Commit 52f57804 authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo

rtlwifi: Clear ACM_CTRL AC3_VO bit correctly

All hw driver components in the rtlwifi driver, except for the
rtl8192de component has this bug. They would clear BE bit in the
ACM_CTRL register instead of the VO bit when processing the VO queue.
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 661fa95d
...@@ -566,7 +566,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -566,7 +566,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN); acm_ctrl &= (~ACMHW_VIQEN);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~ACMHW_BEQEN); acm_ctrl &= (~ACMHW_VOQEN);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
......
...@@ -363,7 +363,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -363,7 +363,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~AcmHw_ViqEn); acm_ctrl &= (~AcmHw_ViqEn);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~AcmHw_BeqEn); acm_ctrl &= (~AcmHw_VoqEn);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
......
...@@ -1871,7 +1871,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -1871,7 +1871,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~AcmHw_ViqEn); acm_ctrl &= (~AcmHw_ViqEn);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~AcmHw_BeqEn); acm_ctrl &= (~AcmHw_VoqEn);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
......
...@@ -562,7 +562,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -562,7 +562,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN); acm_ctrl &= (~ACMHW_VIQEN);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~ACMHW_BEQEN); acm_ctrl &= (~ACMHW_VOQEN);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG, RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
......
...@@ -293,7 +293,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -293,7 +293,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~AcmHw_ViqEn); acm_ctrl &= (~AcmHw_ViqEn);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~AcmHw_BeqEn); acm_ctrl &= (~AcmHw_VoqEn);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
......
...@@ -362,7 +362,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -362,7 +362,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN); acm_ctrl &= (~ACMHW_VIQEN);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~ACMHW_BEQEN); acm_ctrl &= (~ACMHW_VOQEN);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
......
...@@ -603,7 +603,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -603,7 +603,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN); acm_ctrl &= (~ACMHW_VIQEN);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~ACMHW_BEQEN); acm_ctrl &= (~ACMHW_VOQEN);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
......
...@@ -667,7 +667,7 @@ void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -667,7 +667,7 @@ void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN); acm_ctrl &= (~ACMHW_VIQEN);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~ACMHW_BEQEN); acm_ctrl &= (~ACMHW_VOQEN);
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment