[IPV6]: Fix fallout from CONFIG_IPV6_PRIVACY

Trying to build today's 2.6.14+git snapshot gives undefined references
to use_tempaddr

Looks like an ifdef got left out.

Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index b7a5f51238b3958f88bc18adfac17704d3aa0bf7..ddcf7754eec2dd69d65c3ddabf91edad39277314 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/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);