From 2f09e513b04692538047c6de174c1c7c7b11b389 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Wed, 8 Apr 2009 13:15:22 +0000 Subject: [PATCH] --- yaml --- r: 143411 b: refs/heads/master c: d543103a0c75edc0a7a08dfd796de67466a15dfb h: refs/heads/master i: 143409: c8c651dadd41b59a772076352e5ef30444e7b587 143407: c936c07c63e51b5f7c271dd736bd0f964c07f9b9 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8dbd26a7d7ae..561cc7248873 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c2da9c2182fe64b1443a75efc09e493923e86b0 +refs/heads/master: d543103a0c75edc0a7a08dfd796de67466a15dfb diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 91d792d17e09..ea8eb2214b09 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1430,7 +1430,7 @@ void netif_device_detach(struct net_device *dev) { if (test_and_clear_bit(__LINK_STATE_PRESENT, &dev->state) && netif_running(dev)) { - netif_stop_queue(dev); + netif_tx_stop_all_queues(dev); } } EXPORT_SYMBOL(netif_device_detach); @@ -1445,7 +1445,7 @@ void netif_device_attach(struct net_device *dev) { if (!test_and_set_bit(__LINK_STATE_PRESENT, &dev->state) && netif_running(dev)) { - netif_wake_queue(dev); + netif_tx_wake_all_queues(dev); __netdev_watchdog_up(dev); } }