20 files changed, 356 insertions, 118 deletions
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index 65a2562f66b4..6bb43382f3f3 100644
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -67,6 +67,17 @@ struct ieee_ets {
        __u8    reco_prio_tc[IEEE_8021QAZ_MAX_TCS];
 };
+/* This structure contains rate limit extension to the IEEE 802.1Qaz ETS
+ * managed object.
+ * Values are 64 bits long and specified in Kbps to enable usage over both
+ * slow and very fast networks.
+ *
+ * @tc_maxrate: maximal tc tx bandwidth indexed by traffic class
+ */
+struct ieee_maxrate {
+        __u64   tc_maxrate[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
@@ -321,6 +332,7 @@ enum ieee_attrs {
        DCB_ATTR_IEEE_PEER_ETS,
        DCB_ATTR_IEEE_PEER_PFC,
        DCB_ATTR_IEEE_PEER_APP,
+        DCB_ATTR_IEEE_MAXRATE,
        __DCB_ATTR_IEEE_MAX
 };
 #define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index f5647b59a90e..89d68d837b6e 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -726,6 +726,29 @@ struct ethtool_sfeatures {
        struct ethtool_set_features_block features[0];
 };
+/**
+ * struct ethtool_ts_info - holds a device's timestamping and PHC association
+ * @cmd: command number = %ETHTOOL_GET_TS_INFO
+ * @so_timestamping: bit mask of the sum of the supported SO_TIMESTAMPING flags
+ * @phc_index: device index of the associated PHC, or -1 if there is none
+ * @tx_types: bit mask of the supported hwtstamp_tx_types enumeration values
+ * @rx_filters: bit mask of the supported hwtstamp_rx_filters enumeration values
+ *
+ * The bits in the 'tx_types' and 'rx_filters' fields correspond to
+ * the 'hwtstamp_tx_types' and 'hwtstamp_rx_filters' enumeration values,
+ * respectively.  For example, if the device supports HWTSTAMP_TX_ON,
+ * then (1 << HWTSTAMP_TX_ON) in 'tx_types' will be set.
+ */
+struct ethtool_ts_info {
+        __u32   cmd;
+        __u32   so_timestamping;
+        __s32   phc_index;
+        __u32   tx_types;
+        __u32   tx_reserved[3];
+        __u32   rx_filters;
+        __u32   rx_reserved[3];
+};
 /*
 * %ETHTOOL_SFEATURES changes features present in features[].valid to the
 * values of corresponding bits in features[].requested. Bits in .requested
@@ -788,6 +811,7 @@ struct net_device;
 /* Some generic methods drivers may use in their ethtool_ops */
 u32 ethtool_op_get_link(struct net_device *dev);
+int ethtool_op_get_ts_info(struct net_device *dev, struct ethtool_ts_info *eti);
 /**
 * ethtool_rxfh_indir_default - get default value for RX flow hash indirection
@@ -893,6 +917,9 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
 *                 and flag of the device.
 * @get_dump_data: Get dump data.
 * @set_dump: Set dump specific flags to the device.
+ * @get_ts_info: Get the time stamping and PTP hardware clock capabilities.
+ *      Drivers supporting transmit time stamps in software should set this to
+ *      ethtool_op_get_ts_info().
 *
 * All operations are optional (i.e. the function pointer may be set
 * to %NULL) and callers must take this into account.  Callers must
@@ -954,6 +981,7 @@ struct ethtool_ops {
        int     (*get_dump_data)(struct net_device *,
                                 struct ethtool_dump *, void *);
        int     (*set_dump)(struct net_device *, struct ethtool_dump *);
+        int     (*get_ts_info)(struct net_device *, struct ethtool_ts_info *);
 };
 #endif /* __KERNEL__ */
@@ -1028,6 +1056,7 @@ struct ethtool_ops {
 #define ETHTOOL_SET_DUMP        0x0000003e /* Set dump settings */
 #define ETHTOOL_GET_DUMP_FLAG   0x0000003f /* Get dump settings */
 #define ETHTOOL_GET_DUMP_DATA   0x00000040 /* Get dump data */
+#define ETHTOOL_GET_TS_INFO     0x00000041 /* Get time stamping and PHC info */
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 8eeb205f298b..72090994d789 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -126,7 +126,8 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_HATYPE   28
 #define SKF_AD_RXHASH   32
 #define SKF_AD_CPU      36
-#define SKF_AD_MAX      40
+#define SKF_AD_ALU_XOR_X        40
+#define SKF_AD_MAX      44
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
@@ -153,6 +154,9 @@ static inline unsigned int sk_filter_len(const struct sk_filter *fp)
 extern int sk_filter(struct sock *sk, struct sk_buff *skb);
 extern unsigned int sk_run_filter(const struct sk_buff *skb,
                                  const struct sock_filter *filter);
+extern int sk_unattached_filter_create(struct sk_filter **pfp,
+                                       struct sock_fprog *fprog);
+extern void sk_unattached_filter_destroy(struct sk_filter *fp);
 extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
 extern int sk_detach_filter(struct sock *sk);
 extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
@@ -228,6 +232,7 @@ enum {
        BPF_S_ANC_HATYPE,
        BPF_S_ANC_RXHASH,
        BPF_S_ANC_CPU,
+        BPF_S_ANC_ALU_XOR_X,
 };
 #endif /* __KERNEL__ */
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 5852545e6bba..6af8738ae7e9 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -274,6 +274,33 @@ struct hv_ring_buffer_debug_info {
        u32 bytes_avail_towrite;
 };
+/*
+ *
+ * hv_get_ringbuffer_availbytes()
+ *
+ * Get number of bytes available to read and to write to
+ * for the specified ring buffer
+ */
+static inline void
+hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
+                          u32 *read, u32 *write)
+{
+        u32 read_loc, write_loc, dsize;
+        smp_read_barrier_depends();
+        /* Capture the read/write indices before they changed */
+        read_loc = rbi->ring_buffer->read_index;
+        write_loc = rbi->ring_buffer->write_index;
+        dsize = rbi->ring_datasize;
+        *write = write_loc >= read_loc ? dsize - (write_loc - read_loc) :
+                read_loc - write_loc;
+        *read = dsize - *write;
+}
 /*
 * We use the same version numbering for all Hyper-V modules.
 *
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 4b24ff453aee..2f4fa93454c7 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -138,6 +138,8 @@ enum {
        IFLA_GROUP,             /* Group the device belongs to */
        IFLA_NET_NS_FD,
        IFLA_EXT_MASK,          /* Extended info mask, VFs, etc */
+        IFLA_PROMISCUITY,       /* Promiscuity count: > 0 means acts PROMISC */
+#define IFLA_PROMISCUITY IFLA_PROMISCUITY
        __IFLA_MAX
 };
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 58404b0c5010..5fd5ab171165 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -33,6 +33,24 @@ struct team_port {
        struct team *team;
        int index;
+        bool linkup; /* either state.linkup or user.linkup */
+        struct {
+                bool linkup;
+                u32 speed;
+                u8 duplex;
+        } state;
+        /* Values set by userspace */
+        struct {
+                bool linkup;
+                bool linkup_enabled;
+        } user;
+        /* Custom gennetlink interface related flags */
+        bool changed;
+        bool removed;
        /*
         * A place for storing original values of the device before it
         * become a port.
@@ -42,14 +60,6 @@ struct team_port {
                unsigned int mtu;
        } orig;
-        bool linkup;
-        u32 speed;
-        u8 duplex;
-        /* Custom gennetlink interface related flags */
-        bool changed;
-        bool removed;
        struct rcu_head rcu;
 };
@@ -68,18 +78,30 @@ struct team_mode_ops {
 enum team_option_type {
        TEAM_OPTION_TYPE_U32,
        TEAM_OPTION_TYPE_STRING,
+        TEAM_OPTION_TYPE_BINARY,
+        TEAM_OPTION_TYPE_BOOL,
+};
+struct team_gsetter_ctx {
+        union {
+                u32 u32_val;
+                const char *str_val;
+                struct {
+                        const void *ptr;
+                        u32 len;
+                } bin_val;
+                bool bool_val;
+        } data;
+        struct team_port *port;
 };
 struct team_option {
        struct list_head list;
        const char *name;
+        bool per_port;
        enum team_option_type type;
-        int (*getter)(struct team *team, void *arg);
+        int (*getter)(struct team *team, struct team_gsetter_ctx *ctx);
-        int (*setter)(struct team *team, void *arg);
+        int (*setter)(struct team *team, struct team_gsetter_ctx *ctx);
-        /* Custom gennetlink interface related flags */
-        bool changed;
-        bool removed;
 };
 struct team_mode {
@@ -110,6 +132,7 @@ struct team {
        struct list_head port_list;
        struct list_head option_list;
+        struct list_head option_inst_list; /* list of option instances */
        const struct team_mode *mode;
        struct team_mode_ops ops;
@@ -216,6 +239,7 @@ enum {
        TEAM_ATTR_OPTION_TYPE,          /* u8 */
        TEAM_ATTR_OPTION_DATA,          /* dynamic */
        TEAM_ATTR_OPTION_REMOVED,       /* flag */
+        TEAM_ATTR_OPTION_PORT_IFINDEX,  /* u32 */ /* for per-port options */
        __TEAM_ATTR_OPTION_MAX,
        TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 9958ff2cad3c..1f3860a8a109 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -150,6 +150,10 @@ enum {
        /* statistics commands */
        MLX4_CMD_QUERY_IF_STAT   = 0X54,
        MLX4_CMD_SET_IF_STAT     = 0X55,
+        /* set port opcode modifiers */
+        MLX4_SET_PORT_PRIO2TC = 0x8,
+        MLX4_SET_PORT_SCHEDULER  = 0x9,
 };
 enum {
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 834c96c5d879..6d028247f79d 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -628,6 +628,9 @@ int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
                          u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
 int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
                           u8 promisc);
+int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
+int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
+                u8 *pg, u16 *ratelimit);
 int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
 int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
 void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index);
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 091f9e7dc8b9..96005d75893c 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -139,7 +139,8 @@ struct mlx4_qp_path {
        u8                      rgid[16];
        u8                      sched_queue;
        u8                      vlan_index;
-        u8                      reserved3[2];
+        u8                      feup;
+        u8                      reserved3;
        u8                      reserved4[2];
        u8                      dmac[6];
 };
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 2f8e18a23227..d6d549cf1f23 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -411,26 +411,32 @@ ip_set_get_h16(const struct nlattr *attr)
 #define ipset_nest_start(skb, attr) nla_nest_start(skb, attr | NLA_F_NESTED)
 #define ipset_nest_end(skb, start)  nla_nest_end(skb, start)
-#define NLA_PUT_IPADDR4(skb, type, ipaddr)                      \
+static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr)
-do {                                                            \
+{
-        struct nlattr *__nested = ipset_nest_start(skb, type);  \
+        struct nlattr *__nested = ipset_nest_start(skb, type);
-                                                                \
+        int ret;
-        if (!__nested)                                          \
-                goto nla_put_failure;                           \
+        if (!__nested)
-        NLA_PUT_NET32(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);     \
+                return -EMSGSIZE;
-        ipset_nest_end(skb, __nested);                          \
+        ret = nla_put_net32(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);
-} while (0)
+        if (!ret)
+                ipset_nest_end(skb, __nested);
-#define NLA_PUT_IPADDR6(skb, type, ipaddrptr)                   \
+        return ret;
-do {                                                            \
+}
-        struct nlattr *__nested = ipset_nest_start(skb, type);  \
-                                                                \
+static inline int nla_put_ipaddr6(struct sk_buff *skb, int type, const struct in6_addr *ipaddrptr)
-        if (!__nested)                                          \
+{
-                goto nla_put_failure;                           \
+        struct nlattr *__nested = ipset_nest_start(skb, type);
-        NLA_PUT(skb, IPSET_ATTR_IPADDR_IPV6,                    \
+        int ret;
-                sizeof(struct in6_addr), ipaddrptr);            \
-        ipset_nest_end(skb, __nested);                          \
+        if (!__nested)
-} while (0)
+                return -EMSGSIZE;
+        ret = nla_put(skb, IPSET_ATTR_IPADDR_IPV6,
+                      sizeof(struct in6_addr), ipaddrptr);
+        if (!ret)
+                ipset_nest_end(skb, __nested);
+        return ret;
+}
 /* Get address from skbuff */
 static inline __be32
diff --git a/include/linux/netfilter/ipset/ip_set_ahash.h b/include/linux/netfilter/ipset/ip_set_ahash.h
index 05a5d72680be..289b62d9dd1f 100644
--- a/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -594,17 +594,20 @@ type_pf_head(struct ip_set *set, struct sk_buff *skb)
        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
        if (!nested)
                goto nla_put_failure;
-        NLA_PUT_NET32(skb, IPSET_ATTR_HASHSIZE,
+        if (nla_put_net32(skb, IPSET_ATTR_HASHSIZE,
-                      htonl(jhash_size(h->table->htable_bits)));
+                          htonl(jhash_size(h->table->htable_bits))) ||
-        NLA_PUT_NET32(skb, IPSET_ATTR_MAXELEM, htonl(h->maxelem));
+            nla_put_net32(skb, IPSET_ATTR_MAXELEM, htonl(h->maxelem)))
+                goto nla_put_failure;
 #ifdef IP_SET_HASH_WITH_NETMASK
-        if (h->netmask != HOST_MASK)
+        if (h->netmask != HOST_MASK &&
-                NLA_PUT_U8(skb, IPSET_ATTR_NETMASK, h->netmask);
+            nla_put_u8(skb, IPSET_ATTR_NETMASK, h->netmask))
+                goto nla_put_failure;
 #endif
-        NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1));
+        if (nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1)) ||
-        NLA_PUT_NET32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize));
+            nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize)) ||
-        if (with_timeout(h->timeout))
+            (with_timeout(h->timeout) &&
-                NLA_PUT_NET32(skb, IPSET_ATTR_TIMEOUT, htonl(h->timeout));
+             nla_put_net32(skb, IPSET_ATTR_TIMEOUT, htonl(h->timeout))))
+                goto nla_put_failure;
        ipset_nest_end(skb, nested);
        return 0;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 6fe0a37d4abf..f092032f1c98 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -412,6 +412,9 @@ struct phy_driver {
        /* Clears up any memory if needed */
        void (*remove)(struct phy_device *phydev);
+        /* Handles ethtool queries for hardware time stamping. */
+        int (*ts_info)(struct phy_device *phydev, struct ethtool_ts_info *ti);
        /* Handles SIOCSHWTSTAMP ioctl for hardware time stamping. */
        int  (*hwtstamp)(struct phy_device *phydev, struct ifreq *ifr);
diff --git a/include/linux/platform_data/wiznet.h b/include/linux/platform_data/wiznet.h
new file mode 100644
index 000000000000..b5d8c192d84d
--- /dev/null
+++ b/include/linux/platform_data/wiznet.h
@@ -0,0 +1,24 @@
+/*
+ * Ethernet driver for the WIZnet W5x00 chip.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef PLATFORM_DATA_WIZNET_H
+#define PLATFORM_DATA_WIZNET_H
+#include <linux/if_ether.h>
+struct wiznet_platform_data {
+        int     link_gpio;
+        u8      mac_addr[ETH_ALEN];
+};
+#ifndef CONFIG_WIZNET_BUS_SHIFT
+#define CONFIG_WIZNET_BUS_SHIFT 0
+#endif
+#define W5100_BUS_DIRECT_SIZE   (0x8000 << CONFIG_WIZNET_BUS_SHIFT)
+#define W5300_BUS_DIRECT_SIZE   (0x0400 << CONFIG_WIZNET_BUS_SHIFT)
+#endif /* PLATFORM_DATA_WIZNET_H */
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h
index dd2e44fba63e..945704c2ed65 100644
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@ -136,4 +136,12 @@ struct ptp_clock_event {
 extern void ptp_clock_event(struct ptp_clock *ptp,
                            struct ptp_clock_event *event);
+/**
+ * ptp_clock_index() - obtain the device index of a PTP clock
+ *
+ * @ptp:    The clock obtained from ptp_clock_register().
+ */
+extern int ptp_clock_index(struct ptp_clock *ptp);
 #endif
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 0dddc9e42b6b..cf6403186359 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -28,6 +28,51 @@
 #include <linux/platform_device.h>
+#define STMMAC_RX_COE_NONE      0
+#define STMMAC_RX_COE_TYPE1     1
+#define STMMAC_RX_COE_TYPE2     2
+/* Define the macros for CSR clock range parameters to be passed by
+ * platform code.
+ * This could also be configured at run time using CPU freq framework. */
+/* MDC Clock Selection define*/
+#define STMMAC_CSR_60_100M      0x0     /* MDC = clk_scr_i/42 */
+#define STMMAC_CSR_100_150M     0x1     /* MDC = clk_scr_i/62 */
+#define STMMAC_CSR_20_35M       0x2     /* MDC = clk_scr_i/16 */
+#define STMMAC_CSR_35_60M       0x3     /* MDC = clk_scr_i/26 */
+#define STMMAC_CSR_150_250M     0x4     /* MDC = clk_scr_i/102 */
+#define STMMAC_CSR_250_300M     0x5     /* MDC = clk_scr_i/122 */
+/* The MDC clock could be set higher than the IEEE 802.3
+ * specified frequency limit 0f 2.5 MHz, by programming a clock divider
+ * of value different than the above defined values. The resultant MDIO
+ * clock frequency of 12.5 MHz is applicable for the interfacing chips
+ * supporting higher MDC clocks.
+ * The MDC clock selection macros need to be defined for MDC clock rate
+ * of 12.5 MHz, corresponding to the following selection.
+ */
+#define STMMAC_CSR_I_4          0x8     /* clk_csr_i/4 */
+#define STMMAC_CSR_I_6          0x9     /* clk_csr_i/6 */
+#define STMMAC_CSR_I_8          0xA     /* clk_csr_i/8 */
+#define STMMAC_CSR_I_10         0xB     /* clk_csr_i/10 */
+#define STMMAC_CSR_I_12         0xC     /* clk_csr_i/12 */
+#define STMMAC_CSR_I_14         0xD     /* clk_csr_i/14 */
+#define STMMAC_CSR_I_16         0xE     /* clk_csr_i/16 */
+#define STMMAC_CSR_I_18         0xF     /* clk_csr_i/18 */
+/* AXI DMA Burst length suported */
+#define DMA_AXI_BLEN_4          (1 << 1)
+#define DMA_AXI_BLEN_8          (1 << 2)
+#define DMA_AXI_BLEN_16         (1 << 3)
+#define DMA_AXI_BLEN_32         (1 << 4)
+#define DMA_AXI_BLEN_64         (1 << 5)
+#define DMA_AXI_BLEN_128        (1 << 6)
+#define DMA_AXI_BLEN_256        (1 << 7)
+#define DMA_AXI_BLEN_ALL (DMA_AXI_BLEN_4 | DMA_AXI_BLEN_8 | DMA_AXI_BLEN_16 \
+                        | DMA_AXI_BLEN_32 | DMA_AXI_BLEN_64 \
+                        | DMA_AXI_BLEN_128 | DMA_AXI_BLEN_256)
 /* Platfrom data for platform device structure's platform_data field */
 struct stmmac_mdio_bus_data {
@@ -38,16 +83,24 @@ struct stmmac_mdio_bus_data {
        int probed_phy_irq;
 };
+struct stmmac_dma_cfg {
+        int pbl;
+        int fixed_burst;
+        int burst_len;
+};
 struct plat_stmmacenet_data {
+        char *phy_bus_name;
        int bus_id;
        int phy_addr;
        int interface;
        struct stmmac_mdio_bus_data *mdio_bus_data;
-        int pbl;
+        struct stmmac_dma_cfg *dma_cfg;
        int clk_csr;
        int has_gmac;
        int enh_desc;
        int tx_coe;
+        int rx_coe;
        int bugged_jumbo;
        int pmt;
        int force_sf_dma_mode;
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
index f55c980d8e23..fc5d5dcebb00 100644
--- a/include/net/dcbnl.h
+++ b/include/net/dcbnl.h
@@ -48,6 +48,8 @@ struct dcbnl_rtnl_ops {
        /* IEEE 802.1Qaz std */
        int (*ieee_getets) (struct net_device *, struct ieee_ets *);
        int (*ieee_setets) (struct net_device *, struct ieee_ets *);
+        int (*ieee_getmaxrate) (struct net_device *, struct ieee_maxrate *);
+        int (*ieee_setmaxrate) (struct net_device *, struct ieee_maxrate *);
        int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *);
        int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *);
        int (*ieee_getapp) (struct net_device *, struct dcb_app *);
diff --git a/include/net/icmp.h b/include/net/icmp.h
index 75d615649071..ce70a581d95c 100644
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -41,7 +41,6 @@ struct net;
 extern void     icmp_send(struct sk_buff *skb_in,  int type, int code, __be32 info);
 extern int      icmp_rcv(struct sk_buff *skb);
-extern int      icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int      icmp_init(void);
 extern void     icmp_out_count(struct net *net, unsigned char type);
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 6f9c25a76cd1..c02b6ad3f6c5 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -34,6 +34,7 @@ enum {
        __ND_OPT_ARRAY_MAX,
        ND_OPT_ROUTE_INFO = 24,         /* RFC4191 */
        ND_OPT_RDNSS = 25,              /* RFC5006 */
+        ND_OPT_DNSSL = 31,              /* RFC6106 */
        __ND_OPT_MAX
 };
diff --git a/include/net/netlink.h b/include/net/netlink.h
index f394fe5d7641..785f37a3b44e 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -102,20 +102,6 @@
 *   nla_put_flag(skb, type)            add flag attribute to skb
 *   nla_put_msecs(skb, type, jiffies)  add msecs attribute to skb
 *
- * Exceptions Based Attribute Construction:
- *   NLA_PUT(skb, type, len, data)      add attribute to skb
- *   NLA_PUT_U8(skb, type, value)       add u8 attribute to skb
- *   NLA_PUT_U16(skb, type, value)      add u16 attribute to skb
- *   NLA_PUT_U32(skb, type, value)      add u32 attribute to skb
- *   NLA_PUT_U64(skb, type, value)      add u64 attribute to skb
- *   NLA_PUT_STRING(skb, type, str)     add string attribute to skb
- *   NLA_PUT_FLAG(skb, type)            add flag attribute to skb
- *   NLA_PUT_MSECS(skb, type, jiffies)  add msecs attribute to skb
- *
- *   The meaning of these functions is equal to their lower case
- *   variants but they jump to the label nla_put_failure in case
- *   of a failure.
- *
 * Nested Attributes Construction:
 *   nla_nest_start(skb, type)          start a nested attribute
 *   nla_nest_end(skb, nla)             finalize a nested attribute
@@ -772,6 +758,39 @@ static inline int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value)
 }
 /**
+ * nla_put_be16 - Add a __be16 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value)
+{
+        return nla_put(skb, attrtype, sizeof(__be16), &value);
+}
+/**
+ * nla_put_net16 - Add 16-bit network byte order netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value)
+{
+        return nla_put_be16(skb, attrtype | NLA_F_NET_BYTEORDER, value);
+}
+/**
+ * nla_put_le16 - Add a __le16 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value)
+{
+        return nla_put(skb, attrtype, sizeof(__le16), &value);
+}
+/**
 * nla_put_u32 - Add a u32 netlink attribute to a socket buffer
 * @skb: socket buffer to add attribute to
 * @attrtype: attribute type
@@ -783,7 +802,40 @@ static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value)
 }
 /**
- * nla_put_64 - Add a u64 netlink attribute to a socket buffer
+ * nla_put_be32 - Add a __be32 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value)
+{
+        return nla_put(skb, attrtype, sizeof(__be32), &value);
+}
+/**
+ * nla_put_net32 - Add 32-bit network byte order netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value)
+{
+        return nla_put_be32(skb, attrtype | NLA_F_NET_BYTEORDER, value);
+}
+/**
+ * nla_put_le32 - Add a __le32 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value)
+{
+        return nla_put(skb, attrtype, sizeof(__le32), &value);
+}
+/**
+ * nla_put_u64 - Add a u64 netlink attribute to a socket buffer
 * @skb: socket buffer to add attribute to
 * @attrtype: attribute type
 * @value: numeric value
@@ -794,6 +846,39 @@ static inline int nla_put_u64(struct sk_buff *skb, int attrtype, u64 value)
 }
 /**
+ * nla_put_be64 - Add a __be64 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value)
+{
+        return nla_put(skb, attrtype, sizeof(__be64), &value);
+}
+/**
+ * nla_put_net64 - Add 64-bit network byte order netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value)
+{
+        return nla_put_be64(skb, attrtype | NLA_F_NET_BYTEORDER, value);
+}
+/**
+ * nla_put_le64 - Add a __le64 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value)
+{
+        return nla_put(skb, attrtype, sizeof(__le64), &value);
+}
+/**
 * nla_put_string - Add a string netlink attribute to a socket buffer
 * @skb: socket buffer to add attribute to
 * @attrtype: attribute type
@@ -828,60 +913,6 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
        return nla_put(skb, attrtype, sizeof(u64), &tmp);
 }
-#define NLA_PUT(skb, attrtype, attrlen, data) \
-        do { \
-                if (unlikely(nla_put(skb, attrtype, attrlen, data) < 0)) \
-                        goto nla_put_failure; \
-        } while(0)
-#define NLA_PUT_TYPE(skb, type, attrtype, value) \
-        do { \
-                type __tmp = value; \
-                NLA_PUT(skb, attrtype, sizeof(type), &__tmp); \
-        } while(0)
-#define NLA_PUT_U8(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u8, attrtype, value)
-#define NLA_PUT_U16(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u16, attrtype, value)
-#define NLA_PUT_LE16(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __le16, attrtype, value)
-#define NLA_PUT_BE16(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __be16, attrtype, value)
-#define NLA_PUT_NET16(skb, attrtype, value) \
-        NLA_PUT_BE16(skb, attrtype | NLA_F_NET_BYTEORDER, value)
-#define NLA_PUT_U32(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u32, attrtype, value)
-#define NLA_PUT_BE32(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __be32, attrtype, value)
-#define NLA_PUT_NET32(skb, attrtype, value) \
-        NLA_PUT_BE32(skb, attrtype | NLA_F_NET_BYTEORDER, value)
-#define NLA_PUT_U64(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u64, attrtype, value)
-#define NLA_PUT_BE64(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __be64, attrtype, value)
-#define NLA_PUT_NET64(skb, attrtype, value) \
-        NLA_PUT_BE64(skb, attrtype | NLA_F_NET_BYTEORDER, value)
-#define NLA_PUT_STRING(skb, attrtype, value) \
-        NLA_PUT(skb, attrtype, strlen(value) + 1, value)
-#define NLA_PUT_FLAG(skb, attrtype) \
-        NLA_PUT(skb, attrtype, 0, NULL)
-#define NLA_PUT_MSECS(skb, attrtype, jiffies) \
-        NLA_PUT_U64(skb, attrtype, jiffies_to_msecs(jiffies))
 /**
 * nla_get_u32 - return payload of u32 attribute
 * @nla: u32 netlink attribute
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 96239e78e621..1cb32bf107de 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1682,8 +1682,9 @@ static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)
 static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m)
 {
-        if (m->m | m->v)
+        if ((m->m | m->v) &&
-                NLA_PUT(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m);
+            nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m))
+                goto nla_put_failure;
        return 0;
 nla_put_failure: