diff mbox

[1/1] rtlwifi: Clear ACM_CTRL AC3_VO bit correctly

Message ID 1423261472-4607-2-git-send-email-Jes.Sorensen@redhat.com (mailing list archive)
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Jes Sorensen Feb. 6, 2015, 10:24 p.m. UTC
From: Jes Sorensen <Jes.Sorensen@redhat.com>

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>
---
 drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
 drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2 +-
 drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2 +-
 drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +-
 drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +-
 drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

Comments

Larry Finger Feb. 10, 2015, 3:23 a.m. UTC | #1
On 02/06/2015 04:24 PM, Jes.Sorensen@redhat.com wrote:
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
>
> 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>

Jes,

Good catch. Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Thanks,

Larry

> ---
>   drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +-
>   drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +-
>   drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
>   drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2 +-
>   drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2 +-
>   drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +-
>   drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +-
>   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 f2b9713..edc2cbb 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)
>   				acm_ctrl &= (~ACMHW_VIQEN);
>   				break;
>   			case AC3_VO:
> -				acm_ctrl &= (~ACMHW_BEQEN);
> +				acm_ctrl &= (~ACMHW_VOQEN);
>   				break;
>   			default:
>   				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 5c646d5..545b2c1 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)
>   					acm_ctrl &= (~AcmHw_ViqEn);
>   					break;
>   				case AC3_VO:
> -					acm_ctrl &= (~AcmHw_BeqEn);
> +					acm_ctrl &= (~AcmHw_VoqEn);
>   					break;
>   				default:
>   					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 5513217..ab38e68 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> @@ -1867,7 +1867,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
>   					acm_ctrl &= (~AcmHw_ViqEn);
>   					break;
>   				case AC3_VO:
> -					acm_ctrl &= (~AcmHw_BeqEn);
> +					acm_ctrl &= (~AcmHw_VoqEn);
>   					break;
>   				default:
>   					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 1a87edc..bac42e4 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
> @@ -588,7 +588,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
>   				acm_ctrl &= (~ACMHW_VIQEN);
>   				break;
>   			case AC3_VO:
> -				acm_ctrl &= (~ACMHW_BEQEN);
> +				acm_ctrl &= (~ACMHW_VOQEN);
>   				break;
>   			default:
>   				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 5761d5b..dee88a8 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)
>   					acm_ctrl &= (~AcmHw_ViqEn);
>   					break;
>   				case AC3_VO:
> -					acm_ctrl &= (~AcmHw_BeqEn);
> +					acm_ctrl &= (~AcmHw_VoqEn);
>   					break;
>   				default:
>   					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 aa08546..b3b0947 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)
>   					acm_ctrl &= (~ACMHW_VIQEN);
>   					break;
>   				case AC3_VO:
> -					acm_ctrl &= (~ACMHW_BEQEN);
> +					acm_ctrl &= (~ACMHW_VOQEN);
>   					break;
>   				default:
>   					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 6dad28e..b469983 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)
>   				acm_ctrl &= (~ACMHW_VIQEN);
>   				break;
>   			case AC3_VO:
> -				acm_ctrl &= (~ACMHW_BEQEN);
> +				acm_ctrl &= (~ACMHW_VOQEN);
>   				break;
>   			default:
>   				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 8ec8200..ac235df 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)
>   				acm_ctrl &= (~ACMHW_VIQEN);
>   				break;
>   			case AC3_VO:
> -				acm_ctrl &= (~ACMHW_BEQEN);
> +				acm_ctrl &= (~ACMHW_VOQEN);
>   				break;
>   			default:
>   				RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
>

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Feb. 26, 2015, 1:19 p.m. UTC | #2
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> 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>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Feb. 26, 2015, 1:20 p.m. UTC | #3
Larry Finger <Larry.Finger@lwfinger.net> writes:

> On 02/06/2015 04:24 PM, Jes.Sorensen@redhat.com wrote:
>> From: Jes Sorensen <Jes.Sorensen@redhat.com>
>>
>> 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>
>
> Jes,
>
> Good catch. Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

BTW, if you want patchwork to use that Acked-by line add it to a line of
it's own. Otherwise it will ignore it.
diff mbox

Patch

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
index f2b9713..edc2cbb 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)
 				acm_ctrl &= (~ACMHW_VIQEN);
 				break;
 			case AC3_VO:
-				acm_ctrl &= (~ACMHW_BEQEN);
+				acm_ctrl &= (~ACMHW_VOQEN);
 				break;
 			default:
 				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 5c646d5..545b2c1 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)
 					acm_ctrl &= (~AcmHw_ViqEn);
 					break;
 				case AC3_VO:
-					acm_ctrl &= (~AcmHw_BeqEn);
+					acm_ctrl &= (~AcmHw_VoqEn);
 					break;
 				default:
 					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 5513217..ab38e68 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1867,7 +1867,7 @@  void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 					acm_ctrl &= (~AcmHw_ViqEn);
 					break;
 				case AC3_VO:
-					acm_ctrl &= (~AcmHw_BeqEn);
+					acm_ctrl &= (~AcmHw_VoqEn);
 					break;
 				default:
 					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 1a87edc..bac42e4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
@@ -588,7 +588,7 @@  void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 				acm_ctrl &= (~ACMHW_VIQEN);
 				break;
 			case AC3_VO:
-				acm_ctrl &= (~ACMHW_BEQEN);
+				acm_ctrl &= (~ACMHW_VOQEN);
 				break;
 			default:
 				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 5761d5b..dee88a8 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)
 					acm_ctrl &= (~AcmHw_ViqEn);
 					break;
 				case AC3_VO:
-					acm_ctrl &= (~AcmHw_BeqEn);
+					acm_ctrl &= (~AcmHw_VoqEn);
 					break;
 				default:
 					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 aa08546..b3b0947 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)
 					acm_ctrl &= (~ACMHW_VIQEN);
 					break;
 				case AC3_VO:
-					acm_ctrl &= (~ACMHW_BEQEN);
+					acm_ctrl &= (~ACMHW_VOQEN);
 					break;
 				default:
 					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 6dad28e..b469983 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)
 				acm_ctrl &= (~ACMHW_VIQEN);
 				break;
 			case AC3_VO:
-				acm_ctrl &= (~ACMHW_BEQEN);
+				acm_ctrl &= (~ACMHW_VOQEN);
 				break;
 			default:
 				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 8ec8200..ac235df 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)
 				acm_ctrl &= (~ACMHW_VIQEN);
 				break;
 			case AC3_VO:
-				acm_ctrl &= (~ACMHW_BEQEN);
+				acm_ctrl &= (~ACMHW_VOQEN);
 				break;
 			default:
 				RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,