19 files changed, 294 insertions, 8 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index cc47ef41076a..5c1cee11f777 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -119,8 +119,12 @@ enum bpf_prog_type {
        BPF_PROG_TYPE_UNSPEC,
        BPF_PROG_TYPE_SOCKET_FILTER,
        BPF_PROG_TYPE_KPROBE,
+        BPF_PROG_TYPE_SCHED_CLS,
+        BPF_PROG_TYPE_SCHED_ACT,
 };
+#define BPF_PSEUDO_MAP_FD       1
 /* flags for BPF_MAP_UPDATE_ELEM command */
 #define BPF_ANY         0 /* create new element or update existing */
 #define BPF_NOEXIST     1 /* create new element if it didn't exist */
@@ -167,7 +171,61 @@ enum bpf_func_id {
        BPF_FUNC_probe_read,      /* int bpf_probe_read(void *dst, int size, void *src) */
        BPF_FUNC_ktime_get_ns,    /* u64 bpf_ktime_get_ns(void) */
        BPF_FUNC_trace_printk,    /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */
+        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,
 };
+/* user accessible mirror of in-kernel sk_buff.
+ * new fields can only be added to the end of this structure
+ */
+struct __sk_buff {
+        __u32 len;
+        __u32 pkt_type;
+        __u32 mark;
+        __u32 queue_mapping;
+        __u32 protocol;
+        __u32 vlan_present;
+        __u32 vlan_tci;
+        __u32 vlan_proto;
+        __u32 priority;
+};
 #endif /* _UAPI__LINUX_BPF_H__ */
diff --git a/include/uapi/linux/can/raw.h b/include/uapi/linux/can/raw.h
index 78ec76fd89a6..8735f1080385 100644
--- a/include/uapi/linux/can/raw.h
+++ b/include/uapi/linux/can/raw.h
@@ -57,6 +57,7 @@ enum {
        CAN_RAW_LOOPBACK,       /* local loopback (default:on)       */
        CAN_RAW_RECV_OWN_MSGS,  /* receive my own msgs (default:off) */
        CAN_RAW_FD_FRAMES,      /* allow CAN FD frames (default:off) */
+        CAN_RAW_JOIN_FILTERS,   /* all filters must match to trigger */
 };
 #endif /* !_UAPI_CAN_RAW_H */
diff --git a/include/uapi/linux/dcbnl.h b/include/uapi/linux/dcbnl.h
index e711f20dc522..6497d7933d5b 100644
--- a/include/uapi/linux/dcbnl.h
+++ b/include/uapi/linux/dcbnl.h
@@ -78,6 +78,70 @@ struct ieee_maxrate {
        __u64   tc_maxrate[IEEE_8021QAZ_MAX_TCS];
 };
+enum dcbnl_cndd_states {
+        DCB_CNDD_RESET = 0,
+        DCB_CNDD_EDGE,
+        DCB_CNDD_INTERIOR,
+        DCB_CNDD_INTERIOR_READY,
+};
+/* This structure contains the IEEE 802.1Qau QCN managed object.
+ *
+ *@rpg_enable: enable QCN RP
+ *@rppp_max_rps: maximum number of RPs allowed for this CNPV on this port
+ *@rpg_time_reset: time between rate increases if no CNMs received.
+ *                 given in u-seconds
+ *@rpg_byte_reset: transmitted data between rate increases if no CNMs received.
+ *                 given in Bytes
+ *@rpg_threshold: The number of times rpByteStage or rpTimeStage can count
+ *                 before RP rate control state machine advances states
+ *@rpg_max_rate: the maxinun rate, in Mbits per second,
+ *               at which an RP can transmit
+ *@rpg_ai_rate: The rate, in Mbits per second,
+ *              used to increase rpTargetRate in the RPR_ACTIVE_INCREASE
+ *@rpg_hai_rate: The rate, in Mbits per second,
+ *               used to increase rpTargetRate in the RPR_HYPER_INCREASE state
+ *@rpg_gd: Upon CNM receive, flow rate is limited to (Fb/Gd)*CurrentRate.
+ *         rpgGd is given as log2(Gd), where Gd may only be powers of 2
+ *@rpg_min_dec_fac: The minimum factor by which the current transmit rate
+ *                  can be changed by reception of a CNM.
+ *                  value is given as percentage (1-100)
+ *@rpg_min_rate: The minimum value, in bits per second, for rate to limit
+ *@cndd_state_machine: The state of the congestion notification domain
+ *                     defense state machine, as defined by IEEE 802.3Qau
+ *                     section 32.1.1. In the interior ready state,
+ *                     the QCN capable hardware may add CN-TAG TLV to the
+ *                     outgoing traffic, to specifically identify outgoing
+ *                     flows.
+ */
+struct ieee_qcn {
+        __u8 rpg_enable[IEEE_8021QAZ_MAX_TCS];
+        __u32 rppp_max_rps[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_time_reset[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_byte_reset[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_threshold[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_max_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_ai_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_hai_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_gd[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_min_dec_fac[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_min_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 cndd_state_machine[IEEE_8021QAZ_MAX_TCS];
+};
+/* This structure contains the IEEE 802.1Qau QCN statistics.
+ *
+ *@rppp_rp_centiseconds: the number of RP-centiseconds accumulated
+ *                       by RPs at this priority level on this Port
+ *@rppp_created_rps: number of active RPs(flows) that react to CNMs
+ */
+struct ieee_qcn_stats {
+        __u64 rppp_rp_centiseconds[IEEE_8021QAZ_MAX_TCS];
+        __u32 rppp_created_rps[IEEE_8021QAZ_MAX_TCS];
+};
 /* This structure contains the IEEE 802.1Qaz PFC managed object
 *
 * @pfc_cap: Indicates the number of traffic classes on the local device
@@ -334,6 +398,8 @@ enum ieee_attrs {
        DCB_ATTR_IEEE_PEER_PFC,
        DCB_ATTR_IEEE_PEER_APP,
        DCB_ATTR_IEEE_MAXRATE,
+        DCB_ATTR_IEEE_QCN,
+        DCB_ATTR_IEEE_QCN_STATS,
        __DCB_ATTR_IEEE_MAX
 };
 #define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
diff --git a/include/uapi/linux/filter.h b/include/uapi/linux/filter.h
index 47785d5ecf17..34c7936ca114 100644
--- a/include/uapi/linux/filter.h
+++ b/include/uapi/linux/filter.h
@@ -77,7 +77,8 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_VLAN_TAG_PRESENT 48
 #define SKF_AD_PAY_OFFSET       52
 #define SKF_AD_RANDOM   56
-#define SKF_AD_MAX      60
+#define SKF_AD_VLAN_TPID        60
+#define SKF_AD_MAX      64
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
diff --git a/include/uapi/linux/fou.h b/include/uapi/linux/fou.h
index c303588bb767..d2947c52dc67 100644
--- a/include/uapi/linux/fou.h
+++ b/include/uapi/linux/fou.h
@@ -25,6 +25,7 @@ enum {
        FOU_CMD_UNSPEC,
        FOU_CMD_ADD,
        FOU_CMD_DEL,
+        FOU_CMD_GET,
        __FOU_CMD_MAX,
 };
diff --git a/include/uapi/linux/if_addr.h b/include/uapi/linux/if_addr.h
index dea10a87dfd1..4318ab1635ce 100644
--- a/include/uapi/linux/if_addr.h
+++ b/include/uapi/linux/if_addr.h
@@ -50,6 +50,8 @@ enum {
 #define IFA_F_PERMANENT         0x80
 #define IFA_F_MANAGETEMPADDR    0x100
 #define IFA_F_NOPREFIXROUTE     0x200
+#define IFA_F_MCAUTOJOIN        0x400
+#define IFA_F_STABLE_PRIVACY    0x800
 struct ifa_cacheinfo {
        __u32   ifa_prefered;
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index dfd0bb22e554..d9cd19214b98 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -147,6 +147,7 @@ enum {
        IFLA_CARRIER_CHANGES,
        IFLA_PHYS_SWITCH_ID,
        IFLA_LINK_NETNSID,
+        IFLA_PHYS_PORT_NAME,
        __IFLA_MAX
 };
@@ -215,6 +216,7 @@ enum {
 enum in6_addr_gen_mode {
        IN6_ADDR_GEN_MODE_EUI64,
        IN6_ADDR_GEN_MODE_NONE,
+        IN6_ADDR_GEN_MODE_STABLE_PRIVACY,
 };
 /* Bridge section */
@@ -224,6 +226,9 @@ enum {
        IFLA_BR_FORWARD_DELAY,
        IFLA_BR_HELLO_TIME,
        IFLA_BR_MAX_AGE,
+        IFLA_BR_AGEING_TIME,
+        IFLA_BR_STP_STATE,
+        IFLA_BR_PRIORITY,
        __IFLA_BR_MAX,
 };
@@ -247,6 +252,7 @@ enum {
        IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
        IFLA_BRPORT_PROXYARP,   /* proxy ARP */
        IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
+        IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -459,6 +465,9 @@ enum {
        IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
        IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
        IFLA_VF_RATE,           /* Min and Max TX Bandwidth Allocation */
+        IFLA_VF_RSS_QUERY_EN,   /* RSS Redirection Table and Hash Key query
+                                 * on/off switch
+                                 */
        __IFLA_VF_MAX,
 };
@@ -503,6 +512,11 @@ struct ifla_vf_link_state {
        __u32 link_state;
 };
+struct ifla_vf_rss_query_en {
+        __u32 vf;
+        __u32 setting;
+};
 /* VF ports management section
 *
 *      Nested layout of set/get msg is:
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index da2d668b8cf1..053bd102fbe0 100644
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -99,6 +99,7 @@ struct tpacket_auxdata {
 #define TP_STATUS_VLAN_VALID            (1 << 4) /* auxdata has valid tp_vlan_tci */
 #define TP_STATUS_BLK_TMO               (1 << 5)
 #define TP_STATUS_VLAN_TPID_VALID       (1 << 6) /* auxdata has valid tp_vlan_tpid */
+#define TP_STATUS_CSUM_VALID            (1 << 7)
 /* Tx ring - header status */
 #define TP_STATUS_AVAILABLE           0
diff --git a/include/uapi/linux/ip_vs.h b/include/uapi/linux/ip_vs.h
index cabe95d5b461..3199243f2028 100644
--- a/include/uapi/linux/ip_vs.h
+++ b/include/uapi/linux/ip_vs.h
@@ -358,6 +358,8 @@ enum {
        IPVS_SVC_ATTR_PE_NAME,          /* name of ct retriever */
+        IPVS_SVC_ATTR_STATS64,          /* nested attribute for service stats */
        __IPVS_SVC_ATTR_MAX,
 };
@@ -387,6 +389,8 @@ enum {
        IPVS_DEST_ATTR_ADDR_FAMILY,     /* Address family of address */
+        IPVS_DEST_ATTR_STATS64,         /* nested attribute for dest stats */
        __IPVS_DEST_ATTR_MAX,
 };
@@ -410,7 +414,8 @@ enum {
 /*
 * Attributes used to describe service or destination entry statistics
 *
- * Used inside nested attributes IPVS_SVC_ATTR_STATS and IPVS_DEST_ATTR_STATS
+ * Used inside nested attributes IPVS_SVC_ATTR_STATS, IPVS_DEST_ATTR_STATS,
+ * IPVS_SVC_ATTR_STATS64 and IPVS_DEST_ATTR_STATS64.
 */
 enum {
        IPVS_STATS_ATTR_UNSPEC = 0,
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 437a6a4b125a..5efa54ae567c 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -170,6 +170,7 @@ enum {
        DEVCONF_ACCEPT_RA_FROM_LOCAL,
        DEVCONF_USE_OPTIMISTIC,
        DEVCONF_ACCEPT_RA_MTU,
+        DEVCONF_STABLE_SECRET,
        DEVCONF_MAX
 };
diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 3873a35509aa..2e35c61bbdd1 100644
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
@@ -126,6 +126,7 @@ enum {
        NDTPA_PROXY_QLEN,               /* u32 */
        NDTPA_LOCKTIME,                 /* u64, msecs */
        NDTPA_QUEUE_LENBYTES,           /* u32 */
+        NDTPA_MCAST_REPROBES,           /* u32 */
        __NDTPA_MAX
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 832bc46db78b..5fa1cd04762e 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -1,19 +1,49 @@
 #ifndef _LINUX_NF_TABLES_H
 #define _LINUX_NF_TABLES_H
+#define NFT_TABLE_MAXNAMELEN    32
 #define NFT_CHAIN_MAXNAMELEN    32
 #define NFT_USERDATA_MAXLEN     256
+/**
+ * enum nft_registers - nf_tables registers
+ *
+ * nf_tables used to have five registers: a verdict register and four data
+ * registers of size 16. The data registers have been changed to 16 registers
+ * of size 4. For compatibility reasons, the NFT_REG_[1-4] registers still
+ * map to areas of size 16, the 4 byte registers are addressed using
+ * NFT_REG32_00 - NFT_REG32_15.
+ */
 enum nft_registers {
        NFT_REG_VERDICT,
        NFT_REG_1,
        NFT_REG_2,
        NFT_REG_3,
        NFT_REG_4,
-        __NFT_REG_MAX
+        __NFT_REG_MAX,
+        NFT_REG32_00    = 8,
+        MFT_REG32_01,
+        NFT_REG32_02,
+        NFT_REG32_03,
+        NFT_REG32_04,
+        NFT_REG32_05,
+        NFT_REG32_06,
+        NFT_REG32_07,
+        NFT_REG32_08,
+        NFT_REG32_09,
+        NFT_REG32_10,
+        NFT_REG32_11,
+        NFT_REG32_12,
+        NFT_REG32_13,
+        NFT_REG32_14,
+        NFT_REG32_15,
 };
 #define NFT_REG_MAX     (__NFT_REG_MAX - 1)
+#define NFT_REG_SIZE    16
+#define NFT_REG32_SIZE  4
 /**
 * enum nft_verdicts - nf_tables internal verdicts
 *
@@ -207,12 +237,16 @@ enum nft_rule_compat_attributes {
 * @NFT_SET_CONSTANT: set contents may not change while bound
 * @NFT_SET_INTERVAL: set contains intervals
 * @NFT_SET_MAP: set is used as a dictionary
+ * @NFT_SET_TIMEOUT: set uses timeouts
+ * @NFT_SET_EVAL: set contains expressions for evaluation
 */
 enum nft_set_flags {
        NFT_SET_ANONYMOUS               = 0x1,
        NFT_SET_CONSTANT                = 0x2,
        NFT_SET_INTERVAL                = 0x4,
        NFT_SET_MAP                     = 0x8,
+        NFT_SET_TIMEOUT                 = 0x10,
+        NFT_SET_EVAL                    = 0x20,
 };
 /**
@@ -251,6 +285,8 @@ enum nft_set_desc_attributes {
 * @NFTA_SET_POLICY: selection policy (NLA_U32)
 * @NFTA_SET_DESC: set description (NLA_NESTED)
 * @NFTA_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
+ * @NFTA_SET_TIMEOUT: default timeout value (NLA_U64)
+ * @NFTA_SET_GC_INTERVAL: garbage collection interval (NLA_U32)
 */
 enum nft_set_attributes {
        NFTA_SET_UNSPEC,
@@ -264,6 +300,8 @@ enum nft_set_attributes {
        NFTA_SET_POLICY,
        NFTA_SET_DESC,
        NFTA_SET_ID,
+        NFTA_SET_TIMEOUT,
+        NFTA_SET_GC_INTERVAL,
        __NFTA_SET_MAX
 };
 #define NFTA_SET_MAX            (__NFTA_SET_MAX - 1)
@@ -283,12 +321,20 @@ enum nft_set_elem_flags {
 * @NFTA_SET_ELEM_KEY: key value (NLA_NESTED: nft_data)
 * @NFTA_SET_ELEM_DATA: data value of mapping (NLA_NESTED: nft_data_attributes)
 * @NFTA_SET_ELEM_FLAGS: bitmask of nft_set_elem_flags (NLA_U32)
+ * @NFTA_SET_ELEM_TIMEOUT: timeout value (NLA_U64)
+ * @NFTA_SET_ELEM_EXPIRATION: expiration time (NLA_U64)
+ * @NFTA_SET_ELEM_USERDATA: user data (NLA_BINARY)
+ * @NFTA_SET_ELEM_EXPR: expression (NLA_NESTED: nft_expr_attributes)
 */
 enum nft_set_elem_attributes {
        NFTA_SET_ELEM_UNSPEC,
        NFTA_SET_ELEM_KEY,
        NFTA_SET_ELEM_DATA,
        NFTA_SET_ELEM_FLAGS,
+        NFTA_SET_ELEM_TIMEOUT,
+        NFTA_SET_ELEM_EXPIRATION,
+        NFTA_SET_ELEM_USERDATA,
+        NFTA_SET_ELEM_EXPR,
        __NFTA_SET_ELEM_MAX
 };
 #define NFTA_SET_ELEM_MAX       (__NFTA_SET_ELEM_MAX - 1)
@@ -346,6 +392,9 @@ enum nft_data_attributes {
 };
 #define NFTA_DATA_MAX           (__NFTA_DATA_MAX - 1)
+/* Maximum length of a value */
+#define NFT_DATA_VALUE_MAXLEN   64
 /**
 * enum nft_verdict_attributes - nf_tables verdict netlink attributes
 *
@@ -504,6 +553,35 @@ enum nft_lookup_attributes {
 };
 #define NFTA_LOOKUP_MAX         (__NFTA_LOOKUP_MAX - 1)
+enum nft_dynset_ops {
+        NFT_DYNSET_OP_ADD,
+        NFT_DYNSET_OP_UPDATE,
+};
+/**
+ * enum nft_dynset_attributes - dynset expression attributes
+ *
+ * @NFTA_DYNSET_SET_NAME: name of set the to add data to (NLA_STRING)
+ * @NFTA_DYNSET_SET_ID: uniquely identifier of the set in the transaction (NLA_U32)
+ * @NFTA_DYNSET_OP: operation (NLA_U32)
+ * @NFTA_DYNSET_SREG_KEY: source register of the key (NLA_U32)
+ * @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)
+ */
+enum nft_dynset_attributes {
+        NFTA_DYNSET_UNSPEC,
+        NFTA_DYNSET_SET_NAME,
+        NFTA_DYNSET_SET_ID,
+        NFTA_DYNSET_OP,
+        NFTA_DYNSET_SREG_KEY,
+        NFTA_DYNSET_SREG_DATA,
+        NFTA_DYNSET_TIMEOUT,
+        NFTA_DYNSET_EXPR,
+        __NFTA_DYNSET_MAX,
+};
+#define NFTA_DYNSET_MAX         (__NFTA_DYNSET_MAX - 1)
 /**
 * enum nft_payload_bases - nf_tables payload expression offset bases
 *
diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h b/include/uapi/linux/netfilter_bridge/ebtables.h
index ba993360dbe9..773dfe8924c7 100644
--- a/include/uapi/linux/netfilter_bridge/ebtables.h
+++ b/include/uapi/linux/netfilter_bridge/ebtables.h
@@ -12,9 +12,7 @@
 #ifndef _UAPI__LINUX_BRIDGE_EFF_H
 #define _UAPI__LINUX_BRIDGE_EFF_H
-#include <linux/if.h>
 #include <linux/netfilter_bridge.h>
-#include <linux/if_ether.h>
 #define EBT_TABLE_MAXNAMELEN 32
 #define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 68b294e83944..241220c43e86 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -25,6 +25,19 @@
 *
 */
+/*
+ * This header file defines the userspace API to the wireless stack. Please
+ * be careful not to break things - i.e. don't move anything around or so
+ * unless you can demonstrate that it breaks neither API nor ABI.
+ *
+ * Additions to the API should be accompanied by actual implementations in
+ * an upstream driver, so that example implementations exist in case there
+ * are ever concerns about the precise semantics of the API or changes are
+ * needed, and to ensure that code for dead (no longer implemented) API
+ * can actually be identified and removed.
+ * Nonetheless, semantics should also be documented carefully in this file.
+ */
 #include <linux/types.h>
 #define NL80211_GENL_NAME "nl80211"
@@ -1684,6 +1697,10 @@ enum nl80211_commands {
 *      If set during scheduled scan start then the new scan req will be
 *      owned by the netlink socket that created it and the scheduled scan will
 *      be stopped when the socket is closed.
+ *      If set during configuration of regulatory indoor operation then the
+ *      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.
 *
 * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
 *      the TDLS link initiator.
@@ -1737,8 +1754,12 @@ enum nl80211_commands {
 *      should be contained in the result as the sum of the respective counters
 *      over all channels.
 *
- * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before a scheduled scan (or a
+ * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
- *      WoWLAN net-detect scan) is started, u32 in seconds.
+ *      scheduled scan (or a WoWLAN net-detect scan) is started, u32
+ *      in seconds.
+ * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
+ *      is operating in an indoor environment.
 *
 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
 * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2107,6 +2128,8 @@ enum nl80211_attrs {
        NL80211_ATTR_SCHED_SCAN_DELAY,
+        NL80211_ATTR_REG_INDOOR,
        /* add attributes here, update the policy in nl80211.c */
        __NL80211_ATTR_AFTER_LAST,
@@ -3092,7 +3115,8 @@ enum nl80211_mesh_power_mode {
 *
 * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've
 *      established peering with for longer than this time (in seconds), then
- *      remove it from the STA's list of peers.  Default is 30 minutes.
+ *      remove it from the STA's list of peers. You may set this to 0 to disable
+ *      the removal of the STA. Default is 30 minutes.
 *
 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
 */
@@ -3694,6 +3718,8 @@ struct nl80211_pattern_support {
 * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put
 *      the chip into a special state -- works best with chips that have
 *      support for low-power operation already (flag)
+ *      Note that this mode is incompatible with all of the others, if
+ *      any others are even supported by the device.
 * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect
 *      is detected is implementation-specific (flag)
 * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed
@@ -4327,11 +4353,13 @@ enum nl80211_feature_flags {
 /**
 * enum nl80211_ext_feature_index - bit index of extended features.
+ * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
 *
 * @NUM_NL80211_EXT_FEATURES: number of extended features.
 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
 */
 enum nl80211_ext_feature_index {
+        NL80211_EXT_FEATURE_VHT_IBSS,
        /* add new features before the definition below */
        NUM_NL80211_EXT_FEATURES,
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 25731dfb3fcc..bf08e76bf505 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -397,6 +397,8 @@ enum {
        TCA_BPF_CLASSID,
        TCA_BPF_OPS_LEN,
        TCA_BPF_OPS,
+        TCA_BPF_FD,
+        TCA_BPF_NAME,
        __TCA_BPF_MAX,
 };
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 5cc5d66bf519..974db03f7b1a 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/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
@@ -303,6 +305,9 @@ enum rtattr_type_t {
        RTA_TABLE,
        RTA_MARK,
        RTA_MFC_STATS,
+        RTA_VIA,
+        RTA_NEWDST,
+        RTA_PREF,
        __RTA_MAX
 };
@@ -332,6 +337,7 @@ struct rtnexthop {
 #define RTNH_F_DEAD             1       /* Nexthop is dead (used by multipath)  */
 #define RTNH_F_PERVASIVE        2       /* Do recursive gateway lookup  */
 #define RTNH_F_ONLINK           4       /* Gateway is forced on link    */
+#define RTNH_F_EXTERNAL         8       /* Route installed externally   */
 /* Macros to handle hexthops */
@@ -344,6 +350,12 @@ struct rtnexthop {
 #define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len))
 #define RTNH_DATA(rtnh)   ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0)))
+/* RTA_VIA */
+struct rtvia {
+        __kernel_sa_family_t    rtvia_family;
+        __u8                    rtvia_addr[0];
+};
 /* RTM_CACHEINFO */
 struct rta_cacheinfo {
@@ -623,6 +635,10 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_NETCONF    RTNLGRP_IPV6_NETCONF
        RTNLGRP_MDB,
 #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/uapi/linux/tc_act/tc_bpf.h b/include/uapi/linux/tc_act/tc_bpf.h
index 5288bd77e63b..07f17cc70bb3 100644
--- a/include/uapi/linux/tc_act/tc_bpf.h
+++ b/include/uapi/linux/tc_act/tc_bpf.h
@@ -24,6 +24,8 @@ enum {
        TCA_ACT_BPF_PARMS,
        TCA_ACT_BPF_OPS_LEN,
        TCA_ACT_BPF_OPS,
+        TCA_ACT_BPF_FD,
+        TCA_ACT_BPF_NAME,
        __TCA_ACT_BPF_MAX,
 };
 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
diff --git a/include/uapi/linux/tipc_netlink.h b/include/uapi/linux/tipc_netlink.h
index 8d723824ad69..d4c8f142ba63 100644
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
@@ -83,11 +83,20 @@ enum {
        TIPC_NLA_BEARER_NAME,           /* string */
        TIPC_NLA_BEARER_PROP,           /* nest */
        TIPC_NLA_BEARER_DOMAIN,         /* u32 */
+        TIPC_NLA_BEARER_UDP_OPTS,       /* nest */
        __TIPC_NLA_BEARER_MAX,
        TIPC_NLA_BEARER_MAX = __TIPC_NLA_BEARER_MAX - 1
 };
+enum {
+        TIPC_NLA_UDP_UNSPEC,
+        TIPC_NLA_UDP_LOCAL,             /* sockaddr_storage */
+        TIPC_NLA_UDP_REMOTE,            /* sockaddr_storage */
+        __TIPC_NLA_UDP_MAX,
+        TIPC_NLA_UDP_MAX = __TIPC_NLA_UDP_MAX - 1
+};
 /* Socket info */
 enum {
        TIPC_NLA_SOCK_UNSPEC,
diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 02d5125a5ee8..2cd9e608d0d1 100644
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/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