Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[mirror_ubuntu-disco-kernel.git] / drivers / net / ethernet / neterion / vxge / vxge-main.c

diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 426c9a946eb4f9f372ca138c640351c78be9016d..fe7e0e1dd01def224bd1932483170e04d488ff72 100644 (file)
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -2623,7 +2623,7 @@ static void vxge_poll_vp_lockup(struct timer_list *t)
                ring = &vdev->vpaths[i].ring;
 
                /* Truncated to machine word size number of frames */
-               rx_frms = ACCESS_ONCE(ring->stats.rx_frms);
+               rx_frms = READ_ONCE(ring->stats.rx_frms);
 
                /* Did this vpath received any packets */
                if (ring->stats.prev_rx_frms == rx_frms) {