Merge git://github.com/Jkirsher/net-next
[linux-drm-fsl-dcu.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_main.c
index 5f50f1b69cad23dbf077c52563b41c38b1b9d0cf..c26ea9437fedf8c8872ec63001e4f3b3e7785f20 100644 (file)
@@ -1270,8 +1270,8 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                if (ring_is_rsc_enabled(rx_ring))
                        pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
 
-               /* if this is a skb from previous receive DMA will be 0 */
-               if (rx_buffer_info->dma) {
+               /* linear means we are building an skb from multiple pages */
+               if (!skb_is_nonlinear(skb)) {
                        u16 hlen;
                        if (pkt_is_rsc &&
                            !(staterr & IXGBE_RXD_STAT_EOP) &&