mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
50f456b46c
Manually rebased: generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch Removed upstreamed: layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 2fd186501b1cff155cc4a755c210793cfc0dffb5 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Wed, 6 Jan 2021 11:51:31 +0200
|
|
Subject: [PATCH] net: dsa: be louder when a non-legacy FDB operation fails
|
|
|
|
The dev_close() call was added in commit c9eb3e0f8701 ("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>
|
|
---
|
|
net/dsa/slave.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
--- a/net/dsa/slave.c
|
|
+++ b/net/dsa/slave.c
|
|
@@ -1593,7 +1593,9 @@ static void dsa_slave_switchdev_event_wo
|
|
|
|
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;
|
|
@@ -1608,9 +1610,11 @@ static void dsa_slave_switchdev_event_wo
|
|
|
|
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();
|