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-18 10:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: hdd: Rename pRoamInfo" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-12 20:01:54 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7abc0eaeaf
7 changed files with 298 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/hdd/inc/wlan_hdd_assoc.h
View file

@ -244,14 +244,14 @@ enum band_info hdd_conn_get_connected_band(struct hdd_station_ctx *sta_ctx);
/**
* hdd_sme_roam_callback() - hdd sme roam callback
* @pContext: pointer to adapter context
* @pRoamInfo: pointer to roam info
* @roam_info: pointer to roam info
* @roamId: roam id
* @roamStatus: roam status
* @roamResult: roam result
*
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo,
QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult);

1
core/hdd/inc/wlan_hdd_main.h
View file

@ -45,6 +45,7 @@
#define pHddApCtx
#define pHddStaCtx
#define pHostapdState
#define pRoamInfo
/*
* Include files

8
core/hdd/inc/wlan_hdd_wmm.h
View file

@ -311,26 +311,26 @@ QDF_STATUS hdd_wmm_acquire_access(struct hdd_adapter *adapter,
* required by WMM when association takes place
*
* @adapter: [in] pointer to adapter context
* @pRoamInfo: [in] pointer to roam information
* @roam_info: [in] pointer to roam information
* @eBssType: [in] type of BSS
*
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType);
tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType);
/**
* hdd_wmm_connect() - Function which will handle the housekeeping
* required by WMM when a connection is established
*
* @adapter : [in] pointer to adapter context
* @pRoamInfo: [in] pointer to roam information
* @roam_info: [in] pointer to roam information
* @eBssType : [in] type of BSS
*
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType);
tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType);
/**
* hdd_wmm_get_uapsd_mask() - Function which will calculate the

514
core/hdd/src/wlan_hdd_assoc.c
View file

File diff suppressed because it is too large Load diff

34
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -14805,14 +14805,14 @@ struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(struct hdd_adapter *adap
/**
* wlan_hdd_cfg80211_update_bss_db() - update bss database of CF80211
* @adapter: Pointer to adapter
* @pRoamInfo: Pointer to roam info
* @roam_info: Pointer to roam info
*
* This function is used to update the BSS data base of CFG8011
*
* Return: struct cfg80211_bss pointer
*/
struct cfg80211_bss *wlan_hdd_cfg80211_update_bss_db(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo)
tCsrRoamInfo *roam_info)
{
tCsrRoamConnectedProfile roamProfile;
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
@ -14936,7 +14936,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy,
/**
* wlan_hdd_cfg80211_pmksa_candidate_notify() - notify a new PMSKA candidate
* @adapter: Pointer to adapter
* @pRoamInfo: Pointer to roam info
* @roam_info: Pointer to roam info
* @index: Index
* @preauth: Preauth flag
*
@ -14948,7 +14948,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy,
* Return: 0 for success, non-zero for failure
*/
int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo,
tCsrRoamInfo *roam_info,
int index, bool preauth)
{
struct net_device *dev = adapter->dev;
@ -14956,15 +14956,15 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
ENTER();
hdd_debug("is going to notify supplicant of:");
if (NULL == pRoamInfo) {
hdd_err("pRoamInfo is NULL");
if (NULL == roam_info) {
hdd_err("roam_info is NULL");
return -EINVAL;
}
hdd_notice(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pRoamInfo->bssid.bytes));
MAC_ADDR_ARRAY(roam_info->bssid.bytes));
cfg80211_pmksa_candidate_notify(dev, index,
pRoamInfo->bssid.bytes,
roam_info->bssid.bytes,
preauth, GFP_KERNEL);
return 0;
}
@ -14973,7 +14973,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
/**
* wlan_hdd_cfg80211_roam_metrics_preauth() - roam metrics preauth
* @adapter: Pointer to adapter
* @pRoamInfo: Pointer to roam info
* @roam_info: Pointer to roam info
*
* 802.11r/LFR metrics reporting function to report preauth initiation
*
@ -14981,7 +14981,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
*/
#define MAX_LFR_METRICS_EVENT_LENGTH 100
QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo)
tCsrRoamInfo *roam_info)
{
unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
union iwreq_data wrqu;
@ -15001,7 +15001,7 @@ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
wrqu.data.length = scnprintf(metrics_notification,
sizeof(metrics_notification),
"QCOM: LFR_PREAUTH_INIT " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pRoamInfo->bssid.bytes));
MAC_ADDR_ARRAY(roam_info->bssid.bytes));
wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
metrics_notification);
@ -15014,7 +15014,7 @@ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
/**
* wlan_hdd_cfg80211_roam_metrics_handover() - roam metrics hand over
* @adapter: Pointer to adapter
* @pRoamInfo: Pointer to roam info
* @roam_info: Pointer to roam info
* @preauth_status: Preauth status
*
* 802.11r/LFR metrics reporting function to report handover initiation
@ -15023,7 +15023,7 @@ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
*/
QDF_STATUS
wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo,
tCsrRoamInfo *roam_info,
bool preauth_status)
{
unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
@ -15042,7 +15042,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
scnprintf(metrics_notification, sizeof(metrics_notification),
"QCOM: LFR_PREAUTH_STATUS " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pRoamInfo->bssid.bytes));
MAC_ADDR_ARRAY(roam_info->bssid.bytes));
if (1 == preauth_status)
strlcat(metrics_notification, " true",
@ -15065,14 +15065,14 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
/**
* wlan_hdd_cfg80211_roam_metrics_handover() - roam metrics hand over
* @adapter: Pointer to adapter
* @pRoamInfo: Pointer to roam info
* @roam_info: Pointer to roam info
*
* 802.11r/LFR metrics reporting function to report handover initiation
*
* Return: QDF status
*/
QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo)
tCsrRoamInfo *roam_info)
{
unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
union iwreq_data wrqu;
@ -15093,7 +15093,7 @@ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
sizeof(metrics_notification),
"QCOM: LFR_PREAUTH_HANDOVER "
MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pRoamInfo->bssid.bytes));
MAC_ADDR_ARRAY(roam_info->bssid.bytes));
wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
metrics_notification);

10
core/hdd/src/wlan_hdd_cfg80211.h
View file

@ -212,24 +212,24 @@ typedef enum {
#define CFG_AGG_RETRY_MIN (5)
struct cfg80211_bss *wlan_hdd_cfg80211_update_bss_db(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo);
tCsrRoamInfo *roam_info);
int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo,
tCsrRoamInfo *roam_info,
int index, bool preauth);
#ifdef FEATURE_WLAN_LFR_METRICS
QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo);
tCsrRoamInfo *roam_info);
QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *
adapter,
tCsrRoamInfo *
pRoamInfo,
roam_info,
bool preauth_status);
QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo);
tCsrRoamInfo *roam_info);
#endif
#ifdef FEATURE_WLAN_WAPI

24
core/hdd/src/wlan_hdd_wmm.c
View file

@ -1789,13 +1789,13 @@ QDF_STATUS hdd_wmm_acquire_access(struct hdd_adapter *adapter,
* required by WMM when association takes place
*
* @adapter: [in] pointer to adapter context
* @pRoamInfo: [in] pointer to roam information
* @roam_info: [in] pointer to roam information
* @eBssType: [in] type of BSS
*
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType)
tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType)
{
uint8_t uapsdMask;
QDF_STATUS status;
@ -1807,7 +1807,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
ENTER();
if (pRoamInfo->fReassocReq) {
if (roam_info->fReassocReq) {
/* when we reassociate we should continue to use
* whatever parameters were previously established.
* if we are reassociating due to a U-APSD change for
@ -1823,7 +1823,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
}
/* get the negotiated UAPSD Mask */
uapsdMask =
pRoamInfo->u.pConnectedProfile->modifyProfileFields.uapsd_mask;
roam_info->u.pConnectedProfile->modifyProfileFields.uapsd_mask;
hdd_debug("U-APSD mask is 0x%02x", (int)uapsdMask);
@ -1907,13 +1907,13 @@ static const uint8_t acm_mask_bit[WLAN_MAX_AC] = {
* required by WMM when a connection is established
*
* @adapter : [in] pointer to adapter context
* @pRoamInfo: [in] pointer to roam information
* @roam_info: [in] pointer to roam information
* @eBssType : [in] type of BSS
*
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType)
tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType)
{
int ac;
bool qap;
@ -1923,10 +1923,10 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
ENTER();
if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) &&
pRoamInfo && pRoamInfo->u.pConnectedProfile) {
qap = pRoamInfo->u.pConnectedProfile->qap;
qosConnection = pRoamInfo->u.pConnectedProfile->qosConnection;
acmMask = pRoamInfo->u.pConnectedProfile->acm_mask;
roam_info && roam_info->u.pConnectedProfile) {
qap = roam_info->u.pConnectedProfile->qap;
qosConnection = roam_info->u.pConnectedProfile->qosConnection;
acmMask = roam_info->u.pConnectedProfile->acm_mask;
} else {
qap = true;
qosConnection = true;
@ -1959,11 +1959,11 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
adapter->hddWmmStatus.wmmAcStatus[ac].
wmmAcAccessAllowed = true;
}
if (!pRoamInfo->fReassocReq &&
if (!roam_info->fReassocReq &&
!sme_neighbor_roam_is11r_assoc(
WLAN_HDD_GET_HAL_CTX(adapter),
adapter->sessionId) &&
!sme_roam_is_ese_assoc(pRoamInfo)) {
!sme_roam_is_ese_assoc(roam_info)) {
adapter->hddWmmStatus.wmmAcStatus[ac].
wmmAcTspecValid = false;
adapter->hddWmmStatus.wmmAcStatus[ac].