Update header files from net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index f970f9db841e7a7f553400004ae40d75a228a39a..9a3897be49140e3941f95425026c8b9dfeff7929 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -81,6 +81,8 @@ enum bpf_map_type {
        BPF_MAP_TYPE_ARRAY,
        BPF_MAP_TYPE_PROG_ARRAY,
        BPF_MAP_TYPE_PERF_EVENT_ARRAY,
+       BPF_MAP_TYPE_PERCPU_HASH,
+       BPF_MAP_TYPE_PERCPU_ARRAY,
 };
 
 enum bpf_prog_type {

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index ee197a379c7a2b88a4509918534cd903c7b1953c..7dafc0d129459a28206f15de51e6ca049413ac9b 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -183,6 +183,8 @@ struct br_mdb_entry {
 #define MDB_TEMPORARY 0
 #define MDB_PERMANENT 1
        __u8 state;
+#define MDB_FLAGS_OFFLOAD      (1 << 0)
+       __u8 flags;
        __u16 vid;
        struct {
                union {

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index d91f2c97d94655d97ec7b8747ed8d0a7e52059e8..0331c723eb55a3d2e2448500e11871c494d15fbc 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -35,6 +35,8 @@ struct rtnl_link_stats {
        /* for cslip etc */
        __u32   rx_compressed;
        __u32   tx_compressed;
+
+       __u32   rx_nohandler;           /* dropped, no handler found    */
 };
 
 /* The main device statistics structure */
@@ -68,6 +70,8 @@ struct rtnl_link_stats64 {
        /* for cslip etc */
        __u64   rx_compressed;
        __u64   tx_compressed;
+
+       __u64   rx_nohandler;           /* dropped, no handler found    */
 };
 
 /* The struct should be in sync with struct ifmap */
@@ -399,6 +403,14 @@ enum {
 
 #define IFLA_VRF_MAX (__IFLA_VRF_MAX - 1)
 
+enum {
+       IFLA_VRF_PORT_UNSPEC,
+       IFLA_VRF_PORT_TABLE,
+       __IFLA_VRF_PORT_MAX
+};
+
+#define IFLA_VRF_PORT_MAX (__IFLA_VRF_PORT_MAX - 1)
+
 /* IPVLAN section */
 enum {
        IFLA_IPVLAN_UNSPEC,

diff --git a/include/linux/tipc_netlink.h b/include/linux/tipc_netlink.h
index 25eb645e3ae5793f7b8732620710b21c1e6722c7..d4c8f142ba633d8e96d5a227ce1d91dc79c70235 100644 (file)
--- a/include/linux/tipc_netlink.h
+++ b/include/linux/tipc_netlink.h
@@ -56,7 +56,6 @@ enum {
        TIPC_NL_NET_GET,
        TIPC_NL_NET_SET,
        TIPC_NL_NAME_TABLE_GET,
-       TIPC_NL_PEER_REMOVE,
 
        __TIPC_NL_CMD_MAX,
        TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1