Commit f291209e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from Bluetooth, netfilter, BPF and WiFi.

  I didn't collect precise data but feels like we've got a lot of 6.5
  fixes here. WiFi fixes are most user-awaited.

  Current release - regressions:

   - Bluetooth: fix hci_link_tx_to RCU lock usage

  Current release - new code bugs:

   - bpf: mprog: fix maximum program check on mprog attachment

   - eth: ti: icssg-prueth: fix signedness bug in prueth_init_tx_chns()

  Previous releases - regressions:

   - ipv6: tcp: add a missing nf_reset_ct() in 3WHS handling

   - vringh: don't use vringh_kiov_advance() in vringh_iov_xfer(), it
     doesn't handle zero length like we expected

   - wifi:
      - cfg80211: fix cqm_config access race, fix crashes with brcmfmac
      - iwlwifi: mvm: handle PS changes in vif_cfg_changed
      - mac80211: fix mesh id corruption on 32 bit systems
      - mt76: mt76x02: fix MT76x0 external LNA gain handling

   - Bluetooth: fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER

   - l2tp: fix handling of transhdrlen in __ip{,6}_append_data()

   - dsa: mv88e6xxx: avoid EEPROM timeout when EEPROM is absent

   - eth: stmmac: fix the incorrect parameter after refactoring

  Previous releases - always broken:

   - net: replace calls to sock->ops->connect() with kernel_connect(),
     prevent address rewrite in kernel_bind(); otherwise BPF hooks may
     modify arguments, unexpectedly to the caller

   - tcp: fix delayed ACKs when reads and writes align with MSS

   - bpf:
      - verifier: unconditionally reset backtrack_state masks on global
        func exit
      - s390: let arch_prepare_bpf_trampoline return program size, fix
        struct_ops offsets
      - sockmap: fix accounting of available bytes in presence of PEEKs
      - sockmap: reject sk_msg egress redirects to non-TCP sockets

   - ipv4/fib: send netlink notify when delete source address routes

   - ethtool: plca: fix width of reads when parsing netlink commands

   - netfilter: nft_payload: rebuild vlan header on h_proto access

   - Bluetooth: hci_codec: fix leaking memory of local_codecs

   - eth: intel: ice: always add legacy 32byte RXDID in supported_rxdids

   - eth: stmmac:
     - dwmac-stm32: fix resume on STM32 MCU
     - remove buggy and unneeded stmmac_poll_controller, depend on NAPI

   - ibmveth: always recompute TCP pseudo-header checksum, fix use of
     the driver with Open vSwitch

   - wifi:
      - rtw88: rtw8723d: fix MAC address offset in EEPROM
      - mt76: fix lock dependency problem for wed_lock
      - mwifiex: sanity check data reported by the device
      - iwlwifi: ensure ack flag is properly cleared
      - iwlwifi: mvm: fix a memory corruption due to bad pointer arithm
      - iwlwifi: mvm: fix incorrect usage of scan API

  Misc:

   - wifi: mac80211: work around Cisco AP 9115 VHT MPDU length"

* tag 'net-6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (99 commits)
  MAINTAINERS: update Matthieu's email address
  mptcp: userspace pm allow creating id 0 subflow
  mptcp: fix delegated action races
  net: stmmac: remove unneeded stmmac_poll_controller
  net: lan743x: also select PHYLIB
  net: ethernet: mediatek: disable irq before schedule napi
  net: mana: Fix oversized sge0 for GSO packets
  net: mana: Fix the tso_bytes calculation
  net: mana: Fix TX CQE error handling
  netlink: annotate data-races around sk->sk_err
  sctp: update hb timer immediately after users change hb_interval
  sctp: update transport state when processing a dupcook packet
  tcp: fix delayed ACKs for MSS boundary condition
  tcp: fix quick-ack counting to count actual ACKs of new data
  page_pool: fix documentation typos
  tipc: fix a potential deadlock on &tx->lock
  net: stmmac: dwmac-stm32: fix resume on STM32 MCU
  ipv4: Set offload_failed flag in fibmatch results
  netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
  netfilter: nf_tables: Deduplicate nft_register_obj audit logs
  ...
parents cb84fb87 c29d9845

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ Matthew Wilcox <willy@infradead.org> <willy@debian.org> 
Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>

Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>

Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>

Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>

Matthieu CASTET <castet.matthieu@free.fr>

Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>

Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>

MAINTAINERS

+2 −10
Original line number Diff line number Diff line
@@ -470,7 +470,6 @@ F: drivers/hwmon/adm1029.c 
ADM8211 WIRELESS DRIVER

L:	linux-wireless@vger.kernel.org

S:	Orphan

W:	https://wireless.wiki.kernel.org/

F:	drivers/net/wireless/admtek/adm8211.*









ADP1653 FLASH CONTROLLER DRIVER








@@ -9531,10 +9530,8 @@ F:	Documentation/devicetree/bindings/iio/pressure/honeywell,mprls0025pa.yaml







F:	drivers/iio/pressure/mprls0025pa.c

















HOST AP DRIVER









M:	Jouni Malinen <j@w1.fi>









L:	linux-wireless@vger.kernel.org









S:	Obsolete









W:	http://w1.fi/hostap-driver.html









F:	drivers/net/wireless/intersil/hostap/

















HP BIOSCFG DRIVER








@@ -14947,7 +14944,7 @@ K:	macsec







K:	\bmdo_

















NETWORKING [MPTCP]









M:	Matthieu Baerts <matthieu.baerts@tessares.net>









M:	Matthieu Baerts <matttbe@kernel.org>









M:	Mat Martineau <martineau@kernel.org>









L:	netdev@vger.kernel.org









L:	mptcp@lists.linux.dev








@@ -17602,6 +17599,7 @@ M:	Kalle Valo <kvalo@kernel.org>







M:	Jeff Johnson <quic_jjohnson@quicinc.com>









L:	ath12k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath12k









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git









F:	drivers/net/wireless/ath/ath12k/
















@@ -18132,8 +18130,6 @@ REALTEK WIRELESS DRIVER (rtlwifi family)







M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









W:	https://wireless.wiki.kernel.org/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git









F:	drivers/net/wireless/realtek/rtlwifi/

















REALTEK WIRELESS DRIVER (rtw88)








@@ -18661,7 +18657,6 @@ F:	drivers/media/dvb-frontends/rtl2832_sdr*







RTL8180 WIRELESS DRIVER









L:	linux-wireless@vger.kernel.org









S:	Orphan









W:	https://wireless.wiki.kernel.org/









F:	drivers/net/wireless/realtek/rtl818x/rtl8180/

















RTL8187 WIRELESS DRIVER








@@ -18669,14 +18664,12 @@ M:	Hin-Tak Leung <hintak.leung@gmail.com>







M:	Larry Finger <Larry.Finger@lwfinger.net>









L:	linux-wireless@vger.kernel.org









S:	Maintained









W:	https://wireless.wiki.kernel.org/









F:	drivers/net/wireless/realtek/rtl818x/rtl8187/

















RTL8XXXU WIRELESS DRIVER (rtl8xxxu)









M:	Jes Sorensen <Jes.Sorensen@gmail.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel









F:	drivers/net/wireless/realtek/rtl8xxxu/

















RTRS TRANSPORT DRIVERS








@@ -21658,7 +21651,6 @@ L:	linux-wireless@vger.kernel.org







S:	Orphan









W:	https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx









W:	https://wireless.wiki.kernel.org/en/users/Drivers/wl1251









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git









F:	drivers/net/wireless/ti/

















TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER

























arch/s390/net/bpf_jit_comp.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2513,7 +2513,7 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image,







			return -E2BIG;









	}



















	return ret;









	return tjit.common.prg;









}



















bool bpf_jit_supports_subprog_tailcalls(void)
































drivers/bluetooth/btusb.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -4419,6 +4419,7 @@ static int btusb_probe(struct usb_interface *intf,

















	if (id->driver_info & BTUSB_QCA_ROME) {









		data->setup_on_usb = btusb_setup_qca;









		hdev->shutdown = btusb_shutdown_qca;









		hdev->set_bdaddr = btusb_set_bdaddr_ath3012;









		hdev->cmd_timeout = btusb_qca_cmd_timeout;









		set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
































drivers/dma/ti/k3-udma-glue.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -558,6 +558,9 @@ int k3_udma_glue_tx_get_irq(struct k3_udma_glue_tx_channel *tx_chn)







		tx_chn->virq = k3_ringacc_get_ring_irq_num(tx_chn->ringtxcq);









	}



















	if (!tx_chn->virq)









		return -ENXIO;



















	return tx_chn->virq;









}









EXPORT_SYMBOL_GPL(k3_udma_glue_tx_get_irq);