leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: Handle non-bridge master change

Browse Source 
Master change notifications may occur other than when joining or
leaving a bridge, for example when being added to or removed from
a bond or Open vSwitch. In that case, do nothing instead of asking
the switch driver to remove a port from a bridge that it didn't join.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guenter Roeck 2015-03-25 08:08:37 -07:00 committed by David S. Miller
parent ac110f4954
commit b06b107a4c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/dsa/slave.c
View File

@ -830,12 +830,13 @@ static bool dsa_slave_dev_check(struct net_device *dev)
static int dsa_slave_master_changed(struct net_device *dev) static int dsa_slave_master_changed(struct net_device *dev)
{ {
struct net_device *master = netdev_master_upper_dev_get(dev); struct net_device *master = netdev_master_upper_dev_get(dev);
struct dsa_slave_priv *p = netdev_priv(dev);
int err = 0; int err = 0;
if (master && master->rtnl_link_ops && if (master && master->rtnl_link_ops &&
!strcmp(master->rtnl_link_ops->kind, "bridge")) !strcmp(master->rtnl_link_ops->kind, "bridge"))
err = dsa_slave_bridge_port_join(dev, master); err = dsa_slave_bridge_port_join(dev, master);
else else if (dsa_port_is_bridged(p))
err = dsa_slave_bridge_port_leave(dev); err = dsa_slave_bridge_port_leave(dev);
return err; return err;