samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: hdd: Utilize struct csr_roam_profile

Browse Source 
In hdd replace typedef tCsrRoamProfile with struct csr_roam_profile to
align with the Linux coding style.

Change-Id: I38959a6dadc7f1816548f2fa1c4b404e57070590
CRs-Fixed: 2206694
This commit is contained in:
Jeff Johnson
2018-03-15 11:33:31 -07:00
committed by nshrivas
parent cb1b5daac5
commit 61b5e98c2a
10 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/hdd/inc/wlan_hdd_main.h
View File

@@ -2246,7 +2246,7 @@ QDF_STATUS hdd_abort_mac_scan_all_adapters(struct hdd_context *hdd_ctx);
QDF_STATUS QDF_STATUS
wlan_hdd_check_custom_con_channel_rules(struct hdd_adapter *sta_adapter, wlan_hdd_check_custom_con_channel_rules(struct hdd_adapter *sta_adapter,
struct hdd_adapter *ap_adapter, struct hdd_adapter *ap_adapter,
tCsrRoamProfile *roam_profile, struct csr_roam_profile *roam_profile,
tScanResultHandle *scan_cache, tScanResultHandle *scan_cache,
bool *concurrent_chnl_same); bool *concurrent_chnl_same);

2
core/hdd/inc/wlan_hdd_wext.h
View File

@@ -205,7 +205,7 @@ enum hdd_wlan_wmm_ts_info_ack_policy {
*/ */
struct hdd_wext_state { struct hdd_wext_state {
/** The CSR "desired" Profile */ /** The CSR "desired" Profile */
tCsrRoamProfile roamProfile; struct csr_roam_profile roamProfile;
/**WPA or RSN IE*/ /**WPA or RSN IE*/
uint8_t WPARSNIE[MAX_WPA_RSN_IE_LEN]; uint8_t WPARSNIE[MAX_WPA_RSN_IE_LEN];

16
core/hdd/src/wlan_hdd_assoc.c
View File

@@ -1268,7 +1268,7 @@ static void hdd_send_association_event(struct net_device *dev,
/* rather than with cfg to see if FT is enabled */ /* rather than with cfg to see if FT is enabled */
struct hdd_wext_state *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile = &(pWextState->roamProfile); struct csr_roam_profile *roam_profile = &(pWextState->roamProfile);
memset(&wrqu, '\0', sizeof(wrqu)); memset(&wrqu, '\0', sizeof(wrqu));
wrqu.ap_addr.sa_family = ARPHRD_ETHER; wrqu.ap_addr.sa_family = ARPHRD_ETHER;
@@ -5110,7 +5110,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
* Return: void * Return: void
*/ */
static void hdd_set_def_rsne_override( static void hdd_set_def_rsne_override(
tCsrRoamProfile *roam_profile, eCsrAuthType *auth_type) struct csr_roam_profile *roam_profile, eCsrAuthType *auth_type)
{ {
hdd_debug("Set def values in roam profile"); hdd_debug("Set def values in roam profile");
@@ -5250,8 +5250,9 @@ int hdd_set_genie_to_csr(struct hdd_adapter *adapter,
* *
* Return: true if FILS auth else false * Return: true if FILS auth else false
*/ */
static bool hdd_check_fils_rsn_n_set_auth_type(tCsrRoamProfile *roam_profile, static
eCsrAuthType rsn_auth_type) bool hdd_check_fils_rsn_n_set_auth_type(struct csr_roam_profile *roam_profile,
eCsrAuthType rsn_auth_type)
{ {
bool is_fils_rsn = false; bool is_fils_rsn = false;
@@ -5269,8 +5270,9 @@ static bool hdd_check_fils_rsn_n_set_auth_type(tCsrRoamProfile *roam_profile,
return is_fils_rsn; return is_fils_rsn;
} }
#else #else
static bool hdd_check_fils_rsn_n_set_auth_type(tCsrRoamProfile *roam_profile, static
eCsrAuthType rsn_auth_type) bool hdd_check_fils_rsn_n_set_auth_type(struct csr_roam_profile *roam_profile,
eCsrAuthType rsn_auth_type)
{ {
return false; return false;
} }
@@ -5288,7 +5290,7 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
{ {
struct hdd_wext_state *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile = &(pWextState->roamProfile); struct csr_roam_profile *roam_profile = &(pWextState->roamProfile);
struct hdd_station_ctx *sta_ctx = struct hdd_station_ctx *sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter); WLAN_HDD_GET_STATION_CTX_PTR(adapter);

38
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -15401,7 +15401,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
struct wireless_dev *wdev; struct wireless_dev *wdev;
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; struct hdd_context *hdd_ctx;
tCsrRoamProfile *roam_profile = NULL; struct csr_roam_profile *roam_profile = NULL;
eCsrRoamBssType LastBSSType; eCsrRoamBssType LastBSSType;
struct hdd_config *pConfig = NULL; struct hdd_config *pConfig = NULL;
int status; int status;
@@ -16094,7 +16094,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
) )
{ {
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
struct key_params params; struct key_params params;
ENTER(); ENTER();
@@ -16397,7 +16397,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
} else if (QDF_SAP_MODE == adapter->device_mode) { } else if (QDF_SAP_MODE == adapter->device_mode) {
struct hdd_ap_ctx *ap_ctx = struct hdd_ap_ctx *ap_ctx =
WLAN_HDD_GET_AP_CTX_PTR(adapter); WLAN_HDD_GET_AP_CTX_PTR(adapter);
tCsrRoamProfile *profile = struct csr_roam_profile *profile =
wlan_sap_get_roam_profile(ap_ctx->sap_context); wlan_sap_get_roam_profile(ap_ctx->sap_context);
if (!profile) { if (!profile) {
@@ -16931,8 +16931,9 @@ void hdd_select_cbmode(struct hdd_adapter *adapter, uint8_t operationChannel,
* *
* Return: false if sta-sap conc is not allowed, else return true * Return: false if sta-sap conc is not allowed, else return true
*/ */
static bool wlan_hdd_handle_sap_sta_dfs_conc(struct hdd_adapter *adapter, static
tCsrRoamProfile *roam_profile) bool wlan_hdd_handle_sap_sta_dfs_conc(struct hdd_adapter *adapter,
struct csr_roam_profile *roam_profile)
{ {
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
struct hdd_adapter *ap_adapter; struct hdd_adapter *ap_adapter;
@@ -17048,7 +17049,8 @@ static bool wlan_hdd_handle_sap_sta_dfs_conc(struct hdd_adapter *adapter,
* *
* Return: 0 if check result is valid, otherwise return error code * Return: 0 if check result is valid, otherwise return error code
*/ */
static int wlan_hdd_cfg80211_check_pmf_valid(tCsrRoamProfile *roam_profile) static
int wlan_hdd_cfg80211_check_pmf_valid(struct csr_roam_profile *roam_profile)
{ {
if (roam_profile->MFPEnabled && if (roam_profile->MFPEnabled &&
!(roam_profile->MFPRequired || !(roam_profile->MFPRequired ||
@@ -17063,7 +17065,7 @@ static int wlan_hdd_cfg80211_check_pmf_valid(tCsrRoamProfile *roam_profile)
} }
#else #else
static inline static inline
int wlan_hdd_cfg80211_check_pmf_valid(tCsrRoamProfile *roam_profile) int wlan_hdd_cfg80211_check_pmf_valid(struct csr_roam_profile *roam_profile)
{ {
return 0; return 0;
} }
@@ -17095,7 +17097,7 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
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 = INVALID_ROAM_ID; uint32_t roamId = INVALID_ROAM_ID;
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
eCsrAuthType RSNAuthType; eCsrAuthType RSNAuthType;
tSmeConfigParams *sme_config; tSmeConfigParams *sme_config;
uint8_t channel = 0; uint8_t channel = 0;
@@ -17556,7 +17558,7 @@ static int wlan_hdd_cfg80211_set_fils_config(struct hdd_adapter *adapter,
struct cfg80211_connect_params *req) struct cfg80211_connect_params *req)
{ {
struct hdd_wext_state *wext_state; struct hdd_wext_state *wext_state;
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
enum eAniAuthType auth_type; enum eAniAuthType auth_type;
uint8_t *buf; uint8_t *buf;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -17731,7 +17733,7 @@ static int wlan_hdd_set_akm_suite(struct hdd_adapter *adapter, u32 key_mgmt)
{ {
struct hdd_wext_state *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
roam_profile = &pWextState->roamProfile; roam_profile = &pWextState->roamProfile;
@@ -17966,7 +17968,7 @@ static int wlan_hdd_add_assoc_ie(struct hdd_wext_state *wext_state,
* *
* Return: None * Return: None
*/ */
static void wlan_hdd_save_hlp_ie(tCsrRoamProfile *roam_profile, static void wlan_hdd_save_hlp_ie(struct csr_roam_profile *roam_profile,
const uint8_t *gen_ie, uint16_t len, const uint8_t *gen_ie, uint16_t len,
bool flush) bool flush)
{ {
@@ -18001,7 +18003,7 @@ static void wlan_hdd_save_hlp_ie(tCsrRoamProfile *roam_profile,
roam_profile->hlp_ie_len += len; roam_profile->hlp_ie_len += len;
} }
#else #else
static inline void wlan_hdd_save_hlp_ie(tCsrRoamProfile *roam_profile, static inline void wlan_hdd_save_hlp_ie(struct csr_roam_profile *roam_profile,
const uint8_t *gen_ie, uint16_t len, const uint8_t *gen_ie, uint16_t len,
bool flush) bool flush)
{} {}
@@ -18689,7 +18691,7 @@ static void wlan_hdd_check_ht20_ht40_ind(struct hdd_context *hdd_ctx,
{ {
struct hdd_wext_state *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; struct csr_roam_profile *roam_profile;
roam_profile = &wext_state->roamProfile; roam_profile = &wext_state->roamProfile;
roam_profile->force_24ghz_in_ht20 = false; roam_profile->force_24ghz_in_ht20 = false;
@@ -18710,7 +18712,7 @@ static inline void wlan_hdd_check_ht20_ht40_ind(struct hdd_context *hdd_ctx,
{ {
struct hdd_wext_state *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; struct csr_roam_profile *roam_profile;
roam_profile = &wext_state->roamProfile; roam_profile = &wext_state->roamProfile;
@@ -19322,7 +19324,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_wext_state *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
int status; int status;
struct hdd_station_ctx *sta_ctx = struct hdd_station_ctx *sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter); WLAN_HDD_GET_STATION_CTX_PTR(adapter);
@@ -19531,7 +19533,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_wext_state *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
int status; int status;
QDF_STATUS hal_status; QDF_STATUS hal_status;
@@ -21346,7 +21348,7 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
QDF_STATUS status; QDF_STATUS status;
tHalHandle hal_hdl; tHalHandle hal_hdl;
struct qdf_mac_addr bssid; struct qdf_mac_addr bssid;
tCsrRoamProfile roam_profile; struct csr_roam_profile roam_profile;
struct ch_params ch_params; struct ch_params ch_params;
uint8_t sec_ch = 0; uint8_t sec_ch = 0;
int ret; int ret;
@@ -21520,7 +21522,7 @@ static int __wlan_hdd_cfg80211_update_connect_params(
struct cfg80211_connect_params *req, uint32_t changed) struct cfg80211_connect_params *req, uint32_t changed)
{ {
struct hdd_wext_state *wext_state; struct hdd_wext_state *wext_state;
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
uint8_t *buf; uint8_t *buf;
int ret; int ret;
enum eAniAuthType auth_type; enum eAniAuthType auth_type;

3
core/hdd/src/wlan_hdd_hostapd.c
View File

@@ -6669,7 +6669,8 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
) { ) {
struct hdd_wext_state *pWextState = struct hdd_wext_state *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *roam_profile = &pWextState->roamProfile; struct csr_roam_profile *roam_profile =
&pWextState->roamProfile;
struct hdd_station_ctx *sta_ctx = struct hdd_station_ctx *sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter); WLAN_HDD_GET_STATION_CTX_PTR(adapter);

4
core/hdd/src/wlan_hdd_ioctl.c
View File

@@ -805,7 +805,7 @@ void hdd_wma_send_fastreassoc_cmd(struct hdd_adapter *adapter,
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); 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; struct csr_roam_profile *profile = &wext_state->roamProfile;
tSirMacAddr connected_bssid; tSirMacAddr connected_bssid;
qdf_mem_copy(connected_bssid, hdd_sta_ctx->conn_info.bssId.bytes, qdf_mem_copy(connected_bssid, hdd_sta_ctx->conn_info.bssId.bytes,
@@ -4750,7 +4750,7 @@ static int drv_cmd_set_ibss_beacon_oui_data(struct hdd_adapter *adapter,
uint32_t ibss_ie_length; uint32_t ibss_ie_length;
uint8_t *value = command; uint8_t *value = command;
tSirModifyIE ibssModifyIE; tSirModifyIE ibssModifyIE;
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
struct hdd_wext_state *pWextState; struct hdd_wext_state *pWextState;

4
core/hdd/src/wlan_hdd_main.c
View File

@@ -11405,7 +11405,7 @@ void hdd_bus_bw_compute_timer_try_stop(struct hdd_context *hdd_ctx)
QDF_STATUS QDF_STATUS
wlan_hdd_check_custom_con_channel_rules(struct hdd_adapter *sta_adapter, wlan_hdd_check_custom_con_channel_rules(struct hdd_adapter *sta_adapter,
struct hdd_adapter *ap_adapter, struct hdd_adapter *ap_adapter,
tCsrRoamProfile *roam_profile, struct csr_roam_profile *roam_profile,
tScanResultHandle *scan_cache, tScanResultHandle *scan_cache,
bool *concurrent_chnl_same) bool *concurrent_chnl_same)
{ {
@@ -13494,7 +13494,7 @@ int hdd_get_rssi_snr_by_bssid(struct hdd_adapter *adapter, const uint8_t *bssid,
QDF_STATUS status; QDF_STATUS status;
struct hdd_wext_state *wext_state = struct hdd_wext_state *wext_state =
WLAN_HDD_GET_WEXT_STATE_PTR(adapter); WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
tCsrRoamProfile *profile = &wext_state->roamProfile; struct csr_roam_profile *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),
profile, bssid, rssi, snr); profile, bssid, rssi, snr);

2
core/hdd/src/wlan_hdd_nan_datapath.c
View File

@@ -170,7 +170,7 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
uint32_t roam_id; uint32_t roam_id;
struct hdd_wext_state *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; struct csr_roam_profile *roam_profile = &wext_state->roamProfile;
ENTER(); ENTER();

2
core/hdd/src/wlan_hdd_power.c
View File

@@ -730,7 +730,7 @@ static void __hdd_ipv4_notifier_work_queue(struct work_struct *work)
struct hdd_adapter *adapter; struct hdd_adapter *adapter;
int errno; int errno;
struct hdd_wext_state *wext_state; struct hdd_wext_state *wext_state;
tCsrRoamProfile *roam_profile; struct csr_roam_profile *roam_profile;
struct in_ifaddr *ifa; struct in_ifaddr *ifa;
ENTER(); ENTER();

2
core/hdd/src/wlan_hdd_wext.c
View File

@@ -10564,7 +10564,7 @@ int wlan_hdd_set_mon_chan(struct hdd_adapter *adapter, uint32_t chan,
QDF_STATUS status; QDF_STATUS status;
tHalHandle hal_hdl = hdd_ctx->hHal; tHalHandle hal_hdl = hdd_ctx->hHal;
struct qdf_mac_addr bssid; struct qdf_mac_addr bssid;
tCsrRoamProfile roam_profile; struct csr_roam_profile roam_profile;
struct ch_params ch_params; struct ch_params ch_params;
if (QDF_GLOBAL_MONITOR_MODE != hdd_get_conparam()) { if (QDF_GLOBAL_MONITOR_MODE != hdd_get_conparam()) {