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

Commit b2ccccdc authored Nov 10, 2011 by Wey-Yi Guy Committed by John W. Linville Nov 11, 2011

iwlagn: check for SMPS mode



Check and report WARN only when its invalid

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 75a56ecc

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -827,6 +827,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
	case IEEE80211_SMPS_STATIC:		case IEEE80211_SMPS_STATIC:
	case IEEE80211_SMPS_DYNAMIC:		case IEEE80211_SMPS_DYNAMIC:
	return IWL_NUM_IDLE_CHAINS_SINGLE;		return IWL_NUM_IDLE_CHAINS_SINGLE;
			case IEEE80211_SMPS_AUTOMATIC:
	case IEEE80211_SMPS_OFF:		case IEEE80211_SMPS_OFF:
	return active_cnt;		return active_cnt;
	default:		default:

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -542,6 +542,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)

	mutex_lock(&priv->shrd->mutex);		mutex_lock(&priv->shrd->mutex);

			if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status))
			goto out;

	if (unlikely(test_bit(STATUS_SCANNING, &priv->shrd->status))) {		if (unlikely(test_bit(STATUS_SCANNING, &priv->shrd->status))) {
	IWL_DEBUG_MAC80211(priv, "leave - scanning\n");		IWL_DEBUG_MAC80211(priv, "leave - scanning\n");
	goto out;		goto out;