aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commitdcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
parent59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff)
downloadmaster-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz
master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2
master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch')
-rw-r--r--target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch b/target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
index 547e4faf73..7fe3069dff 100644
--- a/target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
+++ b/target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
@@ -44,11 +44,9 @@ To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 2fd2bc9..fa2c2c2 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -237,7 +237,11 @@ static inline void TCP_ECN_check_ce(struct tcp_sock *tp, const struct sk_buff *s
+@@ -237,7 +237,11 @@ static inline void TCP_ECN_check_ce(stru
tcp_enter_quickack_mode((struct sock *)tp);
break;
case INET_ECN_CE: