Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:
 "Highlights:

   1) Support more Realtek wireless chips, from Jes Sorenson.

   2) New BPF types for per-cpu hash and arrap maps, from Alexei
      Starovoitov.

   3) Make several TCP sysctls per-namespace, from Nikolay Borisov.

   4) Allow the use of SO_REUSEPORT in order to do per-thread processing
   of incoming TCP/UDP connections.  The muxing can be done using a
   BPF program which hashes the incoming packet.  From Craig Gallek.

   5) Add a multiplexer for TCP streams, to provide a messaged based
      interface.  BPF programs can be used to determine the message
      boundaries.  From Tom Herbert.

   6) Add 802.1AE MACSEC support, from Sabrina Dubroca.

   7) Avoid factorial complexity when taking down an inetdev interface
      with lots of configured addresses.  We were doing things like
      traversing the entire address less for each address removed, and
      flushing the entire netfilter conntrack table for every address as
      well.

   8) Add and use SKB bulk free infrastructure, from Jesper Brouer.

   9) Allow offloading u32 classifiers to hardware, and implement for
      ixgbe, from John Fastabend.

  10) Allow configuring IRQ coalescing parameters on a per-queue basis,
      from Kan Liang.

  11) Extend ethtool so that larger link mode masks can be supported.
      From David Decotigny.

  12) Introduce devlink, which can be used to configure port link types
      (ethernet vs Infiniband, etc.), port splitting, and switch device
      level attributes as a whole.  From Jiri Pirko.

  13) Hardware offload support for flower classifiers, from Amir Vadai.

  14) Add "Local Checksum Offload".  Basically, for a tunneled packet
      the checksum of the outer header is 'constant' (because with the
      checksum field filled into the inner protocol header, the payload
      of the outer frame checksums to 'zero'), and we can take advantage
      of that in various ways.  From Edward Cree"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1548 commits)
  bonding: fix bond_get_stats()
  net: bcmgenet: fix dma api length mismatch
  net/mlx4_core: Fix backward compatibility on VFs
  phy: mdio-thunder: Fix some Kconfig typos
  lan78xx: add ndo_get_stats64
  lan78xx: handle statistics counter rollover
  RDS: TCP: Remove unused constant
  RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket
  net: smc911x: convert pxa dma to dmaengine
  team: remove duplicate set of flag IFF_MULTICAST
  bonding: remove duplicate set of flag IFF_MULTICAST
  net: fix a comment typo
  ethernet: micrel: fix some error codes
  ip_tunnels, bpf: define IP_TUNNEL_OPTS_MAX and use it
  bpf, dst: add and use dst_tclassid helper
  bpf: make skb->tc_classid also readable
  net: mvneta: bm: clarify dependencies
  cls_bpf: reset class and reuse major in da
  ldmvsw: Checkpatch sunvnet.c and sunvnet_common.c
  ldmvsw: Add ldmvsw.c driver code
  ...

27 files changed, 912 insertions, 88 deletions

diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h
index fb8a41668382..67d632f1743d 100644
--- a/include/uapi/asm-generic/socket.h
+++ b/include/uapi/asm-generic/socket.h
@@ -90,4 +90,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* __ASM_GENERIC_SOCKET_H */
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 5c9ae6a9b7f5..0495884defc1 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -174,6 +174,7 @@ header-y += if_hippi.h
 header-y += if_infiniband.h
 header-y += if_link.h
 header-y += if_ltalk.h
+header-y += if_macsec.h
 header-y += if_packet.h
 header-y += if_phonet.h
 header-y += if_plip.h
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 5df4881dea7b..924f537183fd 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -81,6 +81,9 @@ 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,
+        BPF_MAP_TYPE_STACK_TRACE,
 };
 
 enum bpf_prog_type {
@@ -98,12 +101,15 @@ enum bpf_prog_type {
 #define BPF_NOEXIST     1 /* create new element if it didn't exist */
 #define BPF_EXIST       2 /* update existing element */
 
+#define BPF_F_NO_PREALLOC       (1U << 0)
+
 union bpf_attr {
         struct { /* anonymous struct used by BPF_MAP_CREATE command */
                 __u32   map_type;       /* one of enum bpf_map_type */
                 __u32   key_size;       /* size of key in bytes */
                 __u32   value_size;     /* size of value in bytes */
                 __u32   max_entries;    /* max number of entries in a map */
+                __u32   map_flags;      /* prealloc or not */
         };
 
         struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
@@ -270,6 +276,42 @@ 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_skb_[gs]et_tunnel_opt(skb, opt, size)
+         * retrieve or populate tunnel options metadata
+         * @skb: pointer to skb
+         * @opt: pointer to raw tunnel option data
+         * @size: size of @opt
+         * Return: 0 on success for set, option size for get
+         */
+        BPF_FUNC_skb_get_tunnel_opt,
+        BPF_FUNC_skb_set_tunnel_opt,
         __BPF_FUNC_MAX_ID,
 };
 
@@ -277,6 +319,7 @@ enum bpf_func_id {
 
 /* BPF_FUNC_skb_store_bytes flags. */
 #define BPF_F_RECOMPUTE_CSUM            (1ULL << 0)
+#define BPF_F_INVALIDATE_HASH           (1ULL << 1)
 
 /* BPF_FUNC_l3_csum_replace and BPF_FUNC_l4_csum_replace flags.
  * First 4 bits are for passing the header field size.
@@ -285,6 +328,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)
@@ -292,8 +336,15 @@ 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)
+
 /* BPF_FUNC_skb_set_tunnel_key flags. */
 #define BPF_F_ZERO_CSUM_TX              (1ULL << 1)
+#define BPF_F_DONT_FRAGMENT             (1ULL << 2)
 
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
@@ -324,6 +375,7 @@ struct bpf_tunnel_key {
         };
         __u8 tunnel_tos;
         __u8 tunnel_ttl;
+        __u32 tunnel_label;
 };
 
 #endif /* _UAPI__LINUX_BPF_H__ */
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
new file mode 100644
index 000000000000..c9fee5781eb1
--- /dev/null
+++ b/include/uapi/linux/devlink.h
@@ -0,0 +1,72 @@
+/*
+ * include/uapi/linux/devlink.h - Network physical device Netlink interface
+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2016 Jiri Pirko <jiri@mellanox.com>
+ *
+ * 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 _UAPI_LINUX_DEVLINK_H_
+#define _UAPI_LINUX_DEVLINK_H_
+
+#define DEVLINK_GENL_NAME "devlink"
+#define DEVLINK_GENL_VERSION 0x1
+#define DEVLINK_GENL_MCGRP_CONFIG_NAME "config"
+
+enum devlink_command {
+        /* don't change the order or add anything between, this is ABI! */
+        DEVLINK_CMD_UNSPEC,
+
+        DEVLINK_CMD_GET,                /* can dump */
+        DEVLINK_CMD_SET,
+        DEVLINK_CMD_NEW,
+        DEVLINK_CMD_DEL,
+
+        DEVLINK_CMD_PORT_GET,           /* can dump */
+        DEVLINK_CMD_PORT_SET,
+        DEVLINK_CMD_PORT_NEW,
+        DEVLINK_CMD_PORT_DEL,
+
+        DEVLINK_CMD_PORT_SPLIT,
+        DEVLINK_CMD_PORT_UNSPLIT,
+
+        /* add new commands above here */
+
+        __DEVLINK_CMD_MAX,
+        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
+};
+
+enum devlink_port_type {
+        DEVLINK_PORT_TYPE_NOTSET,
+        DEVLINK_PORT_TYPE_AUTO,
+        DEVLINK_PORT_TYPE_ETH,
+        DEVLINK_PORT_TYPE_IB,
+};
+
+enum devlink_attr {
+        /* don't change the order or add anything between, this is ABI! */
+        DEVLINK_ATTR_UNSPEC,
+
+        /* bus name + dev name together are a handle for devlink entity */
+        DEVLINK_ATTR_BUS_NAME,                  /* string */
+        DEVLINK_ATTR_DEV_NAME,                  /* string */
+
+        DEVLINK_ATTR_PORT_INDEX,                /* u32 */
+        DEVLINK_ATTR_PORT_TYPE,                 /* u16 */
+        DEVLINK_ATTR_PORT_DESIRED_TYPE,         /* u16 */
+        DEVLINK_ATTR_PORT_NETDEV_IFINDEX,       /* u32 */
+        DEVLINK_ATTR_PORT_NETDEV_NAME,          /* string */
+        DEVLINK_ATTR_PORT_IBDEV_NAME,           /* string */
+        DEVLINK_ATTR_PORT_SPLIT_COUNT,          /* u32 */
+        DEVLINK_ATTR_PORT_SPLIT_GROUP,          /* u32 */
+
+        /* add new attributes above here, update the policy in devlink.c */
+
+        __DEVLINK_ATTR_MAX,
+        DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
+};
+
+#endif /* _UAPI_LINUX_DEVLINK_H_ */
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 57fa39005e79..2835b07416b7 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -13,15 +13,21 @@
 #ifndef _UAPI_LINUX_ETHTOOL_H
 #define _UAPI_LINUX_ETHTOOL_H
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/if_ether.h>
 
+#ifndef __KERNEL__
+#include <limits.h> /* for INT_MAX */
+#endif
+
 /* All structures exposed to userland should be defined such that they
  * have the same layout for 32-bit and 64-bit userland.
  */
 
 /**
- * struct ethtool_cmd - link control and status
+ * struct ethtool_cmd - DEPRECATED, link control and status
+ * This structure is DEPRECATED, please use struct ethtool_link_settings.
  * @cmd: Command number = %ETHTOOL_GSET or %ETHTOOL_SSET
  * @supported: Bitmask of %SUPPORTED_* flags for the link modes,
  *      physical connectors and other link features for which the
@@ -31,7 +37,7 @@
  *      physical connectors and other link features that are
  *      advertised through autonegotiation or enabled for
  *      auto-detection.
- * @speed: Low bits of the speed
+ * @speed: Low bits of the speed, 1Mb units, 0 to INT_MAX or SPEED_UNKNOWN
  * @duplex: Duplex mode; one of %DUPLEX_*
  * @port: Physical connector type; one of %PORT_*
  * @phy_address: MDIO address of PHY (transceiver); 0 or 255 if not
@@ -47,7 +53,7 @@
  *      obsoleted by &struct ethtool_coalesce.  Read-only; deprecated.
  * @maxrxpkt: Historically used to report RX IRQ coalescing; now
  *      obsoleted by &struct ethtool_coalesce.  Read-only; deprecated.
- * @speed_hi: High bits of the speed
+ * @speed_hi: High bits of the speed, 1Mb units, 0 to INT_MAX or SPEED_UNKNOWN
  * @eth_tp_mdix: Ethernet twisted-pair MDI(-X) status; one of
  *      %ETH_TP_MDI_*.  If the status is unknown or not applicable, the
  *      value will be %ETH_TP_MDI_INVALID.  Read-only.
@@ -748,6 +754,56 @@ struct ethtool_usrip4_spec {
         __u8    proto;
 };
 
+/**
+ * struct ethtool_tcpip6_spec - flow specification for TCP/IPv6 etc.
+ * @ip6src: Source host
+ * @ip6dst: Destination host
+ * @psrc: Source port
+ * @pdst: Destination port
+ * @tclass: Traffic Class
+ *
+ * This can be used to specify a TCP/IPv6, UDP/IPv6 or SCTP/IPv6 flow.
+ */
+struct ethtool_tcpip6_spec {
+        __be32  ip6src[4];
+        __be32  ip6dst[4];
+        __be16  psrc;
+        __be16  pdst;
+        __u8    tclass;
+};
+
+/**
+ * struct ethtool_ah_espip6_spec - flow specification for IPsec/IPv6
+ * @ip6src: Source host
+ * @ip6dst: Destination host
+ * @spi: Security parameters index
+ * @tclass: Traffic Class
+ *
+ * This can be used to specify an IPsec transport or tunnel over IPv6.
+ */
+struct ethtool_ah_espip6_spec {
+        __be32  ip6src[4];
+        __be32  ip6dst[4];
+        __be32  spi;
+        __u8    tclass;
+};
+
+/**
+ * struct ethtool_usrip6_spec - general flow specification for IPv6
+ * @ip6src: Source host
+ * @ip6dst: Destination host
+ * @l4_4_bytes: First 4 bytes of transport (layer 4) header
+ * @tclass: Traffic Class
+ * @l4_proto: Transport protocol number (nexthdr after any Extension Headers)
+ */
+struct ethtool_usrip6_spec {
+        __be32  ip6src[4];
+        __be32  ip6dst[4];
+        __be32  l4_4_bytes;
+        __u8    tclass;
+        __u8    l4_proto;
+};
+
 union ethtool_flow_union {
         struct ethtool_tcpip4_spec              tcp_ip4_spec;
         struct ethtool_tcpip4_spec              udp_ip4_spec;
@@ -755,6 +811,12 @@ union ethtool_flow_union {
         struct ethtool_ah_espip4_spec           ah_ip4_spec;
         struct ethtool_ah_espip4_spec           esp_ip4_spec;
         struct ethtool_usrip4_spec              usr_ip4_spec;
+        struct ethtool_tcpip6_spec              tcp_ip6_spec;
+        struct ethtool_tcpip6_spec              udp_ip6_spec;
+        struct ethtool_tcpip6_spec              sctp_ip6_spec;
+        struct ethtool_ah_espip6_spec           ah_ip6_spec;
+        struct ethtool_ah_espip6_spec           esp_ip6_spec;
+        struct ethtool_usrip6_spec              usr_ip6_spec;
         struct ethhdr                           ether_spec;
         __u8                                    hdata[52];
 };
@@ -1146,10 +1208,29 @@ enum ethtool_sfeatures_retval_bits {
 #define ETHTOOL_F_WISH          (1 << ETHTOOL_F_WISH__BIT)
 #define ETHTOOL_F_COMPAT        (1 << ETHTOOL_F_COMPAT__BIT)
 
+#define MAX_NUM_QUEUE           4096
+
+/**
+ * struct ethtool_per_queue_op - apply sub command to the queues in mask.
+ * @cmd: ETHTOOL_PERQUEUE
+ * @sub_command: the sub command which apply to each queues
+ * @queue_mask: Bitmap of the queues which sub command apply to
+ * @data: A complete command structure following for each of the queues addressed
+ */
+struct ethtool_per_queue_op {
+        __u32   cmd;
+        __u32   sub_command;
+        __u32   queue_mask[__KERNEL_DIV_ROUND_UP(MAX_NUM_QUEUE, 32)];
+        char    data[];
+};
 
 /* CMDs currently supported */
-#define ETHTOOL_GSET            0x00000001 /* Get settings. */
-#define ETHTOOL_SSET            0x00000002 /* Set settings. */
+#define ETHTOOL_GSET            0x00000001 /* DEPRECATED, Get settings.
+                                            * Please use ETHTOOL_GLINKSETTINGS
+                                            */
+#define ETHTOOL_SSET            0x00000002 /* DEPRECATED, Set settings.
+                                            * Please use ETHTOOL_SLINKSETTINGS
+                                            */
 #define ETHTOOL_GDRVINFO        0x00000003 /* Get driver info. */
 #define ETHTOOL_GREGS           0x00000004 /* Get NIC registers. */
 #define ETHTOOL_GWOL            0x00000005 /* Get wake-on-lan options. */
@@ -1229,73 +1310,141 @@ enum ethtool_sfeatures_retval_bits {
 #define ETHTOOL_STUNABLE        0x00000049 /* Set tunable configuration */
 #define ETHTOOL_GPHYSTATS       0x0000004a /* get PHY-specific statistics */
 
+#define ETHTOOL_PERQUEUE        0x0000004b /* Set per queue options */
+
+#define ETHTOOL_GLINKSETTINGS   0x0000004c /* Get ethtool_link_settings */
+#define ETHTOOL_SLINKSETTINGS   0x0000004d /* Set ethtool_link_settings */
+
+
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
 #define SPARC_ETH_SSET          ETHTOOL_SSET
 
-#define SUPPORTED_10baseT_Half          (1 << 0)
-#define SUPPORTED_10baseT_Full          (1 << 1)
-#define SUPPORTED_100baseT_Half         (1 << 2)
-#define SUPPORTED_100baseT_Full         (1 << 3)
-#define SUPPORTED_1000baseT_Half        (1 << 4)
-#define SUPPORTED_1000baseT_Full        (1 << 5)
-#define SUPPORTED_Autoneg               (1 << 6)
-#define SUPPORTED_TP                    (1 << 7)
-#define SUPPORTED_AUI                   (1 << 8)
-#define SUPPORTED_MII                   (1 << 9)
-#define SUPPORTED_FIBRE                 (1 << 10)
-#define SUPPORTED_BNC                   (1 << 11)
-#define SUPPORTED_10000baseT_Full       (1 << 12)
-#define SUPPORTED_Pause                 (1 << 13)
-#define SUPPORTED_Asym_Pause            (1 << 14)
-#define SUPPORTED_2500baseX_Full        (1 << 15)
-#define SUPPORTED_Backplane             (1 << 16)
-#define SUPPORTED_1000baseKX_Full       (1 << 17)
-#define SUPPORTED_10000baseKX4_Full     (1 << 18)
-#define SUPPORTED_10000baseKR_Full      (1 << 19)
-#define SUPPORTED_10000baseR_FEC        (1 << 20)
-#define SUPPORTED_20000baseMLD2_Full    (1 << 21)
-#define SUPPORTED_20000baseKR2_Full     (1 << 22)
-#define SUPPORTED_40000baseKR4_Full     (1 << 23)
-#define SUPPORTED_40000baseCR4_Full     (1 << 24)
-#define SUPPORTED_40000baseSR4_Full     (1 << 25)
-#define SUPPORTED_40000baseLR4_Full     (1 << 26)
-#define SUPPORTED_56000baseKR4_Full     (1 << 27)
-#define SUPPORTED_56000baseCR4_Full     (1 << 28)
-#define SUPPORTED_56000baseSR4_Full     (1 << 29)
-#define SUPPORTED_56000baseLR4_Full     (1 << 30)
-
-#define ADVERTISED_10baseT_Half         (1 << 0)
-#define ADVERTISED_10baseT_Full         (1 << 1)
-#define ADVERTISED_100baseT_Half        (1 << 2)
-#define ADVERTISED_100baseT_Full        (1 << 3)
-#define ADVERTISED_1000baseT_Half       (1 << 4)
-#define ADVERTISED_1000baseT_Full       (1 << 5)
-#define ADVERTISED_Autoneg              (1 << 6)
-#define ADVERTISED_TP                   (1 << 7)
-#define ADVERTISED_AUI                  (1 << 8)
-#define ADVERTISED_MII                  (1 << 9)
-#define ADVERTISED_FIBRE                (1 << 10)
-#define ADVERTISED_BNC                  (1 << 11)
-#define ADVERTISED_10000baseT_Full      (1 << 12)
-#define ADVERTISED_Pause                (1 << 13)
-#define ADVERTISED_Asym_Pause           (1 << 14)
-#define ADVERTISED_2500baseX_Full       (1 << 15)
-#define ADVERTISED_Backplane            (1 << 16)
-#define ADVERTISED_1000baseKX_Full      (1 << 17)
-#define ADVERTISED_10000baseKX4_Full    (1 << 18)
-#define ADVERTISED_10000baseKR_Full     (1 << 19)
-#define ADVERTISED_10000baseR_FEC       (1 << 20)
-#define ADVERTISED_20000baseMLD2_Full   (1 << 21)
-#define ADVERTISED_20000baseKR2_Full    (1 << 22)
-#define ADVERTISED_40000baseKR4_Full    (1 << 23)
-#define ADVERTISED_40000baseCR4_Full    (1 << 24)
-#define ADVERTISED_40000baseSR4_Full    (1 << 25)
-#define ADVERTISED_40000baseLR4_Full    (1 << 26)
-#define ADVERTISED_56000baseKR4_Full    (1 << 27)
-#define ADVERTISED_56000baseCR4_Full    (1 << 28)
-#define ADVERTISED_56000baseSR4_Full    (1 << 29)
-#define ADVERTISED_56000baseLR4_Full    (1 << 30)
+/* Link mode bit indices */
+enum ethtool_link_mode_bit_indices {
+        ETHTOOL_LINK_MODE_10baseT_Half_BIT      = 0,
+        ETHTOOL_LINK_MODE_10baseT_Full_BIT      = 1,
+        ETHTOOL_LINK_MODE_100baseT_Half_BIT     = 2,
+        ETHTOOL_LINK_MODE_100baseT_Full_BIT     = 3,
+        ETHTOOL_LINK_MODE_1000baseT_Half_BIT    = 4,
+        ETHTOOL_LINK_MODE_1000baseT_Full_BIT    = 5,
+        ETHTOOL_LINK_MODE_Autoneg_BIT           = 6,
+        ETHTOOL_LINK_MODE_TP_BIT                = 7,
+        ETHTOOL_LINK_MODE_AUI_BIT               = 8,
+        ETHTOOL_LINK_MODE_MII_BIT               = 9,
+        ETHTOOL_LINK_MODE_FIBRE_BIT             = 10,
+        ETHTOOL_LINK_MODE_BNC_BIT               = 11,
+        ETHTOOL_LINK_MODE_10000baseT_Full_BIT   = 12,
+        ETHTOOL_LINK_MODE_Pause_BIT             = 13,
+        ETHTOOL_LINK_MODE_Asym_Pause_BIT        = 14,
+        ETHTOOL_LINK_MODE_2500baseX_Full_BIT    = 15,
+        ETHTOOL_LINK_MODE_Backplane_BIT         = 16,
+        ETHTOOL_LINK_MODE_1000baseKX_Full_BIT   = 17,
+        ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT = 18,
+        ETHTOOL_LINK_MODE_10000baseKR_Full_BIT  = 19,
+        ETHTOOL_LINK_MODE_10000baseR_FEC_BIT    = 20,
+        ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT = 21,
+        ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT = 22,
+        ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT = 23,
+        ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT = 24,
+        ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT = 25,
+        ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT = 26,
+        ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT = 27,
+        ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT = 28,
+        ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
+        ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,
+
+        /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
+         * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
+         * macro for bits > 31. The only way to use indices > 31 is to
+         * use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.
+         */
+
+        __ETHTOOL_LINK_MODE_LAST
+          = ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT,
+};
+
+#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name)      \
+        (1UL << (ETHTOOL_LINK_MODE_ ## base_name ## _BIT))
+
+/* DEPRECATED macros. Please migrate to
+ * ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API. Please do NOT
+ * define any new SUPPORTED_* macro for bits > 31.
+ */
+#define SUPPORTED_10baseT_Half          __ETHTOOL_LINK_MODE_LEGACY_MASK(10baseT_Half)
+#define SUPPORTED_10baseT_Full          __ETHTOOL_LINK_MODE_LEGACY_MASK(10baseT_Full)
+#define SUPPORTED_100baseT_Half         __ETHTOOL_LINK_MODE_LEGACY_MASK(100baseT_Half)
+#define SUPPORTED_100baseT_Full         __ETHTOOL_LINK_MODE_LEGACY_MASK(100baseT_Full)
+#define SUPPORTED_1000baseT_Half        __ETHTOOL_LINK_MODE_LEGACY_MASK(1000baseT_Half)
+#define SUPPORTED_1000baseT_Full        __ETHTOOL_LINK_MODE_LEGACY_MASK(1000baseT_Full)
+#define SUPPORTED_Autoneg               __ETHTOOL_LINK_MODE_LEGACY_MASK(Autoneg)
+#define SUPPORTED_TP                    __ETHTOOL_LINK_MODE_LEGACY_MASK(TP)
+#define SUPPORTED_AUI                   __ETHTOOL_LINK_MODE_LEGACY_MASK(AUI)
+#define SUPPORTED_MII                   __ETHTOOL_LINK_MODE_LEGACY_MASK(MII)
+#define SUPPORTED_FIBRE                 __ETHTOOL_LINK_MODE_LEGACY_MASK(FIBRE)
+#define SUPPORTED_BNC                   __ETHTOOL_LINK_MODE_LEGACY_MASK(BNC)
+#define SUPPORTED_10000baseT_Full       __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseT_Full)
+#define SUPPORTED_Pause                 __ETHTOOL_LINK_MODE_LEGACY_MASK(Pause)
+#define SUPPORTED_Asym_Pause            __ETHTOOL_LINK_MODE_LEGACY_MASK(Asym_Pause)
+#define SUPPORTED_2500baseX_Full        __ETHTOOL_LINK_MODE_LEGACY_MASK(2500baseX_Full)
+#define SUPPORTED_Backplane             __ETHTOOL_LINK_MODE_LEGACY_MASK(Backplane)
+#define SUPPORTED_1000baseKX_Full       __ETHTOOL_LINK_MODE_LEGACY_MASK(1000baseKX_Full)
+#define SUPPORTED_10000baseKX4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseKX4_Full)
+#define SUPPORTED_10000baseKR_Full      __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseKR_Full)
+#define SUPPORTED_10000baseR_FEC        __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseR_FEC)
+#define SUPPORTED_20000baseMLD2_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(20000baseMLD2_Full)
+#define SUPPORTED_20000baseKR2_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(20000baseKR2_Full)
+#define SUPPORTED_40000baseKR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseKR4_Full)
+#define SUPPORTED_40000baseCR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseCR4_Full)
+#define SUPPORTED_40000baseSR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseSR4_Full)
+#define SUPPORTED_40000baseLR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseLR4_Full)
+#define SUPPORTED_56000baseKR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseKR4_Full)
+#define SUPPORTED_56000baseCR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseCR4_Full)
+#define SUPPORTED_56000baseSR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseSR4_Full)
+#define SUPPORTED_56000baseLR4_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseLR4_Full)
+/* Please do not define any new SUPPORTED_* macro for bits > 31, see
+ * notice above.
+ */
+
+/*
+ * DEPRECATED macros. Please migrate to
+ * ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API. Please do NOT
+ * define any new ADERTISE_* macro for bits > 31.
+ */
+#define ADVERTISED_10baseT_Half         __ETHTOOL_LINK_MODE_LEGACY_MASK(10baseT_Half)
+#define ADVERTISED_10baseT_Full         __ETHTOOL_LINK_MODE_LEGACY_MASK(10baseT_Full)
+#define ADVERTISED_100baseT_Half        __ETHTOOL_LINK_MODE_LEGACY_MASK(100baseT_Half)
+#define ADVERTISED_100baseT_Full        __ETHTOOL_LINK_MODE_LEGACY_MASK(100baseT_Full)
+#define ADVERTISED_1000baseT_Half       __ETHTOOL_LINK_MODE_LEGACY_MASK(1000baseT_Half)
+#define ADVERTISED_1000baseT_Full       __ETHTOOL_LINK_MODE_LEGACY_MASK(1000baseT_Full)
+#define ADVERTISED_Autoneg              __ETHTOOL_LINK_MODE_LEGACY_MASK(Autoneg)
+#define ADVERTISED_TP                   __ETHTOOL_LINK_MODE_LEGACY_MASK(TP)
+#define ADVERTISED_AUI                  __ETHTOOL_LINK_MODE_LEGACY_MASK(AUI)
+#define ADVERTISED_MII                  __ETHTOOL_LINK_MODE_LEGACY_MASK(MII)
+#define ADVERTISED_FIBRE                __ETHTOOL_LINK_MODE_LEGACY_MASK(FIBRE)
+#define ADVERTISED_BNC                  __ETHTOOL_LINK_MODE_LEGACY_MASK(BNC)
+#define ADVERTISED_10000baseT_Full      __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseT_Full)
+#define ADVERTISED_Pause                __ETHTOOL_LINK_MODE_LEGACY_MASK(Pause)
+#define ADVERTISED_Asym_Pause           __ETHTOOL_LINK_MODE_LEGACY_MASK(Asym_Pause)
+#define ADVERTISED_2500baseX_Full       __ETHTOOL_LINK_MODE_LEGACY_MASK(2500baseX_Full)
+#define ADVERTISED_Backplane            __ETHTOOL_LINK_MODE_LEGACY_MASK(Backplane)
+#define ADVERTISED_1000baseKX_Full      __ETHTOOL_LINK_MODE_LEGACY_MASK(1000baseKX_Full)
+#define ADVERTISED_10000baseKX4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseKX4_Full)
+#define ADVERTISED_10000baseKR_Full     __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseKR_Full)
+#define ADVERTISED_10000baseR_FEC       __ETHTOOL_LINK_MODE_LEGACY_MASK(10000baseR_FEC)
+#define ADVERTISED_20000baseMLD2_Full   __ETHTOOL_LINK_MODE_LEGACY_MASK(20000baseMLD2_Full)
+#define ADVERTISED_20000baseKR2_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(20000baseKR2_Full)
+#define ADVERTISED_40000baseKR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseKR4_Full)
+#define ADVERTISED_40000baseCR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseCR4_Full)
+#define ADVERTISED_40000baseSR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseSR4_Full)
+#define ADVERTISED_40000baseLR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(40000baseLR4_Full)
+#define ADVERTISED_56000baseKR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseKR4_Full)
+#define ADVERTISED_56000baseCR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseCR4_Full)
+#define ADVERTISED_56000baseSR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseSR4_Full)
+#define ADVERTISED_56000baseLR4_Full    __ETHTOOL_LINK_MODE_LEGACY_MASK(56000baseLR4_Full)
+/* Please do not define any new ADVERTISED_* macro for bits > 31, see
+ * notice above.
+ */
 
 /* The following are all involved in forcing a particular link
  * mode for the device for setting things.  When getting the
@@ -1303,7 +1452,7 @@ enum ethtool_sfeatures_retval_bits {
  * it was forced up into this mode or autonegotiated.
  */
 
-/* The forced speed, 10Mb, 100Mb, gigabit, [2.5|5|10|20|25|40|50|56|100]GbE. */
+/* The forced speed, in units of 1Mb. All values 0 to INT_MAX are legal. */
 #define SPEED_10                10
 #define SPEED_100               100
 #define SPEED_1000              1000
@@ -1319,11 +1468,28 @@ enum ethtool_sfeatures_retval_bits {
 
 #define SPEED_UNKNOWN           -1
 
+static inline int ethtool_validate_speed(__u32 speed)
+{
+        return speed <= INT_MAX || speed == SPEED_UNKNOWN;
+}
+
 /* Duplex, half or full. */
 #define DUPLEX_HALF             0x00
 #define DUPLEX_FULL             0x01
 #define DUPLEX_UNKNOWN          0xff
 
+static inline int ethtool_validate_duplex(__u8 duplex)
+{
+        switch (duplex) {
+        case DUPLEX_HALF:
+        case DUPLEX_FULL:
+        case DUPLEX_UNKNOWN:
+                return 1;
+        }
+
+        return 0;
+}
+
 /* Which connector port. */
 #define PORT_TP                 0x00
 #define PORT_AUI                0x01
@@ -1367,15 +1533,17 @@ enum ethtool_sfeatures_retval_bits {
 #define UDP_V4_FLOW     0x02    /* hash or spec (udp_ip4_spec) */
 #define SCTP_V4_FLOW    0x03    /* hash or spec (sctp_ip4_spec) */
 #define AH_ESP_V4_FLOW  0x04    /* hash only */
-#define TCP_V6_FLOW     0x05    /* hash only */
-#define UDP_V6_FLOW     0x06    /* hash only */
-#define SCTP_V6_FLOW    0x07    /* hash only */
+#define TCP_V6_FLOW     0x05    /* hash or spec (tcp_ip6_spec; nfc only) */
+#define UDP_V6_FLOW     0x06    /* hash or spec (udp_ip6_spec; nfc only) */
+#define SCTP_V6_FLOW    0x07    /* hash or spec (sctp_ip6_spec; nfc only) */
 #define AH_ESP_V6_FLOW  0x08    /* hash only */
 #define AH_V4_FLOW      0x09    /* hash or spec (ah_ip4_spec) */
 #define ESP_V4_FLOW     0x0a    /* hash or spec (esp_ip4_spec) */
-#define AH_V6_FLOW      0x0b    /* hash only */
-#define ESP_V6_FLOW     0x0c    /* hash only */
-#define IP_USER_FLOW    0x0d    /* spec only (usr_ip4_spec) */
+#define AH_V6_FLOW      0x0b    /* hash or spec (ah_ip6_spec; nfc only) */
+#define ESP_V6_FLOW     0x0c    /* hash or spec (esp_ip6_spec; nfc only) */
+#define IPV4_USER_FLOW  0x0d    /* spec only (usr_ip4_spec) */
+#define IP_USER_FLOW    IPV4_USER_FLOW
+#define IPV6_USER_FLOW  0x0e    /* spec only (usr_ip6_spec; nfc only) */
 #define IPV4_FLOW       0x10    /* hash only */
 #define IPV6_FLOW       0x11    /* hash only */
 #define ETHER_FLOW      0x12    /* spec only (ether_spec) */
@@ -1441,4 +1609,123 @@ enum ethtool_reset_flags {
 };
 #define ETH_RESET_SHARED_SHIFT  16
 
+
+/**
+ * struct ethtool_link_settings - link control and status
+ *
+ * IMPORTANT, Backward compatibility notice: When implementing new
+ *      user-space tools, please first try %ETHTOOL_GLINKSETTINGS, and
+ *      if it succeeds use %ETHTOOL_SLINKSETTINGS to change link
+ *      settings; do not use %ETHTOOL_SSET if %ETHTOOL_GLINKSETTINGS
+ *      succeeded: stick to %ETHTOOL_GLINKSETTINGS/%SLINKSETTINGS in
+ *      that case.  Conversely, if %ETHTOOL_GLINKSETTINGS fails, use
+ *      %ETHTOOL_GSET to query and %ETHTOOL_SSET to change link
+ *      settings; do not use %ETHTOOL_SLINKSETTINGS if
+ *      %ETHTOOL_GLINKSETTINGS failed: stick to
+ *      %ETHTOOL_GSET/%ETHTOOL_SSET in that case.
+ *
+ * @cmd: Command number = %ETHTOOL_GLINKSETTINGS or %ETHTOOL_SLINKSETTINGS
+ * @speed: Link speed (Mbps)
+ * @duplex: Duplex mode; one of %DUPLEX_*
+ * @port: Physical connector type; one of %PORT_*
+ * @phy_address: MDIO address of PHY (transceiver); 0 or 255 if not
+ *      applicable.  For clause 45 PHYs this is the PRTAD.
+ * @autoneg: Enable/disable autonegotiation and auto-detection;
+ *      either %AUTONEG_DISABLE or %AUTONEG_ENABLE
+ * @mdio_support: Bitmask of %ETH_MDIO_SUPPORTS_* flags for the MDIO
+ *      protocols supported by the interface; 0 if unknown.
+ *      Read-only.
+ * @eth_tp_mdix: Ethernet twisted-pair MDI(-X) status; one of
+ *      %ETH_TP_MDI_*.  If the status is unknown or not applicable, the
+ *      value will be %ETH_TP_MDI_INVALID.  Read-only.
+ * @eth_tp_mdix_ctrl: Ethernet twisted pair MDI(-X) control; one of
+ *      %ETH_TP_MDI_*.  If MDI(-X) control is not implemented, reads
+ *      yield %ETH_TP_MDI_INVALID and writes may be ignored or rejected.
+ *      When written successfully, the link should be renegotiated if
+ *      necessary.
+ * @link_mode_masks_nwords: Number of 32-bit words for each of the
+ *      supported, advertising, lp_advertising link mode bitmaps. For
+ *      %ETHTOOL_GLINKSETTINGS: on entry, number of words passed by user
+ *      (>= 0); on return, if handshake in progress, negative if
+ *      request size unsupported by kernel: absolute value indicates
+ *      kernel recommended size and cmd field is 0, as well as all the
+ *      other fields; otherwise (handshake completed), strictly
+ *      positive to indicate size used by kernel and cmd field is
+ *      %ETHTOOL_GLINKSETTINGS, all other fields populated by driver. For
+ *      %ETHTOOL_SLINKSETTINGS: must be valid on entry, ie. a positive
+ *      value returned previously by %ETHTOOL_GLINKSETTINGS, otherwise
+ *      refused. For drivers: ignore this field (use kernel's
+ *      __ETHTOOL_LINK_MODE_MASK_NBITS instead), any change to it will
+ *      be overwritten by kernel.
+ * @supported: Bitmap with each bit meaning given by
+ *      %ethtool_link_mode_bit_indices for the link modes, physical
+ *      connectors and other link features for which the interface
+ *      supports autonegotiation or auto-detection.  Read-only.
+ * @advertising: Bitmap with each bit meaning given by
+ *      %ethtool_link_mode_bit_indices for the link modes, physical
+ *      connectors and other link features that are advertised through
+ *      autonegotiation or enabled for auto-detection.
+ * @lp_advertising: Bitmap with each bit meaning given by
+ *      %ethtool_link_mode_bit_indices for the link modes, and other
+ *      link features that the link partner advertised through
+ *      autonegotiation; 0 if unknown or not applicable.  Read-only.
+ *
+ * If autonegotiation is disabled, the speed and @duplex represent the
+ * fixed link mode and are writable if the driver supports multiple
+ * link modes.  If it is enabled then they are read-only; if the link
+ * is up they represent the negotiated link mode; if the link is down,
+ * the speed is 0, %SPEED_UNKNOWN or the highest enabled speed and
+ * @duplex is %DUPLEX_UNKNOWN or the best enabled duplex mode.
+ *
+ * Some hardware interfaces may have multiple PHYs and/or physical
+ * connectors fitted or do not allow the driver to detect which are
+ * fitted.  For these interfaces @port and/or @phy_address may be
+ * writable, possibly dependent on @autoneg being %AUTONEG_DISABLE.
+ * Otherwise, attempts to write different values may be ignored or
+ * rejected.
+ *
+ * Deprecated %ethtool_cmd fields transceiver, maxtxpkt and maxrxpkt
+ * are not available in %ethtool_link_settings. Until all drivers are
+ * converted to ignore them or to the new %ethtool_link_settings API,
+ * for both queries and changes, users should always try
+ * %ETHTOOL_GLINKSETTINGS first, and if it fails with -ENOTSUPP stick
+ * only to %ETHTOOL_GSET and %ETHTOOL_SSET consistently. If it
+ * succeeds, then users should stick to %ETHTOOL_GLINKSETTINGS and
+ * %ETHTOOL_SLINKSETTINGS (which would support drivers implementing
+ * either %ethtool_cmd or %ethtool_link_settings).
+ *
+ * Users should assume that all fields not marked read-only are
+ * writable and subject to validation by the driver.  They should use
+ * %ETHTOOL_GLINKSETTINGS to get the current values before making specific
+ * changes and then applying them with %ETHTOOL_SLINKSETTINGS.
+ *
+ * Drivers that implement %get_link_ksettings and/or
+ * %set_link_ksettings should ignore the @cmd
+ * and @link_mode_masks_nwords fields (any change to them overwritten
+ * by kernel), and rely only on kernel's internal
+ * %__ETHTOOL_LINK_MODE_MASK_NBITS and
+ * %ethtool_link_mode_mask_t. Drivers that implement
+ * %set_link_ksettings() should validate all fields other than @cmd
+ * and @link_mode_masks_nwords that are not described as read-only or
+ * deprecated, and must ignore all fields described as read-only.
+ */
+struct ethtool_link_settings {
+        __u32   cmd;
+        __u32   speed;
+        __u8    duplex;
+        __u8    port;
+        __u8    phy_address;
+        __u8    autoneg;
+        __u8    mdio_support;
+        __u8    eth_tp_mdix;
+        __u8    eth_tp_mdix_ctrl;
+        __s8    link_mode_masks_nwords;
+        __u32   reserved[8];
+        __u32   link_mode_masks[0];
+        /* layout of link_mode_masks fields:
+         * __u32 map_supported[link_mode_masks_nwords];
+         * __u32 map_advertising[link_mode_masks_nwords];
+         * __u32 map_lp_advertising[link_mode_masks_nwords];
+         */
+};
 #endif /* _UAPI_LINUX_ETHTOOL_H */
diff --git a/include/uapi/linux/genetlink.h b/include/uapi/linux/genetlink.h
index c3363ba1ae05..5512c90af7e3 100644
--- a/include/uapi/linux/genetlink.h
+++ b/include/uapi/linux/genetlink.h
@@ -21,6 +21,7 @@ struct genlmsghdr {
 #define GENL_CMD_CAP_DO         0x02
 #define GENL_CMD_CAP_DUMP       0x04
 #define GENL_CMD_CAP_HASPOL     0x08
+#define GENL_UNS_ADMIN_PERM     0x10
 
 /*
  * List of reserved static generic netlink identifiers:
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index 9cf2394f0bcf..f80277569f24 100644
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -37,7 +37,7 @@
  * are shared for all types of net_devices. The sysfs entries are available
  * via /sys/class/net/<dev>/flags. Flags which can be toggled through sysfs
  * are annotated below, note that only a few flags can be toggled and some
- * other flags are always always preserved from the original net_device flags
+ * other flags are always preserved from the original net_device flags
  * even if you try to set them via sysfs. Flags which are always preserved
  * are kept under the flag grouping @IFF_VOLATILE. Flags which are volatile
  * are annotated below as such.
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 18db14477bdd..0536eefff9bf 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/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;
@@ -183,6 +214,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/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index ea9221b0331a..4a93051c578c 100644
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
@@ -83,6 +83,7 @@
 #define ETH_P_8021AD    0x88A8          /* 802.1ad Service VLAN         */
 #define ETH_P_802_EX1   0x88B5          /* 802.1 Local Experimental 1.  */
 #define ETH_P_TIPC      0x88CA          /* TIPC                         */
+#define ETH_P_MACSEC    0x88E5          /* 802.1ae MACsec */
 #define ETH_P_8021AH    0x88E7          /* 802.1ah Backbone Service Tag */
 #define ETH_P_MVRP      0x88F5          /* 802.1Q MVRP                  */
 #define ETH_P_1588      0x88F7          /* IEEE 1588 Timesync */
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index a30b78090594..8e3f88fa5b59 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/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 */
@@ -401,6 +405,43 @@ 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)
+
+/* MACSEC section */
+enum {
+        IFLA_MACSEC_UNSPEC,
+        IFLA_MACSEC_SCI,
+        IFLA_MACSEC_PORT,
+        IFLA_MACSEC_ICV_LEN,
+        IFLA_MACSEC_CIPHER_SUITE,
+        IFLA_MACSEC_WINDOW,
+        IFLA_MACSEC_ENCODING_SA,
+        IFLA_MACSEC_ENCRYPT,
+        IFLA_MACSEC_PROTECT,
+        IFLA_MACSEC_INC_SCI,
+        IFLA_MACSEC_ES,
+        IFLA_MACSEC_SCB,
+        IFLA_MACSEC_REPLAY_PROTECT,
+        IFLA_MACSEC_VALIDATION,
+        __IFLA_MACSEC_MAX,
+};
+
+#define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1)
+
+enum macsec_validation_type {
+        MACSEC_VALIDATE_DISABLED = 0,
+        MACSEC_VALIDATE_CHECK = 1,
+        MACSEC_VALIDATE_STRICT = 2,
+        __MACSEC_VALIDATE_END,
+        MACSEC_VALIDATE_MAX = __MACSEC_VALIDATE_END - 1,
+};
+
 /* IPVLAN section */
 enum {
         IFLA_IPVLAN_UNSPEC,
@@ -444,6 +485,7 @@ enum {
         IFLA_VXLAN_GBP,
         IFLA_VXLAN_REMCSUM_NOPARTIAL,
         IFLA_VXLAN_COLLECT_METADATA,
+        IFLA_VXLAN_LABEL,
         __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
@@ -466,6 +508,7 @@ enum {
         IFLA_GENEVE_UDP_CSUM,
         IFLA_GENEVE_UDP_ZERO_CSUM6_TX,
         IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
+        IFLA_GENEVE_LABEL,
         __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
diff --git a/include/uapi/linux/if_macsec.h b/include/uapi/linux/if_macsec.h
new file mode 100644
index 000000000000..26b0d1e3e3e7
--- /dev/null
+++ b/include/uapi/linux/if_macsec.h
@@ -0,0 +1,161 @@
+/*
+ * include/uapi/linux/if_macsec.h - MACsec device
+ *
+ * Copyright (c) 2015 Sabrina Dubroca <sd@queasysnail.net>
+ *
+ * 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 _UAPI_MACSEC_H
+#define _UAPI_MACSEC_H
+
+#include <linux/types.h>
+
+#define MACSEC_GENL_NAME "macsec"
+#define MACSEC_GENL_VERSION 1
+
+#define MACSEC_MAX_KEY_LEN 128
+
+#define DEFAULT_CIPHER_ID   0x0080020001000001ULL
+#define DEFAULT_CIPHER_ALT  0x0080C20001000001ULL
+
+#define MACSEC_MIN_ICV_LEN 8
+#define MACSEC_MAX_ICV_LEN 32
+
+enum macsec_attrs {
+        MACSEC_ATTR_UNSPEC,
+        MACSEC_ATTR_IFINDEX,     /* u32, ifindex of the MACsec netdevice */
+        MACSEC_ATTR_RXSC_CONFIG, /* config, nested macsec_rxsc_attrs */
+        MACSEC_ATTR_SA_CONFIG,   /* config, nested macsec_sa_attrs */
+        MACSEC_ATTR_SECY,        /* dump, nested macsec_secy_attrs */
+        MACSEC_ATTR_TXSA_LIST,   /* dump, nested, macsec_sa_attrs for each TXSA */
+        MACSEC_ATTR_RXSC_LIST,   /* dump, nested, macsec_rxsc_attrs for each RXSC */
+        MACSEC_ATTR_TXSC_STATS,  /* dump, nested, macsec_txsc_stats_attr */
+        MACSEC_ATTR_SECY_STATS,  /* dump, nested, macsec_secy_stats_attr */
+        __MACSEC_ATTR_END,
+        NUM_MACSEC_ATTR = __MACSEC_ATTR_END,
+        MACSEC_ATTR_MAX = __MACSEC_ATTR_END - 1,
+};
+
+enum macsec_secy_attrs {
+        MACSEC_SECY_ATTR_UNSPEC,
+        MACSEC_SECY_ATTR_SCI,
+        MACSEC_SECY_ATTR_ENCODING_SA,
+        MACSEC_SECY_ATTR_WINDOW,
+        MACSEC_SECY_ATTR_CIPHER_SUITE,
+        MACSEC_SECY_ATTR_ICV_LEN,
+        MACSEC_SECY_ATTR_PROTECT,
+        MACSEC_SECY_ATTR_REPLAY,
+        MACSEC_SECY_ATTR_OPER,
+        MACSEC_SECY_ATTR_VALIDATE,
+        MACSEC_SECY_ATTR_ENCRYPT,
+        MACSEC_SECY_ATTR_INC_SCI,
+        MACSEC_SECY_ATTR_ES,
+        MACSEC_SECY_ATTR_SCB,
+        __MACSEC_SECY_ATTR_END,
+        NUM_MACSEC_SECY_ATTR = __MACSEC_SECY_ATTR_END,
+        MACSEC_SECY_ATTR_MAX = __MACSEC_SECY_ATTR_END - 1,
+};
+
+enum macsec_rxsc_attrs {
+        MACSEC_RXSC_ATTR_UNSPEC,
+        MACSEC_RXSC_ATTR_SCI,     /* config/dump, u64 */
+        MACSEC_RXSC_ATTR_ACTIVE,  /* config/dump, u8 0..1 */
+        MACSEC_RXSC_ATTR_SA_LIST, /* dump, nested */
+        MACSEC_RXSC_ATTR_STATS,   /* dump, nested, macsec_rxsc_stats_attr */
+        __MACSEC_RXSC_ATTR_END,
+        NUM_MACSEC_RXSC_ATTR = __MACSEC_RXSC_ATTR_END,
+        MACSEC_RXSC_ATTR_MAX = __MACSEC_RXSC_ATTR_END - 1,
+};
+
+enum macsec_sa_attrs {
+        MACSEC_SA_ATTR_UNSPEC,
+        MACSEC_SA_ATTR_AN,     /* config/dump, u8 0..3 */
+        MACSEC_SA_ATTR_ACTIVE, /* config/dump, u8 0..1 */
+        MACSEC_SA_ATTR_PN,     /* config/dump, u32 */
+        MACSEC_SA_ATTR_KEY,    /* config, data */
+        MACSEC_SA_ATTR_KEYID,  /* config/dump, u64 */
+        MACSEC_SA_ATTR_STATS,  /* dump, nested, macsec_sa_stats_attr */
+        __MACSEC_SA_ATTR_END,
+        NUM_MACSEC_SA_ATTR = __MACSEC_SA_ATTR_END,
+        MACSEC_SA_ATTR_MAX = __MACSEC_SA_ATTR_END - 1,
+};
+
+enum macsec_nl_commands {
+        MACSEC_CMD_GET_TXSC,
+        MACSEC_CMD_ADD_RXSC,
+        MACSEC_CMD_DEL_RXSC,
+        MACSEC_CMD_UPD_RXSC,
+        MACSEC_CMD_ADD_TXSA,
+        MACSEC_CMD_DEL_TXSA,
+        MACSEC_CMD_UPD_TXSA,
+        MACSEC_CMD_ADD_RXSA,
+        MACSEC_CMD_DEL_RXSA,
+        MACSEC_CMD_UPD_RXSA,
+};
+
+/* u64 per-RXSC stats */
+enum macsec_rxsc_stats_attr {
+        MACSEC_RXSC_STATS_ATTR_UNSPEC,
+        MACSEC_RXSC_STATS_ATTR_IN_OCTETS_VALIDATED,
+        MACSEC_RXSC_STATS_ATTR_IN_OCTETS_DECRYPTED,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_UNCHECKED,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_DELAYED,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_OK,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_INVALID,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_LATE,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_VALID,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_NOT_USING_SA,
+        MACSEC_RXSC_STATS_ATTR_IN_PKTS_UNUSED_SA,
+        __MACSEC_RXSC_STATS_ATTR_END,
+        NUM_MACSEC_RXSC_STATS_ATTR = __MACSEC_RXSC_STATS_ATTR_END,
+        MACSEC_RXSC_STATS_ATTR_MAX = __MACSEC_RXSC_STATS_ATTR_END - 1,
+};
+
+/* u32 per-{RX,TX}SA stats */
+enum macsec_sa_stats_attr {
+        MACSEC_SA_STATS_ATTR_UNSPEC,
+        MACSEC_SA_STATS_ATTR_IN_PKTS_OK,
+        MACSEC_SA_STATS_ATTR_IN_PKTS_INVALID,
+        MACSEC_SA_STATS_ATTR_IN_PKTS_NOT_VALID,
+        MACSEC_SA_STATS_ATTR_IN_PKTS_NOT_USING_SA,
+        MACSEC_SA_STATS_ATTR_IN_PKTS_UNUSED_SA,
+        MACSEC_SA_STATS_ATTR_OUT_PKTS_PROTECTED,
+        MACSEC_SA_STATS_ATTR_OUT_PKTS_ENCRYPTED,
+        __MACSEC_SA_STATS_ATTR_END,
+        NUM_MACSEC_SA_STATS_ATTR = __MACSEC_SA_STATS_ATTR_END,
+        MACSEC_SA_STATS_ATTR_MAX = __MACSEC_SA_STATS_ATTR_END - 1,
+};
+
+/* u64 per-TXSC stats */
+enum macsec_txsc_stats_attr {
+        MACSEC_TXSC_STATS_ATTR_UNSPEC,
+        MACSEC_TXSC_STATS_ATTR_OUT_PKTS_PROTECTED,
+        MACSEC_TXSC_STATS_ATTR_OUT_PKTS_ENCRYPTED,
+        MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_PROTECTED,
+        MACSEC_TXSC_STATS_ATTR_OUT_OCTETS_ENCRYPTED,
+        __MACSEC_TXSC_STATS_ATTR_END,
+        NUM_MACSEC_TXSC_STATS_ATTR = __MACSEC_TXSC_STATS_ATTR_END,
+        MACSEC_TXSC_STATS_ATTR_MAX = __MACSEC_TXSC_STATS_ATTR_END - 1,
+};
+
+/* u64 per-SecY stats */
+enum macsec_secy_stats_attr {
+        MACSEC_SECY_STATS_ATTR_UNSPEC,
+        MACSEC_SECY_STATS_ATTR_OUT_PKTS_UNTAGGED,
+        MACSEC_SECY_STATS_ATTR_IN_PKTS_UNTAGGED,
+        MACSEC_SECY_STATS_ATTR_OUT_PKTS_TOO_LONG,
+        MACSEC_SECY_STATS_ATTR_IN_PKTS_NO_TAG,
+        MACSEC_SECY_STATS_ATTR_IN_PKTS_BAD_TAG,
+        MACSEC_SECY_STATS_ATTR_IN_PKTS_UNKNOWN_SCI,
+        MACSEC_SECY_STATS_ATTR_IN_PKTS_NO_SCI,
+        MACSEC_SECY_STATS_ATTR_IN_PKTS_OVERRUN,
+        __MACSEC_SECY_STATS_ATTR_END,
+        NUM_MACSEC_SECY_STATS_ATTR = __MACSEC_SECY_STATS_ATTR_END,
+        MACSEC_SECY_STATS_ATTR_MAX = __MACSEC_SECY_STATS_ATTR_END - 1,
+};
+
+#endif /* _UAPI_MACSEC_H */
diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
index 08f894d2ddbd..f291569768dd 100644
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@ -165,6 +165,8 @@ enum
         IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL,
         IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL,
         IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,
+        IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,
+        IPV4_DEVCONF_DROP_GRATUITOUS_ARP,
         __IPV4_DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 38b4fef20219..395876060f50 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -174,6 +174,9 @@ enum {
         DEVCONF_USE_OIF_ADDRS_ONLY,
         DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT,
         DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,
+        DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,
+        DEVCONF_DROP_UNSOLICITED_NA,
+        DEVCONF_KEEP_ADDR_ON_DOWN,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/kcm.h b/include/uapi/linux/kcm.h
new file mode 100644
index 000000000000..a5a530940b99
--- /dev/null
+++ b/include/uapi/linux/kcm.h
@@ -0,0 +1,40 @@
+/*
+ * Kernel Connection Multiplexor
+ *
+ * Copyright (c) 2016 Tom Herbert <tom@herbertland.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * User API to clone KCM sockets and attach transport socket to a KCM
+ * multiplexor.
+ */
+
+#ifndef KCM_KERNEL_H
+#define KCM_KERNEL_H
+
+struct kcm_attach {
+        int fd;
+        int bpf_fd;
+};
+
+struct kcm_unattach {
+        int fd;
+};
+
+struct kcm_clone {
+        int fd;
+};
+
+#define SIOCKCMATTACH   (SIOCPROTOPRIVATE + 0)
+#define SIOCKCMUNATTACH (SIOCPROTOPRIVATE + 1)
+#define SIOCKCMCLONE    (SIOCPROTOPRIVATE + 2)
+
+#define KCMPROTO_CONNECTED      0
+
+/* Socket options */
+#define KCM_RECV_DISABLE        1
+
+#endif
+
diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
index 321e399457f5..466073f0ce46 100644
--- a/include/uapi/linux/kernel.h
+++ b/include/uapi/linux/kernel.h
@@ -9,5 +9,6 @@
 #define __ALIGN_KERNEL(x, a)            __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
 #define __ALIGN_KERNEL_MASK(x, mask)    (((x) + (mask)) & ~(mask))
 
+#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
 
 #endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h
index ce91215cf7e6..5062fb5751e1 100644
--- a/include/uapi/linux/mroute6.h
+++ b/include/uapi/linux/mroute6.h
@@ -1,6 +1,7 @@
 #ifndef _UAPI__LINUX_MROUTE6_H
 #define _UAPI__LINUX_MROUTE6_H
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/sockios.h>
 
@@ -46,14 +47,8 @@ typedef unsigned short mifi_t;
 typedef __u32           if_mask;
 #define NIFBITS (sizeof(if_mask) * 8)        /* bits per mask */
 
-#if !defined(__KERNEL__)
-#if !defined(DIV_ROUND_UP)
-#define DIV_ROUND_UP(x,y)       (((x) + ((y) - 1)) / (y))
-#endif
-#endif
-
 typedef struct if_set {
-        if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
+        if_mask ifs_bits[__KERNEL_DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
 } if_set;
 
 #define IF_SET(n, p)    ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
diff --git a/include/uapi/linux/netconf.h b/include/uapi/linux/netconf.h
index 23cbd34e4ac7..45dfad509c4d 100644
--- a/include/uapi/linux/netconf.h
+++ b/include/uapi/linux/netconf.h
@@ -19,6 +19,7 @@ enum {
         __NETCONFA_MAX
 };
 #define NETCONFA_MAX    (__NETCONFA_MAX - 1)
+#define NETCONFA_ALL    -1
 
 #define NETCONFA_IFINDEX_ALL            -1
 #define NETCONFA_IFINDEX_DEFAULT        -2
diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h
index 319f47128db8..6d074d14ee27 100644
--- a/include/uapi/linux/netfilter/nf_conntrack_common.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_common.h
@@ -20,9 +20,15 @@ enum ip_conntrack_info {
 
         IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,
         IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,
-        IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY,   
-        /* Number of distinct IP_CT types (no NEW in reply dirn). */
-        IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1
+        /* No NEW in reply direction. */
+
+        /* Number of distinct IP_CT types. */
+        IP_CT_NUMBER,
+
+        /* only for userspace compatibility */
+#ifndef __KERNEL__
+        IP_CT_NEW_REPLY = IP_CT_NUMBER,
+#endif
 };
 
 #define NF_CT_STATE_INVALID_BIT                 (1 << 0)
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index be41ffc128b8..eeffde196f80 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -681,6 +681,7 @@ enum nft_exthdr_attributes {
  * @NFT_META_IIFGROUP: packet input interface group
  * @NFT_META_OIFGROUP: packet output interface group
  * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid)
+ * @NFT_META_PRANDOM: a 32bit pseudo-random number
  */
 enum nft_meta_keys {
         NFT_META_LEN,
@@ -707,6 +708,7 @@ enum nft_meta_keys {
         NFT_META_IIFGROUP,
         NFT_META_OIFGROUP,
         NFT_META_CGROUP,
+        NFT_META_PRANDOM,
 };
 
 /**
@@ -949,10 +951,14 @@ enum nft_nat_attributes {
  * enum nft_masq_attributes - nf_tables masquerade expression attributes
  *
  * @NFTA_MASQ_FLAGS: NAT flags (see NF_NAT_RANGE_* in linux/netfilter/nf_nat.h) (NLA_U32)
+ * @NFTA_MASQ_REG_PROTO_MIN: source register of proto range start (NLA_U32: nft_registers)
+ * @NFTA_MASQ_REG_PROTO_MAX: source register of proto range end (NLA_U32: nft_registers)
  */
 enum nft_masq_attributes {
         NFTA_MASQ_UNSPEC,
         NFTA_MASQ_FLAGS,
+        NFTA_MASQ_REG_PROTO_MIN,
+        NFTA_MASQ_REG_PROTO_MAX,
         __NFTA_MASQ_MAX
 };
 #define NFTA_MASQ_MAX           (__NFTA_MASQ_MAX - 1)
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index f095155d8749..0dba4e4ed2be 100644
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -107,8 +107,10 @@ struct nlmsgerr {
 #define NETLINK_PKTINFO                 3
 #define NETLINK_BROADCAST_ERROR         4
 #define NETLINK_NO_ENOBUFS              5
+#ifndef __KERNEL__
 #define NETLINK_RX_RING                 6
 #define NETLINK_TX_RING                 7
+#endif
 #define NETLINK_LISTEN_ALL_NSID         8
 #define NETLINK_LIST_MEMBERSHIPS        9
 #define NETLINK_CAP_ACK                 10
@@ -134,6 +136,7 @@ struct nl_mmap_hdr {
         __u32           nm_gid;
 };
 
+#ifndef __KERNEL__
 enum nl_mmap_status {
         NL_MMAP_STATUS_UNUSED,
         NL_MMAP_STATUS_RESERVED,
@@ -145,6 +148,7 @@ enum nl_mmap_status {
 #define NL_MMAP_MSG_ALIGNMENT           NLMSG_ALIGNTO
 #define NL_MMAP_MSG_ALIGN(sz)           __ALIGN_KERNEL(sz, NL_MMAP_MSG_ALIGNMENT)
 #define NL_MMAP_HDRLEN                  NL_MMAP_MSG_ALIGN(sizeof(struct nl_mmap_hdr))
+#endif
 
 #define NET_MAJOR 36            /* Major 36 is reserved for networking                                          */
 
diff --git a/include/uapi/linux/netlink_diag.h b/include/uapi/linux/netlink_diag.h
index f2159d30d1f5..d79399394b46 100644
--- a/include/uapi/linux/netlink_diag.h
+++ b/include/uapi/linux/netlink_diag.h
@@ -48,6 +48,8 @@ enum {
 
 #define NDIAG_SHOW_MEMINFO      0x00000001 /* show memory info of a socket */
 #define NDIAG_SHOW_GROUPS       0x00000002 /* show groups of a netlink socket */
+#ifndef __KERNEL__
 #define NDIAG_SHOW_RING_CFG     0x00000004 /* show ring configuration */
+#endif
 
 #endif
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 5b7b5ebe7ca8..5a30a7563633 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -1727,6 +1727,8 @@ enum nl80211_commands {
  *      underlying device supports these minimal RRM features:
  *              %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
  *              %NL80211_FEATURE_QUIET,
+ *      Or, if global RRM is supported, see:
+ *              %NL80211_EXT_FEATURE_RRM
  *      If this flag is used, driver must add the Power Capabilities IE to the
  *      association request. In addition, it must also set the RRM capability
  *      flag in the association request's Capability Info field.
@@ -1789,6 +1791,10 @@ enum nl80211_commands {
  *      thus it must not specify the number of iterations, only the interval
  *      between scans. The scan plans are executed sequentially.
  *      Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
+ * @NL80211_ATTR_PBSS: flag attribute. If set it means operate
+ *      in a PBSS. Specified in %NL80211_CMD_CONNECT to request
+ *      connecting to a PCP, and in %NL80211_CMD_START_AP to start
+ *      a PCP instead of AP. Relevant for DMG networks only.
  *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2164,6 +2170,8 @@ enum nl80211_attrs {
         NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
         NL80211_ATTR_SCHED_SCAN_PLANS,
 
+        NL80211_ATTR_PBSS,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -4396,12 +4404,18 @@ 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.
+ * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can
+ *      can request to use RRM (see %NL80211_ATTR_USE_RRM) with
+ *      %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set
+ *      the ASSOC_REQ_USE_RRM flag in the association request even if
+ *      NL80211_FEATURE_QUIET is not advertized.
  *
  * @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,
+        NL80211_EXT_FEATURE_RRM,
 
         /* add new features before the definition below */
         NUM_NL80211_EXT_FEATURES,
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index a27222d5b413..616d04761730 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -454,6 +454,14 @@ struct ovs_key_ct_labels {
 #define OVS_CS_F_REPLY_DIR         0x08 /* Flow is in the reply direction. */
 #define OVS_CS_F_INVALID           0x10 /* Could not track connection. */
 #define OVS_CS_F_TRACKED           0x20 /* Conntrack has occurred. */
+#define OVS_CS_F_SRC_NAT           0x40 /* Packet's source address/port was
+                                         * mangled by NAT.
+                                         */
+#define OVS_CS_F_DST_NAT           0x80 /* Packet's destination address/port
+                                         * was mangled by NAT.
+                                         */
+
+#define OVS_CS_F_NAT_MASK (OVS_CS_F_SRC_NAT | OVS_CS_F_DST_NAT)
 
 /**
  * enum ovs_flow_attr - attributes for %OVS_FLOW_* commands.
@@ -632,6 +640,8 @@ struct ovs_action_hash {
  * mask. For each bit set in the mask, the corresponding bit in the value is
  * copied to the connection tracking label field in the connection.
  * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.
+ * @OVS_CT_ATTR_NAT: Nested OVS_NAT_ATTR_* for performing L3 network address
+ * translation (NAT) on the packet.
  */
 enum ovs_ct_attr {
         OVS_CT_ATTR_UNSPEC,
@@ -641,12 +651,51 @@ enum ovs_ct_attr {
         OVS_CT_ATTR_LABELS,     /* labels to associate with this connection. */
         OVS_CT_ATTR_HELPER,     /* netlink helper to assist detection of
                                    related connections. */
+        OVS_CT_ATTR_NAT,        /* Nested OVS_NAT_ATTR_* */
         __OVS_CT_ATTR_MAX
 };
 
 #define OVS_CT_ATTR_MAX (__OVS_CT_ATTR_MAX - 1)
 
 /**
+ * enum ovs_nat_attr - Attributes for %OVS_CT_ATTR_NAT.
+ *
+ * @OVS_NAT_ATTR_SRC: Flag for Source NAT (mangle source address/port).
+ * @OVS_NAT_ATTR_DST: Flag for Destination NAT (mangle destination
+ * address/port).  Only one of (@OVS_NAT_ATTR_SRC, @OVS_NAT_ATTR_DST) may be
+ * specified.  Effective only for packets for ct_state NEW connections.
+ * Packets of committed connections are mangled by the NAT action according to
+ * the committed NAT type regardless of the flags specified.  As a corollary, a
+ * NAT action without a NAT type flag will only mangle packets of committed
+ * connections.  The following NAT attributes only apply for NEW
+ * (non-committed) connections, and they may be included only when the CT
+ * action has the @OVS_CT_ATTR_COMMIT flag and either @OVS_NAT_ATTR_SRC or
+ * @OVS_NAT_ATTR_DST is also included.
+ * @OVS_NAT_ATTR_IP_MIN: struct in_addr or struct in6_addr
+ * @OVS_NAT_ATTR_IP_MAX: struct in_addr or struct in6_addr
+ * @OVS_NAT_ATTR_PROTO_MIN: u16 L4 protocol specific lower boundary (port)
+ * @OVS_NAT_ATTR_PROTO_MAX: u16 L4 protocol specific upper boundary (port)
+ * @OVS_NAT_ATTR_PERSISTENT: Flag for persistent IP mapping across reboots
+ * @OVS_NAT_ATTR_PROTO_HASH: Flag for pseudo random L4 port mapping (MD5)
+ * @OVS_NAT_ATTR_PROTO_RANDOM: Flag for fully randomized L4 port mapping
+ */
+enum ovs_nat_attr {
+        OVS_NAT_ATTR_UNSPEC,
+        OVS_NAT_ATTR_SRC,
+        OVS_NAT_ATTR_DST,
+        OVS_NAT_ATTR_IP_MIN,
+        OVS_NAT_ATTR_IP_MAX,
+        OVS_NAT_ATTR_PROTO_MIN,
+        OVS_NAT_ATTR_PROTO_MAX,
+        OVS_NAT_ATTR_PERSISTENT,
+        OVS_NAT_ATTR_PROTO_HASH,
+        OVS_NAT_ATTR_PROTO_RANDOM,
+        __OVS_NAT_ATTR_MAX,
+};
+
+#define OVS_NAT_ATTR_MAX (__OVS_NAT_ATTR_MAX - 1)
+
+/**
  * enum ovs_action_attr - Action types.
  *
  * @OVS_ACTION_ATTR_OUTPUT: Output packet to port.
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 439873775d49..c43c5f78b9c4 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -172,6 +172,7 @@ enum {
         TCA_U32_INDEV,
         TCA_U32_PCNT,
         TCA_U32_MARK,
+        TCA_U32_FLAGS,
         __TCA_U32_MAX
 };
 
@@ -416,6 +417,8 @@ enum {
         TCA_FLOWER_KEY_TCP_DST,         /* be16 */
         TCA_FLOWER_KEY_UDP_SRC,         /* be16 */
         TCA_FLOWER_KEY_UDP_DST,         /* be16 */
+
+        TCA_FLOWER_FLAGS,
         __TCA_FLOWER_MAX,
 };
 
diff --git a/include/uapi/linux/rfkill.h b/include/uapi/linux/rfkill.h
index 058757f7a733..2e00dcebebd0 100644
--- a/include/uapi/linux/rfkill.h
+++ b/include/uapi/linux/rfkill.h
@@ -59,6 +59,8 @@ enum rfkill_type {
  * @RFKILL_OP_DEL: a device was removed
  * @RFKILL_OP_CHANGE: a device's state changed -- userspace changes one device
  * @RFKILL_OP_CHANGE_ALL: userspace changes all devices (of a type, or all)
+ *      into a state, also updating the default state used for devices that
+ *      are hot-plugged later.
  */
 enum rfkill_operation {
         RFKILL_OP_ADD = 0,
diff --git a/include/uapi/linux/tc_act/tc_ife.h b/include/uapi/linux/tc_act/tc_ife.h
new file mode 100644
index 000000000000..d648ff66586f
--- /dev/null
+++ b/include/uapi/linux/tc_act/tc_ife.h
@@ -0,0 +1,38 @@
+#ifndef __UAPI_TC_IFE_H
+#define __UAPI_TC_IFE_H
+
+#include <linux/types.h>
+#include <linux/pkt_cls.h>
+
+#define TCA_ACT_IFE 25
+/* Flag bits for now just encoding/decoding; mutually exclusive */
+#define IFE_ENCODE 1
+#define IFE_DECODE 0
+
+struct tc_ife {
+        tc_gen;
+        __u16 flags;
+};
+
+/*XXX: We need to encode the total number of bytes consumed */
+enum {
+        TCA_IFE_UNSPEC,
+        TCA_IFE_PARMS,
+        TCA_IFE_TM,
+        TCA_IFE_DMAC,
+        TCA_IFE_SMAC,
+        TCA_IFE_TYPE,
+        TCA_IFE_METALST,
+        __TCA_IFE_MAX
+};
+#define TCA_IFE_MAX (__TCA_IFE_MAX - 1)
+
+#define IFE_META_SKBMARK 1
+#define IFE_META_HASHID 2
+#define IFE_META_PRIO 3
+#define IFE_META_QMAP 4
+/*Can be overridden at runtime by module option*/
+#define __IFE_META_MAX 5
+#define IFE_META_MAX (__IFE_META_MAX - 1)
+
+#endif
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 65a77b071e22..53e8e3fe6b1b 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -196,6 +196,11 @@ struct tcp_info {
         __u64   tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
         __u32   tcpi_segs_out;       /* RFC4898 tcpEStatsPerfSegsOut */
         __u32   tcpi_segs_in;        /* RFC4898 tcpEStatsPerfSegsIn */
+
+        __u32   tcpi_notsent_bytes;
+        __u32   tcpi_min_rtt;
+        __u32   tcpi_data_segs_in;      /* RFC4898 tcpEStatsDataSegsIn */
+        __u32   tcpi_data_segs_out;     /* RFC4898 tcpEStatsDataSegsOut */
 };
 
 /* for TCP_MD5SIG socket option */