diff options
Diffstat (limited to 'drivers/staging/ath6kl/os/linux')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_android.c | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 88 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_pm.c | 10 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/cfg80211.c | 28 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/eeprom.c | 8 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/hci_bridge.c | 8 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | 38 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h | 20 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/athdrv_linux.h | 10 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/cfg80211.h | 8 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ioctl.c | 6 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/wireless_ext.c | 6 |
13 files changed, 118 insertions, 118 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c index 88591d7d5444..f7d1069072b9 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 skb && ar->arConnected) { bool needWake = false; if (isEvent) { - if (A_NETBUF_LEN(skb) >= sizeof(A_UINT16)) { - A_UINT16 cmd = *(const A_UINT16 *)A_NETBUF_DATA(skb); + if (A_NETBUF_LEN(skb) >= sizeof(u16)) { + u16 cmd = *(const u16 *)A_NETBUF_DATA(skb); switch (cmd) { case WMI_CONNECT_EVENTID: 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 647c6c983a29..9f7a02f50855 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); #endif /* BLOCK_TX_PATH_FLAG */ typedef struct user_rssi_compensation_t { - A_UINT16 customerID; + u16 customerID; union { - A_UINT16 a_enable; - A_UINT16 bg_enable; - A_UINT16 enable; + u16 a_enable; + u16 bg_enable; + u16 enable; }; A_INT16 bg_param_a; A_INT16 bg_param_b; @@ -322,7 +322,7 @@ static void ar6000_tx_complete(void *Context, HTC_PACKET_QUEUE *pPackets); static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, HTC_PACKET *pPacket); #ifdef ATH_AR6K_11N_SUPPORT -static void ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, A_UINT16 num); +static void ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, u16 num); #endif static void ar6000_deliver_frames_to_nw_stack(void * dev, void *osbuf); //static void ar6000_deliver_frames_to_bt_stack(void * dev, void *osbuf); @@ -773,7 +773,7 @@ aptcTimerHandler(unsigned long arg) #ifdef ATH_AR6K_11N_SUPPORT static void -ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, A_UINT16 num) +ar6000_alloc_netbufs(A_NETBUF_QUEUE_T *q, u16 num) { void * osbuf; @@ -904,26 +904,26 @@ ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar) static void calculate_crc(A_UINT32 TargetType, A_UCHAR *eeprom_data) { - A_UINT16 *ptr_crc; - A_UINT16 *ptr16_eeprom; - A_UINT16 checksum; + u16 *ptr_crc; + u16 *ptr16_eeprom; + u16 checksum; A_UINT32 i; A_UINT32 eeprom_size; if (TargetType == TARGET_TYPE_AR6001) { eeprom_size = 512; - ptr_crc = (A_UINT16 *)eeprom_data; + ptr_crc = (u16 *)eeprom_data; } else if (TargetType == TARGET_TYPE_AR6003) { eeprom_size = 1024; - ptr_crc = (A_UINT16 *)((A_UCHAR *)eeprom_data + 0x04); + ptr_crc = (u16 *)((A_UCHAR *)eeprom_data + 0x04); } else { eeprom_size = 768; - ptr_crc = (A_UINT16 *)((A_UCHAR *)eeprom_data + 0x04); + ptr_crc = (u16 *)((A_UCHAR *)eeprom_data + 0x04); } @@ -932,7 +932,7 @@ void calculate_crc(A_UINT32 TargetType, A_UCHAR *eeprom_data) // Recalculate new CRC checksum = 0; - ptr16_eeprom = (A_UINT16 *)eeprom_data; + ptr16_eeprom = (u16 *)eeprom_data; for (i = 0;i < eeprom_size; i += 2) { checksum = checksum ^ (*ptr16_eeprom); @@ -2552,7 +2552,7 @@ int ar6000_init(struct net_device *dev) * of 0-3 */ connect.ConnectionFlags &= ~HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK; connect.ConnectionFlags |= - ((A_UINT16)reduce_credit_dribble - 1) & HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK; + ((u16)reduce_credit_dribble - 1) & HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK; } /* connect to best-effort service */ connect.ServiceID = WMI_DATA_BE_SVC; @@ -2797,11 +2797,11 @@ ar6000_txPwr_rx(void *devt, u8 txPwr) void -ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList) +ar6000_channelList_rx(void *devt, A_INT8 numChan, u16 *chanList) { AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; - A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (A_UINT16)); + A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (u16)); ar->arNumChannels = numChan; wake_up(&arEvent); @@ -3665,7 +3665,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) AR6000_STAT_INC(ar, rx_length_errors); A_NETBUF_FREE(skb); } else { - A_UINT16 seq_no; + u16 seq_no; u8 meta_type; #if 0 @@ -3678,7 +3678,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) sta_t *conn = NULL; u8 psState=0,prevPsState; ATH_MAC_HDR *datap=NULL; - A_UINT16 offset; + u16 offset; meta_type = WMI_DATA_HDR_GET_META(dhdr); @@ -4206,7 +4206,7 @@ ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, A_UINT32 sw_ver, A_UINT32 a } void -add_new_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 aid, u8 *wpaie, +add_new_sta(AR_SOFTC_T *ar, u8 *mac, u16 aid, u8 *wpaie, u8 ielen, u8 keymgmt, u8 ucipher, u8 auth) { u8 free_slot=aid-1; @@ -4222,8 +4222,8 @@ add_new_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 aid, u8 *wpaie, } void -ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, u8 *bssid, - A_UINT16 listenInterval, A_UINT16 beaconInterval, +ar6000_connect_event(AR_SOFTC_T *ar, u16 channel, u8 *bssid, + u16 listenInterval, u16 beaconInterval, NETWORK_TYPE networkType, u8 beaconIeLen, u8 assocReqLen, u8 assocRespLen, u8 *assocInfo) @@ -4398,9 +4398,9 @@ skip_key: if (assocRespLen && (sizeof(buf) > (12 + (assocRespLen * 2)))) { assoc_resp_ie_pos = beaconIeLen + assocReqLen + - sizeof(A_UINT16) + /* capinfo*/ - sizeof(A_UINT16) + /* status Code */ - sizeof(A_UINT16) ; /* associd */ + sizeof(u16) + /* capinfo*/ + sizeof(u16) + /* status Code */ + sizeof(u16) ; /* associd */ A_MEMZERO(buf, sizeof(buf)); sprintf(buf, "%s", tag2); pos = buf + 12; @@ -4427,8 +4427,8 @@ skip_key: * assoc Request includes capability and listen interval. Skip these. */ assoc_req_ie_pos = beaconIeLen + - sizeof(A_UINT16) + /* capinfo*/ - sizeof(A_UINT16); /* listen interval */ + sizeof(u16) + /* capinfo*/ + sizeof(u16); /* listen interval */ A_MEMZERO(buf, sizeof(buf)); sprintf(buf, "%s", tag1); @@ -4538,7 +4538,7 @@ sta_cleanup(AR_SOFTC_T *ar, u8 i) } -u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 reason) +u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason) { u8 i, removed=0; @@ -4572,7 +4572,7 @@ u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 reason) void ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid, - u8 assocRespLen, u8 *assocInfo, A_UINT16 protocolReasonStatus) + u8 assocRespLen, u8 *assocInfo, u16 protocolReasonStatus) { u8 i; unsigned long flags; @@ -5127,8 +5127,8 @@ ar6000_cac_event(AR_SOFTC_T *ar, u8 ac, u8 cacIndication, } void -ar6000_channel_change_event(AR_SOFTC_T *ar, A_UINT16 oldChannel, - A_UINT16 newChannel) +ar6000_channel_change_event(AR_SOFTC_T *ar, u16 oldChannel, + u16 newChannel) { A_PRINTF("Channel Change notification\nOld Channel: %d, New Channel: %d\n", oldChannel, newChannel); @@ -5519,7 +5519,7 @@ ar6000_alloc_cookie(AR_SOFTC_T *ar) * the event ID and event content. */ #define EVENT_ID_LEN 2 -void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, +void ar6000_send_event_to_app(AR_SOFTC_T *ar, u16 eventId, u8 *datap, int len) { @@ -5528,7 +5528,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, /* note: IWEVCUSTOM only exists in wireless extensions after version 15 */ char *buf; - A_UINT16 size; + u16 size; union iwreq_data wrqu; size = len + EVENT_ID_LEN; @@ -5549,7 +5549,7 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, A_MEMCPY(buf, &eventId, EVENT_ID_LEN); A_MEMCPY(buf+EVENT_ID_LEN, datap, len); - //AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("event ID = %d,len = %d\n",*(A_UINT16*)buf, size)); + //AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("event ID = %d,len = %d\n",*(u16 *)buf, size)); A_MEMZERO(&wrqu, sizeof(wrqu)); wrqu.data.length = size; 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, * to the application. The buf which is sent to application * includes the event ID and event content. */ -void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, +void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, u16 eventId, u8 *datap, int len) { @@ -5573,7 +5573,7 @@ void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId, /* IWEVGENIE exists in wireless extensions version 18 onwards */ char *buf; - A_UINT16 size; + u16 size; union iwreq_data wrqu; size = len + EVENT_ID_LEN; @@ -5648,7 +5648,7 @@ a_copy_from_user(void *to, const void *from, A_UINT32 n) int ar6000_get_driver_cfg(struct net_device *dev, - A_UINT16 cfgParam, + u16 cfgParam, void *result) { @@ -5805,12 +5805,12 @@ read_rssi_compensation_param(AR_SOFTC_T *ar) cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); - rssi_compensation_param.customerID = *(A_UINT16 *)cust_data_ptr & 0xffff; - rssi_compensation_param.enable = *(A_UINT16 *)(cust_data_ptr+2) & 0xffff; - rssi_compensation_param.bg_param_a = *(A_UINT16 *)(cust_data_ptr+4) & 0xffff; - rssi_compensation_param.bg_param_b = *(A_UINT16 *)(cust_data_ptr+6) & 0xffff; - rssi_compensation_param.a_param_a = *(A_UINT16 *)(cust_data_ptr+8) & 0xffff; - rssi_compensation_param.a_param_b = *(A_UINT16 *)(cust_data_ptr+10) &0xffff; + rssi_compensation_param.customerID = *(u16 *)cust_data_ptr & 0xffff; + rssi_compensation_param.enable = *(u16 *)(cust_data_ptr+2) & 0xffff; + rssi_compensation_param.bg_param_a = *(u16 *)(cust_data_ptr+4) & 0xffff; + rssi_compensation_param.bg_param_b = *(u16 *)(cust_data_ptr+6) & 0xffff; + rssi_compensation_param.a_param_a = *(u16 *)(cust_data_ptr+8) & 0xffff; + rssi_compensation_param.a_param_b = *(u16 *)(cust_data_ptr+10) &0xffff; rssi_compensation_param.reserved = *(A_UINT32 *)(cust_data_ptr+12); #ifdef RSSICOMPENSATION_PRINT @@ -6139,7 +6139,7 @@ ar6000_connect_to_ap(struct ar6_softc *ar) /* Set the listen interval into 1000TUs or more. This value will be indicated to Ap in the conn. later set it back locally at the STA to 100/1000 TUs depending on the power mode */ if ((ar->arNetworkType == INFRA_NETWORK)) { - wmi_listeninterval_cmd(ar->arWmi, max(ar->arListenIntervalT, (A_UINT16)A_MAX_WOW_LISTEN_INTERVAL), 0); + wmi_listeninterval_cmd(ar->arWmi, max(ar->arListenIntervalT, (u16)A_MAX_WOW_LISTEN_INTERVAL), 0); } status = wmi_connect_cmd(ar->arWmi, ar->arNetworkType, ar->arDot11AuthMode, ar->arAuthMode, @@ -6187,7 +6187,7 @@ ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie } int -is_iwioctl_allowed(u8 mode, A_UINT16 cmd) +is_iwioctl_allowed(u8 mode, u16 cmd) { if(cmd >= SIOCSIWCOMMIT && cmd <= SIOCGIWPOWER) { cmd -= SIOCSIWCOMMIT; diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c index b2a1351cdff8..7e680a540713 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) static void ar6000_wow_resume(AR_SOFTC_T *ar) { if (ar->arWowState!= WLAN_WOW_STATE_NONE) { - A_UINT16 fg_start_period = (ar->scParams.fg_start_period==0) ? 1 : ar->scParams.fg_start_period; - A_UINT16 bg_period = (ar->scParams.bg_period==0) ? 60 : ar->scParams.bg_period; + u16 fg_start_period = (ar->scParams.fg_start_period==0) ? 1 : ar->scParams.fg_start_period; + u16 bg_period = (ar->scParams.bg_period==0) ? 60 : ar->scParams.bg_period; WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode = {true, false}; ar->arWowState = WLAN_WOW_STATE_NONE; if (wmi_set_host_sleep_mode_cmd(ar->arWmi, &hostSleepMode)!=A_OK) { @@ -251,7 +251,7 @@ wow_not_connected: int ar6000_resume_ev(void *context) { AR_SOFTC_T *ar = (AR_SOFTC_T *)context; - A_UINT16 powerState = ar->arWlanPowerState; + u16 powerState = ar->arWlanPowerState; AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: enter previous state %d wowState %d\n", __func__, powerState, ar->arWowState)); switch (powerState) { @@ -425,7 +425,7 @@ ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode; if (state == WLAN_ENABLED) { - A_UINT16 fg_start_period; + u16 fg_start_period; /* Not in deep sleep state.. exit */ if (ar->arWlanPowerState != WLAN_POWER_STATE_DEEP_SLEEP) { @@ -540,7 +540,7 @@ int ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, bool pmEvent) { int status = A_OK; - A_UINT16 powerState, oldPowerState; + u16 powerState, oldPowerState; AR6000_WLAN_STATE oldstate = ar->arWlanState; bool wlanOff = ar->arWlanOff; #ifdef CONFIG_PM diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c index f526160b8a73..332b336c3391 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, } void -ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, - u8 *bssid, A_UINT16 listenInterval, - A_UINT16 beaconInterval,NETWORK_TYPE networkType, +ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel, + u8 *bssid, u16 listenInterval, + u16 beaconInterval,NETWORK_TYPE networkType, u8 beaconIeLen, u8 assocReqLen, u8 assocRespLen, u8 *assocInfo) { - A_UINT16 size = 0; - A_UINT16 capability = 0; + u16 size = 0; + u16 capability = 0; struct cfg80211_bss *bss = NULL; struct ieee80211_mgmt *mgmt = NULL; struct ieee80211_channel *ibss_channel = NULL; @@ -446,11 +446,11 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, unsigned char *ieeemgmtbuf = NULL; u8 source_mac[ATH_MAC_LEN]; - u8 assocReqIeOffset = sizeof(A_UINT16) + /* capinfo*/ - sizeof(A_UINT16); /* listen interval */ - u8 assocRespIeOffset = sizeof(A_UINT16) + /* capinfo*/ - sizeof(A_UINT16) + /* status Code */ - sizeof(A_UINT16); /* associd */ + u8 assocReqIeOffset = sizeof(u16) + /* capinfo*/ + sizeof(u16); /* listen interval */ + u8 assocRespIeOffset = sizeof(u16) + /* capinfo*/ + sizeof(u16) + /* status Code */ + sizeof(u16); /* associd */ u8 *assocReqIe = assocInfo + beaconIeLen + assocReqIeOffset; u8 *assocRespIe = assocInfo + beaconIeLen + assocReqLen + assocRespIeOffset; @@ -513,7 +513,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, A_MEMCPY(source_mac, ar->arNetDev->dev_addr, ATH_MAC_LEN); ptr_ie_buf = ie_buf; } else { - capability = *(A_UINT16 *)(&assocInfo[beaconIeLen]); + capability = *(u16 *)(&assocInfo[beaconIeLen]); A_MEMCPY(source_mac, bssid, ATH_MAC_LEN); ptr_ie_buf = assocReqIe; ie_buf_len = assocReqLen; @@ -577,7 +577,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, static int ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, - A_UINT16 reason_code) + u16 reason_code) { AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); @@ -620,7 +620,7 @@ ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, void ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid, u8 assocRespLen, - u8 *assocInfo, A_UINT16 protocolReasonStatus) + u8 *assocInfo, u16 protocolReasonStatus) { AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason)); @@ -663,7 +663,7 @@ void ar6k_cfg80211_scan_node(void *arg, bss_t *ni) { struct wiphy *wiphy = (struct wiphy *)arg; - A_UINT16 size; + u16 size; unsigned char *ieeemgmtbuf = NULL; struct ieee80211_mgmt *mgmt; struct ieee80211_channel *channel; diff --git a/drivers/staging/ath6kl/os/linux/eeprom.c b/drivers/staging/ath6kl/os/linux/eeprom.c index 5a9ba162b793..13cd014b4b6b 100644 --- a/drivers/staging/ath6kl/os/linux/eeprom.c +++ b/drivers/staging/ath6kl/os/linux/eeprom.c @@ -106,20 +106,20 @@ static void update_mac(unsigned char *eeprom, int size, unsigned char *macaddr) { int i; - A_UINT16* ptr = (A_UINT16*)(eeprom+4); - A_UINT16 checksum = 0; + u16 *ptr = (u16 *)(eeprom+4); + u16 checksum = 0; memcpy(eeprom+10,macaddr,6); *ptr = 0; - ptr = (A_UINT16*)eeprom; + ptr = (u16 *)eeprom; for (i=0; i<size; i+=2) { checksum ^= *ptr++; } checksum = ~checksum; - ptr = (A_UINT16*)(eeprom+4); + ptr = (u16 *)(eeprom+4); *ptr = checksum; return; } diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c index ffccfbd8d4d9..a4bdd43bc620 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 { #define TX_PACKET_RSV_OFFSET 32 #define NUM_HTC_PACKET_STRUCTS ((MAX_ACL_RECV_BUFS + MAX_EVT_RECV_BUFS + MAX_HCI_WRITE_QUEUE_DEPTH) * 2) -#define HCI_GET_OP_CODE(p) (((A_UINT16)((p)[1])) << 8) | ((A_UINT16)((p)[0])) +#define HCI_GET_OP_CODE(p) (((u16)((p)[1])) << 8) | ((u16)((p)[0])) extern unsigned int setupbtdev; AR3K_CONFIG_INFO ar3kconfig; @@ -285,8 +285,8 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle, if ((hciuartscale != 0) || (hciuartstep != 0)) { /* user wants to tune HCI bridge UART scale/step values */ - ar3kconfig.AR6KScale = (A_UINT16)hciuartscale; - ar3kconfig.AR6KStep = (A_UINT16)hciuartstep; + ar3kconfig.AR6KScale = (u16)hciuartscale; + ar3kconfig.AR6KStep = (u16)hciuartstep; ar3kconfig.Flags |= AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP; } @@ -757,7 +757,7 @@ static int bt_send_frame(struct sk_buff *skb) (type == HCI_COMMAND_TYPE) ? "COMMAND" : "ACL", skb->len)); if (type == HCI_COMMAND_TYPE) { - A_UINT16 opcode = HCI_GET_OP_CODE(skb->data); + u16 opcode = HCI_GET_OP_CODE(skb->data); AR_DEBUG_PRINTF(ATH_DEBUG_ANY,(" HCI Command: OGF:0x%X OCF:0x%X \r\n", opcode >> 10, opcode & 0x3FF)); } diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index 2240bcfb9d00..a439370caa01 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 { #define STA_IS_PS_POLLED(sta) (sta->flags & (STA_PS_POLLED_MASK << STA_PS_POLLED_SHIFT)) typedef struct { - A_UINT16 flags; + u16 flags; u8 mac[ATH_MAC_LEN]; u8 aid; u8 keymgmt; @@ -487,10 +487,10 @@ typedef struct ar6_softc { struct ar_wep_key arWepKeyList[WMI_MAX_KEY_INDEX + 1]; u8 arBssid[6]; u8 arReqBssid[6]; - A_UINT16 arChannelHint; - A_UINT16 arBssChannel; - A_UINT16 arListenIntervalB; - A_UINT16 arListenIntervalT; + u16 arChannelHint; + u16 arBssChannel; + u16 arListenIntervalB; + u16 arListenIntervalT; struct ar6000_version arVersion; A_UINT32 arTargetType; A_INT8 arRssi; @@ -500,7 +500,7 @@ typedef struct ar6_softc { struct net_device_stats arNetStats; struct iw_statistics arIwStats; A_INT8 arNumChannels; - A_UINT16 arChannelList[32]; + u16 arChannelList[32]; A_UINT32 arRegCode; bool statsUpdatePending; TARGET_STATS arTargetStats; @@ -514,8 +514,8 @@ typedef struct ar6_softc { A_UINT32 arTargetMode; A_UINT32 tcmdRxcrcErrPkt; A_UINT32 tcmdRxsecErrPkt; - A_UINT16 tcmdRateCnt[TCMD_MAX_RATES]; - A_UINT16 tcmdRateCntShortGuard[TCMD_MAX_RATES]; + u16 tcmdRateCnt[TCMD_MAX_RATES]; + u16 tcmdRateCntShortGuard[TCMD_MAX_RATES]; #endif AR6000_WLAN_STATE arWlanState; struct ar_node_mapping arNodeMap[MAX_NODE_NUM]; @@ -526,7 +526,7 @@ typedef struct ar6_softc { A_UINT32 arCookieCount; A_UINT32 arRateMask; u8 arSkipScan; - A_UINT16 arBeaconInterval; + u16 arBeaconInterval; bool arConnectPending; bool arWmmEnabled; struct ar_hb_chlng_resp arHBChallengeResp; @@ -558,7 +558,7 @@ typedef struct ar6_softc { #endif USER_RSSI_THOLD rssi_map[12]; u8 arUserBssFilter; - A_UINT16 ap_profile_flag; /* AP mode */ + u16 ap_profile_flag; /* AP mode */ WMI_AP_ACL g_acl; /* AP mode */ sta_t sta_list[AP_MAX_NUM_STA]; /* AP mode */ u8 sta_list_index; /* AP mode */ @@ -577,9 +577,9 @@ typedef struct ar6_softc { u8 ap_country_code[3]; u8 ap_wmode; u8 ap_dtim_period; - A_UINT16 ap_beacon_interval; - A_UINT16 arRTS; - A_UINT16 arACS; /* AP mode - Auto Channel Selection */ + u16 ap_beacon_interval; + u16 arRTS; + u16 arACS; /* AP mode - Auto Channel Selection */ HTC_PACKET_QUEUE amsdu_rx_buffer_queue; bool bIsDestroyProgress; /* flag to indicate ar6k destroy is in progress */ A_TIMER disconnect_timer; @@ -596,15 +596,15 @@ typedef struct ar6_softc { struct cfg80211_scan_request *scan_request; struct ar_key keys[WMI_MAX_KEY_INDEX + 1]; #endif /* ATH6K_CONFIG_CFG80211 */ - A_UINT16 arWlanPowerState; + u16 arWlanPowerState; bool arWlanOff; #ifdef CONFIG_PM - A_UINT16 arWowState; + u16 arWowState; bool arBTOff; bool arBTSharing; - A_UINT16 arSuspendConfig; - A_UINT16 arWlanOffConfig; - A_UINT16 arWow2Config; + u16 arSuspendConfig; + u16 arWlanOffConfig; + u16 arWow2Config; #endif u8 scan_triggered; WMI_SCAN_PARAMS_CMD scParams; @@ -731,7 +731,7 @@ ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr); sta_t * ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid); -u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, A_UINT16 reason); +u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason); /* HCI support */ diff --git a/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h b/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h index b2ee6525cba0..39e0873aff24 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 @@ //============================================================================== #ifndef _AR6K_PAL_H_ #define _AR6K_PAL_H_ -#define HCI_GET_OP_CODE(p) (((A_UINT16)((p)[1])) << 8) | ((A_UINT16)((p)[0])) +#define HCI_GET_OP_CODE(p) (((u16)((p)[1])) << 8) | ((u16)((p)[0])) /* transmit packet reserve offset */ #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 26f5372049e9..04094f91063b 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; void ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, A_UINT32 sw_ver, A_UINT32 abi_ver); int ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid); -void ar6000_connect_event(struct ar6_softc *ar, A_UINT16 channel, - u8 *bssid, A_UINT16 listenInterval, - A_UINT16 beaconInterval, NETWORK_TYPE networkType, +void ar6000_connect_event(struct ar6_softc *ar, u16 channel, + u8 *bssid, u16 listenInterval, + u16 beaconInterval, NETWORK_TYPE networkType, u8 beaconIeLen, u8 assocReqLen, u8 assocRespLen,u8 *assocInfo); void ar6000_disconnect_event(struct ar6_softc *ar, u8 reason, u8 *bssid, u8 assocRespLen, - u8 *assocInfo, A_UINT16 protocolReasonStatus); + u8 *assocInfo, u16 protocolReasonStatus); void ar6000_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast); void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps); -void ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList); +void ar6000_channelList_rx(void *devt, A_INT8 numChan, u16 *chanList); void ar6000_regDomain_event(struct ar6_softc *ar, A_UINT32 regCode); void ar6000_txPwr_rx(void *devt, u8 txPwr); void ar6000_keepalive_rx(void *devt, u8 configured); @@ -58,7 +58,7 @@ void ar6000_rssiThreshold_event(struct ar6_softc *ar, void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal); void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication, u8 statusCode, u8 *tspecSuggestion); -void ar6000_channel_change_event(struct ar6_softc *ar, A_UINT16 oldChannel, A_UINT16 newChannel); +void ar6000_channel_change_event(struct ar6_softc *ar, u16 oldChannel, u16 newChannel); void ar6000_hbChallengeResp_event(struct ar6_softc *, A_UINT32 cookie, A_UINT32 source); void ar6000_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 void ar6000_dbglog_init_done(struct ar6_softc *ar); #ifdef SEND_EVENT_TO_APP -void ar6000_send_event_to_app(struct ar6_softc *ar, A_UINT16 eventId, u8 *datap, int len); -void ar6000_send_generic_event_to_app(struct ar6_softc *ar, A_UINT16 eventId, u8 *datap, int len); +void ar6000_send_event_to_app(struct ar6_softc *ar, u16 eventId, u8 *datap, int len); +void ar6000_send_generic_event_to_app(struct ar6_softc *ar, u16 eventId, u8 *datap, int len); #endif #ifdef CONFIG_HOST_TCMD_SUPPORT @@ -104,7 +104,7 @@ void ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL range, u8 lqVal void ar6000_ratemask_rx(void *devt, A_UINT32 ratemask); int ar6000_get_driver_cfg(struct net_device *dev, - A_UINT16 cfgParam, + u16 cfgParam, void *result); void ar6000_bssInfo_event_rx(struct ar6_softc *ar, u8 *data, int len); @@ -152,7 +152,7 @@ struct ieee80211req_wpaie; int ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie); -int is_iwioctl_allowed(u8 mode, A_UINT16 cmd); +int is_iwioctl_allowed(u8 mode, u16 cmd); int is_xioctl_allowed(u8 mode, int cmd); diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h index c8aec1ae04f3..ffde2c5284f7 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 { /* used by AR6000_IOCTL_WMI_GET_QOS_QUEUE */ struct ar6000_queuereq { u8 trafficClass; - A_UINT16 activeTsids; + u16 activeTsids; }; /* used by AR6000_IOCTL_WMI_GET_TARGET_STATS */ @@ -1067,7 +1067,7 @@ typedef struct targetStats_t { A_UINT32 lq_val; A_UINT32 wow_num_pkts_dropped; - A_UINT16 wow_num_events_discarded; + u16 wow_num_events_discarded; A_INT16 noise_floor_calibation; A_INT16 cs_rssi; @@ -1132,10 +1132,10 @@ struct ar6000_gpio_intr_wait_cmd_s { /* used by the AR6000_XIOCTL_DBGLOG_CFG_MODULE */ typedef struct ar6000_dbglog_module_config_s { A_UINT32 valid; - A_UINT16 mmask; - A_UINT16 tsr; + u16 mmask; + u16 tsr; u32 rep; - A_UINT16 size; + u16 size; } DBGLOG_MODULE_CONFIG; typedef 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 1a304436505c..c2e4fa2ef23b 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); void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status); -void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, - u8 *bssid, A_UINT16 listenInterval, - A_UINT16 beaconInterval,NETWORK_TYPE networkType, +void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel, + u8 *bssid, u16 listenInterval, + u16 beaconInterval,NETWORK_TYPE networkType, u8 beaconIeLen, u8 assocReqLen, u8 assocRespLen, u8 *assocInfo); void ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid, u8 assocRespLen, - u8 *assocInfo, A_UINT16 protocolReasonStatus); + u8 *assocInfo, u16 protocolReasonStatus); void ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast); diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c index c6e44ba2bd51..9b5f387940e0 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) cmdp = A_MALLOC(130); if (copy_from_user(cmdp, rq->ifr_data, sizeof (*cmdp) + - ((cmd.numChannels - 1) * sizeof(A_UINT16)))) + ((cmd.numChannels - 1) * sizeof(u16)))) { kfree(cmdp); return -EFAULT; @@ -703,7 +703,7 @@ ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev, buf[2] = ar->tcmdRxcrcErrPkt; buf[3] = ar->tcmdRxsecErrPkt; A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(A_UINT32)), ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt)); - A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(A_UINT32))+(TCMD_MAX_RATES *sizeof(A_UINT16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard)); + A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(A_UINT32))+(TCMD_MAX_RATES *sizeof(u16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard)); if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) { ret = -EFAULT; @@ -3338,7 +3338,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (copy_from_user(cmdp, userdata, sizeof (*cmdp) + ((setStartScanCmd.numChannels - 1) * - sizeof(A_UINT16)))) + sizeof(u16)))) { kfree(cmdp); ret = -EFAULT; diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c index e09daec2c743..ae2dfb432ec4 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, #ifdef WAPI_ENABLE u8 *ie = erq->pointer; u8 ie_type = ie[0]; - A_UINT16 ie_length = erq->length; + u16 ie_length = erq->length; u8 wapi_ie[128]; #endif @@ -1249,7 +1249,7 @@ ar6000_ioctl_siwauth(struct net_device *dev, AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); bool profChanged; - A_UINT16 param; + u16 param; A_INT32 ret; A_INT32 value; @@ -1418,7 +1418,7 @@ ar6000_ioctl_giwauth(struct net_device *dev, struct iw_param *data, char *extra) { AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); - A_UINT16 param; + u16 param; A_INT32 ret; if (ar->arWmiReady == false) { |