diff options
| author | Alexander Duyck | 2013-02-01 09:56:41 +0100 |
|---|---|---|
| committer | Jeff Kirsher | 2013-04-18 06:19:09 +0200 |
| commit | 20967f42025f50e8497e6d71259ac5fb56655736 (patch) | |
| tree | a843b20fc58ed40d33523457c516fb58e1fb7d99 /drivers/net | |
| parent | Merge branch 'tipc-ipoib' (diff) | |
| download | kernel-qcow2-linux-20967f42025f50e8497e6d71259ac5fb56655736.tar.gz kernel-qcow2-linux-20967f42025f50e8497e6d71259ac5fb56655736.tar.xz kernel-qcow2-linux-20967f42025f50e8497e6d71259ac5fb56655736.zip | |
ixgbe: Mask off check of frag_off as we only want fragment offset
We were incorrectly checking the entire frag_off field when we only wanted the
fragment offset. As a result we were not pulling in TCP headers when the DNF
flag was set.
To correct that we will now check for frag off using the IP_OFFSET mask.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 1339932f59b1..d473a7c0c297 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -1337,7 +1337,7 @@ static unsigned int ixgbe_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))) |