update kernel headers (from 4.7-rc1)

diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h
index b3c20851246980d40dde1c233fbe341e50a91f6f..2280d3f1cbe2238afee75a5600b4d11fa25ca4d5 100644 (file)
--- 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 036283214a44bf7e3915286e52f649557285853f..25b8743ca81550a48f814e6256b9a2f1a7735333 100644 (file)
--- 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 d648ff66586f255c055d7c45d303d96fea8bb839..4ece02a77b9aa567ca02f859735c815f064bb63f 100644 (file)
--- 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)