diff options
| author |   Jiri Pirko <jiri@mellanox.com> | 2015-10-01 11:03:41 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-03 04:49:36 -0700 |
| commit | 57d80838dae55c1bc6ca629e471c84100513079a (patch) | |
| tree | 4ab9aa8ef8563cfa8deef9a126458e3a416b4d07 /net/bridge/br_vlan.c | |
| parent | Merge branch 'tcp-lockless-listener' (diff) | |
| download | linux-dev-57d80838dae55c1bc6ca629e471c84100513079a.tar.xz linux-dev-57d80838dae55c1bc6ca629e471c84100513079a.zip | |
switchdev: rename SWITCHDEV_OBJ_* enum values to SWITCHDEV_OBJ_ID_*
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/br_vlan.c')
| -rw-r--r-- | net/bridge/br_vlan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 75214a51cf0e..68b5a1125667 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -88,7 +88,8 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, .vid_end = vid, }; - err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_VLAN, &v); + err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_ID_PORT_VLAN, + &v); if (err == -EOPNOTSUPP) err = 0; } @@ -136,7 +137,8 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, .vid_end = vid, }; - err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_VLAN, &v); + err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_ID_PORT_VLAN, + &v); if (err == -EOPNOTSUPP) err = 0; } |