aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/ath6kl/hif/common/hif_sdio_common.h2
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c4
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k.c24
-rw-r--r--drivers/staging/ath6kl/htc2/htc_internal.h4
-rw-r--r--drivers/staging/ath6kl/htc2/htc_recv.c2
-rw-r--r--drivers/staging/ath6kl/include/a_debug.h2
-rw-r--r--drivers/staging/ath6kl/include/aggr_recv_api.h8
-rw-r--r--drivers/staging/ath6kl/include/ar3kconfig.h8
-rw-r--r--drivers/staging/ath6kl/include/common/a_hci.h106
-rw-r--r--drivers/staging/ath6kl/include/common/dset_internal.h4
-rw-r--r--drivers/staging/ath6kl/include/common/epping_test.h18
-rw-r--r--drivers/staging/ath6kl/include/common/gmboxif.h8
-rw-r--r--drivers/staging/ath6kl/include/common/htc.h28
-rw-r--r--drivers/staging/ath6kl/include/common/ini_dset.h4
-rw-r--r--drivers/staging/ath6kl/include/common/pkt_log.h8
-rw-r--r--drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h20
-rw-r--r--drivers/staging/ath6kl/include/common/testcmd.h8
-rw-r--r--drivers/staging/ath6kl/include/common/wlan_dset.h2
-rw-r--r--drivers/staging/ath6kl/include/common/wmi.h158
-rw-r--r--drivers/staging/ath6kl/include/common/wmi_thin.h22
-rw-r--r--drivers/staging/ath6kl/include/htc_api.h4
-rw-r--r--drivers/staging/ath6kl/include/htc_packet.h2
-rw-r--r--drivers/staging/ath6kl/include/wlan_api.h12
-rw-r--r--drivers/staging/ath6kl/include/wmi_api.h65
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kconfig.c4
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c4
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h2
-rw-r--r--drivers/staging/ath6kl/miscdrv/common_drv.c4
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_android.c4
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_drv.c88
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_pm.c10
-rw-r--r--drivers/staging/ath6kl/os/linux/cfg80211.c28
-rw-r--r--drivers/staging/ath6kl/os/linux/eeprom.c8
-rw-r--r--drivers/staging/ath6kl/os/linux/hci_bridge.c8
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6000_drv.h38
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6k_pal.h2
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h20
-rw-r--r--drivers/staging/ath6kl/os/linux/include/athdrv_linux.h10
-rw-r--r--drivers/staging/ath6kl/os/linux/include/cfg80211.h8
-rw-r--r--drivers/staging/ath6kl/os/linux/ioctl.c6
-rw-r--r--drivers/staging/ath6kl/os/linux/wireless_ext.c6
-rw-r--r--drivers/staging/ath6kl/reorder/aggr_rx_internal.h10
-rw-r--r--drivers/staging/ath6kl/reorder/rcv_aggr.c20
-rw-r--r--drivers/staging/ath6kl/wlan/include/ieee80211.h10
-rw-r--r--drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c6
-rw-r--r--drivers/staging/ath6kl/wlan/src/wlan_utils.c5
-rw-r--r--drivers/staging/ath6kl/wmi/wmi.c122
-rw-r--r--drivers/staging/ath6kl/wmi/wmi_host.h2
48 files changed, 472 insertions, 476 deletions
diff --git a/drivers/staging/ath6kl/hif/common/hif_sdio_common.h b/drivers/staging/ath6kl/hif/common/hif_sdio_common.h
index 299fd2583c7..9939a4a30d2 100644
--- a/drivers/staging/ath6kl/hif/common/hif_sdio_common.h
+++ b/drivers/staging/ath6kl/hif/common/hif_sdio_common.h
@@ -58,7 +58,7 @@
58#define HIF_DEFAULT_IO_BLOCK_SIZE 128 58#define HIF_DEFAULT_IO_BLOCK_SIZE 128
59 59
60 /* set extended MBOX window information for SDIO interconnects */ 60 /* set extended MBOX window information for SDIO interconnects */
61static INLINE void SetExtendedMboxWindowInfo(A_UINT16 Manfid, HIF_DEVICE_MBOX_INFO *pInfo) 61static INLINE void SetExtendedMboxWindowInfo(u16 Manfid, HIF_DEVICE_MBOX_INFO *pInfo)
62{ 62{
63 switch (Manfid & MANUFACTURER_ID_AR6K_BASE_MASK) { 63 switch (Manfid & MANUFACTURER_ID_AR6K_BASE_MASK) {
64 case MANUFACTURER_ID_AR6002_BASE : 64 case MANUFACTURER_ID_AR6002_BASE :
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 ced9079e606..539b6d226ba 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
@@ -507,7 +507,7 @@ int ReinitSDIO(HIF_DEVICE *device)
507 do { 507 do {
508 if (!device->is_suspend) { 508 if (!device->is_suspend) {
509 A_UINT32 resp; 509 A_UINT32 resp;
510 A_UINT16 rca; 510 u16 rca;
511 A_UINT32 i; 511 A_UINT32 i;
512 int bit = fls(host->ocr_avail) - 1; 512 int bit = fls(host->ocr_avail) - 1;
513 /* emulate the mmc_power_up(...) */ 513 /* emulate the mmc_power_up(...) */
@@ -711,7 +711,7 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
711 } 711 }
712 712
713 if (configLen >= sizeof(HIF_DEVICE_MBOX_INFO)) { 713 if (configLen >= sizeof(HIF_DEVICE_MBOX_INFO)) {
714 SetExtendedMboxWindowInfo((A_UINT16)device->func->device, 714 SetExtendedMboxWindowInfo((u16)device->func->device,
715 (HIF_DEVICE_MBOX_INFO *)config); 715 (HIF_DEVICE_MBOX_INFO *)config);
716 } 716 }
717 717
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index ad14a2f7eff..6a05f4bccbd 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -1042,13 +1042,13 @@ static void AssembleBufferList(BUFFER_PROC_LIST *pList)
1042#define FILL_COUNTING false 1042#define FILL_COUNTING false
1043static void InitBuffers(bool Zero) 1043static void InitBuffers(bool Zero)
1044{ 1044{
1045 A_UINT16 *pBuffer16 = (A_UINT16 *)g_Buffer; 1045 u16 *pBuffer16 = (u16 *)g_Buffer;
1046 int i; 1046 int i;
1047 1047
1048 /* fill buffer with 16 bit counting pattern or zeros */ 1048 /* fill buffer with 16 bit counting pattern or zeros */
1049 for (i = 0; i < (TOTAL_BYTES / 2) ; i++) { 1049 for (i = 0; i < (TOTAL_BYTES / 2) ; i++) {
1050 if (!Zero) { 1050 if (!Zero) {
1051 pBuffer16[i] = (A_UINT16)i; 1051 pBuffer16[i] = (u16)i;
1052 } else { 1052 } else {
1053 pBuffer16[i] = 0; 1053 pBuffer16[i] = 0;
1054 } 1054 }
@@ -1056,10 +1056,10 @@ static void InitBuffers(bool Zero)
1056} 1056}
1057 1057
1058 1058
1059static bool CheckOneBuffer(A_UINT16 *pBuffer16, int Length) 1059static bool CheckOneBuffer(u16 *pBuffer16, int Length)
1060{ 1060{
1061 int i; 1061 int i;
1062 A_UINT16 startCount; 1062 u16 startCount;
1063 bool success = true; 1063 bool success = true;
1064 1064
1065 /* get the starting count */ 1065 /* get the starting count */
@@ -1069,10 +1069,10 @@ static bool CheckOneBuffer(A_UINT16 *pBuffer16, int Length)
1069 /* scan the buffer and verify */ 1069 /* scan the buffer and verify */
1070 for (i = 0; i < (Length / 2) ; i++,startCount++) { 1070 for (i = 0; i < (Length / 2) ; i++,startCount++) {
1071 /* target will invert all the data */ 1071 /* target will invert all the data */
1072 if ((A_UINT16)pBuffer16[i] != (A_UINT16)~startCount) { 1072 if ((u16)pBuffer16[i] != (u16)~startCount) {
1073 success = false; 1073 success = false;
1074 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Data Got:0x%X, Expecting:0x%X (offset:%d, total:%d) \n", 1074 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Data Got:0x%X, Expecting:0x%X (offset:%d, total:%d) \n",
1075 pBuffer16[i], ((A_UINT16)~startCount), i, Length)); 1075 pBuffer16[i], ((u16)~startCount), i, Length));
1076 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("0x%X 0x%X 0x%X 0x%X \n", 1076 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("0x%X 0x%X 0x%X 0x%X \n",
1077 pBuffer16[i], pBuffer16[i + 1], pBuffer16[i + 2],pBuffer16[i+3])); 1077 pBuffer16[i], pBuffer16[i + 1], pBuffer16[i + 2],pBuffer16[i+3]));
1078 break; 1078 break;
@@ -1093,7 +1093,7 @@ static bool CheckBuffers(void)
1093 1093
1094 /* scan the buffers and verify */ 1094 /* scan the buffers and verify */
1095 for (i = 0; i < BUFFER_PROC_LIST_DEPTH ; i++) { 1095 for (i = 0; i < BUFFER_PROC_LIST_DEPTH ; i++) {
1096 success = CheckOneBuffer((A_UINT16 *)checkList[i].pBuffer, checkList[i].length); 1096 success = CheckOneBuffer((u16 *)checkList[i].pBuffer, checkList[i].length);
1097 if (!success) { 1097 if (!success) {
1098 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer : 0x%X, Length:%d failed verify \n", 1098 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer : 0x%X, Length:%d failed verify \n",
1099 (A_UINT32)checkList[i].pBuffer, checkList[i].length)); 1099 (A_UINT32)checkList[i].pBuffer, checkList[i].length));
@@ -1105,7 +1105,7 @@ static bool CheckBuffers(void)
1105} 1105}
1106 1106
1107 /* find the end marker for the last buffer we will be sending */ 1107 /* find the end marker for the last buffer we will be sending */
1108static A_UINT16 GetEndMarker(void) 1108static u16 GetEndMarker(void)
1109{ 1109{
1110 u8 *pBuffer; 1110 u8 *pBuffer;
1111 BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH]; 1111 BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
@@ -1119,7 +1119,7 @@ static A_UINT16 GetEndMarker(void)
1119 pBuffer = &(checkList[BUFFER_PROC_LIST_DEPTH - 1].pBuffer[(checkList[BUFFER_PROC_LIST_DEPTH - 1].length) - 2]); 1119 pBuffer = &(checkList[BUFFER_PROC_LIST_DEPTH - 1].pBuffer[(checkList[BUFFER_PROC_LIST_DEPTH - 1].length) - 2]);
1120 1120
1121 /* the last count in the last buffer is the marker */ 1121 /* the last count in the last buffer is the marker */
1122 return (A_UINT16)pBuffer[0] | ((A_UINT16)pBuffer[1] << 8); 1122 return (u16)pBuffer[0] | ((u16)pBuffer[1] << 8);
1123} 1123}
1124 1124
1125#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR 1125#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR
@@ -1338,7 +1338,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
1338 u8 params[4]; 1338 u8 params[4];
1339 int numBufs; 1339 int numBufs;
1340 int bufferSize; 1340 int bufferSize;
1341 A_UINT16 temp; 1341 u16 temp;
1342 1342
1343 1343
1344 AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest START - \n")); 1344 AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest START - \n"));
@@ -1401,7 +1401,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
1401 } 1401 }
1402 1402
1403 numBufs = params[0]; 1403 numBufs = params[0];
1404 bufferSize = (int)(((A_UINT16)params[2] << 8) | (A_UINT16)params[1]); 1404 bufferSize = (int)(((u16)params[2] << 8) | (u16)params[1]);
1405 1405
1406 AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, 1406 AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE,
1407 ("Target parameters: bufs per mailbox:%d, buffer size:%d bytes (total space: %d, minimum required space (w/padding): %d) \n", 1407 ("Target parameters: bufs per mailbox:%d, buffer size:%d bytes (total space: %d, minimum required space (w/padding): %d) \n",
@@ -1430,7 +1430,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
1430 1430
1431 AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("End Marker: 0x%X \n",temp)); 1431 AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("End Marker: 0x%X \n",temp));
1432 1432
1433 temp = (A_UINT16)g_BlockSizes[1]; 1433 temp = (u16)g_BlockSizes[1];
1434 /* convert to a mask */ 1434 /* convert to a mask */
1435 temp = temp - 1; 1435 temp = temp - 1;
1436 status = HIFReadWrite(pDev->HIFDevice, 1436 status = HIFReadWrite(pDev->HIFDevice,
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h
index 332ab852965..180ad9d9650 100644
--- a/drivers/staging/ath6kl/htc2/htc_internal.h
+++ b/drivers/staging/ath6kl/htc2/htc_internal.h
@@ -178,7 +178,7 @@ void HTCFlushSendPkts(HTC_TARGET *target);
178#ifdef ATH_DEBUG_MODULE 178#ifdef ATH_DEBUG_MODULE
179void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist); 179void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist);
180void DumpCreditDistStates(HTC_TARGET *target); 180void DumpCreditDistStates(HTC_TARGET *target);
181void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription); 181void DebugDumpBytes(A_UCHAR *buffer, u16 length, char *pDescription);
182#endif 182#endif
183 183
184static INLINE HTC_PACKET *HTC_ALLOC_CONTROL_TX(HTC_TARGET *target) { 184static INLINE HTC_PACKET *HTC_ALLOC_CONTROL_TX(HTC_TARGET *target) {
@@ -203,7 +203,7 @@ static INLINE HTC_PACKET *HTC_ALLOC_CONTROL_TX(HTC_TARGET *target) {
203 u8 *pHdrBuf; \ 203 u8 *pHdrBuf; \
204 (pP)->pBuffer -= HTC_HDR_LENGTH; \ 204 (pP)->pBuffer -= HTC_HDR_LENGTH; \
205 pHdrBuf = (pP)->pBuffer; \ 205 pHdrBuf = (pP)->pBuffer; \
206 A_SET_UINT16_FIELD(pHdrBuf,HTC_FRAME_HDR,PayloadLen,(A_UINT16)(pP)->ActualLength); \ 206 A_SET_UINT16_FIELD(pHdrBuf,HTC_FRAME_HDR,PayloadLen,(u16)(pP)->ActualLength); \
207 A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,Flags,(sendflags)); \ 207 A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,Flags,(sendflags)); \
208 A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,EndpointID, (u8)(pP)->Endpoint); \ 208 A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,EndpointID, (u8)(pP)->Endpoint); \
209 A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,ControlBytes[0], (u8)(ctrl0)); \ 209 A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,ControlBytes[0], (u8)(ctrl0)); \
diff --git a/drivers/staging/ath6kl/htc2/htc_recv.c b/drivers/staging/ath6kl/htc2/htc_recv.c
index 0b09b22ca8e..66e5ced10e8 100644
--- a/drivers/staging/ath6kl/htc2/htc_recv.c
+++ b/drivers/staging/ath6kl/htc2/htc_recv.c
@@ -234,7 +234,7 @@ static int HTCProcessRecvHeader(HTC_TARGET *target,
234 u8 temp; 234 u8 temp;
235 u8 *pBuf; 235 u8 *pBuf;
236 int status = A_OK; 236 int status = A_OK;
237 A_UINT16 payloadLen; 237 u16 payloadLen;
238 A_UINT32 lookAhead; 238 A_UINT32 lookAhead;
239 239
240 pBuf = pPacket->pBuffer; 240 pBuf = pPacket->pBuffer;
diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h
index 4cc7b6beffd..dbba3f85616 100644
--- a/drivers/staging/ath6kl/include/a_debug.h
+++ b/drivers/staging/ath6kl/include/a_debug.h
@@ -57,7 +57,7 @@ extern "C" {
57 /* macro to make a module-specific masks */ 57 /* macro to make a module-specific masks */
58#define ATH_DEBUG_MAKE_MODULE_MASK(index) (1 << (ATH_DEBUG_MODULE_MASK_SHIFT + (index))) 58#define ATH_DEBUG_MAKE_MODULE_MASK(index) (1 << (ATH_DEBUG_MODULE_MASK_SHIFT + (index)))
59 59
60void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription); 60void DebugDumpBytes(A_UCHAR *buffer, u16 length, char *pDescription);
61 61
62/* Debug support on a per-module basis 62/* Debug support on a per-module basis
63 * 63 *
diff --git a/drivers/staging/ath6kl/include/aggr_recv_api.h b/drivers/staging/ath6kl/include/aggr_recv_api.h
index 8f76f3744b5..67a058492c4 100644
--- a/drivers/staging/ath6kl/include/aggr_recv_api.h
+++ b/drivers/staging/ath6kl/include/aggr_recv_api.h
@@ -30,7 +30,7 @@ extern "C" {
30 30
31typedef void (* RX_CALLBACK)(void * dev, void *osbuf); 31typedef void (* RX_CALLBACK)(void * dev, void *osbuf);
32 32
33typedef void (* ALLOC_NETBUFS)(A_NETBUF_QUEUE_T *q, A_UINT16 num); 33typedef void (* ALLOC_NETBUFS)(A_NETBUF_QUEUE_T *q, u16 num);
34 34
35/* 35/*
36 * aggr_init: 36 * aggr_init:
@@ -64,7 +64,7 @@ aggr_register_rx_dispatcher(void *cntxt, void * dev, RX_CALLBACK fn);
64 * up to the indicated sequence number. 64 * up to the indicated sequence number.
65 */ 65 */
66void 66void
67aggr_process_bar(void *cntxt, u8 tid, A_UINT16 seq_no); 67aggr_process_bar(void *cntxt, u8 tid, u16 seq_no);
68 68
69 69
70/* 70/*
@@ -82,7 +82,7 @@ aggr_process_bar(void *cntxt, u8 tid, A_UINT16 seq_no);
82 * in hold_q to OS. 82 * in hold_q to OS.
83 */ 83 */
84void 84void
85aggr_recv_addba_req_evt(void * cntxt, u8 tid, A_UINT16 seq_no, u8 win_sz); 85aggr_recv_addba_req_evt(void * cntxt, u8 tid, u16 seq_no, u8 win_sz);
86 86
87 87
88/* 88/*
@@ -108,7 +108,7 @@ aggr_recv_delba_req_evt(void * cntxt, u8 tid);
108 * callback may be called to deliver frames in order. 108 * callback may be called to deliver frames in order.
109 */ 109 */
110void 110void
111aggr_process_recv_frm(void *cntxt, u8 tid, A_UINT16 seq_no, bool is_amsdu, void **osbuf); 111aggr_process_recv_frm(void *cntxt, u8 tid, u16 seq_no, bool is_amsdu, void **osbuf);
112 112
113 113
114/* 114/*
diff --git a/drivers/staging/ath6kl/include/ar3kconfig.h b/drivers/staging/ath6kl/include/ar3kconfig.h
index 5556660b270..b7c503975c1 100644
--- a/drivers/staging/ath6kl/include/ar3kconfig.h
+++ b/drivers/staging/ath6kl/include/ar3kconfig.h
@@ -45,12 +45,12 @@ typedef struct {
45 HIF_DEVICE *pHIFDevice; /* HIF layer device */ 45 HIF_DEVICE *pHIFDevice; /* HIF layer device */
46 46
47 A_UINT32 AR3KBaudRate; /* AR3K operational baud rate */ 47 A_UINT32 AR3KBaudRate; /* AR3K operational baud rate */
48 A_UINT16 AR6KScale; /* AR6K UART scale value */ 48 u16 AR6KScale; /* AR6K UART scale value */
49 A_UINT16 AR6KStep; /* AR6K UART step value */ 49 u16 AR6KStep; /* AR6K UART step value */
50 struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */ 50 struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */
51 A_UINT32 PwrMgmtEnabled; /* TLPM enabled? */ 51 A_UINT32 PwrMgmtEnabled; /* TLPM enabled? */
52 A_UINT16 IdleTimeout; /* TLPM idle timeout */ 52 u16 IdleTimeout; /* TLPM idle timeout */
53 A_UINT16 WakeupTimeout; /* TLPM wakeup timeout */ 53 u16 WakeupTimeout; /* TLPM wakeup timeout */
54 u8 bdaddr[6]; /* Bluetooth device address */ 54 u8 bdaddr[6]; /* Bluetooth device address */
55} AR3K_CONFIG_INFO; 55} AR3K_CONFIG_INFO;
56 56
diff --git a/drivers/staging/ath6kl/include/common/a_hci.h b/drivers/staging/ath6kl/include/common/a_hci.h
index 1d7d5fa3542..317ea57ba87 100644
--- a/drivers/staging/ath6kl/include/common/a_hci.h
+++ b/drivers/staging/ath6kl/include/common/a_hci.h
@@ -242,7 +242,7 @@ typedef enum {
242 242
243/* Command pkt */ 243/* Command pkt */
244typedef struct hci_cmd_pkt_t { 244typedef struct hci_cmd_pkt_t {
245 A_UINT16 opcode; 245 u16 opcode;
246 u8 param_length; 246 u8 param_length;
247 u8 params[255]; 247 u8 params[255];
248} POSTPACK HCI_CMD_PKT; 248} POSTPACK HCI_CMD_PKT;
@@ -250,8 +250,8 @@ typedef struct hci_cmd_pkt_t {
250#define ACL_DATA_HDR_SIZE 4 /* hdl_and flags + data_len */ 250#define ACL_DATA_HDR_SIZE 4 /* hdl_and flags + data_len */
251/* Data pkt */ 251/* Data pkt */
252typedef struct hci_acl_data_pkt_t { 252typedef struct hci_acl_data_pkt_t {
253 A_UINT16 hdl_and_flags; 253 u16 hdl_and_flags;
254 A_UINT16 data_len; 254 u16 data_len;
255 u8 data[Max80211_PAL_PDU_Size]; 255 u8 data[Max80211_PAL_PDU_Size];
256} POSTPACK HCI_ACL_DATA_PKT; 256} POSTPACK HCI_ACL_DATA_PKT;
257 257
@@ -265,7 +265,7 @@ typedef struct hci_event_pkt_t {
265 265
266/*============== HCI Command definitions ======================= */ 266/*============== HCI Command definitions ======================= */
267typedef struct hci_cmd_phy_link_t { 267typedef struct hci_cmd_phy_link_t {
268 A_UINT16 opcode; 268 u16 opcode;
269 u8 param_length; 269 u8 param_length;
270 u8 phy_link_hdl; 270 u8 phy_link_hdl;
271 u8 link_key_len; 271 u8 link_key_len;
@@ -274,62 +274,62 @@ typedef struct hci_cmd_phy_link_t {
274} POSTPACK HCI_CMD_PHY_LINK; 274} POSTPACK HCI_CMD_PHY_LINK;
275 275
276typedef struct hci_cmd_write_rem_amp_assoc_t { 276typedef struct hci_cmd_write_rem_amp_assoc_t {
277 A_UINT16 opcode; 277 u16 opcode;
278 u8 param_length; 278 u8 param_length;
279 u8 phy_link_hdl; 279 u8 phy_link_hdl;
280 A_UINT16 len_so_far; 280 u16 len_so_far;
281 A_UINT16 amp_assoc_remaining_len; 281 u16 amp_assoc_remaining_len;
282 u8 amp_assoc_frag[AMP_ASSOC_MAX_FRAG_SZ]; 282 u8 amp_assoc_frag[AMP_ASSOC_MAX_FRAG_SZ];
283} POSTPACK HCI_CMD_WRITE_REM_AMP_ASSOC; 283} POSTPACK HCI_CMD_WRITE_REM_AMP_ASSOC;
284 284
285 285
286typedef struct hci_cmd_opcode_hdl_t { 286typedef struct hci_cmd_opcode_hdl_t {
287 A_UINT16 opcode; 287 u16 opcode;
288 u8 param_length; 288 u8 param_length;
289 A_UINT16 hdl; 289 u16 hdl;
290} POSTPACK HCI_CMD_READ_LINK_QUAL, 290} POSTPACK HCI_CMD_READ_LINK_QUAL,
291 HCI_CMD_FLUSH, 291 HCI_CMD_FLUSH,
292 HCI_CMD_READ_LINK_SUPERVISION_TIMEOUT; 292 HCI_CMD_READ_LINK_SUPERVISION_TIMEOUT;
293 293
294typedef struct hci_cmd_read_local_amp_assoc_t { 294typedef struct hci_cmd_read_local_amp_assoc_t {
295 A_UINT16 opcode; 295 u16 opcode;
296 u8 param_length; 296 u8 param_length;
297 u8 phy_link_hdl; 297 u8 phy_link_hdl;
298 A_UINT16 len_so_far; 298 u16 len_so_far;
299 A_UINT16 max_rem_amp_assoc_len; 299 u16 max_rem_amp_assoc_len;
300} POSTPACK HCI_CMD_READ_LOCAL_AMP_ASSOC; 300} POSTPACK HCI_CMD_READ_LOCAL_AMP_ASSOC;
301 301
302 302
303typedef struct hci_cmd_set_event_mask_t { 303typedef struct hci_cmd_set_event_mask_t {
304 A_UINT16 opcode; 304 u16 opcode;
305 u8 param_length; 305 u8 param_length;
306 A_UINT64 mask; 306 A_UINT64 mask;
307}POSTPACK HCI_CMD_SET_EVT_MASK, HCI_CMD_SET_EVT_MASK_PG_2; 307}POSTPACK HCI_CMD_SET_EVT_MASK, HCI_CMD_SET_EVT_MASK_PG_2;
308 308
309 309
310typedef struct hci_cmd_enhanced_flush_t{ 310typedef struct hci_cmd_enhanced_flush_t{
311 A_UINT16 opcode; 311 u16 opcode;
312 u8 param_length; 312 u8 param_length;
313 A_UINT16 hdl; 313 u16 hdl;
314 u8 type; 314 u8 type;
315} POSTPACK HCI_CMD_ENHANCED_FLUSH; 315} POSTPACK HCI_CMD_ENHANCED_FLUSH;
316 316
317 317
318typedef struct hci_cmd_write_timeout_t { 318typedef struct hci_cmd_write_timeout_t {
319 A_UINT16 opcode; 319 u16 opcode;
320 u8 param_length; 320 u8 param_length;
321 A_UINT16 timeout; 321 u16 timeout;
322} POSTPACK HCI_CMD_WRITE_TIMEOUT; 322} POSTPACK HCI_CMD_WRITE_TIMEOUT;
323 323
324typedef struct hci_cmd_write_link_supervision_timeout_t { 324typedef struct hci_cmd_write_link_supervision_timeout_t {
325 A_UINT16 opcode; 325 u16 opcode;
326 u8 param_length; 326 u8 param_length;
327 A_UINT16 hdl; 327 u16 hdl;
328 A_UINT16 timeout; 328 u16 timeout;
329} POSTPACK HCI_CMD_WRITE_LINK_SUPERVISION_TIMEOUT; 329} POSTPACK HCI_CMD_WRITE_LINK_SUPERVISION_TIMEOUT;
330 330
331typedef struct hci_cmd_write_flow_control_t { 331typedef struct hci_cmd_write_flow_control_t {
332 A_UINT16 opcode; 332 u16 opcode;
333 u8 param_length; 333 u8 param_length;
334 u8 mode; 334 u8 mode;
335} POSTPACK HCI_CMD_WRITE_FLOW_CONTROL; 335} POSTPACK HCI_CMD_WRITE_FLOW_CONTROL;
@@ -341,7 +341,7 @@ typedef struct location_data_cfg_t {
341} POSTPACK LOCATION_DATA_CFG; 341} POSTPACK LOCATION_DATA_CFG;
342 342
343typedef struct hci_cmd_write_location_data_t { 343typedef struct hci_cmd_write_location_data_t {
344 A_UINT16 opcode; 344 u16 opcode;
345 u8 param_length; 345 u8 param_length;
346 LOCATION_DATA_CFG cfg; 346 LOCATION_DATA_CFG cfg;
347} POSTPACK HCI_CMD_WRITE_LOCATION_DATA; 347} POSTPACK HCI_CMD_WRITE_LOCATION_DATA;
@@ -350,7 +350,7 @@ typedef struct hci_cmd_write_location_data_t {
350typedef struct flow_spec_t { 350typedef struct flow_spec_t {
351 u8 id; 351 u8 id;
352 u8 service_type; 352 u8 service_type;
353 A_UINT16 max_sdu; 353 u16 max_sdu;
354 A_UINT32 sdu_inter_arrival_time; 354 A_UINT32 sdu_inter_arrival_time;
355 A_UINT32 access_latency; 355 A_UINT32 access_latency;
356 A_UINT32 flush_timeout; 356 A_UINT32 flush_timeout;
@@ -358,7 +358,7 @@ typedef struct flow_spec_t {
358 358
359 359
360typedef struct hci_cmd_create_logical_link_t { 360typedef struct hci_cmd_create_logical_link_t {
361 A_UINT16 opcode; 361 u16 opcode;
362 u8 param_length; 362 u8 param_length;
363 u8 phy_link_hdl; 363 u8 phy_link_hdl;
364 FLOW_SPEC tx_flow_spec; 364 FLOW_SPEC tx_flow_spec;
@@ -366,34 +366,34 @@ typedef struct hci_cmd_create_logical_link_t {
366} POSTPACK HCI_CMD_CREATE_LOGICAL_LINK; 366} POSTPACK HCI_CMD_CREATE_LOGICAL_LINK;
367 367
368typedef struct hci_cmd_flow_spec_modify_t { 368typedef struct hci_cmd_flow_spec_modify_t {
369 A_UINT16 opcode; 369 u16 opcode;
370 u8 param_length; 370 u8 param_length;
371 A_UINT16 hdl; 371 u16 hdl;
372 FLOW_SPEC tx_flow_spec; 372 FLOW_SPEC tx_flow_spec;
373 FLOW_SPEC rx_flow_spec; 373 FLOW_SPEC rx_flow_spec;
374} POSTPACK HCI_CMD_FLOW_SPEC_MODIFY; 374} POSTPACK HCI_CMD_FLOW_SPEC_MODIFY;
375 375
376typedef struct hci_cmd_logical_link_cancel_t { 376typedef struct hci_cmd_logical_link_cancel_t {
377 A_UINT16 opcode; 377 u16 opcode;
378 u8 param_length; 378 u8 param_length;
379 u8 phy_link_hdl; 379 u8 phy_link_hdl;
380 u8 tx_flow_spec_id; 380 u8 tx_flow_spec_id;
381} POSTPACK HCI_CMD_LOGICAL_LINK_CANCEL; 381} POSTPACK HCI_CMD_LOGICAL_LINK_CANCEL;
382 382
383typedef struct hci_cmd_disconnect_logical_link_t { 383typedef struct hci_cmd_disconnect_logical_link_t {
384 A_UINT16 opcode; 384 u16 opcode;
385 u8 param_length; 385 u8 param_length;
386 A_UINT16 logical_link_hdl; 386 u16 logical_link_hdl;
387} POSTPACK HCI_CMD_DISCONNECT_LOGICAL_LINK; 387} POSTPACK HCI_CMD_DISCONNECT_LOGICAL_LINK;
388 388
389typedef struct hci_cmd_disconnect_phy_link_t { 389typedef struct hci_cmd_disconnect_phy_link_t {
390 A_UINT16 opcode; 390 u16 opcode;
391 u8 param_length; 391 u8 param_length;
392 u8 phy_link_hdl; 392 u8 phy_link_hdl;
393} POSTPACK HCI_CMD_DISCONNECT_PHY_LINK; 393} POSTPACK HCI_CMD_DISCONNECT_PHY_LINK;
394 394
395typedef struct hci_cmd_srm_t { 395typedef struct hci_cmd_srm_t {
396 A_UINT16 opcode; 396 u16 opcode;
397 u8 param_length; 397 u8 param_length;
398 u8 phy_link_hdl; 398 u8 phy_link_hdl;
399 u8 mode; 399 u8 mode;
@@ -409,7 +409,7 @@ typedef struct hci_event_cmd_complete_t {
409 u8 event_code; 409 u8 event_code;
410 u8 param_len; 410 u8 param_len;
411 u8 num_hci_cmd_pkts; 411 u8 num_hci_cmd_pkts;
412 A_UINT16 opcode; 412 u16 opcode;
413 u8 params[255]; 413 u8 params[255];
414} POSTPACK HCI_EVENT_CMD_COMPLETE; 414} POSTPACK HCI_EVENT_CMD_COMPLETE;
415 415
@@ -420,7 +420,7 @@ typedef struct hci_event_cmd_status_t {
420 u8 param_len; 420 u8 param_len;
421 u8 status; 421 u8 status;
422 u8 num_hci_cmd_pkts; 422 u8 num_hci_cmd_pkts;
423 A_UINT16 opcode; 423 u16 opcode;
424} POSTPACK HCI_EVENT_CMD_STATUS; 424} POSTPACK HCI_EVENT_CMD_STATUS;
425 425
426/* Hardware Error event */ 426/* Hardware Error event */
@@ -435,7 +435,7 @@ typedef struct hci_event_hw_err_t {
435typedef struct hci_event_handle_t { 435typedef struct hci_event_handle_t {
436 u8 event_code; 436 u8 event_code;
437 u8 param_len; 437 u8 param_len;
438 A_UINT16 handle; 438 u16 handle;
439} POSTPACK HCI_EVENT_FLUSH_OCCRD, 439} POSTPACK HCI_EVENT_FLUSH_OCCRD,
440 HCI_EVENT_QOS_VIOLATION; 440 HCI_EVENT_QOS_VIOLATION;
441 441
@@ -457,7 +457,7 @@ typedef struct hci_data_buf_overflow_t {
457typedef struct hci_enhanced_flush_complt_t{ 457typedef struct hci_enhanced_flush_complt_t{
458 u8 event_code; 458 u8 event_code;
459 u8 param_len; 459 u8 param_len;
460 A_UINT16 hdl; 460 u16 hdl;
461} POSTPACK HCI_EVENT_ENHANCED_FLUSH_COMPLT; 461} POSTPACK HCI_EVENT_ENHANCED_FLUSH_COMPLT;
462 462
463/* Channel select event */ 463/* Channel select event */
@@ -480,7 +480,7 @@ typedef struct hci_event_logical_link_complete_event_t {
480 u8 event_code; 480 u8 event_code;
481 u8 param_len; 481 u8 param_len;
482 u8 status; 482 u8 status;
483 A_UINT16 logical_link_hdl; 483 u16 logical_link_hdl;
484 u8 phy_hdl; 484 u8 phy_hdl;
485 u8 tx_flow_id; 485 u8 tx_flow_id;
486} POSTPACK HCI_EVENT_LOGICAL_LINK_COMPLETE_EVENT; 486} POSTPACK HCI_EVENT_LOGICAL_LINK_COMPLETE_EVENT;
@@ -490,7 +490,7 @@ typedef struct hci_event_disconnect_logical_link_event_t {
490 u8 event_code; 490 u8 event_code;
491 u8 param_len; 491 u8 param_len;
492 u8 status; 492 u8 status;
493 A_UINT16 logical_link_hdl; 493 u16 logical_link_hdl;
494 u8 reason; 494 u8 reason;
495} POSTPACK HCI_EVENT_DISCONNECT_LOGICAL_LINK_EVENT; 495} POSTPACK HCI_EVENT_DISCONNECT_LOGICAL_LINK_EVENT;
496 496
@@ -523,7 +523,7 @@ typedef struct hci_event_status_handle_t {
523 u8 event_code; 523 u8 event_code;
524 u8 param_len; 524 u8 param_len;
525 u8 status; 525 u8 status;
526 A_UINT16 handle; 526 u16 handle;
527} POSTPACK HCI_EVENT_FLOW_SPEC_MODIFY, 527} POSTPACK HCI_EVENT_FLOW_SPEC_MODIFY,
528 HCI_EVENT_FLUSH; 528 HCI_EVENT_FLUSH;
529 529
@@ -532,7 +532,7 @@ typedef struct hci_event_status_handle_t {
532typedef struct hci_event_num_of_compl_data_blks_t { 532typedef struct hci_event_num_of_compl_data_blks_t {
533 u8 event_code; 533 u8 event_code;
534 u8 param_len; 534 u8 param_len;
535 A_UINT16 num_data_blks; 535 u16 num_data_blks;
536 u8 num_handles; 536 u8 num_handles;
537 u8 params[255]; 537 u8 params[255];
538} POSTPACK HCI_EVENT_NUM_COMPL_DATA_BLKS; 538} POSTPACK HCI_EVENT_NUM_COMPL_DATA_BLKS;
@@ -564,8 +564,8 @@ typedef struct local_amp_info_resp_t {
564 A_UINT32 min_latency; 564 A_UINT32 min_latency;
565 A_UINT32 max_pdu_size; 565 A_UINT32 max_pdu_size;
566 u8 amp_type; 566 u8 amp_type;
567 A_UINT16 pal_capabilities; 567 u16 pal_capabilities;
568 A_UINT16 amp_assoc_len; 568 u16 amp_assoc_len;
569 A_UINT32 max_flush_timeout; /* in ms */ 569 A_UINT32 max_flush_timeout; /* in ms */
570 A_UINT32 be_flush_timeout; /* in ms */ 570 A_UINT32 be_flush_timeout; /* in ms */
571} POSTPACK LOCAL_AMP_INFO; 571} POSTPACK LOCAL_AMP_INFO;
@@ -573,7 +573,7 @@ typedef struct local_amp_info_resp_t {
573typedef struct amp_assoc_cmd_resp_t{ 573typedef struct amp_assoc_cmd_resp_t{
574 u8 status; 574 u8 status;
575 u8 phy_hdl; 575 u8 phy_hdl;
576 A_UINT16 amp_assoc_len; 576 u16 amp_assoc_len;
577 u8 amp_assoc_frag[AMP_ASSOC_MAX_FRAG_SZ]; 577 u8 amp_assoc_frag[AMP_ASSOC_MAX_FRAG_SZ];
578}POSTPACK AMP_ASSOC_CMD_RESP; 578}POSTPACK AMP_ASSOC_CMD_RESP;
579 579
@@ -619,18 +619,18 @@ enum PAL_HCI_CMD_STATUS {
619 */ 619 */
620typedef struct timeout_read_t { 620typedef struct timeout_read_t {
621 u8 status; 621 u8 status;
622 A_UINT16 timeout; 622 u16 timeout;
623}POSTPACK TIMEOUT_INFO; 623}POSTPACK TIMEOUT_INFO;
624 624
625typedef struct link_supervision_timeout_read_t { 625typedef struct link_supervision_timeout_read_t {
626 u8 status; 626 u8 status;
627 A_UINT16 hdl; 627 u16 hdl;
628 A_UINT16 timeout; 628 u16 timeout;
629}POSTPACK LINK_SUPERVISION_TIMEOUT_INFO; 629}POSTPACK LINK_SUPERVISION_TIMEOUT_INFO;
630 630
631typedef struct status_hdl_t { 631typedef struct status_hdl_t {
632 u8 status; 632 u8 status;
633 A_UINT16 hdl; 633 u16 hdl;
634}POSTPACK INFO_STATUS_HDL; 634}POSTPACK INFO_STATUS_HDL;
635 635
636typedef struct write_remote_amp_assoc_t{ 636typedef struct write_remote_amp_assoc_t{
@@ -650,15 +650,15 @@ typedef struct read_flow_ctrl_mode_t {
650 650
651typedef struct read_data_blk_size_t { 651typedef struct read_data_blk_size_t {
652 u8 status; 652 u8 status;
653 A_UINT16 max_acl_data_pkt_len; 653 u16 max_acl_data_pkt_len;
654 A_UINT16 data_block_len; 654 u16 data_block_len;
655 A_UINT16 total_num_data_blks; 655 u16 total_num_data_blks;
656}POSTPACK READ_DATA_BLK_SIZE_INFO; 656}POSTPACK READ_DATA_BLK_SIZE_INFO;
657 657
658/* Read Link quality info */ 658/* Read Link quality info */
659typedef struct link_qual_t { 659typedef struct link_qual_t {
660 u8 status; 660 u8 status;
661 A_UINT16 hdl; 661 u16 hdl;
662 u8 link_qual; 662 u8 link_qual;
663} POSTPACK READ_LINK_QUAL_INFO, 663} POSTPACK READ_LINK_QUAL_INFO,
664 READ_RSSI_INFO; 664 READ_RSSI_INFO;
@@ -672,10 +672,10 @@ typedef struct ll_cancel_resp_t {
672typedef struct read_local_ver_info_t { 672typedef struct read_local_ver_info_t {
673 u8 status; 673 u8 status;
674 u8 hci_version; 674 u8 hci_version;
675 A_UINT16 hci_revision; 675 u16 hci_revision;
676 u8 pal_version; 676 u8 pal_version;
677 A_UINT16 manf_name; 677 u16 manf_name;
678 A_UINT16 pal_sub_ver; 678 u16 pal_sub_ver;
679} POSTPACK READ_LOCAL_VER_INFO; 679} POSTPACK READ_LOCAL_VER_INFO;
680 680
681 681
diff --git a/drivers/staging/ath6kl/include/common/dset_internal.h b/drivers/staging/ath6kl/include/common/dset_internal.h
index 2460f0ecf12..74914f9cb3c 100644
--- a/drivers/staging/ath6kl/include/common/dset_internal.h
+++ b/drivers/staging/ath6kl/include/common/dset_internal.h
@@ -42,8 +42,8 @@
42typedef PREPACK struct dset_descriptor_s { 42typedef PREPACK struct dset_descriptor_s {
43 struct dset_descriptor_s *next; /* List link. NULL only at the last 43 struct dset_descriptor_s *next; /* List link. NULL only at the last
44 descriptor */ 44 descriptor */
45 A_UINT16 id; /* Dset ID */ 45 u16 id; /* Dset ID */
46 A_UINT16 size; /* Dset size. */ 46 u16 size; /* Dset size. */
47 void *DataPtr; /* Pointer to raw data for standard 47 void *DataPtr; /* Pointer to raw data for standard
48 DataSet or pointer to original 48 DataSet or pointer to original
49 dset_descriptor for patched 49 dset_descriptor for patched
diff --git a/drivers/staging/ath6kl/include/common/epping_test.h b/drivers/staging/ath6kl/include/common/epping_test.h
index 061884dfb33..45f82dd7923 100644
--- a/drivers/staging/ath6kl/include/common/epping_test.h
+++ b/drivers/staging/ath6kl/include/common/epping_test.h
@@ -56,13 +56,13 @@ typedef PREPACK struct {
56 u8 TimeStamp[8]; /* timestamp of packet (host or target) */ 56 u8 TimeStamp[8]; /* timestamp of packet (host or target) */
57 A_UINT32 HostContext_h; /* 4 byte host context, target echos this back */ 57 A_UINT32 HostContext_h; /* 4 byte host context, target echos this back */
58 A_UINT32 SeqNo; /* sequence number (set by host or target) */ 58 A_UINT32 SeqNo; /* sequence number (set by host or target) */
59 A_UINT16 Cmd_h; /* ping command (filled by host) */ 59 u16 Cmd_h; /* ping command (filled by host) */
60 A_UINT16 CmdFlags_h; /* optional flags */ 60 u16 CmdFlags_h; /* optional flags */
61 u8 CmdBuffer_h[8]; /* buffer for command (host -> target) */ 61 u8 CmdBuffer_h[8]; /* buffer for command (host -> target) */
62 u8 CmdBuffer_t[8]; /* buffer for command (target -> host) */ 62 u8 CmdBuffer_t[8]; /* buffer for command (target -> host) */
63 A_UINT16 DataLength; /* length of data */ 63 u16 DataLength; /* length of data */
64 A_UINT16 DataCRC; /* 16 bit CRC of data */ 64 u16 DataCRC; /* 16 bit CRC of data */
65 A_UINT16 HeaderCRC; /* header CRC (fields : StreamNo_h to end, minus HeaderCRC) */ 65 u16 HeaderCRC; /* header CRC (fields : StreamNo_h to end, minus HeaderCRC) */
66} POSTPACK EPPING_HEADER; 66} POSTPACK EPPING_HEADER;
67 67
68#define EPPING_PING_MAGIC_0 0xAA 68#define EPPING_PING_MAGIC_0 0xAA
@@ -97,9 +97,9 @@ typedef PREPACK struct {
97 97
98 /* test command parameters may be no more than 8 bytes */ 98 /* test command parameters may be no more than 8 bytes */
99typedef PREPACK struct { 99typedef PREPACK struct {
100 A_UINT16 BurstCnt; /* number of packets to burst together (for HTC 2.1 testing) */ 100 u16 BurstCnt; /* number of packets to burst together (for HTC 2.1 testing) */
101 A_UINT16 PacketLength; /* length of packet to generate including header */ 101 u16 PacketLength; /* length of packet to generate including header */
102 A_UINT16 Flags; /* flags */ 102 u16 Flags; /* flags */
103 103
104#define EPPING_CONT_RX_DATA_CRC (1 << 0) /* Add CRC to all data */ 104#define EPPING_CONT_RX_DATA_CRC (1 << 0) /* Add CRC to all data */
105#define EPPING_CONT_RX_RANDOM_DATA (1 << 1) /* randomize the data pattern */ 105#define EPPING_CONT_RX_RANDOM_DATA (1 << 1) /* randomize the data pattern */
@@ -107,7 +107,7 @@ typedef PREPACK struct {
107} POSTPACK EPPING_CONT_RX_PARAMS; 107} POSTPACK EPPING_CONT_RX_PARAMS;
108 108
109#define EPPING_HDR_CRC_OFFSET A_OFFSETOF(EPPING_HEADER,StreamNo_h) 109#define EPPING_HDR_CRC_OFFSET A_OFFSETOF(EPPING_HEADER,StreamNo_h)
110#define EPPING_HDR_BYTES_CRC (sizeof(EPPING_HEADER) - EPPING_HDR_CRC_OFFSET - (sizeof(A_UINT16))) 110#define EPPING_HDR_BYTES_CRC (sizeof(EPPING_HEADER) - EPPING_HDR_CRC_OFFSET - (sizeof(u16)))
111 111
112#define HCI_TRANSPORT_STREAM_NUM 16 /* this number is higher than the define WMM AC classes so we 112#define HCI_TRANSPORT_STREAM_NUM 16 /* this number is higher than the define WMM AC classes so we
113 can use this to distinguish packets */ 113 can use this to distinguish packets */
diff --git a/drivers/staging/ath6kl/include/common/gmboxif.h b/drivers/staging/ath6kl/include/common/gmboxif.h
index 374007569d6..dd9afbd78ff 100644
--- a/drivers/staging/ath6kl/include/common/gmboxif.h
+++ b/drivers/staging/ath6kl/include/common/gmboxif.h
@@ -41,17 +41,17 @@
41 41
42 /* definitions for BT HCI packets */ 42 /* definitions for BT HCI packets */
43typedef PREPACK struct { 43typedef PREPACK struct {
44 A_UINT16 Flags_ConnHandle; 44 u16 Flags_ConnHandle;
45 A_UINT16 Length; 45 u16 Length;
46} POSTPACK BT_HCI_ACL_HEADER; 46} POSTPACK BT_HCI_ACL_HEADER;
47 47
48typedef PREPACK struct { 48typedef PREPACK struct {
49 A_UINT16 Flags_ConnHandle; 49 u16 Flags_ConnHandle;
50 u8 Length; 50 u8 Length;
51} POSTPACK BT_HCI_SCO_HEADER; 51} POSTPACK BT_HCI_SCO_HEADER;
52 52
53typedef PREPACK struct { 53typedef PREPACK struct {
54 A_UINT16 OpCode; 54 u16 OpCode;
55 u8 ParamLength; 55 u8 ParamLength;
56} POSTPACK BT_HCI_COMMAND_HEADER; 56} POSTPACK BT_HCI_COMMAND_HEADER;
57 57
diff --git a/drivers/staging/ath6kl/include/common/htc.h b/drivers/staging/ath6kl/include/common/htc.h
index 13a24da3af8..6c85bebd994 100644
--- a/drivers/staging/ath6kl/include/common/htc.h
+++ b/drivers/staging/ath6kl/include/common/htc.h
@@ -31,7 +31,7 @@
31#define A_OFFSETOF(type,field) (unsigned long)(&(((type *)NULL)->field)) 31#define A_OFFSETOF(type,field) (unsigned long)(&(((type *)NULL)->field))
32 32
33#define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \ 33#define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \
34 (((A_UINT16)(((u8 *)(p))[(highbyte)])) << 8 | (A_UINT16)(((u8 *)(p))[(lowbyte)])) 34 (((u16)(((u8 *)(p))[(highbyte)])) << 8 | (u16)(((u8 *)(p))[(lowbyte)]))
35 35
36/* alignment independent macros (little-endian) to fetch UINT16s or UINT8s from a 36/* alignment independent macros (little-endian) to fetch UINT16s or UINT8s from a
37 * structure using only the type and field name. 37 * structure using only the type and field name.
@@ -71,7 +71,7 @@ typedef PREPACK struct _HTC_FRAME_HDR{
71 * to take advantage of 4-byte lookaheads in some hardware implementations */ 71 * to take advantage of 4-byte lookaheads in some hardware implementations */
72 u8 EndpointID; 72 u8 EndpointID;
73 u8 Flags; 73 u8 Flags;
74 A_UINT16 PayloadLen; /* length of data (including trailer) that follows the header */ 74 u16 PayloadLen; /* length of data (including trailer) that follows the header */
75 75
76 /***** end of 4-byte lookahead ****/ 76 /***** end of 4-byte lookahead ****/
77 77
@@ -110,15 +110,15 @@ typedef PREPACK struct _HTC_FRAME_HDR{
110 110
111/* base message ID header */ 111/* base message ID header */
112typedef PREPACK struct { 112typedef PREPACK struct {
113 A_UINT16 MessageID; 113 u16 MessageID;
114} POSTPACK HTC_UNKNOWN_MSG; 114} POSTPACK HTC_UNKNOWN_MSG;
115 115
116/* HTC ready message 116/* HTC ready message
117 * direction : target-to-host */ 117 * direction : target-to-host */
118typedef PREPACK struct { 118typedef PREPACK struct {
119 A_UINT16 MessageID; /* ID */ 119 u16 MessageID; /* ID */
120 A_UINT16 CreditCount; /* number of credits the target can offer */ 120 u16 CreditCount; /* number of credits the target can offer */
121 A_UINT16 CreditSize; /* size of each credit */ 121 u16 CreditSize; /* size of each credit */
122 u8 MaxEndpoints; /* maximum number of endpoints the target has resources for */ 122 u8 MaxEndpoints; /* maximum number of endpoints the target has resources for */
123 u8 _Pad1; 123 u8 _Pad1;
124} POSTPACK HTC_READY_MSG; 124} POSTPACK HTC_READY_MSG;
@@ -139,9 +139,9 @@ typedef PREPACK struct {
139/* connect service 139/* connect service
140 * direction : host-to-target */ 140 * direction : host-to-target */
141typedef PREPACK struct { 141typedef PREPACK struct {
142 A_UINT16 MessageID; 142 u16 MessageID;
143 A_UINT16 ServiceID; /* service ID of the service to connect to */ 143 u16 ServiceID; /* service ID of the service to connect to */
144 A_UINT16 ConnectionFlags; /* connection flags */ 144 u16 ConnectionFlags; /* connection flags */
145 145
146#define HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE (1 << 2) /* reduce credit dribbling when 146#define HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE (1 << 2) /* reduce credit dribbling when
147 the host needs credits */ 147 the host needs credits */
@@ -161,11 +161,11 @@ typedef PREPACK struct {
161/* connect response 161/* connect response
162 * direction : target-to-host */ 162 * direction : target-to-host */
163typedef PREPACK struct { 163typedef PREPACK struct {
164 A_UINT16 MessageID; 164 u16 MessageID;
165 A_UINT16 ServiceID; /* service ID that the connection request was made */ 165 u16 ServiceID; /* service ID that the connection request was made */
166 u8 Status; /* service connection status */ 166 u8 Status; /* service connection status */
167 u8 EndpointID; /* assigned endpoint ID */ 167 u8 EndpointID; /* assigned endpoint ID */
168 A_UINT16 MaxMsgSize; /* maximum expected message size on this endpoint */ 168 u16 MaxMsgSize; /* maximum expected message size on this endpoint */
169 u8 ServiceMetaLength; /* length of meta data that follows */ 169 u8 ServiceMetaLength; /* length of meta data that follows */
170 u8 _Pad1; 170 u8 _Pad1;
171 171
@@ -174,13 +174,13 @@ typedef PREPACK struct {
174} POSTPACK HTC_CONNECT_SERVICE_RESPONSE_MSG; 174} POSTPACK HTC_CONNECT_SERVICE_RESPONSE_MSG;
175 175
176typedef PREPACK struct { 176typedef PREPACK struct {
177 A_UINT16 MessageID; 177 u16 MessageID;
178 /* currently, no other fields */ 178 /* currently, no other fields */
179} POSTPACK HTC_SETUP_COMPLETE_MSG; 179} POSTPACK HTC_SETUP_COMPLETE_MSG;
180 180
181 /* extended setup completion message */ 181 /* extended setup completion message */
182typedef PREPACK struct { 182typedef PREPACK struct {
183 A_UINT16 MessageID; 183 u16 MessageID;
184 A_UINT32 SetupFlags; 184 A_UINT32 SetupFlags;
185 u8 MaxMsgsPerBundledRecv; 185 u8 MaxMsgsPerBundledRecv;
186 u8 Rsvd[3]; 186 u8 Rsvd[3];
diff --git a/drivers/staging/ath6kl/include/common/ini_dset.h b/drivers/staging/ath6kl/include/common/ini_dset.h
index 8cf1af834bd..d6f2301f571 100644
--- a/drivers/staging/ath6kl/include/common/ini_dset.h
+++ b/drivers/staging/ath6kl/include/common/ini_dset.h
@@ -74,8 +74,8 @@ typedef enum {
74} WHAL_INI_DATA_ID; 74} WHAL_INI_DATA_ID;
75 75
76typedef PREPACK struct { 76typedef PREPACK struct {
77 A_UINT16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common 77 u16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common
78 A_UINT16 offset; 78 u16 offset;
79 A_UINT32 newValue; 79 A_UINT32 newValue;
80} POSTPACK INI_DSET_REG_OVERRIDE; 80} POSTPACK INI_DSET_REG_OVERRIDE;
81 81
diff --git a/drivers/staging/ath6kl/include/common/pkt_log.h b/drivers/staging/ath6kl/include/common/pkt_log.h
index 331cc04edad..a3719adf54c 100644
--- a/drivers/staging/ath6kl/include/common/pkt_log.h
+++ b/drivers/staging/ath6kl/include/common/pkt_log.h
@@ -31,11 +31,11 @@ extern "C" {
31/* Pkt log info */ 31/* Pkt log info */
32typedef PREPACK struct pkt_log_t { 32typedef PREPACK struct pkt_log_t {
33 struct info_t { 33 struct info_t {
34 A_UINT16 st; 34 u16 st;
35 A_UINT16 end; 35 u16 end;
36 A_UINT16 cur; 36 u16 cur;
37 }info[4096]; 37 }info[4096];
38 A_UINT16 last_idx; 38 u16 last_idx;
39}POSTPACK PACKET_LOG; 39}POSTPACK PACKET_LOG;
40 40
41 41
diff --git a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
index a50e9eb2458..36e266fe02d 100644
--- a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
+++ b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
@@ -128,7 +128,7 @@ typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structure
128 char entrySize; /* Entry size per table row */ 128 char entrySize; /* Entry size per table row */
129 char searchType; /* Index based access or key based */ 129 char searchType; /* Index based access or key based */
130 char reserved[3]; /* for alignment */ 130 char reserved[3]; /* for alignment */
131 A_UINT16 tableSize; /* Size of this table */ 131 u16 tableSize; /* Size of this table */
132 char *dataPtr; /* Ptr to the actual Table */ 132 char *dataPtr; /* Ptr to the actual Table */
133} POSTPACK dbMasterTable; /* Master table - table of tables */ 133} POSTPACK dbMasterTable; /* Master table - table of tables */
134 134
@@ -169,9 +169,9 @@ typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structure
169 */ 169 */
170 170
171typedef PREPACK struct reg_dmn_pair_mapping { 171typedef PREPACK struct reg_dmn_pair_mapping {
172 A_UINT16 regDmnEnum; /* 16 bit reg domain pair */ 172 u16 regDmnEnum; /* 16 bit reg domain pair */
173 A_UINT16 regDmn5GHz; /* 5GHz reg domain */ 173 u16 regDmn5GHz; /* 5GHz reg domain */
174 A_UINT16 regDmn2GHz; /* 2GHz reg domain */ 174 u16 regDmn2GHz; /* 2GHz reg domain */
175 u8 flags5GHz; /* Requirements flags (AdHoc disallow etc) */ 175 u8 flags5GHz; /* Requirements flags (AdHoc disallow etc) */
176 u8 flags2GHz; /* Requirements flags (AdHoc disallow etc) */ 176 u8 flags2GHz; /* Requirements flags (AdHoc disallow etc) */
177 A_UINT32 pscanMask; /* Passive Scan flags which can override unitary domain passive scan 177 A_UINT32 pscanMask; /* Passive Scan flags which can override unitary domain passive scan
@@ -188,8 +188,8 @@ typedef PREPACK struct reg_dmn_pair_mapping {
188#define MCS_HT40_G_NO (0 << 3) 188#define MCS_HT40_G_NO (0 << 3)
189 189
190typedef PREPACK struct { 190typedef PREPACK struct {
191 A_UINT16 countryCode; 191 u16 countryCode;
192 A_UINT16 regDmnEnum; 192 u16 regDmnEnum;
193 char isoName[3]; 193 char isoName[3];
194 char allowMode; /* what mode is allowed - bit 0: OFDM; bit 1: MCS_HT20; bit 2: MCS_HT40_A; bit 3: MCS_HT40_G */ 194 char allowMode; /* what mode is allowed - bit 0: OFDM; bit 1: MCS_HT20; bit 2: MCS_HT40_A; bit 3: MCS_HT40_G */
195} POSTPACK COUNTRY_CODE_TO_ENUM_RD; 195} POSTPACK COUNTRY_CODE_TO_ENUM_RD;
@@ -209,8 +209,8 @@ typedef PREPACK struct {
209#define FREQ_QUARTER_RATE 0x20000 209#define FREQ_QUARTER_RATE 0x20000
210 210
211typedef PREPACK struct RegDmnFreqBand { 211typedef PREPACK struct RegDmnFreqBand {
212 A_UINT16 lowChannel; /* Low channel center in MHz */ 212 u16 lowChannel; /* Low channel center in MHz */
213 A_UINT16 highChannel; /* High Channel center in MHz */ 213 u16 highChannel; /* High Channel center in MHz */
214 u8 power; /* Max power (dBm) for channel range */ 214 u8 power; /* Max power (dBm) for channel range */
215 u8 channelSep; /* Channel separation within the band */ 215 u8 channelSep; /* Channel separation within the band */
216 u8 useDfs; /* Use DFS in the RegDomain if corresponding bit is set */ 216 u8 useDfs; /* Use DFS in the RegDomain if corresponding bit is set */
@@ -223,12 +223,12 @@ typedef PREPACK struct RegDmnFreqBand {
223 223
224 224
225typedef PREPACK struct regDomain { 225typedef PREPACK struct regDomain {
226 A_UINT16 regDmnEnum; /* value from EnumRd table */ 226 u16 regDmnEnum; /* value from EnumRd table */
227 u8 rdCTL; 227 u8 rdCTL;
228 u8 maxAntGain; 228 u8 maxAntGain;
229 u8 dfsMask; /* DFS bitmask for 5Ghz tables */ 229 u8 dfsMask; /* DFS bitmask for 5Ghz tables */
230 u8 flags; /* Requirement flags (AdHoc disallow etc) */ 230 u8 flags; /* Requirement flags (AdHoc disallow etc) */
231 A_UINT16 reserved; /* for alignment */ 231 u16 reserved; /* for alignment */
232 A_UINT32 pscan; /* Bitmask for passive scan */ 232 A_UINT32 pscan; /* Bitmask for passive scan */
233 A_UINT32 chan11a[BMLEN]; /* 64 bit bitmask for channel/band selection */ 233 A_UINT32 chan11a[BMLEN]; /* 64 bit bitmask for channel/band selection */
234 A_UINT32 chan11bg[BMLEN];/* 64 bit bitmask for channel/band selection */ 234 A_UINT32 chan11bg[BMLEN];/* 64 bit bitmask for channel/band selection */
diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h
index d6616f0fab7..4138c1d13d1 100644
--- a/drivers/staging/ath6kl/include/common/testcmd.h
+++ b/drivers/staging/ath6kl/include/common/testcmd.h
@@ -91,8 +91,8 @@ typedef PREPACK struct {
91 A_UINT32 enANI; 91 A_UINT32 enANI;
92 A_UINT32 scramblerOff; 92 A_UINT32 scramblerOff;
93 A_UINT32 aifsn; 93 A_UINT32 aifsn;
94 A_UINT16 pktSz; 94 u16 pktSz;
95 A_UINT16 txPattern; 95 u16 txPattern;
96 A_UINT32 shortGuard; 96 A_UINT32 shortGuard;
97 A_UINT32 numPackets; 97 A_UINT32 numPackets;
98 A_UINT32 wlanMode; 98 A_UINT32 wlanMode;
@@ -138,8 +138,8 @@ typedef PREPACK struct {
138 A_INT32 rssiInDBm; 138 A_INT32 rssiInDBm;
139 A_UINT32 crcErrPkt; 139 A_UINT32 crcErrPkt;
140 A_UINT32 secErrPkt; 140 A_UINT32 secErrPkt;
141 A_UINT16 rateCnt[TCMD_MAX_RATES]; 141 u16 rateCnt[TCMD_MAX_RATES];
142 A_UINT16 rateCntShortGuard[TCMD_MAX_RATES]; 142 u16 rateCntShortGuard[TCMD_MAX_RATES];
143 } POSTPACK report; 143 } POSTPACK report;
144 struct PREPACK TCMD_CONT_RX_MAC { 144 struct PREPACK TCMD_CONT_RX_MAC {
145 A_UCHAR addr[ATH_MAC_LEN]; 145 A_UCHAR addr[ATH_MAC_LEN];
diff --git a/drivers/staging/ath6kl/include/common/wlan_dset.h b/drivers/staging/ath6kl/include/common/wlan_dset.h
index e092020a263..e775b25de3a 100644
--- a/drivers/staging/ath6kl/include/common/wlan_dset.h
+++ b/drivers/staging/ath6kl/include/common/wlan_dset.h
@@ -27,7 +27,7 @@ typedef PREPACK struct wow_config_dset {
27 27
28 u8 valid_dset; 28 u8 valid_dset;
29 u8 gpio_enable; 29 u8 gpio_enable;
30 A_UINT16 gpio_pin; 30 u16 gpio_pin;
31} POSTPACK WOW_CONFIG_DSET; 31} POSTPACK WOW_CONFIG_DSET;
32 32
33#endif 33#endif
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h
index d39e7282ec2..d4f8d404b6e 100644
--- a/drivers/staging/ath6kl/include/common/wmi.h
+++ b/drivers/staging/ath6kl/include/common/wmi.h
@@ -79,7 +79,7 @@ PREPACK struct host_app_area_s {
79typedef PREPACK struct { 79typedef PREPACK struct {
80 u8 dstMac[ATH_MAC_LEN]; 80 u8 dstMac[ATH_MAC_LEN];
81 u8 srcMac[ATH_MAC_LEN]; 81 u8 srcMac[ATH_MAC_LEN];
82 A_UINT16 typeOrLen; 82 u16 typeOrLen;
83} POSTPACK ATH_MAC_HDR; 83} POSTPACK ATH_MAC_HDR;
84 84
85typedef PREPACK struct { 85typedef PREPACK struct {
@@ -87,7 +87,7 @@ typedef PREPACK struct {
87 u8 ssap; 87 u8 ssap;
88 u8 cntl; 88 u8 cntl;
89 u8 orgCode[3]; 89 u8 orgCode[3];
90 A_UINT16 etherType; 90 u16 etherType;
91} POSTPACK ATH_LLC_SNAP_HDR; 91} POSTPACK ATH_LLC_SNAP_HDR;
92 92
93typedef enum { 93typedef enum {
@@ -170,12 +170,12 @@ typedef PREPACK struct {
170 * ACL data(2) 170 * ACL data(2)
171 */ 171 */
172 172
173 A_UINT16 info2; /* usage of 'info2' field(16-bit): 173 u16 info2; /* usage of 'info2' field(16-bit):
174 * b11:b0 - seq_no 174 * b11:b0 - seq_no
175 * b12 - A-MSDU? 175 * b12 - A-MSDU?
176 * b15:b13 - META_DATA_VERSION 0 - 7 176 * b15:b13 - META_DATA_VERSION 0 - 7
177 */ 177 */
178 A_UINT16 reserved; 178 u16 reserved;
179} POSTPACK WMI_DATA_HDR; 179} POSTPACK WMI_DATA_HDR;
180 180
181/* 181/*
@@ -246,12 +246,12 @@ typedef PREPACK struct {
246 u8 rix; /* rate index mapped to rate at which this packet was received. */ 246 u8 rix; /* rate index mapped to rate at which this packet was received. */
247 u8 rssi; /* rssi of packet */ 247 u8 rssi; /* rssi of packet */
248 u8 channel;/* rf channel during packet reception */ 248 u8 channel;/* rf channel during packet reception */
249 A_UINT16 flags; /* a combination of WMI_RX_FLAGS_... */ 249 u16 flags; /* a combination of WMI_RX_FLAGS_... */
250} POSTPACK WMI_RX_META_V1; 250} POSTPACK WMI_RX_META_V1;
251 251
252#define RX_CSUM_VALID_FLAG (0x1) 252#define RX_CSUM_VALID_FLAG (0x1)
253typedef PREPACK struct { 253typedef PREPACK struct {
254 A_UINT16 csum; 254 u16 csum;
255 u8 csumFlags;/* bit 0 set -partial csum valid 255 u8 csumFlags;/* bit 0 set -partial csum valid
256 bit 1 set -test mode */ 256 bit 1 set -test mode */
257} POSTPACK WMI_RX_META_V2; 257} POSTPACK WMI_RX_META_V2;
@@ -264,15 +264,15 @@ typedef PREPACK struct {
264 * Control Path 264 * Control Path
265 */ 265 */
266typedef PREPACK struct { 266typedef PREPACK struct {
267 A_UINT16 commandId; 267 u16 commandId;
268/* 268/*
269 * info1 - 16 bits 269 * info1 - 16 bits
270 * b03:b00 - id 270 * b03:b00 - id
271 * b15:b04 - unused 271 * b15:b04 - unused
272 */ 272 */
273 A_UINT16 info1; 273 u16 info1;
274 274
275 A_UINT16 reserved; /* For alignment */ 275 u16 reserved; /* For alignment */
276} POSTPACK WMI_CMD_HDR; /* used for commands and events */ 276} POSTPACK WMI_CMD_HDR; /* used for commands and events */
277 277
278/* 278/*
@@ -531,7 +531,7 @@ typedef PREPACK struct {
531 u8 groupCryptoLen; 531 u8 groupCryptoLen;
532 u8 ssidLength; 532 u8 ssidLength;
533 A_UCHAR ssid[WMI_MAX_SSID_LEN]; 533 A_UCHAR ssid[WMI_MAX_SSID_LEN];
534 A_UINT16 channel; 534 u16 channel;
535 u8 bssid[ATH_MAC_LEN]; 535 u8 bssid[ATH_MAC_LEN];
536 A_UINT32 ctrl_flags; 536 A_UINT32 ctrl_flags;
537} POSTPACK WMI_CONNECT_CMD; 537} POSTPACK WMI_CONNECT_CMD;
@@ -540,7 +540,7 @@ typedef PREPACK struct {
540 * WMI_RECONNECT_CMDID 540 * WMI_RECONNECT_CMDID
541 */ 541 */
542typedef PREPACK struct { 542typedef PREPACK struct {
543 A_UINT16 channel; /* hint */ 543 u16 channel; /* hint */
544 u8 bssid[ATH_MAC_LEN]; /* mandatory if set */ 544 u8 bssid[ATH_MAC_LEN]; /* mandatory if set */
545} POSTPACK WMI_RECONNECT_CMD; 545} POSTPACK WMI_RECONNECT_CMD;
546 546
@@ -641,7 +641,7 @@ typedef PREPACK struct {
641 A_UINT32 forceScanInterval; /* Time interval between scans (milliseconds)*/ 641 A_UINT32 forceScanInterval; /* Time interval between scans (milliseconds)*/
642 u8 scanType; /* WMI_SCAN_TYPE */ 642 u8 scanType; /* WMI_SCAN_TYPE */
643 u8 numChannels; /* how many channels follow */ 643 u8 numChannels; /* how many channels follow */
644 A_UINT16 channelList[1]; /* channels in Mhz */ 644 u16 channelList[1]; /* channels in Mhz */
645} POSTPACK WMI_START_SCAN_CMD; 645} POSTPACK WMI_START_SCAN_CMD;
646 646
647/* 647/*
@@ -676,15 +676,15 @@ typedef enum {
676 676
677 677
678typedef PREPACK struct { 678typedef PREPACK struct {
679 A_UINT16 fg_start_period; /* seconds */ 679 u16 fg_start_period; /* seconds */
680 A_UINT16 fg_end_period; /* seconds */ 680 u16 fg_end_period; /* seconds */
681 A_UINT16 bg_period; /* seconds */ 681 u16 bg_period; /* seconds */
682 A_UINT16 maxact_chdwell_time; /* msec */ 682 u16 maxact_chdwell_time; /* msec */
683 A_UINT16 pas_chdwell_time; /* msec */ 683 u16 pas_chdwell_time; /* msec */
684 u8 shortScanRatio; /* how many shorts scan for one long */ 684 u8 shortScanRatio; /* how many shorts scan for one long */
685 u8 scanCtrlFlags; 685 u8 scanCtrlFlags;
686 A_UINT16 minact_chdwell_time; /* msec */ 686 u16 minact_chdwell_time; /* msec */
687 A_UINT16 maxact_scan_per_ssid; /* max active scans per ssid */ 687 u16 maxact_scan_per_ssid; /* max active scans per ssid */
688 A_UINT32 max_dfsch_act_time; /* msecs */ 688 A_UINT32 max_dfsch_act_time; /* msecs */
689} POSTPACK WMI_SCAN_PARAMS_CMD; 689} POSTPACK WMI_SCAN_PARAMS_CMD;
690 690
@@ -705,7 +705,7 @@ typedef enum {
705typedef PREPACK struct { 705typedef PREPACK struct {
706 u8 bssFilter; /* see WMI_BSS_FILTER */ 706 u8 bssFilter; /* see WMI_BSS_FILTER */
707 u8 reserved1; /* For alignment */ 707 u8 reserved1; /* For alignment */
708 A_UINT16 reserved2; /* For alignment */ 708 u16 reserved2; /* For alignment */
709 A_UINT32 ieMask; 709 A_UINT32 ieMask;
710} POSTPACK WMI_BSS_FILTER_CMD; 710} POSTPACK WMI_BSS_FILTER_CMD;
711 711
@@ -737,15 +737,15 @@ typedef PREPACK struct {
737#define MAX_LISTEN_BEACONS 50 737#define MAX_LISTEN_BEACONS 50
738 738
739typedef PREPACK struct { 739typedef PREPACK struct {
740 A_UINT16 listenInterval; 740 u16 listenInterval;
741 A_UINT16 numBeacons; 741 u16 numBeacons;
742} POSTPACK WMI_LISTEN_INT_CMD; 742} POSTPACK WMI_LISTEN_INT_CMD;
743 743
744/* 744/*
745 * WMI_SET_BEACON_INT_CMDID 745 * WMI_SET_BEACON_INT_CMDID
746 */ 746 */
747typedef PREPACK struct { 747typedef PREPACK struct {
748 A_UINT16 beaconInterval; 748 u16 beaconInterval;
749} POSTPACK WMI_BEACON_INT_CMD; 749} POSTPACK WMI_BEACON_INT_CMD;
750 750
751/* 751/*
@@ -759,8 +759,8 @@ typedef PREPACK struct {
759#define MAX_BMISS_BEACONS 50 759#define MAX_BMISS_BEACONS 50
760 760
761typedef PREPACK struct { 761typedef PREPACK struct {
762 A_UINT16 bmissTime; 762 u16 bmissTime;
763 A_UINT16 numBeacons; 763 u16 numBeacons;
764} POSTPACK WMI_BMISS_TIME_CMD; 764} POSTPACK WMI_BMISS_TIME_CMD;
765 765
766/* 766/*
@@ -819,12 +819,12 @@ typedef enum {
819} POWER_SAVE_FAIL_EVENT_POLICY; 819} POWER_SAVE_FAIL_EVENT_POLICY;
820 820
821typedef PREPACK struct { 821typedef PREPACK struct {
822 A_UINT16 idle_period; /* msec */ 822 u16 idle_period; /* msec */
823 A_UINT16 pspoll_number; 823 u16 pspoll_number;
824 A_UINT16 dtim_policy; 824 u16 dtim_policy;
825 A_UINT16 tx_wakeup_policy; 825 u16 tx_wakeup_policy;
826 A_UINT16 num_tx_to_wakeup; 826 u16 num_tx_to_wakeup;
827 A_UINT16 ps_fail_event_policy; 827 u16 ps_fail_event_policy;
828} POSTPACK WMI_POWER_PARAMS_CMD; 828} POSTPACK WMI_POWER_PARAMS_CMD;
829 829
830/* Adhoc power save types */ 830/* Adhoc power save types */
@@ -838,8 +838,8 @@ typedef enum {
838typedef PREPACK struct { 838typedef PREPACK struct {
839 u8 power_saving; 839 u8 power_saving;
840 u8 ttl; /* number of beacon periods */ 840 u8 ttl; /* number of beacon periods */
841 A_UINT16 atim_windows; /* msec */ 841 u16 atim_windows; /* msec */
842 A_UINT16 timeout_value; /* msec */ 842 u16 timeout_value; /* msec */
843} POSTPACK WMI_IBSS_PM_CAPS_CMD; 843} POSTPACK WMI_IBSS_PM_CAPS_CMD;
844 844
845/* AP power save types */ 845/* AP power save types */
@@ -866,8 +866,8 @@ typedef enum {
866} APSD_TIM_POLICY; 866} APSD_TIM_POLICY;
867 867
868typedef PREPACK struct { 868typedef PREPACK struct {
869 A_UINT16 psPollTimeout; /* msec */ 869 u16 psPollTimeout; /* msec */
870 A_UINT16 triggerTimeout; /* msec */ 870 u16 triggerTimeout; /* msec */
871 A_UINT32 apsdTimPolicy; /* TIM behavior with ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */ 871 A_UINT32 apsdTimPolicy; /* TIM behavior with ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */
872 A_UINT32 simulatedAPSDTimPolicy; /* TIM behavior with simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */ 872 A_UINT32 simulatedAPSDTimPolicy; /* TIM behavior with simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */
873} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD; 873} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD;
@@ -876,7 +876,7 @@ typedef PREPACK struct {
876 * WMI_SET_VOICE_PKT_SIZE_CMDID 876 * WMI_SET_VOICE_PKT_SIZE_CMDID
877 */ 877 */
878typedef PREPACK struct { 878typedef PREPACK struct {
879 A_UINT16 voicePktSize; 879 u16 voicePktSize;
880} POSTPACK WMI_SET_VOICE_PKT_SIZE_CMD; 880} POSTPACK WMI_SET_VOICE_PKT_SIZE_CMD;
881 881
882/* 882/*
@@ -941,8 +941,8 @@ typedef PREPACK struct {
941 A_UINT32 minPhyRate; /* in bps */ 941 A_UINT32 minPhyRate; /* in bps */
942 A_UINT32 sba; 942 A_UINT32 sba;
943 A_UINT32 mediumTime; 943 A_UINT32 mediumTime;
944 A_UINT16 nominalMSDU; /* in octects */ 944 u16 nominalMSDU; /* in octects */
945 A_UINT16 maxMSDU; /* in octects */ 945 u16 maxMSDU; /* in octects */
946 u8 trafficClass; 946 u8 trafficClass;
947 u8 trafficDirection; /* DIR_TYPE */ 947 u8 trafficDirection; /* DIR_TYPE */
948 u8 rxQueueNum; 948 u8 rxQueueNum;
@@ -982,7 +982,7 @@ typedef PREPACK struct {
982 u8 scanParam; /* set if enable scan */ 982 u8 scanParam; /* set if enable scan */
983 u8 phyMode; /* see WMI_PHY_MODE */ 983 u8 phyMode; /* see WMI_PHY_MODE */
984 u8 numChannels; /* how many channels follow */ 984 u8 numChannels; /* how many channels follow */
985 A_UINT16 channelList[1]; /* channels in Mhz */ 985 u16 channelList[1]; /* channels in Mhz */
986} POSTPACK WMI_CHANNEL_PARAMS_CMD; 986} POSTPACK WMI_CHANNEL_PARAMS_CMD;
987 987
988 988
@@ -1063,7 +1063,7 @@ typedef PREPACK struct {
1063}POSTPACK WMI_SET_LPREAMBLE_CMD; 1063}POSTPACK WMI_SET_LPREAMBLE_CMD;
1064 1064
1065typedef PREPACK struct { 1065typedef PREPACK struct {
1066 A_UINT16 threshold; 1066 u16 threshold;
1067}POSTPACK WMI_SET_RTS_CMD; 1067}POSTPACK WMI_SET_RTS_CMD;
1068 1068
1069/* 1069/*
@@ -1132,7 +1132,7 @@ typedef PREPACK struct {
1132#define WMI_DEFAULT_AIFSN_ACPARAM 2 1132#define WMI_DEFAULT_AIFSN_ACPARAM 2
1133#define WMI_MAX_AIFSN_ACPARAM 15 1133#define WMI_MAX_AIFSN_ACPARAM 15
1134typedef PREPACK struct { 1134typedef PREPACK struct {
1135 A_UINT16 txop; /* in units of 32 usec */ 1135 u16 txop; /* in units of 32 usec */
1136 u8 eCWmin; 1136 u8 eCWmin;
1137 u8 eCWmax; 1137 u8 eCWmax;
1138 u8 aifsn; 1138 u8 aifsn;
@@ -1208,7 +1208,7 @@ typedef PREPACK struct {
1208} POSTPACK WMI_BSS_BIAS_INFO; 1208} POSTPACK WMI_BSS_BIAS_INFO;
1209 1209
1210typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS { 1210typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS {
1211 A_UINT16 lowrssi_scan_period; 1211 u16 lowrssi_scan_period;
1212 A_INT16 lowrssi_scan_threshold; 1212 A_INT16 lowrssi_scan_threshold;
1213 A_INT16 lowrssi_roam_threshold; 1213 A_INT16 lowrssi_roam_threshold;
1214 u8 roam_rssi_floor; 1214 u8 roam_rssi_floor;
@@ -1866,7 +1866,7 @@ typedef PREPACK struct {
1866 1866
1867 1867
1868typedef PREPACK struct { 1868typedef PREPACK struct {
1869 A_UINT16 cmd_buf_sz; /* HCI cmd buffer size */ 1869 u16 cmd_buf_sz; /* HCI cmd buffer size */
1870 u8 buf[1]; /* Absolute HCI cmd */ 1870 u8 buf[1]; /* Absolute HCI cmd */
1871} POSTPACK WMI_HCI_CMD; 1871} POSTPACK WMI_HCI_CMD;
1872 1872
@@ -1880,7 +1880,7 @@ typedef PREPACK struct {
1880typedef PREPACK struct { 1880typedef PREPACK struct {
1881 u8 reserved1; 1881 u8 reserved1;
1882 u8 numChannels; /* number of channels in reply */ 1882 u8 numChannels; /* number of channels in reply */
1883 A_UINT16 channelList[1]; /* channel in Mhz */ 1883 u16 channelList[1]; /* channel in Mhz */
1884} POSTPACK WMI_CHANNEL_LIST_REPLY; 1884} POSTPACK WMI_CHANNEL_LIST_REPLY;
1885 1885
1886typedef enum { 1886typedef enum {
@@ -2002,10 +2002,10 @@ typedef PREPACK struct {
2002 * Connect Event 2002 * Connect Event
2003 */ 2003 */
2004typedef PREPACK struct { 2004typedef PREPACK struct {
2005 A_UINT16 channel; 2005 u16 channel;
2006 u8 bssid[ATH_MAC_LEN]; 2006 u8 bssid[ATH_MAC_LEN];
2007 A_UINT16 listenInterval; 2007 u16 listenInterval;
2008 A_UINT16 beaconInterval; 2008 u16 beaconInterval;
2009 A_UINT32 networkType; 2009 A_UINT32 networkType;
2010 u8 beaconIeLen; 2010 u8 beaconIeLen;
2011 u8 assocReqLen; 2011 u8 assocReqLen;
@@ -2033,7 +2033,7 @@ typedef enum {
2033} WMI_DISCONNECT_REASON; 2033} WMI_DISCONNECT_REASON;
2034 2034
2035typedef PREPACK struct { 2035typedef PREPACK struct {
2036 A_UINT16 protocolReasonStatus; /* reason code, see 802.11 spec. */ 2036 u16 protocolReasonStatus; /* reason code, see 802.11 spec. */
2037 u8 bssid[ATH_MAC_LEN]; /* set if known */ 2037 u8 bssid[ATH_MAC_LEN]; /* set if known */
2038 u8 disconnectReason ; /* see WMI_DISCONNECT_REASON */ 2038 u8 disconnectReason ; /* see WMI_DISCONNECT_REASON */
2039 u8 assocRespLen; 2039 u8 assocRespLen;
@@ -2059,7 +2059,7 @@ enum {
2059}; 2059};
2060 2060
2061typedef PREPACK struct { 2061typedef PREPACK struct {
2062 A_UINT16 channel; 2062 u16 channel;
2063 u8 frameType; /* see WMI_BI_FTYPE */ 2063 u8 frameType; /* see WMI_BI_FTYPE */
2064 u8 snr; 2064 u8 snr;
2065 A_INT16 rssi; 2065 A_INT16 rssi;
@@ -2076,11 +2076,11 @@ typedef PREPACK struct {
2076 * - Remove rssi and compute it on the host. rssi = snr - 95 2076 * - Remove rssi and compute it on the host. rssi = snr - 95
2077 */ 2077 */
2078typedef PREPACK struct { 2078typedef PREPACK struct {
2079 A_UINT16 channel; 2079 u16 channel;
2080 u8 frameType; /* see WMI_BI_FTYPE */ 2080 u8 frameType; /* see WMI_BI_FTYPE */
2081 u8 snr; 2081 u8 snr;
2082 u8 bssid[ATH_MAC_LEN]; 2082 u8 bssid[ATH_MAC_LEN];
2083 A_UINT16 ieMask; 2083 u16 ieMask;
2084} POSTPACK WMI_BSS_INFO_HDR2; 2084} POSTPACK WMI_BSS_INFO_HDR2;
2085 2085
2086/* 2086/*
@@ -2093,7 +2093,7 @@ typedef enum {
2093} WMI_ERROR_CODE; 2093} WMI_ERROR_CODE;
2094 2094
2095typedef PREPACK struct { 2095typedef PREPACK struct {
2096 A_UINT16 commandId; 2096 u16 commandId;
2097 u8 errorCode; 2097 u8 errorCode;
2098} POSTPACK WMI_CMD_ERROR_EVENT; 2098} POSTPACK WMI_CMD_ERROR_EVENT;
2099 2099
@@ -2190,7 +2190,7 @@ typedef enum {
2190} WMI_OPT_FTYPE; 2190} WMI_OPT_FTYPE;
2191 2191
2192typedef PREPACK struct { 2192typedef PREPACK struct {
2193 A_UINT16 optIEDataLen; 2193 u16 optIEDataLen;
2194 u8 frmType; 2194 u8 frmType;
2195 u8 dstAddr[ATH_MAC_LEN]; 2195 u8 dstAddr[ATH_MAC_LEN];
2196 u8 bssid[ATH_MAC_LEN]; 2196 u8 bssid[ATH_MAC_LEN];
@@ -2205,7 +2205,7 @@ typedef PREPACK struct {
2205 * The 802.11 header is not included. 2205 * The 802.11 header is not included.
2206 */ 2206 */
2207typedef PREPACK struct { 2207typedef PREPACK struct {
2208 A_UINT16 channel; 2208 u16 channel;
2209 u8 frameType; /* see WMI_OPT_FTYPE */ 2209 u8 frameType; /* see WMI_OPT_FTYPE */
2210 A_INT8 snr; 2210 A_INT8 snr;
2211 u8 srcAddr[ATH_MAC_LEN]; 2211 u8 srcAddr[ATH_MAC_LEN];
@@ -2266,19 +2266,19 @@ typedef PREPACK struct {
2266 2266
2267typedef PREPACK struct { 2267typedef PREPACK struct {
2268 A_UINT32 power_save_failure_cnt; 2268 A_UINT32 power_save_failure_cnt;
2269 A_UINT16 stop_tx_failure_cnt; 2269 u16 stop_tx_failure_cnt;
2270 A_UINT16 atim_tx_failure_cnt; 2270 u16 atim_tx_failure_cnt;
2271 A_UINT16 atim_rx_failure_cnt; 2271 u16 atim_rx_failure_cnt;
2272 A_UINT16 bcn_rx_failure_cnt; 2272 u16 bcn_rx_failure_cnt;
2273}POSTPACK pm_stats_t; 2273}POSTPACK pm_stats_t;
2274 2274
2275typedef PREPACK struct { 2275typedef PREPACK struct {
2276 A_UINT32 cs_bmiss_cnt; 2276 A_UINT32 cs_bmiss_cnt;
2277 A_UINT32 cs_lowRssi_cnt; 2277 A_UINT32 cs_lowRssi_cnt;
2278 A_UINT16 cs_connect_cnt; 2278 u16 cs_connect_cnt;
2279 A_UINT16 cs_disconnect_cnt; 2279 u16 cs_disconnect_cnt;
2280 A_INT16 cs_aveBeacon_rssi; 2280 A_INT16 cs_aveBeacon_rssi;
2281 A_UINT16 cs_roam_count; 2281 u16 cs_roam_count;
2282 A_INT16 cs_rssi; 2282 A_INT16 cs_rssi;
2283 u8 cs_snr; 2283 u8 cs_snr;
2284 u8 cs_aveBeacon_snr; 2284 u8 cs_aveBeacon_snr;
@@ -2299,7 +2299,7 @@ typedef PREPACK struct {
2299 2299
2300typedef PREPACK struct { 2300typedef PREPACK struct {
2301 A_UINT32 wow_num_pkts_dropped; 2301 A_UINT32 wow_num_pkts_dropped;
2302 A_UINT16 wow_num_events_discarded; 2302 u16 wow_num_events_discarded;
2303 u8 wow_num_host_pkt_wakeups; 2303 u8 wow_num_host_pkt_wakeups;
2304 u8 wow_num_host_event_wakeups; 2304 u8 wow_num_host_event_wakeups;
2305} POSTPACK wlan_wow_stats_t; 2305} POSTPACK wlan_wow_stats_t;
@@ -2409,8 +2409,8 @@ typedef PREPACK struct {
2409 2409
2410 2410
2411typedef PREPACK struct { 2411typedef PREPACK struct {
2412 A_UINT16 roamMode; 2412 u16 roamMode;
2413 A_UINT16 numEntries; 2413 u16 numEntries;
2414 WMI_BSS_ROAM_INFO bssRoamInfo[1]; 2414 WMI_BSS_ROAM_INFO bssRoamInfo[1];
2415} POSTPACK WMI_TARGET_ROAM_TBL; 2415} POSTPACK WMI_TARGET_ROAM_TBL;
2416 2416
@@ -2418,7 +2418,7 @@ typedef PREPACK struct {
2418 * WMI_HCI_EVENT_EVENTID 2418 * WMI_HCI_EVENT_EVENTID
2419 */ 2419 */
2420typedef PREPACK struct { 2420typedef PREPACK struct {
2421 A_UINT16 evt_buf_sz; /* HCI event buffer size */ 2421 u16 evt_buf_sz; /* HCI event buffer size */
2422 u8 buf[1]; /* HCI event */ 2422 u8 buf[1]; /* HCI event */
2423} POSTPACK WMI_HCI_EVENT; 2423} POSTPACK WMI_HCI_EVENT;
2424 2424
@@ -2451,7 +2451,7 @@ typedef enum {
2451 2451
2452typedef PREPACK struct { 2452typedef PREPACK struct {
2453 u8 bssid[ATH_MAC_LEN]; 2453 u8 bssid[ATH_MAC_LEN];
2454 A_UINT16 channel; 2454 u16 channel;
2455} POSTPACK WMI_AP_INFO_V1; 2455} POSTPACK WMI_AP_INFO_V1;
2456 2456
2457typedef PREPACK union { 2457typedef PREPACK union {
@@ -2728,7 +2728,7 @@ typedef enum {
2728typedef PREPACK struct { 2728typedef PREPACK struct {
2729 u32 enable_wow; 2729 u32 enable_wow;
2730 WMI_WOW_FILTER filter; 2730 WMI_WOW_FILTER filter;
2731 A_UINT16 hostReqDelay; 2731 u16 hostReqDelay;
2732} POSTPACK WMI_SET_WOW_MODE_CMD; 2732} POSTPACK WMI_SET_WOW_MODE_CMD;
2733 2733
2734typedef PREPACK struct { 2734typedef PREPACK struct {
@@ -2754,8 +2754,8 @@ typedef PREPACK struct {
2754} POSTPACK WMI_ADD_WOW_PATTERN_CMD; 2754} POSTPACK WMI_ADD_WOW_PATTERN_CMD;
2755 2755
2756typedef PREPACK struct { 2756typedef PREPACK struct {
2757 A_UINT16 filter_list_id; 2757 u16 filter_list_id;
2758 A_UINT16 filter_id; 2758 u16 filter_id;
2759} POSTPACK WMI_DEL_WOW_PATTERN_CMD; 2759} POSTPACK WMI_DEL_WOW_PATTERN_CMD;
2760 2760
2761typedef PREPACK struct { 2761typedef PREPACK struct {
@@ -2797,7 +2797,7 @@ typedef PREPACK struct {
2797} POSTPACK WMI_PMKID_LIST_REPLY; 2797} POSTPACK WMI_PMKID_LIST_REPLY;
2798 2798
2799typedef PREPACK struct { 2799typedef PREPACK struct {
2800 A_UINT16 oldChannel; 2800 u16 oldChannel;
2801 A_UINT32 newChannel; 2801 A_UINT32 newChannel;
2802} POSTPACK WMI_CHANNEL_CHANGE_EVENT; 2802} POSTPACK WMI_CHANNEL_CHANGE_EVENT;
2803 2803
@@ -2810,7 +2810,7 @@ typedef PREPACK struct {
2810typedef PREPACK struct { 2810typedef PREPACK struct {
2811 u8 tid; 2811 u8 tid;
2812 u8 win_sz; 2812 u8 win_sz;
2813 A_UINT16 st_seq_no; 2813 u16 st_seq_no;
2814 u8 status; /* f/w response for ADDBA Req; OK(0) or failure(!=0) */ 2814 u8 status; /* f/w response for ADDBA Req; OK(0) or failure(!=0) */
2815} POSTPACK WMI_ADDBA_REQ_EVENT; 2815} POSTPACK WMI_ADDBA_REQ_EVENT;
2816 2816
@@ -2818,7 +2818,7 @@ typedef PREPACK struct {
2818typedef PREPACK struct { 2818typedef PREPACK struct {
2819 u8 tid; 2819 u8 tid;
2820 u8 status; /* OK(0), failure (!=0) */ 2820 u8 status; /* OK(0), failure (!=0) */
2821 A_UINT16 amsdu_sz; /* Three values: Not supported(0), 3839, 8k */ 2821 u16 amsdu_sz; /* Three values: Not supported(0), 3839, 8k */
2822} POSTPACK WMI_ADDBA_RESP_EVENT; 2822} POSTPACK WMI_ADDBA_RESP_EVENT;
2823 2823
2824/* WMI_DELBA_EVENTID 2824/* WMI_DELBA_EVENTID
@@ -2828,7 +2828,7 @@ typedef PREPACK struct {
2828typedef PREPACK struct { 2828typedef PREPACK struct {
2829 u8 tid; 2829 u8 tid;
2830 u8 is_peer_initiator; 2830 u8 is_peer_initiator;
2831 A_UINT16 reason_code; 2831 u16 reason_code;
2832} POSTPACK WMI_DELBA_EVENT; 2832} POSTPACK WMI_DELBA_EVENT;
2833 2833
2834 2834
@@ -2847,8 +2847,8 @@ typedef PREPACK struct {
2847 * on each tid, in each direction 2847 * on each tid, in each direction
2848 */ 2848 */
2849typedef PREPACK struct { 2849typedef PREPACK struct {
2850 A_UINT16 tx_allow_aggr; /* 16-bit mask to allow uplink ADDBA negotiation - bit position indicates tid*/ 2850 u16 tx_allow_aggr; /* 16-bit mask to allow uplink ADDBA negotiation - bit position indicates tid*/
2851 A_UINT16 rx_allow_aggr; /* 16-bit mask to allow donwlink ADDBA negotiation - bit position indicates tid*/ 2851 u16 rx_allow_aggr; /* 16-bit mask to allow donwlink ADDBA negotiation - bit position indicates tid*/
2852} POSTPACK WMI_ALLOW_AGGR_CMD; 2852} POSTPACK WMI_ALLOW_AGGR_CMD;
2853 2853
2854/* WMI_ADDBA_REQ_CMDID 2854/* WMI_ADDBA_REQ_CMDID
@@ -2973,7 +2973,7 @@ typedef PREPACK struct {
2973} POSTPACK WMI_AP_ACL_MAC_CMD; 2973} POSTPACK WMI_AP_ACL_MAC_CMD;
2974 2974
2975typedef PREPACK struct { 2975typedef PREPACK struct {
2976 A_UINT16 index; 2976 u16 index;
2977 u8 acl_mac[AP_ACL_SIZE][ATH_MAC_LEN]; 2977 u8 acl_mac[AP_ACL_SIZE][ATH_MAC_LEN];
2978 u8 wildcard[AP_ACL_SIZE]; 2978 u8 wildcard[AP_ACL_SIZE];
2979 u8 policy; 2979 u8 policy;
@@ -2991,7 +2991,7 @@ typedef PREPACK struct {
2991 */ 2991 */
2992typedef PREPACK struct { 2992typedef PREPACK struct {
2993 u8 mac[ATH_MAC_LEN]; 2993 u8 mac[ATH_MAC_LEN];
2994 A_UINT16 reason; /* 802.11 reason code */ 2994 u16 reason; /* 802.11 reason code */
2995 u8 cmd; /* operation to perform */ 2995 u8 cmd; /* operation to perform */
2996#define WMI_AP_MLME_ASSOC 1 /* associate station */ 2996#define WMI_AP_MLME_ASSOC 1 /* associate station */
2997#define WMI_AP_DISASSOC 2 /* disassociate station */ 2997#define WMI_AP_DISASSOC 2 /* disassociate station */
@@ -3011,7 +3011,7 @@ typedef PREPACK struct {
3011 3011
3012typedef PREPACK struct { 3012typedef PREPACK struct {
3013 u32 flag; 3013 u32 flag;
3014 A_UINT16 aid; 3014 u16 aid;
3015} POSTPACK WMI_AP_SET_PVB_CMD; 3015} POSTPACK WMI_AP_SET_PVB_CMD;
3016 3016
3017#define WMI_DISABLE_REGULATORY_CODE "FF" 3017#define WMI_DISABLE_REGULATORY_CODE "FF"
@@ -3074,7 +3074,7 @@ typedef PREPACK struct {
3074/* AP mode events */ 3074/* AP mode events */
3075/* WMI_PS_POLL_EVENT */ 3075/* WMI_PS_POLL_EVENT */
3076typedef PREPACK struct { 3076typedef PREPACK struct {
3077 A_UINT16 aid; 3077 u16 aid;
3078} POSTPACK WMI_PSPOLL_EVENT; 3078} POSTPACK WMI_PSPOLL_EVENT;
3079 3079
3080typedef PREPACK struct { 3080typedef PREPACK struct {
diff --git a/drivers/staging/ath6kl/include/common/wmi_thin.h b/drivers/staging/ath6kl/include/common/wmi_thin.h
index 5444a0b9197..dee5e8aae42 100644
--- a/drivers/staging/ath6kl/include/common/wmi_thin.h
+++ b/drivers/staging/ath6kl/include/common/wmi_thin.h
@@ -103,7 +103,7 @@ typedef enum{
103typedef PREPACK struct { 103typedef PREPACK struct {
104 u8 version; /* the versioned type of messages to use or 0 to disable */ 104 u8 version; /* the versioned type of messages to use or 0 to disable */
105 u8 countThreshold; /* msg count threshold triggering a tx complete message */ 105 u8 countThreshold; /* msg count threshold triggering a tx complete message */
106 A_UINT16 timeThreshold; /* timeout interval in MSEC triggering a tx complete message */ 106 u16 timeThreshold; /* timeout interval in MSEC triggering a tx complete message */
107} POSTPACK WMI_THIN_CONFIG_TXCOMPLETE; 107} POSTPACK WMI_THIN_CONFIG_TXCOMPLETE;
108 108
109/* WMI_THIN_CONFIG_DECRYPT_ERR -- Used to configure behavior for received frames 109/* WMI_THIN_CONFIG_DECRYPT_ERR -- Used to configure behavior for received frames
@@ -139,7 +139,7 @@ typedef PREPACK struct {
139#define WMI_THIN_CFG_MAC_RULES 0x00000004 139#define WMI_THIN_CFG_MAC_RULES 0x00000004
140#define WMI_THIN_CFG_FILTER_RULES 0x00000008 140#define WMI_THIN_CFG_FILTER_RULES 0x00000008
141 A_UINT32 cfgField; /* combination of WMI_THIN_CFG_... describes contents of config command */ 141 A_UINT32 cfgField; /* combination of WMI_THIN_CFG_... describes contents of config command */
142 A_UINT16 length; /* length in bytes of appended sub-commands */ 142 u16 length; /* length in bytes of appended sub-commands */
143 u8 reserved[2]; /* align padding */ 143 u8 reserved[2]; /* align padding */
144} POSTPACK WMI_THIN_CONFIG_CMD; 144} POSTPACK WMI_THIN_CONFIG_CMD;
145 145
@@ -192,13 +192,13 @@ typedef PREPACK struct {
192} POSTPACK WMI_THIN_MIB_SLOT_TIME; 192} POSTPACK WMI_THIN_MIB_SLOT_TIME;
193 193
194typedef PREPACK struct { 194typedef PREPACK struct {
195 A_UINT16 length; //units == bytes 195 u16 length; //units == bytes
196} POSTPACK WMI_THIN_MIB_RTS_THRESHOLD; 196} POSTPACK WMI_THIN_MIB_RTS_THRESHOLD;
197 197
198typedef PREPACK struct { 198typedef PREPACK struct {
199 u8 type; // type of frame 199 u8 type; // type of frame
200 u8 rate; // tx rate to be used (one of WMI_BIT_RATE) 200 u8 rate; // tx rate to be used (one of WMI_BIT_RATE)
201 A_UINT16 length; // num bytes following this structure as the template data 201 u16 length; // num bytes following this structure as the template data
202} POSTPACK WMI_THIN_MIB_TEMPLATE_FRAME; 202} POSTPACK WMI_THIN_MIB_TEMPLATE_FRAME;
203 203
204typedef PREPACK struct { 204typedef PREPACK struct {
@@ -221,11 +221,11 @@ typedef PREPACK struct {
221 u8 treatment; 221 u8 treatment;
222 u8 oui[3]; 222 u8 oui[3];
223 u8 type; 223 u8 type;
224 A_UINT16 version; 224 u16 version;
225} POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_OUI; 225} POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_OUI;
226 226
227typedef PREPACK struct { 227typedef PREPACK struct {
228 A_UINT16 numElements; 228 u16 numElements;
229 u8 entrySize; // sizeof(WMI_THIN_MIB_BEACON_FILTER_TABLE) on host cpu may be 2 may be 4 229 u8 entrySize; // sizeof(WMI_THIN_MIB_BEACON_FILTER_TABLE) on host cpu may be 2 may be 4
230 u8 reserved; 230 u8 reserved;
231} POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_HEADER; 231} POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_HEADER;
@@ -290,7 +290,7 @@ typedef PREPACK struct {
290} POSTPACK WMI_THIN_MIB_PREAMBLE; 290} POSTPACK WMI_THIN_MIB_PREAMBLE;
291 291
292typedef PREPACK struct { 292typedef PREPACK struct {
293 A_UINT16 length; /* the length in bytes of the appended MIB data */ 293 u16 length; /* the length in bytes of the appended MIB data */
294 u8 mibID; /* the ID of the MIB element being set */ 294 u8 mibID; /* the ID of the MIB element being set */
295 u8 reserved; /* align padding */ 295 u8 reserved; /* align padding */
296} POSTPACK WMI_THIN_SET_MIB_CMD; 296} POSTPACK WMI_THIN_SET_MIB_CMD;
@@ -303,8 +303,8 @@ typedef PREPACK struct {
303typedef PREPACK struct { 303typedef PREPACK struct {
304 A_UINT32 basicRateMask; /* bit mask of basic rates */ 304 A_UINT32 basicRateMask; /* bit mask of basic rates */
305 A_UINT32 beaconIntval; /* TUs */ 305 A_UINT32 beaconIntval; /* TUs */
306 A_UINT16 atimWindow; /* TUs */ 306 u16 atimWindow; /* TUs */
307 A_UINT16 channel; /* frequency in Mhz */ 307 u16 channel; /* frequency in Mhz */
308 u8 networkType; /* INFRA_NETWORK | ADHOC_NETWORK */ 308 u8 networkType; /* INFRA_NETWORK | ADHOC_NETWORK */
309 u8 ssidLength; /* 0 - 32 */ 309 u8 ssidLength; /* 0 - 32 */
310 u8 probe; /* != 0 : issue probe req at start */ 310 u8 probe; /* != 0 : issue probe req at start */
@@ -314,8 +314,8 @@ typedef PREPACK struct {
314} POSTPACK WMI_THIN_JOIN_CMD; 314} POSTPACK WMI_THIN_JOIN_CMD;
315 315
316typedef PREPACK struct { 316typedef PREPACK struct {
317 A_UINT16 dtim; /* dtim interval in num beacons */ 317 u16 dtim; /* dtim interval in num beacons */
318 A_UINT16 aid; /* 80211 AID from Assoc resp */ 318 u16 aid; /* 80211 AID from Assoc resp */
319} POSTPACK WMI_THIN_POST_ASSOC_CMD; 319} POSTPACK WMI_THIN_POST_ASSOC_CMD;
320 320
321typedef enum { 321typedef enum {
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h
index 9059f249856..27d8fa281c9 100644
--- a/drivers/staging/ath6kl/include/htc_api.h
+++ b/drivers/staging/ath6kl/include/htc_api.h
@@ -41,7 +41,7 @@ extern "C" {
41 41
42typedef void *HTC_HANDLE; 42typedef void *HTC_HANDLE;
43 43
44typedef A_UINT16 HTC_SERVICE_ID; 44typedef u16 HTC_SERVICE_ID;
45 45
46typedef struct _HTC_INIT_INFO { 46typedef struct _HTC_INIT_INFO {
47 void *pContext; /* context for target failure notification */ 47 void *pContext; /* context for target failure notification */
@@ -141,7 +141,7 @@ typedef struct _HTC_EP_CALLBACKS {
141/* service connection information */ 141/* service connection information */
142typedef struct _HTC_SERVICE_CONNECT_REQ { 142typedef struct _HTC_SERVICE_CONNECT_REQ {
143 HTC_SERVICE_ID ServiceID; /* service ID to connect to */ 143 HTC_SERVICE_ID ServiceID; /* service ID to connect to */
144 A_UINT16 ConnectionFlags; /* connection flags, see htc protocol definition */ 144 u16 ConnectionFlags; /* connection flags, see htc protocol definition */
145 u8 *pMetaData; /* ptr to optional service-specific meta-data */ 145 u8 *pMetaData; /* ptr to optional service-specific meta-data */
146 u8 MetaDataLength; /* optional meta data length */ 146 u8 MetaDataLength; /* optional meta data length */
147 HTC_EP_CALLBACKS EpCallbacks; /* endpoint callbacks */ 147 HTC_EP_CALLBACKS EpCallbacks; /* endpoint callbacks */
diff --git a/drivers/staging/ath6kl/include/htc_packet.h b/drivers/staging/ath6kl/include/htc_packet.h
index 55914efd4be..bbf33d1564d 100644
--- a/drivers/staging/ath6kl/include/htc_packet.h
+++ b/drivers/staging/ath6kl/include/htc_packet.h
@@ -46,7 +46,7 @@ struct _HTC_PACKET;
46 46
47typedef void (* HTC_PACKET_COMPLETION)(void *,struct _HTC_PACKET *); 47typedef void (* HTC_PACKET_COMPLETION)(void *,struct _HTC_PACKET *);
48 48
49typedef A_UINT16 HTC_TX_TAG; 49typedef u16 HTC_TX_TAG;
50 50
51typedef struct _HTC_TX_PACKET_INFO { 51typedef struct _HTC_TX_PACKET_INFO {
52 HTC_TX_TAG Tag; /* tag used to selective flush packets */ 52 HTC_TX_TAG Tag; /* tag used to selective flush packets */
diff --git a/drivers/staging/ath6kl/include/wlan_api.h b/drivers/staging/ath6kl/include/wlan_api.h
index bbc9b1f1982..8fe804d6a21 100644
--- a/drivers/staging/ath6kl/include/wlan_api.h
+++ b/drivers/staging/ath6kl/include/wlan_api.h
@@ -35,7 +35,7 @@ struct ieee80211_node_table;
35struct ieee80211_frame; 35struct ieee80211_frame;
36 36
37struct ieee80211_common_ie { 37struct ieee80211_common_ie {
38 A_UINT16 ie_chan; 38 u16 ie_chan;
39 u8 *ie_tstamp; 39 u8 *ie_tstamp;
40 u8 *ie_ssid; 40 u8 *ie_ssid;
41 u8 *ie_rates; 41 u8 *ie_rates;
@@ -45,8 +45,8 @@ struct ieee80211_common_ie {
45 u8 *ie_rsn; 45 u8 *ie_rsn;
46 u8 *ie_wmm; 46 u8 *ie_wmm;
47 u8 *ie_ath; 47 u8 *ie_ath;
48 A_UINT16 ie_capInfo; 48 u16 ie_capInfo;
49 A_UINT16 ie_beaconInt; 49 u16 ie_beaconInt;
50 u8 *ie_tim; 50 u8 *ie_tim;
51 u8 *ie_chswitch; 51 u8 *ie_chswitch;
52 u8 ie_erp; 52 u8 ie_erp;
@@ -68,7 +68,7 @@ typedef struct bss {
68 struct bss *ni_hash_prev; 68 struct bss *ni_hash_prev;
69 struct ieee80211_common_ie ni_cie; 69 struct ieee80211_common_ie ni_cie;
70 u8 *ni_buf; 70 u8 *ni_buf;
71 A_UINT16 ni_framelen; 71 u16 ni_framelen;
72 struct ieee80211_node_table *ni_table; 72 struct ieee80211_node_table *ni_table;
73 A_UINT32 ni_refcnt; 73 A_UINT32 ni_refcnt;
74 int ni_scangen; 74 int ni_scangen;
@@ -99,8 +99,8 @@ void wlan_node_table_cleanup(struct ieee80211_node_table *nt);
99int wlan_parse_beacon(u8 *buf, int framelen, 99int wlan_parse_beacon(u8 *buf, int framelen,
100 struct ieee80211_common_ie *cie); 100 struct ieee80211_common_ie *cie);
101 101
102A_UINT16 wlan_ieee2freq(int chan); 102u16 wlan_ieee2freq(int chan);
103A_UINT32 wlan_freq2ieee(A_UINT16 freq); 103A_UINT32 wlan_freq2ieee(u16 freq);
104 104
105void wlan_set_nodeage(struct ieee80211_node_table *nt, A_UINT32 nodeAge); 105void wlan_set_nodeage(struct ieee80211_node_table *nt, A_UINT32 nodeAge);
106 106
diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h
index 3f622100e9b..a0310b66106 100644
--- a/drivers/staging/ath6kl/include/wmi_api.h
+++ b/drivers/staging/ath6kl/include/wmi_api.h
@@ -69,7 +69,7 @@ void wmi_qos_state_init(struct wmi_t *wmip);
69void wmi_shutdown(struct wmi_t *wmip); 69void wmi_shutdown(struct wmi_t *wmip);
70HTC_ENDPOINT_ID wmi_get_control_ep(struct wmi_t * wmip); 70HTC_ENDPOINT_ID wmi_get_control_ep(struct wmi_t * wmip);
71void wmi_set_control_ep(struct wmi_t * wmip, HTC_ENDPOINT_ID eid); 71void wmi_set_control_ep(struct wmi_t * wmip, HTC_ENDPOINT_ID eid);
72A_UINT16 wmi_get_mapped_qos_queue(struct wmi_t *, u8 ); 72u16 wmi_get_mapped_qos_queue(struct wmi_t *, u8 );
73int wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf); 73int wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf);
74int wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, u8 msgType, bool bMoreData, WMI_DATA_HDR_DATA_TYPE data_type,u8 metaVersion, void *pTxMetaS); 74int wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, u8 msgType, bool bMoreData, WMI_DATA_HDR_DATA_TYPE data_type,u8 metaVersion, void *pTxMetaS);
75int wmi_dot3_2_dix(void *osbuf); 75int wmi_dot3_2_dix(void *osbuf);
@@ -113,46 +113,46 @@ int wmi_connect_cmd(struct wmi_t *wmip,
113 int ssidLength, 113 int ssidLength,
114 A_UCHAR *ssid, 114 A_UCHAR *ssid,
115 u8 *bssid, 115 u8 *bssid,
116 A_UINT16 channel, 116 u16 channel,
117 A_UINT32 ctrl_flags); 117 A_UINT32 ctrl_flags);
118 118
119int wmi_reconnect_cmd(struct wmi_t *wmip, 119int wmi_reconnect_cmd(struct wmi_t *wmip,
120 u8 *bssid, 120 u8 *bssid,
121 A_UINT16 channel); 121 u16 channel);
122int wmi_disconnect_cmd(struct wmi_t *wmip); 122int wmi_disconnect_cmd(struct wmi_t *wmip);
123int wmi_getrev_cmd(struct wmi_t *wmip); 123int wmi_getrev_cmd(struct wmi_t *wmip);
124int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, 124int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
125 u32 forceFgScan, u32 isLegacy, 125 u32 forceFgScan, u32 isLegacy,
126 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, 126 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval,
127 A_INT8 numChan, A_UINT16 *channelList); 127 A_INT8 numChan, u16 *channelList);
128int wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec, 128int wmi_scanparams_cmd(struct wmi_t *wmip, u16 fg_start_sec,
129 A_UINT16 fg_end_sec, A_UINT16 bg_sec, 129 u16 fg_end_sec, u16 bg_sec,
130 A_UINT16 minact_chdw_msec, 130 u16 minact_chdw_msec,
131 A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec, 131 u16 maxact_chdw_msec, u16 pas_chdw_msec,
132 u8 shScanRatio, u8 scanCtrlFlags, 132 u8 shScanRatio, u8 scanCtrlFlags,
133 A_UINT32 max_dfsch_act_time, 133 A_UINT32 max_dfsch_act_time,
134 A_UINT16 maxact_scan_per_ssid); 134 u16 maxact_scan_per_ssid);
135int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, A_UINT32 ieMask); 135int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, A_UINT32 ieMask);
136int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag, 136int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag,
137 u8 ssidLength, A_UCHAR *ssid); 137 u8 ssidLength, A_UCHAR *ssid);
138int wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons); 138int wmi_listeninterval_cmd(struct wmi_t *wmip, u16 listenInterval, u16 listenBeacons);
139int wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons); 139int wmi_bmisstime_cmd(struct wmi_t *wmip, u16 bmisstime, u16 bmissbeacons);
140int wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType, 140int wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType,
141 u8 ieLen, u8 *ieInfo); 141 u8 ieLen, u8 *ieInfo);
142int wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode); 142int wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode);
143int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl, 143int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl,
144 A_UINT16 atim_windows, A_UINT16 timeout_value); 144 u16 atim_windows, u16 timeout_value);
145int wmi_apps_cmd(struct wmi_t *wmip, u8 psType, A_UINT32 idle_time, 145int wmi_apps_cmd(struct wmi_t *wmip, u8 psType, A_UINT32 idle_time,
146 A_UINT32 ps_period, u8 sleep_period); 146 A_UINT32 ps_period, u8 sleep_period);
147int wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod, 147int wmi_pmparams_cmd(struct wmi_t *wmip, u16 idlePeriod,
148 A_UINT16 psPollNum, A_UINT16 dtimPolicy, 148 u16 psPollNum, u16 dtimPolicy,
149 A_UINT16 wakup_tx_policy, A_UINT16 num_tx_to_wakeup, 149 u16 wakup_tx_policy, u16 num_tx_to_wakeup,
150 A_UINT16 ps_fail_event_policy); 150 u16 ps_fail_event_policy);
151int wmi_disctimeout_cmd(struct wmi_t *wmip, u8 timeout); 151int wmi_disctimeout_cmd(struct wmi_t *wmip, u8 timeout);
152int wmi_sync_cmd(struct wmi_t *wmip, u8 syncNumber); 152int wmi_sync_cmd(struct wmi_t *wmip, u8 syncNumber);
153int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream); 153int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream);
154int wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 streamID); 154int wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 streamID);
155int wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, A_UINT16 rateMask); 155int wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, u16 rateMask);
156int wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate); 156int wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate);
157int wmi_get_bitrate_cmd(struct wmi_t *wmip); 157int wmi_get_bitrate_cmd(struct wmi_t *wmip);
158A_INT8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, A_INT8 *rate_idx); 158A_INT8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, A_INT8 *rate_idx);
@@ -160,7 +160,7 @@ int wmi_get_regDomain_cmd(struct wmi_t *wmip);
160int wmi_get_channelList_cmd(struct wmi_t *wmip); 160int wmi_get_channelList_cmd(struct wmi_t *wmip);
161int wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam, 161int wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam,
162 WMI_PHY_MODE mode, A_INT8 numChan, 162 WMI_PHY_MODE mode, A_INT8 numChan,
163 A_UINT16 *channelList); 163 u16 *channelList);
164 164
165int wmi_set_snr_threshold_params(struct wmi_t *wmip, 165int wmi_set_snr_threshold_params(struct wmi_t *wmip,
166 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); 166 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd);
@@ -169,7 +169,7 @@ int wmi_set_rssi_threshold_params(struct wmi_t *wmip,
169int wmi_clr_rssi_snr(struct wmi_t *wmip); 169int wmi_clr_rssi_snr(struct wmi_t *wmip);
170int wmi_set_lq_threshold_params(struct wmi_t *wmip, 170int wmi_set_lq_threshold_params(struct wmi_t *wmip,
171 WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd); 171 WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd);
172int wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold); 172int wmi_set_rts_cmd(struct wmi_t *wmip, u16 threshold);
173int wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy); 173int wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy);
174 174
175int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); 175int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask);
@@ -177,8 +177,8 @@ int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask);
177int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, 177int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie,
178 A_UINT32 source); 178 A_UINT32 source);
179 179
180int wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask, 180int wmi_config_debug_module_cmd(struct wmi_t *wmip, u16 mmask,
181 A_UINT16 tsr, bool rep, A_UINT16 size, 181 u16 tsr, bool rep, u16 size,
182 A_UINT32 valid); 182 A_UINT32 valid);
183 183
184int wmi_get_stats_cmd(struct wmi_t *wmip); 184int wmi_get_stats_cmd(struct wmi_t *wmip);
@@ -204,7 +204,7 @@ int wmi_deleteBadAp_cmd(struct wmi_t *wmip, u8 apIndex);
204int wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, bool en); 204int wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, bool en);
205int wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId, 205int wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId,
206 bool set); 206 bool set);
207int wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, A_UINT16 txop, 207int wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, u16 txop,
208 u8 eCWmin, u8 eCWmax, 208 u8 eCWmin, u8 eCWmax,
209 u8 aifsn); 209 u8 aifsn);
210int wmi_set_retry_limits_cmd(struct wmi_t *wmip, u8 frameType, 210int wmi_set_retry_limits_cmd(struct wmi_t *wmip, u8 frameType,
@@ -226,11 +226,11 @@ int wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
226 u8 frmType, 226 u8 frmType,
227 u8 *dstMacAddr, 227 u8 *dstMacAddr,
228 u8 *bssid, 228 u8 *bssid,
229 A_UINT16 optIEDataLen, 229 u16 optIEDataLen,
230 u8 *optIEData); 230 u8 *optIEData);
231 231
232int wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl); 232int wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, u16 intvl);
233int wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize); 233int wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, u16 voicePktSize);
234int wmi_set_max_sp_len_cmd(struct wmi_t *wmip, u8 maxSpLen); 234int wmi_set_max_sp_len_cmd(struct wmi_t *wmip, u8 maxSpLen);
235u8 convert_userPriority_to_trafficClass(u8 userPriority); 235u8 convert_userPriority_to_trafficClass(u8 userPriority);
236u8 wmi_get_power_mode_cmd(struct wmi_t *wmip); 236u8 wmi_get_power_mode_cmd(struct wmi_t *wmip);
@@ -293,7 +293,7 @@ int wmi_set_keepalive_cmd(struct wmi_t *wmip, u8 keepaliveInterval);
293int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, 293int wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType,
294 u8 ieLen,u8 *ieInfo); 294 u8 ieLen,u8 *ieInfo);
295 295
296int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, A_UINT16 dataLen); 296int wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen);
297 297
298A_INT32 wmi_get_rate(A_INT8 rateindex); 298A_INT32 wmi_get_rate(A_INT8 rateindex);
299 299
@@ -371,10 +371,10 @@ wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *a);
371u8 acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl); 371u8 acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl);
372 372
373int 373int
374wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, A_UINT16 reason); 374wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, u16 reason);
375 375
376int 376int
377wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, bool flag); 377wmi_set_pvb_cmd(struct wmi_t *wmip, u16 aid, bool flag);
378 378
379int 379int
380wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period); 380wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period);
@@ -395,7 +395,7 @@ int
395wmi_set_ht_op_cmd(struct wmi_t *wmip, u8 sta_chan_width); 395wmi_set_ht_op_cmd(struct wmi_t *wmip, u8 sta_chan_width);
396 396
397int 397int
398wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, A_UINT16 sz); 398wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, u16 sz);
399 399
400int 400int
401wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray); 401wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray);
@@ -407,7 +407,7 @@ int
407wmi_delete_aggr_cmd(struct wmi_t *wmip, u8 tid, bool uplink); 407wmi_delete_aggr_cmd(struct wmi_t *wmip, u8 tid, bool uplink);
408 408
409int 409int
410wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask); 410wmi_allow_aggr_cmd(struct wmi_t *wmip, u16 tx_tidmask, u16 rx_tidmask);
411 411
412int 412int
413wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, u8 rxMetaVersion, bool rxDot11Hdr, bool defragOnHost); 413wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, u8 rxMetaVersion, bool rxDot11Hdr, bool defragOnHost);
@@ -421,11 +421,10 @@ wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE pre
421int 421int
422wmi_set_pmk_cmd(struct wmi_t *wmip, u8 *pmk); 422wmi_set_pmk_cmd(struct wmi_t *wmip, u8 *pmk);
423 423
424A_UINT16 424u16 wmi_ieee2freq (int chan);
425wmi_ieee2freq (int chan);
426 425
427A_UINT32 426A_UINT32
428wmi_freq2ieee (A_UINT16 freq); 427wmi_freq2ieee (u16 freq);
429 428
430bss_t * 429bss_t *
431wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid, 430wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
index 10c53f57ed8..354008904a6 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
@@ -213,14 +213,14 @@ static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig)
213{ 213{
214 int status = A_OK; 214 int status = A_OK;
215 u8 hciBaudChangeCommand[] = {0x0c,0xfc,0x2,0,0}; 215 u8 hciBaudChangeCommand[] = {0x0c,0xfc,0x2,0,0};
216 A_UINT16 baudVal; 216 u16 baudVal;
217 u8 *pEvent = NULL; 217 u8 *pEvent = NULL;
218 u8 *pBufferToFree = NULL; 218 u8 *pBufferToFree = NULL;
219 219
220 do { 220 do {
221 221
222 if (pConfig->Flags & AR3K_CONFIG_FLAG_SET_AR3K_BAUD) { 222 if (pConfig->Flags & AR3K_CONFIG_FLAG_SET_AR3K_BAUD) {
223 baudVal = (A_UINT16)(pConfig->AR3KBaudRate / 100); 223 baudVal = (u16)(pConfig->AR3KBaudRate / 100);
224 hciBaudChangeCommand[3] = (u8)baudVal; 224 hciBaudChangeCommand[3] = (u8)baudVal;
225 hciBaudChangeCommand[4] = (u8)(baudVal >> 8); 225 hciBaudChangeCommand[4] = (u8)(baudVal >> 8);
226 226
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
index 62d11dee34d..0cbc73ce26f 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
@@ -94,7 +94,7 @@ typedef struct tPsTagEntry
94 94
95typedef struct tRamPatch 95typedef struct tRamPatch
96{ 96{
97 A_UINT16 Len; 97 u16 Len;
98 u8 *Data; 98 u8 *Data;
99} tRamPatch, *ptRamPatch; 99} tRamPatch, *ptRamPatch;
100 100
@@ -320,7 +320,7 @@ int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat)
320 char *Buffer; 320 char *Buffer;
321 char *pCharLine; 321 char *pCharLine;
322 u8 TagCount; 322 u8 TagCount;
323 A_UINT16 ByteCount; 323 u16 ByteCount;
324 u8 ParseSection=RAM_PS_SECTION; 324 u8 ParseSection=RAM_PS_SECTION;
325 A_UINT32 pos; 325 A_UINT32 pos;
326 326
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
index 58bd4a90024..13d1d095a45 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
@@ -51,7 +51,7 @@
51#ifndef A_UINT32 51#ifndef A_UINT32
52#define A_UCHAR unsigned char 52#define A_UCHAR unsigned char
53#define A_UINT32 unsigned long 53#define A_UINT32 unsigned long
54#define A_UINT16 unsigned short 54#define u16 unsigned short
55#define u8 unsigned char 55#define u8 unsigned char
56#define bool unsigned char 56#define bool unsigned char
57#endif /* A_UINT32 */ 57#endif /* A_UINT32 */
diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c
index 82bec20e0ff..1d51d2a34e1 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -796,12 +796,12 @@ ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice)
796 796
797#endif /* CONFIG_AR6002_REV1_FORCE_HOST */ 797#endif /* CONFIG_AR6002_REV1_FORCE_HOST */
798 798
799void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription) 799void DebugDumpBytes(A_UCHAR *buffer, u16 length, char *pDescription)
800{ 800{
801 char stream[60]; 801 char stream[60];
802 char byteOffsetStr[10]; 802 char byteOffsetStr[10];
803 A_UINT32 i; 803 A_UINT32 i;
804 A_UINT16 offset, count, byteOffset; 804 u16 offset, count, byteOffset;
805 805
806 A_PRINTF("<---------Dumping %d Bytes : %s ------>\n", length, pDescription); 806 A_PRINTF("<---------Dumping %d Bytes : %s ------>\n", length, pDescription);
807 807
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c
index 88591d7d544..f7d1069072b 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_android.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_android.c
@@ -345,8 +345,8 @@ void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isE
345 skb && ar->arConnected) { 345 skb && ar->arConnected) {
346 bool needWake = false; 346 bool needWake = false;
347 if (isEvent) { 347 if (isEvent) {
348 if (A_NETBUF_LEN(skb) >= sizeof(A_UINT16)) { 348 if (A_NETBUF_LEN(skb) >= sizeof(u16)) {
349 A_UINT16 cmd = *(const A_UINT16 *)A_NETBUF_DATA(skb); 349 u16 cmd = *(const u16 *)A_NETBUF_DATA(skb);
350 switch (cmd) { 350 switch (cmd) {
351 case WMI_CONNECT_EVENTID: 351 case WMI_CONNECT_EVENTID:
352 case WMI_DISCONNECT_EVENTID: 352 case WMI_DISCONNECT_EVENTID:
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 647c6c983a2..9f7a02f5085 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -254,11 +254,11 @@ module_param(blocktx, int, 0644);
254#endif /* BLOCK_TX_PATH_FLAG */ 254#endif /* BLOCK_TX_PATH_FLAG */
255 255
256typedef struct user_rssi_compensation_t { 256typedef struct user_rssi_compensation_t {
257 A_UINT16 customerID; 257 u16 customerID;
258 union { 258 union {
259 A_UINT16 a_enable; 259 u16 a_enable;
260 A_UINT16 bg_enable; 260 u16 bg_enable;
261 A_UINT16 enable; 261 u16 enable;
262 }; 262 };
263 A_INT16 bg_param_a; 263 A_INT16 bg_param_a;
264 A_INT16 bg_param_b; 264 A_INT16 bg_param_b;
@@ -322,7 +322,7 @@ static void ar6000_tx_complete(void *Context, HTC_PACKET_QUEUE *pPackets);
322static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, HTC_PACKET *pPacket); 322static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, HTC_PACKET *pPacket);
323 323
324#ifdef ATH_AR6K_11N_SUPPORT 324#ifdef ATH_AR6K_11N_SUPPORT
325static void ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, A_UINT16 num); 325static void ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, u16 num);
326#endif 326#endif
327static void ar6000_deliver_frames_to_nw_stack(void * dev, void *osbuf); 327static void ar6000_deliver_frames_to_nw_stack(void * dev, void *osbuf);
328//static void ar6000_deliver_frames_to_bt_stack(void * dev, void *osbuf); 328//static void ar6000_deliver_frames_to_bt_stack(void * dev, void *osbuf);
@@ -773,7 +773,7 @@ aptcTimerHandler(unsigned long arg)
773 773
774#ifdef ATH_AR6K_11N_SUPPORT 774#ifdef ATH_AR6K_11N_SUPPORT
775static void 775static void
776ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, A_UINT16 num) 776ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, u16 num)
777{ 777{
778 void * osbuf; 778 void * osbuf;
779 779
@@ -904,26 +904,26 @@ ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar)
904static 904static
905void calculate_crc(A_UINT32 TargetType, A_UCHAR *eeprom_data) 905void calculate_crc(A_UINT32 TargetType, A_UCHAR *eeprom_data)
906{ 906{
907 A_UINT16 *ptr_crc; 907 u16 *ptr_crc;
908 A_UINT16 *ptr16_eeprom; 908 u16 *ptr16_eeprom;
909 A_UINT16 checksum; 909 u16 checksum;
910 A_UINT32 i; 910 A_UINT32 i;
911 A_UINT32 eeprom_size; 911 A_UINT32 eeprom_size;
912 912
913 if (TargetType == TARGET_TYPE_AR6001) 913 if (TargetType == TARGET_TYPE_AR6001)
914 { 914 {
915 eeprom_size = 512; 915 eeprom_size = 512;
916 ptr_crc = (A_UINT16 *)eeprom_data; 916 ptr_crc = (u16 *)eeprom_data;
917 } 917 }
918 else if (TargetType == TARGET_TYPE_AR6003) 918 else if (TargetType == TARGET_TYPE_AR6003)
919 { 919 {
920 eeprom_size = 1024; 920 eeprom_size = 1024;
921 ptr_crc = (A_UINT16 *)((A_UCHAR *)eeprom_data + 0x04); 921 ptr_crc = (u16 *)((A_UCHAR *)eeprom_data + 0x04);
922 } 922 }
923 else 923 else
924 { 924 {
925 eeprom_size = 768; 925 eeprom_size = 768;
926 ptr_crc = (A_UINT16 *)((A_UCHAR *)eeprom_data + 0x04); 926 ptr_crc = (u16 *)((A_UCHAR *)eeprom_data + 0x04);
927 } 927 }
928 928
929 929
@@ -932,7 +932,7 @@ void calculate_crc(A_UINT32 TargetType, A_UCHAR *eeprom_data)
932 932
933 // Recalculate new CRC 933 // Recalculate new CRC
934 checksum = 0; 934 checksum = 0;
935 ptr16_eeprom = (A_UINT16 *)eeprom_data; 935 ptr16_eeprom = (u16 *)eeprom_data;
936 for (i = 0;i < eeprom_size; i += 2) 936 for (i = 0;i < eeprom_size; i += 2)
937 { 937 {
938 checksum = checksum ^ (*ptr16_eeprom); 938 checksum = checksum ^ (*ptr16_eeprom);
@@ -2552,7 +2552,7 @@ int ar6000_init(struct net_device *dev)
2552 * of 0-3 */ 2552 * of 0-3 */
2553 connect.ConnectionFlags &= ~HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK; 2553 connect.ConnectionFlags &= ~HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
2554 connect.ConnectionFlags |= 2554 connect.ConnectionFlags |=
2555 ((A_UINT16)reduce_credit_dribble - 1) & HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK; 2555 ((u16)reduce_credit_dribble - 1) & HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
2556 } 2556 }
2557 /* connect to best-effort service */ 2557 /* connect to best-effort service */
2558 connect.ServiceID = WMI_DATA_BE_SVC; 2558 connect.ServiceID = WMI_DATA_BE_SVC;
@@ -2797,11 +2797,11 @@ ar6000_txPwr_rx(void *devt, u8 txPwr)
2797 2797
2798 2798
2799void 2799void
2800ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList) 2800ar6000_channelList_rx(void *devt, A_INT8 numChan, u16 *chanList)
2801{ 2801{
2802 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 2802 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
2803 2803
2804 A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (A_UINT16)); 2804 A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (u16));
2805 ar->arNumChannels = numChan; 2805 ar->arNumChannels = numChan;
2806 2806
2807 wake_up(&arEvent); 2807 wake_up(&arEvent);
@@ -3665,7 +3665,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket)
3665 AR6000_STAT_INC(ar, rx_length_errors); 3665 AR6000_STAT_INC(ar, rx_length_errors);
3666 A_NETBUF_FREE(skb); 3666 A_NETBUF_FREE(skb);
3667 } else { 3667 } else {
3668 A_UINT16 seq_no; 3668 u16 seq_no;
3669 u8 meta_type; 3669 u8 meta_type;
3670 3670
3671#if 0 3671#if 0
@@ -3678,7 +3678,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket)
3678 sta_t *conn = NULL; 3678 sta_t *conn = NULL;
3679 u8 psState=0,prevPsState; 3679 u8 psState=0,prevPsState;
3680 ATH_MAC_HDR *datap=NULL; 3680 ATH_MAC_HDR *datap=NULL;
3681 A_UINT16 offset; 3681 u16 offset;
3682 3682
3683 meta_type = WMI_DATA_HDR_GET_META(dhdr); 3683 meta_type = WMI_DATA_HDR_GET_META(dhdr);
3684 3684
@@ -4206,7 +4206,7 @@ ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, A_UINT32 sw_ver, A_UINT32 a
4206} 4206}
4207 4207
4208void 4208void
4209add_new_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 aid, u8 *wpaie, 4209add_new_sta(AR_SOFTC_T *ar, u8 *mac, u16 aid, u8 *wpaie,
4210 u8 ielen, u8 keymgmt, u8 ucipher, u8 auth) 4210 u8 ielen, u8 keymgmt, u8 ucipher, u8 auth)
4211{ 4211{
4212 u8 free_slot=aid-1; 4212 u8 free_slot=aid-1;
@@ -4222,8 +4222,8 @@ add_new_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 aid, u8 *wpaie,
4222} 4222}
4223 4223
4224void 4224void
4225ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, u8 *bssid, 4225ar6000_connect_event(AR_SOFTC_T *ar, u16 channel, u8 *bssid,
4226 A_UINT16 listenInterval, A_UINT16 beaconInterval, 4226 u16 listenInterval, u16 beaconInterval,
4227 NETWORK_TYPE networkType, u8 beaconIeLen, 4227 NETWORK_TYPE networkType, u8 beaconIeLen,
4228 u8 assocReqLen, u8 assocRespLen, 4228 u8 assocReqLen, u8 assocRespLen,
4229 u8 *assocInfo) 4229 u8 *assocInfo)
@@ -4398,9 +4398,9 @@ skip_key:
4398 if (assocRespLen && (sizeof(buf) > (12 + (assocRespLen * 2)))) 4398 if (assocRespLen && (sizeof(buf) > (12 + (assocRespLen * 2))))
4399 { 4399 {
4400 assoc_resp_ie_pos = beaconIeLen + assocReqLen + 4400 assoc_resp_ie_pos = beaconIeLen + assocReqLen +
4401 sizeof(A_UINT16) + /* capinfo*/ 4401 sizeof(u16) + /* capinfo*/
4402 sizeof(A_UINT16) + /* status Code */ 4402 sizeof(u16) + /* status Code */
4403 sizeof(A_UINT16) ; /* associd */ 4403 sizeof(u16) ; /* associd */
4404 A_MEMZERO(buf, sizeof(buf)); 4404 A_MEMZERO(buf, sizeof(buf));
4405 sprintf(buf, "%s", tag2); 4405 sprintf(buf, "%s", tag2);
4406 pos = buf + 12; 4406 pos = buf + 12;
@@ -4427,8 +4427,8 @@ skip_key:
4427 * assoc Request includes capability and listen interval. Skip these. 4427 * assoc Request includes capability and listen interval. Skip these.
4428 */ 4428 */
4429 assoc_req_ie_pos = beaconIeLen + 4429 assoc_req_ie_pos = beaconIeLen +
4430 sizeof(A_UINT16) + /* capinfo*/ 4430 sizeof(u16) + /* capinfo*/
4431 sizeof(A_UINT16); /* listen interval */ 4431 sizeof(u16); /* listen interval */
4432 4432
4433 A_MEMZERO(buf, sizeof(buf)); 4433 A_MEMZERO(buf, sizeof(buf));
4434 sprintf(buf, "%s", tag1); 4434 sprintf(buf, "%s", tag1);
@@ -4538,7 +4538,7 @@ sta_cleanup(AR_SOFTC_T *ar, u8 i)
4538 4538
4539} 4539}
4540 4540
4541u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 reason) 4541u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason)
4542{ 4542{
4543 u8 i, removed=0; 4543 u8 i, removed=0;
4544 4544
@@ -4572,7 +4572,7 @@ u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 reason)
4572 4572
4573void 4573void
4574ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid, 4574ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid,
4575 u8 assocRespLen, u8 *assocInfo, A_UINT16 protocolReasonStatus) 4575 u8 assocRespLen, u8 *assocInfo, u16 protocolReasonStatus)
4576{ 4576{
4577 u8 i; 4577 u8 i;
4578 unsigned long flags; 4578 unsigned long flags;
@@ -5127,8 +5127,8 @@ ar6000_cac_event(AR_SOFTC_T *ar, u8 ac, u8 cacIndication,
5127} 5127}
5128 5128
5129void 5129void
5130ar6000_channel_change_event(AR_SOFTC_T *ar, A_UINT16 oldChannel, 5130ar6000_channel_change_event(AR_SOFTC_T *ar, u16 oldChannel,
5131 A_UINT16 newChannel) 5131 u16 newChannel)
5132{ 5132{
5133 A_PRINTF("Channel Change notification\nOld Channel: %d, New Channel: %d\n", 5133 A_PRINTF("Channel Change notification\nOld Channel: %d, New Channel: %d\n",
5134 oldChannel, newChannel); 5134 oldChannel, newChannel);
@@ -5519,7 +5519,7 @@ ar6000_alloc_cookie(AR_SOFTC_T *ar)
5519 * the event ID and event content. 5519 * the event ID and event content.
5520 */ 5520 */
5521#define EVENT_ID_LEN 2 5521#define EVENT_ID_LEN 2
5522void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, 5522void ar6000_send_event_to_app(AR_SOFTC_T *ar, u16 eventId,
5523 u8 *datap, int len) 5523 u8 *datap, int len)
5524{ 5524{
5525 5525
@@ -5528,7 +5528,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId,
5528/* note: IWEVCUSTOM only exists in wireless extensions after version 15 */ 5528/* note: IWEVCUSTOM only exists in wireless extensions after version 15 */
5529 5529
5530 char *buf; 5530 char *buf;
5531 A_UINT16 size; 5531 u16 size;
5532 union iwreq_data wrqu; 5532 union iwreq_data wrqu;
5533 5533
5534 size = len + EVENT_ID_LEN; 5534 size = len + EVENT_ID_LEN;
@@ -5549,7 +5549,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId,
5549 A_MEMCPY(buf, &eventId, EVENT_ID_LEN); 5549 A_MEMCPY(buf, &eventId, EVENT_ID_LEN);
5550 A_MEMCPY(buf+EVENT_ID_LEN, datap, len); 5550 A_MEMCPY(buf+EVENT_ID_LEN, datap, len);
5551 5551
5552 //AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("event ID = %d,len = %d\n",*(A_UINT16*)buf, size)); 5552 //AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("event ID = %d,len = %d\n",*(u16 *)buf, size));
5553 A_MEMZERO(&wrqu, sizeof(wrqu)); 5553 A_MEMZERO(&wrqu, sizeof(wrqu));
5554 wrqu.data.length = size; 5554 wrqu.data.length = size;
5555 wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf); 5555 wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
@@ -5564,7 +5564,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId,
5564 * to the application. The buf which is sent to application 5564 * to the application. The buf which is sent to application
5565 * includes the event ID and event content. 5565 * includes the event ID and event content.
5566 */ 5566 */
5567void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, 5567void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, u16 eventId,
5568 u8 *datap, int len) 5568 u8 *datap, int len)
5569{ 5569{
5570 5570
@@ -5573,7 +5573,7 @@ void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId,
5573/* IWEVGENIE exists in wireless extensions version 18 onwards */ 5573/* IWEVGENIE exists in wireless extensions version 18 onwards */
5574 5574
5575 char *buf; 5575 char *buf;
5576 A_UINT16 size; 5576 u16 size;
5577 union iwreq_data wrqu; 5577 union iwreq_data wrqu;
5578 5578
5579 size = len + EVENT_ID_LEN; 5579 size = len + EVENT_ID_LEN;
@@ -5648,7 +5648,7 @@ a_copy_from_user(void *to, const void *from, A_UINT32 n)
5648 5648
5649int 5649int
5650ar6000_get_driver_cfg(struct net_device *dev, 5650ar6000_get_driver_cfg(struct net_device *dev,
5651 A_UINT16 cfgParam, 5651 u16 cfgParam,
5652 void *result) 5652 void *result)
5653{ 5653{
5654 5654
@@ -5805,12 +5805,12 @@ read_rssi_compensation_param(AR_SOFTC_T *ar)
5805 5805
5806 cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); 5806 cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType);
5807 5807
5808 rssi_compensation_param.customerID = *(A_UINT16 *)cust_data_ptr & 0xffff; 5808 rssi_compensation_param.customerID = *(u16 *)cust_data_ptr & 0xffff;
5809 rssi_compensation_param.enable = *(A_UINT16 *)(cust_data_ptr+2) & 0xffff; 5809 rssi_compensation_param.enable = *(u16 *)(cust_data_ptr+2) & 0xffff;
5810 rssi_compensation_param.bg_param_a = *(A_UINT16 *)(cust_data_ptr+4) & 0xffff; 5810 rssi_compensation_param.bg_param_a = *(u16 *)(cust_data_ptr+4) & 0xffff;
5811 rssi_compensation_param.bg_param_b = *(A_UINT16 *)(cust_data_ptr+6) & 0xffff; 5811 rssi_compensation_param.bg_param_b = *(u16 *)(cust_data_ptr+6) & 0xffff;
5812 rssi_compensation_param.a_param_a = *(A_UINT16 *)(cust_data_ptr+8) & 0xffff; 5812 rssi_compensation_param.a_param_a = *(u16 *)(cust_data_ptr+8) & 0xffff;
5813 rssi_compensation_param.a_param_b = *(A_UINT16 *)(cust_data_ptr+10) &0xffff; 5813 rssi_compensation_param.a_param_b = *(u16 *)(cust_data_ptr+10) &0xffff;
5814 rssi_compensation_param.reserved = *(A_UINT32 *)(cust_data_ptr+12); 5814 rssi_compensation_param.reserved = *(A_UINT32 *)(cust_data_ptr+12);
5815 5815
5816#ifdef RSSICOMPENSATION_PRINT 5816#ifdef RSSICOMPENSATION_PRINT
@@ -6139,7 +6139,7 @@ ar6000_connect_to_ap(struct ar6_softc *ar)
6139 /* Set the listen interval into 1000TUs or more. This value will be indicated to Ap in the conn. 6139 /* Set the listen interval into 1000TUs or more. This value will be indicated to Ap in the conn.
6140 later set it back locally at the STA to 100/1000 TUs depending on the power mode */ 6140 later set it back locally at the STA to 100/1000 TUs depending on the power mode */
6141 if ((ar->arNetworkType == INFRA_NETWORK)) { 6141 if ((ar->arNetworkType == INFRA_NETWORK)) {
6142 wmi_listeninterval_cmd(ar->arWmi, max(ar->arListenIntervalT, (A_UINT16)A_MAX_WOW_LISTEN_INTERVAL), 0); 6142 wmi_listeninterval_cmd(ar->arWmi, max(ar->arListenIntervalT, (u16)A_MAX_WOW_LISTEN_INTERVAL), 0);
6143 } 6143 }
6144 status = wmi_connect_cmd(ar->arWmi, ar->arNetworkType, 6144 status = wmi_connect_cmd(ar->arWmi, ar->arNetworkType,
6145 ar->arDot11AuthMode, ar->arAuthMode, 6145 ar->arDot11AuthMode, ar->arAuthMode,
@@ -6187,7 +6187,7 @@ ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie
6187} 6187}
6188 6188
6189int 6189int
6190is_iwioctl_allowed(u8 mode, A_UINT16 cmd) 6190is_iwioctl_allowed(u8 mode, u16 cmd)
6191{ 6191{
6192 if(cmd >= SIOCSIWCOMMIT && cmd <= SIOCGIWPOWER) { 6192 if(cmd >= SIOCSIWCOMMIT && cmd <= SIOCGIWPOWER) {
6193 cmd -= SIOCSIWCOMMIT; 6193 cmd -= SIOCSIWCOMMIT;
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
index b2a1351cdff..7e680a54071 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
@@ -74,8 +74,8 @@ static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep)
74static void ar6000_wow_resume(AR_SOFTC_T *ar) 74static void ar6000_wow_resume(AR_SOFTC_T *ar)
75{ 75{
76 if (ar->arWowState!= WLAN_WOW_STATE_NONE) { 76 if (ar->arWowState!= WLAN_WOW_STATE_NONE) {
77 A_UINT16 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;
78 A_UINT16 bg_period = (ar->scParams.bg_period==0) ? 60 : ar->scParams.bg_period; 78 u16 bg_period = (ar->scParams.bg_period==0) ? 60 : ar->scParams.bg_period;
79 WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode = {true, false}; 79 WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode = {true, false};
80 ar->arWowState = WLAN_WOW_STATE_NONE; 80 ar->arWowState = WLAN_WOW_STATE_NONE;
81 if (wmi_set_host_sleep_mode_cmd(ar->arWmi, &hostSleepMode)!=A_OK) { 81 if (wmi_set_host_sleep_mode_cmd(ar->arWmi, &hostSleepMode)!=A_OK) {
@@ -251,7 +251,7 @@ wow_not_connected:
251int ar6000_resume_ev(void *context) 251int ar6000_resume_ev(void *context)
252{ 252{
253 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 253 AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
254 A_UINT16 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));
257 switch (powerState) { 257 switch (powerState) {
@@ -425,7 +425,7 @@ ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state)
425 WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode; 425 WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode;
426 426
427 if (state == WLAN_ENABLED) { 427 if (state == WLAN_ENABLED) {
428 A_UINT16 fg_start_period; 428 u16 fg_start_period;
429 429
430 /* Not in deep sleep state.. exit */ 430 /* Not in deep sleep state.. exit */
431 if (ar->arWlanPowerState != WLAN_POWER_STATE_DEEP_SLEEP) { 431 if (ar->arWlanPowerState != WLAN_POWER_STATE_DEEP_SLEEP) {
@@ -540,7 +540,7 @@ int
540ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, bool pmEvent) 540ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, bool pmEvent)
541{ 541{
542 int status = A_OK; 542 int status = A_OK;
543 A_UINT16 powerState, oldPowerState; 543 u16 powerState, oldPowerState;
544 AR6000_WLAN_STATE oldstate = ar->arWlanState; 544 AR6000_WLAN_STATE oldstate = ar->arWlanState;
545 bool wlanOff = ar->arWlanOff; 545 bool wlanOff = ar->arWlanOff;
546#ifdef CONFIG_PM 546#ifdef CONFIG_PM
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index f526160b8a7..332b336c339 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -428,14 +428,14 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
428} 428}
429 429
430void 430void
431ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, 431ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
432 u8 *bssid, A_UINT16 listenInterval, 432 u8 *bssid, u16 listenInterval,
433 A_UINT16 beaconInterval,NETWORK_TYPE networkType, 433 u16 beaconInterval,NETWORK_TYPE networkType,
434 u8 beaconIeLen, u8 assocReqLen, 434 u8 beaconIeLen, u8 assocReqLen,
435 u8 assocRespLen, u8 *assocInfo) 435 u8 assocRespLen, u8 *assocInfo)
436{ 436{
437 A_UINT16 size = 0; 437 u16 size = 0;
438 A_UINT16 capability = 0; 438 u16 capability = 0;
439 struct cfg80211_bss *bss = NULL; 439 struct cfg80211_bss *bss = NULL;
440 struct ieee80211_mgmt *mgmt = NULL; 440 struct ieee80211_mgmt *mgmt = NULL;
441 struct ieee80211_channel *ibss_channel = NULL; 441 struct ieee80211_channel *ibss_channel = NULL;
@@ -446,11 +446,11 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
446 unsigned char *ieeemgmtbuf = NULL; 446 unsigned char *ieeemgmtbuf = NULL;
447 u8 source_mac[ATH_MAC_LEN]; 447 u8 source_mac[ATH_MAC_LEN];
448 448
449 u8 assocReqIeOffset = sizeof(A_UINT16) + /* capinfo*/ 449 u8 assocReqIeOffset = sizeof(u16) + /* capinfo*/
450 sizeof(A_UINT16); /* listen interval */ 450 sizeof(u16); /* listen interval */
451 u8 assocRespIeOffset = sizeof(A_UINT16) + /* capinfo*/ 451 u8 assocRespIeOffset = sizeof(u16) + /* capinfo*/
452 sizeof(A_UINT16) + /* status Code */ 452 sizeof(u16) + /* status Code */
453 sizeof(A_UINT16); /* associd */ 453 sizeof(u16); /* associd */
454 u8 *assocReqIe = assocInfo + beaconIeLen + assocReqIeOffset; 454 u8 *assocReqIe = assocInfo + beaconIeLen + assocReqIeOffset;
455 u8 *assocRespIe = assocInfo + beaconIeLen + assocReqLen + assocRespIeOffset; 455 u8 *assocRespIe = assocInfo + beaconIeLen + assocReqLen + assocRespIeOffset;
456 456
@@ -513,7 +513,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
513 A_MEMCPY(source_mac, ar->arNetDev->dev_addr, ATH_MAC_LEN); 513 A_MEMCPY(source_mac, ar->arNetDev->dev_addr, ATH_MAC_LEN);
514 ptr_ie_buf = ie_buf; 514 ptr_ie_buf = ie_buf;
515 } else { 515 } else {
516 capability = *(A_UINT16 *)(&assocInfo[beaconIeLen]); 516 capability = *(u16 *)(&assocInfo[beaconIeLen]);
517 A_MEMCPY(source_mac, bssid, ATH_MAC_LEN); 517 A_MEMCPY(source_mac, bssid, ATH_MAC_LEN);
518 ptr_ie_buf = assocReqIe; 518 ptr_ie_buf = assocReqIe;
519 ie_buf_len = assocReqLen; 519 ie_buf_len = assocReqLen;
@@ -577,7 +577,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
577 577
578static int 578static int
579ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, 579ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
580 A_UINT16 reason_code) 580 u16 reason_code)
581{ 581{
582 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 582 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
583 583
@@ -620,7 +620,7 @@ ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
620void 620void
621ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason, 621ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason,
622 u8 *bssid, u8 assocRespLen, 622 u8 *bssid, u8 assocRespLen,
623 u8 *assocInfo, A_UINT16 protocolReasonStatus) 623 u8 *assocInfo, u16 protocolReasonStatus)
624{ 624{
625 625
626 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason)); 626 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason));
@@ -663,7 +663,7 @@ void
663ar6k_cfg80211_scan_node(void *arg, bss_t *ni) 663ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
664{ 664{
665 struct wiphy *wiphy = (struct wiphy *)arg; 665 struct wiphy *wiphy = (struct wiphy *)arg;
666 A_UINT16 size; 666 u16 size;
667 unsigned char *ieeemgmtbuf = NULL; 667 unsigned char *ieeemgmtbuf = NULL;
668 struct ieee80211_mgmt *mgmt; 668 struct ieee80211_mgmt *mgmt;
669 struct ieee80211_channel *channel; 669 struct ieee80211_channel *channel;
diff --git a/drivers/staging/ath6kl/os/linux/eeprom.c b/drivers/staging/ath6kl/os/linux/eeprom.c
index 5a9ba162b79..13cd014b4b6 100644
--- a/drivers/staging/ath6kl/os/linux/eeprom.c
+++ b/drivers/staging/ath6kl/os/linux/eeprom.c
@@ -106,20 +106,20 @@ static void
106update_mac(unsigned char *eeprom, int size, unsigned char *macaddr) 106update_mac(unsigned char *eeprom, int size, unsigned char *macaddr)
107{ 107{
108 int i; 108 int i;
109 A_UINT16* ptr = (A_UINT16*)(eeprom+4); 109 u16 *ptr = (u16 *)(eeprom+4);
110 A_UINT16 checksum = 0; 110 u16 checksum = 0;
111 111
112 memcpy(eeprom+10,macaddr,6); 112 memcpy(eeprom+10,macaddr,6);
113 113
114 *ptr = 0; 114 *ptr = 0;
115 ptr = (A_UINT16*)eeprom; 115 ptr = (u16 *)eeprom;
116 116
117 for (i=0; i<size; i+=2) { 117 for (i=0; i<size; i+=2) {
118 checksum ^= *ptr++; 118 checksum ^= *ptr++;
119 } 119 }
120 checksum = ~checksum; 120 checksum = ~checksum;
121 121
122 ptr = (A_UINT16*)(eeprom+4); 122 ptr = (u16 *)(eeprom+4);
123 *ptr = checksum; 123 *ptr = checksum;
124 return; 124 return;
125} 125}
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index ffccfbd8d4d..a4bdd43bc62 100644
--- a/drivers/staging/ath6kl/os/linux/hci_bridge.c
+++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c
@@ -97,7 +97,7 @@ typedef struct {
97#define TX_PACKET_RSV_OFFSET 32 97#define TX_PACKET_RSV_OFFSET 32
98#define NUM_HTC_PACKET_STRUCTS ((MAX_ACL_RECV_BUFS + MAX_EVT_RECV_BUFS + MAX_HCI_WRITE_QUEUE_DEPTH) * 2) 98#define NUM_HTC_PACKET_STRUCTS ((MAX_ACL_RECV_BUFS + MAX_EVT_RECV_BUFS + MAX_HCI_WRITE_QUEUE_DEPTH) * 2)
99 99
100#define HCI_GET_OP_CODE(p) (((A_UINT16)((p)[1])) << 8) | ((A_UINT16)((p)[0])) 100#define HCI_GET_OP_CODE(p) (((u16)((p)[1])) << 8) | ((u16)((p)[0]))
101 101
102extern unsigned int setupbtdev; 102extern unsigned int setupbtdev;
103AR3K_CONFIG_INFO ar3kconfig; 103AR3K_CONFIG_INFO ar3kconfig;
@@ -285,8 +285,8 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
285 285
286 if ((hciuartscale != 0) || (hciuartstep != 0)) { 286 if ((hciuartscale != 0) || (hciuartstep != 0)) {
287 /* user wants to tune HCI bridge UART scale/step values */ 287 /* user wants to tune HCI bridge UART scale/step values */
288 ar3kconfig.AR6KScale = (A_UINT16)hciuartscale; 288 ar3kconfig.AR6KScale = (u16)hciuartscale;
289 ar3kconfig.AR6KStep = (A_UINT16)hciuartstep; 289 ar3kconfig.AR6KStep = (u16)hciuartstep;
290 ar3kconfig.Flags |= AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP; 290 ar3kconfig.Flags |= AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP;
291 } 291 }
292 292
@@ -757,7 +757,7 @@ static int bt_send_frame(struct sk_buff *skb)
757 (type == HCI_COMMAND_TYPE) ? "COMMAND" : "ACL", 757 (type == HCI_COMMAND_TYPE) ? "COMMAND" : "ACL",
758 skb->len)); 758 skb->len));
759 if (type == HCI_COMMAND_TYPE) { 759 if (type == HCI_COMMAND_TYPE) {
760 A_UINT16 opcode = HCI_GET_OP_CODE(skb->data); 760 u16 opcode = HCI_GET_OP_CODE(skb->data);
761 AR_DEBUG_PRINTF(ATH_DEBUG_ANY,(" HCI Command: OGF:0x%X OCF:0x%X \r\n", 761 AR_DEBUG_PRINTF(ATH_DEBUG_ANY,(" HCI Command: OGF:0x%X OCF:0x%X \r\n",
762 opcode >> 10, opcode & 0x3FF)); 762 opcode >> 10, opcode & 0x3FF));
763 } 763 }
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 2240bcfb9d0..a439370caa0 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -436,7 +436,7 @@ struct ar_hb_chlng_resp {
436#define STA_IS_PS_POLLED(sta) (sta->flags & (STA_PS_POLLED_MASK << STA_PS_POLLED_SHIFT)) 436#define STA_IS_PS_POLLED(sta) (sta->flags & (STA_PS_POLLED_MASK << STA_PS_POLLED_SHIFT))
437 437
438typedef struct { 438typedef struct {
439 A_UINT16 flags; 439 u16 flags;
440 u8 mac[ATH_MAC_LEN]; 440 u8 mac[ATH_MAC_LEN];
441 u8 aid; 441 u8 aid;
442 u8 keymgmt; 442 u8 keymgmt;
@@ -487,10 +487,10 @@ typedef struct ar6_softc {
487 struct ar_wep_key arWepKeyList[WMI_MAX_KEY_INDEX + 1]; 487 struct ar_wep_key arWepKeyList[WMI_MAX_KEY_INDEX + 1];
488 u8 arBssid[6]; 488 u8 arBssid[6];
489 u8 arReqBssid[6]; 489 u8 arReqBssid[6];
490 A_UINT16 arChannelHint; 490 u16 arChannelHint;
491 A_UINT16 arBssChannel; 491 u16 arBssChannel;
492 A_UINT16 arListenIntervalB; 492 u16 arListenIntervalB;
493 A_UINT16 arListenIntervalT; 493 u16 arListenIntervalT;
494 struct ar6000_version arVersion; 494 struct ar6000_version arVersion;
495 A_UINT32 arTargetType; 495 A_UINT32 arTargetType;
496 A_INT8 arRssi; 496 A_INT8 arRssi;
@@ -500,7 +500,7 @@ typedef struct ar6_softc {
500 struct net_device_stats arNetStats; 500 struct net_device_stats arNetStats;
501 struct iw_statistics arIwStats; 501 struct iw_statistics arIwStats;
502 A_INT8 arNumChannels; 502 A_INT8 arNumChannels;
503 A_UINT16 arChannelList[32]; 503 u16 arChannelList[32];
504 A_UINT32 arRegCode; 504 A_UINT32 arRegCode;
505 bool statsUpdatePending; 505 bool statsUpdatePending;
506 TARGET_STATS arTargetStats; 506 TARGET_STATS arTargetStats;
@@ -514,8 +514,8 @@ typedef struct ar6_softc {
514 A_UINT32 arTargetMode; 514 A_UINT32 arTargetMode;
515 A_UINT32 tcmdRxcrcErrPkt; 515 A_UINT32 tcmdRxcrcErrPkt;
516 A_UINT32 tcmdRxsecErrPkt; 516 A_UINT32 tcmdRxsecErrPkt;
517 A_UINT16 tcmdRateCnt[TCMD_MAX_RATES]; 517 u16 tcmdRateCnt[TCMD_MAX_RATES];
518 A_UINT16 tcmdRateCntShortGuard[TCMD_MAX_RATES]; 518 u16 tcmdRateCntShortGuard[TCMD_MAX_RATES];
519#endif 519#endif
520 AR6000_WLAN_STATE arWlanState; 520 AR6000_WLAN_STATE arWlanState;
521 struct ar_node_mapping arNodeMap[MAX_NODE_NUM]; 521 struct ar_node_mapping arNodeMap[MAX_NODE_NUM];
@@ -526,7 +526,7 @@ typedef struct ar6_softc {
526 A_UINT32 arCookieCount; 526 A_UINT32 arCookieCount;
527 A_UINT32 arRateMask; 527 A_UINT32 arRateMask;
528 u8 arSkipScan; 528 u8 arSkipScan;
529 A_UINT16 arBeaconInterval; 529 u16 arBeaconInterval;
530 bool arConnectPending; 530 bool arConnectPending;
531 bool arWmmEnabled; 531 bool arWmmEnabled;
532 struct ar_hb_chlng_resp arHBChallengeResp; 532 struct ar_hb_chlng_resp arHBChallengeResp;
@@ -558,7 +558,7 @@ typedef struct ar6_softc {
558#endif 558#endif
559 USER_RSSI_THOLD rssi_map[12]; 559 USER_RSSI_THOLD rssi_map[12];
560 u8 arUserBssFilter; 560 u8 arUserBssFilter;
561 A_UINT16 ap_profile_flag; /* AP mode */ 561 u16 ap_profile_flag; /* AP mode */
562 WMI_AP_ACL g_acl; /* AP mode */ 562 WMI_AP_ACL g_acl; /* AP mode */
563 sta_t sta_list[AP_MAX_NUM_STA]; /* AP mode */ 563 sta_t sta_list[AP_MAX_NUM_STA]; /* AP mode */
564 u8 sta_list_index; /* AP mode */ 564 u8 sta_list_index; /* AP mode */
@@ -577,9 +577,9 @@ typedef struct ar6_softc {
577 u8 ap_country_code[3]; 577 u8 ap_country_code[3];
578 u8 ap_wmode; 578 u8 ap_wmode;
579 u8 ap_dtim_period; 579 u8 ap_dtim_period;
580 A_UINT16 ap_beacon_interval; 580 u16 ap_beacon_interval;
581 A_UINT16 arRTS; 581 u16 arRTS;
582 A_UINT16 arACS; /* AP mode - Auto Channel Selection */ 582 u16 arACS; /* AP mode - Auto Channel Selection */
583 HTC_PACKET_QUEUE amsdu_rx_buffer_queue; 583 HTC_PACKET_QUEUE amsdu_rx_buffer_queue;
584 bool bIsDestroyProgress; /* flag to indicate ar6k destroy is in progress */ 584 bool bIsDestroyProgress; /* flag to indicate ar6k destroy is in progress */
585 A_TIMER disconnect_timer; 585 A_TIMER disconnect_timer;
@@ -596,15 +596,15 @@ typedef struct ar6_softc {
596 struct cfg80211_scan_request *scan_request; 596 struct cfg80211_scan_request *scan_request;
597 struct ar_key keys[WMI_MAX_KEY_INDEX + 1]; 597 struct ar_key keys[WMI_MAX_KEY_INDEX + 1];
598#endif /* ATH6K_CONFIG_CFG80211 */ 598#endif /* ATH6K_CONFIG_CFG80211 */
599 A_UINT16 arWlanPowerState; 599 u16 arWlanPowerState;
600 bool arWlanOff; 600 bool arWlanOff;
601#ifdef CONFIG_PM 601#ifdef CONFIG_PM
602 A_UINT16 arWowState; 602 u16 arWowState;
603 bool arBTOff; 603 bool arBTOff;
604 bool arBTSharing; 604 bool arBTSharing;
605 A_UINT16 arSuspendConfig; 605 u16 arSuspendConfig;
606 A_UINT16 arWlanOffConfig; 606 u16 arWlanOffConfig;
607 A_UINT16 arWow2Config; 607 u16 arWow2Config;
608#endif 608#endif
609 u8 scan_triggered; 609 u8 scan_triggered;
610 WMI_SCAN_PARAMS_CMD scParams; 610 WMI_SCAN_PARAMS_CMD scParams;
@@ -731,7 +731,7 @@ ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr);
731sta_t * 731sta_t *
732ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid); 732ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid);
733 733
734u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 reason); 734u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason);
735 735
736/* HCI support */ 736/* HCI support */
737 737
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h b/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
index b2ee6525cba..39e0873aff2 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
@@ -21,7 +21,7 @@
21//============================================================================== 21//==============================================================================
22#ifndef _AR6K_PAL_H_ 22#ifndef _AR6K_PAL_H_
23#define _AR6K_PAL_H_ 23#define _AR6K_PAL_H_
24#define HCI_GET_OP_CODE(p) (((A_UINT16)((p)[1])) << 8) | ((A_UINT16)((p)[0])) 24#define HCI_GET_OP_CODE(p) (((u16)((p)[1])) << 8) | ((u16)((p)[0]))
25 25
26/* transmit packet reserve offset */ 26/* transmit packet reserve offset */
27#define TX_PACKET_RSV_OFFSET 32 27#define TX_PACKET_RSV_OFFSET 32
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
index 26f5372049e..04094f91063 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
@@ -32,18 +32,18 @@ struct ar6_softc;
32void ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, 32void ar6000_ready_event(void *devt, u8 *datap, u8 phyCap,
33 A_UINT32 sw_ver, A_UINT32 abi_ver); 33 A_UINT32 sw_ver, A_UINT32 abi_ver);
34int ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid); 34int ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid);
35void ar6000_connect_event(struct ar6_softc *ar, A_UINT16 channel, 35void ar6000_connect_event(struct ar6_softc *ar, u16 channel,
36 u8 *bssid, A_UINT16 listenInterval, 36 u8 *bssid, u16 listenInterval,
37 A_UINT16 beaconInterval, NETWORK_TYPE networkType, 37 u16 beaconInterval, NETWORK_TYPE networkType,
38 u8 beaconIeLen, u8 assocReqLen, 38 u8 beaconIeLen, u8 assocReqLen,
39 u8 assocRespLen,u8 *assocInfo); 39 u8 assocRespLen,u8 *assocInfo);
40void ar6000_disconnect_event(struct ar6_softc *ar, u8 reason, 40void ar6000_disconnect_event(struct ar6_softc *ar, u8 reason,
41 u8 *bssid, u8 assocRespLen, 41 u8 *bssid, u8 assocRespLen,
42 u8 *assocInfo, A_UINT16 protocolReasonStatus); 42 u8 *assocInfo, u16 protocolReasonStatus);
43void ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, 43void ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid,
44 bool ismcast); 44 bool ismcast);
45void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps); 45void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps);
46void ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList); 46void ar6000_channelList_rx(void *devt, A_INT8 numChan, u16 *chanList);
47void ar6000_regDomain_event(struct ar6_softc *ar, A_UINT32 regCode); 47void ar6000_regDomain_event(struct ar6_softc *ar, A_UINT32 regCode);
48void ar6000_txPwr_rx(void *devt, u8 txPwr); 48void ar6000_txPwr_rx(void *devt, u8 txPwr);
49void ar6000_keepalive_rx(void *devt, u8 configured); 49void ar6000_keepalive_rx(void *devt, u8 configured);
@@ -58,7 +58,7 @@ void ar6000_rssiThreshold_event(struct ar6_softc *ar,
58void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal); 58void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal);
59void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication, 59void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication,
60 u8 statusCode, u8 *tspecSuggestion); 60 u8 statusCode, u8 *tspecSuggestion);
61void ar6000_channel_change_event(struct ar6_softc *ar, A_UINT16 oldChannel, A_UINT16 newChannel); 61void ar6000_channel_change_event(struct ar6_softc *ar, u16 oldChannel, u16 newChannel);
62void ar6000_hbChallengeResp_event(struct ar6_softc *, A_UINT32 cookie, A_UINT32 source); 62void ar6000_hbChallengeResp_event(struct ar6_softc *, A_UINT32 cookie, A_UINT32 source);
63void 63void
64ar6000_roam_tbl_event(struct ar6_softc *ar, WMI_TARGET_ROAM_TBL *pTbl); 64ar6000_roam_tbl_event(struct ar6_softc *ar, WMI_TARGET_ROAM_TBL *pTbl);
@@ -84,8 +84,8 @@ A_INT16 rssi_compensation_reverse_calc(struct ar6_softc *ar, A_INT16 rssi, bool
84void ar6000_dbglog_init_done(struct ar6_softc *ar); 84void ar6000_dbglog_init_done(struct ar6_softc *ar);
85 85
86#ifdef SEND_EVENT_TO_APP 86#ifdef SEND_EVENT_TO_APP
87void ar6000_send_event_to_app(struct ar6_softc *ar, A_UINT16 eventId, u8 *datap, int len); 87void ar6000_send_event_to_app(struct ar6_softc *ar, u16 eventId, u8 *datap, int len);
88void ar6000_send_generic_event_to_app(struct ar6_softc *ar, A_UINT16 eventId, u8 *datap, int len); 88void ar6000_send_generic_event_to_app(struct ar6_softc *ar, u16 eventId, u8 *datap, int len);
89#endif 89#endif
90 90
91#ifdef CONFIG_HOST_TCMD_SUPPORT 91#ifdef CONFIG_HOST_TCMD_SUPPORT
@@ -104,7 +104,7 @@ void ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL range, u8 lqVal
104void ar6000_ratemask_rx(void *devt, A_UINT32 ratemask); 104void ar6000_ratemask_rx(void *devt, A_UINT32 ratemask);
105 105
106int ar6000_get_driver_cfg(struct net_device *dev, 106int ar6000_get_driver_cfg(struct net_device *dev,
107 A_UINT16 cfgParam, 107 u16 cfgParam,
108 void *result); 108 void *result);
109void ar6000_bssInfo_event_rx(struct ar6_softc *ar, u8 *data, int len); 109void ar6000_bssInfo_event_rx(struct ar6_softc *ar, u8 *data, int len);
110 110
@@ -152,7 +152,7 @@ struct ieee80211req_wpaie;
152int 152int
153ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie); 153ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie);
154 154
155int is_iwioctl_allowed(u8 mode, A_UINT16 cmd); 155int is_iwioctl_allowed(u8 mode, u16 cmd);
156 156
157int is_xioctl_allowed(u8 mode, int cmd); 157int is_xioctl_allowed(u8 mode, int cmd);
158 158
diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
index c8aec1ae04f..ffde2c5284f 100644
--- a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
@@ -1009,7 +1009,7 @@ struct ar6000_version {
1009/* used by AR6000_IOCTL_WMI_GET_QOS_QUEUE */ 1009/* used by AR6000_IOCTL_WMI_GET_QOS_QUEUE */
1010struct ar6000_queuereq { 1010struct ar6000_queuereq {
1011 u8 trafficClass; 1011 u8 trafficClass;
1012 A_UINT16 activeTsids; 1012 u16 activeTsids;
1013}; 1013};
1014 1014
1015/* used by AR6000_IOCTL_WMI_GET_TARGET_STATS */ 1015/* used by AR6000_IOCTL_WMI_GET_TARGET_STATS */
@@ -1067,7 +1067,7 @@ typedef struct targetStats_t {
1067 A_UINT32 lq_val; 1067 A_UINT32 lq_val;
1068 1068
1069 A_UINT32 wow_num_pkts_dropped; 1069 A_UINT32 wow_num_pkts_dropped;
1070 A_UINT16 wow_num_events_discarded; 1070 u16 wow_num_events_discarded;
1071 1071
1072 A_INT16 noise_floor_calibation; 1072 A_INT16 noise_floor_calibation;
1073 A_INT16 cs_rssi; 1073 A_INT16 cs_rssi;
@@ -1132,10 +1132,10 @@ struct ar6000_gpio_intr_wait_cmd_s {
1132/* used by the AR6000_XIOCTL_DBGLOG_CFG_MODULE */ 1132/* used by the AR6000_XIOCTL_DBGLOG_CFG_MODULE */
1133typedef struct ar6000_dbglog_module_config_s { 1133typedef struct ar6000_dbglog_module_config_s {
1134 A_UINT32 valid; 1134 A_UINT32 valid;
1135 A_UINT16 mmask; 1135 u16 mmask;
1136 A_UINT16 tsr; 1136 u16 tsr;
1137 u32 rep; 1137 u32 rep;
1138 A_UINT16 size; 1138 u16 size;
1139} DBGLOG_MODULE_CONFIG; 1139} DBGLOG_MODULE_CONFIG;
1140 1140
1141typedef struct user_rssi_thold_t { 1141typedef struct user_rssi_thold_t {
diff --git a/drivers/staging/ath6kl/os/linux/include/cfg80211.h b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
index 1a304436505..c2e4fa2ef23 100644
--- a/drivers/staging/ath6kl/os/linux/include/cfg80211.h
+++ b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
@@ -29,15 +29,15 @@ void ar6k_cfg80211_deinit(AR_SOFTC_T *ar);
29 29
30void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status); 30void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status);
31 31
32void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, 32void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
33 u8 *bssid, A_UINT16 listenInterval, 33 u8 *bssid, u16 listenInterval,
34 A_UINT16 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(AR_SOFTC_T *ar, u8 reason,
39 u8 *bssid, u8 assocRespLen, 39 u8 *bssid, u8 assocRespLen,
40 u8 *assocInfo, A_UINT16 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(AR_SOFTC_T *ar, u8 keyid, bool ismcast);
43 43
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index c6e44ba2bd5..9b5f387940e 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -343,7 +343,7 @@ ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq)
343 cmdp = A_MALLOC(130); 343 cmdp = A_MALLOC(130);
344 if (copy_from_user(cmdp, rq->ifr_data, 344 if (copy_from_user(cmdp, rq->ifr_data,
345 sizeof (*cmdp) + 345 sizeof (*cmdp) +
346 ((cmd.numChannels - 1) * sizeof(A_UINT16)))) 346 ((cmd.numChannels - 1) * sizeof(u16))))
347 { 347 {
348 kfree(cmdp); 348 kfree(cmdp);
349 return -EFAULT; 349 return -EFAULT;
@@ -703,7 +703,7 @@ ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
703 buf[2] = ar->tcmdRxcrcErrPkt; 703 buf[2] = ar->tcmdRxcrcErrPkt;
704 buf[3] = ar->tcmdRxsecErrPkt; 704 buf[3] = ar->tcmdRxsecErrPkt;
705 A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(A_UINT32)), ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt)); 705 A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(A_UINT32)), ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt));
706 A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(A_UINT32))+(TCMD_MAX_RATES *sizeof(A_UINT16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard)); 706 A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(A_UINT32))+(TCMD_MAX_RATES *sizeof(u16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
707 707
708 if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) { 708 if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) {
709 ret = -EFAULT; 709 ret = -EFAULT;
@@ -3338,7 +3338,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
3338 if (copy_from_user(cmdp, userdata, 3338 if (copy_from_user(cmdp, userdata,
3339 sizeof (*cmdp) + 3339 sizeof (*cmdp) +
3340 ((setStartScanCmd.numChannels - 1) * 3340 ((setStartScanCmd.numChannels - 1) *
3341 sizeof(A_UINT16)))) 3341 sizeof(u16))))
3342 { 3342 {
3343 kfree(cmdp); 3343 kfree(cmdp);
3344 ret = -EFAULT; 3344 ret = -EFAULT;
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c
index e09daec2c74..ae2dfb432ec 100644
--- a/drivers/staging/ath6kl/os/linux/wireless_ext.c
+++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c
@@ -1196,7 +1196,7 @@ ar6000_ioctl_siwgenie(struct net_device *dev,
1196#ifdef WAPI_ENABLE 1196#ifdef WAPI_ENABLE
1197 u8 *ie = erq->pointer; 1197 u8 *ie = erq->pointer;
1198 u8 ie_type = ie[0]; 1198 u8 ie_type = ie[0];
1199 A_UINT16 ie_length = erq->length; 1199 u16 ie_length = erq->length;
1200 u8 wapi_ie[128]; 1200 u8 wapi_ie[128];
1201#endif 1201#endif
1202 1202
@@ -1249,7 +1249,7 @@ ar6000_ioctl_siwauth(struct net_device *dev,
1249 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1249 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
1250 1250
1251 bool profChanged; 1251 bool profChanged;
1252 A_UINT16 param; 1252 u16 param;
1253 A_INT32 ret; 1253 A_INT32 ret;
1254 A_INT32 value; 1254 A_INT32 value;
1255 1255
@@ -1418,7 +1418,7 @@ ar6000_ioctl_giwauth(struct net_device *dev,
1418 struct iw_param *data, char *extra) 1418 struct iw_param *data, char *extra)
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 A_UINT16 param; 1421 u16 param;
1422 A_INT32 ret; 1422 A_INT32 ret;
1423 1423
1424 if (ar->arWmiReady == false) { 1424 if (ar->arWmiReady == false) {
diff --git a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
index f65e290ebde..42e3de0453b 100644
--- a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
+++ b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
@@ -62,14 +62,14 @@ typedef enum {
62typedef struct { 62typedef struct {
63 void *osbuf; 63 void *osbuf;
64 bool is_amsdu; 64 bool is_amsdu;
65 A_UINT16 seq_no; 65 u16 seq_no;
66}OSBUF_HOLD_Q; 66}OSBUF_HOLD_Q;
67 67
68 68
69#if 0 69#if 0
70typedef struct { 70typedef struct {
71 A_UINT16 seqno_st; 71 u16 seqno_st;
72 A_UINT16 seqno_end; 72 u16 seqno_end;
73}WINDOW_SNAPSHOT; 73}WINDOW_SNAPSHOT;
74#endif 74#endif
75 75
@@ -77,8 +77,8 @@ typedef struct {
77 bool aggr; /* is it ON or OFF */ 77 bool aggr; /* is it ON or OFF */
78 bool progress; /* true when frames have arrived after a timer start */ 78 bool progress; /* true when frames have arrived after a timer start */
79 bool timerMon; /* true if the timer started for the sake of this TID */ 79 bool timerMon; /* true if the timer started for the sake of this TID */
80 A_UINT16 win_sz; /* negotiated window size */ 80 u16 win_sz; /* negotiated window size */
81 A_UINT16 seq_next; /* Next seq no, in current window */ 81 u16 seq_next; /* Next seq no, in current window */
82 A_UINT32 hold_q_sz; /* Num of frames that can be held in hold q */ 82 A_UINT32 hold_q_sz; /* Num of frames that can be held in hold q */
83 OSBUF_HOLD_Q *hold_q; /* Hold q for re-order */ 83 OSBUF_HOLD_Q *hold_q; /* Hold q for re-order */
84#if 0 84#if 0
diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c
index 0ae9fdf1411..5eeb6e3b54e 100644
--- a/drivers/staging/ath6kl/reorder/rcv_aggr.c
+++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c
@@ -43,7 +43,7 @@ static void
43aggr_timeout(A_ATH_TIMER arg); 43aggr_timeout(A_ATH_TIMER arg);
44 44
45static void 45static void
46aggr_deque_frms(AGGR_INFO *p_aggr, u8 tid, A_UINT16 seq_no, u8 order); 46aggr_deque_frms(AGGR_INFO *p_aggr, u8 tid, u16 seq_no, u8 order);
47 47
48static void 48static void
49aggr_dispatch_frames(AGGR_INFO *p_aggr, A_NETBUF_QUEUE_T *q); 49aggr_dispatch_frames(AGGR_INFO *p_aggr, A_NETBUF_QUEUE_T *q);
@@ -187,7 +187,7 @@ aggr_register_rx_dispatcher(void *cntxt, void * dev, RX_CALLBACK fn)
187 187
188 188
189void 189void
190aggr_process_bar(void *cntxt, u8 tid, A_UINT16 seq_no) 190aggr_process_bar(void *cntxt, u8 tid, u16 seq_no)
191{ 191{
192 AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt; 192 AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
193 RXTID_STATS *stats; 193 RXTID_STATS *stats;
@@ -201,7 +201,7 @@ aggr_process_bar(void *cntxt, u8 tid, A_UINT16 seq_no)
201 201
202 202
203void 203void
204aggr_recv_addba_req_evt(void *cntxt, u8 tid, A_UINT16 seq_no, u8 win_sz) 204aggr_recv_addba_req_evt(void *cntxt, u8 tid, u16 seq_no, u8 win_sz)
205{ 205{
206 AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt; 206 AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
207 RXTID *rxtid; 207 RXTID *rxtid;
@@ -269,11 +269,11 @@ aggr_recv_delba_req_evt(void *cntxt, u8 tid)
269} 269}
270 270
271static void 271static void
272aggr_deque_frms(AGGR_INFO *p_aggr, u8 tid, A_UINT16 seq_no, u8 order) 272aggr_deque_frms(AGGR_INFO *p_aggr, u8 tid, u16 seq_no, u8 order)
273{ 273{
274 RXTID *rxtid; 274 RXTID *rxtid;
275 OSBUF_HOLD_Q *node; 275 OSBUF_HOLD_Q *node;
276 A_UINT16 idx, idx_end, seq_end; 276 u16 idx, idx_end, seq_end;
277 RXTID_STATS *stats; 277 RXTID_STATS *stats;
278 278
279 A_ASSERT(p_aggr); 279 A_ASSERT(p_aggr);
@@ -359,7 +359,7 @@ static void
359aggr_slice_amsdu(AGGR_INFO *p_aggr, RXTID *rxtid, void **osbuf) 359aggr_slice_amsdu(AGGR_INFO *p_aggr, RXTID *rxtid, void **osbuf)
360{ 360{
361 void *new_buf; 361 void *new_buf;
362 A_UINT16 frame_8023_len, payload_8023_len, mac_hdr_len, amsdu_len; 362 u16 frame_8023_len, payload_8023_len, mac_hdr_len, amsdu_len;
363 u8 *framep; 363 u8 *framep;
364 364
365 /* Frame format at this point: 365 /* Frame format at this point:
@@ -426,13 +426,13 @@ aggr_slice_amsdu(AGGR_INFO *p_aggr, RXTID *rxtid, void **osbuf)
426} 426}
427 427
428void 428void
429aggr_process_recv_frm(void *cntxt, u8 tid, A_UINT16 seq_no, bool is_amsdu, void **osbuf) 429aggr_process_recv_frm(void *cntxt, u8 tid, u16 seq_no, bool is_amsdu, void **osbuf)
430{ 430{
431 AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt; 431 AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
432 RXTID *rxtid; 432 RXTID *rxtid;
433 RXTID_STATS *stats; 433 RXTID_STATS *stats;
434 A_UINT16 idx, st, cur, end; 434 u16 idx, st, cur, end;
435 A_UINT16 *log_idx; 435 u16 *log_idx;
436 OSBUF_HOLD_Q *node; 436 OSBUF_HOLD_Q *node;
437 PACKET_LOG *log; 437 PACKET_LOG *log;
438 438
@@ -472,7 +472,7 @@ aggr_process_recv_frm(void *cntxt, u8 tid, A_UINT16 seq_no, bool is_amsdu, void
472 * be assumed that the window has moved for some valid reason. 472 * be assumed that the window has moved for some valid reason.
473 * Therefore, we dequeue all frames and start fresh. 473 * Therefore, we dequeue all frames and start fresh.
474 */ 474 */
475 A_UINT16 extended_end; 475 u16 extended_end;
476 476
477 extended_end = (end + rxtid->hold_q_sz-1) & IEEE80211_MAX_SEQ_NO; 477 extended_end = (end + rxtid->hold_q_sz-1) & IEEE80211_MAX_SEQ_NO;
478 478
diff --git a/drivers/staging/ath6kl/wlan/include/ieee80211.h b/drivers/staging/ath6kl/wlan/include/ieee80211.h
index 75cece166c5..1bcef9ce86b 100644
--- a/drivers/staging/ath6kl/wlan/include/ieee80211.h
+++ b/drivers/staging/ath6kl/wlan/include/ieee80211.h
@@ -326,10 +326,10 @@ typedef PREPACK struct wmm_tspec_ie_t {
326 u8 ouiType; 326 u8 ouiType;
327 u8 ouiSubType; 327 u8 ouiSubType;
328 u8 version; 328 u8 version;
329 A_UINT16 tsInfo_info; 329 u16 tsInfo_info;
330 u8 tsInfo_reserved; 330 u8 tsInfo_reserved;
331 A_UINT16 nominalMSDU; 331 u16 nominalMSDU;
332 A_UINT16 maxMSDU; 332 u16 maxMSDU;
333 A_UINT32 minServiceInt; 333 A_UINT32 minServiceInt;
334 A_UINT32 maxServiceInt; 334 A_UINT32 maxServiceInt;
335 A_UINT32 inactivityInt; 335 A_UINT32 inactivityInt;
@@ -341,8 +341,8 @@ typedef PREPACK struct wmm_tspec_ie_t {
341 A_UINT32 maxBurstSize; 341 A_UINT32 maxBurstSize;
342 A_UINT32 delayBound; 342 A_UINT32 delayBound;
343 A_UINT32 minPhyRate; 343 A_UINT32 minPhyRate;
344 A_UINT16 sba; 344 u16 sba;
345 A_UINT16 mediumTime; 345 u16 mediumTime;
346} POSTPACK WMM_TSPEC_IE; 346} POSTPACK WMM_TSPEC_IE;
347 347
348 348
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
index 55b2a9623ec..5ed5b9ee154 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
@@ -49,7 +49,7 @@
49 49
50/* unaligned little endian access */ 50/* unaligned little endian access */
51#define LE_READ_2(p) \ 51#define LE_READ_2(p) \
52 ((A_UINT16) \ 52 ((u16) \
53 ((((u8 *)(p))[0] ) | (((u8 *)(p))[1] << 8))) 53 ((((u8 *)(p))[0] ) | (((u8 *)(p))[1] << 8)))
54 54
55#define LE_READ_4(p) \ 55#define LE_READ_4(p) \
@@ -125,8 +125,8 @@ wlan_parse_beacon(u8 *buf, int framelen, struct ieee80211_common_ie *cie)
125 A_MEMZERO(cie, sizeof(*cie)); 125 A_MEMZERO(cie, sizeof(*cie));
126 126
127 cie->ie_tstamp = frm; frm += 8; 127 cie->ie_tstamp = frm; frm += 8;
128 cie->ie_beaconInt = A_LE2CPU16(*(A_UINT16 *)frm); frm += 2; 128 cie->ie_beaconInt = A_LE2CPU16(*(u16 *)frm); frm += 2;
129 cie->ie_capInfo = A_LE2CPU16(*(A_UINT16 *)frm); frm += 2; 129 cie->ie_capInfo = A_LE2CPU16(*(u16 *)frm); frm += 2;
130 cie->ie_chan = 0; 130 cie->ie_chan = 0;
131 131
132 while (frm < efrm) { 132 while (frm < efrm) {
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_utils.c b/drivers/staging/ath6kl/wlan/src/wlan_utils.c
index 1eee7bab3e5..3a57d50e4e2 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_utils.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_utils.c
@@ -30,8 +30,7 @@
30/* 30/*
31 * converts ieee channel number to frequency 31 * converts ieee channel number to frequency
32 */ 32 */
33A_UINT16 33u16 wlan_ieee2freq(int chan)
34wlan_ieee2freq(int chan)
35{ 34{
36 if (chan == 14) { 35 if (chan == 14) {
37 return 2484; 36 return 2484;
@@ -49,7 +48,7 @@ wlan_ieee2freq(int chan)
49 * Converts MHz frequency to IEEE channel number. 48 * Converts MHz frequency to IEEE channel number.
50 */ 49 */
51A_UINT32 50A_UINT32
52wlan_freq2ieee(A_UINT16 freq) 51wlan_freq2ieee(u16 freq)
53{ 52{
54 if (freq == 2484) 53 if (freq == 2484)
55 return 14; 54 return 14;
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index 896f4a4c098..a575ad809ff 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -279,15 +279,15 @@ const u8 up_to_ac[]= {
279typedef PREPACK struct _iphdr { 279typedef PREPACK struct _iphdr {
280 u8 ip_ver_hdrlen; /* version and hdr length */ 280 u8 ip_ver_hdrlen; /* version and hdr length */
281 u8 ip_tos; /* type of service */ 281 u8 ip_tos; /* type of service */
282 A_UINT16 ip_len; /* total length */ 282 u16 ip_len; /* total length */
283 A_UINT16 ip_id; /* identification */ 283 u16 ip_id; /* identification */
284 A_INT16 ip_off; /* fragment offset field */ 284 A_INT16 ip_off; /* fragment offset field */
285#define IP_DF 0x4000 /* dont fragment flag */ 285#define IP_DF 0x4000 /* dont fragment flag */
286#define IP_MF 0x2000 /* more fragments flag */ 286#define IP_MF 0x2000 /* more fragments flag */
287#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ 287#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */
288 u8 ip_ttl; /* time to live */ 288 u8 ip_ttl; /* time to live */
289 u8 ip_p; /* protocol */ 289 u8 ip_p; /* protocol */
290 A_UINT16 ip_sum; /* checksum */ 290 u16 ip_sum; /* checksum */
291 u8 ip_src[4]; /* source and dest address */ 291 u8 ip_src[4]; /* source and dest address */
292 u8 ip_dst[4]; 292 u8 ip_dst[4];
293} POSTPACK iphdr; 293} POSTPACK iphdr;
@@ -395,7 +395,7 @@ int
395wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf) 395wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
396{ 396{
397 u8 *datap; 397 u8 *datap;
398 A_UINT16 typeorlen; 398 u16 typeorlen;
399 ATH_MAC_HDR macHdr; 399 ATH_MAC_HDR macHdr;
400 ATH_LLC_SNAP_HDR *llcHdr; 400 ATH_LLC_SNAP_HDR *llcHdr;
401 401
@@ -409,7 +409,7 @@ wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
409 409
410 datap = A_NETBUF_DATA(osbuf); 410 datap = A_NETBUF_DATA(osbuf);
411 411
412 typeorlen = *(A_UINT16 *)(datap + ATH_MAC_LEN + ATH_MAC_LEN); 412 typeorlen = *(u16 *)(datap + ATH_MAC_LEN + ATH_MAC_LEN);
413 413
414 if (!IS_ETHERTYPE(A_BE2CPU16(typeorlen))) { 414 if (!IS_ETHERTYPE(A_BE2CPU16(typeorlen))) {
415 /* 415 /*
@@ -535,7 +535,7 @@ u8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT32 layer2P
535{ 535{
536 u8 *datap; 536 u8 *datap;
537 u8 trafficClass = WMM_AC_BE; 537 u8 trafficClass = WMM_AC_BE;
538 A_UINT16 ipType = IP_ETHERTYPE; 538 u16 ipType = IP_ETHERTYPE;
539 WMI_DATA_HDR *dtHdr; 539 WMI_DATA_HDR *dtHdr;
540 u8 streamExists = 0; 540 u8 streamExists = 0;
541 u8 userPriority; 541 u8 userPriority;
@@ -625,7 +625,7 @@ int
625wmi_dot11_hdr_add (struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode) 625wmi_dot11_hdr_add (struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode)
626{ 626{
627 u8 *datap; 627 u8 *datap;
628 A_UINT16 typeorlen; 628 u16 typeorlen;
629 ATH_MAC_HDR macHdr; 629 ATH_MAC_HDR macHdr;
630 ATH_LLC_SNAP_HDR *llcHdr; 630 ATH_LLC_SNAP_HDR *llcHdr;
631 struct ieee80211_frame *wh; 631 struct ieee80211_frame *wh;
@@ -641,7 +641,7 @@ wmi_dot11_hdr_add (struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode)
641 641
642 datap = A_NETBUF_DATA(osbuf); 642 datap = A_NETBUF_DATA(osbuf);
643 643
644 typeorlen = *(A_UINT16 *)(datap + ATH_MAC_LEN + ATH_MAC_LEN); 644 typeorlen = *(u16 *)(datap + ATH_MAC_LEN + ATH_MAC_LEN);
645 645
646 if (!IS_ETHERTYPE(A_BE2CPU16(typeorlen))) { 646 if (!IS_ETHERTYPE(A_BE2CPU16(typeorlen))) {
647/* 647/*
@@ -830,7 +830,7 @@ int
830wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf) 830wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf)
831{ 831{
832 WMIX_CMD_HDR *cmd; 832 WMIX_CMD_HDR *cmd;
833 A_UINT16 id; 833 u16 id;
834 u8 *datap; 834 u8 *datap;
835 A_UINT32 len; 835 A_UINT32 len;
836 int status = A_OK; 836 int status = A_OK;
@@ -907,7 +907,7 @@ int
907wmi_control_rx(struct wmi_t *wmip, void *osbuf) 907wmi_control_rx(struct wmi_t *wmip, void *osbuf)
908{ 908{
909 WMI_CMD_HDR *cmd; 909 WMI_CMD_HDR *cmd;
910 A_UINT16 id; 910 u16 id;
911 u8 *datap; 911 u8 *datap;
912 A_UINT32 len, i, loggingReq; 912 A_UINT32 len, i, loggingReq;
913 int status = A_OK; 913 int status = A_OK;
@@ -1279,9 +1279,9 @@ wmi_connect_event_rx(struct wmi_t *wmip, u8 *datap, int len)
1279 1279
1280 /* initialize pointer to start of assoc rsp IEs */ 1280 /* initialize pointer to start of assoc rsp IEs */
1281 pie = ev->assocInfo + ev->beaconIeLen + ev->assocReqLen + 1281 pie = ev->assocInfo + ev->beaconIeLen + ev->assocReqLen +
1282 sizeof(A_UINT16) + /* capinfo*/ 1282 sizeof(u16) + /* capinfo*/
1283 sizeof(A_UINT16) + /* status Code */ 1283 sizeof(u16) + /* status Code */
1284 sizeof(A_UINT16) ; /* associd */ 1284 sizeof(u16) ; /* associd */
1285 1285
1286 /* initialize pointer to end of assoc rsp IEs */ 1286 /* initialize pointer to end of assoc rsp IEs */
1287 peie = ev->assocInfo + ev->beaconIeLen + ev->assocReqLen + ev->assocRespLen; 1287 peie = ev->assocInfo + ev->beaconIeLen + ev->assocReqLen + ev->assocRespLen;
@@ -1991,7 +1991,7 @@ wmi_cac_event_rx(struct wmi_t *wmip, u8 *datap, int len)
1991{ 1991{
1992 WMI_CAC_EVENT *reply; 1992 WMI_CAC_EVENT *reply;
1993 WMM_TSPEC_IE *tspec_ie; 1993 WMM_TSPEC_IE *tspec_ie;
1994 A_UINT16 activeTsids; 1994 u16 activeTsids;
1995 1995
1996 if (len < sizeof(*reply)) { 1996 if (len < sizeof(*reply)) {
1997 return A_EINVAL; 1997 return A_EINVAL;
@@ -2248,7 +2248,7 @@ wmi_lqThresholdEvent_rx(struct wmi_t *wmip, u8 *datap, int len)
2248static int 2248static int
2249wmi_aplistEvent_rx(struct wmi_t *wmip, u8 *datap, int len) 2249wmi_aplistEvent_rx(struct wmi_t *wmip, u8 *datap, int len)
2250{ 2250{
2251 A_UINT16 ap_info_entry_size; 2251 u16 ap_info_entry_size;
2252 WMI_APLIST_EVENT *ev = (WMI_APLIST_EVENT *)datap; 2252 WMI_APLIST_EVENT *ev = (WMI_APLIST_EVENT *)datap;
2253 WMI_AP_INFO_V1 *ap_info_v1; 2253 WMI_AP_INFO_V1 *ap_info_v1;
2254 u8 i; 2254 u8 i;
@@ -2372,7 +2372,7 @@ wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
2372 } 2372 }
2373 2373
2374 cHdr = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf); 2374 cHdr = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf);
2375 cHdr->commandId = (A_UINT16) cmdId; 2375 cHdr->commandId = (u16) cmdId;
2376 cHdr->info1 = 0; // added for virtual interface 2376 cHdr->info1 = 0; // added for virtual interface
2377 2377
2378 /* 2378 /*
@@ -2421,7 +2421,7 @@ wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
2421 CRYPTO_TYPE pairwiseCrypto, u8 pairwiseCryptoLen, 2421 CRYPTO_TYPE pairwiseCrypto, u8 pairwiseCryptoLen,
2422 CRYPTO_TYPE groupCrypto, u8 groupCryptoLen, 2422 CRYPTO_TYPE groupCrypto, u8 groupCryptoLen,
2423 int ssidLength, A_UCHAR *ssid, 2423 int ssidLength, A_UCHAR *ssid,
2424 u8 *bssid, A_UINT16 channel, A_UINT32 ctrl_flags) 2424 u8 *bssid, u16 channel, A_UINT32 ctrl_flags)
2425{ 2425{
2426 void *osbuf; 2426 void *osbuf;
2427 WMI_CONNECT_CMD *cc; 2427 WMI_CONNECT_CMD *cc;
@@ -2471,7 +2471,7 @@ wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
2471} 2471}
2472 2472
2473int 2473int
2474wmi_reconnect_cmd(struct wmi_t *wmip, u8 *bssid, A_UINT16 channel) 2474wmi_reconnect_cmd(struct wmi_t *wmip, u8 *bssid, u16 channel)
2475{ 2475{
2476 void *osbuf; 2476 void *osbuf;
2477 WMI_RECONNECT_CMD *cc; 2477 WMI_RECONNECT_CMD *cc;
@@ -2513,7 +2513,7 @@ int
2513wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, 2513wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
2514 u32 forceFgScan, u32 isLegacy, 2514 u32 forceFgScan, u32 isLegacy,
2515 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, 2515 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval,
2516 A_INT8 numChan, A_UINT16 *channelList) 2516 A_INT8 numChan, u16 *channelList)
2517{ 2517{
2518 void *osbuf; 2518 void *osbuf;
2519 WMI_START_SCAN_CMD *sc; 2519 WMI_START_SCAN_CMD *sc;
@@ -2529,7 +2529,7 @@ wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
2529 if (numChan > WMI_MAX_CHANNELS) { 2529 if (numChan > WMI_MAX_CHANNELS) {
2530 return A_EINVAL; 2530 return A_EINVAL;
2531 } 2531 }
2532 size += sizeof(A_UINT16) * (numChan - 1); 2532 size += sizeof(u16) * (numChan - 1);
2533 } 2533 }
2534 2534
2535 osbuf = A_NETBUF_ALLOC(size); 2535 osbuf = A_NETBUF_ALLOC(size);
@@ -2547,19 +2547,19 @@ wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
2547 sc->forceScanInterval = forceScanInterval; 2547 sc->forceScanInterval = forceScanInterval;
2548 sc->numChannels = numChan; 2548 sc->numChannels = numChan;
2549 if (numChan) { 2549 if (numChan) {
2550 A_MEMCPY(sc->channelList, channelList, numChan * sizeof(A_UINT16)); 2550 A_MEMCPY(sc->channelList, channelList, numChan * sizeof(u16));
2551 } 2551 }
2552 2552
2553 return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG)); 2553 return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG));
2554} 2554}
2555 2555
2556int 2556int
2557wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec, 2557wmi_scanparams_cmd(struct wmi_t *wmip, u16 fg_start_sec,
2558 A_UINT16 fg_end_sec, A_UINT16 bg_sec, 2558 u16 fg_end_sec, u16 bg_sec,
2559 A_UINT16 minact_chdw_msec, A_UINT16 maxact_chdw_msec, 2559 u16 minact_chdw_msec, u16 maxact_chdw_msec,
2560 A_UINT16 pas_chdw_msec, 2560 u16 pas_chdw_msec,
2561 u8 shScanRatio, u8 scanCtrlFlags, 2561 u8 shScanRatio, u8 scanCtrlFlags,
2562 A_UINT32 max_dfsch_act_time, A_UINT16 maxact_scan_per_ssid) 2562 A_UINT32 max_dfsch_act_time, u16 maxact_scan_per_ssid)
2563{ 2563{
2564 void *osbuf; 2564 void *osbuf;
2565 WMI_SCAN_PARAMS_CMD *sc; 2565 WMI_SCAN_PARAMS_CMD *sc;
@@ -2657,7 +2657,7 @@ wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag,
2657} 2657}
2658 2658
2659int 2659int
2660wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons) 2660wmi_listeninterval_cmd(struct wmi_t *wmip, u16 listenInterval, u16 listenBeacons)
2661{ 2661{
2662 void *osbuf; 2662 void *osbuf;
2663 WMI_LISTEN_INT_CMD *cmd; 2663 WMI_LISTEN_INT_CMD *cmd;
@@ -2679,7 +2679,7 @@ wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 lis
2679} 2679}
2680 2680
2681int 2681int
2682wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons) 2682wmi_bmisstime_cmd(struct wmi_t *wmip, u16 bmissTime, u16 bmissBeacons)
2683{ 2683{
2684 void *osbuf; 2684 void *osbuf;
2685 WMI_BMISS_TIME_CMD *cmd; 2685 WMI_BMISS_TIME_CMD *cmd;
@@ -2706,7 +2706,7 @@ wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType,
2706{ 2706{
2707 void *osbuf; 2707 void *osbuf;
2708 WMI_SET_ASSOC_INFO_CMD *cmd; 2708 WMI_SET_ASSOC_INFO_CMD *cmd;
2709 A_UINT16 cmdLen; 2709 u16 cmdLen;
2710 2710
2711 cmdLen = sizeof(*cmd) + ieLen - 1; 2711 cmdLen = sizeof(*cmd) + ieLen - 1;
2712 osbuf = A_NETBUF_ALLOC(cmdLen); 2712 osbuf = A_NETBUF_ALLOC(cmdLen);
@@ -2750,7 +2750,7 @@ wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode)
2750 2750
2751int 2751int
2752wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl, 2752wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl,
2753 A_UINT16 atim_windows, A_UINT16 timeout_value) 2753 u16 atim_windows, u16 timeout_value)
2754{ 2754{
2755 void *osbuf; 2755 void *osbuf;
2756 WMI_IBSS_PM_CAPS_CMD *cmd; 2756 WMI_IBSS_PM_CAPS_CMD *cmd;
@@ -2799,10 +2799,10 @@ wmi_apps_cmd(struct wmi_t *wmip, u8 psType, A_UINT32 idle_time,
2799} 2799}
2800 2800
2801int 2801int
2802wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod, 2802wmi_pmparams_cmd(struct wmi_t *wmip, u16 idlePeriod,
2803 A_UINT16 psPollNum, A_UINT16 dtimPolicy, 2803 u16 psPollNum, u16 dtimPolicy,
2804 A_UINT16 tx_wakeup_policy, A_UINT16 num_tx_to_wakeup, 2804 u16 tx_wakeup_policy, u16 num_tx_to_wakeup,
2805 A_UINT16 ps_fail_event_policy) 2805 u16 ps_fail_event_policy)
2806{ 2806{
2807 void *osbuf; 2807 void *osbuf;
2808 WMI_POWER_PARAMS_CMD *pm; 2808 WMI_POWER_PARAMS_CMD *pm;
@@ -3029,7 +3029,7 @@ wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
3029{ 3029{
3030 void *osbuf; 3030 void *osbuf;
3031 WMI_SET_PMKID_LIST_CMD *cmd; 3031 WMI_SET_PMKID_LIST_CMD *cmd;
3032 A_UINT16 cmdLen; 3032 u16 cmdLen;
3033 u8 i; 3033 u8 i;
3034 3034
3035 cmdLen = sizeof(pmkInfo->numPMKID) + 3035 cmdLen = sizeof(pmkInfo->numPMKID) +
@@ -3297,7 +3297,7 @@ wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 tsid)
3297 void *osbuf; 3297 void *osbuf;
3298 WMI_DELETE_PSTREAM_CMD *cmd; 3298 WMI_DELETE_PSTREAM_CMD *cmd;
3299 int status; 3299 int status;
3300 A_UINT16 activeTsids=0; 3300 u16 activeTsids=0;
3301 3301
3302 /* validate the parameters */ 3302 /* validate the parameters */
3303 if (trafficClass > 3) { 3303 if (trafficClass > 3) {
@@ -3356,7 +3356,7 @@ wmi_delete_pstream_cmd(struct wmi_t *wmip, u8 trafficClass, u8 tsid)
3356} 3356}
3357 3357
3358int 3358int
3359wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, A_UINT16 rateMask) 3359wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, u16 rateMask)
3360{ 3360{
3361 void *osbuf; 3361 void *osbuf;
3362 WMI_FRAME_RATES_CMD *cmd; 3362 WMI_FRAME_RATES_CMD *cmd;
@@ -3597,7 +3597,7 @@ wmi_get_channelList_cmd(struct wmi_t *wmip)
3597int 3597int
3598wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam, 3598wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam,
3599 WMI_PHY_MODE mode, A_INT8 numChan, 3599 WMI_PHY_MODE mode, A_INT8 numChan,
3600 A_UINT16 *channelList) 3600 u16 *channelList)
3601{ 3601{
3602 void *osbuf; 3602 void *osbuf;
3603 WMI_CHANNEL_PARAMS_CMD *cmd; 3603 WMI_CHANNEL_PARAMS_CMD *cmd;
@@ -3609,7 +3609,7 @@ wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam,
3609 if (numChan > WMI_MAX_CHANNELS) { 3609 if (numChan > WMI_MAX_CHANNELS) {
3610 return A_EINVAL; 3610 return A_EINVAL;
3611 } 3611 }
3612 size += sizeof(A_UINT16) * (numChan - 1); 3612 size += sizeof(u16) * (numChan - 1);
3613 } 3613 }
3614 3614
3615 osbuf = A_NETBUF_ALLOC(size); 3615 osbuf = A_NETBUF_ALLOC(size);
@@ -3626,7 +3626,7 @@ wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam,
3626 cmd->scanParam = scanParam; 3626 cmd->scanParam = scanParam;
3627 cmd->phyMode = mode; 3627 cmd->phyMode = mode;
3628 cmd->numChannels = numChan; 3628 cmd->numChannels = numChan;
3629 A_MEMCPY(cmd->channelList, channelList, numChan * sizeof(A_UINT16)); 3629 A_MEMCPY(cmd->channelList, channelList, numChan * sizeof(u16));
3630 3630
3631 return (wmi_cmd_send(wmip, osbuf, WMI_SET_CHANNEL_PARAMS_CMDID, 3631 return (wmi_cmd_send(wmip, osbuf, WMI_SET_CHANNEL_PARAMS_CMDID,
3632 NO_SYNC_WMIFLAG)); 3632 NO_SYNC_WMIFLAG));
@@ -3738,7 +3738,7 @@ wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip,
3738 void *osbuf; 3738 void *osbuf;
3739 A_INT8 size; 3739 A_INT8 size;
3740 WMI_SET_HOST_SLEEP_MODE_CMD *cmd; 3740 WMI_SET_HOST_SLEEP_MODE_CMD *cmd;
3741 A_UINT16 activeTsids=0; 3741 u16 activeTsids=0;
3742 u8 streamExists=0; 3742 u8 streamExists=0;
3743 u8 i; 3743 u8 i;
3744 3744
@@ -4080,8 +4080,8 @@ wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source)
4080} 4080}
4081 4081
4082int 4082int
4083wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask, 4083wmi_config_debug_module_cmd(struct wmi_t *wmip, u16 mmask,
4084 A_UINT16 tsr, bool rep, A_UINT16 size, 4084 u16 tsr, bool rep, u16 size,
4085 A_UINT32 valid) 4085 A_UINT32 valid)
4086{ 4086{
4087 void *osbuf; 4087 void *osbuf;
@@ -4190,10 +4190,9 @@ wmi_get_txPwr_cmd(struct wmi_t *wmip)
4190 return wmi_simple_cmd(wmip, WMI_GET_TX_PWR_CMDID); 4190 return wmi_simple_cmd(wmip, WMI_GET_TX_PWR_CMDID);
4191} 4191}
4192 4192
4193A_UINT16 4193u16 wmi_get_mapped_qos_queue(struct wmi_t *wmip, u8 trafficClass)
4194wmi_get_mapped_qos_queue(struct wmi_t *wmip, u8 trafficClass)
4195{ 4194{
4196 A_UINT16 activeTsids=0; 4195 u16 activeTsids=0;
4197 4196
4198 LOCK_WMI(wmip); 4197 LOCK_WMI(wmip);
4199 activeTsids = wmip->wmi_streamExistsForAC[trafficClass]; 4198 activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
@@ -4411,7 +4410,7 @@ wmi_gpio_intr_ack(struct wmi_t *wmip,
4411#endif /* CONFIG_HOST_GPIO_SUPPORT */ 4410#endif /* CONFIG_HOST_GPIO_SUPPORT */
4412 4411
4413int 4412int
4414wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, A_UINT16 txop, u8 eCWmin, 4413wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, u16 txop, u8 eCWmin,
4415 u8 eCWmax, u8 aifsn) 4414 u8 eCWmax, u8 aifsn)
4416{ 4415{
4417 void *osbuf; 4416 void *osbuf;
@@ -4514,7 +4513,7 @@ wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
4514 u8 frmType, 4513 u8 frmType,
4515 u8 *dstMacAddr, 4514 u8 *dstMacAddr,
4516 u8 *bssid, 4515 u8 *bssid,
4517 A_UINT16 optIEDataLen, 4516 u16 optIEDataLen,
4518 u8 *optIEData) 4517 u8 *optIEData)
4519{ 4518{
4520 void *osbuf; 4519 void *osbuf;
@@ -4541,7 +4540,7 @@ wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
4541} 4540}
4542 4541
4543int 4542int
4544wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl) 4543wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, u16 intvl)
4545{ 4544{
4546 void *osbuf; 4545 void *osbuf;
4547 WMI_BEACON_INT_CMD *cmd; 4546 WMI_BEACON_INT_CMD *cmd;
@@ -4563,7 +4562,7 @@ wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl)
4563 4562
4564 4563
4565int 4564int
4566wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize) 4565wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, u16 voicePktSize)
4567{ 4566{
4568 void *osbuf; 4567 void *osbuf;
4569 WMI_SET_VOICE_PKT_SIZE_CMD *cmd; 4568 WMI_SET_VOICE_PKT_SIZE_CMD *cmd;
@@ -4757,7 +4756,7 @@ wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy)
4757} 4756}
4758 4757
4759int 4758int
4760wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold) 4759wmi_set_rts_cmd(struct wmi_t *wmip, u16 threshold)
4761{ 4760{
4762 void *osbuf; 4761 void *osbuf;
4763 WMI_SET_RTS_CMD *cmd; 4762 WMI_SET_RTS_CMD *cmd;
@@ -5311,7 +5310,7 @@ wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, u8 ieLen,
5311{ 5310{
5312 void *osbuf; 5311 void *osbuf;
5313 WMI_SET_APPIE_CMD *cmd; 5312 WMI_SET_APPIE_CMD *cmd;
5314 A_UINT16 cmdLen; 5313 u16 cmdLen;
5315 5314
5316 cmdLen = sizeof(*cmd) + ieLen - 1; 5315 cmdLen = sizeof(*cmd) + ieLen - 1;
5317 osbuf = A_NETBUF_ALLOC(cmdLen); 5316 osbuf = A_NETBUF_ALLOC(cmdLen);
@@ -5332,7 +5331,7 @@ wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, u8 ieLen,
5332} 5331}
5333 5332
5334int 5333int
5335wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, A_UINT16 dataLen) 5334wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen)
5336{ 5335{
5337 void *osbuf; 5336 void *osbuf;
5338 u8 *data; 5337 u8 *data;
@@ -6187,7 +6186,7 @@ wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *acl)
6187 * firware will allow all STAs till the count reaches AP_MAX_NUM_STA. 6186 * firware will allow all STAs till the count reaches AP_MAX_NUM_STA.
6188 */ 6187 */
6189int 6188int
6190wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, A_UINT16 reason) 6189wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, u16 reason)
6191{ 6190{
6192 void *osbuf; 6191 void *osbuf;
6193 WMI_AP_SET_MLME_CMD *mlme; 6192 WMI_AP_SET_MLME_CMD *mlme;
@@ -6246,7 +6245,7 @@ wmi_wapi_rekey_event_rx(struct wmi_t *wmip, u8 *datap,int len)
6246#endif 6245#endif
6247 6246
6248int 6247int
6249wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, bool flag) 6248wmi_set_pvb_cmd(struct wmi_t *wmip, u16 aid, bool flag)
6250{ 6249{
6251 WMI_AP_SET_PVB_CMD *cmd; 6250 WMI_AP_SET_PVB_CMD *cmd;
6252 void *osbuf = NULL; 6251 void *osbuf = NULL;
@@ -6445,7 +6444,7 @@ wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray)
6445 6444
6446 6445
6447int 6446int
6448wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, A_UINT16 sz) 6447wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, u16 sz)
6449{ 6448{
6450 void *osbuf; 6449 void *osbuf;
6451 WMI_HCI_CMD *cmd; 6450 WMI_HCI_CMD *cmd;
@@ -6465,7 +6464,7 @@ wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, A_UINT16 sz)
6465 6464
6466#ifdef ATH_AR6K_11N_SUPPORT 6465#ifdef ATH_AR6K_11N_SUPPORT
6467int 6466int
6468wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask) 6467wmi_allow_aggr_cmd(struct wmi_t *wmip, u16 tx_tidmask, u16 rx_tidmask)
6469{ 6468{
6470 void *osbuf; 6469 void *osbuf;
6471 WMI_ALLOW_AGGR_CMD *cmd; 6470 WMI_ALLOW_AGGR_CMD *cmd;
@@ -6646,19 +6645,18 @@ wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
6646 return node; 6645 return node;
6647} 6646}
6648 6647
6649A_UINT16 6648u16 wmi_ieee2freq (int chan)
6650wmi_ieee2freq (int chan)
6651{ 6649{
6652 A_UINT16 freq = 0; 6650 u16 freq = 0;
6653 freq = wlan_ieee2freq (chan); 6651 freq = wlan_ieee2freq (chan);
6654 return freq; 6652 return freq;
6655 6653
6656} 6654}
6657 6655
6658A_UINT32 6656A_UINT32
6659wmi_freq2ieee (A_UINT16 freq) 6657wmi_freq2ieee (u16 freq)
6660{ 6658{
6661 A_UINT16 chan = 0; 6659 u16 chan = 0;
6662 chan = wlan_freq2ieee (freq); 6660 chan = wlan_freq2ieee (freq);
6663 return chan; 6661 return chan;
6664} 6662}
diff --git a/drivers/staging/ath6kl/wmi/wmi_host.h b/drivers/staging/ath6kl/wmi/wmi_host.h
index f69b14031e2..a63f6e925a0 100644
--- a/drivers/staging/ath6kl/wmi/wmi_host.h
+++ b/drivers/staging/ath6kl/wmi/wmi_host.h
@@ -62,7 +62,7 @@ typedef struct sq_threshold_params_s {
62struct wmi_t { 62struct wmi_t {
63 bool wmi_ready; 63 bool wmi_ready;
64 bool wmi_numQoSStream; 64 bool wmi_numQoSStream;
65 A_UINT16 wmi_streamExistsForAC[WMM_NUM_AC]; 65 u16 wmi_streamExistsForAC[WMM_NUM_AC];
66 u8 wmi_fatPipeExists; 66 u8 wmi_fatPipeExists;
67 void *wmi_devt; 67 void *wmi_devt;
68 struct wmi_stats wmi_stats; 68 struct wmi_stats wmi_stats;
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 01:44:52 -0400