]> git.baikalelectronics.ru Git - kernel.git/commit
net: dsa: Use prepare/commit phase in dsa_slave_vlan_rx_add_vid()
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 1 Mar 2019 18:37:25 +0000 (10:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Mar 2019 04:45:52 +0000 (20:45 -0800)
commit8f722045cc6d98a8f7222629f7d27b56a77aefe4
tree9f5fd31dafddf37ef48d165db35e01e823c0ed22
parentf2ec663bb7c59277de8222fc243a33a1dc0fa4ef
net: dsa: Use prepare/commit phase in dsa_slave_vlan_rx_add_vid()

We were skipping the prepare phase which causes some problems with at
least a couple of drivers:

- mv88e6xxx chooses to skip programming VID = 0 with -EOPNOTSUPP in
  the prepare phase, but we would still try to force this VID since we
  would only call the commit phase and so we would get the driver to
  return -EINVAL instead

- qca8k does not currently have a port_vlan_add() callback implemented,
  yet we would try to call that unconditionally leading to a NPD

Fix both issues by conforming to the current model doing a
prepare/commit phase, this makes us consistent throughout the code and
assumptions.

Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
Reported-by: Michal Vokáč <michal.vokac@ysoft.com>
Fixes: bd43777af101 ("net: dsa: Add ndo_vlan_rx_{add, kill}_vid implementation")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/slave.c