lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: r8712u: Merging Realtek's latest (v2.6.6). Use stack, not malloc.

Browse Source 
translate_scan() now uses the stack for some variables, instead of mallocing.

Signed-off-by: Ali Bahar <ali@internetDog.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ali Bahar
2011-09-04 03:14:15 +08:00
committed by Greg Kroah-Hartman
parent 6c19d86b9b
commit c13b6f2498
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/rtl8712/rtl871x_ioctl_linux.c
View File

@@ -169,10 +169,6 @@ static inline char *translate_scan(struct _adapter *padapter,
struct iw_event iwe; struct iw_event iwe;
struct ieee80211_ht_cap *pht_capie; struct ieee80211_ht_cap *pht_capie;
char *current_val; char *current_val;
u8 *buf = (u8 *)_malloc(pnetwork->network.IELength * 2);
u8 *wpa_ie = (u8 *)_malloc(255);
u8 *rsn_ie = (u8 *)_malloc(255);
u8 *wps_ie = (u8 *)_malloc(MAX_WPS_IE_LEN);
s8 *p; s8 *p;
u32 i = 0, ht_ielen = 0; u32 i = 0, ht_ielen = 0;
u16 cap, ht_cap = false, mcs_rate; u16 cap, ht_cap = false, mcs_rate;
@@ -289,6 +285,8 @@ static inline char *translate_scan(struct _adapter *padapter,
start = current_val; start = current_val;
/* parsing WPA/WPA2 IE */ /* parsing WPA/WPA2 IE */
{ {
u8 buf[MAX_WPA_IE_LEN];
u8 wpa_ie[255], rsn_ie[255];
u16 wpa_len = 0, rsn_len = 0; u16 wpa_len = 0, rsn_len = 0;
int n; int n;
sint out_len = 0; sint out_len = 0;
@@ -339,6 +337,7 @@ static inline char *translate_scan(struct _adapter *padapter,
} }
{ /* parsing WPS IE */ { /* parsing WPS IE */
u8 wps_ie[512];
uint wps_ielen; uint wps_ielen;
if (r8712_get_wps_ie(pnetwork->network.IEs, if (r8712_get_wps_ie(pnetwork->network.IEs,
@@ -363,10 +362,6 @@ static inline char *translate_scan(struct _adapter *padapter,
iwe.u.qual.noise = 0; /* noise level */ iwe.u.qual.noise = 0; /* noise level */
start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN); start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);
/* how to translate rssi to ?% */ /* how to translate rssi to ?% */
kfree(buf);
kfree(wpa_ie);
kfree(rsn_ie);
kfree(wps_ie);
return start; return start;
} }