diff --git a/[refs] b/[refs]
index 1855cddc6ebb..5f07f8881d5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ceb4f53929f73746be72f73707cd9f8753e2fc
+refs/heads/master: e317da96227cef28a137e2d1ad790b23e518dd2b
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 0f30ee3d94ea..f587a0e6cf34 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1403,6 +1403,9 @@ static struct rt6_info *rt6_add_route_info(struct in6_addr *prefix, int prefixle
 	ipv6_addr_copy(&rtmsg.rtmsg_gateway, gwaddr);
 	rtmsg.rtmsg_metric = 1024;
 	rtmsg.rtmsg_flags = RTF_GATEWAY | RTF_ADDRCONF | RTF_ROUTEINFO | RTF_UP | RTF_PREF(pref);
+	/* We should treat it as a default route if prefix length is 0. */
+	if (!prefixlen)
+		rtmsg.rtmsg_flags |= RTF_DEFAULT;
 	rtmsg.rtmsg_ifindex = ifindex;
 
 	ip6_route_add(&rtmsg, NULL, NULL, NULL);