From 1ad6b17c35d98677459b32fdbeba1129b80c5995 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 1 Feb 2020 00:48:25 +0100 Subject: extract-{handshakes,keys}: rework for upstream kernel Now that WireGuard has been upstreamed and the repos split, we have to look elsewhere for these headers. Signed-off-by: Jason A. Donenfeld --- contrib/extract-keys/Makefile | 7 +------ contrib/extract-keys/config.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'contrib/extract-keys') diff --git a/contrib/extract-keys/Makefile b/contrib/extract-keys/Makefile index 1f7308d..53e7767 100644 --- a/contrib/extract-keys/Makefile +++ b/contrib/extract-keys/Makefile @@ -23,10 +23,5 @@ clean: .PHONY: clean else -config-m := config.o -oldsrc := $(src) -src := $(src)/../../../src -include $(src)/compat/Kbuild.include -include $(src)/crypto/Kbuild.include -src := $(oldsrc) +obj-m := config.o endif diff --git a/contrib/extract-keys/config.c b/contrib/extract-keys/config.c index 640c61b..59009ef 100644 --- a/contrib/extract-keys/config.c +++ b/contrib/extract-keys/config.c @@ -10,9 +10,9 @@ struct def { extern const struct def defs[]; #ifdef __KERNEL__ -#include "../../../src/device.h" -#include "../../../src/peer.h" -#include "../../../src/noise.h" +#include "../drivers/net/wireguard/device.h" +#include "../drivers/net/wireguard/peer.h" +#include "../drivers/net/wireguard/noise.h" const struct def defs[] = { { "SOCK_DEVICE_OFFSET", offsetof(struct sock, sk_user_data) }, { "DEVICE_NAME_OFFSET", -ALIGN(sizeof(struct net_device), NETDEV_ALIGN) + offsetof(struct net_device, name) }, -- cgit v1.2.3-59-g8ed1b