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-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirUpdateIE

Browse source 
Replace tSirMacAddr with cdf_mac_addr in sSirUpdateIE.

Change-Id: Id190e74be5063ecd7792380c6f25ba8de1461c51
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-11-18 22:14:34 -08:00 • committed by Satish Singh
commit 4a2f72d593
5 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6828,8 +6828,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter)
WLAN_EID_OVERLAP_BSS_SCAN_PARAM);
}
#endif
cdf_mem_copy(updateIE.bssid, adapter->macAddressCurrent.bytes,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&updateIE.bssid, &adapter->macAddressCurrent);
updateIE.smeSessionId = adapter->sessionId;
if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
@ -8168,8 +8167,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
return -EINVAL;
}
cdf_mem_copy(updateIE.bssid, pAdapter->macAddressCurrent.bytes,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&updateIE.bssid, &pAdapter->macAddressCurrent);
updateIE.smeSessionId = pAdapter->sessionId;
updateIE.ieBufferlength = 0;
updateIE.pAdditionIEBuffer = NULL;

13
core/hdd/src/wlan_hdd_main.c
View file

@ -2629,7 +2629,7 @@ CDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx)
void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter)
{
uint8_t *bssid = NULL;
struct cdf_mac_addr *bssid = NULL;
tSirUpdateIE updateIE;
switch (pHostapdAdapter->device_mode) {
case WLAN_HDD_INFRA_STATION:
@ -2637,14 +2637,14 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter)
{
hdd_station_ctx_t *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pHostapdAdapter);
bssid = (uint8_t *) &pHddStaCtx->conn_info.bssId;
bssid = &pHddStaCtx->conn_info.bssId;
break;
}
case WLAN_HDD_SOFTAP:
case WLAN_HDD_P2P_GO:
case WLAN_HDD_IBSS:
{
bssid = pHostapdAdapter->macAddressCurrent.bytes;
bssid = &pHostapdAdapter->macAddressCurrent;
break;
}
case WLAN_HDD_FTM:
@ -2660,7 +2660,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter)
return;
}
cdf_mem_copy(updateIE.bssid, bssid, sizeof(tSirMacAddr));
cdf_copy_macaddr(&updateIE.bssid, bssid);
updateIE.smeSessionId = pHostapdAdapter->sessionId;
updateIE.ieBufferlength = 0;
updateIE.pAdditionIEBuffer = NULL;
@ -2835,9 +2835,8 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
adapter->device_mode,
adapter->sessionId);
cdf_mem_copy(updateIE.bssid,
adapter->macAddressCurrent.bytes,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&updateIE.bssid,
&adapter->macAddressCurrent);
updateIE.smeSessionId = adapter->sessionId;
updateIE.ieBufferlength = 0;
updateIE.pAdditionIEBuffer = NULL;

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

@ -3850,7 +3850,7 @@ typedef struct sSirModifyIEsInd {
/* Message format for Update IE message sent to PE */
typedef struct sSirUpdateIE {
tSirMacAddr bssid;
struct cdf_mac_addr bssid;
uint16_t smeSessionId;
bool append;
bool notify;

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

@ -5362,12 +5362,12 @@ static void lim_process_update_add_ies(tpAniSirGlobal mac_ctx,
update_ie = &update_add_ies->updateIE;
/* incoming message has smeSession, use BSSID to find PE session */
session_entry = pe_find_session_by_bssid(mac_ctx,
update_ie->bssid, &session_id);
update_ie->bssid.bytes, &session_id);
if (NULL == session_entry) {
lim_log(mac_ctx, LOGE, FL("Session not found for given bssid. "
MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(update_ie->bssid));
MAC_ADDR_ARRAY(update_ie->bssid.bytes));
goto end;
}
addn_ie = &session_entry->addIeParams;

3
core/sme/src/csr/csr_api_roam.c
View file

@ -18335,8 +18335,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac,
pUpdateAddIEs->msgType = eWNI_SME_UPDATE_ADDITIONAL_IES;
pUpdateAddIEs->msgLen = sizeof(tSirUpdateIEsInd);
cdf_mem_copy(pUpdateAddIEs->updateIE.bssid, pUpdateIE->bssid,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&pUpdateAddIEs->updateIE.bssid, &pUpdateIE->bssid);
pUpdateAddIEs->updateIE.smeSessionId = pUpdateIE->smeSessionId;
pUpdateAddIEs->updateIE.append = pUpdateIE->append;