Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net/ipv6/addrconf.c

+2 −0
Original line number Diff line number Diff line
@@ -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) {