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

Merge branch 'merge-4.10' into next-merge

This commit is contained in:
Stephen Hemminger 2017-02-17 15:32:28 -08:00
parent 6374961a00 d754a64aed
commit 732b18af97
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rt_names.c
View File

@ -119,7 +119,7 @@ static void rtnl_tab_initialize(const char *file, char **tab, int size)
}
static char *rtnl_rtprot_tab[256] = {
[RTPROT_UNSPEC] = "none",
[RTPROT_UNSPEC] = "unspec",
[RTPROT_REDIRECT] = "redirect",
[RTPROT_KERNEL] = "kernel",
[RTPROT_BOOT] = "boot",

9
tc/f_matchall.c
View File

@ -130,6 +130,15 @@ static int matchall_print_opt(struct filter_util *qu, FILE *f,
sprint_tc_classid(rta_getattr_u32(tb[TCA_MATCHALL_CLASSID]), b1));
}
if (tb[TCA_MATCHALL_FLAGS]) {
__u32 flags = rta_getattr_u32(tb[TCA_MATCHALL_FLAGS]);
if (flags & TCA_CLS_FLAGS_SKIP_HW)
fprintf(f, "\n skip_hw");
if (flags & TCA_CLS_FLAGS_SKIP_SW)
fprintf(f, "\n skip_sw");
}
if (tb[TCA_MATCHALL_ACT])
tc_print_action(f, tb[TCA_MATCHALL_ACT]);

5
testsuite/Makefile
View File

@ -17,8 +17,9 @@ ifneq (,$(wildcard /proc/config.gz))
KENV := $(shell cat /proc/config.gz | gunzip | grep ^CONFIG)
else
KVER := $(shell uname -r)
KCPATH := /lib/modules/${KVER}/config
ifneq (,$(wildcard ${KCPATH}))
KCPATHS := /lib/modules/$(KVER)/config /boot/config-$(KVER)
KCPATH := $(firstword $(wildcard $(KCPATHS)))
ifneq (,$(KCPATH))
KENV := $(shell cat ${KCPATH} | grep ^CONFIG)
endif
endif