p54: Modify p54 files for new organization
authorChristian Lamparter <chunkeey@web.de>
Tue, 23 Jun 2009 15:39:45 +0000 (10:39 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jul 2009 19:02:24 +0000 (15:02 -0400)
Modify the remaining p54 files to account for the new file organization.

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/p54/Makefile
drivers/net/wireless/p54/p54.h
drivers/net/wireless/p54/p54common.c [deleted file]
drivers/net/wireless/p54/p54common.h [deleted file]
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/p54/p54spi.c
drivers/net/wireless/p54/p54usb.c

index c2050dee62937abd8a5f41dbade4112753665213..b542e68f1781fc5a300db200e0be9f2590f355ab 100644 (file)
@@ -1,3 +1,6 @@
+p54common-objs                 := eeprom.o fwio.o txrx.o main.o
+p54common-$(CONFIG_P54_LEDS)   += led.o
+
 obj-$(CONFIG_P54_COMMON)       += p54common.o
 obj-$(CONFIG_P54_USB)          += p54usb.o
 obj-$(CONFIG_P54_PCI)          += p54pci.o
index db3df947d8ed45b2c2c623e8dd918b691bc8436d..19d085c73d7d5f38a7577b0c4f1dc6e27108ebf4 100644 (file)
@@ -1,6 +1,3 @@
-#ifndef P54_H
-#define P54_H
-
 /*
  * Shared defines for all mac80211 Prism54 code
  *
  * published by the Free Software Foundation.
  */
 
+#ifndef P54_H
+#define P54_H
+
 #ifdef CONFIG_P54_LEDS
 #include <linux/leds.h>
 #endif /* CONFIG_P54_LEDS */
 
-enum p54_control_frame_types {
-       P54_CONTROL_TYPE_SETUP = 0,
-       P54_CONTROL_TYPE_SCAN,
-       P54_CONTROL_TYPE_TRAP,
-       P54_CONTROL_TYPE_DCFINIT,
-       P54_CONTROL_TYPE_RX_KEYCACHE,
-       P54_CONTROL_TYPE_TIM,
-       P54_CONTROL_TYPE_PSM,
-       P54_CONTROL_TYPE_TXCANCEL,
-       P54_CONTROL_TYPE_TXDONE,
-       P54_CONTROL_TYPE_BURST,
-       P54_CONTROL_TYPE_STAT_READBACK,
-       P54_CONTROL_TYPE_BBP,
-       P54_CONTROL_TYPE_EEPROM_READBACK,
-       P54_CONTROL_TYPE_LED,
-       P54_CONTROL_TYPE_GPIO,
-       P54_CONTROL_TYPE_TIMER,
-       P54_CONTROL_TYPE_MODULATION,
-       P54_CONTROL_TYPE_SYNTH_CONFIG,
-       P54_CONTROL_TYPE_DETECTOR_VALUE,
-       P54_CONTROL_TYPE_XBOW_SYNTH_CFG,
-       P54_CONTROL_TYPE_CCE_QUIET,
-       P54_CONTROL_TYPE_PSM_STA_UNLOCK,
-       P54_CONTROL_TYPE_PCS,
-       P54_CONTROL_TYPE_BT_BALANCER = 28,
-       P54_CONTROL_TYPE_GROUP_ADDRESS_TABLE = 30,
-       P54_CONTROL_TYPE_ARPTABLE = 31,
-       P54_CONTROL_TYPE_BT_OPTIONS = 35
-};
+#define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
+
+#define BR_CODE_MIN                    0x80000000
+#define BR_CODE_COMPONENT_ID           0x80000001
+#define BR_CODE_COMPONENT_VERSION      0x80000002
+#define BR_CODE_DEPENDENT_IF           0x80000003
+#define BR_CODE_EXPOSED_IF             0x80000004
+#define BR_CODE_DESCR                  0x80000101
+#define BR_CODE_MAX                    0x8FFFFFFF
+#define BR_CODE_END_OF_BRA             0xFF0000FF
+#define LEGACY_BR_CODE_END_OF_BRA      0xFFFFFFFF
+
+struct bootrec {
+       __le32 code;
+       __le32 len;
+       u32 data[10];
+} __packed;
+
+/* Interface role definitions */
+#define BR_INTERFACE_ROLE_SERVER       0x0000
+#define BR_INTERFACE_ROLE_CLIENT       0x8000
+
+#define BR_DESC_PRIV_CAP_WEP           BIT(0)
+#define BR_DESC_PRIV_CAP_TKIP          BIT(1)
+#define BR_DESC_PRIV_CAP_MICHAEL       BIT(2)
+#define BR_DESC_PRIV_CAP_CCX_CP                BIT(3)
+#define BR_DESC_PRIV_CAP_CCX_MIC       BIT(4)
+#define BR_DESC_PRIV_CAP_AESCCMP       BIT(5)
+
+struct bootrec_desc {
+       __le16 modes;
+       __le16 flags;
+       __le32 rx_start;
+       __le32 rx_end;
+       u8 headroom;
+       u8 tailroom;
+       u8 tx_queues;
+       u8 tx_depth;
+       u8 privacy_caps;
+       u8 rx_keycache_size;
+       u8 time_size;
+       u8 padding;
+       u8 rates[16];
+       u8 padding2[4];
+       __le16 rx_mtu;
+} __packed;
+
+#define FW_FMAC 0x464d4143
+#define FW_LM86 0x4c4d3836
+#define FW_LM87 0x4c4d3837
+#define FW_LM20 0x4c4d3230
+
+struct bootrec_comp_id {
+       __le32 fw_variant;
+} __packed;
+
+struct bootrec_comp_ver {
+       char fw_version[24];
+} __packed;
+
+struct bootrec_end {
+       __le16 crc;
+       u8 padding[2];
+       u8 md5[16];
+} __packed;
 
 /* provide 16 bytes for the transport back-end */
 #define P54_TX_INFO_DATA_SIZE          16
@@ -55,34 +91,30 @@ enum p54_control_frame_types {
 struct p54_tx_info {
        u32 start_addr;
        u32 end_addr;
-       void *data[P54_TX_INFO_DATA_SIZE / sizeof(void *)];
+       union {
+               void *data[P54_TX_INFO_DATA_SIZE / sizeof(void *)];
+               struct {
+                       u32 extra_len;
+               };
+       };
 };
 
 #define P54_MAX_CTRL_FRAME_LEN         0x1000
 
-#define P54_HDR_FLAG_CONTROL           BIT(15)
-#define P54_HDR_FLAG_CONTROL_OPSET     (BIT(15) + BIT(0))
-
-struct p54_hdr {
-       __le16 flags;
-       __le16 len;
-       __le32 req_id;
-       __le16 type;    /* enum p54_control_frame_types */
-       u8 rts_tries;
-       u8 tries;
-       u8 data[0];
-} __attribute__ ((packed));
-
-#define FREE_AFTER_TX(skb)                                             \
-       ((((struct p54_hdr *) ((struct sk_buff *) skb)->data)->         \
-       flags) == cpu_to_le16(P54_HDR_FLAG_CONTROL_OPSET))
+#define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, _txop)     \
+do {                                                           \
+       queue.aifs = cpu_to_le16(ai_fs);                        \
+       queue.cwmin = cpu_to_le16(cw_min);                      \
+       queue.cwmax = cpu_to_le16(cw_max);                      \
+       queue.txop = cpu_to_le16(_txop);                        \
+} while (0)
 
 struct p54_edcf_queue_param {
        __le16 aifs;
        __le16 cwmin;
        __le16 cwmax;
        __le16 txop;
-} __attribute__ ((packed));
+} __packed;
 
 struct p54_rssi_linear_approximation {
        s16 mul;
@@ -101,13 +133,6 @@ struct p54_cal_database {
 
 #define EEPROM_READBACK_LEN 0x3fc
 
-#define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
-
-#define FW_FMAC 0x464d4143
-#define FW_LM86 0x4c4d3836
-#define FW_LM87 0x4c4d3837
-#define FW_LM20 0x4c4d3230
-
 enum fw_state {
        FW_STATE_OFF,
        FW_STATE_BOOTING,
@@ -138,6 +163,7 @@ struct p54_common {
        void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb);
        int (*open)(struct ieee80211_hw *dev);
        void (*stop)(struct ieee80211_hw *dev);
+       struct sk_buff_head tx_pending;
        struct sk_buff_head tx_queue;
        struct mutex conf_mutex;
 
@@ -156,6 +182,7 @@ struct p54_common {
 
        /* (e)DCF / QOS state */
        bool use_short_slot;
+       spinlock_t tx_stats_lock;
        struct ieee80211_tx_queue_stats tx_stats[8];
        struct p54_edcf_queue_param qos_params[8];
 
@@ -181,7 +208,7 @@ struct p54_common {
        u32 tsf_low32, tsf_high32;
        u32 basic_rate_mask;
        u16 aid;
-       struct sk_buff *cached_beacon;
+       __le32 beacon_req_id;
 
        /* cryptographic engine information */
        u8 privacy_caps;
@@ -202,15 +229,20 @@ struct p54_common {
        /* eeprom handling */
        void *eeprom;
        struct completion eeprom_comp;
+       struct mutex eeprom_mutex;
 };
 
+/* interfaces for the drivers */
 int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb);
 void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb);
 int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw);
 int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len);
 int p54_read_eeprom(struct ieee80211_hw *dev);
+
 struct ieee80211_hw *p54_init_common(size_t priv_data_len);
 int p54_register_common(struct ieee80211_hw *dev, struct device *pdev);
 void p54_free_common(struct ieee80211_hw *dev);
 
+void p54_unregister_common(struct ieee80211_hw *dev);
+
 #endif /* P54_H */
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
deleted file mode 100644 (file)
index d1ea609..0000000
+++ /dev/null
@@ -1,2687 +0,0 @@
-/*
- * Common code for mac80211 Prism54 drivers
- *
- * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
- * Copyright (c) 2007, Christian Lamparter <chunkeey@web.de>
- * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>
- *
- * Based on:
- * - the islsm (softmac prism54) driver, which is:
- *   Copyright 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al.
- * - stlc45xx driver
- *   Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/init.h>
-#include <linux/firmware.h>
-#include <linux/etherdevice.h>
-
-#include <net/mac80211.h>
-#ifdef CONFIG_P54_LEDS
-#include <linux/leds.h>
-#endif /* CONFIG_P54_LEDS */
-
-#include "p54.h"
-#include "p54common.h"
-
-static int modparam_nohwcrypt;
-module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
-MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
-MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
-MODULE_DESCRIPTION("Softmac Prism54 common code");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("prism54common");
-
-static struct ieee80211_rate p54_bgrates[] = {
-       { .bitrate = 10, .hw_value = 0, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-       { .bitrate = 20, .hw_value = 1, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-       { .bitrate = 55, .hw_value = 2, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-       { .bitrate = 110, .hw_value = 3, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-       { .bitrate = 60, .hw_value = 4, },
-       { .bitrate = 90, .hw_value = 5, },
-       { .bitrate = 120, .hw_value = 6, },
-       { .bitrate = 180, .hw_value = 7, },
-       { .bitrate = 240, .hw_value = 8, },
-       { .bitrate = 360, .hw_value = 9, },
-       { .bitrate = 480, .hw_value = 10, },
-       { .bitrate = 540, .hw_value = 11, },
-};
-
-static struct ieee80211_channel p54_bgchannels[] = {
-       { .center_freq = 2412, .hw_value = 1, },
-       { .center_freq = 2417, .hw_value = 2, },
-       { .center_freq = 2422, .hw_value = 3, },
-       { .center_freq = 2427, .hw_value = 4, },
-       { .center_freq = 2432, .hw_value = 5, },
-       { .center_freq = 2437, .hw_value = 6, },
-       { .center_freq = 2442, .hw_value = 7, },
-       { .center_freq = 2447, .hw_value = 8, },
-       { .center_freq = 2452, .hw_value = 9, },
-       { .center_freq = 2457, .hw_value = 10, },
-       { .center_freq = 2462, .hw_value = 11, },
-       { .center_freq = 2467, .hw_value = 12, },
-       { .center_freq = 2472, .hw_value = 13, },
-       { .center_freq = 2484, .hw_value = 14, },
-};
-
-static struct ieee80211_supported_band band_2GHz = {
-       .channels = p54_bgchannels,
-       .n_channels = ARRAY_SIZE(p54_bgchannels),
-       .bitrates = p54_bgrates,
-       .n_bitrates = ARRAY_SIZE(p54_bgrates),
-};
-
-static struct ieee80211_rate p54_arates[] = {
-       { .bitrate = 60, .hw_value = 4, },
-       { .bitrate = 90, .hw_value = 5, },
-       { .bitrate = 120, .hw_value = 6, },
-       { .bitrate = 180, .hw_value = 7, },
-       { .bitrate = 240, .hw_value = 8, },
-       { .bitrate = 360, .hw_value = 9, },
-       { .bitrate = 480, .hw_value = 10, },
-       { .bitrate = 540, .hw_value = 11, },
-};
-
-static struct ieee80211_channel p54_achannels[] = {
-       { .center_freq = 4920 },
-       { .center_freq = 4940 },
-       { .center_freq = 4960 },
-       { .center_freq = 4980 },
-       { .center_freq = 5040 },
-       { .center_freq = 5060 },
-       { .center_freq = 5080 },
-       { .center_freq = 5170 },
-       { .center_freq = 5180 },
-       { .center_freq = 5190 },
-       { .center_freq = 5200 },
-       { .center_freq = 5210 },
-       { .center_freq = 5220 },
-       { .center_freq = 5230 },
-       { .center_freq = 5240 },
-       { .center_freq = 5260 },
-       { .center_freq = 5280 },
-       { .center_freq = 5300 },
-       { .center_freq = 5320 },
-       { .center_freq = 5500 },
-       { .center_freq = 5520 },
-       { .center_freq = 5540 },
-       { .center_freq = 5560 },
-       { .center_freq = 5580 },
-       { .center_freq = 5600 },
-       { .center_freq = 5620 },
-       { .center_freq = 5640 },
-       { .center_freq = 5660 },
-       { .center_freq = 5680 },
-       { .center_freq = 5700 },
-       { .center_freq = 5745 },
-       { .center_freq = 5765 },
-       { .center_freq = 5785 },
-       { .center_freq = 5805 },
-       { .center_freq = 5825 },
-};
-
-static struct ieee80211_supported_band band_5GHz = {
-       .channels = p54_achannels,
-       .n_channels = ARRAY_SIZE(p54_achannels),
-       .bitrates = p54_arates,
-       .n_bitrates = ARRAY_SIZE(p54_arates),
-};
-
-int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
-{
-       struct p54_common *priv = dev->priv;
-       struct bootrec_exp_if *exp_if;
-       struct bootrec *bootrec;
-       u32 *data = (u32 *)fw->data;
-       u32 *end_data = (u32 *)fw->data + (fw->size >> 2);
-       u8 *fw_version = NULL;
-       size_t len;
-       int i;
-       int maxlen;
-
-       if (priv->rx_start)
-               return 0;
-
-       while (data < end_data && *data)
-               data++;
-
-       while (data < end_data && !*data)
-               data++;
-
-       bootrec = (struct bootrec *) data;
-
-       while (bootrec->data <= end_data &&
-              (bootrec->data + (len = le32_to_cpu(bootrec->len))) <= end_data) {
-               u32 code = le32_to_cpu(bootrec->code);
-               switch (code) {
-               case BR_CODE_COMPONENT_ID:
-                       priv->fw_interface = be32_to_cpup((__be32 *)
-                                            bootrec->data);
-                       switch (priv->fw_interface) {
-                       case FW_LM86:
-                       case FW_LM20:
-                       case FW_LM87: {
-                               char *iftype = (char *)bootrec->data;
-                               printk(KERN_INFO "%s: p54 detected a LM%c%c "
-                                                "firmware\n",
-                                       wiphy_name(dev->wiphy),
-                                       iftype[2], iftype[3]);
-                               break;
-                               }
-                       case FW_FMAC:
-                       default:
-                               printk(KERN_ERR "%s: unsupported firmware\n",
-                                       wiphy_name(dev->wiphy));
-                               return -ENODEV;
-                       }
-                       break;
-               case BR_CODE_COMPONENT_VERSION:
-                       /* 24 bytes should be enough for all firmwares */
-                       if (strnlen((unsigned char*)bootrec->data, 24) < 24)
-                               fw_version = (unsigned char*)bootrec->data;
-                       break;
-               case BR_CODE_DESCR: {
-                       struct bootrec_desc *desc =
-                               (struct bootrec_desc *)bootrec->data;
-                       priv->rx_start = le32_to_cpu(desc->rx_start);
-                       /* FIXME add sanity checking */
-                       priv->rx_end = le32_to_cpu(desc->rx_end) - 0x3500;
-                       priv->headroom = desc->headroom;
-                       priv->tailroom = desc->tailroom;
-                       priv->privacy_caps = desc->privacy_caps;
-                       priv->rx_keycache_size = desc->rx_keycache_size;
-                       if (le32_to_cpu(bootrec->len) == 11)
-                               priv->rx_mtu = le16_to_cpu(desc->rx_mtu);
-                       else
-                               priv->rx_mtu = (size_t)
-                                       0x620 - priv->tx_hdr_len;
-                       maxlen = priv->tx_hdr_len + /* USB devices */
-                                sizeof(struct p54_rx_data) +
-                                4 + /* rx alignment */
-                                IEEE80211_MAX_FRAG_THRESHOLD;
-                       if (priv->rx_mtu > maxlen && PAGE_SIZE == 4096) {
-                               printk(KERN_INFO "p54: rx_mtu reduced from %d "
-                                                "to %d\n", priv->rx_mtu,
-                                                maxlen);
-                               priv->rx_mtu = maxlen;
-                       }
-                       break;
-                       }
-               case BR_CODE_EXPOSED_IF:
-                       exp_if = (struct bootrec_exp_if *) bootrec->data;
-                       for (i = 0; i < (len * sizeof(*exp_if) / 4); i++)
-                               if (exp_if[i].if_id == cpu_to_le16(0x1a))
-                                       priv->fw_var = le16_to_cpu(exp_if[i].variant);
-                       break;
-               case BR_CODE_DEPENDENT_IF:
-                       break;
-               case BR_CODE_END_OF_BRA:
-               case LEGACY_BR_CODE_END_OF_BRA:
-                       end_data = NULL;
-                       break;
-               default:
-                       break;
-               }
-               bootrec = (struct bootrec *)&bootrec->data[len];
-       }
-
-       if (fw_version)
-               printk(KERN_INFO "%s: FW rev %s - Softmac protocol %x.%x\n",
-                       wiphy_name(dev->wiphy), fw_version,
-                       priv->fw_var >> 8, priv->fw_var & 0xff);
-
-       if (priv->fw_var < 0x500)
-               printk(KERN_INFO "%s: you are using an obsolete firmware. "
-                      "visit http://wireless.kernel.org/en/users/Drivers/p54 "
-                      "and grab one for \"kernel >= 2.6.28\"!\n",
-                       wiphy_name(dev->wiphy));
-
-       if (priv->fw_var >= 0x300) {
-               /* Firmware supports QoS, use it! */
-               priv->tx_stats[P54_QUEUE_AC_VO].limit = 3;
-               priv->tx_stats[P54_QUEUE_AC_VI].limit = 4;
-               priv->tx_stats[P54_QUEUE_AC_BE].limit = 3;
-               priv->tx_stats[P54_QUEUE_AC_BK].limit = 2;
-               dev->queues = P54_QUEUE_AC_NUM;
-       }
-
-       if (!modparam_nohwcrypt) {
-               printk(KERN_INFO "%s: cryptographic accelerator "
-                                "WEP:%s, TKIP:%s, CCMP:%s\n",
-                       wiphy_name(dev->wiphy),
-                       (priv->privacy_caps & BR_DESC_PRIV_CAP_WEP) ? "YES" :
-                       "no", (priv->privacy_caps & (BR_DESC_PRIV_CAP_TKIP |
-                        BR_DESC_PRIV_CAP_MICHAEL)) ? "YES" : "no",
-                       (priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP) ?
-                       "YES" : "no");
-
-               if (priv->rx_keycache_size) {
-                       /*
-                        * NOTE:
-                        *
-                        * The firmware provides at most 255 (0 - 254) slots
-                        * for keys which are then used to offload decryption.
-                        * As a result the 255 entry (aka 0xff) can be used
-                        * safely by the driver to mark keys that didn't fit
-                        * into the full cache. This trick saves us from
-                        * keeping a extra list for uploaded keys.
-                        */
-
-                       priv->used_rxkeys = kzalloc(BITS_TO_LONGS(
-                               priv->rx_keycache_size), GFP_KERNEL);
-
-                       if (!priv->used_rxkeys)
-                               return -ENOMEM;
-               }
-       }
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(p54_parse_firmware);
-
-static int p54_convert_rev0(struct ieee80211_hw *dev,
-                           struct pda_pa_curve_data *curve_data)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_pa_curve_data_sample *dst;
-       struct pda_pa_curve_data_sample_rev0 *src;
-       size_t cd_len = sizeof(*curve_data) +
-               (curve_data->points_per_channel*sizeof(*dst) + 2) *
-                curve_data->channels;
-       unsigned int i, j;
-       void *source, *target;
-
-       priv->curve_data = kmalloc(sizeof(*priv->curve_data) + cd_len,
-                                  GFP_KERNEL);
-       if (!priv->curve_data)
-               return -ENOMEM;
-
-       priv->curve_data->entries = curve_data->channels;
-       priv->curve_data->entry_size = sizeof(__le16) +
-               sizeof(*dst) * curve_data->points_per_channel;
-       priv->curve_data->offset = offsetof(struct pda_pa_curve_data, data);
-       priv->curve_data->len = cd_len;
-       memcpy(priv->curve_data->data, curve_data, sizeof(*curve_data));
-       source = curve_data->data;
-       target = ((struct pda_pa_curve_data *) priv->curve_data->data)->data;
-       for (i = 0; i < curve_data->channels; i++) {
-               __le16 *freq = source;
-               source += sizeof(__le16);
-               *((__le16 *)target) = *freq;
-               target += sizeof(__le16);
-               for (j = 0; j < curve_data->points_per_channel; j++) {
-                       dst = target;
-                       src = source;
-
-                       dst->rf_power = src->rf_power;
-                       dst->pa_detector = src->pa_detector;
-                       dst->data_64qam = src->pcv;
-                       /* "invent" the points for the other modulations */
-#define SUB(x,y) (u8)((x) - (y)) > (x) ? 0 : (x) - (y)
-                       dst->data_16qam = SUB(src->pcv, 12);
-                       dst->data_qpsk = SUB(dst->data_16qam, 12);
-                       dst->data_bpsk = SUB(dst->data_qpsk, 12);
-                       dst->data_barker = SUB(dst->data_bpsk, 14);
-#undef SUB
-                       target += sizeof(*dst);
-                       source += sizeof(*src);
-               }
-       }
-
-       return 0;
-}
-
-static int p54_convert_rev1(struct ieee80211_hw *dev,
-                           struct pda_pa_curve_data *curve_data)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_pa_curve_data_sample *dst;
-       struct pda_pa_curve_data_sample_rev1 *src;
-       size_t cd_len = sizeof(*curve_data) +
-               (curve_data->points_per_channel*sizeof(*dst) + 2) *
-                curve_data->channels;
-       unsigned int i, j;
-       void *source, *target;
-
-       priv->curve_data = kzalloc(cd_len + sizeof(*priv->curve_data),
-                                  GFP_KERNEL);
-       if (!priv->curve_data)
-               return -ENOMEM;
-
-       priv->curve_data->entries = curve_data->channels;
-       priv->curve_data->entry_size = sizeof(__le16) +
-               sizeof(*dst) * curve_data->points_per_channel;
-       priv->curve_data->offset = offsetof(struct pda_pa_curve_data, data);
-       priv->curve_data->len = cd_len;
-       memcpy(priv->curve_data->data, curve_data, sizeof(*curve_data));
-       source = curve_data->data;
-       target = ((struct pda_pa_curve_data *) priv->curve_data->data)->data;
-       for (i = 0; i < curve_data->channels; i++) {
-               __le16 *freq = source;
-               source += sizeof(__le16);
-               *((__le16 *)target) = *freq;
-               target += sizeof(__le16);
-               for (j = 0; j < curve_data->points_per_channel; j++) {
-                       memcpy(target, source, sizeof(*src));
-
-                       target += sizeof(*dst);
-                       source += sizeof(*src);
-               }
-               source++;
-       }
-
-       return 0;
-}
-
-static const char *p54_rf_chips[] = { "NULL", "Duette3", "Duette2",
-                              "Frisbee", "Xbow", "Longbow", "NULL", "NULL" };
-static int p54_init_xbow_synth(struct ieee80211_hw *dev);
-
-static void p54_parse_rssical(struct ieee80211_hw *dev, void *data, int len,
-                            u16 type)
-{
-       struct p54_common *priv = dev->priv;
-       int offset = (type == PDR_RSSI_LINEAR_APPROXIMATION_EXTENDED) ? 2 : 0;
-       int entry_size = sizeof(struct pda_rssi_cal_entry) + offset;
-       int num_entries = (type == PDR_RSSI_LINEAR_APPROXIMATION) ? 1 : 2;
-       int i;
-
-       if (len != (entry_size * num_entries)) {
-               printk(KERN_ERR "%s: unknown rssi calibration data packing "
-                                " type:(%x) len:%d.\n",
-                      wiphy_name(dev->wiphy), type, len);
-
-               print_hex_dump_bytes("rssical:", DUMP_PREFIX_NONE,
-                                    data, len);
-
-               printk(KERN_ERR "%s: please report this issue.\n",
-                       wiphy_name(dev->wiphy));
-               return;
-       }
-
-       for (i = 0; i < num_entries; i++) {
-               struct pda_rssi_cal_entry *cal = data +
-                                                (offset + i * entry_size);
-               priv->rssical_db[i].mul = (s16) le16_to_cpu(cal->mul);
-               priv->rssical_db[i].add = (s16) le16_to_cpu(cal->add);
-       }
-}
-
-static void p54_parse_default_country(struct ieee80211_hw *dev,
-                                     void *data, int len)
-{
-       struct pda_country *country;
-
-       if (len != sizeof(*country)) {
-               printk(KERN_ERR "%s: found possible invalid default country "
-                               "eeprom entry. (entry size: %d)\n",
-                      wiphy_name(dev->wiphy), len);
-
-               print_hex_dump_bytes("country:", DUMP_PREFIX_NONE,
-                                    data, len);
-
-               printk(KERN_ERR "%s: please report this issue.\n",
-                       wiphy_name(dev->wiphy));
-               return;
-       }
-
-       country = (struct pda_country *) data;
-       if (country->flags == PDR_COUNTRY_CERT_CODE_PSEUDO)
-               regulatory_hint(dev->wiphy, country->alpha2);
-       else {
-               /* TODO:
-                * write a shared/common function that converts
-                * "Regulatory domain codes" (802.11-2007 14.8.2.2)
-                * into ISO/IEC 3166-1 alpha2 for regulatory_hint.
-                */
-       }
-}
-
-static int p54_convert_output_limits(struct ieee80211_hw *dev,
-                                    u8 *data, size_t len)
-{
-       struct p54_common *priv = dev->priv;
-
-       if (len < 2)
-               return -EINVAL;
-
-       if (data[0] != 0) {
-               printk(KERN_ERR "%s: unknown output power db revision:%x\n",
-                      wiphy_name(dev->wiphy), data[0]);
-               return -EINVAL;
-       }
-
-       if (2 + data[1] * sizeof(struct pda_channel_output_limit) > len)
-               return -EINVAL;
-
-       priv->output_limit = kmalloc(data[1] *
-               sizeof(struct pda_channel_output_limit) +
-               sizeof(*priv->output_limit), GFP_KERNEL);
-
-       if (!priv->output_limit)
-               return -ENOMEM;
-
-       priv->output_limit->offset = 0;
-       priv->output_limit->entries = data[1];
-       priv->output_limit->entry_size =
-               sizeof(struct pda_channel_output_limit);
-       priv->output_limit->len = priv->output_limit->entry_size *
-                                 priv->output_limit->entries +
-                                 priv->output_limit->offset;
-
-       memcpy(priv->output_limit->data, &data[2],
-              data[1] * sizeof(struct pda_channel_output_limit));
-
-       return 0;
-}
-
-static struct p54_cal_database *p54_convert_db(struct pda_custom_wrapper *src,
-                                              size_t total_len)
-{
-       struct p54_cal_database *dst;
-       size_t payload_len, entries, entry_size, offset;
-
-       payload_len = le16_to_cpu(src->len);
-       entries = le16_to_cpu(src->entries);
-       entry_size = le16_to_cpu(src->entry_size);
-       offset = le16_to_cpu(src->offset);
-       if (((entries * entry_size + offset) != payload_len) ||
-            (payload_len + sizeof(*src) != total_len))
-               return NULL;
-
-       dst = kmalloc(sizeof(*dst) + payload_len, GFP_KERNEL);
-       if (!dst)
-               return NULL;
-
-       dst->entries = entries;
-       dst->entry_size = entry_size;
-       dst->offset = offset;
-       dst->len = payload_len;
-
-       memcpy(dst->data, src->data, payload_len);
-       return dst;
-}
-
-int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
-{
-       struct p54_common *priv = dev->priv;
-       struct eeprom_pda_wrap *wrap = NULL;
-       struct pda_entry *entry;
-       unsigned int data_len, entry_len;
-       void *tmp;
-       int err;
-       u8 *end = (u8 *)eeprom + len;
-       u16 synth = 0;
-
-       wrap = (struct eeprom_pda_wrap *) eeprom;
-       entry = (void *)wrap->data + le16_to_cpu(wrap->len);
-
-       /* verify that at least the entry length/code fits */
-       while ((u8 *)entry <= end - sizeof(*entry)) {
-               entry_len = le16_to_cpu(entry->len);
-               data_len = ((entry_len - 1) << 1);
-
-               /* abort if entry exceeds whole structure */
-               if ((u8 *)entry + sizeof(*entry) + data_len > end)
-                       break;
-
-               switch (le16_to_cpu(entry->code)) {
-               case PDR_MAC_ADDRESS:
-                       if (data_len != ETH_ALEN)
-                               break;
-                       SET_IEEE80211_PERM_ADDR(dev, entry->data);
-                       break;
-               case PDR_PRISM_PA_CAL_OUTPUT_POWER_LIMITS:
-                       if (priv->output_limit)
-                               break;
-                       err = p54_convert_output_limits(dev, entry->data,
-                                                       data_len);
-                       if (err)
-                               goto err;
-                       break;
-               case PDR_PRISM_PA_CAL_CURVE_DATA: {
-                       struct pda_pa_curve_data *curve_data =
-                               (struct pda_pa_curve_data *)entry->data;
-                       if (data_len < sizeof(*curve_data)) {
-                               err = -EINVAL;
-                               goto err;
-                       }
-
-                       switch (curve_data->cal_method_rev) {
-                       case 0:
-                               err = p54_convert_rev0(dev, curve_data);
-                               break;
-                       case 1:
-                               err = p54_convert_rev1(dev, curve_data);
-                               break;
-                       default:
-                               printk(KERN_ERR "%s: unknown curve data "
-                                               "revision %d\n",
-                                               wiphy_name(dev->wiphy),
-                                               curve_data->cal_method_rev);
-                               err = -ENODEV;
-                               break;
-                       }
-                       if (err)
-                               goto err;
-                       }
-                       break;
-               case PDR_PRISM_ZIF_TX_IQ_CALIBRATION:
-                       priv->iq_autocal = kmalloc(data_len, GFP_KERNEL);
-                       if (!priv->iq_autocal) {
-                               err = -ENOMEM;
-                               goto err;
-                       }
-
-                       memcpy(priv->iq_autocal, entry->data, data_len);
-                       priv->iq_autocal_len = data_len / sizeof(struct pda_iq_autocal_entry);
-                       break;
-               case PDR_DEFAULT_COUNTRY:
-                       p54_parse_default_country(dev, entry->data, data_len);
-                       break;
-               case PDR_INTERFACE_LIST:
-                       tmp = entry->data;
-                       while ((u8 *)tmp < entry->data + data_len) {
-                               struct bootrec_exp_if *exp_if = tmp;
-                               if (le16_to_cpu(exp_if->if_id) == 0xf)
-                                       synth = le16_to_cpu(exp_if->variant);
-                               tmp += sizeof(struct bootrec_exp_if);
-                       }
-                       break;
-               case PDR_HARDWARE_PLATFORM_COMPONENT_ID:
-                       if (data_len < 2)
-                               break;
-                       priv->version = *(u8 *)(entry->data + 1);
-                       break;
-               case PDR_RSSI_LINEAR_APPROXIMATION:
-               case PDR_RSSI_LINEAR_APPROXIMATION_DUAL_BAND:
-               case PDR_RSSI_LINEAR_APPROXIMATION_EXTENDED:
-                       p54_parse_rssical(dev, entry->data, data_len,
-                                         le16_to_cpu(entry->code));
-                       break;
-               case PDR_RSSI_LINEAR_APPROXIMATION_CUSTOM: {
-                       __le16 *src = (void *) entry->data;
-                       s16 *dst = (void *) &priv->rssical_db;
-                       int i;
-
-                       if (data_len != sizeof(priv->rssical_db)) {
-                               err = -EINVAL;
-                               goto err;
-                       }
-                       for (i = 0; i < sizeof(priv->rssical_db) /
-                                       sizeof(*src); i++)
-                               *(dst++) = (s16) le16_to_cpu(*(src++));
-                       }
-                       break;
-               case PDR_PRISM_PA_CAL_OUTPUT_POWER_LIMITS_CUSTOM: {
-                       struct pda_custom_wrapper *pda = (void *) entry->data;
-                       if (priv->output_limit || data_len < sizeof(*pda))
-                               break;
-                       priv->output_limit = p54_convert_db(pda, data_len);
-                       }
-                       break;
-               case PDR_PRISM_PA_CAL_CURVE_DATA_CUSTOM: {
-                       struct pda_custom_wrapper *pda = (void *) entry->data;
-                       if (priv->curve_data || data_len < sizeof(*pda))
-                               break;
-                       priv->curve_data = p54_convert_db(pda, data_len);
-                       }
-                       break;
-               case PDR_END:
-                       /* make it overrun */
-                       entry_len = len;
-                       break;
-               case PDR_MANUFACTURING_PART_NUMBER:
-               case PDR_PDA_VERSION:
-               case PDR_NIC_SERIAL_NUMBER:
-               case PDR_REGULATORY_DOMAIN_LIST:
-               case PDR_TEMPERATURE_TYPE:
-               case PDR_PRISM_PCI_IDENTIFIER:
-               case PDR_COUNTRY_INFORMATION:
-               case PDR_OEM_NAME:
-               case PDR_PRODUCT_NAME:
-               case PDR_UTF8_OEM_NAME:
-               case PDR_UTF8_PRODUCT_NAME:
-               case PDR_COUNTRY_LIST:
-               case PDR_ANTENNA_GAIN:
-               case PDR_PRISM_INDIGO_PA_CALIBRATION_DATA:
-               case PDR_REGULATORY_POWER_LIMITS:
-               case PDR_RADIATED_TRANSMISSION_CORRECTION:
-               case PDR_PRISM_TX_IQ_CALIBRATION:
-               case PDR_BASEBAND_REGISTERS:
-               case PDR_PER_CHANNEL_BASEBAND_REGISTERS:
-                       break;
-               default:
-                       printk(KERN_INFO "%s: unknown eeprom code : 0x%x\n",
-                               wiphy_name(dev->wiphy),
-                               le16_to_cpu(entry->code));
-                       break;
-               }
-
-               entry = (void *)entry + (entry_len + 1)*2;
-       }
-
-       if (!synth || !priv->iq_autocal || !priv->output_limit ||
-           !priv->curve_data) {
-               printk(KERN_ERR "%s: not all required entries found in eeprom!\n",
-                       wiphy_name(dev->wiphy));
-               err = -EINVAL;
-               goto err;
-       }
-
-       priv->rxhw = synth & PDR_SYNTH_FRONTEND_MASK;
-       if (priv->rxhw == PDR_SYNTH_FRONTEND_XBOW)
-               p54_init_xbow_synth(dev);
-       if (!(synth & PDR_SYNTH_24_GHZ_DISABLED))
-               dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &band_2GHz;
-       if (!(synth & PDR_SYNTH_5_GHZ_DISABLED))
-               dev->wiphy->bands[IEEE80211_BAND_5GHZ] = &band_5GHz;
-       if ((synth & PDR_SYNTH_RX_DIV_MASK) == PDR_SYNTH_RX_DIV_SUPPORTED)
-               priv->rx_diversity_mask = 3;
-       if ((synth & PDR_SYNTH_TX_DIV_MASK) == PDR_SYNTH_TX_DIV_SUPPORTED)
-               priv->tx_diversity_mask = 3;
-
-       if (!is_valid_ether_addr(dev->wiphy->perm_addr)) {
-               u8 perm_addr[ETH_ALEN];
-
-               printk(KERN_WARNING "%s: Invalid hwaddr! Using randomly generated MAC addr\n",
-                       wiphy_name(dev->wiphy));
-               random_ether_addr(perm_addr);
-               SET_IEEE80211_PERM_ADDR(dev, perm_addr);
-       }
-
-       printk(KERN_INFO "%s: hwaddr %pM, MAC:isl38%02x RF:%s\n",
-               wiphy_name(dev->wiphy),
-               dev->wiphy->perm_addr,
-               priv->version, p54_rf_chips[priv->rxhw]);
-
-       return 0;
-
-  err:
-       if (priv->iq_autocal) {
-               kfree(priv->iq_autocal);
-               priv->iq_autocal = NULL;
-       }
-
-       if (priv->output_limit) {
-               kfree(priv->output_limit);
-               priv->output_limit = NULL;
-       }
-
-       if (priv->curve_data) {
-               kfree(priv->curve_data);
-               priv->curve_data = NULL;
-       }
-
-       printk(KERN_ERR "%s: eeprom parse failed!\n",
-               wiphy_name(dev->wiphy));
-       return err;
-}
-EXPORT_SYMBOL_GPL(p54_parse_eeprom);
-
-static int p54_rssi_to_dbm(struct ieee80211_hw *dev, int rssi)
-{
-       struct p54_common *priv = dev->priv;
-       int band = dev->conf.channel->band;
-
-       if (priv->rxhw != PDR_SYNTH_FRONTEND_LONGBOW)
-               return ((rssi * priv->rssical_db[band].mul) / 64 +
-                        priv->rssical_db[band].add) / 4;
-       else
-               /*
-                * TODO: find the correct formula
-                */
-               return ((rssi * priv->rssical_db[band].mul) / 64 +
-                        priv->rssical_db[band].add) / 4;
-}
-
-static int p54_rx_data(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_rx_data *hdr = (struct p54_rx_data *) skb->data;
-       struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
-       u16 freq = le16_to_cpu(hdr->freq);
-       size_t header_len = sizeof(*hdr);
-       u32 tsf32;
-       u8 rate = hdr->rate & 0xf;
-
-       /*
-        * If the device is in a unspecified state we have to
-        * ignore all data frames. Else we could end up with a
-        * nasty crash.
-        */
-       if (unlikely(priv->mode == NL80211_IFTYPE_UNSPECIFIED))
-               return 0;
-
-       if (!(hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_IN_FCS_GOOD))) {
-               return 0;
-       }
-
-       if (hdr->decrypt_status == P54_DECRYPT_OK)
-               rx_status->flag |= RX_FLAG_DECRYPTED;
-       if ((hdr->decrypt_status == P54_DECRYPT_FAIL_MICHAEL) ||
-           (hdr->decrypt_status == P54_DECRYPT_FAIL_TKIP))
-               rx_status->flag |= RX_FLAG_MMIC_ERROR;
-
-       rx_status->signal = p54_rssi_to_dbm(dev, hdr->rssi);
-       rx_status->noise = priv->noise;
-       if (hdr->rate & 0x10)
-               rx_status->flag |= RX_FLAG_SHORTPRE;
-       if (dev->conf.channel->band == IEEE80211_BAND_5GHZ)
-               rx_status->rate_idx = (rate < 4) ? 0 : rate - 4;
-       else
-               rx_status->rate_idx = rate;
-
-       rx_status->freq = freq;
-       rx_status->band =  dev->conf.channel->band;
-       rx_status->antenna = hdr->antenna;
-
-       tsf32 = le32_to_cpu(hdr->tsf32);
-       if (tsf32 < priv->tsf_low32)
-               priv->tsf_high32++;
-       rx_status->mactime = ((u64)priv->tsf_high32) << 32 | tsf32;
-       priv->tsf_low32 = tsf32;
-
-       rx_status->flag |= RX_FLAG_TSFT;
-
-       if (hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))
-               header_len += hdr->align[0];
-
-       skb_pull(skb, header_len);
-       skb_trim(skb, le16_to_cpu(hdr->len));
-       ieee80211_rx_irqsafe(dev, skb);
-
-       queue_delayed_work(dev->workqueue, &priv->work,
-                          msecs_to_jiffies(P54_STATISTICS_UPDATE));
-
-       return -1;
-}
-
-static void inline p54_wake_free_queues(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       int i;
-
-       if (priv->mode == NL80211_IFTYPE_UNSPECIFIED)
-               return ;
-
-       for (i = 0; i < dev->queues; i++)
-               if (priv->tx_stats[i + P54_QUEUE_DATA].len <
-                   priv->tx_stats[i + P54_QUEUE_DATA].limit)
-                       ieee80211_wake_queue(dev, i);
-}
-
-void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       struct p54_common *priv = dev->priv;
-       struct ieee80211_tx_info *info;
-       struct p54_tx_info *range;
-       unsigned long flags;
-
-       if (unlikely(!skb || !dev || !skb_queue_len(&priv->tx_queue)))
-               return;
-
-       /*
-        * don't try to free an already unlinked skb
-        */
-       if (unlikely((!skb->next) || (!skb->prev)))
-               return;
-
-       spin_lock_irqsave(&priv->tx_queue.lock, flags);
-       info = IEEE80211_SKB_CB(skb);
-       range = (void *)info->rate_driver_data;
-       if (skb->prev != (struct sk_buff *)&priv->tx_queue) {
-               struct ieee80211_tx_info *ni;
-               struct p54_tx_info *mr;
-
-               ni = IEEE80211_SKB_CB(skb->prev);
-               mr = (struct p54_tx_info *)ni->rate_driver_data;
-       }
-       if (skb->next != (struct sk_buff *)&priv->tx_queue) {
-               struct ieee80211_tx_info *ni;
-               struct p54_tx_info *mr;
-
-               ni = IEEE80211_SKB_CB(skb->next);
-               mr = (struct p54_tx_info *)ni->rate_driver_data;
-       }
-       __skb_unlink(skb, &priv->tx_queue);
-       spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-       dev_kfree_skb_any(skb);
-       p54_wake_free_queues(dev);
-}
-EXPORT_SYMBOL_GPL(p54_free_skb);
-
-static struct sk_buff *p54_find_tx_entry(struct ieee80211_hw *dev,
-                                          __le32 req_id)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *entry;
-       unsigned long flags;
-
-       spin_lock_irqsave(&priv->tx_queue.lock, flags);
-       entry = priv->tx_queue.next;
-       while (entry != (struct sk_buff *)&priv->tx_queue) {
-               struct p54_hdr *hdr = (struct p54_hdr *) entry->data;
-
-               if (hdr->req_id == req_id) {
-                       spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-                       return entry;
-               }
-               entry = entry->next;
-       }
-       spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-       return NULL;
-}
-
-static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_hdr *hdr = (struct p54_hdr *) skb->data;
-       struct p54_frame_sent *payload = (struct p54_frame_sent *) hdr->data;
-       struct sk_buff *entry;
-       u32 addr = le32_to_cpu(hdr->req_id) - priv->headroom;
-       struct p54_tx_info *range = NULL;
-       unsigned long flags;
-       int count, idx;
-
-       spin_lock_irqsave(&priv->tx_queue.lock, flags);
-       entry = (struct sk_buff *) priv->tx_queue.next;
-       while (entry != (struct sk_buff *)&priv->tx_queue) {
-               struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry);
-               struct p54_hdr *entry_hdr;
-               struct p54_tx_data *entry_data;
-               unsigned int pad = 0, frame_len;
-
-               range = (void *)info->rate_driver_data;
-               if (range->start_addr != addr) {
-                       entry = entry->next;
-                       continue;
-               }
-
-               if (entry->next != (struct sk_buff *)&priv->tx_queue) {
-                       struct ieee80211_tx_info *ni;
-                       struct p54_tx_info *mr;
-
-                       ni = IEEE80211_SKB_CB(entry->next);
-                       mr = (struct p54_tx_info *)ni->rate_driver_data;
-               }
-
-               __skb_unlink(entry, &priv->tx_queue);
-
-               frame_len = entry->len;
-               entry_hdr = (struct p54_hdr *) entry->data;
-               entry_data = (struct p54_tx_data *) entry_hdr->data;
-               if (priv->tx_stats[entry_data->hw_queue].len)
-                       priv->tx_stats[entry_data->hw_queue].len--;
-               priv->stats.dot11ACKFailureCount += payload->tries - 1;
-               spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-
-               /*
-                * Frames in P54_QUEUE_FWSCAN and P54_QUEUE_BEACON are
-                * generated by the driver. Therefore tx_status is bogus
-                * and we don't want to confuse the mac80211 stack.
-                */
-               if (unlikely(entry_data->hw_queue < P54_QUEUE_FWSCAN)) {
-                       if (entry_data->hw_queue == P54_QUEUE_BEACON)
-                               priv->cached_beacon = NULL;
-
-                       kfree_skb(entry);
-                       goto out;
-               }
-
-               /*
-                * Clear manually, ieee80211_tx_info_clear_status would
-                * clear the counts too and we need them.
-                */
-               memset(&info->status.ampdu_ack_len, 0,
-                      sizeof(struct ieee80211_tx_info) -
-                      offsetof(struct ieee80211_tx_info, status.ampdu_ack_len));
-               BUILD_BUG_ON(offsetof(struct ieee80211_tx_info,
-                                     status.ampdu_ack_len) != 23);
-
-               if (entry_hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))
-                       pad = entry_data->align[0];
-
-               /* walk through the rates array and adjust the counts */
-               count = payload->tries;
-               for (idx = 0; idx < 4; idx++) {
-                       if (count >= info->status.rates[idx].count) {
-                               count -= info->status.rates[idx].count;
-                       } else if (count > 0) {
-                               info->status.rates[idx].count = count;
-                               count = 0;
-                       } else {
-                               info->status.rates[idx].idx = -1;
-                               info->status.rates[idx].count = 0;
-                       }
-               }
-
-               if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
-                    (!payload->status))
-                       info->flags |= IEEE80211_TX_STAT_ACK;
-               if (payload->status & P54_TX_PSM_CANCELLED)
-                       info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
-               info->status.ack_signal = p54_rssi_to_dbm(dev,
-                               (int)payload->ack_rssi);
-
-               /* Undo all changes to the frame. */
-               switch (entry_data->key_type) {
-               case P54_CRYPTO_TKIPMICHAEL: {
-                       u8 *iv = (u8 *)(entry_data->align + pad +
-                                       entry_data->crypt_offset);
-
-                       /* Restore the original TKIP IV. */
-                       iv[2] = iv[0];
-                       iv[0] = iv[1];
-                       iv[1] = (iv[0] | 0x20) & 0x7f;  /* WEPSeed - 8.3.2.2 */
-
-                       frame_len -= 12; /* remove TKIP_MMIC + TKIP_ICV */
-                       break;
-                       }
-               case P54_CRYPTO_AESCCMP:
-                       frame_len -= 8; /* remove CCMP_MIC */
-                       break;
-               case P54_CRYPTO_WEP:
-                       frame_len -= 4; /* remove WEP_ICV */
-                       break;
-               }
-               skb_trim(entry, frame_len);
-               skb_pull(entry, sizeof(*hdr) + pad + sizeof(*entry_data));
-               ieee80211_tx_status_irqsafe(dev, entry);
-               goto out;
-       }
-       spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-
-out:
-       p54_wake_free_queues(dev);
-}
-
-static void p54_rx_eeprom_readback(struct ieee80211_hw *dev,
-                                  struct sk_buff *skb)
-{
-       struct p54_hdr *hdr = (struct p54_hdr *) skb->data;
-       struct p54_eeprom_lm86 *eeprom = (struct p54_eeprom_lm86 *) hdr->data;
-       struct p54_common *priv = dev->priv;
-
-       if (!priv->eeprom)
-               return ;
-
-       if (priv->fw_var >= 0x509) {
-               memcpy(priv->eeprom, eeprom->v2.data,
-                      le16_to_cpu(eeprom->v2.len));
-       } else {
-               memcpy(priv->eeprom, eeprom->v1.data,
-                      le16_to_cpu(eeprom->v1.len));
-       }
-
-       complete(&priv->eeprom_comp);
-}
-
-static void p54_rx_stats(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_hdr *hdr = (struct p54_hdr *) skb->data;
-       struct p54_statistics *stats = (struct p54_statistics *) hdr->data;
-       u32 tsf32;
-
-       if (unlikely(priv->mode == NL80211_IFTYPE_UNSPECIFIED))
-               return ;
-
-       tsf32 = le32_to_cpu(stats->tsf32);
-       if (tsf32 < priv->tsf_low32)
-               priv->tsf_high32++;
-       priv->tsf_low32 = tsf32;
-
-       priv->stats.dot11RTSFailureCount = le32_to_cpu(stats->rts_fail);
-       priv->stats.dot11RTSSuccessCount = le32_to_cpu(stats->rts_success);
-       priv->stats.dot11FCSErrorCount = le32_to_cpu(stats->rx_bad_fcs);
-
-       priv->noise = p54_rssi_to_dbm(dev, le32_to_cpu(stats->noise));
-
-       p54_free_skb(dev, p54_find_tx_entry(dev, hdr->req_id));
-}
-
-static void p54_rx_trap(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_hdr *hdr = (struct p54_hdr *) skb->data;
-       struct p54_trap *trap = (struct p54_trap *) hdr->data;
-       u16 event = le16_to_cpu(trap->event);
-       u16 freq = le16_to_cpu(trap->frequency);
-
-       switch (event) {
-       case P54_TRAP_BEACON_TX:
-               break;
-       case P54_TRAP_RADAR:
-               printk(KERN_INFO "%s: radar (freq:%d MHz)\n",
-                       wiphy_name(dev->wiphy), freq);
-               break;
-       case P54_TRAP_NO_BEACON:
-               if (priv->vif)
-                       ieee80211_beacon_loss(priv->vif);
-               break;
-       case P54_TRAP_SCAN:
-               break;
-       case P54_TRAP_TBTT:
-               break;
-       case P54_TRAP_TIMER:
-               break;
-       default:
-               printk(KERN_INFO "%s: received event:%x freq:%d\n",
-                      wiphy_name(dev->wiphy), event, freq);
-               break;
-       }
-}
-
-static int p54_rx_control(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       struct p54_hdr *hdr = (struct p54_hdr *) skb->data;
-
-       switch (le16_to_cpu(hdr->type)) {
-       case P54_CONTROL_TYPE_TXDONE:
-               p54_rx_frame_sent(dev, skb);
-               break;
-       case P54_CONTROL_TYPE_TRAP:
-               p54_rx_trap(dev, skb);
-               break;
-       case P54_CONTROL_TYPE_BBP:
-               break;
-       case P54_CONTROL_TYPE_STAT_READBACK:
-               p54_rx_stats(dev, skb);
-               break;
-       case P54_CONTROL_TYPE_EEPROM_READBACK:
-               p54_rx_eeprom_readback(dev, skb);
-               break;
-       default:
-               printk(KERN_DEBUG "%s: not handling 0x%02x type control frame\n",
-                      wiphy_name(dev->wiphy), le16_to_cpu(hdr->type));
-               break;
-       }
-
-       return 0;
-}
-
-/* returns zero if skb can be reused */
-int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       u16 type = le16_to_cpu(*((__le16 *)skb->data));
-
-       if (type & P54_HDR_FLAG_CONTROL)
-               return p54_rx_control(dev, skb);
-       else
-               return p54_rx_data(dev, skb);
-}
-EXPORT_SYMBOL_GPL(p54_rx);
-
-/*
- * So, the firmware is somewhat stupid and doesn't know what places in its
- * memory incoming data should go to. By poking around in the firmware, we
- * can find some unused memory to upload our packets to. However, data that we
- * want the card to TX needs to stay intact until the card has told us that
- * it is done with it. This function finds empty places we can upload to and
- * marks allocated areas as reserved if necessary. p54_rx_frame_sent or
- * p54_free_skb frees allocated areas.
- */
-static int p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb,
-                              struct p54_hdr *data, u32 len)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *entry;
-       struct sk_buff *target_skb = NULL;
-       struct ieee80211_tx_info *info;
-       struct p54_tx_info *range;
-       u32 last_addr = priv->rx_start;
-       u32 largest_hole = 0;
-       u32 target_addr = priv->rx_start;
-       unsigned long flags;
-       unsigned int left;
-       len = (len + priv->headroom + priv->tailroom + 3) & ~0x3;
-
-       if (!skb)
-               return -EINVAL;
-
-       spin_lock_irqsave(&priv->tx_queue.lock, flags);
-
-       left = skb_queue_len(&priv->tx_queue);
-       if (unlikely(left >= 28)) {
-               /*
-                * The tx_queue is nearly full!
-                * We have throttle normal data traffic, because we must
-                * have a few spare slots for control frames left.
-                */
-               ieee80211_stop_queues(dev);
-               queue_delayed_work(dev->workqueue, &priv->work,
-                                  msecs_to_jiffies(P54_TX_TIMEOUT));
-
-               if (unlikely(left == 32)) {
-                       /*
-                        * The tx_queue is now really full.
-                        *
-                        * TODO: check if the device has crashed and reset it.
-                        */
-                       spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-                       return -ENOSPC;
-               }
-       }
-
-       entry = priv->tx_queue.next;
-       while (left--) {
-               u32 hole_size;
-               info = IEEE80211_SKB_CB(entry);
-               range = (void *)info->rate_driver_data;
-               hole_size = range->start_addr - last_addr;
-               if (!target_skb && hole_size >= len) {
-                       target_skb = entry->prev;
-                       hole_size -= len;
-                       target_addr = last_addr;
-               }
-               largest_hole = max(largest_hole, hole_size);
-               last_addr = range->end_addr;
-               entry = entry->next;
-       }
-       if (!target_skb && priv->rx_end - last_addr >= len) {
-               target_skb = priv->tx_queue.prev;
-               largest_hole = max(largest_hole, priv->rx_end - last_addr - len);
-               if (!skb_queue_empty(&priv->tx_queue)) {
-                       info = IEEE80211_SKB_CB(target_skb);
-                       range = (void *)info->rate_driver_data;
-                       target_addr = range->end_addr;
-               }
-       } else
-               largest_hole = max(largest_hole, priv->rx_end - last_addr);
-
-       if (!target_skb) {
-               spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-               ieee80211_stop_queues(dev);
-               return -ENOSPC;
-       }
-
-       info = IEEE80211_SKB_CB(skb);
-       range = (void *)info->rate_driver_data;
-       range->start_addr = target_addr;
-       range->end_addr = target_addr + len;
-       __skb_queue_after(&priv->tx_queue, target_skb, skb);
-       spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-
-       if (largest_hole < priv->headroom + sizeof(struct p54_hdr) +
-                          48 + IEEE80211_MAX_RTS_THRESHOLD + priv->tailroom)
-               ieee80211_stop_queues(dev);
-
-       data->req_id = cpu_to_le32(target_addr + priv->headroom);
-       return 0;
-}
-
-static struct sk_buff *p54_alloc_skb(struct ieee80211_hw *dev, u16 hdr_flags,
-                                    u16 payload_len, u16 type, gfp_t memflags)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_hdr *hdr;
-       struct sk_buff *skb;
-       size_t frame_len = sizeof(*hdr) + payload_len;
-
-       if (frame_len > P54_MAX_CTRL_FRAME_LEN)
-               return NULL;
-
-       skb = __dev_alloc_skb(priv->tx_hdr_len + frame_len, memflags);
-       if (!skb)
-               return NULL;
-       skb_reserve(skb, priv->tx_hdr_len);
-
-       hdr = (struct p54_hdr *) skb_put(skb, sizeof(*hdr));
-       hdr->flags = cpu_to_le16(hdr_flags);
-       hdr->len = cpu_to_le16(payload_len);
-       hdr->type = cpu_to_le16(type);
-       hdr->tries = hdr->rts_tries = 0;
-
-       if (p54_assign_address(dev, skb, hdr, frame_len)) {
-               kfree_skb(skb);
-               return NULL;
-       }
-       return skb;
-}
-
-int p54_read_eeprom(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_eeprom_lm86 *eeprom_hdr;
-       struct sk_buff *skb;
-       size_t eeprom_size = 0x2020, offset = 0, blocksize, maxblocksize;
-       int ret = -ENOMEM;
-       void *eeprom = NULL;
-
-       maxblocksize = EEPROM_READBACK_LEN;
-       if (priv->fw_var >= 0x509)
-               maxblocksize -= 0xc;
-       else
-               maxblocksize -= 0x4;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL, sizeof(*eeprom_hdr) +
-                           maxblocksize, P54_CONTROL_TYPE_EEPROM_READBACK,
-                           GFP_KERNEL);
-       if (!skb)
-               goto free;
-       priv->eeprom = kzalloc(EEPROM_READBACK_LEN, GFP_KERNEL);
-       if (!priv->eeprom)
-               goto free;
-       eeprom = kzalloc(eeprom_size, GFP_KERNEL);
-       if (!eeprom)
-               goto free;
-
-       eeprom_hdr = (struct p54_eeprom_lm86 *) skb_put(skb,
-                    sizeof(*eeprom_hdr) + maxblocksize);
-
-       while (eeprom_size) {
-               blocksize = min(eeprom_size, maxblocksize);
-               if (priv->fw_var < 0x509) {
-                       eeprom_hdr->v1.offset = cpu_to_le16(offset);
-                       eeprom_hdr->v1.len = cpu_to_le16(blocksize);
-               } else {
-                       eeprom_hdr->v2.offset = cpu_to_le32(offset);
-                       eeprom_hdr->v2.len = cpu_to_le16(blocksize);
-                       eeprom_hdr->v2.magic2 = 0xf;
-                       memcpy(eeprom_hdr->v2.magic, (const char *)"LOCK", 4);
-               }
-               priv->tx(dev, skb);
-
-               if (!wait_for_completion_interruptible_timeout(&priv->eeprom_comp, HZ)) {
-                       printk(KERN_ERR "%s: device does not respond!\n",
-                               wiphy_name(dev->wiphy));
-                       ret = -EBUSY;
-                       goto free;
-               }
-
-               memcpy(eeprom + offset, priv->eeprom, blocksize);
-               offset += blocksize;
-               eeprom_size -= blocksize;
-       }
-
-       ret = p54_parse_eeprom(dev, eeprom, offset);
-free:
-       kfree(priv->eeprom);
-       priv->eeprom = NULL;
-       p54_free_skb(dev, skb);
-       kfree(eeprom);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(p54_read_eeprom);
-
-static int p54_set_tim(struct ieee80211_hw *dev, struct ieee80211_sta *sta,
-               bool set)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_tim *tim;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*tim),
-                           P54_CONTROL_TYPE_TIM, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       tim = (struct p54_tim *) skb_put(skb, sizeof(*tim));
-       tim->count = 1;
-       tim->entry[0] = cpu_to_le16(set ? (sta->aid | 0x8000) : sta->aid);
-       priv->tx(dev, skb);
-       return 0;
-}
-
-static int p54_sta_unlock(struct ieee80211_hw *dev, u8 *addr)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_sta_unlock *sta;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*sta),
-                           P54_CONTROL_TYPE_PSM_STA_UNLOCK, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       sta = (struct p54_sta_unlock *)skb_put(skb, sizeof(*sta));
-       memcpy(sta->addr, addr, ETH_ALEN);
-       priv->tx(dev, skb);
-       return 0;
-}
-
-static void p54_sta_notify(struct ieee80211_hw *dev, struct ieee80211_vif *vif,
-                             enum sta_notify_cmd notify_cmd,
-                             struct ieee80211_sta *sta)
-{
-       switch (notify_cmd) {
-       case STA_NOTIFY_ADD:
-       case STA_NOTIFY_REMOVE:
-               /*
-                * Notify the firmware that we don't want or we don't
-                * need to buffer frames for this station anymore.
-                */
-
-               p54_sta_unlock(dev, sta->addr);
-               break;
-       case STA_NOTIFY_AWAKE:
-               /* update the firmware's filter table */
-               p54_sta_unlock(dev, sta->addr);
-               break;
-       default:
-               break;
-       }
-}
-
-static int p54_tx_cancel(struct ieee80211_hw *dev, struct sk_buff *entry)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_hdr *hdr;
-       struct p54_txcancel *cancel;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*cancel),
-                           P54_CONTROL_TYPE_TXCANCEL, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       hdr = (void *)entry->data;
-       cancel = (struct p54_txcancel *)skb_put(skb, sizeof(*cancel));
-       cancel->req_id = hdr->req_id;
-       priv->tx(dev, skb);
-       return 0;
-}
-
-static int p54_tx_fill(struct ieee80211_hw *dev, struct sk_buff *skb,
-               struct ieee80211_tx_info *info, u8 *queue, size_t *extra_len,
-               u16 *flags, u16 *aid)
-{
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-       struct p54_common *priv = dev->priv;
-       int ret = 1;
-
-       switch (priv->mode) {
-       case NL80211_IFTYPE_MONITOR:
-               /*
-                * We have to set P54_HDR_FLAG_DATA_OUT_PROMISC for
-                * every frame in promiscuous/monitor mode.
-                * see STSW45x0C LMAC API - page 12.
-                */
-               *aid = 0;
-               *flags = P54_HDR_FLAG_DATA_OUT_PROMISC;
-               *queue += P54_QUEUE_DATA;
-               break;
-       case NL80211_IFTYPE_STATION:
-               *aid = 1;
-               if (unlikely(ieee80211_is_mgmt(hdr->frame_control))) {
-                       *queue = P54_QUEUE_MGMT;
-                       ret = 0;
-               } else
-                       *queue += P54_QUEUE_DATA;
-               break;
-       case NL80211_IFTYPE_AP:
-       case NL80211_IFTYPE_ADHOC:
-       case NL80211_IFTYPE_MESH_POINT:
-               if (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) {
-                       *aid = 0;
-                       *queue = P54_QUEUE_CAB;
-                       return 0;
-               }
-
-               if (unlikely(ieee80211_is_mgmt(hdr->frame_control))) {
-                       if (ieee80211_is_probe_resp(hdr->frame_control)) {
-                               *aid = 0;
-                               *queue = P54_QUEUE_MGMT;
-                               *flags = P54_HDR_FLAG_DATA_OUT_TIMESTAMP |
-                                        P54_HDR_FLAG_DATA_OUT_NOCANCEL;
-                               return 0;
-                       } else if (ieee80211_is_beacon(hdr->frame_control)) {
-                               *aid = 0;
-
-                               if (info->flags & IEEE80211_TX_CTL_INJECTED) {
-                                       /*
-                                        * Injecting beacons on top of a AP is
-                                        * not a good idea... nevertheless,
-                                        * it should be doable.
-                                        */
-
-                                       *queue += P54_QUEUE_DATA;
-                                       return 1;
-                               }
-
-                               *flags = P54_HDR_FLAG_DATA_OUT_TIMESTAMP;
-                               *queue = P54_QUEUE_BEACON;
-                               *extra_len = IEEE80211_MAX_TIM_LEN;
-                               return 0;
-                       } else {
-                               *queue = P54_QUEUE_MGMT;
-                               ret = 0;
-                       }
-               } else
-                       *queue += P54_QUEUE_DATA;
-
-               if (info->control.sta)
-                       *aid = info->control.sta->aid;
-
-               if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
-                       *flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL;
-               break;
-       }
-       return ret;
-}
-
-static u8 p54_convert_algo(enum ieee80211_key_alg alg)
-{
-       switch (alg) {
-       case ALG_WEP:
-               return P54_CRYPTO_WEP;
-       case ALG_TKIP:
-               return P54_CRYPTO_TKIPMICHAEL;
-       case ALG_CCMP:
-               return P54_CRYPTO_AESCCMP;
-       default:
-               return 0;
-       }
-}
-
-static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
-{
-       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-       struct ieee80211_tx_queue_stats *current_queue;
-       struct p54_common *priv = dev->priv;
-       struct p54_hdr *hdr;
-       struct p54_tx_data *txhdr;
-       size_t padding, len, tim_len = 0;
-       int i, j, ridx, ret;
-       u16 hdr_flags = 0, aid = 0;
-       u8 rate, queue, crypt_offset = 0;
-       u8 cts_rate = 0x20;
-       u8 rc_flags;
-       u8 calculated_tries[4];
-       u8 nrates = 0, nremaining = 8;
-
-       queue = skb_get_queue_mapping(skb);
-
-       ret = p54_tx_fill(dev, skb, info, &queue, &tim_len, &hdr_flags, &aid);
-       current_queue = &priv->tx_stats[queue];
-       if (unlikely((current_queue->len > current_queue->limit) && ret))
-               return NETDEV_TX_BUSY;
-       current_queue->len++;
-       current_queue->count++;
-       if ((current_queue->len == current_queue->limit) && ret)
-               ieee80211_stop_queue(dev, skb_get_queue_mapping(skb));
-
-       padding = (unsigned long)(skb->data - (sizeof(*hdr) + sizeof(*txhdr))) & 3;
-       len = skb->len;
-
-       if (info->control.hw_key) {
-               crypt_offset = ieee80211_get_hdrlen_from_skb(skb);
-               if (info->control.hw_key->alg == ALG_TKIP) {
-                       u8 *iv = (u8 *)(skb->data + crypt_offset);
-                       /*
-                        * The firmware excepts that the IV has to have
-                        * this special format
-                        */
-                       iv[1] = iv[0];
-                       iv[0] = iv[2];
-                       iv[2] = 0;
-               }
-       }
-
-       txhdr = (struct p54_tx_data *) skb_push(skb, sizeof(*txhdr) + padding);
-       hdr = (struct p54_hdr *) skb_push(skb, sizeof(*hdr));
-
-       if (padding)
-               hdr_flags |= P54_HDR_FLAG_DATA_ALIGN;
-       hdr->type = cpu_to_le16(aid);
-       hdr->rts_tries = info->control.rates[0].count;
-
-       /*
-        * we register the rates in perfect order, and
-        * RTS/CTS won't happen on 5 GHz
-        */
-       cts_rate = info->control.rts_cts_rate_idx;
-
-       memset(&txhdr->rateset, 0, sizeof(txhdr->rateset));
-
-       /* see how many rates got used */
-       for (i = 0; i < 4; i++) {
-               if (info->control.rates[i].idx < 0)
-                       break;
-               nrates++;
-       }
-
-       /* limit tries to 8/nrates per rate */
-       for (i = 0; i < nrates; i++) {
-               /*
-                * The magic expression here is equivalent to 8/nrates for
-                * all values that matter, but avoids division and jumps.
-                * Note that nrates can only take the values 1 through 4.
-                */
-               calculated_tries[i] = min_t(int, ((15 >> nrates) | 1) + 1,
-                                                info->control.rates[i].count);
-               nremaining -= calculated_tries[i];
-       }
-
-       /* if there are tries left, distribute from back to front */
-       for (i = nrates - 1; nremaining > 0 && i >= 0; i--) {
-               int tmp = info->control.rates[i].count - calculated_tries[i];
-
-               if (tmp <= 0)
-                       continue;
-               /* RC requested more tries at this rate */
-
-               tmp = min_t(int, tmp, nremaining);
-               calculated_tries[i] += tmp;
-               nremaining -= tmp;
-       }
-
-       ridx = 0;
-       for (i = 0; i < nrates && ridx < 8; i++) {
-               /* we register the rates in perfect order */
-               rate = info->control.rates[i].idx;
-               if (info->band == IEEE80211_BAND_5GHZ)
-                       rate += 4;
-
-               /* store the count we actually calculated for TX status */
-               info->control.rates[i].count = calculated_tries[i];
-
-               rc_flags = info->control.rates[i].flags;
-               if (rc_flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) {
-                       rate |= 0x10;
-                       cts_rate |= 0x10;
-               }
-               if (rc_flags & IEEE80211_TX_RC_USE_RTS_CTS)
-                       rate |= 0x40;
-               else if (rc_flags & IEEE80211_TX_RC_USE_CTS_PROTECT)
-                       rate |= 0x20;
-               for (j = 0; j < calculated_tries[i] && ridx < 8; j++) {
-                       txhdr->rateset[ridx] = rate;
-                       ridx++;
-               }
-       }
-
-       if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
-               hdr_flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
-
-       /* TODO: enable bursting */
-       hdr->flags = cpu_to_le16(hdr_flags);
-       hdr->tries = ridx;
-       txhdr->rts_rate_idx = 0;
-       if (info->control.hw_key) {
-               txhdr->key_type = p54_convert_algo(info->control.hw_key->alg);
-               txhdr->key_len = min((u8)16, info->control.hw_key->keylen);
-               memcpy(txhdr->key, info->control.hw_key->key, txhdr->key_len);
-               if (info->control.hw_key->alg == ALG_TKIP) {
-                       if (unlikely(skb_tailroom(skb) < 12))
-                               goto err;
-                       /* reserve space for the MIC key */
-                       len += 8;
-                       memcpy(skb_put(skb, 8), &(info->control.hw_key->key
-                               [NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY]), 8);
-               }
-               /* reserve some space for ICV */
-               len += info->control.hw_key->icv_len;
-               memset(skb_put(skb, info->control.hw_key->icv_len), 0,
-                      info->control.hw_key->icv_len);
-       } else {
-               txhdr->key_type = 0;
-               txhdr->key_len = 0;
-       }
-       txhdr->crypt_offset = crypt_offset;
-       txhdr->hw_queue = queue;
-       txhdr->backlog = current_queue->len;
-       memset(txhdr->durations, 0, sizeof(txhdr->durations));
-       txhdr->tx_antenna = ((info->antenna_sel_tx == 0) ?
-               2 : info->antenna_sel_tx - 1) & priv->tx_diversity_mask;
-       if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW) {
-               txhdr->longbow.cts_rate = cts_rate;
-               txhdr->longbow.output_power = cpu_to_le16(priv->output_power);
-       } else {
-               txhdr->normal.output_power = priv->output_power;
-               txhdr->normal.cts_rate = cts_rate;
-       }
-       if (padding)
-               txhdr->align[0] = padding;
-
-       hdr->len = cpu_to_le16(len);
-       /* modifies skb->cb and with it info, so must be last! */
-       if (unlikely(p54_assign_address(dev, skb, hdr, skb->len + tim_len)))
-               goto err;
-       priv->tx(dev, skb);
-
-       queue_delayed_work(dev->workqueue, &priv->work,
-                          msecs_to_jiffies(P54_TX_FRAME_LIFETIME));
-
-       return NETDEV_TX_OK;
-
- err:
-       skb_pull(skb, sizeof(*hdr) + sizeof(*txhdr) + padding);
-       current_queue->len--;
-       current_queue->count--;
-       return NETDEV_TX_BUSY;
-}
-
-static int p54_setup_mac(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_setup_mac *setup;
-       u16 mode;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*setup),
-                           P54_CONTROL_TYPE_SETUP, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       setup = (struct p54_setup_mac *) skb_put(skb, sizeof(*setup));
-       if (dev->conf.radio_enabled) {
-               switch (priv->mode) {
-               case NL80211_IFTYPE_STATION:
-                       mode = P54_FILTER_TYPE_STATION;
-                       break;
-               case NL80211_IFTYPE_AP:
-                       mode = P54_FILTER_TYPE_AP;
-                       break;
-               case NL80211_IFTYPE_ADHOC:
-               case NL80211_IFTYPE_MESH_POINT:
-                       mode = P54_FILTER_TYPE_IBSS;
-                       break;
-               case NL80211_IFTYPE_MONITOR:
-                       mode = P54_FILTER_TYPE_PROMISCUOUS;
-                       break;
-               default:
-                       mode = P54_FILTER_TYPE_HIBERNATE;
-                       break;
-               }
-
-               /*
-                * "TRANSPARENT and PROMISCUOUS are mutually exclusive"
-                * STSW45X0C LMAC API - page 12
-                */
-               if (((priv->filter_flags & FIF_PROMISC_IN_BSS) ||
-                    (priv->filter_flags & FIF_OTHER_BSS)) &&
-                   (mode != P54_FILTER_TYPE_PROMISCUOUS))
-                       mode |= P54_FILTER_TYPE_TRANSPARENT;
-       } else
-               mode = P54_FILTER_TYPE_HIBERNATE;
-
-       setup->mac_mode = cpu_to_le16(mode);
-       memcpy(setup->mac_addr, priv->mac_addr, ETH_ALEN);
-       memcpy(setup->bssid, priv->bssid, ETH_ALEN);
-       setup->rx_antenna = 2 & priv->rx_diversity_mask; /* automatic */
-       setup->rx_align = 0;
-       if (priv->fw_var < 0x500) {
-               setup->v1.basic_rate_mask = cpu_to_le32(priv->basic_rate_mask);
-               memset(setup->v1.rts_rates, 0, 8);
-               setup->v1.rx_addr = cpu_to_le32(priv->rx_end);
-               setup->v1.max_rx = cpu_to_le16(priv->rx_mtu);
-               setup->v1.rxhw = cpu_to_le16(priv->rxhw);
-               setup->v1.wakeup_timer = cpu_to_le16(priv->wakeup_timer);
-               setup->v1.unalloc0 = cpu_to_le16(0);
-       } else {
-               setup->v2.rx_addr = cpu_to_le32(priv->rx_end);
-               setup->v2.max_rx = cpu_to_le16(priv->rx_mtu);
-               setup->v2.rxhw = cpu_to_le16(priv->rxhw);
-               setup->v2.timer = cpu_to_le16(priv->wakeup_timer);
-               setup->v2.truncate = cpu_to_le16(48896);
-               setup->v2.basic_rate_mask = cpu_to_le32(priv->basic_rate_mask);
-               setup->v2.sbss_offset = 0;
-               setup->v2.mcast_window = 0;
-               setup->v2.rx_rssi_threshold = 0;
-               setup->v2.rx_ed_threshold = 0;
-               setup->v2.ref_clock = cpu_to_le32(644245094);
-               setup->v2.lpf_bandwidth = cpu_to_le16(65535);
-               setup->v2.osc_start_delay = cpu_to_le16(65535);
-       }
-       priv->tx(dev, skb);
-       return 0;
-}
-
-static int p54_scan(struct ieee80211_hw *dev, u16 mode, u16 dwell)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_hdr *hdr;
-       struct p54_scan_head *head;
-       struct p54_iq_autocal_entry *iq_autocal;
-       union p54_scan_body_union *body;
-       struct p54_scan_tail_rate *rate;
-       struct pda_rssi_cal_entry *rssi;
-       unsigned int i;
-       void *entry;
-       int band = dev->conf.channel->band;
-       __le16 freq = cpu_to_le16(dev->conf.channel->center_freq);
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*head) +
-                           2 + sizeof(*iq_autocal) + sizeof(*body) +
-                           sizeof(*rate) + 2 * sizeof(*rssi),
-                           P54_CONTROL_TYPE_SCAN, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       head = (struct p54_scan_head *) skb_put(skb, sizeof(*head));
-       memset(head->scan_params, 0, sizeof(head->scan_params));
-       head->mode = cpu_to_le16(mode);
-       head->dwell = cpu_to_le16(dwell);
-       head->freq = freq;
-
-       if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW) {
-               __le16 *pa_power_points = (__le16 *) skb_put(skb, 2);
-               *pa_power_points = cpu_to_le16(0x0c);
-       }
-
-       iq_autocal = (void *) skb_put(skb, sizeof(*iq_autocal));
-       for (i = 0; i < priv->iq_autocal_len; i++) {
-               if (priv->iq_autocal[i].freq != freq)
-                       continue;
-
-               memcpy(iq_autocal, &priv->iq_autocal[i].params,
-                      sizeof(struct p54_iq_autocal_entry));
-               break;
-       }
-       if (i == priv->iq_autocal_len)
-               goto err;
-
-       if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW)
-               body = (void *) skb_put(skb, sizeof(body->longbow));
-       else
-               body = (void *) skb_put(skb, sizeof(body->normal));
-
-       for (i = 0; i < priv->output_limit->entries; i++) {
-               __le16 *entry_freq = (void *) (priv->output_limit->data +
-                                    priv->output_limit->entry_size * i);
-
-               if (*entry_freq != freq)
-                       continue;
-
-               if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW) {
-                       memcpy(&body->longbow.power_limits,
-                              (void *) entry_freq + sizeof(__le16),
-                              priv->output_limit->entry_size);
-               } else {
-                       struct pda_channel_output_limit *limits =
-                              (void *) entry_freq;
-
-                       body->normal.val_barker = 0x38;
-                       body->normal.val_bpsk = body->normal.dup_bpsk =
-                               limits->val_bpsk;
-                       body->normal.val_qpsk = body->normal.dup_qpsk =
-                               limits->val_qpsk;
-                       body->normal.val_16qam = body->normal.dup_16qam =
-                               limits->val_16qam;
-                       body->normal.val_64qam = body->normal.dup_64qam =
-                               limits->val_64qam;
-               }
-               break;
-       }
-       if (i == priv->output_limit->entries)
-               goto err;
-
-       entry = (void *)(priv->curve_data->data + priv->curve_data->offset);
-       for (i = 0; i < priv->curve_data->entries; i++) {
-               if (*((__le16 *)entry) != freq) {
-                       entry += priv->curve_data->entry_size;
-                       continue;
-               }
-
-               if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW) {
-                       memcpy(&body->longbow.curve_data,
-                               (void *) entry + sizeof(__le16),
-                               priv->curve_data->entry_size);
-               } else {
-                       struct p54_scan_body *chan = &body->normal;
-                       struct pda_pa_curve_data *curve_data =
-                               (void *) priv->curve_data->data;
-
-                       entry += sizeof(__le16);
-                       chan->pa_points_per_curve = 8;
-                       memset(chan->curve_data, 0, sizeof(*chan->curve_data));
-                       memcpy(chan->curve_data, entry,
-                              sizeof(struct p54_pa_curve_data_sample) *
-                              min((u8)8, curve_data->points_per_channel));
-               }
-               break;
-       }
-       if (i == priv->curve_data->entries)
-               goto err;
-
-       if ((priv->fw_var >= 0x500) && (priv->fw_var < 0x509)) {
-               rate = (void *) skb_put(skb, sizeof(*rate));
-               rate->basic_rate_mask = cpu_to_le32(priv->basic_rate_mask);
-               for (i = 0; i < sizeof(rate->rts_rates); i++)
-                       rate->rts_rates[i] = i;
-       }
-
-       rssi = (struct pda_rssi_cal_entry *) skb_put(skb, sizeof(*rssi));
-       rssi->mul = cpu_to_le16(priv->rssical_db[band].mul);
-       rssi->add = cpu_to_le16(priv->rssical_db[band].add);
-       if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW) {
-               /* Longbow frontend needs ever more */
-               rssi = (void *) skb_put(skb, sizeof(*rssi));
-               rssi->mul = cpu_to_le16(priv->rssical_db[band].longbow_unkn);
-               rssi->add = cpu_to_le16(priv->rssical_db[band].longbow_unk2);
-       }
-
-       if (priv->fw_var >= 0x509) {
-               rate = (void *) skb_put(skb, sizeof(*rate));
-               rate->basic_rate_mask = cpu_to_le32(priv->basic_rate_mask);
-               for (i = 0; i < sizeof(rate->rts_rates); i++)
-                       rate->rts_rates[i] = i;
-       }
-
-       hdr = (struct p54_hdr *) skb->data;
-       hdr->len = cpu_to_le16(skb->len - sizeof(*hdr));
-
-       priv->tx(dev, skb);
-       return 0;
-
- err:
-       printk(KERN_ERR "%s: frequency change failed\n", wiphy_name(dev->wiphy));
-       p54_free_skb(dev, skb);
-       return -EINVAL;
-}
-
-static int p54_set_leds(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_led *led;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*led),
-                           P54_CONTROL_TYPE_LED, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       led = (struct p54_led *) skb_put(skb, sizeof(*led));
-       led->flags = cpu_to_le16(0x0003);
-       led->mask[0] = led->mask[1] = cpu_to_le16(priv->softled_state);
-       led->delay[0] = cpu_to_le16(1);
-       led->delay[1] = cpu_to_le16(0);
-       priv->tx(dev, skb);
-       return 0;
-}
-
-#define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, _txop)     \
-do {                                                           \
-       queue.aifs = cpu_to_le16(ai_fs);                        \
-       queue.cwmin = cpu_to_le16(cw_min);                      \
-       queue.cwmax = cpu_to_le16(cw_max);                      \
-       queue.txop = cpu_to_le16(_txop);                        \
-} while(0)
-
-static int p54_set_edcf(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_edcf *edcf;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*edcf),
-                           P54_CONTROL_TYPE_DCFINIT, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       edcf = (struct p54_edcf *)skb_put(skb, sizeof(*edcf));
-       if (priv->use_short_slot) {
-               edcf->slottime = 9;
-               edcf->sifs = 0x10;
-               edcf->eofpad = 0x00;
-       } else {
-               edcf->slottime = 20;
-               edcf->sifs = 0x0a;
-               edcf->eofpad = 0x06;
-       }
-       /* (see prism54/isl_oid.h for further details) */
-       edcf->frameburst = cpu_to_le16(0);
-       edcf->round_trip_delay = cpu_to_le16(0);
-       edcf->flags = 0;
-       memset(edcf->mapping, 0, sizeof(edcf->mapping));
-       memcpy(edcf->queue, priv->qos_params, sizeof(edcf->queue));
-       priv->tx(dev, skb);
-       return 0;
-}
-
-static int p54_set_ps(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_psm *psm;
-       u16 mode;
-       int i;
-
-       if (dev->conf.flags & IEEE80211_CONF_PS)
-               mode = P54_PSM | P54_PSM_BEACON_TIMEOUT | P54_PSM_DTIM |
-                      P54_PSM_CHECKSUM | P54_PSM_MCBC;
-       else
-               mode = P54_PSM_CAM;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*psm),
-                           P54_CONTROL_TYPE_PSM, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
-
-       psm = (struct p54_psm *)skb_put(skb, sizeof(*psm));
-       psm->mode = cpu_to_le16(mode);
-       psm->aid = cpu_to_le16(priv->aid);
-       for (i = 0; i < ARRAY_SIZE(psm->intervals); i++) {
-               psm->intervals[i].interval =
-                       cpu_to_le16(dev->conf.listen_interval);
-               psm->intervals[i].periods = cpu_to_le16(1);
-       }
-
-       psm->beacon_rssi_skip_max = 200;
-       psm->rssi_delta_threshold = 0;
-       psm->nr = 10;
-       psm->exclude[0] = 0;
-
-       priv->tx(dev, skb);
-
-       return 0;
-}
-
-static int p54_beacon_tim(struct sk_buff *skb)
-{
-       /*
-        * the good excuse for this mess is ... the firmware.
-        * The dummy TIM MUST be at the end of the beacon frame,
-        * because it'll be overwritten!
-        */
-
-       struct ieee80211_mgmt *mgmt = (void *)skb->data;
-       u8 *pos, *end;
-
-       if (skb->len <= sizeof(mgmt))
-               return -EINVAL;
-
-       pos = (u8 *)mgmt->u.beacon.variable;
-       end = skb->data + skb->len;
-       while (pos < end) {
-               if (pos + 2 + pos[1] > end)
-                       return -EINVAL;
-
-               if (pos[0] == WLAN_EID_TIM) {
-                       u8 dtim_len = pos[1];
-                       u8 dtim_period = pos[3];
-                       u8 *next = pos + 2 + dtim_len;
-
-                       if (dtim_len < 3)
-                               return -EINVAL;
-
-                       memmove(pos, next, end - next);
-
-                       if (dtim_len > 3)
-                               skb_trim(skb, skb->len - (dtim_len - 3));
-
-                       pos = end - (dtim_len + 2);
-
-                       /* add the dummy at the end */
-                       pos[0] = WLAN_EID_TIM;
-                       pos[1] = 3;
-                       pos[2] = 0;
-                       pos[3] = dtim_period;
-                       pos[4] = 0;
-                       return 0;
-               }
-               pos += 2 + pos[1];
-       }
-       return 0;
-}
-
-static int p54_beacon_update(struct ieee80211_hw *dev,
-                       struct ieee80211_vif *vif)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *beacon;
-       int ret;
-
-       if (priv->cached_beacon) {
-               p54_tx_cancel(dev, priv->cached_beacon);
-               /* wait for the last beacon the be freed */
-               msleep(10);
-       }
-
-       beacon = ieee80211_beacon_get(dev, vif);
-       if (!beacon)
-               return -ENOMEM;
-       ret = p54_beacon_tim(beacon);
-       if (ret)
-               return ret;
-       ret = p54_tx(dev, beacon);
-       if (ret)
-               return ret;
-       priv->cached_beacon = beacon;
-       priv->tsf_high32 = 0;
-       priv->tsf_low32 = 0;
-
-       return 0;
-}
-
-static int p54_start(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       int err;
-
-       mutex_lock(&priv->conf_mutex);
-       err = priv->open(dev);
-       if (err)
-               goto out;
-       P54_SET_QUEUE(priv->qos_params[0], 0x0002, 0x0003, 0x0007, 47);
-       P54_SET_QUEUE(priv->qos_params[1], 0x0002, 0x0007, 0x000f, 94);
-       P54_SET_QUEUE(priv->qos_params[2], 0x0003, 0x000f, 0x03ff, 0);
-       P54_SET_QUEUE(priv->qos_params[3], 0x0007, 0x000f, 0x03ff, 0);
-       err = p54_set_edcf(dev);
-       if (err)
-               goto out;
-
-       memset(priv->bssid, ~0, ETH_ALEN);
-       priv->mode = NL80211_IFTYPE_MONITOR;
-       err = p54_setup_mac(dev);
-       if (err) {
-               priv->mode = NL80211_IFTYPE_UNSPECIFIED;
-               goto out;
-       }
-
-       queue_delayed_work(dev->workqueue, &priv->work, 0);
-
-       priv->softled_state = 0;
-       err = p54_set_leds(dev);
-
-out:
-       mutex_unlock(&priv->conf_mutex);
-       return err;
-}
-
-static void p54_stop(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-
-       mutex_lock(&priv->conf_mutex);
-       priv->mode = NL80211_IFTYPE_UNSPECIFIED;
-       priv->softled_state = 0;
-       p54_set_leds(dev);
-
-#ifdef CONFIG_P54_LEDS
-       cancel_delayed_work_sync(&priv->led_work);
-#endif /* CONFIG_P54_LEDS */
-       cancel_delayed_work_sync(&priv->work);
-       if (priv->cached_beacon)
-               p54_tx_cancel(dev, priv->cached_beacon);
-
-       priv->stop(dev);
-       while ((skb = skb_dequeue(&priv->tx_queue)))
-               kfree_skb(skb);
-       priv->cached_beacon = NULL;
-       priv->tsf_high32 = priv->tsf_low32 = 0;
-       mutex_unlock(&priv->conf_mutex);
-}
-
-static int p54_add_interface(struct ieee80211_hw *dev,
-                            struct ieee80211_if_init_conf *conf)
-{
-       struct p54_common *priv = dev->priv;
-
-       mutex_lock(&priv->conf_mutex);
-       if (priv->mode != NL80211_IFTYPE_MONITOR) {
-               mutex_unlock(&priv->conf_mutex);
-               return -EOPNOTSUPP;
-       }
-
-       priv->vif = conf->vif;
-
-       switch (conf->type) {
-       case NL80211_IFTYPE_STATION:
-       case NL80211_IFTYPE_ADHOC:
-       case NL80211_IFTYPE_AP:
-       case NL80211_IFTYPE_MESH_POINT:
-               priv->mode = conf->type;
-               break;
-       default:
-               mutex_unlock(&priv->conf_mutex);
-               return -EOPNOTSUPP;
-       }
-
-       memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
-       p54_setup_mac(dev);
-       mutex_unlock(&priv->conf_mutex);
-       return 0;
-}
-
-static void p54_remove_interface(struct ieee80211_hw *dev,
-                                struct ieee80211_if_init_conf *conf)
-{
-       struct p54_common *priv = dev->priv;
-
-       mutex_lock(&priv->conf_mutex);
-       priv->vif = NULL;
-       if (priv->cached_beacon)
-               p54_tx_cancel(dev, priv->cached_beacon);
-       priv->mode = NL80211_IFTYPE_MONITOR;
-       memset(priv->mac_addr, 0, ETH_ALEN);
-       memset(priv->bssid, 0, ETH_ALEN);
-       p54_setup_mac(dev);
-       mutex_unlock(&priv->conf_mutex);
-}
-
-static int p54_config(struct ieee80211_hw *dev, u32 changed)
-{
-       int ret = 0;
-       struct p54_common *priv = dev->priv;
-       struct ieee80211_conf *conf = &dev->conf;
-
-       mutex_lock(&priv->conf_mutex);
-       if (changed & IEEE80211_CONF_CHANGE_POWER)
-               priv->output_power = conf->power_level << 2;
-       if (changed & IEEE80211_CONF_CHANGE_RADIO_ENABLED) {
-               ret = p54_setup_mac(dev);
-               if (ret)
-                       goto out;
-       }
-       if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-               ret = p54_scan(dev, P54_SCAN_EXIT, 0);
-               if (ret)
-                       goto out;
-       }
-       if (changed & IEEE80211_CONF_CHANGE_PS) {
-               ret = p54_set_ps(dev);
-               if (ret)
-                       goto out;
-       }
-
-out:
-       mutex_unlock(&priv->conf_mutex);
-       return ret;
-}
-
-static void p54_configure_filter(struct ieee80211_hw *dev,
-                                unsigned int changed_flags,
-                                unsigned int *total_flags,
-                                int mc_count, struct dev_mc_list *mclist)
-{
-       struct p54_common *priv = dev->priv;
-
-       *total_flags &= FIF_PROMISC_IN_BSS |
-                       FIF_OTHER_BSS;
-
-       priv->filter_flags = *total_flags;
-
-       if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS))
-               p54_setup_mac(dev);
-}
-
-static int p54_conf_tx(struct ieee80211_hw *dev, u16 queue,
-                      const struct ieee80211_tx_queue_params *params)
-{
-       struct p54_common *priv = dev->priv;
-       int ret;
-
-       mutex_lock(&priv->conf_mutex);
-       if ((params) && !(queue > 4)) {
-               P54_SET_QUEUE(priv->qos_params[queue], params->aifs,
-                       params->cw_min, params->cw_max, params->txop);
-               ret = p54_set_edcf(dev);
-       } else
-               ret = -EINVAL;
-       mutex_unlock(&priv->conf_mutex);
-       return ret;
-}
-
-static int p54_init_xbow_synth(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_xbow_synth *xbow;
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*xbow),
-                           P54_CONTROL_TYPE_XBOW_SYNTH_CFG, GFP_KERNEL);
-       if (!skb)
-               return -ENOMEM;
-
-       xbow = (struct p54_xbow_synth *)skb_put(skb, sizeof(*xbow));
-       xbow->magic1 = cpu_to_le16(0x1);
-       xbow->magic2 = cpu_to_le16(0x2);
-       xbow->freq = cpu_to_le16(5390);
-       memset(xbow->padding, 0, sizeof(xbow->padding));
-       priv->tx(dev, skb);
-       return 0;
-}
-
-static void p54_work(struct work_struct *work)
-{
-       struct p54_common *priv = container_of(work, struct p54_common,
-                                              work.work);
-       struct ieee80211_hw *dev = priv->hw;
-       struct sk_buff *skb;
-
-       if (unlikely(priv->mode == NL80211_IFTYPE_UNSPECIFIED))
-               return ;
-
-       /*
-        * TODO: walk through tx_queue and do the following tasks
-        *      1. initiate bursts.
-        *      2. cancel stuck frames / reset the device if necessary.
-        */
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL,
-                           sizeof(struct p54_statistics),
-                           P54_CONTROL_TYPE_STAT_READBACK, GFP_KERNEL);
-       if (!skb)
-               return ;
-
-       priv->tx(dev, skb);
-}
-
-static int p54_get_stats(struct ieee80211_hw *dev,
-                        struct ieee80211_low_level_stats *stats)
-{
-       struct p54_common *priv = dev->priv;
-
-       memcpy(stats, &priv->stats, sizeof(*stats));
-       return 0;
-}
-
-static int p54_get_tx_stats(struct ieee80211_hw *dev,
-                           struct ieee80211_tx_queue_stats *stats)
-{
-       struct p54_common *priv = dev->priv;
-
-       memcpy(stats, &priv->tx_stats[P54_QUEUE_DATA],
-              sizeof(stats[0]) * dev->queues);
-       return 0;
-}
-
-static void p54_bss_info_changed(struct ieee80211_hw *dev,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_bss_conf *info,
-                                u32 changed)
-{
-       struct p54_common *priv = dev->priv;
-       int ret;
-
-       mutex_lock(&priv->conf_mutex);
-       if (changed & BSS_CHANGED_BSSID) {
-               memcpy(priv->bssid, info->bssid, ETH_ALEN);
-               ret = p54_setup_mac(dev);
-               if (ret)
-                       goto out;
-       }
-
-       if (changed & BSS_CHANGED_BEACON) {
-               ret = p54_scan(dev, P54_SCAN_EXIT, 0);
-               if (ret)
-                       goto out;
-               ret = p54_setup_mac(dev);
-               if (ret)
-                       goto out;
-               ret = p54_beacon_update(dev, vif);
-               if (ret)
-                       goto out;
-       }
-       /* XXX: this mimics having two callbacks... clean up */
- out:
-       mutex_unlock(&priv->conf_mutex);
-
-       if (changed & (BSS_CHANGED_ERP_SLOT | BSS_CHANGED_BEACON)) {
-               priv->use_short_slot = info->use_short_slot;
-               p54_set_edcf(dev);
-       }
-       if (changed & BSS_CHANGED_BASIC_RATES) {
-               if (dev->conf.channel->band == IEEE80211_BAND_5GHZ)
-                       priv->basic_rate_mask = (info->basic_rates << 4);
-               else
-                       priv->basic_rate_mask = info->basic_rates;
-               p54_setup_mac(dev);
-               if (priv->fw_var >= 0x500)
-                       p54_scan(dev, P54_SCAN_EXIT, 0);
-       }
-       if (changed & BSS_CHANGED_ASSOC) {
-               if (info->assoc) {
-                       priv->aid = info->aid;
-                       priv->wakeup_timer = info->beacon_int *
-                                            info->dtim_period * 5;
-                       p54_setup_mac(dev);
-               }
-       }
-}
-
-static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd,
-                      struct ieee80211_vif *vif, struct ieee80211_sta *sta,
-                      struct ieee80211_key_conf *key)
-{
-       struct p54_common *priv = dev->priv;
-       struct sk_buff *skb;
-       struct p54_keycache *rxkey;
-       int slot, ret = 0;
-       u8 algo = 0;
-
-       if (modparam_nohwcrypt)
-               return -EOPNOTSUPP;
-
-       mutex_lock(&priv->conf_mutex);
-       if (cmd == SET_KEY) {
-               switch (key->alg) {
-               case ALG_TKIP:
-                       if (!(priv->privacy_caps & (BR_DESC_PRIV_CAP_MICHAEL |
-                             BR_DESC_PRIV_CAP_TKIP))) {
-                               ret = -EOPNOTSUPP;
-                               goto out_unlock;
-                       }
-                       key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-                       algo = P54_CRYPTO_TKIPMICHAEL;
-                       break;
-               case ALG_WEP:
-                       if (!(priv->privacy_caps & BR_DESC_PRIV_CAP_WEP)) {
-                               ret = -EOPNOTSUPP;
-                               goto out_unlock;
-                       }
-                       key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-                       algo = P54_CRYPTO_WEP;
-                       break;
-               case ALG_CCMP:
-                       if (!(priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP)) {
-                               ret = -EOPNOTSUPP;
-                               goto out_unlock;
-                       }
-                       key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-                       algo = P54_CRYPTO_AESCCMP;
-                       break;
-               default:
-                       ret = -EOPNOTSUPP;
-                       goto out_unlock;
-               }
-               slot = bitmap_find_free_region(priv->used_rxkeys,
-                                              priv->rx_keycache_size, 0);
-
-               if (slot < 0) {
-                       /*
-                        * The device supports the choosen algorithm, but the
-                        * firmware does not provide enough key slots to store
-                        * all of them.
-                        * But encryption offload for outgoing frames is always
-                        * possible, so we just pretend that the upload was
-                        * successful and do the decryption in software.
-                        */
-
-                       /* mark the key as invalid. */
-                       key->hw_key_idx = 0xff;
-                       goto out_unlock;
-               }
-       } else {
-               slot = key->hw_key_idx;
-
-               if (slot == 0xff) {
-                       /* This key was not uploaded into the rx key cache. */
-
-                       goto out_unlock;
-               }
-
-               bitmap_release_region(priv->used_rxkeys, slot, 0);
-               algo = 0;
-       }
-
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*rxkey),
-                           P54_CONTROL_TYPE_RX_KEYCACHE, GFP_KERNEL);
-       if (!skb) {
-               bitmap_release_region(priv->used_rxkeys, slot, 0);
-               ret = -ENOSPC;
-               goto out_unlock;
-       }
-
-       rxkey = (struct p54_keycache *)skb_put(skb, sizeof(*rxkey));
-       rxkey->entry = slot;
-       rxkey->key_id = key->keyidx;
-       rxkey->key_type = algo;
-       if (sta)
-               memcpy(rxkey->mac, sta->addr, ETH_ALEN);
-       else
-               memset(rxkey->mac, ~0, ETH_ALEN);
-       if (key->alg != ALG_TKIP) {
-               rxkey->key_len = min((u8)16, key->keylen);
-               memcpy(rxkey->key, key->key, rxkey->key_len);
-       } else {
-               rxkey->key_len = 24;
-               memcpy(rxkey->key, key->key, 16);
-               memcpy(&(rxkey->key[16]), &(key->key
-                       [NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY]), 8);
-       }
-
-       priv->tx(dev, skb);
-       key->hw_key_idx = slot;
-
-out_unlock:
-       mutex_unlock(&priv->conf_mutex);
-       return ret;
-}
-
-#ifdef CONFIG_P54_LEDS
-static void p54_update_leds(struct work_struct *work)
-{
-       struct p54_common *priv = container_of(work, struct p54_common,
-                                              led_work.work);
-       int err, i, tmp, blink_delay = 400;
-       bool rerun = false;
-
-       /* Don't toggle the LED, when the device is down. */
-       if (priv->mode == NL80211_IFTYPE_UNSPECIFIED)
-               return ;
-
-       for (i = 0; i < ARRAY_SIZE(priv->leds); i++)
-               if (priv->leds[i].toggled) {
-                       priv->softled_state |= BIT(i);
-
-                       tmp = 70 + 200 / (priv->leds[i].toggled);
-                       if (tmp < blink_delay)
-                               blink_delay = tmp;
-
-                       if (priv->leds[i].led_dev.brightness == LED_OFF)
-                               rerun = true;
-
-                       priv->leds[i].toggled =
-                               !!priv->leds[i].led_dev.brightness;
-               } else
-                       priv->softled_state &= ~BIT(i);
-
-       err = p54_set_leds(priv->hw);
-       if (err && net_ratelimit())
-               printk(KERN_ERR "%s: failed to update LEDs.\n",
-                       wiphy_name(priv->hw->wiphy));
-
-       if (rerun)
-               queue_delayed_work(priv->hw->workqueue, &priv->led_work,
-                       msecs_to_jiffies(blink_delay));
-}
-
-static void p54_led_brightness_set(struct led_classdev *led_dev,
-                                  enum led_brightness brightness)
-{
-       struct p54_led_dev *led = container_of(led_dev, struct p54_led_dev,
-                                              led_dev);
-       struct ieee80211_hw *dev = led->hw_dev;
-       struct p54_common *priv = dev->priv;
-
-       if (priv->mode == NL80211_IFTYPE_UNSPECIFIED)
-               return ;
-
-       if (brightness) {
-               led->toggled++;
-               queue_delayed_work(priv->hw->workqueue, &priv->led_work,
-                                  HZ/10);
-       }
-}
-
-static int p54_register_led(struct ieee80211_hw *dev,
-                           unsigned int led_index,
-                           char *name, char *trigger)
-{
-       struct p54_common *priv = dev->priv;
-       struct p54_led_dev *led = &priv->leds[led_index];
-       int err;
-
-       if (led->registered)
-               return -EEXIST;
-
-       snprintf(led->name, sizeof(led->name), "p54-%s::%s",
-                wiphy_name(dev->wiphy), name);
-       led->hw_dev = dev;
-       led->index = led_index;
-       led->led_dev.name = led->name;
-       led->led_dev.default_trigger = trigger;
-       led->led_dev.brightness_set = p54_led_brightness_set;
-
-       err = led_classdev_register(wiphy_dev(dev->wiphy), &led->led_dev);
-       if (err)
-               printk(KERN_ERR "%s: Failed to register %s LED.\n",
-                       wiphy_name(dev->wiphy), name);
-       else
-               led->registered = 1;
-
-       return err;
-}
-
-static int p54_init_leds(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       int err;
-
-       /*
-        * TODO:
-        * Figure out if the EEPROM contains some hints about the number
-        * of available/programmable LEDs of the device.
-        */
-
-       INIT_DELAYED_WORK(&priv->led_work, p54_update_leds);
-
-       err = p54_register_led(dev, 0, "assoc",
-                              ieee80211_get_assoc_led_name(dev));
-       if (err)
-               return err;
-
-       err = p54_register_led(dev, 1, "tx",
-                              ieee80211_get_tx_led_name(dev));
-       if (err)
-               return err;
-
-       err = p54_register_led(dev, 2, "rx",
-                              ieee80211_get_rx_led_name(dev));
-       if (err)
-               return err;
-
-       err = p54_register_led(dev, 3, "radio",
-                              ieee80211_get_radio_led_name(dev));
-       if (err)
-               return err;
-
-       err = p54_set_leds(dev);
-       return err;
-}
-
-static void p54_unregister_leds(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(priv->leds); i++)
-               if (priv->leds[i].registered)
-                       led_classdev_unregister(&priv->leds[i].led_dev);
-}
-#endif /* CONFIG_P54_LEDS */
-
-static const struct ieee80211_ops p54_ops = {
-       .tx                     = p54_tx,
-       .start                  = p54_start,
-       .stop                   = p54_stop,
-       .add_interface          = p54_add_interface,
-       .remove_interface       = p54_remove_interface,
-       .set_tim                = p54_set_tim,
-       .sta_notify             = p54_sta_notify,
-       .set_key                = p54_set_key,
-       .config                 = p54_config,
-       .bss_info_changed       = p54_bss_info_changed,
-       .configure_filter       = p54_configure_filter,
-       .conf_tx                = p54_conf_tx,
-       .get_stats              = p54_get_stats,
-       .get_tx_stats           = p54_get_tx_stats
-};
-
-struct ieee80211_hw *p54_init_common(size_t priv_data_len)
-{
-       struct ieee80211_hw *dev;
-       struct p54_common *priv;
-
-       dev = ieee80211_alloc_hw(priv_data_len, &p54_ops);
-       if (!dev)
-               return NULL;
-
-       priv = dev->priv;
-       priv->hw = dev;
-       priv->mode = NL80211_IFTYPE_UNSPECIFIED;
-       priv->basic_rate_mask = 0x15f;
-       skb_queue_head_init(&priv->tx_queue);
-       dev->flags = IEEE80211_HW_RX_INCLUDES_FCS |
-                    IEEE80211_HW_SIGNAL_DBM |
-                    IEEE80211_HW_NOISE_DBM;
-
-       dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
-                                     BIT(NL80211_IFTYPE_ADHOC) |
-                                     BIT(NL80211_IFTYPE_AP) |
-                                     BIT(NL80211_IFTYPE_MESH_POINT);
-
-       dev->channel_change_time = 1000;        /* TODO: find actual value */
-       priv->tx_stats[P54_QUEUE_BEACON].limit = 1;
-       priv->tx_stats[P54_QUEUE_FWSCAN].limit = 1;
-       priv->tx_stats[P54_QUEUE_MGMT].limit = 3;
-       priv->tx_stats[P54_QUEUE_CAB].limit = 3;
-       priv->tx_stats[P54_QUEUE_DATA].limit = 5;
-       dev->queues = 1;
-       priv->noise = -94;
-       /*
-        * We support at most 8 tries no matter which rate they're at,
-        * we cannot support max_rates * max_rate_tries as we set it
-        * here, but setting it correctly to 4/2 or so would limit us
-        * artificially if the RC algorithm wants just two rates, so
-        * let's say 4/7, we'll redistribute it at TX time, see the
-        * comments there.
-        */
-       dev->max_rates = 4;
-       dev->max_rate_tries = 7;
-       dev->extra_tx_headroom = sizeof(struct p54_hdr) + 4 +
-                                sizeof(struct p54_tx_data);
-
-       mutex_init(&priv->conf_mutex);
-       init_completion(&priv->eeprom_comp);
-       INIT_DELAYED_WORK(&priv->work, p54_work);
-
-       return dev;
-}
-EXPORT_SYMBOL_GPL(p54_init_common);
-
-int p54_register_common(struct ieee80211_hw *dev, struct device *pdev)
-{
-       int err;
-
-       err = ieee80211_register_hw(dev);
-       if (err) {
-               dev_err(pdev, "Cannot register device (%d).\n", err);
-               return err;
-       }
-
-#ifdef CONFIG_P54_LEDS
-       err = p54_init_leds(dev);
-       if (err)
-               return err;
-#endif /* CONFIG_P54_LEDS */
-
-       dev_info(pdev, "is registered as '%s'\n", wiphy_name(dev->wiphy));
-       return 0;
-}
-EXPORT_SYMBOL_GPL(p54_register_common);
-
-void p54_free_common(struct ieee80211_hw *dev)
-{
-       struct p54_common *priv = dev->priv;
-       kfree(priv->iq_autocal);
-       kfree(priv->output_limit);
-       kfree(priv->curve_data);
-       kfree(priv->used_rxkeys);
-
-#ifdef CONFIG_P54_LEDS
-       p54_unregister_leds(dev);
-#endif /* CONFIG_P54_LEDS */
-}
-EXPORT_SYMBOL_GPL(p54_free_common);
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
deleted file mode 100644 (file)
index 75ead7a..0000000
+++ /dev/null
@@ -1,644 +0,0 @@
-#ifndef P54COMMON_H
-#define P54COMMON_H
-
-/*
- * Common code specific definitions for mac80211 Prism54 drivers
- *
- * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
- * Copyright (c) 2007, Christian Lamparter <chunkeey@web.de>
- *
- * Based on:
- * - the islsm (softmac prism54) driver, which is:
- *   Copyright 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al.
- *
- * - LMAC API interface header file for STLC4560 (lmac_longbow.h)
- *   Copyright (C) 2007 Conexant Systems, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-struct bootrec {
-       __le32 code;
-       __le32 len;
-       u32 data[10];
-} __attribute__((packed));
-
-#define PDR_SYNTH_FRONTEND_MASK                0x0007
-#define PDR_SYNTH_FRONTEND_DUETTE3     0x0001
-#define PDR_SYNTH_FRONTEND_DUETTE2     0x0002
-#define PDR_SYNTH_FRONTEND_FRISBEE     0x0003
-#define PDR_SYNTH_FRONTEND_XBOW                0x0004
-#define PDR_SYNTH_FRONTEND_LONGBOW     0x0005
-#define PDR_SYNTH_IQ_CAL_MASK          0x0018
-#define PDR_SYNTH_IQ_CAL_PA_DETECTOR   0x0000
-#define PDR_SYNTH_IQ_CAL_DISABLED      0x0008
-#define PDR_SYNTH_IQ_CAL_ZIF           0x0010
-#define PDR_SYNTH_FAA_SWITCH_MASK      0x0020
-#define PDR_SYNTH_FAA_SWITCH_ENABLED   0x0020
-#define PDR_SYNTH_24_GHZ_MASK          0x0040
-#define PDR_SYNTH_24_GHZ_DISABLED      0x0040
-#define PDR_SYNTH_5_GHZ_MASK           0x0080
-#define PDR_SYNTH_5_GHZ_DISABLED       0x0080
-#define PDR_SYNTH_RX_DIV_MASK          0x0100
-#define PDR_SYNTH_RX_DIV_SUPPORTED     0x0100
-#define PDR_SYNTH_TX_DIV_MASK          0x0200
-#define PDR_SYNTH_TX_DIV_SUPPORTED     0x0200
-
-struct bootrec_exp_if {
-       __le16 role;
-       __le16 if_id;
-       __le16 variant;
-       __le16 btm_compat;
-       __le16 top_compat;
-} __attribute__((packed));
-
-#define BR_DESC_PRIV_CAP_WEP           BIT(0)
-#define BR_DESC_PRIV_CAP_TKIP          BIT(1)
-#define BR_DESC_PRIV_CAP_MICHAEL       BIT(2)
-#define BR_DESC_PRIV_CAP_CCX_CP                BIT(3)
-#define BR_DESC_PRIV_CAP_CCX_MIC       BIT(4)
-#define BR_DESC_PRIV_CAP_AESCCMP       BIT(5)
-
-struct bootrec_desc {
-       __le16 modes;
-       __le16 flags;
-       __le32 rx_start;
-       __le32 rx_end;
-       u8 headroom;
-       u8 tailroom;
-       u8 tx_queues;
-       u8 tx_depth;
-       u8 privacy_caps;
-       u8 rx_keycache_size;
-       u8 time_size;
-       u8 padding;
-       u8 rates[16];
-       u8 padding2[4];
-       __le16 rx_mtu;
-} __attribute__((packed));
-
-#define BR_CODE_MIN                    0x80000000
-#define BR_CODE_COMPONENT_ID           0x80000001
-#define BR_CODE_COMPONENT_VERSION      0x80000002
-#define BR_CODE_DEPENDENT_IF           0x80000003
-#define BR_CODE_EXPOSED_IF             0x80000004
-#define BR_CODE_DESCR                  0x80000101
-#define BR_CODE_MAX                    0x8FFFFFFF
-#define BR_CODE_END_OF_BRA             0xFF0000FF
-#define LEGACY_BR_CODE_END_OF_BRA      0xFFFFFFFF
-
-#define P54_HDR_FLAG_DATA_ALIGN                BIT(14)
-#define P54_HDR_FLAG_DATA_OUT_PROMISC  BIT(0)
-#define P54_HDR_FLAG_DATA_OUT_TIMESTAMP BIT(1)
-#define P54_HDR_FLAG_DATA_OUT_SEQNR    BIT(2)
-#define P54_HDR_FLAG_DATA_OUT_BIT3     BIT(3)
-#define P54_HDR_FLAG_DATA_OUT_BURST    BIT(4)
-#define P54_HDR_FLAG_DATA_OUT_NOCANCEL BIT(5)
-#define P54_HDR_FLAG_DATA_OUT_CLEARTIM BIT(6)
-#define P54_HDR_FLAG_DATA_OUT_HITCHHIKE        BIT(7)
-#define P54_HDR_FLAG_DATA_OUT_COMPRESS BIT(8)
-#define P54_HDR_FLAG_DATA_OUT_CONCAT   BIT(9)
-#define P54_HDR_FLAG_DATA_OUT_PCS_ACCEPT BIT(10)
-#define P54_HDR_FLAG_DATA_OUT_WAITEOSP BIT(11)
-
-#define P54_HDR_FLAG_DATA_IN_FCS_GOOD  BIT(0)
-#define P54_HDR_FLAG_DATA_IN_MATCH_MAC BIT(1)
-#define P54_HDR_FLAG_DATA_IN_MCBC      BIT(2)
-#define P54_HDR_FLAG_DATA_IN_BEACON    BIT(3)
-#define P54_HDR_FLAG_DATA_IN_MATCH_BSS BIT(4)
-#define P54_HDR_FLAG_DATA_IN_BCAST_BSS BIT(5)
-#define P54_HDR_FLAG_DATA_IN_DATA      BIT(6)
-#define P54_HDR_FLAG_DATA_IN_TRUNCATED BIT(7)
-#define P54_HDR_FLAG_DATA_IN_BIT8      BIT(8)
-#define P54_HDR_FLAG_DATA_IN_TRANSPARENT BIT(9)
-
-/* PDA defines are Copyright (C) 2005 Nokia Corporation (taken from islsm_pda.h) */
-
-struct pda_entry {
-       __le16 len;     /* includes both code and data */
-       __le16 code;
-       u8 data[0];
-} __attribute__ ((packed));
-
-struct eeprom_pda_wrap {
-       __le32 magic;
-       __le16 pad;
-       __le16 len;
-       __le32 arm_opcode;
-       u8 data[0];
-} __attribute__ ((packed));
-
-struct p54_iq_autocal_entry {
-       __le16 iq_param[4];
-} __attribute__ ((packed));
-
-struct pda_iq_autocal_entry {
-        __le16 freq;
-       struct p54_iq_autocal_entry params;
-} __attribute__ ((packed));
-
-struct pda_channel_output_limit {
-       __le16 freq;
-       u8 val_bpsk;
-       u8 val_qpsk;
-       u8 val_16qam;
-       u8 val_64qam;
-       u8 rate_set_mask;
-       u8 rate_set_size;
-} __attribute__ ((packed));
-
-struct pda_pa_curve_data_sample_rev0 {
-       u8 rf_power;
-       u8 pa_detector;
-       u8 pcv;
-} __attribute__ ((packed));
-
-struct pda_pa_curve_data_sample_rev1 {
-       u8 rf_power;
-       u8 pa_detector;
-       u8 data_barker;
-       u8 data_bpsk;
-       u8 data_qpsk;
-       u8 data_16qam;
-       u8 data_64qam;
-} __attribute__ ((packed));
-
-struct p54_pa_curve_data_sample {
-       u8 rf_power;
-       u8 pa_detector;
-       u8 data_barker;
-       u8 data_bpsk;
-       u8 data_qpsk;
-       u8 data_16qam;
-       u8 data_64qam;
-       u8 padding;
-} __attribute__ ((packed));
-
-struct pda_pa_curve_data {
-       u8 cal_method_rev;
-       u8 channels;
-       u8 points_per_channel;
-       u8 padding;
-       u8 data[0];
-} __attribute__ ((packed));
-
-struct pda_rssi_cal_entry {
-       __le16 mul;
-       __le16 add;
-} __attribute__ ((packed));
-
-struct pda_country {
-       u8 regdomain;
-       u8 alpha2[2];
-       u8 flags;
-} __attribute__ ((packed));
-
-/*
- * Warning: Longbow's structures are bogus.
- */
-struct p54_channel_output_limit_longbow {
-       __le16 rf_power_points[12];
-} __attribute__ ((packed));
-
-struct p54_pa_curve_data_sample_longbow {
-       __le16 rf_power;
-       __le16 pa_detector;
-       struct {
-               __le16 data[4];
-       } points[3] __attribute__ ((packed));
-} __attribute__ ((packed));
-
-struct pda_custom_wrapper {
-       __le16 entries;
-       __le16 entry_size;
-       __le16 offset;
-       __le16 len;
-       u8 data[0];
-} __attribute__ ((packed));
-
-/*
- * this defines the PDR codes used to build PDAs as defined in document
- * number 553155. The current implementation mirrors version 1.1 of the
- * document and lists only PDRs supported by the ARM platform.
- */
-
-/* common and choice range (0x0000 - 0x0fff) */
-#define PDR_END                                        0x0000
-#define PDR_MANUFACTURING_PART_NUMBER          0x0001
-#define PDR_PDA_VERSION                                0x0002
-#define PDR_NIC_SERIAL_NUMBER                  0x0003
-
-#define PDR_MAC_ADDRESS                                0x0101
-#define PDR_REGULATORY_DOMAIN_LIST             0x0103
-#define PDR_TEMPERATURE_TYPE                   0x0107
-
-#define PDR_PRISM_PCI_IDENTIFIER               0x0402
-
-/* ARM range (0x1000 - 0x1fff) */
-#define PDR_COUNTRY_INFORMATION                        0x1000
-#define PDR_INTERFACE_LIST                     0x1001
-#define PDR_HARDWARE_PLATFORM_COMPONENT_ID     0x1002
-#define PDR_OEM_NAME                           0x1003
-#define PDR_PRODUCT_NAME                       0x1004
-#define PDR_UTF8_OEM_NAME                      0x1005
-#define PDR_UTF8_PRODUCT_NAME                  0x1006
-#define PDR_COUNTRY_LIST                       0x1007
-#define PDR_DEFAULT_COUNTRY                    0x1008
-
-#define PDR_ANTENNA_GAIN                       0x1100
-
-#define PDR_PRISM_INDIGO_PA_CALIBRATION_DATA   0x1901
-#define PDR_RSSI_LINEAR_APPROXIMATION          0x1902
-#define PDR_PRISM_PA_CAL_OUTPUT_POWER_LIMITS   0x1903
-#define PDR_PRISM_PA_CAL_CURVE_DATA            0x1904
-#define PDR_RSSI_LINEAR_APPROXIMATION_DUAL_BAND        0x1905
-#define PDR_PRISM_ZIF_TX_IQ_CALIBRATION                0x1906
-#define PDR_REGULATORY_POWER_LIMITS            0x1907
-#define PDR_RSSI_LINEAR_APPROXIMATION_EXTENDED 0x1908
-#define PDR_RADIATED_TRANSMISSION_CORRECTION   0x1909
-#define PDR_PRISM_TX_IQ_CALIBRATION            0x190a
-
-/* reserved range (0x2000 - 0x7fff) */
-
-/* customer range (0x8000 - 0xffff) */
-#define PDR_BASEBAND_REGISTERS                         0x8000
-#define PDR_PER_CHANNEL_BASEBAND_REGISTERS             0x8001
-
-/* used by our modificated eeprom image */
-#define PDR_RSSI_LINEAR_APPROXIMATION_CUSTOM           0xDEAD
-#define PDR_PRISM_PA_CAL_OUTPUT_POWER_LIMITS_CUSTOM    0xBEEF
-#define PDR_PRISM_PA_CAL_CURVE_DATA_CUSTOM             0xB05D
-
-/* PDR definitions for default country & country list */
-#define PDR_COUNTRY_CERT_CODE          0x80
-#define PDR_COUNTRY_CERT_CODE_REAL     0x00
-#define PDR_COUNTRY_CERT_CODE_PSEUDO   0x80
-#define PDR_COUNTRY_CERT_BAND          0x40
-#define PDR_COUNTRY_CERT_BAND_2GHZ     0x00
-#define PDR_COUNTRY_CERT_BAND_5GHZ     0x40
-#define PDR_COUNTRY_CERT_IODOOR                0x30
-#define PDR_COUNTRY_CERT_IODOOR_BOTH   0x00
-#define PDR_COUNTRY_CERT_IODOOR_INDOOR 0x20
-#define PDR_COUNTRY_CERT_IODOOR_OUTDOOR        0x30
-#define PDR_COUNTRY_CERT_INDEX         0x0F
-
-struct p54_eeprom_lm86 {
-       union {
-               struct {
-                       __le16 offset;
-                       __le16 len;
-                       u8 data[0];
-               } v1;
-               struct {
-                       __le32 offset;
-                       __le16 len;
-                       u8 magic2;
-                       u8 pad;
-                       u8 magic[4];
-                       u8 data[0];
-               } v2;
-       }  __attribute__ ((packed));
-} __attribute__ ((packed));
-
-enum p54_rx_decrypt_status {
-       P54_DECRYPT_NONE = 0,
-       P54_DECRYPT_OK,
-       P54_DECRYPT_NOKEY,
-       P54_DECRYPT_NOMICHAEL,
-       P54_DECRYPT_NOCKIPMIC,
-       P54_DECRYPT_FAIL_WEP,
-       P54_DECRYPT_FAIL_TKIP,
-       P54_DECRYPT_FAIL_MICHAEL,
-       P54_DECRYPT_FAIL_CKIPKP,
-       P54_DECRYPT_FAIL_CKIPMIC,
-       P54_DECRYPT_FAIL_AESCCMP
-};
-
-struct p54_rx_data {
-       __le16 flags;
-       __le16 len;
-       __le16 freq;
-       u8 antenna;
-       u8 rate;
-       u8 rssi;
-       u8 quality;
-       u8 decrypt_status;
-       u8 rssi_raw;
-       __le32 tsf32;
-       __le32 unalloc0;
-       u8 align[0];
-} __attribute__ ((packed));
-
-enum p54_trap_type {
-       P54_TRAP_SCAN = 0,
-       P54_TRAP_TIMER,
-       P54_TRAP_BEACON_TX,
-       P54_TRAP_FAA_RADIO_ON,
-       P54_TRAP_FAA_RADIO_OFF,
-       P54_TRAP_RADAR,
-       P54_TRAP_NO_BEACON,
-       P54_TRAP_TBTT,
-       P54_TRAP_SCO_ENTER,
-       P54_TRAP_SCO_EXIT
-};
-
-struct p54_trap {
-       __le16 event;
-       __le16 frequency;
-} __attribute__ ((packed));
-
-enum p54_frame_sent_status {
-       P54_TX_OK = 0,
-       P54_TX_FAILED,
-       P54_TX_PSM,
-       P54_TX_PSM_CANCELLED = 4
-};
-
-struct p54_frame_sent {
-       u8 status;
-       u8 tries;
-       u8 ack_rssi;
-       u8 quality;
-       __le16 seq;
-       u8 antenna;
-       u8 padding;
-} __attribute__ ((packed));
-
-enum p54_tx_data_crypt {
-       P54_CRYPTO_NONE = 0,
-       P54_CRYPTO_WEP,
-       P54_CRYPTO_TKIP,
-       P54_CRYPTO_TKIPMICHAEL,
-       P54_CRYPTO_CCX_WEPMIC,
-       P54_CRYPTO_CCX_KPMIC,
-       P54_CRYPTO_CCX_KP,
-       P54_CRYPTO_AESCCMP
-};
-
-enum p54_tx_data_queue {
-       P54_QUEUE_BEACON        = 0,
-       P54_QUEUE_FWSCAN        = 1,
-       P54_QUEUE_MGMT          = 2,
-       P54_QUEUE_CAB           = 3,
-       P54_QUEUE_DATA          = 4,
-
-       P54_QUEUE_AC_NUM        = 4,
-       P54_QUEUE_AC_VO         = 4,
-       P54_QUEUE_AC_VI         = 5,
-       P54_QUEUE_AC_BE         = 6,
-       P54_QUEUE_AC_BK         = 7,
-
-       /* keep last */
-       P54_QUEUE_NUM           = 8,
-};
-
-struct p54_tx_data {
-       u8 rateset[8];
-       u8 rts_rate_idx;
-       u8 crypt_offset;
-       u8 key_type;
-       u8 key_len;
-       u8 key[16];
-       u8 hw_queue;
-       u8 backlog;
-       __le16 durations[4];
-       u8 tx_antenna;
-       union {
-               struct {
-                       u8 cts_rate;
-                       __le16 output_power;
-               } __attribute__((packed)) longbow;
-               struct {
-                       u8 output_power;
-                       u8 cts_rate;
-                       u8 unalloc;
-               } __attribute__ ((packed)) normal;
-       } __attribute__ ((packed));
-       u8 unalloc2[2];
-       u8 align[0];
-} __attribute__ ((packed));
-
-/* unit is ms */
-#define P54_TX_FRAME_LIFETIME 2000
-#define P54_TX_TIMEOUT 4000
-#define P54_STATISTICS_UPDATE 5000
-
-#define P54_FILTER_TYPE_NONE           0
-#define P54_FILTER_TYPE_STATION                BIT(0)
-#define P54_FILTER_TYPE_IBSS           BIT(1)
-#define P54_FILTER_TYPE_AP             BIT(2)
-#define P54_FILTER_TYPE_TRANSPARENT    BIT(3)
-#define P54_FILTER_TYPE_PROMISCUOUS    BIT(4)
-#define P54_FILTER_TYPE_HIBERNATE      BIT(5)
-#define P54_FILTER_TYPE_NOACK          BIT(6)
-#define P54_FILTER_TYPE_RX_DISABLED    BIT(7)
-
-struct p54_setup_mac {
-       __le16 mac_mode;
-       u8 mac_addr[ETH_ALEN];
-       u8 bssid[ETH_ALEN];
-       u8 rx_antenna;
-       u8 rx_align;
-       union {
-               struct {
-                       __le32 basic_rate_mask;
-                       u8 rts_rates[8];
-                       __le32 rx_addr;
-                       __le16 max_rx;
-                       __le16 rxhw;
-                       __le16 wakeup_timer;
-                       __le16 unalloc0;
-               } v1 __attribute__ ((packed));
-               struct {
-                       __le32 rx_addr;
-                       __le16 max_rx;
-                       __le16 rxhw;
-                       __le16 timer;
-                       __le16 truncate;
-                       __le32 basic_rate_mask;
-                       u8 sbss_offset;
-                       u8 mcast_window;
-                       u8 rx_rssi_threshold;
-                       u8 rx_ed_threshold;
-                       __le32 ref_clock;
-                       __le16 lpf_bandwidth;
-                       __le16 osc_start_delay;
-               } v2 __attribute__ ((packed));
-       } __attribute__ ((packed));
-} __attribute__ ((packed));
-
-#define P54_SETUP_V1_LEN 40
-#define P54_SETUP_V2_LEN (sizeof(struct p54_setup_mac))
-
-#define P54_SCAN_EXIT  BIT(0)
-#define P54_SCAN_TRAP  BIT(1)
-#define P54_SCAN_ACTIVE BIT(2)
-#define P54_SCAN_FILTER BIT(3)
-
-struct p54_scan_head {
-       __le16 mode;
-       __le16 dwell;
-       u8 scan_params[20];
-       __le16 freq;
-} __attribute__ ((packed));
-
-struct p54_scan_body {
-       u8 pa_points_per_curve;
-       u8 val_barker;
-       u8 val_bpsk;
-       u8 val_qpsk;
-       u8 val_16qam;
-       u8 val_64qam;
-       struct p54_pa_curve_data_sample curve_data[8];
-       u8 dup_bpsk;
-       u8 dup_qpsk;
-       u8 dup_16qam;
-       u8 dup_64qam;
-} __attribute__ ((packed));
-
-struct p54_scan_body_longbow {
-       struct p54_channel_output_limit_longbow power_limits;
-       struct p54_pa_curve_data_sample_longbow curve_data[8];
-       __le16 unkn[6];         /* maybe more power_limits or rate_mask */
-} __attribute__ ((packed));
-
-union p54_scan_body_union {
-       struct p54_scan_body normal;
-       struct p54_scan_body_longbow longbow;
-} __attribute__ ((packed));
-
-struct p54_scan_tail_rate {
-       __le32 basic_rate_mask;
-       u8 rts_rates[8];
-} __attribute__ ((packed));
-
-struct p54_led {
-       __le16 flags;
-       __le16 mask[2];
-       __le16 delay[2];
-} __attribute__ ((packed));
-
-struct p54_edcf {
-       u8 flags;
-       u8 slottime;
-       u8 sifs;
-       u8 eofpad;
-       struct p54_edcf_queue_param queue[8];
-       u8 mapping[4];
-       __le16 frameburst;
-       __le16 round_trip_delay;
-} __attribute__ ((packed));
-
-struct p54_statistics {
-       __le32 rx_success;
-       __le32 rx_bad_fcs;
-       __le32 rx_abort;
-       __le32 rx_abort_phy;
-       __le32 rts_success;
-       __le32 rts_fail;
-       __le32 tsf32;
-       __le32 airtime;
-       __le32 noise;
-       __le32 sample_noise[8];
-       __le32 sample_cca;
-       __le32 sample_tx;
-} __attribute__ ((packed));
-
-struct p54_xbow_synth {
-       __le16 magic1;
-       __le16 magic2;
-       __le16 freq;
-       u32 padding[5];
-} __attribute__ ((packed));
-
-struct p54_timer {
-       __le32 interval;
-} __attribute__ ((packed));
-
-struct p54_keycache {
-       u8 entry;
-       u8 key_id;
-       u8 mac[ETH_ALEN];
-       u8 padding[2];
-       u8 key_type;
-       u8 key_len;
-       u8 key[24];
-} __attribute__ ((packed));
-
-struct p54_burst {
-       u8 flags;
-       u8 queue;
-       u8 backlog;
-       u8 pad;
-       __le16 durations[32];
-} __attribute__ ((packed));
-
-struct p54_psm_interval {
-       __le16 interval;
-       __le16 periods;
-} __attribute__ ((packed));
-
-#define P54_PSM_CAM                    0
-#define P54_PSM                                BIT(0)
-#define P54_PSM_DTIM                   BIT(1)
-#define P54_PSM_MCBC                   BIT(2)
-#define P54_PSM_CHECKSUM               BIT(3)
-#define P54_PSM_SKIP_MORE_DATA         BIT(4)
-#define P54_PSM_BEACON_TIMEOUT         BIT(5)
-#define P54_PSM_HFOSLEEP               BIT(6)
-#define P54_PSM_AUTOSWITCH_SLEEP       BIT(7)
-#define P54_PSM_LPIT                   BIT(8)
-#define P54_PSM_BF_UCAST_SKIP          BIT(9)
-#define P54_PSM_BF_MCAST_SKIP          BIT(10)
-
-struct p54_psm {
-       __le16 mode;
-       __le16 aid;
-       struct p54_psm_interval intervals[4];
-       u8 beacon_rssi_skip_max;
-       u8 rssi_delta_threshold;
-       u8 nr;
-       u8 exclude[1];
-} __attribute__ ((packed));
-
-#define MC_FILTER_ADDRESS_NUM 4
-
-struct p54_group_address_table {
-       __le16 filter_enable;
-       __le16 num_address;
-       u8 mac_list[MC_FILTER_ADDRESS_NUM][ETH_ALEN];
-} __attribute__ ((packed));
-
-struct p54_txcancel {
-       __le32 req_id;
-} __attribute__ ((packed));
-
-struct p54_sta_unlock {
-       u8 addr[ETH_ALEN];
-       u16 padding;
-} __attribute__ ((packed));
-
-#define P54_TIM_CLEAR BIT(15)
-struct p54_tim {
-       u8 count;
-       u8 padding[3];
-       __le16 entry[8];
-} __attribute__ ((packed));
-
-struct p54_cce_quiet {
-       __le32 period;
-} __attribute__ ((packed));
-
-struct p54_bt_balancer {
-       __le16 prio_thresh;
-       __le16 acl_thresh;
-} __attribute__ ((packed));
-
-struct p54_arp_table {
-       __le16 filter_enable;
-       u8 ipv4_addr[4];
-} __attribute__ ((packed));
-
-#endif /* P54COMMON_H */
index b1610ea4bb3da0c135b6bf8e416d0be4f91ca952..d348c265e867c9384812b0a803e5aaae740732ef 100644 (file)
@@ -22,6 +22,7 @@
 #include <net/mac80211.h>
 
 #include "p54.h"
+#include "lmac.h"
 #include "p54pci.h"
 
 MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
@@ -564,7 +565,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
  err_free_common:
        release_firmware(priv->firmware);
-       p54_free_common(dev);
        pci_free_consistent(pdev, sizeof(*priv->ring_control),
                            priv->ring_control, priv->ring_control_dma);
 
@@ -573,7 +573,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
  err_free_dev:
        pci_set_drvdata(pdev, NULL);
-       ieee80211_free_hw(dev);
+       p54_free_common(dev);
 
  err_free_reg:
        pci_release_regions(pdev);
@@ -590,16 +590,15 @@ static void __devexit p54p_remove(struct pci_dev *pdev)
        if (!dev)
                return;
 
-       ieee80211_unregister_hw(dev);
+       p54_unregister_common(dev);
        priv = dev->priv;
        release_firmware(priv->firmware);
        pci_free_consistent(pdev, sizeof(*priv->ring_control),
                            priv->ring_control, priv->ring_control_dma);
-       p54_free_common(dev);
        iounmap(priv->map);
        pci_release_regions(pdev);
        pci_disable_device(pdev);
-       ieee80211_free_hw(dev);
+       p54_free_common(dev);
 }
 
 #ifdef CONFIG_PM
index 83116baeb110082b2f94e3bb40186f8e98f97ad8..7ef191a9d792a8ed3ecfe327c42d51f6be40cf70 100644 (file)
@@ -34,7 +34,7 @@
 #include "p54spi_eeprom.h"
 #include "p54.h"
 
-#include "p54common.h"
+#include "lmac.h"
 
 MODULE_FIRMWARE("3826.arm");
 MODULE_ALIAS("stlc45xx");
@@ -713,7 +713,7 @@ static int __devexit p54spi_remove(struct spi_device *spi)
 {
        struct p54s_priv *priv = dev_get_drvdata(&spi->dev);
 
-       ieee80211_unregister_hw(priv->hw);
+       p54_unregister_common(priv->hw);
 
        free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
 
@@ -724,7 +724,6 @@ static int __devexit p54spi_remove(struct spi_device *spi)
        mutex_destroy(&priv->mutex);
 
        p54_free_common(priv->hw);
-       ieee80211_free_hw(priv->hw);
 
        return 0;
 }
index 0e877a104a89f0f92955567b1be1688fbeca569d..461d88f5ceb74fcf708f5ef549bf0be4d86d0cf5 100644 (file)
@@ -22,6 +22,7 @@
 #include <net/mac80211.h>
 
 #include "p54.h"
+#include "lmac.h"
 #include "p54usb.h"
 
 MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
@@ -961,7 +962,7 @@ err_free_fw:
        release_firmware(priv->fw);
 
 err_free_dev:
-       ieee80211_free_hw(dev);
+       p54_free_common(dev);
        usb_set_intfdata(intf, NULL);
        usb_put_dev(udev);
        return err;
@@ -975,13 +976,12 @@ static void __devexit p54u_disconnect(struct usb_interface *intf)
        if (!dev)
                return;
 
-       ieee80211_unregister_hw(dev);
+       p54_unregister_common(dev);
 
        priv = dev->priv;
        usb_put_dev(interface_to_usbdev(intf));
        release_firmware(priv->fw);
        p54_free_common(dev);
-       ieee80211_free_hw(dev);
 }
 
 static int p54u_pre_reset(struct usb_interface *intf)