mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
da98603597
This PR is a blend of several kernel bumps authored by ldir taken from his
staging tree w/ some further adjustments made by me and update_kernel.sh
Summary:
Deleted upstreamed patches:
generic:
742-v5.5-net-sfp-add-support-for-module-quirks.patch
743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch
bcm63xx:
022-v5.8-mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch
024-v5.8-mtd-rawnand-brcmnand-fix-CS0-layout.patch
mediatek:
0402-net-ethernet-mtk_eth_soc-Always-call-mtk_gmac0_rgmii.patch
Deleted patches applied differently upstream:
generic:
641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
Manually merged patches:
generic:
395-v5.8-net-sch_cake-Take-advantage-of-skb-hash-where-appropriate.patch
bcm27xx:
950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
layerscape:
701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
Build system: x86_64
Build-tested: ath79/generic, bcm27xx/bcm2708, bcm27xx/bcm2711,
imx6, mvebu/cortexa9, sunxi/a53
Run-tested: Netgear R7800 (ipq806x)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-By: Lucian Cristian <Lucian.cristian@gmail.com> [mvebu]
Tested-By: Curtis Deptuck <curtdept@me.com> [x86/64]
[do not remove 395-v5.8-net-sch_cake-Take-advantage-... patch,
adjust and refresh patches, adjust commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-By: John Audia <graysky@archlinux.us> [ipq806x]
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
From b34a93b528f08401835259c477ade49730fc1baf Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Wed, 13 Jun 2018 15:21:10 +0100
|
|
Subject: [PATCH] net: lan78xx: Disable TCP Segmentation Offload (TSO)
|
|
|
|
TSO seems to be having issues when packets are dropped and the
|
|
remote end uses Selective Acknowledge (SACK) to denote that
|
|
data is missing. The missing data is never resent, so the
|
|
connection eventually stalls.
|
|
|
|
There is a module parameter of enable_tso added to allow
|
|
further debugging without forcing a rebuild of the kernel.
|
|
|
|
https://github.com/raspberrypi/linux/issues/2449
|
|
https://github.com/raspberrypi/linux/issues/2482
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/net/usb/lan78xx.c | 19 +++++++++++++++++--
|
|
1 file changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -425,6 +425,15 @@ static int msg_level = -1;
|
|
module_param(msg_level, int, 0);
|
|
MODULE_PARM_DESC(msg_level, "Override default message level");
|
|
|
|
+/* TSO seems to be having some issue with Selective Acknowledge (SACK) that
|
|
+ * results in lost data never being retransmitted.
|
|
+ * Disable it by default now, but adds a module parameter to enable it for
|
|
+ * debug purposes (the full cause is not currently understood).
|
|
+ */
|
|
+static bool enable_tso;
|
|
+module_param(enable_tso, bool, 0644);
|
|
+MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
|
|
+
|
|
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
|
|
{
|
|
u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
|
|
@@ -2925,8 +2934,14 @@ static int lan78xx_bind(struct lan78xx_n
|
|
if (DEFAULT_RX_CSUM_ENABLE)
|
|
dev->net->features |= NETIF_F_RXCSUM;
|
|
|
|
- if (DEFAULT_TSO_CSUM_ENABLE)
|
|
- dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG;
|
|
+ if (DEFAULT_TSO_CSUM_ENABLE) {
|
|
+ dev->net->features |= NETIF_F_SG;
|
|
+ /* Use module parameter to control TCP segmentation offload as
|
|
+ * it appears to cause issues.
|
|
+ */
|
|
+ if (enable_tso)
|
|
+ dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6;
|
|
+ }
|
|
|
|
if (DEFAULT_VLAN_RX_OFFLOAD)
|
|
dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX;
|