switchdev: s/swdev_/switchdev_/

[cascardo/linux.git] / drivers / net / ethernet / rocker / rocker.c

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 418f62b..7473874 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4221,8 +4221,8 @@ static const struct net_device_ops rocker_port_netdev_ops = {
  * swdev interface
  ********************/
 
-static int rocker_port_swdev_parent_id_get(struct net_device *dev,
-                                          struct netdev_phys_item_id *psid)
+static int rocker_port_switchdev_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;
@@ -4232,18 +4232,19 @@ static int rocker_port_swdev_parent_id_get(struct net_device *dev,
        return 0;
 }
 
-static int rocker_port_swdev_port_stp_update(struct net_device *dev, u8 state)
+static int rocker_port_switchdev_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_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)
+static int rocker_port_switchdev_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;
@@ -4252,10 +4253,10 @@ static int rocker_port_swdev_fib_ipv4_add(struct net_device *dev,
                                    fi, tb_id, flags);
 }
 
-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)
+static int rocker_port_switchdev_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;
@@ -4264,11 +4265,11 @@ static int rocker_port_swdev_fib_ipv4_del(struct net_device *dev,
                                    fi, tb_id, flags);
 }
 
-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,
+static const struct switchdev_ops rocker_port_switchdev_ops = {
+       .switchdev_parent_id_get        = rocker_port_switchdev_parent_id_get,
+       .switchdev_port_stp_update      = rocker_port_switchdev_port_stp_update,
+       .switchdev_fib_ipv4_add         = rocker_port_switchdev_fib_ipv4_add,
+       .switchdev_fib_ipv4_del         = rocker_port_switchdev_fib_ipv4_del,
 };
 
 /********************
@@ -4623,7 +4624,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;
+       dev->switchdev_ops = &rocker_port_switchdev_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,