Commit e4504a15 authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Greg Kroah-Hartman

Staging: rtl8188eu: Use put_unaligned_le16

Using byte ordering functions and then memcpy() is risky and
prone to hide errors which are hard to track down. So, this
patch introduces the use of function put_unaligned_le16 which
makes the code clear. Here, use of variable tim_bitmap_le
and variable itself is removed. Also, to be compatible with the
changes header file is added too.

Coccinelle is used to do this change and semantic patch used for
this is as follows:

@A@
typedef __le16;
__le16 e16;
identifier tmp;
expression ptr;
expression y,e;
type T;
@@

- tmp = cpu_to_le16(y);

<+... when != tmp
(
- memcpy(ptr, (T)&tmp, \(2\|sizeof(__le16)\|sizeof(e16)\));
+ put_unaligned_le16(y,ptr);
|
- memcpy(ptr, (T)&tmp, ...);
+ put_unaligned_le16(y,ptr);
)
...+>
? tmp = e

@@ type T; identifier a.tmp; @@

- T tmp;
...when != tmp
Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarPreeti U Murthy <preeti@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78f5d8f9
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>
#include <ieee80211.h> #include <ieee80211.h>
#include <asm/unaligned.h>
#ifdef CONFIG_88EU_AP_MODE #ifdef CONFIG_88EU_AP_MODE
...@@ -78,11 +79,8 @@ static void update_BCNTIM(struct adapter *padapter) ...@@ -78,11 +79,8 @@ static void update_BCNTIM(struct adapter *padapter)
if (true) { if (true) {
u8 *p, *dst_ie, *premainder_ie = NULL; u8 *p, *dst_ie, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL; u8 *pbackup_remainder_ie = NULL;
__le16 tim_bitmap_le;
uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen; uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen, pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_); p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen, pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_);
if (p != NULL && tim_ielen > 0) { if (p != NULL && tim_ielen > 0) {
tim_ielen += 2; tim_ielen += 2;
...@@ -137,9 +135,9 @@ static void update_BCNTIM(struct adapter *padapter) ...@@ -137,9 +135,9 @@ static void update_BCNTIM(struct adapter *padapter)
*dst_ie++ = 0; *dst_ie++ = 0;
if (tim_ielen == 4) { if (tim_ielen == 4) {
*dst_ie++ = *(u8 *)&tim_bitmap_le; *dst_ie++ = pstapriv->tim_bitmap & 0xff;
} else if (tim_ielen == 5) { } else if (tim_ielen == 5) {
memcpy(dst_ie, &tim_bitmap_le, 2); put_unaligned_le16(pstapriv->tim_bitmap, dst_ie);
dst_ie += 2; dst_ie += 2;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment