140-fix-linking-libnl-genl.patch 1.2 KB

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