Commit 00c5ae2f authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

mac80211: change MIMO_PS to SM_PS 



This patch follows 11n spec naming more rigorously replacing MIMO_PS
with SM_PS (Spatial Multiplexing Power Save).

(Originally submitted as 4 patches, "mac80211: change MIMO_PS to SM_PS",
"iwlwifi: change MIMO_PS to SM_PS", "ath9k: change MIMO_PS to SM_PS",
and "iwlwifi: remove double definition of SM PS". -- JWL)

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 1e493d19

drivers/net/wireless/ath9k/main.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void setup_ht_cap(struct ieee80211_ht_info *ht_info) 


	ht_info->ht_supported = 1;

	ht_info->cap = (u16)IEEE80211_HT_CAP_SUP_WIDTH

			|(u16)IEEE80211_HT_CAP_MIMO_PS

			|(u16)IEEE80211_HT_CAP_SM_PS

			|(u16)IEEE80211_HT_CAP_SGI_40

			|(u16)IEEE80211_HT_CAP_DSSSCCK40;

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

+2 −2
Original line number Diff line number Diff line
@@ -1153,8 +1153,8 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv, 
	    !sta->ht_info.ht_supported)

		return -1;



	if (((sta->ht_info.cap & IEEE80211_HT_CAP_MIMO_PS) >> 2)

						== IWL_MIMO_PS_STATIC)

	if (((sta->ht_info.cap & IEEE80211_HT_CAP_SM_PS) >> 2)

						== WLAN_HT_CAP_SM_PS_STATIC)

		return -1;



	/* Need both Tx chains/antennas to support MIMO */

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

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ 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_MIMO_PS) >> 2);

	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;

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

+8 −8
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv, 


	ht_info->cap |= (u16)IEEE80211_HT_CAP_GRN_FLD;

	ht_info->cap |= (u16)IEEE80211_HT_CAP_SGI_20;

	ht_info->cap |= (u16)(IEEE80211_HT_CAP_MIMO_PS &

			     (IWL_MIMO_PS_NONE << 2));

	ht_info->cap |= (u16)(IEEE80211_HT_CAP_SM_PS &

			     (WLAN_HT_CAP_SM_PS_DISABLED << 2));



	max_bit_rate = MAX_BIT_RATE_20_MHZ;

	if (priv->hw_params.fat_channel & BIT(band)) {
@@ -709,7 +709,7 @@ 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 == IWL_MIMO_PS_STATIC)))

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

		return 2;

	else

		return 3;
@@ -721,14 +721,14 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_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) {

	case IWL_MIMO_PS_STATIC:

	case IWL_MIMO_PS_DYNAMIC:

	case WLAN_HT_CAP_SM_PS_STATIC:

	case WLAN_HT_CAP_SM_PS_DYNAMIC:

		idle_cnt = (is_cam) ? 2 : 1;

		break;

	case IWL_MIMO_PS_NONE:

	case WLAN_HT_CAP_SM_PS_DISABLED:

		idle_cnt = (is_cam) ? active_cnt : 1;

		break;

	case IWL_MIMO_PS_INVALID:

	case WLAN_HT_CAP_SM_PS_INVALID:

	default:

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

		WARN_ON(1);
@@ -912,7 +912,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 = IWL_MIMO_PS_NONE;

	priv->ps_mode = WLAN_HT_CAP_SM_PS_DISABLED;



	/* Choose which receivers/antennas to use */

	iwl_set_rxon_chain(priv);

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

+0 −5
Original line number Diff line number Diff line
@@ -644,11 +644,6 @@ struct iwl_kw { 
#define IWL_CHANNEL_WIDTH_20MHZ   0

#define IWL_CHANNEL_WIDTH_40MHZ   1



#define IWL_MIMO_PS_STATIC        0

#define IWL_MIMO_PS_NONE          3

#define IWL_MIMO_PS_DYNAMIC       1

#define IWL_MIMO_PS_INVALID       2



#define IWL_OPERATION_MODE_AUTO     0

#define IWL_OPERATION_MODE_HT_ONLY  1

#define IWL_OPERATION_MODE_MIXED    2