Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44fd0261 authored by Peter Chubb's avatar Peter Chubb Committed by David S. Miller
Browse files

[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: default avatarPeter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fd52fe0

net/ipv6/addrconf.c

+2 −1
Original line number Diff line number Diff line
@@ -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);