From patchwork Wed Sep 10 16:20:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?U8OpYmFzdGllbiBCYXJyw6k=?= X-Patchwork-Id: 387899 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 D204E14012A for ; Thu, 11 Sep 2014 02:26:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752689AbaIJQ0e (ORCPT ); Wed, 10 Sep 2014 12:26:34 -0400 Received: from smtp.sgsi.ucl.ac.be ([130.104.5.67]:53214 "EHLO smtp6.sgsi.ucl.ac.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752673AbaIJQ0c (ORCPT ); Wed, 10 Sep 2014 12:26:32 -0400 Received: from oasis.uclouvain.be (unknown [130.104.6.131]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by smtp6.sgsi.ucl.ac.be (Postfix) with ESMTPS id 0F9B718340A; Wed, 10 Sep 2014 18:26:25 +0200 (CEST) Received: from localhost.localdomain (83.134.17.199) by ucl-mbx01.OASIS.UCLOUVAIN.BE (10.10.10.21) with Microsoft SMTP Server (TLS) id 15.0.913.22; Wed, 10 Sep 2014 18:26:24 +0200 From: =?UTF-8?q?S=C3=A9bastien=20Barr=C3=A9?= To: David Miller CC: =?UTF-8?q?S=C3=A9bastien=20Barr=C3=A9?= , Julian Anastasov , , Gregory Detal , Christoph Paasch , Hannes Frederic Sowa , Sergei Shtylyov Subject: [PATCH net-next] Revert "ipv4: Clarify in docs that accept_local requires rp_filter." Date: Wed, 10 Sep 2014 18:20:23 +0200 Message-ID: <1410366023-9129-1-git-send-email-sebastien.barre@uclouvain.be> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [83.134.17.199] X-ClientProxiedBy: UCL-CAS03.OASIS.UCLOUVAIN.BE (10.10.10.43) To ucl-mbx01.OASIS.UCLOUVAIN.BE (10.10.10.21) X-Virus-Scanned: clamav-milter 0.97.7-exp at smtp-6.sipr-dc.ucl.ac.be X-Virus-Status: Clean Received-SPF: Pass (client IP white listed); receiver=; client-ip=130.104.6.131; helo= Received-SPF: Pass (client IP white listed); receiver=; client-ip=130.104.6.131; envelope-from= X-SGSI-MailScanner-ID: 0F9B718340A.ADBAA X-SGSI-MailScanner: Found to be clean X-SGSI-SpamCheck: n'est pas un polluriel, SpamAssassin (not cached, score=0.793, requis 5, autolearn=not spam, RDNS_NONE 0.79) X-SGSI-From: sebastien.barre@uclouvain.be X-SGSI-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit c801e3cc1925 ("ipv4: Clarify in docs that accept_local requires rp_filter."). It is not needed anymore since commit 1dced6a85482 ("ipv4: Restore accept_local behaviour in fib_validate_source()"). Suggested-by: Julian Anastasov Cc: Gregory Detal Cc: Christoph Paasch Cc: Hannes Frederic Sowa Cc: Sergei Shtylyov Signed-off-by: Sébastien Barré --- Documentation/networking/ip-sysctl.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index db2383c..1b5581a 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -952,14 +952,9 @@ accept_source_route - BOOLEAN FALSE (host) accept_local - BOOLEAN - Accept packets with local source addresses. In combination - with suitable routing, this can be used to direct packets - between two local interfaces over the wire and have them - accepted properly. - - rp_filter must be set to a non-zero value in order for - accept_local to have an effect. - + Accept packets with local source addresses. In combination with + suitable routing, this can be used to direct packets between two + local interfaces over the wire and have them accepted properly. default FALSE route_localnet - BOOLEAN