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

Commit 582de30a authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: BT Coex - always initialize smps_mode 



smps_mode is used uninitialized in a debug statement in AP
mode, so always initialize it.

While at it, fix a typo.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 717e2390

drivers/net/wireless/iwlwifi/mvm/coex.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -754,7 +754,8 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 
	struct iwl_bt_iterator_data *data = _data;

	struct iwl_bt_iterator_data *data = _data;

	struct iwl_mvm *mvm = data->mvm;

	struct iwl_mvm *mvm = data->mvm;

	struct ieee80211_chanctx_conf *chanctx_conf;

	struct ieee80211_chanctx_conf *chanctx_conf;

	enum ieee80211_smps_mode smps_mode;

	/* default smps_mode is AUTOMATIC - only used for client modes */

	enum ieee80211_smps_mode smps_mode = IEEE80211_SMPS_AUTOMATIC;

	u32 bt_activity_grading;

	u32 bt_activity_grading;

	int ave_rssi;

	int ave_rssi;
@@ -762,8 +763,6 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 




	switch (vif->type) {

	switch (vif->type) {

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_STATION:

		/* default smps_mode for BSS / P2P client is AUTOMATIC */

		smps_mode = IEEE80211_SMPS_AUTOMATIC;

		break;

		break;

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_AP:

		if (!mvmvif->ap_ibss_active)

		if (!mvmvif->ap_ibss_active)
@@ -795,7 +794,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 
	else if (bt_activity_grading >= BT_LOW_TRAFFIC)

	else if (bt_activity_grading >= BT_LOW_TRAFFIC)

		smps_mode = IEEE80211_SMPS_DYNAMIC;

		smps_mode = IEEE80211_SMPS_DYNAMIC;





	/* relax SMPS contraints for next association */

	/* relax SMPS constraints for next association */

	if (!vif->bss_conf.assoc)

	if (!vif->bss_conf.assoc)

		smps_mode = IEEE80211_SMPS_AUTOMATIC;

		smps_mode = IEEE80211_SMPS_AUTOMATIC;