1 files changed, 18 insertions, 6 deletions

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 7bb2646ae0ef..28b6ff3eaa37 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -2310,30 +2310,40 @@ static int atmel_get_scan(struct net_device *dev,
                 iwe.cmd = SIOCGIWAP;
                 iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
                 memcpy(iwe.u.ap_addr.sa_data, priv->BSSinfo[i].BSSID, 6);
-                current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_ADDR_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev,
+                                                  extra + IW_SCAN_MAX_DATA,
+                                                  &iwe, IW_EV_ADDR_LEN);
 
                 iwe.u.data.length =  priv->BSSinfo[i].SSIDsize;
                 if (iwe.u.data.length > 32)
                         iwe.u.data.length = 32;
                 iwe.cmd = SIOCGIWESSID;
                 iwe.u.data.flags = 1;
-                current_ev = iwe_stream_add_point(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, priv->BSSinfo[i].SSID);
+                current_ev = iwe_stream_add_point(info, current_ev,
+                                                  extra + IW_SCAN_MAX_DATA,
+                                                  &iwe, priv->BSSinfo[i].SSID);
 
                 iwe.cmd = SIOCGIWMODE;
                 iwe.u.mode = priv->BSSinfo[i].BSStype;
-                current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_UINT_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev,
+                                                  extra + IW_SCAN_MAX_DATA,
+                                                  &iwe, IW_EV_UINT_LEN);
 
                 iwe.cmd = SIOCGIWFREQ;
                 iwe.u.freq.m = priv->BSSinfo[i].channel;
                 iwe.u.freq.e = 0;
-                current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_FREQ_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev,
+                                                  extra + IW_SCAN_MAX_DATA,
+                                                  &iwe, IW_EV_FREQ_LEN);
 
                 /* Add quality statistics */
                 iwe.cmd = IWEVQUAL;
                 iwe.u.qual.level = priv->BSSinfo[i].RSSI;
                 iwe.u.qual.qual  = iwe.u.qual.level;
                 /* iwe.u.qual.noise  = SOMETHING */
-                current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA , &iwe, IW_EV_QUAL_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev,
+                                                  extra + IW_SCAN_MAX_DATA,
+                                                  &iwe, IW_EV_QUAL_LEN);
 
 
                 iwe.cmd = SIOCGIWENCODE;
@@ -2342,7 +2352,9 @@ static int atmel_get_scan(struct net_device *dev,
                 else
                         iwe.u.data.flags = IW_ENCODE_DISABLED;
                 iwe.u.data.length = 0;
-                current_ev = iwe_stream_add_point(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, NULL);
+                current_ev = iwe_stream_add_point(info, current_ev,
+                                                  extra + IW_SCAN_MAX_DATA,
+                                                  &iwe, NULL);
         }
 
         /* Length of data */