Skip to content

Commit cf6dacf

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: sysctl: update nf_ct settings for fullcone nat kernel: backport tso for asix driver kernel: add kmod-hwmon-sht3x support kernel: add missing symbol in generic config
2 parents c404642 + 58692d5 commit cf6dacf

File tree

6 files changed

+156
-1
lines changed

6 files changed

+156
-1
lines changed

‎package/kernel/linux/files/sysctl-nf-conntrack.conf

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ net.netfilter.nf_conntrack_max=65535
77
net.netfilter.nf_conntrack_tcp_timeout_established=7440
88
net.netfilter.nf_conntrack_udp_timeout=60
99
net.netfilter.nf_conntrack_udp_timeout_stream=180
10-
net.netfilter.nf_conntrack_helper=1
10+
net.netfilter.nf_conntrack_helper=1
11+
net.netfilter.nf_conntrack_buckets=16384
12+
net.netfilter.nf_conntrack_expect_max=512

‎package/kernel/linux/modules/hwmon.mk

+15
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,21 @@ endef
427427
$(eval $(call KernelPackage,hwmon-sht21))
428428

429429

430+
define KernelPackage/hwmon-sht3x
431+
TITLE:=Sensiron SHT3x and compat. monitoring support
432+
KCONFIG:=CONFIG_SENSORS_SHT3x
433+
FILES:=$(LINUX_DIR)/drivers/hwmon/sht3x.ko
434+
AUTOLOAD:=$(call AutoProbe,sht3x)
435+
$(call AddDepends/hwmon,+kmod-i2c-core +kmod-lib-crc8)
436+
endef
437+
438+
define KernelPackage/hwmon-sht3x/description
439+
Kernel module for Sensirion SHT3x temperature and humidity sensors chip
440+
endef
441+
442+
$(eval $(call KernelPackage,hwmon-sht3x))
443+
444+
430445
define KernelPackage/hwmon-tmp102
431446
TITLE:=Texas Instruments TMP102 monitoring support
432447
KCONFIG:=CONFIG_SENSORS_TMP102

‎target/linux/generic/backport-5.10/797-v5.17-net-usb-ax88179_178a-add-TSO-feature.patch

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
From 16b1c4e01c89ba07367461e0bc4cb84993c2d027 Mon Sep 17 00:00:00 2001
2+
From: Jacky Chou <[email protected]>
3+
Date: Mon, 15 Nov 2021 11:49:41 +0800
4+
Subject: [PATCH] net: usb: ax88179_178a: add TSO feature
5+
6+
On low-effciency embedded platforms, transmission performance is poor
7+
due to on Bulk-out with single packet.
8+
Adding TSO feature improves the transmission performance and reduces
9+
the number of interrupt caused by Bulk-out complete.
10+
11+
Reference to module, net: usb: aqc111.
12+
13+
Signed-off-by: Jacky Chou <[email protected]>
14+
Signed-off-by: David S. Miller <[email protected]>
15+
---
16+
drivers/net/usb/ax88179_178a.c | 17 +++++++++++------
17+
1 file changed, 11 insertions(+), 6 deletions(-)
18+
19+
--- a/drivers/net/usb/ax88179_178a.c
20+
+++ b/drivers/net/usb/ax88179_178a.c
21+
@@ -1377,11 +1377,12 @@ static int ax88179_bind(struct usbnet *d
22+
dev->mii.phy_id = 0x03;
23+
dev->mii.supports_gmii = 1;
24+
25+
- dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
26+
- NETIF_F_RXCSUM;
27+
+ dev->net->features |= NETIF_F_SG | NETIF_F_IP_CSUM |
28+
+ NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO;
29+
30+
- dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
31+
- NETIF_F_RXCSUM;
32+
+ dev->net->hw_features |= dev->net->features;
33+
+
34+
+ netif_set_gso_max_size(dev->net, 16384);
35+
36+
/* Enable checksum offload */
37+
*tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
38+
@@ -1587,17 +1588,19 @@ ax88179_tx_fixup(struct usbnet *dev, str
39+
{
40+
u32 tx_hdr1, tx_hdr2;
41+
int frame_size = dev->maxpacket;
42+
- int mss = skb_shinfo(skb)->gso_size;
43+
int headroom;
44+
void *ptr;
45+
46+
tx_hdr1 = skb->len;
47+
- tx_hdr2 = mss;
48+
+ tx_hdr2 = skb_shinfo(skb)->gso_size; /* Set TSO mss */
49+
if (((skb->len + 8) % frame_size) == 0)
50+
tx_hdr2 |= 0x80008000; /* Enable padding */
51+
52+
headroom = skb_headroom(skb) - 8;
53+
54+
+ if ((dev->net->features & NETIF_F_SG) && skb_linearize(skb))
55+
+ return NULL;
56+
+
57+
if ((skb_header_cloned(skb) || headroom < 0) &&
58+
pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) {
59+
dev_kfree_skb_any(skb);
60+
@@ -1608,6 +1611,8 @@ ax88179_tx_fixup(struct usbnet *dev, str
61+
put_unaligned_le32(tx_hdr1, ptr);
62+
put_unaligned_le32(tx_hdr2, ptr + 4);
63+
64+
+ usbnet_set_skb_tx_stats(skb, (skb_shinfo(skb)->gso_segs ?: 1), 0);
65+
+
66+
return skb;
67+
}
68+

‎target/linux/generic/backport-5.15/797-v5.17-net-usb-ax88179_178a-add-TSO-feature.patch

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
From 16b1c4e01c89ba07367461e0bc4cb84993c2d027 Mon Sep 17 00:00:00 2001
2+
From: Jacky Chou <[email protected]>
3+
Date: Mon, 15 Nov 2021 11:49:41 +0800
4+
Subject: [PATCH] net: usb: ax88179_178a: add TSO feature
5+
6+
On low-effciency embedded platforms, transmission performance is poor
7+
due to on Bulk-out with single packet.
8+
Adding TSO feature improves the transmission performance and reduces
9+
the number of interrupt caused by Bulk-out complete.
10+
11+
Reference to module, net: usb: aqc111.
12+
13+
Signed-off-by: Jacky Chou <[email protected]>
14+
Signed-off-by: David S. Miller <[email protected]>
15+
---
16+
drivers/net/usb/ax88179_178a.c | 17 +++++++++++------
17+
1 file changed, 11 insertions(+), 6 deletions(-)
18+
19+
--- a/drivers/net/usb/ax88179_178a.c
20+
+++ b/drivers/net/usb/ax88179_178a.c
21+
@@ -1377,11 +1377,12 @@ static int ax88179_bind(struct usbnet *d
22+
dev->mii.phy_id = 0x03;
23+
dev->mii.supports_gmii = 1;
24+
25+
- dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
26+
- NETIF_F_RXCSUM;
27+
+ dev->net->features |= NETIF_F_SG | NETIF_F_IP_CSUM |
28+
+ NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO;
29+
30+
- dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
31+
- NETIF_F_RXCSUM;
32+
+ dev->net->hw_features |= dev->net->features;
33+
+
34+
+ netif_set_gso_max_size(dev->net, 16384);
35+
36+
/* Enable checksum offload */
37+
*tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
38+
@@ -1587,17 +1588,19 @@ ax88179_tx_fixup(struct usbnet *dev, str
39+
{
40+
u32 tx_hdr1, tx_hdr2;
41+
int frame_size = dev->maxpacket;
42+
- int mss = skb_shinfo(skb)->gso_size;
43+
int headroom;
44+
void *ptr;
45+
46+
tx_hdr1 = skb->len;
47+
- tx_hdr2 = mss;
48+
+ tx_hdr2 = skb_shinfo(skb)->gso_size; /* Set TSO mss */
49+
if (((skb->len + 8) % frame_size) == 0)
50+
tx_hdr2 |= 0x80008000; /* Enable padding */
51+
52+
headroom = skb_headroom(skb) - 8;
53+
54+
+ if ((dev->net->features & NETIF_F_SG) && skb_linearize(skb))
55+
+ return NULL;
56+
+
57+
if ((skb_header_cloned(skb) || headroom < 0) &&
58+
pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) {
59+
dev_kfree_skb_any(skb);
60+
@@ -1608,6 +1611,8 @@ ax88179_tx_fixup(struct usbnet *dev, str
61+
put_unaligned_le32(tx_hdr1, ptr);
62+
put_unaligned_le32(tx_hdr2, ptr + 4);
63+
64+
+ usbnet_set_skb_tx_stats(skb, (skb_shinfo(skb)->gso_segs ?: 1), 0);
65+
+
66+
return skb;
67+
}
68+

‎target/linux/generic/config-5.10

+1
Original file line numberDiff line numberDiff line change
@@ -2922,6 +2922,7 @@ CONFIG_LBDAF=y
29222922
CONFIG_LDISC_AUTOLOAD=y
29232923
# CONFIG_LDM_PARTITION is not set
29242924
CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y
2925+
# CONFIG_LD_HEAD_STUB_CATCH is not set
29252926
# CONFIG_LEDS_AN30259A is not set
29262927
# CONFIG_LEDS_APU is not set
29272928
# CONFIG_LEDS_AW2013 is not set

‎target/linux/generic/config-5.15

+1
Original file line numberDiff line numberDiff line change
@@ -3063,6 +3063,7 @@ CONFIG_LBDAF=y
30633063
CONFIG_LDISC_AUTOLOAD=y
30643064
# CONFIG_LDM_PARTITION is not set
30653065
CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y
3066+
# CONFIG_LD_HEAD_STUB_CATCH is not set
30663067
# CONFIG_LEDS_AN30259A is not set
30673068
# CONFIG_LEDS_APU is not set
30683069
# CONFIG_LEDS_AW2013 is not set

0 commit comments

Comments
 (0)