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>

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 6fdcf6c7a31eaeb729d806b3e5879dd19bd5e7de..c88d1d499166d9143a3dbfc32e1af9250ea1915b 100644 (file)
--- 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);