Commit 4db692d6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2023-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Kalle Valo says:

====================
wireless fixes for v6.3

First set of fixes for v6.3. We have only three oneliners. The most
important one is the patch reducing warnings about the Wireless
Extensions usage, reported by Linus.

* tag 'wireless-2023-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: wext: warn about usage only once
  wifi: mt76: usb: fix use-after-free in mt76u_free_rx_queue
  wifi: ath11k: allow system suspend to survive ath11k
====================

Link: https://lore.kernel.org/r/20230227131053.BD779C433D2@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 923b2e30 52fd9063

drivers/net/wireless/ath/ath11k/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev) 
	if (ret)

		ath11k_warn(ab, "failed to suspend core: %d\n", ret);



	return ret;

	return 0;

}



static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)

drivers/net/wireless/mediatek/mt76/usb.c

+1 −0
Original line number Diff line number Diff line
@@ -706,6 +706,7 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q) 
		q->entry[i].urb = NULL;

	}

	page_pool_destroy(q->page_pool);

	q->page_pool = NULL;

}



static void mt76u_free_rx(struct mt76_dev *dev)

net/wireless/wext-core.c

+2 −2
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static void wireless_warn_cfg80211_wext(void) 
{

	char name[sizeof(current->comm)];



	pr_warn_ratelimited("warning: `%s' uses wireless extensions that are deprecated for modern drivers; use nl80211\n",

	pr_warn_once("warning: `%s' uses wireless extensions which will stop working for Wi-Fi 7 hardware; use nl80211\n",

		     get_task_comm(name, current));

}

#endif