Re: [PATCH] rtl8192{ce,cu,de,se}: avoid problems because of possible ERFOFF -> ERFSLEEP -> .. transition

[Larry Finger <Larry.Finger@xxxxxxxxxxxx>]

On 11/28/2011 06:21 PM, Philipp Dreimann wrote:
> Hello!
>
> I noticed that ppsc->rfpwr_state could be set to ERFSLEEP even
> though the device is actually in ERFOFF.
>
> Or am I missing something?
>
> BR,
>   Philipp
>
> ---
>   drivers/net/wireless/rtlwifi/rtl8192ce/phy.c |    3 ++-
>   drivers/net/wireless/rtlwifi/rtl8192cu/phy.c |    3 ++-
>   drivers/net/wireless/rtlwifi/rtl8192de/phy.c |    2 +-
>   drivers/net/wireless/rtlwifi/rtl8192se/phy.c |    3 ++-
>   4 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
> index 592a10a..7f6b933 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
> @@ -569,7 +569,8 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
>   		}
>   	case ERFSLEEP:{
>   			if (ppsc->rfpwr_state == ERFOFF)
> -				break;
> +				return false;
> +				
>   			for (queue_id = 0, i = 0;
>   			     queue_id<  RTL_PCI_MAX_TX_QUEUE_COUNT;) {
>   				ring =&pcipriv->dev.tx_ring[queue_id];
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
> index 7285290..33ada66 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
> @@ -548,7 +548,8 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
>   		break;
>   	case ERFSLEEP:
>   		if (ppsc->rfpwr_state == ERFOFF)
> -			break;
> +			return false;
> +			
>   		for (queue_id = 0, i = 0;
>   		     queue_id<  RTL_PCI_MAX_TX_QUEUE_COUNT;) {
>   			ring =&pcipriv->dev.tx_ring[queue_id];
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
> index 3ac7af1..0883349 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
> @@ -3374,7 +3374,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
>   		break;
>   	case ERFSLEEP:
>   		if (ppsc->rfpwr_state == ERFOFF)
> -			break;
> +			return false;
>
>   		for (queue_id = 0, i = 0;
>   		     queue_id<  RTL_PCI_MAX_TX_QUEUE_COUNT;) {
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
> index f27171a..539172e 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
> @@ -602,7 +602,8 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
>   		}
>   	case ERFSLEEP:
>   			if (ppsc->rfpwr_state == ERFOFF)
> -				break;
> +				return false;
> +				
>
>   			for (queue_id = 0, i = 0;
>   			     queue_id<  RTL_PCI_MAX_TX_QUEUE_COUNT;) {

Yes, it would be possible to jump from ERFSLEEP to ERFOFF in the code.

Chaoming: Is this what you want, or is it a bug?

Thanks,

Larry
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html