A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

net: dsa: make port_bridge_leave return void

Browse source 
netdev_upper_dev_unlink() which notifies NETDEV_CHANGEUPPER, returns
void, as well as del_nbp(). So there's no advantage to catch an eventual
error from the port_bridge_leave routine at the DSA level.

Make this routine void for the DSA layer and its existing drivers.

Signed-off-by: Vivien Didelot <[email protected]>
Acked-by: Jiri Pirko <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Vivien Didelot 2016-03-13 16:21:33 -04:00 • committed by David S. Miller
commit 16bfa7024e
5 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
net/dsa/slave.c
View file

@ -454,15 +454,14 @@ static int dsa_slave_bridge_port_join(struct net_device *dev,
return ret;
}
static int dsa_slave_bridge_port_leave(struct net_device *dev)
static void dsa_slave_bridge_port_leave(struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
int ret = -EOPNOTSUPP;
if (ds->drv->port_bridge_leave)
ret = ds->drv->port_bridge_leave(ds, p->port);
ds->drv->port_bridge_leave(ds, p->port);
p->bridge_dev = NULL;
@ -470,8 +469,6 @@ static int dsa_slave_bridge_port_leave(struct net_device *dev)
* so allow it to be in BR_STATE_FORWARDING to be kept functional
*/
dsa_slave_stp_update(dev, BR_STATE_FORWARDING);
return ret;
}
static int dsa_slave_port_attr_get(struct net_device *dev,
@ -1156,7 +1153,7 @@ static int dsa_slave_master_changed(struct net_device *dev)
!strcmp(master->rtnl_link_ops->kind, "bridge"))
err = dsa_slave_bridge_port_join(dev, master);
else if (dsa_port_is_bridged(p))
err = dsa_slave_bridge_port_leave(dev);
dsa_slave_bridge_port_leave(dev);
return err;
}