Commit 68433066 authored Jul 05, 2023 by Linus Torvalds

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bluetooth, bpf and wireguard.

  Current release - regressions:

   - nvme-tcp: fix comma-related oops after sendpage changes

  Current release - new code bugs:

   - ptp: make max_phase_adjustment sysfs device attribute invisible
     when not supported

  Previous releases - regressions:

   - sctp: fix potential deadlock on &net->sctp.addr_wq_lock

   - mptcp:
      - ensure subflow is unhashed before cleaning the backlog
      - do not rely on implicit state check in mptcp_listen()

  Previous releases - always broken:

   - net: fix net_dev_start_xmit trace event vs skb_transport_offset()

   - Bluetooth:
      - fix use-bdaddr-property quirk
      - L2CAP: fix multiple UaFs
      - ISO: use hci_sync for setting CIG parameters
      - hci_event: fix Set CIG Parameters error status handling
      - hci_event: fix parsing of CIS Established Event
      - MGMT: fix marking SCAN_RSP as not connectable

   - wireguard: queuing: use saner cpu selection wrapping

   - sched: act_ipt: various bug fixes for iptables <> TC interactions

   - sched: act_pedit: add size check for TCA_PEDIT_PARMS_EX

   - dsa: fixes for receiving PTP packets with 8021q and sja1105 tagging

   - eth: sfc: fix null-deref in devlink port without MAE access

   - eth: ibmvnic: do not reset dql stats on NON_FATAL err

  Misc:

   - xsk: honor SO_BINDTODEVICE on bind"

* tag 'net-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (70 commits)
  nfp: clean mc addresses in application firmware when closing port
  selftests: mptcp: pm_nl_ctl: fix 32-bit support
  selftests: mptcp: depend on SYN_COOKIES
  selftests: mptcp: userspace_pm: report errors with 'remove' tests
  selftests: mptcp: userspace_pm: use correct server port
  selftests: mptcp: sockopt: return error if wrong mark
  selftests: mptcp: sockopt: use 'iptables-legacy' if available
  selftests: mptcp: connect: fail if nft supposed to work
  mptcp: do not rely on implicit state check in mptcp_listen()
  mptcp: ensure subflow is unhashed before cleaning the backlog
  s390/qeth: Fix vipa deletion
  octeontx-af: fix hardware timestamp configuration
  net: dsa: sja1105: always enable the send_meta options
  net: dsa: tag_sja1105: fix MAC DA patching from meta frames
  net: Replace strlcpy with strscpy
  pptp: Fix fib lookup calls.
  mlxsw: spectrum_router: Fix an IS_ERR() vs NULL check
  net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX
  xsk: Honor SO_BINDTODEVICE on bind
  ptp: Make max_phase_adjustment sysfs device attribute invisible when not supported
  ...

parents 73a3fcda cc7eab25

Documentation/ABI/testing/sysfs-class-net-qmi

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ Description:
		What: /sys/class/net/<iface>/qmi/pass_through
		Date: January 2021
		KernelVersion: 5.12
		Contact: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
		Contact: Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>
		Description:
		Boolean. Default: 'N'

Documentation/networking/af_xdp.rst

+9 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,15 @@ start N bytes into the buffer leaving the first N bytes for the
		application to use. The final option is the flags field, but it will
		be dealt with in separate sections for each UMEM flag.

		SO_BINDTODEVICE setsockopt
		--------------------------

		This is a generic SOL_SOCKET option that can be used to tie AF_XDP
		socket to a particular network interface. It is useful when a socket
		is created by a privileged process and passed to a non-privileged one.
		Once the option is set, kernel will refuse attempts to bind that socket
		to a different interface. Updating the value requires CAP_NET_RAW.

		XDP_STATISTICS getsockopt
		-------------------------

Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst

+3 −4

Original line number	Diff line number	Diff line
		@@ -190,8 +190,7 @@ MAP header\|IP Packet\|Optional padding\|MAP header\|Command Packet\|Optional pad...
		3. Userspace configuration
		==========================

		rmnet userspace configuration is done through netlink library librmnetctl
		and command line utility rmnetcli. Utility is hosted in codeaurora forum git.
		The driver uses rtnl_link_ops for communication.
		rmnet userspace configuration is done through netlink using iproute2
		https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/

		https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/dataservices/tree/rmnetctl
		The driver uses rtnl_link_ops for communication.

Documentation/process/maintainer-netdev.rst

+5 −2

Original line number	Diff line number	Diff line
		@@ -149,8 +149,11 @@ themselves. No email should ever be sent to the list with the main purpose
		of communicating with the bot, the bot commands should be seen as metadata.

		The use of the bot is restricted to authors of the patches (the ``From:``
		header on patch submission and command must match!), maintainers themselves
		and a handful of senior reviewers. Bot records its activity here:
		header on patch submission and command must match!), maintainers of
		the modified code according to the MAINTAINERS file (again, ``From:``
		must match the MAINTAINERS entry) and a handful of senior reviewers.

		Bot records its activity here:

		https://patchwork.hopto.org/pw-bot.html

drivers/bluetooth/btqca.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -637,7 +637,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
		snprintf(config.fwname, sizeof(config.fwname),
		"qca/%s", firmware_name);
		else if (qca_is_wcn399x(soc_type)) {
		if (ver.soc_id == QCA_WCN3991_SOC_ID) {
		if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID) {
		snprintf(config.fwname, sizeof(config.fwname),
		"qca/crnv%02xu.bin", rom_ver);
		} else {