mac80211: mark patches accepted upstream
[openwrt/staging/981213.git] / package / kernel / mac80211 / patches / subsys / 306-04-v6.2-wifi-realtek-remove-duplicated-wake_tx_queue.patch
1 From: Johannes Berg <johannes.berg@intel.com>
2 Date: Mon, 10 Oct 2022 19:17:46 +0200
3 Subject: [PATCH] wifi: realtek: remove duplicated wake_tx_queue
4
5 By accident, the previous patch duplicated the initialization
6 of the wake_tx_queue callback. Fix that by removing the new
7 initializations.
8
9 Fixes: a790cc3a4fad ("wifi: mac80211: add wake_tx_queue callback to drivers")
10 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
11 ---
12
13 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c
14 +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
15 @@ -896,7 +896,6 @@ static void rtw_ops_sta_rc_update(struct
16
17 const struct ieee80211_ops rtw_ops = {
18 .tx = rtw_ops_tx,
19 - .wake_tx_queue = ieee80211_handle_wake_tx_queue,
20 .wake_tx_queue = rtw_ops_wake_tx_queue,
21 .start = rtw_ops_start,
22 .stop = rtw_ops_stop,
23 --- a/drivers/net/wireless/realtek/rtw89/mac80211.c
24 +++ b/drivers/net/wireless/realtek/rtw89/mac80211.c
25 @@ -918,7 +918,6 @@ static int rtw89_ops_set_tid_config(stru
26
27 const struct ieee80211_ops rtw89_ops = {
28 .tx = rtw89_ops_tx,
29 - .wake_tx_queue = ieee80211_handle_wake_tx_queue,
30 .wake_tx_queue = rtw89_ops_wake_tx_queue,
31 .start = rtw89_ops_start,
32 .stop = rtw89_ops_stop,