Commit 12837be1 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: rename ps_mode to sm_ps 



This patch renames iwl_priv.ps_mode for clearer
iwl_priv.current_ht_config.sm_ps (spatial multiplexing power save).

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00c5ae2f

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

+2 −2
Original line number Diff line number Diff line
@@ -564,8 +564,6 @@ static void iwl4965_ht_conf(struct iwl_priv *priv, 
	if (!iwl_conf->is_ht)

		return;



	priv->ps_mode = (u8)((ht_conf->cap & IEEE80211_HT_CAP_SM_PS) >> 2);



	if (ht_conf->cap & IEEE80211_HT_CAP_SGI_20)

		iwl_conf->sgf |= HT_SHORT_GI_20MHZ;

	if (ht_conf->cap & IEEE80211_HT_CAP_SGI_40)
@@ -586,6 +584,8 @@ static void iwl4965_ht_conf(struct iwl_priv *priv, 
		iwl_conf->supported_chan_width = 0;

	}



	iwl_conf->sm_ps = (u8)((ht_conf->cap & IEEE80211_HT_CAP_SM_PS) >> 2);



	memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16);



	iwl_conf->control_channel = ht_bss_conf->primary_channel;

drivers/net/wireless/iwlwifi/iwl-core.c

+6 −4
Original line number Diff line number Diff line
@@ -709,7 +709,8 @@ static int iwl_get_active_rx_chain_count(struct iwl_priv *priv) 
	bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);



	/* # of Rx chains to use when expecting MIMO. */

	if (is_single || (!is_cam && (priv->ps_mode == WLAN_HT_CAP_SM_PS_STATIC)))

	if (is_single || (!is_cam && (priv->current_ht_config.sm_ps ==

						 WLAN_HT_CAP_SM_PS_STATIC)))

		return 2;

	else

		return 3;
@@ -720,7 +721,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt) 
	int idle_cnt;

	bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);

	/* # Rx chains when idling and maybe trying to save power */

	switch (priv->ps_mode) {

	switch (priv->current_ht_config.sm_ps) {

	case WLAN_HT_CAP_SM_PS_STATIC:

	case WLAN_HT_CAP_SM_PS_DYNAMIC:

		idle_cnt = (is_cam) ? 2 : 1;
@@ -730,7 +731,8 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt) 
		break;

	case WLAN_HT_CAP_SM_PS_INVALID:

	default:

		IWL_ERROR("invalide mimo ps mode %d\n", priv->ps_mode);

		IWL_ERROR("invalide mimo ps mode %d\n",

			   priv->current_ht_config.sm_ps);

		WARN_ON(1);

		idle_cnt = -1;

		break;
@@ -912,7 +914,7 @@ int iwl_init_drv(struct iwl_priv *priv) 
	priv->iw_mode = IEEE80211_IF_TYPE_STA;



	priv->use_ant_b_for_management_frame = 1; /* start with ant B */

	priv->ps_mode = WLAN_HT_CAP_SM_PS_DISABLED;

	priv->current_ht_config.sm_ps = WLAN_HT_CAP_SM_PS_DISABLED;



	/* Choose which receivers/antennas to use */

	iwl_set_rxon_chain(priv);

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ struct iwl_ht_info { 
	/* self configuration data */

	u8 is_ht;

	u8 supported_chan_width;

	u8 sm_ps;

	u8 is_green_field;

	u8 sgf;			/* HT_SHORT_GI_* short guard interval */

	u8 max_amsdu_size;
@@ -990,7 +991,6 @@ struct iwl_priv { 
	 * hardware */

	u16 assoc_id;

	u16 assoc_capability;

	u8 ps_mode;



	struct iwl_qos_info qos_data;