History

switchdev: rename switchdev_obj_vlan to switchdev_obj_port_vlan

Make the struct name in sync with object id name.

Jiri Pirko committed 11 years ago

Commit 8f24f301 parent 1f868395 files · +12 −12Browse files

Unified · Split

5 files
  1. drivers/net/ethernet/rocker/rocker.c +3 −3
  2. include/net/switchdev.h +1 −1
  3. net/bridge/br_vlan.c +2 −2
  4. net/dsa/slave.c +3 −3
  5. net/switchdev/switchdev.c +3 −3
drivers/net/ethernet/rocker/rocker.c+3−3
@@ -4408,7 +4408,7 @@ static int rocker_port_vlan_add(struct rocker_port *rocker_port, · 4407 unmodified lines
44084408
44094409 static int rocker_port_vlans_add(struct rocker_port *rocker_port,
44104410 struct switchdev_trans *trans,
4411− const struct switchdev_obj_vlan *vlan)
4411+ const struct switchdev_obj_port_vlan *vlan)
44124412 {
44134413 u16 vid;
44144414 int err;
@@ -4480,7 +4480,7 @@ static int rocker_port_vlan_del(struct rocker_port *rocker_port, · 65 unmodified lines
44804480 }
44814481
44824482 static int rocker_port_vlans_del(struct rocker_port *rocker_port,
4483− const struct switchdev_obj_vlan *vlan)
4483+ const struct switchdev_obj_port_vlan *vlan)
44844484 {
44854485 u16 vid;
44864486 int err;
@@ -4565,7 +4565,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port, · 78 unmodified lines
45654565 }
45664566
45674567 static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
4568− struct switchdev_obj_vlan *vlan,
4568+ struct switchdev_obj_port_vlan *vlan,
45694569 int (*cb)(void *obj))
45704570 {
45714571 u16 vid;
include/net/switchdev.h+1−1
@@ -65,7 +65,7 @@ enum switchdev_obj_id { · 64 unmodified lines
6565 };
6666
6767 /* SWITCHDEV_OBJ_ID_PORT_VLAN */
68−struct switchdev_obj_vlan {
68+struct switchdev_obj_port_vlan {
6969 u16 flags;
7070 u16 vid_begin;
7171 u16 vid_end;
net/bridge/br_vlan.c+2−2
@@ -82,7 +82,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, · 81 unmodified lines
8282 if (ops->ndo_vlan_rx_add_vid) {
8383 err = vlan_vid_add(dev, br->vlan_proto, vid);
8484 } else {
85− struct switchdev_obj_vlan v = {
85+ struct switchdev_obj_port_vlan v = {
8686 .flags = flags,
8787 .vid_begin = vid,
8888 .vid_end = vid,
@@ -132,7 +132,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, · 43 unmodified lines
132132 if (ops->ndo_vlan_rx_kill_vid) {
133133 vlan_vid_del(dev, br->vlan_proto, vid);
134134 } else {
135− struct switchdev_obj_vlan v = {
135+ struct switchdev_obj_port_vlan v = {
136136 .vid_begin = vid,
137137 .vid_end = vid,
138138 };
net/dsa/slave.c+3−3
@@ -242,7 +242,7 @@ static int dsa_bridge_check_vlan_range(struct dsa_switch *ds, · 241 unmodified lines
242242 }
243243
244244 static int dsa_slave_port_vlan_add(struct net_device *dev,
245− const struct switchdev_obj_vlan *vlan,
245+ const struct switchdev_obj_port_vlan *vlan,
246246 struct switchdev_trans *trans)
247247 {
248248 struct dsa_slave_priv *p = netdev_priv(dev);
@@ -278,7 +278,7 @@ static int dsa_slave_port_vlan_add(struct net_device *dev, · 29 unmodified lines
278278 }
279279
280280 static int dsa_slave_port_vlan_del(struct net_device *dev,
281− const struct switchdev_obj_vlan *vlan)
281+ const struct switchdev_obj_port_vlan *vlan)
282282 {
283283 struct dsa_slave_priv *p = netdev_priv(dev);
284284 struct dsa_switch *ds = p->parent;
@@ -298,7 +298,7 @@ static int dsa_slave_port_vlan_del(struct net_device *dev, · 13 unmodified lines
298298 }
299299
300300 static int dsa_slave_port_vlan_dump(struct net_device *dev,
301− struct switchdev_obj_vlan *vlan,
301+ struct switchdev_obj_port_vlan *vlan,
302302 int (*cb)(void *obj))
303303 {
304304 struct dsa_slave_priv *p = netdev_priv(dev);
net/switchdev/switchdev.c+3−3
@@ -483,7 +483,7 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev, · 482 unmodified lines
483483 EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
484484
485485 struct switchdev_vlan_dump {
486− struct switchdev_obj_vlan vlan;
486+ struct switchdev_obj_port_vlan vlan;
487487 struct sk_buff *skb;
488488 u32 filter_mask;
489489 u16 flags;
@@ -523,7 +523,7 @@ static int switchdev_port_vlan_dump_put(struct switchdev_vlan_dump *dump) · 33 unmodified lines
523523
524524 static int switchdev_port_vlan_dump_cb(void *obj)
525525 {
526− struct switchdev_obj_vlan *vlan = obj;
526+ struct switchdev_obj_port_vlan *vlan = obj;
527527 struct switchdev_vlan_dump *dump =
528528 container_of(vlan, struct switchdev_vlan_dump, vlan);
529529 int err = 0;
@@ -704,7 +704,7 @@ static int switchdev_port_br_afspec(struct net_device *dev, · 174 unmodified lines
704704 {
705705 struct nlattr *attr;
706706 struct bridge_vlan_info *vinfo;
707− struct switchdev_obj_vlan vlan = { 0 };
707+ struct switchdev_obj_port_vlan vlan = { 0 };
708708 int rem;
709709 int err;
710710