switchdev: cut over to new switchdev_port_bridge_getlink

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

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 17a4c5504b1beeac16052c7d7061e3a50362e3e5..56ee316db1a11f4b6e383cd43fe94c612573f528 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4295,19 +4295,6 @@ skip:
        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,
 };

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