diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:54:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:54:02 -0500 |
| commit | e538af42e416ac17368593370f7e1f5a71d55197 (patch) | |
| tree | 507b90ccb700de4f564cc1a2def19658fe054a0c /net/ipv6/addrconf.c | |
| parent | 2226340eb8df9c42f9fca74582d08d5117fc0cec (diff) | |
| parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/addrconf.c')
| -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 a16064ba0ca..76ff9f4fe89 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, } /* Rule 4: Prefer home address -- not implemented yet */ + if (hiscore.rule < 4) + hiscore.rule++; /* Rule 5: Prefer outgoing interface */ if (hiscore.rule < 5) { |