diff --git a/[refs] b/[refs]
index ff449fa0164d..b9df0306a00c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce8632ba6b3ed0bf2efa98672e2808de34250389
+refs/heads/master: fc59f9a3bf8096a1f68a8b78ada7a0e0ab9236b2
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index ea8eb2214b09..343883f65ea7 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2328,8 +2328,10 @@ static int napi_gro_complete(struct sk_buff *skb)
 	struct list_head *head = &ptype_base[ntohs(type) & PTYPE_HASH_MASK];
 	int err = -ENOENT;
 
-	if (NAPI_GRO_CB(skb)->count == 1)
+	if (NAPI_GRO_CB(skb)->count == 1) {
+		skb_shinfo(skb)->gso_size = 0;
 		goto out;
+	}
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(ptype, head, list) {
@@ -2348,7 +2350,6 @@ static int napi_gro_complete(struct sk_buff *skb)
 	}
 
 out:
-	skb_shinfo(skb)->gso_size = 0;
 	return netif_receive_skb(skb);
 }