Commit 033771c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bluetooth, wireless and netfilter.

  There's one fix for power management with Intel's e1000e here,
  Thorsten tells us there's another problem that started in v6.9. We're
  trying to wrap that up but I don't think it's blocking.

  Current release - new code bugs:

   - wifi: mac80211: disable softirqs for queued frame handling

   - af_unix: fix uninit-value in __unix_walk_scc(), with the new
     garbage collection algo

  Previous releases - regressions:

   - Bluetooth:
      - qca: fix BT enable failure for QCA6390 after warm reboot
      - add quirk to ignore reserved PHY bits in LE Extended Adv Report,
        abused by some Broadcom controllers found on Apple machines

   - wifi: wilc1000: fix ies_len type in connect path

  Previous releases - always broken:

   - tcp: fix DSACK undo in fast recovery to call tcp_try_to_open(),
     avoid premature timeouts

   - net: make sure skb_datagram_iter maps fragments page by page, in
     case we somehow get compound highmem mixed in

   - eth: bnx2x: fix multiple UBSAN array-index-out-of-bounds when more
     queues are used

  Misc:

   - MAINTAINERS: Remembering Larry Finger"

* tag 'net-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (62 commits)
  bnxt_en: Fix the resource check condition for RSS contexts
  mlxsw: core_linecards: Fix double memory deallocation in case of invalid INI file
  inet_diag: Initialize pad field in struct inet_diag_req_v2
  tcp: Don't flag tcp_sk(sk)->rx_opt.saw_unknown for TCP AO.
  selftests: make order checking verbose in msg_zerocopy selftest
  selftests: fix OOM in msg_zerocopy selftest
  ice: use proper macro for testing bit
  ice: Reject pin requests with unsupported flags
  ice: Don't process extts if PTP is disabled
  ice: Fix improper extts handling
  selftest: af_unix: Add test case for backtrack after finalising SCC.
  af_unix: Fix uninit-value in __unix_walk_scc()
  bonding: Fix out-of-bounds read in bond_option_arp_ip_targets_set()
  net: rswitch: Avoid use-after-free in rswitch_poll()
  netfilter: nf_tables: unconditionally flush pending work before notifier
  wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference
  wifi: iwlwifi: mvm: avoid link lookup in statistics
  wifi: iwlwifi: mvm: don't wake up rx_sync_waitq upon RFKILL
  wifi: iwlwifi: properly set WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK
  wifi: wilc1000: fix ies_len type in connect path
  ...
parents d470e9f5 5d350dc3

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,10 @@ D: UDF filesystem 
S: (ask for current address)

S: USA



N: Larry Finger

E: Larry.Finger@lwfinger.net

D: Maintainer of wireless drivers, too many to list here



N: Jürgen Fischer

E: fischer@norbit.de

D: Author of Adaptec AHA-152x SCSI driver

MAINTAINERS

+5 −8
Original line number Diff line number Diff line
@@ -3601,10 +3601,9 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/b43 
F:	drivers/net/wireless/broadcom/b43/









B43LEGACY WIRELESS DRIVER









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









L:	linux-wireless@vger.kernel.org









L:	b43-dev@lists.infradead.org









S:	Maintained









S:	Orphan









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









F:	drivers/net/wireless/broadcom/b43legacy/
















@@ -18374,7 +18373,7 @@ M:	Jeff Johnson <jjohnson@kernel.org>







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









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









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









N:	ath12k
















@@ -18384,7 +18383,7 @@ M:	Jeff Johnson <jjohnson@kernel.org>







L:	ath10k@lists.infradead.org









S:	Supported









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









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









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









F:	drivers/net/wireless/ath/ath10k/









N:	ath10k
















@@ -18395,7 +18394,7 @@ L:	ath11k@lists.infradead.org







S:	Supported









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









B:	https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport









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









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









F:	drivers/net/wireless/ath/ath11k/









N:	ath11k
















@@ -18404,7 +18403,7 @@ M:	Toke Høiland-Jørgensen <toke@toke.dk>







L:	linux-wireless@vger.kernel.org









S:	Maintained









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









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









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









F:	Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml









F:	drivers/net/wireless/ath/ath9k/
















@@ -19509,7 +19508,6 @@ F:	drivers/net/wireless/realtek/rtl818x/rtl8180/















RTL8187 WIRELESS DRIVER









M:	Hin-Tak Leung <hintak.leung@gmail.com>









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









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git








@@ -21247,7 +21245,6 @@ W:	http://wiki.laptop.org/go/DCON







F:	drivers/staging/olpc_dcon/

















STAGING - REALTEK RTL8712U DRIVERS









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









M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.









S:	Odd Fixes









F:	drivers/staging/rtl8712/

























drivers/bluetooth/btintel_pcie.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -382,7 +382,7 @@ static int btintel_pcie_recv_frame(struct btintel_pcie_data *data,

















	/* The first 4 bytes indicates the Intel PCIe specific packet type */









	pdata = skb_pull_data(skb, BTINTEL_PCIE_HCI_TYPE_LEN);









	if (!data) {









	if (!pdata) {









		bt_dev_err(hdev, "Corrupted packet received");









		ret = -EILSEQ;









		goto exit_error;
































drivers/bluetooth/btnxpuart.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -281,7 +281,7 @@ static u8 crc8_table[CRC8_TABLE_SIZE];

















/* Default configurations */









#define DEFAULT_H2C_WAKEUP_MODE	WAKEUP_METHOD_BREAK









#define DEFAULT_PS_MODE		PS_MODE_DISABLE









#define DEFAULT_PS_MODE		PS_MODE_ENABLE









#define FW_INIT_BAUDRATE	HCI_NXP_PRI_BAUDRATE



















static struct sk_buff *nxp_drv_send_cmd(struct hci_dev *hdev, u16 opcode,
































drivers/bluetooth/hci_bcm4377.c



+9
−1






























Original line number
Diff line number
Diff line







@@ -495,6 +495,10 @@ struct bcm4377_data;







 *                  extended scanning









 * broken_mws_transport_config: Set to true if the chip erroneously claims to









 *                              support MWS Transport Configuration









 * broken_le_ext_adv_report_phy: Set to true if this chip stuffs flags inside









 *                               reserved bits of Primary/Secondary_PHY inside









 *                               LE Extended Advertising Report events which









 *                               have to be ignored









 * send_calibration: Optional callback to send calibration data









 * send_ptb: Callback to send "PTB" regulatory/calibration data









 */








@@ -513,6 +517,7 @@ struct bcm4377_hw {







	unsigned long broken_ext_scan : 1;









	unsigned long broken_mws_transport_config : 1;









	unsigned long broken_le_coded : 1;









	unsigned long broken_le_ext_adv_report_phy : 1;



















	int (*send_calibration)(struct bcm4377_data *bcm4377);









	int (*send_ptb)(struct bcm4377_data *bcm4377,








@@ -716,7 +721,7 @@ static void bcm4377_handle_ack(struct bcm4377_data *bcm4377,







		ring->events[msgid] = NULL;









	}



















	bitmap_release_region(ring->msgids, msgid, ring->n_entries);









	bitmap_release_region(ring->msgids, msgid, 0);



















unlock:









	spin_unlock_irqrestore(&ring->lock, flags);








@@ -2373,6 +2378,8 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id)







		set_bit(HCI_QUIRK_BROKEN_EXT_SCAN, &hdev->quirks);









	if (bcm4377->hw->broken_le_coded)









		set_bit(HCI_QUIRK_BROKEN_LE_CODED, &hdev->quirks);









	if (bcm4377->hw->broken_le_ext_adv_report_phy)









		set_bit(HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY, &hdev->quirks);



















	pci_set_drvdata(pdev, bcm4377);









	hci_set_drvdata(hdev, bcm4377);








@@ -2477,6 +2484,7 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = {







		.clear_pciecfg_subsystem_ctrl_bit19 = true,









		.broken_mws_transport_config = true,









		.broken_le_coded = true,









		.broken_le_ext_adv_report_phy = true,









		.send_calibration = bcm4387_send_calibration,









		.send_ptb = bcm4378_send_ptb,









	},