From 3d989261dbed301c0c2bef917a3f433f77512f90 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Sun, 9 Oct 2011 12:11:34 +0100 Subject: [PATCH] --- yaml --- r: 268819 b: refs/heads/master c: 68da105637af306f5113441812c13209e4f939c4 h: refs/heads/master i: 268817: 76ebe739cd651d4894aca45f1cd23bf576c509fb 268815: c190d91ced1b317f3e27cf253856f9d5b7a3971b v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlags49_h2/wl_wext.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9cf47bcc7dfc..99ae163d2e3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25b20463f30e98c7e939b706ba7696fcfb68d1fd +refs/heads/master: 68da105637af306f5113441812c13209e4f939c4 diff --git a/trunk/drivers/staging/wlags49_h2/wl_wext.c b/trunk/drivers/staging/wlags49_h2/wl_wext.c index c392fd82e980..af9fec583a75 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_wext.c +++ b/trunk/drivers/staging/wlags49_h2/wl_wext.c @@ -2759,21 +2759,19 @@ static int wireless_get_scan(struct net_device *dev, struct iw_request_info *inf buf = iwe_stream_add_point(info, buf, buf_end, &iwe, msg); - /* Custom info (WPA-IE) */ + /* WPA-IE */ wpa_ie = NULL; wpa_ie_len = 0; wpa_ie = wl_parse_wpa_ie( probe_resp, &wpa_ie_len ); if( wpa_ie != NULL ) { - memset( &iwe, 0, sizeof( iwe )); - memset( msg, 0, sizeof( msg )); + memset(&iwe, 0, sizeof(iwe)); - iwe.cmd = IWEVCUSTOM; - sprintf( msg, "wpa_ie=%s", wl_print_wpa_ie( wpa_ie, wpa_ie_len )); - iwe.u.data.length = strlen( msg ); + iwe.cmd = IWEVGENIE; + iwe.u.data.length = wpa_ie_len; buf = iwe_stream_add_point(info, buf, buf_end, - &iwe, msg); + &iwe, wpa_ie); } /* Add other custom info in formatted string format as needed... */