Skip to content
Snippets Groups Projects
Commit d70aa5e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 4570cd6a 220bbd74
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
net/ipv6/addrconf.c
+ 2
− 0
View file @ d70aa5e4
...@@ -985,6 +985,8 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, ...@@ -985,6 +985,8 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
} }
/* Rule 4: Prefer home address -- not implemented yet */ /* Rule 4: Prefer home address -- not implemented yet */
if (hiscore.rule < 4)
hiscore.rule++;
/* Rule 5: Prefer outgoing interface */ /* Rule 5: Prefer outgoing interface */
if (hiscore.rule < 5) { if (hiscore.rule < 5) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment