Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85fdb956 authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

switchdev: cut over to new switchdev_port_bridge_getlink 



Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8793d0a6

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -4040,6 +4040,7 @@ static const struct net_device_ops bond_netdev_ops = { 
	.ndo_del_slave		= bond_release,

	.ndo_fix_features	= bond_fix_features,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_features_check	= passthru_features_check,

};

drivers/net/ethernet/rocker/rocker.c

+1 −14
Original line number Diff line number Diff line
@@ -4295,19 +4295,6 @@ static int rocker_port_fdb_dump(struct sk_buff *skb, 
	return idx;

}



static int rocker_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				      struct net_device *dev,

				      u32 filter_mask, int nlflags)

{

	struct rocker_port *rocker_port = netdev_priv(dev);

	u16 mode = BRIDGE_MODE_UNDEF;

	u32 mask = BR_LEARNING | BR_LEARNING_SYNC;



	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode,

				       rocker_port->brport_flags, mask,

				       nlflags);

}



static int rocker_port_get_phys_port_name(struct net_device *dev,

					  char *buf, size_t len)

{
@@ -4334,8 +4321,8 @@ static const struct net_device_ops rocker_port_netdev_ops = { 
	.ndo_fdb_add			= rocker_port_fdb_add,

	.ndo_fdb_del			= rocker_port_fdb_del,

	.ndo_fdb_dump			= rocker_port_fdb_dump,

	.ndo_bridge_getlink		= switchdev_port_bridge_getlink,

	.ndo_bridge_setlink		= switchdev_port_bridge_setlink,

	.ndo_bridge_getlink		= rocker_port_bridge_getlink,

	.ndo_bridge_dellink		= switchdev_port_bridge_dellink,

	.ndo_get_phys_port_name		= rocker_port_get_phys_port_name,

};

drivers/net/team/team.c

+1 −0
Original line number Diff line number Diff line
@@ -1978,6 +1978,7 @@ static const struct net_device_ops team_netdev_ops = { 
	.ndo_fix_features	= team_fix_features,

	.ndo_change_carrier     = team_change_carrier,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_features_check	= passthru_features_check,

};