Merge with Linux 2.2.8.

1 files changed, 30 insertions, 1 deletions

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 0c38cac86..36935ed3a 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -23,9 +23,12 @@ enum
 	TCA_POLICE_TBF,
 	TCA_POLICE_RATE,
 	TCA_POLICE_PEAKRATE,
+	TCA_POLICE_AVRATE,
+	TCA_POLICE_RESULT
+#define TCA_POLICE_RESULT TCA_POLICE_RESULT
 };
 
-#define TCA_POLICE_MAX TCA_POLICE_PEAKRATE
+#define TCA_POLICE_MAX TCA_POLICE_RESULT
 
 /* U32 filters */
 
@@ -114,4 +117,30 @@ struct tc_rsvp_pinfo
 	__u8	tunnelhdr;
 };
 
+/* ROUTE filter */
+
+enum
+{
+	TCA_ROUTE4_UNSPEC,
+	TCA_ROUTE4_CLASSID,
+	TCA_ROUTE4_TO,
+	TCA_ROUTE4_FROM,
+	TCA_ROUTE4_IIF,
+	TCA_ROUTE4_POLICE,
+};
+
+#define TCA_ROUTE4_MAX TCA_ROUTE4_POLICE
+
+
+/* FW filter */
+
+enum
+{
+	TCA_FW_UNSPEC,
+	TCA_FW_CLASSID,
+	TCA_FW_POLICE,
+};
+
+#define TCA_FW_MAX TCA_FW_POLICE
+
 #endif