diff options
author | Ingo Molnar | 2013-04-08 17:41:50 +0200 |
---|---|---|
committer | Ingo Molnar | 2013-04-08 17:41:50 +0200 |
commit | b6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (patch) | |
tree | 14e6031e0efa8e8b684db3b7ff85f8ac63ed0824 /net/ipv6/tcp_ipv6.c | |
parent | x86, MCE, AMD: Use MCG_CAP MSR to find out number of banks on AMD (diff) | |
parent | x86/mce: Rework cmci_rediscover() to play well with CPU hotplug (diff) | |
download | kernel-qcow2-linux-b6d5278dc8385eaf2e3904a4af444a04f6ae4e71.tar.gz kernel-qcow2-linux-b6d5278dc8385eaf2e3904a4af444a04f6ae4e71.tar.xz kernel-qcow2-linux-b6d5278dc8385eaf2e3904a4af444a04f6ae4e71.zip |
Merge tag 'please-pull-cmci_rediscover' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull clean up of the cmci_rediscover code to fix problems found by Dave Jones,
from Tony Luck.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 9b6460055df5..f6d629fd6aee 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -389,6 +389,13 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, } if (type == ICMPV6_PKT_TOOBIG) { + /* We are not interested in TCP_LISTEN and open_requests + * (SYN-ACKs send out by Linux are always <576bytes so + * they should go through unfragmented). + */ + if (sk->sk_state == TCP_LISTEN) + goto out; + tp->mtu_info = ntohl(info); if (!sock_owned_by_user(sk)) tcp_v6_mtu_reduced(sk); |