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

Commit e23c2cac authored by Vulupala Shashank Reddy's avatar Vulupala Shashank Reddy Committed by Gerrit - the friendly Code Review server
Browse files

qcacld-3.0: Update the channel only if AUTH resp is successful 

Currently channel is updated whenever AUTH frame is received
irrespective of its status. So in case of unsuccessful AUTH
wrong channel is updated in pkt capture mode.

To fix this issue, update the channel only if AUTH response
is successful. Also if after AUTH success, association or
reassociation fails update the channel with last connected
channel.

Change-Id: I51ee6bb2466f765ce6058c411b0dc0ab74a0dd04
CRs-Fixed: 2987748
parent a07ea269

components/pkt_capture/core/inc/wlan_pkt_capture_priv.h

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -63,6 +63,8 @@ struct pkt_capture_cb_context { 
 * @ppdu_stats_q: list used for storing smu related ppdu stats

 * @lock_q: spinlock for ppdu_stats q

 * @tx_nss: nss of tx data packets received from ppdu stats

 * @last_freq: Last connected freq

 * @curr_freq: current connected freq

 */

struct pkt_capture_vdev_priv {

	struct wlan_objmgr_vdev *vdev;
@@ -74,6 +76,8 @@ struct pkt_capture_vdev_priv { 
	qdf_list_t ppdu_stats_q;

	qdf_spinlock_t lock_q;

	uint8_t tx_nss;

	qdf_freq_t last_freq;

	qdf_freq_t curr_freq;

};



/**

components/pkt_capture/core/src/wlan_pkt_capture_main.c

+2 −0
Original line number Diff line number Diff line
@@ -754,6 +754,8 @@ pkt_capture_register_callbacks(struct wlan_objmgr_vdev *vdev, 
	target_if_pkt_capture_register_rx_ops(&psoc_priv->rx_ops);

	pkt_capture_wdi_event_subscribe(psoc);

	pkt_capture_record_channel(vdev);

	vdev_priv->curr_freq = vdev->vdev_mlme.des_chan->ch_freq;

	vdev_priv->last_freq = vdev_priv->curr_freq;



	status = tgt_pkt_capture_register_ev_handler(vdev);

	if (QDF_IS_STATUS_ERROR(status))

components/pkt_capture/core/src/wlan_pkt_capture_mon_thread.c

+71 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -25,6 +26,7 @@ 
#include "wlan_mgmt_txrx_utils_api.h"

#include "cdp_txrx_ctrl.h"

#include "cfg_ucfg_api.h"

#include "wlan_mgmt_txrx_utils_api.h"



void pkt_capture_mon(struct pkt_capture_cb_context *cb_ctx, qdf_nbuf_t msdu,

		     struct wlan_objmgr_vdev *vdev, uint16_t ch_freq)
@@ -35,6 +37,9 @@ void pkt_capture_mon(struct pkt_capture_cb_context *cb_ctx, qdf_nbuf_t msdu, 
	void *soc = cds_get_context(QDF_MODULE_ID_SOC);

	struct wlan_objmgr_pdev *pdev = wlan_vdev_get_pdev(vdev);

	cdp_config_param_type val;

	uint16_t status;

	tSirMacAuthFrameBody *auth;

	struct pkt_capture_vdev_priv *vdev_priv;



	rthdr = (struct radiotap_header *)qdf_nbuf_data(msdu);

	rtlen = rthdr->it_len;
@@ -42,17 +47,79 @@ void pkt_capture_mon(struct pkt_capture_cb_context *cb_ctx, qdf_nbuf_t msdu, 
	type = (wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK;

	sub_type = (wh)->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;



	vdev_priv = pkt_capture_vdev_get_priv(vdev);

	if (!vdev_priv) {

		pkt_capture_err("packet capture vdev priv is NULL");

		return;

	}



	/*

	 *  Update channel only if successful AUTH Resp is received.

	 *  This is done so that EAPOL M1 data frame have correct

	 *  channel

	 */

	if ((type == IEEE80211_FC0_TYPE_MGT) &&

	    (sub_type == MGMT_SUBTYPE_AUTH)) {

		uint8_t chan = wlan_freq_to_chan(ch_freq);



		auth = (tSirMacAuthFrameBody *)(qdf_nbuf_data(msdu) + rtlen +

			sizeof(tSirMacMgmtHdr));



		if (auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_2 ||

		    auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_4) {

			if (auth->authStatusCode == STATUS_SUCCESS) {

				val.cdp_pdev_param_monitor_chan = chan;

		cdp_txrx_set_pdev_param(soc, wlan_objmgr_pdev_get_pdev_id(pdev),

				cdp_txrx_set_pdev_param(

					soc, wlan_objmgr_pdev_get_pdev_id(pdev),

					CDP_MONITOR_CHANNEL, val);



				val.cdp_pdev_param_mon_freq = ch_freq;

		cdp_txrx_set_pdev_param(soc, wlan_objmgr_pdev_get_pdev_id(pdev),

				cdp_txrx_set_pdev_param(

					soc, wlan_objmgr_pdev_get_pdev_id(pdev),

					CDP_MONITOR_FREQUENCY, val);

			}

		}

	}



	/*

	 *  Update channel to last connected channel in case of assoc/reassoc

	 *  response failure and save current chan in case of success

	 */

	if ((type == IEEE80211_FC0_TYPE_MGT) &&

	    ((sub_type == MGMT_SUBTYPE_ASSOC_RESP) ||

	    (sub_type == MGMT_SUBTYPE_REASSOC_RESP))) {

		if (qdf_nbuf_len(msdu) < (rtlen + sizeof(tSirMacMgmtHdr) +

		   SIR_MAC_ASSOC_RSP_STATUS_CODE_OFFSET)) {

			pkt_capture_err("Packet length is less than expected");

			qdf_nbuf_free(msdu);

			return;

		}



		status = (uint16_t)(*(qdf_nbuf_data(msdu) + rtlen +

			 sizeof(tSirMacMgmtHdr) +

			 SIR_MAC_ASSOC_RSP_STATUS_CODE_OFFSET));



		if (status == STATUS_SUCCESS) {

			vdev_priv->last_freq = vdev_priv->curr_freq;

			vdev_priv->curr_freq = ch_freq;

		} else {

			uint8_t chan_num;



			chan_num = wlan_reg_freq_to_chan(pdev,

							 vdev_priv->last_freq);



			val.cdp_pdev_param_monitor_chan = chan_num;

			cdp_txrx_set_pdev_param(

				soc, wlan_objmgr_pdev_get_pdev_id(pdev),

				CDP_MONITOR_CHANNEL, val);



			val.cdp_pdev_param_mon_freq = vdev_priv->last_freq;

			cdp_txrx_set_pdev_param(

				soc, wlan_objmgr_pdev_get_pdev_id(pdev),

				CDP_MONITOR_FREQUENCY, val);



			vdev_priv->curr_freq = vdev_priv->last_freq;

		}

	}



	if (cb_ctx->mon_cb(cb_ctx->mon_ctx, msdu) != QDF_STATUS_SUCCESS) {