• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff -urN libnl-3.7.0/include/netlink-private/utils.h libnl-3.7.0-new/include/netlink-private/utils.h
2--- libnl-3.7.0/include/netlink-private/utils.h	2022-05-24 16:55:12.000000000 +0800
3+++ libnl-3.7.0-new/include/netlink-private/utils.h	2024-01-13 18:22:20.218754000 +0800
4@@ -114,10 +114,8 @@
5
6 #define _nl_assert_addr_family(addr_family)                                    \
7 	do {                                                                   \
8-		typeof(addr_family) _addr_family = (addr_family);              \
9-                                                                               \
10-		_nl_assert(_addr_family == AF_INET ||                          \
11-			   _addr_family == AF_INET6);                          \
12+		_nl_assert(addr_family == AF_INET ||                          \
13+			   addr_family == AF_INET6);                          \
14 	} while (0)
15
16 /*****************************************************************************/
17diff -urN libnl-3.7.0/lib/route/link/vrf.c libnl-3.7.0-new/lib/route/link/vrf.c
18--- libnl-3.7.0/lib/route/link/vrf.c	2022-05-24 16:55:12.000000000 +0800
19+++ libnl-3.7.0-new/lib/route/link/vrf.c	2024-01-15 17:14:53.121653400 +0800
20@@ -27,7 +27,6 @@
21 #include <netlink/route/link/vrf.h>
22
23 #include <linux/if_link.h>
24-#include <linux-private/linux/rtnetlink.h>
25
26 #define VRF_TABLE_ID_MAX  RT_TABLE_MAX
27
28diff -urN libnl-3.7.0/lib/route/mdb.c libnl-3.7.0-new/lib/route/mdb.c
29--- libnl-3.7.0/lib/route/mdb.c	2022-05-24 16:55:12.000000000 +0800
30+++ libnl-3.7.0-new/lib/route/mdb.c	2024-01-13 18:23:23.811971400 +0800
31@@ -7,7 +7,7 @@
32 #include <netlink/netlink.h>
33 #include <netlink/route/mdb.h>
34 #include <netlink/utils.h>
35-#include <linux/if_bridge.h>
36+#include <linux-private/linux/if_bridge.h>
37
38 /** @cond SKIP */
39 #define MDB_ATTR_IFINDEX         0x000001
40diff -urN libnl-3.7.0/lib/utils.c libnl-3.7.0-new/lib/utils.c
41--- libnl-3.7.0/lib/utils.c	2022-07-06 23:21:11.000000000 +0800
42+++ libnl-3.7.0-new/lib/utils.c	2024-01-13 18:24:36.832909100 +0800
43@@ -219,8 +219,8 @@
44
45 int nl_rate2str(unsigned long long rate, int type, char *buf, size_t len)
46 {
47-	char *unit;
48-	double frac;
49+	char *unit = NULL;
50+	double frac = 0.0;
51
52 	switch (type) {
53 	case NL_BYTE_RATE:
54@@ -367,6 +367,7 @@
55 	}
56
57 	BUG();
58+	return buf;
59 }
60
61 /**
62diff -urN libnl-3.7.0/src/lib/utils.c libnl-3.7.0-new/src/lib/utils.c
63--- libnl-3.7.0/src/lib/utils.c	2022-05-24 16:55:12.000000000 +0800
64+++ libnl-3.7.0-new/src/lib/utils.c	2024-01-15 16:17:20.093386000 +0800
65@@ -24,6 +24,8 @@
66 #include <dlfcn.h>
67 #endif
68
69+#define PKGLIBDIR "/usr/local/lib"
70+
71 /**
72  * Parse a text based 32 bit unsigned integer argument
73  * @arg arg		Integer in text form.
74