Commit 2fd18650 authored Jan 06, 2021 by Vladimir Oltean Committed by Jakub Kicinski Jan 07, 2021

net: dsa: be louder when a non-legacy FDB operation fails



The dev_close() call was added in commit c9eb3e0f ("net: dsa: Add
support for learning FDB through notification") "to indicate inconsistent
situation" when we could not delete an FDB entry from the port.

bridge fdb del d8:58:d7:00:ca:6d dev swp0 self master

It is a bit drastic and at the same time not helpful if the above fails
to only print with netdev_dbg log level, but on the other hand to bring
the interface down.

So increase the verbosity of the error message, and drop dev_close().

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 90dc8fd3

net/dsa/slave.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -2072,7 +2072,9 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work)

		err = dsa_port_fdb_add(dp, fdb_info->addr, fdb_info->vid);
		if (err) {
		netdev_dbg(dev, "fdb add failed err=%d\n", err);
		netdev_err(dev,
		"failed to add %pM vid %d to fdb: %d\n",
		fdb_info->addr, fdb_info->vid, err);
		break;
		}
		fdb_info->offloaded = true;
		@@ -2087,9 +2089,11 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work)

		err = dsa_port_fdb_del(dp, fdb_info->addr, fdb_info->vid);
		if (err) {
		netdev_dbg(dev, "fdb del failed err=%d\n", err);
		dev_close(dev);
		netdev_err(dev,
		"failed to delete %pM vid %d from fdb: %d\n",
		fdb_info->addr, fdb_info->vid, err);
		}

		break;
		}
		rtnl_unlock();