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

d70aa5e4 · Linus Torvalds · 4570cd6a · 220bbd74 · d70aa5e4
隐藏空白更改
内联并排

Showing with 2 addition and 0 deletion

net/ipv6/addrconf.c net/ipv6/addrconf.c +2 -0

未找到文件。
--- 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) {