openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Linus Torvalds 2005-11-29 08:06:51 -08:00
parent 4570cd6a65 220bbd7483
commit d70aa5e4b5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/addrconf.c
View File

@ -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) {