diff options
| author | Greg Rose | 2012-11-02 06:50:21 +0100 |
|---|---|---|
| committer | Jeff Kirsher | 2012-11-15 14:35:12 +0100 |
| commit | b9dd245bc6033a08ee46506cf3cb68d0edceef1d (patch) | |
| tree | 4c721571f97666eb3895bbb161701723eef7d4b7 /drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |
| parent | ioat: Do not enable DCA if tag map is invalid (diff) | |
| download | kernel-qcow2-linux-b9dd245bc6033a08ee46506cf3cb68d0edceef1d.tar.gz kernel-qcow2-linux-b9dd245bc6033a08ee46506cf3cb68d0edceef1d.tar.xz kernel-qcow2-linux-b9dd245bc6033a08ee46506cf3cb68d0edceef1d.zip | |
ixgbevf: Streamline the rx buffer allocation
Moves allocation of local variable to section where it is needed and
removes unnecessary if statement.
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 9d8815302363..b46dff8ef9ab 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -341,15 +341,16 @@ static void ixgbevf_alloc_rx_buffers(struct ixgbevf_adapter *adapter, struct pci_dev *pdev = adapter->pdev; union ixgbe_adv_rx_desc *rx_desc; struct ixgbevf_rx_buffer *bi; - struct sk_buff *skb; unsigned int i = rx_ring->next_to_use; bi = &rx_ring->rx_buffer_info[i]; while (cleaned_count--) { rx_desc = IXGBEVF_RX_DESC(rx_ring, i); - skb = bi->skb; - if (!skb) { + + if (!bi->skb) { + struct sk_buff *skb; + skb = netdev_alloc_skb_ip_align(rx_ring->netdev, rx_ring->rx_buf_len); if (!skb) { @@ -357,8 +358,7 @@ static void ixgbevf_alloc_rx_buffers(struct ixgbevf_adapter *adapter, goto no_buffers; } bi->skb = skb; - } - if (!bi->dma) { + bi->dma = dma_map_single(&pdev->dev, skb->data, rx_ring->rx_buf_len, DMA_FROM_DEVICE); |