From 7814c4f19cb784fe17e06b4f1df06053d09c4cd4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 1 Apr 2009 11:20:20 +0000
Subject: [PATCH] --- yaml --- r: 139813 b: refs/heads/master c:
 f2bde7328633269ee935d9ed96535ade15cc348f h: refs/heads/master i:   139811:
 93da58dbf0b343c0c24e8cd69919451d75a43a4b v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 865aff63e83f..0aec77e8ea19 100644
--- 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
index 52fea5b28ca6..91d792d17e09 100644
--- 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;
 	}