Merge branch 'Simplify-DSA-handling-of-VLAN-subinterface-offload'
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Aug 2019 03:46:26 +0000 (20:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Aug 2019 03:46:26 +0000 (20:46 -0700)
commit380702e371559ad943b8616b1bf7196b59820e80
tree12d6d044df23a3c2e8361cf4ff94df97467ac567
parent1ddc5d9484191ea6f66dcb9bcf6c99e0bbc081dd
parente9bf96943b408e6c99dd13fb01cb907335787c61
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 <davem@davemloft.net>