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

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

Merge 3f97d298 on remote branch 

Change-Id: I8092ee9905dfc83a25abc1b223cd76fb670a5d08
parents c46fc7f9 3f97d298

core/dp/txrx/ol_txrx.c

+1 −4
Original line number Diff line number Diff line
@@ -3814,11 +3814,8 @@ ol_txrx_clear_peer_internal(struct ol_txrx_peer_t *peer) 
{

	p_cds_sched_context sched_ctx = get_cds_sched_ctxt();

	/* Drop pending Rx frames in CDS */

	if (sched_ctx) {

	if (sched_ctx)

		cds_drop_rxpkt_by_staid(sched_ctx, peer->local_id);

		if (cds_get_pktcap_mode_enable())

			cds_drop_monpkt(sched_ctx);

	}



	/* Purge the cached rx frame queue */

	ol_txrx_flush_rx_frames(peer, 1);

core/hdd/src/wlan_hdd_hostapd.c

+0 −1
Original line number Diff line number Diff line
@@ -8919,7 +8919,6 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, 
		global_p2p_connection_status = P2P_NOT_ACTIVE;

	}

#endif

	pAdapter->sessionId = HDD_SESSION_ID_INVALID;

	wlan_hdd_check_conc_and_update_tdls_state(pHddCtx, false);

	EXIT();

	return ret;

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            1

#define QWLAN_VERSION_PATCH            1

#define QWLAN_VERSION_EXTRA            "R"

#define QWLAN_VERSION_EXTRA            "W"

#define QWLAN_VERSION_BUILD            73



#define QWLAN_VERSIONSTR               "5.1.1.73R"

#define QWLAN_VERSIONSTR               "5.1.1.73W"



#endif /* QWLAN_VERSION_H */

core/sme/src/csr/csr_api_roam.c

+2 −2
Original line number Diff line number Diff line
@@ -4315,7 +4315,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, 
				sizeof(pCommand->u.roamCmd.peerMac));

		pCommand->u.roamCmd.reason =

			(tSirMacReasonCodes)p_del_sta_params->reason_code;

		status = csr_queue_sme_command(pMac, pCommand, false);

		status = csr_queue_sme_command(pMac, pCommand, true);

		if (!QDF_IS_STATUS_SUCCESS(status)) {

			sme_err("fail to send message status: %d", status);

			csr_release_command_roam(pMac, pCommand);
@@ -4356,7 +4356,7 @@ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, 
			     sizeof(tSirMacAddr));

		pCommand->u.roamCmd.reason =

			(tSirMacReasonCodes)pDelStaParams->reason_code;

		status = csr_queue_sme_command(pMac, pCommand, false);

		status = csr_queue_sme_command(pMac, pCommand, true);

		if (!QDF_IS_STATUS_SUCCESS(status)) {

			sme_err("fail to send message status: %d", status);

			csr_release_command_roam(pMac, pCommand);

core/wma/src/wma_features.c

+3 −2
Original line number Diff line number Diff line
@@ -9743,8 +9743,9 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, 
	if (!pmac->sap.SapDfsInfo.disable_dfs_ch_switch)

		wma->dfs_ic->disable_phy_err_processing = true;



	if ((ichan->ic_ieee != (wma->dfs_ic->last_radar_found_chan)) ||

	    (pmac->sap.SapDfsInfo.disable_dfs_ch_switch == true)) {

	if (!cds_is_sta_sap_scc_allowed_on_dfs_channel() &&

	    ((ichan->ic_ieee != (wma->dfs_ic->last_radar_found_chan)) ||

	    (pmac->sap.SapDfsInfo.disable_dfs_ch_switch == true))) {

		radar_event = (struct wma_dfs_radar_indication *)

			qdf_mem_malloc(sizeof(struct wma_dfs_radar_indication));

		if (radar_event == NULL) {