2005-11-09 00:17:03

by Peter Chubb

Subject: [PATCH] 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 <[email protected]>

net/ipv6/addrconf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6-import/net/ipv6/addrconf.c
===================================================================
--- linux-2.6-import.orig/net/ipv6/addrconf.c 2005-11-09 11:11:42.137993239 +1100
+++ linux-2.6-import/net/ipv6/addrconf.c 2005-11-09 11:12:39.857561898 +1100
@@ -1022,6 +1022,7 @@ int ipv6_dev_get_saddr(struct net_device
continue;
}

+#ifdef CONFIG_IPV6_PRIVACY
/* Rule 7: Prefer public address
* Note: prefer temprary address if use_tempaddr >= 2
*/
@@ -1043,7 +1044,7 @@ int ipv6_dev_get_saddr(struct net_device
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);

2005-11-09 21:06:01

by David Miller

Subject: Re: [PATCH] Fix fallout from CONFIG_IPV6_PRIVACY

From: Peter Chubb <[email protected]>
Date: Wed, 9 Nov 2005 11:16:58 +1100

> 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 <[email protected]>

Applied, thanks Peter.