mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
0d2873df15
Manually rebased* generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch Added new backport* generic/backport-5.4/050-gro-fix-napi_gro_frags-Fast-GRO-breakage-due-to-IP-a.patch All others updated automatically. The new backport was included based on this[1] upstream commit that will be mainlined soon. This change is needed because Eric Dumazet's check for NET_IP_ALIGN (landed in 5.4.114) causes huge slowdowns on drivers which use napi_gro_frags(). Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional *Credit to Alexander Lobakin 1. https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=7ad18ff6449cbd6beb26b53128ddf56d2685aa93 Signed-off-by: John Audia <graysky@archlinux.us>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 4e4637b10374ede3cd33d7e1b389e6cea6343ea3 Mon Sep 17 00:00:00 2001
|
|
From: Colin Ian King <colin.king@canonical.com>
|
|
Date: Tue, 12 Nov 2019 13:05:23 +0000
|
|
Subject: [PATCH] net: dsa: mv88e6xxx: fix broken if statement because of a
|
|
stray semicolon
|
|
|
|
There is a stray semicolon in an if statement that will cause a dev_err
|
|
message to be printed unconditionally. Fix this by removing the stray
|
|
semicolon.
|
|
|
|
Addresses-Coverity: ("Stay semicolon")
|
|
Fixes: f0942e00a1ab ("net: dsa: mv88e6xxx: Add support for port mirroring")
|
|
Signed-off-by: Colin Ian King <colin.king@canonical.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
|
@@ -4989,7 +4989,7 @@ static void mv88e6xxx_port_mirror_del(st
|
|
if (chip->info->ops->set_egress_port(chip,
|
|
direction,
|
|
dsa_upstream_port(ds,
|
|
- port)));
|
|
+ port)))
|
|
dev_err(ds->dev, "failed to set egress port\n");
|
|
}
|
|
|