Merge tag 'wireless-2025-04-11' of... (e861041e) · Commits · git / linux-net

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -6335,6 +6335,7 @@ F: Documentation/process/cve.rst

		CW1200 WLAN driver
		S: Orphan
		L: linux-wireless@vger.kernel.org
		F: drivers/net/wireless/st/
		F: include/linux/platform_data/net-cw1200.h

		@@ -14285,6 +14286,7 @@ S: Odd fixes
		F: drivers/net/ethernet/marvell/sk*

		MARVELL LIBERTAS WIRELESS DRIVER
		L: linux-wireless@vger.kernel.org
		L: libertas-dev@lists.infradead.org
		S: Orphan
		F: drivers/net/wireless/marvell/libertas/
		@@ -19748,6 +19750,7 @@ F: drivers/media/tuners/qt1010*

		QUALCOMM ATH12K WIRELESS DRIVER
		M: Jeff Johnson <jjohnson@kernel.org>
		L: linux-wireless@vger.kernel.org
		L: ath12k@lists.infradead.org
		S: Supported
		W: https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
		@@ -19757,6 +19760,7 @@ N: ath12k

		QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
		M: Jeff Johnson <jjohnson@kernel.org>
		L: linux-wireless@vger.kernel.org
		L: ath10k@lists.infradead.org
		S: Supported
		W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
		@@ -19766,6 +19770,7 @@ N: ath10k

		QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
		M: Jeff Johnson <jjohnson@kernel.org>
		L: linux-wireless@vger.kernel.org
		L: ath11k@lists.infradead.org
		S: Supported
		W: https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
		@@ -22139,6 +22144,7 @@ F: drivers/platform/x86/touchscreen_dmi.c

		SILICON LABS WIRELESS DRIVERS (for WFxxx series)
		M: Jérôme Pouiller <jerome.pouiller@silabs.com>
		L: linux-wireless@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
		F: drivers/net/wireless/silabs/

+1 −1

Original line number	Diff line number	Diff line
		@@ -2552,7 +2552,7 @@ static void at76_disconnect(struct usb_interface *interface)

		wiphy_info(priv->hw->wiphy, "disconnecting\n");
		at76_delete_device(priv);
		usb_put_dev(priv->udev);
		usb_put_dev(interface_to_usbdev(interface));
		dev_info(&interface->dev, "disconnected\n");
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -561,8 +561,10 @@ struct brcmf_mp_device brcmf_get_module_param(struct device dev,
		if (!found) {
		/* No platform data for this device, try OF and DMI data */
		brcmf_dmi_probe(settings, chip, chiprev);
		if (brcmf_of_probe(dev, bus_type, settings) == -EPROBE_DEFER)
		if (brcmf_of_probe(dev, bus_type, settings) == -EPROBE_DEFER) {
		kfree(settings);
		return ERR_PTR(-EPROBE_DEFER);
		}
		brcmf_acpi_probe(dev, bus_type, settings);
		}
		return settings;

+3 −5

Original line number	Diff line number	Diff line
		@@ -1895,7 +1895,6 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
		int link_id;
		int ret;
		bool fw_err = false;
		bool keep_connection;

		lockdep_assert_wiphy(mld->wiphy);

		@@ -1965,7 +1964,7 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
		iwl_mld_process_netdetect_res(mld, bss_vif, &resume_data);
		mld->netdetect = false;
		} else {
		keep_connection =
		bool keep_connection =
		iwl_mld_process_wowlan_status(mld, bss_vif,
		resume_data.wowlan_status);

		@@ -1973,10 +1972,9 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
		if (keep_connection)
		iwl_mld_unblock_emlsr(mld, bss_vif,
		IWL_MLD_EMLSR_BLOCKED_WOWLAN);
		}

		if (!mld->netdetect && !keep_connection)
		else
		ieee80211_resume_disconnect(bss_vif);
		}

		goto out;

+1 −1

Original line number	Diff line number	Diff line
		@@ -396,8 +396,8 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct iwl_mld mld, char buf,
		.data[0] = &cmd,
		};
		struct iwl_dhc_tas_status_resp *resp = NULL;
		u32 resp_len = 0;
		ssize_t pos = 0;
		u32 resp_len;
		u32 status;
		int ret;