[PATCH net-next 0/3] ipv6: fix checkpatch errors and warnings.

[PATCH net-next 0/3] ipv6: fix checkpatch errors and warnings.

[Wangyufen]

From: Wang Yufen <wangyufen@huawei.com>

Wang Yufen (3):
  ipv6: fix checkpatch errors comments and space
  ipv6: fix checkpatch errors of brace and trailing statements
  ipv6: fix checkpatch errors of foo

 net/ipv6/ip6_fib.c | 62 +++---
 1 file changed, 31 insertions(+), 31 deletions(-)

 -- 
1.7.12

[PATCH net-next 1/3] ipv6: fix checkpatch errors comments and space

[Wangyufen]

From: Wang Yufen <wangyufen@huawei.com>

WARNING: please, no space before tabs
WARNING: please, no spaces at the start of a line
ERROR: spaces required around that ':' (ctx:VxW)
ERROR: spaces required around that '>' (ctx:VxV)
ERROR: spaces required around that '>=' (ctx:VxV)

Signed-off-by: Wang Yufen <wangyufen@huawei.com>
---
 net/ipv6/ip6_fib.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 075602f..c626a0f 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -9,14 +9,12 @@
  *      modify it under the terms of the GNU General Public License
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
- */
-
-/*
- * 	Changes:
- * 	Yuji SEKIYA @USAGI:	Support default route on router node;
- * 				remove ip6_null_entry from the top of
- * 				routing table.
- * 	Ville Nuorvala:		Fixed routing subtrees.
+ *
+ *	Changes:
+ *	Yuji SEKIYA @USAGI:	Support default route on router node;
+ *				remove ip6_null_entry from the top of
+ *				routing table.
+ *	Ville Nuorvala:		Fixed routing subtrees.
  */
 
 #define pr_fmt(fmt) "IPv6: " fmt
@@ -138,7 +136,7 @@ static __inline__ __be32 addr_bit_set(const void *token, int fn_bit)
 	const __be32 *addr = token;
 	/*
 	 * Here,
-	 * 	1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)
+	 *	1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)
 	 * is optimized version of
 	 *	htonl(1 << ((~fn_bit)&0x1F))
 	 * See include/asm-generic/bitops/le.h.
@@ -485,7 +483,7 @@ static struct fib6_node *fib6_add_1(struct fib6_node *root,
 		fn->fn_sernum = sernum;
 		dir = addr_bit_set(addr, fn->fn_bit);
 		pn = fn;
-		fn = dir ? fn->right: fn->left;
+		fn = dir ? fn->right : fn->left;
 	} while (fn);
 
 	if (!allow_create) {
@@ -1213,10 +1211,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net,
 					w->node = child;
 					if (children&2) {
 						RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state);
-						w->state = w->state>=FWS_R ? FWS_U : FWS_INIT;
+						w->state = w->state >= FWS_R ? FWS_U : FWS_INIT;
 					} else {
 						RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state);
-						w->state = w->state>=FWS_C ? FWS_U : FWS_INIT;
+						w->state = w->state >= FWS_C ? FWS_U : FWS_INIT;
 					}
 				}
 			}
@@ -1314,7 +1312,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info)
 	struct rt6_info **rtp;
 
 #if RT6_DEBUG >= 2
-	if (rt->dst.obsolete>0) {
+	if (rt->dst.obsolete > 0) {
 		WARN_ON(fn != NULL);
 		return -ENOENT;
 	}
@@ -1707,7 +1705,7 @@ out_rt6_stats:
 	kfree(net->ipv6.rt6_stats);
 out_timer:
 	return -ENOMEM;
- }
+}
 
 static void fib6_net_exit(struct net *net)
 {
-- 
1.7.12

[PATCH net-next 2/3] ipv6: fix checkpatch errors of brace and trailing statements

[Wangyufen]

From: Wang Yufen <wangyufen@huawei.com>

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>
---
 net/ipv6/ip6_fib.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index c626a0f..8cb6949 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);
@@ -1149,8 +1147,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
@@ -1178,8 +1178,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);
-- 
1.7.12

[PATCH net-next 3/3] ipv6: fix checkpatch errors of foo

[Wangyufen]

From: Wang Yufen <wangyufen@huawei.com>

ERROR: "(foo*)" should be "(foo *)"
ERROR: "foo * bar" should be "foo *bar"

Signed-off-by: Wang Yufen <wangyufen@huawei.com>
---
 net/ipv6/ip6_fib.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 8cb6949..22acde8 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -44,7 +44,7 @@
 #define RT6_TRACE(x...) do { ; } while (0)
 #endif
 
-static struct kmem_cache * fib6_node_kmem __read_mostly;
+static struct kmem_cache *fib6_node_kmem __read_mostly;
 
 enum fib_walk_state_t {
 #ifdef CONFIG_IPV6_SUBTREES
@@ -143,7 +143,7 @@ static __inline__ __be32 addr_bit_set(const void *token, int fn_bit)
 	       addr[fn_bit >> 5];
 }
 
-static __inline__ struct fib6_node * node_alloc(void)
+static __inline__ struct fib6_node *node_alloc(void)
 {
 	struct fib6_node *fn;
 
@@ -152,7 +152,7 @@ static __inline__ struct fib6_node * node_alloc(void)
 	return fn;
 }
 
-static __inline__ void node_free(struct fib6_node * fn)
+static __inline__ void node_free(struct fib6_node *fn)
 {
 	kmem_cache_free(fib6_node_kmem, fn);
 }
@@ -288,7 +288,7 @@ static int fib6_dump_node(struct fib6_walker_t *w)
 
 static void fib6_dump_end(struct netlink_callback *cb)
 {
-	struct fib6_walker_t *w = (void*)cb->args[2];
+	struct fib6_walker_t *w = (void *)cb->args[2];
 
 	if (w) {
 		if (cb->args[4]) {
@@ -298,7 +298,7 @@ static void fib6_dump_end(struct netlink_callback *cb)
 		cb->args[2] = 0;
 		kfree(w);
 	}
-	cb->done = (void*)cb->args[3];
+	cb->done = (void *)cb->args[3];
 	cb->args[1] = 3;
 }
 
@@ -951,7 +951,7 @@ struct lookup_args {
 	const struct in6_addr	*addr;		/* search key			*/
 };
 
-static struct fib6_node * fib6_lookup_1(struct fib6_node *root,
+static struct fib6_node *fib6_lookup_1(struct fib6_node *root,
 					struct lookup_args *args)
 {
 	struct fib6_node *fn;
@@ -1014,7 +1014,7 @@ backtrack:
 	return NULL;
 }
 
-struct fib6_node * fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,
+struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,
 			       const struct in6_addr *saddr)
 {
 	struct fib6_node *fn;
@@ -1047,7 +1047,7 @@ struct fib6_node * fib6_lookup(struct fib6_node *root, const struct in6_addr *da
  */
 
 
-static struct fib6_node * fib6_locate_1(struct fib6_node *root,
+static struct fib6_node *fib6_locate_1(struct fib6_node *root,
 					const struct in6_addr *addr,
 					int plen, int offset)
 {
@@ -1077,7 +1077,7 @@ static struct fib6_node * fib6_locate_1(struct fib6_node *root,
 	return NULL;
 }
 
-struct fib6_node * fib6_locate(struct fib6_node *root,
+struct fib6_node *fib6_locate(struct fib6_node *root,
 			       const struct in6_addr *daddr, int dst_len,
 			       const struct in6_addr *saddr, int src_len)
 {
-- 
1.7.12

Re: [PATCH net-next 3/3] ipv6: fix checkpatch errors of foo

[Sergei Shtylyov]

Hello.

On 03/25/2014 05:44 AM, Wangyufen wrote:

> From: Wang Yufen <wangyufen@huawei.com>

> ERROR: "(foo*)" should be "(foo *)"
> ERROR: "foo * bar" should be "foo *bar"

> Signed-off-by: Wang Yufen <wangyufen@huawei.com>
> ---
>   net/ipv6/ip6_fib.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)

> diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
> index 8cb6949..22acde8 100644
> --- a/net/ipv6/ip6_fib.c
> +++ b/net/ipv6/ip6_fib.c
[...]
> @@ -951,7 +951,7 @@ struct lookup_args {
>   	const struct in6_addr	*addr;		/* search key			*/
>   };
>
> -static struct fib6_node * fib6_lookup_1(struct fib6_node *root,
> +static struct fib6_node *fib6_lookup_1(struct fib6_node *root,
>   					struct lookup_args *args)

    Reindent the above line please, so that it still starts under *struct* on 
the previous line.

[...]
> @@ -1014,7 +1014,7 @@ backtrack:
>   	return NULL;
>   }
>
> -struct fib6_node * fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,
> +struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,
>   			       const struct in6_addr *saddr)

    Likewise.

[...]
> @@ -1047,7 +1047,7 @@ struct fib6_node * fib6_lookup(struct fib6_node *root, const struct in6_addr *da
>    */
>
>
> -static struct fib6_node * fib6_locate_1(struct fib6_node *root,
> +static struct fib6_node *fib6_locate_1(struct fib6_node *root,
>   					const struct in6_addr *addr,
>   					int plen, int offset)

    Likewise.

[...]
> @@ -1077,7 +1077,7 @@ static struct fib6_node * fib6_locate_1(struct fib6_node *root,
>   	return NULL;
>   }
>
> -struct fib6_node * fib6_locate(struct fib6_node *root,
> +struct fib6_node *fib6_locate(struct fib6_node *root,
>   			       const struct in6_addr *daddr, int dst_len,
>   			       const struct in6_addr *saddr, int src_len)

    Likewise.

WBR, Sergei