wext: Emit event stream entries correctly when compat.

Three major portions to this change:

1) Add IW_EV_COMPAT_LCP_LEN, IW_EV_COMPAT_POINT_OFF,
   and IW_EV_COMPAT_POINT_LEN helper defines.

2) Delete iw_stream_check_add_*(), they are unused.

3) Add iw_request_info argument to iwe_stream_add_*(), and use it to
   size the event and pointer lengths correctly depending upon whether
   IW_REQUEST_FLAG_COMPAT is set or not.

4) The mechanical transformations to the drivers and wireless stack
   bits to get the iw_request_info passed down into the routines
   modified in #3.  Also, explicit references to IW_EV_LCP_LEN are
   replaced with iwe_stream_lcp_len(info).

With a lot of help and bug fixes from Masakazu Mokuno.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 27 insertions, 22 deletions

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);