summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2015-10-01 11:03:43 +0200
committerDavid S. Miller <davem@davemloft.net>2015-10-03 04:49:38 -0700
commit8f24f3095dcedaa4eb4719eee2bed738fe2ce4a0 (patch)
treea1bbf65f238f8cb6e74097178aad9972e9d63eec /net/bridge
parent1f86839874a50c9ee2009567d2f312b1e1949e24 (diff)
downloadop-kernel-dev-8f24f3095dcedaa4eb4719eee2bed738fe2ce4a0.zip
op-kernel-dev-8f24f3095dcedaa4eb4719eee2bed738fe2ce4a0.tar.gz
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/bridge')
-rw-r--r--net/bridge/br_vlan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 68b5a11..d4cb129 100644
--- 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,
};
OpenPOWER on IntegriCloud