From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 064C8C46460 for ; Tue, 7 May 2019 05:48:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2B37206A3 for ; Tue, 7 May 2019 05:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557208105; bh=HgdTLEb3jB+qZl9zWsPI3Ht5ORdhynr4mHeCSve1tIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BlXW8iiNhnjjUTXtiNIMh5RwoITPIaLagT55g8T3aSqVRpa2S0SoBbGmhyIPSHFb5 S0I+/rBGCFf3kakF1AMeZN2ADXv4LRDoj/RbV/NamalW1spq0R6t8e0mKt6Q1NUbMc Xvx7quSi9r5wYsyXsPetdsRxj+pGw5/RpRd8AIfs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729209AbfEGFkr (ORCPT ); Tue, 7 May 2019 01:40:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:60198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729197AbfEGFkq (ORCPT ); Tue, 7 May 2019 01:40:46 -0400 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 91F5520578; Tue, 7 May 2019 05:40:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207646; bh=HgdTLEb3jB+qZl9zWsPI3Ht5ORdhynr4mHeCSve1tIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gKVY95Yt4WOCzx2RunNc4JEN/GkFrh2KpJWNcJ7t5KMXspzr3aaR3ztY1ewNPrPqE AsjUURtJZ6T/erGP6B96flBEESuKHrQ1mRYV+9GGRfhzQGnnhlWsOPxgzA6rEtHj2X fAno+r6X66wX5IwppTrF+8V1PbMZlYkMKbeILJBU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matteo Croce , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 77/95] gtp: change NET_UDP_TUNNEL dependency to select Date: Tue, 7 May 2019 01:38:06 -0400 Message-Id: <20190507053826.31622-77-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053826.31622-1-sashal@kernel.org> References: <20190507053826.31622-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matteo Croce [ Upstream commit c22da36688d6298f2e546dcc43fdc1ad35036467 ] Similarly to commit a7603ac1fc8c ("geneve: change NET_UDP_TUNNEL dependency to select"), GTP has a dependency on NET_UDP_TUNNEL which makes impossible to compile it if no other protocol depending on NET_UDP_TUNNEL is selected. Fix this by 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 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 aba0d652095b..f3357091e9d1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -212,8 +212,8 @@ config GENEVE config GTP tristate "GPRS Tunneling Protocol datapath (GTP-U)" - depends on INET && NET_UDP_TUNNEL - select NET_IP_TUNNEL + depends on INET + select NET_UDP_TUNNEL ---help--- This allows one to create gtp virtual interfaces that provide the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol -- 2.20.1