Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91ddff8a authored Dec 07, 2011 by Philipp Dreimann Committed by John W. Linville Dec 07, 2011

rtl8192{ce,cu,de,se}: avoid problems because of possible ERFOFF -> ERFSLEEP transition

In drivers rtl8192ce, rtl8192cu, rtl8192se, and rtl8192de, break
statements would allow ppsc->rfpwr_state to be changed to ERFSLEEP
even though the device is actually in ERFOFF.

Signed-off-by: Philipp Dreimann <philipp@dreimann.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Cc: Chaoming Li <chaoming_li@realsil.com.cn>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 15062e6a

drivers/net/wireless/rtlwifi/rtl8192ce/phy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -569,7 +569,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
	}		}
	case ERFSLEEP:{		case ERFSLEEP:{
	if (ppsc->rfpwr_state == ERFOFF)		if (ppsc->rfpwr_state == ERFOFF)
	break;		return false;
	for (queue_id = 0, i = 0;		for (queue_id = 0, i = 0;
	queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {		queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
	ring = &pcipriv->dev.tx_ring[queue_id];		ring = &pcipriv->dev.tx_ring[queue_id];

drivers/net/wireless/rtlwifi/rtl8192cu/phy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -548,7 +548,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
	break;		break;
	case ERFSLEEP:		case ERFSLEEP:
	if (ppsc->rfpwr_state == ERFOFF)		if (ppsc->rfpwr_state == ERFOFF)
	break;		return false;
	for (queue_id = 0, i = 0;		for (queue_id = 0, i = 0;
	queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {		queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
	ring = &pcipriv->dev.tx_ring[queue_id];		ring = &pcipriv->dev.tx_ring[queue_id];

drivers/net/wireless/rtlwifi/rtl8192de/phy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3374,7 +3374,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
	break;		break;
	case ERFSLEEP:		case ERFSLEEP:
	if (ppsc->rfpwr_state == ERFOFF)		if (ppsc->rfpwr_state == ERFOFF)
	break;		return false;

	for (queue_id = 0, i = 0;		for (queue_id = 0, i = 0;
	queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {		queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {

drivers/net/wireless/rtlwifi/rtl8192se/phy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -602,7 +602,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
	}		}
	case ERFSLEEP:		case ERFSLEEP:
	if (ppsc->rfpwr_state == ERFOFF)		if (ppsc->rfpwr_state == ERFOFF)
	break;		return false;

	for (queue_id = 0, i = 0;		for (queue_id = 0, i = 0;
	queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {		queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {