diff options
author | Joe Perches <joe@perches.com> | 2011-02-02 17:05:49 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 17:34:49 -0500 |
commit | ab3655dae4948a82a3be52681af0b778ead2c0ff (patch) | |
tree | 3b3c7b695b241971fc559a293cb39752862889a9 /drivers/staging/ath6kl/os/linux/ar6000_drv.c | |
parent | 4c42080f3e4efba6f79fe1840eb0b728f286702d (diff) |
staging: ath6kl: Convert A_UINT8 to u8
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/os/linux/ar6000_drv.c')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 173 |
1 files changed, 85 insertions, 88 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index b1909479179..647c6c983a2 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -47,8 +47,8 @@ | |||
47 | #define LINUX_HACK_FUDGE_FACTOR 16 | 47 | #define LINUX_HACK_FUDGE_FACTOR 16 |
48 | #define BDATA_BDADDR_OFFSET 28 | 48 | #define BDATA_BDADDR_OFFSET 28 |
49 | 49 | ||
50 | A_UINT8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; | 50 | u8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; |
51 | A_UINT8 null_mac[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; | 51 | u8 null_mac[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; |
52 | 52 | ||
53 | #ifdef DEBUG | 53 | #ifdef DEBUG |
54 | 54 | ||
@@ -370,7 +370,7 @@ static void ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie); | |||
370 | static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar); | 370 | static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar); |
371 | 371 | ||
372 | #ifdef USER_KEYS | 372 | #ifdef USER_KEYS |
373 | static int ar6000_reinstall_keys(AR_SOFTC_T *ar,A_UINT8 key_op_ctrl); | 373 | static int ar6000_reinstall_keys(AR_SOFTC_T *ar,u8 key_op_ctrl); |
374 | #endif | 374 | #endif |
375 | 375 | ||
376 | #ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT | 376 | #ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT |
@@ -614,7 +614,7 @@ ar6000_dbglog_event(AR_SOFTC_T *ar, A_UINT32 dropped, | |||
614 | send = dbglog_get_debug_fragment(&buffer[sent], length - sent, | 614 | send = dbglog_get_debug_fragment(&buffer[sent], length - sent, |
615 | MAX_WIRELESS_EVENT_SIZE); | 615 | MAX_WIRELESS_EVENT_SIZE); |
616 | while (send) { | 616 | while (send) { |
617 | ar6000_send_event_to_app(ar, WMIX_DBGLOG_EVENTID, (A_UINT8*)&buffer[sent], send); | 617 | ar6000_send_event_to_app(ar, WMIX_DBGLOG_EVENTID, (u8 *)&buffer[sent], send); |
618 | sent += send; | 618 | sent += send; |
619 | send = dbglog_get_debug_fragment(&buffer[sent], length - sent, | 619 | send = dbglog_get_debug_fragment(&buffer[sent], length - sent, |
620 | MAX_WIRELESS_EVENT_SIZE); | 620 | MAX_WIRELESS_EVENT_SIZE); |
@@ -950,10 +950,10 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size) | |||
950 | A_UCHAR *ptr_mac; | 950 | A_UCHAR *ptr_mac; |
951 | switch (ar->arTargetType) { | 951 | switch (ar->arTargetType) { |
952 | case TARGET_TYPE_AR6002: | 952 | case TARGET_TYPE_AR6002: |
953 | ptr_mac = (A_UINT8 *)((A_UCHAR *)eeprom_data + AR6002_MAC_ADDRESS_OFFSET); | 953 | ptr_mac = (u8 *)((A_UCHAR *)eeprom_data + AR6002_MAC_ADDRESS_OFFSET); |
954 | break; | 954 | break; |
955 | case TARGET_TYPE_AR6003: | 955 | case TARGET_TYPE_AR6003: |
956 | ptr_mac = (A_UINT8 *)((A_UCHAR *)eeprom_data + AR6003_MAC_ADDRESS_OFFSET); | 956 | ptr_mac = (u8 *)((A_UCHAR *)eeprom_data + AR6003_MAC_ADDRESS_OFFSET); |
957 | break; | 957 | break; |
958 | default: | 958 | default: |
959 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n")); | 959 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n")); |
@@ -1877,7 +1877,7 @@ static void ar6000_target_failure(void *Instance, int Status) | |||
1877 | errEvent.errorVal = WMI_TARGET_COM_ERR | | 1877 | errEvent.errorVal = WMI_TARGET_COM_ERR | |
1878 | WMI_TARGET_FATAL_ERR; | 1878 | WMI_TARGET_FATAL_ERR; |
1879 | ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID, | 1879 | ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID, |
1880 | (A_UINT8 *)&errEvent, | 1880 | (u8 *)&errEvent, |
1881 | sizeof(WMI_TARGET_ERROR_REPORT_EVENT)); | 1881 | sizeof(WMI_TARGET_ERROR_REPORT_EVENT)); |
1882 | } | 1882 | } |
1883 | } | 1883 | } |
@@ -2186,7 +2186,7 @@ static void ar6000_detect_error(unsigned long ptr) | |||
2186 | errEvent.errorVal = WMI_TARGET_COM_ERR | WMI_TARGET_FATAL_ERR; | 2186 | errEvent.errorVal = WMI_TARGET_COM_ERR | WMI_TARGET_FATAL_ERR; |
2187 | AR6000_SPIN_UNLOCK(&ar->arLock, 0); | 2187 | AR6000_SPIN_UNLOCK(&ar->arLock, 0); |
2188 | ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID, | 2188 | ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID, |
2189 | (A_UINT8 *)&errEvent, | 2189 | (u8 *)&errEvent, |
2190 | sizeof(WMI_TARGET_ERROR_REPORT_EVENT)); | 2190 | sizeof(WMI_TARGET_ERROR_REPORT_EVENT)); |
2191 | return; | 2191 | return; |
2192 | } | 2192 | } |
@@ -2264,8 +2264,8 @@ ar6000_init_control_info(AR_SOFTC_T *ar) | |||
2264 | 2264 | ||
2265 | /* Initialize the AP mode state info */ | 2265 | /* Initialize the AP mode state info */ |
2266 | { | 2266 | { |
2267 | A_UINT8 ctr; | 2267 | u8 ctr; |
2268 | A_MEMZERO((A_UINT8 *)ar->sta_list, AP_MAX_NUM_STA * sizeof(sta_t)); | 2268 | A_MEMZERO((u8 *)ar->sta_list, AP_MAX_NUM_STA * sizeof(sta_t)); |
2269 | 2269 | ||
2270 | /* init the Mutexes */ | 2270 | /* init the Mutexes */ |
2271 | A_MUTEX_INIT(&ar->mcastpsqLock); | 2271 | A_MUTEX_INIT(&ar->mcastpsqLock); |
@@ -2414,14 +2414,13 @@ void ar6000_TxDataCleanup(AR_SOFTC_T *ar) | |||
2414 | } | 2414 | } |
2415 | 2415 | ||
2416 | HTC_ENDPOINT_ID | 2416 | HTC_ENDPOINT_ID |
2417 | ar6000_ac2_endpoint_id ( void * devt, A_UINT8 ac) | 2417 | ar6000_ac2_endpoint_id ( void * devt, u8 ac) |
2418 | { | 2418 | { |
2419 | AR_SOFTC_T *ar = (AR_SOFTC_T *) devt; | 2419 | AR_SOFTC_T *ar = (AR_SOFTC_T *) devt; |
2420 | return(arAc2EndpointID(ar, ac)); | 2420 | return(arAc2EndpointID(ar, ac)); |
2421 | } | 2421 | } |
2422 | 2422 | ||
2423 | A_UINT8 | 2423 | u8 ar6000_endpoint_id2_ac(void * devt, HTC_ENDPOINT_ID ep ) |
2424 | ar6000_endpoint_id2_ac(void * devt, HTC_ENDPOINT_ID ep ) | ||
2425 | { | 2424 | { |
2426 | AR_SOFTC_T *ar = (AR_SOFTC_T *) devt; | 2425 | AR_SOFTC_T *ar = (AR_SOFTC_T *) devt; |
2427 | return(arEndpoint2Ac(ar, ep )); | 2426 | return(arEndpoint2Ac(ar, ep )); |
@@ -2788,7 +2787,7 @@ ar6000_ratemask_rx(void *devt, A_UINT32 ratemask) | |||
2788 | } | 2787 | } |
2789 | 2788 | ||
2790 | void | 2789 | void |
2791 | ar6000_txPwr_rx(void *devt, A_UINT8 txPwr) | 2790 | ar6000_txPwr_rx(void *devt, u8 txPwr) |
2792 | { | 2791 | { |
2793 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; | 2792 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; |
2794 | 2793 | ||
@@ -2808,11 +2807,10 @@ ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList) | |||
2808 | wake_up(&arEvent); | 2807 | wake_up(&arEvent); |
2809 | } | 2808 | } |
2810 | 2809 | ||
2811 | A_UINT8 | 2810 | u8 ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, A_UINT32 * mapNo) |
2812 | ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, A_UINT32 * mapNo) | ||
2813 | { | 2811 | { |
2814 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 2812 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
2815 | A_UINT8 *datap; | 2813 | u8 *datap; |
2816 | ATH_MAC_HDR *macHdr; | 2814 | ATH_MAC_HDR *macHdr; |
2817 | A_UINT32 i, eptMap; | 2815 | A_UINT32 i, eptMap; |
2818 | 2816 | ||
@@ -2888,14 +2886,14 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) | |||
2888 | { | 2886 | { |
2889 | #define AC_NOT_MAPPED 99 | 2887 | #define AC_NOT_MAPPED 99 |
2890 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 2888 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
2891 | A_UINT8 ac = AC_NOT_MAPPED; | 2889 | u8 ac = AC_NOT_MAPPED; |
2892 | HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED; | 2890 | HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED; |
2893 | A_UINT32 mapNo = 0; | 2891 | A_UINT32 mapNo = 0; |
2894 | int len; | 2892 | int len; |
2895 | struct ar_cookie *cookie; | 2893 | struct ar_cookie *cookie; |
2896 | bool checkAdHocPsMapping = false,bMoreData = false; | 2894 | bool checkAdHocPsMapping = false,bMoreData = false; |
2897 | HTC_TX_TAG htc_tag = AR6K_DATA_PKT_TAG; | 2895 | HTC_TX_TAG htc_tag = AR6K_DATA_PKT_TAG; |
2898 | A_UINT8 dot11Hdr = processDot11Hdr; | 2896 | u8 dot11Hdr = processDot11Hdr; |
2899 | #ifdef CONFIG_PM | 2897 | #ifdef CONFIG_PM |
2900 | if (ar->arWowState != WLAN_WOW_STATE_NONE) { | 2898 | if (ar->arWowState != WLAN_WOW_STATE_NONE) { |
2901 | A_NETBUF_FREE(skb); | 2899 | A_NETBUF_FREE(skb); |
@@ -2942,7 +2940,7 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) | |||
2942 | * mcastq | 2940 | * mcastq |
2943 | */ | 2941 | */ |
2944 | if (IEEE80211_IS_MULTICAST(datap->dstMac)) { | 2942 | if (IEEE80211_IS_MULTICAST(datap->dstMac)) { |
2945 | A_UINT8 ctr=0; | 2943 | u8 ctr=0; |
2946 | bool qMcast=false; | 2944 | bool qMcast=false; |
2947 | 2945 | ||
2948 | 2946 | ||
@@ -3024,9 +3022,9 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) | |||
3024 | 3022 | ||
3025 | if (ar->arWmiEnabled) { | 3023 | if (ar->arWmiEnabled) { |
3026 | #ifdef CONFIG_CHECKSUM_OFFLOAD | 3024 | #ifdef CONFIG_CHECKSUM_OFFLOAD |
3027 | A_UINT8 csumStart=0; | 3025 | u8 csumStart=0; |
3028 | A_UINT8 csumDest=0; | 3026 | u8 csumDest=0; |
3029 | A_UINT8 csum=skb->ip_summed; | 3027 | u8 csum=skb->ip_summed; |
3030 | if(csumOffload && (csum==CHECKSUM_PARTIAL)){ | 3028 | if(csumOffload && (csum==CHECKSUM_PARTIAL)){ |
3031 | csumStart = (skb->head + skb->csum_start - skb_network_header(skb) + | 3029 | csumStart = (skb->head + skb->csum_start - skb_network_header(skb) + |
3032 | sizeof(ATH_LLC_SNAP_HDR)); | 3030 | sizeof(ATH_LLC_SNAP_HDR)); |
@@ -3527,10 +3525,10 @@ ar6000_tx_complete(void *Context, HTC_PACKET_QUEUE *pPacketQueue) | |||
3527 | } | 3525 | } |
3528 | 3526 | ||
3529 | sta_t * | 3527 | sta_t * |
3530 | ieee80211_find_conn(AR_SOFTC_T *ar, A_UINT8 *node_addr) | 3528 | ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr) |
3531 | { | 3529 | { |
3532 | sta_t *conn = NULL; | 3530 | sta_t *conn = NULL; |
3533 | A_UINT8 i, max_conn; | 3531 | u8 i, max_conn; |
3534 | 3532 | ||
3535 | switch(ar->arNetworkType) { | 3533 | switch(ar->arNetworkType) { |
3536 | case AP_NETWORK: | 3534 | case AP_NETWORK: |
@@ -3551,10 +3549,10 @@ ieee80211_find_conn(AR_SOFTC_T *ar, A_UINT8 *node_addr) | |||
3551 | return conn; | 3549 | return conn; |
3552 | } | 3550 | } |
3553 | 3551 | ||
3554 | sta_t *ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, A_UINT8 aid) | 3552 | sta_t *ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid) |
3555 | { | 3553 | { |
3556 | sta_t *conn = NULL; | 3554 | sta_t *conn = NULL; |
3557 | A_UINT8 ctr; | 3555 | u8 ctr; |
3558 | 3556 | ||
3559 | for (ctr = 0; ctr < AP_MAX_NUM_STA; ctr++) { | 3557 | for (ctr = 0; ctr < AP_MAX_NUM_STA; ctr++) { |
3560 | if (ar->sta_list[ctr].aid == aid) { | 3558 | if (ar->sta_list[ctr].aid == aid) { |
@@ -3575,7 +3573,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) | |||
3575 | AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; | 3573 | AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; |
3576 | struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext; | 3574 | struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext; |
3577 | int minHdrLen; | 3575 | int minHdrLen; |
3578 | A_UINT8 containsDot11Hdr = 0; | 3576 | u8 containsDot11Hdr = 0; |
3579 | int status = pPacket->Status; | 3577 | int status = pPacket->Status; |
3580 | HTC_ENDPOINT_ID ept = pPacket->Endpoint; | 3578 | HTC_ENDPOINT_ID ept = pPacket->Endpoint; |
3581 | 3579 | ||
@@ -3631,7 +3629,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) | |||
3631 | } else { | 3629 | } else { |
3632 | WMI_DATA_HDR *dhdr = (WMI_DATA_HDR *)A_NETBUF_DATA(skb); | 3630 | WMI_DATA_HDR *dhdr = (WMI_DATA_HDR *)A_NETBUF_DATA(skb); |
3633 | bool is_amsdu; | 3631 | bool is_amsdu; |
3634 | A_UINT8 tid; | 3632 | u8 tid; |
3635 | bool is_acl_data_frame; | 3633 | bool is_acl_data_frame; |
3636 | is_acl_data_frame = WMI_DATA_HDR_GET_DATA_TYPE(dhdr) == WMI_DATA_HDR_DATA_TYPE_ACL; | 3634 | is_acl_data_frame = WMI_DATA_HDR_GET_DATA_TYPE(dhdr) == WMI_DATA_HDR_DATA_TYPE_ACL; |
3637 | #ifdef CONFIG_PM | 3635 | #ifdef CONFIG_PM |
@@ -3668,7 +3666,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) | |||
3668 | A_NETBUF_FREE(skb); | 3666 | A_NETBUF_FREE(skb); |
3669 | } else { | 3667 | } else { |
3670 | A_UINT16 seq_no; | 3668 | A_UINT16 seq_no; |
3671 | A_UINT8 meta_type; | 3669 | u8 meta_type; |
3672 | 3670 | ||
3673 | #if 0 | 3671 | #if 0 |
3674 | /* Access RSSI values here */ | 3672 | /* Access RSSI values here */ |
@@ -3678,7 +3676,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) | |||
3678 | /* Get the Power save state of the STA */ | 3676 | /* Get the Power save state of the STA */ |
3679 | if (ar->arNetworkType == AP_NETWORK) { | 3677 | if (ar->arNetworkType == AP_NETWORK) { |
3680 | sta_t *conn = NULL; | 3678 | sta_t *conn = NULL; |
3681 | A_UINT8 psState=0,prevPsState; | 3679 | u8 psState=0,prevPsState; |
3682 | ATH_MAC_HDR *datap=NULL; | 3680 | ATH_MAC_HDR *datap=NULL; |
3683 | A_UINT16 offset; | 3681 | A_UINT16 offset; |
3684 | 3682 | ||
@@ -4162,7 +4160,7 @@ err_exit: | |||
4162 | } | 4160 | } |
4163 | 4161 | ||
4164 | void | 4162 | void |
4165 | ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap, A_UINT32 sw_ver, A_UINT32 abi_ver) | 4163 | ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, A_UINT32 sw_ver, A_UINT32 abi_ver) |
4166 | { | 4164 | { |
4167 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; | 4165 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; |
4168 | struct net_device *dev = ar->arNetDev; | 4166 | struct net_device *dev = ar->arNetDev; |
@@ -4208,10 +4206,10 @@ ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap, A_UINT32 sw_ver, | |||
4208 | } | 4206 | } |
4209 | 4207 | ||
4210 | void | 4208 | void |
4211 | add_new_sta(AR_SOFTC_T *ar, A_UINT8 *mac, A_UINT16 aid, A_UINT8 *wpaie, | 4209 | add_new_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 aid, u8 *wpaie, |
4212 | A_UINT8 ielen, A_UINT8 keymgmt, A_UINT8 ucipher, A_UINT8 auth) | 4210 | u8 ielen, u8 keymgmt, u8 ucipher, u8 auth) |
4213 | { | 4211 | { |
4214 | A_UINT8 free_slot=aid-1; | 4212 | u8 free_slot=aid-1; |
4215 | 4213 | ||
4216 | A_MEMCPY(ar->sta_list[free_slot].mac, mac, ATH_MAC_LEN); | 4214 | A_MEMCPY(ar->sta_list[free_slot].mac, mac, ATH_MAC_LEN); |
4217 | A_MEMCPY(ar->sta_list[free_slot].wpa_ie, wpaie, ielen); | 4215 | A_MEMCPY(ar->sta_list[free_slot].wpa_ie, wpaie, ielen); |
@@ -4224,11 +4222,11 @@ add_new_sta(AR_SOFTC_T *ar, A_UINT8 *mac, A_UINT16 aid, A_UINT8 *wpaie, | |||
4224 | } | 4222 | } |
4225 | 4223 | ||
4226 | void | 4224 | void |
4227 | ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, A_UINT8 *bssid, | 4225 | ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, u8 *bssid, |
4228 | A_UINT16 listenInterval, A_UINT16 beaconInterval, | 4226 | A_UINT16 listenInterval, A_UINT16 beaconInterval, |
4229 | NETWORK_TYPE networkType, A_UINT8 beaconIeLen, | 4227 | NETWORK_TYPE networkType, u8 beaconIeLen, |
4230 | A_UINT8 assocReqLen, A_UINT8 assocRespLen, | 4228 | u8 assocReqLen, u8 assocRespLen, |
4231 | A_UINT8 *assocInfo) | 4229 | u8 *assocInfo) |
4232 | { | 4230 | { |
4233 | union iwreq_data wrqu; | 4231 | union iwreq_data wrqu; |
4234 | int i, beacon_ie_pos, assoc_resp_ie_pos, assoc_req_ie_pos; | 4232 | int i, beacon_ie_pos, assoc_resp_ie_pos, assoc_req_ie_pos; |
@@ -4237,7 +4235,7 @@ ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, A_UINT8 *bssid, | |||
4237 | static const char *beaconIetag = "BEACONIE="; | 4235 | static const char *beaconIetag = "BEACONIE="; |
4238 | char buf[WMI_CONTROL_MSG_MAX_LEN * 2 + strlen(tag1) + 1]; | 4236 | char buf[WMI_CONTROL_MSG_MAX_LEN * 2 + strlen(tag1) + 1]; |
4239 | char *pos; | 4237 | char *pos; |
4240 | A_UINT8 key_op_ctrl; | 4238 | u8 key_op_ctrl; |
4241 | unsigned long flags; | 4239 | unsigned long flags; |
4242 | struct ieee80211req_key *ik; | 4240 | struct ieee80211req_key *ik; |
4243 | CRYPTO_TYPE keyType = NONE_CRYPT; | 4241 | CRYPTO_TYPE keyType = NONE_CRYPT; |
@@ -4273,7 +4271,7 @@ ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, A_UINT8 *bssid, | |||
4273 | goto skip_key; | 4271 | goto skip_key; |
4274 | } | 4272 | } |
4275 | wmi_addKey_cmd(ar->arWmi, ik->ik_keyix, keyType, GROUP_USAGE, | 4273 | wmi_addKey_cmd(ar->arWmi, ik->ik_keyix, keyType, GROUP_USAGE, |
4276 | ik->ik_keylen, (A_UINT8 *)&ik->ik_keyrsc, | 4274 | ik->ik_keylen, (u8 *)&ik->ik_keyrsc, |
4277 | ik->ik_keydata, KEY_OP_INIT_VAL, ik->ik_macaddr, | 4275 | ik->ik_keydata, KEY_OP_INIT_VAL, ik->ik_macaddr, |
4278 | SYNC_BOTH_WMIFLAG); | 4276 | SYNC_BOTH_WMIFLAG); |
4279 | 4277 | ||
@@ -4517,7 +4515,7 @@ void ar6000_set_numdataendpts(AR_SOFTC_T *ar, A_UINT32 num) | |||
4517 | } | 4515 | } |
4518 | 4516 | ||
4519 | void | 4517 | void |
4520 | sta_cleanup(AR_SOFTC_T *ar, A_UINT8 i) | 4518 | sta_cleanup(AR_SOFTC_T *ar, u8 i) |
4521 | { | 4519 | { |
4522 | struct sk_buff *skb; | 4520 | struct sk_buff *skb; |
4523 | 4521 | ||
@@ -4540,10 +4538,9 @@ sta_cleanup(AR_SOFTC_T *ar, A_UINT8 i) | |||
4540 | 4538 | ||
4541 | } | 4539 | } |
4542 | 4540 | ||
4543 | A_UINT8 | 4541 | u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 reason) |
4544 | remove_sta(AR_SOFTC_T *ar, A_UINT8 *mac, A_UINT16 reason) | ||
4545 | { | 4542 | { |
4546 | A_UINT8 i, removed=0; | 4543 | u8 i, removed=0; |
4547 | 4544 | ||
4548 | if(IS_MAC_NULL(mac)) { | 4545 | if(IS_MAC_NULL(mac)) { |
4549 | return removed; | 4546 | return removed; |
@@ -4574,10 +4571,10 @@ remove_sta(AR_SOFTC_T *ar, A_UINT8 *mac, A_UINT16 reason) | |||
4574 | } | 4571 | } |
4575 | 4572 | ||
4576 | void | 4573 | void |
4577 | ar6000_disconnect_event(AR_SOFTC_T *ar, A_UINT8 reason, A_UINT8 *bssid, | 4574 | ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid, |
4578 | A_UINT8 assocRespLen, A_UINT8 *assocInfo, A_UINT16 protocolReasonStatus) | 4575 | u8 assocRespLen, u8 *assocInfo, A_UINT16 protocolReasonStatus) |
4579 | { | 4576 | { |
4580 | A_UINT8 i; | 4577 | u8 i; |
4581 | unsigned long flags; | 4578 | unsigned long flags; |
4582 | union iwreq_data wrqu; | 4579 | union iwreq_data wrqu; |
4583 | 4580 | ||
@@ -4761,7 +4758,7 @@ ar6000_hci_event_rcv_evt(struct ar6_softc *ar, WMI_HCI_EVENT *cmd) | |||
4761 | { | 4758 | { |
4762 | void *osbuf = NULL; | 4759 | void *osbuf = NULL; |
4763 | A_INT8 i; | 4760 | A_INT8 i; |
4764 | A_UINT8 size, *buf; | 4761 | u8 size, *buf; |
4765 | int ret = A_OK; | 4762 | int ret = A_OK; |
4766 | 4763 | ||
4767 | size = cmd->evt_buf_sz + 4; | 4764 | size = cmd->evt_buf_sz + 4; |
@@ -4773,7 +4770,7 @@ ar6000_hci_event_rcv_evt(struct ar6_softc *ar, WMI_HCI_EVENT *cmd) | |||
4773 | } | 4770 | } |
4774 | 4771 | ||
4775 | A_NETBUF_PUT(osbuf, size); | 4772 | A_NETBUF_PUT(osbuf, size); |
4776 | buf = (A_UINT8 *)A_NETBUF_DATA(osbuf); | 4773 | buf = (u8 *)A_NETBUF_DATA(osbuf); |
4777 | /* First 2-bytes carry HCI event/ACL data type | 4774 | /* First 2-bytes carry HCI event/ACL data type |
4778 | * the next 2 are free | 4775 | * the next 2 are free |
4779 | */ | 4776 | */ |
@@ -4850,7 +4847,7 @@ ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info) | |||
4850 | } | 4847 | } |
4851 | 4848 | ||
4852 | void | 4849 | void |
4853 | ar6000_tkip_micerr_event(AR_SOFTC_T *ar, A_UINT8 keyid, bool ismcast) | 4850 | ar6000_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast) |
4854 | { | 4851 | { |
4855 | static const char *tag = "MLME-MICHAELMICFAILURE.indication"; | 4852 | static const char *tag = "MLME-MICHAELMICFAILURE.indication"; |
4856 | char buf[128]; | 4853 | char buf[128]; |
@@ -4910,9 +4907,9 @@ ar6000_scanComplete_event(AR_SOFTC_T *ar, int status) | |||
4910 | } | 4907 | } |
4911 | 4908 | ||
4912 | void | 4909 | void |
4913 | ar6000_targetStats_event(AR_SOFTC_T *ar, A_UINT8 *ptr, A_UINT32 len) | 4910 | ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, A_UINT32 len) |
4914 | { | 4911 | { |
4915 | A_UINT8 ac; | 4912 | u8 ac; |
4916 | 4913 | ||
4917 | if(ar->arNetworkType == AP_NETWORK) { | 4914 | if(ar->arNetworkType == AP_NETWORK) { |
4918 | WMI_AP_MODE_STAT *p = (WMI_AP_MODE_STAT *)ptr; | 4915 | WMI_AP_MODE_STAT *p = (WMI_AP_MODE_STAT *)ptr; |
@@ -5051,7 +5048,7 @@ ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, | |||
5051 | A_PRINTF("rssi Threshold range = %d tag = %d rssi = %d\n", newThreshold, | 5048 | A_PRINTF("rssi Threshold range = %d tag = %d rssi = %d\n", newThreshold, |
5052 | userRssiThold.tag, userRssiThold.rssi); | 5049 | userRssiThold.tag, userRssiThold.rssi); |
5053 | 5050 | ||
5054 | ar6000_send_event_to_app(ar, WMI_RSSI_THRESHOLD_EVENTID,(A_UINT8 *)&userRssiThold, sizeof(USER_RSSI_THOLD)); | 5051 | ar6000_send_event_to_app(ar, WMI_RSSI_THRESHOLD_EVENTID,(u8 *)&userRssiThold, sizeof(USER_RSSI_THOLD)); |
5055 | } | 5052 | } |
5056 | 5053 | ||
5057 | 5054 | ||
@@ -5061,7 +5058,7 @@ ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, A_UINT32 cookie, A_UINT32 source) | |||
5061 | if (source == APP_HB_CHALLENGE) { | 5058 | if (source == APP_HB_CHALLENGE) { |
5062 | /* Report it to the app in case it wants a positive acknowledgement */ | 5059 | /* Report it to the app in case it wants a positive acknowledgement */ |
5063 | ar6000_send_event_to_app(ar, WMIX_HB_CHALLENGE_RESP_EVENTID, | 5060 | ar6000_send_event_to_app(ar, WMIX_HB_CHALLENGE_RESP_EVENTID, |
5064 | (A_UINT8 *)&cookie, sizeof(cookie)); | 5061 | (u8 *)&cookie, sizeof(cookie)); |
5065 | } else { | 5062 | } else { |
5066 | /* This would ignore the replys that come in after their due time */ | 5063 | /* This would ignore the replys that come in after their due time */ |
5067 | if (cookie == ar->arHBChallengeResp.seqNum) { | 5064 | if (cookie == ar->arHBChallengeResp.seqNum) { |
@@ -5107,8 +5104,8 @@ ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal) | |||
5107 | 5104 | ||
5108 | 5105 | ||
5109 | void | 5106 | void |
5110 | ar6000_cac_event(AR_SOFTC_T *ar, A_UINT8 ac, A_UINT8 cacIndication, | 5107 | ar6000_cac_event(AR_SOFTC_T *ar, u8 ac, u8 cacIndication, |
5111 | A_UINT8 statusCode, A_UINT8 *tspecSuggestion) | 5108 | u8 statusCode, u8 *tspecSuggestion) |
5112 | { | 5109 | { |
5113 | WMM_TSPEC_IE *tspecIe; | 5110 | WMM_TSPEC_IE *tspecIe; |
5114 | 5111 | ||
@@ -5146,7 +5143,7 @@ ar6000_channel_change_event(AR_SOFTC_T *ar, A_UINT16 oldChannel, | |||
5146 | void | 5143 | void |
5147 | ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl) | 5144 | ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl) |
5148 | { | 5145 | { |
5149 | A_UINT8 i; | 5146 | u8 i; |
5150 | 5147 | ||
5151 | A_PRINTF("ROAM TABLE NO OF ENTRIES is %d ROAM MODE is %d\n", | 5148 | A_PRINTF("ROAM TABLE NO OF ENTRIES is %d ROAM MODE is %d\n", |
5152 | pTbl->numEntries, pTbl->roamMode); | 5149 | pTbl->numEntries, pTbl->roamMode); |
@@ -5169,9 +5166,9 @@ ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl) | |||
5169 | } | 5166 | } |
5170 | 5167 | ||
5171 | void | 5168 | void |
5172 | ar6000_wow_list_event(struct ar6_softc *ar, A_UINT8 num_filters, WMI_GET_WOW_LIST_REPLY *wow_reply) | 5169 | ar6000_wow_list_event(struct ar6_softc *ar, u8 num_filters, WMI_GET_WOW_LIST_REPLY *wow_reply) |
5173 | { | 5170 | { |
5174 | A_UINT8 i,j; | 5171 | u8 i,j; |
5175 | 5172 | ||
5176 | /*Each event now contains exactly one filter, see bug 26613*/ | 5173 | /*Each event now contains exactly one filter, see bug 26613*/ |
5177 | A_PRINTF("WOW pattern %d of %d patterns\n", wow_reply->this_filter_num, wow_reply->num_filters); | 5174 | A_PRINTF("WOW pattern %d of %d patterns\n", wow_reply->this_filter_num, wow_reply->num_filters); |
@@ -5235,7 +5232,7 @@ ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p) | |||
5235 | } | 5232 | } |
5236 | 5233 | ||
5237 | void | 5234 | void |
5238 | ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, A_UINT8 *datap, int len) | 5235 | ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, u8 *datap, int len) |
5239 | { | 5236 | { |
5240 | struct sk_buff *skb; | 5237 | struct sk_buff *skb; |
5241 | WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap; | 5238 | WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap; |
@@ -5306,7 +5303,7 @@ ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid) | |||
5306 | if(logWmiRawMsgs) { | 5303 | if(logWmiRawMsgs) { |
5307 | A_PRINTF("WMI cmd send, msgNo %d :", wmiSendCmdNum); | 5304 | A_PRINTF("WMI cmd send, msgNo %d :", wmiSendCmdNum); |
5308 | for(i = 0; i < a_netbuf_to_len(osbuf); i++) | 5305 | for(i = 0; i < a_netbuf_to_len(osbuf); i++) |
5309 | A_PRINTF("%x ", ((A_UINT8 *)a_netbuf_to_data(osbuf))[i]); | 5306 | A_PRINTF("%x ", ((u8 *)a_netbuf_to_data(osbuf))[i]); |
5310 | A_PRINTF("\n"); | 5307 | A_PRINTF("\n"); |
5311 | } | 5308 | } |
5312 | 5309 | ||
@@ -5347,7 +5344,7 @@ ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid) | |||
5347 | } | 5344 | } |
5348 | 5345 | ||
5349 | /* indicate tx activity or inactivity on a WMI stream */ | 5346 | /* indicate tx activity or inactivity on a WMI stream */ |
5350 | void ar6000_indicate_tx_activity(void *devt, A_UINT8 TrafficClass, bool Active) | 5347 | void ar6000_indicate_tx_activity(void *devt, u8 TrafficClass, bool Active) |
5351 | { | 5348 | { |
5352 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; | 5349 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; |
5353 | HTC_ENDPOINT_ID eid ; | 5350 | HTC_ENDPOINT_ID eid ; |
@@ -5407,7 +5404,7 @@ void ar6000_indicate_tx_activity(void *devt, A_UINT8 TrafficClass, bool Active) | |||
5407 | } | 5404 | } |
5408 | 5405 | ||
5409 | void | 5406 | void |
5410 | ar6000_btcoex_config_event(struct ar6_softc *ar, A_UINT8 *ptr, A_UINT32 len) | 5407 | ar6000_btcoex_config_event(struct ar6_softc *ar, u8 *ptr, A_UINT32 len) |
5411 | { | 5408 | { |
5412 | 5409 | ||
5413 | WMI_BTCOEX_CONFIG_EVENT *pBtcoexConfig = (WMI_BTCOEX_CONFIG_EVENT *)ptr; | 5410 | WMI_BTCOEX_CONFIG_EVENT *pBtcoexConfig = (WMI_BTCOEX_CONFIG_EVENT *)ptr; |
@@ -5444,7 +5441,7 @@ ar6000_btcoex_config_event(struct ar6_softc *ar, A_UINT8 *ptr, A_UINT32 len) | |||
5444 | } | 5441 | } |
5445 | 5442 | ||
5446 | void | 5443 | void |
5447 | ar6000_btcoex_stats_event(struct ar6_softc *ar, A_UINT8 *ptr, A_UINT32 len) | 5444 | ar6000_btcoex_stats_event(struct ar6_softc *ar, u8 *ptr, A_UINT32 len) |
5448 | { | 5445 | { |
5449 | WMI_BTCOEX_STATS_EVENT *pBtcoexStats = (WMI_BTCOEX_STATS_EVENT *)ptr; | 5446 | WMI_BTCOEX_STATS_EVENT *pBtcoexStats = (WMI_BTCOEX_STATS_EVENT *)ptr; |
5450 | 5447 | ||
@@ -5523,7 +5520,7 @@ ar6000_alloc_cookie(AR_SOFTC_T *ar) | |||
5523 | */ | 5520 | */ |
5524 | #define EVENT_ID_LEN 2 | 5521 | #define EVENT_ID_LEN 2 |
5525 | void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, | 5522 | void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, |
5526 | A_UINT8 *datap, int len) | 5523 | u8 *datap, int len) |
5527 | { | 5524 | { |
5528 | 5525 | ||
5529 | #if (WIRELESS_EXT >= 15) | 5526 | #if (WIRELESS_EXT >= 15) |
@@ -5568,7 +5565,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, | |||
5568 | * includes the event ID and event content. | 5565 | * includes the event ID and event content. |
5569 | */ | 5566 | */ |
5570 | void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, | 5567 | void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, |
5571 | A_UINT8 *datap, int len) | 5568 | u8 *datap, int len) |
5572 | { | 5569 | { |
5573 | 5570 | ||
5574 | #if (WIRELESS_EXT >= 18) | 5571 | #if (WIRELESS_EXT >= 18) |
@@ -5616,7 +5613,7 @@ ar6000_tx_retry_err_event(void *devt) | |||
5616 | } | 5613 | } |
5617 | 5614 | ||
5618 | void | 5615 | void |
5619 | ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, A_UINT8 snr) | 5616 | ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, u8 snr) |
5620 | { | 5617 | { |
5621 | WMI_SNR_THRESHOLD_EVENT event; | 5618 | WMI_SNR_THRESHOLD_EVENT event; |
5622 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; | 5619 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; |
@@ -5624,12 +5621,12 @@ ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, A_UI | |||
5624 | event.range = newThreshold; | 5621 | event.range = newThreshold; |
5625 | event.snr = snr; | 5622 | event.snr = snr; |
5626 | 5623 | ||
5627 | ar6000_send_event_to_app(ar, WMI_SNR_THRESHOLD_EVENTID, (A_UINT8 *)&event, | 5624 | ar6000_send_event_to_app(ar, WMI_SNR_THRESHOLD_EVENTID, (u8 *)&event, |
5628 | sizeof(WMI_SNR_THRESHOLD_EVENT)); | 5625 | sizeof(WMI_SNR_THRESHOLD_EVENT)); |
5629 | } | 5626 | } |
5630 | 5627 | ||
5631 | void | 5628 | void |
5632 | ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL newThreshold, A_UINT8 lq) | 5629 | ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL newThreshold, u8 lq) |
5633 | { | 5630 | { |
5634 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("lq threshold range %d, lq %d\n", newThreshold, lq)); | 5631 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("lq threshold range %d, lq %d\n", newThreshold, lq)); |
5635 | } | 5632 | } |
@@ -5674,7 +5671,7 @@ ar6000_get_driver_cfg(struct net_device *dev, | |||
5674 | } | 5671 | } |
5675 | 5672 | ||
5676 | void | 5673 | void |
5677 | ar6000_keepalive_rx(void *devt, A_UINT8 configured) | 5674 | ar6000_keepalive_rx(void *devt, u8 configured) |
5678 | { | 5675 | { |
5679 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; | 5676 | AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; |
5680 | 5677 | ||
@@ -5683,10 +5680,10 @@ ar6000_keepalive_rx(void *devt, A_UINT8 configured) | |||
5683 | } | 5680 | } |
5684 | 5681 | ||
5685 | void | 5682 | void |
5686 | ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID, WMI_PMKID *pmkidList, | 5683 | ar6000_pmkid_list_event(void *devt, u8 numPMKID, WMI_PMKID *pmkidList, |
5687 | A_UINT8 *bssidList) | 5684 | u8 *bssidList) |
5688 | { | 5685 | { |
5689 | A_UINT8 i, j; | 5686 | u8 i, j; |
5690 | 5687 | ||
5691 | A_PRINTF("Number of Cached PMKIDs is %d\n", numPMKID); | 5688 | A_PRINTF("Number of Cached PMKIDs is %d\n", numPMKID); |
5692 | 5689 | ||
@@ -5700,12 +5697,12 @@ ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID, WMI_PMKID *pmkidList, | |||
5700 | for (j = 0; j < WMI_PMKID_LEN; j++) { | 5697 | for (j = 0; j < WMI_PMKID_LEN; j++) { |
5701 | A_PRINTF("%2.2x", pmkidList->pmkid[j]); | 5698 | A_PRINTF("%2.2x", pmkidList->pmkid[j]); |
5702 | } | 5699 | } |
5703 | pmkidList = (WMI_PMKID *)((A_UINT8 *)pmkidList + ATH_MAC_LEN + | 5700 | pmkidList = (WMI_PMKID *)((u8 *)pmkidList + ATH_MAC_LEN + |
5704 | WMI_PMKID_LEN); | 5701 | WMI_PMKID_LEN); |
5705 | } | 5702 | } |
5706 | } | 5703 | } |
5707 | 5704 | ||
5708 | void ar6000_pspoll_event(AR_SOFTC_T *ar,A_UINT8 aid) | 5705 | void ar6000_pspoll_event(AR_SOFTC_T *ar,u8 aid) |
5709 | { | 5706 | { |
5710 | sta_t *conn=NULL; | 5707 | sta_t *conn=NULL; |
5711 | bool isPsqEmpty = false; | 5708 | bool isPsqEmpty = false; |
@@ -5793,7 +5790,7 @@ void ar6000_dtimexpiry_event(AR_SOFTC_T *ar) | |||
5793 | void | 5790 | void |
5794 | read_rssi_compensation_param(AR_SOFTC_T *ar) | 5791 | read_rssi_compensation_param(AR_SOFTC_T *ar) |
5795 | { | 5792 | { |
5796 | A_UINT8 *cust_data_ptr; | 5793 | u8 *cust_data_ptr; |
5797 | 5794 | ||
5798 | //#define RSSICOMPENSATION_PRINT | 5795 | //#define RSSICOMPENSATION_PRINT |
5799 | 5796 | ||
@@ -5801,7 +5798,7 @@ read_rssi_compensation_param(AR_SOFTC_T *ar) | |||
5801 | A_INT16 i; | 5798 | A_INT16 i; |
5802 | cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); | 5799 | cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); |
5803 | for (i=0; i<16; i++) { | 5800 | for (i=0; i<16; i++) { |
5804 | A_PRINTF("cust_data_%d = %x \n", i, *(A_UINT8 *)cust_data_ptr); | 5801 | A_PRINTF("cust_data_%d = %x \n", i, *(u8 *)cust_data_ptr); |
5805 | cust_data_ptr += 1; | 5802 | cust_data_ptr += 1; |
5806 | } | 5803 | } |
5807 | #endif | 5804 | #endif |
@@ -5938,7 +5935,7 @@ rssi_compensation_reverse_calc(AR_SOFTC_T *ar, A_INT16 rssi, bool Above) | |||
5938 | } | 5935 | } |
5939 | 5936 | ||
5940 | #ifdef WAPI_ENABLE | 5937 | #ifdef WAPI_ENABLE |
5941 | void ap_wapi_rekey_event(AR_SOFTC_T *ar, A_UINT8 type, A_UINT8 *mac) | 5938 | void ap_wapi_rekey_event(AR_SOFTC_T *ar, u8 type, u8 *mac) |
5942 | { | 5939 | { |
5943 | union iwreq_data wrqu; | 5940 | union iwreq_data wrqu; |
5944 | char buf[20]; | 5941 | char buf[20]; |
@@ -5960,7 +5957,7 @@ void ap_wapi_rekey_event(AR_SOFTC_T *ar, A_UINT8 type, A_UINT8 *mac) | |||
5960 | #ifdef USER_KEYS | 5957 | #ifdef USER_KEYS |
5961 | static int | 5958 | static int |
5962 | 5959 | ||
5963 | ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl) | 5960 | ar6000_reinstall_keys(AR_SOFTC_T *ar, u8 key_op_ctrl) |
5964 | { | 5961 | { |
5965 | int status = A_OK; | 5962 | int status = A_OK; |
5966 | struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik; | 5963 | struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik; |
@@ -5975,7 +5972,7 @@ ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl) | |||
5975 | if (uik->ik_keylen) { | 5972 | if (uik->ik_keylen) { |
5976 | status = wmi_addKey_cmd(ar->arWmi, uik->ik_keyix, | 5973 | status = wmi_addKey_cmd(ar->arWmi, uik->ik_keyix, |
5977 | ar->user_saved_keys.keyType, PAIRWISE_USAGE, | 5974 | ar->user_saved_keys.keyType, PAIRWISE_USAGE, |
5978 | uik->ik_keylen, (A_UINT8 *)&uik->ik_keyrsc, | 5975 | uik->ik_keylen, (u8 *)&uik->ik_keyrsc, |
5979 | uik->ik_keydata, key_op_ctrl, uik->ik_macaddr, SYNC_BEFORE_WMIFLAG); | 5976 | uik->ik_keydata, key_op_ctrl, uik->ik_macaddr, SYNC_BEFORE_WMIFLAG); |
5980 | } | 5977 | } |
5981 | 5978 | ||
@@ -5991,7 +5988,7 @@ ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl) | |||
5991 | if (bik->ik_keylen) { | 5988 | if (bik->ik_keylen) { |
5992 | status = wmi_addKey_cmd(ar->arWmi, bik->ik_keyix, | 5989 | status = wmi_addKey_cmd(ar->arWmi, bik->ik_keyix, |
5993 | ar->user_saved_keys.keyType, GROUP_USAGE, | 5990 | ar->user_saved_keys.keyType, GROUP_USAGE, |
5994 | bik->ik_keylen, (A_UINT8 *)&bik->ik_keyrsc, | 5991 | bik->ik_keylen, (u8 *)&bik->ik_keyrsc, |
5995 | bik->ik_keydata, key_op_ctrl, bik->ik_macaddr, NO_SYNC_WMIFLAG); | 5992 | bik->ik_keydata, key_op_ctrl, bik->ik_macaddr, NO_SYNC_WMIFLAG); |
5996 | } | 5993 | } |
5997 | } else { | 5994 | } else { |
@@ -6190,7 +6187,7 @@ ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie | |||
6190 | } | 6187 | } |
6191 | 6188 | ||
6192 | int | 6189 | int |
6193 | is_iwioctl_allowed(A_UINT8 mode, A_UINT16 cmd) | 6190 | is_iwioctl_allowed(u8 mode, A_UINT16 cmd) |
6194 | { | 6191 | { |
6195 | if(cmd >= SIOCSIWCOMMIT && cmd <= SIOCGIWPOWER) { | 6192 | if(cmd >= SIOCSIWCOMMIT && cmd <= SIOCGIWPOWER) { |
6196 | cmd -= SIOCSIWCOMMIT; | 6193 | cmd -= SIOCSIWCOMMIT; |
@@ -6207,7 +6204,7 @@ is_iwioctl_allowed(A_UINT8 mode, A_UINT16 cmd) | |||
6207 | } | 6204 | } |
6208 | 6205 | ||
6209 | int | 6206 | int |
6210 | is_xioctl_allowed(A_UINT8 mode, int cmd) | 6207 | is_xioctl_allowed(u8 mode, int cmd) |
6211 | { | 6208 | { |
6212 | if(sizeof(xioctl_filter)-1 < cmd) { | 6209 | if(sizeof(xioctl_filter)-1 < cmd) { |
6213 | A_PRINTF("Filter for this cmd=%d not defined\n",cmd); | 6210 | A_PRINTF("Filter for this cmd=%d not defined\n",cmd); |
@@ -6236,7 +6233,7 @@ ap_set_wapi_key(struct ar6_softc *ar, void *ikey) | |||
6236 | ik->ik_keylen); | 6233 | ik->ik_keylen); |
6237 | 6234 | ||
6238 | status = wmi_addKey_cmd(ar->arWmi, ik->ik_keyix, WAPI_CRYPT, keyUsage, | 6235 | status = wmi_addKey_cmd(ar->arWmi, ik->ik_keyix, WAPI_CRYPT, keyUsage, |
6239 | ik->ik_keylen, (A_UINT8 *)&ik->ik_keyrsc, | 6236 | ik->ik_keylen, (u8 *)&ik->ik_keyrsc, |
6240 | ik->ik_keydata, KEY_OP_INIT_VAL, ik->ik_macaddr, | 6237 | ik->ik_keydata, KEY_OP_INIT_VAL, ik->ik_macaddr, |
6241 | SYNC_BOTH_WMIFLAG); | 6238 | SYNC_BOTH_WMIFLAG); |
6242 | 6239 | ||
@@ -6249,10 +6246,10 @@ ap_set_wapi_key(struct ar6_softc *ar, void *ikey) | |||
6249 | 6246 | ||
6250 | void ar6000_peer_event( | 6247 | void ar6000_peer_event( |
6251 | void *context, | 6248 | void *context, |
6252 | A_UINT8 eventCode, | 6249 | u8 eventCode, |
6253 | A_UINT8 *macAddr) | 6250 | u8 *macAddr) |
6254 | { | 6251 | { |
6255 | A_UINT8 pos; | 6252 | u8 pos; |
6256 | 6253 | ||
6257 | for (pos=0;pos<6;pos++) | 6254 | for (pos=0;pos<6;pos++) |
6258 | printk("%02x: ",*(macAddr+pos)); | 6255 | printk("%02x: ",*(macAddr+pos)); |