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

Commit 54ba5a0b authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

switchdev: cut over to new switchdev_port_bridge_dellink 



Rocker, bonding and team and switch over to the new
switchdev_port_bridge_dellink to avoid duplicating code in each driver.

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 5c34e022

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4040,7 +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_dellink	= ndo_dflt_switchdev_port_bridge_dellink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_features_check	= passthru_features_check,

};

drivers/net/ethernet/rocker/rocker.c

+1 −0
Original line number Diff line number Diff line
@@ -4336,6 +4336,7 @@ static const struct net_device_ops rocker_port_netdev_ops = { 
	.ndo_fdb_dump			= rocker_port_fdb_dump,

	.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 −1
Original line number Diff line number Diff line
@@ -1978,7 +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_dellink     = ndo_dflt_switchdev_port_bridge_dellink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_features_check	= passthru_features_check,

};