From a408325ca63f468900da6dba00b13f4f67f010ab Mon Sep 17 00:00:00 2001
From: Peter Chubb <peterc@gelato.unsw.edu.au>
Date: Wed, 9 Nov 2005 13:05:47 -0800
Subject: [PATCH] --- yaml --- r: 13653 b: refs/heads/master c:
 44fd0261d3509b0b4303fd9ba792058d230186ab h: refs/heads/master i:   13651:
 38a7b9b611996d637adf40cab55e76ad8eaa2fc8 v: v3

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

diff --git a/[refs] b/[refs]
index 11c4a1fb1ddf..03c96dd42549 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fd52fe0989f8c84abd8d4a40ded79d4da911744
+refs/heads/master: 44fd0261d3509b0b4303fd9ba792058d230186ab
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index b7a5f51238b3..ddcf7754eec2 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -1022,6 +1022,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
 					continue;
 			}
 
+#ifdef CONFIG_IPV6_PRIVACY
 			/* Rule 7: Prefer public address
 			 * Note: prefer temprary address if use_tempaddr >= 2
 			 */
@@ -1042,7 +1043,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
 				if (hiscore.attrs & IPV6_SADDR_SCORE_PRIVACY)
 					continue;
 			}
-
+#endif
 			/* Rule 8: Use longest matching prefix */
 			if (hiscore.rule < 8)
 				hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);