diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-16 03:36:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-16 03:36:33 -0400 |
commit | a465419b1febb603821f924805529cff89cafeed (patch) | |
tree | 5131fa2dbf624ebeb6cf61bf4dc1bc9464fe0bbd /net/ipv4/tcp_output.c | |
parent | 3b098e2d7c693796cc4dffb07caa249fc0f70771 (diff) |
net: Introduce sk_route_nocaps
TCP-MD5 sessions have intermittent failures, when route cache is
invalidated. ip_queue_xmit() has to find a new route, calls
sk_setup_caps(sk, &rt->u.dst), destroying the
sk->sk_route_caps &= ~NETIF_F_GSO_MASK
that MD5 desperately try to make all over its way (from
tcp_transmit_skb() for example)
So we send few bad packets, and everything is fine when
tcp_transmit_skb() is called again for this socket.
Since ip_queue_xmit() is at a lower level than TCP-MD5, I chose to use a
socket field, sk_route_nocaps, containing bits to mask on sk_route_caps.
Reported-by: Bhaskar Dutta <bhaskie@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 5db3a2c6cb33..18a3302480cb 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -873,7 +873,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, | |||
873 | #ifdef CONFIG_TCP_MD5SIG | 873 | #ifdef CONFIG_TCP_MD5SIG |
874 | /* Calculate the MD5 hash, as we have all we need now */ | 874 | /* Calculate the MD5 hash, as we have all we need now */ |
875 | if (md5) { | 875 | if (md5) { |
876 | sk->sk_route_caps &= ~NETIF_F_GSO_MASK; | 876 | sk_nocaps_add(sk, NETIF_F_GSO_MASK); |
877 | tp->af_specific->calc_md5_hash(opts.hash_location, | 877 | tp->af_specific->calc_md5_hash(opts.hash_location, |
878 | md5, sk, NULL, skb); | 878 | md5, sk, NULL, skb); |
879 | } | 879 | } |