summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-04-01 21:44:35 -0700
committerJakub Kicinski <kuba@kernel.org>2024-04-01 21:44:36 -0700
commitb21bc5f7abcb27604e2b159c0ceb6d026826bf30 (patch)
tree264b1fee687f4b33b3af3154f43d805b7625c87a
parent2699c54746dcffd5a5a3496b32e47c3ee55e8a4e (diff)
parent35f73351533b52e7eed34b1d27ff280e41e72e10 (diff)
downloadwireguard-linux-trimmed-b21bc5f7abcb27604e2b159c0ceb6d026826bf30.tar.gz
wireguard-linux-trimmed-b21bc5f7abcb27604e2b159c0ceb6d026826bf30.zip
Merge branch 'genetlink-remove-linux-genetlink-h'davem/net
Jakub Kicinski says: ==================== genetlink: remove linux/genetlink.h There are two genetlink headers net/genetlink.h and linux/genetlink.h This is similar to netlink.h, but for netlink.h both contain good amount of code. For genetlink.h the linux/ version is leftover from before uAPI headers were split out, it has 10 lines of code. Move those 10 lines into other appropriate headers and delete linux/genetlink.h. I occasionally open the wrong header in the editor when coding, I guess I'm not the only one. v2: https://lore.kernel.org/all/20240325173716.2390605-1-kuba@kernel.org/ v1: https://lore.kernel.org/all/20240309183458.3014713-1-kuba@kernel.org ==================== Link: https://lore.kernel.org/r/20240329175710.291749-1-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/wireguard/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c
index ee4da9a..a00671b 100644
--- a/drivers/net/wireguard/main.c
+++ b/drivers/net/wireguard/main.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/genetlink.h>
+#include <net/genetlink.h>
#include <net/rtnetlink.h>
static int __init wg_mod_init(void)