11 files changed, 195 insertions, 143 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index e30f8b79ea89..73d66a80c4a3 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -7156,6 +7156,7 @@ out:
  * format that the Wireless Tools will understand - Jean II
  */
 static inline char *airo_translate_scan(struct net_device *dev,
+                                        struct iw_request_info *info,
                                         char *current_ev,
                                         char *end_buf,
                                         BSSListRid *bss)
@@ -7172,7 +7173,8 @@ static inline char *airo_translate_scan(struct net_device *dev,
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
         memcpy(iwe.u.ap_addr.sa_data, bss->bssid, ETH_ALEN);
-        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_ADDR_LEN);
 
         /* Other entries will be displayed in the order we give them */
 
@@ -7182,7 +7184,8 @@ static inline char *airo_translate_scan(struct net_device *dev,
                 iwe.u.data.length = 32;
         iwe.cmd = SIOCGIWESSID;
         iwe.u.data.flags = 1;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, bss->ssid);
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                          &iwe, bss->ssid);
 
         /* Add mode */
         iwe.cmd = SIOCGIWMODE;
@@ -7192,7 +7195,8 @@ static inline char *airo_translate_scan(struct net_device *dev,
                         iwe.u.mode = IW_MODE_MASTER;
                 else
                         iwe.u.mode = IW_MODE_ADHOC;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_UINT_LEN);
         }
 
         /* Add frequency */
@@ -7203,7 +7207,8 @@ static inline char *airo_translate_scan(struct net_device *dev,
          */
         iwe.u.freq.m = frequency_list[iwe.u.freq.m - 1] * 100000;
         iwe.u.freq.e = 1;
-        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_FREQ_LEN);
 
         dBm = le16_to_cpu(bss->dBm);
 
@@ -7223,7 +7228,8 @@ static inline char *airo_translate_scan(struct net_device *dev,
                                 | IW_QUAL_DBM;
         }
         iwe.u.qual.noise = ai->wstats.qual.noise;
-        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_QUAL_LEN);
 
         /* Add encryption capability */
         iwe.cmd = SIOCGIWENCODE;
@@ -7232,11 +7238,12 @@ static inline char *airo_translate_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, end_buf, &iwe, bss->ssid);
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                          &iwe, bss->ssid);
 
         /* Rate : stuffing multiple values in a single event require a bit
          * more of magic - Jean II */
-        current_val = current_ev + IW_EV_LCP_LEN;
+        current_val = current_ev + iwe_stream_lcp_len(info);
 
         iwe.cmd = SIOCGIWRATE;
         /* Those two flags are ignored... */
@@ -7249,10 +7256,12 @@ static inline char *airo_translate_scan(struct net_device *dev,
                 /* Bit rate given in 500 kb/s units (+ 0x80) */
                 iwe.u.bitrate.value = ((bss->rates[i] & 0x7f) * 500000);
                 /* Add new value to event */
-                current_val = iwe_stream_add_value(current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN);
+                current_val = iwe_stream_add_value(info, current_ev,
+                                                   current_val, end_buf,
+                                                   &iwe, IW_EV_PARAM_LEN);
         }
         /* Check if we added any event */
-        if((current_val - current_ev) > IW_EV_LCP_LEN)
+        if ((current_val - current_ev) > iwe_stream_lcp_len(info))
                 current_ev = current_val;
 
         /* Beacon interval */
@@ -7261,7 +7270,8 @@ static inline char *airo_translate_scan(struct net_device *dev,
                 iwe.cmd = IWEVCUSTOM;
                 sprintf(buf, "bcn_int=%d", bss->beaconInterval);
                 iwe.u.data.length = strlen(buf);
-                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
+                current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                                  &iwe, buf);
                 kfree(buf);
         }
 
@@ -7295,8 +7305,10 @@ static inline char *airo_translate_scan(struct net_device *dev,
                                         iwe.cmd = IWEVGENIE;
                                         iwe.u.data.length = min(info_element->len + 2,
                                                                   MAX_WPA_IE_LEN);
-                                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                                        &iwe, (char *) info_element);
+                                        current_ev = iwe_stream_add_point(
+                                                        info, current_ev,
+                                                        end_buf, &iwe,
+                                                        (char *) info_element);
                                 }
                                 break;
 
@@ -7304,8 +7316,9 @@ static inline char *airo_translate_scan(struct net_device *dev,
                                 iwe.cmd = IWEVGENIE;
                                 iwe.u.data.length = min(info_element->len + 2,
                                                           MAX_WPA_IE_LEN);
-                                current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                                &iwe, (char *) info_element);
+                                current_ev = iwe_stream_add_point(
+                                        info, current_ev, end_buf,
+                                        &iwe, (char *) info_element);
                                 break;
 
                         default:
@@ -7344,7 +7357,7 @@ static int airo_get_scan(struct net_device *dev,
 
         list_for_each_entry (net, &ai->network_list, list) {
                 /* Translate to WE format this entry */
-                current_ev = airo_translate_scan(dev, current_ev,
+                current_ev = airo_translate_scan(dev, info, current_ev,
                                                  extra + dwrq->length,
                                                  &net->bss);
 
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 */
diff --git a/drivers/net/wireless/hostap/hostap.h b/drivers/net/wireless/hostap/hostap.h
index 547ba84dc797..3a386a636cca 100644
--- a/drivers/net/wireless/hostap/hostap.h
+++ b/drivers/net/wireless/hostap/hostap.h
@@ -67,7 +67,8 @@ void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,
 int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
                            struct iw_quality qual[], int buf_size,
                            int aplist);
-int prism2_ap_translate_scan(struct net_device *dev, char *buffer);
+int prism2_ap_translate_scan(struct net_device *dev,
+                             struct iw_request_info *info, char *buffer);
 int prism2_hostapd(struct ap_data *ap, struct prism2_hostapd_param *param);
 
 
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 0acd9589c48c..06b23df8f69b 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -2420,7 +2420,8 @@ int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
 
 /* Translate our list of Access Points & Stations to a card independant
  * format that the Wireless Tools will understand - Jean II */
-int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
+int prism2_ap_translate_scan(struct net_device *dev,
+                             struct iw_request_info *info, char *buffer)
 {
         struct hostap_interface *iface;
         local_info_t *local;
@@ -2449,8 +2450,8 @@ int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
                 iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
                 memcpy(iwe.u.ap_addr.sa_data, sta->addr, ETH_ALEN);
                 iwe.len = IW_EV_ADDR_LEN;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-                                                  IW_EV_ADDR_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_ADDR_LEN);
 
                 /* Use the mode to indicate if it's a station or
                  * an Access Point */
@@ -2461,8 +2462,8 @@ int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
                 else
                         iwe.u.mode = IW_MODE_INFRA;
                 iwe.len = IW_EV_UINT_LEN;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-                                                  IW_EV_UINT_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_UINT_LEN);
 
                 /* Some quality */
                 memset(&iwe, 0, sizeof(iwe));
@@ -2477,8 +2478,8 @@ int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
                 iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
                 iwe.u.qual.updated = sta->last_rx_updated;
                 iwe.len = IW_EV_QUAL_LEN;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-                                                  IW_EV_QUAL_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_QUAL_LEN);
 
 #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
                 if (sta->ap) {
@@ -2486,8 +2487,8 @@ int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
                         iwe.cmd = SIOCGIWESSID;
                         iwe.u.data.length = sta->u.ap.ssid_len;
                         iwe.u.data.flags = 1;
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                                          &iwe,
+                        current_ev = iwe_stream_add_point(info, current_ev,
+                                                          end_buf, &iwe,
                                                           sta->u.ap.ssid);
 
                         memset(&iwe, 0, sizeof(iwe));
@@ -2497,10 +2498,9 @@ int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
                                         IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
                         else
                                 iwe.u.data.flags = IW_ENCODE_DISABLED;
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                                          &iwe,
-                                                          sta->u.ap.ssid
-                                                          /* 0 byte memcpy */);
+                        current_ev = iwe_stream_add_point(info, current_ev,
+                                                          end_buf, &iwe,
+                                                          sta->u.ap.ssid);
 
                         if (sta->u.ap.channel > 0 &&
                             sta->u.ap.channel <= FREQ_COUNT) {
@@ -2510,7 +2510,7 @@ int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
                                         * 100000;
                                 iwe.u.freq.e = 1;
                                 current_ev = iwe_stream_add_event(
-                                        current_ev, end_buf, &iwe,
+                                        info, current_ev, end_buf, &iwe,
                                         IW_EV_FREQ_LEN);
                         }
 
@@ -2519,8 +2519,8 @@ int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
                         sprintf(buf, "beacon_interval=%d",
                                 sta->listen_interval);
                         iwe.u.data.length = strlen(buf);
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                                          &iwe, buf);
+                        current_ev = iwe_stream_add_point(info, current_ev,
+                                                          end_buf, &iwe, buf);
                 }
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
 
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 0ca0bfeb0ada..ed52d98317cd 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1793,6 +1793,7 @@ static int prism2_ioctl_siwscan(struct net_device *dev,
 
 #ifndef PRISM2_NO_STATION_MODES
 static char * __prism2_translate_scan(local_info_t *local,
+                                      struct iw_request_info *info,
                                       struct hfa384x_hostscan_result *scan,
                                       struct hostap_bss_info *bss,
                                       char *current_ev, char *end_buf)
@@ -1823,7 +1824,7 @@ static char * __prism2_translate_scan(local_info_t *local,
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
         memcpy(iwe.u.ap_addr.sa_data, bssid, ETH_ALEN);
-        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,
                                           IW_EV_ADDR_LEN);
 
         /* Other entries will be displayed in the order we give them */
@@ -1832,7 +1833,8 @@ static char * __prism2_translate_scan(local_info_t *local,
         iwe.cmd = SIOCGIWESSID;
         iwe.u.data.length = ssid_len;
         iwe.u.data.flags = 1;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, ssid);
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                          &iwe, ssid);
 
         memset(&iwe, 0, sizeof(iwe));
         iwe.cmd = SIOCGIWMODE;
@@ -1847,8 +1849,8 @@ static char * __prism2_translate_scan(local_info_t *local,
                         iwe.u.mode = IW_MODE_MASTER;
                 else
                         iwe.u.mode = IW_MODE_ADHOC;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-                                                  IW_EV_UINT_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_UINT_LEN);
         }
 
         memset(&iwe, 0, sizeof(iwe));
@@ -1864,8 +1866,8 @@ static char * __prism2_translate_scan(local_info_t *local,
         if (chan > 0) {
                 iwe.u.freq.m = freq_list[chan - 1] * 100000;
                 iwe.u.freq.e = 1;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-                                                  IW_EV_FREQ_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_FREQ_LEN);
         }
 
         if (scan) {
@@ -1884,8 +1886,8 @@ static char * __prism2_translate_scan(local_info_t *local,
                         | IW_QUAL_NOISE_UPDATED
                         | IW_QUAL_QUAL_INVALID
                         | IW_QUAL_DBM;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-                                                  IW_EV_QUAL_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_QUAL_LEN);
         }
 
         memset(&iwe, 0, sizeof(iwe));
@@ -1895,13 +1897,13 @@ static char * __prism2_translate_scan(local_info_t *local,
         else
                 iwe.u.data.flags = IW_ENCODE_DISABLED;
         iwe.u.data.length = 0;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, "");
 
         /* TODO: add SuppRates into BSS table */
         if (scan) {
                 memset(&iwe, 0, sizeof(iwe));
                 iwe.cmd = SIOCGIWRATE;
-                current_val = current_ev + IW_EV_LCP_LEN;
+                current_val = current_ev + iwe_stream_lcp_len(info);
                 pos = scan->sup_rates;
                 for (i = 0; i < sizeof(scan->sup_rates); i++) {
                         if (pos[i] == 0)
@@ -1909,11 +1911,11 @@ static char * __prism2_translate_scan(local_info_t *local,
                         /* Bit rate given in 500 kb/s units (+ 0x80) */
                         iwe.u.bitrate.value = ((pos[i] & 0x7f) * 500000);
                         current_val = iwe_stream_add_value(
-                                current_ev, current_val, end_buf, &iwe,
+                                info, current_ev, current_val, end_buf, &iwe,
                                 IW_EV_PARAM_LEN);
                 }
                 /* Check if we added any event */
-                if ((current_val - current_ev) > IW_EV_LCP_LEN)
+                if ((current_val - current_ev) > iwe_stream_lcp_len(info))
                         current_ev = current_val;
         }
 
@@ -1924,15 +1926,15 @@ static char * __prism2_translate_scan(local_info_t *local,
                 iwe.cmd = IWEVCUSTOM;
                 sprintf(buf, "bcn_int=%d", le16_to_cpu(scan->beacon_interval));
                 iwe.u.data.length = strlen(buf);
-                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
-                                                  buf);
+                current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                                  &iwe, buf);
 
                 memset(&iwe, 0, sizeof(iwe));
                 iwe.cmd = IWEVCUSTOM;
                 sprintf(buf, "resp_rate=%d", le16_to_cpu(scan->rate));
                 iwe.u.data.length = strlen(buf);
-                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
-                                                  buf);
+                current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                                  &iwe, buf);
 
                 if (local->last_scan_type == PRISM2_HOSTSCAN &&
                     (capabilities & WLAN_CAPABILITY_IBSS)) {
@@ -1940,8 +1942,8 @@ static char * __prism2_translate_scan(local_info_t *local,
                         iwe.cmd = IWEVCUSTOM;
                         sprintf(buf, "atim=%d", le16_to_cpu(scan->atim));
                         iwe.u.data.length = strlen(buf);
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                                          &iwe, buf);
+                        current_ev = iwe_stream_add_point(info, current_ev,
+                                                          end_buf, &iwe, buf);
                 }
         }
         kfree(buf);
@@ -1950,16 +1952,16 @@ static char * __prism2_translate_scan(local_info_t *local,
                 memset(&iwe, 0, sizeof(iwe));
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = bss->wpa_ie_len;
-                current_ev = iwe_stream_add_point(
-                        current_ev, end_buf, &iwe, bss->wpa_ie);
+                current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                                  &iwe, bss->wpa_ie);
         }
 
         if (bss && bss->rsn_ie_len > 0 && bss->rsn_ie_len <= MAX_WPA_IE_LEN) {
                 memset(&iwe, 0, sizeof(iwe));
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = bss->rsn_ie_len;
-                current_ev = iwe_stream_add_point(
-                        current_ev, end_buf, &iwe, bss->rsn_ie);
+                current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                                  &iwe, bss->rsn_ie);
         }
 
         return current_ev;
@@ -1969,6 +1971,7 @@ static char * __prism2_translate_scan(local_info_t *local,
 /* Translate scan data returned from the card to a card independant
  * format that the Wireless Tools will understand - Jean II */
 static inline int prism2_translate_scan(local_info_t *local,
+                                        struct iw_request_info *info,
                                         char *buffer, int buflen)
 {
         struct hfa384x_hostscan_result *scan;
@@ -1999,13 +2002,14 @@ static inline int prism2_translate_scan(local_info_t *local,
                         if (memcmp(bss->bssid, scan->bssid, ETH_ALEN) == 0) {
                                 bss->included = 1;
                                 current_ev = __prism2_translate_scan(
-                                        local, scan, bss, current_ev, end_buf);
+                                        local, info, scan, bss, current_ev,
+                                        end_buf);
                                 found++;
                         }
                 }
                 if (!found) {
                         current_ev = __prism2_translate_scan(
-                                local, scan, NULL, current_ev, end_buf);
+                                local, info, scan, NULL, current_ev, end_buf);
                 }
                 /* Check if there is space for one more entry */
                 if ((end_buf - current_ev) <= IW_EV_ADDR_LEN) {
@@ -2023,7 +2027,7 @@ static inline int prism2_translate_scan(local_info_t *local,
                 bss = list_entry(ptr, struct hostap_bss_info, list);
                 if (bss->included)
                         continue;
-                current_ev = __prism2_translate_scan(local, NULL, bss,
+                current_ev = __prism2_translate_scan(local, info, NULL, bss,
                                                      current_ev, end_buf);
                 /* Check if there is space for one more entry */
                 if ((end_buf - current_ev) <= IW_EV_ADDR_LEN) {
@@ -2070,7 +2074,7 @@ static inline int prism2_ioctl_giwscan_sta(struct net_device *dev,
         }
         local->scan_timestamp = 0;
 
-        res = prism2_translate_scan(local, extra, data->length);
+        res = prism2_translate_scan(local, info, extra, data->length);
 
         if (res >= 0) {
                 data->length = res;
@@ -2103,7 +2107,7 @@ static int prism2_ioctl_giwscan(struct net_device *dev,
                  * Jean II */
 
                 /* Translate to WE format */
-                res = prism2_ap_translate_scan(dev, extra);
+                res = prism2_ap_translate_scan(dev, info, extra);
                 if (res >= 0) {
                         printk(KERN_DEBUG "Scan result translation succeeded "
                                "(length=%d)\n", res);
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index d448c9702a0f..343ed38f772d 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -776,8 +776,9 @@ out:
 #define MAX_CUSTOM_LEN 64
 
 static inline char *lbs_translate_scan(struct lbs_private *priv,
-                                       char *start, char *stop,
-                                       struct bss_descriptor *bss)
+                                            struct iw_request_info *info,
+                                            char *start, char *stop,
+                                            struct bss_descriptor *bss)
 {
         struct chan_freq_power *cfp;
         char *current_val;      /* For rates */
@@ -801,24 +802,24 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
         memcpy(iwe.u.ap_addr.sa_data, &bss->bssid, ETH_ALEN);
-        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_ADDR_LEN);
+        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN);
 
         /* SSID */
         iwe.cmd = SIOCGIWESSID;
         iwe.u.data.flags = 1;
         iwe.u.data.length = min((uint32_t) bss->ssid_len, (uint32_t) IW_ESSID_MAX_SIZE);
-        start = iwe_stream_add_point(start, stop, &iwe, bss->ssid);
+        start = iwe_stream_add_point(info, start, stop, &iwe, bss->ssid);
 
         /* Mode */
         iwe.cmd = SIOCGIWMODE;
         iwe.u.mode = bss->mode;
-        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN);
+        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN);
 
         /* Frequency */
         iwe.cmd = SIOCGIWFREQ;
         iwe.u.freq.m = (long)cfp->freq * 100000;
         iwe.u.freq.e = 1;
-        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
+        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN);
 
         /* Add quality statistics */
         iwe.cmd = IWEVQUAL;
@@ -852,7 +853,7 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
                 nf = priv->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
                 iwe.u.qual.level = CAL_RSSI(snr, nf);
         }
-        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);
+        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);
 
         /* Add encryption capability */
         iwe.cmd = SIOCGIWENCODE;
@@ -862,9 +863,9 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
                 iwe.u.data.flags = IW_ENCODE_DISABLED;
         }
         iwe.u.data.length = 0;
-        start = iwe_stream_add_point(start, stop, &iwe, bss->ssid);
+        start = iwe_stream_add_point(info, start, stop, &iwe, bss->ssid);
 
-        current_val = start + IW_EV_LCP_LEN;
+        current_val = start + iwe_stream_lcp_len(info);
 
         iwe.cmd = SIOCGIWRATE;
         iwe.u.bitrate.fixed = 0;
@@ -874,19 +875,19 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
         for (j = 0; bss->rates[j] && (j < sizeof(bss->rates)); j++) {
                 /* Bit rate given in 500 kb/s units */
                 iwe.u.bitrate.value = bss->rates[j] * 500000;
-                current_val = iwe_stream_add_value(start, current_val,
-                                         stop, &iwe, IW_EV_PARAM_LEN);
+                current_val = iwe_stream_add_value(info, start, current_val,
+                                                   stop, &iwe, IW_EV_PARAM_LEN);
         }
         if ((bss->mode == IW_MODE_ADHOC) && priv->adhoccreate
             && !lbs_ssid_cmp(priv->curbssparams.ssid,
                              priv->curbssparams.ssid_len,
                              bss->ssid, bss->ssid_len)) {
                 iwe.u.bitrate.value = 22 * 500000;
-                current_val = iwe_stream_add_value(start, current_val,
+                current_val = iwe_stream_add_value(info, start, current_val,
                                                    stop, &iwe, IW_EV_PARAM_LEN);
         }
         /* Check if we added any event */
-        if((current_val - start) > IW_EV_LCP_LEN)
+        if ((current_val - start) > iwe_stream_lcp_len(info))
                 start = current_val;
 
         memset(&iwe, 0, sizeof(iwe));
@@ -895,7 +896,7 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
                 memcpy(buf, bss->wpa_ie, bss->wpa_ie_len);
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = bss->wpa_ie_len;
-                start = iwe_stream_add_point(start, stop, &iwe, buf);
+                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
         }
 
         memset(&iwe, 0, sizeof(iwe));
@@ -904,7 +905,7 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
                 memcpy(buf, bss->rsn_ie, bss->rsn_ie_len);
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = bss->rsn_ie_len;
-                start = iwe_stream_add_point(start, stop, &iwe, buf);
+                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
         }
 
         if (bss->mesh) {
@@ -915,7 +916,8 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
                 p += snprintf(p, MAX_CUSTOM_LEN, "mesh-type: olpc");
                 iwe.u.data.length = p - custom;
                 if (iwe.u.data.length)
-                        start = iwe_stream_add_point(start, stop, &iwe, custom);
+                        start = iwe_stream_add_point(info, start, stop,
+                                                     &iwe, custom);
         }
 
 out:
@@ -1036,7 +1038,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
                 }
 
                 /* Translate to WE format this entry */
-                next_ev = lbs_translate_scan(priv, ev, stop, iter_bss);
+                next_ev = lbs_translate_scan(priv, info, ev, stop, iter_bss);
                 if (next_ev == NULL)
                         continue;
                 ev = next_ev;
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 6d13a0d15a0c..b047306bf386 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -4046,6 +4046,7 @@ static int orinoco_ioctl_setscan(struct net_device *dev,
  * format that the Wireless Tools will understand - Jean II
  * Return message length or -errno for fatal errors */
 static inline char *orinoco_translate_scan(struct net_device *dev,
+                                           struct iw_request_info *info,
                                            char *current_ev,
                                            char *end_buf,
                                            union hermes_scan_info *bss,
@@ -4062,7 +4063,8 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
         memcpy(iwe.u.ap_addr.sa_data, bss->a.bssid, ETH_ALEN);
-        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_ADDR_LEN);
 
         /* Other entries will be displayed in the order we give them */
 
@@ -4072,7 +4074,8 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
                 iwe.u.data.length = 32;
         iwe.cmd = SIOCGIWESSID;
         iwe.u.data.flags = 1;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, bss->a.essid);
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                          &iwe, bss->a.essid);
 
         /* Add mode */
         iwe.cmd = SIOCGIWMODE;
@@ -4082,7 +4085,8 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
                         iwe.u.mode = IW_MODE_MASTER;
                 else
                         iwe.u.mode = IW_MODE_ADHOC;
-                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_UINT_LEN);
         }
 
         channel = bss->s.channel;
@@ -4091,7 +4095,7 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
                 iwe.cmd = SIOCGIWFREQ;
                 iwe.u.freq.m = channel_frequency[channel-1] * 100000;
                 iwe.u.freq.e = 1;
-                current_ev = iwe_stream_add_event(current_ev, end_buf,
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
                                                   &iwe, IW_EV_FREQ_LEN);
         }
 
@@ -4106,7 +4110,8 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
                 iwe.u.qual.qual = iwe.u.qual.level - iwe.u.qual.noise;
         else
                 iwe.u.qual.qual = 0;
-        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_QUAL_LEN);
 
         /* Add encryption capability */
         iwe.cmd = SIOCGIWENCODE;
@@ -4115,7 +4120,8 @@ static inline char *orinoco_translate_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, end_buf, &iwe, bss->a.essid);
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                          &iwe, bss->a.essid);
 
         /* Add EXTRA: Age to display seconds since last beacon/probe response
          * for given network. */
@@ -4126,11 +4132,12 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
                       jiffies_to_msecs(jiffies - last_scanned));
         iwe.u.data.length = p - custom;
         if (iwe.u.data.length)
-                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
+                current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                                  &iwe, custom);
 
         /* Bit rate is not available in Lucent/Agere firmwares */
         if (priv->firmware_type != FIRMWARE_TYPE_AGERE) {
-                char *current_val = current_ev + IW_EV_LCP_LEN;
+                char *current_val = current_ev + iwe_stream_lcp_len(info);
                 int i;
                 int step;
 
@@ -4149,12 +4156,13 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
                                 break;
                         /* Bit rate given in 500 kb/s units (+ 0x80) */
                         iwe.u.bitrate.value = ((bss->p.rates[i] & 0x7f) * 500000);
-                        current_val = iwe_stream_add_value(current_ev, current_val,
+                        current_val = iwe_stream_add_value(info, current_ev,
+                                                           current_val,
                                                            end_buf, &iwe,
                                                            IW_EV_PARAM_LEN);
                 }
                 /* Check if we added any event */
-                if ((current_val - current_ev) > IW_EV_LCP_LEN)
+                if ((current_val - current_ev) > iwe_stream_lcp_len(info))
                         current_ev = current_val;
         }
 
@@ -4190,7 +4198,7 @@ static int orinoco_ioctl_getscan(struct net_device *dev,
 
         list_for_each_entry(bss, &priv->bss_list, list) {
                 /* Translate to WE format this entry */
-                current_ev = orinoco_translate_scan(dev, current_ev,
+                current_ev = orinoco_translate_scan(dev, info, current_ev,
                                                     extra + srq->length,
                                                     &bss->bss,
                                                     bss->last_scanned);
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 5b375b289036..97fa14e0a479 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -571,8 +571,9 @@ prism54_set_scan(struct net_device *dev, struct iw_request_info *info,
  */
 
 static char *
-prism54_translate_bss(struct net_device *ndev, char *current_ev,
-                      char *end_buf, struct obj_bss *bss, char noise)
+prism54_translate_bss(struct net_device *ndev, struct iw_request_info *info,
+                      char *current_ev, char *end_buf, struct obj_bss *bss,
+                      char noise)
 {
         struct iw_event iwe;    /* Temporary buffer */
         short cap;
@@ -584,8 +585,8 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
         memcpy(iwe.u.ap_addr.sa_data, bss->address, 6);
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
         iwe.cmd = SIOCGIWAP;
-        current_ev =
-            iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_ADDR_LEN);
 
         /* The following entries will be displayed in the same order we give them */
 
@@ -593,7 +594,7 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
         iwe.u.data.length = bss->ssid.length;
         iwe.u.data.flags = 1;
         iwe.cmd = SIOCGIWESSID;
-        current_ev = iwe_stream_add_point(current_ev, end_buf,
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,
                                           &iwe, bss->ssid.octets);
 
         /* Capabilities */
@@ -610,9 +611,8 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
                 iwe.u.mode = IW_MODE_ADHOC;
         iwe.cmd = SIOCGIWMODE;
         if (iwe.u.mode)
-                current_ev =
-                    iwe_stream_add_event(current_ev, end_buf, &iwe,
-                                         IW_EV_UINT_LEN);
+                current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                                  &iwe, IW_EV_UINT_LEN);
 
         /* Encryption capability */
         if (cap & CAP_CRYPT)
@@ -621,14 +621,15 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
                 iwe.u.data.flags = IW_ENCODE_DISABLED;
         iwe.u.data.length = 0;
         iwe.cmd = SIOCGIWENCODE;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, NULL);
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                          &iwe, NULL);
 
         /* Add frequency. (short) bss->channel is the frequency in MHz */
         iwe.u.freq.m = bss->channel;
         iwe.u.freq.e = 6;
         iwe.cmd = SIOCGIWFREQ;
-        current_ev =
-            iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_FREQ_LEN);
 
         /* Add quality statistics */
         iwe.u.qual.level = bss->rssi;
@@ -636,20 +637,20 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
         /* do a simple SNR for quality */
         iwe.u.qual.qual = bss->rssi - noise;
         iwe.cmd = IWEVQUAL;
-        current_ev =
-            iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
+        current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+                                          &iwe, IW_EV_QUAL_LEN);
 
         /* Add WPA/RSN Information Element, if any */
         wpa_ie_len = prism54_wpa_bss_ie_get(priv, bss->address, wpa_ie);
         if (wpa_ie_len > 0) {
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = min(wpa_ie_len, (size_t)MAX_WPA_IE_LEN);
-                current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                &iwe, wpa_ie);
+                current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+                                                  &iwe, wpa_ie);
         }
         /* Do the bitrates */
         {
-                char *  current_val = current_ev + IW_EV_LCP_LEN;
+                char *current_val = current_ev + iwe_stream_lcp_len(info);
                 int i;
                 int mask;
 
@@ -662,14 +663,14 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
                 for(i = 0; i < sizeof(scan_rate_list); i++) {
                         if(bss->rates & mask) {
                                 iwe.u.bitrate.value = (scan_rate_list[i] * 500000);
-                                current_val = iwe_stream_add_value(current_ev, current_val,
-                                                                   end_buf, &iwe,
-                                                                   IW_EV_PARAM_LEN);
+                                current_val = iwe_stream_add_value(
+                                        info, current_ev, current_val,
+                                        end_buf, &iwe, IW_EV_PARAM_LEN);
                         }
                         mask <<= 1;
                 }
                 /* Check if we added any event */
-                if ((current_val - current_ev) > IW_EV_LCP_LEN)
+                if ((current_val - current_ev) > iwe_stream_lcp_len(info))
                         current_ev = current_val;
         }
 
@@ -710,7 +711,7 @@ prism54_get_scan(struct net_device *ndev, struct iw_request_info *info,
 
         /* ok now, scan the list and translate its info */
         for (i = 0; i < (int) bsslist->nr; i++) {
-                current_ev = prism54_translate_bss(ndev, current_ev,
+                current_ev = prism54_translate_bss(ndev, info, current_ev,
                                                    extra + dwrq->length,
                                                    &(bsslist->bsslist[i]),
                                                    noise);
@@ -2704,6 +2705,7 @@ prism2_ioctl_scan_req(struct net_device *ndev,
                      struct prism2_hostapd_param *param)
 {
         islpci_private *priv = netdev_priv(ndev);
+        struct iw_request_info info;
         int i, rvalue;
         struct obj_bsslist *bsslist;
         u32 noise = 0;
@@ -2727,9 +2729,12 @@ prism2_ioctl_scan_req(struct net_device *ndev,
         rvalue |= mgt_get_request(priv, DOT11_OID_BSSLIST, 0, NULL, &r);
         bsslist = r.ptr;
 
+        info.cmd = PRISM54_HOSTAPD;
+        info.flags = 0;
+
         /* ok now, scan the list and translate its info */
         for (i = 0; i < min(IW_MAX_AP, (int) bsslist->nr); i++)
-                current_ev = prism54_translate_bss(ndev, current_ev,
+                current_ev = prism54_translate_bss(ndev, &info, current_ev,
                                                    extra + IW_SCAN_MAX_DATA,
                                                    &(bsslist->bsslist[i]),
                                                    noise);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index a36d2c85e26e..65c50025c88f 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1648,7 +1648,9 @@ static int rndis_iw_set_scan(struct net_device *dev,
 
 
 static char *rndis_translate_scan(struct net_device *dev,
-    char *cev, char *end_buf, struct ndis_80211_bssid_ex *bssid)
+                                  struct iw_request_info *info, char *cev,
+                                  char *end_buf,
+                                  struct ndis_80211_bssid_ex *bssid)
 {
 #ifdef DEBUG
         struct usbnet *usbdev = dev->priv;
@@ -1667,14 +1669,14 @@ static char *rndis_translate_scan(struct net_device *dev,
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
         memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN);
-        cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_ADDR_LEN);
+        cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_ADDR_LEN);
 
         devdbg(usbdev, "SSID(%d) %s", le32_to_cpu(bssid->ssid.length),
                                                 bssid->ssid.essid);
         iwe.cmd = SIOCGIWESSID;
         iwe.u.essid.length = le32_to_cpu(bssid->ssid.length);
         iwe.u.essid.flags = 1;
-        cev = iwe_stream_add_point(cev, end_buf, &iwe, bssid->ssid.essid);
+        cev = iwe_stream_add_point(info, cev, end_buf, &iwe, bssid->ssid.essid);
 
         devdbg(usbdev, "MODE %d", le32_to_cpu(bssid->net_infra));
         iwe.cmd = SIOCGIWMODE;
@@ -1690,12 +1692,12 @@ static char *rndis_translate_scan(struct net_device *dev,
                 iwe.u.mode = IW_MODE_AUTO;
                 break;
         }
-        cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_UINT_LEN);
+        cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_UINT_LEN);
 
         devdbg(usbdev, "FREQ %d kHz", le32_to_cpu(bssid->config.ds_config));
         iwe.cmd = SIOCGIWFREQ;
         dsconfig_to_freq(le32_to_cpu(bssid->config.ds_config), &iwe.u.freq);
-        cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_FREQ_LEN);
+        cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_FREQ_LEN);
 
         devdbg(usbdev, "QUAL %d", le32_to_cpu(bssid->rssi));
         iwe.cmd = IWEVQUAL;
@@ -1704,7 +1706,7 @@ static char *rndis_translate_scan(struct net_device *dev,
         iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED
                         | IW_QUAL_LEVEL_UPDATED
                         | IW_QUAL_NOISE_INVALID;
-        cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_QUAL_LEN);
+        cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_QUAL_LEN);
 
         devdbg(usbdev, "ENCODE %d", le32_to_cpu(bssid->privacy));
         iwe.cmd = SIOCGIWENCODE;
@@ -1714,10 +1716,10 @@ static char *rndis_translate_scan(struct net_device *dev,
         else
                 iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
 
-        cev = iwe_stream_add_point(cev, end_buf, &iwe, NULL);
+        cev = iwe_stream_add_point(info, cev, end_buf, &iwe, NULL);
 
         devdbg(usbdev, "RATES:");
-        current_val = cev + IW_EV_LCP_LEN;
+        current_val = cev + iwe_stream_lcp_len(info);
         iwe.cmd = SIOCGIWRATE;
         for (i = 0; i < sizeof(bssid->rates); i++) {
                 if (bssid->rates[i] & 0x7f) {
@@ -1725,13 +1727,13 @@ static char *rndis_translate_scan(struct net_device *dev,
                                 ((bssid->rates[i] & 0x7f) *
                                 500000);
                         devdbg(usbdev, " %d", iwe.u.bitrate.value);
-                        current_val = iwe_stream_add_value(cev,
+                        current_val = iwe_stream_add_value(info, cev,
                                 current_val, end_buf, &iwe,
                                 IW_EV_PARAM_LEN);
                 }
         }
 
-        if ((current_val - cev) > IW_EV_LCP_LEN)
+        if ((current_val - cev) > iwe_stream_lcp_len(info))
                 cev = current_val;
 
         beacon = le32_to_cpu(bssid->config.beacon_period);
@@ -1739,14 +1741,14 @@ static char *rndis_translate_scan(struct net_device *dev,
         iwe.cmd = IWEVCUSTOM;
         snprintf(sbuf, sizeof(sbuf), "bcn_int=%d", beacon);
         iwe.u.data.length = strlen(sbuf);
-        cev = iwe_stream_add_point(cev, end_buf, &iwe, sbuf);
+        cev = iwe_stream_add_point(info, cev, end_buf, &iwe, sbuf);
 
         atim = le32_to_cpu(bssid->config.atim_window);
         devdbg(usbdev, "ATIM %d", atim);
         iwe.cmd = IWEVCUSTOM;
         snprintf(sbuf, sizeof(sbuf), "atim=%u", atim);
         iwe.u.data.length = strlen(sbuf);
-        cev = iwe_stream_add_point(cev, end_buf, &iwe, sbuf);
+        cev = iwe_stream_add_point(info, cev, end_buf, &iwe, sbuf);
 
         ie = (void *)(bssid->ies + sizeof(struct ndis_80211_fixed_ies));
         ie_len = min(bssid_len - (int)sizeof(*bssid),
@@ -1760,7 +1762,7 @@ static char *rndis_translate_scan(struct net_device *dev,
                                         (ie->id == MFIE_TYPE_RSN) ? 2 : 1);
                         iwe.cmd = IWEVGENIE;
                         iwe.u.data.length = min(ie->len + 2, MAX_WPA_IE_LEN);
-                        cev = iwe_stream_add_point(cev, end_buf, &iwe,
+                        cev = iwe_stream_add_point(info, cev, end_buf, &iwe,
                                                                 (u8 *)ie);
                 }
 
@@ -1803,8 +1805,8 @@ static int rndis_iw_get_scan(struct net_device *dev,
         devdbg(usbdev, "SIOCGIWSCAN: %d BSSIDs found", count);
 
         while (count && ((void *)bssid + bssid_len) <= (buf + len)) {
-                cev = rndis_translate_scan(dev, cev, extra + IW_SCAN_MAX_DATA,
-                                                                        bssid);
+                cev = rndis_translate_scan(dev, info, cev,
+                                           extra + IW_SCAN_MAX_DATA, bssid);
                 bssid = (void *)bssid + bssid_len;
                 bssid_len = le32_to_cpu(bssid->length);
                 count--;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 42a36b3f3ff7..377141995e36 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1624,25 +1624,25 @@ static int wl3501_get_scan(struct net_device *dev, struct iw_request_info *info,
                 iwe.cmd                 = SIOCGIWAP;
                 iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
                 memcpy(iwe.u.ap_addr.sa_data, this->bss_set[i].bssid, ETH_ALEN);
-                current_ev = iwe_stream_add_event(current_ev,
+                current_ev = iwe_stream_add_event(info, current_ev,
                                                   extra + IW_SCAN_MAX_DATA,
                                                   &iwe, IW_EV_ADDR_LEN);
                 iwe.cmd           = SIOCGIWESSID;
                 iwe.u.data.flags  = 1;
                 iwe.u.data.length = this->bss_set[i].ssid.el.len;
-                current_ev = iwe_stream_add_point(current_ev,
+                current_ev = iwe_stream_add_point(info, current_ev,
                                                   extra + IW_SCAN_MAX_DATA,
                                                   &iwe,
                                                   this->bss_set[i].ssid.essid);
                 iwe.cmd    = SIOCGIWMODE;
                 iwe.u.mode = this->bss_set[i].bss_type;
-                current_ev = iwe_stream_add_event(current_ev,
+                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 = this->bss_set[i].ds_pset.chan;
                 iwe.u.freq.e = 0;
-                current_ev = iwe_stream_add_event(current_ev,
+                current_ev = iwe_stream_add_event(info, current_ev,
                                                   extra + IW_SCAN_MAX_DATA,
                                                   &iwe, IW_EV_FREQ_LEN);
                 iwe.cmd = SIOCGIWENCODE;
@@ -1651,7 +1651,7 @@ static int wl3501_get_scan(struct net_device *dev, struct iw_request_info *info,
                 else
                         iwe.u.data.flags = IW_ENCODE_DISABLED;
                 iwe.u.data.length = 0;
-                current_ev = iwe_stream_add_point(current_ev,
+                current_ev = iwe_stream_add_point(info, current_ev,
                                                   extra + IW_SCAN_MAX_DATA,
                                                   &iwe, NULL);
         }
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index d5c0c66188ca..07e4d1f73207 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -1152,32 +1152,36 @@ static int zd1201_get_scan(struct net_device *dev,
                 iwe.cmd = SIOCGIWAP;
                 iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
                 memcpy(iwe.u.ap_addr.sa_data, zd->rxdata+i+6, 6);
-                cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_ADDR_LEN);
+                cev = iwe_stream_add_event(info, cev, end_buf,
+                                           &iwe, IW_EV_ADDR_LEN);
 
                 iwe.cmd = SIOCGIWESSID;
                 iwe.u.data.length = zd->rxdata[i+16];
                 iwe.u.data.flags = 1;
-                cev = iwe_stream_add_point(cev, end_buf, &iwe, zd->rxdata+i+18);
+                cev = iwe_stream_add_point(info, cev, end_buf,
+                                           &iwe, zd->rxdata+i+18);
 
                 iwe.cmd = SIOCGIWMODE;
                 if (zd->rxdata[i+14]&0x01)
                         iwe.u.mode = IW_MODE_MASTER;
                 else
                         iwe.u.mode = IW_MODE_ADHOC;
-                cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_UINT_LEN);
+                cev = iwe_stream_add_event(info, cev, end_buf,
+                                           &iwe, IW_EV_UINT_LEN);
                 
                 iwe.cmd = SIOCGIWFREQ;
                 iwe.u.freq.m = zd->rxdata[i+0];
                 iwe.u.freq.e = 0;
-                cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_FREQ_LEN);
+                cev = iwe_stream_add_event(info, cev, end_buf,
+                                           &iwe, IW_EV_FREQ_LEN);
                 
                 iwe.cmd = SIOCGIWRATE;
                 iwe.u.bitrate.fixed = 0;
                 iwe.u.bitrate.disabled = 0;
                 for (j=0; j<10; j++) if (zd->rxdata[i+50+j]) {
                         iwe.u.bitrate.value = (zd->rxdata[i+50+j]&0x7f)*500000;
-                        cev=iwe_stream_add_event(cev, end_buf, &iwe,
-                            IW_EV_PARAM_LEN);
+                        cev = iwe_stream_add_event(info, cev, end_buf,
+                                                   &iwe, IW_EV_PARAM_LEN);
                 }
                 
                 iwe.cmd = SIOCGIWENCODE;
@@ -1186,14 +1190,15 @@ static int zd1201_get_scan(struct net_device *dev,
                         iwe.u.data.flags = IW_ENCODE_ENABLED;
                 else
                         iwe.u.data.flags = IW_ENCODE_DISABLED;
-                cev = iwe_stream_add_point(cev, end_buf, &iwe, NULL);
+                cev = iwe_stream_add_point(info, cev, end_buf, &iwe, NULL);
                 
                 iwe.cmd = IWEVQUAL;
                 iwe.u.qual.qual = zd->rxdata[i+4];
                 iwe.u.qual.noise= zd->rxdata[i+2]/10-100;
                 iwe.u.qual.level = (256+zd->rxdata[i+4]*100)/255-100;
                 iwe.u.qual.updated = 7;
-                cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_QUAL_LEN);
+                cev = iwe_stream_add_event(info, cev, end_buf,
+                                           &iwe, IW_EV_QUAL_LEN);
         }
 
         if (!enabled_save)