diff options
author | Wang Yufen <wangyufen@huawei.com> | 2014-03-28 00:07:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:15:52 -0400 |
commit | 49e253e399778f7b93deccc9fb5b834cc8de6c92 (patch) | |
tree | b0a3bff3a63108448a819f1118d9448c330e9214 /net/ipv6 | |
parent | 8db46f1d4c689bfbdde0a83e1ba73c820ab98b42 (diff) |
ipv6: fix checkpatch errors of brace and trailing statements
ERROR: open brace '{' following enum go on the same line
ERROR: open brace '{' following struct go on the same line
ERROR: trailing statements should be on next line
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_fib.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 6fdcf6c7a31e..c88d1d499166 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
@@ -46,8 +46,7 @@ | |||
46 | 46 | ||
47 | static struct kmem_cache * fib6_node_kmem __read_mostly; | 47 | static struct kmem_cache * fib6_node_kmem __read_mostly; |
48 | 48 | ||
49 | enum fib_walk_state_t | 49 | enum fib_walk_state_t { |
50 | { | ||
51 | #ifdef CONFIG_IPV6_SUBTREES | 50 | #ifdef CONFIG_IPV6_SUBTREES |
52 | FWS_S, | 51 | FWS_S, |
53 | #endif | 52 | #endif |
@@ -57,8 +56,7 @@ enum fib_walk_state_t | |||
57 | FWS_U | 56 | FWS_U |
58 | }; | 57 | }; |
59 | 58 | ||
60 | struct fib6_cleaner_t | 59 | struct fib6_cleaner_t { |
61 | { | ||
62 | struct fib6_walker_t w; | 60 | struct fib6_walker_t w; |
63 | struct net *net; | 61 | struct net *net; |
64 | int (*func)(struct rt6_info *, void *arg); | 62 | int (*func)(struct rt6_info *, void *arg); |
@@ -1190,8 +1188,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net, | |||
1190 | 1188 | ||
1191 | children = 0; | 1189 | children = 0; |
1192 | child = NULL; | 1190 | child = NULL; |
1193 | if (fn->right) child = fn->right, children |= 1; | 1191 | if (fn->right) |
1194 | if (fn->left) child = fn->left, children |= 2; | 1192 | child = fn->right, children |= 1; |
1193 | if (fn->left) | ||
1194 | child = fn->left, children |= 2; | ||
1195 | 1195 | ||
1196 | if (children == 3 || FIB6_SUBTREE(fn) | 1196 | if (children == 3 || FIB6_SUBTREE(fn) |
1197 | #ifdef CONFIG_IPV6_SUBTREES | 1197 | #ifdef CONFIG_IPV6_SUBTREES |
@@ -1219,8 +1219,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net, | |||
1219 | } else { | 1219 | } else { |
1220 | WARN_ON(fn->fn_flags & RTN_ROOT); | 1220 | WARN_ON(fn->fn_flags & RTN_ROOT); |
1221 | #endif | 1221 | #endif |
1222 | if (pn->right == fn) pn->right = child; | 1222 | if (pn->right == fn) |
1223 | else if (pn->left == fn) pn->left = child; | 1223 | pn->right = child; |
1224 | else if (pn->left == fn) | ||
1225 | pn->left = child; | ||
1224 | #if RT6_DEBUG >= 2 | 1226 | #if RT6_DEBUG >= 2 |
1225 | else | 1227 | else |
1226 | WARN_ON(1); | 1228 | WARN_ON(1); |