---

yaml
---
r: 328119
b: refs/heads/master
c: 5dff747
h: refs/heads/master
i:
  328117: 9b196d6
  328115: 4dcd243
  328111: 13040b0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcc452935da124f26885e969ec5a78a8735d1452
+refs/heads/master: 5dff747b7038d10f9c174a1245263fd1c36a644d

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;