diff options
author | Joe Perches <joe@perches.com> | 2011-02-02 17:05:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 17:34:51 -0500 |
commit | f68057e6fab6943ea2c5867d8b72e4b08bef5f6e (patch) | |
tree | fbac4cd9aa9a4b9c04d3fd35209b524d5b07bd65 /drivers/staging/ath6kl | |
parent | cb1e370987c3651707e30e404e41ebdc83571fba (diff) |
staging: ath6kl: Convert A_INT32 to s32
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl')
-rw-r--r-- | drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 10 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/htc.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/common/testcmd.h | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/common/wmi.h | 12 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/common_drv.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/wmi_api.h | 6 | ||||
-rw-r--r-- | drivers/staging/ath6kl/miscdrv/common_drv.c | 14 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 15 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | 8 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/athdrv_linux.h | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/osapi_linux.h | 20 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ioctl.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/netbuf.c | 21 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/wireless_ext.c | 22 | ||||
-rw-r--r-- | drivers/staging/ath6kl/wmi/wmi.c | 39 |
16 files changed, 91 insertions, 94 deletions
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c index ba4399fb1dd..57cb1f70dcf 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | |||
@@ -465,10 +465,10 @@ static int async_task(void *param) | |||
465 | return 0; | 465 | return 0; |
466 | } | 466 | } |
467 | 467 | ||
468 | static A_INT32 IssueSDCommand(HIF_DEVICE *device, u32 opcode, u32 arg, u32 flags, u32 *resp) | 468 | static s32 IssueSDCommand(HIF_DEVICE *device, u32 opcode, u32 arg, u32 flags, u32 *resp) |
469 | { | 469 | { |
470 | struct mmc_command cmd; | 470 | struct mmc_command cmd; |
471 | A_INT32 err; | 471 | s32 err; |
472 | struct mmc_host *host; | 472 | struct mmc_host *host; |
473 | struct sdio_func *func; | 473 | struct sdio_func *func; |
474 | 474 | ||
@@ -490,7 +490,7 @@ static A_INT32 IssueSDCommand(HIF_DEVICE *device, u32 opcode, u32 arg, u32 flags | |||
490 | 490 | ||
491 | int ReinitSDIO(HIF_DEVICE *device) | 491 | int ReinitSDIO(HIF_DEVICE *device) |
492 | { | 492 | { |
493 | A_INT32 err; | 493 | s32 err; |
494 | struct mmc_host *host; | 494 | struct mmc_host *host; |
495 | struct mmc_card *card; | 495 | struct mmc_card *card; |
496 | struct sdio_func *func; | 496 | struct sdio_func *func; |
@@ -1153,7 +1153,7 @@ static void hifDeviceRemoved(struct sdio_func *func) | |||
1153 | */ | 1153 | */ |
1154 | int hifWaitForPendingRecv(HIF_DEVICE *device) | 1154 | int hifWaitForPendingRecv(HIF_DEVICE *device) |
1155 | { | 1155 | { |
1156 | A_INT32 cnt = 10; | 1156 | s32 cnt = 10; |
1157 | u8 host_int_status; | 1157 | u8 host_int_status; |
1158 | int status = A_OK; | 1158 | int status = A_OK; |
1159 | 1159 | ||
@@ -1280,7 +1280,7 @@ static int Func0_CMD52ReadByte(struct mmc_card *card, unsigned int address, unsi | |||
1280 | { | 1280 | { |
1281 | struct mmc_command ioCmd; | 1281 | struct mmc_command ioCmd; |
1282 | unsigned long arg; | 1282 | unsigned long arg; |
1283 | A_INT32 err; | 1283 | s32 err; |
1284 | 1284 | ||
1285 | memset(&ioCmd,0,sizeof(ioCmd)); | 1285 | memset(&ioCmd,0,sizeof(ioCmd)); |
1286 | SDIO_SET_CMD52_READ_ARG(arg,0,address); | 1286 | SDIO_SET_CMD52_READ_ARG(arg,0,address); |
diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c index 48ae318ff9d..afc523f81bc 100644 --- a/drivers/staging/ath6kl/htc2/htc.c +++ b/drivers/staging/ath6kl/htc2/htc.c | |||
@@ -64,7 +64,7 @@ HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList) | |||
64 | /* cleanup the HTC instance */ | 64 | /* cleanup the HTC instance */ |
65 | static void HTCCleanup(HTC_TARGET *target) | 65 | static void HTCCleanup(HTC_TARGET *target) |
66 | { | 66 | { |
67 | A_INT32 i; | 67 | s32 i; |
68 | 68 | ||
69 | DevCleanup(&target->Device); | 69 | DevCleanup(&target->Device); |
70 | 70 | ||
diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h index 49861e2058f..3799b687498 100644 --- a/drivers/staging/ath6kl/include/common/testcmd.h +++ b/drivers/staging/ath6kl/include/common/testcmd.h | |||
@@ -86,7 +86,7 @@ typedef PREPACK struct { | |||
86 | u32 mode; | 86 | u32 mode; |
87 | u32 freq; | 87 | u32 freq; |
88 | u32 dataRate; | 88 | u32 dataRate; |
89 | A_INT32 txPwr; | 89 | s32 txPwr; |
90 | u32 antenna; | 90 | u32 antenna; |
91 | u32 enANI; | 91 | u32 enANI; |
92 | u32 scramblerOff; | 92 | u32 scramblerOff; |
@@ -135,7 +135,7 @@ typedef PREPACK struct { | |||
135 | } POSTPACK para; | 135 | } POSTPACK para; |
136 | struct PREPACK TCMD_CONT_RX_REPORT { | 136 | struct PREPACK TCMD_CONT_RX_REPORT { |
137 | u32 totalPkt; | 137 | u32 totalPkt; |
138 | A_INT32 rssiInDBm; | 138 | s32 rssiInDBm; |
139 | u32 crcErrPkt; | 139 | u32 crcErrPkt; |
140 | u32 secErrPkt; | 140 | u32 secErrPkt; |
141 | u16 rateCnt[TCMD_MAX_RATES]; | 141 | u16 rateCnt[TCMD_MAX_RATES]; |
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index 12ca0254e8e..a03b4371519 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h | |||
@@ -2155,7 +2155,7 @@ typedef PREPACK struct { | |||
2155 | * WMI_SCAN_COMPLETE_EVENTID - no parameters (old), staus parameter (new) | 2155 | * WMI_SCAN_COMPLETE_EVENTID - no parameters (old), staus parameter (new) |
2156 | */ | 2156 | */ |
2157 | typedef PREPACK struct { | 2157 | typedef PREPACK struct { |
2158 | A_INT32 status; | 2158 | s32 status; |
2159 | } POSTPACK WMI_SCAN_COMPLETE_EVENT; | 2159 | } POSTPACK WMI_SCAN_COMPLETE_EVENT; |
2160 | 2160 | ||
2161 | #define MAX_OPT_DATA_LEN 1400 | 2161 | #define MAX_OPT_DATA_LEN 1400 |
@@ -2233,7 +2233,7 @@ typedef PREPACK struct { | |||
2233 | u32 tx_retry_cnt; | 2233 | u32 tx_retry_cnt; |
2234 | u32 tx_mult_retry_cnt; | 2234 | u32 tx_mult_retry_cnt; |
2235 | u32 tx_rts_fail_cnt; | 2235 | u32 tx_rts_fail_cnt; |
2236 | A_INT32 tx_unicast_rate; | 2236 | s32 tx_unicast_rate; |
2237 | }POSTPACK tx_stats_t; | 2237 | }POSTPACK tx_stats_t; |
2238 | 2238 | ||
2239 | typedef PREPACK struct { | 2239 | typedef PREPACK struct { |
@@ -2252,7 +2252,7 @@ typedef PREPACK struct { | |||
2252 | u32 rx_key_cache_miss; | 2252 | u32 rx_key_cache_miss; |
2253 | u32 rx_decrypt_err; | 2253 | u32 rx_decrypt_err; |
2254 | u32 rx_duplicate_frames; | 2254 | u32 rx_duplicate_frames; |
2255 | A_INT32 rx_unicast_rate; | 2255 | s32 rx_unicast_rate; |
2256 | }POSTPACK rx_stats_t; | 2256 | }POSTPACK rx_stats_t; |
2257 | 2257 | ||
2258 | typedef PREPACK struct { | 2258 | typedef PREPACK struct { |
@@ -2306,7 +2306,7 @@ typedef PREPACK struct { | |||
2306 | 2306 | ||
2307 | typedef PREPACK struct { | 2307 | typedef PREPACK struct { |
2308 | u32 lqVal; | 2308 | u32 lqVal; |
2309 | A_INT32 noise_floor_calibation; | 2309 | s32 noise_floor_calibation; |
2310 | pm_stats_t pmStats; | 2310 | pm_stats_t pmStats; |
2311 | wlan_net_stats_t txrxStats; | 2311 | wlan_net_stats_t txrxStats; |
2312 | wlan_wow_stats_t wowStats; | 2312 | wlan_wow_stats_t wowStats; |
@@ -2388,7 +2388,7 @@ typedef enum{ | |||
2388 | } WMI_LQ_THRESHOLD_VAL; | 2388 | } WMI_LQ_THRESHOLD_VAL; |
2389 | 2389 | ||
2390 | typedef PREPACK struct { | 2390 | typedef PREPACK struct { |
2391 | A_INT32 lq; | 2391 | s32 lq; |
2392 | u8 range; /* WMI_LQ_THRESHOLD_VAL */ | 2392 | u8 range; /* WMI_LQ_THRESHOLD_VAL */ |
2393 | }POSTPACK WMI_LQ_THRESHOLD_EVENT; | 2393 | }POSTPACK WMI_LQ_THRESHOLD_EVENT; |
2394 | /* | 2394 | /* |
@@ -2397,7 +2397,7 @@ typedef PREPACK struct { | |||
2397 | #define MAX_ROAM_TBL_CAND 5 | 2397 | #define MAX_ROAM_TBL_CAND 5 |
2398 | 2398 | ||
2399 | typedef PREPACK struct { | 2399 | typedef PREPACK struct { |
2400 | A_INT32 roam_util; | 2400 | s32 roam_util; |
2401 | u8 bssid[ATH_MAC_LEN]; | 2401 | u8 bssid[ATH_MAC_LEN]; |
2402 | s8 rssi; | 2402 | s8 rssi; |
2403 | s8 rssidt; | 2403 | s8 rssidt; |
diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h index f5152eb86c5..141b7efc571 100644 --- a/drivers/staging/ath6kl/include/common_drv.h +++ b/drivers/staging/ath6kl/include/common_drv.h | |||
@@ -37,7 +37,7 @@ typedef struct _COMMON_CREDIT_STATE_INFO { | |||
37 | } COMMON_CREDIT_STATE_INFO; | 37 | } COMMON_CREDIT_STATE_INFO; |
38 | 38 | ||
39 | typedef struct { | 39 | typedef struct { |
40 | A_INT32 (*setupTransport)(void *ar); | 40 | s32 (*setupTransport)(void *ar); |
41 | void (*cleanupTransport)(void *ar); | 41 | void (*cleanupTransport)(void *ar); |
42 | } HCI_TRANSPORT_CALLBACKS; | 42 | } HCI_TRANSPORT_CALLBACKS; |
43 | 43 | ||
diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h index b34c1f9c667..e51440ad7b7 100644 --- a/drivers/staging/ath6kl/include/wmi_api.h +++ b/drivers/staging/ath6kl/include/wmi_api.h | |||
@@ -153,9 +153,9 @@ int wmi_sync_cmd(struct wmi_t *wmip, u8 syncNumber); | |||
153 | int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream); | 153 | int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream); |
154 | int wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 streamID); | 154 | int wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 streamID); |
155 | int wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, u16 rateMask); | 155 | int wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, u16 rateMask); |
156 | int wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate); | 156 | int wmi_set_bitrate_cmd(struct wmi_t *wmip, s32 dataRate, s32 mgmtRate, s32 ctlRate); |
157 | int wmi_get_bitrate_cmd(struct wmi_t *wmip); | 157 | int wmi_get_bitrate_cmd(struct wmi_t *wmip); |
158 | s8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, s8 *rate_idx); | 158 | s8 wmi_validate_bitrate(struct wmi_t *wmip, s32 rate, s8 *rate_idx); |
159 | int wmi_get_regDomain_cmd(struct wmi_t *wmip); | 159 | int wmi_get_regDomain_cmd(struct wmi_t *wmip); |
160 | int wmi_get_channelList_cmd(struct wmi_t *wmip); | 160 | int wmi_get_channelList_cmd(struct wmi_t *wmip); |
161 | int wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam, | 161 | int wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam, |
@@ -295,7 +295,7 @@ int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, | |||
295 | 295 | ||
296 | int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen); | 296 | int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen); |
297 | 297 | ||
298 | A_INT32 wmi_get_rate(s8 rateindex); | 298 | s32 wmi_get_rate(s8 rateindex); |
299 | 299 | ||
300 | int wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *cmd); | 300 | int wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *cmd); |
301 | 301 | ||
diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c index d0485bf4229..0c9c8a34264 100644 --- a/drivers/staging/ath6kl/miscdrv/common_drv.c +++ b/drivers/staging/ath6kl/miscdrv/common_drv.c | |||
@@ -87,7 +87,7 @@ int ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, u32 RegisterAddr, u32 | |||
87 | { | 87 | { |
88 | int status; | 88 | int status; |
89 | u8 addrValue[4]; | 89 | u8 addrValue[4]; |
90 | A_INT32 i; | 90 | s32 i; |
91 | 91 | ||
92 | /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written | 92 | /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written |
93 | * last to initiate the access cycle */ | 93 | * last to initiate the access cycle */ |
@@ -358,10 +358,10 @@ _do_write_diag(HIF_DEVICE *hifDevice, u32 addr, u32 value) | |||
358 | */ | 358 | */ |
359 | #if 0 | 359 | #if 0 |
360 | static int | 360 | static int |
361 | _delay_until_target_alive(HIF_DEVICE *hifDevice, A_INT32 wait_msecs, u32 TargetType) | 361 | _delay_until_target_alive(HIF_DEVICE *hifDevice, s32 wait_msecs, u32 TargetType) |
362 | { | 362 | { |
363 | A_INT32 actual_wait; | 363 | s32 actual_wait; |
364 | A_INT32 i; | 364 | s32 i; |
365 | u32 address; | 365 | u32 address; |
366 | 366 | ||
367 | actual_wait = 0; | 367 | actual_wait = 0; |
@@ -485,7 +485,7 @@ ar6000_copy_cust_data_from_target(HIF_DEVICE *hifDevice, u32 TargetType) | |||
485 | { | 485 | { |
486 | u32 eepHeaderAddr; | 486 | u32 eepHeaderAddr; |
487 | u8 AR6003CustDataShadow[AR6003_CUST_DATA_SIZE+4]; | 487 | u8 AR6003CustDataShadow[AR6003_CUST_DATA_SIZE+4]; |
488 | A_INT32 i; | 488 | s32 i; |
489 | 489 | ||
490 | if (BMIReadMemory(hifDevice, | 490 | if (BMIReadMemory(hifDevice, |
491 | HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_board_data), | 491 | HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_board_data), |
@@ -727,13 +727,13 @@ int ar6000_prepare_target(HIF_DEVICE *hifDevice, | |||
727 | int | 727 | int |
728 | ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice) | 728 | ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice) |
729 | { | 729 | { |
730 | A_INT32 i; | 730 | s32 i; |
731 | struct forceROM_s { | 731 | struct forceROM_s { |
732 | u32 addr; | 732 | u32 addr; |
733 | u32 data; | 733 | u32 data; |
734 | }; | 734 | }; |
735 | struct forceROM_s *ForceROM; | 735 | struct forceROM_s *ForceROM; |
736 | A_INT32 szForceROM; | 736 | s32 szForceROM; |
737 | int status = A_OK; | 737 | int status = A_OK; |
738 | u32 address; | 738 | u32 address; |
739 | u32 data; | 739 | u32 data; |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index 651f9f4b665..ed82a3ba568 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -453,14 +453,14 @@ ar6000_dbglog_init_done(AR_SOFTC_T *ar) | |||
453 | 453 | ||
454 | u32 dbglog_get_debug_fragment(s8 *datap, u32 len, u32 limit) | 454 | u32 dbglog_get_debug_fragment(s8 *datap, u32 len, u32 limit) |
455 | { | 455 | { |
456 | A_INT32 *buffer; | 456 | s32 *buffer; |
457 | u32 count; | 457 | u32 count; |
458 | u32 numargs; | 458 | u32 numargs; |
459 | u32 length; | 459 | u32 length; |
460 | u32 fraglen; | 460 | u32 fraglen; |
461 | 461 | ||
462 | count = fraglen = 0; | 462 | count = fraglen = 0; |
463 | buffer = (A_INT32 *)datap; | 463 | buffer = (s32 *)datap; |
464 | length = (limit >> 2); | 464 | length = (limit >> 2); |
465 | 465 | ||
466 | if (len <= limit) { | 466 | if (len <= limit) { |
@@ -479,7 +479,7 @@ u32 dbglog_get_debug_fragment(s8 *datap, u32 len, u32 limit) | |||
479 | void | 479 | void |
480 | dbglog_parse_debug_logs(s8 *datap, u32 len) | 480 | dbglog_parse_debug_logs(s8 *datap, u32 len) |
481 | { | 481 | { |
482 | A_INT32 *buffer; | 482 | s32 *buffer; |
483 | u32 count; | 483 | u32 count; |
484 | u32 timestamp; | 484 | u32 timestamp; |
485 | u32 debugid; | 485 | u32 debugid; |
@@ -488,7 +488,7 @@ dbglog_parse_debug_logs(s8 *datap, u32 len) | |||
488 | u32 length; | 488 | u32 length; |
489 | 489 | ||
490 | count = 0; | 490 | count = 0; |
491 | buffer = (A_INT32 *)datap; | 491 | buffer = (s32 *)datap; |
492 | length = (len >> 2); | 492 | length = (len >> 2); |
493 | while (count < length) { | 493 | while (count < length) { |
494 | debugid = DBGLOG_GET_DBGID(buffer[count]); | 494 | debugid = DBGLOG_GET_DBGID(buffer[count]); |
@@ -2429,7 +2429,7 @@ int ar6000_init(struct net_device *dev) | |||
2429 | { | 2429 | { |
2430 | AR_SOFTC_T *ar; | 2430 | AR_SOFTC_T *ar; |
2431 | int status; | 2431 | int status; |
2432 | A_INT32 timeleft; | 2432 | s32 timeleft; |
2433 | s16 i; | 2433 | s16 i; |
2434 | int ret = 0; | 2434 | int ret = 0; |
2435 | #if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE) | 2435 | #if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE) |
@@ -2767,7 +2767,7 @@ ar6000_init_done: | |||
2767 | 2767 | ||
2768 | 2768 | ||
2769 | void | 2769 | void |
2770 | ar6000_bitrate_rx(void *devt, A_INT32 rateKbps) | 2770 | ar6000_bitrate_rx(void *devt, s32 rateKbps) |
2771 | { | 2771 | { |
2772 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; | 2772 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; |
2773 | 2773 | ||
@@ -5826,8 +5826,7 @@ read_rssi_compensation_param(AR_SOFTC_T *ar) | |||
5826 | return; | 5826 | return; |
5827 | } | 5827 | } |
5828 | 5828 | ||
5829 | A_INT32 | 5829 | s32 rssi_compensation_calc_tcmd(u32 freq, s32 rssi, u32 totalPkt) |
5830 | rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt) | ||
5831 | { | 5830 | { |
5832 | 5831 | ||
5833 | if (freq > 5000) | 5832 | if (freq > 5000) |
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index bef88eb75e0..339925a84d6 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | |||
@@ -496,7 +496,7 @@ typedef struct ar6_softc { | |||
496 | s8 arRssi; | 496 | s8 arRssi; |
497 | u8 arTxPwr; | 497 | u8 arTxPwr; |
498 | bool arTxPwrSet; | 498 | bool arTxPwrSet; |
499 | A_INT32 arBitRate; | 499 | s32 arBitRate; |
500 | struct net_device_stats arNetStats; | 500 | struct net_device_stats arNetStats; |
501 | struct iw_statistics arIwStats; | 501 | struct iw_statistics arIwStats; |
502 | s8 arNumChannels; | 502 | s8 arNumChannels; |
@@ -509,7 +509,7 @@ typedef struct ar6_softc { | |||
509 | #ifdef CONFIG_HOST_TCMD_SUPPORT | 509 | #ifdef CONFIG_HOST_TCMD_SUPPORT |
510 | u8 tcmdRxReport; | 510 | u8 tcmdRxReport; |
511 | u32 tcmdRxTotalPkt; | 511 | u32 tcmdRxTotalPkt; |
512 | A_INT32 tcmdRxRssi; | 512 | s32 tcmdRxRssi; |
513 | u32 tcmdPm; | 513 | u32 tcmdPm; |
514 | u32 arTargetMode; | 514 | u32 arTargetMode; |
515 | u32 tcmdRxcrcErrPkt; | 515 | u32 tcmdRxcrcErrPkt; |
@@ -552,7 +552,7 @@ typedef struct ar6_softc { | |||
552 | u32 dbglog_init_done; | 552 | u32 dbglog_init_done; |
553 | u32 arConnectCtrlFlags; | 553 | u32 arConnectCtrlFlags; |
554 | #ifdef USER_KEYS | 554 | #ifdef USER_KEYS |
555 | A_INT32 user_savedkeys_stat; | 555 | s32 user_savedkeys_stat; |
556 | u32 user_key_ctrl; | 556 | u32 user_key_ctrl; |
557 | struct USER_SAVEDKEYS user_saved_keys; | 557 | struct USER_SAVEDKEYS user_saved_keys; |
558 | #endif | 558 | #endif |
@@ -589,7 +589,7 @@ typedef struct ar6_softc { | |||
589 | #endif | 589 | #endif |
590 | WMI_BTCOEX_CONFIG_EVENT arBtcoexConfig; | 590 | WMI_BTCOEX_CONFIG_EVENT arBtcoexConfig; |
591 | WMI_BTCOEX_STATS_EVENT arBtcoexStats; | 591 | WMI_BTCOEX_STATS_EVENT arBtcoexStats; |
592 | A_INT32 (*exitCallback)(void *config); /* generic callback at AR6K exit */ | 592 | s32 (*exitCallback)(void *config); /* generic callback at AR6K exit */ |
593 | HIF_DEVICE_OS_DEVICE_INFO osDevInfo; | 593 | HIF_DEVICE_OS_DEVICE_INFO osDevInfo; |
594 | #ifdef ATH6K_CONFIG_CFG80211 | 594 | #ifdef ATH6K_CONFIG_CFG80211 |
595 | struct wireless_dev *wdev; | 595 | struct wireless_dev *wdev; |
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h index 328982fb3a9..a8d3f549822 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h | |||
@@ -42,7 +42,7 @@ void ar6000_disconnect_event(struct ar6_softc *ar, u8 reason, | |||
42 | u8 *assocInfo, u16 protocolReasonStatus); | 42 | u8 *assocInfo, u16 protocolReasonStatus); |
43 | void ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, | 43 | void ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, |
44 | bool ismcast); | 44 | bool ismcast); |
45 | void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps); | 45 | void ar6000_bitrate_rx(void *devt, s32 rateKbps); |
46 | void ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList); | 46 | void ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList); |
47 | void ar6000_regDomain_event(struct ar6_softc *ar, u32 regCode); | 47 | void ar6000_regDomain_event(struct ar6_softc *ar, u32 regCode); |
48 | void ar6000_txPwr_rx(void *devt, u8 txPwr); | 48 | void ar6000_txPwr_rx(void *devt, u8 txPwr); |
@@ -77,7 +77,7 @@ void ar6000_gpio_intr_rx(u32 intr_mask, u32 input_values); | |||
77 | void ar6000_gpio_data_rx(u32 reg_id, u32 value); | 77 | void ar6000_gpio_data_rx(u32 reg_id, u32 value); |
78 | void ar6000_gpio_ack_rx(void); | 78 | void ar6000_gpio_ack_rx(void); |
79 | 79 | ||
80 | A_INT32 rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt); | 80 | s32 rssi_compensation_calc_tcmd(u32 freq, s32 rssi, u32 totalPkt); |
81 | s16 rssi_compensation_calc(struct ar6_softc *ar, s16 rssi); | 81 | s16 rssi_compensation_calc(struct ar6_softc *ar, s16 rssi); |
82 | s16 rssi_compensation_reverse_calc(struct ar6_softc *ar, s16 rssi, bool Above); | 82 | s16 rssi_compensation_reverse_calc(struct ar6_softc *ar, s16 rssi, bool Above); |
83 | 83 | ||
diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h index a3e65081f98..383571a1ab3 100644 --- a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h | |||
@@ -1061,8 +1061,8 @@ typedef struct targetStats_t { | |||
1061 | u64 cs_connect_cnt; | 1061 | u64 cs_connect_cnt; |
1062 | u64 cs_disconnect_cnt; | 1062 | u64 cs_disconnect_cnt; |
1063 | 1063 | ||
1064 | A_INT32 tx_unicast_rate; | 1064 | s32 tx_unicast_rate; |
1065 | A_INT32 rx_unicast_rate; | 1065 | s32 rx_unicast_rate; |
1066 | 1066 | ||
1067 | u32 lq_val; | 1067 | u32 lq_val; |
1068 | 1068 | ||
diff --git a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h index 209046f7b93..eb09d43f44e 100644 --- a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h | |||
@@ -307,16 +307,16 @@ void *a_netbuf_alloc_raw(int size); | |||
307 | void a_netbuf_free(void *bufPtr); | 307 | void a_netbuf_free(void *bufPtr); |
308 | void *a_netbuf_to_data(void *bufPtr); | 308 | void *a_netbuf_to_data(void *bufPtr); |
309 | u32 a_netbuf_to_len(void *bufPtr); | 309 | u32 a_netbuf_to_len(void *bufPtr); |
310 | int a_netbuf_push(void *bufPtr, A_INT32 len); | 310 | int a_netbuf_push(void *bufPtr, s32 len); |
311 | int a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len); | 311 | int a_netbuf_push_data(void *bufPtr, char *srcPtr, s32 len); |
312 | int a_netbuf_put(void *bufPtr, A_INT32 len); | 312 | int a_netbuf_put(void *bufPtr, s32 len); |
313 | int a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len); | 313 | int a_netbuf_put_data(void *bufPtr, char *srcPtr, s32 len); |
314 | int a_netbuf_pull(void *bufPtr, A_INT32 len); | 314 | int a_netbuf_pull(void *bufPtr, s32 len); |
315 | int a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len); | 315 | int a_netbuf_pull_data(void *bufPtr, char *dstPtr, s32 len); |
316 | int a_netbuf_trim(void *bufPtr, A_INT32 len); | 316 | int a_netbuf_trim(void *bufPtr, s32 len); |
317 | int a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len); | 317 | int a_netbuf_trim_data(void *bufPtr, char *dstPtr, s32 len); |
318 | int a_netbuf_setlen(void *bufPtr, A_INT32 len); | 318 | int a_netbuf_setlen(void *bufPtr, s32 len); |
319 | A_INT32 a_netbuf_headroom(void *bufPtr); | 319 | s32 a_netbuf_headroom(void *bufPtr); |
320 | void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt); | 320 | void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt); |
321 | void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt); | 321 | void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt); |
322 | void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q); | 322 | void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q); |
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c index a055528588a..8f7d20ad4f7 100644 --- a/drivers/staging/ath6kl/os/linux/ioctl.c +++ b/drivers/staging/ath6kl/os/linux/ioctl.c | |||
@@ -417,7 +417,7 @@ ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq) | |||
417 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 417 | AR_SOFTC_T *ar = (AR_SOFTC_T *)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 | A_INT32 i, j; | 420 | s32 i, j; |
421 | int ret = 0; | 421 | int ret = 0; |
422 | 422 | ||
423 | if (ar->arWmiReady == false) { | 423 | if (ar->arWmiReady == false) { |
diff --git a/drivers/staging/ath6kl/os/linux/netbuf.c b/drivers/staging/ath6kl/os/linux/netbuf.c index 580d82985ec..703a2cdf84c 100644 --- a/drivers/staging/ath6kl/os/linux/netbuf.c +++ b/drivers/staging/ath6kl/os/linux/netbuf.c | |||
@@ -105,7 +105,7 @@ a_netbuf_to_data(void *bufPtr) | |||
105 | * pointed to by bufPtr | 105 | * pointed to by bufPtr |
106 | */ | 106 | */ |
107 | int | 107 | int |
108 | a_netbuf_push(void *bufPtr, A_INT32 len) | 108 | a_netbuf_push(void *bufPtr, s32 len) |
109 | { | 109 | { |
110 | skb_push((struct sk_buff *)bufPtr, len); | 110 | skb_push((struct sk_buff *)bufPtr, len); |
111 | 111 | ||
@@ -117,7 +117,7 @@ a_netbuf_push(void *bufPtr, A_INT32 len) | |||
117 | * pointed to by bufPtr and also fill with data | 117 | * pointed to by bufPtr and also fill with data |
118 | */ | 118 | */ |
119 | int | 119 | int |
120 | a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len) | 120 | a_netbuf_push_data(void *bufPtr, char *srcPtr, s32 len) |
121 | { | 121 | { |
122 | skb_push((struct sk_buff *) bufPtr, len); | 122 | skb_push((struct sk_buff *) bufPtr, len); |
123 | A_MEMCPY(((struct sk_buff *)bufPtr)->data, srcPtr, len); | 123 | A_MEMCPY(((struct sk_buff *)bufPtr)->data, srcPtr, len); |
@@ -130,7 +130,7 @@ a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len) | |||
130 | * pointed to by bufPtr | 130 | * pointed to by bufPtr |
131 | */ | 131 | */ |
132 | int | 132 | int |
133 | a_netbuf_put(void *bufPtr, A_INT32 len) | 133 | a_netbuf_put(void *bufPtr, s32 len) |
134 | { | 134 | { |
135 | skb_put((struct sk_buff *)bufPtr, len); | 135 | skb_put((struct sk_buff *)bufPtr, len); |
136 | 136 | ||
@@ -142,7 +142,7 @@ a_netbuf_put(void *bufPtr, A_INT32 len) | |||
142 | * pointed to by bufPtr and also fill with data | 142 | * pointed to by bufPtr and also fill with data |
143 | */ | 143 | */ |
144 | int | 144 | int |
145 | a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len) | 145 | a_netbuf_put_data(void *bufPtr, char *srcPtr, s32 len) |
146 | { | 146 | { |
147 | char *start = (char*)(((struct sk_buff *)bufPtr)->data + | 147 | char *start = (char*)(((struct sk_buff *)bufPtr)->data + |
148 | ((struct sk_buff *)bufPtr)->len); | 148 | ((struct sk_buff *)bufPtr)->len); |
@@ -157,7 +157,7 @@ a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len) | |||
157 | * Trim the network buffer pointed to by bufPtr to len # of bytes | 157 | * Trim the network buffer pointed to by bufPtr to len # of bytes |
158 | */ | 158 | */ |
159 | int | 159 | int |
160 | a_netbuf_setlen(void *bufPtr, A_INT32 len) | 160 | a_netbuf_setlen(void *bufPtr, s32 len) |
161 | { | 161 | { |
162 | skb_trim((struct sk_buff *)bufPtr, len); | 162 | skb_trim((struct sk_buff *)bufPtr, len); |
163 | 163 | ||
@@ -168,7 +168,7 @@ a_netbuf_setlen(void *bufPtr, A_INT32 len) | |||
168 | * Chop of len # of bytes from the end of the buffer. | 168 | * Chop of len # of bytes from the end of the buffer. |
169 | */ | 169 | */ |
170 | int | 170 | int |
171 | a_netbuf_trim(void *bufPtr, A_INT32 len) | 171 | a_netbuf_trim(void *bufPtr, s32 len) |
172 | { | 172 | { |
173 | skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len); | 173 | skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len); |
174 | 174 | ||
@@ -179,7 +179,7 @@ a_netbuf_trim(void *bufPtr, A_INT32 len) | |||
179 | * Chop of len # of bytes from the end of the buffer and return the data. | 179 | * Chop of len # of bytes from the end of the buffer and return the data. |
180 | */ | 180 | */ |
181 | int | 181 | int |
182 | a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len) | 182 | a_netbuf_trim_data(void *bufPtr, char *dstPtr, s32 len) |
183 | { | 183 | { |
184 | char *start = (char*)(((struct sk_buff *)bufPtr)->data + | 184 | char *start = (char*)(((struct sk_buff *)bufPtr)->data + |
185 | (((struct sk_buff *)bufPtr)->len - len)); | 185 | (((struct sk_buff *)bufPtr)->len - len)); |
@@ -194,8 +194,7 @@ a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len) | |||
194 | /* | 194 | /* |
195 | * Returns the number of bytes available to a a_netbuf_push() | 195 | * Returns the number of bytes available to a a_netbuf_push() |
196 | */ | 196 | */ |
197 | A_INT32 | 197 | s32 a_netbuf_headroom(void *bufPtr) |
198 | a_netbuf_headroom(void *bufPtr) | ||
199 | { | 198 | { |
200 | return (skb_headroom((struct sk_buff *)bufPtr)); | 199 | return (skb_headroom((struct sk_buff *)bufPtr)); |
201 | } | 200 | } |
@@ -204,7 +203,7 @@ a_netbuf_headroom(void *bufPtr) | |||
204 | * Removes specified number of bytes from the beginning of the buffer | 203 | * Removes specified number of bytes from the beginning of the buffer |
205 | */ | 204 | */ |
206 | int | 205 | int |
207 | a_netbuf_pull(void *bufPtr, A_INT32 len) | 206 | a_netbuf_pull(void *bufPtr, s32 len) |
208 | { | 207 | { |
209 | skb_pull((struct sk_buff *)bufPtr, len); | 208 | skb_pull((struct sk_buff *)bufPtr, len); |
210 | 209 | ||
@@ -216,7 +215,7 @@ a_netbuf_pull(void *bufPtr, A_INT32 len) | |||
216 | * and return the data | 215 | * and return the data |
217 | */ | 216 | */ |
218 | int | 217 | int |
219 | a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len) | 218 | a_netbuf_pull_data(void *bufPtr, char *dstPtr, s32 len) |
220 | { | 219 | { |
221 | A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len); | 220 | A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len); |
222 | skb_pull((struct sk_buff *)bufPtr, len); | 221 | skb_pull((struct sk_buff *)bufPtr, len); |
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c index df02625fabc..7cf4f62a337 100644 --- a/drivers/staging/ath6kl/os/linux/wireless_ext.c +++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c | |||
@@ -97,7 +97,7 @@ ar6000_scan_node(void *arg, bss_t *ni) | |||
97 | char *end_buf; | 97 | char *end_buf; |
98 | struct ieee80211_common_ie *cie; | 98 | struct ieee80211_common_ie *cie; |
99 | char *current_val; | 99 | char *current_val; |
100 | A_INT32 j; | 100 | s32 j; |
101 | u32 rate_len, data_len = 0; | 101 | u32 rate_len, data_len = 0; |
102 | 102 | ||
103 | param = (struct ar_giwscan_param *)arg; | 103 | param = (struct ar_giwscan_param *)arg; |
@@ -1007,7 +1007,7 @@ ar6000_ioctl_siwencode(struct net_device *dev, | |||
1007 | { | 1007 | { |
1008 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1008 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1009 | int index; | 1009 | int index; |
1010 | A_INT32 auth = 0; | 1010 | s32 auth = 0; |
1011 | 1011 | ||
1012 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { | 1012 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { |
1013 | A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); | 1013 | A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); |
@@ -1250,8 +1250,8 @@ ar6000_ioctl_siwauth(struct net_device *dev, | |||
1250 | 1250 | ||
1251 | bool profChanged; | 1251 | bool profChanged; |
1252 | u16 param; | 1252 | u16 param; |
1253 | A_INT32 ret; | 1253 | s32 ret; |
1254 | A_INT32 value; | 1254 | s32 value; |
1255 | 1255 | ||
1256 | if (ar->arWmiReady == false) { | 1256 | if (ar->arWmiReady == false) { |
1257 | return -EIO; | 1257 | return -EIO; |
@@ -1419,7 +1419,7 @@ ar6000_ioctl_giwauth(struct net_device *dev, | |||
1419 | { | 1419 | { |
1420 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1420 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1421 | u16 param; | 1421 | u16 param; |
1422 | A_INT32 ret; | 1422 | s32 ret; |
1423 | 1423 | ||
1424 | if (ar->arWmiReady == false) { | 1424 | if (ar->arWmiReady == false) { |
1425 | return -EIO; | 1425 | return -EIO; |
@@ -1546,7 +1546,7 @@ ar6000_ioctl_siwpmksa(struct net_device *dev, | |||
1546 | struct iw_point *data, char *extra) | 1546 | struct iw_point *data, char *extra) |
1547 | { | 1547 | { |
1548 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1548 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1549 | A_INT32 ret; | 1549 | s32 ret; |
1550 | int status; | 1550 | int status; |
1551 | struct iw_pmksa *pmksa; | 1551 | struct iw_pmksa *pmksa; |
1552 | 1552 | ||
@@ -1593,11 +1593,11 @@ static int ar6000_set_wapi_key(struct net_device *dev, | |||
1593 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1593 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1594 | struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; | 1594 | struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; |
1595 | KEY_USAGE keyUsage = 0; | 1595 | KEY_USAGE keyUsage = 0; |
1596 | A_INT32 keyLen; | 1596 | s32 keyLen; |
1597 | u8 *keyData; | 1597 | u8 *keyData; |
1598 | A_INT32 index; | 1598 | s32 index; |
1599 | u32 *PN; | 1599 | u32 *PN; |
1600 | A_INT32 i; | 1600 | s32 i; |
1601 | int status; | 1601 | int status; |
1602 | u8 wapiKeyRsc[16]; | 1602 | u8 wapiKeyRsc[16]; |
1603 | CRYPTO_TYPE keyType = WAPI_CRYPT; | 1603 | CRYPTO_TYPE keyType = WAPI_CRYPT; |
@@ -1653,10 +1653,10 @@ ar6000_ioctl_siwencodeext(struct net_device *dev, | |||
1653 | struct iw_point *erq, char *extra) | 1653 | struct iw_point *erq, char *extra) |
1654 | { | 1654 | { |
1655 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1655 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1656 | A_INT32 index; | 1656 | s32 index; |
1657 | struct iw_encode_ext *ext; | 1657 | struct iw_encode_ext *ext; |
1658 | KEY_USAGE keyUsage; | 1658 | KEY_USAGE keyUsage; |
1659 | A_INT32 keyLen; | 1659 | s32 keyLen; |
1660 | u8 *keyData; | 1660 | u8 *keyData; |
1661 | u8 keyRsc[8]; | 1661 | u8 keyRsc[8]; |
1662 | int status; | 1662 | int status; |
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index b80bdb7e764..cae1c2face0 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c | |||
@@ -153,7 +153,7 @@ static int | |||
153 | wmi_lqThresholdEvent_rx(struct wmi_t *wmip, u8 *datap, int len); | 153 | wmi_lqThresholdEvent_rx(struct wmi_t *wmip, u8 *datap, int len); |
154 | 154 | ||
155 | static bool | 155 | static bool |
156 | wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_INT32 rateIndex); | 156 | wmi_is_bitrate_index_valid(struct wmi_t *wmip, s32 rateIndex); |
157 | 157 | ||
158 | static int | 158 | static int |
159 | wmi_aplistEvent_rx(struct wmi_t *wmip, u8 *datap, int len); | 159 | wmi_aplistEvent_rx(struct wmi_t *wmip, u8 *datap, int len); |
@@ -212,7 +212,7 @@ extern unsigned int processDot11Hdr; | |||
212 | #endif | 212 | #endif |
213 | 213 | ||
214 | int wps_enable; | 214 | int wps_enable; |
215 | static const A_INT32 wmi_rateTable[][2] = { | 215 | static const s32 wmi_rateTable[][2] = { |
216 | //{W/O SGI, with SGI} | 216 | //{W/O SGI, with SGI} |
217 | {1000, 1000}, | 217 | {1000, 1000}, |
218 | {2000, 2000}, | 218 | {2000, 2000}, |
@@ -244,20 +244,20 @@ static const A_INT32 wmi_rateTable[][2] = { | |||
244 | {135000, 150000}, | 244 | {135000, 150000}, |
245 | {0, 0}}; | 245 | {0, 0}}; |
246 | 246 | ||
247 | #define MODE_A_SUPPORT_RATE_START ((A_INT32) 4) | 247 | #define MODE_A_SUPPORT_RATE_START ((s32) 4) |
248 | #define MODE_A_SUPPORT_RATE_STOP ((A_INT32) 11) | 248 | #define MODE_A_SUPPORT_RATE_STOP ((s32) 11) |
249 | 249 | ||
250 | #define MODE_GONLY_SUPPORT_RATE_START MODE_A_SUPPORT_RATE_START | 250 | #define MODE_GONLY_SUPPORT_RATE_START MODE_A_SUPPORT_RATE_START |
251 | #define MODE_GONLY_SUPPORT_RATE_STOP MODE_A_SUPPORT_RATE_STOP | 251 | #define MODE_GONLY_SUPPORT_RATE_STOP MODE_A_SUPPORT_RATE_STOP |
252 | 252 | ||
253 | #define MODE_B_SUPPORT_RATE_START ((A_INT32) 0) | 253 | #define MODE_B_SUPPORT_RATE_START ((s32) 0) |
254 | #define MODE_B_SUPPORT_RATE_STOP ((A_INT32) 3) | 254 | #define MODE_B_SUPPORT_RATE_STOP ((s32) 3) |
255 | 255 | ||
256 | #define MODE_G_SUPPORT_RATE_START ((A_INT32) 0) | 256 | #define MODE_G_SUPPORT_RATE_START ((s32) 0) |
257 | #define MODE_G_SUPPORT_RATE_STOP ((A_INT32) 11) | 257 | #define MODE_G_SUPPORT_RATE_STOP ((s32) 11) |
258 | 258 | ||
259 | #define MODE_GHT20_SUPPORT_RATE_START ((A_INT32) 0) | 259 | #define MODE_GHT20_SUPPORT_RATE_START ((s32) 0) |
260 | #define MODE_GHT20_SUPPORT_RATE_STOP ((A_INT32) 19) | 260 | #define MODE_GHT20_SUPPORT_RATE_STOP ((s32) 19) |
261 | 261 | ||
262 | #define MAX_NUMBER_OF_SUPPORT_RATES (MODE_GHT20_SUPPORT_RATE_STOP + 1) | 262 | #define MAX_NUMBER_OF_SUPPORT_RATES (MODE_GHT20_SUPPORT_RATE_STOP + 1) |
263 | 263 | ||
@@ -1657,7 +1657,7 @@ static int | |||
1657 | wmi_bitrate_reply_rx(struct wmi_t *wmip, u8 *datap, int len) | 1657 | wmi_bitrate_reply_rx(struct wmi_t *wmip, u8 *datap, int len) |
1658 | { | 1658 | { |
1659 | WMI_BIT_RATE_REPLY *reply; | 1659 | WMI_BIT_RATE_REPLY *reply; |
1660 | A_INT32 rate; | 1660 | s32 rate; |
1661 | u32 sgi,index; | 1661 | u32 sgi,index; |
1662 | /* 54149: | 1662 | /* 54149: |
1663 | * WMI_BIT_RATE_CMD structure is changed to WMI_BIT_RATE_REPLY. | 1663 | * WMI_BIT_RATE_CMD structure is changed to WMI_BIT_RATE_REPLY. |
@@ -3201,8 +3201,8 @@ wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params) | |||
3201 | void *osbuf; | 3201 | void *osbuf; |
3202 | WMI_CREATE_PSTREAM_CMD *cmd; | 3202 | WMI_CREATE_PSTREAM_CMD *cmd; |
3203 | u8 fatPipeExistsForAC=0; | 3203 | u8 fatPipeExistsForAC=0; |
3204 | A_INT32 minimalPHY = 0; | 3204 | s32 minimalPHY = 0; |
3205 | A_INT32 nominalPHY = 0; | 3205 | s32 nominalPHY = 0; |
3206 | 3206 | ||
3207 | /* Validate all the parameters. */ | 3207 | /* Validate all the parameters. */ |
3208 | if( !((params->userPriority < 8) && | 3208 | if( !((params->userPriority < 8) && |
@@ -3395,7 +3395,7 @@ wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, u16 r | |||
3395 | * then auto selection is used. | 3395 | * then auto selection is used. |
3396 | */ | 3396 | */ |
3397 | int | 3397 | int |
3398 | wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate) | 3398 | wmi_set_bitrate_cmd(struct wmi_t *wmip, s32 dataRate, s32 mgmtRate, s32 ctlRate) |
3399 | { | 3399 | { |
3400 | void *osbuf; | 3400 | void *osbuf; |
3401 | WMI_BIT_RATE_CMD *cmd; | 3401 | WMI_BIT_RATE_CMD *cmd; |
@@ -3454,7 +3454,7 @@ wmi_get_bitrate_cmd(struct wmi_t *wmip) | |||
3454 | * Returns true iff the given rate index is legal in the current PHY mode. | 3454 | * Returns true iff the given rate index is legal in the current PHY mode. |
3455 | */ | 3455 | */ |
3456 | bool | 3456 | bool |
3457 | wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_INT32 rateIndex) | 3457 | wmi_is_bitrate_index_valid(struct wmi_t *wmip, s32 rateIndex) |
3458 | { | 3458 | { |
3459 | WMI_PHY_MODE phyMode = (WMI_PHY_MODE) wmip->wmi_phyMode; | 3459 | WMI_PHY_MODE phyMode = (WMI_PHY_MODE) wmip->wmi_phyMode; |
3460 | bool isValid = true; | 3460 | bool isValid = true; |
@@ -3509,7 +3509,7 @@ wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_INT32 rateIndex) | |||
3509 | return isValid; | 3509 | return isValid; |
3510 | } | 3510 | } |
3511 | 3511 | ||
3512 | s8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, s8 *rate_idx) | 3512 | s8 wmi_validate_bitrate(struct wmi_t *wmip, s32 rate, s8 *rate_idx) |
3513 | { | 3513 | { |
3514 | s8 i; | 3514 | s8 i; |
3515 | 3515 | ||
@@ -3523,7 +3523,7 @@ s8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, s8 *rate_idx) | |||
3523 | } | 3523 | } |
3524 | } | 3524 | } |
3525 | 3525 | ||
3526 | if(wmi_is_bitrate_index_valid(wmip, (A_INT32) i) != true) { | 3526 | if(wmi_is_bitrate_index_valid(wmip, (s32) i) != true) { |
3527 | return A_EINVAL; | 3527 | return A_EINVAL; |
3528 | } | 3528 | } |
3529 | 3529 | ||
@@ -3537,7 +3537,7 @@ wmi_set_fixrates_cmd(struct wmi_t *wmip, u32 fixRatesMask) | |||
3537 | void *osbuf; | 3537 | void *osbuf; |
3538 | WMI_FIX_RATES_CMD *cmd; | 3538 | WMI_FIX_RATES_CMD *cmd; |
3539 | #if 0 | 3539 | #if 0 |
3540 | A_INT32 rateIndex; | 3540 | s32 rateIndex; |
3541 | /* This check does not work for AR6003 as the HT modes are enabled only when | 3541 | /* This check does not work for AR6003 as the HT modes are enabled only when |
3542 | * the STA is connected to a HT_BSS and is not based only on channel. It is | 3542 | * the STA is connected to a HT_BSS and is not based only on channel. It is |
3543 | * safe to skip this check however because rate control will only use rates | 3543 | * safe to skip this check however because rate control will only use rates |
@@ -5349,8 +5349,7 @@ wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen) | |||
5349 | return (wmi_cmd_send(wmip, osbuf, WMI_SET_WHALPARAM_CMDID, NO_SYNC_WMIFLAG)); | 5349 | return (wmi_cmd_send(wmip, osbuf, WMI_SET_WHALPARAM_CMDID, NO_SYNC_WMIFLAG)); |
5350 | } | 5350 | } |
5351 | 5351 | ||
5352 | A_INT32 | 5352 | s32 wmi_get_rate(s8 rateindex) |
5353 | wmi_get_rate(s8 rateindex) | ||
5354 | { | 5353 | { |
5355 | if (rateindex == RATE_AUTO) { | 5354 | if (rateindex == RATE_AUTO) { |
5356 | return 0; | 5355 | return 0; |