| 1 | --- a/include/netlink/genl/mngt.h |
| 2 | +++ b/include/netlink/genl/mngt.h |
| 3 | @@ -22,6 +22,15 @@ extern "C" { |
| 4 | |
| 5 | struct nl_cache_ops; |
| 6 | |
| 7 | +struct genl_info |
| 8 | +{ |
| 9 | + struct sockaddr_nl * who; |
| 10 | + struct nlmsghdr * nlh; |
| 11 | + struct genlmsghdr * genlhdr; |
| 12 | + void * userhdr; |
| 13 | + struct nlattr ** attrs; |
| 14 | +}; |
| 15 | + |
| 16 | /** |
| 17 | * @ingroup genl_mngt |
| 18 | * Generic Netlink Command |
| 19 | --- a/include/netlink-types.h |
| 20 | +++ b/include/netlink-types.h |
| 21 | @@ -95,15 +95,6 @@ struct nl_cache_mngr |
| 22 | |
| 23 | struct nl_parser_param; |
| 24 | |
| 25 | -struct genl_info |
| 26 | -{ |
| 27 | - struct sockaddr_nl * who; |
| 28 | - struct nlmsghdr * nlh; |
| 29 | - struct genlmsghdr * genlhdr; |
| 30 | - void * userhdr; |
| 31 | - struct nlattr ** attrs; |
| 32 | -}; |
| 33 | - |
| 34 | #define LOOSE_FLAG_COMPARISON 1 |
| 35 | |
| 36 | #define NL_OBJ_MARK 1 |
| 37 | --- a/src/nl-list-caches.c |
| 38 | +++ b/src/nl-list-caches.c |
| 39 | @@ -10,6 +10,7 @@ |
| 40 | */ |
| 41 | |
| 42 | #include "utils.h" |
| 43 | +#include <netlink-local.h> |
| 44 | |
| 45 | static void print_usage(void) |
| 46 | { |
| 47 | --- a/src/utils.c |
| 48 | +++ b/src/utils.c |
| 49 | @@ -12,6 +12,7 @@ |
| 50 | #include "utils.h" |
| 51 | |
| 52 | #include <stdlib.h> |
| 53 | +#include <stdarg.h> |
| 54 | |
| 55 | int nltool_init(int argc, char *argv[]) |
| 56 | { |
| 57 | --- a/src/utils.h |
| 58 | +++ b/src/utils.h |
| 59 | @@ -22,7 +22,6 @@ |
| 60 | #include <sys/types.h> |
| 61 | #include <sys/socket.h> |
| 62 | |
| 63 | -#include <netlink-local.h> |
| 64 | #include <netlink/netlink.h> |
| 65 | #include <netlink/utils.h> |
| 66 | #include <netlink/addr.h> |
| 67 | |