update kernel headers from net-next

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

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 16dc501fb8f2c97b014fdfdba361e11f21140cf6..eedf24d637764e6c99677d46618a5d1ac8e0104e 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -603,6 +603,7 @@ struct __sk_buff {
        __u32 tc_classid;
        __u32 data;
        __u32 data_end;
+       __u32 napi_id;
 };
 
 struct bpf_tunnel_key {

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 4f975f5704d8f71f22c96c9d28c468695b946aa7..7375335a0773cd7931e9e7a2a9dcd4e874171627 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -75,6 +75,7 @@ enum {
        IFLA_IPTUN_ENCAP_SPORT,
        IFLA_IPTUN_ENCAP_DPORT,
        IFLA_IPTUN_COLLECT_METADATA,
+       IFLA_IPTUN_FWMARK,
        __IFLA_IPTUN_MAX,
 };
 #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
@@ -132,6 +133,7 @@ enum {
        IFLA_GRE_ENCAP_DPORT,
        IFLA_GRE_COLLECT_METADATA,
        IFLA_GRE_IGNORE_DF,
+       IFLA_GRE_FWMARK,
        __IFLA_GRE_MAX,
 };
 
@@ -147,6 +149,7 @@ enum {
        IFLA_VTI_OKEY,
        IFLA_VTI_LOCAL,
        IFLA_VTI_REMOTE,
+       IFLA_VTI_FWMARK,
        __IFLA_VTI_MAX,
 };
 

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index d2dd1fd65e77a165a27911b09e2a3d995e0b359a..3af99e027dccc1e31ef664e04ab944731e320457 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -303,6 +303,7 @@ enum xfrm_attr_type_t {
        XFRMA_PROTO,            /* __u8 */
        XFRMA_ADDRESS_FILTER,   /* struct xfrm_address_filter */
        XFRMA_PAD,
+       XFRMA_OFFLOAD_DEV,      /* struct xfrm_state_offload */
        __XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)
@@ -494,6 +495,13 @@ struct xfrm_address_filter {
        __u8                            dplen;
 };
 
+struct xfrm_user_offload {
+       int                             ifindex;
+       __u8                            flags;
+};
+#define XFRM_OFFLOAD_IPV6      1
+#define XFRM_OFFLOAD_INBOUND   2
+
 /* backwards compatibility for userspace */
 #define XFRMGRP_ACQUIRE                1
 #define XFRMGRP_EXPIRE         2