sfc: Allow resets to be upgraded; use atomic ops for safety

[firefly-linux-kernel-4.4.55.git] / drivers / net / sfc / falcon.c

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 60176e873d62a3a48f4862518c8430ed84253094..a4c7830ec9b085fc91e214d34fb171377e43fce8 100644 (file)
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -536,7 +536,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
        efx_oword_t reg;
        int link_speed, isolate;
 
-       isolate = (efx->reset_pending != RESET_TYPE_NONE);
+       isolate = !!ACCESS_ONCE(efx->reset_pending);
 
        switch (link_state->speed) {
        case 10000: link_speed = 3; break;