Skip to content

Commit

Permalink
ipv6: fix checkpatch errors of "foo*" and "foo * bar"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wang Yufen authored and David S. Miller committed Mar 29, 2014
1 parent 49e253e commit 437de07
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions net/ipv6/ip6_fib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand All @@ -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);
}
Expand Down Expand Up @@ -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]) {
Expand All @@ -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;
}

Expand Down Expand Up @@ -992,8 +992,8 @@ struct lookup_args {
const struct in6_addr *addr; /* search key */
};

static struct fib6_node * fib6_lookup_1(struct fib6_node *root,
struct lookup_args *args)
static struct fib6_node *fib6_lookup_1(struct fib6_node *root,
struct lookup_args *args)
{
struct fib6_node *fn;
__be32 dir;
Expand Down Expand Up @@ -1055,8 +1055,8 @@ static struct fib6_node * fib6_lookup_1(struct fib6_node *root,
return NULL;
}

struct fib6_node * fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,
const struct in6_addr *saddr)
struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,
const struct in6_addr *saddr)
{
struct fib6_node *fn;
struct lookup_args args[] = {
Expand Down Expand Up @@ -1088,9 +1088,9 @@ 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,
const struct in6_addr *addr,
int plen, int offset)
static struct fib6_node *fib6_locate_1(struct fib6_node *root,
const struct in6_addr *addr,
int plen, int offset)
{
struct fib6_node *fn;

Expand Down Expand Up @@ -1118,9 +1118,9 @@ static struct fib6_node * fib6_locate_1(struct fib6_node *root,
return NULL;
}

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)
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)
{
struct fib6_node *fn;

Expand Down

0 comments on commit 437de07

Please sign in to comment.