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_ematch | |
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_ematch')
-rw-r--r-- | include/linux/tc_ematch/tc_em_cmp.h | 6 | ||||
-rw-r--r-- | include/linux/tc_ematch/tc_em_meta.h | 15 | ||||
-rw-r--r-- | include/linux/tc_ematch/tc_em_nbyte.h | 3 | ||||
-rw-r--r-- | include/linux/tc_ematch/tc_em_text.h | 3 |
4 files changed, 9 insertions, 18 deletions
diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h index 38e7f7b25ec2..f34bb1bae083 100644 --- a/include/linux/tc_ematch/tc_em_cmp.h +++ b/include/linux/tc_ematch/tc_em_cmp.h | |||
@@ -4,8 +4,7 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
6 | 6 | ||
7 | struct tcf_em_cmp | 7 | struct tcf_em_cmp { |
8 | { | ||
9 | __u32 val; | 8 | __u32 val; |
10 | __u32 mask; | 9 | __u32 mask; |
11 | __u16 off; | 10 | __u16 off; |
@@ -15,8 +14,7 @@ struct tcf_em_cmp | |||
15 | __u8 opnd:4; | 14 | __u8 opnd:4; |
16 | }; | 15 | }; |
17 | 16 | ||
18 | enum | 17 | enum { |
19 | { | ||
20 | TCF_EM_ALIGN_U8 = 1, | 18 | TCF_EM_ALIGN_U8 = 1, |
21 | TCF_EM_ALIGN_U16 = 2, | 19 | TCF_EM_ALIGN_U16 = 2, |
22 | TCF_EM_ALIGN_U32 = 4 | 20 | TCF_EM_ALIGN_U32 = 4 |
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h index dcfb733fa1f6..0864206ec1a3 100644 --- a/include/linux/tc_ematch/tc_em_meta.h +++ b/include/linux/tc_ematch/tc_em_meta.h | |||
@@ -4,8 +4,7 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
6 | 6 | ||
7 | enum | 7 | enum { |
8 | { | ||
9 | TCA_EM_META_UNSPEC, | 8 | TCA_EM_META_UNSPEC, |
10 | TCA_EM_META_HDR, | 9 | TCA_EM_META_HDR, |
11 | TCA_EM_META_LVALUE, | 10 | TCA_EM_META_LVALUE, |
@@ -14,8 +13,7 @@ enum | |||
14 | }; | 13 | }; |
15 | #define TCA_EM_META_MAX (__TCA_EM_META_MAX - 1) | 14 | #define TCA_EM_META_MAX (__TCA_EM_META_MAX - 1) |
16 | 15 | ||
17 | struct tcf_meta_val | 16 | struct tcf_meta_val { |
18 | { | ||
19 | __u16 kind; | 17 | __u16 kind; |
20 | __u8 shift; | 18 | __u8 shift; |
21 | __u8 op; | 19 | __u8 op; |
@@ -26,16 +24,14 @@ struct tcf_meta_val | |||
26 | #define TCF_META_ID_MASK 0x7ff | 24 | #define TCF_META_ID_MASK 0x7ff |
27 | #define TCF_META_ID(kind) ((kind) & TCF_META_ID_MASK) | 25 | #define TCF_META_ID(kind) ((kind) & TCF_META_ID_MASK) |
28 | 26 | ||
29 | enum | 27 | enum { |
30 | { | ||
31 | TCF_META_TYPE_VAR, | 28 | TCF_META_TYPE_VAR, |
32 | TCF_META_TYPE_INT, | 29 | TCF_META_TYPE_INT, |
33 | __TCF_META_TYPE_MAX | 30 | __TCF_META_TYPE_MAX |
34 | }; | 31 | }; |
35 | #define TCF_META_TYPE_MAX (__TCF_META_TYPE_MAX - 1) | 32 | #define TCF_META_TYPE_MAX (__TCF_META_TYPE_MAX - 1) |
36 | 33 | ||
37 | enum | 34 | enum { |
38 | { | ||
39 | TCF_META_ID_VALUE, | 35 | TCF_META_ID_VALUE, |
40 | TCF_META_ID_RANDOM, | 36 | TCF_META_ID_RANDOM, |
41 | TCF_META_ID_LOADAVG_0, | 37 | TCF_META_ID_LOADAVG_0, |
@@ -87,8 +83,7 @@ enum | |||
87 | }; | 83 | }; |
88 | #define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1) | 84 | #define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1) |
89 | 85 | ||
90 | struct tcf_meta_hdr | 86 | struct tcf_meta_hdr { |
91 | { | ||
92 | struct tcf_meta_val left; | 87 | struct tcf_meta_val left; |
93 | struct tcf_meta_val right; | 88 | struct tcf_meta_val right; |
94 | }; | 89 | }; |
diff --git a/include/linux/tc_ematch/tc_em_nbyte.h b/include/linux/tc_ematch/tc_em_nbyte.h index 9ed8c2e58488..7172cfb999c1 100644 --- a/include/linux/tc_ematch/tc_em_nbyte.h +++ b/include/linux/tc_ematch/tc_em_nbyte.h | |||
@@ -4,8 +4,7 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
6 | 6 | ||
7 | struct tcf_em_nbyte | 7 | struct tcf_em_nbyte { |
8 | { | ||
9 | __u16 off; | 8 | __u16 off; |
10 | __u16 len:12; | 9 | __u16 len:12; |
11 | __u8 layer:4; | 10 | __u8 layer:4; |
diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/linux/tc_ematch/tc_em_text.h index d12a73a225fc..5aac4045ba88 100644 --- a/include/linux/tc_ematch/tc_em_text.h +++ b/include/linux/tc_ematch/tc_em_text.h | |||
@@ -6,8 +6,7 @@ | |||
6 | 6 | ||
7 | #define TC_EM_TEXT_ALGOSIZ 16 | 7 | #define TC_EM_TEXT_ALGOSIZ 16 |
8 | 8 | ||
9 | struct tcf_em_text | 9 | struct tcf_em_text { |
10 | { | ||
11 | char algo[TC_EM_TEXT_ALGOSIZ]; | 10 | char algo[TC_EM_TEXT_ALGOSIZ]; |
12 | __u16 from_offset; | 11 | __u16 from_offset; |
13 | __u16 to_offset; | 12 | __u16 to_offset; |