diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-04-06 18:55:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-08 23:50:41 +0300 |
| commit | 4d5770b39710180644f655b2c6cb0c880d108c63 (patch) | |
| tree | a416797b924cb52dfe9fe95464f12205286e7bc7 /net | |
| parent | 8497aa618dd605b084fae86e676ea23ca85558b5 (diff) | |
| download | linux-4d5770b39710180644f655b2c6cb0c880d108c63.tar.xz | |
net: dsa: make the VLAN add function return void
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dsa/slave.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 90bc7442c44f..2dae0d064359 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -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; } |