e1000: rename struct e1000_buffer to e1000_tx_buffer

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / e1000 / e1000_ethtool.c

diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 9b50272824a1e2c859feeaf00312aace09ec380c..c7280d9c638ed858194fb677933ff96d17afeb20 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -968,7 +968,7 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
                        if (rxdr->buffer_info[i].dma)
                                dma_unmap_single(&pdev->dev,
                                                 rxdr->buffer_info[i].dma,
-                                                rxdr->buffer_info[i].length,
+                                                E1000_RXBUFFER_2048,
                                                 DMA_FROM_DEVICE);
                        if (rxdr->buffer_info[i].skb)
                                dev_kfree_skb(rxdr->buffer_info[i].skb);
@@ -1006,7 +1006,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
        if (!txdr->count)
                txdr->count = E1000_DEFAULT_TXD;
 
-       txdr->buffer_info = kcalloc(txdr->count, sizeof(struct e1000_buffer),
+       txdr->buffer_info = kcalloc(txdr->count, sizeof(struct e1000_tx_buffer),
                                    GFP_KERNEL);
        if (!txdr->buffer_info) {
                ret_val = 1;
@@ -1065,7 +1065,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
        if (!rxdr->count)
                rxdr->count = E1000_DEFAULT_RXD;
 
-       rxdr->buffer_info = kcalloc(rxdr->count, sizeof(struct e1000_buffer),
+       rxdr->buffer_info = kcalloc(rxdr->count, sizeof(struct e1000_rx_buffer),
                                    GFP_KERNEL);
        if (!rxdr->buffer_info) {
                ret_val = 5;
@@ -1104,7 +1104,6 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                }
                skb_reserve(skb, NET_IP_ALIGN);
                rxdr->buffer_info[i].skb = skb;
-               rxdr->buffer_info[i].length = E1000_RXBUFFER_2048;
                rxdr->buffer_info[i].dma =
                        dma_map_single(&pdev->dev, skb->data,
                                       E1000_RXBUFFER_2048, DMA_FROM_DEVICE);
@@ -1440,7 +1439,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
                do { /* receive the sent packets */
                        dma_sync_single_for_cpu(&pdev->dev,
                                                rxdr->buffer_info[l].dma,
-                                               rxdr->buffer_info[l].length,
+                                               E1000_RXBUFFER_2048,
                                                DMA_FROM_DEVICE);
 
                        ret_val = e1000_check_lbtest_frame(