diff options
| author |   Jiri Pirko <jiri@mellanox.com> | 2015-10-01 11:03:45 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-03 04:49:39 -0700 |
| commit | 648b4a995a057187ddd77cdb181e6a0b24ab2959 (patch) | |
| tree | 28535b6300765d1411c7a7e4a30015de227cb947 /net/bridge/br_vlan.c | |
| parent | switchdev: rename switchdev_obj_fdb to switchdev_obj_port_fdb (diff) | |
| download | linux-dev-648b4a995a057187ddd77cdb181e6a0b24ab2959.tar.xz linux-dev-648b4a995a057187ddd77cdb181e6a0b24ab2959.zip | |
switchdev: bring back switchdev_obj and use it as a generic object param
Replace "void *obj" with a generic structure. Introduce couple of
helpers along that.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index d4cb129557f4..0b87cf6ccb46 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -89,7 +89,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, }; err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_ID_PORT_VLAN, - &v); + &v.obj); if (err == -EOPNOTSUPP) err = 0; } @@ -138,7 +138,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, }; err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_ID_PORT_VLAN, - &v); + &v.obj); if (err == -EOPNOTSUPP) err = 0; } |