Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-omap-h63xx.git] / net / core / link_watch.c

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 50218218445b6383cedf50f0c696bd33208cbe07..bf8f7af699d7035e6e61af7c794c10877cd4fff9 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -77,12 +77,10 @@ static void rfc2863_policy(struct net_device *dev)
 }
 
 
-static int linkwatch_urgent_event(struct net_device *dev)
+static bool linkwatch_urgent_event(struct net_device *dev)
 {
-       struct netdev_queue *txq = &dev->tx_queue;
-
        return netif_running(dev) && netif_carrier_ok(dev) &&
-              txq->qdisc != txq->qdisc_sleeping;
+               qdisc_tx_changing(dev);
 }
 
 
@@ -182,12 +180,9 @@ static void __linkwatch_run_queue(int urgent_only)
 
                rfc2863_policy(dev);
                if (dev->flags & IFF_UP) {
-                       if (netif_carrier_ok(dev)) {
-                               struct netdev_queue *txq = &dev->tx_queue;
-
-                               WARN_ON(txq->qdisc_sleeping == &noop_qdisc);
+                       if (netif_carrier_ok(dev))
                                dev_activate(dev);
-                       } else
+                       else
                                dev_deactivate(dev);
 
                        netdev_state_change(dev);
@@ -218,7 +213,7 @@ static void linkwatch_event(struct work_struct *dummy)
 
 void linkwatch_fire_event(struct net_device *dev)
 {
-       int urgent = linkwatch_urgent_event(dev);
+       bool urgent = linkwatch_urgent_event(dev);
 
        if (!test_and_set_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state)) {
                dev_hold(dev);