From 03470d6e14146eeea4e38aab59316fc18c8d4f68 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Thu, 4 Jun 2009 15:59:49 +0000 Subject: [PATCH] --- yaml --- r: 150713 b: refs/heads/master c: 21fa4e66bd0bedfa4ed6aa6f7008b2aff6d45c8d h: refs/heads/master i: 150711: 3966f3bc3c264dc1833bc66afad1290b152d5591 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5e5a4d339b8..3ac2565665af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74766013a131f1e1c2fe8fd138e12841eb708060 +refs/heads/master: 21fa4e66bd0bedfa4ed6aa6f7008b2aff6d45c8d diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 9684632f15b8..e1efa1d7df4e 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -708,7 +708,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, prefetch(skb->data - NET_IP_ALIGN); rx_buffer_info->skb = NULL; - if (len && !skb_shinfo(skb)->nr_frags) { + if (rx_buffer_info->dma) { pci_unmap_single(pdev, rx_buffer_info->dma, rx_ring->rx_buf_len, PCI_DMA_FROMDEVICE);