diff options
| author | Peter Chubb <peterc@gelato.unsw.edu.au> | 2005-11-09 13:05:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-09 13:05:47 -0800 |
| commit | 44fd0261d3509b0b4303fd9ba792058d230186ab (patch) | |
| tree | 9a504fdbd1c2caa7d1a74c98a6ca86237b996d03 | |
| parent | 5fd52fe0989f8c84abd8d4a40ded79d4da911744 (diff) | |
| download | talos-obmc-linux-44fd0261d3509b0b4303fd9ba792058d230186ab.tar.gz talos-obmc-linux-44fd0261d3509b0b4303fd9ba792058d230186ab.zip | |
[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>
| -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, 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); |
