mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 00:24:41 -04:00
qcacld-3.0: Rename some hdd_roaming_info fields
Per the Linux coding style "mixed-case names are frowned upon" so rename the following fields in struct hdd_roaming_info: - peerMac - roamId - roamStatus - deferKeyComplete Change-Id: I14f280ad3d8043aee3098ad9f28fc86a97202249 CRs-Fixed: 2136542
This commit is contained in:
parent
02d14cee08
commit
af2ae4b3bf
3 changed files with 18 additions and 18 deletions
|
|
@ -512,18 +512,18 @@ struct hdd_stats {
|
|||
/**
|
||||
* struct hdd_roaming_info - HDD Internal Roaming Information
|
||||
* @bssid: BSSID to which we are connected
|
||||
* @peerMac: Peer MAC address for IBSS connection
|
||||
* @roamId: Unique identifier for a roaming instance
|
||||
* @roamStatus: Current roam command status
|
||||
* @deferKeyComplete: Should key complete be deferred?
|
||||
* @peer_mac: Peer MAC address for IBSS connection
|
||||
* @roam_id: Unique identifier for a roaming instance
|
||||
* @roam_status: Current roam command status
|
||||
* @defer_key_complete: Should key complete be deferred?
|
||||
*
|
||||
*/
|
||||
struct hdd_roaming_info {
|
||||
tSirMacAddr bssid;
|
||||
tSirMacAddr peerMac;
|
||||
uint32_t roamId;
|
||||
eRoamCmdStatus roamStatus;
|
||||
bool deferKeyComplete;
|
||||
tSirMacAddr peer_mac;
|
||||
uint32_t roam_id;
|
||||
eRoamCmdStatus roam_status;
|
||||
bool defer_key_complete;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2514,18 +2514,18 @@ void hdd_perform_roam_set_key_complete(struct hdd_adapter *adapter)
|
|||
qdf_mem_copy(roamInfo.bssid.bytes,
|
||||
sta_ctx->roam_info.bssid, QDF_MAC_ADDR_SIZE);
|
||||
qdf_mem_copy(roamInfo.peerMac.bytes,
|
||||
sta_ctx->roam_info.peerMac, QDF_MAC_ADDR_SIZE);
|
||||
sta_ctx->roam_info.peer_mac, QDF_MAC_ADDR_SIZE);
|
||||
|
||||
qdf_ret_status =
|
||||
hdd_roam_set_key_complete_handler(adapter,
|
||||
&roamInfo,
|
||||
sta_ctx->roam_info.roamId,
|
||||
sta_ctx->roam_info.roamStatus,
|
||||
sta_ctx->roam_info.roam_id,
|
||||
sta_ctx->roam_info.roam_status,
|
||||
eCSR_ROAM_RESULT_AUTHENTICATED);
|
||||
if (qdf_ret_status != QDF_STATUS_SUCCESS)
|
||||
hdd_err("Set Key complete failure");
|
||||
|
||||
sta_ctx->roam_info.deferKeyComplete = false;
|
||||
sta_ctx->roam_info.defer_key_complete = false;
|
||||
}
|
||||
|
||||
#if defined(WLAN_FEATURE_FILS_SK) && \
|
||||
|
|
@ -2931,15 +2931,15 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
|
|||
roam_info->bssid.bytes,
|
||||
QDF_MAC_ADDR_SIZE);
|
||||
qdf_mem_copy(sta_ctx->
|
||||
roam_info.peerMac,
|
||||
roam_info.peer_mac,
|
||||
roam_info->peerMac.bytes,
|
||||
QDF_MAC_ADDR_SIZE);
|
||||
sta_ctx->roam_info.roamId =
|
||||
sta_ctx->roam_info.roam_id =
|
||||
roamId;
|
||||
sta_ctx->roam_info.roam_status =
|
||||
roamStatus;
|
||||
sta_ctx->roam_info.
|
||||
roamStatus = roamStatus;
|
||||
sta_ctx->roam_info.
|
||||
deferKeyComplete = true;
|
||||
defer_key_complete = true;
|
||||
}
|
||||
} else if (!hddDisconInProgress) {
|
||||
hdd_debug("ft_carrier_on is %d, sending connect indication",
|
||||
|
|
|
|||
|
|
@ -14434,7 +14434,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
|
|||
|
||||
if (!pairwise) {
|
||||
/* set group key */
|
||||
if (sta_ctx->roam_info.deferKeyComplete) {
|
||||
if (sta_ctx->roam_info.defer_key_complete) {
|
||||
hdd_debug("Perform Set key Complete");
|
||||
hdd_perform_roam_set_key_complete(adapter);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue