Development discussion of WireGuard
 help / color / mirror / Atom feed
* [PATCH] wg: freebsd: move if_wg path to reflect new in-tree location
@ 2022-10-29  1:45 kevans
  2022-10-29  1:52 ` Jason A. Donenfeld
  0 siblings, 1 reply; 2+ messages in thread
From: kevans @ 2022-10-29  1:45 UTC (permalink / raw)
  To: wireguard; +Cc: Kyle Evans

From: Kyle Evans <kevans@FreeBSD.org>

When we re-added if_wg to the tree, we changed directories in dev to
strip the if_ (we don't use this prefix for other interfaces'
directories). Adjust it here as a convenience, so that when we import
wireguard-tools to FreeBSD the path will just work as-is with our usual
build.

Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
---
 src/ipc-freebsd.h                          | 2 +-
 src/uapi/freebsd/dev/{if_wg => wg}/if_wg.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/uapi/freebsd/dev/{if_wg => wg}/if_wg.h (100%)

diff --git a/src/ipc-freebsd.h b/src/ipc-freebsd.h
index 2c10c10..b5be15b 100644
--- a/src/ipc-freebsd.h
+++ b/src/ipc-freebsd.h
@@ -6,7 +6,7 @@
 
 #include <sys/nv.h>
 #include <sys/sockio.h>
-#include <dev/if_wg/if_wg.h>
+#include <dev/wg/if_wg.h>
 
 #define IPC_SUPPORTS_KERNEL_INTERFACE
 
diff --git a/src/uapi/freebsd/dev/if_wg/if_wg.h b/src/uapi/freebsd/dev/wg/if_wg.h
similarity index 100%
rename from src/uapi/freebsd/dev/if_wg/if_wg.h
rename to src/uapi/freebsd/dev/wg/if_wg.h
-- 
2.36.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] wg: freebsd: move if_wg path to reflect new in-tree location
  2022-10-29  1:45 [PATCH] wg: freebsd: move if_wg path to reflect new in-tree location kevans
@ 2022-10-29  1:52 ` Jason A. Donenfeld
  0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2022-10-29  1:52 UTC (permalink / raw)
  To: kevans; +Cc: wireguard

https://git.zx2c4.com/wireguard-tools/commit/?id=7b2ae7aa2f52fbac65874a641cbfbb0182d0ba46

Applied, thanks!

(Very excited about all this...)

Jason

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-29  1:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-29  1:45 [PATCH] wg: freebsd: move if_wg path to reflect new in-tree location kevans
2022-10-29  1:52 ` Jason A. Donenfeld

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).