|
@@ -479,7 +479,6 @@ static void ixgbe_alloc_rx_buffers(struct ixgbe_adapter *adapter,
|
|
|
union ixgbe_adv_rx_desc *rx_desc;
|
|
|
struct ixgbe_rx_buffer *bi;
|
|
|
unsigned int i;
|
|
|
- unsigned int bufsz = rx_ring->rx_buf_len + NET_IP_ALIGN;
|
|
|
|
|
|
i = rx_ring->next_to_use;
|
|
|
bi = &rx_ring->rx_buffer_info[i];
|
|
@@ -508,8 +507,10 @@ static void ixgbe_alloc_rx_buffers(struct ixgbe_adapter *adapter,
|
|
|
}
|
|
|
|
|
|
if (!bi->skb) {
|
|
|
- struct sk_buff *skb = netdev_alloc_skb(adapter->netdev,
|
|
|
- bufsz);
|
|
|
+ struct sk_buff *skb;
|
|
|
+ skb = netdev_alloc_skb(adapter->netdev,
|
|
|
+ (rx_ring->rx_buf_len +
|
|
|
+ NET_IP_ALIGN));
|
|
|
|
|
|
if (!skb) {
|
|
|
adapter->alloc_rx_buff_failed++;
|
|
@@ -524,7 +525,8 @@ static void ixgbe_alloc_rx_buffers(struct ixgbe_adapter *adapter,
|
|
|
skb_reserve(skb, NET_IP_ALIGN);
|
|
|
|
|
|
bi->skb = skb;
|
|
|
- bi->dma = pci_map_single(pdev, skb->data, bufsz,
|
|
|
+ bi->dma = pci_map_single(pdev, skb->data,
|
|
|
+ rx_ring->rx_buf_len,
|
|
|
PCI_DMA_FROMDEVICE);
|
|
|
}
|
|
|
/* Refresh the desc even if buffer_addrs didn't change because
|
|
@@ -615,7 +617,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,
|
|
|
|
|
|
if (len && !skb_shinfo(skb)->nr_frags) {
|
|
|
pci_unmap_single(pdev, rx_buffer_info->dma,
|
|
|
- rx_ring->rx_buf_len + NET_IP_ALIGN,
|
|
|
+ rx_ring->rx_buf_len,
|
|
|
PCI_DMA_FROMDEVICE);
|
|
|
skb_put(skb, len);
|
|
|
}
|