From 0a99e7badf3c301791f1dedf2877231759eb0a94 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 23 May 2016 09:06:11 -0700 Subject: [PATCH] update kernel headers (from 4.7-rc1) --- include/linux/libc-compat.h | 2 +- include/linux/pkt_cls.h | 4 ++++ include/linux/tc_act/tc_ife.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h index b3c20851..2280d3f1 100644 --- a/include/linux/libc-compat.h +++ b/include/linux/libc-compat.h @@ -52,7 +52,7 @@ #if defined(__GLIBC__) /* Coordinate with glibc net/if.h header. */ -#if defined(_NET_IF_H) +#if defined(_NET_IF_H) && defined(__USE_MISC) /* GLIBC headers included first so don't define anything * that would already be defined. */ diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index 03628321..25b8743c 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -97,6 +97,10 @@ enum { #define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1) +/* tca flags definitions */ +#define TCA_CLS_FLAGS_SKIP_HW (1 << 0) +#define TCA_CLS_FLAGS_SKIP_SW (1 << 1) + /* U32 filters */ #define TC_U32_HTID(h) ((h)&0xFFF00000) diff --git a/include/linux/tc_act/tc_ife.h b/include/linux/tc_act/tc_ife.h index d648ff66..4ece02a7 100644 --- a/include/linux/tc_act/tc_ife.h +++ b/include/linux/tc_act/tc_ife.h @@ -23,6 +23,7 @@ enum { TCA_IFE_SMAC, TCA_IFE_TYPE, TCA_IFE_METALST, + TCA_IFE_PAD, __TCA_IFE_MAX }; #define TCA_IFE_MAX (__TCA_IFE_MAX - 1)