upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 13b5c34..7ea1d35 100644 (file)
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -151,12 +151,12 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
         * firewall FW_* code.
         */
 #ifdef CONFIG_NET_CLS_ACT
-       sch->stats.packets++;
-       sch->stats.bytes += skb->len;
+       sch->bstats.packets++;
+       sch->bstats.bytes += skb->len;
        switch (result) {
                case TC_ACT_SHOT:
                        result = TC_ACT_SHOT;
-                       sch->stats.drops++;
+                       sch->qstats.drops++;
                        break;
                case TC_ACT_STOLEN:
                case TC_ACT_QUEUED:
@@ -176,14 +176,14 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
        switch (result) {
                case TC_POLICE_SHOT:
                result = NF_DROP;
-               sch->stats.drops++;
+               sch->qstats.drops++;
                break;
                case TC_POLICE_RECLASSIFY: /* DSCP remarking here ? */
                case TC_POLICE_OK:
                case TC_POLICE_UNSPEC:
                default:
-               sch->stats.packets++;
-               sch->stats.bytes += skb->len;
+               sch->bstats.packets++;
+               sch->bstats.bytes += skb->len;
                result = NF_ACCEPT;
                break;
        };
@@ -191,8 +191,8 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
 #else
        D2PRINTK("Overriding result to ACCEPT\n");
        result = NF_ACCEPT;
-       sch->stats.packets++;
-       sch->stats.bytes += skb->len;
+       sch->bstats.packets++;
+       sch->bstats.bytes += skb->len;
 #endif
 #endif