From d13c6d078e97f97ea06b0c5a66de5d4a87d9b6df Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 24 Dec 2019 14:36:38 +0100 Subject: kernel: bump 4.14 to 4.14.160 Refreshed all patches. Compile-tested on: ipq40xx, ath79 Runtime-tested on: ipq40xx Signed-off-by: Hauke Mehrtens --- .../backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch | 4 ++-- .../274-flow_dissector-Parse-batman-adv-unicast-headers.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/backport-4.14') diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 484093d55a..b851799824 100644 --- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -65,7 +65,7 @@ Cc: Kir Kolyshkin * Before updating sk_refcnt, we must commit prior changes to memory --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1696,7 +1696,7 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1697,7 +1697,7 @@ u32 tcp_tso_autosize(const struct sock * { u32 bytes, segs; @@ -74,7 +74,7 @@ Cc: Kir Kolyshkin sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); /* Goal is to send at least one packet per ms, -@@ -2214,7 +2214,7 @@ static bool tcp_small_queue_check(struct +@@ -2215,7 +2215,7 @@ static bool tcp_small_queue_check(struct { unsigned int limit; diff --git a/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch b/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch index b0b2823cc9..a9b2fc40a3 100644 --- a/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch +++ b/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch @@ -94,7 +94,7 @@ Signed-off-by: David S. Miller static void __skb_flow_dissect_tcp(const struct sk_buff *skb, struct flow_dissector *flow_dissector, -@@ -717,6 +769,11 @@ proto_again: +@@ -718,6 +770,11 @@ proto_again: nhoff, hlen); break; -- cgit v1.2.3