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
4408 4408
4409static int rocker_port_vlans_add(struct rocker_port *rocker_port,4409static int rocker_port_vlans_add(struct rocker_port *rocker_port,
4410 struct switchdev_trans *trans,4410 struct switchdev_trans *trans,
4411 const struct switchdev_obj_vlan *vlan)4411 const struct switchdev_obj_port_vlan *vlan)
4412{4412{
4413 u16 vid;4413 u16 vid;
4414 int err;4414 int err;
@@ -4480,7 +4480,7 @@ static int rocker_port_vlan_del(struct rocker_port *rocker_port, · 65 unmodified lines
4480}4480}
4481 4481
4482static int rocker_port_vlans_del(struct rocker_port *rocker_port,4482static 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)
4484{4484{
4485 u16 vid;4485 u16 vid;
4486 int err;4486 int err;
@@ -4565,7 +4565,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port, · 78 unmodified lines
4565}4565}
4566 4566
4567static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,4567static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
4568 struct switchdev_obj_vlan *vlan,4568 struct switchdev_obj_port_vlan *vlan,
4569 int (*cb)(void *obj))4569 int (*cb)(void *obj))
4570{4570{
4571 u16 vid;4571 u16 vid;
include/net/switchdev.h+1−1
@@ -65,7 +65,7 @@ enum switchdev_obj_id { · 64 unmodified lines
65};65};
66 66
67/* SWITCHDEV_OBJ_ID_PORT_VLAN */67/* SWITCHDEV_OBJ_ID_PORT_VLAN */
68struct switchdev_obj_vlan {68struct switchdev_obj_port_vlan {
69 u16 flags;69 u16 flags;
70 u16 vid_begin;70 u16 vid_begin;
71 u16 vid_end;71 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
82 if (ops->ndo_vlan_rx_add_vid) {82 if (ops->ndo_vlan_rx_add_vid) {
83 err = vlan_vid_add(dev, br->vlan_proto, vid);83 err = vlan_vid_add(dev, br->vlan_proto, vid);
84 } else {84 } else {
85 struct switchdev_obj_vlan v = {85 struct switchdev_obj_port_vlan v = {
86 .flags = flags,86 .flags = flags,
87 .vid_begin = vid,87 .vid_begin = vid,
88 .vid_end = vid,88 .vid_end = vid,
@@ -132,7 +132,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, · 43 unmodified lines
132 if (ops->ndo_vlan_rx_kill_vid) {132 if (ops->ndo_vlan_rx_kill_vid) {
133 vlan_vid_del(dev, br->vlan_proto, vid);133 vlan_vid_del(dev, br->vlan_proto, vid);
134 } else {134 } else {
135 struct switchdev_obj_vlan v = {135 struct switchdev_obj_port_vlan v = {
136 .vid_begin = vid,136 .vid_begin = vid,
137 .vid_end = vid,137 .vid_end = vid,
138 };138 };
net/dsa/slave.c+3−3
@@ -242,7 +242,7 @@ static int dsa_bridge_check_vlan_range(struct dsa_switch *ds, · 241 unmodified lines
242}242}
243 243
244static int dsa_slave_port_vlan_add(struct net_device *dev,244static 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,
246 struct switchdev_trans *trans)246 struct switchdev_trans *trans)
247{247{
248 struct dsa_slave_priv *p = netdev_priv(dev);248 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
278}278}
279 279
280static int dsa_slave_port_vlan_del(struct net_device *dev,280static 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)
282{282{
283 struct dsa_slave_priv *p = netdev_priv(dev);283 struct dsa_slave_priv *p = netdev_priv(dev);
284 struct dsa_switch *ds = p->parent;284 struct dsa_switch *ds = p->parent;
@@ -298,7 +298,7 @@ static int dsa_slave_port_vlan_del(struct net_device *dev, · 13 unmodified lines
298}298}
299 299
300static int dsa_slave_port_vlan_dump(struct net_device *dev,300static int dsa_slave_port_vlan_dump(struct net_device *dev,
301 struct switchdev_obj_vlan *vlan,301 struct switchdev_obj_port_vlan *vlan,
302 int (*cb)(void *obj))302 int (*cb)(void *obj))
303{303{
304 struct dsa_slave_priv *p = netdev_priv(dev);304 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
483EXPORT_SYMBOL_GPL(call_switchdev_notifiers);483EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
484 484
485struct switchdev_vlan_dump {485struct switchdev_vlan_dump {
486 struct switchdev_obj_vlan vlan;486 struct switchdev_obj_port_vlan vlan;
487 struct sk_buff *skb;487 struct sk_buff *skb;
488 u32 filter_mask;488 u32 filter_mask;
489 u16 flags;489 u16 flags;
@@ -523,7 +523,7 @@ static int switchdev_port_vlan_dump_put(struct switchdev_vlan_dump *dump) · 33 unmodified lines
523 523
524static int switchdev_port_vlan_dump_cb(void *obj)524static int switchdev_port_vlan_dump_cb(void *obj)
525{525{
526 struct switchdev_obj_vlan *vlan = obj;526 struct switchdev_obj_port_vlan *vlan = obj;
527 struct switchdev_vlan_dump *dump =527 struct switchdev_vlan_dump *dump =
528 container_of(vlan, struct switchdev_vlan_dump, vlan);528 container_of(vlan, struct switchdev_vlan_dump, vlan);
529 int err = 0;529 int err = 0;
@@ -704,7 +704,7 @@ static int switchdev_port_br_afspec(struct net_device *dev, · 174 unmodified lines
704{704{
705 struct nlattr *attr;705 struct nlattr *attr;
706 struct bridge_vlan_info *vinfo;706 struct bridge_vlan_info *vinfo;
707 struct switchdev_obj_vlan vlan = { 0 };707 struct switchdev_obj_port_vlan vlan = { 0 };
708 int rem;708 int rem;
709 int err;709 int err;
710 710