From: David S. Miller Date: Wed, 28 Aug 2019 03:46:26 +0000 (-0700) Subject: Merge branch 'Simplify-DSA-handling-of-VLAN-subinterface-offload' X-Git-Tag: v5.4-rc1~131^2~142 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=380702e371559ad943b8616b1bf7196b59820e80;p=linux.git Merge branch 'Simplify-DSA-handling-of-VLAN-subinterface-offload' Vladimir Oltean says: ==================== Simplify DSA handling of VLAN subinterface offload Depends on Vivien Didelot's patchset: https://patchwork.ozlabs.org/project/netdev/list/?series=127197&state=* This patchset removes a few strange-looking guards for -EOPNOTSUPP in dsa_slave_vlan_rx_add_vid and dsa_slave_vlan_rx_kill_vid, making that code path no longer possible. It also disables the code path for the sja1105 driver, which does support editing the VLAN table, but not hardware-accelerated VLAN sub-interfaces, therefore the check in the DSA core would be wrong. There was no better DSA callback to do this than .port_enable, i.e. at ndo_open time. ==================== Signed-off-by: David S. Miller --- 380702e371559ad943b8616b1bf7196b59820e80