samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
フォーク 0
コード イシュー プルリクエスト Actions パッケージ プロジェクト リリース Wiki アクティビティ

qcacld-3.0: Replace typedef hdd_wext_state_t

ソースを参照 
The Linux Coding Style enumerates a few special cases where typedefs
are useful, but stresses "NEVER EVER use a typedef unless you can
clearly match one of those rules." The hdd_wext_state_t typedef does
not meet any of those criteria, so replace references to it with a
reference to the underlying struct.

Change-Id: I30a735370fccf0e7bf068b1679cc01844c719a9f
CRs-Fixed: 2119532
このコミットが含まれているのは:
Jeff Johnson
2017-09-30 20:02:35 -07:00
committed by snandini
親 7274ccc757
コミット 2a7220019a
10個のファイルの変更、118行の追加、78行の削除
Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

2
core/hdd/inc/wlan_hdd_main.h
ファイルの表示

@@ -666,7 +666,7 @@ struct hdd_mon_set_ch_info {
struct hdd_station_ctx { struct hdd_station_ctx {
/* Handle to the Wireless Extension State */ /* Handle to the Wireless Extension State */
hdd_wext_state_t WextState; struct hdd_wext_state WextState;
/* Connection information*/ /* Connection information*/
struct hdd_connection_info conn_info; struct hdd_connection_info conn_info;

5
core/hdd/inc/wlan_hdd_wext.h
ファイルの表示

@@ -203,7 +203,7 @@ enum hdd_wlan_wmm_ts_info_ack_policy {
* This structure contains the interface level (granularity) * This structure contains the interface level (granularity)
* configuration information in support of wireless extensions. * configuration information in support of wireless extensions.
*/ */
typedef struct hdd_wext_state { struct hdd_wext_state {
/** The CSR "desired" Profile */ /** The CSR "desired" Profile */
tCsrRoamProfile roamProfile; tCsrRoamProfile roamProfile;
@@ -230,8 +230,7 @@ typedef struct hdd_wext_state {
/**Counter measure state, Started/Stopped*/ /**Counter measure state, Started/Stopped*/
bool mTKIPCounterMeasures; bool mTKIPCounterMeasures;
};
} hdd_wext_state_t;
struct ccp_freq_chan_map { struct ccp_freq_chan_map {
/* List of frequencies */ /* List of frequencies */

43
core/hdd/src/wlan_hdd_assoc.c
ファイルの表示

@@ -1237,7 +1237,8 @@ static void hdd_send_association_event(struct net_device *dev,
/* Added to find the auth type on the fly at run time */ /* Added to find the auth type on the fly at run time */
/* rather than with cfg to see if FT is enabled */ /* rather than with cfg to see if FT is enabled */
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile); tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile);
memset(&wrqu, '\0', sizeof(wrqu)); memset(&wrqu, '\0', sizeof(wrqu));
@@ -2503,7 +2504,7 @@ void hdd_perform_roam_set_key_complete(struct hdd_adapter *pAdapter)
#if defined(WLAN_FEATURE_FILS_SK) && defined(CFG80211_FILS_SK_OFFLOAD_SUPPORT) #if defined(WLAN_FEATURE_FILS_SK) && defined(CFG80211_FILS_SK_OFFLOAD_SUPPORT)
void hdd_clear_fils_connection_info(struct hdd_adapter *adapter) void hdd_clear_fils_connection_info(struct hdd_adapter *adapter)
{ {
hdd_wext_state_t *wext_state; struct hdd_wext_state *wext_state;
if ((adapter->device_mode == QDF_SAP_MODE) || if ((adapter->device_mode == QDF_SAP_MODE) ||
(adapter->device_mode == QDF_P2P_GO_MODE)) (adapter->device_mode == QDF_P2P_GO_MODE))
@@ -3072,7 +3073,7 @@ static QDF_STATUS hdd_association_completion_handler(struct hdd_adapter *pAdapte
#endif #endif
} else { } else {
bool connect_timeout = false; bool connect_timeout = false;
hdd_wext_state_t *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
if (pRoamInfo) if (pRoamInfo)
hdd_err("wlan: connection failed with " MAC_ADDRESS_STR hdd_err("wlan: connection failed with " MAC_ADDRESS_STR
@@ -4359,7 +4360,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
{ {
QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
struct hdd_adapter *pAdapter = (struct hdd_adapter *) pContext; struct hdd_adapter *pAdapter = (struct hdd_adapter *) pContext;
hdd_wext_state_t *pWextState = NULL; struct hdd_wext_state *pWextState = NULL;
struct hdd_station_ctx *pHddStaCtx = NULL; struct hdd_station_ctx *pHddStaCtx = NULL;
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
struct cfg80211_bss *bss_status; struct cfg80211_bss *bss_status;
@@ -4871,7 +4872,8 @@ hdd_translate_wpa_to_csr_encryption_type(uint8_t cipher_suite[4])
*/ */
static inline bool hdd_is_fils_connection(struct hdd_adapter *adapter) static inline bool hdd_is_fils_connection(struct hdd_adapter *adapter)
{ {
hdd_wext_state_t *wext_state = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
if (wext_state->roamProfile.fils_con_info) if (wext_state->roamProfile.fils_con_info)
return wext_state->roamProfile. return wext_state->roamProfile.
@@ -5000,9 +5002,11 @@ static int32_t hdd_process_genie(struct hdd_adapter *pAdapter,
* *
* Return: 0 on success, error number otherwise * Return: 0 on success, error number otherwise
*/ */
int hdd_set_genie_to_csr(struct hdd_adapter *pAdapter, eCsrAuthType *RSNAuthType) int hdd_set_genie_to_csr(struct hdd_adapter *pAdapter,
eCsrAuthType *RSNAuthType)
{ {
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
uint32_t status = 0; uint32_t status = 0;
eCsrEncryptionType RSNEncryptType; eCsrEncryptionType RSNEncryptType;
eCsrEncryptionType mcRSNEncryptType; eCsrEncryptionType mcRSNEncryptType;
@@ -5114,11 +5118,14 @@ static bool hdd_check_fils_rsn_n_set_auth_type(tCsrRoamProfile *roam_profile,
* *
* Return: 0 on success, error number otherwise * Return: 0 on success, error number otherwise
*/ */
int hdd_set_csr_auth_type(struct hdd_adapter *pAdapter, eCsrAuthType RSNAuthType) int hdd_set_csr_auth_type(struct hdd_adapter *pAdapter,
eCsrAuthType RSNAuthType)
{ {
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile); tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile);
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
pRoamProfile->AuthType.numEntries = 1; pRoamProfile->AuthType.numEntries = 1;
hdd_debug("pHddStaCtx->conn_info.authType = %d", hdd_debug("pHddStaCtx->conn_info.authType = %d",
@@ -5263,7 +5270,7 @@ static int __iw_set_essid(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
uint32_t status = 0; uint32_t status = 0;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
uint32_t roamId; uint32_t roamId;
@@ -5493,8 +5500,9 @@ static int __iw_get_essid(struct net_device *dev,
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
hdd_wext_state_t *wextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *wextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
int ret; int ret;
ENTER_DEV(dev); ENTER_DEV(dev);
@@ -5564,8 +5572,10 @@ static int __iw_set_auth(struct net_device *dev, struct iw_request_info *info,
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile;
eCsrEncryptionType mcEncryptionType; eCsrEncryptionType mcEncryptionType;
eCsrEncryptionType ucEncryptionType; eCsrEncryptionType ucEncryptionType;
@@ -5800,7 +5810,8 @@ static int __iw_get_auth(struct net_device *dev, struct iw_request_info *info,
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile;
int ret; int ret;

75
core/hdd/src/wlan_hdd_cfg80211.c
ファイルの表示

@@ -13353,7 +13353,7 @@ static int wlan_hdd_change_client_iface_to_new_mode(struct net_device *ndev,
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
struct hdd_config *config = hdd_ctx->config; struct hdd_config *config = hdd_ctx->config;
hdd_wext_state_t *wext; struct hdd_wext_state *wext;
struct wireless_dev *wdev; struct wireless_dev *wdev;
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -13489,7 +13489,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
(pAdapter->device_mode == QDF_P2P_CLIENT_MODE) || (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) ||
(pAdapter->device_mode == QDF_P2P_DEVICE_MODE) || (pAdapter->device_mode == QDF_P2P_DEVICE_MODE) ||
(pAdapter->device_mode == QDF_IBSS_MODE)) { (pAdapter->device_mode == QDF_IBSS_MODE)) {
hdd_wext_state_t *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
pRoamProfile = &pWextState->roamProfile; pRoamProfile = &pWextState->roamProfile;
@@ -13994,7 +13994,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
} else if ((pAdapter->device_mode == QDF_STA_MODE) || } else if ((pAdapter->device_mode == QDF_STA_MODE) ||
(pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) { (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) {
hdd_wext_state_t *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_station_ctx *pHddStaCtx = struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -14117,7 +14117,8 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
) )
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(ndev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(ndev);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile); tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile);
struct key_params params; struct key_params params;
@@ -14287,8 +14288,10 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
bool unicast, bool multicast) bool unicast, bool multicast)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(ndev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(ndev);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
int status; int status;
@@ -15234,7 +15237,7 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *pAdapter,
{ {
int status = 0; int status = 0;
QDF_STATUS qdf_status; QDF_STATUS qdf_status;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
struct hdd_station_ctx *hdd_sta_ctx; struct hdd_station_ctx *hdd_sta_ctx;
uint32_t roamId; uint32_t roamId;
@@ -15584,8 +15587,10 @@ ret_status:
static int wlan_hdd_cfg80211_set_auth_type(struct hdd_adapter *pAdapter, static int wlan_hdd_cfg80211_set_auth_type(struct hdd_adapter *pAdapter,
enum nl80211_auth_type auth_type) enum nl80211_auth_type auth_type)
{ {
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
/*set authentication type */ /*set authentication type */
switch (auth_type) { switch (auth_type) {
@@ -15636,7 +15641,7 @@ static int wlan_hdd_cfg80211_set_auth_type(struct hdd_adapter *pAdapter,
* *
* Return: None * Return: None
*/ */
static void hdd_validate_fils_info_ptr(hdd_wext_state_t *wext_state, static void hdd_validate_fils_info_ptr(struct hdd_wext_state *wext_state,
bool *fils_akm_check) bool *fils_akm_check)
{ {
struct cds_fils_connection_info *fils_con_info; struct cds_fils_connection_info *fils_con_info;
@@ -15650,7 +15655,7 @@ static void hdd_validate_fils_info_ptr(hdd_wext_state_t *wext_state,
*fils_akm_check = true; *fils_akm_check = true;
} }
#else #else
static void hdd_validate_fils_info_ptr(hdd_wext_state_t *wext_state, static void hdd_validate_fils_info_ptr(struct hdd_wext_state *wext_state,
bool *fils_akm_check) bool *fils_akm_check)
{ {
*fils_akm_check = true; *fils_akm_check = true;
@@ -15668,7 +15673,8 @@ static void hdd_validate_fils_info_ptr(hdd_wext_state_t *wext_state,
*/ */
static int wlan_hdd_set_akm_suite(struct hdd_adapter *pAdapter, u32 key_mgmt) static int wlan_hdd_set_akm_suite(struct hdd_adapter *pAdapter, u32 key_mgmt)
{ {
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *roam_profile; tCsrRoamProfile *roam_profile;
bool fils_akm_check; bool fils_akm_check;
@@ -15771,8 +15777,10 @@ static int wlan_hdd_cfg80211_set_cipher(struct hdd_adapter *pAdapter,
u32 cipher, bool ucast) u32 cipher, bool ucast)
{ {
eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE; eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
if (!cipher) { if (!cipher) {
hdd_debug("received cipher %d - considering none", cipher); hdd_debug("received cipher %d - considering none", cipher);
@@ -15853,7 +15861,7 @@ static int wlan_hdd_cfg80211_set_cipher(struct hdd_adapter *pAdapter,
* *
* Return: 0 for success, non-zero for failure * Return: 0 for success, non-zero for failure
*/ */
static int wlan_hdd_add_assoc_ie(hdd_wext_state_t *wext_state, static int wlan_hdd_add_assoc_ie(struct hdd_wext_state *wext_state,
const uint8_t *gen_ie, uint16_t len) const uint8_t *gen_ie, uint16_t len)
{ {
uint16_t cur_add_ie_len = uint16_t cur_add_ie_len =
@@ -15884,10 +15892,12 @@ static int wlan_hdd_add_assoc_ie(hdd_wext_state_t *wext_state,
* *
* Return: 0 for success, non-zero for failure * Return: 0 for success, non-zero for failure
*/ */
static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *pAdapter, const uint8_t *ie, static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *pAdapter,
size_t ie_len) const uint8_t *ie,
size_t ie_len)
{ {
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
const uint8_t *genie = ie; const uint8_t *genie = ie;
uint16_t remLen = ie_len; uint16_t remLen = ie_len;
#ifdef FEATURE_WLAN_WAPI #ifdef FEATURE_WLAN_WAPI
@@ -16255,7 +16265,7 @@ static int wlan_hdd_get_fils_auth_type(enum nl80211_auth_type auth)
static int wlan_hdd_cfg80211_set_fils_config(struct hdd_adapter *adapter, static int wlan_hdd_cfg80211_set_fils_config(struct hdd_adapter *adapter,
struct cfg80211_connect_params *req) struct cfg80211_connect_params *req)
{ {
hdd_wext_state_t *wext_state; struct hdd_wext_state *wext_state;
tCsrRoamProfile *roam_profile; tCsrRoamProfile *roam_profile;
int auth_type; int auth_type;
uint8_t *buf; uint8_t *buf;
@@ -16341,7 +16351,8 @@ static int wlan_hdd_cfg80211_set_privacy(struct hdd_adapter *pAdapter,
struct cfg80211_connect_params *req) struct cfg80211_connect_params *req)
{ {
int status = 0; int status = 0;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
ENTER(); ENTER();
@@ -16563,7 +16574,8 @@ static bool wlan_hdd_reassoc_bssid_hint(struct hdd_adapter *adapter,
bool reassoc = false; bool reassoc = false;
const uint8_t *bssid = NULL; const uint8_t *bssid = NULL;
uint16_t channel = 0; uint16_t channel = 0;
hdd_wext_state_t *wext_state = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
if (req->bssid) if (req->bssid)
bssid = req->bssid; bssid = req->bssid;
@@ -16623,7 +16635,8 @@ static void wlan_hdd_check_ht20_ht40_ind(struct hdd_context *hdd_ctx,
struct hdd_adapter *adapter, struct hdd_adapter *adapter,
struct cfg80211_connect_params *req) struct cfg80211_connect_params *req)
{ {
hdd_wext_state_t *wext_state = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile; tCsrRoamProfile *roam_profile;
roam_profile = &wext_state->roamProfile; roam_profile = &wext_state->roamProfile;
@@ -16643,7 +16656,8 @@ static inline void wlan_hdd_check_ht20_ht40_ind(struct hdd_context *hdd_ctx,
struct hdd_adapter *adapter, struct hdd_adapter *adapter,
struct cfg80211_connect_params *req) struct cfg80211_connect_params *req)
{ {
hdd_wext_state_t *wext_state = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile; tCsrRoamProfile *roam_profile;
roam_profile = &wext_state->roamProfile; roam_profile = &wext_state->roamProfile;
@@ -17156,9 +17170,11 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *pAdapter,
*params) *params)
{ {
int status = 0; int status = 0;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE; eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE;
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
ENTER(); ENTER();
@@ -17248,10 +17264,12 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
struct cfg80211_ibss_params *params) struct cfg80211_ibss_params *params)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile; tCsrRoamProfile *pRoamProfile;
int status; int status;
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
struct qdf_mac_addr bssid; struct qdf_mac_addr bssid;
u8 channelNum = 0; u8 channelNum = 0;
@@ -17455,7 +17473,8 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
struct net_device *dev) struct net_device *dev)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile; tCsrRoamProfile *pRoamProfile;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
int status; int status;

2
core/hdd/src/wlan_hdd_hostapd.c
ファイルの表示

@@ -6543,7 +6543,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
if ((pAdapter->device_mode == QDF_STA_MODE) if ((pAdapter->device_mode == QDF_STA_MODE)
|| (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) || (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)
) { ) {
hdd_wext_state_t *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile;
struct hdd_station_ctx *pHddStaCtx = struct hdd_station_ctx *pHddStaCtx =

5
core/hdd/src/wlan_hdd_ioctl.c
ファイルの表示

@@ -801,7 +801,8 @@ static int hdd_parse_reassoc_command_v1_data(const uint8_t *pValue,
void hdd_wma_send_fastreassoc_cmd(struct hdd_adapter *adapter, void hdd_wma_send_fastreassoc_cmd(struct hdd_adapter *adapter,
const tSirMacAddr bssid, int channel) const tSirMacAddr bssid, int channel)
{ {
hdd_wext_state_t *wext_state = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
struct hdd_station_ctx *hdd_sta_ctx = struct hdd_station_ctx *hdd_sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter); WLAN_HDD_GET_STATION_CTX_PTR(adapter);
tCsrRoamProfile *profile = &wext_state->roamProfile; tCsrRoamProfile *profile = &wext_state->roamProfile;
@@ -4756,7 +4757,7 @@ static int drv_cmd_set_ibss_beacon_oui_data(struct hdd_adapter *adapter,
uint8_t *value = command; uint8_t *value = command;
tSirModifyIE ibssModifyIE; tSirModifyIE ibssModifyIE;
tCsrRoamProfile *pRoamProfile; tCsrRoamProfile *pRoamProfile;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
if (QDF_IBSS_MODE != adapter->device_mode) { if (QDF_IBSS_MODE != adapter->device_mode) {

6
core/hdd/src/wlan_hdd_main.c
ファイルの表示

@@ -4272,7 +4272,8 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
const bool bCloseSession) const bool bCloseSession)
{ {
QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
union iwreq_data wrqu; union iwreq_data wrqu;
tSirUpdateIE updateIE; tSirUpdateIE updateIE;
unsigned long rc; unsigned long rc;
@@ -12519,7 +12520,8 @@ int hdd_get_rssi_snr_by_bssid(struct hdd_adapter *adapter, const uint8_t *bssid,
int8_t *rssi, int8_t *snr) int8_t *rssi, int8_t *snr)
{ {
QDF_STATUS status; QDF_STATUS status;
hdd_wext_state_t *wext_state = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *profile = &wext_state->roamProfile; tCsrRoamProfile *profile = &wext_state->roamProfile;
status = sme_get_rssi_snr_by_bssid(WLAN_HDD_GET_HAL_CTX(adapter), status = sme_get_rssi_snr_by_bssid(WLAN_HDD_GET_HAL_CTX(adapter),

2
core/hdd/src/wlan_hdd_nan_datapath.c
ファイルの表示

@@ -214,7 +214,7 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
{ {
int ret; int ret;
uint32_t roam_id; uint32_t roam_id;
hdd_wext_state_t *wext_state = struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile = &wext_state->roamProfile; tCsrRoamProfile *roam_profile = &wext_state->roamProfile;

2
core/hdd/src/wlan_hdd_scan.c
ファイルの表示

@@ -443,7 +443,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
struct hdd_scan_info *pScanInfo = NULL; struct hdd_scan_info *pScanInfo = NULL;
struct hdd_adapter *con_sap_adapter; struct hdd_adapter *con_sap_adapter;
uint16_t con_dfs_ch; uint16_t con_dfs_ch;
hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
uint8_t curr_session_id; uint8_t curr_session_id;
enum scan_reject_states curr_reason; enum scan_reject_states curr_reason;
static uint32_t scan_ebusy_cnt; static uint32_t scan_ebusy_cnt;

54
core/hdd/src/wlan_hdd_wext.c
ファイルの表示

@@ -4125,7 +4125,7 @@ static void hdd_statistics_cb(void *pStats, void *pContext)
{ {
struct hdd_adapter *pAdapter = (struct hdd_adapter *) pContext; struct hdd_adapter *pAdapter = (struct hdd_adapter *) pContext;
struct hdd_stats *pStatsCache = NULL; struct hdd_stats *pStatsCache = NULL;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
tCsrSummaryStatsInfo *pSummaryStats = NULL; tCsrSummaryStatsInfo *pSummaryStats = NULL;
@@ -4169,7 +4169,8 @@ static void hdd_statistics_cb(void *pStats, void *pContext)
*/ */
void hdd_clear_roam_profile_ie(struct hdd_adapter *pAdapter) void hdd_clear_roam_profile_ie(struct hdd_adapter *pAdapter)
{ {
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
ENTER(); ENTER();
@@ -4654,7 +4655,7 @@ static int __iw_set_mode(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
tCsrRoamProfile *pRoamProfile; tCsrRoamProfile *pRoamProfile;
@@ -4771,7 +4772,7 @@ static int
__iw_get_mode(struct net_device *dev, struct iw_request_info *info, __iw_get_mode(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
int ret; int ret;
@@ -4847,7 +4848,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info,
uint8_t validChan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; uint8_t validChan[WNI_CFG_VALID_CHANNEL_LIST_LEN];
uint32_t indx = 0; uint32_t indx = 0;
int ret; int ret;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -4971,7 +4972,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info,
uint32_t status = false, channel = 0, freq = 0; uint32_t status = false, channel = 0, freq = 0;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
tHalHandle hHal; tHalHandle hHal;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
tCsrRoamProfile *pRoamProfile; tCsrRoamProfile *pRoamProfile;
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
@@ -5180,7 +5181,7 @@ static int __iw_get_bitrate(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
QDF_STATUS status; QDF_STATUS status;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
@@ -5271,7 +5272,7 @@ static int __iw_set_bitrate(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
uint8_t supp_rates[WNI_CFG_SUPPORTED_RATES_11A_LEN]; uint8_t supp_rates[WNI_CFG_SUPPORTED_RATES_11A_LEN];
uint32_t a_len = WNI_CFG_SUPPORTED_RATES_11A_LEN; uint32_t a_len = WNI_CFG_SUPPORTED_RATES_11A_LEN;
@@ -5377,7 +5378,8 @@ static int __iw_set_genie(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
uint8_t *genie = NULL; uint8_t *genie = NULL;
uint8_t *base_genie = NULL; uint8_t *base_genie = NULL;
uint16_t remLen; uint16_t remLen;
@@ -5570,7 +5572,7 @@ static int __iw_get_genie(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
QDF_STATUS status; QDF_STATUS status;
@@ -5664,7 +5666,8 @@ static int __iw_get_encode(struct net_device *dev,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile); tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile);
int keyId; int keyId;
eCsrAuthType authType = eCSR_AUTH_TYPE_NONE; eCsrAuthType authType = eCSR_AUTH_TYPE_NONE;
@@ -6731,8 +6734,10 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx =
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
struct iw_point *encoderq = &(wrqu->encoding); struct iw_point *encoderq = &(wrqu->encoding);
uint32_t keyId; uint32_t keyId;
@@ -6920,7 +6925,8 @@ static int __iw_get_encodeext(struct net_device *dev,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile); tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile);
int keyId; int keyId;
eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE; eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE;
@@ -7019,8 +7025,10 @@ static int __iw_set_encodeext(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx =
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile;
@@ -10131,7 +10139,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
int ret; int ret;
#ifdef WLAN_FEATURE_11W #ifdef WLAN_FEATURE_11W
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
#endif #endif
#ifdef WLAN_FEATURE_11W #ifdef WLAN_FEATURE_11W
@@ -12228,7 +12236,7 @@ static int __iw_get_statistics(struct net_device *dev,
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
hdd_wext_state_t *pWextState; struct hdd_wext_state *pWextState;
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
char *p = extra; char *p = extra;
@@ -14432,7 +14440,7 @@ const struct iw_handler_def we_handler_def = {
*/ */
static int hdd_set_wext(struct hdd_adapter *pAdapter) static int hdd_set_wext(struct hdd_adapter *pAdapter)
{ {
hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
ENTER(); ENTER();
@@ -14487,12 +14495,12 @@ static int hdd_set_wext(struct hdd_adapter *pAdapter)
} }
#ifdef WLAN_FEATURE_FILS_SK #ifdef WLAN_FEATURE_FILS_SK
static void hdd_initialize_fils_info(hdd_wext_state_t *pwextBuf) static void hdd_initialize_fils_info(struct hdd_wext_state *pwextBuf)
{ {
pwextBuf->roamProfile.fils_con_info = NULL; pwextBuf->roamProfile.fils_con_info = NULL;
} }
#else #else
static void hdd_initialize_fils_info(hdd_wext_state_t *pwextBuf) static void hdd_initialize_fils_info(struct hdd_wext_state *pwextBuf)
{ } { }
#endif #endif
@@ -14507,7 +14515,7 @@ static void hdd_initialize_fils_info(hdd_wext_state_t *pwextBuf)
int hdd_register_wext(struct net_device *dev) int hdd_register_wext(struct net_device *dev)
{ {
struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_wext_state *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
QDF_STATUS status; QDF_STATUS status;
ENTER(); ENTER();
@@ -14518,7 +14526,7 @@ int hdd_register_wext(struct net_device *dev)
} }
/* Zero the memory. This zeros the profile structure */ /* Zero the memory. This zeros the profile structure */
memset(pwextBuf, 0, sizeof(hdd_wext_state_t)); memset(pwextBuf, 0, sizeof(struct hdd_wext_state));
status = hdd_set_wext(pAdapter); status = hdd_set_wext(pAdapter);