diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 4e56c3195989..74ec185a697f 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -947,7 +947,7 @@ static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done, | |||
947 | if (*work_done >= work_to_do) | 947 | if (*work_done >= work_to_do) |
948 | break; | 948 | break; |
949 | (*work_done)++; | 949 | (*work_done)++; |
950 | rmb(); /* read descriptor and rx_buffer_info after status DD */ | 950 | dma_rmb(); /* read descriptor and rx_buffer_info after status DD */ |
951 | 951 | ||
952 | skb = buffer_info->skb; | 952 | skb = buffer_info->skb; |
953 | buffer_info->skb = NULL; | 953 | buffer_info->skb = NULL; |
@@ -1232,7 +1232,7 @@ static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring) | |||
1232 | (count < tx_ring->count)) { | 1232 | (count < tx_ring->count)) { |
1233 | bool cleaned = false; | 1233 | bool cleaned = false; |
1234 | 1234 | ||
1235 | rmb(); /* read buffer_info after eop_desc */ | 1235 | dma_rmb(); /* read buffer_info after eop_desc */ |
1236 | for (; !cleaned; count++) { | 1236 | for (; !cleaned; count++) { |
1237 | tx_desc = E1000_TX_DESC(*tx_ring, i); | 1237 | tx_desc = E1000_TX_DESC(*tx_ring, i); |
1238 | buffer_info = &tx_ring->buffer_info[i]; | 1238 | buffer_info = &tx_ring->buffer_info[i]; |
@@ -1332,7 +1332,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done, | |||
1332 | break; | 1332 | break; |
1333 | (*work_done)++; | 1333 | (*work_done)++; |
1334 | skb = buffer_info->skb; | 1334 | skb = buffer_info->skb; |
1335 | rmb(); /* read descriptor and rx_buffer_info after status DD */ | 1335 | dma_rmb(); /* read descriptor and rx_buffer_info after status DD */ |
1336 | 1336 | ||
1337 | /* in the packet split case this is header only */ | 1337 | /* in the packet split case this is header only */ |
1338 | prefetch(skb->data - NET_IP_ALIGN); | 1338 | prefetch(skb->data - NET_IP_ALIGN); |
@@ -1536,7 +1536,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done, | |||
1536 | if (*work_done >= work_to_do) | 1536 | if (*work_done >= work_to_do) |
1537 | break; | 1537 | break; |
1538 | (*work_done)++; | 1538 | (*work_done)++; |
1539 | rmb(); /* read descriptor and rx_buffer_info after status DD */ | 1539 | dma_rmb(); /* read descriptor and rx_buffer_info after status DD */ |
1540 | 1540 | ||
1541 | skb = buffer_info->skb; | 1541 | skb = buffer_info->skb; |
1542 | buffer_info->skb = NULL; | 1542 | buffer_info->skb = NULL; |