aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorSathya Perla <sathyap@serverengines.com>2009-06-09 22:18:35 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-11 05:47:15 -0400
commitb305be78a044c5f6a9d146229a280d08db0c630a (patch)
treef047ec1f8a5c9999d5870e58a6b0b2b0de2f58ad /drivers/net/benet
parentc0feed87fe452c20681ae29909adaecedd1ec9f3 (diff)
be2net: Use cancel_delayed_work_sync instead of cancel_delayed_work()
Use cancel_delayed_work_sycn instead of cancel_delayed_work() to reliably kill be_worker() as it rearms itself. Signed-off-by: Sathya Perla <sathyap@serverengines.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 347d002fa425..69046a109ac3 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1533,7 +1533,7 @@ static int be_close(struct net_device *netdev)
1533 struct be_eq_obj *tx_eq = &adapter->tx_eq; 1533 struct be_eq_obj *tx_eq = &adapter->tx_eq;
1534 int vec; 1534 int vec;
1535 1535
1536 cancel_delayed_work(&adapter->work); 1536 cancel_delayed_work_sync(&adapter->work);
1537 1537
1538 netif_stop_queue(netdev); 1538 netif_stop_queue(netdev);
1539 netif_carrier_off(netdev); 1539 netif_carrier_off(netdev);