update to current 4.5-rc net-next headers

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 9a3897be49140e3941f95425026c8b9dfeff7929..ffaba7c4dea3e5f2c342250e17e6ccb343467716 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -83,6 +83,7 @@ enum bpf_map_type {
        BPF_MAP_TYPE_PERF_EVENT_ARRAY,
        BPF_MAP_TYPE_PERCPU_HASH,
        BPF_MAP_TYPE_PERCPU_ARRAY,
+       BPF_MAP_TYPE_STACK_TRACE,
 };
 
 enum bpf_prog_type {
@@ -272,6 +273,31 @@ enum bpf_func_id {
         */
        BPF_FUNC_perf_event_output,
        BPF_FUNC_skb_load_bytes,
+
+       /**
+        * bpf_get_stackid(ctx, map, flags) - walk user or kernel stack and return id
+        * @ctx: struct pt_regs*
+        * @map: pointer to stack_trace map
+        * @flags: bits 0-7 - numer of stack frames to skip
+        *         bit 8 - collect user stack instead of kernel
+        *         bit 9 - compare stacks by hash only
+        *         bit 10 - if two different stacks hash into the same stackid
+        *                  discard old
+        *         other bits - reserved
+        * Return: >= 0 stackid on success or negative error
+        */
+       BPF_FUNC_get_stackid,
+
+       /**
+        * bpf_csum_diff(from, from_size, to, to_size, seed) - calculate csum diff
+        * @from: raw from buffer
+        * @from_size: length of from buffer
+        * @to: raw to buffer
+        * @to_size: length of to buffer
+        * @seed: optional seed
+        * Return: csum result
+        */
+       BPF_FUNC_csum_diff,
        __BPF_FUNC_MAX_ID,
 };
 
@@ -287,6 +313,7 @@ enum bpf_func_id {
 
 /* BPF_FUNC_l4_csum_replace flags. */
 #define BPF_F_PSEUDO_HDR               (1ULL << 4)
+#define BPF_F_MARK_MANGLED_0           (1ULL << 5)
 
 /* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
 #define BPF_F_INGRESS                  (1ULL << 0)
@@ -294,6 +321,12 @@ enum bpf_func_id {
 /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
 #define BPF_F_TUNINFO_IPV6             (1ULL << 0)
 
+/* BPF_FUNC_get_stackid flags. */
+#define BPF_F_SKIP_FIELD_MASK          0xffULL
+#define BPF_F_USER_STACK               (1ULL << 8)
+#define BPF_F_FAST_STACK_CMP           (1ULL << 9)
+#define BPF_F_REUSE_STACKID            (1ULL << 10)
+
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 7dafc0d129459a28206f15de51e6ca049413ac9b..8de96b7a7dbf146281c556e76379e22c2297ed56 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -137,11 +137,17 @@ struct bridge_vlan_info {
 /* Bridge multicast database attributes
  * [MDBA_MDB] = {
  *     [MDBA_MDB_ENTRY] = {
- *         [MDBA_MDB_ENTRY_INFO]
+ *         [MDBA_MDB_ENTRY_INFO] {
+ *             struct br_mdb_entry
+ *             [MDBA_MDB_EATTR attributes]
+ *         }
  *     }
  * }
  * [MDBA_ROUTER] = {
- *    [MDBA_ROUTER_PORT]
+ *    [MDBA_ROUTER_PORT] = {
+ *        u32 ifindex
+ *        [MDBA_ROUTER_PATTR attributes]
+ *    }
  * }
  */
 enum {
@@ -166,6 +172,22 @@ enum {
 };
 #define MDBA_MDB_ENTRY_MAX (__MDBA_MDB_ENTRY_MAX - 1)
 
+/* per mdb entry additional attributes */
+enum {
+       MDBA_MDB_EATTR_UNSPEC,
+       MDBA_MDB_EATTR_TIMER,
+       __MDBA_MDB_EATTR_MAX
+};
+#define MDBA_MDB_EATTR_MAX (__MDBA_MDB_EATTR_MAX - 1)
+
+/* multicast router types */
+enum {
+       MDB_RTR_TYPE_DISABLED,
+       MDB_RTR_TYPE_TEMP_QUERY,
+       MDB_RTR_TYPE_PERM,
+       MDB_RTR_TYPE_TEMP
+};
+
 enum {
        MDBA_ROUTER_UNSPEC,
        MDBA_ROUTER_PORT,
@@ -173,6 +195,15 @@ enum {
 };
 #define MDBA_ROUTER_MAX (__MDBA_ROUTER_MAX - 1)
 
+/* router port attributes */
+enum {
+       MDBA_ROUTER_PATTR_UNSPEC,
+       MDBA_ROUTER_PATTR_TIMER,
+       MDBA_ROUTER_PATTR_TYPE,
+       __MDBA_ROUTER_PATTR_MAX
+};
+#define MDBA_ROUTER_PATTR_MAX (__MDBA_ROUTER_PATTR_MAX - 1)
+
 struct br_port_msg {
        __u8  family;
        __u32 ifindex;

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index a323146ea3779b13f27b259be20d56f755f0d31e..a1b89a11b2b3a98a24eaebdabc85a4f3fbbd6064 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -118,6 +118,7 @@ enum {
        TCA_U32_INDEV,
        TCA_U32_PCNT,
        TCA_U32_MARK,
+       TCA_U32_FLAGS,
        __TCA_U32_MAX
 };