diff options
| author |   Vivien Didelot <vivien.didelot@gmail.com> | 2019-08-25 13:25:16 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-27 20:17:27 -0700 |
| commit | cf360866b11901eca5317e8a5c26c3e15b7bf1f2 (patch) | |
| tree | 9321d3d52b8f01ad89b9133cbb6a3ed9701f50cc /net/dsa | |
| parent | net: dsa: remove bitmap operations (diff) | |
| download | linux-dev-cf360866b11901eca5317e8a5c26c3e15b7bf1f2.tar.xz linux-dev-cf360866b11901eca5317e8a5c26c3e15b7bf1f2.zip | |
net: dsa: do not skip -EOPNOTSUPP in dsa_port_vid_add
Currently dsa_port_vid_add returns 0 if the switch returns -EOPNOTSUPP.
This function is used in the tag_8021q.c code to offload the PVID of
ports, which would simply not work if .port_vlan_add is not supported
by the underlying switch.
Do not skip -EOPNOTSUPP in dsa_port_vid_add but only when necessary,
that is to say in dsa_slave_vlan_rx_add_vid.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/port.c | 4 | ||||
| -rw-r--r-- | net/dsa/slave.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c index f75301456430..ef28df7ecbde 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -382,8 +382,8 @@ int dsa_port_vid_add(struct dsa_port *dp, u16 vid, u16 flags) trans.ph_prepare = true; err = dsa_port_vlan_add(dp, &vlan, &trans); - if (err == -EOPNOTSUPP) - return 0; + if (err) + return err; trans.ph_prepare = false; return dsa_port_vlan_add(dp, &vlan, &trans); diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 33f41178afcc..9d61d9dbf001 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1082,8 +1082,11 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto, return -EBUSY; } - /* This API only allows programming tagged, non-PVID VIDs */ - return dsa_port_vid_add(dp, vid, 0); + ret = dsa_port_vid_add(dp, vid, 0); + if (ret && ret != -EOPNOTSUPP) + return ret; + + return 0; } static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, |