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/ipv6/ndisc.c | |
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/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 69a0051cea67..b3dd844cd34f 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -228,12 +228,12 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur, | |||
228 | do { | 228 | do { |
229 | cur = ((void *)cur) + (cur->nd_opt_len << 3); | 229 | cur = ((void *)cur) + (cur->nd_opt_len << 3); |
230 | } while(cur < end && cur->nd_opt_type != type); | 230 | } while(cur < end && cur->nd_opt_type != type); |
231 | return (cur <= end && cur->nd_opt_type == type ? cur : NULL); | 231 | return cur <= end && cur->nd_opt_type == type ? cur : NULL; |
232 | } | 232 | } |
233 | 233 | ||
234 | static inline int ndisc_is_useropt(struct nd_opt_hdr *opt) | 234 | static inline int ndisc_is_useropt(struct nd_opt_hdr *opt) |
235 | { | 235 | { |
236 | return (opt->nd_opt_type == ND_OPT_RDNSS); | 236 | return opt->nd_opt_type == ND_OPT_RDNSS; |
237 | } | 237 | } |
238 | 238 | ||
239 | static struct nd_opt_hdr *ndisc_next_useropt(struct nd_opt_hdr *cur, | 239 | static struct nd_opt_hdr *ndisc_next_useropt(struct nd_opt_hdr *cur, |
@@ -244,7 +244,7 @@ static struct nd_opt_hdr *ndisc_next_useropt(struct nd_opt_hdr *cur, | |||
244 | do { | 244 | do { |
245 | cur = ((void *)cur) + (cur->nd_opt_len << 3); | 245 | cur = ((void *)cur) + (cur->nd_opt_len << 3); |
246 | } while(cur < end && !ndisc_is_useropt(cur)); | 246 | } while(cur < end && !ndisc_is_useropt(cur)); |
247 | return (cur <= end && ndisc_is_useropt(cur) ? cur : NULL); | 247 | return cur <= end && ndisc_is_useropt(cur) ? cur : NULL; |
248 | } | 248 | } |
249 | 249 | ||
250 | static struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len, | 250 | static struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len, |
@@ -319,7 +319,7 @@ static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, | |||
319 | int prepad = ndisc_addr_option_pad(dev->type); | 319 | int prepad = ndisc_addr_option_pad(dev->type); |
320 | if (lladdrlen != NDISC_OPT_SPACE(dev->addr_len + prepad)) | 320 | if (lladdrlen != NDISC_OPT_SPACE(dev->addr_len + prepad)) |
321 | return NULL; | 321 | return NULL; |
322 | return (lladdr + prepad); | 322 | return lladdr + prepad; |
323 | } | 323 | } |
324 | 324 | ||
325 | int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir) | 325 | int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir) |