X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fpkt_sched.h;h=b80dbc3b5d801e1aab5f82a15e434346acd41e04;hb=6367666f534ee8fa9c6a7b667f38b5e445f85918;hp=73d84c071cb1d17018a0b490e003f48d3b7e3d8a;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 73d84c071..b80dbc3b5 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -117,11 +117,8 @@ enum
 	TCA_TBF_PARMS,
 	TCA_TBF_RTAB,
 	TCA_TBF_PTAB,
-	__TCA_TBF_MAX,
 };
 
-#define TCA_TBF_MAX (__TCA_TBF_MAX - 1)
-
 
 /* TEQL section */
 
@@ -154,11 +151,8 @@ enum
 	TCA_RED_UNSPEC,
 	TCA_RED_PARMS,
 	TCA_RED_STAB,
-	__TCA_RED_MAX,
 };
 
-#define TCA_RED_MAX (__TCA_RED_MAX - 1)
-
 struct tc_red_qopt
 {
 	__u32		limit;		/* HARD maximal queue length (bytes)	*/
@@ -189,11 +183,8 @@ enum
        TCA_GRED_PARMS,
        TCA_GRED_STAB,
        TCA_GRED_DPS,
-	   __TCA_GRED_MAX,
 };
 
-#define TCA_GRED_MAX (__TCA_GRED_MAX - 1)
-
 #define TCA_SET_OFF TCA_GRED_PARMS
 struct tc_gred_qopt
 {
@@ -258,11 +249,7 @@ enum
 	TCA_HTB_INIT,
 	TCA_HTB_CTAB,
 	TCA_HTB_RTAB,
-	__TCA_HTB_MAX,
 };
-
-#define TCA_HTB_MAX (__TCA_HTB_MAX - 1)
-
 struct tc_htb_xstats
 {
 	__u32 lends;
@@ -300,12 +287,9 @@ enum
 	TCA_HFSC_RSC,
 	TCA_HFSC_FSC,
 	TCA_HFSC_USC,
-	__TCA_HFSC_MAX,
+	TCA_HFSC_MAX = TCA_HFSC_USC
 };
 
-#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
-
-
 /* CBQ section */
 
 #define TC_CBQ_MAXPRIO		8
@@ -386,10 +370,9 @@ enum
 	TCA_CBQ_RATE,
 	TCA_CBQ_RTAB,
 	TCA_CBQ_POLICE,
-	__TCA_CBQ_MAX,
 };
 
-#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
+#define TCA_CBQ_MAX	TCA_CBQ_POLICE
 
 /* dsmark section */
 
@@ -399,11 +382,10 @@ enum {
 	TCA_DSMARK_DEFAULT_INDEX,
 	TCA_DSMARK_SET_TC_INDEX,
 	TCA_DSMARK_MASK,
-	TCA_DSMARK_VALUE,
-	__TCA_DSMARK_MAX,
+	TCA_DSMARK_VALUE
 };
 
-#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
+#define TCA_DSMARK_MAX TCA_DSMARK_VALUE
 
 /* ATM  section */
 
@@ -414,11 +396,10 @@ enum {
 	TCA_ATM_HDR,		/* LL header */
 	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */
 	TCA_ATM_ADDR,		/* PVC address (for output only) */
-	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */
-	__TCA_ATM_MAX,
+	TCA_ATM_STATE		/* VC state (ATM_VS_*; for output only) */
 };
 
-#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)
+#define TCA_ATM_MAX	TCA_ATM_STATE
 
 /* Network emulator */
 
@@ -427,10 +408,9 @@ enum
 	TCA_NETEM_UNSPEC,
 	TCA_NETEM_CORR,
 	TCA_NETEM_DELAY_DIST,
-	__TCA_NETEM_MAX,
 };
 
-#define TCA_NETEM_MAX (__TCA_NETEM_MAX - 1)
+#define TCA_NETEM_MAX	TCA_NETEM_DELAY_DIST
 
 struct tc_netem_qopt
 {