xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: make the VLAN add function return void

Browse Source 
The switchdev design implies that a software error should not happen in
the commit phase since it must have been previously reported in the
prepare phase. If an hardware error occurs during the commit phase,
there is nothing switchdev can do about it.

The DSA layer separates port_vlan_prepare and port_vlan_add for
simplicity and convenience. If an hardware error occurs during the
commit phase, there is no need to report it outside the driver itself.

Make the DSA port_vlan_add routine return void for explicitness.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot
2016-04-06 11:55:05 -04:00
committed by David S. Miller
parent 8497aa618d
commit 4d5770b397
4 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/dsa/slave.c
View File

@@ -207,21 +207,16 @@ static int dsa_slave_port_vlan_add(struct net_device *dev,
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
int err;
if (switchdev_trans_ph_prepare(trans)) {
if (!ds->drv->port_vlan_prepare || !ds->drv->port_vlan_add)
return -EOPNOTSUPP;
err = ds->drv->port_vlan_prepare(ds, p->port, vlan, trans);
if (err)
return err;
} else {
err = ds->drv->port_vlan_add(ds, p->port, vlan, trans);
if (err)
return err;
return ds->drv->port_vlan_prepare(ds, p->port, vlan, trans);
}
ds->drv->port_vlan_add(ds, p->port, vlan, trans);
return 0;
}