3 files changed, 64 insertions, 51 deletions

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 223348d8cc07..bc5f27aa3131 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4131,8 +4131,26 @@ static int rocker_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
                                        rocker_port->brport_flags, mask);
 }
 
-static int rocker_port_switch_parent_id_get(struct net_device *dev,
-                                            struct netdev_phys_item_id *psid)
+static const struct net_device_ops rocker_port_netdev_ops = {
+        .ndo_open                       = rocker_port_open,
+        .ndo_stop                       = rocker_port_stop,
+        .ndo_start_xmit                 = rocker_port_xmit,
+        .ndo_set_mac_address            = rocker_port_set_mac_address,
+        .ndo_vlan_rx_add_vid            = rocker_port_vlan_rx_add_vid,
+        .ndo_vlan_rx_kill_vid           = rocker_port_vlan_rx_kill_vid,
+        .ndo_fdb_add                    = rocker_port_fdb_add,
+        .ndo_fdb_del                    = rocker_port_fdb_del,
+        .ndo_fdb_dump                   = rocker_port_fdb_dump,
+        .ndo_bridge_setlink             = rocker_port_bridge_setlink,
+        .ndo_bridge_getlink             = rocker_port_bridge_getlink,
+};
+
+/********************
+ * swdev interface
+ ********************/
+
+static int rocker_port_swdev_parent_id_get(struct net_device *dev,
+                                           struct netdev_phys_item_id *psid)
 {
         struct rocker_port *rocker_port = netdev_priv(dev);
         struct rocker *rocker = rocker_port->rocker;
@@ -4142,18 +4160,18 @@ static int rocker_port_switch_parent_id_get(struct net_device *dev,
         return 0;
 }
 
-static int rocker_port_switch_port_stp_update(struct net_device *dev, u8 state)
+static int rocker_port_swdev_port_stp_update(struct net_device *dev, u8 state)
 {
         struct rocker_port *rocker_port = netdev_priv(dev);
 
         return rocker_port_stp_update(rocker_port, state);
 }
 
-static int rocker_port_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)
+static int rocker_port_swdev_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)
 {
         struct rocker_port *rocker_port = netdev_priv(dev);
         int flags = 0;
@@ -4162,10 +4180,10 @@ static int rocker_port_switch_fib_ipv4_add(struct net_device *dev,
                                     fi, tb_id, flags);
 }
 
-static int rocker_port_switch_fib_ipv4_del(struct net_device *dev,
-                                           __be32 dst, int dst_len,
-                                           struct fib_info *fi,
-                                           u8 tos, u8 type, u32 tb_id)
+static int rocker_port_swdev_fib_ipv4_del(struct net_device *dev,
+                                          __be32 dst, int dst_len,
+                                          struct fib_info *fi,
+                                          u8 tos, u8 type, u32 tb_id)
 {
         struct rocker_port *rocker_port = netdev_priv(dev);
         int flags = ROCKER_OP_FLAG_REMOVE;
@@ -4174,22 +4192,11 @@ static int rocker_port_switch_fib_ipv4_del(struct net_device *dev,
                                     fi, tb_id, flags);
 }
 
-static const struct net_device_ops rocker_port_netdev_ops = {
-        .ndo_open                       = rocker_port_open,
-        .ndo_stop                       = rocker_port_stop,
-        .ndo_start_xmit                 = rocker_port_xmit,
-        .ndo_set_mac_address            = rocker_port_set_mac_address,
-        .ndo_vlan_rx_add_vid            = rocker_port_vlan_rx_add_vid,
-        .ndo_vlan_rx_kill_vid           = rocker_port_vlan_rx_kill_vid,
-        .ndo_fdb_add                    = rocker_port_fdb_add,
-        .ndo_fdb_del                    = rocker_port_fdb_del,
-        .ndo_fdb_dump                   = rocker_port_fdb_dump,
-        .ndo_bridge_setlink             = rocker_port_bridge_setlink,
-        .ndo_bridge_getlink             = rocker_port_bridge_getlink,
-        .ndo_switch_parent_id_get       = rocker_port_switch_parent_id_get,
-        .ndo_switch_port_stp_update     = rocker_port_switch_port_stp_update,
-        .ndo_switch_fib_ipv4_add        = rocker_port_switch_fib_ipv4_add,
-        .ndo_switch_fib_ipv4_del        = rocker_port_switch_fib_ipv4_del,
+static const struct swdev_ops rocker_port_swdev_ops = {
+        .swdev_parent_id_get            = rocker_port_swdev_parent_id_get,
+        .swdev_port_stp_update          = rocker_port_swdev_port_stp_update,
+        .swdev_fib_ipv4_add             = rocker_port_swdev_fib_ipv4_add,
+        .swdev_fib_ipv4_del             = rocker_port_swdev_fib_ipv4_del,
 };
 
 /********************
@@ -4544,6 +4551,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)
         rocker_port_dev_addr_init(rocker, rocker_port);
         dev->netdev_ops = &rocker_port_netdev_ops;
         dev->ethtool_ops = &rocker_port_ethtool_ops;
+        dev->swdev_ops = &rocker_port_swdev_ops;
         netif_napi_add(dev, &rocker_port->napi_tx, rocker_port_poll_tx,
                        NAPI_POLL_WEIGHT);
         netif_napi_add(dev, &rocker_port->napi_rx, rocker_port_poll_rx,
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 6511552039d6..f0af7aa331c1 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -16,6 +16,7 @@
 #include <linux/of_net.h>
 #include <linux/of_mdio.h>
 #include <net/rtnetlink.h>
+#include <net/switchdev.h>
 #include <linux/if_bridge.h>
 #include "dsa_priv.h"
 
@@ -572,8 +573,11 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
         .ndo_set_rx_mode        = dsa_slave_set_rx_mode,
         .ndo_set_mac_address    = dsa_slave_set_mac_address,
         .ndo_do_ioctl           = dsa_slave_ioctl,
-        .ndo_switch_parent_id_get = dsa_slave_parent_id_get,
-        .ndo_switch_port_stp_update = dsa_slave_stp_update,
+};
+
+static const struct swdev_ops dsa_slave_swdev_ops = {
+        .swdev_parent_id_get = dsa_slave_parent_id_get,
+        .swdev_port_stp_update = dsa_slave_stp_update,
 };
 
 static void dsa_slave_adjust_link(struct net_device *dev)
@@ -755,6 +759,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
         eth_hw_addr_inherit(slave_dev, master);
         slave_dev->tx_queue_len = 0;
         slave_dev->netdev_ops = &dsa_slave_netdev_ops;
+        slave_dev->swdev_ops = &dsa_slave_swdev_ops;
 
         SET_NETDEV_DEV(slave_dev, parent);
         slave_dev->dev.of_node = ds->pd->port_dn[port];
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index b7a23132c610..c9bfa004abed 100644
--- 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;