diff --git a/[refs] b/[refs]
index 2d594f85e0eb..845ff33277dc 100644
--- 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
index f71e2365b43d..ea6eb44618e7 100644
--- 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;
 	}