diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2015-02-06 17:24:32 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-02-26 08:16:45 -0500 |
commit | 52f578049404e4d3397dbf94ad8adc30aff7b723 (patch) | |
tree | 67f9d7857ffa15695b8d90e0eaa1f52f4338b78b /drivers/net/wireless/rtlwifi | |
parent | 661fa95ddb9e4c9bf6b3ec575a92dd837ec72ace (diff) |
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: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index f2b9713c456e..edc2cbb6253c 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | |||
@@ -566,7 +566,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
566 | acm_ctrl &= (~ACMHW_VIQEN); | 566 | acm_ctrl &= (~ACMHW_VIQEN); |
567 | break; | 567 | break; |
568 | case AC3_VO: | 568 | case AC3_VO: |
569 | acm_ctrl &= (~ACMHW_BEQEN); | 569 | acm_ctrl &= (~ACMHW_VOQEN); |
570 | break; | 570 | break; |
571 | default: | 571 | default: |
572 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 572 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index 303b299376c9..04eb5c3f8464 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -363,7 +363,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
363 | acm_ctrl &= (~AcmHw_ViqEn); | 363 | acm_ctrl &= (~AcmHw_ViqEn); |
364 | break; | 364 | break; |
365 | case AC3_VO: | 365 | case AC3_VO: |
366 | acm_ctrl &= (~AcmHw_BeqEn); | 366 | acm_ctrl &= (~AcmHw_VoqEn); |
367 | break; | 367 | break; |
368 | default: | 368 | default: |
369 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 369 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c index fe4b699a12f5..c9a882a231f6 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | |||
@@ -1871,7 +1871,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
1871 | acm_ctrl &= (~AcmHw_ViqEn); | 1871 | acm_ctrl &= (~AcmHw_ViqEn); |
1872 | break; | 1872 | break; |
1873 | case AC3_VO: | 1873 | case AC3_VO: |
1874 | acm_ctrl &= (~AcmHw_BeqEn); | 1874 | acm_ctrl &= (~AcmHw_VoqEn); |
1875 | break; | 1875 | break; |
1876 | default: | 1876 | default: |
1877 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 1877 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c index b461b3128da5..db230a3f0137 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | |||
@@ -562,7 +562,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
562 | acm_ctrl &= (~ACMHW_VIQEN); | 562 | acm_ctrl &= (~ACMHW_VIQEN); |
563 | break; | 563 | break; |
564 | case AC3_VO: | 564 | case AC3_VO: |
565 | acm_ctrl &= (~ACMHW_BEQEN); | 565 | acm_ctrl &= (~ACMHW_VOQEN); |
566 | break; | 566 | break; |
567 | default: | 567 | default: |
568 | RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG, | 568 | RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c index 5761d5b49e39..dee88a80bee1 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c | |||
@@ -293,7 +293,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
293 | acm_ctrl &= (~AcmHw_ViqEn); | 293 | acm_ctrl &= (~AcmHw_ViqEn); |
294 | break; | 294 | break; |
295 | case AC3_VO: | 295 | case AC3_VO: |
296 | acm_ctrl &= (~AcmHw_BeqEn); | 296 | acm_ctrl &= (~AcmHw_VoqEn); |
297 | break; | 297 | break; |
298 | default: | 298 | default: |
299 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 299 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c index aa085462d0e9..b3b094759f6d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | |||
@@ -362,7 +362,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
362 | acm_ctrl &= (~ACMHW_VIQEN); | 362 | acm_ctrl &= (~ACMHW_VIQEN); |
363 | break; | 363 | break; |
364 | case AC3_VO: | 364 | case AC3_VO: |
365 | acm_ctrl &= (~ACMHW_BEQEN); | 365 | acm_ctrl &= (~ACMHW_VOQEN); |
366 | break; | 366 | break; |
367 | default: | 367 | default: |
368 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, | 368 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c index 6dad28e77bbb..b46998341c40 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c | |||
@@ -603,7 +603,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
603 | acm_ctrl &= (~ACMHW_VIQEN); | 603 | acm_ctrl &= (~ACMHW_VIQEN); |
604 | break; | 604 | break; |
605 | case AC3_VO: | 605 | case AC3_VO: |
606 | acm_ctrl &= (~ACMHW_BEQEN); | 606 | acm_ctrl &= (~ACMHW_VOQEN); |
607 | break; | 607 | break; |
608 | default: | 608 | default: |
609 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, | 609 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c index 8ec8200002c7..ac235df727af 100644 --- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | |||
@@ -667,7 +667,7 @@ void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
667 | acm_ctrl &= (~ACMHW_VIQEN); | 667 | acm_ctrl &= (~ACMHW_VIQEN); |
668 | break; | 668 | break; |
669 | case AC3_VO: | 669 | case AC3_VO: |
670 | acm_ctrl &= (~ACMHW_BEQEN); | 670 | acm_ctrl &= (~ACMHW_VOQEN); |
671 | break; | 671 | break; |
672 | default: | 672 | default: |
673 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, | 673 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |