diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-05-18 14:39:34 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-18 14:39:34 -0700 |
commit | 90223c1136b2930751116fb7de9675f55843f3ad (patch) | |
tree | ad66d6f6fe5deb321b82ed4efff70e748e8f21df /drivers/net/wireless/realtek/rtw88/mac80211.c | |
parent | 1ecaf17d097c91a7bd2979c57f7c81c5eeaf526b (diff) | |
parent | 1f594fe7c90746982569bd4f3489e809104a9176 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/freescale/fec_main.c
6ead9c98cafc ("net: fec: remove the xdp_return_frame when lack of tx BDs")
144470c88c5d ("net: fec: using the standard return codes when xdp xmit errors")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wireless/realtek/rtw88/mac80211.c')
-rw-r--r-- | drivers/net/wireless/realtek/rtw88/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c index 02cd19ee6e4c..e82e40cac60a 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -920,7 +920,7 @@ static void rtw_ops_sta_rc_update(struct ieee80211_hw *hw, struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv; if (changed & IEEE80211_RC_BW_CHANGED) - rtw_update_sta_info(rtwdev, si, true); + ieee80211_queue_work(rtwdev->hw, &si->rc_work); } const struct ieee80211_ops rtw_ops = { |