Commit 261ce887 authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: mac80211: make smps_mode per-link 



The SMPS power save mode needs to be per-link rather than being shared
for all links. As such, move it into struct ieee80211_link_sta.

Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b320d6c4

drivers/net/wireless/ath/ath10k/mac.c

+3 −3
Original line number Diff line number Diff line
@@ -8520,7 +8520,7 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw, 
		   "mac sta rc update for %pM changed %08x bw %d nss %d smps %d\n",

		   sta->addr, changed, sta->deflink.bandwidth,

		   sta->deflink.rx_nss,

		   sta->smps_mode);

		   sta->deflink.smps_mode);



	if (changed & IEEE80211_RC_BW_CHANGED) {

		bw = WMI_PEER_CHWIDTH_20MHZ;
@@ -8554,7 +8554,7 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw, 
	if (changed & IEEE80211_RC_SMPS_CHANGED) {

		smps = WMI_PEER_SMPS_PS_NONE;



		switch (sta->smps_mode) {

		switch (sta->deflink.smps_mode) {

		case IEEE80211_SMPS_AUTOMATIC:

		case IEEE80211_SMPS_OFF:

			smps = WMI_PEER_SMPS_PS_NONE;
@@ -8567,7 +8567,7 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw, 
			break;

		case IEEE80211_SMPS_NUM_MODES:

			ath10k_warn(ar, "Invalid smps %d in sta rc update for %pM\n",

				    sta->smps_mode, sta->addr);

				    sta->deflink.smps_mode, sta->addr);

			smps = WMI_PEER_SMPS_PS_NONE;

			break;

		}

drivers/net/wireless/ath/ath11k/mac.c

+3 −3
Original line number Diff line number Diff line
@@ -4701,7 +4701,7 @@ static void ath11k_mac_op_sta_rc_update(struct ieee80211_hw *hw, 
		   "mac sta rc update for %pM changed %08x bw %d nss %d smps %d\n",

		   sta->addr, changed, sta->deflink.bandwidth,

		   sta->deflink.rx_nss,

		   sta->smps_mode);

		   sta->deflink.smps_mode);



	spin_lock_bh(&ar->data_lock);
@@ -4737,7 +4737,7 @@ static void ath11k_mac_op_sta_rc_update(struct ieee80211_hw *hw, 
	if (changed & IEEE80211_RC_SMPS_CHANGED) {

		smps = WMI_PEER_SMPS_PS_NONE;



		switch (sta->smps_mode) {

		switch (sta->deflink.smps_mode) {

		case IEEE80211_SMPS_AUTOMATIC:

		case IEEE80211_SMPS_OFF:

			smps = WMI_PEER_SMPS_PS_NONE;
@@ -4750,7 +4750,7 @@ static void ath11k_mac_op_sta_rc_update(struct ieee80211_hw *hw, 
			break;

		default:

			ath11k_warn(ar->ab, "Invalid smps %d in sta rc update for %pM\n",

				    sta->smps_mode, sta->addr);

				    sta->deflink.smps_mode, sta->addr);

			smps = WMI_PEER_SMPS_PS_NONE;

			break;

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -2160,7 +2160,7 @@ static void setup_frame_info(struct ieee80211_hw *hw, 
		fi->keyix = an->ps_key;

	else

		fi->keyix = ATH9K_TXKEYIX_INVALID;

	fi->dyn_smps = sta && sta->smps_mode == IEEE80211_SMPS_DYNAMIC;

	fi->dyn_smps = sta && sta->deflink.smps_mode == IEEE80211_SMPS_DYNAMIC;

	fi->keytype = keytype;

	fi->framelen = framelen;

	fi->tx_power = txpower;

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

+1 −1
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ il4965_rs_switch_to_mimo2(struct il_priv *il, struct il_lq_sta *lq_sta, 
	if (!conf_is_ht(conf) || !sta->deflink.ht_cap.ht_supported)

		return -1;



	if (sta->smps_mode == IEEE80211_SMPS_STATIC)

	if (sta->deflink.smps_mode == IEEE80211_SMPS_STATIC)

		return -1;



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

drivers/net/wireless/intel/iwlegacy/common.c

+4 −4
Original line number Diff line number Diff line
@@ -1870,15 +1870,15 @@ il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta) 
		goto done;



	D_ASSOC("spatial multiplexing power save mode: %s\n",

		(sta->smps_mode == IEEE80211_SMPS_STATIC) ? "static" :

		(sta->smps_mode == IEEE80211_SMPS_DYNAMIC) ? "dynamic" :

		(sta->deflink.smps_mode == IEEE80211_SMPS_STATIC) ? "static" :

		(sta->deflink.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 (sta->smps_mode) {

	switch (sta->deflink.smps_mode) {

	case IEEE80211_SMPS_STATIC:

		sta_flags |= STA_FLG_MIMO_DIS_MSK;

		break;
@@ -1888,7 +1888,7 @@ il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta) 
	case IEEE80211_SMPS_OFF:

		break;

	default:

		IL_WARN("Invalid MIMO PS mode %d\n", sta->smps_mode);

		IL_WARN("Invalid MIMO PS mode %d\n", sta->deflink.smps_mode);

		break;

	}