mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
net: dsa: rename port_*_bridge routines
Rename DSA port_join_bridge and port_leave_bridge routines to respectively port_bridge_join and port_bridge_leave in order to respect an implicit Port::Bridge namespace. 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:
parent
1e1589ad8b
commit
71327a4e7d
6 changed files with 14 additions and 14 deletions
|
|
@ -448,8 +448,8 @@ static int dsa_slave_bridge_port_join(struct net_device *dev,
|
|||
|
||||
p->bridge_dev = br;
|
||||
|
||||
if (ds->drv->port_join_bridge)
|
||||
ret = ds->drv->port_join_bridge(ds, p->port, br);
|
||||
if (ds->drv->port_bridge_join)
|
||||
ret = ds->drv->port_bridge_join(ds, p->port, br);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -461,8 +461,8 @@ static int dsa_slave_bridge_port_leave(struct net_device *dev)
|
|||
int ret = -EOPNOTSUPP;
|
||||
|
||||
|
||||
if (ds->drv->port_leave_bridge)
|
||||
ret = ds->drv->port_leave_bridge(ds, p->port);
|
||||
if (ds->drv->port_bridge_leave)
|
||||
ret = ds->drv->port_bridge_leave(ds, p->port);
|
||||
|
||||
p->bridge_dev = NULL;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue