update kernel headers for net-next

Current santized kernel headers from net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 77f33a6ac1f80d1be07e2b45442a2ed299ca40ae..08aab3aa1c2b1ec7f23fde2c8fae1bf56873f60d 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -168,6 +168,43 @@ enum bpf_func_id {
        BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */
        BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */
        BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */
+
+       /**
+        * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet
+        * @skb: pointer to skb
+        * @offset: offset within packet from skb->data
+        * @from: pointer where to copy bytes from
+        * @len: number of bytes to store into packet
+        * @flags: bit 0 - if true, recompute skb->csum
+        *         other bits - reserved
+        * Return: 0 on success
+        */
+       BPF_FUNC_skb_store_bytes,
+
+       /**
+        * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum
+        * @skb: pointer to skb
+        * @offset: offset within packet where IP checksum is located
+        * @from: old value of header field
+        * @to: new value of header field
+        * @flags: bits 0-3 - size of header field
+        *         other bits - reserved
+        * Return: 0 on success
+        */
+       BPF_FUNC_l3_csum_replace,
+
+       /**
+        * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum
+        * @skb: pointer to skb
+        * @offset: offset within packet where TCP/UDP checksum is located
+        * @from: old value of header field
+        * @to: new value of header field
+        * @flags: bits 0-3 - size of header field
+        *         bit 4 - is pseudo header
+        *         other bits - reserved
+        * Return: 0 on success
+        */
+       BPF_FUNC_l4_csum_replace,
        __BPF_FUNC_MAX_ID,
 };
 
@@ -183,6 +220,7 @@ struct __sk_buff {
        __u32 vlan_present;
        __u32 vlan_tci;
        __u32 vlan_proto;
+       __u32 priority;
 };
 
 #endif /* __LINUX_BPF_H__ */

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 28650a31d77f2a6727f6435175cd2ac6a6ec6f24..702b19b4207eac31d581dbec5fad6ffeb0ca83cc 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -134,6 +134,8 @@ enum {
 
        RTM_NEWNSID = 88,
 #define RTM_NEWNSID RTM_NEWNSID
+       RTM_DELNSID = 89,
+#define RTM_DELNSID RTM_DELNSID
        RTM_GETNSID = 90,
 #define RTM_GETNSID RTM_GETNSID
 
@@ -633,6 +635,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_MDB            RTNLGRP_MDB
        RTNLGRP_MPLS_ROUTE,
 #define RTNLGRP_MPLS_ROUTE     RTNLGRP_MPLS_ROUTE
+       RTNLGRP_NSID,
+#define RTNLGRP_NSID           RTNLGRP_NSID
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 3a1fd3299f2c193f163d73762b639afcf7c3d318..b8f54510df076f3a87bd28f0bf1690b13e72e513 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_XFRM_H
 #define _LINUX_XFRM_H
 
+#include <linux/in6.h>
 #include <linux/types.h>
 
 /* All of the structures in this file may not change size as they are
@@ -13,6 +14,7 @@
 typedef union {
        __be32          a4;
        __be32          a6[4];
+       struct in6_addr in6;
 } xfrm_address_t;
 
 /* Ident of a specific xfrm_state. It is used on input to lookup