summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Girigowda <sgirigow@codeaurora.org>2017-03-24 18:27:57 -0700
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-31 16:01:39 -0700
commit83af5ffe7b3df9d777f9867d16420c3afe392b94 (patch)
tree6727d5b5f5172e51b1fc3ed7bf538712d215f6fb
parente93a7869f6de2d9fd1313fea9e502d64b8cfc46f (diff)
qcacld-3.0: Fix kernel checkpatch warnings in qc_sap_ioctl.h
Fix kernel checkpatch warnings in qc_sap_ioctl.h. As a part of checkpatch warnings remove the unused structures/enums. Change-Id: I0144c3cf2d40c115d4965cd0e230c928c710f82a CRs-Fixed: 2024274
-rw-r--r--core/hdd/inc/qc_sap_ioctl.h48
-rw-r--r--core/hdd/src/wlan_hdd_hostapd.c11
-rw-r--r--core/hdd/src/wlan_hdd_wext.c2
3 files changed, 11 insertions, 50 deletions
diff --git a/core/hdd/inc/qc_sap_ioctl.h b/core/hdd/inc/qc_sap_ioctl.h
index c1c70ee28de2..a87869fa8857 100644
--- a/core/hdd/inc/qc_sap_ioctl.h
+++ b/core/hdd/inc/qc_sap_ioctl.h
@@ -40,34 +40,6 @@
#define QCSAP_MAX_OPT_IE 256
#define QCSAP_MAX_WSC_IE 256
#define QCSAP_MAX_GET_STA_INFO 512
-
-typedef struct sSSID {
- uint8_t length;
- uint8_t ssId[32];
-} tSSID;
-
-typedef struct sSSIDInfo {
- tSSID ssid;
- uint8_t ssidHidden;
-} tSSIDInfo;
-
-typedef enum {
- eQC_DOT11_MODE_ALL = 0,
- eQC_DOT11_MODE_ABG = 0x0001, /* 11a/b/g only, no HT, no proprietary */
- eQC_DOT11_MODE_11A = 0x0002,
- eQC_DOT11_MODE_11B = 0x0004,
- eQC_DOT11_MODE_11G = 0x0008,
- eQC_DOT11_MODE_11N = 0x0010,
- eQC_DOT11_MODE_11G_ONLY = 0x0020,
- eQC_DOT11_MODE_11N_ONLY = 0x0040,
- eQC_DOT11_MODE_11B_ONLY = 0x0080,
- eQC_DOT11_MODE_11A_ONLY = 0x0100,
- /* This is for WIFI test. It is same as eWNIAPI_MAC_PROTOCOL_ALL except when it starts IBSS in 11B of 2.4GHz */
- /* It is for CSR internal use */
- eQC_DOT11_MODE_AUTO = 0x0200,
-
-} tQcPhyMode;
-
#define QCSAP_ADDR_LEN 6
typedef uint8_t qcmacaddr[QCSAP_ADDR_LEN];
@@ -77,18 +49,6 @@ struct qc_mac_acl_entry {
int vlan_id;
};
-typedef enum {
- eQC_AUTH_TYPE_OPEN_SYSTEM,
- eQC_AUTH_TYPE_SHARED_KEY,
- eQC_AUTH_TYPE_AUTO_SWITCH
-} eQcAuthType;
-
-typedef enum {
- eQC_WPS_BEACON_IE,
- eQC_WPS_PROBE_RSP_IE,
- eQC_WPS_ASSOC_RSP_IE
-} eQCWPSType;
-
/*
* Retrieve the WPA/RSN information element for an associated station.
*/
@@ -108,20 +68,20 @@ struct sQcSapreq_wscie {
/*
* Retrieve the WPS PBC Probe Request IEs.
*/
-typedef struct sQcSapreq_WPSPBCProbeReqIES {
+struct sap_wpspbc_probe_reqies {
struct qdf_mac_addr macaddr;
uint16_t probeReqIELen;
uint8_t probeReqIE[512];
-} sQcSapreq_WPSPBCProbeReqIES_t;
+};
/*
* Channel List Info
*/
-typedef struct {
+struct channel_list_info {
uint8_t num_channels;
uint8_t channels[WNI_CFG_VALID_CHANNEL_LIST_LEN];
-} tChannelListInfo, *tpChannelListInfo;
+};
#ifdef __linux__
/*
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index f3d08f4fe8ef..83eb3b749103 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -4134,7 +4134,8 @@ static int __iw_get_channel_list(struct net_device *dev,
uint8_t band_end_channel = CHAN_ENUM_184;
hdd_adapter_t *hostapd_adapter = (netdev_priv(dev));
tHalHandle hal = WLAN_HDD_GET_HAL_CTX(hostapd_adapter);
- tpChannelListInfo channel_list = (tpChannelListInfo) extra;
+ struct channel_list_info *channel_list =
+ (struct channel_list_info *) extra;
eCsrBand cur_band = eCSR_BAND_ALL;
hdd_context_t *hdd_ctx;
int ret;
@@ -4151,7 +4152,7 @@ static int __iw_get_channel_list(struct net_device *dev,
hdd_err("not able get the current frequency band");
return -EIO;
}
- wrqu->data.length = sizeof(tChannelListInfo);
+ wrqu->data.length = sizeof(struct channel_list_info);
if (eCSR_BAND_24 == cur_band) {
band_start_channel = CHAN_ENUM_1;
@@ -4274,7 +4275,7 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev));
- sQcSapreq_WPSPBCProbeReqIES_t WPSPBCProbeReqIEs;
+ struct sap_wpspbc_probe_reqies WPSPBCProbeReqIEs;
hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter);
hdd_context_t *hdd_ctx;
int ret;
@@ -5602,7 +5603,7 @@ static const struct iw_priv_args hostapd_private_args[] = {
}, {
QCSAP_IOCTL_GET_WPS_PBC_PROBE_REQ_IES,
IW_PRIV_TYPE_BYTE |
- sizeof(sQcSapreq_WPSPBCProbeReqIES_t) |
+ sizeof(struct sap_wpspbc_probe_reqies) |
IW_PRIV_SIZE_FIXED, 0, "getProbeReqIEs"
}
, {
@@ -5676,7 +5677,7 @@ static const struct iw_priv_args hostapd_private_args[] = {
{
QCSAP_IOCTL_GET_CHANNEL_LIST,
0,
- IW_PRIV_TYPE_BYTE | sizeof(tChannelListInfo),
+ IW_PRIV_TYPE_BYTE | sizeof(struct channel_list_info),
"getChannelList"
}
,
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index dbe91f9da78c..c8d09d5f4ac5 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -9715,7 +9715,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
uint8_t ubuf_len = WNI_CFG_COUNTRY_CODE_LEN;
hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
- tChannelListInfo channel_list;
+ struct channel_list_info channel_list;
memset(&channel_list, 0, sizeof(channel_list));
status = iw_get_channel_list(dev, info, wrqu,