Commit 8db46f1d authored by Wang Yufen's avatar Wang Yufen Committed by David S. Miller

ipv6: fix checkpatch errors comments and space

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: default avatarWang Yufen <wangyufen@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 587daaf3
...@@ -9,14 +9,12 @@ ...@@ -9,14 +9,12 @@
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ *
* Changes:
/* * Yuji SEKIYA @USAGI: Support default route on router node;
* Changes: * remove ip6_null_entry from the top of
* Yuji SEKIYA @USAGI: Support default route on router node; * routing table.
* remove ip6_null_entry from the top of * Ville Nuorvala: Fixed routing subtrees.
* routing table.
* Ville Nuorvala: Fixed routing subtrees.
*/ */
#define pr_fmt(fmt) "IPv6: " fmt #define pr_fmt(fmt) "IPv6: " fmt
...@@ -138,7 +136,7 @@ static __inline__ __be32 addr_bit_set(const void *token, int fn_bit) ...@@ -138,7 +136,7 @@ static __inline__ __be32 addr_bit_set(const void *token, int fn_bit)
const __be32 *addr = token; const __be32 *addr = token;
/* /*
* Here, * Here,
* 1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f) * 1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)
* is optimized version of * is optimized version of
* htonl(1 << ((~fn_bit)&0x1F)) * htonl(1 << ((~fn_bit)&0x1F))
* See include/asm-generic/bitops/le.h. * See include/asm-generic/bitops/le.h.
...@@ -485,7 +483,7 @@ static struct fib6_node *fib6_add_1(struct fib6_node *root, ...@@ -485,7 +483,7 @@ static struct fib6_node *fib6_add_1(struct fib6_node *root,
fn->fn_sernum = sernum; fn->fn_sernum = sernum;
dir = addr_bit_set(addr, fn->fn_bit); dir = addr_bit_set(addr, fn->fn_bit);
pn = fn; pn = fn;
fn = dir ? fn->right: fn->left; fn = dir ? fn->right : fn->left;
} while (fn); } while (fn);
if (!allow_create) { if (!allow_create) {
...@@ -1254,10 +1252,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net, ...@@ -1254,10 +1252,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net,
w->node = child; w->node = child;
if (children&2) { if (children&2) {
RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state); 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 { } else {
RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state); 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;
} }
} }
} }
...@@ -1355,7 +1353,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info) ...@@ -1355,7 +1353,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info)
struct rt6_info **rtp; struct rt6_info **rtp;
#if RT6_DEBUG >= 2 #if RT6_DEBUG >= 2
if (rt->dst.obsolete>0) { if (rt->dst.obsolete > 0) {
WARN_ON(fn != NULL); WARN_ON(fn != NULL);
return -ENOENT; return -ENOENT;
} }
...@@ -1748,7 +1746,7 @@ static int __net_init fib6_net_init(struct net *net) ...@@ -1748,7 +1746,7 @@ static int __net_init fib6_net_init(struct net *net)
kfree(net->ipv6.rt6_stats); kfree(net->ipv6.rt6_stats);
out_timer: out_timer:
return -ENOMEM; return -ENOMEM;
} }
static void fib6_net_exit(struct net *net) static void fib6_net_exit(struct net *net)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment