aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorRomain Kuntz <r.kuntz@ipflavors.com>2013-01-09 15:02:26 +0100
committerBen Hutchings <ben@decadent.org.uk>2013-02-20 03:15:32 +0000
commit77b3f442bce440d228ad0002974e2c8189458b41 (patch)
treef7ba41e2c0396aa38d5df3c545b5fe03615da031 /net
parent35dc6fe99d2a18517078eb05f23604ca588fd207 (diff)
ipv6: fix the noflags test in addrconf_get_prefix_route
[ Upstream commit 85da53bf1c336bb07ac038fb951403ab0478d2c5 ] The tests on the flags in addrconf_get_prefix_route() does no make much sense: the 'noflags' parameter contains the set of flags that must not match with the route flags, so the test must be done against 'noflags', and not against 'flags'. Signed-off-by: Romain Kuntz <r.kuntz@ipflavors.com> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/addrconf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index aef80d7f588..b27baed45ad 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1739,7 +1739,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
continue;
if ((rt->rt6i_flags & flags) != flags)
continue;
- if ((noflags != 0) && ((rt->rt6i_flags & flags) != 0))
+ if ((rt->rt6i_flags & noflags) != 0)
continue;
dst_hold(&rt->dst);
break;