This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / net / pkt_cls.h

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 4de3ea7..ca07367 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -71,38 +71,12 @@ static inline int tc_classify(struct sk_buff *skb, struct tcf_proto *tp, struct
 {
        int err = 0;
        u32 protocol = skb->protocol;
-#ifdef CONFIG_NET_CLS_ACT
-       struct tcf_proto *otp = tp;
-reclassify:
-#endif
-       protocol = skb->protocol;
 
        for ( ; tp; tp = tp->next) {
                if ((tp->protocol == protocol ||
-                       tp->protocol == __constant_htons(ETH_P_ALL)) &&
-                       (err = tp->classify(skb, tp, res)) >= 0) {
-#ifdef CONFIG_NET_CLS_ACT
-                       if ( TC_ACT_RECLASSIFY == err) {
-                               __u32 verd = (__u32) G_TC_VERD(skb->tc_verd);
-                               tp = otp;
-
-                               if (MAX_REC_LOOP < verd++) {
-                                       printk("rule prio %d protocol %02x reclassify is buggy packet dropped\n",tp->prio&0xffff, ntohs(tp->protocol));
-                                       return TC_ACT_SHOT;
-                               }
-                               skb->tc_verd = SET_TC_VERD(skb->tc_verd,verd);
-                               goto reclassify;
-                       } else {
-                               if (skb->tc_verd) 
-                                       skb->tc_verd = SET_TC_VERD(skb->tc_verd,0);
-                               return err;
-                       }
-#else
-
+                    tp->protocol == __constant_htons(ETH_P_ALL)) &&
+                   (err = tp->classify(skb, tp, res)) >= 0)
                        return err;
-#endif
-            }
-
        }
        return -1;
 }
@@ -116,8 +90,6 @@ static inline void tcf_destroy(struct tcf_proto *tp)
 
 extern int register_tcf_proto_ops(struct tcf_proto_ops *ops);
 extern int unregister_tcf_proto_ops(struct tcf_proto_ops *ops);
-extern int ing_filter(struct sk_buff *skb);
-