aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/efx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sfc/efx.c')
-rw-r--r--drivers/net/sfc/efx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index df19e86ab2e7..86d40295a777 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -691,7 +691,7 @@ static void efx_stop_port(struct efx_nic *efx)
691 mutex_unlock(&efx->mac_lock); 691 mutex_unlock(&efx->mac_lock);
692 692
693 /* Serialise against efx_set_multicast_list() */ 693 /* Serialise against efx_set_multicast_list() */
694 if (NET_DEV_REGISTERED(efx)) { 694 if (efx_dev_registered(efx)) {
695 netif_tx_lock_bh(efx->net_dev); 695 netif_tx_lock_bh(efx->net_dev);
696 netif_tx_unlock_bh(efx->net_dev); 696 netif_tx_unlock_bh(efx->net_dev);
697 } 697 }
@@ -1030,7 +1030,7 @@ static void efx_start_all(struct efx_nic *efx)
1030 return; 1030 return;
1031 if ((efx->state != STATE_RUNNING) && (efx->state != STATE_INIT)) 1031 if ((efx->state != STATE_RUNNING) && (efx->state != STATE_INIT))
1032 return; 1032 return;
1033 if (NET_DEV_REGISTERED(efx) && !netif_running(efx->net_dev)) 1033 if (efx_dev_registered(efx) && !netif_running(efx->net_dev))
1034 return; 1034 return;
1035 1035
1036 /* Mark the port as enabled so port reconfigurations can start, then 1036 /* Mark the port as enabled so port reconfigurations can start, then
@@ -1112,7 +1112,7 @@ static void efx_stop_all(struct efx_nic *efx)
1112 /* Stop the kernel transmit interface late, so the watchdog 1112 /* Stop the kernel transmit interface late, so the watchdog
1113 * timer isn't ticking over the flush */ 1113 * timer isn't ticking over the flush */
1114 efx_stop_queue(efx); 1114 efx_stop_queue(efx);
1115 if (NET_DEV_REGISTERED(efx)) { 1115 if (efx_dev_registered(efx)) {
1116 netif_tx_lock_bh(efx->net_dev); 1116 netif_tx_lock_bh(efx->net_dev);
1117 netif_tx_unlock_bh(efx->net_dev); 1117 netif_tx_unlock_bh(efx->net_dev);
1118 } 1118 }
@@ -1550,7 +1550,7 @@ static void efx_unregister_netdev(struct efx_nic *efx)
1550 efx_for_each_tx_queue(tx_queue, efx) 1550 efx_for_each_tx_queue(tx_queue, efx)
1551 efx_release_tx_buffers(tx_queue); 1551 efx_release_tx_buffers(tx_queue);
1552 1552
1553 if (NET_DEV_REGISTERED(efx)) { 1553 if (efx_dev_registered(efx)) {
1554 strlcpy(efx->name, pci_name(efx->pci_dev), sizeof(efx->name)); 1554 strlcpy(efx->name, pci_name(efx->pci_dev), sizeof(efx->name));
1555 unregister_netdev(efx->net_dev); 1555 unregister_netdev(efx->net_dev);
1556 } 1556 }