1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 0fe25210629b..0ce145e93545 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6145,20 +6145,23 @@ static unsigned int igb_get_headlen(unsigned char *data,
                 if (hlen < sizeof(struct iphdr))
                         return hdr.network - data;
 
-                /* record next protocol */
-                nexthdr = hdr.ipv4->protocol;
-                hdr.network += hlen;
+                /* record next protocol if header is present */
+                if (!hdr.ipv4->frag_off)
+                        nexthdr = hdr.ipv4->protocol;
         } else if (protocol == __constant_htons(ETH_P_IPV6)) {
                 if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))
                         return max_len;
 
                 /* record next protocol */
                 nexthdr = hdr.ipv6->nexthdr;
-                hdr.network += sizeof(struct ipv6hdr);
+                hlen = sizeof(struct ipv6hdr);
         } else {
                 return hdr.network - data;
         }
 
+        /* relocate pointer to start of L4 header */
+        hdr.network += hlen;
+
         /* finally sort out TCP */
         if (nexthdr == IPPROTO_TCP) {
                 if ((hdr.network - data) > (max_len - sizeof(struct tcphdr)))