diff options
author | Peter Chubb <peterc@gelato.unsw.edu.au> | 2005-11-09 16:05:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-09 16:05:47 -0500 |
commit | 44fd0261d3509b0b4303fd9ba792058d230186ab (patch) | |
tree | 9a504fdbd1c2caa7d1a74c98a6ca86237b996d03 /net/ipv6 | |
parent | 5fd52fe0989f8c84abd8d4a40ded79d4da911744 (diff) |
[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>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b7a5f51238b3..ddcf7754eec2 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -1022,6 +1022,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, | |||
1022 | continue; | 1022 | continue; |
1023 | } | 1023 | } |
1024 | 1024 | ||
1025 | #ifdef CONFIG_IPV6_PRIVACY | ||
1025 | /* Rule 7: Prefer public address | 1026 | /* Rule 7: Prefer public address |
1026 | * Note: prefer temprary address if use_tempaddr >= 2 | 1027 | * Note: prefer temprary address if use_tempaddr >= 2 |
1027 | */ | 1028 | */ |
@@ -1042,7 +1043,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, | |||
1042 | if (hiscore.attrs & IPV6_SADDR_SCORE_PRIVACY) | 1043 | if (hiscore.attrs & IPV6_SADDR_SCORE_PRIVACY) |
1043 | continue; | 1044 | continue; |
1044 | } | 1045 | } |
1045 | 1046 | #endif | |
1046 | /* Rule 8: Use longest matching prefix */ | 1047 | /* Rule 8: Use longest matching prefix */ |
1047 | if (hiscore.rule < 8) | 1048 | if (hiscore.rule < 8) |
1048 | hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr); | 1049 | hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr); |