update kernel headers from net-next

Align with upstream kernel.

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index e84f25a2a4eada4812b9d455ba7293472a97abe1..088091d1cb8c50aaa55de825fc38c7ba8d6ae9a7 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -258,6 +258,18 @@ enum bpf_func_id {
        BPF_FUNC_get_cgroup_classid,
        BPF_FUNC_skb_vlan_push, /* bpf_skb_vlan_push(skb, vlan_proto, vlan_tci) */
        BPF_FUNC_skb_vlan_pop,  /* bpf_skb_vlan_pop(skb) */
+
+       /**
+        * bpf_skb_[gs]et_tunnel_key(skb, key, size, flags)
+        * retrieve or populate tunnel metadata
+        * @skb: pointer to skb
+        * @key: pointer to 'struct bpf_tunnel_key'
+        * @size: size of 'struct bpf_tunnel_key'
+        * @flags: room for future extensions
+        * Retrun: 0 on success
+        */
+       BPF_FUNC_skb_get_tunnel_key,
+       BPF_FUNC_skb_set_tunnel_key,
        __BPF_FUNC_MAX_ID,
 };
 
@@ -280,4 +292,9 @@ struct __sk_buff {
        __u32 cb[5];
 };
 
+struct bpf_tunnel_key {
+       __u32 tunnel_id;
+       __u32 remote_ipv4;
+};
+
 #endif /* __LINUX_BPF_H__ */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 32d9e4c43b7b997988519d37653982f625ae9cd0..b905cf7f49486d774e11aceda6e2cbeac8f7915b 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -381,6 +381,7 @@ enum {
        IFLA_VXLAN_GBP,
        IFLA_VXLAN_REMCSUM_NOPARTIAL,
        IFLA_VXLAN_FLOWBASED,
+       IFLA_VXLAN_COLLECT_METADATA,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -431,6 +432,7 @@ enum {
        IFLA_BOND_AD_ACTOR_SYS_PRIO,
        IFLA_BOND_AD_USER_PORT_KEY,
        IFLA_BOND_AD_ACTOR_SYSTEM,
+       IFLA_BOND_TLB_DYNAMIC_LB,
        __IFLA_BOND_MAX,
 };