[IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY

[IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY

[YOSHIFUJI Hideaki / 吉藤英明]

We need to update hiscore.rule even if we don't enable CONFIG_IPV6_PRIVACY,
because we have more less significant rule; longest match.

I think it is suitable for -stable as well.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
 net/ipv6/addrconf.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1069,6 +1069,9 @@ #ifdef CONFIG_IPV6_PRIVACY
 				if (hiscore.attrs & IPV6_SADDR_SCORE_PRIVACY)
 					continue;
 			}
+#else
+			if (hiscore.rule < 7)
+				hiscore.rule++;
 #endif
 			/* Rule 8: Use longest matching prefix */
 			if (hiscore.rule < 8) {

-- 
YOSHIFUJI Hideaki @ USAGI Project  <yoshfuji@linux-ipv6.org>
GPG-FP  : 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA

Re: [IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY

[David Miller]

From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Thu, 22 Jun 2006 00:23:41 +0900 (JST)

> We need to update hiscore.rule even if we don't enable CONFIG_IPV6_PRIVACY,
> because we have more less significant rule; longest match.

Applied, thank you.

> I think it is suitable for -stable as well.

Agreed, I have pushed it to -stable.