Skip to content

Commit 515be49

Browse files
committed
kernel: bump to 4.9.189,4.14.138,4.19.66
1 parent f87bb8f commit 515be49

File tree

40 files changed

+104
-104
lines changed

40 files changed

+104
-104
lines changed

include/kernel-version.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
66
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
77
endif
88

9-
LINUX_VERSION-4.9 = .187
10-
LINUX_VERSION-4.14 = .136
11-
LINUX_VERSION-4.19 = .64
9+
LINUX_VERSION-4.9 = .189
10+
LINUX_VERSION-4.14 = .138
11+
LINUX_VERSION-4.19 = .66
1212

13-
LINUX_KERNEL_HASH-4.9.187 = 014bcd042cd25e073539c17bd34c616a936b19787a9c6a4c35d36a4f28afd1c7
14-
LINUX_KERNEL_HASH-4.14.136 = 268dff959216e59437a8f9db7c2cea3a1ada8a4c72232dc5b7f83ecca12bdf70
15-
LINUX_KERNEL_HASH-4.19.64 = 7a6f8be33df3bef763495e8dde7a2fd7cdad71d7b952cd740b68eaac1bab5abd
13+
LINUX_KERNEL_HASH-4.9.189 = 93d945661246f726b694455c80c140717d2beff5a718445a51183439bbe5d0b3
14+
LINUX_KERNEL_HASH-4.14.138 = f250bd1de3a83c1f015f8e6e9bfa9f20eaef3dc24a6cd60116e49979314b837b
15+
LINUX_KERNEL_HASH-4.19.66 = c981abe15c4b9496cdadb04e4f4afb88b3a78f31ced8d07684ee9c58b3fadb64
1616

1717
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
1818
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1919

2020
--- a/drivers/spi/spi-bcm2835.c
2121
+++ b/drivers/spi/spi-bcm2835.c
22-
@@ -686,6 +686,8 @@ static int bcm2835_spi_setup(struct spi_
22+
@@ -687,6 +687,8 @@ static int bcm2835_spi_setup(struct spi_
2323
{
2424
int err;
2525
struct gpio_chip *chip;
@@ -28,7 +28,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2828
/*
2929
* sanity checking the native-chipselects
3030
*/
31-
@@ -702,15 +704,42 @@ static int bcm2835_spi_setup(struct spi_
31+
@@ -703,15 +705,42 @@ static int bcm2835_spi_setup(struct spi_
3232
"setup: only two native chip-selects are supported\n");
3333
return -EINVAL;
3434
}

target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1616

1717
--- a/drivers/spi/spi-bcm2835.c
1818
+++ b/drivers/spi/spi-bcm2835.c
19-
@@ -705,6 +705,7 @@ static int bcm2835_spi_setup(struct spi_
19+
@@ -706,6 +706,7 @@ static int bcm2835_spi_setup(struct spi_
2020
return -EINVAL;
2121
}
2222

2323
+#if 0
2424
/* now translate native cs to GPIO */
2525
/* first look for chip select pins in the devices pin groups */
2626
for (pingroup_index = 0;
27-
@@ -754,6 +755,7 @@ static int bcm2835_spi_setup(struct spi_
27+
@@ -755,6 +756,7 @@ static int bcm2835_spi_setup(struct spi_
2828
spi->chip_select, spi->cs_gpio, err);
2929
return err;
3030
}

target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH 013/725] spi-bcm2835: Remove unused code
99

1010
--- a/drivers/spi/spi-bcm2835.c
1111
+++ b/drivers/spi/spi-bcm2835.c
12-
@@ -677,17 +677,8 @@ static void bcm2835_spi_set_cs(struct sp
12+
@@ -678,17 +678,8 @@ static void bcm2835_spi_set_cs(struct sp
1313
bcm2835_wr(bs, BCM2835_SPI_CS, cs);
1414
}
1515

@@ -27,7 +27,7 @@ Subject: [PATCH 013/725] spi-bcm2835: Remove unused code
2727
/*
2828
* sanity checking the native-chipselects
2929
*/
30-
@@ -705,58 +696,6 @@ static int bcm2835_spi_setup(struct spi_
30+
@@ -706,58 +697,6 @@ static int bcm2835_spi_setup(struct spi_
3131
return -EINVAL;
3232
}
3333

target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1717

1818
--- a/kernel/cgroup/cgroup.c
1919
+++ b/kernel/cgroup/cgroup.c
20-
@@ -5296,6 +5296,8 @@ int __init cgroup_init_early(void)
20+
@@ -5334,6 +5334,8 @@ int __init cgroup_init_early(void)
2121
}
2222

2323
static u16 cgroup_disable_mask __initdata;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2626

2727
/**
2828
* cgroup_init - cgroup initialization
29-
@@ -5336,6 +5338,12 @@ int __init cgroup_init(void)
29+
@@ -5374,6 +5376,12 @@ int __init cgroup_init(void)
3030

3131
mutex_unlock(&cgroup_mutex);
3232

@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3939
for_each_subsys(ss, ssid) {
4040
if (ss->early_init) {
4141
struct cgroup_subsys_state *css =
42-
@@ -5719,6 +5727,28 @@ static int __init cgroup_disable(char *s
42+
@@ -5765,6 +5773,28 @@ static int __init cgroup_disable(char *s
4343
}
4444
__setup("cgroup_disable=", cgroup_disable);
4545

target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2626
/* Device and char device-related information */
2727
static DEFINE_IDA(gpio_ida);
2828
static dev_t gpio_devt;
29-
@@ -2624,7 +2626,7 @@ int gpiod_direction_output(struct gpio_d
29+
@@ -2626,7 +2628,7 @@ int gpiod_direction_output(struct gpio_d
3030
value = !!value;
3131

3232
/* GPIOs used for IRQs shall not be set as output */
@@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3535
gpiod_err(desc,
3636
"%s: tried to set a GPIO tied to an IRQ as output\n",
3737
__func__);
38-
@@ -3312,7 +3314,7 @@ int gpiochip_lock_as_irq(struct gpio_chi
38+
@@ -3314,7 +3316,7 @@ int gpiochip_lock_as_irq(struct gpio_chi
3939
}
4040
}
4141

target/linux/brcm2708/patches-4.19/950-0430-Revert-cgroup-Disable-cgroup-memory-by-default.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
1010

1111
--- a/kernel/cgroup/cgroup.c
1212
+++ b/kernel/cgroup/cgroup.c
13-
@@ -5296,8 +5296,6 @@ int __init cgroup_init_early(void)
13+
@@ -5334,8 +5334,6 @@ int __init cgroup_init_early(void)
1414
}
1515

1616
static u16 cgroup_disable_mask __initdata;
@@ -19,7 +19,7 @@ This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
1919

2020
/**
2121
* cgroup_init - cgroup initialization
22-
@@ -5338,12 +5336,6 @@ int __init cgroup_init(void)
22+
@@ -5376,12 +5374,6 @@ int __init cgroup_init(void)
2323

2424
mutex_unlock(&cgroup_mutex);
2525

@@ -32,7 +32,7 @@ This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
3232
for_each_subsys(ss, ssid) {
3333
if (ss->early_init) {
3434
struct cgroup_subsys_state *css =
35-
@@ -5727,28 +5719,6 @@ static int __init cgroup_disable(char *s
35+
@@ -5773,28 +5765,6 @@ static int __init cgroup_disable(char *s
3636
}
3737
__setup("cgroup_disable=", cgroup_disable);
3838

target/linux/brcm2708/patches-4.19/950-0553-spi-bcm2835-enable-shared-interrupt-support.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
2323
/* Read as many bytes as possible from FIFO */
2424
bcm2835_rd_fifo(bs);
2525
/* Write as many bytes as possible to FIFO */
26-
@@ -755,7 +759,8 @@ static int bcm2835_spi_probe(struct plat
26+
@@ -756,7 +760,8 @@ static int bcm2835_spi_probe(struct plat
2727
bcm2835_wr(bs, BCM2835_SPI_CS,
2828
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
2929

target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
8989

9090
--- a/drivers/gpio/gpiolib.c
9191
+++ b/drivers/gpio/gpiolib.c
92-
@@ -1938,7 +1938,8 @@ int gpiochip_add_pingroup_range(struct g
92+
@@ -1940,7 +1940,8 @@ int gpiochip_add_pingroup_range(struct g
9393

9494
list_add_tail(&pin_range->node, &gdev->pin_ranges);
9595

@@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
9999
}
100100
EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);
101101

102-
@@ -1990,7 +1991,7 @@ int gpiochip_add_pin_range(struct gpio_c
102+
@@ -1992,7 +1993,7 @@ int gpiochip_add_pin_range(struct gpio_c
103103

104104
list_add_tail(&pin_range->node, &gdev->pin_ranges);
105105

target/linux/generic/backport-4.14/011-kbuild-export-SUBARCH.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
1010

1111
--- a/Makefile
1212
+++ b/Makefile
13-
@@ -428,8 +428,8 @@ KBUILD_CFLAGS_MODULE := -DMODULE
14-
KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
13+
@@ -429,8 +429,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s
1514
GCC_PLUGINS_CFLAGS :=
15+
CLANG_FLAGS :=
1616

1717
-export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
1818
-export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES

target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
6565
* Before updating sk_refcnt, we must commit prior changes to memory
6666
--- a/net/ipv4/tcp_output.c
6767
+++ b/net/ipv4/tcp_output.c
68-
@@ -1687,7 +1687,7 @@ u32 tcp_tso_autosize(const struct sock *
68+
@@ -1696,7 +1696,7 @@ u32 tcp_tso_autosize(const struct sock *
6969
{
7070
u32 bytes, segs;
7171

@@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
7474
sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
7575

7676
/* Goal is to send at least one packet per ms,
77-
@@ -2204,7 +2204,7 @@ static bool tcp_small_queue_check(struct
77+
@@ -2213,7 +2213,7 @@ static bool tcp_small_queue_check(struct
7878
{
7979
unsigned int limit;
8080

target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
1010

1111
--- a/Makefile
1212
+++ b/Makefile
13-
@@ -431,8 +431,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s
14-
KBUILD_LDFLAGS :=
13+
@@ -432,8 +432,8 @@ KBUILD_LDFLAGS :=
1514
GCC_PLUGINS_CFLAGS :=
15+
CLANG_FLAGS :=
1616

1717
-export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
1818
-export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS

target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
1010

1111
--- a/Makefile
1212
+++ b/Makefile
13-
@@ -406,8 +406,8 @@ KERNELRELEASE = $(shell cat include/conf
13+
@@ -407,8 +407,8 @@ KERNELRELEASE = $(shell cat include/conf
1414
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
1515

1616
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
117117
+
118118
--- a/include/linux/compiler.h
119119
+++ b/include/linux/compiler.h
120-
@@ -589,4 +589,23 @@ unsigned long read_word_at_a_time(const
120+
@@ -605,4 +605,23 @@ unsigned long read_word_at_a_time(const
121121
# define __kprobes
122122
# define nokprobe_inline inline
123123
#endif

target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch

+11-11
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
303303
+ if (!br_port_group_equal(p, port, src))
304304
continue;
305305

306-
rcu_assign_pointer(*pp, p->next);
307-
@@ -1517,7 +1555,7 @@ br_multicast_leave_group(struct net_brid
306+
if (p->flags & MDB_PG_FLAGS_PERMANENT)
307+
@@ -1520,7 +1558,7 @@ br_multicast_leave_group(struct net_brid
308308
for (p = mlock_dereference(mp->ports, br);
309309
p != NULL;
310310
p = mlock_dereference(p->next, br)) {
@@ -313,7 +313,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
313313
continue;
314314

315315
if (!hlist_unhashed(&p->mglist) &&
316-
@@ -1568,7 +1606,8 @@ out:
316+
@@ -1571,7 +1609,8 @@ out:
317317
static void br_ip4_multicast_leave_group(struct net_bridge *br,
318318
struct net_bridge_port *port,
319319
__be32 group,
@@ -323,7 +323,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
323323
{
324324
struct br_ip br_group;
325325
struct bridge_mcast_own_query *own_query;
326-
@@ -1583,14 +1622,15 @@ static void br_ip4_multicast_leave_group
326+
@@ -1586,14 +1625,15 @@ static void br_ip4_multicast_leave_group
327327
br_group.vid = vid;
328328

329329
br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
@@ -341,7 +341,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
341341
{
342342
struct br_ip br_group;
343343
struct bridge_mcast_own_query *own_query;
344-
@@ -1605,7 +1645,7 @@ static void br_ip6_multicast_leave_group
344+
@@ -1608,7 +1648,7 @@ static void br_ip6_multicast_leave_group
345345
br_group.vid = vid;
346346

347347
br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
@@ -350,15 +350,15 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
350350
}
351351
#endif
352352

353-
@@ -1648,6 +1688,7 @@ static int br_multicast_ipv4_rcv(struct
353+
@@ -1651,6 +1691,7 @@ static int br_multicast_ipv4_rcv(struct
354354
u16 vid)
355355
{
356356
struct sk_buff *skb_trimmed = NULL;
357357
+ const unsigned char *src;
358358
struct igmphdr *ih;
359359
int err;
360360

361-
@@ -1663,13 +1704,14 @@ static int br_multicast_ipv4_rcv(struct
361+
@@ -1666,13 +1707,14 @@ static int br_multicast_ipv4_rcv(struct
362362
}
363363

364364
ih = igmp_hdr(skb);
@@ -374,7 +374,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
374374
break;
375375
case IGMPV3_HOST_MEMBERSHIP_REPORT:
376376
err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid);
377-
@@ -1678,7 +1720,7 @@ static int br_multicast_ipv4_rcv(struct
377+
@@ -1681,7 +1723,7 @@ static int br_multicast_ipv4_rcv(struct
378378
err = br_ip4_multicast_query(br, port, skb_trimmed, vid);
379379
break;
380380
case IGMP_HOST_LEAVE_MESSAGE:
@@ -383,15 +383,15 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
383383
break;
384384
}
385385

386-
@@ -1698,6 +1740,7 @@ static int br_multicast_ipv6_rcv(struct
386+
@@ -1701,6 +1743,7 @@ static int br_multicast_ipv6_rcv(struct
387387
u16 vid)
388388
{
389389
struct sk_buff *skb_trimmed = NULL;
390390
+ const unsigned char *src;
391391
struct mld_msg *mld;
392392
int err;
393393

394-
@@ -1717,8 +1760,10 @@ static int br_multicast_ipv6_rcv(struct
394+
@@ -1720,8 +1763,10 @@ static int br_multicast_ipv6_rcv(struct
395395

396396
switch (mld->mld_type) {
397397
case ICMPV6_MGM_REPORT:
@@ -403,7 +403,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
403403
break;
404404
case ICMPV6_MLD2_REPORT:
405405
err = br_ip6_multicast_mld2_report(br, port, skb_trimmed, vid);
406-
@@ -1727,7 +1772,8 @@ static int br_multicast_ipv6_rcv(struct
406+
@@ -1730,7 +1775,8 @@ static int br_multicast_ipv6_rcv(struct
407407
err = br_ip6_multicast_query(br, port, skb_trimmed, vid);
408408
break;
409409
case ICMPV6_MGM_REDUCTION:

target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
6060
nval = cmpxchg(&tp->tsq_flags, oval, nval);
6161
if (nval != oval)
6262
continue;
63-
@@ -2226,6 +2226,8 @@ static bool tcp_write_xmit(struct sock *
63+
@@ -2235,6 +2235,8 @@ static bool tcp_write_xmit(struct sock *
6464
unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
6565
break;
6666

target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
1919

2020
--- a/net/ipv4/tcp_output.c
2121
+++ b/net/ipv4/tcp_output.c
22-
@@ -2131,6 +2131,15 @@ static bool tcp_small_queue_check(struct
22+
@@ -2140,6 +2140,15 @@ static bool tcp_small_queue_check(struct
2323
limit <<= factor;
2424

2525
if (atomic_read(&sk->sk_wmem_alloc) > limit) {

target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
1717

1818
--- a/net/ipv4/tcp_output.c
1919
+++ b/net/ipv4/tcp_output.c
20-
@@ -1964,26 +1964,26 @@ static bool tcp_can_coalesce_send_queue_
20+
@@ -1973,26 +1973,26 @@ static bool tcp_can_coalesce_send_queue_
2121
*/
2222
static int tcp_mtu_probe(struct sock *sk)
2323
{

target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
114114
if (nval != oval)
115115
continue;
116116

117-
@@ -2140,7 +2140,7 @@ static bool tcp_small_queue_check(struct
117+
@@ -2149,7 +2149,7 @@ static bool tcp_small_queue_check(struct
118118
skb->prev == sk->sk_write_queue.next)
119119
return false;
120120

@@ -123,7 +123,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
123123
/* It is possible TX completion already happened
124124
* before we set TSQ_THROTTLED, so we must
125125
* test again the condition.
126-
@@ -2238,8 +2238,8 @@ static bool tcp_write_xmit(struct sock *
126+
@@ -2247,8 +2247,8 @@ static bool tcp_write_xmit(struct sock *
127127
unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
128128
break;
129129

@@ -134,7 +134,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
134134
if (tcp_small_queue_check(sk, skb, 0))
135135
break;
136136

137-
@@ -3550,8 +3550,6 @@ void __tcp_send_ack(struct sock *sk, u32
137+
@@ -3559,8 +3559,6 @@ void __tcp_send_ack(struct sock *sk, u32
138138
/* We do not want pure acks influencing TCP Small Queues or fq/pacing
139139
* too much.
140140
* SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784

target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
6565
* Before updating sk_refcnt, we must commit prior changes to memory
6666
--- a/net/ipv4/tcp_output.c
6767
+++ b/net/ipv4/tcp_output.c
68-
@@ -1597,7 +1597,7 @@ u32 tcp_tso_autosize(const struct sock *
68+
@@ -1606,7 +1606,7 @@ u32 tcp_tso_autosize(const struct sock *
6969
{
7070
u32 bytes, segs;
7171

@@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
7474
sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
7575

7676
/* Goal is to send at least one packet per ms,
77-
@@ -2127,7 +2127,7 @@ static bool tcp_small_queue_check(struct
77+
@@ -2136,7 +2136,7 @@ static bool tcp_small_queue_check(struct
7878
{
7979
unsigned int limit;
8080

0 commit comments

Comments
 (0)