Skip to content

Commit

Permalink
staging: r8712u: Merging Realtek's latest (v2.6.6). Use stack, not ma…
Browse files Browse the repository at this point in the history
…lloc.

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>
  • Loading branch information
Ali Bahar authored and Greg Kroah-Hartman committed Sep 7, 2011
1 parent 6c19d86 commit c13b6f2
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/staging/rtl8712/rtl871x_ioctl_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ static inline char *translate_scan(struct _adapter *padapter,
struct iw_event iwe;
struct ieee80211_ht_cap *pht_capie;
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;
u32 i = 0, ht_ielen = 0;
u16 cap, ht_cap = false, mcs_rate;
Expand Down Expand Up @@ -289,6 +285,8 @@ static inline char *translate_scan(struct _adapter *padapter,
start = current_val;
/* parsing WPA/WPA2 IE */
{
u8 buf[MAX_WPA_IE_LEN];
u8 wpa_ie[255], rsn_ie[255];
u16 wpa_len = 0, rsn_len = 0;
int n;
sint out_len = 0;
Expand Down Expand Up @@ -339,6 +337,7 @@ static inline char *translate_scan(struct _adapter *padapter,
}

{ /* parsing WPS IE */
u8 wps_ie[512];
uint wps_ielen;

if (r8712_get_wps_ie(pnetwork->network.IEs,
Expand All @@ -363,10 +362,6 @@ static inline char *translate_scan(struct _adapter *padapter,
iwe.u.qual.noise = 0; /* noise level */
start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);
/* how to translate rssi to ?% */
kfree(buf);
kfree(wpa_ie);
kfree(rsn_ie);
kfree(wps_ie);
return start;
}

Expand Down

0 comments on commit c13b6f2

Please sign in to comment.