Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6

5 files changed, 40 insertions, 21 deletions

diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index 4fd73809602e..d669e5956ce7 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_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index cdf90c40f11b..79a9bc95d2a7 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);
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index ed52d98317cd..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;
         }
@@ -2520,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 f7aec9309d04..b5213f61fb0b 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -596,25 +596,7 @@ void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
 
 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;