From 3f25e8767b6dcd0df3d2147f4b7517299cc1629a Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paul.mckenney@linaro.org>
Date: Fri, 6 Jan 2012 17:08:33 -0800
Subject: [PATCH] --- yaml --- r: 288549 b: refs/heads/master c:
 605b4afec8e51d0603089eac01a3ca9dd919e909 h: refs/heads/master i:   288547:
 a52de48abaec08c06b189a159ca9aaa552f6a4c7 v: v3

---
 [refs]                       | 2 +-
 trunk/net/ipv4/ip_sockglue.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f815a5d8eb0d..e0eb980daf71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f9c8c1b091628a550b70ee51d7d729187f5c290
+refs/heads/master: 605b4afec8e51d0603089eac01a3ca9dd919e909
diff --git a/trunk/net/ipv4/ip_sockglue.c b/trunk/net/ipv4/ip_sockglue.c
index 8aa87c19fa00..5343d9ac510b 100644
--- a/trunk/net/ipv4/ip_sockglue.c
+++ b/trunk/net/ipv4/ip_sockglue.c
@@ -445,11 +445,6 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len)
 }
 
 
-static void opt_kfree_rcu(struct rcu_head *head)
-{
-	kfree(container_of(head, struct ip_options_rcu, rcu));
-}
-
 /*
  *	Socket option code for IP. This is the end of the line after any
  *	TCP,UDP etc options on an IP socket.
@@ -525,7 +520,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
 		}
 		rcu_assign_pointer(inet->inet_opt, opt);
 		if (old)
-			call_rcu(&old->rcu, opt_kfree_rcu);
+			kfree_rcu(old, rcu);
 		break;
 	}
 	case IP_PKTINFO: