---

yaml --- r: 213883 b: refs/heads/master c: dbe5775 h: refs/heads/master i: 213881: c7908bd 213879: 18ad95f v: v3
git-mirror · Aug 20, 2010 · dce27a5 · dce27a5
1 parent f404709
commit dce27a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d47b45951af087c1a4439c559309b0bf90a0718
+refs/heads/master: dbe5775bbc00116ed5699babfe17c54f32eb34c3
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2284,7 +2284,10 @@ __u32 __skb_get_rxhash(struct sk_buff *skb)
 			goto done;
 
 		ip = (struct iphdr *) skb->data + nhoff;
-		ip_proto = ip->protocol;
+		if (ip->frag_off & htons(IP_MF | IP_OFFSET))
+			ip_proto = 0;
+		else
+			ip_proto = ip->protocol;
 		addr1 = (__force u32) ip->saddr;
 		addr2 = (__force u32) ip->daddr;
 		ihl = ip->ihl;