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

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

tcp: remove tcp_synack_options() socket argument 



We do not use the socket in this function.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfe673b0

net/ipv4/tcp_output.c

+7 −8
Original line number Diff line number Diff line
@@ -612,8 +612,7 @@ static unsigned int tcp_syn_options(struct sock *sk, struct sk_buff *skb, 
}



/* Set up TCP options for SYN-ACKs. */

static unsigned int tcp_synack_options(struct sock *sk,

				   struct request_sock *req,

static unsigned int tcp_synack_options(struct request_sock *req,

				       unsigned int mss, struct sk_buff *skb,

				       struct tcp_out_options *opts,

				       const struct tcp_md5sig_key *md5,
@@ -2989,8 +2988,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, 
	md5 = tcp_rsk(req)->af_specific->req_md5_lookup(sk, req_to_sk(req));

#endif

	skb_set_hash(skb, tcp_rsk(req)->txhash, PKT_HASH_TYPE_L4);

	tcp_header_size = tcp_synack_options(sk, req, mss, skb, &opts, md5,

					     foc) + sizeof(*th);

	tcp_header_size = tcp_synack_options(req, mss, skb, &opts, md5, foc) +

			  sizeof(*th);



	skb_push(skb, tcp_header_size);

	skb_reset_transport_header(skb);