diff options
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d126365ac046..25b0beda4331 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -217,14 +217,14 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, | |||
217 | 217 | ||
218 | static __inline__ int rt6_check_expired(const struct rt6_info *rt) | 218 | static __inline__ int rt6_check_expired(const struct rt6_info *rt) |
219 | { | 219 | { |
220 | return (rt->rt6i_flags & RTF_EXPIRES && | 220 | return (rt->rt6i_flags & RTF_EXPIRES) && |
221 | time_after(jiffies, rt->rt6i_expires)); | 221 | time_after(jiffies, rt->rt6i_expires); |
222 | } | 222 | } |
223 | 223 | ||
224 | static inline int rt6_need_strict(struct in6_addr *daddr) | 224 | static inline int rt6_need_strict(struct in6_addr *daddr) |
225 | { | 225 | { |
226 | return (ipv6_addr_type(daddr) & | 226 | return ipv6_addr_type(daddr) & |
227 | (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK)); | 227 | (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK); |
228 | } | 228 | } |
229 | 229 | ||
230 | /* | 230 | /* |
@@ -440,7 +440,7 @@ static struct rt6_info *rt6_select(struct fib6_node *fn, int oif, int strict) | |||
440 | __func__, match); | 440 | __func__, match); |
441 | 441 | ||
442 | net = dev_net(rt0->rt6i_dev); | 442 | net = dev_net(rt0->rt6i_dev); |
443 | return (match ? match : net->ipv6.ip6_null_entry); | 443 | return match ? match : net->ipv6.ip6_null_entry; |
444 | } | 444 | } |
445 | 445 | ||
446 | #ifdef CONFIG_IPV6_ROUTE_INFO | 446 | #ifdef CONFIG_IPV6_ROUTE_INFO |
@@ -859,7 +859,7 @@ int ip6_dst_blackhole(struct sock *sk, struct dst_entry **dstp, struct flowi *fl | |||
859 | 859 | ||
860 | dst_release(*dstp); | 860 | dst_release(*dstp); |
861 | *dstp = new; | 861 | *dstp = new; |
862 | return (new ? 0 : -ENOMEM); | 862 | return new ? 0 : -ENOMEM; |
863 | } | 863 | } |
864 | EXPORT_SYMBOL_GPL(ip6_dst_blackhole); | 864 | EXPORT_SYMBOL_GPL(ip6_dst_blackhole); |
865 | 865 | ||
@@ -1070,7 +1070,7 @@ static int ip6_dst_gc(struct dst_ops *ops) | |||
1070 | net->ipv6.ip6_rt_gc_expire = rt_gc_timeout>>1; | 1070 | net->ipv6.ip6_rt_gc_expire = rt_gc_timeout>>1; |
1071 | out: | 1071 | out: |
1072 | net->ipv6.ip6_rt_gc_expire -= net->ipv6.ip6_rt_gc_expire>>rt_elasticity; | 1072 | net->ipv6.ip6_rt_gc_expire -= net->ipv6.ip6_rt_gc_expire>>rt_elasticity; |
1073 | return (atomic_read(&ops->entries) > rt_max_size); | 1073 | return atomic_read(&ops->entries) > rt_max_size; |
1074 | } | 1074 | } |
1075 | 1075 | ||
1076 | /* Clean host part of a prefix. Not necessary in radix tree, | 1076 | /* Clean host part of a prefix. Not necessary in radix tree, |