---

yaml --- r: 264063 b: refs/heads/master c: b811ce9 h: refs/heads/master i: 264061: 6a58d36 264059: 42b6365 264055: e7dba6f 264047: a5bc39e 264031: 53a5956 263999: 60822bf 263935: 2aeffdc v: v3
git-mirror · Sep 21, 2011 · 5d7ea9b · 5d7ea9b
1 parent e0c6553
commit 5d7ea9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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) &&