mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
iproute2: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48613
This commit is contained in:
parent
6af8f1429d
commit
29044db278
@ -1,6 +1,6 @@
|
||||
--- a/ip/ipxfrm.c
|
||||
+++ b/ip/ipxfrm.c
|
||||
@@ -467,7 +467,6 @@ void xfrm_selector_print(struct xfrm_sel
|
||||
@@ -470,7 +470,6 @@ void xfrm_selector_print(struct xfrm_sel
|
||||
switch (sel->proto) {
|
||||
case IPPROTO_TCP:
|
||||
case IPPROTO_UDP:
|
||||
@ -8,11 +8,11 @@
|
||||
case IPPROTO_DCCP:
|
||||
default: /* XXX */
|
||||
if (sel->sport_mask)
|
||||
@@ -1337,7 +1336,6 @@ static int xfrm_selector_upspec_parse(st
|
||||
@@ -1341,7 +1340,6 @@ static int xfrm_selector_upspec_parse(st
|
||||
switch (sel->proto) {
|
||||
case IPPROTO_TCP:
|
||||
case IPPROTO_UDP:
|
||||
- case IPPROTO_SCTP:
|
||||
case IPPROTO_DCCP:
|
||||
case IPPROTO_IP: /* to allow shared SA for different protocols */
|
||||
break;
|
||||
default:
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/misc/Makefile
|
||||
+++ b/misc/Makefile
|
||||
@@ -5,9 +5,9 @@
|
||||
@@ -5,9 +5,9 @@ TARGETS=ss nstat ifstat rtacct lnstat
|
||||
|
||||
include ../Config
|
||||
|
||||
@ -12,5 +12,4 @@
|
||||
+#endif
|
||||
|
||||
ifeq ($(HAVE_SELINUX),y)
|
||||
LDLIBS += $(shell pkg-config --libs libselinux)
|
||||
|
||||
LDLIBS += $(shell $(PKG_CONFIG) --libs libselinux)
|
||||
|
@ -9,4 +9,3 @@
|
||||
|
||||
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
|
||||
LDLIBS += $(LIBNETLINK)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -34,7 +34,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
|
||||
@@ -34,7 +34,7 @@ HOSTCC = gcc
|
||||
DEFINES += -D_GNU_SOURCE
|
||||
# Turn on transparent support for LFS
|
||||
DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
|
||||
@ -8,3 +8,4 @@
|
||||
+CCOPTS = -O2 $(EXTRA_CCOPTS)
|
||||
WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
|
||||
WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
|
||||
|
||||
|
@ -7,5 +7,5 @@
|
||||
-CFLAGS += -fPIC
|
||||
+CFLAGS += $(FPIC)
|
||||
|
||||
UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o \
|
||||
names.o
|
||||
UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \
|
||||
inet_proto.o namespace.o json_writer.o \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/ip/Makefile
|
||||
+++ b/ip/Makefile
|
||||
@@ -16,6 +16,13 @@ ifeq ($(IP_CONFIG_SETNS),y)
|
||||
@@ -17,6 +17,13 @@ ifeq ($(IP_CONFIG_SETNS),y)
|
||||
CFLAGS += -DHAVE_SETNS
|
||||
endif
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
|
||||
SCRIPTS=ifcfg rtpr routel routef
|
||||
TARGETS=ip rtmon
|
||||
@@ -43,7 +50,7 @@ else
|
||||
@@ -44,7 +51,7 @@ else
|
||||
|
||||
ip: static-syms.o
|
||||
static-syms.o: static-syms.h
|
||||
@ -70,7 +70,7 @@
|
||||
};
|
||||
--- a/lib/utils.c
|
||||
+++ b/lib/utils.c
|
||||
@@ -675,6 +675,7 @@ const char *rt_addr_n2a(int af, int len,
|
||||
@@ -710,6 +710,7 @@ const char *rt_addr_n2a(int af, int len,
|
||||
return inet_ntop(af, addr, buf, buflen);
|
||||
case AF_MPLS:
|
||||
return mpls_ntop(af, addr, buf, buflen);
|
||||
@ -78,7 +78,7 @@
|
||||
case AF_IPX:
|
||||
return ipx_ntop(af, addr, buf, buflen);
|
||||
case AF_DECnet:
|
||||
@@ -683,6 +684,7 @@ const char *rt_addr_n2a(int af, int len,
|
||||
@@ -718,6 +719,7 @@ const char *rt_addr_n2a(int af, int len,
|
||||
memcpy(dna.a_addr, addr, 2);
|
||||
return dnet_ntop(af, &dna, buf, buflen);
|
||||
}
|
||||
@ -98,4 +98,4 @@
|
||||
+
|
||||
CFLAGS += $(FPIC)
|
||||
|
||||
UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o \
|
||||
UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \
|
||||
|
@ -24,7 +24,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
|
||||
|
||||
--- a/include/linux/rtnetlink.h
|
||||
+++ b/include/linux/rtnetlink.h
|
||||
@@ -208,6 +208,7 @@ enum {
|
||||
@@ -210,6 +210,7 @@ enum {
|
||||
RTN_THROW, /* Not in this table */
|
||||
RTN_NAT, /* Translate this address */
|
||||
RTN_XRESOLVE, /* Use external resolver */
|
||||
|
Loading…
Reference in New Issue
Block a user