]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Update kernel headers to 08009a760213
authorDavid Ahern <dsahern@gmail.com>
Mon, 26 Feb 2018 21:24:38 +0000 (13:24 -0800)
committerDavid Ahern <dsahern@gmail.com>
Mon, 26 Feb 2018 21:24:38 +0000 (13:24 -0800)
Update kernel headers to commit 08009a760213
("net: make kmem caches as __ro_after_init")

Signed-off-by: David Ahern <dsahern@gmail.com>
include/uapi/linux/fib_rules.h
include/uapi/linux/if_ether.h
include/uapi/linux/pkt_cls.h

index 2b642bf9b5a0ab492c06a4c82392200834059cd1..77d90ae381149de044bbd6034a380ec626c8e4e4 100644 (file)
@@ -23,7 +23,7 @@ struct fib_rule_hdr {
        __u8            tos;
 
        __u8            table;
-       __u8            res1;   /* reserved */
+       __u8            res1;   /* reserved */
        __u8            res2;   /* reserved */
        __u8            action;
 
@@ -58,6 +58,7 @@ enum {
        FRA_PAD,
        FRA_L3MDEV,     /* iif or oif is l3mdev goto its table */
        FRA_UID_RANGE,  /* UID range */
+       FRA_PROTOCOL,   /* Originator of the rule */
        __FRA_MAX
 };
 
index a34b152e3c19683f2acd70a9e3d750897382eb70..c3fafe295f62ad6b6821ed2e84430f1a6f8631c2 100644 (file)
@@ -88,6 +88,7 @@
 #define ETH_P_AOE      0x88A2          /* ATA over Ethernet            */
 #define ETH_P_8021AD   0x88A8          /* 802.1ad Service VLAN         */
 #define ETH_P_802_EX1  0x88B5          /* 802.1 Local Experimental 1.  */
+#define ETH_P_PREAUTH  0x88C7          /* 802.11 Preauthentication */
 #define ETH_P_TIPC     0x88CA          /* TIPC                         */
 #define ETH_P_MACSEC   0x88E5          /* 802.1ae MACsec */
 #define ETH_P_8021AH   0x88E7          /* 802.1ah Backbone Service Tag */
index 46c506615f4ad7f103ec7a479bf70911c480fff0..7cafb26df5557d947927aa4945c89954e66b6fb0 100644 (file)
@@ -555,7 +555,8 @@ enum {
 #define        TCF_EM_VLAN             6
 #define        TCF_EM_CANID            7
 #define        TCF_EM_IPSET            8
-#define        TCF_EM_MAX              8
+#define        TCF_EM_IPT              9
+#define        TCF_EM_MAX              9
 
 enum {
        TCF_EM_PROG_TC