upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / net / sched / sch_prio.c

diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 6961f08..7804835 100644 (file)
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -15,7 +15,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -107,8 +107,8 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc* sch)
                goto dropped;
 
        if ((ret = qdisc->enqueue(skb, qdisc)) == NET_XMIT_SUCCESS) {
-               sch->stats.bytes += skb->len;
-               sch->stats.packets++;
+               sch->bstats.bytes += skb->len;
+               sch->bstats.packets++;
                sch->q.qlen++;
                return NET_XMIT_SUCCESS;
        }
@@ -117,10 +117,10 @@ dropped:
 #ifdef CONFIG_NET_CLS_ACT
        if (NET_XMIT_DROP == ret) {
 #endif
-               sch->stats.drops++;
+               sch->qstats.drops++;
 #ifdef CONFIG_NET_CLS_ACT
        } else {
-               sch->stats.overlimits++; /* abuse, but noone uses it */
+               sch->qstats.overlimits++; /* abuse, but noone uses it */
        }
 #endif
        return ret; 
@@ -139,10 +139,11 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch)
 
        if ((ret = qdisc->ops->requeue(skb, qdisc)) == 0) {
                sch->q.qlen++;
+               sch->qstats.requeues++;
                return 0;
        }
 dropped:
-       sch->stats.drops++;
+       sch->qstats.drops++;
        return NET_XMIT_DROP;
 }