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/wireless_ext.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/wireless_ext.c')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/wireless_ext.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c index e167c82ca3d..e09daec2c74 100644 --- a/drivers/staging/ath6kl/os/linux/wireless_ext.c +++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c | |||
@@ -64,10 +64,9 @@ encode_ie(void *buf, size_t bufsize, | |||
64 | } | 64 | } |
65 | #endif /* WIRELESS_EXT > 14 */ | 65 | #endif /* WIRELESS_EXT > 14 */ |
66 | 66 | ||
67 | static A_UINT8 | 67 | static u8 get_bss_phy_capability(bss_t *bss) |
68 | get_bss_phy_capability(bss_t *bss) | ||
69 | { | 68 | { |
70 | A_UINT8 capability = 0; | 69 | u8 capability = 0; |
71 | struct ieee80211_common_ie *cie = &bss->ni_cie; | 70 | struct ieee80211_common_ie *cie = &bss->ni_cie; |
72 | #define CHAN_IS_11A(x) (!((x >= 2412) && (x <= 2484))) | 71 | #define CHAN_IS_11A(x) (!((x >= 2412) && (x <= 2484))) |
73 | if (CHAN_IS_11A(cie->ie_chan)) { | 72 | if (CHAN_IS_11A(cie->ie_chan)) { |
@@ -464,8 +463,8 @@ ar6000_ioctl_siwessid(struct net_device *dev, | |||
464 | { | 463 | { |
465 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 464 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
466 | int status; | 465 | int status; |
467 | A_UINT8 arNetworkType; | 466 | u8 arNetworkType; |
468 | A_UINT8 prevMode = ar->arNetworkType; | 467 | u8 prevMode = ar->arNetworkType; |
469 | 468 | ||
470 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { | 469 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { |
471 | A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); | 470 | A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); |
@@ -512,7 +511,7 @@ ar6000_ioctl_siwessid(struct net_device *dev, | |||
512 | } | 511 | } |
513 | return 0; | 512 | return 0; |
514 | } else if(ar->arNetworkType == AP_NETWORK) { | 513 | } else if(ar->arNetworkType == AP_NETWORK) { |
515 | A_UINT8 ctr; | 514 | u8 ctr; |
516 | struct sk_buff *skb; | 515 | struct sk_buff *skb; |
517 | 516 | ||
518 | /* We are switching from AP to STA | IBSS mode, cleanup the AP state */ | 517 | /* We are switching from AP to STA | IBSS mode, cleanup the AP state */ |
@@ -683,8 +682,8 @@ ar6000_ioctl_giwessid(struct net_device *dev, | |||
683 | 682 | ||
684 | void ar6000_install_static_wep_keys(AR_SOFTC_T *ar) | 683 | void ar6000_install_static_wep_keys(AR_SOFTC_T *ar) |
685 | { | 684 | { |
686 | A_UINT8 index; | 685 | u8 index; |
687 | A_UINT8 keyUsage; | 686 | u8 keyUsage; |
688 | 687 | ||
689 | for (index = WMI_MIN_KEY_INDEX; index <= WMI_MAX_KEY_INDEX; index++) { | 688 | for (index = WMI_MIN_KEY_INDEX; index <= WMI_MAX_KEY_INDEX; index++) { |
690 | if (ar->arWepKeyList[index].arKeyLen) { | 689 | if (ar->arWepKeyList[index].arKeyLen) { |
@@ -813,7 +812,7 @@ ar6000_ioctl_siwtxpow(struct net_device *dev, | |||
813 | struct iw_param *rrq, char *extra) | 812 | struct iw_param *rrq, char *extra) |
814 | { | 813 | { |
815 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 814 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
816 | A_UINT8 dbM; | 815 | u8 dbM; |
817 | 816 | ||
818 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { | 817 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { |
819 | A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); | 818 | A_PRINTF("wext_ioctl: cmd=0x%x not allowed in this mode\n", info->cmd); |
@@ -1123,7 +1122,7 @@ ar6000_ioctl_giwencode(struct net_device *dev, | |||
1123 | struct iw_point *erq, char *key) | 1122 | struct iw_point *erq, char *key) |
1124 | { | 1123 | { |
1125 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1124 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1126 | A_UINT8 keyIndex; | 1125 | u8 keyIndex; |
1127 | struct ar_wep_key *wk; | 1126 | struct ar_wep_key *wk; |
1128 | 1127 | ||
1129 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { | 1128 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { |
@@ -1195,10 +1194,10 @@ ar6000_ioctl_siwgenie(struct net_device *dev, | |||
1195 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1194 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1196 | 1195 | ||
1197 | #ifdef WAPI_ENABLE | 1196 | #ifdef WAPI_ENABLE |
1198 | A_UINT8 *ie = erq->pointer; | 1197 | u8 *ie = erq->pointer; |
1199 | A_UINT8 ie_type = ie[0]; | 1198 | u8 ie_type = ie[0]; |
1200 | A_UINT16 ie_length = erq->length; | 1199 | A_UINT16 ie_length = erq->length; |
1201 | A_UINT8 wapi_ie[128]; | 1200 | u8 wapi_ie[128]; |
1202 | #endif | 1201 | #endif |
1203 | 1202 | ||
1204 | if (ar->arWmiReady == false) { | 1203 | if (ar->arWmiReady == false) { |
@@ -1562,10 +1561,10 @@ ar6000_ioctl_siwpmksa(struct net_device *dev, | |||
1562 | 1561 | ||
1563 | switch (pmksa->cmd) { | 1562 | switch (pmksa->cmd) { |
1564 | case IW_PMKSA_ADD: | 1563 | case IW_PMKSA_ADD: |
1565 | status = wmi_setPmkid_cmd(ar->arWmi, (A_UINT8*)pmksa->bssid.sa_data, pmksa->pmkid, true); | 1564 | status = wmi_setPmkid_cmd(ar->arWmi, (u8 *)pmksa->bssid.sa_data, pmksa->pmkid, true); |
1566 | break; | 1565 | break; |
1567 | case IW_PMKSA_REMOVE: | 1566 | case IW_PMKSA_REMOVE: |
1568 | status = wmi_setPmkid_cmd(ar->arWmi, (A_UINT8*)pmksa->bssid.sa_data, pmksa->pmkid, false); | 1567 | status = wmi_setPmkid_cmd(ar->arWmi, (u8 *)pmksa->bssid.sa_data, pmksa->pmkid, false); |
1569 | break; | 1568 | break; |
1570 | case IW_PMKSA_FLUSH: | 1569 | case IW_PMKSA_FLUSH: |
1571 | if (ar->arConnected == true) { | 1570 | if (ar->arConnected == true) { |
@@ -1595,14 +1594,14 @@ static int ar6000_set_wapi_key(struct net_device *dev, | |||
1595 | struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; | 1594 | struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; |
1596 | KEY_USAGE keyUsage = 0; | 1595 | KEY_USAGE keyUsage = 0; |
1597 | A_INT32 keyLen; | 1596 | A_INT32 keyLen; |
1598 | A_UINT8 *keyData; | 1597 | u8 *keyData; |
1599 | A_INT32 index; | 1598 | A_INT32 index; |
1600 | A_UINT32 *PN; | 1599 | A_UINT32 *PN; |
1601 | A_INT32 i; | 1600 | A_INT32 i; |
1602 | int status; | 1601 | int status; |
1603 | A_UINT8 wapiKeyRsc[16]; | 1602 | u8 wapiKeyRsc[16]; |
1604 | CRYPTO_TYPE keyType = WAPI_CRYPT; | 1603 | CRYPTO_TYPE keyType = WAPI_CRYPT; |
1605 | const A_UINT8 broadcastMac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; | 1604 | const u8 broadcastMac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; |
1606 | 1605 | ||
1607 | index = erq->flags & IW_ENCODE_INDEX; | 1606 | index = erq->flags & IW_ENCODE_INDEX; |
1608 | if (index && (((index - 1) < WMI_MIN_KEY_INDEX) || | 1607 | if (index && (((index - 1) < WMI_MIN_KEY_INDEX) || |
@@ -1614,7 +1613,7 @@ static int ar6000_set_wapi_key(struct net_device *dev, | |||
1614 | if (index < 0 || index > 4) { | 1613 | if (index < 0 || index > 4) { |
1615 | return -EIO; | 1614 | return -EIO; |
1616 | } | 1615 | } |
1617 | keyData = (A_UINT8 *)(ext + 1); | 1616 | keyData = (u8 *)(ext + 1); |
1618 | keyLen = erq->length - sizeof(struct iw_encode_ext); | 1617 | keyLen = erq->length - sizeof(struct iw_encode_ext); |
1619 | A_MEMCPY(wapiKeyRsc, ext->tx_seq, sizeof(wapiKeyRsc)); | 1618 | A_MEMCPY(wapiKeyRsc, ext->tx_seq, sizeof(wapiKeyRsc)); |
1620 | 1619 | ||
@@ -1658,8 +1657,8 @@ ar6000_ioctl_siwencodeext(struct net_device *dev, | |||
1658 | struct iw_encode_ext *ext; | 1657 | struct iw_encode_ext *ext; |
1659 | KEY_USAGE keyUsage; | 1658 | KEY_USAGE keyUsage; |
1660 | A_INT32 keyLen; | 1659 | A_INT32 keyLen; |
1661 | A_UINT8 *keyData; | 1660 | u8 *keyData; |
1662 | A_UINT8 keyRsc[8]; | 1661 | u8 keyRsc[8]; |
1663 | int status; | 1662 | int status; |
1664 | CRYPTO_TYPE keyType; | 1663 | CRYPTO_TYPE keyType; |
1665 | #ifdef USER_KEYS | 1664 | #ifdef USER_KEYS |
@@ -1721,7 +1720,7 @@ ar6000_ioctl_siwencodeext(struct net_device *dev, | |||
1721 | } | 1720 | } |
1722 | 1721 | ||
1723 | /* key follows iw_encode_ext */ | 1722 | /* key follows iw_encode_ext */ |
1724 | keyData = (A_UINT8 *)(ext + 1); | 1723 | keyData = (u8 *)(ext + 1); |
1725 | 1724 | ||
1726 | switch (ext->alg) { | 1725 | switch (ext->alg) { |
1727 | case IW_ENCODE_ALG_WEP: | 1726 | case IW_ENCODE_ALG_WEP: |
@@ -1792,7 +1791,7 @@ ar6000_ioctl_siwencodeext(struct net_device *dev, | |||
1792 | status = wmi_addKey_cmd(ar->arWmi, index, keyType, keyUsage, | 1791 | status = wmi_addKey_cmd(ar->arWmi, index, keyType, keyUsage, |
1793 | keyLen, keyRsc, | 1792 | keyLen, keyRsc, |
1794 | keyData, KEY_OP_INIT_VAL, | 1793 | keyData, KEY_OP_INIT_VAL, |
1795 | (A_UINT8*)ext->addr.sa_data, | 1794 | (u8 *)ext->addr.sa_data, |
1796 | SYNC_BOTH_WMIFLAG); | 1795 | SYNC_BOTH_WMIFLAG); |
1797 | if (status != A_OK) { | 1796 | if (status != A_OK) { |
1798 | return -EIO; | 1797 | return -EIO; |
@@ -1906,7 +1905,7 @@ ar6000_ioctl_giwname(struct net_device *dev, | |||
1906 | struct iw_request_info *info, | 1905 | struct iw_request_info *info, |
1907 | char *name, char *extra) | 1906 | char *name, char *extra) |
1908 | { | 1907 | { |
1909 | A_UINT8 capability; | 1908 | u8 capability; |
1910 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); | 1909 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); |
1911 | 1910 | ||
1912 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { | 1911 | if (is_iwioctl_allowed(ar->arNextMode, info->cmd) != A_OK) { |
@@ -2393,7 +2392,7 @@ ar6000_ioctl_siwmlme(struct net_device *dev, | |||
2393 | 2392 | ||
2394 | if (data->pointer && data->length == sizeof(struct iw_mlme)) { | 2393 | if (data->pointer && data->length == sizeof(struct iw_mlme)) { |
2395 | 2394 | ||
2396 | A_UINT8 arNetworkType; | 2395 | u8 arNetworkType; |
2397 | struct iw_mlme mlme; | 2396 | struct iw_mlme mlme; |
2398 | 2397 | ||
2399 | if (copy_from_user(&mlme, data->pointer, sizeof(struct iw_mlme))) | 2398 | if (copy_from_user(&mlme, data->pointer, sizeof(struct iw_mlme))) |