diff options
author | Joe Perches <joe@perches.com> | 2011-02-02 17:05:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 17:34:50 -0500 |
commit | 4853ac05cff7745979830c52fe6fb46a7be6fa94 (patch) | |
tree | 3ac45cd8a9aaaee0c0de0cb50db78ba62844bbed /drivers/staging/ath6kl/wmi/wmi.c | |
parent | ab3655dae4948a82a3be52681af0b778ead2c0ff (diff) |
staging: ath6kl: Convert A_UINT16 to u16
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/wmi/wmi.c')
-rw-r--r-- | drivers/staging/ath6kl/wmi/wmi.c | 122 |
1 files changed, 60 insertions, 62 deletions
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[]= { | |||
279 | typedef PREPACK struct _iphdr { | 279 | typedef 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 | |||
395 | wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf) | 395 | wmi_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 | |||
625 | wmi_dot11_hdr_add (struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode) | 625 | wmi_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 | |||
830 | wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf) | 830 | wmi_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 | |||
907 | wmi_control_rx(struct wmi_t *wmip, void *osbuf) | 907 | wmi_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) | |||
2248 | static int | 2248 | static int |
2249 | wmi_aplistEvent_rx(struct wmi_t *wmip, u8 *datap, int len) | 2249 | wmi_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 | ||
2473 | int | 2473 | int |
2474 | wmi_reconnect_cmd(struct wmi_t *wmip, u8 *bssid, A_UINT16 channel) | 2474 | wmi_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 | |||
2513 | wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, | 2513 | wmi_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 | ||
2556 | int | 2556 | int |
2557 | wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec, | 2557 | wmi_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 | ||
2659 | int | 2659 | int |
2660 | wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons) | 2660 | wmi_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 | ||
2681 | int | 2681 | int |
2682 | wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons) | 2682 | wmi_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 | ||
2751 | int | 2751 | int |
2752 | wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl, | 2752 | wmi_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 | ||
2801 | int | 2801 | int |
2802 | wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod, | 2802 | wmi_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 | ||
3358 | int | 3358 | int |
3359 | wmi_set_framerate_cmd(struct wmi_t *wmip, u8 bEnable, u8 type, u8 subType, A_UINT16 rateMask) | 3359 | wmi_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) | |||
3597 | int | 3597 | int |
3598 | wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam, | 3598 | wmi_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 | ||
4082 | int | 4082 | int |
4083 | wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask, | 4083 | wmi_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 | ||
4193 | A_UINT16 | 4193 | u16 wmi_get_mapped_qos_queue(struct wmi_t *wmip, u8 trafficClass) |
4194 | wmi_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 | ||
4413 | int | 4412 | int |
4414 | wmi_set_access_params_cmd(struct wmi_t *wmip, u8 ac, A_UINT16 txop, u8 eCWmin, | 4413 | wmi_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 | ||
4543 | int | 4542 | int |
4544 | wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl) | 4543 | wmi_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 | ||
4565 | int | 4564 | int |
4566 | wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize) | 4565 | wmi_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 | ||
4759 | int | 4758 | int |
4760 | wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold) | 4759 | wmi_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 | ||
5334 | int | 5333 | int |
5335 | wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, A_UINT16 dataLen) | 5334 | wmi_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 | */ |
6189 | int | 6188 | int |
6190 | wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, A_UINT16 reason) | 6189 | wmi_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 | ||
6248 | int | 6247 | int |
6249 | wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, bool flag) | 6248 | wmi_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 | ||
6447 | int | 6446 | int |
6448 | wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, A_UINT16 sz) | 6447 | wmi_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 |
6467 | int | 6466 | int |
6468 | wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask) | 6467 | wmi_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 | ||
6649 | A_UINT16 | 6648 | u16 wmi_ieee2freq (int chan) |
6650 | wmi_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 | ||
6658 | A_UINT32 | 6656 | A_UINT32 |
6659 | wmi_freq2ieee (A_UINT16 freq) | 6657 | wmi_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 | } |