diff options
author | Wang Yufen <wangyufen@huawei.com> | 2014-03-28 00:07:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:15:52 -0400 |
commit | 8db46f1d4c689bfbdde0a83e1ba73c820ab98b42 (patch) | |
tree | 89c996632913472db55eef3e8ac5dc8b8a78660a /net/ipv6/ip6_fib.c | |
parent | 587daaf38296244d216a8dd354e6ab743b075fb8 (diff) |
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: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
-rw-r--r-- | net/ipv6/ip6_fib.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 4ee487b103ae..6fdcf6c7a31e 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
@@ -9,14 +9,12 @@ | |||
9 | * modify it under the terms of the GNU General Public License | 9 | * modify it under the terms of the GNU General Public License |
10 | * as published by the Free Software Foundation; either version | 10 | * as published by the Free Software Foundation; either version |
11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
12 | */ | 12 | * |
13 | 13 | * Changes: | |
14 | /* | 14 | * Yuji SEKIYA @USAGI: Support default route on router node; |
15 | * Changes: | 15 | * remove ip6_null_entry from the top of |
16 | * Yuji SEKIYA @USAGI: Support default route on router node; | 16 | * routing table. |
17 | * remove ip6_null_entry from the top of | 17 | * Ville Nuorvala: Fixed routing subtrees. |
18 | * routing table. | ||
19 | * Ville Nuorvala: Fixed routing subtrees. | ||
20 | */ | 18 | */ |
21 | 19 | ||
22 | #define pr_fmt(fmt) "IPv6: " fmt | 20 | #define pr_fmt(fmt) "IPv6: " fmt |
@@ -138,7 +136,7 @@ static __inline__ __be32 addr_bit_set(const void *token, int fn_bit) | |||
138 | const __be32 *addr = token; | 136 | const __be32 *addr = token; |
139 | /* | 137 | /* |
140 | * Here, | 138 | * Here, |
141 | * 1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f) | 139 | * 1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f) |
142 | * is optimized version of | 140 | * is optimized version of |
143 | * htonl(1 << ((~fn_bit)&0x1F)) | 141 | * htonl(1 << ((~fn_bit)&0x1F)) |
144 | * See include/asm-generic/bitops/le.h. | 142 | * See include/asm-generic/bitops/le.h. |
@@ -485,7 +483,7 @@ static struct fib6_node *fib6_add_1(struct fib6_node *root, | |||
485 | fn->fn_sernum = sernum; | 483 | fn->fn_sernum = sernum; |
486 | dir = addr_bit_set(addr, fn->fn_bit); | 484 | dir = addr_bit_set(addr, fn->fn_bit); |
487 | pn = fn; | 485 | pn = fn; |
488 | fn = dir ? fn->right: fn->left; | 486 | fn = dir ? fn->right : fn->left; |
489 | } while (fn); | 487 | } while (fn); |
490 | 488 | ||
491 | if (!allow_create) { | 489 | if (!allow_create) { |
@@ -1254,10 +1252,10 @@ static struct fib6_node *fib6_repair_tree(struct net *net, | |||
1254 | w->node = child; | 1252 | w->node = child; |
1255 | if (children&2) { | 1253 | if (children&2) { |
1256 | RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state); | 1254 | RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state); |
1257 | w->state = w->state>=FWS_R ? FWS_U : FWS_INIT; | 1255 | w->state = w->state >= FWS_R ? FWS_U : FWS_INIT; |
1258 | } else { | 1256 | } else { |
1259 | RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state); | 1257 | RT6_TRACE("W %p adjusted by delnode 2, s=%d\n", w, w->state); |
1260 | w->state = w->state>=FWS_C ? FWS_U : FWS_INIT; | 1258 | w->state = w->state >= FWS_C ? FWS_U : FWS_INIT; |
1261 | } | 1259 | } |
1262 | } | 1260 | } |
1263 | } | 1261 | } |
@@ -1355,7 +1353,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info) | |||
1355 | struct rt6_info **rtp; | 1353 | struct rt6_info **rtp; |
1356 | 1354 | ||
1357 | #if RT6_DEBUG >= 2 | 1355 | #if RT6_DEBUG >= 2 |
1358 | if (rt->dst.obsolete>0) { | 1356 | if (rt->dst.obsolete > 0) { |
1359 | WARN_ON(fn != NULL); | 1357 | WARN_ON(fn != NULL); |
1360 | return -ENOENT; | 1358 | return -ENOENT; |
1361 | } | 1359 | } |
@@ -1748,7 +1746,7 @@ out_rt6_stats: | |||
1748 | kfree(net->ipv6.rt6_stats); | 1746 | kfree(net->ipv6.rt6_stats); |
1749 | out_timer: | 1747 | out_timer: |
1750 | return -ENOMEM; | 1748 | return -ENOMEM; |
1751 | } | 1749 | } |
1752 | 1750 | ||
1753 | static void fib6_net_exit(struct net *net) | 1751 | static void fib6_net_exit(struct net *net) |
1754 | { | 1752 | { |