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

Commit 5dff747b authored by Christoph Paasch's avatar Christoph Paasch Committed by David S. Miller
Browse files

tcp: Remove unused parameter from tcp_v4_save_options 



struct sock *sk is not used inside tcp_v4_save_options. Thus it can be
removed.

Signed-off-by: default avatarChristoph Paasch <christoph.paasch@uclouvain.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bcc45293

net/ipv4/tcp_ipv4.c

+2 −3
Original line number Diff line number Diff line
@@ -925,8 +925,7 @@ EXPORT_SYMBOL(tcp_syn_flood_action); 
/*

 * Save and compile IPv4 options into the request_sock if needed.

 */

static struct ip_options_rcu *tcp_v4_save_options(struct sock *sk,

						  struct sk_buff *skb)

static struct ip_options_rcu *tcp_v4_save_options(struct sk_buff *skb)

{

	const struct ip_options *opt = &(IPCB(skb)->opt);

	struct ip_options_rcu *dopt = NULL;
@@ -1568,7 +1567,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	ireq->loc_addr = daddr;

	ireq->rmt_addr = saddr;

	ireq->no_srccheck = inet_sk(sk)->transparent;

	ireq->opt = tcp_v4_save_options(sk, skb);

	ireq->opt = tcp_v4_save_options(skb);



	if (security_inet_conn_request(sk, skb, req))

		goto drop_and_free;