---

yaml --- r: 143411 b: refs/heads/master c: d543103 h: refs/heads/master i: 143409: c8c651d 143407: c936c07 v: v3
git-mirror · Apr 11, 2009 · 2f09e51 · 2f09e51
1 parent 10c2339
commit 2f09e51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
 	}
 }