diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index b548ef0cf56b..983eb4e6f7aa 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
@@ -3856,7 +3856,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, | |||
3856 | while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && | 3856 | while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && |
3857 | (count < tx_ring->count)) { | 3857 | (count < tx_ring->count)) { |
3858 | bool cleaned = false; | 3858 | bool cleaned = false; |
3859 | rmb(); /* read buffer_info after eop_desc */ | 3859 | dma_rmb(); /* read buffer_info after eop_desc */ |
3860 | for ( ; !cleaned; count++) { | 3860 | for ( ; !cleaned; count++) { |
3861 | tx_desc = E1000_TX_DESC(*tx_ring, i); | 3861 | tx_desc = E1000_TX_DESC(*tx_ring, i); |
3862 | buffer_info = &tx_ring->buffer_info[i]; | 3862 | buffer_info = &tx_ring->buffer_info[i]; |
@@ -4154,7 +4154,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, | |||
4154 | if (*work_done >= work_to_do) | 4154 | if (*work_done >= work_to_do) |
4155 | break; | 4155 | break; |
4156 | (*work_done)++; | 4156 | (*work_done)++; |
4157 | rmb(); /* read descriptor and rx_buffer_info after status DD */ | 4157 | dma_rmb(); /* read descriptor and rx_buffer_info after status DD */ |
4158 | 4158 | ||
4159 | status = rx_desc->status; | 4159 | status = rx_desc->status; |
4160 | 4160 | ||
@@ -4375,7 +4375,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, | |||
4375 | if (*work_done >= work_to_do) | 4375 | if (*work_done >= work_to_do) |
4376 | break; | 4376 | break; |
4377 | (*work_done)++; | 4377 | (*work_done)++; |
4378 | rmb(); /* read descriptor and rx_buffer_info after status DD */ | 4378 | dma_rmb(); /* read descriptor and rx_buffer_info after status DD */ |
4379 | 4379 | ||
4380 | status = rx_desc->status; | 4380 | status = rx_desc->status; |
4381 | length = le16_to_cpu(rx_desc->length); | 4381 | length = le16_to_cpu(rx_desc->length); |