switchdev: rename switchdev_obj_vlan to switchdev_obj_port_vlan

Make the struct name in sync with object id name.

Suggested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 4540ca63a434ef82603bae7f17a9114b9d6a7889..d75fc4b3baa907a947dbcea2f254ca644f3fd5f8 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4408,7 +4408,7 @@ static int rocker_port_vlan_add(struct rocker_port *rocker_port,
 
 static int rocker_port_vlans_add(struct rocker_port *rocker_port,
                                 struct switchdev_trans *trans,
-                                const struct switchdev_obj_vlan *vlan)
+                                const struct switchdev_obj_port_vlan *vlan)
 {
        u16 vid;
        int err;
@@ -4480,7 +4480,7 @@ static int rocker_port_vlan_del(struct rocker_port *rocker_port,
 }
 
 static int rocker_port_vlans_del(struct rocker_port *rocker_port,
-                                const struct switchdev_obj_vlan *vlan)
+                                const struct switchdev_obj_port_vlan *vlan)
 {
        u16 vid;
        int err;
@@ -4565,7 +4565,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
 }
 
 static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
-                                struct switchdev_obj_vlan *vlan,
+                                struct switchdev_obj_port_vlan *vlan,
                                int (*cb)(void *obj))
 {
        u16 vid;

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 612719b9618a63606e9b1df2105d7833519a621d..0138f9b374e2a7df1e659ab94ed7b07cc3ef7820 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -65,7 +65,7 @@ enum switchdev_obj_id {
 };
 
 /* SWITCHDEV_OBJ_ID_PORT_VLAN */
-struct switchdev_obj_vlan {
+struct switchdev_obj_port_vlan {
        u16 flags;
        u16 vid_begin;
        u16 vid_end;

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 68b5a11256671eecb9220d7effbb417d1ae19610..d4cb129557f48ff2c91f898ff460fea0a0e59b6e 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -82,7 +82,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
        if (ops->ndo_vlan_rx_add_vid) {
                err = vlan_vid_add(dev, br->vlan_proto, vid);
        } else {
-               struct switchdev_obj_vlan v = {
+               struct switchdev_obj_port_vlan v = {
                        .flags = flags,
                        .vid_begin = vid,
                        .vid_end = vid,
@@ -132,7 +132,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
        if (ops->ndo_vlan_rx_kill_vid) {
                vlan_vid_del(dev, br->vlan_proto, vid);
        } else {
-               struct switchdev_obj_vlan v = {
+               struct switchdev_obj_port_vlan v = {
                        .vid_begin = vid,
                        .vid_end = vid,
                };

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8992568f5c0ed5c209027744403fd8f9a14933ec..baf34f2221153aaa21b741d6d380368442b84df0 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -242,7 +242,7 @@ static int dsa_bridge_check_vlan_range(struct dsa_switch *ds,
 }
 
 static int dsa_slave_port_vlan_add(struct net_device *dev,
-                                  const struct switchdev_obj_vlan *vlan,
+                                  const struct switchdev_obj_port_vlan *vlan,
                                   struct switchdev_trans *trans)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
@@ -278,7 +278,7 @@ static int dsa_slave_port_vlan_add(struct net_device *dev,
 }
 
 static int dsa_slave_port_vlan_del(struct net_device *dev,
-                                  const struct switchdev_obj_vlan *vlan)
+                                  const struct switchdev_obj_port_vlan *vlan)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
        struct dsa_switch *ds = p->parent;
@@ -298,7 +298,7 @@ static int dsa_slave_port_vlan_del(struct net_device *dev,
 }
 
 static int dsa_slave_port_vlan_dump(struct net_device *dev,
-                                   struct switchdev_obj_vlan *vlan,
+                                   struct switchdev_obj_port_vlan *vlan,
                                    int (*cb)(void *obj))
 {
        struct dsa_slave_priv *p = netdev_priv(dev);

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index c457c1f73d35c57ba63f0fc8b3512bc93b0eb235..02ee926ebde6397293a42fc95f1ec344d09fd829 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -483,7 +483,7 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
 EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
 
 struct switchdev_vlan_dump {
-       struct switchdev_obj_vlan vlan;
+       struct switchdev_obj_port_vlan vlan;
        struct sk_buff *skb;
        u32 filter_mask;
        u16 flags;
@@ -523,7 +523,7 @@ static int switchdev_port_vlan_dump_put(struct switchdev_vlan_dump *dump)
 
 static int switchdev_port_vlan_dump_cb(void *obj)
 {
-       struct switchdev_obj_vlan *vlan = obj;
+       struct switchdev_obj_port_vlan *vlan = obj;
        struct switchdev_vlan_dump *dump =
                container_of(vlan, struct switchdev_vlan_dump, vlan);
        int err = 0;
@@ -704,7 +704,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
 {
        struct nlattr *attr;
        struct bridge_vlan_info *vinfo;
-       struct switchdev_obj_vlan vlan = { 0 };
+       struct switchdev_obj_port_vlan vlan = { 0 };
        int rem;
        int err;