27 files changed, 778 insertions, 22 deletions

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 185f8ea2702f..d0352a971ebd 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -71,6 +71,7 @@ header-y += binfmts.h
 header-y += blkpg.h
 header-y += blktrace_api.h
 header-y += bpf_common.h
+header-y += bpf_perf_event.h
 header-y += bpf.h
 header-y += bpqether.h
 header-y += bsg.h
diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index 0fbf6fd4711b..734fe83ab645 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -23,6 +23,42 @@
 #define BATADV_NL_MCAST_GROUP_TPMETER   "tpmeter"
 
 /**
+ * enum batadv_tt_client_flags - TT client specific flags
+ * @BATADV_TT_CLIENT_DEL: the client has to be deleted from the table
+ * @BATADV_TT_CLIENT_ROAM: the client roamed to/from another node and the new
+ *  update telling its new real location has not been received/sent yet
+ * @BATADV_TT_CLIENT_WIFI: this client is connected through a wifi interface.
+ *  This information is used by the "AP Isolation" feature
+ * @BATADV_TT_CLIENT_ISOLA: this client is considered "isolated". This
+ *  information is used by the Extended Isolation feature
+ * @BATADV_TT_CLIENT_NOPURGE: this client should never be removed from the table
+ * @BATADV_TT_CLIENT_NEW: this client has been added to the local table but has
+ *  not been announced yet
+ * @BATADV_TT_CLIENT_PENDING: this client is marked for removal but it is kept
+ *  in the table for one more originator interval for consistency purposes
+ * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be part of
+ *  the network but no nnode has already announced it
+ *
+ * Bits from 0 to 7 are called _remote flags_ because they are sent on the wire.
+ * Bits from 8 to 15 are called _local flags_ because they are used for local
+ * computations only.
+ *
+ * Bits from 4 to 7 - a subset of remote flags - are ensured to be in sync with
+ * the other nodes in the network. To achieve this goal these flags are included
+ * in the TT CRC computation.
+ */
+enum batadv_tt_client_flags {
+        BATADV_TT_CLIENT_DEL     = (1 << 0),
+        BATADV_TT_CLIENT_ROAM    = (1 << 1),
+        BATADV_TT_CLIENT_WIFI    = (1 << 4),
+        BATADV_TT_CLIENT_ISOLA   = (1 << 5),
+        BATADV_TT_CLIENT_NOPURGE = (1 << 8),
+        BATADV_TT_CLIENT_NEW     = (1 << 9),
+        BATADV_TT_CLIENT_PENDING = (1 << 10),
+        BATADV_TT_CLIENT_TEMP    = (1 << 11),
+};
+
+/**
  * enum batadv_nl_attrs - batman-adv netlink attributes
  *
  * @BATADV_ATTR_UNSPEC: unspecified attribute to catch errors
@@ -40,6 +76,26 @@
  * @BATADV_ATTR_TPMETER_BYTES: amount of acked bytes during run
  * @BATADV_ATTR_TPMETER_COOKIE: session cookie to match tp_meter session
  * @BATADV_ATTR_PAD: attribute used for padding for 64-bit alignment
+ * @BATADV_ATTR_ACTIVE: Flag indicating if the hard interface is active
+ * @BATADV_ATTR_TT_ADDRESS: Client MAC address
+ * @BATADV_ATTR_TT_TTVN: Translation table version
+ * @BATADV_ATTR_TT_LAST_TTVN: Previous translation table version
+ * @BATADV_ATTR_TT_CRC32: CRC32 over translation table
+ * @BATADV_ATTR_TT_VID: VLAN ID
+ * @BATADV_ATTR_TT_FLAGS: Translation table client flags
+ * @BATADV_ATTR_FLAG_BEST: Flags indicating entry is the best
+ * @BATADV_ATTR_LAST_SEEN_MSECS: Time in milliseconds since last seen
+ * @BATADV_ATTR_NEIGH_ADDRESS: Neighbour MAC address
+ * @BATADV_ATTR_TQ: TQ to neighbour
+ * @BATADV_ATTR_THROUGHPUT: Estimated throughput to Neighbour
+ * @BATADV_ATTR_BANDWIDTH_UP: Reported uplink bandwidth
+ * @BATADV_ATTR_BANDWIDTH_DOWN: Reported downlink bandwidth
+ * @BATADV_ATTR_ROUTER: Gateway router MAC address
+ * @BATADV_ATTR_BLA_OWN: Flag indicating own originator
+ * @BATADV_ATTR_BLA_ADDRESS: Bridge loop avoidance claim MAC address
+ * @BATADV_ATTR_BLA_VID: BLA VLAN ID
+ * @BATADV_ATTR_BLA_BACKBONE: BLA gateway originator MAC address
+ * @BATADV_ATTR_BLA_CRC: BLA CRC
  * @__BATADV_ATTR_AFTER_LAST: internal use
  * @NUM_BATADV_ATTR: total number of batadv_nl_attrs available
  * @BATADV_ATTR_MAX: highest attribute number currently defined
@@ -60,6 +116,26 @@ enum batadv_nl_attrs {
         BATADV_ATTR_TPMETER_BYTES,
         BATADV_ATTR_TPMETER_COOKIE,
         BATADV_ATTR_PAD,
+        BATADV_ATTR_ACTIVE,
+        BATADV_ATTR_TT_ADDRESS,
+        BATADV_ATTR_TT_TTVN,
+        BATADV_ATTR_TT_LAST_TTVN,
+        BATADV_ATTR_TT_CRC32,
+        BATADV_ATTR_TT_VID,
+        BATADV_ATTR_TT_FLAGS,
+        BATADV_ATTR_FLAG_BEST,
+        BATADV_ATTR_LAST_SEEN_MSECS,
+        BATADV_ATTR_NEIGH_ADDRESS,
+        BATADV_ATTR_TQ,
+        BATADV_ATTR_THROUGHPUT,
+        BATADV_ATTR_BANDWIDTH_UP,
+        BATADV_ATTR_BANDWIDTH_DOWN,
+        BATADV_ATTR_ROUTER,
+        BATADV_ATTR_BLA_OWN,
+        BATADV_ATTR_BLA_ADDRESS,
+        BATADV_ATTR_BLA_VID,
+        BATADV_ATTR_BLA_BACKBONE,
+        BATADV_ATTR_BLA_CRC,
         /* add attributes above here, update the policy in netlink.c */
         __BATADV_ATTR_AFTER_LAST,
         NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST,
@@ -73,6 +149,15 @@ enum batadv_nl_attrs {
  * @BATADV_CMD_GET_MESH_INFO: Query basic information about batman-adv device
  * @BATADV_CMD_TP_METER: Start a tp meter session
  * @BATADV_CMD_TP_METER_CANCEL: Cancel a tp meter session
+ * @BATADV_CMD_GET_ROUTING_ALGOS: Query the list of routing algorithms.
+ * @BATADV_CMD_GET_HARDIFS: Query list of hard interfaces
+ * @BATADV_CMD_GET_TRANSTABLE_LOCAL: Query list of local translations
+ * @BATADV_CMD_GET_TRANSTABLE_GLOBAL Query list of global translations
+ * @BATADV_CMD_GET_ORIGINATORS: Query list of originators
+ * @BATADV_CMD_GET_NEIGHBORS: Query list of neighbours
+ * @BATADV_CMD_GET_GATEWAYS: Query list of gateways
+ * @BATADV_CMD_GET_BLA_CLAIM: Query list of bridge loop avoidance claims
+ * @BATADV_CMD_GET_BLA_BACKBONE: Query list of bridge loop avoidance backbones
  * @__BATADV_CMD_AFTER_LAST: internal use
  * @BATADV_CMD_MAX: highest used command number
  */
@@ -81,6 +166,15 @@ enum batadv_nl_commands {
         BATADV_CMD_GET_MESH_INFO,
         BATADV_CMD_TP_METER,
         BATADV_CMD_TP_METER_CANCEL,
+        BATADV_CMD_GET_ROUTING_ALGOS,
+        BATADV_CMD_GET_HARDIFS,
+        BATADV_CMD_GET_TRANSTABLE_LOCAL,
+        BATADV_CMD_GET_TRANSTABLE_GLOBAL,
+        BATADV_CMD_GET_ORIGINATORS,
+        BATADV_CMD_GET_NEIGHBORS,
+        BATADV_CMD_GET_GATEWAYS,
+        BATADV_CMD_GET_BLA_CLAIM,
+        BATADV_CMD_GET_BLA_BACKBONE,
         /* add new commands above here */
         __BATADV_CMD_AFTER_LAST,
         BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 9e5fc168c8a3..f09c70b97eca 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -95,6 +95,7 @@ enum bpf_prog_type {
         BPF_PROG_TYPE_SCHED_ACT,
         BPF_PROG_TYPE_TRACEPOINT,
         BPF_PROG_TYPE_XDP,
+        BPF_PROG_TYPE_PERF_EVENT,
 };
 
 #define BPF_PSEUDO_MAP_FD       1
@@ -375,6 +376,56 @@ 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_skb_pull_data(skb, len)
+         * The helper will pull in non-linear data in case the
+         * skb is non-linear and not all of len are part of the
+         * linear section. Only needed for read/write with direct
+         * packet access.
+         * @skb: pointer to skb
+         * @len: len to make read/writeable
+         * Return: 0 on success or negative error
+         */
+        BPF_FUNC_skb_pull_data,
+
+        /**
+         * bpf_csum_update(skb, csum)
+         * Adds csum into skb->csum in case of CHECKSUM_COMPLETE.
+         * @skb: pointer to skb
+         * @csum: csum to add
+         * Return: csum on success or negative error
+         */
+        BPF_FUNC_csum_update,
+
+        /**
+         * bpf_set_hash_invalid(skb)
+         * Invalidate current skb>hash.
+         * @skb: pointer to skb
+         */
+        BPF_FUNC_set_hash_invalid,
+
         __BPF_FUNC_MAX_ID,
 };
 
diff --git a/include/uapi/linux/bpf_perf_event.h b/include/uapi/linux/bpf_perf_event.h
new file mode 100644
index 000000000000..067427259820
--- /dev/null
+++ b/include/uapi/linux/bpf_perf_event.h
@@ -0,0 +1,18 @@
+/* Copyright (c) 2016 Facebook
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__
+#define _UAPI__LINUX_BPF_PERF_EVENT_H__
+
+#include <linux/types.h>
+#include <linux/ptrace.h>
+
+struct bpf_perf_event_data {
+        struct pt_regs regs;
+        __u64 sample_period;
+};
+
+#endif /* _UAPI__LINUX_BPF_PERF_EVENT_H__ */
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index b8f38e84d93a..099a4200732c 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1362,7 +1362,14 @@ enum ethtool_link_mode_bit_indices {
         ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT        = 37,
         ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT        = 38,
         ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT    = 39,
-        ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT         = 40,
+        ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT         = 40,
+        ETHTOOL_LINK_MODE_1000baseX_Full_BIT    = 41,
+        ETHTOOL_LINK_MODE_10000baseCR_Full_BIT  = 42,
+        ETHTOOL_LINK_MODE_10000baseSR_Full_BIT  = 43,
+        ETHTOOL_LINK_MODE_10000baseLR_Full_BIT  = 44,
+        ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
+        ETHTOOL_LINK_MODE_10000baseER_Full_BIT  = 46,
+
 
         /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
          * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
@@ -1371,7 +1378,7 @@ enum ethtool_link_mode_bit_indices {
          */
 
         __ETHTOOL_LINK_MODE_LAST
-          = ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,
+          = ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
 };
 
 #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name)      \
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index c186f64fffca..ab92bca6d448 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/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/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index a1b5202c5f6b..b4fba662cd32 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -318,6 +318,7 @@ enum {
         IFLA_BRPORT_FLUSH,
         IFLA_BRPORT_MULTICAST_ROUTER,
         IFLA_BRPORT_PAD,
+        IFLA_BRPORT_MCAST_FLOOD,
         __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -463,6 +464,7 @@ enum {
 enum ipvlan_mode {
         IPVLAN_MODE_L2 = 0,
         IPVLAN_MODE_L3,
+        IPVLAN_MODE_L3S,
         IPVLAN_MODE_MAX
 };
 
@@ -617,7 +619,7 @@ enum {
 enum {
         IFLA_VF_UNSPEC,
         IFLA_VF_MAC,            /* Hardware queue specific attributes */
-        IFLA_VF_VLAN,
+        IFLA_VF_VLAN,           /* VLAN ID and QoS */
         IFLA_VF_TX_RATE,        /* Max TX Bandwidth Allocation */
         IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
         IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
@@ -629,6 +631,7 @@ enum {
         IFLA_VF_TRUST,          /* Trust VF */
         IFLA_VF_IB_NODE_GUID,   /* VF Infiniband node GUID */
         IFLA_VF_IB_PORT_GUID,   /* VF Infiniband port GUID */
+        IFLA_VF_VLAN_LIST,      /* nested list of vlans, option for QinQ */
         __IFLA_VF_MAX,
 };
 
@@ -645,6 +648,22 @@ struct ifla_vf_vlan {
         __u32 qos;
 };
 
+enum {
+        IFLA_VF_VLAN_INFO_UNSPEC,
+        IFLA_VF_VLAN_INFO,      /* VLAN ID, QoS and VLAN protocol */
+        __IFLA_VF_VLAN_INFO_MAX,
+};
+
+#define IFLA_VF_VLAN_INFO_MAX (__IFLA_VF_VLAN_INFO_MAX - 1)
+#define MAX_VLAN_LIST_LEN 1
+
+struct ifla_vf_vlan_info {
+        __u32 vf;
+        __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
+        __u32 qos;
+        __be16 vlan_proto; /* VLAN protocol either 802.1Q or 802.1ad */
+};
+
 struct ifla_vf_tx_rate {
         __u32 vf;
         __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
@@ -825,6 +844,7 @@ enum {
         IFLA_STATS_LINK_64,
         IFLA_STATS_LINK_XSTATS,
         IFLA_STATS_LINK_XSTATS_SLAVE,
+        IFLA_STATS_LINK_OFFLOAD_XSTATS,
         __IFLA_STATS_MAX,
 };
 
@@ -844,6 +864,14 @@ enum {
 };
 #define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
 
+/* These are stats embedded into IFLA_STATS_LINK_OFFLOAD_XSTATS */
+enum {
+        IFLA_OFFLOAD_XSTATS_UNSPEC,
+        IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
+        __IFLA_OFFLOAD_XSTATS_MAX
+};
+#define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1)
+
 /* XDP section */
 
 enum {
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index 777b6cdb1b7b..92f3c8677523 100644
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -27,9 +27,23 @@
 #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_0           __cpu_to_be16(0x0000)
+#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;
@@ -60,6 +74,7 @@ enum {
         IFLA_IPTUN_ENCAP_FLAGS,
         IFLA_IPTUN_ENCAP_SPORT,
         IFLA_IPTUN_ENCAP_DPORT,
+        IFLA_IPTUN_COLLECT_METADATA,
         __IFLA_IPTUN_MAX,
 };
 #define IFLA_IPTUN_MAX  (__IFLA_IPTUN_MAX - 1)
diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index abbd1dc5d683..509cd961068d 100644
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/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 {
@@ -117,6 +123,8 @@ enum {
         INET_DIAG_LOCALS,
         INET_DIAG_PEERS,
         INET_DIAG_PAD,
+        INET_DIAG_MARK,
+        INET_DIAG_BBRINFO,
         __INET_DIAG_MAX,
 };
 
@@ -150,8 +158,20 @@ struct tcp_dctcp_info {
         __u32   dctcp_ab_tot;
 };
 
+/* INET_DIAG_BBRINFO */
+
+struct tcp_bbr_info {
+        /* u64 bw: max-filtered BW (app throughput) estimate in Byte per sec: */
+        __u32   bbr_bw_lo;              /* lower 32 bits of bw */
+        __u32   bbr_bw_hi;              /* upper 32 bits of bw */
+        __u32   bbr_min_rtt;            /* min-filtered RTT in uSec */
+        __u32   bbr_pacing_gain;        /* pacing gain shifted left 8 bits */
+        __u32   bbr_cwnd_gain;          /* cwnd gain shifted left 8 bits */
+};
+
 union tcp_cc_info {
         struct tcpvegas_info    vegas;
         struct tcp_dctcp_info   dctcp;
+        struct tcp_bbr_info     bbr;
 };
 #endif /* _UAPI_INET_DIAG_H_ */
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 395876060f50..8c2772340c3f 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -177,6 +177,7 @@ enum {
         DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,
         DEVCONF_DROP_UNSOLICITED_NA,
         DEVCONF_KEEP_ADDR_ON_DOWN,
+        DEVCONF_RTR_SOLICIT_MAX_INTERVAL,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/mii.h b/include/uapi/linux/mii.h
index 237fac4bc17b..15d8510cdae0 100644
--- a/include/uapi/linux/mii.h
+++ b/include/uapi/linux/mii.h
@@ -48,6 +48,7 @@
 #define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
 #define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
 #define BMCR_RESET              0x8000  /* Reset to default state      */
+#define BMCR_SPEED10            0x0000  /* Select 10Mbps               */
 
 /* Basic mode status register. */
 #define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
diff --git a/include/uapi/linux/netfilter/nf_log.h b/include/uapi/linux/netfilter/nf_log.h
new file mode 100644
index 000000000000..8be21e02387d
--- /dev/null
+++ b/include/uapi/linux/netfilter/nf_log.h
@@ -0,0 +1,12 @@
+#ifndef _NETFILTER_NF_LOG_H
+#define _NETFILTER_NF_LOG_H
+
+#define NF_LOG_TCPSEQ           0x01    /* Log TCP sequence numbers */
+#define NF_LOG_TCPOPT           0x02    /* Log TCP options */
+#define NF_LOG_IPOPT            0x04    /* Log IP options */
+#define NF_LOG_UID              0x08    /* Log UID owning local socket */
+#define NF_LOG_NFLOG            0x10    /* Unsupported, don't reuse */
+#define NF_LOG_MACDECODE        0x20    /* Decode MAC header */
+#define NF_LOG_MASK             0x2f
+
+#endif /* _NETFILTER_NF_LOG_H */
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index c674ba2563b7..c6c4477c136b 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -546,6 +546,35 @@ enum nft_cmp_attributes {
 };
 #define NFTA_CMP_MAX            (__NFTA_CMP_MAX - 1)
 
+/**
+ * enum nft_range_ops - nf_tables range operator
+ *
+ * @NFT_RANGE_EQ: equal
+ * @NFT_RANGE_NEQ: not equal
+ */
+enum nft_range_ops {
+        NFT_RANGE_EQ,
+        NFT_RANGE_NEQ,
+};
+
+/**
+ * enum nft_range_attributes - nf_tables range expression netlink attributes
+ *
+ * @NFTA_RANGE_SREG: source register of data to compare (NLA_U32: nft_registers)
+ * @NFTA_RANGE_OP: cmp operation (NLA_U32: nft_cmp_ops)
+ * @NFTA_RANGE_FROM_DATA: data range from (NLA_NESTED: nft_data_attributes)
+ * @NFTA_RANGE_TO_DATA: data range to (NLA_NESTED: nft_data_attributes)
+ */
+enum nft_range_attributes {
+        NFTA_RANGE_UNSPEC,
+        NFTA_RANGE_SREG,
+        NFTA_RANGE_OP,
+        NFTA_RANGE_FROM_DATA,
+        NFTA_RANGE_TO_DATA,
+        __NFTA_RANGE_MAX
+};
+#define NFTA_RANGE_MAX          (__NFTA_RANGE_MAX - 1)
+
 enum nft_lookup_flags {
         NFT_LOOKUP_F_INV = (1 << 0),
 };
@@ -575,6 +604,10 @@ enum nft_dynset_ops {
         NFT_DYNSET_OP_UPDATE,
 };
 
+enum nft_dynset_flags {
+        NFT_DYNSET_F_INV        = (1 << 0),
+};
+
 /**
  * enum nft_dynset_attributes - dynset expression attributes
  *
@@ -585,6 +618,7 @@ enum nft_dynset_ops {
  * @NFTA_DYNSET_SREG_DATA: source register of the data (NLA_U32)
  * @NFTA_DYNSET_TIMEOUT: timeout value for the new element (NLA_U64)
  * @NFTA_DYNSET_EXPR: expression (NLA_NESTED: nft_expr_attributes)
+ * @NFTA_DYNSET_FLAGS: flags (NLA_U32)
  */
 enum nft_dynset_attributes {
         NFTA_DYNSET_UNSPEC,
@@ -596,6 +630,7 @@ enum nft_dynset_attributes {
         NFTA_DYNSET_TIMEOUT,
         NFTA_DYNSET_EXPR,
         NFTA_DYNSET_PAD,
+        NFTA_DYNSET_FLAGS,
         __NFTA_DYNSET_MAX,
 };
 #define NFTA_DYNSET_MAX         (__NFTA_DYNSET_MAX - 1)
@@ -724,6 +759,28 @@ enum nft_meta_keys {
 };
 
 /**
+ * enum nft_hash_attributes - nf_tables hash expression netlink attributes
+ *
+ * @NFTA_HASH_SREG: source register (NLA_U32)
+ * @NFTA_HASH_DREG: destination register (NLA_U32)
+ * @NFTA_HASH_LEN: source data length (NLA_U32)
+ * @NFTA_HASH_MODULUS: modulus value (NLA_U32)
+ * @NFTA_HASH_SEED: seed value (NLA_U32)
+ * @NFTA_HASH_OFFSET: add this offset value to hash result (NLA_U32)
+ */
+enum nft_hash_attributes {
+        NFTA_HASH_UNSPEC,
+        NFTA_HASH_SREG,
+        NFTA_HASH_DREG,
+        NFTA_HASH_LEN,
+        NFTA_HASH_MODULUS,
+        NFTA_HASH_SEED,
+        NFTA_HASH_OFFSET,
+        __NFTA_HASH_MAX,
+};
+#define NFTA_HASH_MAX   (__NFTA_HASH_MAX - 1)
+
+/**
  * enum nft_meta_attributes - nf_tables meta expression netlink attributes
  *
  * @NFTA_META_DREG: destination register (NLA_U32)
@@ -866,12 +923,14 @@ enum nft_log_attributes {
  * @NFTA_QUEUE_NUM: netlink queue to send messages to (NLA_U16)
  * @NFTA_QUEUE_TOTAL: number of queues to load balance packets on (NLA_U16)
  * @NFTA_QUEUE_FLAGS: various flags (NLA_U16)
+ * @NFTA_QUEUE_SREG_QNUM: source register of queue number (NLA_U32: nft_registers)
  */
 enum nft_queue_attributes {
         NFTA_QUEUE_UNSPEC,
         NFTA_QUEUE_NUM,
         NFTA_QUEUE_TOTAL,
         NFTA_QUEUE_FLAGS,
+        NFTA_QUEUE_SREG_QNUM,
         __NFTA_QUEUE_MAX
 };
 #define NFTA_QUEUE_MAX          (__NFTA_QUEUE_MAX - 1)
@@ -880,6 +939,25 @@ enum nft_queue_attributes {
 #define NFT_QUEUE_FLAG_CPU_FANOUT       0x02 /* use current CPU (no hashing) */
 #define NFT_QUEUE_FLAG_MASK             0x03
 
+enum nft_quota_flags {
+        NFT_QUOTA_F_INV         = (1 << 0),
+};
+
+/**
+ * enum nft_quota_attributes - nf_tables quota expression netlink attributes
+ *
+ * @NFTA_QUOTA_BYTES: quota in bytes (NLA_U16)
+ * @NFTA_QUOTA_FLAGS: flags (NLA_U32)
+ */
+enum nft_quota_attributes {
+        NFTA_QUOTA_UNSPEC,
+        NFTA_QUOTA_BYTES,
+        NFTA_QUOTA_FLAGS,
+        NFTA_QUOTA_PAD,
+        __NFTA_QUOTA_MAX
+};
+#define NFTA_QUOTA_MAX          (__NFTA_QUOTA_MAX - 1)
+
 /**
  * enum nft_reject_types - nf_tables reject expression reject types
  *
@@ -1051,7 +1129,7 @@ enum nft_gen_attributes {
  * @NFTA_TRACE_NFPROTO: nf protocol processed (NLA_U32)
  * @NFTA_TRACE_POLICY: policy that decided fate of packet (NLA_U32)
  */
-enum nft_trace_attibutes {
+enum nft_trace_attributes {
         NFTA_TRACE_UNSPEC,
         NFTA_TRACE_TABLE,
         NFTA_TRACE_CHAIN,
@@ -1082,4 +1160,30 @@ enum nft_trace_types {
         __NFT_TRACETYPE_MAX
 };
 #define NFT_TRACETYPE_MAX (__NFT_TRACETYPE_MAX - 1)
+
+/**
+ * enum nft_ng_attributes - nf_tables number generator expression netlink attributes
+ *
+ * @NFTA_NG_DREG: destination register (NLA_U32)
+ * @NFTA_NG_MODULUS: maximum counter value (NLA_U32)
+ * @NFTA_NG_TYPE: operation type (NLA_U32)
+ * @NFTA_NG_OFFSET: offset to be added to the counter (NLA_U32)
+ */
+enum nft_ng_attributes {
+        NFTA_NG_UNSPEC,
+        NFTA_NG_DREG,
+        NFTA_NG_MODULUS,
+        NFTA_NG_TYPE,
+        NFTA_NG_OFFSET,
+        __NFTA_NG_MAX
+};
+#define NFTA_NG_MAX     (__NFTA_NG_MAX - 1)
+
+enum nft_ng_types {
+        NFT_NG_INCREMENTAL,
+        NFT_NG_RANDOM,
+        __NFT_NG_MAX
+};
+#define NFT_NG_MAX      (__NFT_NG_MAX - 1)
+
 #endif /* _LINUX_NF_TABLES_H */
diff --git a/include/uapi/linux/netfilter/nfnetlink_conntrack.h b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
index 9df789709abe..6deb8867c5fc 100644
--- a/include/uapi/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
@@ -231,13 +231,13 @@ enum ctattr_secctx {
 
 enum ctattr_stats_cpu {
         CTA_STATS_UNSPEC,
-        CTA_STATS_SEARCHED,
+        CTA_STATS_SEARCHED,     /* no longer used */
         CTA_STATS_FOUND,
-        CTA_STATS_NEW,
+        CTA_STATS_NEW,          /* no longer used */
         CTA_STATS_INVALID,
         CTA_STATS_IGNORE,
-        CTA_STATS_DELETE,
-        CTA_STATS_DELETE_LIST,
+        CTA_STATS_DELETE,       /* no longer used */
+        CTA_STATS_DELETE_LIST,  /* no longer used */
         CTA_STATS_INSERT,
         CTA_STATS_INSERT_FAILED,
         CTA_STATS_DROP,
diff --git a/include/uapi/linux/netfilter/xt_hashlimit.h b/include/uapi/linux/netfilter/xt_hashlimit.h
index 6db90372f09c..3efc0ca18345 100644
--- a/include/uapi/linux/netfilter/xt_hashlimit.h
+++ b/include/uapi/linux/netfilter/xt_hashlimit.h
@@ -6,6 +6,7 @@
 
 /* timings are in milliseconds. */
 #define XT_HASHLIMIT_SCALE 10000
+#define XT_HASHLIMIT_SCALE_v2 1000000llu
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
  * seconds, or one packet every 59 hours.
  */
@@ -63,6 +64,20 @@ struct hashlimit_cfg1 {
         __u8 srcmask, dstmask;
 };
 
+struct hashlimit_cfg2 {
+        __u64 avg;              /* Average secs between packets * scale */
+        __u64 burst;            /* Period multiplier for upper limit. */
+        __u32 mode;             /* bitmask of XT_HASHLIMIT_HASH_* */
+
+        /* user specified */
+        __u32 size;             /* how many buckets */
+        __u32 max;              /* max number of entries */
+        __u32 gc_interval;      /* gc interval */
+        __u32 expire;           /* when do entries expire? */
+
+        __u8 srcmask, dstmask;
+};
+
 struct xt_hashlimit_mtinfo1 {
         char name[IFNAMSIZ];
         struct hashlimit_cfg1 cfg;
@@ -71,4 +86,12 @@ struct xt_hashlimit_mtinfo1 {
         struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
 };
 
+struct xt_hashlimit_mtinfo2 {
+        char name[NAME_MAX];
+        struct hashlimit_cfg2 cfg;
+
+        /* Used internally by the kernel */
+        struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
+};
+
 #endif /* _UAPI_XT_HASHLIMIT_H */
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 220694151434..56368e9b4622 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -48,6 +48,7 @@
 #define NL80211_MULTICAST_GROUP_REG             "regulatory"
 #define NL80211_MULTICAST_GROUP_MLME            "mlme"
 #define NL80211_MULTICAST_GROUP_VENDOR          "vendor"
+#define NL80211_MULTICAST_GROUP_NAN             "nan"
 #define NL80211_MULTICAST_GROUP_TESTMODE        "testmode"
 
 /**
@@ -838,6 +839,41 @@
  *      not running. The driver indicates the status of the scan through
  *      cfg80211_scan_done().
  *
+ * @NL80211_CMD_START_NAN: Start NAN operation, identified by its
+ *      %NL80211_ATTR_WDEV interface. This interface must have been previously
+ *      created with %NL80211_CMD_NEW_INTERFACE. After it has been started, the
+ *      NAN interface will create or join a cluster. This command must have a
+ *      valid %NL80211_ATTR_NAN_MASTER_PREF attribute and optional
+ *      %NL80211_ATTR_NAN_DUAL attributes.
+ *      After this command NAN functions can be added.
+ * @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by
+ *      its %NL80211_ATTR_WDEV interface.
+ * @NL80211_CMD_ADD_NAN_FUNCTION: Add a NAN function. The function is defined
+ *      with %NL80211_ATTR_NAN_FUNC nested attribute. When called, this
+ *      operation returns the strictly positive and unique instance id
+ *      (%NL80211_ATTR_NAN_FUNC_INST_ID) and a cookie (%NL80211_ATTR_COOKIE)
+ *      of the function upon success.
+ *      Since instance ID's can be re-used, this cookie is the right
+ *      way to identify the function. This will avoid races when a termination
+ *      event is handled by the user space after it has already added a new
+ *      function that got the same instance id from the kernel as the one
+ *      which just terminated.
+ *      This cookie may be used in NAN events even before the command
+ *      returns, so userspace shouldn't process NAN events until it processes
+ *      the response to this command.
+ *      Look at %NL80211_ATTR_SOCKET_OWNER as well.
+ * @NL80211_CMD_DEL_NAN_FUNCTION: Delete a NAN function by cookie.
+ *      This command is also used as a notification sent when a NAN function is
+ *      terminated. This will contain a %NL80211_ATTR_NAN_FUNC_INST_ID
+ *      and %NL80211_ATTR_COOKIE attributes.
+ * @NL80211_CMD_CHANGE_NAN_CONFIG: Change current NAN configuration. NAN
+ *      must be operational (%NL80211_CMD_START_NAN was executed).
+ *      It must contain at least one of the following attributes:
+ *      %NL80211_ATTR_NAN_MASTER_PREF, %NL80211_ATTR_NAN_DUAL.
+ * @NL80211_CMD_NAN_FUNC_MATCH: Notification sent when a match is reported.
+ *      This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and
+ *      %NL80211_ATTR_COOKIE.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -1026,6 +1062,13 @@ enum nl80211_commands {
 
         NL80211_CMD_ABORT_SCAN,
 
+        NL80211_CMD_START_NAN,
+        NL80211_CMD_STOP_NAN,
+        NL80211_CMD_ADD_NAN_FUNCTION,
+        NL80211_CMD_DEL_NAN_FUNCTION,
+        NL80211_CMD_CHANGE_NAN_CONFIG,
+        NL80211_CMD_NAN_MATCH,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -1343,7 +1386,13 @@ enum nl80211_commands {
  *      enum nl80211_band value is used as the index (nla_type() of the nested
  *      data. If a band is not included, it will be configured to allow all
  *      rates based on negotiated supported rates information. This attribute
- *      is used with %NL80211_CMD_SET_TX_BITRATE_MASK.
+ *      is used with %NL80211_CMD_SET_TX_BITRATE_MASK and with starting AP,
+ *      and joining mesh networks (not IBSS yet). In the later case, it must
+ *      specify just a single bitrate, which is to be used for the beacon.
+ *      The driver must also specify support for this with the extended
+ *      features NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
+ *      NL80211_EXT_FEATURE_BEACON_RATE_HT and
+ *      NL80211_EXT_FEATURE_BEACON_RATE_VHT.
  *
  * @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain
  *      at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
@@ -1733,6 +1782,12 @@ enum nl80211_commands {
  *      regulatory indoor configuration would be owned by the netlink socket
  *      that configured the indoor setting, and the indoor operation would be
  *      cleared when the socket is closed.
+ *      If set during NAN interface creation, the interface will be destroyed
+ *      if the socket is closed just like any other interface. Moreover, only
+ *      the netlink socket that created the interface will be allowed to add
+ *      and remove functions. NAN notifications will be sent in unicast to that
+ *      socket. Without this attribute, any socket can add functions and the
+ *      notifications will be sent to the %NL80211_MCGRP_NAN multicast group.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *      the TDLS link initiator.
@@ -1867,6 +1922,21 @@ enum nl80211_commands {
  * @NL80211_ATTR_MESH_PEER_AID: Association ID for the mesh peer (u16). This is
  *      used to pull the stored data for mesh peer in power save state.
  *
+ * @NL80211_ATTR_NAN_MASTER_PREF: the master preference to be used by
+ *      %NL80211_CMD_START_NAN and optionally with
+ *      %NL80211_CMD_CHANGE_NAN_CONFIG. Its type is u8 and it can't be 0.
+ *      Also, values 1 and 255 are reserved for certification purposes and
+ *      should not be used during a normal device operation.
+ * @NL80211_ATTR_NAN_DUAL: NAN dual band operation config (see
+ *      &enum nl80211_nan_dual_band_conf). This attribute is used with
+ *      %NL80211_CMD_START_NAN and optionally with
+ *      %NL80211_CMD_CHANGE_NAN_CONFIG.
+ * @NL80211_ATTR_NAN_FUNC: a function that can be added to NAN. See
+ *      &enum nl80211_nan_func_attributes for description of this nested
+ *      attribute.
+ * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute.
+ *      See &enum nl80211_nan_match_attributes.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2261,6 +2331,11 @@ enum nl80211_attrs {
 
         NL80211_ATTR_MESH_PEER_AID,
 
+        NL80211_ATTR_NAN_MASTER_PREF,
+        NL80211_ATTR_NAN_DUAL,
+        NL80211_ATTR_NAN_FUNC,
+        NL80211_ATTR_NAN_MATCH,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -2339,6 +2414,7 @@ enum nl80211_attrs {
  *      commands to create and destroy one
  * @NL80211_IF_TYPE_OCB: Outside Context of a BSS
  *      This mode corresponds to the MIB variable dot11OCBActivated=true
+ * @NL80211_IFTYPE_NAN: NAN device interface type (not a netdev)
  * @NL80211_IFTYPE_MAX: highest interface type number currently defined
  * @NUM_NL80211_IFTYPES: number of defined interface types
  *
@@ -2359,6 +2435,7 @@ enum nl80211_iftype {
         NL80211_IFTYPE_P2P_GO,
         NL80211_IFTYPE_P2P_DEVICE,
         NL80211_IFTYPE_OCB,
+        NL80211_IFTYPE_NAN,
 
         /* keep last */
         NUM_NL80211_IFTYPES,
@@ -4551,6 +4628,12 @@ enum nl80211_feature_flags {
  *      (if available).
  * @NL80211_EXT_FEATURE_SET_SCAN_DWELL: This driver supports configuration of
  *      channel dwell time.
+ * @NL80211_EXT_FEATURE_BEACON_RATE_LEGACY: Driver supports beacon rate
+ *      configuration (AP/mesh), supporting a legacy (non HT/VHT) rate.
+ * @NL80211_EXT_FEATURE_BEACON_RATE_HT: Driver supports beacon rate
+ *      configuration (AP/mesh) with HT rates.
+ * @NL80211_EXT_FEATURE_BEACON_RATE_VHT: Driver supports beacon rate
+ *      configuration (AP/mesh) with VHT rates.
  *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4562,6 +4645,9 @@ enum nl80211_ext_feature_index {
         NL80211_EXT_FEATURE_SCAN_START_TIME,
         NL80211_EXT_FEATURE_BSS_PARENT_TSF,
         NL80211_EXT_FEATURE_SET_SCAN_DWELL,
+        NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
+        NL80211_EXT_FEATURE_BEACON_RATE_HT,
+        NL80211_EXT_FEATURE_BEACON_RATE_VHT,
 
         /* add new features before the definition below */
         NUM_NL80211_EXT_FEATURES,
@@ -4855,4 +4941,186 @@ enum nl80211_bss_select_attr {
         NL80211_BSS_SELECT_ATTR_MAX = __NL80211_BSS_SELECT_ATTR_AFTER_LAST - 1
 };
 
+/**
+ * enum nl80211_nan_dual_band_conf - NAN dual band configuration
+ *
+ * Defines the NAN dual band mode of operation
+ *
+ * @NL80211_NAN_BAND_DEFAULT: device default mode
+ * @NL80211_NAN_BAND_2GHZ: 2.4GHz mode
+ * @NL80211_NAN_BAND_5GHZ: 5GHz mode
+  */
+enum nl80211_nan_dual_band_conf {
+        NL80211_NAN_BAND_DEFAULT        = 1 << 0,
+        NL80211_NAN_BAND_2GHZ           = 1 << 1,
+        NL80211_NAN_BAND_5GHZ           = 1 << 2,
+};
+
+/**
+ * enum nl80211_nan_function_type - NAN function type
+ *
+ * Defines the function type of a NAN function
+ *
+ * @NL80211_NAN_FUNC_PUBLISH: function is publish
+ * @NL80211_NAN_FUNC_SUBSCRIBE: function is subscribe
+ * @NL80211_NAN_FUNC_FOLLOW_UP: function is follow-up
+ */
+enum nl80211_nan_function_type {
+        NL80211_NAN_FUNC_PUBLISH,
+        NL80211_NAN_FUNC_SUBSCRIBE,
+        NL80211_NAN_FUNC_FOLLOW_UP,
+
+        /* keep last */
+        __NL80211_NAN_FUNC_TYPE_AFTER_LAST,
+        NL80211_NAN_FUNC_MAX_TYPE = __NL80211_NAN_FUNC_TYPE_AFTER_LAST - 1,
+};
+
+/**
+ * enum nl80211_nan_publish_type - NAN publish tx type
+ *
+ * Defines how to send publish Service Discovery Frames
+ *
+ * @NL80211_NAN_SOLICITED_PUBLISH: publish function is solicited
+ * @NL80211_NAN_UNSOLICITED_PUBLISH: publish function is unsolicited
+ */
+enum nl80211_nan_publish_type {
+        NL80211_NAN_SOLICITED_PUBLISH = 1 << 0,
+        NL80211_NAN_UNSOLICITED_PUBLISH = 1 << 1,
+};
+
+/**
+ * enum nl80211_nan_func_term_reason - NAN functions termination reason
+ *
+ * Defines termination reasons of a NAN function
+ *
+ * @NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST: requested by user
+ * @NL80211_NAN_FUNC_TERM_REASON_TTL_EXPIRED: timeout
+ * @NL80211_NAN_FUNC_TERM_REASON_ERROR: errored
+ */
+enum nl80211_nan_func_term_reason {
+        NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST,
+        NL80211_NAN_FUNC_TERM_REASON_TTL_EXPIRED,
+        NL80211_NAN_FUNC_TERM_REASON_ERROR,
+};
+
+#define NL80211_NAN_FUNC_SERVICE_ID_LEN 6
+#define NL80211_NAN_FUNC_SERVICE_SPEC_INFO_MAX_LEN 0xff
+#define NL80211_NAN_FUNC_SRF_MAX_LEN 0xff
+
+/**
+ * enum nl80211_nan_func_attributes - NAN function attributes
+ * @__NL80211_NAN_FUNC_INVALID: invalid
+ * @NL80211_NAN_FUNC_TYPE: &enum nl80211_nan_function_type (u8).
+ * @NL80211_NAN_FUNC_SERVICE_ID: 6 bytes of the service ID hash as
+ *      specified in NAN spec. This is a binary attribute.
+ * @NL80211_NAN_FUNC_PUBLISH_TYPE: relevant if the function's type is
+ *      publish. Defines the transmission type for the publish Service Discovery
+ *      Frame, see &enum nl80211_nan_publish_type. Its type is u8.
+ * @NL80211_NAN_FUNC_PUBLISH_BCAST: relevant if the function is a solicited
+ *      publish. Should the solicited publish Service Discovery Frame be sent to
+ *      the NAN Broadcast address. This is a flag.
+ * @NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE: relevant if the function's type is
+ *      subscribe. Is the subscribe active. This is a flag.
+ * @NL80211_NAN_FUNC_FOLLOW_UP_ID: relevant if the function's type is follow up.
+ *      The instance ID for the follow up Service Discovery Frame. This is u8.
+ * @NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID: relevant if the function's type
+ *      is follow up. This is a u8.
+ *      The requestor instance ID for the follow up Service Discovery Frame.
+ * @NL80211_NAN_FUNC_FOLLOW_UP_DEST: the MAC address of the recipient of the
+ *      follow up Service Discovery Frame. This is a binary attribute.
+ * @NL80211_NAN_FUNC_CLOSE_RANGE: is this function limited for devices in a
+ *      close range. The range itself (RSSI) is defined by the device.
+ *      This is a flag.
+ * @NL80211_NAN_FUNC_TTL: strictly positive number of DWs this function should
+ *      stay active. If not present infinite TTL is assumed. This is a u32.
+ * @NL80211_NAN_FUNC_SERVICE_INFO: array of bytes describing the service
+ *      specific info. This is a binary attribute.
+ * @NL80211_NAN_FUNC_SRF: Service Receive Filter. This is a nested attribute.
+ *      See &enum nl80211_nan_srf_attributes.
+ * @NL80211_NAN_FUNC_RX_MATCH_FILTER: Receive Matching filter. This is a nested
+ *      attribute. It is a list of binary values.
+ * @NL80211_NAN_FUNC_TX_MATCH_FILTER: Transmit Matching filter. This is a
+ *      nested attribute. It is a list of binary values.
+ * @NL80211_NAN_FUNC_INSTANCE_ID: The instance ID of the function.
+ *      Its type is u8 and it cannot be 0.
+ * @NL80211_NAN_FUNC_TERM_REASON: NAN function termination reason.
+ *      See &enum nl80211_nan_func_term_reason.
+ *
+ * @NUM_NL80211_NAN_FUNC_ATTR: internal
+ * @NL80211_NAN_FUNC_ATTR_MAX: highest NAN function attribute
+ */
+enum nl80211_nan_func_attributes {
+        __NL80211_NAN_FUNC_INVALID,
+        NL80211_NAN_FUNC_TYPE,
+        NL80211_NAN_FUNC_SERVICE_ID,
+        NL80211_NAN_FUNC_PUBLISH_TYPE,
+        NL80211_NAN_FUNC_PUBLISH_BCAST,
+        NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE,
+        NL80211_NAN_FUNC_FOLLOW_UP_ID,
+        NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID,
+        NL80211_NAN_FUNC_FOLLOW_UP_DEST,
+        NL80211_NAN_FUNC_CLOSE_RANGE,
+        NL80211_NAN_FUNC_TTL,
+        NL80211_NAN_FUNC_SERVICE_INFO,
+        NL80211_NAN_FUNC_SRF,
+        NL80211_NAN_FUNC_RX_MATCH_FILTER,
+        NL80211_NAN_FUNC_TX_MATCH_FILTER,
+        NL80211_NAN_FUNC_INSTANCE_ID,
+        NL80211_NAN_FUNC_TERM_REASON,
+
+        /* keep last */
+        NUM_NL80211_NAN_FUNC_ATTR,
+        NL80211_NAN_FUNC_ATTR_MAX = NUM_NL80211_NAN_FUNC_ATTR - 1
+};
+
+/**
+ * enum nl80211_nan_srf_attributes - NAN Service Response filter attributes
+ * @__NL80211_NAN_SRF_INVALID: invalid
+ * @NL80211_NAN_SRF_INCLUDE: present if the include bit of the SRF set.
+ *      This is a flag.
+ * @NL80211_NAN_SRF_BF: Bloom Filter. Present if and only if
+ *      &NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.
+ * @NL80211_NAN_SRF_BF_IDX: index of the Bloom Filter. Mandatory if
+ *      &NL80211_NAN_SRF_BF is present. This is a u8.
+ * @NL80211_NAN_SRF_MAC_ADDRS: list of MAC addresses for the SRF. Present if
+ *      and only if &NL80211_NAN_SRF_BF isn't present. This is a nested
+ *      attribute. Each nested attribute is a MAC address.
+ * @NUM_NL80211_NAN_SRF_ATTR: internal
+ * @NL80211_NAN_SRF_ATTR_MAX: highest NAN SRF attribute
+ */
+enum nl80211_nan_srf_attributes {
+        __NL80211_NAN_SRF_INVALID,
+        NL80211_NAN_SRF_INCLUDE,
+        NL80211_NAN_SRF_BF,
+        NL80211_NAN_SRF_BF_IDX,
+        NL80211_NAN_SRF_MAC_ADDRS,
+
+        /* keep last */
+        NUM_NL80211_NAN_SRF_ATTR,
+        NL80211_NAN_SRF_ATTR_MAX = NUM_NL80211_NAN_SRF_ATTR - 1,
+};
+
+/**
+ * enum nl80211_nan_match_attributes - NAN match attributes
+ * @__NL80211_NAN_MATCH_INVALID: invalid
+ * @NL80211_NAN_MATCH_FUNC_LOCAL: the local function that had the
+ *      match. This is a nested attribute.
+ *      See &enum nl80211_nan_func_attributes.
+ * @NL80211_NAN_MATCH_FUNC_PEER: the peer function
+ *      that caused the match. This is a nested attribute.
+ *      See &enum nl80211_nan_func_attributes.
+ *
+ * @NUM_NL80211_NAN_MATCH_ATTR: internal
+ * @NL80211_NAN_MATCH_ATTR_MAX: highest NAN match attribute
+ */
+enum nl80211_nan_match_attributes {
+        __NL80211_NAN_MATCH_INVALID,
+        NL80211_NAN_MATCH_FUNC_LOCAL,
+        NL80211_NAN_MATCH_FUNC_PEER,
+
+        /* keep last */
+        NUM_NL80211_NAN_MATCH_ATTR,
+        NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1
+};
+
 #endif /* __LINUX_NL80211_H */
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 54c3b4f4aceb..59ed3992c760 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -605,13 +605,13 @@ struct ovs_action_push_mpls {
  * @vlan_tci: Tag control identifier (TCI) to push.  The CFI bit must be set
  * (but it will not be set in the 802.1Q header that is pushed).
  *
- * The @vlan_tpid value is typically %ETH_P_8021Q.  The only acceptable TPID
- * values are those that the kernel module also parses as 802.1Q headers, to
- * prevent %OVS_ACTION_ATTR_PUSH_VLAN followed by %OVS_ACTION_ATTR_POP_VLAN
- * from having surprising results.
+ * The @vlan_tpid value is typically %ETH_P_8021Q or %ETH_P_8021AD.
+ * The only acceptable TPID values are those that the kernel module also parses
+ * as 802.1Q or 802.1AD headers, to prevent %OVS_ACTION_ATTR_PUSH_VLAN followed
+ * by %OVS_ACTION_ATTR_POP_VLAN from having surprising results.
  */
 struct ovs_action_push_vlan {
-        __be16 vlan_tpid;       /* 802.1Q TPID. */
+        __be16 vlan_tpid;       /* 802.1Q or 802.1ad TPID. */
         __be16 vlan_tci;        /* 802.1Q TCI (VLAN ID and priority). */
 };
 
@@ -721,9 +721,10 @@ enum ovs_nat_attr {
  * is copied from the value to the packet header field, rest of the bits are
  * left unchanged.  The non-masked value bits must be passed in as zeroes.
  * Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute.
- * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the
- * packet.
- * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet.
+ * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q or 802.1ad header
+ * onto the packet.
+ * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q or 802.1ad header
+ * from the packet.
  * @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in
  * the nested %OVS_SAMPLE_ATTR_* attributes.
  * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index d1c1ccaba787..8fd715f806a2 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -396,6 +396,7 @@ enum {
         TCA_BPF_FD,
         TCA_BPF_NAME,
         TCA_BPF_FLAGS,
+        TCA_BPF_FLAGS_GEN,
         __TCA_BPF_MAX,
 };
 
@@ -428,6 +429,24 @@ enum {
         TCA_FLOWER_KEY_UDP_DST,         /* be16 */
 
         TCA_FLOWER_FLAGS,
+        TCA_FLOWER_KEY_VLAN_ID,         /* be16 */
+        TCA_FLOWER_KEY_VLAN_PRIO,       /* u8   */
+        TCA_FLOWER_KEY_VLAN_ETH_TYPE,   /* be16 */
+
+        TCA_FLOWER_KEY_ENC_KEY_ID,      /* be32 */
+        TCA_FLOWER_KEY_ENC_IPV4_SRC,    /* be32 */
+        TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK,/* be32 */
+        TCA_FLOWER_KEY_ENC_IPV4_DST,    /* be32 */
+        TCA_FLOWER_KEY_ENC_IPV4_DST_MASK,/* be32 */
+        TCA_FLOWER_KEY_ENC_IPV6_SRC,    /* struct in6_addr */
+        TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK,/* struct in6_addr */
+        TCA_FLOWER_KEY_ENC_IPV6_DST,    /* struct in6_addr */
+        TCA_FLOWER_KEY_ENC_IPV6_DST_MASK,/* struct in6_addr */
+
+        TCA_FLOWER_KEY_TCP_SRC_MASK,    /* be16 */
+        TCA_FLOWER_KEY_TCP_DST_MASK,    /* be16 */
+        TCA_FLOWER_KEY_UDP_SRC_MASK,    /* be16 */
+        TCA_FLOWER_KEY_UDP_DST_MASK,    /* be16 */
         __TCA_FLOWER_MAX,
 };
 
diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 2382eed50278..df7451d35131 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -792,6 +792,8 @@ enum {
 
         TCA_FQ_ORPHAN_MASK,     /* mask applied to orphaned skb hashes */
 
+        TCA_FQ_LOW_RATE_THRESHOLD, /* per packet delay under this rate */
+
         __TCA_FQ_MAX
 };
 
@@ -809,7 +811,7 @@ struct tc_fq_qd_stats {
         __u32   flows;
         __u32   inactive_flows;
         __u32   throttled_flows;
-        __u32   pad;
+        __u32   unthrottle_latency_ns;
 };
 
 /* Heavy-Hitter Filter */
diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index 25a9ad8bcef1..e7a31f830690 100644
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -235,6 +235,7 @@ enum
         LINUX_MIB_TCPSPURIOUSRTOS,              /* TCPSpuriousRTOs */
         LINUX_MIB_TCPMD5NOTFOUND,               /* TCPMD5NotFound */
         LINUX_MIB_TCPMD5UNEXPECTED,             /* TCPMD5Unexpected */
+        LINUX_MIB_TCPMD5FAILURE,                /* TCPMD5Failure */
         LINUX_MIB_SACKSHIFTED,
         LINUX_MIB_SACKMERGED,
         LINUX_MIB_SACKSHIFTFALLBACK,
diff --git a/include/uapi/linux/tc_act/tc_ife.h b/include/uapi/linux/tc_act/tc_ife.h
index 4ece02a77b9a..cd18360eca24 100644
--- a/include/uapi/linux/tc_act/tc_ife.h
+++ b/include/uapi/linux/tc_act/tc_ife.h
@@ -32,8 +32,9 @@ enum {
 #define IFE_META_HASHID 2
 #define IFE_META_PRIO 3
 #define IFE_META_QMAP 4
+#define IFE_META_TCINDEX 5
 /*Can be overridden at runtime by module option*/
-#define __IFE_META_MAX 5
+#define __IFE_META_MAX 6
 #define IFE_META_MAX (__IFE_META_MAX - 1)
 
 #endif
diff --git a/include/uapi/linux/tc_act/tc_skbmod.h b/include/uapi/linux/tc_act/tc_skbmod.h
new file mode 100644
index 000000000000..10fc07da6c69
--- /dev/null
+++ b/include/uapi/linux/tc_act/tc_skbmod.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016, Jamal Hadi Salim
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+*/
+
+#ifndef __LINUX_TC_SKBMOD_H
+#define __LINUX_TC_SKBMOD_H
+
+#include <linux/pkt_cls.h>
+
+#define TCA_ACT_SKBMOD 15
+
+#define SKBMOD_F_DMAC   0x1
+#define SKBMOD_F_SMAC   0x2
+#define SKBMOD_F_ETYPE  0x4
+#define SKBMOD_F_SWAPMAC 0x8
+
+struct tc_skbmod {
+        tc_gen;
+        __u64 flags;
+};
+
+enum {
+        TCA_SKBMOD_UNSPEC,
+        TCA_SKBMOD_TM,
+        TCA_SKBMOD_PARMS,
+        TCA_SKBMOD_DMAC,
+        TCA_SKBMOD_SMAC,
+        TCA_SKBMOD_ETYPE,
+        TCA_SKBMOD_PAD,
+        __TCA_SKBMOD_MAX
+};
+#define TCA_SKBMOD_MAX (__TCA_SKBMOD_MAX - 1)
+
+#endif
diff --git a/include/uapi/linux/tc_act/tc_tunnel_key.h b/include/uapi/linux/tc_act/tc_tunnel_key.h
new file mode 100644
index 000000000000..890106ff16e6
--- /dev/null
+++ b/include/uapi/linux/tc_act/tc_tunnel_key.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016, Amir Vadai <amir@vadai.me>
+ * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __LINUX_TC_TUNNEL_KEY_H
+#define __LINUX_TC_TUNNEL_KEY_H
+
+#include <linux/pkt_cls.h>
+
+#define TCA_ACT_TUNNEL_KEY 17
+
+#define TCA_TUNNEL_KEY_ACT_SET      1
+#define TCA_TUNNEL_KEY_ACT_RELEASE  2
+
+struct tc_tunnel_key {
+        tc_gen;
+        int t_action;
+};
+
+enum {
+        TCA_TUNNEL_KEY_UNSPEC,
+        TCA_TUNNEL_KEY_TM,
+        TCA_TUNNEL_KEY_PARMS,
+        TCA_TUNNEL_KEY_ENC_IPV4_SRC,    /* be32 */
+        TCA_TUNNEL_KEY_ENC_IPV4_DST,    /* be32 */
+        TCA_TUNNEL_KEY_ENC_IPV6_SRC,    /* struct in6_addr */
+        TCA_TUNNEL_KEY_ENC_IPV6_DST,    /* struct in6_addr */
+        TCA_TUNNEL_KEY_ENC_KEY_ID,      /* be64 */
+        TCA_TUNNEL_KEY_PAD,
+        __TCA_TUNNEL_KEY_MAX,
+};
+
+#define TCA_TUNNEL_KEY_MAX (__TCA_TUNNEL_KEY_MAX - 1)
+
+#endif
diff --git a/include/uapi/linux/tc_act/tc_vlan.h b/include/uapi/linux/tc_act/tc_vlan.h
index 31151ff6264f..bddb272b843f 100644
--- a/include/uapi/linux/tc_act/tc_vlan.h
+++ b/include/uapi/linux/tc_act/tc_vlan.h
@@ -16,6 +16,7 @@
 
 #define TCA_VLAN_ACT_POP        1
 #define TCA_VLAN_ACT_PUSH       2
+#define TCA_VLAN_ACT_MODIFY     3
 
 struct tc_vlan {
         tc_gen;
@@ -29,6 +30,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/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 482898fc433a..73ac0db487f8 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -167,6 +167,7 @@ struct tcp_info {
         __u8    tcpi_backoff;
         __u8    tcpi_options;
         __u8    tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+        __u8    tcpi_delivery_rate_app_limited:1;
 
         __u32   tcpi_rto;
         __u32   tcpi_ato;
@@ -211,6 +212,8 @@ struct tcp_info {
         __u32   tcpi_min_rtt;
         __u32   tcpi_data_segs_in;      /* RFC4898 tcpEStatsDataSegsIn */
         __u32   tcpi_data_segs_out;     /* RFC4898 tcpEStatsDataSegsOut */
+
+        __u64   tcpi_delivery_rate;
 };
 
 /* for TCP_MD5SIG socket option */
diff --git a/include/uapi/linux/tipc_netlink.h b/include/uapi/linux/tipc_netlink.h
index 5f3f6d09fb79..f9edd20fe9ba 100644
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
@@ -59,6 +59,9 @@ enum {
         TIPC_NL_MON_SET,
         TIPC_NL_MON_GET,
         TIPC_NL_MON_PEER_GET,
+        TIPC_NL_PEER_REMOVE,
+        TIPC_NL_BEARER_ADD,
+        TIPC_NL_UDP_GET_REMOTEIP,
 
         __TIPC_NL_CMD_MAX,
         TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1
@@ -98,6 +101,7 @@ enum {
         TIPC_NLA_UDP_UNSPEC,
         TIPC_NLA_UDP_LOCAL,             /* sockaddr_storage */
         TIPC_NLA_UDP_REMOTE,            /* sockaddr_storage */
+        TIPC_NLA_UDP_MULTI_REMOTEIP,    /* flag */
 
         __TIPC_NLA_UDP_MAX,
         TIPC_NLA_UDP_MAX = __TIPC_NLA_UDP_MAX - 1
diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 143338978b48..1fc62b239f1b 100644
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -298,7 +298,7 @@ enum xfrm_attr_type_t {
         XFRMA_ALG_AUTH_TRUNC,   /* struct xfrm_algo_auth */
         XFRMA_MARK,             /* struct xfrm_mark */
         XFRMA_TFCPAD,           /* __u32 */
-        XFRMA_REPLAY_ESN_VAL,   /* struct xfrm_replay_esn */
+        XFRMA_REPLAY_ESN_VAL,   /* struct xfrm_replay_state_esn */
         XFRMA_SA_EXTRA_FLAGS,   /* __u32 */
         XFRMA_PROTO,            /* __u8 */
         XFRMA_ADDRESS_FILTER,   /* struct xfrm_address_filter */