diff options
| author | Wang Yufen <wangyufen@huawei.com> | 2014-03-28 12:07:03 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:15:52 -0400 |
| commit | 49e253e399778f7b93deccc9fb5b834cc8de6c92 (patch) | |
| tree | b0a3bff3a63108448a819f1118d9448c330e9214 | |
| parent | 8db46f1d4c689bfbdde0a83e1ba73c820ab98b42 (diff) | |
| download | linux-49e253e399778f7b93deccc9fb5b834cc8de6c92.tar.gz linux-49e253e399778f7b93deccc9fb5b834cc8de6c92.tar.bz2 linux-49e253e399778f7b93deccc9fb5b834cc8de6c92.zip | |
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>
| -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 @@ static struct kmem_cache * fib6_node_kmem __read_mostly; -enum fib_walk_state_t -{ +enum fib_walk_state_t { #ifdef CONFIG_IPV6_SUBTREES FWS_S, #endif @@ -57,8 +56,7 @@ enum fib_walk_state_t FWS_U }; -struct fib6_cleaner_t -{ +struct fib6_cleaner_t { struct fib6_walker_t w; struct net *net; int (*func)(struct rt6_info *, void *arg); @@ -1190,8 +1188,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net, children = 0; child = NULL; - if (fn->right) child = fn->right, children |= 1; - if (fn->left) child = fn->left, children |= 2; + if (fn->right) + child = fn->right, children |= 1; + if (fn->left) + child = fn->left, children |= 2; if (children == 3 || FIB6_SUBTREE(fn) #ifdef CONFIG_IPV6_SUBTREES @@ -1219,8 +1219,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net, } else { WARN_ON(fn->fn_flags & RTN_ROOT); #endif - if (pn->right == fn) pn->right = child; - else if (pn->left == fn) pn->left = child; + if (pn->right == fn) + pn->right = child; + else if (pn->left == fn) + pn->left = child; #if RT6_DEBUG >= 2 else WARN_ON(1); |