Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / net / sched / sch_dsmark.c

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index e38e0d00d1e6204be6e1fcd7e24eff74529d921d..60f89199e3da861f8c1af675fa402f071328c3d5 100644 (file)
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -9,7 +9,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/skbuff.h>
-#include <linux/netdevice.h> /* for pkt_sched */
 #include <linux/rtnetlink.h>
 #include <net/pkt_sched.h>
 #include <net/dsfield.h>
@@ -226,7 +225,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                        default:
                                skb->tc_index = 0;
                                break;
-               };
+               }
        }
 
        if (TC_H_MAJ(skb->priority) == sch->handle)
@@ -238,26 +237,24 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                D2PRINTK("result %d class 0x%04x\n", result, res.classid);
 
                switch (result) {
-#ifdef CONFIG_NET_CLS_POLICE
-                       case TC_POLICE_SHOT:
-                               kfree_skb(skb);
-                               sch->qstats.drops++;
-                               return NET_XMIT_POLICED;
-#if 0
-                       case TC_POLICE_RECLASSIFY:
-                               /* FIXME: what to do here ??? */
-#endif
+#ifdef CONFIG_NET_CLS_ACT
+               case TC_ACT_QUEUED:
+               case TC_ACT_STOLEN:
+                       kfree_skb(skb);
+                       return NET_XMIT_SUCCESS;
+               case TC_ACT_SHOT:
+                       kfree_skb(skb);
+                       sch->qstats.drops++;
+                       return NET_XMIT_BYPASS;
 #endif
-                       case TC_POLICE_OK:
-                               skb->tc_index = TC_H_MIN(res.classid);
-                               break;
-                       case TC_POLICE_UNSPEC:
-                               /* fall through */
-                       default:
-                               if (p->default_index != NO_DEFAULT_INDEX)
-                                       skb->tc_index = p->default_index;
-                               break;
-               };
+               case TC_ACT_OK:
+                       skb->tc_index = TC_H_MIN(res.classid);
+                       break;
+               default:
+                       if (p->default_index != NO_DEFAULT_INDEX)
+                               skb->tc_index = p->default_index;
+                       break;
+               }
        }
 
        err = p->q->enqueue(skb,p->q);
@@ -310,7 +307,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
                                       "unsupported protocol %d\n",
                                       ntohs(skb->protocol));
                        break;
-       };
+       }
 
        return skb;
 }