mirror of https://github.com/hak5/openwrt.git
kernel: bump 4.9 to 4.9.192
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>openwrt-18.06
parent
6f677d6848
commit
418cf097e7
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
LINUX_RELEASE?=1
|
LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-4.9 = .191
|
LINUX_VERSION-4.9 = .192
|
||||||
LINUX_VERSION-4.14 = .142
|
LINUX_VERSION-4.14 = .142
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-4.9.191 = ded4b87406deb67112b25a2283e8b5c89c2b47e2de14a97acda57f74cd38b7bc
|
LINUX_KERNEL_HASH-4.9.192 = 7a1a300cce70a4fd0d49b7fff7b1673159b61c4040c5a7c08ea333a7cb328d54
|
||||||
LINUX_KERNEL_HASH-4.14.142 = e67ba535991170a8383be68203af7d9b4262474ceeff2f9afedeac6043b590f3
|
LINUX_KERNEL_HASH-4.14.142 = e67ba535991170a8383be68203af7d9b4262474ceeff2f9afedeac6043b590f3
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
|
|
|
@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
nval = cmpxchg(&tp->tsq_flags, oval, nval);
|
nval = cmpxchg(&tp->tsq_flags, oval, nval);
|
||||||
if (nval != oval)
|
if (nval != oval)
|
||||||
continue;
|
continue;
|
||||||
@@ -2235,6 +2235,8 @@ static bool tcp_write_xmit(struct sock *
|
@@ -2236,6 +2236,8 @@ static bool tcp_write_xmit(struct sock *
|
||||||
unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
|
unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
|
||||||
--- a/net/ipv4/tcp_output.c
|
--- a/net/ipv4/tcp_output.c
|
||||||
+++ b/net/ipv4/tcp_output.c
|
+++ b/net/ipv4/tcp_output.c
|
||||||
@@ -2140,6 +2140,15 @@ static bool tcp_small_queue_check(struct
|
@@ -2141,6 +2141,15 @@ static bool tcp_small_queue_check(struct
|
||||||
limit <<= factor;
|
limit <<= factor;
|
||||||
|
|
||||||
if (atomic_read(&sk->sk_wmem_alloc) > limit) {
|
if (atomic_read(&sk->sk_wmem_alloc) > limit) {
|
||||||
|
|
|
@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
if (nval != oval)
|
if (nval != oval)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -2149,7 +2149,7 @@ static bool tcp_small_queue_check(struct
|
@@ -2150,7 +2150,7 @@ static bool tcp_small_queue_check(struct
|
||||||
skb->prev == sk->sk_write_queue.next)
|
skb->prev == sk->sk_write_queue.next)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -123,7 +123,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
/* It is possible TX completion already happened
|
/* It is possible TX completion already happened
|
||||||
* before we set TSQ_THROTTLED, so we must
|
* before we set TSQ_THROTTLED, so we must
|
||||||
* test again the condition.
|
* test again the condition.
|
||||||
@@ -2247,8 +2247,8 @@ static bool tcp_write_xmit(struct sock *
|
@@ -2248,8 +2248,8 @@ static bool tcp_write_xmit(struct sock *
|
||||||
unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
|
unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
if (tcp_small_queue_check(sk, skb, 0))
|
if (tcp_small_queue_check(sk, skb, 0))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -3559,8 +3559,6 @@ void __tcp_send_ack(struct sock *sk, u32
|
@@ -3560,8 +3560,6 @@ void __tcp_send_ack(struct sock *sk, u32
|
||||||
/* We do not want pure acks influencing TCP Small Queues or fq/pacing
|
/* We do not want pure acks influencing TCP Small Queues or fq/pacing
|
||||||
* too much.
|
* too much.
|
||||||
* SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784
|
* SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784
|
||||||
|
|
|
@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
|
||||||
sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
|
sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
|
||||||
|
|
||||||
/* Goal is to send at least one packet per ms,
|
/* Goal is to send at least one packet per ms,
|
||||||
@@ -2136,7 +2136,7 @@ static bool tcp_small_queue_check(struct
|
@@ -2137,7 +2137,7 @@ static bool tcp_small_queue_check(struct
|
||||||
{
|
{
|
||||||
unsigned int limit;
|
unsigned int limit;
|
||||||
|
|
||||||
|
|
|
@ -1238,7 +1238,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
}
|
}
|
||||||
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
|
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
|
||||||
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
|
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
|
||||||
@@ -887,7 +887,7 @@ static int tsi108_poll(struct napi_struc
|
@@ -888,7 +888,7 @@ static int tsi108_poll(struct napi_struc
|
||||||
|
|
||||||
if (num_received < budget) {
|
if (num_received < budget) {
|
||||||
data->rxpending = 0;
|
data->rxpending = 0;
|
||||||
|
|
Loading…
Reference in New Issue