1 files changed, 28 insertions, 56 deletions

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 3c842edff388..7f6ba8658abe 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -75,8 +75,7 @@ bits 9,10,11: redirect counter -  redirect TTL. Loop avoidance
 #define SET_TC_AT(v,n)   ((V_TC_AT(n)) | (v & ~M_TC_AT))
 
 /* Action attributes */
-enum
-{
+enum {
         TCA_ACT_UNSPEC,
         TCA_ACT_KIND,
         TCA_ACT_OPTIONS,
@@ -108,8 +107,7 @@ enum
 #define TC_ACT_JUMP             0x10000000
 
 /* Action type identifiers*/
-enum
-{
+enum {
         TCA_ID_UNSPEC=0,
         TCA_ID_POLICE=1,
         /* other actions go here */
@@ -118,8 +116,7 @@ enum
 
 #define TCA_ID_MAX __TCA_ID_MAX
 
-struct tc_police
-{
+struct tc_police {
         __u32                   index;
         int                     action;
 #define TC_POLICE_UNSPEC        TC_ACT_UNSPEC
@@ -138,15 +135,13 @@ struct tc_police
         __u32                   capab;
 };
 
-struct tcf_t
-{
+struct tcf_t {
         __u64   install;
         __u64   lastuse;
         __u64   expires;
 };
 
-struct tc_cnt
-{
+struct tc_cnt {
         int                   refcnt; 
         int                   bindcnt;
 };
@@ -158,8 +153,7 @@ struct tc_cnt
         int                   refcnt; \
         int                   bindcnt
 
-enum
-{
+enum {
         TCA_POLICE_UNSPEC,
         TCA_POLICE_TBF,
         TCA_POLICE_RATE,
@@ -182,8 +176,7 @@ enum
 #define TC_U32_UNSPEC   0
 #define TC_U32_ROOT     (0xFFF00000)
 
-enum
-{
+enum {
         TCA_U32_UNSPEC,
         TCA_U32_CLASSID,
         TCA_U32_HASH,
@@ -200,16 +193,14 @@ enum
 
 #define TCA_U32_MAX (__TCA_U32_MAX - 1)
 
-struct tc_u32_key
-{
+struct tc_u32_key {
         __be32          mask;
         __be32          val;
         int             off;
         int             offmask;
 };
 
-struct tc_u32_sel
-{
+struct tc_u32_sel {
         unsigned char           flags;
         unsigned char           offshift;
         unsigned char           nkeys;
@@ -223,15 +214,13 @@ struct tc_u32_sel
         struct tc_u32_key       keys[0];
 };
 
-struct tc_u32_mark
-{
+struct tc_u32_mark {
         __u32           val;
         __u32           mask;
         __u32           success;
 };
 
-struct tc_u32_pcnt
-{
+struct tc_u32_pcnt {
         __u64 rcnt;
         __u64 rhit;
         __u64 kcnts[0];
@@ -249,8 +238,7 @@ struct tc_u32_pcnt
 
 /* RSVP filter */
 
-enum
-{
+enum {
         TCA_RSVP_UNSPEC,
         TCA_RSVP_CLASSID,
         TCA_RSVP_DST,
@@ -263,15 +251,13 @@ enum
 
 #define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
 
-struct tc_rsvp_gpi
-{
+struct tc_rsvp_gpi {
         __u32   key;
         __u32   mask;
         int     offset;
 };
 
-struct tc_rsvp_pinfo
-{
+struct tc_rsvp_pinfo {
         struct tc_rsvp_gpi dpi;
         struct tc_rsvp_gpi spi;
         __u8    protocol;
@@ -282,8 +268,7 @@ struct tc_rsvp_pinfo
 
 /* ROUTE filter */
 
-enum
-{
+enum {
         TCA_ROUTE4_UNSPEC,
         TCA_ROUTE4_CLASSID,
         TCA_ROUTE4_TO,
@@ -299,8 +284,7 @@ enum
 
 /* FW filter */
 
-enum
-{
+enum {
         TCA_FW_UNSPEC,
         TCA_FW_CLASSID,
         TCA_FW_POLICE,
@@ -314,8 +298,7 @@ enum
 
 /* TC index filter */
 
-enum
-{
+enum {
         TCA_TCINDEX_UNSPEC,
         TCA_TCINDEX_HASH,
         TCA_TCINDEX_MASK,
@@ -331,8 +314,7 @@ enum
 
 /* Flow filter */
 
-enum
-{
+enum {
         FLOW_KEY_SRC,
         FLOW_KEY_DST,
         FLOW_KEY_PROTO,
@@ -355,14 +337,12 @@ enum
 
 #define FLOW_KEY_MAX    (__FLOW_KEY_MAX - 1)
 
-enum
-{
+enum {
         FLOW_MODE_MAP,
         FLOW_MODE_HASH,
 };
 
-enum
-{
+enum {
         TCA_FLOW_UNSPEC,
         TCA_FLOW_KEYS,
         TCA_FLOW_MODE,
@@ -383,8 +363,7 @@ enum
 
 /* Basic filter */
 
-enum
-{
+enum {
         TCA_BASIC_UNSPEC,
         TCA_BASIC_CLASSID,
         TCA_BASIC_EMATCHES,
@@ -398,8 +377,7 @@ enum
 
 /* Cgroup classifier */
 
-enum
-{
+enum {
         TCA_CGROUP_UNSPEC,
         TCA_CGROUP_ACT,
         TCA_CGROUP_POLICE,
@@ -411,14 +389,12 @@ enum
 
 /* Extended Matches */
 
-struct tcf_ematch_tree_hdr
-{
+struct tcf_ematch_tree_hdr {
         __u16           nmatches;
         __u16           progid;
 };
 
-enum
-{
+enum {
         TCA_EMATCH_TREE_UNSPEC,
         TCA_EMATCH_TREE_HDR,
         TCA_EMATCH_TREE_LIST,
@@ -426,8 +402,7 @@ enum
 };
 #define TCA_EMATCH_TREE_MAX (__TCA_EMATCH_TREE_MAX - 1)
 
-struct tcf_ematch_hdr
-{
+struct tcf_ematch_hdr {
         __u16           matchid;
         __u16           kind;
         __u16           flags;
@@ -457,8 +432,7 @@ struct tcf_ematch_hdr
 #define TCF_EM_REL_MASK 3
 #define TCF_EM_REL_VALID(v) (((v) & TCF_EM_REL_MASK) != TCF_EM_REL_MASK)
 
-enum
-{
+enum {
         TCF_LAYER_LINK,
         TCF_LAYER_NETWORK,
         TCF_LAYER_TRANSPORT,
@@ -479,13 +453,11 @@ enum
 #define        TCF_EM_VLAN              6
 #define TCF_EM_MAX              6
 
-enum
-{
+enum {
         TCF_EM_PROG_TC
 };
 
-enum
-{
+enum {
         TCF_EM_OPND_EQ,
         TCF_EM_OPND_GT,
         TCF_EM_OPND_LT