From 806883963f177c1636972de169621e1c0178c7af Mon Sep 17 00:00:00 2001 From: Steve Hodgson Date: Mon, 1 Sep 2008 12:48:20 +0100 Subject: [PATCH] --- yaml --- r: 111351 b: refs/heads/master c: dacccc741164edf95fb13dbf5eedb96fb94f7290 h: refs/heads/master i: 111349: 2af360601370fcd7fd9ae83f6c32e967bf052564 111347: dad814027016a4c8bf203c6c5fd76f51ff33187c 111343: bbdaa0fe5ff43f34dea50be3db96da314460e8a7 v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/efx.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc5d4be48617..557dfcea528c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8b87c17017f2ce1890fb9a7f85fb0fbf5643e37 +refs/heads/master: dacccc741164edf95fb13dbf5eedb96fb94f7290 diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c index d41a6e34da7d..be9382faf19d 100644 --- a/trunk/drivers/net/sfc/efx.c +++ b/trunk/drivers/net/sfc/efx.c @@ -1027,7 +1027,8 @@ static void efx_start_all(struct efx_nic *efx) /* Mark the port as enabled so port reconfigurations can start, then * restart the transmit interface early so the watchdog timer stops */ efx_start_port(efx); - efx_wake_queue(efx); + if (efx_dev_registered(efx)) + efx_wake_queue(efx); efx_for_each_channel(channel, efx) efx_start_channel(channel); @@ -1102,8 +1103,8 @@ static void efx_stop_all(struct efx_nic *efx) /* Stop the kernel transmit interface late, so the watchdog * timer isn't ticking over the flush */ - efx_stop_queue(efx); if (efx_dev_registered(efx)) { + efx_stop_queue(efx); netif_tx_lock_bh(efx->net_dev); netif_tx_unlock_bh(efx->net_dev); }