p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: bridge: check __vlan_vid_del for error 

Since __vlan_del can return an error code, change its inner function
__vlan_vid_del to return an eventual error from switchdev_port_obj_del.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2015-09-05 21:27:57 -04:00 committed by David S. Miller
parent 39797a279d
commit bf361ad381
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/bridge/br_vlan.c
View File

@ -117,10 +117,11 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
return err; return err;
} }
static void __vlan_vid_del(struct net_device *dev, struct net_bridge *br, static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
u16 vid) u16 vid)
{ {
const struct net_device_ops *ops = dev->netdev_ops; const struct net_device_ops *ops = dev->netdev_ops;
int err = 0;
/* If driver uses VLAN ndo ops, use 8021q to delete vid /* If driver uses VLAN ndo ops, use 8021q to delete vid
* on device, otherwise try switchdev ops to delete vid. * on device, otherwise try switchdev ops to delete vid.
@ -137,8 +138,12 @@ static void __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
}, },
}; };
switchdev_port_obj_del(dev, &vlan_obj); err = switchdev_port_obj_del(dev, &vlan_obj);
if (err == -EOPNOTSUPP)
err = 0;
} }
return err;
} }
static int __vlan_del(struct net_port_vlans *v, u16 vid) static int __vlan_del(struct net_port_vlans *v, u16 vid)
@ -151,7 +156,11 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid)
if (v->port_idx) { if (v->port_idx) {
struct net_bridge_port *p = v->parent.port; struct net_bridge_port *p = v->parent.port;
__vlan_vid_del(p->dev, p->br, vid); int err;
err = __vlan_vid_del(p->dev, p->br, vid);
if (err)
return err;
} }
clear_bit(vid, v->vlan_bitmap); clear_bit(vid, v->vlan_bitmap);