1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 926ad8c2f2c7..a9e091cb5499 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1201,9 +1201,10 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                         hdr_info = le16_to_cpu(ixgbe_get_hdr_info(rx_desc));
                         len = (hdr_info & IXGBE_RXDADV_HDRBUFLEN_MASK) >>
                                IXGBE_RXDADV_HDRBUFLEN_SHIFT;
-                        if (len > IXGBE_RX_HDR_SIZE)
-                                len = IXGBE_RX_HDR_SIZE;
                         upper_len = le16_to_cpu(rx_desc->wb.upper.length);
+                        if ((len > IXGBE_RX_HDR_SIZE) ||
+                            (upper_len && !(hdr_info & IXGBE_RXDADV_SPH)))
+                                len = IXGBE_RX_HDR_SIZE;
                 } else {
                         len = le16_to_cpu(rx_desc->wb.upper.length);
                 }