aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-09-25 10:39:17 -0400
committerDavid S. Miller <davem@davemloft.net>2015-09-25 16:00:38 -0400
commit37bfbdda0b036a3720924e04c0171d9038159c2c (patch)
tree29310f6628155303ddaf074f97a8412e4dcccef3
parentcfe673b0ae4754ffc051482f4a948b67ddbeec10 (diff)
tcp: remove tcp_synack_options() socket argument
We do not use the socket in this function. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_output.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 4cd0b50d4e46..87392cb51b11 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -612,12 +612,11 @@ static unsigned int tcp_syn_options(struct sock *sk, struct sk_buff *skb,
612} 612}
613 613
614/* Set up TCP options for SYN-ACKs. */ 614/* Set up TCP options for SYN-ACKs. */
615static unsigned int tcp_synack_options(struct sock *sk, 615static unsigned int tcp_synack_options(struct request_sock *req,
616 struct request_sock *req, 616 unsigned int mss, struct sk_buff *skb,
617 unsigned int mss, struct sk_buff *skb, 617 struct tcp_out_options *opts,
618 struct tcp_out_options *opts, 618 const struct tcp_md5sig_key *md5,
619 const struct tcp_md5sig_key *md5, 619 struct tcp_fastopen_cookie *foc)
620 struct tcp_fastopen_cookie *foc)
621{ 620{
622 struct inet_request_sock *ireq = inet_rsk(req); 621 struct inet_request_sock *ireq = inet_rsk(req);
623 unsigned int remaining = MAX_TCP_OPTION_SPACE; 622 unsigned int remaining = MAX_TCP_OPTION_SPACE;
@@ -2989,8 +2988,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
2989 md5 = tcp_rsk(req)->af_specific->req_md5_lookup(sk, req_to_sk(req)); 2988 md5 = tcp_rsk(req)->af_specific->req_md5_lookup(sk, req_to_sk(req));
2990#endif 2989#endif
2991 skb_set_hash(skb, tcp_rsk(req)->txhash, PKT_HASH_TYPE_L4); 2990 skb_set_hash(skb, tcp_rsk(req)->txhash, PKT_HASH_TYPE_L4);
2992 tcp_header_size = tcp_synack_options(sk, req, mss, skb, &opts, md5, 2991 tcp_header_size = tcp_synack_options(req, mss, skb, &opts, md5, foc) +
2993 foc) + sizeof(*th); 2992 sizeof(*th);
2994 2993
2995 skb_push(skb, tcp_header_size); 2994 skb_push(skb, tcp_header_size);
2996 skb_reset_transport_header(skb); 2995 skb_reset_transport_header(skb);