diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 18:50:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 18:50:32 -0400 |
| commit | 06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c (patch) | |
| tree | 9f93c1a56082d80e5741bb2a231e93314efbcd7e /net/sched | |
| parent | 22fa8d59be28affbecc6ae87abf528aebeebff24 (diff) | |
| parent | 03cf786c4e83dba404ad23ca58f49147ae52dffd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4]: Explicitly call fib_get_table() in fib_frontend.c
[NET]: Use BUILD_BUG_ON in net/core/flowi.c
[NET]: Remove in-code externs for some functions from net/core/dev.c
[NET]: Don't declare extern variables in net/core/sysctl_net_core.c
[TCP]: Remove unneeded implicit type cast when calling tcp_minshall_update()
[NET]: Treat the sign of the result of skb_headroom() consistently
[9P]: Fix missing unlock before return in p9_mux_poll_start
[PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE
[IPV4] ip_gre: sendto/recvfrom NBMA address
[SCTP]: Consolidate sctp_ulpq_renege_xxx functions
[NETLINK]: Fix ACK processing after netlink_dump_start
[VLAN]: MAINTAINERS update
[DCCP]: Implement SIOCINQ/FIONREAD
[NET]: Validate device addr prior to interface-up
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_prio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index abd82fc3ec..de894096e4 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
| @@ -136,7 +136,7 @@ prio_dequeue(struct Qdisc* sch) | |||
| 136 | * pulling an skb. This way we avoid excessive requeues | 136 | * pulling an skb. This way we avoid excessive requeues |
| 137 | * for slower queues. | 137 | * for slower queues. |
| 138 | */ | 138 | */ |
| 139 | if (!netif_subqueue_stopped(sch->dev, (q->mq ? prio : 0))) { | 139 | if (!__netif_subqueue_stopped(sch->dev, (q->mq ? prio : 0))) { |
| 140 | qdisc = q->queues[prio]; | 140 | qdisc = q->queues[prio]; |
| 141 | skb = qdisc->dequeue(qdisc); | 141 | skb = qdisc->dequeue(qdisc); |
| 142 | if (skb) { | 142 | if (skb) { |
| @@ -165,7 +165,7 @@ static struct sk_buff *rr_dequeue(struct Qdisc* sch) | |||
| 165 | * for slower queues. If the queue is stopped, try the | 165 | * for slower queues. If the queue is stopped, try the |
| 166 | * next queue. | 166 | * next queue. |
| 167 | */ | 167 | */ |
| 168 | if (!netif_subqueue_stopped(sch->dev, | 168 | if (!__netif_subqueue_stopped(sch->dev, |
| 169 | (q->mq ? q->curband : 0))) { | 169 | (q->mq ? q->curband : 0))) { |
| 170 | qdisc = q->queues[q->curband]; | 170 | qdisc = q->queues[q->curband]; |
| 171 | skb = qdisc->dequeue(qdisc); | 171 | skb = qdisc->dequeue(qdisc); |