Commit 27c8aac7 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Use get_unaligned_be16() instead of RTW_GET_BE16() 



Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 506a42a6

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+4 −4
Original line number Diff line number Diff line
@@ -807,8 +807,8 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_at 


	while (attr_ptr - wps_ie < wps_ielen) {

		/*  4 = 2(Attribute ID) + 2(Length) */

		u16 attr_id = RTW_GET_BE16(attr_ptr);

		u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2);

		u16 attr_id = get_unaligned_be16(attr_ptr);

		u16 attr_data_len = get_unaligned_be16(attr_ptr + 2);

		u16 attr_len = attr_data_len + 4;



		if (attr_id == target_attr_id) {
@@ -1156,8 +1156,8 @@ void dump_wps_ie(u8 *ie, u32 ie_len) 


	pos += 6;

	while (pos-ie < ie_len) {

		id = RTW_GET_BE16(pos);

		len = RTW_GET_BE16(pos + 2);

		id = get_unaligned_be16(pos);

		len = get_unaligned_be16(pos + 2);

		DBG_88E("%s ID:0x%04x, LEN:%u\n", __func__, id, len);

		pos += (4+len);

	}

drivers/staging/rtl8188eu/core/rtw_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -1644,7 +1644,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe) 


	while (a_len > ETH_HLEN) {

		/* Offset 12 denote 2 mac address */

		nSubframe_Length = RTW_GET_BE16(pdata + 12);

		nSubframe_Length = get_unaligned_be16(pdata + 12);



		if (a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length)) {

			DBG_88E("nRemain_Length is %d and nSubframe_Length is : %d\n", a_len, nSubframe_Length);
@@ -1699,7 +1699,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe) 
	for (i = 0; i < nr_subframes; i++) {

		sub_skb = subframes[i];

		/* convert hdr + possible LLC headers into Ethernet header */

		eth_type = RTW_GET_BE16(&sub_skb->data[6]);

		eth_type = get_unaligned_be16(&sub_skb->data[6]);

		if (sub_skb->len >= 8 &&

		    ((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) &&

			  eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) ||

drivers/staging/rtl8188eu/include/osdep_service.h

+0 −2
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ u64 rtw_modular64(u64 x, u64 y); 


/* Macros for handling unaligned memory accesses */



#define RTW_GET_BE16(a) ((u16) (((a)[0] << 8) | (a)[1]))



#define RTW_GET_LE16(a) ((u16) (((a)[1] << 8) | (a)[0]))

#define RTW_PUT_LE16(a, val)			\

	do {					\