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>
This commit is contained in:
David S. Miller
2008-07-08 23:11:25 -07:00
parent 970565bbad
commit 86d804e10a
6 changed files with 27 additions and 19 deletions

View File

@@ -1320,12 +1320,13 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
}
void __netif_schedule(struct net_device *dev)
void __netif_schedule(struct netdev_queue *txq)
{
struct net_device *dev = txq->dev;
if (!test_and_set_bit(__LINK_STATE_SCHED, &dev->state)) {
struct netdev_queue *txq = &dev->tx_queue;
unsigned long flags;
struct softnet_data *sd;
unsigned long flags;
local_irq_save(flags);
sd = &__get_cpu_var(softnet_data);
@@ -1932,7 +1933,7 @@ static void net_tx_action(struct softirq_action *h)
qdisc_run(dev);
spin_unlock(&txq->lock);
} else {
netif_schedule(dev);
netif_schedule_queue(txq);
}
}
}