Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8ed6250 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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 58d607d3 ("tcp: provide
skb->hash to synack packets")

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 729bf329

net/ipv4/tcp_ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -1276,7 +1276,6 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 
	newinet->mc_index     = inet_iif(skb);

	newinet->mc_ttl	      = ip_hdr(skb)->ttl;

	newinet->rcv_tos      = ip_hdr(skb)->tos;

	newsk->sk_txhash      = tcp_rsk(req)->txhash;

	inet_csk(newsk)->icsk_ext_hdr_len = 0;

	if (inet_opt)

		inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen;

net/ipv4/tcp_minisocks.c

+1 −0
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, 
		tcp_enable_early_retrans(newtp);

		newtp->tlp_high_seq = 0;

		newtp->lsndtime = treq->snt_synack.stamp_jiffies;

		newsk->sk_txhash = treq->txhash;

		newtp->last_oow_ack_time = 0;

		newtp->total_retrans = req->num_retrans;

net/ipv6/tcp_ipv6.c

+0 −2
Original line number Diff line number Diff line
@@ -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.