diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-02 11:01:32 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-02 11:01:32 -0400 |
| commit | 76fad347ab357ec3e28b0cfb781111e4129d76f5 (patch) | |
| tree | f1054509efbe4d8cc642e2c4cca441d25cd99754 | |
| parent | 2b6a79425863853f09726b12b4629fbd198a69ad (diff) | |
| download | longterm-queue-4.18-76fad347ab357ec3e28b0cfb781111e4129d76f5.tar.gz | |
tcp: refresh ctxt
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-tcp_fragment-should-apply-sane-memory-limits.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/queue/tcp-tcp_fragment-should-apply-sane-memory-limits.patch b/queue/tcp-tcp_fragment-should-apply-sane-memory-limits.patch index a2590b0..fc7ab96 100644 --- a/queue/tcp-tcp_fragment-should-apply-sane-memory-limits.patch +++ b/queue/tcp-tcp_fragment-should-apply-sane-memory-limits.patch @@ -1,4 +1,4 @@ -From f070ef2ac66716357066b683fb0baf55f8191a2e Mon Sep 17 00:00:00 2001 +From d1608603eb531e08d4e03ae007aa48a5e27f0e23 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Sat, 18 May 2019 05:12:05 -0700 Subject: [PATCH] tcp: tcp_fragment() should apply sane memory limits @@ -32,34 +32,34 @@ Cc: Jonathan Lemon <jonathan.lemon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h -index 86dc24a96c90..fd42c1316d3d 100644 +index e908dd0f7577..4d56ceaa65ec 100644 --- a/include/uapi/linux/snmp.h +++ b/include/uapi/linux/snmp.h -@@ -283,6 +283,7 @@ enum +@@ -280,6 +280,7 @@ enum + LINUX_MIB_TCPDELIVERED, /* TCPDelivered */ + LINUX_MIB_TCPDELIVEREDCE, /* TCPDeliveredCE */ LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */ - LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */ - LINUX_MIB_TCPRCVQDROP, /* TCPRcvQDrop */ + LINUX_MIB_TCPWQUEUETOOBIG, /* TCPWqueueTooBig */ __LINUX_MIB_MAX }; diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c -index 4370f4246e86..073273b751f8 100644 +index 2194746cb037..344fe61c1ac5 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c -@@ -287,6 +287,7 @@ static const struct snmp_mib snmp4_net_list[] = { +@@ -288,6 +288,7 @@ static const struct snmp_mib snmp4_net_list[] = { + SNMP_MIB_ITEM("TCPDelivered", LINUX_MIB_TCPDELIVERED), + SNMP_MIB_ITEM("TCPDeliveredCE", LINUX_MIB_TCPDELIVEREDCE), SNMP_MIB_ITEM("TCPAckCompressed", LINUX_MIB_TCPACKCOMPRESSED), - SNMP_MIB_ITEM("TCPZeroWindowDrop", LINUX_MIB_TCPZEROWINDOWDROP), - SNMP_MIB_ITEM("TCPRcvQDrop", LINUX_MIB_TCPRCVQDROP), + SNMP_MIB_ITEM("TCPWqueueTooBig", LINUX_MIB_TCPWQUEUETOOBIG), SNMP_MIB_SENTINEL }; diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c -index b8e3bbb85211..1bb1c46b4aba 100644 +index ce2c3e5c607d..0dcf1382453e 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1296,6 +1296,11 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, +@@ -1312,6 +1312,11 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, if (nsize < 0) nsize = 0; |