From 9203d871c612e8f6d446f23280b266497f06d8e1 Mon Sep 17 00:00:00 2001 From: Christoph Paasch Date: Wed, 26 Sep 2012 11:59:09 +0000 Subject: [PATCH] --- yaml --- r: 328119 b: refs/heads/master c: 5dff747b7038d10f9c174a1245263fd1c36a644d h: refs/heads/master i: 328117: 9b196d6c13775bb69685ba18f1864a1986b0826f 328115: 4dcd2431da4594fe3f281cb5845707a378b093dc 328111: 13040b0dcfb85aba1da12b5fa36de08901c7e6d9 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_ipv4.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 91b796fc83d7..382d103efe03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcc452935da124f26885e969ec5a78a8735d1452 +refs/heads/master: 5dff747b7038d10f9c174a1245263fd1c36a644d diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c index 93406c583f43..385eb79cf6aa 100644 --- a/trunk/net/ipv4/tcp_ipv4.c +++ b/trunk/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;