diff options
author | Eric Dumazet <edumazet@google.com> | 2015-09-22 23:44:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-24 17:52:30 -0400 |
commit | d8ed625044cdede8661324074aaad7459a1e3c7a (patch) | |
tree | baa489eef4a565cf732cae57fc1df38f04eaf13a /net/ipv4/tcp_ipv4.c | |
parent | 729bf329c79684327a55c33cdf21222543a1e5f1 (diff) |
tcp: factorize sk_txhash init
Neal suggested to move sk_txhash init into tcp_create_openreq_child(),
called both from IPv4 and IPv6.
This opportunity was missed in commit 58d607d3e52f ("tcp: provide
skb->hash to synack packets")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index d671d742a239..7e2646542312 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1276,7 +1276,6 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
1276 | newinet->mc_index = inet_iif(skb); | 1276 | newinet->mc_index = inet_iif(skb); |
1277 | newinet->mc_ttl = ip_hdr(skb)->ttl; | 1277 | newinet->mc_ttl = ip_hdr(skb)->ttl; |
1278 | newinet->rcv_tos = ip_hdr(skb)->tos; | 1278 | newinet->rcv_tos = ip_hdr(skb)->tos; |
1279 | newsk->sk_txhash = tcp_rsk(req)->txhash; | ||
1280 | inet_csk(newsk)->icsk_ext_hdr_len = 0; | 1279 | inet_csk(newsk)->icsk_ext_hdr_len = 0; |
1281 | if (inet_opt) | 1280 | if (inet_opt) |
1282 | inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen; | 1281 | inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen; |