From 5d7ea9b5cc558a9603a5ede41b6bbd9888a61572 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Tue, 20 Sep 2011 15:13:03 +0000 Subject: [PATCH] --- yaml --- r: 264063 b: refs/heads/master c: b811ce9104a7f7663ddae4f7795a194a103b8f90 h: refs/heads/master i: 264061: 6a58d368eafa3a578a9ec9673e04fed4a535910a 264059: 42b63656b378c94522cc1ee53c658d22b8276465 264055: e7dba6f823e7ea1a67ca2c056f950c91bc2b99f8 264047: a5bc39ed8aa37309a85068aa9bd5e92423ffe6ec 264031: 53a595697294fd706e2fc271c737d7ab9acefa3b 263999: 60822bf0ae8427a9f756548a0c8289b4bbee89a3 263935: 2aeffdc455642c4ae8453cc5a6ffa9d7ad678700 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ee188fcf22b5..b2598335ddb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c1e688388f629e8d8e88183b5ebc21e209252aa +refs/heads/master: b811ce9104a7f7663ddae4f7795a194a103b8f90 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 22790394318a..e1fcc9589278 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -1321,8 +1321,8 @@ static void 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) &&