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>

diff --git a/net/dsa/port.c b/net/dsa/port.c
index f75301456430bdf5af333c5e870a5ee5fce5761b..ef28df7ecbde3d7b87d38630e421a2f4392c4f46 100644 (file)
--- 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 33f41178afccf207abfeafd7e3fa05cf0e832129..9d61d9dbf001f2e76f8f12e90e141cb6c1739aef 100644 (file)
--- 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,