Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (ded652a6) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/wireless/ath/ath9k/rc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1204,7 +1204,7 @@ static u8 ath_rc_build_ht_caps(struct ath_softc sc, struct ieee80211_sta sta)
		caps \|= WLAN_RC_TS_FLAG \| WLAN_RC_DS_FLAG;
		else if (sta->ht_cap.mcs.rx_mask[1])
		caps \|= WLAN_RC_DS_FLAG;
		if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) {
		if (sta->bandwidth >= IEEE80211_STA_RX_BW_40) {
		caps \|= WLAN_RC_40_FLAG;
		if (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40)
		caps \|= WLAN_RC_SGI_FLAG;

drivers/net/wireless/iwlegacy/4965-rs.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1183,8 +1183,7 @@ il4965_rs_switch_to_mimo2(struct il_priv il, struct il_lq_sta lq_sta,
		if (!conf_is_ht(conf) \|\| !sta->ht_cap.ht_supported)
		return -1;

		if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2) ==
		WLAN_HT_CAP_SM_PS_STATIC)
		if (sta->smps_mode == IEEE80211_SMPS_STATIC)
		return -1;

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

drivers/net/wireless/iwlegacy/common.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -1830,32 +1830,30 @@ il_set_ht_add_station(struct il_priv il, u8 idx, struct ieee80211_sta sta)
		{
		struct ieee80211_sta_ht_cap *sta_ht_inf = &sta->ht_cap;
		__le32 sta_flags;
		u8 mimo_ps_mode;

		if (!sta \|\| !sta_ht_inf->ht_supported)
		goto done;

		mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
		D_ASSOC("spatial multiplexing power save mode: %s\n",
		(mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ? "static" :
		(mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ? "dynamic" :
		(sta->smps_mode == IEEE80211_SMPS_STATIC) ? "static" :
		(sta->smps_mode == IEEE80211_SMPS_DYNAMIC) ? "dynamic" :
		"disabled");

		sta_flags = il->stations[idx].sta.station_flags;

		sta_flags &= ~(STA_FLG_RTS_MIMO_PROT_MSK \| STA_FLG_MIMO_DIS_MSK);

		switch (mimo_ps_mode) {
		case WLAN_HT_CAP_SM_PS_STATIC:
		switch (sta->smps_mode) {
		case IEEE80211_SMPS_STATIC:
		sta_flags \|= STA_FLG_MIMO_DIS_MSK;
		break;
		case WLAN_HT_CAP_SM_PS_DYNAMIC:
		case IEEE80211_SMPS_DYNAMIC:
		sta_flags \|= STA_FLG_RTS_MIMO_PROT_MSK;
		break;
		case WLAN_HT_CAP_SM_PS_DISABLED:
		case IEEE80211_SMPS_OFF:
		break;
		default:
		IL_WARN("Invalid MIMO PS mode %d\n", mimo_ps_mode);
		IL_WARN("Invalid MIMO PS mode %d\n", sta->smps_mode);
		break;
		}

drivers/net/wireless/iwlwifi/dvm/agn.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ int iwl_sta_update_ht(struct iwl_priv priv, struct iwl_rxon_context ctx,

		bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
		struct iwl_rxon_context *ctx,
		struct ieee80211_sta_ht_cap *ht_cap);
		struct ieee80211_sta *sta);

		static inline int iwl_sta_id(struct ieee80211_sta *sta)
		{

drivers/net/wireless/iwlwifi/dvm/rs.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -1289,8 +1289,7 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
		if (!conf_is_ht(conf) \|\| !sta->ht_cap.ht_supported)
		return -1;

		if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
		== WLAN_HT_CAP_SM_PS_STATIC)
		if (sta->smps_mode == IEEE80211_SMPS_STATIC)
		return -1;

		/* Need both Tx chains/antennas to support MIMO */
		@@ -1305,7 +1304,7 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
		tbl->max_search = IWL_MAX_SEARCH;
		rate_mask = lq_sta->active_mimo2_rate;

		if (iwl_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
		if (iwl_is_ht40_tx_allowed(priv, ctx, sta))
		tbl->is_ht40 = 1;
		else
		tbl->is_ht40 = 0;
		@@ -1345,8 +1344,7 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv,
		if (!conf_is_ht(conf) \|\| !sta->ht_cap.ht_supported)
		return -1;

		if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
		== WLAN_HT_CAP_SM_PS_STATIC)
		if (sta->smps_mode == IEEE80211_SMPS_STATIC)
		return -1;

		/* Need both Tx chains/antennas to support MIMO */
		@@ -1361,7 +1359,7 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv,
		tbl->max_search = IWL_MAX_11N_MIMO3_SEARCH;
		rate_mask = lq_sta->active_mimo3_rate;

		if (iwl_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
		if (iwl_is_ht40_tx_allowed(priv, ctx, sta))
		tbl->is_ht40 = 1;
		else
		tbl->is_ht40 = 0;
		@@ -1410,7 +1408,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
		tbl->max_search = IWL_MAX_SEARCH;
		rate_mask = lq_sta->active_siso_rate;

		if (iwl_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
		if (iwl_is_ht40_tx_allowed(priv, ctx, sta))
		tbl->is_ht40 = 1;
		else
		tbl->is_ht40 = 0;