diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 11:06:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 11:06:51 -0500 |
| commit | d70aa5e4b54aa7e704c886838715ac8a45d5750f (patch) | |
| tree | 9604b37c2530212b42e06391eefefc09d758a418 | |
| parent | 4570cd6a65f0559b0e11a6f953f5204fea5c719d (diff) | |
| parent | 220bbd748335f73aafb472a97716762a42cb0d58 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a16064ba0caf..76ff9f4fe89d 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -985,6 +985,8 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, | |||
| 985 | } | 985 | } |
| 986 | 986 | ||
| 987 | /* Rule 4: Prefer home address -- not implemented yet */ | 987 | /* Rule 4: Prefer home address -- not implemented yet */ |
| 988 | if (hiscore.rule < 4) | ||
| 989 | hiscore.rule++; | ||
| 988 | 990 | ||
| 989 | /* Rule 5: Prefer outgoing interface */ | 991 | /* Rule 5: Prefer outgoing interface */ |
| 990 | if (hiscore.rule < 5) { | 992 | if (hiscore.rule < 5) { |