staging: wlags49_h2: Report WPA IE in scan results with IWEVGENIE
authorDavid Kilroy <kilroyd@googlemail.com>
Sun, 9 Oct 2011 11:11:34 +0000 (12:11 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 17 Oct 2011 22:22:37 +0000 (15:22 -0700)
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>
drivers/staging/wlags49_h2/wl_wext.c

index c392fd8..af9fec5 100644 (file)
@@ -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... */