diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
commit | 638cbac8de9b57345a9446e107b6aebc10b58970 (patch) | |
tree | e445fe3a1b8ad718d7ee770ed1c7a43e3eb5a611 /net/ipv6/addrconf.c | |
parent | f055408957750cf759162c364c2a4dfe19765844 (diff) | |
parent | fc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff) |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ddcf7754eec2..56a09a4ac410 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -1045,9 +1045,10 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, | |||
1045 | } | 1045 | } |
1046 | #endif | 1046 | #endif |
1047 | /* Rule 8: Use longest matching prefix */ | 1047 | /* Rule 8: Use longest matching prefix */ |
1048 | if (hiscore.rule < 8) | 1048 | if (hiscore.rule < 8) { |
1049 | hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr); | 1049 | hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr); |
1050 | score.rule++; | 1050 | hiscore.rule++; |
1051 | } | ||
1051 | score.matchlen = ipv6_addr_diff(&ifa->addr, daddr); | 1052 | score.matchlen = ipv6_addr_diff(&ifa->addr, daddr); |
1052 | if (score.matchlen > hiscore.matchlen) { | 1053 | if (score.matchlen > hiscore.matchlen) { |
1053 | score.rule = 8; | 1054 | score.rule = 8; |