diff options
| author | Joe Perches <joe@perches.com> | 2011-02-02 14:05:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 14:34:50 -0800 |
| commit | 4853ac05cff7745979830c52fe6fb46a7be6fa94 (patch) | |
| tree | 3ac45cd8a9aaaee0c0de0cb50db78ba62844bbed /drivers/staging/ath6kl/wlan | |
| 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/wlan')
| -rw-r--r-- | drivers/staging/ath6kl/wlan/include/ieee80211.h | 10 | ||||
| -rw-r--r-- | drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 6 | ||||
| -rw-r--r-- | drivers/staging/ath6kl/wlan/src/wlan_utils.c | 5 |
3 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/ath6kl/wlan/include/ieee80211.h b/drivers/staging/ath6kl/wlan/include/ieee80211.h index 75cece166c59..1bcef9ce86b1 100644 --- a/drivers/staging/ath6kl/wlan/include/ieee80211.h +++ b/drivers/staging/ath6kl/wlan/include/ieee80211.h @@ -326,10 +326,10 @@ typedef PREPACK struct wmm_tspec_ie_t { u8 ouiType; u8 ouiSubType; u8 version; - A_UINT16 tsInfo_info; + u16 tsInfo_info; u8 tsInfo_reserved; - A_UINT16 nominalMSDU; - A_UINT16 maxMSDU; + u16 nominalMSDU; + u16 maxMSDU; A_UINT32 minServiceInt; A_UINT32 maxServiceInt; A_UINT32 inactivityInt; @@ -341,8 +341,8 @@ typedef PREPACK struct wmm_tspec_ie_t { A_UINT32 maxBurstSize; A_UINT32 delayBound; A_UINT32 minPhyRate; - A_UINT16 sba; - A_UINT16 mediumTime; + u16 sba; + u16 mediumTime; } POSTPACK WMM_TSPEC_IE; diff --git a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c index 55b2a9623ec3..5ed5b9ee154a 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c @@ -49,7 +49,7 @@ /* unaligned little endian access */ #define LE_READ_2(p) \ - ((A_UINT16) \ + ((u16) \ ((((u8 *)(p))[0] ) | (((u8 *)(p))[1] << 8))) #define LE_READ_4(p) \ @@ -125,8 +125,8 @@ wlan_parse_beacon(u8 *buf, int framelen, struct ieee80211_common_ie *cie) A_MEMZERO(cie, sizeof(*cie)); cie->ie_tstamp = frm; frm += 8; - cie->ie_beaconInt = A_LE2CPU16(*(A_UINT16 *)frm); frm += 2; - cie->ie_capInfo = A_LE2CPU16(*(A_UINT16 *)frm); frm += 2; + cie->ie_beaconInt = A_LE2CPU16(*(u16 *)frm); frm += 2; + cie->ie_capInfo = A_LE2CPU16(*(u16 *)frm); frm += 2; cie->ie_chan = 0; while (frm < efrm) { diff --git a/drivers/staging/ath6kl/wlan/src/wlan_utils.c b/drivers/staging/ath6kl/wlan/src/wlan_utils.c index 1eee7bab3e50..3a57d50e4e20 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_utils.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_utils.c @@ -30,8 +30,7 @@ /* * converts ieee channel number to frequency */ -A_UINT16 -wlan_ieee2freq(int chan) +u16 wlan_ieee2freq(int chan) { if (chan == 14) { return 2484; @@ -49,7 +48,7 @@ wlan_ieee2freq(int chan) * Converts MHz frequency to IEEE channel number. */ A_UINT32 -wlan_freq2ieee(A_UINT16 freq) +wlan_freq2ieee(u16 freq) { if (freq == 2484) return 14; |