7 files changed, 91 insertions, 67 deletions

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_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index 020f450e9dba..f106bc1585a4 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -78,6 +78,9 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,
                         prism_header = 2;
                         phdrlen = sizeof(struct linux_wlan_ng_cap_hdr);
                 }
+        } else if (dev->type == ARPHRD_IEEE80211_RADIOTAP) {
+                prism_header = 3;
+                phdrlen = sizeof(struct hostap_radiotap_rx);
         } else {
                 prism_header = 0;
                 phdrlen = 0;
@@ -165,6 +168,24 @@ hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
                 hdr->ssi_noise  = htonl(rx_stats->noise);
                 hdr->preamble   = htonl(0); /* unknown */
                 hdr->encoding   = htonl(1); /* cck */
+        } else if (prism_header == 3) {
+                struct hostap_radiotap_rx *hdr;
+                hdr = (struct hostap_radiotap_rx *)skb_push(skb, phdrlen);
+                memset(hdr, 0, phdrlen);
+                hdr->hdr.it_len = cpu_to_le16(phdrlen);
+                hdr->hdr.it_present =
+                        cpu_to_le32((1 << IEEE80211_RADIOTAP_TSFT) |
+                                    (1 << IEEE80211_RADIOTAP_CHANNEL) |
+                                    (1 << IEEE80211_RADIOTAP_RATE) |
+                                    (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
+                                    (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE));
+                hdr->tsft = cpu_to_le64(rx_stats->mac_time);
+                hdr->chan_freq = cpu_to_le16(freq_list[local->channel - 1]);
+                hdr->chan_flags = cpu_to_le16(IEEE80211_CHAN_CCK |
+                                                 IEEE80211_CHAN_2GHZ);
+                hdr->rate = rx_stats->rate / 5;
+                hdr->dbm_antsignal = rx_stats->signal;
+                hdr->dbm_antnoise = rx_stats->noise;
         }
 
         ret = skb->len - phdrlen;
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index ab981afd481d..af3d4ef2a80b 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_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 936f52e3d95c..09004a632ae7 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -3204,6 +3204,7 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
         local->auth_algs = PRISM2_AUTH_OPEN | PRISM2_AUTH_SHARED_KEY;
         local->sram_type = -1;
         local->scan_channel_mask = 0xffff;
+        local->monitor_type = PRISM2_MONITOR_RADIOTAP;
 
         /* Initialize task queue structures */
         INIT_WORK(&local->reset_queue, handle_reset_queue);
@@ -3416,7 +3417,7 @@ static void prism2_free_local_data(struct net_device *dev)
 }
 
 
-#ifndef PRISM2_PLX
+#if (defined(PRISM2_PCI) && defined(CONFIG_PM)) || defined(PRISM2_PCCARD)
 static void prism2_suspend(struct net_device *dev)
 {
         struct hostap_interface *iface;
@@ -3435,7 +3436,7 @@ static void prism2_suspend(struct net_device *dev)
         /* Disable hardware and firmware */
         prism2_hw_shutdown(dev, 0);
 }
-#endif /* PRISM2_PLX */
+#endif /* (PRISM2_PCI && CONFIG_PM) || PRISM2_PCCARD */
 
 
 /* These might at some point be compiled separately and used as separate
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 0ca0bfeb0ada..3f8b1d7036e5 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -897,6 +897,8 @@ static void hostap_monitor_set_type(local_info_t *local)
         if (local->monitor_type == PRISM2_MONITOR_PRISM ||
             local->monitor_type == PRISM2_MONITOR_CAPHDR) {
                 dev->type = ARPHRD_IEEE80211_PRISM;
+        } else if (local->monitor_type == PRISM2_MONITOR_RADIOTAP) {
+                dev->type = ARPHRD_IEEE80211_RADIOTAP;
         } else {
                 dev->type = ARPHRD_IEEE80211;
         }
@@ -1793,6 +1795,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 +1826,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 +1835,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 +1851,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 +1868,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 +1888,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 +1899,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 +1913,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 +1928,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 +1944,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 +1954,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 +1973,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 +2004,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 +2029,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 +2076,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 +2109,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);
@@ -2516,7 +2522,8 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
         case PRISM2_PARAM_MONITOR_TYPE:
                 if (value != PRISM2_MONITOR_80211 &&
                     value != PRISM2_MONITOR_CAPHDR &&
-                    value != PRISM2_MONITOR_PRISM) {
+                    value != PRISM2_MONITOR_PRISM &&
+                    value != PRISM2_MONITOR_RADIOTAP) {
                         ret = -EINVAL;
                         break;
                 }
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index a38e85f334df..756ab56c1f40 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -597,25 +597,7 @@ void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
 static int hostap_80211_header_parse(const struct sk_buff *skb,
                                      unsigned char *haddr)
 {
-        struct hostap_interface *iface = netdev_priv(skb->dev);
-        local_info_t *local = iface->local;
-
-        if (local->monitor_type == PRISM2_MONITOR_PRISM ||
-            local->monitor_type == PRISM2_MONITOR_CAPHDR) {
-                const unsigned char *mac = skb_mac_header(skb);
-
-                if (*(u32 *)mac == LWNG_CAP_DID_BASE) {
-                        memcpy(haddr,
-                               mac + sizeof(struct linux_wlan_ng_prism_hdr) + 10,
-                               ETH_ALEN); /* addr2 */
-                } else { /* (*(u32 *)mac == htonl(LWNG_CAPHDR_VERSION)) */
-                        memcpy(haddr,
-                               mac + sizeof(struct linux_wlan_ng_cap_hdr) + 10,
-                               ETH_ALEN); /* addr2 */
-                }
-        } else
-                memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
-
+        memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
         return ETH_ALEN;
 }
 
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 15445bce2ac7..ffdf4876121b 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -5,6 +5,7 @@
 #include <linux/netdevice.h>
 #include <linux/mutex.h>
 #include <net/iw_handler.h>
+#include <net/ieee80211_radiotap.h>
 
 #include "hostap_config.h"
 #include "hostap_common.h"
@@ -55,6 +56,17 @@ struct linux_wlan_ng_cap_hdr {
         __be32 encoding;
 } __attribute__ ((packed));
 
+struct hostap_radiotap_rx {
+        struct ieee80211_radiotap_header hdr;
+        __le64 tsft;
+        u8 rate;
+        u8 padding;
+        __le16 chan_freq;
+        __le16 chan_flags;
+        s8 dbm_antsignal;
+        s8 dbm_antnoise;
+} __attribute__ ((packed));
+
 #define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
 #define LWNG_CAPHDR_VERSION 0x80211001
 
@@ -734,7 +746,7 @@ struct local_info {
         unsigned long scan_timestamp; /* Time started to scan */
         enum {
                 PRISM2_MONITOR_80211 = 0, PRISM2_MONITOR_PRISM = 1,
-                PRISM2_MONITOR_CAPHDR = 2
+                PRISM2_MONITOR_CAPHDR = 2, PRISM2_MONITOR_RADIOTAP = 3
         } monitor_type;
         int monitor_allow_fcserr;