From patchwork Sun Dec 2 11:44:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 203202 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 218FE2C00AE for ; Sun, 2 Dec 2012 22:45:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541Ab2LBLp3 (ORCPT ); Sun, 2 Dec 2012 06:45:29 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:39994 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753292Ab2LBLp1 (ORCPT ); Sun, 2 Dec 2012 06:45:27 -0500 Received: by mail-ee0-f46.google.com with SMTP id e53so1083415eek.19 for ; Sun, 02 Dec 2012 03:45:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=RrcaOTMNnWilE7GLN9WYyxpG7JK2NqhsfruS6BqRLK8=; b=QuBdfSIYq1jk4dnFKzs0KWDyH9RW/4k8OPdbeqfdu9A3LHb1aQ3QUsVCCF0ouLL6b8 EObHeQf798HuKV7X8cqa/vnGrOZ6KUIsAphWoan6hNsl/G2r12GosozcLiXhuAbPlgPe 9gBStewGlQPiCWLDdkJwC2cAtzDCDSqWvgxe5Ri7PrpaHGN+YvqdQErWQPG6y86kBojx vk2qsLX7OirQLVMKds73mQ17Gl/97ADpFEuCXAqpytVK4jTUH9MQ/oOgzFbVoyc7FlQj hB3hMtuIF+cxlkNGXpO4/zmNS26g1+Yo1WAQSk3kb89d4k1TNMBBn1xztrLudC+yTm7q bI3Q== Received: by 10.14.215.194 with SMTP id e42mr25055139eep.32.1354448726802; Sun, 02 Dec 2012 03:45:26 -0800 (PST) Received: from pixies.home.jungo.com ([212.150.239.254]) by mx.google.com with ESMTPS id 43sm23898437eed.10.2012.12.02.03.45.24 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 02 Dec 2012 03:45:25 -0800 (PST) From: Shmulik Ladkani To: "David S. Miller" Cc: netdev@vger.kernel.org, Hideaki YOSHIFUJI , Thomas Graf , Tore Anderson , Ami Koren , Shmulik Ladkani Subject: [PATCH net-next] ipv6: Make 'addrconf_rs_timer' send Router Solicitations (and re-arm itself) if Router Advertisements are accepted Date: Sun, 2 Dec 2012 13:44:53 +0200 Message-Id: <1354448693-32155-1-git-send-email-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 1.7.9 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As of 026359b [ipv6: Send ICMPv6 RSes only when RAs are accepted], Router Solicitations are sent whenever kernel accepts Router Advertisements on the interface. However, this logic isn't reflected in 'addrconf_rs_timer'. The timer fails to issue subsequent RS messages (and fails to re-arm itself) if forwarding is enabled and the special hybrid mode is enabled (accept_ra=2). Fix the condition determining whether next RS should be sent, by using 'ipv6_accept_ra()'. Reported-by: Ami Koren Signed-off-by: Shmulik Ladkani --- net/ipv6/addrconf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ca1ed8a..3b990a2 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2843,7 +2843,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 */