aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2011-03-14 13:59:11 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 14:58:57 -0400
commita71f0bf684bc1d1ae74ede5639d376d45a64ba7e (patch)
tree18d79f91cee222ea0fa245c740e525692ac14b3a /drivers/staging
parentb2bad0874006d504a887468f0ce40f4de326e8e8 (diff)
ath6kl: remove-typedef AR_SOFTC_T
remove-typedef -s AR_SOFTC_T \ "struct ar6_softc" drivers/staging/ath6kl/ Tested-by: Naveen Singh <nsingh@atheros.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_android.c2
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_drv.c242
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_pm.c18
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_raw_if.c18
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6k_pal.c8
-rw-r--r--drivers/staging/ath6kl/os/linux/cfg80211.c50
-rw-r--r--drivers/staging/ath6kl/os/linux/hci_bridge.c24
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6000_drv.h36
-rw-r--r--drivers/staging/ath6kl/os/linux/include/cfg80211.h10
-rw-r--r--drivers/staging/ath6kl/os/linux/ioctl.c112
-rw-r--r--drivers/staging/ath6kl/os/linux/wireless_ext.c66
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 002cdc76c830..c96f6e9c99c6 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)
334} 334}
335 335
336#ifdef CONFIG_PM 336#ifdef CONFIG_PM
337void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent) 337void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)
338{ 338{
339 if ( 339 if (
340#ifdef CONFIG_HAS_EARLYSUSPEND 340#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 41c66b77e5f6..27cb02dfad3c 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);
281int ar6000_init(struct net_device *dev); 281int ar6000_init(struct net_device *dev);
282static int ar6000_open(struct net_device *dev); 282static int ar6000_open(struct net_device *dev);
283static int ar6000_close(struct net_device *dev); 283static int ar6000_close(struct net_device *dev);
284static void ar6000_init_control_info(AR_SOFTC_T *ar); 284static void ar6000_init_control_info(struct ar6_softc *ar);
285static int ar6000_data_tx(struct sk_buff *skb, struct net_device *dev); 285static int ar6000_data_tx(struct sk_buff *skb, struct net_device *dev);
286 286
287void ar6000_destroy(struct net_device *dev, unsigned int unregister); 287void ar6000_destroy(struct net_device *dev, unsigned int unregister);
@@ -292,7 +292,7 @@ static struct iw_statistics *ar6000_get_iwstats(struct net_device * dev);
292 292
293static void disconnect_timer_handler(unsigned long ptr); 293static void disconnect_timer_handler(unsigned long ptr);
294 294
295void read_rssi_compensation_param(AR_SOFTC_T *ar); 295void read_rssi_compensation_param(struct ar6_softc *ar);
296 296
297 /* for android builds we call external APIs that handle firmware download and configuration */ 297 /* for android builds we call external APIs that handle firmware download and configuration */
298#ifdef ANDROID_ENV 298#ifdef ANDROID_ENV
@@ -309,7 +309,7 @@ static int ar6000_avail_ev(void *context, void *hif_handle);
309 309
310static int ar6000_unavail_ev(void *context, void *hif_handle); 310static int ar6000_unavail_ev(void *context, void *hif_handle);
311 311
312int ar6000_configure_target(AR_SOFTC_T *ar); 312int ar6000_configure_target(struct ar6_softc *ar);
313 313
314static void ar6000_target_failure(void *Instance, int Status); 314static void ar6000_target_failure(void *Instance, int Status);
315 315
@@ -329,9 +329,9 @@ static void ar6000_deliver_frames_to_nw_stack(void * dev, void *osbuf);
329 329
330static struct htc_packet *ar6000_alloc_amsdu_rxbuf(void *Context, HTC_ENDPOINT_ID Endpoint, int Length); 330static struct htc_packet *ar6000_alloc_amsdu_rxbuf(void *Context, HTC_ENDPOINT_ID Endpoint, int Length);
331 331
332static void ar6000_refill_amsdu_rxbufs(AR_SOFTC_T *ar, int Count); 332static void ar6000_refill_amsdu_rxbufs(struct ar6_softc *ar, int Count);
333 333
334static void ar6000_cleanup_amsdu_rxbufs(AR_SOFTC_T *ar); 334static void ar6000_cleanup_amsdu_rxbufs(struct ar6_softc *ar);
335 335
336static ssize_t 336static ssize_t
337ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj, 337ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj,
@@ -344,17 +344,17 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
344 char *buf, loff_t pos, size_t count); 344 char *buf, loff_t pos, size_t count);
345 345
346static int 346static int
347ar6000_sysfs_bmi_init(AR_SOFTC_T *ar); 347ar6000_sysfs_bmi_init(struct ar6_softc *ar);
348 348
349/* HCI PAL callback function declarations */ 349/* HCI PAL callback function declarations */
350int ar6k_setup_hci_pal(AR_SOFTC_T *ar); 350int ar6k_setup_hci_pal(struct ar6_softc *ar);
351void ar6k_cleanup_hci_pal(AR_SOFTC_T *ar); 351void ar6k_cleanup_hci_pal(struct ar6_softc *ar);
352 352
353static void 353static void
354ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar); 354ar6000_sysfs_bmi_deinit(struct ar6_softc *ar);
355 355
356int 356int
357ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode); 357ar6000_sysfs_bmi_get_config(struct ar6_softc *ar, u32 mode);
358 358
359/* 359/*
360 * Static variables 360 * Static variables
@@ -364,13 +364,13 @@ struct net_device *ar6000_devices[MAX_AR6000];
364static int is_netdev_registered; 364static int is_netdev_registered;
365extern struct iw_handler_def ath_iw_handler_def; 365extern struct iw_handler_def ath_iw_handler_def;
366DECLARE_WAIT_QUEUE_HEAD(arEvent); 366DECLARE_WAIT_QUEUE_HEAD(arEvent);
367static void ar6000_cookie_init(AR_SOFTC_T *ar); 367static void ar6000_cookie_init(struct ar6_softc *ar);
368static void ar6000_cookie_cleanup(AR_SOFTC_T *ar); 368static void ar6000_cookie_cleanup(struct ar6_softc *ar);
369static void ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie); 369static void ar6000_free_cookie(struct ar6_softc *ar, struct ar_cookie * cookie);
370static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar); 370static struct ar_cookie *ar6000_alloc_cookie(struct ar6_softc *ar);
371 371
372#ifdef USER_KEYS 372#ifdef USER_KEYS
373static int ar6000_reinstall_keys(AR_SOFTC_T *ar,u8 key_op_ctrl); 373static int ar6000_reinstall_keys(struct ar6_softc *ar,u8 key_op_ctrl);
374#endif 374#endif
375 375
376#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT 376#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
@@ -403,7 +403,7 @@ static struct net_device_ops ar6000_netdev_ops = {
403#define REPORT_DEBUG_LOGS_TO_APP 403#define REPORT_DEBUG_LOGS_TO_APP
404 404
405int 405int
406ar6000_set_host_app_area(AR_SOFTC_T *ar) 406ar6000_set_host_app_area(struct ar6_softc *ar)
407{ 407{
408 u32 address, data; 408 u32 address, data;
409 struct host_app_area_s host_app_area; 409 struct host_app_area_s host_app_area;
@@ -425,7 +425,7 @@ ar6000_set_host_app_area(AR_SOFTC_T *ar)
425 return 0; 425 return 0;
426} 426}
427 427
428u32 dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar) 428u32 dbglog_get_debug_hdr_ptr(struct ar6_softc *ar)
429{ 429{
430 u32 param; 430 u32 param;
431 u32 address; 431 u32 address;
@@ -446,7 +446,7 @@ u32 dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
446 * data stuctures over the diagnostic window. 446 * data stuctures over the diagnostic window.
447 */ 447 */
448void 448void
449ar6000_dbglog_init_done(AR_SOFTC_T *ar) 449ar6000_dbglog_init_done(struct ar6_softc *ar)
450{ 450{
451 ar->dbglog_init_done = true; 451 ar->dbglog_init_done = true;
452} 452}
@@ -518,7 +518,7 @@ dbglog_parse_debug_logs(s8 *datap, u32 len)
518} 518}
519 519
520int 520int
521ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar) 521ar6000_dbglog_get_debug_logs(struct ar6_softc *ar)
522{ 522{
523 u32 data[8]; /* Should be able to accomodate struct dbglog_buf_s */ 523 u32 data[8]; /* Should be able to accomodate struct dbglog_buf_s */
524 u32 address; 524 u32 address;
@@ -596,7 +596,7 @@ ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
596} 596}
597 597
598void 598void
599ar6000_dbglog_event(AR_SOFTC_T *ar, u32 dropped, 599ar6000_dbglog_event(struct ar6_softc *ar, u32 dropped,
600 s8 *buffer, u32 length) 600 s8 *buffer, u32 length)
601{ 601{
602#ifdef REPORT_DEBUG_LOGS_TO_APP 602#ifdef REPORT_DEBUG_LOGS_TO_APP
@@ -738,10 +738,10 @@ aptcTimerHandler(unsigned long arg)
738{ 738{
739 u32 numbytes; 739 u32 numbytes;
740 u32 throughput; 740 u32 throughput;
741 AR_SOFTC_T *ar; 741 struct ar6_softc *ar;
742 int status; 742 int status;
743 743
744 ar = (AR_SOFTC_T *)arg; 744 ar = (struct ar6_softc *)arg;
745 A_ASSERT(ar != NULL); 745 A_ASSERT(ar != NULL);
746 A_ASSERT(!timer_pending(&aptcTimer)); 746 A_ASSERT(!timer_pending(&aptcTimer));
747 747
@@ -802,12 +802,12 @@ ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj,
802 char *buf, loff_t pos, size_t count) 802 char *buf, loff_t pos, size_t count)
803{ 803{
804 int index; 804 int index;
805 AR_SOFTC_T *ar; 805 struct ar6_softc *ar;
806 struct hif_device_os_device_info *osDevInfo; 806 struct hif_device_os_device_info *osDevInfo;
807 807
808 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Read %d bytes\n", (u32)count)); 808 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Read %d bytes\n", (u32)count));
809 for (index=0; index < MAX_AR6000; index++) { 809 for (index=0; index < MAX_AR6000; index++) {
810 ar = (AR_SOFTC_T *)ar6k_priv(ar6000_devices[index]); 810 ar = (struct ar6_softc *)ar6k_priv(ar6000_devices[index]);
811 osDevInfo = &ar->osDevInfo; 811 osDevInfo = &ar->osDevInfo;
812 if (kobj == (&(((struct device *)osDevInfo->pOSDevice)->kobj))) { 812 if (kobj == (&(((struct device *)osDevInfo->pOSDevice)->kobj))) {
813 break; 813 break;
@@ -829,12 +829,12 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
829 char *buf, loff_t pos, size_t count) 829 char *buf, loff_t pos, size_t count)
830{ 830{
831 int index; 831 int index;
832 AR_SOFTC_T *ar; 832 struct ar6_softc *ar;
833 struct hif_device_os_device_info *osDevInfo; 833 struct hif_device_os_device_info *osDevInfo;
834 834
835 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Write %d bytes\n", (u32)count)); 835 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Write %d bytes\n", (u32)count));
836 for (index=0; index < MAX_AR6000; index++) { 836 for (index=0; index < MAX_AR6000; index++) {
837 ar = (AR_SOFTC_T *)ar6k_priv(ar6000_devices[index]); 837 ar = (struct ar6_softc *)ar6k_priv(ar6000_devices[index]);
838 osDevInfo = &ar->osDevInfo; 838 osDevInfo = &ar->osDevInfo;
839 if (kobj == (&(((struct device *)osDevInfo->pOSDevice)->kobj))) { 839 if (kobj == (&(((struct device *)osDevInfo->pOSDevice)->kobj))) {
840 break; 840 break;
@@ -851,7 +851,7 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
851} 851}
852 852
853static int 853static int
854ar6000_sysfs_bmi_init(AR_SOFTC_T *ar) 854ar6000_sysfs_bmi_init(struct ar6_softc *ar)
855{ 855{
856 int status; 856 int status;
857 857
@@ -880,7 +880,7 @@ ar6000_sysfs_bmi_init(AR_SOFTC_T *ar)
880} 880}
881 881
882static void 882static void
883ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar) 883ar6000_sysfs_bmi_deinit(struct ar6_softc *ar)
884{ 884{
885 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Deleting sysfs entry\n")); 885 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Deleting sysfs entry\n"));
886 886
@@ -941,7 +941,7 @@ void calculate_crc(u32 TargetType, u8 *eeprom_data)
941} 941}
942 942
943static void 943static void
944ar6000_softmac_update(AR_SOFTC_T *ar, u8 *eeprom_data, size_t size) 944ar6000_softmac_update(struct ar6_softc *ar, u8 *eeprom_data, size_t size)
945{ 945{
946 const char *source = "random generated"; 946 const char *source = "random generated";
947 const struct firmware *softmac_entry; 947 const struct firmware *softmac_entry;
@@ -992,7 +992,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, u8 *eeprom_data, size_t size)
992#endif /* SOFTMAC_FILE_USED */ 992#endif /* SOFTMAC_FILE_USED */
993 993
994static int 994static int
995ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, u32 address, bool compressed) 995ar6000_transfer_bin_file(struct ar6_softc *ar, AR6K_BIN_FILE file, u32 address, bool compressed)
996{ 996{
997 int status; 997 int status;
998 const char *filename; 998 const char *filename;
@@ -1156,7 +1156,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, u32 address, bool c
1156#endif /* INIT_MODE_DRV_ENABLED */ 1156#endif /* INIT_MODE_DRV_ENABLED */
1157 1157
1158int 1158int
1159ar6000_update_bdaddr(AR_SOFTC_T *ar) 1159ar6000_update_bdaddr(struct ar6_softc *ar)
1160{ 1160{
1161 1161
1162 if (setupbtdev != 0) { 1162 if (setupbtdev != 0) {
@@ -1183,7 +1183,7 @@ return 0;
1183} 1183}
1184 1184
1185int 1185int
1186ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode) 1186ar6000_sysfs_bmi_get_config(struct ar6_softc *ar, u32 mode)
1187{ 1187{
1188 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n")); 1188 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n"));
1189 1189
@@ -1398,7 +1398,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
1398} 1398}
1399 1399
1400int 1400int
1401ar6000_configure_target(AR_SOFTC_T *ar) 1401ar6000_configure_target(struct ar6_softc *ar)
1402{ 1402{
1403 u32 param; 1403 u32 param;
1404 if (enableuartprint) { 1404 if (enableuartprint) {
@@ -1597,7 +1597,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
1597 int i; 1597 int i;
1598 struct net_device *dev; 1598 struct net_device *dev;
1599 void *ar_netif; 1599 void *ar_netif;
1600 AR_SOFTC_T *ar; 1600 struct ar6_softc *ar;
1601 int device_index = 0; 1601 int device_index = 0;
1602 struct htc_init_info htcInfo; 1602 struct htc_init_info htcInfo;
1603#ifdef ATH6K_CONFIG_CFG80211 1603#ifdef ATH6K_CONFIG_CFG80211
@@ -1638,7 +1638,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
1638 } 1638 }
1639 ar_netif = wdev_priv(wdev); 1639 ar_netif = wdev_priv(wdev);
1640#else 1640#else
1641 dev = alloc_etherdev(sizeof(AR_SOFTC_T)); 1641 dev = alloc_etherdev(sizeof(struct ar6_softc));
1642 if (dev == NULL) { 1642 if (dev == NULL) {
1643 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_available: can't alloc etherdev\n")); 1643 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_available: can't alloc etherdev\n"));
1644 return A_ERROR; 1644 return A_ERROR;
@@ -1652,8 +1652,8 @@ ar6000_avail_ev(void *context, void *hif_handle)
1652 return A_ERROR; 1652 return A_ERROR;
1653 } 1653 }
1654 1654
1655 A_MEMZERO(ar_netif, sizeof(AR_SOFTC_T)); 1655 A_MEMZERO(ar_netif, sizeof(struct ar6_softc));
1656 ar = (AR_SOFTC_T *)ar_netif; 1656 ar = (struct ar6_softc *)ar_netif;
1657 1657
1658#ifdef ATH6K_CONFIG_CFG80211 1658#ifdef ATH6K_CONFIG_CFG80211
1659 ar->wdev = wdev; 1659 ar->wdev = wdev;
@@ -1854,7 +1854,7 @@ avail_ev_failed :
1854 1854
1855static void ar6000_target_failure(void *Instance, int Status) 1855static void ar6000_target_failure(void *Instance, int Status)
1856{ 1856{
1857 AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance; 1857 struct ar6_softc *ar = (struct ar6_softc *)Instance;
1858 WMI_TARGET_ERROR_REPORT_EVENT errEvent; 1858 WMI_TARGET_ERROR_REPORT_EVENT errEvent;
1859 static bool sip = false; 1859 static bool sip = false;
1860 1860
@@ -1890,7 +1890,7 @@ static void ar6000_target_failure(void *Instance, int Status)
1890static int 1890static int
1891ar6000_unavail_ev(void *context, void *hif_handle) 1891ar6000_unavail_ev(void *context, void *hif_handle)
1892{ 1892{
1893 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 1893 struct ar6_softc *ar = (struct ar6_softc *)context;
1894 /* NULL out it's entry in the global list */ 1894 /* NULL out it's entry in the global list */
1895 ar6000_devices[ar->arDeviceIndex] = NULL; 1895 ar6000_devices[ar->arDeviceIndex] = NULL;
1896 ar6000_destroy(ar->arNetDev, 1); 1896 ar6000_destroy(ar->arNetDev, 1);
@@ -1902,7 +1902,7 @@ void
1902ar6000_restart_endpoint(struct net_device *dev) 1902ar6000_restart_endpoint(struct net_device *dev)
1903{ 1903{
1904 int status = 0; 1904 int status = 0;
1905 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1905 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1906 1906
1907 BMIInit(); 1907 BMIInit();
1908 do { 1908 do {
@@ -1936,7 +1936,7 @@ ar6000_restart_endpoint(struct net_device *dev)
1936void 1936void
1937ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs) 1937ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs)
1938{ 1938{
1939 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1939 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1940 1940
1941 /* Stop the transmit queues */ 1941 /* Stop the transmit queues */
1942 netif_stop_queue(dev); 1942 netif_stop_queue(dev);
@@ -2074,7 +2074,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs)
2074void 2074void
2075ar6000_destroy(struct net_device *dev, unsigned int unregister) 2075ar6000_destroy(struct net_device *dev, unsigned int unregister)
2076{ 2076{
2077 AR_SOFTC_T *ar; 2077 struct ar6_softc *ar;
2078 2078
2079 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("+ar6000_destroy \n")); 2079 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("+ar6000_destroy \n"));
2080 2080
@@ -2159,7 +2159,7 @@ ar6000_destroy(struct net_device *dev, unsigned int unregister)
2159static void disconnect_timer_handler(unsigned long ptr) 2159static void disconnect_timer_handler(unsigned long ptr)
2160{ 2160{
2161 struct net_device *dev = (struct net_device *)ptr; 2161 struct net_device *dev = (struct net_device *)ptr;
2162 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2162 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2163 2163
2164 A_UNTIMEOUT(&ar->disconnect_timer); 2164 A_UNTIMEOUT(&ar->disconnect_timer);
2165 2165
@@ -2170,7 +2170,7 @@ static void disconnect_timer_handler(unsigned long ptr)
2170static void ar6000_detect_error(unsigned long ptr) 2170static void ar6000_detect_error(unsigned long ptr)
2171{ 2171{
2172 struct net_device *dev = (struct net_device *)ptr; 2172 struct net_device *dev = (struct net_device *)ptr;
2173 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2173 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2174 WMI_TARGET_ERROR_REPORT_EVENT errEvent; 2174 WMI_TARGET_ERROR_REPORT_EVENT errEvent;
2175 2175
2176 AR6000_SPIN_LOCK(&ar->arLock, 0); 2176 AR6000_SPIN_LOCK(&ar->arLock, 0);
@@ -2209,7 +2209,7 @@ static void ar6000_detect_error(unsigned long ptr)
2209 A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0); 2209 A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
2210} 2210}
2211 2211
2212void ar6000_init_profile_info(AR_SOFTC_T *ar) 2212void ar6000_init_profile_info(struct ar6_softc *ar)
2213{ 2213{
2214 ar->arSsidLen = 0; 2214 ar->arSsidLen = 0;
2215 A_MEMZERO(ar->arSsid, sizeof(ar->arSsid)); 2215 A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
@@ -2239,7 +2239,7 @@ void ar6000_init_profile_info(AR_SOFTC_T *ar)
2239} 2239}
2240 2240
2241static void 2241static void
2242ar6000_init_control_info(AR_SOFTC_T *ar) 2242ar6000_init_control_info(struct ar6_softc *ar)
2243{ 2243{
2244 ar->arWmiEnabled = false; 2244 ar->arWmiEnabled = false;
2245 ar6000_init_profile_info(ar); 2245 ar6000_init_profile_info(ar);
@@ -2291,7 +2291,7 @@ static int
2291ar6000_open(struct net_device *dev) 2291ar6000_open(struct net_device *dev)
2292{ 2292{
2293 unsigned long flags; 2293 unsigned long flags;
2294 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2294 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2295 2295
2296 spin_lock_irqsave(&ar->arLock, flags); 2296 spin_lock_irqsave(&ar->arLock, flags);
2297 2297
@@ -2317,7 +2317,7 @@ static int
2317ar6000_close(struct net_device *dev) 2317ar6000_close(struct net_device *dev)
2318{ 2318{
2319#ifdef ATH6K_CONFIG_CFG80211 2319#ifdef ATH6K_CONFIG_CFG80211
2320 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2320 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2321#endif /* ATH6K_CONFIG_CFG80211 */ 2321#endif /* ATH6K_CONFIG_CFG80211 */
2322 netif_stop_queue(dev); 2322 netif_stop_queue(dev);
2323 2323
@@ -2338,7 +2338,7 @@ ar6000_close(struct net_device *dev)
2338} 2338}
2339 2339
2340/* connect to a service */ 2340/* connect to a service */
2341static int ar6000_connectservice(AR_SOFTC_T *ar, 2341static int ar6000_connectservice(struct ar6_softc *ar,
2342 struct htc_service_connect_req *pConnect, 2342 struct htc_service_connect_req *pConnect,
2343 char *pDesc) 2343 char *pDesc)
2344{ 2344{
@@ -2390,7 +2390,7 @@ static int ar6000_connectservice(AR_SOFTC_T *ar,
2390 return status; 2390 return status;
2391} 2391}
2392 2392
2393void ar6000_TxDataCleanup(AR_SOFTC_T *ar) 2393void ar6000_TxDataCleanup(struct ar6_softc *ar)
2394{ 2394{
2395 /* flush all the data (non-control) streams 2395 /* flush all the data (non-control) streams
2396 * we only flush packets that are tagged as data, we leave any control packets that 2396 * 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)
2412HTC_ENDPOINT_ID 2412HTC_ENDPOINT_ID
2413ar6000_ac2_endpoint_id ( void * devt, u8 ac) 2413ar6000_ac2_endpoint_id ( void * devt, u8 ac)
2414{ 2414{
2415 AR_SOFTC_T *ar = (AR_SOFTC_T *) devt; 2415 struct ar6_softc *ar = (struct ar6_softc *) devt;
2416 return(arAc2EndpointID(ar, ac)); 2416 return(arAc2EndpointID(ar, ac));
2417} 2417}
2418 2418
2419u8 ar6000_endpoint_id2_ac(void * devt, HTC_ENDPOINT_ID ep ) 2419u8 ar6000_endpoint_id2_ac(void * devt, HTC_ENDPOINT_ID ep )
2420{ 2420{
2421 AR_SOFTC_T *ar = (AR_SOFTC_T *) devt; 2421 struct ar6_softc *ar = (struct ar6_softc *) devt;
2422 return(arEndpoint2Ac(ar, ep )); 2422 return(arEndpoint2Ac(ar, ep ));
2423} 2423}
2424 2424
2425/* 2425/*
2426 * This function applies WLAN specific configuration defined in wlan_config.h 2426 * This function applies WLAN specific configuration defined in wlan_config.h
2427 */ 2427 */
2428int ar6000_target_config_wlan_params(AR_SOFTC_T *ar) 2428int ar6000_target_config_wlan_params(struct ar6_softc *ar)
2429{ 2429{
2430 int status = 0; 2430 int status = 0;
2431#if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE) 2431#if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE)
@@ -2546,7 +2546,7 @@ int ar6000_target_config_wlan_params(AR_SOFTC_T *ar)
2546/* This function does one time initialization for the lifetime of the device */ 2546/* This function does one time initialization for the lifetime of the device */
2547int ar6000_init(struct net_device *dev) 2547int ar6000_init(struct net_device *dev)
2548{ 2548{
2549 AR_SOFTC_T *ar; 2549 struct ar6_softc *ar;
2550 int status; 2550 int status;
2551 s32 timeleft; 2551 s32 timeleft;
2552 s16 i; 2552 s16 i;
@@ -2845,7 +2845,7 @@ ar6000_init_done:
2845void 2845void
2846ar6000_bitrate_rx(void *devt, s32 rateKbps) 2846ar6000_bitrate_rx(void *devt, s32 rateKbps)
2847{ 2847{
2848 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 2848 struct ar6_softc *ar = (struct ar6_softc *)devt;
2849 2849
2850 ar->arBitRate = rateKbps; 2850 ar->arBitRate = rateKbps;
2851 wake_up(&arEvent); 2851 wake_up(&arEvent);
@@ -2854,7 +2854,7 @@ ar6000_bitrate_rx(void *devt, s32 rateKbps)
2854void 2854void
2855ar6000_ratemask_rx(void *devt, u32 ratemask) 2855ar6000_ratemask_rx(void *devt, u32 ratemask)
2856{ 2856{
2857 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 2857 struct ar6_softc *ar = (struct ar6_softc *)devt;
2858 2858
2859 ar->arRateMask = ratemask; 2859 ar->arRateMask = ratemask;
2860 wake_up(&arEvent); 2860 wake_up(&arEvent);
@@ -2863,7 +2863,7 @@ ar6000_ratemask_rx(void *devt, u32 ratemask)
2863void 2863void
2864ar6000_txPwr_rx(void *devt, u8 txPwr) 2864ar6000_txPwr_rx(void *devt, u8 txPwr)
2865{ 2865{
2866 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 2866 struct ar6_softc *ar = (struct ar6_softc *)devt;
2867 2867
2868 ar->arTxPwr = txPwr; 2868 ar->arTxPwr = txPwr;
2869 wake_up(&arEvent); 2869 wake_up(&arEvent);
@@ -2873,7 +2873,7 @@ ar6000_txPwr_rx(void *devt, u8 txPwr)
2873void 2873void
2874ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList) 2874ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList)
2875{ 2875{
2876 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 2876 struct ar6_softc *ar = (struct ar6_softc *)devt;
2877 2877
2878 memcpy(ar->arChannelList, chanList, numChan * sizeof (u16)); 2878 memcpy(ar->arChannelList, chanList, numChan * sizeof (u16));
2879 ar->arNumChannels = numChan; 2879 ar->arNumChannels = numChan;
@@ -2883,7 +2883,7 @@ ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList)
2883 2883
2884u8 ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, u32 *mapNo) 2884u8 ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, u32 *mapNo)
2885{ 2885{
2886 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2886 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2887 u8 *datap; 2887 u8 *datap;
2888 ATH_MAC_HDR *macHdr; 2888 ATH_MAC_HDR *macHdr;
2889 u32 i, eptMap; 2889 u32 i, eptMap;
@@ -2952,14 +2952,14 @@ static void ar6000_dump_skb(struct sk_buff *skb)
2952#endif 2952#endif
2953 2953
2954#ifdef HTC_TEST_SEND_PKTS 2954#ifdef HTC_TEST_SEND_PKTS
2955static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *skb); 2955static void DoHTCSendPktsTest(struct ar6_softc *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *skb);
2956#endif 2956#endif
2957 2957
2958static int 2958static int
2959ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) 2959ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
2960{ 2960{
2961#define AC_NOT_MAPPED 99 2961#define AC_NOT_MAPPED 99
2962 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2962 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2963 u8 ac = AC_NOT_MAPPED; 2963 u8 ac = AC_NOT_MAPPED;
2964 HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED; 2964 HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED;
2965 u32 mapNo = 0; 2965 u32 mapNo = 0;
@@ -3281,7 +3281,7 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
3281int 3281int
3282ar6000_acl_data_tx(struct sk_buff *skb, struct net_device *dev) 3282ar6000_acl_data_tx(struct sk_buff *skb, struct net_device *dev)
3283{ 3283{
3284 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 3284 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
3285 struct ar_cookie *cookie; 3285 struct ar_cookie *cookie;
3286 HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED; 3286 HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED;
3287 3287
@@ -3337,7 +3337,7 @@ tvsub(register struct timeval *out, register struct timeval *in)
3337} 3337}
3338 3338
3339void 3339void
3340applyAPTCHeuristics(AR_SOFTC_T *ar) 3340applyAPTCHeuristics(struct ar6_softc *ar)
3341{ 3341{
3342 u32 duration; 3342 u32 duration;
3343 u32 numbytes; 3343 u32 numbytes;
@@ -3378,7 +3378,7 @@ applyAPTCHeuristics(AR_SOFTC_T *ar)
3378 3378
3379static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, struct htc_packet *pPacket) 3379static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, struct htc_packet *pPacket)
3380{ 3380{
3381 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 3381 struct ar6_softc *ar = (struct ar6_softc *)Context;
3382 HTC_SEND_FULL_ACTION action = HTC_SEND_FULL_KEEP; 3382 HTC_SEND_FULL_ACTION action = HTC_SEND_FULL_KEEP;
3383 bool stopNet = false; 3383 bool stopNet = false;
3384 HTC_ENDPOINT_ID Endpoint = HTC_GET_ENDPOINT_FROM_PKT(pPacket); 3384 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
3463static void 3463static void
3464ar6000_tx_complete(void *Context, struct htc_packet_queue *pPacketQueue) 3464ar6000_tx_complete(void *Context, struct htc_packet_queue *pPacketQueue)
3465{ 3465{
3466 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 3466 struct ar6_softc *ar = (struct ar6_softc *)Context;
3467 u32 mapNo = 0; 3467 u32 mapNo = 0;
3468 int status; 3468 int status;
3469 struct ar_cookie * ar_cookie; 3469 struct ar_cookie * ar_cookie;
@@ -3599,7 +3599,7 @@ ar6000_tx_complete(void *Context, struct htc_packet_queue *pPacketQueue)
3599} 3599}
3600 3600
3601sta_t * 3601sta_t *
3602ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr) 3602ieee80211_find_conn(struct ar6_softc *ar, u8 *node_addr)
3603{ 3603{
3604 sta_t *conn = NULL; 3604 sta_t *conn = NULL;
3605 u8 i, max_conn; 3605 u8 i, max_conn;
@@ -3623,7 +3623,7 @@ ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr)
3623 return conn; 3623 return conn;
3624} 3624}
3625 3625
3626sta_t *ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid) 3626sta_t *ieee80211_find_conn_for_aid(struct ar6_softc *ar, u8 aid)
3627{ 3627{
3628 sta_t *conn = NULL; 3628 sta_t *conn = NULL;
3629 u8 ctr; 3629 u8 ctr;
@@ -3644,7 +3644,7 @@ int pktcount;
3644static void 3644static void
3645ar6000_rx(void *Context, struct htc_packet *pPacket) 3645ar6000_rx(void *Context, struct htc_packet *pPacket)
3646{ 3646{
3647 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 3647 struct ar6_softc *ar = (struct ar6_softc *)Context;
3648 struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext; 3648 struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext;
3649 int minHdrLen; 3649 int minHdrLen;
3650 u8 containsDot11Hdr = 0; 3650 u8 containsDot11Hdr = 0;
@@ -3942,7 +3942,7 @@ ar6000_deliver_frames_to_nw_stack(void *dev, void *osbuf)
3942 skb->dev = dev; 3942 skb->dev = dev;
3943 if ((skb->dev->flags & IFF_UP) == IFF_UP) { 3943 if ((skb->dev->flags & IFF_UP) == IFF_UP) {
3944#ifdef CONFIG_PM 3944#ifdef CONFIG_PM
3945 ar6000_check_wow_status((AR_SOFTC_T *)ar6k_priv(dev), skb, false); 3945 ar6000_check_wow_status((struct ar6_softc *)ar6k_priv(dev), skb, false);
3946#endif /* CONFIG_PM */ 3946#endif /* CONFIG_PM */
3947 skb->protocol = eth_type_trans(skb, skb->dev); 3947 skb->protocol = eth_type_trans(skb, skb->dev);
3948 /* 3948 /*
@@ -3987,7 +3987,7 @@ ar6000_deliver_frames_to_bt_stack(void *dev, void *osbuf)
3987static void 3987static void
3988ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint) 3988ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint)
3989{ 3989{
3990 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 3990 struct ar6_softc *ar = (struct ar6_softc *)Context;
3991 void *osBuf; 3991 void *osBuf;
3992 int RxBuffers; 3992 int RxBuffers;
3993 int buffersToRefill; 3993 int buffersToRefill;
@@ -4029,7 +4029,7 @@ ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint)
4029} 4029}
4030 4030
4031 /* clean up our amsdu buffer list */ 4031 /* clean up our amsdu buffer list */
4032static void ar6000_cleanup_amsdu_rxbufs(AR_SOFTC_T *ar) 4032static void ar6000_cleanup_amsdu_rxbufs(struct ar6_softc *ar)
4033{ 4033{
4034 struct htc_packet *pPacket; 4034 struct htc_packet *pPacket;
4035 void *osBuf; 4035 void *osBuf;
@@ -4058,7 +4058,7 @@ static void ar6000_cleanup_amsdu_rxbufs(AR_SOFTC_T *ar)
4058 4058
4059 4059
4060 /* refill the amsdu buffer list */ 4060 /* refill the amsdu buffer list */
4061static void ar6000_refill_amsdu_rxbufs(AR_SOFTC_T *ar, int Count) 4061static void ar6000_refill_amsdu_rxbufs(struct ar6_softc *ar, int Count)
4062{ 4062{
4063 struct htc_packet *pPacket; 4063 struct htc_packet *pPacket;
4064 void *osBuf; 4064 void *osBuf;
@@ -4093,7 +4093,7 @@ static void ar6000_refill_amsdu_rxbufs(AR_SOFTC_T *ar, int Count)
4093static struct htc_packet *ar6000_alloc_amsdu_rxbuf(void *Context, HTC_ENDPOINT_ID Endpoint, int Length) 4093static struct htc_packet *ar6000_alloc_amsdu_rxbuf(void *Context, HTC_ENDPOINT_ID Endpoint, int Length)
4094{ 4094{
4095 struct htc_packet *pPacket = NULL; 4095 struct htc_packet *pPacket = NULL;
4096 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 4096 struct ar6_softc *ar = (struct ar6_softc *)Context;
4097 int refillCount = 0; 4097 int refillCount = 0;
4098 4098
4099 AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_RX,("ar6000_alloc_amsdu_rxbuf: eid=%d, Length:%d\n",Endpoint,Length)); 4099 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)
4142static struct net_device_stats * 4142static struct net_device_stats *
4143ar6000_get_stats(struct net_device *dev) 4143ar6000_get_stats(struct net_device *dev)
4144{ 4144{
4145 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 4145 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
4146 return &ar->arNetStats; 4146 return &ar->arNetStats;
4147} 4147}
4148 4148
4149static struct iw_statistics * 4149static struct iw_statistics *
4150ar6000_get_iwstats(struct net_device * dev) 4150ar6000_get_iwstats(struct net_device * dev)
4151{ 4151{
4152 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 4152 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
4153 TARGET_STATS *pStats = &ar->arTargetStats; 4153 TARGET_STATS *pStats = &ar->arTargetStats;
4154 struct iw_statistics * pIwStats = &ar->arIwStats; 4154 struct iw_statistics * pIwStats = &ar->arIwStats;
4155 int rtnllocked; 4155 int rtnllocked;
@@ -4236,7 +4236,7 @@ err_exit:
4236void 4236void
4237ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, u32 sw_ver, u32 abi_ver) 4237ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, u32 sw_ver, u32 abi_ver)
4238{ 4238{
4239 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 4239 struct ar6_softc *ar = (struct ar6_softc *)devt;
4240 struct net_device *dev = ar->arNetDev; 4240 struct net_device *dev = ar->arNetDev;
4241 4241
4242 memcpy(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN); 4242 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)
4255} 4255}
4256 4256
4257void 4257void
4258add_new_sta(AR_SOFTC_T *ar, u8 *mac, u16 aid, u8 *wpaie, 4258add_new_sta(struct ar6_softc *ar, u8 *mac, u16 aid, u8 *wpaie,
4259 u8 ielen, u8 keymgmt, u8 ucipher, u8 auth) 4259 u8 ielen, u8 keymgmt, u8 ucipher, u8 auth)
4260{ 4260{
4261 u8 free_slot=aid-1; 4261 u8 free_slot=aid-1;
@@ -4271,7 +4271,7 @@ add_new_sta(AR_SOFTC_T *ar, u8 *mac, u16 aid, u8 *wpaie,
4271} 4271}
4272 4272
4273void 4273void
4274ar6000_connect_event(AR_SOFTC_T *ar, u16 channel, u8 *bssid, 4274ar6000_connect_event(struct ar6_softc *ar, u16 channel, u8 *bssid,
4275 u16 listenInterval, u16 beaconInterval, 4275 u16 listenInterval, u16 beaconInterval,
4276 NETWORK_TYPE networkType, u8 beaconIeLen, 4276 NETWORK_TYPE networkType, u8 beaconIeLen,
4277 u8 assocReqLen, u8 assocRespLen, 4277 u8 assocReqLen, u8 assocRespLen,
@@ -4557,14 +4557,14 @@ skip_key:
4557 4557
4558} 4558}
4559 4559
4560void ar6000_set_numdataendpts(AR_SOFTC_T *ar, u32 num) 4560void ar6000_set_numdataendpts(struct ar6_softc *ar, u32 num)
4561{ 4561{
4562 A_ASSERT(num <= (HTC_MAILBOX_NUM_MAX - 1)); 4562 A_ASSERT(num <= (HTC_MAILBOX_NUM_MAX - 1));
4563 ar->arNumDataEndPts = num; 4563 ar->arNumDataEndPts = num;
4564} 4564}
4565 4565
4566void 4566void
4567sta_cleanup(AR_SOFTC_T *ar, u8 i) 4567sta_cleanup(struct ar6_softc *ar, u8 i)
4568{ 4568{
4569 struct sk_buff *skb; 4569 struct sk_buff *skb;
4570 4570
@@ -4587,7 +4587,7 @@ sta_cleanup(AR_SOFTC_T *ar, u8 i)
4587 4587
4588} 4588}
4589 4589
4590u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason) 4590u8 remove_sta(struct ar6_softc *ar, u8 *mac, u16 reason)
4591{ 4591{
4592 u8 i, removed=0; 4592 u8 i, removed=0;
4593 4593
@@ -4620,7 +4620,7 @@ u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason)
4620} 4620}
4621 4621
4622void 4622void
4623ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid, 4623ar6000_disconnect_event(struct ar6_softc *ar, u8 reason, u8 *bssid,
4624 u8 assocRespLen, u8 *assocInfo, u16 protocolReasonStatus) 4624 u8 assocRespLen, u8 *assocInfo, u16 protocolReasonStatus)
4625{ 4625{
4626 u8 i; 4626 u8 i;
@@ -4768,7 +4768,7 @@ ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid,
4768} 4768}
4769 4769
4770void 4770void
4771ar6000_regDomain_event(AR_SOFTC_T *ar, u32 regCode) 4771ar6000_regDomain_event(struct ar6_softc *ar, u32 regCode)
4772{ 4772{
4773 A_PRINTF("AR6000 Reg Code = 0x%x\n", regCode); 4773 A_PRINTF("AR6000 Reg Code = 0x%x\n", regCode);
4774 ar->arRegCode = regCode; 4774 ar->arRegCode = regCode;
@@ -4776,7 +4776,7 @@ ar6000_regDomain_event(AR_SOFTC_T *ar, u32 regCode)
4776 4776
4777#ifdef ATH_AR6K_11N_SUPPORT 4777#ifdef ATH_AR6K_11N_SUPPORT
4778void 4778void
4779ar6000_aggr_rcv_addba_req_evt(AR_SOFTC_T *ar, WMI_ADDBA_REQ_EVENT *evt) 4779ar6000_aggr_rcv_addba_req_evt(struct ar6_softc *ar, WMI_ADDBA_REQ_EVENT *evt)
4780{ 4780{
4781 if(evt->status == 0) { 4781 if(evt->status == 0) {
4782 aggr_recv_addba_req_evt(ar->aggr_cntxt, evt->tid, evt->st_seq_no, evt->win_sz); 4782 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)
4784} 4784}
4785 4785
4786void 4786void
4787ar6000_aggr_rcv_addba_resp_evt(AR_SOFTC_T *ar, WMI_ADDBA_RESP_EVENT *evt) 4787ar6000_aggr_rcv_addba_resp_evt(struct ar6_softc *ar, WMI_ADDBA_RESP_EVENT *evt)
4788{ 4788{
4789 A_PRINTF("ADDBA RESP. tid %d status %d, sz %d\n", evt->tid, evt->status, evt->amsdu_sz); 4789 A_PRINTF("ADDBA RESP. tid %d status %d, sz %d\n", evt->tid, evt->status, evt->amsdu_sz);
4790 if(evt->status == 0) { 4790 if(evt->status == 0) {
@@ -4792,7 +4792,7 @@ ar6000_aggr_rcv_addba_resp_evt(AR_SOFTC_T *ar, WMI_ADDBA_RESP_EVENT *evt)
4792} 4792}
4793 4793
4794void 4794void
4795ar6000_aggr_rcv_delba_req_evt(AR_SOFTC_T *ar, WMI_DELBA_EVENT *evt) 4795ar6000_aggr_rcv_delba_req_evt(struct ar6_softc *ar, WMI_DELBA_EVENT *evt)
4796{ 4796{
4797 aggr_recv_delba_req_evt(ar->aggr_cntxt, evt->tid); 4797 aggr_recv_delba_req_evt(ar->aggr_cntxt, evt->tid);
4798} 4798}
@@ -4849,7 +4849,7 @@ ar6000_hci_event_rcv_evt(struct ar6_softc *ar, WMI_HCI_EVENT *cmd)
4849} 4849}
4850 4850
4851void 4851void
4852ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info) 4852ar6000_neighborReport_event(struct ar6_softc *ar, int numAps, WMI_NEIGHBOR_INFO *info)
4853{ 4853{
4854#if WIRELESS_EXT >= 18 4854#if WIRELESS_EXT >= 18
4855 struct iw_pmkid_cand *pmkcand; 4855 struct iw_pmkid_cand *pmkcand;
@@ -4897,7 +4897,7 @@ ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info)
4897} 4897}
4898 4898
4899void 4899void
4900ar6000_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast) 4900ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast)
4901{ 4901{
4902 static const char *tag = "MLME-MICHAELMICFAILURE.indication"; 4902 static const char *tag = "MLME-MICHAELMICFAILURE.indication";
4903 char buf[128]; 4903 char buf[128];
@@ -4934,7 +4934,7 @@ ar6000_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast)
4934} 4934}
4935 4935
4936void 4936void
4937ar6000_scanComplete_event(AR_SOFTC_T *ar, int status) 4937ar6000_scanComplete_event(struct ar6_softc *ar, int status)
4938{ 4938{
4939 4939
4940#ifdef ATH6K_CONFIG_CFG80211 4940#ifdef ATH6K_CONFIG_CFG80211
@@ -4957,7 +4957,7 @@ ar6000_scanComplete_event(AR_SOFTC_T *ar, int status)
4957} 4957}
4958 4958
4959void 4959void
4960ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, u32 len) 4960ar6000_targetStats_event(struct ar6_softc *ar, u8 *ptr, u32 len)
4961{ 4961{
4962 u8 ac; 4962 u8 ac;
4963 4963
@@ -5082,7 +5082,7 @@ ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, u32 len)
5082} 5082}
5083 5083
5084void 5084void
5085ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, s16 rssi) 5085ar6000_rssiThreshold_event(struct ar6_softc *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, s16 rssi)
5086{ 5086{
5087 USER_RSSI_THOLD userRssiThold; 5087 USER_RSSI_THOLD userRssiThold;
5088 5088
@@ -5103,7 +5103,7 @@ ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold,
5103 5103
5104 5104
5105void 5105void
5106ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, u32 cookie, u32 source) 5106ar6000_hbChallengeResp_event(struct ar6_softc *ar, u32 cookie, u32 source)
5107{ 5107{
5108 if (source == APP_HB_CHALLENGE) { 5108 if (source == APP_HB_CHALLENGE) {
5109 /* Report it to the app in case it wants a positive acknowledgement */ 5109 /* 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)
5119 5119
5120 5120
5121void 5121void
5122ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal) 5122ar6000_reportError_event(struct ar6_softc *ar, WMI_TARGET_ERROR_VAL errorVal)
5123{ 5123{
5124 static const char * const errString[] = { 5124 static const char * const errString[] = {
5125 [WMI_TARGET_PM_ERR_FAIL] "WMI_TARGET_PM_ERR_FAIL", 5125 [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)
5154 5154
5155 5155
5156void 5156void
5157ar6000_cac_event(AR_SOFTC_T *ar, u8 ac, u8 cacIndication, 5157ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cacIndication,
5158 u8 statusCode, u8 *tspecSuggestion) 5158 u8 statusCode, u8 *tspecSuggestion)
5159{ 5159{
5160 WMM_TSPEC_IE *tspecIe; 5160 WMM_TSPEC_IE *tspecIe;
@@ -5177,7 +5177,7 @@ ar6000_cac_event(AR_SOFTC_T *ar, u8 ac, u8 cacIndication,
5177} 5177}
5178 5178
5179void 5179void
5180ar6000_channel_change_event(AR_SOFTC_T *ar, u16 oldChannel, 5180ar6000_channel_change_event(struct ar6_softc *ar, u16 oldChannel,
5181 u16 newChannel) 5181 u16 newChannel)
5182{ 5182{
5183 A_PRINTF("Channel Change notification\nOld Channel: %d, New Channel: %d\n", 5183 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,
5191} while(0) 5191} while(0)
5192 5192
5193void 5193void
5194ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl) 5194ar6000_roam_tbl_event(struct ar6_softc *ar, WMI_TARGET_ROAM_TBL *pTbl)
5195{ 5195{
5196 u8 i; 5196 u8 i;
5197 5197
@@ -5270,7 +5270,7 @@ ar6000_display_roam_time(WMI_TARGET_ROAM_TIME *p)
5270} 5270}
5271 5271
5272void 5272void
5273ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p) 5273ar6000_roam_data_event(struct ar6_softc *ar, WMI_TARGET_ROAM_DATA *p)
5274{ 5274{
5275 switch (p->roamDataType) { 5275 switch (p->roamDataType) {
5276 case ROAM_DATA_TIME: 5276 case ROAM_DATA_TIME:
@@ -5282,7 +5282,7 @@ ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p)
5282} 5282}
5283 5283
5284void 5284void
5285ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, u8 *datap, int len) 5285ar6000_bssInfo_event_rx(struct ar6_softc *ar, u8 *datap, int len)
5286{ 5286{
5287 struct sk_buff *skb; 5287 struct sk_buff *skb;
5288 WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap; 5288 WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap;
@@ -5317,7 +5317,7 @@ u32 wmiSendCmdNum;
5317int 5317int
5318ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid) 5318ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid)
5319{ 5319{
5320 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 5320 struct ar6_softc *ar = (struct ar6_softc *)devt;
5321 int status = 0; 5321 int status = 0;
5322 struct ar_cookie *cookie = NULL; 5322 struct ar_cookie *cookie = NULL;
5323 int i; 5323 int i;
@@ -5396,7 +5396,7 @@ ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid)
5396/* indicate tx activity or inactivity on a WMI stream */ 5396/* indicate tx activity or inactivity on a WMI stream */
5397void ar6000_indicate_tx_activity(void *devt, u8 TrafficClass, bool Active) 5397void ar6000_indicate_tx_activity(void *devt, u8 TrafficClass, bool Active)
5398{ 5398{
5399 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 5399 struct ar6_softc *ar = (struct ar6_softc *)devt;
5400 HTC_ENDPOINT_ID eid ; 5400 HTC_ENDPOINT_ID eid ;
5401 int i; 5401 int i;
5402 5402
@@ -5510,7 +5510,7 @@ module_exit(ar6000_cleanup_module);
5510 5510
5511/* Init cookie queue */ 5511/* Init cookie queue */
5512static void 5512static void
5513ar6000_cookie_init(AR_SOFTC_T *ar) 5513ar6000_cookie_init(struct ar6_softc *ar)
5514{ 5514{
5515 u32 i; 5515 u32 i;
5516 5516
@@ -5526,7 +5526,7 @@ ar6000_cookie_init(AR_SOFTC_T *ar)
5526 5526
5527/* cleanup cookie queue */ 5527/* cleanup cookie queue */
5528static void 5528static void
5529ar6000_cookie_cleanup(AR_SOFTC_T *ar) 5529ar6000_cookie_cleanup(struct ar6_softc *ar)
5530{ 5530{
5531 /* It is gone .... */ 5531 /* It is gone .... */
5532 ar->arCookieList = NULL; 5532 ar->arCookieList = NULL;
@@ -5535,7 +5535,7 @@ ar6000_cookie_cleanup(AR_SOFTC_T *ar)
5535 5535
5536/* Init cookie queue */ 5536/* Init cookie queue */
5537static void 5537static void
5538ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie) 5538ar6000_free_cookie(struct ar6_softc *ar, struct ar_cookie * cookie)
5539{ 5539{
5540 /* Insert first */ 5540 /* Insert first */
5541 A_ASSERT(ar != NULL); 5541 A_ASSERT(ar != NULL);
@@ -5548,7 +5548,7 @@ ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie)
5548 5548
5549/* cleanup cookie queue */ 5549/* cleanup cookie queue */
5550static struct ar_cookie * 5550static struct ar_cookie *
5551ar6000_alloc_cookie(AR_SOFTC_T *ar) 5551ar6000_alloc_cookie(struct ar6_softc *ar)
5552{ 5552{
5553 struct ar_cookie *cookie; 5553 struct ar_cookie *cookie;
5554 5554
@@ -5569,7 +5569,7 @@ ar6000_alloc_cookie(AR_SOFTC_T *ar)
5569 * the event ID and event content. 5569 * the event ID and event content.
5570 */ 5570 */
5571#define EVENT_ID_LEN 2 5571#define EVENT_ID_LEN 2
5572void ar6000_send_event_to_app(AR_SOFTC_T *ar, u16 eventId, 5572void ar6000_send_event_to_app(struct ar6_softc *ar, u16 eventId,
5573 u8 *datap, int len) 5573 u8 *datap, int len)
5574{ 5574{
5575 5575
@@ -5614,7 +5614,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, u16 eventId,
5614 * to the application. The buf which is sent to application 5614 * to the application. The buf which is sent to application
5615 * includes the event ID and event content. 5615 * includes the event ID and event content.
5616 */ 5616 */
5617void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, u16 eventId, 5617void ar6000_send_generic_event_to_app(struct ar6_softc *ar, u16 eventId,
5618 u8 *datap, int len) 5618 u8 *datap, int len)
5619{ 5619{
5620 5620
@@ -5666,7 +5666,7 @@ void
5666ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, u8 snr) 5666ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, u8 snr)
5667{ 5667{
5668 WMI_SNR_THRESHOLD_EVENT event; 5668 WMI_SNR_THRESHOLD_EVENT event;
5669 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 5669 struct ar6_softc *ar = (struct ar6_softc *)devt;
5670 5670
5671 event.range = newThreshold; 5671 event.range = newThreshold;
5672 event.snr = snr; 5672 event.snr = snr;
@@ -5721,7 +5721,7 @@ ar6000_get_driver_cfg(struct net_device *dev,
5721void 5721void
5722ar6000_keepalive_rx(void *devt, u8 configured) 5722ar6000_keepalive_rx(void *devt, u8 configured)
5723{ 5723{
5724 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 5724 struct ar6_softc *ar = (struct ar6_softc *)devt;
5725 5725
5726 ar->arKeepaliveConfigured = configured; 5726 ar->arKeepaliveConfigured = configured;
5727 wake_up(&arEvent); 5727 wake_up(&arEvent);
@@ -5750,7 +5750,7 @@ ar6000_pmkid_list_event(void *devt, u8 numPMKID, WMI_PMKID *pmkidList,
5750 } 5750 }
5751} 5751}
5752 5752
5753void ar6000_pspoll_event(AR_SOFTC_T *ar,u8 aid) 5753void ar6000_pspoll_event(struct ar6_softc *ar,u8 aid)
5754{ 5754{
5755 sta_t *conn=NULL; 5755 sta_t *conn=NULL;
5756 bool isPsqEmpty = false; 5756 bool isPsqEmpty = false;
@@ -5790,7 +5790,7 @@ void ar6000_pspoll_event(AR_SOFTC_T *ar,u8 aid)
5790 } 5790 }
5791} 5791}
5792 5792
5793void ar6000_dtimexpiry_event(AR_SOFTC_T *ar) 5793void ar6000_dtimexpiry_event(struct ar6_softc *ar)
5794{ 5794{
5795 bool isMcastQueued = false; 5795 bool isMcastQueued = false;
5796 struct sk_buff *skb = NULL; 5796 struct sk_buff *skb = NULL;
@@ -5836,7 +5836,7 @@ void ar6000_dtimexpiry_event(AR_SOFTC_T *ar)
5836} 5836}
5837 5837
5838void 5838void
5839read_rssi_compensation_param(AR_SOFTC_T *ar) 5839read_rssi_compensation_param(struct ar6_softc *ar)
5840{ 5840{
5841 u8 *cust_data_ptr; 5841 u8 *cust_data_ptr;
5842 5842
@@ -5907,7 +5907,7 @@ s32 rssi_compensation_calc_tcmd(u32 freq, s32 rssi, u32 totalPkt)
5907 return rssi; 5907 return rssi;
5908} 5908}
5909 5909
5910s16 rssi_compensation_calc(AR_SOFTC_T *ar, s16 rssi) 5910s16 rssi_compensation_calc(struct ar6_softc *ar, s16 rssi)
5911{ 5911{
5912 if (ar->arBssChannel > 5000) 5912 if (ar->arBssChannel > 5000)
5913 { 5913 {
@@ -5935,7 +5935,7 @@ s16 rssi_compensation_calc(AR_SOFTC_T *ar, s16 rssi)
5935 return rssi; 5935 return rssi;
5936} 5936}
5937 5937
5938s16 rssi_compensation_reverse_calc(AR_SOFTC_T *ar, s16 rssi, bool Above) 5938s16 rssi_compensation_reverse_calc(struct ar6_softc *ar, s16 rssi, bool Above)
5939{ 5939{
5940 s16 i; 5940 s16 i;
5941 5941
@@ -5980,7 +5980,7 @@ s16 rssi_compensation_reverse_calc(AR_SOFTC_T *ar, s16 rssi, bool Above)
5980} 5980}
5981 5981
5982#ifdef WAPI_ENABLE 5982#ifdef WAPI_ENABLE
5983void ap_wapi_rekey_event(AR_SOFTC_T *ar, u8 type, u8 *mac) 5983void ap_wapi_rekey_event(struct ar6_softc *ar, u8 type, u8 *mac)
5984{ 5984{
5985 union iwreq_data wrqu; 5985 union iwreq_data wrqu;
5986 char buf[20]; 5986 char buf[20];
@@ -6002,7 +6002,7 @@ void ap_wapi_rekey_event(AR_SOFTC_T *ar, u8 type, u8 *mac)
6002#ifdef USER_KEYS 6002#ifdef USER_KEYS
6003static int 6003static int
6004 6004
6005ar6000_reinstall_keys(AR_SOFTC_T *ar, u8 key_op_ctrl) 6005ar6000_reinstall_keys(struct ar6_softc *ar, u8 key_op_ctrl)
6006{ 6006{
6007 int status = 0; 6007 int status = 0;
6008 struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik; 6008 struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik;
@@ -6316,7 +6316,7 @@ void ar6000_peer_event(
6316 6316
6317#ifdef HTC_TEST_SEND_PKTS 6317#ifdef HTC_TEST_SEND_PKTS
6318#define HTC_TEST_DUPLICATE 8 6318#define HTC_TEST_DUPLICATE 8
6319static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *dupskb) 6319static void DoHTCSendPktsTest(struct ar6_softc *ar, int MapNo, HTC_ENDPOINT_ID eid, struct sk_buff *dupskb)
6320{ 6320{
6321 struct ar_cookie *cookie; 6321 struct ar_cookie *cookie;
6322 struct ar_cookie *cookieArray[HTC_TEST_DUPLICATE]; 6322 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
6400 * AP mode. 6400 * AP mode.
6401 */ 6401 */
6402 6402
6403int ar6000_start_ap_interface(AR_SOFTC_T *ar) 6403int ar6000_start_ap_interface(struct ar6_softc *ar)
6404{ 6404{
6405 struct ar_virtual_interface *arApDev; 6405 struct ar_virtual_interface *arApDev;
6406 6406
@@ -6411,7 +6411,7 @@ int ar6000_start_ap_interface(AR_SOFTC_T *ar)
6411 return 0; 6411 return 0;
6412} 6412}
6413 6413
6414int ar6000_stop_ap_interface(AR_SOFTC_T *ar) 6414int ar6000_stop_ap_interface(struct ar6_softc *ar)
6415{ 6415{
6416 struct ar_virtual_interface *arApDev; 6416 struct ar_virtual_interface *arApDev;
6417 6417
@@ -6425,7 +6425,7 @@ int ar6000_stop_ap_interface(AR_SOFTC_T *ar)
6425} 6425}
6426 6426
6427 6427
6428int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname) 6428int ar6000_create_ap_interface(struct ar6_softc *ar, char *ap_ifname)
6429{ 6429{
6430 struct net_device *dev; 6430 struct net_device *dev;
6431 struct ar_virtual_interface *arApDev; 6431 struct ar_virtual_interface *arApDev;
@@ -6458,7 +6458,7 @@ int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
6458 return 0; 6458 return 0;
6459} 6459}
6460 6460
6461int ar6000_add_ap_interface(AR_SOFTC_T *ar, char *ap_ifname) 6461int ar6000_add_ap_interface(struct ar6_softc *ar, char *ap_ifname)
6462{ 6462{
6463 /* Interface already added, need not proceed further */ 6463 /* Interface already added, need not proceed further */
6464 if (ar->arApDev != NULL) { 6464 if (ar->arApDev != NULL) {
@@ -6475,7 +6475,7 @@ int ar6000_add_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
6475 return ar6000_start_ap_interface(ar); 6475 return ar6000_start_ap_interface(ar);
6476} 6476}
6477 6477
6478int ar6000_remove_ap_interface(AR_SOFTC_T *ar) 6478int ar6000_remove_ap_interface(struct ar6_softc *ar)
6479{ 6479{
6480 if (arApNetDev) { 6480 if (arApNetDev) {
6481 ar6000_stop_ap_interface(ar); 6481 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 5659ad8f8e16..1a9042446bcb 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;
37extern wait_queue_head_t arEvent; 37extern wait_queue_head_t arEvent;
38 38
39#ifdef ANDROID_ENV 39#ifdef ANDROID_ENV
40extern void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent); 40extern void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent);
41#endif 41#endif
42#undef ATH_MODULE_NAME 42#undef ATH_MODULE_NAME
43#define ATH_MODULE_NAME pm 43#define ATH_MODULE_NAME pm
@@ -57,10 +57,10 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(pm,
57 57
58#endif /* DEBUG */ 58#endif /* DEBUG */
59 59
60int ar6000_exit_cut_power_state(AR_SOFTC_T *ar); 60int ar6000_exit_cut_power_state(struct ar6_softc *ar);
61 61
62#ifdef CONFIG_PM 62#ifdef CONFIG_PM
63static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep) 63static void ar6k_send_asleep_event_to_app(struct ar6_softc *ar, bool asleep)
64{ 64{
65 char buf[128]; 65 char buf[128];
66 union iwreq_data wrqu; 66 union iwreq_data wrqu;
@@ -71,7 +71,7 @@ static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep)
71 wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf); 71 wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
72} 72}
73 73
74static void ar6000_wow_resume(AR_SOFTC_T *ar) 74static void ar6000_wow_resume(struct ar6_softc *ar)
75{ 75{
76 if (ar->arWowState!= WLAN_WOW_STATE_NONE) { 76 if (ar->arWowState!= WLAN_WOW_STATE_NONE) {
77 u16 fg_start_period = (ar->scParams.fg_start_period==0) ? 1 : ar->scParams.fg_start_period; 77 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)
110 ar->arWlanPowerState = WLAN_POWER_STATE_ON; 110 ar->arWlanPowerState = WLAN_POWER_STATE_ON;
111} 111}
112 112
113static void ar6000_wow_suspend(AR_SOFTC_T *ar) 113static void ar6000_wow_suspend(struct ar6_softc *ar)
114{ 114{
115#define WOW_LIST_ID 1 115#define WOW_LIST_ID 1
116 if (ar->arNetworkType != AP_NETWORK) { 116 if (ar->arNetworkType != AP_NETWORK) {
@@ -214,7 +214,7 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar)
214int ar6000_suspend_ev(void *context) 214int ar6000_suspend_ev(void *context)
215{ 215{
216 int status = 0; 216 int status = 0;
217 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 217 struct ar6_softc *ar = (struct ar6_softc *)context;
218 s16 pmmode = ar->arSuspendConfig; 218 s16 pmmode = ar->arSuspendConfig;
219wow_not_connected: 219wow_not_connected:
220 switch (pmmode) { 220 switch (pmmode) {
@@ -250,7 +250,7 @@ wow_not_connected:
250 250
251int ar6000_resume_ev(void *context) 251int ar6000_resume_ev(void *context)
252{ 252{
253 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 253 struct ar6_softc *ar = (struct ar6_softc *)context;
254 u16 powerState = ar->arWlanPowerState; 254 u16 powerState = ar->arWlanPowerState;
255 255
256 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: enter previous state %d wowState %d\n", __func__, powerState, ar->arWowState)); 256 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)
273 return 0; 273 return 0;
274} 274}
275 275
276void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent) 276void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)
277{ 277{
278 if (ar->arWowState!=WLAN_WOW_STATE_NONE) { 278 if (ar->arWowState!=WLAN_WOW_STATE_NONE) {
279 if (ar->arWowState==WLAN_WOW_STATE_SUSPENDING) { 279 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)
292 292
293int ar6000_power_change_ev(void *context, u32 config) 293int ar6000_power_change_ev(void *context, u32 config)
294{ 294{
295 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 295 struct ar6_softc *ar = (struct ar6_softc *)context;
296 int status = 0; 296 int status = 0;
297 297
298 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config)); 298 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 7b6339c41e95..ae7c1dd96d83 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 @@
28static void 28static void
29ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket) 29ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket)
30{ 30{
31 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 31 struct ar6_softc *ar = (struct ar6_softc *)Context;
32 raw_htc_buffer *busy; 32 raw_htc_buffer *busy;
33 HTC_RAW_STREAM_ID streamID; 33 HTC_RAW_STREAM_ID streamID;
34 AR_RAW_HTC_T *arRaw = ar->arRawHtc; 34 AR_RAW_HTC_T *arRaw = ar->arRawHtc;
@@ -72,7 +72,7 @@ ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket)
72static void 72static void
73ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket) 73ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket)
74{ 74{
75 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 75 struct ar6_softc *ar = (struct ar6_softc *)Context;
76 raw_htc_buffer *free; 76 raw_htc_buffer *free;
77 HTC_RAW_STREAM_ID streamID; 77 HTC_RAW_STREAM_ID streamID;
78 AR_RAW_HTC_T *arRaw = ar->arRawHtc; 78 AR_RAW_HTC_T *arRaw = ar->arRawHtc;
@@ -111,7 +111,7 @@ ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket)
111} 111}
112 112
113/* connect to a service */ 113/* connect to a service */
114static int ar6000_connect_raw_service(AR_SOFTC_T *ar, 114static int ar6000_connect_raw_service(struct ar6_softc *ar,
115 HTC_RAW_STREAM_ID StreamID) 115 HTC_RAW_STREAM_ID StreamID)
116{ 116{
117 int status; 117 int status;
@@ -166,7 +166,7 @@ static int ar6000_connect_raw_service(AR_SOFTC_T *ar,
166 return status; 166 return status;
167} 167}
168 168
169int ar6000_htc_raw_open(AR_SOFTC_T *ar) 169int ar6000_htc_raw_open(struct ar6_softc *ar)
170{ 170{
171 int status; 171 int status;
172 int streamID, endPt, count2; 172 int streamID, endPt, count2;
@@ -272,7 +272,7 @@ int ar6000_htc_raw_open(AR_SOFTC_T *ar)
272 return 0; 272 return 0;
273} 273}
274 274
275int ar6000_htc_raw_close(AR_SOFTC_T *ar) 275int ar6000_htc_raw_close(struct ar6_softc *ar)
276{ 276{
277 A_PRINTF("ar6000_htc_raw_close called \n"); 277 A_PRINTF("ar6000_htc_raw_close called \n");
278 HTCStop(ar->arHtcTarget); 278 HTCStop(ar->arHtcTarget);
@@ -286,7 +286,7 @@ int ar6000_htc_raw_close(AR_SOFTC_T *ar)
286} 286}
287 287
288raw_htc_buffer * 288raw_htc_buffer *
289get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID) 289get_filled_buffer(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID)
290{ 290{
291 int count; 291 int count;
292 raw_htc_buffer *busy; 292 raw_htc_buffer *busy;
@@ -308,7 +308,7 @@ get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
308 return busy; 308 return busy;
309} 309}
310 310
311ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID, 311ssize_t ar6000_htc_raw_read(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID,
312 char __user *buffer, size_t length) 312 char __user *buffer, size_t length)
313{ 313{
314 int readPtr; 314 int readPtr;
@@ -368,7 +368,7 @@ ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
368} 368}
369 369
370static raw_htc_buffer * 370static raw_htc_buffer *
371get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID) 371get_free_buffer(struct ar6_softc *ar, HTC_ENDPOINT_ID StreamID)
372{ 372{
373 int count; 373 int count;
374 raw_htc_buffer *free; 374 raw_htc_buffer *free;
@@ -390,7 +390,7 @@ get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
390 return free; 390 return free;
391} 391}
392 392
393ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID, 393ssize_t ar6000_htc_raw_write(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID,
394 char __user *buffer, size_t length) 394 char __user *buffer, size_t length)
395{ 395{
396 int writePtr; 396 int writePtr;
diff --git a/drivers/staging/ath6kl/os/linux/ar6k_pal.c b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
index 08f3710b2103..1f7179acfd70 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{
49#define HCI_NORMAL_MODE (1) 49#define HCI_NORMAL_MODE (1)
50#define HCI_REGISTERED (1<<1) 50#define HCI_REGISTERED (1<<1)
51 struct hci_dev *hdev; /* BT Stack HCI dev */ 51 struct hci_dev *hdev; /* BT Stack HCI dev */
52 AR_SOFTC_T *ar; 52 struct ar6_softc *ar;
53 53
54}ar6k_hci_pal_info_t; 54}ar6k_hci_pal_info_t;
55 55
@@ -122,7 +122,7 @@ static int btpal_send_frame(struct sk_buff *skb)
122 ar6k_hci_pal_info_t *pHciPalInfo; 122 ar6k_hci_pal_info_t *pHciPalInfo;
123 int status = 0; 123 int status = 0;
124 struct sk_buff *txSkb = NULL; 124 struct sk_buff *txSkb = NULL;
125 AR_SOFTC_T *ar; 125 struct ar6_softc *ar;
126 126
127 if (!hdev) { 127 if (!hdev) {
128 PRIN_LOG("HCI PAL: btpal_send_frame - no device\n"); 128 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)
313 *********************************************/ 313 *********************************************/
314void ar6k_cleanup_hci_pal(void *ar_p) 314void ar6k_cleanup_hci_pal(void *ar_p)
315{ 315{
316 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p; 316 struct ar6_softc *ar = (struct ar6_softc *)ar_p;
317 ar6k_hci_pal_info_t *pHciPalInfo = (ar6k_hci_pal_info_t *)ar->hcipal_info; 317 ar6k_hci_pal_info_t *pHciPalInfo = (ar6k_hci_pal_info_t *)ar->hcipal_info;
318 318
319 if (pHciPalInfo != NULL) { 319 if (pHciPalInfo != NULL) {
@@ -405,7 +405,7 @@ int ar6k_setup_hci_pal(void *ar_p)
405 int status = 0; 405 int status = 0;
406 ar6k_hci_pal_info_t *pHciPalInfo; 406 ar6k_hci_pal_info_t *pHciPalInfo;
407 ar6k_pal_config_t ar6k_pal_config; 407 ar6k_pal_config_t ar6k_pal_config;
408 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p; 408 struct ar6_softc *ar = (struct ar6_softc *)ar_p;
409 409
410 do { 410 do {
411 411
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index 2edac0723af4..bcca39418f90 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 = {
136}; 136};
137 137
138static int 138static int
139ar6k_set_wpa_version(AR_SOFTC_T *ar, enum nl80211_wpa_versions wpa_version) 139ar6k_set_wpa_version(struct ar6_softc *ar, enum nl80211_wpa_versions wpa_version)
140{ 140{
141 141
142 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: %u\n", __func__, wpa_version)); 142 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)
157} 157}
158 158
159static int 159static int
160ar6k_set_auth_type(AR_SOFTC_T *ar, enum nl80211_auth_type auth_type) 160ar6k_set_auth_type(struct ar6_softc *ar, enum nl80211_auth_type auth_type)
161{ 161{
162 162
163 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: 0x%x\n", __func__, auth_type)); 163 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)
183} 183}
184 184
185static int 185static int
186ar6k_set_cipher(AR_SOFTC_T *ar, u32 cipher, bool ucast) 186ar6k_set_cipher(struct ar6_softc *ar, u32 cipher, bool ucast)
187{ 187{
188 u8 *ar_cipher = ucast ? &ar->arPairwiseCrypto : 188 u8 *ar_cipher = ucast ? &ar->arPairwiseCrypto :
189 &ar->arGroupCrypto; 189 &ar->arGroupCrypto;
@@ -225,7 +225,7 @@ ar6k_set_cipher(AR_SOFTC_T *ar, u32 cipher, bool ucast)
225} 225}
226 226
227static void 227static void
228ar6k_set_key_mgmt(AR_SOFTC_T *ar, u32 key_mgmt) 228ar6k_set_key_mgmt(struct ar6_softc *ar, u32 key_mgmt)
229{ 229{
230 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: 0x%x\n", __func__, key_mgmt)); 230 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: 0x%x\n", __func__, key_mgmt));
231 231
@@ -244,7 +244,7 @@ static int
244ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 244ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
245 struct cfg80211_connect_params *sme) 245 struct cfg80211_connect_params *sme)
246{ 246{
247 AR_SOFTC_T *ar = ar6k_priv(dev); 247 struct ar6_softc *ar = ar6k_priv(dev);
248 int status; 248 int status;
249 249
250 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); 250 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
@@ -429,7 +429,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
429} 429}
430 430
431void 431void
432ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel, 432ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel,
433 u8 *bssid, u16 listenInterval, 433 u8 *bssid, u16 listenInterval,
434 u16 beaconInterval,NETWORK_TYPE networkType, 434 u16 beaconInterval,NETWORK_TYPE networkType,
435 u8 beaconIeLen, u8 assocReqLen, 435 u8 beaconIeLen, u8 assocReqLen,
@@ -581,7 +581,7 @@ static int
581ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, 581ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
582 u16 reason_code) 582 u16 reason_code)
583{ 583{
584 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 584 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
585 585
586 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason_code)); 586 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason_code));
587 587
@@ -620,7 +620,7 @@ ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
620} 620}
621 621
622void 622void
623ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason, 623ar6k_cfg80211_disconnect_event(struct ar6_softc *ar, u8 reason,
624 u8 *bssid, u8 assocRespLen, 624 u8 *bssid, u8 assocRespLen,
625 u8 *assocInfo, u16 protocolReasonStatus) 625 u8 *assocInfo, u16 protocolReasonStatus)
626{ 626{
@@ -736,7 +736,7 @@ static int
736ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, 736ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
737 struct cfg80211_scan_request *request) 737 struct cfg80211_scan_request *request)
738{ 738{
739 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); 739 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
740 int ret = 0; 740 int ret = 0;
741 u32 forceFgScan = 0; 741 u32 forceFgScan = 0;
742 742
@@ -792,7 +792,7 @@ ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
792} 792}
793 793
794void 794void
795ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status) 795ar6k_cfg80211_scanComplete_event(struct ar6_softc *ar, int status)
796{ 796{
797 797
798 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: status %d\n", __func__, status)); 798 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,
823 u8 key_index, bool pairwise, const u8 *mac_addr, 823 u8 key_index, bool pairwise, const u8 *mac_addr,
824 struct key_params *params) 824 struct key_params *params)
825{ 825{
826 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); 826 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
827 struct ar_key *key = NULL; 827 struct ar_key *key = NULL;
828 u8 key_usage; 828 u8 key_usage;
829 u8 key_type; 829 u8 key_type;
@@ -915,7 +915,7 @@ static int
915ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, 915ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
916 u8 key_index, bool pairwise, const u8 *mac_addr) 916 u8 key_index, bool pairwise, const u8 *mac_addr)
917{ 917{
918 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); 918 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
919 919
920 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index)); 920 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index));
921 921
@@ -952,7 +952,7 @@ ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
952 void *cookie, 952 void *cookie,
953 void (*callback)(void *cookie, struct key_params*)) 953 void (*callback)(void *cookie, struct key_params*))
954{ 954{
955 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); 955 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
956 struct ar_key *key = NULL; 956 struct ar_key *key = NULL;
957 struct key_params params; 957 struct key_params params;
958 958
@@ -992,7 +992,7 @@ static int
992ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev, 992ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev,
993 u8 key_index, bool unicast, bool multicast) 993 u8 key_index, bool unicast, bool multicast)
994{ 994{
995 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); 995 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
996 struct ar_key *key = NULL; 996 struct ar_key *key = NULL;
997 int status = 0; 997 int status = 0;
998 u8 key_usage; 998 u8 key_usage;
@@ -1044,7 +1044,7 @@ static int
1044ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev, 1044ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev,
1045 u8 key_index) 1045 u8 key_index)
1046{ 1046{
1047 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); 1047 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
1048 1048
1049 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index)); 1049 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index));
1050 1050
@@ -1063,7 +1063,7 @@ ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev,
1063} 1063}
1064 1064
1065void 1065void
1066ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast) 1066ar6k_cfg80211_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast)
1067{ 1067{
1068 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, 1068 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
1069 ("%s: keyid %d, ismcast %d\n", __func__, keyid, ismcast)); 1069 ("%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)
1076static int 1076static int
1077ar6k_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) 1077ar6k_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
1078{ 1078{
1079 AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy); 1079 struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
1080 1080
1081 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: changed 0x%x\n", __func__, changed)); 1081 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: changed 0x%x\n", __func__, changed));
1082 1082
@@ -1113,7 +1113,7 @@ ar6k_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
1113static int 1113static int
1114ar6k_cfg80211_set_txpower(struct wiphy *wiphy, enum nl80211_tx_power_setting type, int dbm) 1114ar6k_cfg80211_set_txpower(struct wiphy *wiphy, enum nl80211_tx_power_setting type, int dbm)
1115{ 1115{
1116 AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy); 1116 struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
1117 u8 ar_dbm; 1117 u8 ar_dbm;
1118 1118
1119 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type 0x%x, dbm %d\n", __func__, type, dbm)); 1119 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
1149static int 1149static int
1150ar6k_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm) 1150ar6k_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)
1151{ 1151{
1152 AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy); 1152 struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
1153 1153
1154 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); 1154 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
1155 1155
@@ -1188,7 +1188,7 @@ ar6k_cfg80211_set_power_mgmt(struct wiphy *wiphy,
1188 struct net_device *dev, 1188 struct net_device *dev,
1189 bool pmgmt, int timeout) 1189 bool pmgmt, int timeout)
1190{ 1190{
1191 AR_SOFTC_T *ar = ar6k_priv(dev); 1191 struct ar6_softc *ar = ar6k_priv(dev);
1192 WMI_POWER_MODE_CMD pwrMode; 1192 WMI_POWER_MODE_CMD pwrMode;
1193 1193
1194 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: pmgmt %d, timeout %d\n", __func__, pmgmt, timeout)); 1194 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,
1250 enum nl80211_iftype type, u32 *flags, 1250 enum nl80211_iftype type, u32 *flags,
1251 struct vif_params *params) 1251 struct vif_params *params)
1252{ 1252{
1253 AR_SOFTC_T *ar = ar6k_priv(ndev); 1253 struct ar6_softc *ar = ar6k_priv(ndev);
1254 struct wireless_dev *wdev = ar->wdev; 1254 struct wireless_dev *wdev = ar->wdev;
1255 1255
1256 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type %u\n", __func__, type)); 1256 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type %u\n", __func__, type));
@@ -1286,7 +1286,7 @@ static int
1286ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, 1286ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
1287 struct cfg80211_ibss_params *ibss_param) 1287 struct cfg80211_ibss_params *ibss_param)
1288{ 1288{
1289 AR_SOFTC_T *ar = ar6k_priv(dev); 1289 struct ar6_softc *ar = ar6k_priv(dev);
1290 int status; 1290 int status;
1291 1291
1292 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); 1292 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
@@ -1361,7 +1361,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
1361static int 1361static int
1362ar6k_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev) 1362ar6k_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
1363{ 1363{
1364 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1364 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1365 1365
1366 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); 1366 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
1367 1367
@@ -1429,7 +1429,7 @@ ar6k_cfg80211_init(struct device *dev)
1429 } 1429 }
1430 1430
1431 /* create a new wiphy for use with cfg80211 */ 1431 /* create a new wiphy for use with cfg80211 */
1432 wdev->wiphy = wiphy_new(&ar6k_cfg80211_ops, sizeof(AR_SOFTC_T)); 1432 wdev->wiphy = wiphy_new(&ar6k_cfg80211_ops, sizeof(struct ar6_softc));
1433 if(!wdev->wiphy) { 1433 if(!wdev->wiphy) {
1434 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, 1434 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
1435 ("%s: Couldn't allocate wiphy device\n", __func__)); 1435 ("%s: Couldn't allocate wiphy device\n", __func__));
@@ -1463,7 +1463,7 @@ ar6k_cfg80211_init(struct device *dev)
1463} 1463}
1464 1464
1465void 1465void
1466ar6k_cfg80211_deinit(AR_SOFTC_T *ar) 1466ar6k_cfg80211_deinit(struct ar6_softc *ar)
1467{ 1467{
1468 struct wireless_dev *wdev = ar->wdev; 1468 struct wireless_dev *wdev = ar->wdev;
1469 1469
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index 4b7f5a81b652..1ff71e867691 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 {
85#ifdef EXPORT_HCI_BRIDGE_INTERFACE 85#ifdef EXPORT_HCI_BRIDGE_INTERFACE
86 struct hci_transport_misc_handles HCITransHdl; 86 struct hci_transport_misc_handles HCITransHdl;
87#else 87#else
88 AR_SOFTC_T *ar; 88 struct ar6_softc *ar;
89#endif /* EXPORT_HCI_BRIDGE_INTERFACE */ 89#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
90}; 90};
91 91
@@ -120,10 +120,10 @@ int ar6000_setup_hci(void *ar);
120void ar6000_cleanup_hci(void *ar); 120void ar6000_cleanup_hci(void *ar);
121int hci_test_send(void *ar, struct sk_buff *skb); 121int hci_test_send(void *ar, struct sk_buff *skb);
122#else 122#else
123int ar6000_setup_hci(AR_SOFTC_T *ar); 123int ar6000_setup_hci(struct ar6_softc *ar);
124void ar6000_cleanup_hci(AR_SOFTC_T *ar); 124void ar6000_cleanup_hci(struct ar6_softc *ar);
125/* HCI bridge testing */ 125/* HCI bridge testing */
126int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb); 126int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb);
127#endif /* EXPORT_HCI_BRIDGE_INTERFACE */ 127#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
128 128
129#define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock) 129#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
466#ifdef EXPORT_HCI_BRIDGE_INTERFACE 466#ifdef EXPORT_HCI_BRIDGE_INTERFACE
467int ar6000_setup_hci(void *ar) 467int ar6000_setup_hci(void *ar)
468#else 468#else
469int ar6000_setup_hci(AR_SOFTC_T *ar) 469int ar6000_setup_hci(struct ar6_softc *ar)
470#endif 470#endif
471{ 471{
472 struct hci_transport_config_info config; 472 struct hci_transport_config_info config;
@@ -563,7 +563,7 @@ int ar6000_setup_hci(AR_SOFTC_T *ar)
563#ifdef EXPORT_HCI_BRIDGE_INTERFACE 563#ifdef EXPORT_HCI_BRIDGE_INTERFACE
564void ar6000_cleanup_hci(void *ar) 564void ar6000_cleanup_hci(void *ar)
565#else 565#else
566void ar6000_cleanup_hci(AR_SOFTC_T *ar) 566void ar6000_cleanup_hci(struct ar6_softc *ar)
567#endif 567#endif
568{ 568{
569#ifdef EXPORT_HCI_BRIDGE_INTERFACE 569#ifdef EXPORT_HCI_BRIDGE_INTERFACE
@@ -598,7 +598,7 @@ void ar6000_cleanup_hci(AR_SOFTC_T *ar)
598#ifdef EXPORT_HCI_BRIDGE_INTERFACE 598#ifdef EXPORT_HCI_BRIDGE_INTERFACE
599int hci_test_send(void *ar, struct sk_buff *skb) 599int hci_test_send(void *ar, struct sk_buff *skb)
600#else 600#else
601int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb) 601int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb)
602#endif 602#endif
603{ 603{
604 int status = 0; 604 int status = 0;
@@ -664,7 +664,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
664 return status; 664 return status;
665} 665}
666 666
667void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig) 667void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig)
668{ 668{
669 struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info; 669 struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info;
670 struct ar3k_config_info *config = (struct ar3k_config_info *)ar3kconfig; 670 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
1080#ifdef EXPORT_HCI_BRIDGE_INTERFACE 1080#ifdef EXPORT_HCI_BRIDGE_INTERFACE
1081int ar6000_setup_hci(void *ar) 1081int ar6000_setup_hci(void *ar)
1082#else 1082#else
1083int ar6000_setup_hci(AR_SOFTC_T *ar) 1083int ar6000_setup_hci(struct ar6_softc *ar)
1084#endif 1084#endif
1085{ 1085{
1086 return 0; 1086 return 0;
@@ -1089,14 +1089,14 @@ int ar6000_setup_hci(AR_SOFTC_T *ar)
1089#ifdef EXPORT_HCI_BRIDGE_INTERFACE 1089#ifdef EXPORT_HCI_BRIDGE_INTERFACE
1090void ar6000_cleanup_hci(void *ar) 1090void ar6000_cleanup_hci(void *ar)
1091#else 1091#else
1092void ar6000_cleanup_hci(AR_SOFTC_T *ar) 1092void ar6000_cleanup_hci(struct ar6_softc *ar)
1093#endif 1093#endif
1094{ 1094{
1095 return; 1095 return;
1096} 1096}
1097 1097
1098#ifndef EXPORT_HCI_BRIDGE_INTERFACE 1098#ifndef EXPORT_HCI_BRIDGE_INTERFACE
1099void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig) 1099void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig)
1100{ 1100{
1101 return; 1101 return;
1102} 1102}
@@ -1105,7 +1105,7 @@ void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
1105#ifdef EXPORT_HCI_BRIDGE_INTERFACE 1105#ifdef EXPORT_HCI_BRIDGE_INTERFACE
1106int hci_test_send(void *ar, struct sk_buff *skb) 1106int hci_test_send(void *ar, struct sk_buff *skb)
1107#else 1107#else
1108int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb) 1108int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb)
1109#endif 1109#endif
1110{ 1110{
1111 return -EOPNOTSUPP; 1111 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 8d8a964bac17..9b5c0a3970b6 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 {
466 bool read_buffer_available[HTC_RAW_STREAM_NUM_MAX]; 466 bool read_buffer_available[HTC_RAW_STREAM_NUM_MAX];
467} AR_RAW_HTC_T; 467} AR_RAW_HTC_T;
468 468
469typedef struct ar6_softc { 469struct ar6_softc {
470 struct net_device *arNetDev; /* net_device pointer */ 470 struct net_device *arNetDev; /* net_device pointer */
471 void *arWmi; 471 void *arWmi;
472 int arTxPending[ENDPOINT_MAX]; 472 int arTxPending[ENDPOINT_MAX];
@@ -622,12 +622,12 @@ typedef struct ar6_softc {
622#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT 622#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
623 void *arApDev; 623 void *arApDev;
624#endif 624#endif
625} AR_SOFTC_T; 625};
626 626
627#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT 627#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
628struct ar_virtual_interface { 628struct ar_virtual_interface {
629 struct net_device *arNetDev; /* net_device pointer */ 629 struct net_device *arNetDev; /* net_device pointer */
630 AR_SOFTC_T *arDev; /* ar device pointer */ 630 struct ar6_softc *arDev; /* ar device pointer */
631 struct net_device *arStaNetDev; /* net_device pointer */ 631 struct net_device *arStaNetDev; /* net_device pointer */
632}; 632};
633#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */ 633#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */
@@ -704,11 +704,11 @@ struct ar_giwscan_param {
704int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); 704int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
705int ar6000_ioctl_dispatcher(struct net_device *dev, struct ifreq *rq, int cmd); 705int ar6000_ioctl_dispatcher(struct net_device *dev, struct ifreq *rq, int cmd);
706void ar6000_gpio_init(void); 706void ar6000_gpio_init(void);
707void ar6000_init_profile_info(AR_SOFTC_T *ar); 707void ar6000_init_profile_info(struct ar6_softc *ar);
708void ar6000_install_static_wep_keys(AR_SOFTC_T *ar); 708void ar6000_install_static_wep_keys(struct ar6_softc *ar);
709int ar6000_init(struct net_device *dev); 709int ar6000_init(struct net_device *dev);
710int ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar); 710int ar6000_dbglog_get_debug_logs(struct ar6_softc *ar);
711void ar6000_TxDataCleanup(AR_SOFTC_T *ar); 711void ar6000_TxDataCleanup(struct ar6_softc *ar);
712int ar6000_acl_data_tx(struct sk_buff *skb, struct net_device *dev); 712int ar6000_acl_data_tx(struct sk_buff *skb, struct net_device *dev);
713void ar6000_restart_endpoint(struct net_device *dev); 713void ar6000_restart_endpoint(struct net_device *dev);
714void ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs); 714void 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
719#define __user 719#define __user
720#endif 720#endif
721 721
722int ar6000_htc_raw_open(AR_SOFTC_T *ar); 722int ar6000_htc_raw_open(struct ar6_softc *ar);
723int ar6000_htc_raw_close(AR_SOFTC_T *ar); 723int ar6000_htc_raw_close(struct ar6_softc *ar);
724ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, 724ssize_t ar6000_htc_raw_read(struct ar6_softc *ar,
725 HTC_RAW_STREAM_ID StreamID, 725 HTC_RAW_STREAM_ID StreamID,
726 char __user *buffer, size_t count); 726 char __user *buffer, size_t count);
727ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, 727ssize_t ar6000_htc_raw_write(struct ar6_softc *ar,
728 HTC_RAW_STREAM_ID StreamID, 728 HTC_RAW_STREAM_ID StreamID,
729 char __user *buffer, size_t count); 729 char __user *buffer, size_t count);
730 730
@@ -733,22 +733,22 @@ ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
733/* AP mode */ 733/* AP mode */
734/*TODO: These routines should be moved to a file that is common across OS */ 734/*TODO: These routines should be moved to a file that is common across OS */
735sta_t * 735sta_t *
736ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr); 736ieee80211_find_conn(struct ar6_softc *ar, u8 *node_addr);
737 737
738sta_t * 738sta_t *
739ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid); 739ieee80211_find_conn_for_aid(struct ar6_softc *ar, u8 aid);
740 740
741u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason); 741u8 remove_sta(struct ar6_softc *ar, u8 *mac, u16 reason);
742 742
743/* HCI support */ 743/* HCI support */
744 744
745#ifndef EXPORT_HCI_BRIDGE_INTERFACE 745#ifndef EXPORT_HCI_BRIDGE_INTERFACE
746int ar6000_setup_hci(AR_SOFTC_T *ar); 746int ar6000_setup_hci(struct ar6_softc *ar);
747void ar6000_cleanup_hci(AR_SOFTC_T *ar); 747void ar6000_cleanup_hci(struct ar6_softc *ar);
748void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig); 748void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig);
749 749
750/* HCI bridge testing */ 750/* HCI bridge testing */
751int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb); 751int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb);
752#endif 752#endif
753 753
754ATH_DEBUG_DECLARE_EXTERN(htc); 754ATH_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 c2e4fa2ef23b..1a6ae97c6b08 100644
--- a/drivers/staging/ath6kl/os/linux/include/cfg80211.h
+++ b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
@@ -25,21 +25,21 @@
25#define _AR6K_CFG80211_H_ 25#define _AR6K_CFG80211_H_
26 26
27struct wireless_dev *ar6k_cfg80211_init(struct device *dev); 27struct wireless_dev *ar6k_cfg80211_init(struct device *dev);
28void ar6k_cfg80211_deinit(AR_SOFTC_T *ar); 28void ar6k_cfg80211_deinit(struct ar6_softc *ar);
29 29
30void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status); 30void ar6k_cfg80211_scanComplete_event(struct ar6_softc *ar, int status);
31 31
32void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel, 32void ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel,
33 u8 *bssid, u16 listenInterval, 33 u8 *bssid, u16 listenInterval,
34 u16 beaconInterval,NETWORK_TYPE networkType, 34 u16 beaconInterval,NETWORK_TYPE networkType,
35 u8 beaconIeLen, u8 assocReqLen, 35 u8 beaconIeLen, u8 assocReqLen,
36 u8 assocRespLen, u8 *assocInfo); 36 u8 assocRespLen, u8 *assocInfo);
37 37
38void ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason, 38void ar6k_cfg80211_disconnect_event(struct ar6_softc *ar, u8 reason,
39 u8 *bssid, u8 assocRespLen, 39 u8 *bssid, u8 assocRespLen,
40 u8 *assocInfo, u16 protocolReasonStatus); 40 u8 *assocInfo, u16 protocolReasonStatus);
41 41
42void ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast); 42void ar6k_cfg80211_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast);
43 43
44#endif /* _AR6K_CFG80211_H_ */ 44#endif /* _AR6K_CFG80211_H_ */
45 45
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index 2c0d4fd3a517..c650faa28bbb 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -39,7 +39,7 @@ extern int loghci;
39static int 39static int
40ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq) 40ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq)
41{ 41{
42 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 42 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
43 43
44 if (ar->arWmiReady == false) { 44 if (ar->arWmiReady == false) {
45 return -EIO; 45 return -EIO;
@@ -55,7 +55,7 @@ ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq)
55static int 55static int
56ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq) 56ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq)
57{ 57{
58 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 58 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
59 59
60 if (ar->arWmiReady == false) { 60 if (ar->arWmiReady == false) {
61 return -EIO; 61 return -EIO;
@@ -74,7 +74,7 @@ ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq)
74static int 74static int
75ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata) 75ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata)
76{ 76{
77 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 77 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
78 WMI_SET_ROAM_CTRL_CMD cmd; 78 WMI_SET_ROAM_CTRL_CMD cmd;
79 u8 size = sizeof(cmd); 79 u8 size = sizeof(cmd);
80 80
@@ -107,7 +107,7 @@ ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata)
107static int 107static int
108ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata) 108ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata)
109{ 109{
110 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 110 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
111 WMI_POWERSAVE_TIMERS_POLICY_CMD cmd; 111 WMI_POWERSAVE_TIMERS_POLICY_CMD cmd;
112 u8 size = sizeof(cmd); 112 u8 size = sizeof(cmd);
113 113
@@ -133,7 +133,7 @@ ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata)
133static int 133static int
134ar6000_ioctl_set_qos_supp(struct net_device *dev, struct ifreq *rq) 134ar6000_ioctl_set_qos_supp(struct net_device *dev, struct ifreq *rq)
135{ 135{
136 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 136 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
137 WMI_SET_QOS_SUPP_CMD cmd; 137 WMI_SET_QOS_SUPP_CMD cmd;
138 int ret; 138 int ret;
139 139
@@ -168,7 +168,7 @@ ar6000_ioctl_set_qos_supp(struct net_device *dev, struct ifreq *rq)
168static int 168static int
169ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq) 169ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
170{ 170{
171 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 171 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
172 WMI_SET_WMM_CMD cmd; 172 WMI_SET_WMM_CMD cmd;
173 int ret; 173 int ret;
174 174
@@ -209,7 +209,7 @@ ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
209static int 209static int
210ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq) 210ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
211{ 211{
212 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 212 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
213 WMI_SET_WMM_TXOP_CMD cmd; 213 WMI_SET_WMM_TXOP_CMD cmd;
214 int ret; 214 int ret;
215 215
@@ -244,7 +244,7 @@ ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
244static int 244static int
245ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq) 245ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq)
246{ 246{
247 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 247 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
248 int ret = 0; 248 int ret = 0;
249 249
250 if ((dev->flags & IFF_UP) != IFF_UP || ar->arWmiReady == false) { 250 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)
261static int 261static int
262ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq) 262ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq)
263{ 263{
264 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 264 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
265 WMI_AP_SET_COUNTRY_CMD cmd; 265 WMI_AP_SET_COUNTRY_CMD cmd;
266 int ret; 266 int ret;
267 267
@@ -301,7 +301,7 @@ ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq)
301static int 301static int
302ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq) 302ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq)
303{ 303{
304 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 304 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
305 WMI_POWER_MODE_CMD power_mode; 305 WMI_POWER_MODE_CMD power_mode;
306 int ret = 0; 306 int ret = 0;
307 307
@@ -321,7 +321,7 @@ ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq)
321static int 321static int
322ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq) 322ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq)
323{ 323{
324 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 324 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
325 WMI_CHANNEL_PARAMS_CMD cmd, *cmdp; 325 WMI_CHANNEL_PARAMS_CMD cmd, *cmdp;
326 int ret = 0; 326 int ret = 0;
327 327
@@ -382,7 +382,7 @@ static int
382ar6000_ioctl_set_snr_threshold(struct net_device *dev, struct ifreq *rq) 382ar6000_ioctl_set_snr_threshold(struct net_device *dev, struct ifreq *rq)
383{ 383{
384 384
385 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 385 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
386 WMI_SNR_THRESHOLD_PARAMS_CMD cmd; 386 WMI_SNR_THRESHOLD_PARAMS_CMD cmd;
387 int ret = 0; 387 int ret = 0;
388 388
@@ -414,7 +414,7 @@ ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
414 thold2.rssi = tmpThold.rssi; \ 414 thold2.rssi = tmpThold.rssi; \
415} while (0) 415} while (0)
416 416
417 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 417 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
418 WMI_RSSI_THRESHOLD_PARAMS_CMD cmd; 418 WMI_RSSI_THRESHOLD_PARAMS_CMD cmd;
419 USER_RSSI_PARAMS rssiParams; 419 USER_RSSI_PARAMS rssiParams;
420 s32 i, j; 420 s32 i, j;
@@ -491,7 +491,7 @@ static int
491ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq) 491ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq)
492{ 492{
493 493
494 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 494 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
495 WMI_LQ_THRESHOLD_PARAMS_CMD cmd; 495 WMI_LQ_THRESHOLD_PARAMS_CMD cmd;
496 int ret = 0; 496 int ret = 0;
497 497
@@ -514,7 +514,7 @@ ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq)
514static int 514static int
515ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq) 515ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq)
516{ 516{
517 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 517 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
518 WMI_PROBED_SSID_CMD cmd; 518 WMI_PROBED_SSID_CMD cmd;
519 int ret = 0; 519 int ret = 0;
520 520
@@ -538,7 +538,7 @@ ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq)
538static int 538static int
539ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq) 539ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
540{ 540{
541 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 541 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
542 WMI_ADD_BAD_AP_CMD cmd; 542 WMI_ADD_BAD_AP_CMD cmd;
543 int ret = 0; 543 int ret = 0;
544 544
@@ -574,7 +574,7 @@ ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
574static int 574static int
575ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq) 575ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
576{ 576{
577 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 577 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
578 WMI_CREATE_PSTREAM_CMD cmd; 578 WMI_CREATE_PSTREAM_CMD cmd;
579 int ret; 579 int ret;
580 580
@@ -607,7 +607,7 @@ ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
607static int 607static int
608ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq) 608ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq)
609{ 609{
610 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 610 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
611 WMI_DELETE_PSTREAM_CMD cmd; 611 WMI_DELETE_PSTREAM_CMD cmd;
612 int ret = 0; 612 int ret = 0;
613 613
@@ -637,7 +637,7 @@ ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq)
637static int 637static int
638ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq) 638ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq)
639{ 639{
640 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 640 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
641 struct ar6000_queuereq qreq; 641 struct ar6000_queuereq qreq;
642 int ret = 0; 642 int ret = 0;
643 643
@@ -665,7 +665,7 @@ static int
665ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev, 665ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
666 struct ifreq *rq, u8 *data, u32 len) 666 struct ifreq *rq, u8 *data, u32 len)
667{ 667{
668 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 668 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
669 u32 buf[4+TCMD_MAX_RATES]; 669 u32 buf[4+TCMD_MAX_RATES];
670 int ret = 0; 670 int ret = 0;
671 671
@@ -717,7 +717,7 @@ ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
717void 717void
718ar6000_tcmd_rx_report_event(void *devt, u8 *results, int len) 718ar6000_tcmd_rx_report_event(void *devt, u8 *results, int len)
719{ 719{
720 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 720 struct ar6_softc *ar = (struct ar6_softc *)devt;
721 TCMD_CONT_RX * rx_rep = (TCMD_CONT_RX *)results; 721 TCMD_CONT_RX * rx_rep = (TCMD_CONT_RX *)results;
722 722
723 if (enablerssicompensation) { 723 if (enablerssicompensation) {
@@ -742,7 +742,7 @@ ar6000_tcmd_rx_report_event(void *devt, u8 *results, int len)
742static int 742static int
743ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq) 743ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq)
744{ 744{
745 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 745 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
746 WMI_TARGET_ERROR_REPORT_BITMASK cmd; 746 WMI_TARGET_ERROR_REPORT_BITMASK cmd;
747 int ret = 0; 747 int ret = 0;
748 748
@@ -762,7 +762,7 @@ ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq)
762static int 762static int
763ar6000_clear_target_stats(struct net_device *dev) 763ar6000_clear_target_stats(struct net_device *dev)
764{ 764{
765 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 765 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
766 TARGET_STATS *pStats = &ar->arTargetStats; 766 TARGET_STATS *pStats = &ar->arTargetStats;
767 int ret = 0; 767 int ret = 0;
768 768
@@ -778,7 +778,7 @@ ar6000_clear_target_stats(struct net_device *dev)
778static int 778static int
779ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq) 779ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq)
780{ 780{
781 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 781 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
782 TARGET_STATS_CMD cmd; 782 TARGET_STATS_CMD cmd;
783 TARGET_STATS *pStats = &ar->arTargetStats; 783 TARGET_STATS *pStats = &ar->arTargetStats;
784 int ret = 0; 784 int ret = 0;
@@ -829,7 +829,7 @@ ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq)
829static int 829static int
830ar6000_ioctl_get_ap_stats(struct net_device *dev, struct ifreq *rq) 830ar6000_ioctl_get_ap_stats(struct net_device *dev, struct ifreq *rq)
831{ 831{
832 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 832 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
833 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 */ 833 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 */
834 WMI_AP_MODE_STAT *pStats = &ar->arAPStats; 834 WMI_AP_MODE_STAT *pStats = &ar->arAPStats;
835 int ret = 0; 835 int ret = 0;
@@ -888,7 +888,7 @@ ar6000_ioctl_get_ap_stats(struct net_device *dev, struct ifreq *rq)
888static int 888static int
889ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq) 889ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq)
890{ 890{
891 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 891 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
892 WMI_SET_ACCESS_PARAMS_CMD cmd; 892 WMI_SET_ACCESS_PARAMS_CMD cmd;
893 int ret = 0; 893 int ret = 0;
894 894
@@ -914,7 +914,7 @@ ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq)
914static int 914static int
915ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq) 915ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
916{ 916{
917 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 917 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
918 WMI_DISC_TIMEOUT_CMD cmd; 918 WMI_DISC_TIMEOUT_CMD cmd;
919 int ret = 0; 919 int ret = 0;
920 920
@@ -939,7 +939,7 @@ ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
939static int 939static int
940ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata) 940ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata)
941{ 941{
942 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 942 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
943 WMI_SET_VOICE_PKT_SIZE_CMD cmd; 943 WMI_SET_VOICE_PKT_SIZE_CMD cmd;
944 int ret = 0; 944 int ret = 0;
945 945
@@ -965,7 +965,7 @@ ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata)
965static int 965static int
966ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata) 966ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata)
967{ 967{
968 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 968 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
969 WMI_SET_MAX_SP_LEN_CMD cmd; 969 WMI_SET_MAX_SP_LEN_CMD cmd;
970 int ret = 0; 970 int ret = 0;
971 971
@@ -991,7 +991,7 @@ ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata)
991static int 991static int
992ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata) 992ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata)
993{ 993{
994 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 994 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
995 WMI_SET_BT_STATUS_CMD cmd; 995 WMI_SET_BT_STATUS_CMD cmd;
996 int ret = 0; 996 int ret = 0;
997 997
@@ -1016,7 +1016,7 @@ ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata)
1016static int 1016static int
1017ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata) 1017ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata)
1018{ 1018{
1019 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1019 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1020 WMI_SET_BT_PARAMS_CMD cmd; 1020 WMI_SET_BT_PARAMS_CMD cmd;
1021 int ret = 0; 1021 int ret = 0;
1022 1022
@@ -1041,7 +1041,7 @@ ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata)
1041static int 1041static int
1042ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata) 1042ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata)
1043{ 1043{
1044 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1044 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1045 WMI_SET_BTCOEX_FE_ANT_CMD cmd; 1045 WMI_SET_BTCOEX_FE_ANT_CMD cmd;
1046 int ret = 0; 1046 int ret = 0;
1047 1047
@@ -1065,7 +1065,7 @@ ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata)
1065static int 1065static int
1066ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *userdata) 1066ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *userdata)
1067{ 1067{
1068 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1068 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1069 WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD cmd; 1069 WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD cmd;
1070 int ret = 0; 1070 int ret = 0;
1071 1071
@@ -1090,7 +1090,7 @@ ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *use
1090static int 1090static int
1091ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, char *userdata) 1091ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, char *userdata)
1092{ 1092{
1093 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1093 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1094 WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD cmd; 1094 WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD cmd;
1095 int ret = 0; 1095 int ret = 0;
1096 1096
@@ -1115,7 +1115,7 @@ ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, cha
1115static int 1115static int
1116ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char *userdata) 1116ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char *userdata)
1117{ 1117{
1118 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1118 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1119 WMI_SET_BTCOEX_SCO_CONFIG_CMD cmd; 1119 WMI_SET_BTCOEX_SCO_CONFIG_CMD cmd;
1120 int ret = 0; 1120 int ret = 0;
1121 1121
@@ -1141,7 +1141,7 @@ static int
1141ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev, 1141ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
1142 char *userdata) 1142 char *userdata)
1143{ 1143{
1144 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1144 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1145 WMI_SET_BTCOEX_A2DP_CONFIG_CMD cmd; 1145 WMI_SET_BTCOEX_A2DP_CONFIG_CMD cmd;
1146 int ret = 0; 1146 int ret = 0;
1147 1147
@@ -1166,7 +1166,7 @@ ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
1166static int 1166static int
1167ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userdata) 1167ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userdata)
1168{ 1168{
1169 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1169 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1170 WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD cmd; 1170 WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD cmd;
1171 int ret = 0; 1171 int ret = 0;
1172 1172
@@ -1191,7 +1191,7 @@ ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userd
1191static int 1191static int
1192ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata) 1192ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata)
1193{ 1193{
1194 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1194 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1195 WMI_SET_BTCOEX_DEBUG_CMD cmd; 1195 WMI_SET_BTCOEX_DEBUG_CMD cmd;
1196 int ret = 0; 1196 int ret = 0;
1197 1197
@@ -1216,7 +1216,7 @@ ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata)
1216static int 1216static int
1217ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char *userdata) 1217ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char *userdata)
1218{ 1218{
1219 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1219 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1220 WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD cmd; 1220 WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD cmd;
1221 int ret = 0; 1221 int ret = 0;
1222 1222
@@ -1242,7 +1242,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char *userdata,
1242 struct ifreq *rq) 1242 struct ifreq *rq)
1243{ 1243{
1244 1244
1245 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1245 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1246 AR6000_BTCOEX_CONFIG btcoexConfig; 1246 AR6000_BTCOEX_CONFIG btcoexConfig;
1247 WMI_BTCOEX_CONFIG_EVENT *pbtcoexConfigEv = &ar->arBtcoexConfig; 1247 WMI_BTCOEX_CONFIG_EVENT *pbtcoexConfigEv = &ar->arBtcoexConfig;
1248 1248
@@ -1285,7 +1285,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char *userdata,
1285static int 1285static int
1286ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, struct ifreq *rq) 1286ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, struct ifreq *rq)
1287{ 1287{
1288 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1288 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1289 AR6000_BTCOEX_STATS btcoexStats; 1289 AR6000_BTCOEX_STATS btcoexStats;
1290 WMI_BTCOEX_STATS_EVENT *pbtcoexStats = &ar->arBtcoexStats; 1290 WMI_BTCOEX_STATS_EVENT *pbtcoexStats = &ar->arBtcoexStats;
1291 int ret = 0; 1291 int ret = 0;
@@ -1332,7 +1332,7 @@ ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, stru
1332static int 1332static int
1333ar6000_xioctl_set_excess_tx_retry_thres_cmd(struct net_device * dev, char * userdata) 1333ar6000_xioctl_set_excess_tx_retry_thres_cmd(struct net_device * dev, char * userdata)
1334{ 1334{
1335 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1335 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1336 WMI_SET_EXCESS_TX_RETRY_THRES_CMD cmd; 1336 WMI_SET_EXCESS_TX_RETRY_THRES_CMD cmd;
1337 int ret = 0; 1337 int ret = 0;
1338 1338
@@ -1414,7 +1414,7 @@ ar6000_gpio_output_set(struct net_device *dev,
1414 u32 enable_mask, 1414 u32 enable_mask,
1415 u32 disable_mask) 1415 u32 disable_mask)
1416{ 1416{
1417 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1417 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1418 1418
1419 gpio_ack_received = false; 1419 gpio_ack_received = false;
1420 return wmi_gpio_output_set(ar->arWmi, 1420 return wmi_gpio_output_set(ar->arWmi,
@@ -1424,7 +1424,7 @@ ar6000_gpio_output_set(struct net_device *dev,
1424static int 1424static int
1425ar6000_gpio_input_get(struct net_device *dev) 1425ar6000_gpio_input_get(struct net_device *dev)
1426{ 1426{
1427 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1427 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1428 1428
1429 *((volatile bool *)&gpio_data_available) = false; 1429 *((volatile bool *)&gpio_data_available) = false;
1430 return wmi_gpio_input_get(ar->arWmi); 1430 return wmi_gpio_input_get(ar->arWmi);
@@ -1435,7 +1435,7 @@ ar6000_gpio_register_set(struct net_device *dev,
1435 u32 gpioreg_id, 1435 u32 gpioreg_id,
1436 u32 value) 1436 u32 value)
1437{ 1437{
1438 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1438 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1439 1439
1440 gpio_ack_received = false; 1440 gpio_ack_received = false;
1441 return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value); 1441 return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value);
@@ -1445,7 +1445,7 @@ static int
1445ar6000_gpio_register_get(struct net_device *dev, 1445ar6000_gpio_register_get(struct net_device *dev,
1446 u32 gpioreg_id) 1446 u32 gpioreg_id)
1447{ 1447{
1448 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1448 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1449 1449
1450 *((volatile bool *)&gpio_data_available) = false; 1450 *((volatile bool *)&gpio_data_available) = false;
1451 return wmi_gpio_register_get(ar->arWmi, gpioreg_id); 1451 return wmi_gpio_register_get(ar->arWmi, gpioreg_id);
@@ -1455,7 +1455,7 @@ static int
1455ar6000_gpio_intr_ack(struct net_device *dev, 1455ar6000_gpio_intr_ack(struct net_device *dev,
1456 u32 ack_mask) 1456 u32 ack_mask)
1457{ 1457{
1458 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1458 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1459 1459
1460 gpio_intr_available = false; 1460 gpio_intr_available = false;
1461 return wmi_gpio_intr_ack(ar->arWmi, ack_mask); 1461 return wmi_gpio_intr_ack(ar->arWmi, ack_mask);
@@ -1469,7 +1469,7 @@ static bool prof_count_available; /* Requested GPIO data available */
1469static int 1469static int
1470prof_count_get(struct net_device *dev) 1470prof_count_get(struct net_device *dev)
1471{ 1471{
1472 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1472 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1473 1473
1474 *((volatile bool *)&prof_count_available) = false; 1474 *((volatile bool *)&prof_count_available) = false;
1475 return wmi_prof_count_get_cmd(ar->arWmi); 1475 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
1541 1541
1542 1542
1543int 1543int
1544ar6000_ioctl_ap_setparam(AR_SOFTC_T *ar, int param, int value) 1544ar6000_ioctl_ap_setparam(struct ar6_softc *ar, int param, int value)
1545{ 1545{
1546 int ret=0; 1546 int ret=0;
1547 1547
@@ -1621,7 +1621,7 @@ ar6000_ioctl_ap_setparam(AR_SOFTC_T *ar, int param, int value)
1621} 1621}
1622 1622
1623int 1623int
1624ar6000_ioctl_setparam(AR_SOFTC_T *ar, int param, int value) 1624ar6000_ioctl_setparam(struct ar6_softc *ar, int param, int value)
1625{ 1625{
1626 bool profChanged = false; 1626 bool profChanged = false;
1627 int ret=0; 1627 int ret=0;
@@ -1757,7 +1757,7 @@ ar6000_ioctl_setparam(AR_SOFTC_T *ar, int param, int value)
1757} 1757}
1758 1758
1759int 1759int
1760ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik) 1760ar6000_ioctl_setkey(struct ar6_softc *ar, struct ieee80211req_key *ik)
1761{ 1761{
1762 KEY_USAGE keyUsage; 1762 KEY_USAGE keyUsage;
1763 int status; 1763 int status;
@@ -1864,7 +1864,7 @@ ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik)
1864 1864
1865int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 1865int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1866{ 1866{
1867 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1867 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1868 HIF_DEVICE *hifDevice = ar->arHifDevice; 1868 HIF_DEVICE *hifDevice = ar->arHifDevice;
1869 int ret = 0, param; 1869 int ret = 0, param;
1870 unsigned int address = 0; 1870 unsigned int address = 0;
@@ -3141,7 +3141,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
3141 case AR6000_XIOCTL_SET_OPT_MODE: 3141 case AR6000_XIOCTL_SET_OPT_MODE:
3142 { 3142 {
3143 WMI_SET_OPT_MODE_CMD optModeCmd; 3143 WMI_SET_OPT_MODE_CMD optModeCmd;
3144 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 3144 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
3145 3145
3146 if (ar->arWmiReady == false) { 3146 if (ar->arWmiReady == false) {
3147 ret = -EIO; 3147 ret = -EIO;
@@ -3242,7 +3242,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
3242 } 3242 }
3243 case IEEE80211_IOCTL_SETAUTHALG: 3243 case IEEE80211_IOCTL_SETAUTHALG:
3244 { 3244 {
3245 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 3245 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
3246 struct ieee80211req_authalg req; 3246 struct ieee80211req_authalg req;
3247 3247
3248 if (ar->arWmiReady == false) { 3248 if (ar->arWmiReady == false) {
@@ -3417,7 +3417,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
3417 case AR6000_XIOCTL_WMI_GETFIXRATES: 3417 case AR6000_XIOCTL_WMI_GETFIXRATES:
3418 { 3418 {
3419 WMI_FIX_RATES_CMD getFixRatesCmd; 3419 WMI_FIX_RATES_CMD getFixRatesCmd;
3420 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 3420 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
3421 int ret = 0; 3421 int ret = 0;
3422 3422
3423 if (ar->bIsDestroyProgress) { 3423 if (ar->bIsDestroyProgress) {
@@ -3627,7 +3627,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
3627 } 3627 }
3628 case AR6000_XIOCTL_WMI_GET_KEEPALIVE: 3628 case AR6000_XIOCTL_WMI_GET_KEEPALIVE:
3629 { 3629 {
3630 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 3630 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
3631 WMI_GET_KEEPALIVE_CMD getKeepAlive; 3631 WMI_GET_KEEPALIVE_CMD getKeepAlive;
3632 int ret = 0; 3632 int ret = 0;
3633 if (ar->bIsDestroyProgress) { 3633 if (ar->bIsDestroyProgress) {
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c
index 824f1be9883f..4b779434956f 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,
416 struct iw_request_info *info, 416 struct iw_request_info *info,
417 struct iw_point *data, char *extra) 417 struct iw_point *data, char *extra)
418{ 418{
419 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 419 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
420 struct ar_giwscan_param param; 420 struct ar_giwscan_param param;
421 421
422 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 422 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -461,7 +461,7 @@ ar6000_ioctl_siwessid(struct net_device *dev,
461 struct iw_request_info *info, 461 struct iw_request_info *info,
462 struct iw_point *data, char *ssid) 462 struct iw_point *data, char *ssid)
463{ 463{
464 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 464 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
465 int status; 465 int status;
466 u8 arNetworkType; 466 u8 arNetworkType;
467 u8 prevMode = ar->arNetworkType; 467 u8 prevMode = ar->arNetworkType;
@@ -658,7 +658,7 @@ ar6000_ioctl_giwessid(struct net_device *dev,
658 struct iw_request_info *info, 658 struct iw_request_info *info,
659 struct iw_point *data, char *essid) 659 struct iw_point *data, char *essid)
660{ 660{
661 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 661 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
662 662
663 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 663 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
664 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 664 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,
681} 681}
682 682
683 683
684void ar6000_install_static_wep_keys(AR_SOFTC_T *ar) 684void ar6000_install_static_wep_keys(struct ar6_softc *ar)
685{ 685{
686 u8 index; 686 u8 index;
687 u8 keyUsage; 687 u8 keyUsage;
@@ -712,7 +712,7 @@ ar6000_ioctl_siwrate(struct net_device *dev,
712 struct iw_request_info *info, 712 struct iw_request_info *info,
713 struct iw_param *rrq, char *extra) 713 struct iw_param *rrq, char *extra)
714{ 714{
715 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 715 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
716 u32 kbps; 716 u32 kbps;
717 s8 rate_idx; 717 s8 rate_idx;
718 718
@@ -749,7 +749,7 @@ ar6000_ioctl_giwrate(struct net_device *dev,
749 struct iw_request_info *info, 749 struct iw_request_info *info,
750 struct iw_param *rrq, char *extra) 750 struct iw_param *rrq, char *extra)
751{ 751{
752 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 752 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
753 int ret = 0; 753 int ret = 0;
754 754
755 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 755 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -812,7 +812,7 @@ ar6000_ioctl_siwtxpow(struct net_device *dev,
812 struct iw_request_info *info, 812 struct iw_request_info *info,
813 struct iw_param *rrq, char *extra) 813 struct iw_param *rrq, char *extra)
814{ 814{
815 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 815 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
816 u8 dbM; 816 u8 dbM;
817 817
818 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 818 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -854,7 +854,7 @@ ar6000_ioctl_giwtxpow(struct net_device *dev,
854 struct iw_request_info *info, 854 struct iw_request_info *info,
855 struct iw_param *rrq, char *extra) 855 struct iw_param *rrq, char *extra)
856{ 856{
857 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 857 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
858 int ret = 0; 858 int ret = 0;
859 859
860 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 860 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -924,7 +924,7 @@ ar6000_ioctl_siwretry(struct net_device *dev,
924 struct iw_request_info *info, 924 struct iw_request_info *info,
925 struct iw_param *rrq, char *extra) 925 struct iw_param *rrq, char *extra)
926{ 926{
927 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 927 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
928 928
929 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 929 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
930 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 930 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,
965 struct iw_request_info *info, 965 struct iw_request_info *info,
966 struct iw_param *rrq, char *extra) 966 struct iw_param *rrq, char *extra)
967{ 967{
968 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 968 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
969 969
970 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 970 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
971 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 971 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,
1006 struct iw_request_info *info, 1006 struct iw_request_info *info,
1007 struct iw_point *erq, char *keybuf) 1007 struct iw_point *erq, char *keybuf)
1008{ 1008{
1009 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1009 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1010 int index; 1010 int index;
1011 s32 auth = 0; 1011 s32 auth = 0;
1012 1012
@@ -1122,7 +1122,7 @@ ar6000_ioctl_giwencode(struct net_device *dev,
1122 struct iw_request_info *info, 1122 struct iw_request_info *info,
1123 struct iw_point *erq, char *key) 1123 struct iw_point *erq, char *key)
1124{ 1124{
1125 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1125 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1126 u8 keyIndex; 1126 u8 keyIndex;
1127 struct ar_wep_key *wk; 1127 struct ar_wep_key *wk;
1128 1128
@@ -1192,7 +1192,7 @@ ar6000_ioctl_siwgenie(struct net_device *dev,
1192 struct iw_request_info *info, 1192 struct iw_request_info *info,
1193 struct iw_point *erq, char *extra) 1193 struct iw_point *erq, char *extra)
1194{ 1194{
1195 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1195 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1196 1196
1197#ifdef WAPI_ENABLE 1197#ifdef WAPI_ENABLE
1198 u8 *ie = erq->pointer; 1198 u8 *ie = erq->pointer;
@@ -1228,7 +1228,7 @@ ar6000_ioctl_giwgenie(struct net_device *dev,
1228 struct iw_request_info *info, 1228 struct iw_request_info *info,
1229 struct iw_point *erq, char *extra) 1229 struct iw_point *erq, char *extra)
1230{ 1230{
1231 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1231 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1232 1232
1233 if (ar->arWmiReady == false) { 1233 if (ar->arWmiReady == false) {
1234 return -EIO; 1234 return -EIO;
@@ -1247,7 +1247,7 @@ ar6000_ioctl_siwauth(struct net_device *dev,
1247 struct iw_request_info *info, 1247 struct iw_request_info *info,
1248 struct iw_param *data, char *extra) 1248 struct iw_param *data, char *extra)
1249{ 1249{
1250 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1250 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1251 1251
1252 bool profChanged; 1252 bool profChanged;
1253 u16 param; 1253 u16 param;
@@ -1418,7 +1418,7 @@ ar6000_ioctl_giwauth(struct net_device *dev,
1418 struct iw_request_info *info, 1418 struct iw_request_info *info,
1419 struct iw_param *data, char *extra) 1419 struct iw_param *data, char *extra)
1420{ 1420{
1421 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1421 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1422 u16 param; 1422 u16 param;
1423 s32 ret; 1423 s32 ret;
1424 1424
@@ -1546,7 +1546,7 @@ ar6000_ioctl_siwpmksa(struct net_device *dev,
1546 struct iw_request_info *info, 1546 struct iw_request_info *info,
1547 struct iw_point *data, char *extra) 1547 struct iw_point *data, char *extra)
1548{ 1548{
1549 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1549 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1550 s32 ret; 1550 s32 ret;
1551 int status; 1551 int status;
1552 struct iw_pmksa *pmksa; 1552 struct iw_pmksa *pmksa;
@@ -1591,7 +1591,7 @@ static int ar6000_set_wapi_key(struct net_device *dev,
1591 struct iw_request_info *info, 1591 struct iw_request_info *info,
1592 struct iw_point *erq, char *extra) 1592 struct iw_point *erq, char *extra)
1593{ 1593{
1594 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1594 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1595 struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; 1595 struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
1596 KEY_USAGE keyUsage = 0; 1596 KEY_USAGE keyUsage = 0;
1597 s32 keyLen; 1597 s32 keyLen;
@@ -1653,7 +1653,7 @@ ar6000_ioctl_siwencodeext(struct net_device *dev,
1653 struct iw_request_info *info, 1653 struct iw_request_info *info,
1654 struct iw_point *erq, char *extra) 1654 struct iw_point *erq, char *extra)
1655{ 1655{
1656 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1656 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1657 s32 index; 1657 s32 index;
1658 struct iw_encode_ext *ext; 1658 struct iw_encode_ext *ext;
1659 KEY_USAGE keyUsage; 1659 KEY_USAGE keyUsage;
@@ -1827,7 +1827,7 @@ ar6000_ioctl_giwencodeext(struct net_device *dev,
1827 struct iw_request_info *info, 1827 struct iw_request_info *info,
1828 struct iw_point *erq, char *extra) 1828 struct iw_point *erq, char *extra)
1829{ 1829{
1830 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1830 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1831 1831
1832 if (ar->arWlanState == WLAN_DISABLED) { 1832 if (ar->arWlanState == WLAN_DISABLED) {
1833 return -EIO; 1833 return -EIO;
@@ -1850,7 +1850,7 @@ static int ar6000_ioctl_siwpower(struct net_device *dev,
1850 union iwreq_data *wrqu, char *extra) 1850 union iwreq_data *wrqu, char *extra)
1851{ 1851{
1852#ifndef ATH6K_CONFIG_OTA_MODE 1852#ifndef ATH6K_CONFIG_OTA_MODE
1853 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1853 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1854 WMI_POWER_MODE power_mode; 1854 WMI_POWER_MODE power_mode;
1855 1855
1856 if (ar->arWmiReady == false) { 1856 if (ar->arWmiReady == false) {
@@ -1876,7 +1876,7 @@ static int ar6000_ioctl_giwpower(struct net_device *dev,
1876 struct iw_request_info *info, 1876 struct iw_request_info *info,
1877 union iwreq_data *wrqu, char *extra) 1877 union iwreq_data *wrqu, char *extra)
1878{ 1878{
1879 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1879 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1880 WMI_POWER_MODE power_mode; 1880 WMI_POWER_MODE power_mode;
1881 1881
1882 if (ar->arWmiReady == false) { 1882 if (ar->arWmiReady == false) {
@@ -1907,7 +1907,7 @@ ar6000_ioctl_giwname(struct net_device *dev,
1907 char *name, char *extra) 1907 char *name, char *extra)
1908{ 1908{
1909 u8 capability; 1909 u8 capability;
1910 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1910 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1911 1911
1912 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 1912 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
1913 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 1913 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,
1961 struct iw_request_info *info, 1961 struct iw_request_info *info,
1962 struct iw_freq *freq, char *extra) 1962 struct iw_freq *freq, char *extra)
1963{ 1963{
1964 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1964 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
1965 1965
1966 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 1966 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
1967 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 1967 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,
2006 struct iw_request_info *info, 2006 struct iw_request_info *info,
2007 struct iw_freq *freq, char *extra) 2007 struct iw_freq *freq, char *extra)
2008{ 2008{
2009 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2009 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2010 2010
2011 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2011 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
2012 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 2012 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,
2046 struct iw_request_info *info, 2046 struct iw_request_info *info,
2047 __u32 *mode, char *extra) 2047 __u32 *mode, char *extra)
2048{ 2048{
2049 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2049 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2050 2050
2051 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2051 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
2052 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 2052 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,
2117 struct iw_request_info *info, 2117 struct iw_request_info *info,
2118 __u32 *mode, char *extra) 2118 __u32 *mode, char *extra)
2119{ 2119{
2120 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2120 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2121 2121
2122 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2122 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
2123 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 2123 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,
2177 struct iw_request_info *info, 2177 struct iw_request_info *info,
2178 struct iw_point *data, char *extra) 2178 struct iw_point *data, char *extra)
2179{ 2179{
2180 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2180 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2181 struct iw_range *range = (struct iw_range *) extra; 2181 struct iw_range *range = (struct iw_range *) extra;
2182 int i, ret = 0; 2182 int i, ret = 0;
2183 2183
@@ -2300,7 +2300,7 @@ ar6000_ioctl_siwap(struct net_device *dev,
2300 struct iw_request_info *info, 2300 struct iw_request_info *info,
2301 struct sockaddr *ap_addr, char *extra) 2301 struct sockaddr *ap_addr, char *extra)
2302{ 2302{
2303 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2303 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2304 2304
2305 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2305 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
2306 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 2306 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,
2332 struct iw_request_info *info, 2332 struct iw_request_info *info,
2333 struct sockaddr *ap_addr, char *extra) 2333 struct sockaddr *ap_addr, char *extra)
2334{ 2334{
2335 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2335 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2336 2336
2337 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2337 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
2338 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 2338 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,
2368 struct iw_request_info *info, 2368 struct iw_request_info *info,
2369 struct iw_point *data, char *extra) 2369 struct iw_point *data, char *extra)
2370{ 2370{
2371 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2371 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2372 2372
2373 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2373 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
2374 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 2374 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,
2460#define ACT_DWELLTIME_DEFAULT 105 2460#define ACT_DWELLTIME_DEFAULT 105
2461#define HOME_TXDRAIN_TIME 100 2461#define HOME_TXDRAIN_TIME 100
2462#define SCAN_INT HOME_TXDRAIN_TIME + ACT_DWELLTIME_DEFAULT 2462#define SCAN_INT HOME_TXDRAIN_TIME + ACT_DWELLTIME_DEFAULT
2463 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2463 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2464 int ret = 0; 2464 int ret = 0;
2465 2465
2466 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2466 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
@@ -2588,7 +2588,7 @@ ar6000_ioctl_siwcommit(struct net_device *dev,
2588 struct iw_request_info *info, 2588 struct iw_request_info *info,
2589 struct iw_point *data, char *extra) 2589 struct iw_point *data, char *extra)
2590{ 2590{
2591 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 2591 struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
2592 2592
2593 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) { 2593 if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != 0) {
2594 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); 2594 A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd);
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-13 07:29:15 -0500