diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-23 20:48:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-23 20:48:27 +0200 |
| commit | 7611cbb900b4b9a6fe5eca12fb12645c0576a015 (patch) | |
| tree | 9c8c8e1fa991e4728d25a19b86c974c8e49ee1b7 /drivers/net/dsa | |
| parent | Merge branch 'l2tp-replace-custom-logging-code-with-tracepoints' (diff) | |
| parent | Merge tag 'powerpc-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| download | linux-7611cbb900b4b9a6fe5eca12fb12645c0576a015.tar.xz linux-7611cbb900b4b9a6fe5eca12fb12645c0576a015.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 2 | ||||
| -rw-r--r-- | drivers/net/dsa/ocelot/Kconfig | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 6500179c2ca2..0837ae0e0c5e 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1554,6 +1554,8 @@ static int b53_arl_op(struct b53_device *dev, int op, int port, return ret; switch (ret) { + case -ETIMEDOUT: + return ret; case -ENOSPC: dev_dbg(dev->dev, "{%pM,%.4d} no space left in ARL\n", addr, vid); diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig index f121619d81fe..2d23ccef7d0e 100644 --- a/drivers/net/dsa/ocelot/Kconfig +++ b/drivers/net/dsa/ocelot/Kconfig @@ -9,7 +9,7 @@ config NET_DSA_MSCC_FELIX select NET_DSA_TAG_OCELOT select FSL_ENETC_MDIO help - This driver supports network switches from the the Vitesse / + This driver supports network switches from the Vitesse / Microsemi / Microchip Ocelot family of switching cores that are connected to their host CPU via Ethernet. The following switches are supported: |