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 '23461551c006 ("fou: Support for foo-over-udp RX path")'
for depencies of udp_del_offload and udp_offloads, which were removed in
'd92283e338f6 ("fou: change to use UDP socket GRO")'.
Built and installed kernel and setup GUE/FOU tunnels.
Signed-off-by: Coco Li <[email protected]>
---
net/ipv4/Kconfig | 1 -
net/ipv4/fou.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 87983e70f03f..e983bb0c5012 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -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
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 0d085cc8d96c..025a33c1b04d 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -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>
--
2.35.1.1178.g4f1659d476-goog
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <[email protected]>:
On Mon, 11 Apr 2022 14:37:17 -0700 you wrote:
> 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 '23461551c006 ("fou: Support for foo-over-udp RX path")'
> for depencies of udp_del_offload and udp_offloads, which were removed in
> 'd92283e338f6 ("fou: change to use UDP socket GRO")'.
>
> [...]
Here is the summary with links:
- [net-next,v2] fou: Remove XRFM from NET_FOU Kconfig
https://git.kernel.org/netdev/net-next/c/753b953774b5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html