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: Rename hdd_ap_ctx ucEncryptType field

Browse source 
Per the Linux coding style "mixed-case names are frowned upon" and
"so-called Hungarian notation [...] is brain damaged" so rename field
ucEncryptType in struct hdd_ap_ctx.

Change-Id: Id729616f27bc944b24797786d715cd43f10efc7f
CRs-Fixed: 2134924
This commit is contained in:
Jeff Johnson 2017-10-27 15:05:18 -07:00 • committed by snandini
commit a8e686bc37
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -812,12 +812,14 @@ struct hdd_station_info {
* @disable_intrabss_fwd: Prevent forwarding between stations
* @broadcast_sta_id: Station ID assigned after BSS starts
* @privacy: The privacy bits of configuration
* @encryption_type: The encryption being used
*/
struct hdd_ap_ctx {
struct hdd_hostapd_state hostapd_state;
bool disable_intrabss_fwd;
uint8_t broadcast_sta_id;
uint8_t privacy;
eCsrEncryptionType encryption_type;
tSirWPSPBCProbeReq WPSPBCProbeReq;
@ -825,12 +827,10 @@ struct hdd_ap_ctx {
struct semaphore semWpsPBCOverlapInd;
qdf_mc_timer_t hdd_ap_inactivity_timer;
uint8_t operatingChannel;
eCsrEncryptionType ucEncryptType;
/* This will point to group key data,
* if it is received before start bss

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

@ -1876,11 +1876,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
we_event = IWEVREGISTERED;
if ((eCSR_ENCRYPT_TYPE_NONE == ap_ctx->ucEncryptType) ||
if ((eCSR_ENCRYPT_TYPE_NONE == ap_ctx->encryption_type) ||
(eCSR_ENCRYPT_TYPE_WEP40_STATICKEY ==
ap_ctx->ucEncryptType)
ap_ctx->encryption_type)
|| (eCSR_ENCRYPT_TYPE_WEP104_STATICKEY ==
ap_ctx->ucEncryptType)) {
ap_ctx->encryption_type)) {
bAuthRequired = false;
}
@ -7761,7 +7761,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
pConfig->RSNEncryptType = eCSR_ENCRYPT_TYPE_NONE;
pConfig->mcRSNEncryptType = eCSR_ENCRYPT_TYPE_NONE;
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->ucEncryptType =
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->encryption_type =
eCSR_ENCRYPT_TYPE_NONE;
pConfig->RSNWPAReqIELength = 0;
@ -7796,7 +7796,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
pConfig->RSNEncryptType = RSNEncryptType;
pConfig->mcRSNEncryptType = mcRSNEncryptType;
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->
ucEncryptType = RSNEncryptType;
encryption_type = RSNEncryptType;
hdd_debug("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d",
RSNAuthType, RSNEncryptType, mcRSNEncryptType);
}
@ -7842,7 +7842,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
pConfig->RSNEncryptType = RSNEncryptType;
pConfig->mcRSNEncryptType = mcRSNEncryptType;
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->
ucEncryptType = RSNEncryptType;
encryption_type = RSNEncryptType;
hdd_debug("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d",
RSNAuthType, RSNEncryptType,
mcRSNEncryptType);