aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWang Yufen <wangyufen@huawei.com>2014-03-28 00:07:04 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-29 18:15:52 -0400
commit437de07ced703c2d171b43bd63cf47e0af09a241 (patch)
treece24bd1f917c02bc6707b23b365bf4708b1eeb30 /net
parent49e253e399778f7b93deccc9fb5b834cc8de6c92 (diff)
ipv6: fix checkpatch errors of "foo*" and "foo * bar"
ERROR: "(foo*)" should be "(foo *)" ERROR: "foo * bar" should be "foo *bar" Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Wang Yufen <wangyufen@huawei.com> Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_fib.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index c88d1d499166..34e0ded5c14b 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -44,7 +44,7 @@
44#define RT6_TRACE(x...) do { ; } while (0) 44#define RT6_TRACE(x...) do { ; } while (0)
45#endif 45#endif
46 46
47static struct kmem_cache * fib6_node_kmem __read_mostly; 47static struct kmem_cache *fib6_node_kmem __read_mostly;
48 48
49enum fib_walk_state_t { 49enum fib_walk_state_t {
50#ifdef CONFIG_IPV6_SUBTREES 50#ifdef CONFIG_IPV6_SUBTREES
@@ -143,7 +143,7 @@ static __inline__ __be32 addr_bit_set(const void *token, int fn_bit)
143 addr[fn_bit >> 5]; 143 addr[fn_bit >> 5];
144} 144}
145 145
146static __inline__ struct fib6_node * node_alloc(void) 146static __inline__ struct fib6_node *node_alloc(void)
147{ 147{
148 struct fib6_node *fn; 148 struct fib6_node *fn;
149 149
@@ -152,7 +152,7 @@ static __inline__ struct fib6_node * node_alloc(void)
152 return fn; 152 return fn;
153} 153}
154 154
155static __inline__ void node_free(struct fib6_node * fn) 155static __inline__ void node_free(struct fib6_node *fn)
156{ 156{
157 kmem_cache_free(fib6_node_kmem, fn); 157 kmem_cache_free(fib6_node_kmem, fn);
158} 158}
@@ -288,7 +288,7 @@ static int fib6_dump_node(struct fib6_walker_t *w)
288 288
289static void fib6_dump_end(struct netlink_callback *cb) 289static void fib6_dump_end(struct netlink_callback *cb)
290{ 290{
291 struct fib6_walker_t *w = (void*)cb->args[2]; 291 struct fib6_walker_t *w = (void *)cb->args[2];
292 292
293 if (w) { 293 if (w) {
294 if (cb->args[4]) { 294 if (cb->args[4]) {
@@ -298,7 +298,7 @@ static void fib6_dump_end(struct netlink_callback *cb)
298 cb->args[2] = 0; 298 cb->args[2] = 0;
299 kfree(w); 299 kfree(w);
300 } 300 }
301 cb->done = (void*)cb->args[3]; 301 cb->done = (void *)cb->args[3];
302 cb->args[1] = 3; 302 cb->args[1] = 3;
303} 303}
304 304
@@ -992,8 +992,8 @@ struct lookup_args {
992 const struct in6_addr *addr; /* search key */ 992 const struct in6_addr *addr; /* search key */
993}; 993};
994 994
995static struct fib6_node * fib6_lookup_1(struct fib6_node *root, 995static struct fib6_node *fib6_lookup_1(struct fib6_node *root,
996 struct lookup_args *args) 996 struct lookup_args *args)
997{ 997{
998 struct fib6_node *fn; 998 struct fib6_node *fn;
999 __be32 dir; 999 __be32 dir;
@@ -1055,8 +1055,8 @@ backtrack:
1055 return NULL; 1055 return NULL;
1056} 1056}
1057 1057
1058struct fib6_node * fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr, 1058struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,
1059 const struct in6_addr *saddr) 1059 const struct in6_addr *saddr)
1060{ 1060{
1061 struct fib6_node *fn; 1061 struct fib6_node *fn;
1062 struct lookup_args args[] = { 1062 struct lookup_args args[] = {
@@ -1088,9 +1088,9 @@ struct fib6_node * fib6_lookup(struct fib6_node *root, const struct in6_addr *da
1088 */ 1088 */
1089 1089
1090 1090
1091static struct fib6_node * fib6_locate_1(struct fib6_node *root, 1091static struct fib6_node *fib6_locate_1(struct fib6_node *root,
1092 const struct in6_addr *addr, 1092 const struct in6_addr *addr,
1093 int plen, int offset) 1093 int plen, int offset)
1094{ 1094{
1095 struct fib6_node *fn; 1095 struct fib6_node *fn;
1096 1096
@@ -1118,9 +1118,9 @@ static struct fib6_node * fib6_locate_1(struct fib6_node *root,
1118 return NULL; 1118 return NULL;
1119} 1119}
1120 1120
1121struct fib6_node * fib6_locate(struct fib6_node *root, 1121struct fib6_node *fib6_locate(struct fib6_node *root,
1122 const struct in6_addr *daddr, int dst_len, 1122 const struct in6_addr *daddr, int dst_len,
1123 const struct in6_addr *saddr, int src_len) 1123 const struct in6_addr *saddr, int src_len)
1124{ 1124{
1125 struct fib6_node *fn; 1125 struct fib6_node *fn;
1126 1126