update kernel headers during 4.12 merge window

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h
index cb5d1a51920276d567f7c84b20001bda2f9c76ef..9cd1de954c0aca32718e3f3bd4c95f209cdeb0ae 100644 (file)
--- a/include/linux/elf-em.h
+++ b/include/linux/elf-em.h
@@ -42,7 +42,6 @@
 #define EM_TILEGX      191     /* Tilera TILE-Gx */
 #define EM_BPF         247     /* Linux BPF - in-kernel virtual machine */
 #define EM_FRV         0x5441  /* Fujitsu FR-V */
-#define EM_AVR32       0x18ad  /* Atmel AVR32 */
 
 /*
  * This is an interim value that we will use until the committee comes

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index f1129e383b2a47ad96890e06355ccb6223332c2b..d613be3b3239e476d728ffa323347ef42e97eaec 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -37,7 +37,20 @@ enum {
 #define TC_ACT_QUEUED          5
 #define TC_ACT_REPEAT          6
 #define TC_ACT_REDIRECT                7
-#define TC_ACT_JUMP            0x10000000
+
+/* There is a special kind of actions called "extended actions",
+ * which need a value parameter. These have a local opcode located in
+ * the highest nibble, starting from 1. The rest of the bits
+ * are used to carry the value. These two parts together make
+ * a combined opcode.
+ */
+#define __TC_ACT_EXT_SHIFT 28
+#define __TC_ACT_EXT(local) ((local) << __TC_ACT_EXT_SHIFT)
+#define TC_ACT_EXT_VAL_MASK ((1 << __TC_ACT_EXT_SHIFT) - 1)
+#define TC_ACT_EXT_CMP(combined, opcode) \
+       (((combined) & (~TC_ACT_EXT_VAL_MASK)) == opcode)
+
+#define TC_ACT_JUMP __TC_ACT_EXT(1)
 
 /* Action type identifiers*/
 enum {