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
  ...

76 files changed, 440 insertions, 205 deletions

diff --git a/arch/alpha/include/asm/checksum.h b/arch/alpha/include/asm/checksum.h
index d3854bbf0a9e..f2bbdd2ace51 100644
--- a/arch/alpha/include/asm/checksum.h
+++ b/arch/alpha/include/asm/checksum.h
@@ -13,14 +13,11 @@ extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented
  */
-extern __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                           unsigned short len,
-                                           unsigned short proto,
-                                           __wsum sum);
+__sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+                          __u32 len, __u8 proto, __wsum sum);
 
 __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                unsigned short len, unsigned short proto,
-                                __wsum sum);
+                          __u32 len, __u8 proto, __wsum sum);
 
 /*
  * computes the checksum of a memory block at buff, length len,
@@ -70,6 +67,5 @@ static inline __sum16 csum_fold(__wsum csum)
 #define _HAVE_ARCH_IPV6_CSUM
 extern __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                const struct in6_addr *daddr,
-                               __u32 len, unsigned short proto,
-                               __wsum sum);
+                               __u32 len, __u8 proto, __wsum sum);
 #endif
diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h
index c5fb9e6bc3a5..9e46d6e656d9 100644
--- a/arch/alpha/include/uapi/asm/socket.h
+++ b/arch/alpha/include/uapi/asm/socket.h
@@ -95,4 +95,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index 199f6efa83fa..377f9e34eb97 100644
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -42,9 +42,7 @@ static inline unsigned short from64to16(unsigned long x)
  * returns a 16-bit checksum, already complemented.
  */
 __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                   unsigned short len,
-                                   unsigned short proto,
-                                   __wsum sum)
+                          __u32 len, __u8 proto, __wsum sum)
 {
         return (__force __sum16)~from64to16(
                 (__force u64)saddr + (__force u64)daddr +
@@ -52,9 +50,7 @@ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
 }
 
 __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                   unsigned short len,
-                                   unsigned short proto,
-                                   __wsum sum)
+                          __u32 len, __u8 proto, __wsum sum)
 {
         unsigned long result;
 
diff --git a/arch/arc/include/asm/checksum.h b/arch/arc/include/asm/checksum.h
index 10957298b7a3..913eb4aab05b 100644
--- a/arch/arc/include/asm/checksum.h
+++ b/arch/arc/include/asm/checksum.h
@@ -70,8 +70,8 @@ ip_fast_csum(const void *iph, unsigned int ihl)
  * SA [4], DA [4], zeroes [1], Proto[1], TCP Seg(hdr+data) Len [2]
  */
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         __asm__ __volatile__(
         "       add.f %0, %0, %1        \n"
diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index acd5b1519edb..5f9451be21ff 100644
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -61,7 +61,8 @@
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
                           MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
-                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
+                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                 internal-regs {
                         spi1: spi@10680 {
@@ -138,12 +139,18 @@
                                 status = "okay";
                                 phy = <&phy2>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <1>;
+                                bm,pool-short = <3>;
                         };
 
                         ethernet@34000 {
                                 status = "okay";
                                 phy = <&phy1>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <2>;
+                                bm,pool-short = <3>;
                         };
 
                         ethernet@70000 {
@@ -157,6 +164,13 @@
                                 status = "okay";
                                 phy = <&phy0>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <0>;
+                                bm,pool-short = <3>;
+                        };
+
+                        bm@c8000 {
+                                status = "okay";
                         };
 
                         nfc: flash@d0000 {
@@ -178,6 +192,10 @@
                         };
                 };
 
+                bm-bppi {
+                        status = "okay";
+                };
+
                 pcie-controller {
                         status = "okay";
 
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index c6e180eb3b11..c60206efb583 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -78,6 +78,9 @@
                 internal-regs {
                         ethernet@30000 {
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <2>;
+                                bm,pool-short = <1>;
                                 status = "okay";
 
                                 fixed-link {
@@ -88,6 +91,9 @@
 
                         ethernet@34000 {
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <3>;
+                                bm,pool-short = <1>;
                                 status = "okay";
 
                                 fixed-link {
diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts
index ff47af57f091..ea93ed727030 100644
--- a/arch/arm/boot/dts/armada-388-db.dts
+++ b/arch/arm/boot/dts/armada-388-db.dts
@@ -66,7 +66,8 @@
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
                           MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
-                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
+                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                 internal-regs {
                         spi@10600 {
@@ -99,6 +100,9 @@
                                 status = "okay";
                                 phy = <&phy1>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <2>;
+                                bm,pool-short = <3>;
                         };
 
                         usb@58000 {
@@ -109,6 +113,9 @@
                                 status = "okay";
                                 phy = <&phy0>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <0>;
+                                bm,pool-short = <1>;
                         };
 
                         mdio@72004 {
@@ -129,6 +136,10 @@
                                 status = "okay";
                         };
 
+                        bm@c8000 {
+                                status = "okay";
+                        };
+
                         flash@d0000 {
                                 status = "okay";
                                 num-cs = <1>;
@@ -169,6 +180,10 @@
                         };
                 };
 
+                bm-bppi {
+                        status = "okay";
+                };
+
                 pcie-controller {
                         status = "okay";
                         /*
diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts
index cd316021d6ce..466b01eb1038 100644
--- a/arch/arm/boot/dts/armada-388-gp.dts
+++ b/arch/arm/boot/dts/armada-388-gp.dts
@@ -60,7 +60,8 @@
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
                           MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
-                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
+                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                 internal-regs {
                         spi@10600 {
@@ -133,6 +134,9 @@
                                 status = "okay";
                                 phy = <&phy1>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <2>;
+                                bm,pool-short = <3>;
                         };
 
                         /* CON4 */
@@ -152,6 +156,9 @@
                                 status = "okay";
                                 phy = <&phy0>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <0>;
+                                bm,pool-short = <1>;
                         };
 
 
@@ -186,6 +193,10 @@
                                 };
                         };
 
+                        bm@c8000 {
+                                status = "okay";
+                        };
+
                         sata@e0000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&sata2_pins>, <&sata3_pins>;
@@ -240,6 +251,10 @@
                         };
                 };
 
+                bm-bppi {
+                        status = "okay";
+                };
+
                 pcie-controller {
                         status = "okay";
                         /*
diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
index 3f792a563c05..8c9842237b60 100644
--- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
@@ -58,7 +58,8 @@
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
                           MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
-                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
+                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                 internal-regs {
                         ethernet@70000 {
@@ -66,6 +67,9 @@
                                 pinctrl-names = "default";
                                 phy = <&phy_dedicated>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <0>;
+                                bm,pool-short = <1>;
                                 status = "okay";
                         };
 
@@ -110,6 +114,15 @@
                                 pinctrl-names = "default";
                                 status = "okay";
                         };
+
+                        bm@c8000 {
+                                status = "okay";
+                        };
                 };
+
+                bm-bppi {
+                        status = "okay";
+                };
+
         };
 };
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index e8b7f6726772..066a8f06405c 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -540,6 +540,14 @@
                                 status = "disabled";
                         };
 
+                        bm: bm@c8000 {
+                                compatible = "marvell,armada-380-neta-bm";
+                                reg = <0xc8000 0xac>;
+                                clocks = <&gateclk 13>;
+                                internal-mem = <&bm_bppi>;
+                                status = "disabled";
+                        };
+
                         sata@e0000 {
                                 compatible = "marvell,armada-380-ahci";
                                 reg = <0xe0000 0x2000>;
@@ -618,6 +626,17 @@
                         #size-cells = <1>;
                         ranges = <0 MBUS_ID(0x09, 0x15) 0 0x800>;
                 };
+
+                bm_bppi: bm-bppi {
+                        compatible = "mmio-sram";
+                        reg = <MBUS_ID(0x0c, 0x04) 0 0x100000>;
+                        ranges = <0 MBUS_ID(0x0c, 0x04) 0 0x100000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clocks = <&gateclk 13>;
+                        no-memory-wc;
+                        status = "disabled";
+                };
         };
 
         clocks {
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index ebe1d267406d..cca366590561 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -77,7 +77,8 @@
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                           MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
                           MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+                          MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
 
                 devbus-bootcs {
                         status = "okay";
@@ -181,21 +182,33 @@
                                 status = "okay";
                                 phy = <&phy0>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <0>;
                         };
                         ethernet@74000 {
                                 status = "okay";
                                 phy = <&phy1>;
                                 phy-mode = "rgmii-id";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <1>;
                         };
                         ethernet@30000 {
                                 status = "okay";
                                 phy = <&phy2>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <2>;
                         };
                         ethernet@34000 {
                                 status = "okay";
                                 phy = <&phy3>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <3>;
+                        };
+
+                        bm@c0000 {
+                                status = "okay";
                         };
 
                         mvsdio@d4000 {
@@ -230,5 +243,9 @@
                                 };
                         };
                 };
+
+                bm-bppi {
+                        status = "okay";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 5730b875c4f5..061f4237760e 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -96,7 +96,8 @@
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                           MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
                           MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+                          MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
 
                 devbus-bootcs {
                         status = "okay";
@@ -196,21 +197,29 @@
                                 status = "okay";
                                 phy = <&phy0>;
                                 phy-mode = "qsgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <0>;
                         };
                         ethernet@74000 {
                                 status = "okay";
                                 phy = <&phy1>;
                                 phy-mode = "qsgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <1>;
                         };
                         ethernet@30000 {
                                 status = "okay";
                                 phy = <&phy2>;
                                 phy-mode = "qsgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <2>;
                         };
                         ethernet@34000 {
                                 status = "okay";
                                 phy = <&phy3>;
                                 phy-mode = "qsgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <3>;
                         };
 
                         /* Front-side USB slot */
@@ -235,6 +244,10 @@
                                 };
                         };
 
+                        bm@c0000 {
+                                status = "okay";
+                        };
+
                         nand@d0000 {
                                 status = "okay";
                                 num-cs = <1>;
@@ -243,5 +256,9 @@
                                 nand-on-flash-bbt;
                         };
                 };
+
+                bm-bppi {
+                        status = "okay";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 853bd392a4fe..ed3b889d16ce 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -67,7 +67,8 @@
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                           MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
                           MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+                          MBUS_ID(0x0c, 0x04) 0 0 0xd1200000 0x100000>;
 
                 devbus-bootcs {
                         status = "okay";
@@ -176,21 +177,29 @@
                                 status = "okay";
                                 phy = <&phy0>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <0>;
                         };
                         ethernet@74000 {
                                 status = "okay";
                                 phy = <&phy1>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <1>;
                         };
                         ethernet@30000 {
                                 status = "okay";
                                 phy = <&phy2>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <2>;
                         };
                         ethernet@34000 {
                                 status = "okay";
                                 phy = <&phy3>;
                                 phy-mode = "sgmii";
+                                buffer-manager = <&bm>;
+                                bm,pool-long = <3>;
                         };
                         i2c@11000 {
                                 status = "okay";
@@ -219,6 +228,14 @@
                         usb@51000 {
                                 status = "okay";
                         };
+
+                        bm@c0000 {
+                                status = "okay";
+                        };
+                };
+
+                bm-bppi {
+                        status = "okay";
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index be23196829bb..553349c07f28 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -253,6 +253,14 @@
                                 marvell,crypto-sram-size = <0x800>;
                         };
 
+                        bm: bm@c0000 {
+                                compatible = "marvell,armada-380-neta-bm";
+                                reg = <0xc0000 0xac>;
+                                clocks = <&gateclk 13>;
+                                internal-mem = <&bm_bppi>;
+                                status = "disabled";
+                        };
+
                         xor@f0900 {
                                 compatible = "marvell,orion-xor";
                                 reg = <0xF0900 0x100
@@ -291,6 +299,17 @@
                         #size-cells = <1>;
                         ranges = <0 MBUS_ID(0x09, 0x05) 0 0x800>;
                 };
+
+                bm_bppi: bm-bppi {
+                        compatible = "mmio-sram";
+                        reg = <MBUS_ID(0x0c, 0x04) 0 0x100000>;
+                        ranges = <0 MBUS_ID(0x0c, 0x04) 0 0x100000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clocks = <&gateclk 13>;
+                        no-memory-wc;
+                        status = "disabled";
+                };
         };
 
         clocks {
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 2c84ca236473..ecf12dc22595 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -457,6 +457,18 @@
                         reg = <0x0 0x2d24000 0x0 0x4000>;
                 };
 
+                ptp_clock@2d10e00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x0 0x2d10e00 0x0 0xb0>;
+                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                        fsl,tclk-period = <5>;
+                        fsl,tmr-prsc    = <2>;
+                        fsl,tmr-add     = <0xaaaaaaab>;
+                        fsl,tmr-fiper1  = <999999990>;
+                        fsl,tmr-fiper2  = <99990>;
+                        fsl,max-adj     = <499999999>;
+                };
+
                 enet0: ethernet@2d10000 {
                         compatible = "fsl,etsec2";
                         device_type = "network";
diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts
index 28a033666017..b3d6ec87f615 100644
--- a/arch/arm/boot/dts/rk3036-evb.dts
+++ b/arch/arm/boot/dts/rk3036-evb.dts
@@ -47,6 +47,20 @@
         compatible = "rockchip,rk3036-evb", "rockchip,rk3036";
 };
 
+&emac {
+        pinctrl-names = "default";
+        pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
+        phy = <&phy0>;
+        phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */
+        phy-reset-duration = <10>; /* millisecond */
+
+        status = "okay";
+
+        phy0: ethernet-phy@0 {
+                reg = <0>;
+        };
+};
+
 &i2c1 {
         status = "okay";
 
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 992f9cadbc04..6b4ffc3cd590 100644
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -60,6 +60,20 @@
         status = "okay";
 };
 
+&emac {
+        pinctrl-names = "default";
+        pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
+        phy = <&phy0>;
+        phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */
+        phy-reset-duration = <10>; /* millisecond */
+
+        status = "okay";
+
+        phy0: ethernet-phy@0 {
+                reg = <0>;
+        };
+};
+
 &emmc {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index b9567c1e0687..609319ce916a 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -186,6 +186,27 @@
                 status = "disabled";
         };
 
+        emac: ethernet@10200000 {
+                compatible = "rockchip,rk3036-emac", "snps,arc-emac";
+                reg = <0x10200000 0x4000>;
+                interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                rockchip,grf = <&grf>;
+                clocks = <&cru HCLK_MAC>, <&cru SCLK_MACREF>, <&cru SCLK_MAC>;
+                clock-names = "hclk", "macref", "macclk";
+                /*
+                 * Fix the emac parent clock is DPLL instead of APLL.
+                 * since that will cause some unstable things if the cpufreq
+                 * is working. (e.g: the accurate 50MHz what mac_ref need)
+                 */
+                assigned-clocks = <&cru SCLK_MACPLL>;
+                assigned-clock-parents = <&cru PLL_DPLL>;
+                max-speed = <100>;
+                phy-mode = "rmii";
+                status = "disabled";
+        };
+
         sdmmc: dwmmc@10214000 {
                 compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";
                 reg = <0x10214000 0x4000>;
@@ -556,6 +577,24 @@
                         };
                 };
 
+                emac {
+                        emac_xfer: emac-xfer {
+                                rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_default>, /* crs_dvalid */
+                                                <2 13 RK_FUNC_1 &pcfg_pull_default>, /* tx_en */
+                                                <2 14 RK_FUNC_1 &pcfg_pull_default>, /* mac_clk */
+                                                <2 15 RK_FUNC_1 &pcfg_pull_default>, /* rx_err */
+                                                <2 16 RK_FUNC_1 &pcfg_pull_default>, /* rxd1 */
+                                                <2 17 RK_FUNC_1 &pcfg_pull_default>, /* rxd0 */
+                                                <2 18 RK_FUNC_1 &pcfg_pull_default>, /* txd1 */
+                                                <2 19 RK_FUNC_1 &pcfg_pull_default>; /* txd0 */
+                        };
+
+                        emac_mdio: emac-mdio {
+                                rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_default>, /* mac_md */
+                                                <2 25 RK_FUNC_1 &pcfg_pull_default>; /* mac_mdclk */
+                        };
+                };
+
                 i2c0 {
                         i2c0_xfer: i2c0-xfer {
                                 rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>,
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 1f9ca4737ef6..afb1f62fb05e 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -91,7 +91,7 @@ CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6123=y
 CONFIG_NET_DSA_MV88E6171=y
 CONFIG_NET_DSA_MV88E6352=y
 CONFIG_MV643XX_ETH=y
diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index af29780accdc..6c4c54037bc4 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -92,7 +92,7 @@ CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6123=y
 CONFIG_NET_DSA_MV88E6171=y
 CONFIG_NET_DSA_MV88E6352=y
 CONFIG_MV643XX_ETH=y
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index 5876ce7af130..6a5bc27538f1 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -86,7 +86,7 @@ CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6123=y
 CONFIG_MV643XX_ETH=y
 CONFIG_MARVELL_PHY=y
 # CONFIG_INPUT_MOUSEDEV is not set
diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
index 523315115478..524692f4acab 100644
--- a/arch/arm/include/asm/checksum.h
+++ b/arch/arm/include/asm/checksum.h
@@ -84,10 +84,10 @@ ip_fast_csum(const void *iph, unsigned int ihl)
 }
 
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
-        u32 lenprot = len | proto << 16;
+        u32 lenprot = len + proto;
         if (__builtin_constant_p(sum) && sum == 0) {
                 __asm__(
                 "adds   %0, %1, %2      @ csum_tcpudp_nofold0   \n\t"
@@ -121,8 +121,8 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
+csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,
+                  __u8 proto, __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
 }
@@ -144,8 +144,8 @@ __csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __
                 __be32 proto, __wsum sum);
 
 static inline __sum16
-csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len,
-                unsigned short proto, __wsum sum)
+csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
+                __u32 len, __u8 proto, __wsum sum)
 {
         return csum_fold(__csum_ipv6_magic(saddr, daddr, htonl(len),
                                            htonl(proto), sum));
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index 49d1110cff53..52db8bf7e153 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -17,23 +17,25 @@
  *
  */
 
+#include <linux/property.h>
 #include <linux/gpio/machine.h>
 #include <linux/platform_device.h>
-#include <linux/rfkill-gpio.h>
 
 #include "board.h"
 
-static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
-        .name   = "wifi_rfkill",
-        .type   = RFKILL_TYPE_WLAN,
+static struct property_entry __initdata wifi_rfkill_prop[] = {
+        PROPERTY_ENTRY_STRING("name", "wifi_rfkill"),
+        PROPERTY_ENTRY_STRING("type", "wlan"),
+        { },
+};
+
+static struct property_set __initdata wifi_rfkill_pset = {
+        .properties = wifi_rfkill_prop,
 };
 
 static struct platform_device wifi_rfkill_device = {
         .name   = "rfkill_gpio",
         .id     = -1,
-        .dev    = {
-                .platform_data = &wifi_rfkill_platform_data,
-        },
 };
 
 static struct gpiod_lookup_table wifi_gpio_lookup = {
@@ -47,6 +49,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup = {
 
 void __init tegra_paz00_wifikill_init(void)
 {
+        platform_device_add_properties(&wifi_rfkill_device, &wifi_rfkill_pset);
         gpiod_add_lookup_table(&wifi_gpio_lookup);
         platform_device_register(&wifi_rfkill_device);
 }
diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index 5d87a3dc44b8..278f106a0054 100644
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -621,7 +621,13 @@
                               <0x0 0x1f600000 0x0 0Xd100>,
                               <0x0 0x20000000 0x0 0X220000>;
                         interrupts = <0 108 4>,
-                                     <0 109 4>;
+                                     <0 109 4>,
+                                     <0 110 4>,
+                                     <0 111 4>,
+                                     <0 112 4>,
+                                     <0 113 4>,
+                                     <0 114 4>,
+                                     <0 115 4>;
                         port-id = <1>;
                         dma-coherent;
                         clocks = <&xge1clk 0>;
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 3e40bd469cea..b7d7109e7304 100644
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -964,7 +964,13 @@
                               <0x0 0x18000000 0x0 0X200>;
                         reg-names = "enet_csr", "ring_csr", "ring_cmd";
                         interrupts = <0x0 0x60 0x4>,
-                                     <0x0 0x61 0x4>;
+                                     <0x0 0x61 0x4>,
+                                     <0x0 0x62 0x4>,
+                                     <0x0 0x63 0x4>,
+                                     <0x0 0x64 0x4>,
+                                     <0x0 0x65 0x4>,
+                                     <0x0 0x66 0x4>,
+                                     <0x0 0x67 0x4>;
                         dma-coherent;
                         clocks = <&xge0clk 0>;
                         /* mac address will be overwritten by the bootloader */
diff --git a/arch/avr32/include/asm/checksum.h b/arch/avr32/include/asm/checksum.h
index 4ddbfd2486af..4ab7d5bdaf53 100644
--- a/arch/avr32/include/asm/checksum.h
+++ b/arch/avr32/include/asm/checksum.h
@@ -111,9 +111,8 @@ static inline __sum16 csum_fold(__wsum sum)
 }
 
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                               unsigned short len,
-                                               unsigned short proto,
-                                               __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         asm("   add     %0, %1\n"
             "   adc     %0, %0, %2\n"
@@ -132,9 +131,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
diff --git a/arch/avr32/include/uapi/asm/socket.h b/arch/avr32/include/uapi/asm/socket.h
index 9de0796240a0..1fd147f09a38 100644
--- a/arch/avr32/include/uapi/asm/socket.h
+++ b/arch/avr32/include/uapi/asm/socket.h
@@ -88,4 +88,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _UAPI__ASM_AVR32_SOCKET_H */
diff --git a/arch/blackfin/include/asm/checksum.h b/arch/blackfin/include/asm/checksum.h
index 623cc7fb00bc..e7134bf94e3c 100644
--- a/arch/blackfin/include/asm/checksum.h
+++ b/arch/blackfin/include/asm/checksum.h
@@ -14,8 +14,8 @@
  */
 
 static inline __wsum
-__csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+__csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                     __u8 proto, __wsum sum)
 {
         unsigned int carry;
 
diff --git a/arch/c6x/include/asm/checksum.h b/arch/c6x/include/asm/checksum.h
index 7246816d6e4d..249b0e421ddc 100644
--- a/arch/c6x/include/asm/checksum.h
+++ b/arch/c6x/include/asm/checksum.h
@@ -10,8 +10,8 @@
 #define _ASM_C6X_CHECKSUM_H
 
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         unsigned long long tmp;
 
diff --git a/arch/cris/include/arch-v10/arch/checksum.h b/arch/cris/include/arch-v10/arch/checksum.h
index b8000c5d7fe1..d1d1bd9e1090 100644
--- a/arch/cris/include/arch-v10/arch/checksum.h
+++ b/arch/cris/include/arch-v10/arch/checksum.h
@@ -9,8 +9,8 @@
  */
 
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         __wsum res;
         __asm__ ("add.d %2, %0\n\t"
diff --git a/arch/cris/include/arch-v32/arch/checksum.h b/arch/cris/include/arch-v32/arch/checksum.h
index e5dcfce6e0dc..65cf205b1329 100644
--- a/arch/cris/include/arch-v32/arch/checksum.h
+++ b/arch/cris/include/arch-v32/arch/checksum.h
@@ -11,7 +11,7 @@
  */
 static inline __wsum
 csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                   unsigned short len, unsigned short proto, __wsum sum)
+                   __u32 len, __u8 proto, __wsum sum)
 {
         __wsum res;
 
diff --git a/arch/cris/include/asm/checksum.h b/arch/cris/include/asm/checksum.h
index 75dcb77d6cb0..ea949c60b190 100644
--- a/arch/cris/include/asm/checksum.h
+++ b/arch/cris/include/asm/checksum.h
@@ -63,9 +63,8 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
  */
 
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
diff --git a/arch/frv/include/asm/checksum.h b/arch/frv/include/asm/checksum.h
index 269da09ff637..b77388c5901d 100644
--- a/arch/frv/include/asm/checksum.h
+++ b/arch/frv/include/asm/checksum.h
@@ -105,8 +105,8 @@ static inline __sum16 csum_fold(__wsum sum)
  * returns a 16-bit checksum, already complemented
  */
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         asm("   addcc           %1,%0,%0,icc0   \n"
             "   addxcc          %2,%0,%0,icc0   \n"
@@ -120,8 +120,8 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
 }
 
 static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
+csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,
+                  __u8 proto, __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
@@ -135,7 +135,7 @@ extern __sum16 ip_compute_csum(const void *buff, int len);
 #define _HAVE_ARCH_IPV6_CSUM
 static inline __sum16
 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
-                __u32 len, unsigned short proto, __wsum sum)
+                __u32 len, __u8 proto, __wsum sum)
 {
         unsigned long tmp, tmp2;
 
diff --git a/arch/frv/include/uapi/asm/socket.h b/arch/frv/include/uapi/asm/socket.h
index f02e4849ae83..afbc98f02d27 100644
--- a/arch/frv/include/uapi/asm/socket.h
+++ b/arch/frv/include/uapi/asm/socket.h
@@ -88,5 +88,7 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _ASM_SOCKET_H */
 
diff --git a/arch/hexagon/include/asm/checksum.h b/arch/hexagon/include/asm/checksum.h
index 46ec8a7fd65f..d9f58d696238 100644
--- a/arch/hexagon/include/asm/checksum.h
+++ b/arch/hexagon/include/asm/checksum.h
@@ -38,12 +38,12 @@ __wsum csum_partial_copy_nocheck(const void *src, void *dst,
  * returns a 16-bit checksum, already complemented
  */
 #define csum_tcpudp_nofold csum_tcpudp_nofold
-__wsum csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
-        unsigned short len, unsigned short proto, __wsum sum);
+__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
+                          __u32 len, __u8 proto, __wsum sum);
 
 #define csum_tcpudp_magic csum_tcpudp_magic
-__sum16 csum_tcpudp_magic(unsigned long saddr, unsigned long daddr,
-        unsigned short len, unsigned short proto, __wsum sum);
+__sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+                          __u32 len, __u8 proto, __wsum sum);
 
 #include <asm-generic/checksum.h>
 
diff --git a/arch/hexagon/lib/checksum.c b/arch/hexagon/lib/checksum.c
index 8169f78a46a7..617506d1a559 100644
--- a/arch/hexagon/lib/checksum.c
+++ b/arch/hexagon/lib/checksum.c
@@ -60,18 +60,16 @@ static inline unsigned short from64to16(u64 x)
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented.
  */
-__sum16 csum_tcpudp_magic(unsigned long saddr, unsigned long daddr,
-                          unsigned short len, unsigned short proto,
-                          __wsum sum)
+__sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+                          __u32 len, __u8 proto, __wsum sum)
 {
         return (__force __sum16)~from64to16(
                 (__force u64)saddr + (__force u64)daddr +
                 (__force u64)sum + ((len + proto) << 8));
 }
 
-__wsum csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
-                          unsigned short len, unsigned short proto,
-                          __wsum sum)
+__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
+                          __u32 len, __u8 proto, __wsum sum)
 {
         u64 result;
 
diff --git a/arch/ia64/include/asm/checksum.h b/arch/ia64/include/asm/checksum.h
index 97af155057e4..7accf54162b2 100644
--- a/arch/ia64/include/asm/checksum.h
+++ b/arch/ia64/include/asm/checksum.h
@@ -16,15 +16,11 @@ extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
  * Computes the checksum of the TCP/UDP pseudo-header returns a 16-bit
  * checksum, already complemented
  */
-extern __sum16 csum_tcpudp_magic (__be32 saddr, __be32 daddr,
-                                             unsigned short len,
-                                             unsigned short proto,
-                                             __wsum sum);
+extern __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+                                 __u32 len, __u8 proto, __wsum sum);
 
-extern __wsum csum_tcpudp_nofold (__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
-                                        __wsum sum);
+extern __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
+                                 __u32 len, __u8 proto, __wsum sum);
 
 /*
  * Computes the checksum of a memory block at buff, length len,
@@ -73,7 +69,7 @@ static inline __sum16 csum_fold(__wsum csum)
 #define _HAVE_ARCH_IPV6_CSUM    1
 struct in6_addr;
 extern __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
-        const struct in6_addr *daddr, __u32 len, unsigned short proto,
-        __wsum csum);
+                               const struct in6_addr *daddr,
+                               __u32 len, __u8 proto, __wsum csum);
 
 #endif /* _ASM_IA64_CHECKSUM_H */
diff --git a/arch/ia64/include/uapi/asm/socket.h b/arch/ia64/include/uapi/asm/socket.h
index bce29166de1b..0018fad9039f 100644
--- a/arch/ia64/include/uapi/asm/socket.h
+++ b/arch/ia64/include/uapi/asm/socket.h
@@ -97,4 +97,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _ASM_IA64_SOCKET_H */
diff --git a/arch/ia64/lib/checksum.c b/arch/ia64/lib/checksum.c
index 9fc955026f86..2cb23cb0c2e1 100644
--- a/arch/ia64/lib/checksum.c
+++ b/arch/ia64/lib/checksum.c
@@ -34,8 +34,8 @@ from64to16 (unsigned long x)
  * returns a 16-bit checksum, already complemented.
  */
 __sum16
-csum_tcpudp_magic (__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,
+                  __u8 proto, __wsum sum)
 {
         return (__force __sum16)~from64to16(
                 (__force u64)saddr + (__force u64)daddr +
@@ -45,8 +45,8 @@ csum_tcpudp_magic (__be32 saddr, __be32 daddr, unsigned short len,
 EXPORT_SYMBOL(csum_tcpudp_magic);
 
 __wsum
-csum_tcpudp_nofold (__be32 saddr, __be32 daddr, unsigned short len,
-                    unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         unsigned long result;
 
diff --git a/arch/m32r/include/asm/checksum.h b/arch/m32r/include/asm/checksum.h
index a7a7c4f44abe..d68e93c9bd62 100644
--- a/arch/m32r/include/asm/checksum.h
+++ b/arch/m32r/include/asm/checksum.h
@@ -114,9 +114,8 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 }
 
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                               unsigned short len,
-                                               unsigned short proto,
-                                               __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
 #if defined(__LITTLE_ENDIAN)
         unsigned long len_proto = (proto + len) << 8;
@@ -145,9 +144,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
diff --git a/arch/m32r/include/uapi/asm/socket.h b/arch/m32r/include/uapi/asm/socket.h
index 14aa4a6bccf1..5fe42fc7b6c5 100644
--- a/arch/m32r/include/uapi/asm/socket.h
+++ b/arch/m32r/include/uapi/asm/socket.h
@@ -88,4 +88,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _ASM_M32R_SOCKET_H */
diff --git a/arch/m68k/include/asm/checksum.h b/arch/m68k/include/asm/checksum.h
index 2f88d867c711..75e91f03b178 100644
--- a/arch/m68k/include/asm/checksum.h
+++ b/arch/m68k/include/asm/checksum.h
@@ -117,7 +117,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len)
 #define _HAVE_ARCH_IPV6_CSUM
 static __inline__ __sum16
 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
-                __u32 len, unsigned short proto, __wsum sum)
+                __u32 len, __u8 proto, __wsum sum)
 {
         register unsigned long tmp;
         __asm__("addl %2@,%0\n\t"
diff --git a/arch/metag/include/asm/checksum.h b/arch/metag/include/asm/checksum.h
index 08dd1cc65799..f65fe83b1730 100644
--- a/arch/metag/include/asm/checksum.h
+++ b/arch/metag/include/asm/checksum.h
@@ -59,8 +59,7 @@ extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
  * returns a 16-bit checksum, already complemented
  */
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         unsigned long len_proto = (proto + len) << 8;
@@ -78,8 +77,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
 }
 
 static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
+csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,
+                  __u8 proto, __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
 }
diff --git a/arch/microblaze/include/asm/checksum.h b/arch/microblaze/include/asm/checksum.h
index 0185cbefdda4..adeecebbb0d1 100644
--- a/arch/microblaze/include/asm/checksum.h
+++ b/arch/microblaze/include/asm/checksum.h
@@ -16,8 +16,8 @@
  */
 #define csum_tcpudp_nofold      csum_tcpudp_nofold
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         __asm__("add %0, %0, %1\n\t"
                 "addc %0, %0, %2\n\t"
diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h
index 3ceacde5eb6e..bce1ce53149a 100644
--- a/arch/mips/include/asm/checksum.h
+++ b/arch/mips/include/asm/checksum.h
@@ -160,9 +160,9 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 }
 #define ip_fast_csum ip_fast_csum
 
-static inline __wsum csum_tcpudp_nofold(__be32 saddr,
-        __be32 daddr, unsigned short len, unsigned short proto,
-        __wsum sum)
+static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         __asm__(
         "       .set    push            # csum_tcpudp_nofold\n"
@@ -215,7 +215,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len)
 #define _HAVE_ARCH_IPV6_CSUM
 static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                           const struct in6_addr *daddr,
-                                          __u32 len, unsigned short proto,
+                                          __u32 len, __u8 proto,
                                           __wsum sum)
 {
         __wsum tmp;
diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
index 5910fe294e93..2027240aafbb 100644
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -106,4 +106,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index e3733cde50d6..402ac2ec7e83 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -320,11 +320,12 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
 #if IS_ENABLED(CONFIG_TC35815)
 static u32 tx4939_get_eth_speed(struct net_device *dev)
 {
-        struct ethtool_cmd cmd;
-        if (__ethtool_get_settings(dev, &cmd))
+        struct ethtool_link_ksettings cmd;
+
+        if (__ethtool_get_link_ksettings(dev, &cmd))
                 return 100;     /* default 100Mbps */
 
-        return ethtool_cmd_speed(&cmd);
+        return cmd.base.speed;
 }
 
 static int tx4939_netdev_event(struct notifier_block *this,
diff --git a/arch/mn10300/include/asm/checksum.h b/arch/mn10300/include/asm/checksum.h
index 9fb2a8d8826a..c80df5b504ac 100644
--- a/arch/mn10300/include/asm/checksum.h
+++ b/arch/mn10300/include/asm/checksum.h
@@ -37,16 +37,11 @@ static inline __sum16 csum_fold(__wsum sum)
         return (~sum) >> 16;
 }
 
-static inline __wsum csum_tcpudp_nofold(unsigned long saddr,
-                                        unsigned long daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
-        __wsum tmp;
-
-        tmp = (__wsum) ntohs(len) << 16;
-        tmp += (__wsum) proto << 8;
+        __wsum tmp = (__wsum)((len + proto) << 8);
 
         asm(
                 "       add     %1,%0           \n"
@@ -64,10 +59,8 @@ static inline __wsum csum_tcpudp_nofold(unsigned long saddr,
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented
  */
-static inline __sum16 csum_tcpudp_magic(unsigned long saddr,
-                                        unsigned long daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
diff --git a/arch/mn10300/include/uapi/asm/socket.h b/arch/mn10300/include/uapi/asm/socket.h
index 58b1aa01ab9f..5129f23a9ee1 100644
--- a/arch/mn10300/include/uapi/asm/socket.h
+++ b/arch/mn10300/include/uapi/asm/socket.h
@@ -88,4 +88,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/nios2/include/asm/checksum.h b/arch/nios2/include/asm/checksum.h
index 6bc1f0d5df7b..703c5ee63421 100644
--- a/arch/nios2/include/asm/checksum.h
+++ b/arch/nios2/include/asm/checksum.h
@@ -45,8 +45,7 @@ static inline __sum16 csum_fold(__wsum sum)
  */
 #define csum_tcpudp_nofold csum_tcpudp_nofold
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         __asm__ __volatile__(
@@ -60,7 +59,7 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                 "cmpltu r8, %0, %3\n"
                 "add    %0, %0, r8\n"   /* add carry */
                 : "=r" (sum), "=r" (saddr)
-                : "r" (daddr), "r" ((ntohs(len) << 16) + (proto * 256)),
+                : "r" (daddr), "r" ((len + proto) << 8),
                   "0" (sum),
                   "1" (saddr)
                 : "r8");
@@ -69,8 +68,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
 }
 
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto, __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
 }
diff --git a/arch/parisc/include/asm/checksum.h b/arch/parisc/include/asm/checksum.h
index c84b2fcb18a9..60c2c42619c9 100644
--- a/arch/parisc/include/asm/checksum.h
+++ b/arch/parisc/include/asm/checksum.h
@@ -85,9 +85,8 @@ static inline __sum16 csum_fold(__wsum csum)
 }
  
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                               unsigned short len,
-                                               unsigned short proto,
-                                               __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         __asm__(
         "       add  %1, %0, %0\n"
@@ -104,9 +103,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
@@ -124,7 +122,7 @@ static inline __sum16 ip_compute_csum(const void *buf, int len)
 #define _HAVE_ARCH_IPV6_CSUM
 static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                           const struct in6_addr *daddr,
-                                          __u32 len, unsigned short proto,
+                                          __u32 len, __u8 proto,
                                           __wsum sum)
 {
         __asm__ __volatile__ (
diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
index f9cf1223422c..9c935d717df9 100644
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@ -87,4 +87,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        0x402C
 #define SO_ATTACH_REUSEPORT_EBPF        0x402D
 
+#define SO_CNX_ADVICE           0x402E
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h
index dd54f28ecdec..1672e3398270 100644
--- a/arch/powerpc/include/uapi/asm/socket.h
+++ b/arch/powerpc/include/uapi/asm/socket.h
@@ -95,4 +95,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif  /* _ASM_POWERPC_SOCKET_H */
diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h
index 740364856355..d7f100c53f07 100644
--- a/arch/s390/include/asm/checksum.h
+++ b/arch/s390/include/asm/checksum.h
@@ -91,8 +91,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
  * returns a 32-bit checksum
  */
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                   unsigned short len, unsigned short proto,
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto,
                    __wsum sum)
 {
         __u32 csum = (__force __u32)sum;
@@ -118,8 +117,7 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  */
 
 static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                  unsigned short len, unsigned short proto,
+csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len, __u8 proto,
                   __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
diff --git a/arch/s390/include/uapi/asm/socket.h b/arch/s390/include/uapi/asm/socket.h
index d02e89d14fef..41b51c2f4f1b 100644
--- a/arch/s390/include/uapi/asm/socket.h
+++ b/arch/s390/include/uapi/asm/socket.h
@@ -94,4 +94,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/score/include/asm/checksum.h b/arch/score/include/asm/checksum.h
index 961bd64015a8..539d9fd45d21 100644
--- a/arch/score/include/asm/checksum.h
+++ b/arch/score/include/asm/checksum.h
@@ -127,10 +127,10 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 }
 
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
-        unsigned long tmp = (ntohs(len) << 16) + proto * 256;
+        unsigned long tmp = (len + proto) << 8;
         __asm__ __volatile__(
                 ".set volatile\n\t"
                 "add\t%0, %0, %2\n\t"
@@ -161,8 +161,8 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
-                unsigned short proto, __wsum sum)
+csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,
+                  __u8 proto, __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
 }
@@ -179,9 +179,8 @@ static inline unsigned short ip_compute_csum(const void *buff, int len)
 
 #define _HAVE_ARCH_IPV6_CSUM
 static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
-                                const struct in6_addr *daddr,
-                                __u32 len, unsigned short proto,
-                                __wsum sum)
+                                      const struct in6_addr *daddr,
+                                      __u32 len, __u8 proto, __wsum sum)
 {
         __asm__ __volatile__(
                 ".set\tvolatile\t\t\t# csum_ipv6_magic\n\t"
diff --git a/arch/sh/include/asm/checksum_32.h b/arch/sh/include/asm/checksum_32.h
index 14b7ac2f0a07..9c84386d35cb 100644
--- a/arch/sh/include/asm/checksum_32.h
+++ b/arch/sh/include/asm/checksum_32.h
@@ -115,8 +115,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 }
 
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
 #ifdef __LITTLE_ENDIAN__
@@ -142,8 +141,7 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
@@ -161,8 +159,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len)
 #define _HAVE_ARCH_IPV6_CSUM
 static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                       const struct in6_addr *daddr,
-                                      __u32 len, unsigned short proto,
-                                      __wsum sum)
+                                      __u32 len, __u8 proto, __wsum sum)
 {
         unsigned int __dummy;
         __asm__("clrt\n\t"
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig
index 6b68f12f29db..04920ab8e292 100644
--- a/arch/sparc/configs/sparc64_defconfig
+++ b/arch/sparc/configs/sparc64_defconfig
@@ -102,6 +102,7 @@ CONFIG_SUNLANCE=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_SUNVNET=m
+CONFIG_LDMVSW=m
 CONFIG_NET_PCI=y
 CONFIG_E1000=m
 CONFIG_E1000E=m
diff --git a/arch/sparc/include/asm/checksum_32.h b/arch/sparc/include/asm/checksum_32.h
index 426b2389a1c2..eff748c871ec 100644
--- a/arch/sparc/include/asm/checksum_32.h
+++ b/arch/sparc/include/asm/checksum_32.h
@@ -170,9 +170,8 @@ static inline __sum16 csum_fold(__wsum sum)
 }
 
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                               unsigned short len,
-                                               unsigned short proto,
-                                               __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         __asm__ __volatile__("addcc\t%1, %0, %0\n\t"
                              "addxcc\t%2, %0, %0\n\t"
@@ -190,9 +189,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
@@ -201,8 +199,7 @@ static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
 
 static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                       const struct in6_addr *daddr,
-                                      __u32 len, unsigned short proto,
-                                      __wsum sum)
+                                      __u32 len, __u8 proto, __wsum sum)
 {
         __asm__ __volatile__ (
                 "addcc  %3, %4, %%g4\n\t"
diff --git a/arch/sparc/include/asm/checksum_64.h b/arch/sparc/include/asm/checksum_64.h
index b8779a6a5911..0395d75322e9 100644
--- a/arch/sparc/include/asm/checksum_64.h
+++ b/arch/sparc/include/asm/checksum_64.h
@@ -96,8 +96,7 @@ static inline __sum16 csum_fold(__wsum sum)
 }
 
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                        unsigned int len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         __asm__ __volatile__(
@@ -116,8 +115,7 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
@@ -127,8 +125,7 @@ static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
 
 static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                       const struct in6_addr *daddr,
-                                      __u32 len, unsigned short proto,
-                                      __wsum sum)
+                                      __u32 len, __u8 proto, __wsum sum)
 {
         __asm__ __volatile__ (
 "       addcc           %3, %4, %%g7\n"
diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h
index d270ee91968e..31aede3af088 100644
--- a/arch/sparc/include/uapi/asm/socket.h
+++ b/arch/sparc/include/uapi/asm/socket.h
@@ -84,6 +84,8 @@
 #define SO_ATTACH_REUSEPORT_CBPF        0x0035
 #define SO_ATTACH_REUSEPORT_EBPF        0x0036
 
+#define SO_CNX_ADVICE           0x0037
+
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define SO_SECURITY_AUTHENTICATION              0x5001
 #define SO_SECURITY_ENCRYPTION_TRANSPORT        0x5002
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index c1387b7f447d..3f3dfb8b150a 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -222,7 +222,7 @@ CONFIG_TUN=y
 CONFIG_VETH=m
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6123=y
 CONFIG_SKY2=y
 CONFIG_PTP_1588_CLOCK_TILEGX=y
 # CONFIG_WLAN is not set
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 6d9ce8af1107..ef9e27eb2f50 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -341,7 +341,7 @@ CONFIG_TUN=y
 CONFIG_VETH=m
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6123=y
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_E1000E=y
 # CONFIG_WLAN is not set
diff --git a/arch/unicore32/include/asm/checksum.h b/arch/unicore32/include/asm/checksum.h
index f55c3f937c3e..23ceb9e3a89b 100644
--- a/arch/unicore32/include/asm/checksum.h
+++ b/arch/unicore32/include/asm/checksum.h
@@ -20,8 +20,8 @@
  */
 
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         __asm__(
         "add.a  %0, %1, %2\n"
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 5e830d0c95c9..9b6ad08aa51a 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -2194,11 +2194,11 @@ static int backtrace_stack(void *data, char *name)
         return 0;
 }
 
-static void backtrace_address(void *data, unsigned long addr, int reliable)
+static int backtrace_address(void *data, unsigned long addr, int reliable)
 {
         struct perf_callchain_entry *entry = data;
 
-        perf_callchain_store(entry, addr);
+        return perf_callchain_store(entry, addr);
 }
 
 static const struct stacktrace_ops backtrace_ops = {
diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
index f50de6951738..532f85e6651f 100644
--- a/arch/x86/include/asm/checksum_32.h
+++ b/arch/x86/include/asm/checksum_32.h
@@ -112,8 +112,7 @@ static inline __sum16 csum_fold(__wsum sum)
 }
 
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         asm("addl %1, %0        ;\n"
@@ -131,8 +130,7 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
+                                        __u32 len, __u8 proto,
                                         __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
@@ -151,8 +149,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len)
 #define _HAVE_ARCH_IPV6_CSUM
 static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                       const struct in6_addr *daddr,
-                                      __u32 len, unsigned short proto,
-                                      __wsum sum)
+                                      __u32 len, __u8 proto, __wsum sum)
 {
         asm("addl 0(%1), %0     ;\n"
             "adcl 4(%1), %0     ;\n"
diff --git a/arch/x86/include/asm/checksum_64.h b/arch/x86/include/asm/checksum_64.h
index cd00e1774491..c020ee75dce7 100644
--- a/arch/x86/include/asm/checksum_64.h
+++ b/arch/x86/include/asm/checksum_64.h
@@ -84,8 +84,8 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
  * 32bit unfolded.
  */
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                   __u8 proto, __wsum sum)
 {
         asm("  addl %1, %0\n"
             "  adcl %2, %0\n"
@@ -110,8 +110,8 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
  * complemented and ready to be filled in.
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                        unsigned short len,
-                                        unsigned short proto, __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
 }
@@ -177,7 +177,7 @@ struct in6_addr;
 #define _HAVE_ARCH_IPV6_CSUM 1
 extern __sum16
 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
-                __u32 len, unsigned short proto, __wsum sum);
+                __u32 len, __u8 proto, __wsum sum);
 
 static inline unsigned add32_with_carry(unsigned a, unsigned b)
 {
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index 70bbe39043a9..7c247e7404be 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -37,7 +37,7 @@ print_context_stack_bp(struct thread_info *tinfo,
 /* Generic stack tracer with callbacks */
 
 struct stacktrace_ops {
-        void (*address)(void *data, unsigned long address, int reliable);
+        int (*address)(void *data, unsigned long address, int reliable);
         /* On negative return stop dumping */
         int (*stack)(void *data, char *name);
         walk_stack_t    walk_stack;
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 32e5699eadfe..8efa57a5f29e 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -135,7 +135,8 @@ print_context_stack_bp(struct thread_info *tinfo,
                 if (!__kernel_text_address(addr))
                         break;
 
-                ops->address(data, addr, 1);
+                if (ops->address(data, addr, 1))
+                        break;
                 frame = frame->next_frame;
                 ret_addr = &frame->return_address;
                 print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
@@ -154,10 +155,11 @@ static int print_trace_stack(void *data, char *name)
 /*
  * Print one address/symbol entries per line.
  */
-static void print_trace_address(void *data, unsigned long addr, int reliable)
+static int print_trace_address(void *data, unsigned long addr, int reliable)
 {
         touch_nmi_watchdog();
         printk_stack_address(addr, reliable, data);
+        return 0;
 }
 
 static const struct stacktrace_ops print_trace_ops = {
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index fdd0c6430e5a..9ee98eefc44d 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -14,30 +14,34 @@ static int save_stack_stack(void *data, char *name)
         return 0;
 }
 
-static void
+static int
 __save_stack_address(void *data, unsigned long addr, bool reliable, bool nosched)
 {
         struct stack_trace *trace = data;
 #ifdef CONFIG_FRAME_POINTER
         if (!reliable)
-                return;
+                return 0;
 #endif
         if (nosched && in_sched_functions(addr))
-                return;
+                return 0;
         if (trace->skip > 0) {
                 trace->skip--;
-                return;
+                return 0;
         }
-        if (trace->nr_entries < trace->max_entries)
+        if (trace->nr_entries < trace->max_entries) {
                 trace->entries[trace->nr_entries++] = addr;
+                return 0;
+        } else {
+                return -1; /* no more room, stop walking the stack */
+        }
 }
 
-static void save_stack_address(void *data, unsigned long addr, int reliable)
+static int save_stack_address(void *data, unsigned long addr, int reliable)
 {
         return __save_stack_address(data, addr, reliable, false);
 }
 
-static void
+static int
 save_stack_address_nosched(void *data, unsigned long addr, int reliable)
 {
         return __save_stack_address(data, addr, reliable, true);
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
index 1318f75d56e4..28a6654f0d08 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
 __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                         const struct in6_addr *daddr,
-                        __u32 len, unsigned short proto, __wsum sum)
+                        __u32 len, __u8 proto, __wsum sum)
 {
         __u64 rest, sum64;
 
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index 4e664bdb535a..cb31a4440e58 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
@@ -23,12 +23,13 @@ static int backtrace_stack(void *data, char *name)
         return 0;
 }
 
-static void backtrace_address(void *data, unsigned long addr, int reliable)
+static int backtrace_address(void *data, unsigned long addr, int reliable)
 {
         unsigned int *depth = data;
 
         if ((*depth)--)
                 oprofile_add_trace(addr);
+        return 0;
 }
 
 static struct stacktrace_ops backtrace_ops = {
diff --git a/arch/x86/um/asm/checksum.h b/arch/x86/um/asm/checksum.h
index ee940185e89f..54d96f1e3594 100644
--- a/arch/x86/um/asm/checksum.h
+++ b/arch/x86/um/asm/checksum.h
@@ -87,8 +87,8 @@ static inline __sum16 csum_fold(__wsum sum)
  * 32bit unfolded.
  */
 static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                   unsigned short proto, __wsum sum)
+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
+                  __u8 proto, __wsum sum)
 {
         asm("  addl %1, %0\n"
             "  adcl %2, %0\n"
@@ -104,9 +104,8 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
  * returns a 16-bit checksum, already complemented
  */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                           unsigned short len,
-                                           unsigned short proto,
-                                           __wsum sum)
+                                        __u32 len, __u8 proto,
+                                        __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
diff --git a/arch/x86/um/asm/checksum_32.h b/arch/x86/um/asm/checksum_32.h
index ab77b6f9a4bf..83a75f8a1233 100644
--- a/arch/x86/um/asm/checksum_32.h
+++ b/arch/x86/um/asm/checksum_32.h
@@ -13,7 +13,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len)
 #define _HAVE_ARCH_IPV6_CSUM
 static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                           const struct in6_addr *daddr,
-                                          __u32 len, unsigned short proto,
+                                          __u32 len, __u8 proto,
                                           __wsum sum)
 {
         __asm__(
diff --git a/arch/xtensa/include/asm/checksum.h b/arch/xtensa/include/asm/checksum.h
index 0593de689b56..ec35074fcb03 100644
--- a/arch/xtensa/include/asm/checksum.h
+++ b/arch/xtensa/include/asm/checksum.h
@@ -123,9 +123,8 @@ static __inline__ __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 }
 
 static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   __wsum sum)
+                                            __u32 len, __u8 proto,
+                                            __wsum sum)
 {
 
 #ifdef __XTENSA_EL__
@@ -157,9 +156,8 @@ static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
  * returns a 16-bit checksum, already complemented
  */
 static __inline__ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                       unsigned short len,
-                                                       unsigned short proto,
-                                                       __wsum sum)
+                                            __u32 len, __u8 proto,
+                                            __wsum sum)
 {
         return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
@@ -177,7 +175,7 @@ static __inline__ __sum16 ip_compute_csum(const void *buff, int len)
 #define _HAVE_ARCH_IPV6_CSUM
 static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                           const struct in6_addr *daddr,
-                                          __u32 len, unsigned short proto,
+                                          __u32 len, __u8 proto,
                                           __wsum sum)
 {
         unsigned int __dummy;
diff --git a/arch/xtensa/include/uapi/asm/socket.h b/arch/xtensa/include/uapi/asm/socket.h
index fd3b96d1153f..81435d995e11 100644
--- a/arch/xtensa/include/uapi/asm/socket.h
+++ b/arch/xtensa/include/uapi/asm/socket.h
@@ -99,4 +99,6 @@
 #define SO_ATTACH_REUSEPORT_CBPF        51
 #define SO_ATTACH_REUSEPORT_EBPF        52
 
+#define SO_CNX_ADVICE           53
+
 #endif  /* _XTENSA_SOCKET_H */