net: dsa: Advertise the VLAN offload netdev ability only if switch supports it

When adding a VLAN sub-interface on a DSA slave port, the 8021q core
checks NETIF_F_HW_VLAN_CTAG_FILTER and, if the netdev is capable of
filtering, calls .ndo_vlan_rx_add_vid or .ndo_vlan_rx_kill_vid to
configure the VLAN offloading.

DSA sets this up counter-intuitively: it always advertises this netdev
feature, but the underlying driver may not actually support VLAN table
manipulation. In that case, the DSA core is forced to ignore the error,
because not being able to offload the VLAN is still fine - and should
result in the creation of a non-accelerated VLAN sub-interface.

Change this so that the netdev feature is only advertised for switch
drivers that support VLAN manipulation, instead of checking for
-EOPNOTSUPP at runtime.

Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index d842251250996f55968725d9a3390e0b63b600c1..9a88035517a69d7be449ade96e265d9177f0ae8c 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1131,11 +1131,11 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
        }
 
        ret = dsa_port_vid_add(dp, vid, 0);
-       if (ret && ret != -EOPNOTSUPP)
+       if (ret)
                return ret;
 
        ret = dsa_port_vid_add(dp->cpu_dp, vid, 0);
-       if (ret && ret != -EOPNOTSUPP)
+       if (ret)
                return ret;
 
        return 0;
@@ -1164,14 +1164,10 @@ static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
                        return -EBUSY;
        }
 
-       ret = dsa_port_vid_del(dp, vid);
-       if (ret == -EOPNOTSUPP)
-               ret = 0;
-
        /* Do not deprogram the CPU port as it may be shared with other user
         * ports which can be members of this VLAN as well.
         */
-       return ret;
+       return dsa_port_vid_del(dp, vid);
 }
 
 static const struct ethtool_ops dsa_slave_ethtool_ops = {
@@ -1418,8 +1414,9 @@ int dsa_slave_create(struct dsa_port *port)
        if (slave_dev == NULL)
                return -ENOMEM;
 
-       slave_dev->features = master->vlan_features | NETIF_F_HW_TC |
-                               NETIF_F_HW_VLAN_CTAG_FILTER;
+       slave_dev->features = master->vlan_features | NETIF_F_HW_TC;
+       if (ds->ops->port_vlan_add && ds->ops->port_vlan_del)
+               slave_dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
        slave_dev->hw_features |= NETIF_F_HW_TC;
        slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;
        if (!IS_ERR_OR_NULL(port->mac))