* [PATCH] tcp: Remove unused parameter from tcp_v4_save_options
@ 2012-09-26 21:59 Christoph Paasch
2012-09-27 23:20 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Paasch @ 2012-09-26 21:59 UTC (permalink / raw)
To: David Miller; +Cc: netdev
struct sock *sk is not used inside tcp_v4_save_options. Thus it can be
removed.
Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
---
net/ipv4/tcp_ipv4.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 93406c5..385eb79 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -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;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tcp: Remove unused parameter from tcp_v4_save_options
2012-09-26 21:59 [PATCH] tcp: Remove unused parameter from tcp_v4_save_options Christoph Paasch
@ 2012-09-27 23:20 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-09-27 23:20 UTC (permalink / raw)
To: christoph.paasch; +Cc: netdev
From: Christoph Paasch <christoph.paasch@uclouvain.be>
Date: Wed, 26 Sep 2012 23:59:09 +0200
> struct sock *sk is not used inside tcp_v4_save_options. Thus it can be
> removed.
>
> Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-27 23:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-26 21:59 [PATCH] tcp: Remove unused parameter from tcp_v4_save_options Christoph Paasch
2012-09-27 23:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).