diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-22 16:43:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-23 17:33:39 -0400 |
commit | a02cec2155fbea457eca8881870fd2de1a4c4c76 (patch) | |
tree | cfbfc4b32bfe10f9cd803d46c31607d13f1858f5 /net/core | |
parent | 6a08d194ee40806e0ccd5f36ed768e64cbfc979f (diff) |
net: return operator cleanup
Change "return (EXPR);" to "return EXPR;"
return is not a function, parentheses are not required.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/flow.c | 4 | ||||
-rw-r--r-- | net/core/neighbour.c | 6 | ||||
-rw-r--r-- | net/core/utils.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index b143b86b1f2a..127c8a7ffd61 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -176,8 +176,8 @@ static u32 flow_hash_code(struct flow_cache *fc, | |||
176 | { | 176 | { |
177 | u32 *k = (u32 *) key; | 177 | u32 *k = (u32 *) key; |
178 | 178 | ||
179 | return (jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd) | 179 | return jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd) |
180 | & (flow_cache_hash_size(fc) - 1)); | 180 | & (flow_cache_hash_size(fc) - 1); |
181 | } | 181 | } |
182 | 182 | ||
183 | typedef unsigned long flow_compare_t; | 183 | typedef unsigned long flow_compare_t; |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index a4e0a7482c2b..96b1a749abb4 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -122,7 +122,7 @@ static void neigh_cleanup_and_release(struct neighbour *neigh) | |||
122 | 122 | ||
123 | unsigned long neigh_rand_reach_time(unsigned long base) | 123 | unsigned long neigh_rand_reach_time(unsigned long base) |
124 | { | 124 | { |
125 | return (base ? (net_random() % base) + (base >> 1) : 0); | 125 | return base ? (net_random() % base) + (base >> 1) : 0; |
126 | } | 126 | } |
127 | EXPORT_SYMBOL(neigh_rand_reach_time); | 127 | EXPORT_SYMBOL(neigh_rand_reach_time); |
128 | 128 | ||
@@ -766,9 +766,9 @@ next_elt: | |||
766 | static __inline__ int neigh_max_probes(struct neighbour *n) | 766 | static __inline__ int neigh_max_probes(struct neighbour *n) |
767 | { | 767 | { |
768 | struct neigh_parms *p = n->parms; | 768 | struct neigh_parms *p = n->parms; |
769 | return (n->nud_state & NUD_PROBE ? | 769 | return (n->nud_state & NUD_PROBE) ? |
770 | p->ucast_probes : | 770 | p->ucast_probes : |
771 | p->ucast_probes + p->app_probes + p->mcast_probes); | 771 | p->ucast_probes + p->app_probes + p->mcast_probes; |
772 | } | 772 | } |
773 | 773 | ||
774 | static void neigh_invalidate(struct neighbour *neigh) | 774 | static void neigh_invalidate(struct neighbour *neigh) |
diff --git a/net/core/utils.c b/net/core/utils.c index ec6bb322f372..5fea0ab21902 100644 --- a/net/core/utils.c +++ b/net/core/utils.c | |||
@@ -75,7 +75,7 @@ __be32 in_aton(const char *str) | |||
75 | str++; | 75 | str++; |
76 | } | 76 | } |
77 | } | 77 | } |
78 | return(htonl(l)); | 78 | return htonl(l); |
79 | } | 79 | } |
80 | EXPORT_SYMBOL(in_aton); | 80 | EXPORT_SYMBOL(in_aton); |
81 | 81 | ||