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-24 21:54:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirWPSPBCProbeReq

Browse source 
Replace tSirMacAddr with cdf_mac_addr in tSirWPSPBCProbeReq.

Change-Id: I7f465505aceaf420172635b9b21e57fc1e1d51ae
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-11-24 14:30:37 -08:00 • committed by Satish Singh
commit 7c5fe34474
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/hdd/inc/qc_sap_ioctl.h
View file

@ -109,7 +109,7 @@ struct sQcSapreq_wscie {
* Retrieve the WPS PBC Probe Request IEs.
*/
typedef struct sQcSapreq_WPSPBCProbeReqIES {
uint8_t macaddr[QCSAP_ADDR_LEN];
struct cdf_mac_addr macaddr;
uint16_t probeReqIELen;
uint8_t probeReqIE[512];
} sQcSapreq_WPSPBCProbeReqIES_t;

18
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -1487,13 +1487,12 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
WPSPBCProbeReq.probeReqIE,
pHddApCtx->WPSPBCProbeReq.probeReqIELen);
cdf_mem_copy(pHddApCtx->WPSPBCProbeReq.peerMacAddr,
pSapEvent->sapevt.sapPBCProbeReqEvent.
WPSPBCProbeReq.peerMacAddr,
CDF_MAC_ADDR_SIZE);
cdf_copy_macaddr(&pHddApCtx->WPSPBCProbeReq.peer_macaddr,
&pSapEvent->sapevt.sapPBCProbeReqEvent.
WPSPBCProbeReq.peer_macaddr);
hddLog(LOG1, "WPS PBC probe req " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pHddApCtx->WPSPBCProbeReq.
peerMacAddr));
peer_macaddr.bytes));
memset(&wreq, 0, sizeof(wreq));
wreq.data.length = strlen(message); /* This is length of message */
wireless_send_event(dev, IWEVCUSTOM, &wreq,
@ -3766,9 +3765,8 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev,
cdf_mem_copy(&WPSPBCProbeReqIEs.probeReqIE,
pHddApCtx->WPSPBCProbeReq.probeReqIE,
WPSPBCProbeReqIEs.probeReqIELen);
cdf_mem_copy(&WPSPBCProbeReqIEs.macaddr,
pHddApCtx->WPSPBCProbeReq.peerMacAddr,
CDF_MAC_ADDR_SIZE);
cdf_copy_macaddr(&WPSPBCProbeReqIEs.macaddr,
&pHddApCtx->WPSPBCProbeReq.peer_macaddr);
if (copy_to_user(wrqu->data.pointer,
(void *)&WPSPBCProbeReqIEs,
sizeof(WPSPBCProbeReqIEs))) {
@ -3776,8 +3774,8 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev,
return -EFAULT;
}
wrqu->data.length = 12 + WPSPBCProbeReqIEs.probeReqIELen;
hddLog(LOG1, FL("Macaddress : " MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(WPSPBCProbeReqIEs.macaddr));
hdd_info("Macaddress : " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(WPSPBCProbeReqIEs.macaddr.bytes));
up(&pHddApCtx->semWpsPBCOverlapInd);
EXIT();
return 0;

2
core/mac/inc/sir_api.h
View file

@ -2494,7 +2494,7 @@ typedef struct sSirSmeGetWPSPBCSessionsReq {
} tSirSmeGetWPSPBCSessionsReq, *tpSirSmeGetWPSPBCSessionsReq;
typedef struct sSirWPSPBCProbeReq {
tSirMacAddr peerMacAddr;
struct cdf_mac_addr peer_macaddr;
uint16_t probeReqIELen;
uint8_t probeReqIE[512];
} tSirWPSPBCProbeReq, *tpSirWPSPBCProbeReq;

4
core/mac/src/pe/lim/lim_process_probe_req_frame.c
View file

@ -666,8 +666,8 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac,
cdf_mem_copy(pSirSmeProbeReqInd->bssid.bytes, psessionEntry->bssId,
CDF_MAC_ADDR_SIZE);
cdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peerMacAddr,
peerMacAddr, sizeof(tSirMacAddr));
cdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peer_macaddr.bytes,
peerMacAddr, CDF_MAC_ADDR_SIZE);
MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type));
pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIELen =