From bcf9edbd3fff6b428bbd69e78e8eff404868b257 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zheng.z.yan@intel.com>
Date: Sat, 8 Oct 2011 22:34:35 +0000
Subject: [PATCH] --- yaml --- r: 264337 b: refs/heads/master c:
 cdaf557034bb4397b2c86bb424de1788b134f610 h: refs/heads/master i:   264335:
 0e66e9d16fd72d496001b56d35368b31e950c307 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/af_inet6.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bac8b6c1b35c..82ba8aa88d9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 134d0f974c55c942541f1663d51fa846257eff2a
+refs/heads/master: cdaf557034bb4397b2c86bb424de1788b134f610
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index 3b5669a2582d..d27c797f9f05 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -875,6 +875,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,
 		skb_reset_transport_header(skb);
 		__skb_push(skb, skb_gro_offset(skb));
 
+		ops = rcu_dereference(inet6_protos[proto]);
 		if (!ops || !ops->gro_receive)
 			goto out_unlock;