Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp4566251pja; Thu, 21 Nov 2019 22:00:09 -0800 (PST) X-Google-Smtp-Source: APXvYqzBCn9uPjFtdvSxGoEgEi0FsrnbOlU5rtDFJtFirklWV8thFXYlfeVnTrjRPlSQaOWLDXPB X-Received: by 2002:a17:907:20b4:: with SMTP id pw20mr19217166ejb.83.1574402409609; Thu, 21 Nov 2019 22:00:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574402409; cv=none; d=google.com; s=arc-20160816; b=E3jh7lKlHNRqgotDUtKZaKtBqCMMeRWc+VqMNqNIEFoAUKaoOCQL4YPCRj+U394d6N uUgC7BnRvOwdx0wE1S9HH43k51FT4pYYqdJ5H+GbAh7InAUYVpRqZjCfRMbirxZQnelZ 8569h+oU+YumgTP4prO0bLgIy/2++Np6fY0DVJIGZDSSBccLTJN2FL+b/cPBEmkdENxa 1ALPcKtwqlhD7p843EZLoiEuo2yxjFD3Q88OmNsNSoLgaMMqlbC+TamxW3hAmkAmFf7n rAP5TnrPskA5oA36u/hF22dUG+FIZJp97EH9Gyfzd/y70dUxkVPWSRwtDzJJkLTusdOQ /q1w== 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 :dkim-signature; bh=Y7Z6JNwrJGrYo9FneFaDPYoJ6knIEWMXeitYTf/sx4I=; b=EVpXxRU3Z0sPvfgyimSrCItBlrGpGZhxkZBNmzEflVnJkT6Qv9NSuS0HtZw0BdTQKP U2dZWOdHmVEqLifN1sQv/Z/F8y6CQIYd1gGtLgQakFXwIyztZRyb7xbPVe/vDPTOUUU/ rClqxR+/WkFse7u5RbZZi97SRD3FxS5HtDDeDSVWfSWsviNUxN8SJvFYiHyDSNcGclWv /fNXZZ4Ojjak148p6NuDsToG5X3kvJnqx+T1cXMF2aLjf/UXk+9kCfF5pUfsHvt1YiLl LX2VXu//Va3lYdnyrrwkf5DAl+NnAQHMqKlqSHO4ezc3sTPsR7D7O/ArLKBg6UChCbNS GrCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pRTbi4Yb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a13si3194655ejy.365.2019.11.21.21.59.45; Thu, 21 Nov 2019 22:00:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pRTbi4Yb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728441AbfKVFzg (ORCPT + 99 others); Fri, 22 Nov 2019 00:55:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:58752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727495AbfKVFwv (ORCPT ); Fri, 22 Nov 2019 00:52:51 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 544E420721; Fri, 22 Nov 2019 05:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401970; bh=zXt9GqHUeIEH2vibE824zaULD6dlD3GFqN4+W2MhxWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pRTbi4YbXNkVFmKWO3dW4uotjVM7cTdm1zcJGM1S3L3GyXic6o1T/e7QvFbpF5Dlk YJ8eJsu3y0na8pukmnFN5K+D7XIazICItbC3acF5Sbc8UXaYqpa8qTBu58+RTRJUBg vjRm/U9rLYckoK9xDcK+3xQhlA1HNk/3S1uG1tfo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matteo Croce , Andrea Claudi , Davide Caratti , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 190/219] geneve: change NET_UDP_TUNNEL dependency to select Date: Fri, 22 Nov 2019 00:48:42 -0500 Message-Id: <20191122054911.1750-183-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matteo Croce [ Upstream commit a7603ac1fc8ce1409f8ff70e6ce505f308b2c002 ] Due to the depends on NET_UDP_TUNNEL, at the moment it is impossible to compile GENEVE if no other protocol depending on NET_UDP_TUNNEL is selected. Fix this changing the depends to a select, and drop NET_IP_TUNNEL from the select list, as it already depends on NET_UDP_TUNNEL. Signed-off-by: Matteo Croce Reviewed-and-tested-by: Andrea Claudi Tested-by: Davide Caratti Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 619bf1498a662..0652caad57ec1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -197,9 +197,9 @@ config VXLAN config GENEVE tristate "Generic Network Virtualization Encapsulation" - depends on INET && NET_UDP_TUNNEL + depends on INET depends on IPV6 || !IPV6 - select NET_IP_TUNNEL + select NET_UDP_TUNNEL select GRO_CELLS ---help--- This allows one to create geneve virtual interfaces that provide -- 2.20.1