switchdev: remove unused switchdev_port_bridge_dellink

Now we can remove old wrappers for dellink.

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/include/net/switchdev.h b/include/net/switchdev.h
index 8ffadca9e760c187c8f4cd473c30cd9cb2b6b45e..397b1e6e04f6ba3b311db5f7088c142e6064c18a 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -130,8 +130,6 @@ int switchdev_port_bridge_setlink(struct net_device *dev,
                                  struct nlmsghdr *nlh, u16 flags);
 int switchdev_port_bridge_dellink(struct net_device *dev,
                                  struct nlmsghdr *nlh, u16 flags);
-int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev,
-                                          struct nlmsghdr *nlh, u16 flags);
 int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
                           u8 tos, u8 type, u32 nlflags, u32 tb_id);
 int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
@@ -164,12 +162,6 @@ static inline int switchdev_port_obj_del(struct net_device *dev,
        return -EOPNOTSUPP;
 }
 
-static inline int switchdev_port_bridge_dellink(struct net_device *dev,
-                                           struct nlmsghdr *nlh, u16 flags)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int register_switchdev_notifier(struct notifier_block *nb)
 {
        return 0;
@@ -201,13 +193,6 @@ static inline int switchdev_port_bridge_dellink(struct net_device *dev,
        return -EOPNOTSUPP;
 }
 
-static inline int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev,
-                                                        struct nlmsghdr *nlh,
-                                                        u16 flags)
-{
-       return 0;
-}
-
 static inline int switchdev_fib_ipv4_add(u32 dst, int dst_len,
                                         struct fib_info *fi,
                                         u8 tos, u8 type,

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 8ce678e397b4d90e40464f989e2b3a8576b1c4a4..0e15b6f6bb56a61c181f28e380f55a0f81b932a9 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -536,36 +536,6 @@ int switchdev_port_bridge_dellink(struct net_device *dev,
 }
 EXPORT_SYMBOL_GPL(switchdev_port_bridge_dellink);
 
-/**
- *     ndo_dflt_switchdev_port_bridge_dellink - default ndo bridge dellink
- *                                              op for master devices
- *
- *     @dev: port device
- *     @nlh: netlink msg with bridge port attributes
- *     @flags: bridge dellink flags
- *
- *     Notify master device slaves of bridge port attribute deletes
- */
-int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev,
-                                          struct nlmsghdr *nlh, u16 flags)
-{
-       struct net_device *lower_dev;
-       struct list_head *iter;
-       int ret = 0, err = 0;
-
-       if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
-               return ret;
-
-       netdev_for_each_lower_dev(dev, lower_dev, iter) {
-               err = switchdev_port_bridge_dellink(lower_dev, nlh, flags);
-               if (err && err != -EOPNOTSUPP)
-                       ret = err;
-       }
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(ndo_dflt_switchdev_port_bridge_dellink);
-
 static struct net_device *switchdev_get_lowest_dev(struct net_device *dev)
 {
        const struct switchdev_ops *ops = dev->switchdev_ops;