netdev: Make netif_schedule() routines work with netdev_queue objects.
Only plain netif_schedule() remains taking a net_device, mostly as a
compatability item while we transition the rest of these interfaces.
Everything else calls netif_schedule_queue() or __netif_schedule(),
both of which take a netdev_queue pointer.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index aae6c6d..28aa8e7 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -952,12 +952,19 @@
#define HAVE_NETIF_QUEUE
-extern void __netif_schedule(struct net_device *dev);
+extern void __netif_schedule(struct netdev_queue *txq);
+
+static inline void netif_schedule_queue(struct netdev_queue *txq)
+{
+ struct net_device *dev = txq->dev;
+
+ if (!test_bit(__LINK_STATE_XOFF, &dev->state))
+ __netif_schedule(txq);
+}
static inline void netif_schedule(struct net_device *dev)
{
- if (!test_bit(__LINK_STATE_XOFF, &dev->state))
- __netif_schedule(dev);
+ netif_schedule_queue(&dev->tx_queue);
}
/**
@@ -987,7 +994,7 @@
}
#endif
if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
- __netif_schedule(dev);
+ __netif_schedule(&dev->tx_queue);
}
/**
@@ -1103,7 +1110,7 @@
#endif
if (test_and_clear_bit(__LINK_STATE_XOFF,
&dev->egress_subqueue[queue_index].state))
- __netif_schedule(dev);
+ __netif_schedule(&dev->tx_queue);
#endif
}