Skip to content

Commit 4db692d

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 923b2e3 + 52fd906 commit 4db692d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev)
981981
if (ret)
982982
ath11k_warn(ab, "failed to suspend core: %d\n", ret);
983983

984-
return ret;
984+
return 0;
985985
}
986986

987987
static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
706706
q->entry[i].urb = NULL;
707707
}
708708
page_pool_destroy(q->page_pool);
709+
q->page_pool = NULL;
709710
}
710711

711712
static void mt76u_free_rx(struct mt76_dev *dev)

net/wireless/wext-core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,8 @@ static void wireless_warn_cfg80211_wext(void)
641641
{
642642
char name[sizeof(current->comm)];
643643

644-
pr_warn_ratelimited("warning: `%s' uses wireless extensions that are deprecated for modern drivers; use nl80211\n",
645-
get_task_comm(name, current));
644+
pr_warn_once("warning: `%s' uses wireless extensions which will stop working for Wi-Fi 7 hardware; use nl80211\n",
645+
get_task_comm(name, current));
646646
}
647647
#endif
648648

0 commit comments

Comments
 (0)