---

yaml --- r: 369299 b: refs/heads/master c: b9555f6 h: refs/heads/master i: 369297: 9f5581e 369295: 7f963b7 v: v3
git-mirror · Apr 18, 2013 · 2ddf5c7 · 2ddf5c7
1 parent 5613892
commit 2ddf5c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c17a203721d72c36798e5d7fa564e1adf8beb65
+refs/heads/master: b9555f6627656309c01b0c077dcecbee0ac9343f
diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_main.c b/trunk/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6472,7 +6472,7 @@ static unsigned int igb_get_headlen(unsigned char *data,
 			return hdr.network - data;
 
 		/* record next protocol if header is present */
-		if (!hdr.ipv4->frag_off)
+		if (!(hdr.ipv4->frag_off & htons(IP_OFFSET)))
 			nexthdr = hdr.ipv4->protocol;
 	} else if (protocol == __constant_htons(ETH_P_IPV6)) {
 		if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))