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

Commit 57566b20 authored by tamizhr@codeaurora.org's avatar tamizhr@codeaurora.org Committed by Johannes Berg
Browse files

mac80211: Use proper smps_mode enum in sta opmode event 



SMPS_MODE change value notified via nl80211 contains mac80211
specific value(ieee80211_smps_mode) and user space application
will not know those values. This patch add support to map
the mac80211 enum value to nl80211_smps_mode which will be
understood by the userspace application.

Signed-off-by: default avatarTamizh chelvam <tamizhr@codeaurora.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5e78abd0

net/mac80211/ht.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -466,6 +466,21 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata, 
		__ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_PEER_REQUEST);

		__ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_PEER_REQUEST);

}

}





enum nl80211_smps_mode

ieee80211_smps_mode_to_smps_mode(enum ieee80211_smps_mode smps)

{

	switch (smps) {

	case IEEE80211_SMPS_OFF:

		return NL80211_SMPS_OFF;

	case IEEE80211_SMPS_STATIC:

		return NL80211_SMPS_STATIC;

	case IEEE80211_SMPS_DYNAMIC:

		return NL80211_SMPS_DYNAMIC;

	default:

		return NL80211_SMPS_OFF;

	}

}



int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,

int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,

			       enum ieee80211_smps_mode smps, const u8 *da,

			       enum ieee80211_smps_mode smps, const u8 *da,

			       const u8 *bssid)

			       const u8 *bssid)

net/mac80211/ieee80211_i.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1788,6 +1788,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid); 
void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid);

void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid);





u8 ieee80211_mcs_to_chains(const struct ieee80211_mcs_info *mcs);

u8 ieee80211_mcs_to_chains(const struct ieee80211_mcs_info *mcs);

enum nl80211_smps_mode

ieee80211_smps_mode_to_smps_mode(enum ieee80211_smps_mode smps);





/* VHT */

/* VHT */

void

void

net/mac80211/rx.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2883,7 +2883,8 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
			if (rx->sta->sta.smps_mode == smps_mode)

			if (rx->sta->sta.smps_mode == smps_mode)

				goto handled;

				goto handled;

			rx->sta->sta.smps_mode = smps_mode;

			rx->sta->sta.smps_mode = smps_mode;

			sta_opmode.smps_mode = smps_mode;

			sta_opmode.smps_mode =

				ieee80211_smps_mode_to_smps_mode(smps_mode);

			sta_opmode.changed = STA_OPMODE_SMPS_MODE_CHANGED;

			sta_opmode.changed = STA_OPMODE_SMPS_MODE_CHANGED;





			sband = rx->local->hw.wiphy->bands[status->band];

			sband = rx->local->hw.wiphy->bands[status->band];