From 1abf39e00ab2993f63c064138d0bd906b3164f57 Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Wed, 20 Feb 2019 15:44:36 +0000 Subject: [PATCH] geneve: change NET_UDP_TUNNEL dependency to select mainline inclusion from mainline-v5.0 commit a7603ac1fc8c category: bugfix bugzilla: 9546 CVE: NA ------------------------------------------------- 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: Shangli Reviewed-by: Mao Wenan Signed-off-by: Yang Yingliang --- drivers/net/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d03775100f7d..bc4f8b7fd9f8 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 -- GitLab