From: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
remove-typedef -s AR_SOFTC_T \
"struct ar6_softc" drivers/staging/ath6kl/
Tested-by: Naveen Singh <nsingh@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/ath6kl/os/linux/ar6000_android.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 242 ++++++++++----------
drivers/staging/ath6kl/os/linux/ar6000_pm.c | 18 +-
drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 18 +-
drivers/staging/ath6kl/os/linux/ar6k_pal.c | 8 +-
drivers/staging/ath6kl/os/linux/cfg80211.c | 50 ++--
drivers/staging/ath6kl/os/linux/hci_bridge.c | 24 +-
.../staging/ath6kl/os/linux/include/ar6000_drv.h | 36 ++--
drivers/staging/ath6kl/os/linux/include/cfg80211.h | 10 +-
drivers/staging/ath6kl/os/linux/ioctl.c | 112 +++++-----
drivers/staging/ath6kl/os/linux/wireless_ext.c | 66 +++---
11 files changed, 293 insertions(+), 293 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c
index 002cdc7..c96f6e9 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_android.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_android.c
@@ -334,7 +334,7 @@ void android_module_exit(void)
}
#ifdef CONFIG_PM
-void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)
+void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)
{
if (
#ifdef CONFIG_HAS_EARLYSUSPEND
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 41c66b7..27cb02d 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -281,7 +281,7 @@ static void ar6000_cleanup_module(void);
int ar6000_init(struct net_device *dev);
static int ar6000_open(struct net_device *dev);
static int ar6000_close(struct net_device *dev);
-static void ar6000_init_control_info(AR_SOFTC_T *ar);
+static void ar6000_init_control_info(struct ar6_softc *ar);
static int ar6000_data_tx(struct sk_buff *skb, struct net_device *dev);
void ar6000_destroy(struct net_device *dev, unsigned int unregister);
@@ -292,7 +292,7 @@ static struct iw_statistics *ar6000_get_iwstats(struct net_device * dev);
static void disconnect_timer_handler(unsigned long ptr);
-void read_rssi_compensation_param(AR_SOFTC_T *ar);
+void read_rssi_compensation_param(struct ar6_softc *ar);
/* for android builds we call external APIs that handle firmware download and configuration */
#ifdef ANDROID_ENV
@@ -309,7 +309,7 @@ static int ar6000_avail_ev(void *context, void *hif_handle);
static int ar6000_unavail_ev(void *context, void *hif_handle);
-int ar6000_configure_target(AR_SOFTC_T *ar);
+int ar6000_configure_target(struct ar6_softc *ar);
static void ar6000_target_failure(void *Instance, int Status);
@@ -329,9 +329,9 @@ static void ar6000_deliver_frames_to_nw_stack(void * dev, void *osbuf);
static struct htc_packet *ar6000_alloc_amsdu_rxbuf(void *Context, HTC_ENDPOINT_ID Endpoint, int Length);
-static void ar6000_refill_amsdu_rxbufs(AR_SOFTC_T *ar, int Count);
+static void ar6000_refill_amsdu_rxbufs(struct ar6_softc *ar, int Count);
-static void ar6000_cleanup_amsdu_rxbufs(AR_SOFTC_T *ar);
+static void ar6000_cleanup_amsdu_rxbufs(struct ar6_softc *ar);
static ssize_t
ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj,
@@ -344,17 +344,17 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
char *buf, loff_t pos, size_t count);
static int
-ar6000_sysfs_bmi_init(AR_SOFTC_T *ar);
+ar6000_sysfs_bmi_init(struct ar6_softc *ar);
/* HCI PAL callback function declarations */
-int ar6k_setup_hci_pal(AR_SOFTC_T *ar);
-void ar6k_cleanup_hci_pal(AR_SOFTC_T *ar);
+int ar6k_setup_hci_pal(struct ar6_softc *ar);
+void ar6k_cleanup_hci_pal(struct ar6_softc *ar);
static void
-ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar);
+ar6000_sysfs_bmi_deinit(struct ar6_softc *ar);
int
-ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode);
+ar6000_sysfs_bmi_get_config(struct ar6_softc *ar, u32 mode);
/*
* Static variables
@@ -364,13 +364,13 @@ struct net_device *ar6000_devices[MAX_AR6000];
static int is_netdev_registered;
extern struct iw_handler_def ath_iw_handler_def;
DECLARE_WAIT_QUEUE_HEAD(arEvent);
-static void ar6000_cookie_init(AR_SOFTC_T *ar);
-static void ar6000_cookie_cleanup(AR_SOFTC_T *ar);
-static void ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie);
-static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar);
+static void ar6000_cookie_init(struct ar6_softc *ar);
+static void ar6000_cookie_cleanup(struct ar6_softc *ar);
+static void ar6000_free_cookie(struct ar6_softc *ar, struct ar_cookie * cookie);
+static struct ar_cookie *ar6000_alloc_cookie(struct ar6_softc *ar);
#ifdef USER_KEYS
-static int ar6000_reinstall_keys(AR_SOFTC_T *ar,u8 key_op_ctrl);
+static int ar6000_reinstall_keys(struct ar6_softc *ar,u8 key_op_ctrl);
#endif
#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
@@ -403,7 +403,7 @@ static struct net_device_ops ar6000_netdev_ops = {
#define REPORT_DEBUG_LOGS_TO_APP
int
-ar6000_set_host_app_area(AR_SOFTC_T *ar)
+ar6000_set_host_app_area(struct ar6_softc *ar)
{
u32 address, data;
struct host_app_area_s host_app_area;
@@ -425,7 +425,7 @@ ar6000_set_host_app_area(AR_SOFTC_T *ar)
return 0;
}
-u32 dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
+u32 dbglog_get_debug_hdr_ptr(struct ar6_softc *ar)
{
u32 param;
u32 address;
@@ -446,7 +446,7 @@ u32 dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
* data stuctures over the diagnostic window.
*/
void
-ar6000_dbglog_init_done(AR_SOFTC_T *ar)
+ar6000_dbglog_init_done(struct ar6_softc *ar)
{
ar->dbglog_init_done = true;
}
@@ -518,7 +518,7 @@ dbglog_parse_debug_logs(s8 *datap, u32 len)
}
int
-ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
+ar6000_dbglog_get_debug_logs(struct ar6_softc *ar)
{
u32 data[8]; /* Should be able to accomodate struct dbglog_buf_s */
u32 address;
@@ -596,7 +596,7 @@ ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
}
void
-ar6000_dbglog_event(AR_SOFTC_T *ar, u32 dropped,
+ar6000_dbglog_event(struct ar6_softc *ar, u32 dropped,
s8 *buffer, u32 length)
{
#ifdef REPORT_DEBUG_LOGS_TO_APP
@@ -738,10 +738,10 @@ aptcTimerHandler(unsigned long arg)
{
u32 numbytes;
u32 throughput;
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
int status;
- ar = (AR_SOFTC_T *)arg;
+ ar = (struct ar6_softc *)arg;
A_ASSERT(ar != NULL);
A_ASSERT(!timer_pending(&aptcTimer));
@@ -802,12 +802,12 @@ ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj,
char *buf, loff_t pos, size_t count)
{
int index;
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
struct hif_device_os_device_info *osDevInfo;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Read %d bytes\n", (u32)count));
for (index=0; index < MAX_AR6000; index++) {
- ar = (AR_SOFTC_T *)ar6k_priv(ar6000_devices[index]);
+ ar = (struct ar6_softc *)ar6k_priv(ar6000_devices[index]);
osDevInfo = &ar->osDevInfo;
if (kobj == (&(((struct device *)osDevInfo->pOSDevice)->kobj))) {
break;
@@ -829,12 +829,12 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
char *buf, loff_t pos, size_t count)
{
int index;
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
struct hif_device_os_device_info *osDevInfo;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Write %d bytes\n", (u32)count));
for (index=0; index < MAX_AR6000; index++) {
- ar = (AR_SOFTC_T *)ar6k_priv(ar6000_devices[index]);
+ ar = (struct ar6_softc *)ar6k_priv(ar6000_devices[index]);
osDevInfo = &ar->osDevInfo;
if (kobj == (&(((struct device *)osDevInfo->pOSDevice)->kobj))) {
break;
@@ -851,7 +851,7 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
}
static int
-ar6000_sysfs_bmi_init(AR_SOFTC_T *ar)
+ar6000_sysfs_bmi_init(struct ar6_softc *ar)
{
int status;
@@ -880,7 +880,7 @@ ar6000_sysfs_bmi_init(AR_SOFTC_T *ar)
}
static void
-ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar)
+ar6000_sysfs_bmi_deinit(struct ar6_softc *ar)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Deleting sysfs entry\n"));
@@ -941,7 +941,7 @@ void calculate_crc(u32 TargetType, u8 *eeprom_data)
}
static void
-ar6000_softmac_update(AR_SOFTC_T *ar, u8 *eeprom_data, size_t size)
+ar6000_softmac_update(struct ar6_softc *ar, u8 *eeprom_data, size_t size)
{
const char *source = "random generated";
const struct firmware *softmac_entry;
@@ -992,7 +992,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, u8 *eeprom_data, size_t size)
#endif /* SOFTMAC_FILE_USED */
static int
-ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, u32 address, bool compressed)
+ar6000_transfer_bin_file(struct ar6_softc *ar, AR6K_BIN_FILE file, u32 address, bool compressed)
{
int status;
const char *filename;
@@ -1156,7 +1156,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, u32 address, bool c
#endif /* INIT_MODE_DRV_ENABLED */
int
-ar6000_update_bdaddr(AR_SOFTC_T *ar)
+ar6000_update_bdaddr(struct ar6_softc *ar)
{
if (setupbtdev != 0) {
@@ -1183,7 +1183,7 @@ return 0;
}
int
-ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
+ar6000_sysfs_bmi_get_config(struct ar6_softc *ar, u32 mode)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n"));
@@ -1398,7 +1398,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
}
int
-ar6000_configure_target(AR_SOFTC_T *ar)
+ar6000_configure_target(struct ar6_softc *ar)
{
u32 param;
if (enableuartprint) {
@@ -1597,7 +1597,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
int i;
struct net_device *dev;
void *ar_netif;
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
int device_index = 0;
struct htc_init_info htcInfo;
#ifdef ATH6K_CONFIG_CFG80211
@@ -1638,7 +1638,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
}
ar_netif = wdev_priv(wdev);
#else
- dev = alloc_etherdev(sizeof(AR_SOFTC_T));
+ dev = alloc_etherdev(sizeof(struct ar6_softc));
if (dev == NULL) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_available: can't alloc etherdev\n"));
return A_ERROR;
@@ -1652,8 +1652,8 @@ ar6000_avail_ev(void *context, void *hif_handle)
return A_ERROR;
}
- A_MEMZERO(ar_netif, sizeof(AR_SOFTC_T));
- ar = (AR_SOFTC_T *)ar_netif;
+ A_MEMZERO(ar_netif, sizeof(struct ar6_softc));
+ ar = (struct ar6_softc *)ar_netif;
#ifdef ATH6K_CONFIG_CFG80211
ar->wdev = wdev;
@@ -1854,7 +1854,7 @@ avail_ev_failed :
static void ar6000_target_failure(void *Instance, int Status)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
+ struct ar6_softc *ar = (struct ar6_softc *)Instance;
WMI_TARGET_ERROR_REPORT_EVENT errEvent;
static bool sip = false;
@@ -1890,7 +1890,7 @@ static void ar6000_target_failure(void *Instance, int Status)
static int
ar6000_unavail_ev(void *context, void *hif_handle)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
+ struct ar6_softc *ar = (struct ar6_softc *)context;
/* NULL out it's entry in the global list */
ar6000_devices[ar->arDeviceIndex] = NULL;
ar6000_destroy(ar->arNetDev, 1);
@@ -1902,7 +1902,7 @@ void
ar6000_restart_endpoint(struct net_device *dev)
{
int status = 0;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
BMIInit();
do {
@@ -1936,7 +1936,7 @@ ar6000_restart_endpoint(struct net_device *dev)
void
ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
/* Stop the transmit queues */
netif_stop_queue(dev);
@@ -2074,7 +2074,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs)
void
ar6000_destroy(struct net_device *dev, unsigned int unregister)
{
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("+ar6000_destroy \n"));
@@ -2159,7 +2159,7 @@ ar6000_destroy(struct net_device *dev, unsigned int unregister)
static void disconnect_timer_handler(unsigned long ptr)
{
struct net_device *dev = (struct net_device *)ptr;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
A_UNTIMEOUT(&ar->disconnect_timer);
@@ -2170,7 +2170,7 @@ static void disconnect_timer_handler(unsigned long ptr)
static void ar6000_detect_error(unsigned long ptr)
{
struct net_device *dev = (struct net_device *)ptr;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_TARGET_ERROR_REPORT_EVENT errEvent;
AR6000_SPIN_LOCK(&ar->arLock, 0);
@@ -2209,7 +2209,7 @@ static void ar6000_detect_error(unsigned long ptr)
A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
}
-void ar6000_init_profile_info(AR_SOFTC_T *ar)
+void ar6000_init_profile_info(struct ar6_softc *ar)
{
ar->arSsidLen = 0;
A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
@@ -2239,7 +2239,7 @@ void ar6000_init_profile_info(AR_SOFTC_T *ar)
}
static void
-ar6000_init_control_info(AR_SOFTC_T *ar)
+ar6000_init_control_info(struct ar6_softc *ar)
{
ar->arWmiEnabled = false;
ar6000_init_profile_info(ar);
@@ -2291,7 +2291,7 @@ static int
ar6000_open(struct net_device *dev)
{
unsigned long flags;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
spin_lock_irqsave(&ar->arLock, flags);
@@ -2317,7 +2317,7 @@ static int
ar6000_close(struct net_device *dev)
{
#ifdef ATH6K_CONFIG_CFG80211
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
#endif /* ATH6K_CONFIG_CFG80211 */
netif_stop_queue(dev);
@@ -2338,7 +2338,7 @@ ar6000_close(struct net_device *dev)
}
/* connect to a service */
-static int ar6000_connectservice(AR_SOFTC_T *ar,
+static int ar6000_connectservice(struct ar6_softc *ar,
struct htc_service_connect_req *pConnect,
char *pDesc)
{
@@ -2390,7 +2390,7 @@ static int ar6000_connectservice(AR_SOFTC_T *ar,
return status;
}
-void ar6000_TxDataCleanup(AR_SOFTC_T *ar)
+void ar6000_TxDataCleanup(struct ar6_softc *ar)
{
/* flush all the data (non-control) streams
* we only flush packets that are tagged as data, we leave any control packets that
@@ -2412,20 +2412,20 @@ void ar6000_TxDataCleanup(AR_SOFTC_T *ar)
HTC_ENDPOINT_ID
ar6000_ac2_endpoint_id ( void * devt, u8 ac)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *) devt;
+ struct ar6_softc *ar = (struct ar6_softc *) devt;
return(arAc2EndpointID(ar, ac));
}
u8 ar6000_endpoint_id2_ac(void * devt, HTC_ENDPOINT_ID ep )
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *) devt;
+ struct ar6_softc *ar = (struct ar6_softc *) devt;
return(arEndpoint2Ac(ar, ep ));
}
/*
* This function applies WLAN specific configuration defined in wlan_config.h
*/
-int ar6000_target_config_wlan_params(AR_SOFTC_T *ar)
+int ar6000_target_config_wlan_params(struct ar6_softc *ar)
{
int status = 0;
#if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE)
@@ -2546,7 +2546,7 @@ int ar6000_target_config_wlan_params(AR_SOFTC_T *ar)
/* This function does one time initialization for the lifetime of the device */
int ar6000_init(struct net_device *dev)
{
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
int status;
s32 timeleft;
s16 i;
@@ -2845,7 +2845,7 @@ ar6000_init_done:
void
ar6000_bitrate_rx(void *devt, s32 rateKbps)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
ar->arBitRate = rateKbps;
wake_up(&arEvent);
@@ -2854,7 +2854,7 @@ ar6000_bitrate_rx(void *devt, s32 rateKbps)
void
ar6000_ratemask_rx(void *devt, u32 ratemask)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
ar->arRateMask = ratemask;
wake_up(&arEvent);
@@ -2863,7 +2863,7 @@ ar6000_ratemask_rx(void *devt, u32 ratemask)
void
ar6000_txPwr_rx(void *devt, u8 txPwr)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
ar->arTxPwr = txPwr;
wake_up(&arEvent);
@@ -2873,7 +2873,7 @@ ar6000_txPwr_rx(void *devt, u8 txPwr)
void
ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
memcpy(ar->arChannelList, chanList, numChan * sizeof (u16));
ar->arNumChannels = numChan;
@@ -2883,7 +2883,7 @@ ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList)
u8 ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, u32 *mapNo)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u8 *datap;
ATH_MAC_HDR *macHdr;
u32 i, eptMap;
@@ -2952,14 +2952,14 @@ static void ar6000_dump_skb(struct sk_buff *skb)
#endif
#ifdef HTC_TEST_SEND_PKTS
-static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *skb);
+static void DoHTCSendPktsTest(struct ar6_softc *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *skb);
#endif
static int
ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
{
#define AC_NOT_MAPPED 99
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u8 ac = AC_NOT_MAPPED;
HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED;
u32 mapNo = 0;
@@ -3281,7 +3281,7 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
int
ar6000_acl_data_tx(struct sk_buff *skb, struct net_device *dev)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
struct ar_cookie *cookie;
HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED;
@@ -3337,7 +3337,7 @@ tvsub(register struct timeval *out, register struct timeval *in)
}
void
-applyAPTCHeuristics(AR_SOFTC_T *ar)
+applyAPTCHeuristics(struct ar6_softc *ar)
{
u32 duration;
u32 numbytes;
@@ -3378,7 +3378,7 @@ applyAPTCHeuristics(AR_SOFTC_T *ar)
static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, struct htc_packet *pPacket)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
+ struct ar6_softc *ar = (struct ar6_softc *)Context;
HTC_SEND_FULL_ACTION action = HTC_SEND_FULL_KEEP;
bool stopNet = false;
HTC_ENDPOINT_ID Endpoint = HTC_GET_ENDPOINT_FROM_PKT(pPacket);
@@ -3463,7 +3463,7 @@ static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, struct htc_packe
static void
ar6000_tx_complete(void *Context, struct htc_packet_queue *pPacketQueue)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
+ struct ar6_softc *ar = (struct ar6_softc *)Context;
u32 mapNo = 0;
int status;
struct ar_cookie * ar_cookie;
@@ -3599,7 +3599,7 @@ ar6000_tx_complete(void *Context, struct htc_packet_queue *pPacketQueue)
}
sta_t *
-ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr)
+ieee80211_find_conn(struct ar6_softc *ar, u8 *node_addr)
{
sta_t *conn = NULL;
u8 i, max_conn;
@@ -3623,7 +3623,7 @@ ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr)
return conn;
}
-sta_t *ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid)
+sta_t *ieee80211_find_conn_for_aid(struct ar6_softc *ar, u8 aid)
{
sta_t *conn = NULL;
u8 ctr;
@@ -3644,7 +3644,7 @@ int pktcount;
static void
ar6000_rx(void *Context, struct htc_packet *pPacket)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
+ struct ar6_softc *ar = (struct ar6_softc *)Context;
struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext;
int minHdrLen;
u8 containsDot11Hdr = 0;
@@ -3942,7 +3942,7 @@ ar6000_deliver_frames_to_nw_stack(void *dev, void *osbuf)
skb->dev = dev;
if ((skb->dev->flags & IFF_UP) == IFF_UP) {
#ifdef CONFIG_PM
- ar6000_check_wow_status((AR_SOFTC_T *)ar6k_priv(dev), skb, false);
+ ar6000_check_wow_status((struct ar6_softc *)ar6k_priv(dev), skb, false);
#endif /* CONFIG_PM */
skb->protocol = eth_type_trans(skb, skb->dev);
/*
@@ -3987,7 +3987,7 @@ ar6000_deliver_frames_to_bt_stack(void *dev, void *osbuf)
static void
ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
+ struct ar6_softc *ar = (struct ar6_softc *)Context;
void *osBuf;
int RxBuffers;
int buffersToRefill;
@@ -4029,7 +4029,7 @@ ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint)
}
/* clean up our amsdu buffer list */
-static void ar6000_cleanup_amsdu_rxbufs(AR_SOFTC_T *ar)
+static void ar6000_cleanup_amsdu_rxbufs(struct ar6_softc *ar)
{
struct htc_packet *pPacket;
void *osBuf;
@@ -4058,7 +4058,7 @@ static void ar6000_cleanup_amsdu_rxbufs(AR_SOFTC_T *ar)
/* refill the amsdu buffer list */
-static void ar6000_refill_amsdu_rxbufs(AR_SOFTC_T *ar, int Count)
+static void ar6000_refill_amsdu_rxbufs(struct ar6_softc *ar, int Count)
{
struct htc_packet *pPacket;
void *osBuf;
@@ -4093,7 +4093,7 @@ static void ar6000_refill_amsdu_rxbufs(AR_SOFTC_T *ar, int Count)
static struct htc_packet *ar6000_alloc_amsdu_rxbuf(void *Context, HTC_ENDPOINT_ID Endpoint, int Length)
{
struct htc_packet *pPacket = NULL;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
+ struct ar6_softc *ar = (struct ar6_softc *)Context;
int refillCount = 0;
AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_RX,("ar6000_alloc_amsdu_rxbuf: eid=%d, Length:%d\n",Endpoint,Length));
@@ -4142,14 +4142,14 @@ ar6000_set_multicast_list(struct net_device *dev)
static struct net_device_stats *
ar6000_get_stats(struct net_device *dev)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
return &ar->arNetStats;
}
static struct iw_statistics *
ar6000_get_iwstats(struct net_device * dev)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
TARGET_STATS *pStats = &ar->arTargetStats;
struct iw_statistics * pIwStats = &ar->arIwStats;
int rtnllocked;
@@ -4236,7 +4236,7 @@ err_exit:
void
ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, u32 sw_ver, u32 abi_ver)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
struct net_device *dev = ar->arNetDev;
memcpy(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN);
@@ -4255,7 +4255,7 @@ ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, u32 sw_ver, u32 abi_ver)
}
void
-add_new_sta(AR_SOFTC_T *ar, u8 *mac, u16 aid, u8 *wpaie,
+add_new_sta(struct ar6_softc *ar, u8 *mac, u16 aid, u8 *wpaie,
u8 ielen, u8 keymgmt, u8 ucipher, u8 auth)
{
u8 free_slot=aid-1;
@@ -4271,7 +4271,7 @@ add_new_sta(AR_SOFTC_T *ar, u8 *mac, u16 aid, u8 *wpaie,
}
void
-ar6000_connect_event(AR_SOFTC_T *ar, u16 channel, u8 *bssid,
+ar6000_connect_event(struct ar6_softc *ar, u16 channel, u8 *bssid,
u16 listenInterval, u16 beaconInterval,
NETWORK_TYPE networkType, u8 beaconIeLen,
u8 assocReqLen, u8 assocRespLen,
@@ -4557,14 +4557,14 @@ skip_key:
}
-void ar6000_set_numdataendpts(AR_SOFTC_T *ar, u32 num)
+void ar6000_set_numdataendpts(struct ar6_softc *ar, u32 num)
{
A_ASSERT(num <= (HTC_MAILBOX_NUM_MAX - 1));
ar->arNumDataEndPts = num;
}
void
-sta_cleanup(AR_SOFTC_T *ar, u8 i)
+sta_cleanup(struct ar6_softc *ar, u8 i)
{
struct sk_buff *skb;
@@ -4587,7 +4587,7 @@ sta_cleanup(AR_SOFTC_T *ar, u8 i)
}
-u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason)
+u8 remove_sta(struct ar6_softc *ar, u8 *mac, u16 reason)
{
u8 i, removed=0;
@@ -4620,7 +4620,7 @@ u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason)
}
void
-ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid,
+ar6000_disconnect_event(struct ar6_softc *ar, u8 reason, u8 *bssid,
u8 assocRespLen, u8 *assocInfo, u16 protocolReasonStatus)
{
u8 i;
@@ -4768,7 +4768,7 @@ ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid,
}
void
-ar6000_regDomain_event(AR_SOFTC_T *ar, u32 regCode)
+ar6000_regDomain_event(struct ar6_softc *ar, u32 regCode)
{
A_PRINTF("AR6000 Reg Code = 0x%x\n", regCode);
ar->arRegCode = regCode;
@@ -4776,7 +4776,7 @@ ar6000_regDomain_event(AR_SOFTC_T *ar, u32 regCode)
#ifdef ATH_AR6K_11N_SUPPORT
void
-ar6000_aggr_rcv_addba_req_evt(AR_SOFTC_T *ar, WMI_ADDBA_REQ_EVENT *evt)
+ar6000_aggr_rcv_addba_req_evt(struct ar6_softc *ar, WMI_ADDBA_REQ_EVENT *evt)
{
if(evt->status == 0) {
aggr_recv_addba_req_evt(ar->aggr_cntxt, evt->tid, evt->st_seq_no, evt->win_sz);
@@ -4784,7 +4784,7 @@ ar6000_aggr_rcv_addba_req_evt(AR_SOFTC_T *ar, WMI_ADDBA_REQ_EVENT *evt)
}
void
-ar6000_aggr_rcv_addba_resp_evt(AR_SOFTC_T *ar, WMI_ADDBA_RESP_EVENT *evt)
+ar6000_aggr_rcv_addba_resp_evt(struct ar6_softc *ar, WMI_ADDBA_RESP_EVENT *evt)
{
A_PRINTF("ADDBA RESP. tid %d status %d, sz %d\n", evt->tid, evt->status, evt->amsdu_sz);
if(evt->status == 0) {
@@ -4792,7 +4792,7 @@ ar6000_aggr_rcv_addba_resp_evt(AR_SOFTC_T *ar, WMI_ADDBA_RESP_EVENT *evt)
}
void
-ar6000_aggr_rcv_delba_req_evt(AR_SOFTC_T *ar, WMI_DELBA_EVENT *evt)
+ar6000_aggr_rcv_delba_req_evt(struct ar6_softc *ar, WMI_DELBA_EVENT *evt)
{
aggr_recv_delba_req_evt(ar->aggr_cntxt, evt->tid);
}
@@ -4849,7 +4849,7 @@ ar6000_hci_event_rcv_evt(struct ar6_softc *ar, WMI_HCI_EVENT *cmd)
}
void
-ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info)
+ar6000_neighborReport_event(struct ar6_softc *ar, int numAps, WMI_NEIGHBOR_INFO *info)
{
#if WIRELESS_EXT >= 18
struct iw_pmkid_cand *pmkcand;
@@ -4897,7 +4897,7 @@ ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info)
}
void
-ar6000_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast)
+ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast)
{
static const char *tag = "MLME-MICHAELMICFAILURE.indication";
char buf[128];
@@ -4934,7 +4934,7 @@ ar6000_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast)
}
void
-ar6000_scanComplete_event(AR_SOFTC_T *ar, int status)
+ar6000_scanComplete_event(struct ar6_softc *ar, int status)
{
#ifdef ATH6K_CONFIG_CFG80211
@@ -4957,7 +4957,7 @@ ar6000_scanComplete_event(AR_SOFTC_T *ar, int status)
}
void
-ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, u32 len)
+ar6000_targetStats_event(struct ar6_softc *ar, u8 *ptr, u32 len)
{
u8 ac;
@@ -5082,7 +5082,7 @@ ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, u32 len)
}
void
-ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, s16 rssi)
+ar6000_rssiThreshold_event(struct ar6_softc *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, s16 rssi)
{
USER_RSSI_THOLD userRssiThold;
@@ -5103,7 +5103,7 @@ ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold,
void
-ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, u32 cookie, u32 source)
+ar6000_hbChallengeResp_event(struct ar6_softc *ar, u32 cookie, u32 source)
{
if (source == APP_HB_CHALLENGE) {
/* Report it to the app in case it wants a positive acknowledgement */
@@ -5119,7 +5119,7 @@ ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, u32 cookie, u32 source)
void
-ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal)
+ar6000_reportError_event(struct ar6_softc *ar, WMI_TARGET_ERROR_VAL errorVal)
{
static const char * const errString[] = {
[WMI_TARGET_PM_ERR_FAIL] "WMI_TARGET_PM_ERR_FAIL",
@@ -5154,7 +5154,7 @@ ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal)
void
-ar6000_cac_event(AR_SOFTC_T *ar, u8 ac, u8 cacIndication,
+ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cacIndication,
u8 statusCode, u8 *tspecSuggestion)
{
WMM_TSPEC_IE *tspecIe;
@@ -5177,7 +5177,7 @@ ar6000_cac_event(AR_SOFTC_T *ar, u8 ac, u8 cacIndication,
}
void
-ar6000_channel_change_event(AR_SOFTC_T *ar, u16 oldChannel,
+ar6000_channel_change_event(struct ar6_softc *ar, u16 oldChannel,
u16 newChannel)
{
A_PRINTF("Channel Change notification\nOld Channel: %d, New Channel: %d\n",
@@ -5191,7 +5191,7 @@ ar6000_channel_change_event(AR_SOFTC_T *ar, u16 oldChannel,
} while(0)
void
-ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl)
+ar6000_roam_tbl_event(struct ar6_softc *ar, WMI_TARGET_ROAM_TBL *pTbl)
{
u8 i;
@@ -5270,7 +5270,7 @@ ar6000_display_roam_time(WMI_TARGET_ROAM_TIME *p)
}
void
-ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p)
+ar6000_roam_data_event(struct ar6_softc *ar, WMI_TARGET_ROAM_DATA *p)
{
switch (p->roamDataType) {
case ROAM_DATA_TIME:
@@ -5282,7 +5282,7 @@ ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p)
}
void
-ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, u8 *datap, int len)
+ar6000_bssInfo_event_rx(struct ar6_softc *ar, u8 *datap, int len)
{
struct sk_buff *skb;
WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap;
@@ -5317,7 +5317,7 @@ u32 wmiSendCmdNum;
int
ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
int status = 0;
struct ar_cookie *cookie = NULL;
int i;
@@ -5396,7 +5396,7 @@ ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid)
/* indicate tx activity or inactivity on a WMI stream */
void ar6000_indicate_tx_activity(void *devt, u8 TrafficClass, bool Active)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
HTC_ENDPOINT_ID eid ;
int i;
@@ -5510,7 +5510,7 @@ module_exit(ar6000_cleanup_module);
/* Init cookie queue */
static void
-ar6000_cookie_init(AR_SOFTC_T *ar)
+ar6000_cookie_init(struct ar6_softc *ar)
{
u32 i;
@@ -5526,7 +5526,7 @@ ar6000_cookie_init(AR_SOFTC_T *ar)
/* cleanup cookie queue */
static void
-ar6000_cookie_cleanup(AR_SOFTC_T *ar)
+ar6000_cookie_cleanup(struct ar6_softc *ar)
{
/* It is gone .... */
ar->arCookieList = NULL;
@@ -5535,7 +5535,7 @@ ar6000_cookie_cleanup(AR_SOFTC_T *ar)
/* Init cookie queue */
static void
-ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie)
+ar6000_free_cookie(struct ar6_softc *ar, struct ar_cookie * cookie)
{
/* Insert first */
A_ASSERT(ar != NULL);
@@ -5548,7 +5548,7 @@ ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie)
/* cleanup cookie queue */
static struct ar_cookie *
-ar6000_alloc_cookie(AR_SOFTC_T *ar)
+ar6000_alloc_cookie(struct ar6_softc *ar)
{
struct ar_cookie *cookie;
@@ -5569,7 +5569,7 @@ ar6000_alloc_cookie(AR_SOFTC_T *ar)
* the event ID and event content.
*/
#define EVENT_ID_LEN 2
-void ar6000_send_event_to_app(AR_SOFTC_T *ar, u16 eventId,
+void ar6000_send_event_to_app(struct ar6_softc *ar, u16 eventId,
u8 *datap, int len)
{
@@ -5614,7 +5614,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, u16 eventId,
* to the application. The buf which is sent to application
* includes the event ID and event content.
*/
-void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, u16 eventId,
+void ar6000_send_generic_event_to_app(struct ar6_softc *ar, u16 eventId,
u8 *datap, int len)
{
@@ -5666,7 +5666,7 @@ void
ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, u8 snr)
{
WMI_SNR_THRESHOLD_EVENT event;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
event.range = newThreshold;
event.snr = snr;
@@ -5721,7 +5721,7 @@ ar6000_get_driver_cfg(struct net_device *dev,
void
ar6000_keepalive_rx(void *devt, u8 configured)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
ar->arKeepaliveConfigured = configured;
wake_up(&arEvent);
@@ -5750,7 +5750,7 @@ ar6000_pmkid_list_event(void *devt, u8 numPMKID, WMI_PMKID *pmkidList,
}
}
-void ar6000_pspoll_event(AR_SOFTC_T *ar,u8 aid)
+void ar6000_pspoll_event(struct ar6_softc *ar,u8 aid)
{
sta_t *conn=NULL;
bool isPsqEmpty = false;
@@ -5790,7 +5790,7 @@ void ar6000_pspoll_event(AR_SOFTC_T *ar,u8 aid)
}
}
-void ar6000_dtimexpiry_event(AR_SOFTC_T *ar)
+void ar6000_dtimexpiry_event(struct ar6_softc *ar)
{
bool isMcastQueued = false;
struct sk_buff *skb = NULL;
@@ -5836,7 +5836,7 @@ void ar6000_dtimexpiry_event(AR_SOFTC_T *ar)
}
void
-read_rssi_compensation_param(AR_SOFTC_T *ar)
+read_rssi_compensation_param(struct ar6_softc *ar)
{
u8 *cust_data_ptr;
@@ -5907,7 +5907,7 @@ s32 rssi_compensation_calc_tcmd(u32 freq, s32 rssi, u32 totalPkt)
return rssi;
}
-s16 rssi_compensation_calc(AR_SOFTC_T *ar, s16 rssi)
+s16 rssi_compensation_calc(struct ar6_softc *ar, s16 rssi)
{
if (ar->arBssChannel > 5000)
{
@@ -5935,7 +5935,7 @@ s16 rssi_compensation_calc(AR_SOFTC_T *ar, s16 rssi)
return rssi;
}
-s16 rssi_compensation_reverse_calc(AR_SOFTC_T *ar, s16 rssi, bool Above)
+s16 rssi_compensation_reverse_calc(struct ar6_softc *ar, s16 rssi, bool Above)
{
s16 i;
@@ -5980,7 +5980,7 @@ s16 rssi_compensation_reverse_calc(AR_SOFTC_T *ar, s16 rssi, bool Above)
}
#ifdef WAPI_ENABLE
-void ap_wapi_rekey_event(AR_SOFTC_T *ar, u8 type, u8 *mac)
+void ap_wapi_rekey_event(struct ar6_softc *ar, u8 type, u8 *mac)
{
union iwreq_data wrqu;
char buf[20];
@@ -6002,7 +6002,7 @@ void ap_wapi_rekey_event(AR_SOFTC_T *ar, u8 type, u8 *mac)
#ifdef USER_KEYS
static int
-ar6000_reinstall_keys(AR_SOFTC_T *ar, u8 key_op_ctrl)
+ar6000_reinstall_keys(struct ar6_softc *ar, u8 key_op_ctrl)
{
int status = 0;
struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik;
@@ -6316,7 +6316,7 @@ void ar6000_peer_event(
#ifdef HTC_TEST_SEND_PKTS
#define HTC_TEST_DUPLICATE 8
-static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *dupskb)
+static void DoHTCSendPktsTest(struct ar6_softc *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *dupskb)
{
struct ar_cookie *cookie;
struct ar_cookie *cookieArray[HTC_TEST_DUPLICATE];
@@ -6400,7 +6400,7 @@ static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, st
* AP mode.
*/
-int ar6000_start_ap_interface(AR_SOFTC_T *ar)
+int ar6000_start_ap_interface(struct ar6_softc *ar)
{
struct ar_virtual_interface *arApDev;
@@ -6411,7 +6411,7 @@ int ar6000_start_ap_interface(AR_SOFTC_T *ar)
return 0;
}
-int ar6000_stop_ap_interface(AR_SOFTC_T *ar)
+int ar6000_stop_ap_interface(struct ar6_softc *ar)
{
struct ar_virtual_interface *arApDev;
@@ -6425,7 +6425,7 @@ int ar6000_stop_ap_interface(AR_SOFTC_T *ar)
}
-int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
+int ar6000_create_ap_interface(struct ar6_softc *ar, char *ap_ifname)
{
struct net_device *dev;
struct ar_virtual_interface *arApDev;
@@ -6458,7 +6458,7 @@ int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
return 0;
}
-int ar6000_add_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
+int ar6000_add_ap_interface(struct ar6_softc *ar, char *ap_ifname)
{
/* Interface already added, need not proceed further */
if (ar->arApDev != NULL) {
@@ -6475,7 +6475,7 @@ int ar6000_add_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
return ar6000_start_ap_interface(ar);
}
-int ar6000_remove_ap_interface(AR_SOFTC_T *ar)
+int ar6000_remove_ap_interface(struct ar6_softc *ar)
{
if (arApNetDev) {
ar6000_stop_ap_interface(ar);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
index 5659ad8..1a90424 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
@@ -37,7 +37,7 @@ extern unsigned int wmitimeout;
extern wait_queue_head_t arEvent;
#ifdef ANDROID_ENV
-extern void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent);
+extern void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent);
#endif
#undef ATH_MODULE_NAME
#define ATH_MODULE_NAME pm
@@ -57,10 +57,10 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(pm,
#endif /* DEBUG */
-int ar6000_exit_cut_power_state(AR_SOFTC_T *ar);
+int ar6000_exit_cut_power_state(struct ar6_softc *ar);
#ifdef CONFIG_PM
-static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep)
+static void ar6k_send_asleep_event_to_app(struct ar6_softc *ar, bool asleep)
{
char buf[128];
union iwreq_data wrqu;
@@ -71,7 +71,7 @@ static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep)
wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
}
-static void ar6000_wow_resume(AR_SOFTC_T *ar)
+static void ar6000_wow_resume(struct ar6_softc *ar)
{
if (ar->arWowState!= WLAN_WOW_STATE_NONE) {
u16 fg_start_period = (ar->scParams.fg_start_period==0) ? 1 : ar->scParams.fg_start_period;
@@ -110,7 +110,7 @@ static void ar6000_wow_resume(AR_SOFTC_T *ar)
ar->arWlanPowerState = WLAN_POWER_STATE_ON;
}
-static void ar6000_wow_suspend(AR_SOFTC_T *ar)
+static void ar6000_wow_suspend(struct ar6_softc *ar)
{
#define WOW_LIST_ID 1
if (ar->arNetworkType != AP_NETWORK) {
@@ -214,7 +214,7 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar)
int ar6000_suspend_ev(void *context)
{
int status = 0;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
+ struct ar6_softc *ar = (struct ar6_softc *)context;
s16 pmmode = ar->arSuspendConfig;
wow_not_connected:
switch (pmmode) {
@@ -250,7 +250,7 @@ wow_not_connected:
int ar6000_resume_ev(void *context)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
+ struct ar6_softc *ar = (struct ar6_softc *)context;
u16 powerState = ar->arWlanPowerState;
AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: enter previous state %d wowState %d\n", __func__, powerState, ar->arWowState));
@@ -273,7 +273,7 @@ int ar6000_resume_ev(void *context)
return 0;
}
-void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)
+void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)
{
if (ar->arWowState!=WLAN_WOW_STATE_NONE) {
if (ar->arWowState==WLAN_WOW_STATE_SUSPENDING) {
@@ -292,7 +292,7 @@ void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)
int ar6000_power_change_ev(void *context, u32 config)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
+ struct ar6_softc *ar = (struct ar6_softc *)context;
int status = 0;
AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config));
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
index 7b6339c..ae7c1dd 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
@@ -28,7 +28,7 @@
static void
ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
+ struct ar6_softc *ar = (struct ar6_softc *)Context;
raw_htc_buffer *busy;
HTC_RAW_STREAM_ID streamID;
AR_RAW_HTC_T *arRaw = ar->arRawHtc;
@@ -72,7 +72,7 @@ ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket)
static void
ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
+ struct ar6_softc *ar = (struct ar6_softc *)Context;
raw_htc_buffer *free;
HTC_RAW_STREAM_ID streamID;
AR_RAW_HTC_T *arRaw = ar->arRawHtc;
@@ -111,7 +111,7 @@ ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket)
}
/* connect to a service */
-static int ar6000_connect_raw_service(AR_SOFTC_T *ar,
+static int ar6000_connect_raw_service(struct ar6_softc *ar,
HTC_RAW_STREAM_ID StreamID)
{
int status;
@@ -166,7 +166,7 @@ static int ar6000_connect_raw_service(AR_SOFTC_T *ar,
return status;
}
-int ar6000_htc_raw_open(AR_SOFTC_T *ar)
+int ar6000_htc_raw_open(struct ar6_softc *ar)
{
int status;
int streamID, endPt, count2;
@@ -272,7 +272,7 @@ int ar6000_htc_raw_open(AR_SOFTC_T *ar)
return 0;
}
-int ar6000_htc_raw_close(AR_SOFTC_T *ar)
+int ar6000_htc_raw_close(struct ar6_softc *ar)
{
A_PRINTF("ar6000_htc_raw_close called \n");
HTCStop(ar->arHtcTarget);
@@ -286,7 +286,7 @@ int ar6000_htc_raw_close(AR_SOFTC_T *ar)
}
raw_htc_buffer *
-get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
+get_filled_buffer(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID)
{
int count;
raw_htc_buffer *busy;
@@ -308,7 +308,7 @@ get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
return busy;
}
-ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
+ssize_t ar6000_htc_raw_read(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t length)
{
int readPtr;
@@ -368,7 +368,7 @@ ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
}
static raw_htc_buffer *
-get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
+get_free_buffer(struct ar6_softc *ar, HTC_ENDPOINT_ID StreamID)
{
int count;
raw_htc_buffer *free;
@@ -390,7 +390,7 @@ get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
return free;
}
-ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
+ssize_t ar6000_htc_raw_write(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t length)
{
int writePtr;
diff --git a/drivers/staging/ath6kl/os/linux/ar6k_pal.c b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
index 08f3710..1f7179a 100644
--- a/drivers/staging/ath6kl/os/linux/ar6k_pal.c
+++ b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
@@ -49,7 +49,7 @@ typedef struct ar6k_hci_pal_info_s{
#define HCI_NORMAL_MODE (1)
#define HCI_REGISTERED (1<<1)
struct hci_dev *hdev; /* BT Stack HCI dev */
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
}ar6k_hci_pal_info_t;
@@ -122,7 +122,7 @@ static int btpal_send_frame(struct sk_buff *skb)
ar6k_hci_pal_info_t *pHciPalInfo;
int status = 0;
struct sk_buff *txSkb = NULL;
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
if (!hdev) {
PRIN_LOG("HCI PAL: btpal_send_frame - no device\n");
@@ -313,7 +313,7 @@ static int bt_setup_hci_pal(ar6k_hci_pal_info_t *pHciPalInfo)
*********************************************/
void ar6k_cleanup_hci_pal(void *ar_p)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p;
+ struct ar6_softc *ar = (struct ar6_softc *)ar_p;
ar6k_hci_pal_info_t *pHciPalInfo = (ar6k_hci_pal_info_t *)ar->hcipal_info;
if (pHciPalInfo != NULL) {
@@ -405,7 +405,7 @@ int ar6k_setup_hci_pal(void *ar_p)
int status = 0;
ar6k_hci_pal_info_t *pHciPalInfo;
ar6k_pal_config_t ar6k_pal_config;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p;
+ struct ar6_softc *ar = (struct ar6_softc *)ar_p;
do {
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index 2edac07..bcca394 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -136,7 +136,7 @@ ieee80211_supported_band ar6k_band_5ghz = {
};
static int
-ar6k_set_wpa_version(AR_SOFTC_T *ar, enum nl80211_wpa_versions wpa_version)
+ar6k_set_wpa_version(struct ar6_softc *ar, enum nl80211_wpa_versions wpa_version)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: %u\n", __func__, wpa_version));
@@ -157,7 +157,7 @@ ar6k_set_wpa_version(AR_SOFTC_T *ar, enum nl80211_wpa_versions wpa_version)
}
static int
-ar6k_set_auth_type(AR_SOFTC_T *ar, enum nl80211_auth_type auth_type)
+ar6k_set_auth_type(struct ar6_softc *ar, enum nl80211_auth_type auth_type)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: 0x%x\n", __func__, auth_type));
@@ -183,7 +183,7 @@ ar6k_set_auth_type(AR_SOFTC_T *ar, enum nl80211_auth_type auth_type)
}
static int
-ar6k_set_cipher(AR_SOFTC_T *ar, u32 cipher, bool ucast)
+ar6k_set_cipher(struct ar6_softc *ar, u32 cipher, bool ucast)
{
u8 *ar_cipher = ucast ? &ar->arPairwiseCrypto :
&ar->arGroupCrypto;
@@ -225,7 +225,7 @@ ar6k_set_cipher(AR_SOFTC_T *ar, u32 cipher, bool ucast)
}
static void
-ar6k_set_key_mgmt(AR_SOFTC_T *ar, u32 key_mgmt)
+ar6k_set_key_mgmt(struct ar6_softc *ar, u32 key_mgmt)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: 0x%x\n", __func__, key_mgmt));
@@ -244,7 +244,7 @@ static int
ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_connect_params *sme)
{
- AR_SOFTC_T *ar = ar6k_priv(dev);
+ struct ar6_softc *ar = ar6k_priv(dev);
int status;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
@@ -429,7 +429,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
}
void
-ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
+ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel,
u8 *bssid, u16 listenInterval,
u16 beaconInterval,NETWORK_TYPE networkType,
u8 beaconIeLen, u8 assocReqLen,
@@ -581,7 +581,7 @@ static int
ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
u16 reason_code)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason_code));
@@ -620,7 +620,7 @@ ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
}
void
-ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason,
+ar6k_cfg80211_disconnect_event(struct ar6_softc *ar, u8 reason,
u8 *bssid, u8 assocRespLen,
u8 *assocInfo, u16 protocolReasonStatus)
{
@@ -736,7 +736,7 @@ static int
ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_scan_request *request)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
int ret = 0;
u32 forceFgScan = 0;
@@ -792,7 +792,7 @@ ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
}
void
-ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status)
+ar6k_cfg80211_scanComplete_event(struct ar6_softc *ar, int status)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: status %d\n", __func__, status));
@@ -823,7 +823,7 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index, bool pairwise, const u8 *mac_addr,
struct key_params *params)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
struct ar_key *key = NULL;
u8 key_usage;
u8 key_type;
@@ -915,7 +915,7 @@ static int
ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index, bool pairwise, const u8 *mac_addr)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index));
@@ -952,7 +952,7 @@ ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
void *cookie,
void (*callback)(void *cookie, struct key_params*))
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
struct ar_key *key = NULL;
struct key_params params;
@@ -992,7 +992,7 @@ static int
ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index, bool unicast, bool multicast)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
struct ar_key *key = NULL;
int status = 0;
u8 key_usage;
@@ -1044,7 +1044,7 @@ static int
ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index));
@@ -1063,7 +1063,7 @@ ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev,
}
void
-ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast)
+ar6k_cfg80211_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
("%s: keyid %d, ismcast %d\n", __func__, keyid, ismcast));
@@ -1076,7 +1076,7 @@ ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast)
static int
ar6k_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy);
+ struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: changed 0x%x\n", __func__, changed));
@@ -1113,7 +1113,7 @@ ar6k_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
static int
ar6k_cfg80211_set_txpower(struct wiphy *wiphy, enum nl80211_tx_power_setting type, int dbm)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy);
+ struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
u8 ar_dbm;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type 0x%x, dbm %d\n", __func__, type, dbm));
@@ -1149,7 +1149,7 @@ ar6k_cfg80211_set_txpower(struct wiphy *wiphy, enum nl80211_tx_power_setting typ
static int
ar6k_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy);
+ struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
@@ -1188,7 +1188,7 @@ ar6k_cfg80211_set_power_mgmt(struct wiphy *wiphy,
struct net_device *dev,
bool pmgmt, int timeout)
{
- AR_SOFTC_T *ar = ar6k_priv(dev);
+ struct ar6_softc *ar = ar6k_priv(dev);
WMI_POWER_MODE_CMD pwrMode;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: pmgmt %d, timeout %d\n", __func__, pmgmt, timeout));
@@ -1250,7 +1250,7 @@ ar6k_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
enum nl80211_iftype type, u32 *flags,
struct vif_params *params)
{
- AR_SOFTC_T *ar = ar6k_priv(ndev);
+ struct ar6_softc *ar = ar6k_priv(ndev);
struct wireless_dev *wdev = ar->wdev;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type %u\n", __func__, type));
@@ -1286,7 +1286,7 @@ static int
ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_ibss_params *ibss_param)
{
- AR_SOFTC_T *ar = ar6k_priv(dev);
+ struct ar6_softc *ar = ar6k_priv(dev);
int status;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
@@ -1361,7 +1361,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
static int
ar6k_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
@@ -1429,7 +1429,7 @@ ar6k_cfg80211_init(struct device *dev)
}
/* create a new wiphy for use with cfg80211 */
- wdev->wiphy = wiphy_new(&ar6k_cfg80211_ops, sizeof(AR_SOFTC_T));
+ wdev->wiphy = wiphy_new(&ar6k_cfg80211_ops, sizeof(struct ar6_softc));
if(!wdev->wiphy) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("%s: Couldn't allocate wiphy device\n", __func__));
@@ -1463,7 +1463,7 @@ ar6k_cfg80211_init(struct device *dev)
}
void
-ar6k_cfg80211_deinit(AR_SOFTC_T *ar)
+ar6k_cfg80211_deinit(struct ar6_softc *ar)
{
struct wireless_dev *wdev = ar->wdev;
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index 4b7f5a8..1ff71e8 100644
--- a/drivers/staging/ath6kl/os/linux/hci_bridge.c
+++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c
@@ -85,7 +85,7 @@ struct ar6k_hci_bridge_info {
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
struct hci_transport_misc_handles HCITransHdl;
#else
- AR_SOFTC_T *ar;
+ struct ar6_softc *ar;
#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
};
@@ -120,10 +120,10 @@ int ar6000_setup_hci(void *ar);
void ar6000_cleanup_hci(void *ar);
int hci_test_send(void *ar, struct sk_buff *skb);
#else
-int ar6000_setup_hci(AR_SOFTC_T *ar);
-void ar6000_cleanup_hci(AR_SOFTC_T *ar);
+int ar6000_setup_hci(struct ar6_softc *ar);
+void ar6000_cleanup_hci(struct ar6_softc *ar);
/* HCI bridge testing */
-int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb);
+int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb);
#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
#define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock)
@@ -466,7 +466,7 @@ static HCI_SEND_FULL_ACTION ar6000_hci_pkt_send_full(void *pContext, struct htc
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int ar6000_setup_hci(void *ar)
#else
-int ar6000_setup_hci(AR_SOFTC_T *ar)
+int ar6000_setup_hci(struct ar6_softc *ar)
#endif
{
struct hci_transport_config_info config;
@@ -563,7 +563,7 @@ int ar6000_setup_hci(AR_SOFTC_T *ar)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
void ar6000_cleanup_hci(void *ar)
#else
-void ar6000_cleanup_hci(AR_SOFTC_T *ar)
+void ar6000_cleanup_hci(struct ar6_softc *ar)
#endif
{
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
@@ -598,7 +598,7 @@ void ar6000_cleanup_hci(AR_SOFTC_T *ar)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int hci_test_send(void *ar, struct sk_buff *skb)
#else
-int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
+int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb)
#endif
{
int status = 0;
@@ -664,7 +664,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
return status;
}
-void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
+void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig)
{
struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info;
struct ar3k_config_info *config = (struct ar3k_config_info *)ar3kconfig;
@@ -1080,7 +1080,7 @@ static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_b
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int ar6000_setup_hci(void *ar)
#else
-int ar6000_setup_hci(AR_SOFTC_T *ar)
+int ar6000_setup_hci(struct ar6_softc *ar)
#endif
{
return 0;
@@ -1089,14 +1089,14 @@ int ar6000_setup_hci(AR_SOFTC_T *ar)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
void ar6000_cleanup_hci(void *ar)
#else
-void ar6000_cleanup_hci(AR_SOFTC_T *ar)
+void ar6000_cleanup_hci(struct ar6_softc *ar)
#endif
{
return;
}
#ifndef EXPORT_HCI_BRIDGE_INTERFACE
-void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
+void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig)
{
return;
}
@@ -1105,7 +1105,7 @@ void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int hci_test_send(void *ar, struct sk_buff *skb)
#else
-int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
+int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb)
#endif
{
return -EOPNOTSUPP;
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 8d8a964..9b5c0a3 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -466,7 +466,7 @@ typedef struct ar6_raw_htc {
bool read_buffer_available[HTC_RAW_STREAM_NUM_MAX];
} AR_RAW_HTC_T;
-typedef struct ar6_softc {
+struct ar6_softc {
struct net_device *arNetDev; /* net_device pointer */
void *arWmi;
int arTxPending[ENDPOINT_MAX];
@@ -622,12 +622,12 @@ typedef struct ar6_softc {
#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
void *arApDev;
#endif
-} AR_SOFTC_T;
+};
#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
struct ar_virtual_interface {
struct net_device *arNetDev; /* net_device pointer */
- AR_SOFTC_T *arDev; /* ar device pointer */
+ struct ar6_softc *arDev; /* ar device pointer */
struct net_device *arStaNetDev; /* net_device pointer */
};
#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */
@@ -704,11 +704,11 @@ struct ar_giwscan_param {
int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
int ar6000_ioctl_dispatcher(struct net_device *dev, struct ifreq *rq, int cmd);
void ar6000_gpio_init(void);
-void ar6000_init_profile_info(AR_SOFTC_T *ar);
-void ar6000_install_static_wep_keys(AR_SOFTC_T *ar);
+void ar6000_init_profile_info(struct ar6_softc *ar);
+void ar6000_install_static_wep_keys(struct ar6_softc *ar);
int ar6000_init(struct net_device *dev);
-int ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar);
-void ar6000_TxDataCleanup(AR_SOFTC_T *ar);
+int ar6000_dbglog_get_debug_logs(struct ar6_softc *ar);
+void ar6000_TxDataCleanup(struct ar6_softc *ar);
int ar6000_acl_data_tx(struct sk_buff *skb, struct net_device *dev);
void ar6000_restart_endpoint(struct net_device *dev);
void ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs);
@@ -719,12 +719,12 @@ void ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbgl
#define __user
#endif
-int ar6000_htc_raw_open(AR_SOFTC_T *ar);
-int ar6000_htc_raw_close(AR_SOFTC_T *ar);
-ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar,
+int ar6000_htc_raw_open(struct ar6_softc *ar);
+int ar6000_htc_raw_close(struct ar6_softc *ar);
+ssize_t ar6000_htc_raw_read(struct ar6_softc *ar,
HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t count);
-ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
+ssize_t ar6000_htc_raw_write(struct ar6_softc *ar,
HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t count);
@@ -733,22 +733,22 @@ ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
/* AP mode */
/*TODO: These routines should be moved to a file that is common across OS */
sta_t *
-ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr);
+ieee80211_find_conn(struct ar6_softc *ar, u8 *node_addr);
sta_t *
-ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid);
+ieee80211_find_conn_for_aid(struct ar6_softc *ar, u8 aid);
-u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason);
+u8 remove_sta(struct ar6_softc *ar, u8 *mac, u16 reason);
/* HCI support */
#ifndef EXPORT_HCI_BRIDGE_INTERFACE
-int ar6000_setup_hci(AR_SOFTC_T *ar);
-void ar6000_cleanup_hci(AR_SOFTC_T *ar);
-void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig);
+int ar6000_setup_hci(struct ar6_softc *ar);
+void ar6000_cleanup_hci(struct ar6_softc *ar);
+void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig);
/* HCI bridge testing */
-int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb);
+int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb);
#endif
ATH_DEBUG_DECLARE_EXTERN(htc);
diff --git a/drivers/staging/ath6kl/os/linux/include/cfg80211.h b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
index c2e4fa2..1a6ae97 100644
--- a/drivers/staging/ath6kl/os/linux/include/cfg80211.h
+++ b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
@@ -25,21 +25,21 @@
#define _AR6K_CFG80211_H_
struct wireless_dev *ar6k_cfg80211_init(struct device *dev);
-void ar6k_cfg80211_deinit(AR_SOFTC_T *ar);
+void ar6k_cfg80211_deinit(struct ar6_softc *ar);
-void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status);
+void ar6k_cfg80211_scanComplete_event(struct ar6_softc *ar, int status);
-void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
+void ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel,
u8 *bssid, u16 listenInterval,
u16 beaconInterval,NETWORK_TYPE networkType,
u8 beaconIeLen, u8 assocReqLen,
u8 assocRespLen, u8 *assocInfo);
-void ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason,
+void ar6k_cfg80211_disconnect_event(struct ar6_softc *ar, u8 reason,
u8 *bssid, u8 assocRespLen,
u8 *assocInfo, u16 protocolReasonStatus);
-void ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast);
+void ar6k_cfg80211_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast);
#endif /* _AR6K_CFG80211_H_ */
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index 2c0d4fd..c650faa 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -39,7 +39,7 @@ extern int loghci;
static int
ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (ar->arWmiReady == false) {
return -EIO;
@@ -55,7 +55,7 @@ ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (ar->arWmiReady == false) {
return -EIO;
@@ -74,7 +74,7 @@ ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_ROAM_CTRL_CMD cmd;
u8 size = sizeof(cmd);
@@ -107,7 +107,7 @@ ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata)
static int
ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_POWERSAVE_TIMERS_POLICY_CMD cmd;
u8 size = sizeof(cmd);
@@ -133,7 +133,7 @@ ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata)
static int
ar6000_ioctl_set_qos_supp(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_QOS_SUPP_CMD cmd;
int ret;
@@ -168,7 +168,7 @@ ar6000_ioctl_set_qos_supp(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_WMM_CMD cmd;
int ret;
@@ -209,7 +209,7 @@ ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_WMM_TXOP_CMD cmd;
int ret;
@@ -244,7 +244,7 @@ ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
int ret = 0;
if ((dev->flags & IFF_UP) != IFF_UP || ar->arWmiReady == false) {
@@ -261,7 +261,7 @@ ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_AP_SET_COUNTRY_CMD cmd;
int ret;
@@ -301,7 +301,7 @@ ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_POWER_MODE_CMD power_mode;
int ret = 0;
@@ -321,7 +321,7 @@ ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_CHANNEL_PARAMS_CMD cmd, *cmdp;
int ret = 0;
@@ -382,7 +382,7 @@ static int
ar6000_ioctl_set_snr_threshold(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SNR_THRESHOLD_PARAMS_CMD cmd;
int ret = 0;
@@ -414,7 +414,7 @@ ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
thold2.rssi = tmpThold.rssi; \
} while (0)
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_RSSI_THRESHOLD_PARAMS_CMD cmd;
USER_RSSI_PARAMS rssiParams;
s32 i, j;
@@ -491,7 +491,7 @@ static int
ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_LQ_THRESHOLD_PARAMS_CMD cmd;
int ret = 0;
@@ -514,7 +514,7 @@ ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_PROBED_SSID_CMD cmd;
int ret = 0;
@@ -538,7 +538,7 @@ ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_ADD_BAD_AP_CMD cmd;
int ret = 0;
@@ -574,7 +574,7 @@ ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_CREATE_PSTREAM_CMD cmd;
int ret;
@@ -607,7 +607,7 @@ ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_DELETE_PSTREAM_CMD cmd;
int ret = 0;
@@ -637,7 +637,7 @@ ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
struct ar6000_queuereq qreq;
int ret = 0;
@@ -665,7 +665,7 @@ static int
ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
struct ifreq *rq, u8 *data, u32 len)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u32 buf[4+TCMD_MAX_RATES];
int ret = 0;
@@ -717,7 +717,7 @@ ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
void
ar6000_tcmd_rx_report_event(void *devt, u8 *results, int len)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
+ struct ar6_softc *ar = (struct ar6_softc *)devt;
TCMD_CONT_RX * rx_rep = (TCMD_CONT_RX *)results;
if (enablerssicompensation) {
@@ -742,7 +742,7 @@ ar6000_tcmd_rx_report_event(void *devt, u8 *results, int len)
static int
ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_TARGET_ERROR_REPORT_BITMASK cmd;
int ret = 0;
@@ -762,7 +762,7 @@ ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq)
static int
ar6000_clear_target_stats(struct net_device *dev)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
TARGET_STATS *pStats = &ar->arTargetStats;
int ret = 0;
@@ -778,7 +778,7 @@ ar6000_clear_target_stats(struct net_device *dev)
static int
ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
TARGET_STATS_CMD cmd;
TARGET_STATS *pStats = &ar->arTargetStats;
int ret = 0;
@@ -829,7 +829,7 @@ ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_get_ap_stats(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u32 action; /* Allocating only the desired space on the frame. Declaring is as a WMI_AP_MODE_STAT variable results in exceeding the compiler imposed limit on the maximum frame size */
WMI_AP_MODE_STAT *pStats = &ar->arAPStats;
int ret = 0;
@@ -888,7 +888,7 @@ ar6000_ioctl_get_ap_stats(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_ACCESS_PARAMS_CMD cmd;
int ret = 0;
@@ -914,7 +914,7 @@ ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq)
static int
ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_DISC_TIMEOUT_CMD cmd;
int ret = 0;
@@ -939,7 +939,7 @@ ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
static int
ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_VOICE_PKT_SIZE_CMD cmd;
int ret = 0;
@@ -965,7 +965,7 @@ ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata)
static int
ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_MAX_SP_LEN_CMD cmd;
int ret = 0;
@@ -991,7 +991,7 @@ ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata)
static int
ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BT_STATUS_CMD cmd;
int ret = 0;
@@ -1016,7 +1016,7 @@ ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata)
static int
ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BT_PARAMS_CMD cmd;
int ret = 0;
@@ -1041,7 +1041,7 @@ ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata)
static int
ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_FE_ANT_CMD cmd;
int ret = 0;
@@ -1065,7 +1065,7 @@ ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata)
static int
ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD cmd;
int ret = 0;
@@ -1090,7 +1090,7 @@ ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *use
static int
ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD cmd;
int ret = 0;
@@ -1115,7 +1115,7 @@ ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, cha
static int
ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_SCO_CONFIG_CMD cmd;
int ret = 0;
@@ -1141,7 +1141,7 @@ static int
ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_A2DP_CONFIG_CMD cmd;
int ret = 0;
@@ -1166,7 +1166,7 @@ ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
static int
ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD cmd;
int ret = 0;
@@ -1191,7 +1191,7 @@ ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userd
static int
ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_DEBUG_CMD cmd;
int ret = 0;
@@ -1216,7 +1216,7 @@ ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata)
static int
ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char *userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD cmd;
int ret = 0;
@@ -1242,7 +1242,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char *userdata,
struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
AR6000_BTCOEX_CONFIG btcoexConfig;
WMI_BTCOEX_CONFIG_EVENT *pbtcoexConfigEv = &ar->arBtcoexConfig;
@@ -1285,7 +1285,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char *userdata,
static int
ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, struct ifreq *rq)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
AR6000_BTCOEX_STATS btcoexStats;
WMI_BTCOEX_STATS_EVENT *pbtcoexStats = &ar->arBtcoexStats;
int ret = 0;
@@ -1332,7 +1332,7 @@ ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, stru
static int
ar6000_xioctl_set_excess_tx_retry_thres_cmd(struct net_device * dev, char * userdata)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_SET_EXCESS_TX_RETRY_THRES_CMD cmd;
int ret = 0;
@@ -1414,7 +1414,7 @@ ar6000_gpio_output_set(struct net_device *dev,
u32 enable_mask,
u32 disable_mask)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
gpio_ack_received = false;
return wmi_gpio_output_set(ar->arWmi,
@@ -1424,7 +1424,7 @@ ar6000_gpio_output_set(struct net_device *dev,
static int
ar6000_gpio_input_get(struct net_device *dev)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
*((volatile bool *)&gpio_data_available) = false;
return wmi_gpio_input_get(ar->arWmi);
@@ -1435,7 +1435,7 @@ ar6000_gpio_register_set(struct net_device *dev,
u32 gpioreg_id,
u32 value)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
gpio_ack_received = false;
return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value);
@@ -1445,7 +1445,7 @@ static int
ar6000_gpio_register_get(struct net_device *dev,
u32 gpioreg_id)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
*((volatile bool *)&gpio_data_available) = false;
return wmi_gpio_register_get(ar->arWmi, gpioreg_id);
@@ -1455,7 +1455,7 @@ static int
ar6000_gpio_intr_ack(struct net_device *dev,
u32 ack_mask)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
gpio_intr_available = false;
return wmi_gpio_intr_ack(ar->arWmi, ack_mask);
@@ -1469,7 +1469,7 @@ static bool prof_count_available; /* Requested GPIO data available */
static int
prof_count_get(struct net_device *dev)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
*((volatile bool *)&prof_count_available) = false;
return wmi_prof_count_get_cmd(ar->arWmi);
@@ -1541,7 +1541,7 @@ ar6000_create_acl_data_osbuf(struct net_device *dev, u8 *userdata, void **p_osbu
int
-ar6000_ioctl_ap_setparam(AR_SOFTC_T *ar, int param, int value)
+ar6000_ioctl_ap_setparam(struct ar6_softc *ar, int param, int value)
{
int ret=0;
@@ -1621,7 +1621,7 @@ ar6000_ioctl_ap_setparam(AR_SOFTC_T *ar, int param, int value)
}
int
-ar6000_ioctl_setparam(AR_SOFTC_T *ar, int param, int value)
+ar6000_ioctl_setparam(struct ar6_softc *ar, int param, int value)
{
bool profChanged = false;
int ret=0;
@@ -1757,7 +1757,7 @@ ar6000_ioctl_setparam(AR_SOFTC_T *ar, int param, int value)
}
int
-ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik)
+ar6000_ioctl_setkey(struct ar6_softc *ar, struct ieee80211req_key *ik)
{
KEY_USAGE keyUsage;
int status;
@@ -1864,7 +1864,7 @@ ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik)
int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
HIF_DEVICE *hifDevice = ar->arHifDevice;
int ret = 0, param;
unsigned int address = 0;
@@ -3141,7 +3141,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
case AR6000_XIOCTL_SET_OPT_MODE:
{
WMI_SET_OPT_MODE_CMD optModeCmd;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (ar->arWmiReady == false) {
ret = -EIO;
@@ -3242,7 +3242,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
}
case IEEE80211_IOCTL_SETAUTHALG:
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
struct ieee80211req_authalg req;
if (ar->arWmiReady == false) {
@@ -3417,7 +3417,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
case AR6000_XIOCTL_WMI_GETFIXRATES:
{
WMI_FIX_RATES_CMD getFixRatesCmd;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
int ret = 0;
if (ar->bIsDestroyProgress) {
@@ -3627,7 +3627,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
}
case AR6000_XIOCTL_WMI_GET_KEEPALIVE:
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_GET_KEEPALIVE_CMD getKeepAlive;
int ret = 0;
if (ar->bIsDestroyProgress) {
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c
index 824f1be..4b77943 100644
--- a/drivers/staging/ath6kl/os/linux/wireless_ext.c
+++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c
@@ -416,7 +416,7 @@ ar6000_ioctl_giwscan(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
struct ar_giwscan_param param;
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -461,7 +461,7 @@ ar6000_ioctl_siwessid(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *ssid)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
int status;
u8 arNetworkType;
u8 prevMode = ar->arNetworkType;
@@ -658,7 +658,7 @@ ar6000_ioctl_giwessid(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *essid)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -681,7 +681,7 @@ ar6000_ioctl_giwessid(struct net_device *dev,
}
-void ar6000_install_static_wep_keys(AR_SOFTC_T *ar)
+void ar6000_install_static_wep_keys(struct ar6_softc *ar)
{
u8 index;
u8 keyUsage;
@@ -712,7 +712,7 @@ ar6000_ioctl_siwrate(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u32 kbps;
s8 rate_idx;
@@ -749,7 +749,7 @@ ar6000_ioctl_giwrate(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
int ret = 0;
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -812,7 +812,7 @@ ar6000_ioctl_siwtxpow(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u8 dbM;
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -854,7 +854,7 @@ ar6000_ioctl_giwtxpow(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
int ret = 0;
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -924,7 +924,7 @@ ar6000_ioctl_siwretry(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -965,7 +965,7 @@ ar6000_ioctl_giwretry(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -1006,7 +1006,7 @@ ar6000_ioctl_siwencode(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *keybuf)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
int index;
s32 auth = 0;
@@ -1122,7 +1122,7 @@ ar6000_ioctl_giwencode(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *key)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u8 keyIndex;
struct ar_wep_key *wk;
@@ -1192,7 +1192,7 @@ ar6000_ioctl_siwgenie(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
#ifdef WAPI_ENABLE
u8 *ie = erq->pointer;
@@ -1228,7 +1228,7 @@ ar6000_ioctl_giwgenie(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (ar->arWmiReady == false) {
return -EIO;
@@ -1247,7 +1247,7 @@ ar6000_ioctl_siwauth(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *data, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
bool profChanged;
u16 param;
@@ -1418,7 +1418,7 @@ ar6000_ioctl_giwauth(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *data, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
u16 param;
s32 ret;
@@ -1546,7 +1546,7 @@ ar6000_ioctl_siwpmksa(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
s32 ret;
int status;
struct iw_pmksa *pmksa;
@@ -1591,7 +1591,7 @@ static int ar6000_set_wapi_key(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
KEY_USAGE keyUsage = 0;
s32 keyLen;
@@ -1653,7 +1653,7 @@ ar6000_ioctl_siwencodeext(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
s32 index;
struct iw_encode_ext *ext;
KEY_USAGE keyUsage;
@@ -1827,7 +1827,7 @@ ar6000_ioctl_giwencodeext(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (ar->arWlanState == WLAN_DISABLED) {
return -EIO;
@@ -1850,7 +1850,7 @@ static int ar6000_ioctl_siwpower(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
#ifndef ATH6K_CONFIG_OTA_MODE
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_POWER_MODE power_mode;
if (ar->arWmiReady == false) {
@@ -1876,7 +1876,7 @@ static int ar6000_ioctl_giwpower(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
WMI_POWER_MODE power_mode;
if (ar->arWmiReady == false) {
@@ -1907,7 +1907,7 @@ ar6000_ioctl_giwname(struct net_device *dev,
char *name, char *extra)
{
u8 capability;
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -1961,7 +1961,7 @@ ar6000_ioctl_siwfreq(struct net_device *dev,
struct iw_request_info *info,
struct iw_freq *freq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -2006,7 +2006,7 @@ ar6000_ioctl_giwfreq(struct net_device *dev,
struct iw_request_info *info,
struct iw_freq *freq, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -2046,7 +2046,7 @@ ar6000_ioctl_siwmode(struct net_device *dev,
struct iw_request_info *info,
__u32 *mode, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -2117,7 +2117,7 @@ ar6000_ioctl_giwmode(struct net_device *dev,
struct iw_request_info *info,
__u32 *mode, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -2177,7 +2177,7 @@ ar6000_ioctl_giwrange(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
struct iw_range *range = (struct iw_range *) extra;
int i, ret = 0;
@@ -2300,7 +2300,7 @@ ar6000_ioctl_siwap(struct net_device *dev,
struct iw_request_info *info,
struct sockaddr *ap_addr, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -2332,7 +2332,7 @@ ar6000_ioctl_giwap(struct net_device *dev,
struct iw_request_info *info,
struct sockaddr *ap_addr, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -2368,7 +2368,7 @@ ar6000_ioctl_siwmlme(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
@@ -2460,7 +2460,7 @@ ar6000_ioctl_siwscan(struct net_device *dev,
#define ACT_DWELLTIME_DEFAULT 105
#define HOME_TXDRAIN_TIME 100
#define SCAN_INT HOME_TXDRAIN_TIME + ACT_DWELLTIME_DEFAULT
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
int ret = 0;
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -2588,7 +2588,7 @@ ar6000_ioctl_siwcommit(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
+ struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
