skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-22 04:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove macro RTW_GET_LE16

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-12 21:55:10 -06:00
parent d6aed151f2
commit 6ba33b6e48
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/rtw_ap.c
View file

@ -900,10 +900,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
/* beacon interval */ /* beacon interval */
p = rtw_get_beacon_interval_from_ie(ie);/* 8: TimeStamp, 2: Beacon Interval 2:Capability */ p = rtw_get_beacon_interval_from_ie(ie);/* 8: TimeStamp, 2: Beacon Interval 2:Capability */
pbss_network->Configuration.BeaconPeriod = RTW_GET_LE16(p); pbss_network->Configuration.BeaconPeriod = get_unaligned_le16(p);
/* capability */ /* capability */
cap = RTW_GET_LE16(ie); cap = get_unaligned_le16(ie);
/* SSID */ /* SSID */
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));

8
core/rtw_ieee80211.c
View file

@ -553,7 +553,7 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis
/* pairwise_cipher */ /* pairwise_cipher */
if (left >= 2) { if (left >= 2) {
count = RTW_GET_LE16(pos); count = get_unaligned_le16(pos);
pos += 2; pos += 2;
left -= 2; left -= 2;
@ -620,7 +620,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi
/* pairwise_cipher */ /* pairwise_cipher */
if (left >= 2) { if (left >= 2) {
count = RTW_GET_LE16(pos); count = get_unaligned_le16(pos);
pos += 2; pos += 2;
left -= 2; left -= 2;
@ -1178,7 +1178,7 @@ void dump_p2p_ie(u8 *ie, u32 ie_len)
pos += 6; pos += 6;
while (pos-ie < ie_len) { while (pos-ie < ie_len) {
id = *pos; id = *pos;
len = RTW_GET_LE16(pos+1); len = get_unaligned_le16(pos+1);
DBG_88E("%s ID:%u, LEN:%u\n", __func__, id, len); DBG_88E("%s ID:%u, LEN:%u\n", __func__, id, len);
pos += (3+len); pos += (3+len);
} }
@ -1252,7 +1252,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id , u8 *buf_att
while (attr_ptr - p2p_ie < p2p_ielen) { while (attr_ptr - p2p_ie < p2p_ielen) {
/* 3 = 1(Attribute ID) + 2(Length) */ /* 3 = 1(Attribute ID) + 2(Length) */
u8 attr_id = *attr_ptr; u8 attr_id = *attr_ptr;
u16 attr_data_len = RTW_GET_LE16(attr_ptr + 1); u16 attr_data_len = get_unaligned_le16(attr_ptr + 1);
u16 attr_len = attr_data_len + 3; u16 attr_len = attr_data_len + 3;
if (attr_id == target_attr_id) { if (attr_id == target_attr_id) {

6
core/rtw_mlme_ext.c
View file

@ -1047,7 +1047,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
goto asoc_class2_error; goto asoc_class2_error;
} }
capab_info = RTW_GET_LE16(pframe + WLAN_HDR_A3_LEN); capab_info = get_unaligned_le16(pframe + WLAN_HDR_A3_LEN);
left = pkt_len - (IEEE80211_3ADDR_LEN + ie_offset); left = pkt_len - (IEEE80211_3ADDR_LEN + ie_offset);
pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset); pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset);
@ -1789,7 +1789,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 37);/* reject ADDBA Req */ issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 37);/* reject ADDBA Req */
break; break;
case RTW_WLAN_ACTION_ADDBA_RESP: /* ADDBA response */ case RTW_WLAN_ACTION_ADDBA_RESP: /* ADDBA response */
status = RTW_GET_LE16(&frame_body[3]); status = get_unaligned_le16(&frame_body[3]);
tid = ((frame_body[5] >> 2) & 0x7); tid = ((frame_body[5] >> 2) & 0x7);
if (status == 0) { /* successful */ if (status == 0) { /* successful */
DBG_88E("agg_enable for TID=%d\n", tid); DBG_88E("agg_enable for TID=%d\n", tid);
@ -1803,7 +1803,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
if ((frame_body[3] & BIT(3)) == 0) { if ((frame_body[3] & BIT(3)) == 0) {
psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
reason_code = RTW_GET_LE16(&frame_body[4]); reason_code = get_unaligned_le16(&frame_body[4]);
} else if ((frame_body[3] & BIT(3)) == BIT(3)) { } else if ((frame_body[3] & BIT(3)) == BIT(3)) {
tid = (frame_body[3] >> 4) & 0x0F; tid = (frame_body[3] >> 4) & 0x0F;
preorder_ctrl = &psta->recvreorder_ctrl[tid]; preorder_ctrl = &psta->recvreorder_ctrl[tid];

1
include/osdep_service.h
View file

@ -431,7 +431,6 @@ u64 rtw_division64(u64 x, u64 y);
(a)[1] = ((u16) (val)) & 0xff; \ (a)[1] = ((u16) (val)) & 0xff; \
} while (0) } while (0)
#define RTW_GET_LE16(a) ((u16) (((a)[1] << 8) | (a)[0]))
#define RTW_PUT_LE16(a, val) \ #define RTW_PUT_LE16(a, val) \
do { \ do { \
(a)[1] = ((u16) (val)) >> 8; \ (a)[1] = ((u16) (val)) >> 8; \