samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename pEseBcnReq

Browse Source 
The Linux Coding Style frowns upon mixed-case names and so-called
Hungarian notation, so rename pEseBcnReq (used by both HDD and SME) to
be compliant.

Change-Id: I377e1c4ff65bafeba403aa87a6542891f03bb2ba
CRs-Fixed: 2405758
This commit is contained in:
Jeff Johnson
2019-02-26 12:23:26 -08:00
committed by nshrivas
parent a0b6c3c0f3
commit b2c3d04b6b
3 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/hdd/src/wlan_hdd_ioctl.c
View File

@@ -2504,7 +2504,7 @@ done:
/** /**
* hdd_parse_ese_beacon_req() - Parse ese beacon request * hdd_parse_ese_beacon_req() - Parse ese beacon request
* @command: Pointer to data * @command: Pointer to data
* @pEseBcnReq: Output pointer to store parsed ie information * @req: Output pointer to store parsed ie information
* *
* This function parses the ese beacon request passed in the format * This function parses the ese beacon request passed in the format
* CCXBEACONREQ<space><Number of fields><space><Measurement token> * CCXBEACONREQ<space><Number of fields><space><Measurement token>
@@ -2521,7 +2521,7 @@ done:
* Return: 0 for success non-zero for failure * Return: 0 for success non-zero for failure
*/ */
static int hdd_parse_ese_beacon_req(uint8_t *command, static int hdd_parse_ese_beacon_req(uint8_t *command,
tCsrEseBeaconReq *pEseBcnReq) tCsrEseBeaconReq *req)
{ {
uint8_t *inPtr = command; uint8_t *inPtr = command;
uint8_t input = 0; uint8_t input = 0;
@@ -2553,11 +2553,11 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
return -EINVAL; return -EINVAL;
input = QDF_MIN(input, SIR_ESE_MAX_MEAS_IE_REQS); input = QDF_MIN(input, SIR_ESE_MAX_MEAS_IE_REQS);
pEseBcnReq->numBcnReqIe = input; req->numBcnReqIe = input;
hdd_debug("Number of Bcn Req Ie fields: %d", pEseBcnReq->numBcnReqIe); hdd_debug("Number of Bcn Req Ie fields: %d", req->numBcnReqIe);
for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++) { for (j = 0; j < (req->numBcnReqIe); j++) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
/* /*
* inPtr pointing to the beginning of 1st space * inPtr pointing to the beginning of 1st space
@@ -2595,7 +2595,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
tempInt); tempInt);
return -EINVAL; return -EINVAL;
} }
pEseBcnReq->bcnReq[j].measurementToken = req->bcnReq[j].measurementToken =
tempInt; tempInt;
break; break;
@@ -2607,7 +2607,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
tempInt); tempInt);
return -EINVAL; return -EINVAL;
} }
pEseBcnReq->bcnReq[j].channel = tempInt; req->bcnReq[j].channel = tempInt;
break; break;
case 2: /* Scan mode */ case 2: /* Scan mode */
@@ -2617,33 +2617,33 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
tempInt); tempInt);
return -EINVAL; return -EINVAL;
} }
pEseBcnReq->bcnReq[j].scanMode = tempInt; req->bcnReq[j].scanMode = tempInt;
break; break;
case 3: /* Measurement duration */ case 3: /* Measurement duration */
if ((!tempInt if ((!tempInt
&& (pEseBcnReq->bcnReq[j].scanMode != && (req->bcnReq[j].scanMode !=
eSIR_BEACON_TABLE)) || eSIR_BEACON_TABLE)) ||
(pEseBcnReq->bcnReq[j].scanMode == (req->bcnReq[j].scanMode ==
eSIR_BEACON_TABLE)) { eSIR_BEACON_TABLE)) {
hdd_err("Invalid Measurement Duration: %u", hdd_err("Invalid Measurement Duration: %u",
tempInt); tempInt);
return -EINVAL; return -EINVAL;
} }
pEseBcnReq->bcnReq[j].measurementDuration = req->bcnReq[j].measurementDuration =
tempInt; tempInt;
break; break;
} }
} }
} }
for (j = 0; j < pEseBcnReq->numBcnReqIe; j++) { for (j = 0; j < req->numBcnReqIe; j++) {
hdd_debug("Index: %d Measurement Token: %u Channel: %u Scan Mode: %u Measurement Duration: %u", hdd_debug("Index: %d Measurement Token: %u Channel: %u Scan Mode: %u Measurement Duration: %u",
j, j,
pEseBcnReq->bcnReq[j].measurementToken, req->bcnReq[j].measurementToken,
pEseBcnReq->bcnReq[j].channel, req->bcnReq[j].channel,
pEseBcnReq->bcnReq[j].scanMode, req->bcnReq[j].scanMode,
pEseBcnReq->bcnReq[j].measurementDuration); req->bcnReq[j].measurementDuration);
} }
return 0; return 0;

2
core/sme/inc/sme_api.h
View File

@@ -599,7 +599,7 @@ QDF_STATUS sme_set_cckm_ie(mac_handle_t mac_handle,
uint8_t *pCckmIe, uint8_t cckmIeLen); uint8_t *pCckmIe, uint8_t cckmIeLen);
QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle, QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
const uint8_t sessionId, const uint8_t sessionId,
const tCsrEseBeaconReq *pEseBcnReq); const tCsrEseBeaconReq *in_req);
QDF_STATUS sme_set_plm_request(mac_handle_t mac_handle, struct plm_req *pPlm); QDF_STATUS sme_set_plm_request(mac_handle_t mac_handle, struct plm_req *pPlm);
#endif /*FEATURE_WLAN_ESE */ #endif /*FEATURE_WLAN_ESE */
QDF_STATUS sme_get_modify_profile_fields(mac_handle_t mac_handle, QDF_STATUS sme_get_modify_profile_fields(mac_handle_t mac_handle,

15
core/sme/src/common/sme_api.c
View File

@@ -1606,7 +1606,7 @@ QDF_STATUS sme_set_cckm_ie(mac_handle_t mac_handle, uint8_t sessionId,
* sme_set_ese_beacon_request() - set ese beacon request * sme_set_ese_beacon_request() - set ese beacon request
* @mac_handle: Opaque handle to the global MAC context * @mac_handle: Opaque handle to the global MAC context
* @sessionId: session id * @sessionId: session id
* @pEseBcnReq: Ese beacon report * @in_req: Ese beacon report request
* *
* function to set ESE beacon request parameters * function to set ESE beacon request parameters
* *
@@ -1614,12 +1614,12 @@ QDF_STATUS sme_set_cckm_ie(mac_handle_t mac_handle, uint8_t sessionId,
*/ */
QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle, QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
const uint8_t sessionId, const uint8_t sessionId,
const tCsrEseBeaconReq *pEseBcnReq) const tCsrEseBeaconReq *in_req)
{ {
QDF_STATUS status; QDF_STATUS status;
struct mac_context *mac = MAC_CONTEXT(mac_handle); struct mac_context *mac = MAC_CONTEXT(mac_handle);
tpSirBeaconReportReqInd pSmeBcnReportReq = NULL; tpSirBeaconReportReqInd pSmeBcnReportReq = NULL;
tCsrEseBeaconReqParams *pBeaconReq = NULL; const tCsrEseBeaconReqParams *pBeaconReq = NULL;
uint8_t counter = 0; uint8_t counter = 0;
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext; tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
@@ -1630,7 +1630,7 @@ QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
} }
/* Store the info in RRM context */ /* Store the info in RRM context */
qdf_mem_copy(&pSmeRrmContext->eseBcnReqInfo, pEseBcnReq, qdf_mem_copy(&pSmeRrmContext->eseBcnReqInfo, in_req,
sizeof(tCsrEseBeaconReq)); sizeof(tCsrEseBeaconReq));
/* Prepare the request to send to SME. */ /* Prepare the request to send to SME. */
@@ -1648,12 +1648,11 @@ QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
pSession->connectedProfile.bssid.bytes, pSession->connectedProfile.bssid.bytes,
sizeof(tSirMacAddr)); sizeof(tSirMacAddr));
pSmeBcnReportReq->channelInfo.channelNum = 255; pSmeBcnReportReq->channelInfo.channelNum = 255;
pSmeBcnReportReq->channelList.numChannels = pEseBcnReq->numBcnReqIe; pSmeBcnReportReq->channelList.numChannels = in_req->numBcnReqIe;
pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_ESE_UPLOAD; pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_ESE_UPLOAD;
for (counter = 0; counter < pEseBcnReq->numBcnReqIe; counter++) { for (counter = 0; counter < in_req->numBcnReqIe; counter++) {
pBeaconReq = pBeaconReq = &in_req->bcnReq[counter];
(tCsrEseBeaconReqParams *) &pEseBcnReq->bcnReq[counter];
pSmeBcnReportReq->fMeasurementtype[counter] = pSmeBcnReportReq->fMeasurementtype[counter] =
pBeaconReq->scanMode; pBeaconReq->scanMode;
pSmeBcnReportReq->measurementDuration[counter] = pSmeBcnReportReq->measurementDuration[counter] =