switchdev: use new swdev ops

[mirror_ubuntu-hirsute-kernel.git] / net / switchdev / switchdev.c

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 8cf42a69baf43091699e287b4d42ac18ea971915..c9bfa004abed1b7d5a47b9bf509eabce32ad956c 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -28,11 +28,11 @@
 int netdev_switch_parent_id_get(struct net_device *dev,
                                struct netdev_phys_item_id *psid)
 {
-       const struct net_device_ops *ops = dev->netdev_ops;
+       const struct swdev_ops *ops = dev->swdev_ops;
 
-       if (!ops->ndo_switch_parent_id_get)
+       if (!ops || !ops->swdev_parent_id_get)
                return -EOPNOTSUPP;
-       return ops->ndo_switch_parent_id_get(dev, psid);
+       return ops->swdev_parent_id_get(dev, psid);
 }
 EXPORT_SYMBOL_GPL(netdev_switch_parent_id_get);
 
@@ -46,12 +46,12 @@ EXPORT_SYMBOL_GPL(netdev_switch_parent_id_get);
  */
 int netdev_switch_port_stp_update(struct net_device *dev, u8 state)
 {
-       const struct net_device_ops *ops = dev->netdev_ops;
+       const struct swdev_ops *ops = dev->swdev_ops;
 
-       if (!ops->ndo_switch_port_stp_update)
+       if (!ops || !ops->swdev_port_stp_update)
                return -EOPNOTSUPP;
-       WARN_ON(!ops->ndo_switch_parent_id_get);
-       return ops->ndo_switch_port_stp_update(dev, state);
+       WARN_ON(!ops->swdev_parent_id_get);
+       return ops->swdev_port_stp_update(dev, state);
 }
 EXPORT_SYMBOL_GPL(netdev_switch_port_stp_update);
 
@@ -59,7 +59,7 @@ static DEFINE_MUTEX(netdev_switch_mutex);
 static RAW_NOTIFIER_HEAD(netdev_switch_notif_chain);
 
 /**
- *     register_netdev_switch_notifier - Register nofifier
+ *     register_netdev_switch_notifier - Register notifier
  *     @nb: notifier_block
  *
  *     Register switch device notifier. This should be used by code
@@ -78,7 +78,7 @@ int register_netdev_switch_notifier(struct notifier_block *nb)
 EXPORT_SYMBOL_GPL(register_netdev_switch_notifier);
 
 /**
- *     unregister_netdev_switch_notifier - Unregister nofifier
+ *     unregister_netdev_switch_notifier - Unregister notifier
  *     @nb: notifier_block
  *
  *     Unregister switch device notifier.
@@ -96,7 +96,7 @@ int unregister_netdev_switch_notifier(struct notifier_block *nb)
 EXPORT_SYMBOL_GPL(unregister_netdev_switch_notifier);
 
 /**
- *     call_netdev_switch_notifiers - Call nofifiers
+ *     call_netdev_switch_notifiers - Call notifiers
  *     @val: value passed unmodified to notifier function
  *     @dev: port device
  *     @info: notifier information data
@@ -230,17 +230,17 @@ EXPORT_SYMBOL_GPL(ndo_dflt_netdev_switch_port_bridge_dellink);
 
 static struct net_device *netdev_switch_get_lowest_dev(struct net_device *dev)
 {
-       const struct net_device_ops *ops = dev->netdev_ops;
+       const struct swdev_ops *ops = dev->swdev_ops;
        struct net_device *lower_dev;
        struct net_device *port_dev;
        struct list_head *iter;
 
        /* Recusively search down until we find a sw port dev.
-        * (A sw port dev supports ndo_switch_parent_id_get).
+        * (A sw port dev supports swdev_parent_id_get).
         */
 
        if (dev->features & NETIF_F_HW_SWITCH_OFFLOAD &&
-           ops->ndo_switch_parent_id_get)
+           ops && ops->swdev_parent_id_get)
                return dev;
 
        netdev_for_each_lower_dev(dev, lower_dev, iter) {
@@ -304,7 +304,7 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
                               u8 tos, u8 type, u32 nlflags, u32 tb_id)
 {
        struct net_device *dev;
-       const struct net_device_ops *ops;
+       const struct swdev_ops *ops;
        int err = 0;
 
        /* Don't offload route if using custom ip rules or if
@@ -322,12 +322,12 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
        dev = netdev_switch_get_dev_by_nhs(fi);
        if (!dev)
                return 0;
-       ops = dev->netdev_ops;
+       ops = dev->swdev_ops;
 
-       if (ops->ndo_switch_fib_ipv4_add) {
-               err = ops->ndo_switch_fib_ipv4_add(dev, htonl(dst), dst_len,
-                                                  fi, tos, type, nlflags,
-                                                  tb_id);
+       if (ops->swdev_fib_ipv4_add) {
+               err = ops->swdev_fib_ipv4_add(dev, htonl(dst), dst_len,
+                                             fi, tos, type, nlflags,
+                                             tb_id);
                if (!err)
                        fi->fib_flags |= RTNH_F_EXTERNAL;
        }
@@ -352,7 +352,7 @@ int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
                               u8 tos, u8 type, u32 tb_id)
 {
        struct net_device *dev;
-       const struct net_device_ops *ops;
+       const struct swdev_ops *ops;
        int err = 0;
 
        if (!(fi->fib_flags & RTNH_F_EXTERNAL))
@@ -361,11 +361,11 @@ int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
        dev = netdev_switch_get_dev_by_nhs(fi);
        if (!dev)
                return 0;
-       ops = dev->netdev_ops;
+       ops = dev->swdev_ops;
 
-       if (ops->ndo_switch_fib_ipv4_del) {
-               err = ops->ndo_switch_fib_ipv4_del(dev, htonl(dst), dst_len,
-                                                  fi, tos, type, tb_id);
+       if (ops->swdev_fib_ipv4_del) {
+               err = ops->swdev_fib_ipv4_del(dev, htonl(dst), dst_len,
+                                             fi, tos, type, tb_id);
                if (!err)
                        fi->fib_flags &= ~RTNH_F_EXTERNAL;
        }