update kernel headers

Update from 4.6-rc3

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index dc043ef1f4dbcfa62026e63926f581ffc9b0ebff..0f5d6f5494db85c51ac05e0c86a25230bfb08e4b 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -375,6 +375,7 @@ struct bpf_tunnel_key {
        };
        __u8 tunnel_tos;
        __u8 tunnel_ttl;
+       __u16 tunnel_ext;
        __u32 tunnel_label;
 };
 

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 9b7f3c8d64c4f80d635b9dad107d712180f79210..6a688e8c6fb4f0e071402d3adb852eac6c210c28 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -153,6 +153,8 @@ enum {
        IFLA_LINK_NETNSID,
        IFLA_PHYS_PORT_NAME,
        IFLA_PROTO_DOWN,
+       IFLA_GSO_MAX_SEGS,
+       IFLA_GSO_MAX_SIZE,
        __IFLA_MAX
 };
 
@@ -597,6 +599,8 @@ enum {
                                 */
        IFLA_VF_STATS,          /* network device statistics */
        IFLA_VF_TRUST,          /* Trust VF */
+       IFLA_VF_IB_NODE_GUID,   /* VF Infiniband node GUID */
+       IFLA_VF_IB_PORT_GUID,   /* VF Infiniband port GUID */
        __IFLA_VF_MAX,
 };
 
@@ -629,6 +633,11 @@ struct ifla_vf_spoofchk {
        __u32 setting;
 };
 
+struct ifla_vf_guid {
+       __u32 vf;
+       __u64 guid;
+};
+
 enum {
        IFLA_VF_LINK_STATE_AUTO,        /* link state of the uplink */
        IFLA_VF_LINK_STATE_ENABLE,      /* link always up */