Commit 183d46ff authored Aug 01, 2024 by Linus Torvalds

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from wireless, bleutooth, BPF and netfilter.

  Current release - regressions:

   - core: drop bad gso csum_start and offset in virtio_net_hdr

   - wifi: mt76: fix null pointer access in mt792x_mac_link_bss_remove

   - eth: tun: add missing bpf_net_ctx_clear() in do_xdp_generic()

   - phy: aquantia: only poll GLOBAL_CFG regs on aqr113, aqr113c and
     aqr115c

  Current release - new code bugs:

   - smc: prevent UAF in inet_create()

   - bluetooth: btmtk: fix kernel crash when entering btmtk_usb_suspend

   - eth: bnxt: reject unsupported hash functions

  Previous releases - regressions:

   - sched: act_ct: take care of padding in struct zones_ht_key

   - netfilter: fix null-ptr-deref in iptable_nat_table_init().

   - tcp: adjust clamping window for applications specifying SO_RCVBUF

  Previous releases - always broken:

   - ethtool: rss: small fixes to spec and GET

   - mptcp:
      - fix signal endpoint re-add
      - pm: fix backup support in signal endpoints

   - wifi: ath12k: fix soft lockup on suspend

   - eth: bnxt_en: fix RSS logic in __bnxt_reserve_rings()

   - eth: ice: fix AF_XDP ZC timeout and concurrency issues

   - eth: mlx5:
      - fix missing lock on sync reset reload
      - fix error handling in irq_pool_request_irq"

* tag 'net-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (76 commits)
  mptcp: fix duplicate data handling
  mptcp: fix bad RCVPRUNED mib accounting
  ipv6: fix ndisc_is_useropt() handling for PIO
  igc: Fix double reset adapter triggered from a single taprio cmd
  net: MAINTAINERS: Demote Qualcomm IPA to "maintained"
  net: wan: fsl_qmc_hdlc: Discard received CRC
  net: wan: fsl_qmc_hdlc: Convert carrier_lock spinlock to a mutex
  net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
  net/mlx5e: Fix CT entry update leaks of modify header context
  net/mlx5e: Require mlx5 tc classifier action support for IPsec prio capability
  net/mlx5: Fix missing lock on sync reset reload
  net/mlx5: Lag, don't use the hardcoded value of the first port
  net/mlx5: DR, Fix 'stack guard page was hit' error in dr_rule
  net/mlx5: Fix error handling in irq_pool_request_irq
  net/mlx5: Always drain health in shutdown callback
  net: Add skbuff.h to MAINTAINERS
  r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
  netfilter: iptables: Fix potential null-ptr-deref in ip6table_nat_table_init().
  netfilter: iptables: Fix null-ptr-deref in iptable_nat_table_init().
  net: drop bad gso csum_start and offset in virtio_net_hdr
  ...

parents 21b136cc 25010bfd

Documentation/netlink/specs/ethtool.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1753,6 +1753,7 @@ operations:
		request:
		attributes:
		- header
		- context
		reply:
		attributes:
		- header
		@@ -1761,7 +1762,6 @@ operations:
		- indir
		- hkey
		- input_xfrm
		dump: *rss-get-op
		-
		name: plca-get-cfg
		doc: Get PLCA params.

Documentation/networking/ethtool-netlink.rst

+1 −0

Original line number	Diff line number	Diff line
		@@ -1875,6 +1875,7 @@ Kernel response contents:

		===================================== ====== ==========================
		``ETHTOOL_A_RSS_HEADER`` nested reply header
		``ETHTOOL_A_RSS_CONTEXT`` u32 context number
		``ETHTOOL_A_RSS_HFUNC`` u32 RSS hash func
		``ETHTOOL_A_RSS_INDIR`` binary Indir table bytes
		``ETHTOOL_A_RSS_HKEY`` binary Hash key bytes

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -15936,6 +15936,7 @@ F: include/linux/in.h
		F: include/linux/indirect_call_wrapper.h
		F: include/linux/net.h
		F: include/linux/netdevice.h
		F: include/linux/skbuff.h
		F: include/net/
		F: include/uapi/linux/in.h
		F: include/uapi/linux/net.h
		@@ -18556,7 +18557,7 @@ F: drivers/usb/misc/qcom_eud.c
		QCOM IPA DRIVER
		M: Alex Elder <elder@kernel.org>
		L: netdev@vger.kernel.org
		S: Supported
		S: Maintained
		F: drivers/net/ipa/

		QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT

drivers/bluetooth/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -413,6 +413,7 @@ config BT_ATH3K
		config BT_MTKSDIO
		tristate "MediaTek HCI SDIO driver"
		depends on MMC
		depends on USB \|\| !BT_HCIBTUSB_MTK
		select BT_MTK
		help
		MediaTek Bluetooth HCI SDIO driver.
		@@ -425,6 +426,7 @@ config BT_MTKSDIO
		config BT_MTKUART
		tristate "MediaTek HCI UART driver"
		depends on SERIAL_DEV_BUS
		depends on USB \|\| !BT_HCIBTUSB_MTK
		select BT_MTK
		help
		MediaTek Bluetooth HCI UART driver.

drivers/bluetooth/btintel.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -3085,6 +3085,9 @@ static int btintel_setup_combined(struct hci_dev *hdev)
		btintel_set_dsm_reset_method(hdev, &ver_tlv);

		err = btintel_bootloader_setup_tlv(hdev, &ver_tlv);
		if (err)
		goto exit_error;

		btintel_register_devcoredump_support(hdev);
		btintel_print_fseq_info(hdev);
		break;