qcacld-3.0: Fix camelCase in tsap_Config_t

Rename typedef tsap_Config_t and the underlying struct sap_Config to
align with the Linux coding standard.

Change-Id: I6e8f8b5ab9555c7781f1acf12a0475902866300c
CRs-Fixed: 2237721
This commit is contained in:
Jeff Johnson 2018-05-05 23:22:32 -07:00 • committed by nshrivas
commit e4c11db22a
12 changed files with 56 additions and 56 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -29,7 +29,7 @@
struct hdd_context;
struct wma_tgt_cfg;
struct hdd_beacon_data;
struct sap_Config;
struct sap_config;
#ifdef WLAN_FEATURE_11AX
/**
@ -91,7 +91,7 @@ void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx,
* Return: None
*/
void wlan_hdd_check_11ax_support(struct hdd_beacon_data *beacon,
struct sap_Config *config);
struct sap_config *config);
/**
* hdd_he_print_ini_config()- Print 11AX(HE) specific INI configuration
@ -150,7 +150,7 @@ static inline void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx,
}
static inline void wlan_hdd_check_11ax_support(struct hdd_beacon_data *beacon,
struct sap_Config *config)
struct sap_config *config)
{
}

View file

@ -1037,7 +1037,7 @@ struct hdd_ap_ctx {
tCsrRoamSetKey wep_key[CSR_MAX_NUM_KEY];
uint8_t wep_def_key_idx;
struct sap_context *sap_context;
tsap_Config_t sap_config;
tsap_config_t sap_config;
uint8_t operating_channel;
struct hdd_beacon_data *beacon;
qdf_mc_timer_t vendor_acs_timer;

View file

@ -28,7 +28,7 @@
#include "qdf_event.h"
struct hdd_context;
struct sap_Config;
struct sap_config;
/*
* order of parameters in addTs private ioctl
@ -248,7 +248,7 @@ int hdd_assemble_rate_code(uint8_t preamble, uint8_t nss, uint8_t rate);
* Return: 0 on success, negative errno on failure
*/
int hdd_set_11ax_rate(struct hdd_adapter *adapter, int value,
struct sap_Config *sap_config);
struct sap_config *sap_config);
int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
int new_phymode, struct hdd_context *phddctx);

View file

@ -1521,7 +1521,7 @@ static int is_driver_dfs_capable(struct wiphy *wiphy,
int wlan_hdd_sap_cfg_dfs_override(struct hdd_adapter *adapter)
{
struct hdd_adapter *con_sap_adapter;
tsap_Config_t *sap_config, *con_sap_config;
tsap_config_t *sap_config, *con_sap_config;
int con_ch;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@ -1603,7 +1603,7 @@ int wlan_hdd_sap_cfg_dfs_override(struct hdd_adapter *adapter)
* Return: 0 if success else error code
*/
static int wlan_hdd_reset_force_acs_chan_range(struct hdd_context *hdd_ctx,
tsap_Config_t *sap_config)
tsap_config_t *sap_config)
{
bool is_dfs_mode_enabled = false;
uint32_t i, num_channels = 0;
@ -1719,7 +1719,7 @@ static int wlan_hdd_reset_force_acs_chan_range(struct hdd_context *hdd_ctx,
* Return: 0 if success; -EINVAL if ACS channel list is NULL
*/
static int wlan_hdd_set_acs_ch_range(
tsap_Config_t *sap_cfg, enum qca_wlan_vendor_acs_hw_mode hw_mode,
tsap_config_t *sap_cfg, enum qca_wlan_vendor_acs_hw_mode hw_mode,
bool ht_enabled, bool vht_enabled)
{
int i;
@ -1771,7 +1771,7 @@ static int wlan_hdd_set_acs_ch_range(
static void wlan_hdd_cfg80211_start_pending_acs(struct work_struct *work);
static void hdd_update_acs_channel_list(tsap_Config_t *sap_config,
static void hdd_update_acs_channel_list(tsap_config_t *sap_config,
enum band_info band)
{
int i, temp_count = 0;
@ -1811,7 +1811,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
{
struct hdd_context *hdd_ctx;
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
tpWLAN_SAPEventCB acs_event_callback;
int status;
@ -1909,7 +1909,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
*/
static void hdd_update_vendor_pcl_list(struct hdd_context *hdd_ctx,
struct hdd_vendor_acs_chan_params *acs_chan_params,
tsap_Config_t *sap_config)
tsap_config_t *sap_config)
{
int i, j;
/*
@ -1952,7 +1952,7 @@ static int hdd_update_reg_chan_info(struct hdd_adapter *adapter,
struct ch_params ch_params = {0};
uint8_t bw_offset = 0, chan = 0;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
tsap_Config_t *sap_config = &adapter->session.ap.sap_config;
tsap_config_t *sap_config = &adapter->session.ap.sap_config;
/* memory allocation */
sap_config->channel_info = qdf_mem_malloc(
@ -2050,7 +2050,7 @@ static int hdd_update_reg_chan_info(struct hdd_adapter *adapter,
*/
static int32_t
hdd_cfg80211_update_channel_info(struct sk_buff *skb,
tsap_Config_t *sap_config, int idx)
tsap_config_t *sap_config, int idx)
{
struct nlattr *nla_attr, *channel;
struct hdd_channel_info *icv;
@ -2157,7 +2157,7 @@ fail:
}
static void hdd_get_scan_band(struct hdd_context *hdd_ctx,
tsap_Config_t *sap_config,
tsap_config_t *sap_config,
enum band_info *band)
{
/* Get scan band */
@ -2193,7 +2193,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
uint8_t reason)
{
struct sk_buff *skb;
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
uint32_t channel_count = 0, status = -EINVAL;
uint8_t channel_list[QDF_MAX_NUM_CHAN] = {0};
uint32_t freq_list[QDF_MAX_NUM_CHAN] = {0};
@ -2457,7 +2457,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
struct net_device *ndev = wdev->netdev;
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
struct sk_buff *temp_skbuff;
int ret, i;
struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_ACS_MAX + 1];
@ -2844,7 +2844,7 @@ static void wlan_hdd_cfg80211_start_pending_acs(struct work_struct *work)
void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
{
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
tsap_Config_t *sap_cfg = &(WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config;
tsap_config_t *sap_cfg = &(WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config;
struct sk_buff *vendor_event;
int ret_val;
struct hdd_adapter *con_sap_adapter;
@ -9975,7 +9975,7 @@ int wlan_hdd_sap_get_valid_channellist(struct hdd_adapter *adapter,
uint8_t *channel_list,
enum band_info band)
{
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
uint8_t tmp_chan_list[QDF_MAX_NUM_CHAN] = {0};
uint32_t chan_count;
@ -11373,7 +11373,7 @@ static QDF_STATUS wlan_hdd_validate_acs_channel(struct hdd_adapter *adapter,
}
static void hdd_update_acs_sap_config(struct hdd_context *hdd_ctx,
tsap_Config_t *sap_config,
tsap_config_t *sap_config,
struct hdd_vendor_chan_info *channel_list)
{
sap_config->channel = channel_list->pri_ch;
@ -11407,7 +11407,7 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason,
uint8_t channel_cnt,
struct hdd_vendor_chan_info *channel_list)
{
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
struct hdd_ap_ctx *hdd_ap_ctx;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
QDF_STATUS status = QDF_STATUS_SUCCESS;
@ -21403,7 +21403,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
int i;
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
struct hdd_hostapd_state *hostapd_state;
tsap_Config_t *pConfig;
tsap_config_t *pConfig;
struct hdd_context *hdd_ctx;
int status;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;

View file

@ -228,7 +228,7 @@ void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx,
}
void wlan_hdd_check_11ax_support(struct hdd_beacon_data *beacon,
tsap_Config_t *config)
tsap_config_t *config)
{
const uint8_t *ie;

View file

@ -1897,7 +1897,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
case eSAP_DFS_RADAR_DETECT:
{
int i;
tsap_Config_t *sap_config =
tsap_config_t *sap_config =
&adapter->session.ap.sap_config;
hdd_dfs_indicate_radar(hdd_ctx);
@ -3507,7 +3507,7 @@ static __iw_softap_setparam(struct net_device *dev,
case QCASAP_SET_11N_RATE:
{
uint8_t preamble = 0, nss = 0, rix = 0;
tsap_Config_t *pConfig =
tsap_config_t *pConfig =
&adapter->session.ap.sap_config;
hdd_debug("SET_HT_RATE val %d", set_value);
@ -3570,7 +3570,7 @@ static __iw_softap_setparam(struct net_device *dev,
case QCASAP_SET_VHT_RATE:
{
uint8_t preamble = 0, nss = 0, rix = 0;
tsap_Config_t *pConfig =
tsap_config_t *pConfig =
&adapter->session.ap.sap_config;
if (pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac &&
@ -6407,7 +6407,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
int status;
tSmeConfigParams *sme_config;
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
hdd_enter();
@ -6933,7 +6933,7 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter)
uint8_t *genie;
uint16_t total_ielen = 0;
int ret = 0;
tsap_Config_t *pConfig;
tsap_config_t *pConfig;
tSirUpdateIE updateIE;
struct hdd_beacon_data *beacon = NULL;
uint16_t proberesp_ies_len;
@ -7074,7 +7074,7 @@ done:
*/
static void wlan_hdd_set_sap_hwmode(struct hdd_adapter *adapter)
{
tsap_Config_t *pConfig = &adapter->session.ap.sap_config;
tsap_config_t *pConfig = &adapter->session.ap.sap_config;
struct hdd_beacon_data *pBeacon = adapter->session.ap.beacon;
struct ieee80211_mgmt *pMgmt_frame =
(struct ieee80211_mgmt *)pBeacon->head;
@ -7137,7 +7137,7 @@ static void wlan_hdd_set_sap_hwmode(struct hdd_adapter *adapter)
*/
QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter)
{
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
struct hdd_config *ini_config;
tHalHandle hal;
@ -7152,7 +7152,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter *
hdd_ctx->skip_acs_scan_status);
if (hdd_ctx->skip_acs_scan_status == eSAP_SKIP_ACS_SCAN) {
struct hdd_adapter *con_sap_adapter;
tsap_Config_t *con_sap_config = NULL;
tsap_config_t *con_sap_config = NULL;
con_sap_adapter = hdd_get_con_sap_adapter(adapter, false);
@ -7268,7 +7268,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter *
*/
static int wlan_hdd_sap_p2p_11ac_overrides(struct hdd_adapter *ap_adapter)
{
tsap_Config_t *sap_cfg = &ap_adapter->session.ap.sap_config;
tsap_config_t *sap_cfg = &ap_adapter->session.ap.sap_config;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
/* Fixed channel 11AC override:
@ -7343,7 +7343,7 @@ static int wlan_hdd_sap_p2p_11ac_overrides(struct hdd_adapter *ap_adapter)
*/
static int wlan_hdd_setup_acs_overrides(struct hdd_adapter *ap_adapter)
{
tsap_Config_t *sap_cfg = &ap_adapter->session.ap.sap_config;
tsap_config_t *sap_cfg = &ap_adapter->session.ap.sap_config;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
hdd_debug("** Driver force ACS override **");
@ -7472,7 +7472,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
enum nl80211_hidden_ssid hidden_ssid,
bool check_for_concurrency)
{
tsap_Config_t *pConfig;
tsap_config_t *pConfig;
struct hdd_beacon_data *pBeacon = NULL;
struct ieee80211_mgmt *pMgmt_frame;
const uint8_t *pIe = NULL;
@ -8559,7 +8559,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
if (cds_is_sub_20_mhz_enabled()) {
enum channel_state ch_state;
enum phy_ch_width sub_20_ch_width = CH_WIDTH_INVALID;
tsap_Config_t *sap_cfg = &adapter->session.ap.sap_config;
tsap_config_t *sap_cfg = &adapter->session.ap.sap_config;
/* Avoid ACS/DFS, and overwrite ch wd to 20 */
if (channel == 0) {
@ -8641,7 +8641,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
) {
struct hdd_beacon_data *old, *new;
enum nl80211_channel_type channel_type;
tsap_Config_t *sap_config =
tsap_config_t *sap_config =
&((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config);
old = adapter->session.ap.beacon;

View file

@ -4896,7 +4896,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx,
union iwreq_data wrqu;
tSirUpdateIE updateIE;
unsigned long rc;
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
hdd_enter();
@ -11613,7 +11613,7 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit)
struct hdd_hostapd_state *hostapd_state;
QDF_STATUS qdf_status;
struct hdd_context *hdd_ctx;
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
if (NULL == ap_adapter) {
hdd_err("ap_adapter is NULL here");
@ -13392,7 +13392,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
struct hdd_hostapd_state *hostapd_state;
QDF_STATUS qdf_status;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
tsap_Config_t *sap_config;
tsap_config_t *sap_config;
void *sap_ctx;
hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);

View file

@ -3689,7 +3689,7 @@ int hdd_assemble_rate_code(uint8_t preamble, uint8_t nss, uint8_t rate)
}
int hdd_set_11ax_rate(struct hdd_adapter *adapter, int set_value,
struct sap_Config *sap_config)
struct sap_config *sap_config)
{
uint8_t preamble = 0, nss = 0, rix = 0;
int ret;

View file

@ -543,7 +543,7 @@ enum sap_acs_dfs_mode {
ACS_DFS_MODE_DEPRIORITIZE
};
typedef struct sap_Config {
typedef struct sap_config {
tSap_SSIDInfo_t SSIDinfo;
eCsrPhyMode SapHw_mode; /* Wireless Mode */
eSapMacAddrACL SapMacaddr_acl;
@ -623,7 +623,7 @@ typedef struct sap_Config {
bool chan_switch_hostapd_rate_enabled;
bool dfs_beacon_tx_enhanced;
uint16_t reduced_beacon_interval;
} tsap_Config_t;
} tsap_config_t;
#ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
typedef enum {
@ -912,7 +912,7 @@ bool wlansap_is_channel_leaking_in_nol(struct sap_context *sap_ctx,
*/
QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
tpWLAN_SAPEventCB pSapEventCallback,
tsap_Config_t *pConfig, void *pUsrContext);
tsap_config_t *pConfig, void *pUsrContext);
/**
* wlansap_stop_bss() - stop BSS.
@ -1006,7 +1006,7 @@ uint16_t wlansap_check_cc_intf(struct sap_context *sap_ctx);
* QDF_STATUS_SUCCESS: Success
*/
QDF_STATUS wlansap_set_mac_acl(struct sap_context *sap_ctx,
tsap_Config_t *pConfig);
tsap_config_t *pConfig);
/**
* wlansap_disassoc_sta() - initiate disassociation of station.
@ -1296,12 +1296,12 @@ uint32_t wlan_sap_get_vht_ch_width(struct sap_context *sap_ctx);
void wlan_sap_set_vht_ch_width(struct sap_context *sap_ctx,
uint32_t vht_channel_width);
QDF_STATUS wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig,
QDF_STATUS wlansap_update_sap_config_add_ie(tsap_config_t *pConfig,
const uint8_t *
pAdditionIEBuffer,
uint16_t additionIELength,
eUpdateIEsType updateType);
QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig,
QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_config_t *pConfig,
eUpdateIEsType updateType);
void wlansap_extend_to_acs_range(tHalHandle hal, uint8_t *startChannelNum,
uint8_t *endChannelNum, uint8_t *bandStartChannel,
@ -1357,7 +1357,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
*/
QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
tpWLAN_SAPEventCB pacs_event_callback,
tsap_Config_t *pconfig,
tsap_config_t *pconfig,
void *pusr_context);
/**

View file

@ -2801,7 +2801,7 @@ QDF_STATUS sap_fsm(struct sap_context *sap_ctx, ptWLAN_SAPEvent sap_event)
}
eSapStatus
sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType,
sapconvert_to_csr_profile(tsap_config_t *pconfig_params, eCsrRoamBssType bssType,
struct csr_roam_profile *profile)
{
/* Create Roam profile for SoftAP to connect */

View file

@ -326,7 +326,7 @@ sap_signal_hdd_event(struct sap_context *sapContext,
QDF_STATUS sap_fsm(struct sap_context *sapContext, ptWLAN_SAPEvent sapEvent);
eSapStatus
sapconvert_to_csr_profile(tsap_Config_t *pconfig_params,
sapconvert_to_csr_profile(tsap_config_t *pconfig_params,
eCsrRoamBssType bssType,
struct csr_roam_profile *profile);

View file

@ -469,7 +469,7 @@ uint16_t wlansap_check_cc_intf(struct sap_context *sap_ctx)
* performing the operation
*/
static QDF_STATUS
wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig,
wlansap_set_scan_acs_channel_params(tsap_config_t *pconfig,
struct sap_context *psap_ctx,
void *pusr_context)
{
@ -622,7 +622,7 @@ static inline bool wlan_sap_validate_channel_switch(tHalHandle hal,
#endif
QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
tpWLAN_SAPEventCB pSapEventCallback,
tsap_Config_t *pConfig, void *pUsrContext)
tsap_config_t *pConfig, void *pUsrContext)
{
tWLAN_SAPEvent sapEvent; /* State machine event */
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@ -759,7 +759,7 @@ fail:
} /* wlansap_start_bss */
QDF_STATUS wlansap_set_mac_acl(struct sap_context *sap_ctx,
tsap_Config_t *pConfig)
tsap_config_t *pConfig)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@ -2119,7 +2119,7 @@ QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel)
}
QDF_STATUS
wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig,
wlansap_update_sap_config_add_ie(tsap_config_t *pConfig,
const uint8_t *pAdditionIEBuffer,
uint16_t additionIELength,
eUpdateIEsType updateType)
@ -2205,7 +2205,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig,
}
QDF_STATUS
wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType)
wlansap_reset_sap_config_add_ie(tsap_config_t *pConfig, eUpdateIEsType updateType)
{
if (NULL == pConfig) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@ -2436,7 +2436,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
tpWLAN_SAPEventCB pacs_event_callback,
tsap_Config_t *pconfig,
tsap_config_t *pconfig,
void *pusr_context)
{
tHalHandle h_hal = NULL;