Merge tag 'net-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski:
 "Networking fixes, including fixes from netfilter, wireless and bpf
  trees.

  Current release - regressions:

   - mt76: fix NULL pointer dereference in mt76u_status_worker and
     mt76s_process_tx_queue

   - net: ipa: fix interconnect enable bug

  Current release - always broken:

   - netfilter: fixes possible oops in mtype_resize in ipset

   - ath11k: fix number of coding issues found by static analysis tools
     and spurious error messages

  Previous releases - regressions:

   - e1000e: re-enable s0ix power saving flows for systems with the
     Intel i219-LM Ethernet controllers to fix power use regression

   - virtio_net: fix recursive call to cpus_read_lock() to avoid a
     deadlock

   - ipv4: ignore ECN bits for fib lookups in fib_compute_spec_dst()

   - sysfs: take the rtnl lock around XPS configuration

   - xsk: fix memory leak for failed bind and rollback reservation at
     NETDEV_TX_BUSY

   - r8169: work around power-saving bug on some chip versions

  Previous releases - always broken:

   - dcb: validate netlink message in DCB handler

   - tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS
     to prevent unnecessary retries

   - vhost_net: fix ubuf refcount when sendmsg fails

   - bpf: save correct stopping point in file seq iteration

   - ncsi: use real net-device for response handler

   - neighbor: fix div by zero caused by a data race (TOCTOU)

   - bareudp: fix use of incorrect min_headroom size and a false
     positive lockdep splat from the TX lock

   - mvpp2:
      - clear force link UP during port init procedure in case
        bootloader had set it
      - add TCAM entry to drop flow control pause frames
      - fix PPPoE with ipv6 packet parsing
      - fix GoP Networking Complex Control config of port 3
      - fix pkt coalescing IRQ-threshold configuration

   - xsk: fix race in SKB mode transmit with shared cq

   - ionic: account for vlan tag len in rx buffer len

   - stmmac: ignore the second clock input, current clock framework does
     not handle exclusive clock use well, other drivers may reconfigure
     the second clock

  Misc:

   - ppp: change PPPIOCUNBRIDGECHAN ioctl request number to follow
     existing scheme"

* tag 'net-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (99 commits)
  net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access
  net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs
  net: lapb: Decrease the refcount of "struct lapb_cb" in lapb_device_event
  r8169: work around power-saving bug on some chip versions
  net: usb: qmi_wwan: add Quectel EM160R-GL
  selftests: mlxsw: Set headroom size of correct port
  net: macb: Correct usage of MACB_CAPS_CLK_HW_CHG flag
  ibmvnic: fix: NULL pointer dereference.
  docs: networking: packet_mmap: fix old config reference
  docs: networking: packet_mmap: fix formatting for C macros
  vhost_net: fix ubuf refcount incorrectly when sendmsg fails
  bareudp: Fix use of incorrect min_headroom size
  bareudp: set NETIF_F_LLTX flag
  net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
  atlantic: remove architecture depends
  erspan: fix version 1 check in gre_parse_header()
  net: hns: fix return value check in __lb_other_process()
  net: sched: prevent invalid Scell_log shift count
  net: neighbor: fix a crash caused by mod zero
  ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
  ...

diff --combined MAINTAINERS
index 6eff4f720c721cf37ea0a37da9a0b23af6702f34,80f75ab960cd8ed8ceb00459e0135c3b13df32d4..7c1e45c416b17f583884d9c9f3d445c05c5af89a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -203,8 -203,8 +203,8 @@@ F: include/uapi/linux/nl80211.
  F:    net/wireless/
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
- M:    Realtek linux nic maintainers <[email protected]>
  M:    Heiner Kallweit <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/realtek/r8169*
@@@ -1183,7 -1183,7 +1183,7 @@@ F:      Documentation/devicetree/bindings/in
  F:    drivers/irqchip/irq-goldfish-pic.c
  
  ANDROID GOLDFISH RTC DRIVER
 -M:    Miodrag Dinic <miodrag.dinic@mips.com>
 +M:    Jiaxun Yang <jiaxun.yang@flygoat.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
  F:    drivers/rtc/rtc-goldfish.c
@@@ -2119,7 -2119,7 +2119,7 @@@ N:      atme
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
- M:    Microchip Linux Driver Support <[email protected]>
+ M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://github.com/microchip-ung/linux-upstream.git
@@@ -2146,10 -2146,8 +2146,10 @@@ L:    [email protected]
  S:    Maintained
  W:    http://linux-chenxing.org/
  F:    Documentation/devicetree/bindings/arm/mstar/*
 +F:    Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
  F:    arch/arm/boot/dts/mstar-*
  F:    arch/arm/mach-mstar/
 +F:    drivers/gpio/gpio-msc313.c
  F:    include/dt-bindings/gpio/msc313-gpio.h
  
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
@@@ -3199,7 -3197,6 +3199,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    block/
  F:    drivers/block/
 +F:    fs/block_dev.c
  F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
@@@ -3556,7 -3553,7 +3556,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/bnxt/
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
- M:    Arend van Spriel <arend.vanspriel@broadcom.com>
+ M:    Arend van Spriel <aspriel@gmail.com>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
  M:    Chi-hsien Lin <[email protected]>
@@@ -3961,7 -3958,7 +3961,7 @@@ F:      net/can
  CAN-J1939 NETWORK LAYER
  M:    Robin van der Gracht <[email protected]>
  M:    Oleksij Rempel <[email protected]>
- R:    Pengutronix Kernel Team <[email protected]>
+ R:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/j1939.rst
@@@ -4355,8 -4352,8 +4355,8 @@@ T:      git git://linuxtv.org/media_tree.gi
  F:    drivers/media/pci/cobalt/
  
  COCCINELLE/Semantic Patches (SmPL)
 -M:    Julia Lawall <Julia.Lawall@lip6.fr>
 -M:    Gilles Muller <Gilles.Muller@lip6.fr>
 +M:    Julia Lawall <Julia.Lawall@inria.fr>
 +M:    Gilles Muller <Gilles.Muller@inria.fr>
  M:    Nicolas Palix <[email protected]>
  M:    Michal Marek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -4588,7 -4585,7 +4588,7 @@@ B:      https://bugzilla.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  F:    Documentation/admin-guide/pm/cpuidle.rst
  F:    Documentation/driver-api/pm/cpuidle.rst
 -F:    drivers/cpuidle/*
 +F:    drivers/cpuidle/
  F:    include/linux/cpuidle.h
  
  CPU POWER MONITORING SUBSYSTEM
@@@ -5298,12 -5295,6 +5298,12 @@@ F:    include/linux/dma-mapping.
  F:    include/linux/dma-map-ops.h
  F:    kernel/dma/
  
 +DMA MAPPING BENCHMARK
 +M:    Barry Song <[email protected]>
 +L:    [email protected]
 +F:    kernel/dma/map_benchmark.c
 +F:    tools/testing/selftests/dma/
 +
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <[email protected]>
  R:    Benjamin Gaignard <[email protected]>
@@@ -7509,7 -7500,7 +7509,7 @@@ M:      Bob Peterson <[email protected]
  M:    Andreas Gruenbacher <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://sources.redhat.com/cluster/
 +B:    https://bugzilla.kernel.org/enter_bug.cgi?product=File%20System&component=gfs2
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
  F:    Documentation/filesystems/gfs2*
  F:    fs/gfs2/
@@@ -7557,7 -7548,6 +7557,7 @@@ M:      Andy Shevchenko <andriy.shevchenko@l
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    Documentation/firmware-guide/acpi/gpio-properties.rst
  F:    drivers/gpio/gpiolib-acpi.c
  F:    drivers/gpio/gpiolib-acpi.h
@@@ -7991,12 -7981,6 +7991,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/dma/hisi_dma.c
  
 +HISILICON GPIO DRIVER
 +M:    Luo Jiaxing <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-hisi.c
 +
  HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
  M:    Zaibo Xu <[email protected]>
  L:    [email protected]
@@@ -8423,7 -8407,7 +8423,7 @@@ F:      Documentation/devicetree/bindings/i3
  F:    drivers/i3c/master/dw*
  
  I3C SUBSYSTEM
 -M:    Boris Brezillon <[email protected]>
 +M:    Alexandre Belloni <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  C:    irc://chat.freenode.net/linux-i3c
@@@ -11667,7 -11651,7 +11667,7 @@@ F:   drivers/media/platform/atmel/atmel-i
  
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
  M:    Woojung Huh <[email protected]>
- M:    Microchip Linux Driver Support <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
@@@ -11677,7 -11661,7 +11677,7 @@@ F:   net/dsa/tag_ksz.
  
  MICROCHIP LAN743X ETHERNET DRIVER
  M:    Bryan Whitehead <[email protected]>
- M:    Microchip Linux Driver Support <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
@@@ -11771,7 -11755,7 +11771,7 @@@ F:   drivers/net/wireless/microchip/wilc1
  
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
- M:    Microchip Linux Driver Support <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
@@@ -12825,10 -12809,10 +12825,10 @@@ F:        tools/objtool
  F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
- M:    Microchip Linux Driver Support <[email protected]>
  M:    Vladimir Oltean <[email protected]>
  M:    Claudiu Manoil <[email protected]>
  M:    Alexandre Belloni <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/dsa/ocelot/*
@@@ -13890,7 -13874,7 +13890,7 @@@ F:   drivers/platform/x86/peaq-wmi.
  
  PENSANDO ETHERNET DRIVERS
  M:    Shannon Nelson <[email protected]>
- M:    Pensando Drivers <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
@@@ -14669,7 -14653,7 +14669,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/net/wireless/ath/ath11k/
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
- M:    QCA ath9k Development <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
@@@ -15115,7 -15099,7 +15115,7 @@@ RENESAS CLOCK DRIVER
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-clk
  F:    Documentation/devicetree/bindings/clock/renesas,*
  F:    drivers/clk/renesas/
  
@@@ -16917,22 -16901,6 +16917,22 @@@ M: Ion Badulescu <[email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STATIC BRANCH/CALL
 +M:    Peter Zijlstra <[email protected]>
 +M:    Josh Poimboeuf <[email protected]>
 +M:    Jason Baron <[email protected]>
 +R:    Steven Rostedt <[email protected]>
 +R:    Ard Biesheuvel <[email protected]>
 +S:    Supported
 +F:    arch/*/include/asm/jump_label*.h
 +F:    arch/*/include/asm/static_call*.h
 +F:    arch/*/kernel/jump_label.c
 +F:    arch/*/kernel/static_call.c
 +F:    include/linux/jump_label*.h
 +F:    include/linux/static_call*.h
 +F:    kernel/jump_label.c
 +F:    kernel/static_call.c
 +
  STEC S1220 SKD DRIVER
  M:    Damien Le Moal <[email protected]>
  L:    [email protected]
@@@ -18370,7 -18338,7 +18370,7 @@@ F:   include/linux/usb/isp116x.
  
  USB LAN78XX ETHERNET DRIVER
  M:    Woojung Huh <[email protected]>
- M:    Microchip Linux Driver Support <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/microchip,lan78xx.txt
@@@ -18484,7 -18452,7 +18484,7 @@@ F:   drivers/net/usb/smsc75xx.
  
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <[email protected]>
- M:    Microchip Linux Driver Support <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
@@@ -19031,7 -18999,7 +19031,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <[email protected]>
- M:    "VMware, Inc." <[email protected]>
+ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -19532,16 -19500,6 +19532,16 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/net/can/xilinx_can.txt
  F:    drivers/net/can/xilinx_can.c
  
 +XILINX GPIO DRIVER
 +M:    Shubhrajyoti Datta <[email protected]>
 +R:    Srinivas Neeli <[email protected]>
 +R:    Michal Simek <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/gpio-xilinx.txt
 +F:    Documentation/devicetree/bindings/gpio/gpio-zynq.txt
 +F:    drivers/gpio/gpio-xilinx.c
 +F:    drivers/gpio/gpio-zynq.c
 +
  XILINX SD-FEC IP CORES
  M:    Derek Kiernan <[email protected]>
  M:    Dragan Cvetic <[email protected]>

diff --combined drivers/net/virtio_net.c
index 4c41df624dbb1ee0dd68b1fa50d2ee39bc1dad8b,ee611d10729455672a6511ed796b5a7af810430a..508408fbe78fbd8658dc226834b5b1b334b8b011
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -2093,14 -2093,16 +2093,16 @@@ static int virtnet_set_channels(struct 
  
        get_online_cpus();
        err = _virtnet_set_queues(vi, queue_pairs);
-       if (!err) {
-               netif_set_real_num_tx_queues(dev, queue_pairs);
-               netif_set_real_num_rx_queues(dev, queue_pairs);
- 
-               virtnet_set_affinity(vi);
+       if (err) {
+               put_online_cpus();
+               goto err;
        }
+       virtnet_set_affinity(vi);
        put_online_cpus();
  
+       netif_set_real_num_tx_queues(dev, queue_pairs);
+       netif_set_real_num_rx_queues(dev, queue_pairs);
+  err:
        return err;
  }
  
@@@ -3072,7 -3074,6 +3074,7 @@@ static int virtnet_probe(struct virtio_
                        dev_err(&vdev->dev,
                                "device MTU appears to have changed it is now %d < %d",
                                mtu, dev->min_mtu);
 +                      err = -EINVAL;
                        goto free;
                }