aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2011-10-09 12:11:34 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-17 15:22:37 -0700
commit68da105637af306f5113441812c13209e4f939c4 (patch)
tree340941fd8fd0b17c8c017039441c279032d62121
parent25b20463f30e98c7e939b706ba7696fcfb68d1fd (diff)
staging: wlags49_h2: Report WPA IE in scan results with IWEVGENIE
Report the IE using the appropriate event instead of a custom one. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/wlags49_h2/wl_wext.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c
index c392fd82e98..af9fec583a7 100644
--- a/drivers/staging/wlags49_h2/wl_wext.c
+++ b/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... */