From patchwork Thu Jun 28 18:01:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TcOhdMOpIEVja2w=?= X-Patchwork-Id: 936305 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="db/2hdTS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Gndd4vykz9ryt for ; Fri, 29 Jun 2018 04:01:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967652AbeF1SBI (ORCPT ); Thu, 28 Jun 2018 14:01:08 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:37082 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967649AbeF1SBG (ORCPT ); Thu, 28 Jun 2018 14:01:06 -0400 Received: by mail-wr0-f196.google.com with SMTP id k6-v6so6392266wrp.4 for ; Thu, 28 Jun 2018 11:01:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HaiuPxcM3/WjlEpjJpW8mjufHtLNEONLPssbD37qSZM=; b=db/2hdTSoyw9me9IvP9Y4g1nlJv4XEMHIi4i5CR2WvItJbSd+lVbjDy+jF6/WKEqpr dRTBZhRQK3d8lnFPUHDgn8q1+8mJqK22H83tuyIxFBwMMt0EtHtxSoeSa9/ZsmlZmoF0 baVOehpIUUG1yMQDvznpvYGWxz8+Hkwlzy31ebvCVz72XQx2aUCmPOzN2XHm+z2VlduM 5cWdc1u3s0QlFwX6xhyxUk/xoPpqOrc4pCQEBQHo/XCAShAqPIpFiT8oH/VochxCne9i YAiysW6BtvHwVJCFEoUEBOSkMA5S95u/UQE81idp8LmEXsQyKve3ZHY+K5zk+p7bfsPZ OnEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HaiuPxcM3/WjlEpjJpW8mjufHtLNEONLPssbD37qSZM=; b=F1kDHQzoGhagClg109pU6FBBFK+QbPqyzGICDH/I131FqNJyWFdyDq74Z6lQ8Q7+tT Zi+308xJOWANr1rIpC1NsXcJOOe8Ri5573bh622qmz2tt3t+UlLWXRRMC/YFwZWellrH 7X4JGfyuK5VkraNKkhrtpQUug/jLyEswDjD4x8/5q10loyywtW+A96eMuVV5uA4A5Nl4 ajZrBegYKKxFYDOyYFh+Akt2wAwMfaz6Kou6DYnth2KO4wAVE6ic4tzt5sHFHSl1giv7 J1zx+8KXbbuFShK1FWsX+3tM0mdWI94v1lgDOgdACFJKGBnPkWlUGwFPbwf5l1MapJJi OU2w== X-Gm-Message-State: APt69E2gHJp3hs9I61h91kccmDsQiEil0+C5lfUeSXLPxXDV4M4/RdhL n97jVC1+PflAQYKLeOQmnLyY5Zc3 X-Google-Smtp-Source: AAOMgpfKxOZ56cztpk2AhLxSQP4Yr6FTutHbnnMUGdajZmThvV+07lLf2POmoOXHlg79Q7DVFRc+Qw== X-Received: by 2002:adf:a285:: with SMTP id s5-v6mr9361025wra.114.1530208864921; Thu, 28 Jun 2018 11:01:04 -0700 (PDT) Received: from ecklm-lapos.localdomain (ecklm-pi.sch.bme.hu. [152.66.210.28]) by smtp.gmail.com with ESMTPSA id k7-v6sm5382419wrq.82.2018.06.28.11.01.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 11:01:04 -0700 (PDT) From: =?utf-8?b?TcOhdMOpIEVja2w=?= To: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next] netfilter: Kconfig: Change select dependencies from IPV6 to NF_TABLES_IPV6 and IP6_NF_IPTABLES Date: Thu, 28 Jun 2018 20:01:01 +0200 Message-Id: <20180628180102.10049-1-ecklm94@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180618131252.26423-1-ecklm94@gmail.com> References: <20180618131252.26423-1-ecklm94@gmail.com> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org In some cases module selects depend on IPV6, but this means that they select another module even if eg. NF_TABLES_IPV6 is not set in which case the selected module is useless due to the lack of IPv6 nf_tables functionality. The same applies for IP6_NF_IPTABLES and iptables. Signed-off-by: Máté Eckl --- net/netfilter/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index dbd7d1fad277..25861340f818 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -626,7 +626,7 @@ config NFT_SOCKET tristate "Netfilter nf_tables socket match support" depends on IPV6 || IPV6=n select NF_SOCKET_IPV4 - select NF_SOCKET_IPV6 if IPV6 + select NF_SOCKET_IPV6 if NF_TABLES_IPV6 help This option allows matching for the presence or absence of a corresponding socket and its attributes. @@ -892,7 +892,7 @@ config NETFILTER_XT_TARGET_LOG tristate "LOG target support" select NF_LOG_COMMON select NF_LOG_IPV4 - select NF_LOG_IPV6 if IPV6 + select NF_LOG_IPV6 if IP6_NF_IPTABLES default m if NETFILTER_ADVANCED=n help This option adds a `LOG' target, which allows you to create rules in @@ -984,7 +984,7 @@ config NETFILTER_XT_TARGET_TEE depends on IPV6 || IPV6=n depends on !NF_CONNTRACK || NF_CONNTRACK select NF_DUP_IPV4 - select NF_DUP_IPV6 if IPV6 + select NF_DUP_IPV6 if IP6_NF_IPTABLES ---help--- This option adds a "TEE" target with which a packet can be cloned and this clone be rerouted to another nexthop.