update headers to 4.8-rc2 net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 766db7f15eddc40f19d580c413b708cfd954251d..ee3ea150ac716311bc750ba19410311fc4634e23 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -375,6 +375,28 @@ enum bpf_func_id {
         */
        BPF_FUNC_probe_write_user,
 
+       /**
+        * bpf_current_task_under_cgroup(map, index) - Check cgroup2 membership of current task
+        * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type
+        * @index: index of the cgroup in the bpf_map
+        * Return:
+        *   == 0 current failed the cgroup2 descendant test
+        *   == 1 current succeeded the cgroup2 descendant test
+        *    < 0 error
+        */
+       BPF_FUNC_current_task_under_cgroup,
+
+       /**
+        * bpf_skb_change_tail(skb, len, flags)
+        * The helper will resize the skb to the given new size,
+        * to be used f.e. with control messages.
+        * @skb: pointer to skb
+        * @len: new skb length
+        * @flags: reserved
+        * Return: 0 on success or negative error
+        */
+       BPF_FUNC_skb_change_tail,
+
        __BPF_FUNC_MAX_ID,
 };
 

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index d9c76fe7a13b996ff282f21cf00415e3da963a7a..b7393dd2b5407879569031370e6f49d1a6c89ffa 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -140,7 +140,7 @@ struct bridge_vlan_xstats {
        __u64 tx_bytes;
        __u64 tx_packets;
        __u16 vid;
-       __u16 pad1;
+       __u16 flags;
        __u32 pad2;
 };
 

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 1fa343db4cf7e3820e5510b679d22c5ed4d28ba8..1fbd86bfef436b590f28e0fc3f808cbbb677cd4c 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -24,9 +24,22 @@
 #define GRE_SEQ                __cpu_to_be16(0x1000)
 #define GRE_STRICT     __cpu_to_be16(0x0800)
 #define GRE_REC                __cpu_to_be16(0x0700)
-#define GRE_FLAGS      __cpu_to_be16(0x00F8)
+#define GRE_ACK                __cpu_to_be16(0x0080)
+#define GRE_FLAGS      __cpu_to_be16(0x0078)
 #define GRE_VERSION    __cpu_to_be16(0x0007)
 
+#define GRE_IS_CSUM(f)         ((f) & GRE_CSUM)
+#define GRE_IS_ROUTING(f)      ((f) & GRE_ROUTING)
+#define GRE_IS_KEY(f)          ((f) & GRE_KEY)
+#define GRE_IS_SEQ(f)          ((f) & GRE_SEQ)
+#define GRE_IS_STRICT(f)       ((f) & GRE_STRICT)
+#define GRE_IS_REC(f)          ((f) & GRE_REC)
+#define GRE_IS_ACK(f)          ((f) & GRE_ACK)
+
+#define GRE_VERSION_1          __cpu_to_be16(0x0001)
+#define GRE_PROTO_PPP          __cpu_to_be16(0x880b)
+#define GRE_PPTP_KEY_MASK      __cpu_to_be32(0xffff)
+
 struct ip_tunnel_parm {
        char                    name[IFNAMSIZ];
        int                     link;

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index beb74ee1fefd59282362c8b9af6ad11d945ade5a..408cebdad4cd6bcde91e519d1282179d474474f7 100644 (file)
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -73,6 +73,7 @@ enum {
        INET_DIAG_BC_S_COND,
        INET_DIAG_BC_D_COND,
        INET_DIAG_BC_DEV_COND,   /* u32 ifindex */
+       INET_DIAG_BC_MARK_COND,
 };
 
 struct inet_diag_hostcond {
@@ -82,6 +83,11 @@ struct inet_diag_hostcond {
        __be32  addr[0];
 };
 
+struct inet_diag_markcond {
+       __u32 mark;
+       __u32 mask;
+};
+
 /* Base info structure. It contains socket identity (addrs/ports/cookie)
  * and, alas, the information shown by netstat. */
 struct inet_diag_msg {

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 5e6c61e7f47b64e0c93497e2167d6cc22e3ac5c1..a50bcc2f38a93b392caf7e450b98d4a91b4d0402 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -374,6 +374,9 @@ enum {
        TCA_FLOWER_KEY_UDP_DST,         /* be16 */
 
        TCA_FLOWER_FLAGS,
+       TCA_FLOWER_KEY_VLAN_ID,
+       TCA_FLOWER_KEY_VLAN_PRIO,
+       TCA_FLOWER_KEY_VLAN_ETH_TYPE,
        __TCA_FLOWER_MAX,
 };
 

diff --git a/include/linux/tc_act/tc_vlan.h b/include/linux/tc_act/tc_vlan.h
index 31151ff6264f5ca966691c4ad0008c6b09cfe71a..be72b6e3843b971e60ce6f5d1a924fe31242fa4b 100644 (file)
--- a/include/linux/tc_act/tc_vlan.h
+++ b/include/linux/tc_act/tc_vlan.h
@@ -29,6 +29,7 @@ enum {
        TCA_VLAN_PUSH_VLAN_ID,
        TCA_VLAN_PUSH_VLAN_PROTOCOL,
        TCA_VLAN_PAD,
+       TCA_VLAN_PUSH_VLAN_PRIORITY,
        __TCA_VLAN_MAX,
 };
 #define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1)

diff --git a/include/linux/tipc_netlink.h b/include/linux/tipc_netlink.h
index 5f3f6d09fb790b80854c63008f3bb77f0ba484c6..bcb65ef725f67657b498e341d154f98de338640a 100644 (file)
--- a/include/linux/tipc_netlink.h
+++ b/include/linux/tipc_netlink.h
@@ -59,6 +59,7 @@ enum {
        TIPC_NL_MON_SET,
        TIPC_NL_MON_GET,
        TIPC_NL_MON_PEER_GET,
+       TIPC_NL_PEER_REMOVE,
 
        __TIPC_NL_CMD_MAX,
        TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1