diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-04 12:50:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-04 12:50:58 -0500 |
| commit | d94d9fee9fa4e66a0b91640a694b8b10177075b3 (patch) | |
| tree | 330b2b19e63c92f1fef3d9dbe0733ddeb0109664 /include/linux/tc_act | |
| parent | b8883a65be2d925ea82b14ca0068ce9a6c8bac1f (diff) | |
net: cleanup include/linux
This cleanup patch puts struct/union/enum opening braces,
in first line to ease grep games.
struct something
{
becomes :
struct something {
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tc_act')
| -rw-r--r-- | include/linux/tc_act/tc_defact.h | 6 | ||||
| -rw-r--r-- | include/linux/tc_act/tc_gact.h | 9 | ||||
| -rw-r--r-- | include/linux/tc_act/tc_ipt.h | 3 | ||||
| -rw-r--r-- | include/linux/tc_act/tc_mirred.h | 6 | ||||
| -rw-r--r-- | include/linux/tc_act/tc_nat.h | 6 | ||||
| -rw-r--r-- | include/linux/tc_act/tc_pedit.h | 9 |
6 files changed, 13 insertions, 26 deletions
diff --git a/include/linux/tc_act/tc_defact.h b/include/linux/tc_act/tc_defact.h index 964f473af0f0..6f65d07c7ce2 100644 --- a/include/linux/tc_act/tc_defact.h +++ b/include/linux/tc_act/tc_defact.h | |||
| @@ -3,13 +3,11 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/pkt_cls.h> | 4 | #include <linux/pkt_cls.h> |
| 5 | 5 | ||
| 6 | struct tc_defact | 6 | struct tc_defact { |
| 7 | { | ||
| 8 | tc_gen; | 7 | tc_gen; |
| 9 | }; | 8 | }; |
| 10 | 9 | ||
| 11 | enum | 10 | enum { |
| 12 | { | ||
| 13 | TCA_DEF_UNSPEC, | 11 | TCA_DEF_UNSPEC, |
| 14 | TCA_DEF_TM, | 12 | TCA_DEF_TM, |
| 15 | TCA_DEF_PARMS, | 13 | TCA_DEF_PARMS, |
diff --git a/include/linux/tc_act/tc_gact.h b/include/linux/tc_act/tc_gact.h index e895c0a39629..f7bf94eed510 100644 --- a/include/linux/tc_act/tc_gact.h +++ b/include/linux/tc_act/tc_gact.h | |||
| @@ -5,14 +5,12 @@ | |||
| 5 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
| 6 | 6 | ||
| 7 | #define TCA_ACT_GACT 5 | 7 | #define TCA_ACT_GACT 5 |
| 8 | struct tc_gact | 8 | struct tc_gact { |
| 9 | { | ||
| 10 | tc_gen; | 9 | tc_gen; |
| 11 | 10 | ||
| 12 | }; | 11 | }; |
| 13 | 12 | ||
| 14 | struct tc_gact_p | 13 | struct tc_gact_p { |
| 15 | { | ||
| 16 | #define PGACT_NONE 0 | 14 | #define PGACT_NONE 0 |
| 17 | #define PGACT_NETRAND 1 | 15 | #define PGACT_NETRAND 1 |
| 18 | #define PGACT_DETERM 2 | 16 | #define PGACT_DETERM 2 |
| @@ -22,8 +20,7 @@ struct tc_gact_p | |||
| 22 | int paction; | 20 | int paction; |
| 23 | }; | 21 | }; |
| 24 | 22 | ||
| 25 | enum | 23 | enum { |
| 26 | { | ||
| 27 | TCA_GACT_UNSPEC, | 24 | TCA_GACT_UNSPEC, |
| 28 | TCA_GACT_TM, | 25 | TCA_GACT_TM, |
| 29 | TCA_GACT_PARMS, | 26 | TCA_GACT_PARMS, |
diff --git a/include/linux/tc_act/tc_ipt.h b/include/linux/tc_act/tc_ipt.h index 4b6f7b6c7a79..a2335563d21f 100644 --- a/include/linux/tc_act/tc_ipt.h +++ b/include/linux/tc_act/tc_ipt.h | |||
| @@ -5,8 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #define TCA_ACT_IPT 6 | 6 | #define TCA_ACT_IPT 6 |
| 7 | 7 | ||
| 8 | enum | 8 | enum { |
| 9 | { | ||
| 10 | TCA_IPT_UNSPEC, | 9 | TCA_IPT_UNSPEC, |
| 11 | TCA_IPT_TABLE, | 10 | TCA_IPT_TABLE, |
| 12 | TCA_IPT_HOOK, | 11 | TCA_IPT_HOOK, |
diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h index 0a99ab60d610..7561750e8fd6 100644 --- a/include/linux/tc_act/tc_mirred.h +++ b/include/linux/tc_act/tc_mirred.h | |||
| @@ -10,15 +10,13 @@ | |||
| 10 | #define TCA_INGRESS_REDIR 3 /* packet redirect to INGRESS*/ | 10 | #define TCA_INGRESS_REDIR 3 /* packet redirect to INGRESS*/ |
| 11 | #define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */ | 11 | #define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */ |
| 12 | 12 | ||
| 13 | struct tc_mirred | 13 | struct tc_mirred { |
| 14 | { | ||
| 15 | tc_gen; | 14 | tc_gen; |
| 16 | int eaction; /* one of IN/EGRESS_MIRROR/REDIR */ | 15 | int eaction; /* one of IN/EGRESS_MIRROR/REDIR */ |
| 17 | __u32 ifindex; /* ifindex of egress port */ | 16 | __u32 ifindex; /* ifindex of egress port */ |
| 18 | }; | 17 | }; |
| 19 | 18 | ||
| 20 | enum | 19 | enum { |
| 21 | { | ||
| 22 | TCA_MIRRED_UNSPEC, | 20 | TCA_MIRRED_UNSPEC, |
| 23 | TCA_MIRRED_TM, | 21 | TCA_MIRRED_TM, |
| 24 | TCA_MIRRED_PARMS, | 22 | TCA_MIRRED_PARMS, |
diff --git a/include/linux/tc_act/tc_nat.h b/include/linux/tc_act/tc_nat.h index e7cf31e8ba79..6663aeba0b9a 100644 --- a/include/linux/tc_act/tc_nat.h +++ b/include/linux/tc_act/tc_nat.h | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #define TCA_ACT_NAT 9 | 7 | #define TCA_ACT_NAT 9 |
| 8 | 8 | ||
| 9 | enum | 9 | enum { |
| 10 | { | ||
| 11 | TCA_NAT_UNSPEC, | 10 | TCA_NAT_UNSPEC, |
| 12 | TCA_NAT_PARMS, | 11 | TCA_NAT_PARMS, |
| 13 | TCA_NAT_TM, | 12 | TCA_NAT_TM, |
| @@ -17,8 +16,7 @@ enum | |||
| 17 | 16 | ||
| 18 | #define TCA_NAT_FLAG_EGRESS 1 | 17 | #define TCA_NAT_FLAG_EGRESS 1 |
| 19 | 18 | ||
| 20 | struct tc_nat | 19 | struct tc_nat { |
| 21 | { | ||
| 22 | tc_gen; | 20 | tc_gen; |
| 23 | __be32 old_addr; | 21 | __be32 old_addr; |
| 24 | __be32 new_addr; | 22 | __be32 new_addr; |
diff --git a/include/linux/tc_act/tc_pedit.h b/include/linux/tc_act/tc_pedit.h index 54ce9064115a..716cfabcd5b2 100644 --- a/include/linux/tc_act/tc_pedit.h +++ b/include/linux/tc_act/tc_pedit.h | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #define TCA_ACT_PEDIT 7 | 7 | #define TCA_ACT_PEDIT 7 |
| 8 | 8 | ||
| 9 | enum | 9 | enum { |
| 10 | { | ||
| 11 | TCA_PEDIT_UNSPEC, | 10 | TCA_PEDIT_UNSPEC, |
| 12 | TCA_PEDIT_TM, | 11 | TCA_PEDIT_TM, |
| 13 | TCA_PEDIT_PARMS, | 12 | TCA_PEDIT_PARMS, |
| @@ -15,8 +14,7 @@ enum | |||
| 15 | }; | 14 | }; |
| 16 | #define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1) | 15 | #define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1) |
| 17 | 16 | ||
| 18 | struct tc_pedit_key | 17 | struct tc_pedit_key { |
| 19 | { | ||
| 20 | __u32 mask; /* AND */ | 18 | __u32 mask; /* AND */ |
| 21 | __u32 val; /*XOR */ | 19 | __u32 val; /*XOR */ |
| 22 | __u32 off; /*offset */ | 20 | __u32 off; /*offset */ |
| @@ -25,8 +23,7 @@ struct tc_pedit_key | |||
| 25 | __u32 shift; | 23 | __u32 shift; |
| 26 | }; | 24 | }; |
| 27 | 25 | ||
| 28 | struct tc_pedit_sel | 26 | struct tc_pedit_sel { |
| 29 | { | ||
| 30 | tc_gen; | 27 | tc_gen; |
| 31 | unsigned char nkeys; | 28 | unsigned char nkeys; |
| 32 | unsigned char flags; | 29 | unsigned char flags; |
