Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from David Miller:

 1) Fix ieeeu02154 atusb driver use-after-free, from Johan Hovold.

 2) Need to validate TCA_CBQ_WRROPT netlink attributes, from Eric
    Dumazet.

 3) txq null deref in mac80211, from Miaoqing Pan.

 4) ionic driver needs to select NET_DEVLINK, from Arnd Bergmann.

 5) Need to disable bh during nft_connlimit GC, from Pablo Neira Ayuso.

 6) Avoid division by zero in taprio scheduler, from Vladimir Oltean.

 7) Various xgmac fixes in stmmac driver from Jose Abreu.

 8) Avoid 64-bit division in mlx5 leading to link errors on 32-bit from
    Michal Kubecek.

 9) Fix bad VLAN check in rtl8366 DSA driver, from Linus Walleij.

10) Fix sleep while atomic in sja1105, from Vladimir Oltean.

11) Suspend/resume deadlock in stmmac, from Thierry Reding.

12) Various UDP GSO fixes from Josh Hunt.

13) Fix slab out of bounds access in tcp_zerocopy_receive(), from Eric
    Dumazet.

14) Fix OOPS in __ipv6_ifa_notify(), from David Ahern.

15) Memory leak in NFC's llcp_sock_bind, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (72 commits)
  selftests/net: add nettest to .gitignore
  net: qlogic: Fix memory leak in ql_alloc_large_buffers
  nfc: fix memory leak in llcp_sock_bind()
  sch_dsmark: fix potential NULL deref in dsmark_init()
  net: phy: at803x: use operating parameters from PHY-specific status
  net: phy: extract pause mode
  net: phy: extract link partner advertisement reading
  net: phy: fix write to mii-ctrl1000 register
  ipv6: Handle missing host route in __ipv6_ifa_notify
  net: phy: allow for reset line to be tied to a sleepy GPIO controller
  net: ipv4: avoid mixed n_redirects and rate_tokens usage
  r8152: Set macpassthru in reset_resume callback
  cxgb4:Fix out-of-bounds MSI-X info array access
  Revert "ipv6: Handle race in addrconf_dad_work"
  net: make sock_prot_memory_pressure() return "const char *"
  rxrpc: Fix rxrpc_recvmsg tracepoint
  qmi_wwan: add support for Cinterion CLS8 devices
  tcp: fix slab-out-of-bounds in tcp_zerocopy_receive()
  lib: textsearch: fix escapes in example code
  udp: only do GSO if # of segs > 1
  ...

2 files changed, 5 insertions, 12 deletions

diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
index c7cced739c34..8aefd81fbc86 100644
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@ -21,3 +21,4 @@ ipv6_flowlabel
 ipv6_flowlabel_mgr
 so_txtime
 tcp_fastopen_backup_key
+nettest
diff --git a/tools/testing/selftests/net/udpgso.c b/tools/testing/selftests/net/udpgso.c
index b8265ee9923f..614b31aad168 100644
--- a/tools/testing/selftests/net/udpgso.c
+++ b/tools/testing/selftests/net/udpgso.c
@@ -89,12 +89,9 @@ struct testcase testcases_v4[] = {
                 .tfail = true,
         },
         {
-                /* send a single MSS: will fail with GSO, because the segment
-                 * logic in udp4_ufo_fragment demands a gso skb to be > MTU
-                 */
+                /* send a single MSS: will fall back to no GSO */
                 .tlen = CONST_MSS_V4,
                 .gso_len = CONST_MSS_V4,
-                .tfail = true,
                 .r_num_mss = 1,
         },
         {
@@ -139,10 +136,9 @@ struct testcase testcases_v4[] = {
                 .tfail = true,
         },
         {
-                /* send a single 1B MSS: will fail, see single MSS above */
+                /* send a single 1B MSS: will fall back to no GSO */
                 .tlen = 1,
                 .gso_len = 1,
-                .tfail = true,
                 .r_num_mss = 1,
         },
         {
@@ -196,12 +192,9 @@ struct testcase testcases_v6[] = {
                 .tfail = true,
         },
         {
-                /* send a single MSS: will fail with GSO, because the segment
-                 * logic in udp4_ufo_fragment demands a gso skb to be > MTU
-                 */
+                /* send a single MSS: will fall back to no GSO */
                 .tlen = CONST_MSS_V6,
                 .gso_len = CONST_MSS_V6,
-                .tfail = true,
                 .r_num_mss = 1,
         },
         {
@@ -246,10 +239,9 @@ struct testcase testcases_v6[] = {
                 .tfail = true,
         },
         {
-                /* send a single 1B MSS: will fail, see single MSS above */
+                /* send a single 1B MSS: will fall back to no GSO */
                 .tlen = 1,
                 .gso_len = 1,
-                .tfail = true,
                 .r_num_mss = 1,
         },
         {