Commit 753b9537 authored by Coco Li's avatar Coco Li Committed by Jakub Kicinski
Browse files

fou: Remove XRFM from NET_FOU Kconfig 



XRFM is no longer needed for configuring FOU tunnels
(CONFIG_NET_FOU_IP_TUNNELS), remove from Kconfig.

Also remove the xrfm.h dependency in fou.c. It was
added in '23461551 ("fou: Support for foo-over-udp RX path")'
for depencies of udp_del_offload and udp_offloads, which were removed in
'd92283e3 ("fou: change to use UDP socket GRO")'.

Built and installed kernel and setup GUE/FOU tunnels.

Signed-off-by: default avatarCoco Li <lixiaoyan@google.com>
Link: https://lore.kernel.org/r/20220411213717.3688789-1-lixiaoyan@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d3c17b5d

net/ipv4/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ config NET_UDP_TUNNEL 


config NET_FOU

	tristate "IP: Foo (IP protocols) over UDP"

	select XFRM

	select NET_UDP_TUNNEL

	help

	  Foo over UDP allows any IP protocol to be directly encapsulated

net/ipv4/fou.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <net/protocol.h>

#include <net/udp.h>

#include <net/udp_tunnel.h>

#include <net/xfrm.h>

#include <uapi/linux/fou.h>

#include <uapi/linux/genetlink.h>