1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 6a0526a59a8a..e0cbd6a0bde8 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -1195,7 +1195,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                 goto err_nomem;
         }
 
-        rx_ring->size = rx_ring->count * sizeof(struct e1000_rx_desc);
+        rx_ring->size = rx_ring->count * sizeof(union e1000_rx_desc_extended);
         rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
                                            &rx_ring->dma, GFP_KERNEL);
         if (!rx_ring->desc) {
@@ -1221,7 +1221,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         ew32(RCTL, rctl);
 
         for (i = 0; i < rx_ring->count; i++) {
-                struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rx_ring, i);
+                union e1000_rx_desc_extended *rx_desc;
                 struct sk_buff *skb;
 
                 skb = alloc_skb(2048 + NET_IP_ALIGN, GFP_KERNEL);
@@ -1239,8 +1239,9 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                         ret_val = 8;
                         goto err_nomem;
                 }
-                rx_desc->buffer_addr =
-                        cpu_to_le64(rx_ring->buffer_info[i].dma);
+                rx_desc = E1000_RX_DESC_EXT(*rx_ring, i);
+                rx_desc->read.buffer_addr =
+                    cpu_to_le64(rx_ring->buffer_info[i].dma);
                 memset(skb->data, 0x00, skb->len);
         }