---

yaml --- r: 360825 b: refs/heads/master c: 3e8b0ac h: refs/heads/master i: 360823: 77a6e85 v: v3
git-mirror · Mar 4, 2013 · 4ef49bb · 4ef49bb
1 parent ad8a44f
commit 4ef49bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de5fb0a053482d89262c3284b67884cd2c621adc
+refs/heads/master: 3e8b0ac3e41e3c882222a5522d5df7212438ab51
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -1915,7 +1915,8 @@ void rt6_purge_dflt_routers(struct net *net)
 restart:
 	read_lock_bh(&table->tb6_lock);
 	for (rt = table->tb6_root.leaf; rt; rt = rt->dst.rt6_next) {
-		if (rt->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) {
+		if (rt->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF) &&
+		    (!rt->rt6i_idev || rt->rt6i_idev->cnf.accept_ra != 2)) {
 			dst_hold(&rt->dst);
 			read_unlock_bh(&table->tb6_lock);
 			ip6_del_rt(rt);