From d78419c64d2e9dff1f3908e1e4f53b4d15136c58 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Thu, 22 Jun 2006 01:41:18 -0700
Subject: [PATCH] --- yaml --- r: 29177 b: refs/heads/master c:
 5e2707fa3aed8c24075087cbaea2628725adbe55 h: refs/heads/master i:   29175:
 f640d70f2f970d303b28a2d72a4f187d97baead7 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 792aabcb35dd..0887a8f4ca45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 102128e3a27821bdcbacb10f4f2bba253f587ba4
+refs/heads/master: 5e2707fa3aed8c24075087cbaea2628725adbe55
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 6b361fc3e14d..4da664538f52 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -1075,6 +1075,9 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
 				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) {