summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-09-23 03:44:17 (GMT)
committerDavid S. Miller <davem@davemloft.net>2015-09-24 21:52:30 (GMT)
commitd8ed625044cdede8661324074aaad7459a1e3c7a (patch)
treebaa489eef4a565cf732cae57fc1df38f04eaf13a /net/ipv6
parent729bf329c79684327a55c33cdf21222543a1e5f1 (diff)
downloadlinux-d8ed625044cdede8661324074aaad7459a1e3c7a.tar.xz
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/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index f9c0e26..a004e0b 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1090,8 +1090,6 @@ static struct sock *tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
newsk->sk_v6_rcv_saddr = ireq->ir_v6_loc_addr;
newsk->sk_bound_dev_if = ireq->ir_iif;
- newsk->sk_txhash = tcp_rsk(req)->txhash;
-
/* Now IPv6 options...
First: no IPv4 options.