| commit | d70aa5e4b54aa7e704c886838715ac8a45d5750f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Nov 29 08:06:51 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Nov 29 08:06:51 2005 -0800 |
| tree | 9604b37c2530212b42e06391eefefc09d758a418 | |
| parent | 4570cd6a65f0559b0e11a6f953f5204fea5c719d [diff] | |
| parent | 220bbd748335f73aafb472a97716762a42cb0d58 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a16064b..76ff9f4 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c
@@ -985,6 +985,8 @@ } /* Rule 4: Prefer home address -- not implemented yet */ + if (hiscore.rule < 4) + hiscore.rule++; /* Rule 5: Prefer outgoing interface */ if (hiscore.rule < 5) {