releases/4.14.130/net-dsa-mv88e6xxx-avoid-error-message-on-remove-from.patch

   1 From f7d48c53691f397e19d9d844e92697464bc4a792 Mon Sep 17 00:00:00 2001
   2 From: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
   3 Date: Fri, 31 May 2019 10:35:14 +0300
   4 Subject: net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0
   5
   6 [ Upstream commit 62394708f3e01c9f2be6be74eb6305bae1ed924f ]
   7
   8 When non-bridged, non-vlan'ed mv88e6xxx port is moving down, error
   9 message is logged:
  10
  11 failed to kill vid 0081/0 for device eth_cu_1000_4
  12
  13 This is caused by call from __vlan_vid_del() with vin set to zero, over
  14 call chain this results into _mv88e6xxx_port_vlan_del() called with
  15 vid=0, and mv88e6xxx_vtu_get() called from there returns -EINVAL.
  16
  17 On symmetric path moving port up, call goes through
  18 mv88e6xxx_port_vlan_prepare() that calls mv88e6xxx_port_check_hw_vlan()
  19 that returns -EOPNOTSUPP for zero vid.
  20
  21 This patch changes mv88e6xxx_vtu_get() to also return -EOPNOTSUPP for
  22 zero vid, then this error code is explicitly cleared in
  23 dsa_slave_vlan_rx_kill_vid() and error message is no longer logged.
  24
  25 Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
  26 Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
  27 Signed-off-by: David S. Miller <davem@davemloft.net>
  28 Signed-off-by: Sasha Levin <sashal@kernel.org>
  29 ---
  30  drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
  31  1 file changed, 1 insertion(+), 1 deletion(-)
  32
  33 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
  34 index 172b13012e10..086603de1859 100644
  35 --- a/drivers/net/dsa/mv88e6xxx/chip.c
  36 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
  37 @@ -1075,7 +1075,7 @@ static int mv88e6xxx_vtu_get(struct mv88e6xxx_chip *chip, u16 vid,
  38         int err;
  39
  40         if (!vid)
  41 -               return -EINVAL;
  42 +               return -EOPNOTSUPP;
  43
  44         entry->vid = vid - 1;
  45         entry->valid = false;
  46 --
  47 2.20.1
  48