---

yaml --- r: 341743 b: refs/heads/master c: 9ba2add h: refs/heads/master i: 341741: 9b6a37e 341739: de3be2c 341735: c25f88e 341727: 1ba80e2 v: v3
git-mirror · Dec 3, 2012 · 692f0b3 · 692f0b3
1 parent d2d96fe
commit 692f0b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c85382e30618f66d4b15e608ff32253beb22649
+refs/heads/master: 9ba2add3cf5c103b7236f82a023c8ee05a51e4d1
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
@@ -2988,7 +2988,7 @@ static void addrconf_rs_timer(unsigned long data)
 	if (idev->dead || !(idev->if_flags & IF_READY))
 		goto out;
 
-	if (idev->cnf.forwarding)
+	if (!ipv6_accept_ra(idev))
 		goto out;
 
 	/* Announcement received after solicitation was sent */