netdev: remove ndo ops for switchdev

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9e8a2a933c68f4e3df3d25e836e95426d2f5ae19..dd1d069758be0f7410ae22c9c6b381b3fcd911f7 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -768,8 +768,6 @@ struct netdev_phys_item_id {
 typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
                                       struct sk_buff *skb);
 
-struct fib_info;
-
 /*
  * This structure defines the management hooks for network devices.
  * The following hooks can be defined; unless noted otherwise, they are
@@ -1024,23 +1022,6 @@ struct fib_info;
  *     be otherwise expressed by feature flags. The check is called with
  *     the set of features that the stack has calculated and it returns
  *     those the driver believes to be appropriate.
- *
- * int (*ndo_switch_parent_id_get)(struct net_device *dev,
- *                                struct netdev_phys_item_id *psid);
- *     Called to get an ID of the switch chip this port is part of.
- *     If driver implements this, it indicates that it represents a port
- *     of a switch chip.
- * int (*ndo_switch_port_stp_update)(struct net_device *dev, u8 state);
- *     Called to notify switch device port of bridge port STP
- *     state change.
- * int (*ndo_sw_parent_fib_ipv4_add)(struct net_device *dev, __be32 dst,
- *                                  int dst_len, struct fib_info *fi,
- *                                  u8 tos, u8 type, u32 nlflags, u32 tb_id);
- *     Called to add/modify IPv4 route to switch device.
- * int (*ndo_sw_parent_fib_ipv4_del)(struct net_device *dev, __be32 dst,
- *                                  int dst_len, struct fib_info *fi,
- *                                  u8 tos, u8 type, u32 tb_id);
- *     Called to delete IPv4 route from switch device.
  */
 struct net_device_ops {
        int                     (*ndo_init)(struct net_device *dev);
@@ -1197,25 +1178,6 @@ struct net_device_ops {
        netdev_features_t       (*ndo_features_check) (struct sk_buff *skb,
                                                       struct net_device *dev,
                                                       netdev_features_t features);
-#ifdef CONFIG_NET_SWITCHDEV
-       int                     (*ndo_switch_parent_id_get)(struct net_device *dev,
-                                                           struct netdev_phys_item_id *psid);
-       int                     (*ndo_switch_port_stp_update)(struct net_device *dev,
-                                                             u8 state);
-       int                     (*ndo_switch_fib_ipv4_add)(struct net_device *dev,
-                                                          __be32 dst,
-                                                          int dst_len,
-                                                          struct fib_info *fi,
-                                                          u8 tos, u8 type,
-                                                          u32 nlflags,
-                                                          u32 tb_id);
-       int                     (*ndo_switch_fib_ipv4_del)(struct net_device *dev,
-                                                          __be32 dst,
-                                                          int dst_len,
-                                                          struct fib_info *fi,
-                                                          u8 tos, u8 type,
-                                                          u32 tb_id);
-#endif
 };
 
 /**