matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-08-09 09:11:48 -07:00
parent e9155685b7 fcfcc40b7d
commit 7ef36c8cea
6 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -1,7 +1,4 @@
# Include "Config" if already generated # Top level Makefile for iproute2
ifneq ($(wildcard Config),)
include Config
endif
ifeq ($(VERBOSE),0) ifeq ($(VERBOSE),0)
MAKEFLAGS += --no-print-directory MAKEFLAGS += --no-print-directory
@ -57,16 +54,6 @@ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink man
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
LDLIBS += $(LIBNETLINK) LDLIBS += $(LIBNETLINK)
ifeq ($(HAVE_ELF),y)
CFLAGS += -DHAVE_ELF
LDLIBS += -lelf
endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: Config all: Config
@set -e; \ @set -e; \
for i in $(SUBDIRS); \ for i in $(SUBDIRS); \

5
bridge/Makefile
View File

@ -6,6 +6,11 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS CFLAGS += -DHAVE_SETNS
endif endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: bridge all: bridge
bridge: $(BROBJ) $(LIBNETLINK) bridge: $(BROBJ) $(LIBNETLINK)

5
genl/Makefile
View File

@ -17,6 +17,11 @@ LDFLAGS += -Wl,-export-dynamic
LDLIBS += -lm -ldl LDLIBS += -lm -ldl
endif endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: genl all: genl
genl: $(GENLOBJ) $(LIBNETLINK) $(LIBUTIL) $(GENLLIB) genl: $(GENLOBJ) $(LIBNETLINK) $(LIBUTIL) $(GENLLIB)

18
ip/link_vti.c
View File

@ -210,8 +210,9 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{ {
const char *local = "any"; const char *local = "any";
const char *remote = "any"; const char *remote = "any";
__u32 key;
unsigned int link; unsigned int link;
char s2[64]; char s2[IFNAMSIZ];
if (!tb) if (!tb)
return; return;
@ -244,15 +245,14 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
fprintf(f, "dev %u ", link); fprintf(f, "dev %u ", link);
} }
if (tb[IFLA_VTI_IKEY]) { if (tb[IFLA_VTI_IKEY] &&
inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_IKEY]), s2, sizeof(s2)); (key = rta_getattr_u32(tb[IFLA_VTI_IKEY])))
fprintf(f, "ikey %s ", s2); fprintf(f, "ikey %#x ", ntohl(key));
}
if (tb[IFLA_VTI_OKEY]) {
inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_OKEY]), s2, sizeof(s2)); if (tb[IFLA_VTI_OKEY] &&
fprintf(f, "okey %s ", s2); (key = rta_getattr_u32(tb[IFLA_VTI_OKEY])))
} fprintf(f, "okey %#x ", ntohl(key));
if (tb[IFLA_VTI_FWMARK] && rta_getattr_u32(tb[IFLA_VTI_FWMARK])) { if (tb[IFLA_VTI_FWMARK] && rta_getattr_u32(tb[IFLA_VTI_FWMARK])) {
fprintf(f, "fwmark 0x%x ", fprintf(f, "fwmark 0x%x ",

5
misc/Makefile
View File

@ -18,6 +18,11 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS CFLAGS += -DHAVE_SETNS
endif endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: $(TARGETS) all: $(TARGETS)
ss: $(SSOBJ) ss: $(SSOBJ)

7
netem/Makefile
View File

@ -1,3 +1,5 @@
include ../Config
DISTGEN = maketable normal pareto paretonormal DISTGEN = maketable normal pareto paretonormal
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
@ -5,6 +7,11 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS) CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm LDLIBS += -lm
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: $(DISTGEN) $(DISTDATA) all: $(DISTGEN) $(DISTDATA)
$(DISTGEN): $(DISTGEN):