mirror of
https://github.com/facebook/proxygen.git
synced 2025-08-01 10:26:51 +03:00
Summary: As titled, create a patch file for iproute2 for iproute version 4.2. This patch will help us compile in both Centos8 and Centos9. NOTE that these changes exist in new releases of iproute and we are backporting to ensure we can compile on Centos9. Patches from 6.4: - https://github.com/iproute2/iproute2/blob/main/ip/ipmroute.c#L41 - https://github.com/iproute2/iproute2/blob/main/ip/xfrm_monitor.c#L21 Reviewed By: shri-khare Differential Revision: D51971639 fbshipit-source-id: c09f93ef9b7a891842f763b7730548f0d0e1f44b
37 lines
742 B
Diff
37 lines
742 B
Diff
diff --git a/bridge/fdb.c b/bridge/fdb.c
|
|
--- a/bridge/fdb.c
|
|
+++ b/bridge/fdb.c
|
|
@@ -31,7 +31,7 @@
|
|
|
|
static unsigned int filter_index, filter_vlan, filter_state;
|
|
|
|
-json_writer_t *jw_global;
|
|
+static json_writer_t *jw_global;
|
|
|
|
static void usage(void)
|
|
{
|
|
diff --git a/ip/ipmroute.c b/ip/ipmroute.c
|
|
--- a/ip/ipmroute.c
|
|
+++ b/ip/ipmroute.c
|
|
@@ -44,7 +44,7 @@
|
|
exit(-1);
|
|
}
|
|
|
|
-struct rtfilter {
|
|
+static struct rtfilter {
|
|
int tb;
|
|
int af;
|
|
int iif;
|
|
diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c
|
|
--- a/ip/xfrm_monitor.c
|
|
+++ b/ip/xfrm_monitor.c
|
|
@@ -34,7 +34,7 @@
|
|
#include "ip_common.h"
|
|
|
|
static void usage(void) __attribute__((noreturn));
|
|
-int listen_all_nsid;
|
|
+static int listen_all_nsid;
|
|
|
|
static void usage(void)
|
|
{
|