2 files changed, 32 insertions, 18 deletions

diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 064af675a941..71ddac6ac4f4 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -114,6 +114,7 @@ struct ixgbe_rx_buffer {
         dma_addr_t dma;
         struct page *page;
         dma_addr_t page_dma;
+        unsigned int page_offset;
 };
 
 struct ixgbe_queue_stats {
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index ef965c996848..5858ab2b48f0 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -493,16 +493,24 @@ static void ixgbe_alloc_rx_buffers(struct ixgbe_adapter *adapter,
         while (cleaned_count--) {
                 rx_desc = IXGBE_RX_DESC_ADV(*rx_ring, i);
 
-                if (!bi->page &&
+                if (!bi->page_dma &&
                     (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED)) {
-                        bi->page = alloc_page(GFP_ATOMIC);
                         if (!bi->page) {
-                                adapter->alloc_rx_page_failed++;
-                                goto no_buffers;
+                                bi->page = alloc_page(GFP_ATOMIC);
+                                if (!bi->page) {
+                                        adapter->alloc_rx_page_failed++;
+                                        goto no_buffers;
+                                }
+                                bi->page_offset = 0;
+                        } else {
+                                /* use a half page if we're re-using */
+                                bi->page_offset ^= (PAGE_SIZE / 2);
                         }
-                        bi->page_dma = pci_map_page(pdev, bi->page, 0,
-                                                    PAGE_SIZE,
-                                                    PCI_DMA_FROMDEVICE);
+
+                        bi->page_dma = pci_map_page(pdev, bi->page,
+                                                    bi->page_offset,
+                                                    (PAGE_SIZE / 2),
+                                                    PCI_DMA_FROMDEVICE);
                 }
 
                 if (!bi->skb) {
@@ -596,7 +604,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,
                 if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
                         hdr_info = le16_to_cpu(ixgbe_get_hdr_info(rx_desc));
                         len = (hdr_info & IXGBE_RXDADV_HDRBUFLEN_MASK) >>
-                               IXGBE_RXDADV_HDRBUFLEN_SHIFT;
+                               IXGBE_RXDADV_HDRBUFLEN_SHIFT;
                         if (hdr_info & IXGBE_RXDADV_SPH)
                                 adapter->rx_hdr_split++;
                         if (len > IXGBE_RX_HDR_SIZE)
@@ -620,11 +628,18 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,
 
                 if (upper_len) {
                         pci_unmap_page(pdev, rx_buffer_info->page_dma,
-                                       PAGE_SIZE, PCI_DMA_FROMDEVICE);
+                                       PAGE_SIZE / 2, PCI_DMA_FROMDEVICE);
                         rx_buffer_info->page_dma = 0;
                         skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
-                                           rx_buffer_info->page, 0, upper_len);
-                        rx_buffer_info->page = NULL;
+                                           rx_buffer_info->page,
+                                           rx_buffer_info->page_offset,
+                                           upper_len);
+
+                        if ((rx_ring->rx_buf_len > (PAGE_SIZE / 2)) ||
+                            (page_count(rx_buffer_info->page) != 1))
+                                rx_buffer_info->page = NULL;
+                        else
+                                get_page(rx_buffer_info->page);
 
                         skb->len += upper_len;
                         skb->data_len += upper_len;
@@ -647,6 +662,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,
                         rx_buffer_info->skb = next_buffer->skb;
                         rx_buffer_info->dma = next_buffer->dma;
                         next_buffer->skb = skb;
+                        next_buffer->dma = 0;
                         adapter->non_eop_descs++;
                         goto next_desc;
                 }
@@ -1534,10 +1550,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
         int rx_buf_len;
 
         /* Decide whether to use packet split mode or not */
-        if (netdev->mtu > ETH_DATA_LEN)
-                adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
-        else
-                adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+        adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
 
         /* Set the RX buffer length according to the mode */
         if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
@@ -2018,12 +2031,12 @@ static void ixgbe_clean_rx_ring(struct ixgbe_adapter *adapter,
                 }
                 if (!rx_buffer_info->page)
                         continue;
-                pci_unmap_page(pdev, rx_buffer_info->page_dma, PAGE_SIZE,
-                               PCI_DMA_FROMDEVICE);
+                pci_unmap_page(pdev, rx_buffer_info->page_dma, PAGE_SIZE / 2,
+                               PCI_DMA_FROMDEVICE);
                 rx_buffer_info->page_dma = 0;
-
                 put_page(rx_buffer_info->page);
                 rx_buffer_info->page = NULL;
+                rx_buffer_info->page_offset = 0;
         }
 
         size = sizeof(struct ixgbe_rx_buffer) * rx_ring->count;