Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

git-mirror · Nov 29, 2005 · d70aa5e · d70aa5e
2 parents 4570cd6 + 220bbd7
commit d70aa5e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
@@ -985,6 +985,8 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
 			}
 
 			/* Rule 4: Prefer home address -- not implemented yet */
+			if (hiscore.rule < 4)
+				hiscore.rule++;
 
 			/* Rule 5: Prefer outgoing interface */
 			if (hiscore.rule < 5) {