tools: ynl: remove the libmnl dependency
authorJakub Kicinski <kuba@kernel.org>
Tue, 27 Feb 2024 22:30:31 +0000 (14:30 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 28 Feb 2024 23:25:45 +0000 (15:25 -0800)
We don't use libmnl any more.

Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Link: https://lore.kernel.org/r/20240227223032.1835527-15-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/net/ynl/lib/ynl-priv.h
tools/net/ynl/lib/ynl.c
tools/net/ynl/samples/Makefile
tools/net/ynl/ynl-gen-c.py

index 5150ef1dacdadcd6f70682eebf36d8f26af947c7..a8099fab035decb75759ee14b50718125c719804 100644 (file)
@@ -2,8 +2,8 @@
 #ifndef __YNL_C_PRIV_H
 #define __YNL_C_PRIV_H 1
 
+#include <stdbool.h>
 #include <stddef.h>
-#include <libmnl/libmnl.h>
 #include <linux/types.h>
 
 struct ynl_parse_arg;
@@ -12,8 +12,6 @@ struct ynl_parse_arg;
  * YNL internals / low level stuff
  */
 
-/* Generic mnl helper code */
-
 enum ynl_policy_type {
        YNL_PT_REJECT = 1,
        YNL_PT_IGNORE,
index 9d028929117accf1f052bbe6002264529e954e18..f8a66ae88ba9e3ef230a429e59d9db3d7f7845ef 100644 (file)
@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <linux/types.h>
-#include <libmnl/libmnl.h>
 #include <linux/genetlink.h>
 #include <sys/socket.h>
 
index 28bdb1557a54cf1894b45dcb76d7b73dc5b30e20..1d33e98e3ffe7d533a9c4516d15c1d68ae8693ff 100644 (file)
@@ -9,7 +9,7 @@ ifeq ("$(DEBUG)","1")
   CFLAGS += -g -fsanitize=address -fsanitize=leak -static-libasan
 endif
 
-LDLIBS=-lmnl ../lib/ynl.a ../generated/protos.a
+LDLIBS=../lib/ynl.a ../generated/protos.a
 
 SRCS=$(wildcard *.c)
 BINS=$(patsubst %.c,%,${SRCS})
index 375d5f5e3052535c9561ec8ee803e86e5cc7dec7..2f5febfe66a1f898217b6d4fb5dd5532c6523121 100755 (executable)
@@ -2677,7 +2677,6 @@ def main():
 
     if args.mode == "user":
         if not args.header:
-            cw.p("#include <libmnl/libmnl.h>")
             cw.p("#include <linux/genetlink.h>")
             cw.nl()
             for one in args.user_header: