diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 14:52:17 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 14:52:28 +0100 |
| commit | 2c6a140e97ce3bb3cc5c5d637bf1e7dba95b0936 (patch) | |
| tree | 50c8f3b36f6aa35e0383df45c2edea477a3f375e /drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | |
| parent | 618b00d8d20a4793984f802454c74af8593e898a (diff) | |
| parent | 2a910f4af54d11deaefdc445f895724371645a97 (diff) | |
Merge tag 'v5.15.139' into fslc-5.15-2.2.x-imx
This is the 5.15.139 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
drivers/clk/imx/clk-imx8mq.c
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c index 6f61d6a10627..5a34894a533b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c @@ -799,7 +799,7 @@ static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw) } if (rtlpriv->btcoexist.bt_edca_dl != 0) { - edca_be_ul = rtlpriv->btcoexist.bt_edca_dl; + edca_be_dl = rtlpriv->btcoexist.bt_edca_dl; bt_change_edca = true; } |