summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2012-09-10 18:41:07 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-13 16:34:03 -0400
commit91b4b04ff85de9086c959138d747d2808cc83a46 (patch)
tree85c36f26fcc60df164f894923188ee10f51d0456 /net
parent417962a02ba283c8532d61474dc08e0a966cd269 (diff)
downloadlinux-3.10-91b4b04ff85de9086c959138d747d2808cc83a46.tar.gz
linux-3.10-91b4b04ff85de9086c959138d747d2808cc83a46.tar.bz2
linux-3.10-91b4b04ff85de9086c959138d747d2808cc83a46.zip
ipv6: Compare addresses only bits up to the prefix length (RFC6724).
Compare bits up to the source address's prefix length only to allows DNS load balancing to continue to be used as a tie breaker. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/addrconf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 1237d5d037d..5fd8ec895c8 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1070,8 +1070,10 @@ static int ipv6_get_saddr_eval(struct net *net,
break;
case IPV6_SADDR_RULE_PREFIX:
/* Rule 8: Use longest matching prefix */
- score->matchlen = ret = ipv6_addr_diff(&score->ifa->addr,
- dst->addr);
+ ret = ipv6_addr_diff(&score->ifa->addr, dst->addr);
+ if (ret > score->ifa->prefix_len)
+ ret = score->ifa->prefix_len;
+ score->matchlen = ret;
break;
default:
ret = 0;