diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-14 19:28:11 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-14 19:28:11 (GMT) |
| commit | 200cfbb36ce360f7943c62b6c09885c215bfc1f5 (patch) | |
| tree | 8f7513bd35225f8681cd7d214d807b7e26211afa /net/sched | |
| parent | 29e0937bb693879221f575b01f26314b3f443322 (diff) | |
| parent | d831666e98b4f1e19ebdd2349735f47bf37cd293 (diff) | |
| download | linux-fsl-qoriq-200cfbb36ce360f7943c62b6c09885c215bfc1f5.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4] SNMP: Display new statistics at /proc/net/netstat
[IPV6]: Reverse sense of promisc tests in ip6_mc_input
[NET_SCHED]: prio qdisc boundary condition
[IPSEC]: Don't warn if high-order hash resize fails
[IPSEC]: Check validity of direction in xfrm_policy_byid
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_prio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 269a6e1..6d7542c 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c @@ -75,7 +75,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) band = res.classid; } band = TC_H_MIN(band) - 1; - if (band > q->bands) + if (band >= q->bands) return q->queues[q->prio2band[0]]; return q->queues[band]; |