From 74be5baa5ceb45444a8b3e132b7dc848082ff4e7 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sun, 29 Jul 2012 21:06:13 +0000
Subject: [PATCH] --- yaml --- r: 320522 b: refs/heads/master c:
 cca32e4bf999a34ac08d959f351f2b30bcd02460 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/ip_input.c  | 2 --
 trunk/net/ipv6/ip6_input.c | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 01ac64ad393b..34b133903279 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bbb181308bc348e02bfdbebdedd4e4ec9d452ce
+refs/heads/master: cca32e4bf999a34ac08d959f351f2b30bcd02460
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
index 981ff1eef28c..f1395a6fb35f 100644
--- a/trunk/net/ipv4/ip_input.c
+++ b/trunk/net/ipv4/ip_input.c
@@ -325,14 +325,12 @@ static int ip_rcv_finish(struct sk_buff *skb)
 		const struct net_protocol *ipprot;
 		int protocol = iph->protocol;
 
-		rcu_read_lock();
 		ipprot = rcu_dereference(inet_protos[protocol]);
 		if (ipprot && ipprot->early_demux) {
 			ipprot->early_demux(skb);
 			/* must reload iph, skb->head might have changed */
 			iph = ip_hdr(skb);
 		}
-		rcu_read_unlock();
 	}
 
 	/*
diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c
index 47975e363fcd..a52d864d562b 100644
--- a/trunk/net/ipv6/ip6_input.c
+++ b/trunk/net/ipv6/ip6_input.c
@@ -52,11 +52,9 @@ int ip6_rcv_finish(struct sk_buff *skb)
 	if (sysctl_ip_early_demux && !skb_dst(skb)) {
 		const struct inet6_protocol *ipprot;
 
-		rcu_read_lock();
 		ipprot = rcu_dereference(inet6_protos[ipv6_hdr(skb)->nexthdr]);
 		if (ipprot && ipprot->early_demux)
 			ipprot->early_demux(skb);
-		rcu_read_unlock();
 	}
 	if (!skb_dst(skb))
 		ip6_route_input(skb);