Commit ede264af authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller

[PKT_SCHED]: Max TLV types cleanup

Cleans up maximum TLV type of existing definitions and adds
missing definitions for TBF, RED, GRED, and HTB.
Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9539ad41
...@@ -117,8 +117,11 @@ enum ...@@ -117,8 +117,11 @@ enum
TCA_TBF_PARMS, TCA_TBF_PARMS,
TCA_TBF_RTAB, TCA_TBF_RTAB,
TCA_TBF_PTAB, TCA_TBF_PTAB,
__TCA_TBF_MAX,
}; };
#define TCA_TBF_MAX (__TCA_TBF_MAX - 1)
/* TEQL section */ /* TEQL section */
...@@ -151,8 +154,11 @@ enum ...@@ -151,8 +154,11 @@ enum
TCA_RED_UNSPEC, TCA_RED_UNSPEC,
TCA_RED_PARMS, TCA_RED_PARMS,
TCA_RED_STAB, TCA_RED_STAB,
__TCA_RED_MAX,
}; };
#define TCA_RED_MAX (__TCA_RED_MAX - 1)
struct tc_red_qopt struct tc_red_qopt
{ {
__u32 limit; /* HARD maximal queue length (bytes) */ __u32 limit; /* HARD maximal queue length (bytes) */
...@@ -183,8 +189,11 @@ enum ...@@ -183,8 +189,11 @@ enum
TCA_GRED_PARMS, TCA_GRED_PARMS,
TCA_GRED_STAB, TCA_GRED_STAB,
TCA_GRED_DPS, TCA_GRED_DPS,
__TCA_GRED_MAX,
}; };
#define TCA_GRED_MAX (__TCA_GRED_MAX - 1)
#define TCA_SET_OFF TCA_GRED_PARMS #define TCA_SET_OFF TCA_GRED_PARMS
struct tc_gred_qopt struct tc_gred_qopt
{ {
...@@ -249,7 +258,11 @@ enum ...@@ -249,7 +258,11 @@ enum
TCA_HTB_INIT, TCA_HTB_INIT,
TCA_HTB_CTAB, TCA_HTB_CTAB,
TCA_HTB_RTAB, TCA_HTB_RTAB,
__TCA_HTB_MAX,
}; };
#define TCA_HTB_MAX (__TCA_HTB_MAX - 1)
struct tc_htb_xstats struct tc_htb_xstats
{ {
__u32 lends; __u32 lends;
...@@ -287,9 +300,12 @@ enum ...@@ -287,9 +300,12 @@ enum
TCA_HFSC_RSC, TCA_HFSC_RSC,
TCA_HFSC_FSC, TCA_HFSC_FSC,
TCA_HFSC_USC, TCA_HFSC_USC,
TCA_HFSC_MAX = TCA_HFSC_USC __TCA_HFSC_MAX,
}; };
#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
/* CBQ section */ /* CBQ section */
#define TC_CBQ_MAXPRIO 8 #define TC_CBQ_MAXPRIO 8
...@@ -370,9 +386,10 @@ enum ...@@ -370,9 +386,10 @@ enum
TCA_CBQ_RATE, TCA_CBQ_RATE,
TCA_CBQ_RTAB, TCA_CBQ_RTAB,
TCA_CBQ_POLICE, TCA_CBQ_POLICE,
__TCA_CBQ_MAX,
}; };
#define TCA_CBQ_MAX TCA_CBQ_POLICE #define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1)
/* dsmark section */ /* dsmark section */
...@@ -382,10 +399,11 @@ enum { ...@@ -382,10 +399,11 @@ enum {
TCA_DSMARK_DEFAULT_INDEX, TCA_DSMARK_DEFAULT_INDEX,
TCA_DSMARK_SET_TC_INDEX, TCA_DSMARK_SET_TC_INDEX,
TCA_DSMARK_MASK, TCA_DSMARK_MASK,
TCA_DSMARK_VALUE TCA_DSMARK_VALUE,
__TCA_DSMARK_MAX,
}; };
#define TCA_DSMARK_MAX TCA_DSMARK_VALUE #define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
/* ATM section */ /* ATM section */
...@@ -396,10 +414,11 @@ enum { ...@@ -396,10 +414,11 @@ enum {
TCA_ATM_HDR, /* LL header */ TCA_ATM_HDR, /* LL header */
TCA_ATM_EXCESS, /* excess traffic class (0 for CLP) */ TCA_ATM_EXCESS, /* excess traffic class (0 for CLP) */
TCA_ATM_ADDR, /* PVC address (for output only) */ TCA_ATM_ADDR, /* PVC address (for output only) */
TCA_ATM_STATE /* VC state (ATM_VS_*; for output only) */ TCA_ATM_STATE, /* VC state (ATM_VS_*; for output only) */
__TCA_ATM_MAX,
}; };
#define TCA_ATM_MAX TCA_ATM_STATE #define TCA_ATM_MAX (__TCA_ATM_MAX - 1)
/* Network emulator */ /* Network emulator */
...@@ -408,9 +427,10 @@ enum ...@@ -408,9 +427,10 @@ enum
TCA_NETEM_UNSPEC, TCA_NETEM_UNSPEC,
TCA_NETEM_CORR, TCA_NETEM_CORR,
TCA_NETEM_DELAY_DIST, TCA_NETEM_DELAY_DIST,
__TCA_NETEM_MAX,
}; };
#define TCA_NETEM_MAX TCA_NETEM_DELAY_DIST #define TCA_NETEM_MAX (__TCA_NETEM_MAX - 1)
struct tc_netem_qopt struct tc_netem_qopt
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment