From 692f0b303a09e43d9456d7a442376064273ad609 Mon Sep 17 00:00:00 2001
From: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Date: Sun, 2 Dec 2012 01:44:53 +0000
Subject: [PATCH] --- yaml --- r: 341743 b: refs/heads/master c:
 9ba2add3cf5c103b7236f82a023c8ee05a51e4d1 h: refs/heads/master i:   341741:
 9b6a37e79a61659be1ad4612ea21fc06539d55ab   341739:
 de3be2c04a4078a7b81379098716148fcd57475c   341735:
 c25f88e64a016d07d12d3fe2bdb56ca11e947fd5   341727:
 1ba80e20d3774025789b8ac595c0f8d750f13831 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8ade67b9a626..b9abcab7fdbb 100644
--- 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
index 4b644f656c41..22ae75d54017 100644
--- 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 */