Received: by 2002:a05:6a10:6006:0:0:0:0 with SMTP id w6csp1802148pxa; Sat, 29 Aug 2020 03:58:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzggWTnSLF4v7Br8fo9fPG5sWugvXK9E6vrM4EzHbA8JvMEuU0FR+erRLtCbG4HMT2FBXgK X-Received: by 2002:aa7:c6ca:: with SMTP id b10mr2905589eds.269.1598698679950; Sat, 29 Aug 2020 03:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598698679; cv=none; d=google.com; s=arc-20160816; b=nszCsbPYQFJ5UYvTj7IUY5SE9Di7yRMA1+1Vuox5X2492UDKy5VjcHAboduNSbt9/3 CmF/UHm2pmzj03Cj7ctOs43wfzgY9b1yRMkplu4GTOjrMJgsdabexZuE8UqA+GT/qSV7 9BB7VjV74EpBkjxeNG+UCazH8KJJbH0ogmM48pCgSVp1eRqH6h0TFtCay4McYrULLq/g iH3KsAfcc9/dmZ6f2UVfG+TLCvSkSYStJA/ME3nR3gYLu8EIsy+iXPySAVvtbsLF4MIQ u8O8/tSuCDISMjifpN71bEAU7O4LzNP6BK12tl3B2xIsma398OXQuN8zZrgaMHOn11oj Wqiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BMy5hmZf2vyJeauI9qrcgHjim5V/GDqMgLpePnO/64o=; b=QJexT0ZgupjgQYdR2BAAOQeG6nfRVJWEkYkESj4Itzt4gUgWRApa6pFCtgNNcPKjln hnQUHaTxAc1Hncv8B9GBuA2kVz5lpAK3sD2AKebORYNxjrXFpKiiWJdc779ezIoxWC12 t8mgdd8D6h1z1YjQsWY9cCxVoEmudeD3hXNBz9dD17B3FAxkGIaxTIpa0lqnJMJWnDQL tA7Tr8Im06pBfJ0Gj2G2ADi75Jmf2SzpFZ73lu7GbKWlQT/tJjWBBxNgPpXANV8XH8BQ 7OWHa5Kr1KCG0YS7UheLNH0i+JkZWwT7DJAbTs0igEHQQnvPnhzOo6V1tYYe5rnh+lrW 7WhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z1si1464377eja.41.2020.08.29.03.57.37; Sat, 29 Aug 2020 03:57:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728114AbgH2K4W (ORCPT + 99 others); Sat, 29 Aug 2020 06:56:22 -0400 Received: from forward105p.mail.yandex.net ([77.88.28.108]:43743 "EHLO forward105p.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728070AbgH2Kx7 (ORCPT ); Sat, 29 Aug 2020 06:53:59 -0400 X-Greylist: delayed 7360 seconds by postgrey-1.27 at vger.kernel.org; Sat, 29 Aug 2020 06:53:31 EDT Received: from forward101q.mail.yandex.net (forward101q.mail.yandex.net [IPv6:2a02:6b8:c0e:4b:0:640:4012:bb98]) by forward105p.mail.yandex.net (Yandex) with ESMTP id C036A4D41A1A; Sat, 29 Aug 2020 13:52:44 +0300 (MSK) Received: from mxback7q.mail.yandex.net (mxback7q.mail.yandex.net [IPv6:2a02:6b8:c0e:41:0:640:cbbf:d618]) by forward101q.mail.yandex.net (Yandex) with ESMTP id BAC61CF40002; Sat, 29 Aug 2020 13:52:44 +0300 (MSK) Received: from vla1-00787b9b359d.qloud-c.yandex.net (vla1-00787b9b359d.qloud-c.yandex.net [2a02:6b8:c0d:2915:0:640:78:7b9b]) by mxback7q.mail.yandex.net (mxback/Yandex) with ESMTP id gCYnzgL8Ka-qh8iouRw; Sat, 29 Aug 2020 13:52:44 +0300 Received: by vla1-00787b9b359d.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id 8pPW436arS-qelORpTN; Sat, 29 Aug 2020 13:52:42 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Yaroslav Bolyukin To: ja@ssi.bg Cc: iam@lach.pw, Wensong Zhang , Simon Horman , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , Jakub Kicinski , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , netdev@vger.kernel.org, lvs-devel@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Subject: [PATCHv4 net-next] Remove ipvs v6 dependency on iptables Date: Sat, 29 Aug 2020 15:51:37 +0500 Message-Id: <20200829105136.3533-1-iam@lach.pw> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This dependency was added because ipv6_find_hdr was in iptables specific code but is no longer required Fixes: f8f626754ebe ("ipv6: Move ipv6_find_hdr() out of Netfilter code.") Fixes: 63dca2c0b0e7 ("ipvs: Fix faulty IPv6 extension header handling in IPVS"). Signed-off-by: Yaroslav Bolyukin --- include/net/ip_vs.h | 3 --- net/netfilter/ipvs/Kconfig | 1 - 2 files changed, 4 deletions(-) diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 9a59a3378..d609e957a 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -25,9 +25,6 @@ #include #include /* for struct ipv6hdr */ #include -#if IS_ENABLED(CONFIG_IP_VS_IPV6) -#include -#endif #if IS_ENABLED(CONFIG_NF_CONNTRACK) #include #endif diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig index 2c1593089..eb0e329f9 100644 --- a/net/netfilter/ipvs/Kconfig +++ b/net/netfilter/ipvs/Kconfig @@ -29,7 +29,6 @@ if IP_VS config IP_VS_IPV6 bool "IPv6 support for IPVS" depends on IPV6 = y || IP_VS = IPV6 - select IP6_NF_IPTABLES select NF_DEFRAG_IPV6 help Add IPv6 support to IPVS. -- 2.28.0