IPv6: simplify & condense a few declarations & statements
Subsystems (3)
PATCH 1/1 IPv6: simplify & condense a few declarations & statements
This patch combines several statements/declarations into more concise forms and removes a couple of unnecessary local variables within a few functions, mostly inline.
---
net/ipv6/ip6_fib.c +3 -11
@@ -111,10 +111,7 @@ static inline void fib6_walker_unlink(struct fib6_walker_t *w) }static __inline__u32 fib6_new_sernum (void ) { -u32 n = ++rt_sernum; -if ((__s32 )n <=0 ) - rt_sernum = n =1 ; -return n; +return (__s32 )++rt_sernum <=0 ? rt_sernum =1 : rt_sernum; }/*
@@ -149,11 +146,7 @@ static __inline__ __be32 addr_bit_set(const void *token, int fn_bit)static __inline__struct fib6_node *node_alloc (void ) { -struct fib6_node *fn; - - fn =kmem_cache_zalloc (fib6_node_kmem,GFP_ATOMIC ); - -return fn; +return kmem_cache_zalloc (fib6_node_kmem,GFP_ATOMIC ); }static __inline__void node_free (struct fib6_node * fn)
@@ -190,9 +183,8 @@ static void fib6_link_table(struct net *net, struct fib6_table *tb)static struct fib6_table *fib6_alloc_table (struct net *net,u32 id) { -struct fib6_table *table; +struct fib6_table *table =kzalloc (sizeof (struct fib6_table ),GFP_ATOMIC ); - table =kzalloc (sizeof (*table),GFP_ATOMIC );if (table) { table->tb6_id = id; table->tb6_root.leaf = net->ipv6.ip6_null_entry;
David Miller
maintainerFrom: Nathaniel Yazdani <[email protected]>
Date: Wed, 17 Apr 2013 10:20:22 -0700
Quoted 2 lines
This patch combines several statements/declarations into more concise forms and removes a couple of unnecessary local variables within a few functions, mostly inline.
Please make commit messages with 80 column long lines maximum.
net/ipv6/ip6_fib.c static inline void fib6_walker_unlink(struct fib6_walker_t *w) · line 114
Quoted 9 lines
net/ipv6/ip6_fib.c +1
-4@@ -111,10 +111,7 @@ static inline void fib6_walker_unlink(struct fib6_walker_t *w) }static __inline__u32 fib6_new_sernum (void ) { -u32 n = ++rt_sernum; -if ((__s32 )n <=0 ) - rt_sernum = n =1 ; -return n; +return (__s32 )++rt_sernum <=0 ? rt_sernum =1 : rt_sernum;
Like your commit message, I find this unreadable, and definitely not an improvement.
I'm not applying this even with the long lines in the commit message fixes, sorry.
Quoted 2 lines
I'm not applying this even with the long lines in the commit message fixes, sorry.
Okay, well thank you for your time nonetheless.