---

yaml --- r: 22116 b: refs/heads/master c: 045927f h: refs/heads/master v: v3
git-mirror · Mar 21, 2006 · d9bde1e · d9bde1e
1 parent 65aa62d
commit d9bde1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 554cfb7ee5d4f2d0edb280e66e4a2db1906a8300
+refs/heads/master: 045927ff84c340da5442543e87be988fcde5a283
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -1248,6 +1248,7 @@ struct rt6_info *rt6_get_dflt_router(struct in6_addr *addr, struct net_device *d
 	write_lock_bh(&rt6_lock);
 	for (rt = fn->leaf; rt; rt=rt->u.next) {
 		if (dev == rt->rt6i_dev &&
+		    ((rt->rt6i_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) &&
 		    ipv6_addr_equal(&rt->rt6i_gateway, addr))
 			break;
 	}