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: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6b1b5dd985f0d65c81396ebf7d86428edaf499b0..8459ca8fec5044d9cc260015384bb49358130eed 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -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,
 };
 

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index e94089e87e9411bc748ce62be5308af79d7cf1c5..17a4c5504b1beeac16052c7d7061e3a50362e3e5 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -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,
 };
 

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index e6c4df2e63c76e86d73c4f7bc5c3fa9bc1be296e..028375391d6f2d236f83ed1cf2191bfb587fa455 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -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,
 };