diff options
author | Jiri Pirko <jiri@mellanox.com> | 2015-10-01 05:03:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-03 07:49:38 -0400 |
commit | 8f24f3095dcedaa4eb4719eee2bed738fe2ce4a0 (patch) | |
tree | a1bbf65f238f8cb6e74097178aad9972e9d63eec /net/switchdev | |
parent | 1f86839874a50c9ee2009567d2f312b1e1949e24 (diff) |
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>
Diffstat (limited to 'net/switchdev')
-rw-r--r-- | net/switchdev/switchdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index c457c1f73d35..02ee926ebde6 100644 --- 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, | |||
483 | EXPORT_SYMBOL_GPL(call_switchdev_notifiers); | 483 | EXPORT_SYMBOL_GPL(call_switchdev_notifiers); |
484 | 484 | ||
485 | struct switchdev_vlan_dump { | 485 | struct 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) | |||
523 | 523 | ||
524 | static int switchdev_port_vlan_dump_cb(void *obj) | 524 | static 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, | |||
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 | ||