Commit 17bbde2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from Bluetooth.

  Current release - new code bugs:

    - eth:
       - txgbe: fix the issue of TX failure
       - ngbe: specify IRQ vector when the number of VFs is 7

  Previous releases - regressions:

    - sched: always pass notifications when child class becomes empty

    - ipv4: fix stat increase when udp early demux drops the packet

    - bluetooth: prevent unintended pause by checking if advertising is active

    - virtio: fix error reporting in virtqueue_resize

    - eth:
       - virtio-net:
          - ensure the received length does not exceed allocated size
          - fix the xsk frame's length check
       - lan78xx: fix WARN in __netif_napi_del_locked on disconnect

  Previous releases - always broken:

    - bluetooth: mesh: check instances prior disabling advertising

    - eth:
       - idpf: convert control queue mutex to a spinlock
       - dpaa2: fix xdp_rxq_info leak
       - amd-xgbe: align CL37 AN sequence as per databook"

* tag 'net-6.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (38 commits)
  vsock/vmci: Clear the vmci transport packet properly when initializing it
  dt-bindings: net: sophgo,sg2044-dwmac: Drop status from the example
  net: ngbe: specify IRQ vector when the number of VFs is 7
  net: wangxun: revert the adjustment of the IRQ vector sequence
  net: txgbe: request MISC IRQ in ndo_open
  virtio_net: Enforce minimum TX ring size for reliability
  virtio_net: Cleanup '2+MAX_SKB_FRAGS'
  virtio_ring: Fix error reporting in virtqueue_resize
  virtio-net: xsk: rx: fix the frame's length check
  virtio-net: use the check_mergeable_len helper
  virtio-net: remove redundant truesize check with PAGE_SIZE
  virtio-net: ensure the received length does not exceed allocated size
  net: ipv4: fix stat increase when udp early demux drops the packet
  net: libwx: fix the incorrect display of the queue number
  amd-xgbe: do not double read link status
  net/sched: Always pass notifications when child class becomes empty
  nui: Fix dma_mapping_error() check
  rose: fix dangling neighbour pointers in rose_rt_device_down()
  enic: fix incorrect MTU comparison in enic_change_mtu()
  amd-xgbe: align CL37 AN sequence as per databook
  ...
parents d32e907d 223e2288

Documentation/devicetree/bindings/net/sophgo,sg2044-dwmac.yaml

+2 −1
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ examples: 
      interrupt-parent = <&intc>;

      interrupts = <296 IRQ_TYPE_LEVEL_HIGH>;

      interrupt-names = "macirq";

      phy-handle = <&phy0>;

      phy-mode = "rgmii-id";

      resets = <&rst 30>;

      reset-names = "stmmaceth";

      snps,multicast-filter-bins = <0>;
@@ -91,7 +93,6 @@ examples: 
      snps,mtl-rx-config = <&gmac0_mtl_rx_setup>;

      snps,mtl-tx-config = <&gmac0_mtl_tx_setup>;

      snps,axi-config = <&gmac0_stmmac_axi_setup>;

      status = "disabled";



      gmac0_mtl_rx_setup: rx-queues-config {

        snps,rx-queues-to-use = <8>;

Documentation/networking/tls.rst

+3 −1
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ User interface 
Creating a TLS connection

-------------------------



First create a new TCP socket and set the TLS ULP.

First create a new TCP socket and once the connection is established set the

TLS ULP.



.. code-block:: c



  sock = socket(AF_INET, SOCK_STREAM, 0);

  connect(sock, addr, addrlen);

  setsockopt(sock, SOL_TCP, TCP_ULP, "tls", sizeof("tls"));



Setting the TLS ULP allows us to set/get TLS socket options. Currently

Documentation/process/maintainer-netdev.rst

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ Posting as one thread is discouraged because it confuses patchwork 
(as of patchwork 2.2.2).



Co-posting selftests

--------------------

~~~~~~~~~~~~~~~~~~~~



Selftests should be part of the same series as the code changes.

Specifically for fixes both code change and related test should go into

MAINTAINERS

+7 −3
Original line number Diff line number Diff line
@@ -15550,6 +15550,7 @@ F: drivers/net/ethernet/mellanox/mlx4/en_* 
MELLANOX ETHERNET DRIVER (mlx5e)

M:	Saeed Mahameed <saeedm@nvidia.com>

M:	Tariq Toukan <tariqt@nvidia.com>

M:	Mark Bloch <mbloch@nvidia.com>

L:	netdev@vger.kernel.org

S:	Maintained

W:	https://www.nvidia.com/networking/
@@ -15619,6 +15620,7 @@ MELLANOX MLX5 core VPI driver 
M:	Saeed Mahameed <saeedm@nvidia.com>

M:	Leon Romanovsky <leonro@nvidia.com>

M:	Tariq Toukan <tariqt@nvidia.com>

M:	Mark Bloch <mbloch@nvidia.com>

L:	netdev@vger.kernel.org

L:	linux-rdma@vger.kernel.org

S:	Maintained
@@ -21198,7 +21200,7 @@ M: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> 
L:	netdev@vger.kernel.org

L:	linux-renesas-soc@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/net/renesas,r9a09g057-gbeth.yaml

F:	Documentation/devicetree/bindings/net/renesas,rzv2h-gbeth.yaml

F:	drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c









RENESAS RZ/V2H(P) USB2PHY PORT RESET DRIVER








@@ -22586,9 +22588,11 @@ S:	Maintained







F:	drivers/misc/sgi-xp/

















SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS









M:	D. Wythe <alibuda@linux.alibaba.com>









M:	Dust Li <dust.li@linux.alibaba.com>









M:	Sidraya Jayagond <sidraya@linux.ibm.com>









M:	Wenjia Zhang <wenjia@linux.ibm.com>









M:	Jan Karcher <jaka@linux.ibm.com>









R:	D. Wythe <alibuda@linux.alibaba.com>









R:	Mahanta Jambigi <mjambigi@linux.ibm.com>









R:	Tony Lu <tonylu@linux.alibaba.com>









R:	Wen Gu <guwen@linux.alibaba.com>









L:	linux-rdma@vger.kernel.org

























drivers/net/ethernet/amd/xgbe/xgbe-common.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -1269,6 +1269,8 @@







#define MDIO_VEND2_CTRL1_SS13		BIT(13)









#endif



















#define XGBE_VEND2_MAC_AUTO_SW		BIT(9)



















/* MDIO mask values */









#define XGBE_AN_CL73_INT_CMPLT		BIT(0)









#define XGBE_AN_CL73_INC_LINK		BIT(1)