---

yaml --- r: 139813 b: refs/heads/master c: f2bde73 h: refs/heads/master i: 139811: 93da58d v: v3
git-mirror · Apr 2, 2009 · 7814c4f · 7814c4f
1 parent 82b2f85
commit 7814c4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d78ad8cbfe73ad568de38814a75e9c92ad0a907c
+refs/heads/master: f2bde7328633269ee935d9ed96535ade15cc348f
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2472,8 +2472,9 @@ static int __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
 		return GRO_NORMAL;
 
 	for (p = napi->gro_list; p; p = p->next) {
-		NAPI_GRO_CB(p)->same_flow = !compare_ether_header(
-			skb_mac_header(p), skb_gro_mac_header(skb));
+		NAPI_GRO_CB(p)->same_flow = (p->dev == skb->dev)
+			&& !compare_ether_header(skb_mac_header(p),
+						 skb_gro_mac_header(skb));
 		NAPI_GRO_CB(p)->flush = 0;
 	}