diff options
author | Christoph Paasch <christoph.paasch@uclouvain.be> | 2012-09-26 07:59:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-27 19:20:26 -0400 |
commit | 5dff747b7038d10f9c174a1245263fd1c36a644d (patch) | |
tree | 7972334b850ec3eeafed5a2e9155de8ba36b7b8f /net/ipv4/tcp_ipv4.c | |
parent | bcc452935da124f26885e969ec5a78a8735d1452 (diff) |
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: Christoph Paasch <christoph.paasch@uclouvain.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 93406c583f43..385eb79cf6aa 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -925,8 +925,7 @@ EXPORT_SYMBOL(tcp_syn_flood_action); | |||
925 | /* | 925 | /* |
926 | * Save and compile IPv4 options into the request_sock if needed. | 926 | * Save and compile IPv4 options into the request_sock if needed. |
927 | */ | 927 | */ |
928 | static struct ip_options_rcu *tcp_v4_save_options(struct sock *sk, | 928 | static struct ip_options_rcu *tcp_v4_save_options(struct sk_buff *skb) |
929 | struct sk_buff *skb) | ||
930 | { | 929 | { |
931 | const struct ip_options *opt = &(IPCB(skb)->opt); | 930 | const struct ip_options *opt = &(IPCB(skb)->opt); |
932 | struct ip_options_rcu *dopt = NULL; | 931 | struct ip_options_rcu *dopt = NULL; |
@@ -1568,7 +1567,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
1568 | ireq->loc_addr = daddr; | 1567 | ireq->loc_addr = daddr; |
1569 | ireq->rmt_addr = saddr; | 1568 | ireq->rmt_addr = saddr; |
1570 | ireq->no_srccheck = inet_sk(sk)->transparent; | 1569 | ireq->no_srccheck = inet_sk(sk)->transparent; |
1571 | ireq->opt = tcp_v4_save_options(sk, skb); | 1570 | ireq->opt = tcp_v4_save_options(skb); |
1572 | 1571 | ||
1573 | if (security_inet_conn_request(sk, skb, req)) | 1572 | if (security_inet_conn_request(sk, skb, req)) |
1574 | goto drop_and_free; | 1573 | goto drop_and_free; |