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

Commit 80438254 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d85f7d8c on remote branch 

Change-Id: I818dce7dfa2f9735313b095ab9fad26a3ffa2c77
parents e2ffe832 d85f7d8c

core/mac/inc/qwlan_version.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#define QWLAN_VERSION_MAJOR            5

#define QWLAN_VERSION_MINOR            2

#define QWLAN_VERSION_PATCH            022

#define QWLAN_VERSION_EXTRA            "A"

#define QWLAN_VERSION_EXTRA            "B"

#define QWLAN_VERSION_BUILD            12



#define QWLAN_VERSIONSTR               "5.2.022.12A"

#define QWLAN_VERSIONSTR               "5.2.022.12B"



#endif /* QWLAN_VERSION_H */

core/mac/src/pe/lim/lim_utils.c

+9 −15
Original line number Diff line number Diff line
@@ -1934,23 +1934,17 @@ static void __lim_process_channel_switch_timeout(struct pe_session *pe_session) 
		}



		/*

		 * If the channel-list that AP is asking us to switch is invalid

		 * then we cannot switch the channel. Just disassociate from AP.

		 * We will find a better AP !!!

		 */

		if ((pe_session->limMlmState ==

		   eLIM_MLM_LINK_ESTABLISHED_STATE) &&

		   (pe_session->limSmeState != eLIM_SME_WT_DISASSOC_STATE) &&

		   (pe_session->limSmeState != eLIM_SME_WT_DEAUTH_STATE)) {

			pe_err("Invalid channel! Disconnect");

			lim_tear_down_link_with_ap(mac,

					   mac->lim.lim_timers.

					   gLimChannelSwitchTimer.sessionId,

					   eSIR_MAC_UNSUPPORTED_CHANNEL_CSA,

					   eLIM_LINK_MONITORING_DISASSOC);

		 * The channel switch request received from AP is carrying

		 * invalid channel. It's ok to ignore this channel switch

		 * request as it might be from spoof AP. If it's from genuine

		 * AP, it may lead to heart beat failure and result in

		 * disconnection. DUT can go ahead and reconnect to it/any

		 * other AP once it disconnects.

		 */

		pe_err("Invalid channel freq %u Ignore CSA request",

		       channel_freq);

		return;

	}

	}

	switch (pe_session->gLimChannelSwitch.state) {

	case eLIM_CHANNEL_SWITCH_PRIMARY_ONLY:

		lim_switch_primary_channel(mac,