A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Remove sir_convert_addts_req2_struct()" into wlan-cld3.driver.lnx.2.0

Browse source
This commit is contained in:
CNSS_WLAN Service 2018-12-07 02:21:09 -08:00 • committed by Gerrit - the friendly Code Review server
commit 69bce35d65
2 changed files with 0 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/mac/src/include/parser_api.h
View file

@ -618,11 +618,6 @@ sir_convert_auth_frame2_struct(struct mac_context *mac,
uint8_t *frame, uint32_t len,
tpSirMacAuthFrameBody auth);
QDF_STATUS
sir_convert_addts_req2_struct(struct mac_context *mac,
uint8_t *frame, uint32_t len,
tSirAddtsReqInfo *addTs);
QDF_STATUS
sir_convert_addts_rsp2_struct(struct mac_context *mac,
uint8_t *frame, uint32_t len,

124
core/mac/src/sys/legacy/src/utils/src/parser_api.c
View file

@ -4305,130 +4305,6 @@ sir_convert_auth_frame2_struct(struct mac_context *mac,
} /* End sir_convert_auth_frame2_struct. */
QDF_STATUS
sir_convert_addts_req2_struct(struct mac_context *mac,
uint8_t *pFrame,
uint32_t nFrame, tSirAddtsReqInfo *pAddTs)
{
tDot11fAddTSRequest addts = { {0} };
tDot11fWMMAddTSRequest wmmaddts = { {0} };
uint8_t j;
uint16_t i;
uint32_t status;
if (SIR_MAC_QOS_ADD_TS_REQ != *(pFrame + 1)) {
pe_err("Action of %d; this is not supported & is probably an error",
*(pFrame + 1));
return QDF_STATUS_E_FAILURE;
}
/* Zero-init our [out] parameter, */
qdf_mem_set((uint8_t *) pAddTs, sizeof(tSirAddtsReqInfo), 0);
/* delegate to the framesc-generated code, */
switch (*pFrame) {
case SIR_MAC_ACTION_QOS_MGMT:
status = dot11f_unpack_add_ts_request(mac, pFrame, nFrame,
&addts, false);
break;
case SIR_MAC_ACTION_WME:
status =
dot11f_unpack_wmm_add_ts_request(mac, pFrame, nFrame,
&wmmaddts, false);
break;
default:
pe_err("Category of %d; this is not supported & is probably an error",
*pFrame);
return QDF_STATUS_E_FAILURE;
}
if (DOT11F_FAILED(status)) {
pe_err("Failed to parse an Add TS Request frame (0x%08x, %d bytes):",
status, nFrame);
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
pFrame, nFrame);
return QDF_STATUS_E_FAILURE;
} else if (DOT11F_WARNED(status)) {
pe_debug("There were warnings while unpacking an Add TS Request frame (0x%08x,%d bytes):",
status, nFrame);
}
/* & "transliterate" from a 'tDot11fAddTSRequest' or a */
/* 'tDot11WMMAddTSRequest' to a 'tSirMacAddtsReqInfo'... */
if (SIR_MAC_ACTION_QOS_MGMT == *pFrame) {
pAddTs->dialogToken = addts.DialogToken.token;
if (addts.TSPEC.present) {
convert_tspec(mac, &pAddTs->tspec, &addts.TSPEC);
} else {
pe_err("Mandatory TSPEC element missing in Add TS Request");
return QDF_STATUS_E_FAILURE;
}
if (addts.num_TCLAS) {
pAddTs->numTclas = (uint8_t) addts.num_TCLAS;
for (i = 0U; i < addts.num_TCLAS; ++i) {
if (QDF_STATUS_SUCCESS !=
convert_tclas(mac, &(pAddTs->tclasInfo[i]),
&(addts.TCLAS[i]))) {
pe_err("Failed to convert a TCLAS IE");
return QDF_STATUS_E_FAILURE;
}
}
}
if (addts.TCLASSPROC.present) {
pAddTs->tclasProcPresent = 1;
pAddTs->tclasProc = addts.TCLASSPROC.processing;
}
if (addts.WMMTSPEC.present) {
pAddTs->wsmTspecPresent = 1;
convert_wmmtspec(mac, &pAddTs->tspec, &addts.WMMTSPEC);
}
if (addts.num_WMMTCLAS) {
j = (uint8_t) (pAddTs->numTclas + addts.num_WMMTCLAS);
if (SIR_MAC_TCLASIE_MAXNUM < j)
j = SIR_MAC_TCLASIE_MAXNUM;
for (i = pAddTs->numTclas; i < j; ++i) {
if (QDF_STATUS_SUCCESS !=
convert_wmmtclas(mac,
&(pAddTs->tclasInfo[i]),
&(addts.WMMTCLAS[i]))) {
pe_err("Failed to convert a TCLAS IE");
return QDF_STATUS_E_FAILURE;
}
}
}
if (addts.WMMTCLASPROC.present) {
pAddTs->tclasProcPresent = 1;
pAddTs->tclasProc = addts.WMMTCLASPROC.processing;
}
if (1 < pAddTs->numTclas && (!pAddTs->tclasProcPresent)) {
pe_err("%d TCLAS IE but not TCLASPROC IE",
pAddTs->numTclas);
return QDF_STATUS_E_FAILURE;
}
} else {
pAddTs->dialogToken = wmmaddts.DialogToken.token;
if (wmmaddts.WMMTSPEC.present) {
pAddTs->wmeTspecPresent = 1;
convert_wmmtspec(mac, &pAddTs->tspec,
&wmmaddts.WMMTSPEC);
} else {
pe_err("Mandatory WME TSPEC element missing!");
return QDF_STATUS_E_FAILURE;
}
}
return QDF_STATUS_SUCCESS;
} /* End sir_convert_addts_req2_struct. */
QDF_STATUS
sir_convert_addts_rsp2_struct(struct mac_context *mac,
uint8_t *pFrame,