p54: tx refused but queue active
[linux-2.6.git] / drivers / net / wireless / p54 / p54common.c
index 8e5e1ab..22ca122 100644 (file)
@@ -9,7 +9,7 @@
  * - the islsm (softmac prism54) driver, which is:
  *   Copyright 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al.
  * - stlc45xx driver
- * C\002  Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+ *   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
 #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");
@@ -135,6 +141,7 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
        u8 *fw_version = NULL;
        size_t len;
        int i;
+       int maxlen;
 
        if (priv->rx_start)
                return 0;
@@ -155,21 +162,21 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                        priv->fw_interface = be32_to_cpup((__be32 *)
                                             bootrec->data);
                        switch (priv->fw_interface) {
-                       case FW_FMAC:
-                               printk(KERN_INFO "p54: FreeMAC firmware\n");
-                               break;
-                       case FW_LM20:
-                               printk(KERN_INFO "p54: LM20 firmware\n");
-                               break;
                        case FW_LM86:
-                               printk(KERN_INFO "p54: LM86 firmware\n");
-                               break;
-                       case FW_LM87:
-                               printk(KERN_INFO "p54: LM87 firmware\n");
+                       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_INFO "p54: unknown firmware\n");
-                               break;
+                               printk(KERN_ERR "%s: unsupported firmware\n",
+                                       wiphy_name(dev->wiphy));
+                               return -ENODEV;
                        }
                        break;
                case BR_CODE_COMPONENT_VERSION:
@@ -185,11 +192,23 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                        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:
@@ -211,21 +230,53 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
        }
 
        if (fw_version)
-               printk(KERN_INFO "p54: FW rev %s - Softmac protocol %x.%x\n",
-                       fw_version, priv->fw_var >> 8, priv->fw_var & 0xff);
+               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 "p54: you are using an obsolete firmware. "
+               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");
+                      "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[4].limit = 3;
-               priv->tx_stats[5].limit = 4;
-               priv->tx_stats[6].limit = 3;
-               priv->tx_stats[7].limit = 1;
-               dev->queues = 4;
+               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;
@@ -244,13 +295,19 @@ static int p54_convert_rev0(struct ieee80211_hw *dev,
        unsigned int i, j;
        void *source, *target;
 
-       priv->curve_data = kmalloc(cd_len, GFP_KERNEL);
+       priv->curve_data = kmalloc(sizeof(*priv->curve_data) + cd_len,
+                                  GFP_KERNEL);
        if (!priv->curve_data)
                return -ENOMEM;
 
-       memcpy(priv->curve_data, curve_data, sizeof(*curve_data));
+       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 = priv->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);
@@ -290,13 +347,19 @@ static int p54_convert_rev1(struct ieee80211_hw *dev,
        unsigned int i, j;
        void *source, *target;
 
-       priv->curve_data = kmalloc(cd_len, GFP_KERNEL);
+       priv->curve_data = kzalloc(cd_len + sizeof(*priv->curve_data),
+                                  GFP_KERNEL);
        if (!priv->curve_data)
                return -ENOMEM;
 
-       memcpy(priv->curve_data, curve_data, sizeof(*curve_data));
+       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 = priv->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);
@@ -318,7 +381,132 @@ 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 int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
+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;
@@ -343,30 +531,17 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
 
                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 (data_len < 2) {
-                               err = -EINVAL;
-                               goto err;
-                       }
-
-                       if (2 + entry->data[1]*sizeof(*priv->output_limit) > data_len) {
-                               err = -EINVAL;
-                               goto err;
-                       }
-
-                       priv->output_limit = kmalloc(entry->data[1] *
-                               sizeof(*priv->output_limit), GFP_KERNEL);
-
-                       if (!priv->output_limit) {
-                               err = -ENOMEM;
+                       if (priv->output_limit)
+                               break;
+                       err = p54_convert_output_limits(dev, entry->data,
+                                                       data_len);
+                       if (err)
                                goto err;
-                       }
-
-                       memcpy(priv->output_limit, &entry->data[2],
-                              entry->data[1]*sizeof(*priv->output_limit));
-                       priv->output_limit_len = entry->data[1];
                        break;
                case PDR_PRISM_PA_CAL_CURVE_DATA: {
                        struct pda_pa_curve_data *curve_data =
@@ -384,16 +559,17 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                                err = p54_convert_rev1(dev, curve_data);
                                break;
                        default:
-                               printk(KERN_ERR "p54: unknown curve data "
+                               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) {
@@ -404,6 +580,9 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                        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) {
@@ -414,14 +593,71 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                        }
                        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 "p54: unknown eeprom code : 0x%x\n",
+                       printk(KERN_INFO "%s: unknown eeprom code : 0x%x\n",
+                               wiphy_name(dev->wiphy),
                                le16_to_cpu(entry->code));
                        break;
                }
@@ -431,18 +667,23 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
 
        if (!synth || !priv->iq_autocal || !priv->output_limit ||
            !priv->curve_data) {
-               printk(KERN_ERR "p54: not all required entries found in eeprom!\n");
+               printk(KERN_ERR "%s: not all required entries found in eeprom!\n",
+                       wiphy_name(dev->wiphy));
                err = -EINVAL;
                goto err;
        }
 
-       priv->rxhw = synth & 0x07;
-       if (priv->rxhw == 4)
+       priv->rxhw = synth & PDR_SYNTH_FRONTEND_MASK;
+       if (priv->rxhw == PDR_SYNTH_FRONTEND_XBOW)
                p54_init_xbow_synth(dev);
-       if (!(synth & 0x40))
+       if (!(synth & PDR_SYNTH_24_GHZ_DISABLED))
                dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &band_2GHz;
-       if (!(synth & 0x80))
+       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];
@@ -476,14 +717,26 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                priv->curve_data = NULL;
        }
 
-       printk(KERN_ERR "p54: eeprom parse failed!\n");
+       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)
 {
-       /* TODO: get the rssi_add & rssi_mul data from the eeprom */
-       return ((rssi * 0x83) / 64 - 400) / 4;
+       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)
@@ -494,20 +747,35 @@ static int p54_rx_data(struct ieee80211_hw *dev, struct sk_buff *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))) {
-               if (priv->filter_flags & FIF_FCSFAIL)
-                       rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
-               else
-                       return 0;
+               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;
-       /* XX correct? */
-       rx_status.qual = (100 * hdr->rssi) / 127;
-       rx_status.rate_idx = (dev->conf.channel->band == IEEE80211_BAND_2GHZ ?
-                       hdr->rate : (hdr->rate - 4)) & 0xf;
+       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;
@@ -528,6 +796,9 @@ static int p54_rx_data(struct ieee80211_hw *dev, struct sk_buff *skb)
 
        ieee80211_rx_irqsafe(dev, skb, &rx_status);
 
+       queue_delayed_work(dev->workqueue, &priv->work,
+                          msecs_to_jiffies(P54_STATISTICS_UPDATE));
+
        return -1;
 }
 
@@ -540,7 +811,8 @@ static void inline p54_wake_free_queues(struct ieee80211_hw *dev)
                return ;
 
        for (i = 0; i < dev->queues; i++)
-               if (priv->tx_stats[i + 4].len < priv->tx_stats[i + 4].limit)
+               if (priv->tx_stats[i + P54_QUEUE_DATA].len <
+                   priv->tx_stats[i + P54_QUEUE_DATA].limit)
                        ieee80211_wake_queue(dev, i);
 }
 
@@ -548,11 +820,16 @@ void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb)
 {
        struct p54_common *priv = dev->priv;
        struct ieee80211_tx_info *info;
-       struct memrecord *range;
+       struct p54_tx_info *range;
        unsigned long flags;
-       u32 freed = 0, last_addr = priv->rx_start;
 
-       if (!skb || !dev)
+       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);
@@ -560,73 +837,104 @@ void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb)
        range = (void *)info->rate_driver_data;
        if (skb->prev != (struct sk_buff *)&priv->tx_queue) {
                struct ieee80211_tx_info *ni;
-               struct memrecord *mr;
+               struct p54_tx_info *mr;
 
                ni = IEEE80211_SKB_CB(skb->prev);
-               mr = (struct memrecord *)ni->rate_driver_data;
-               last_addr = mr->end_addr;
+               mr = (struct p54_tx_info *)ni->rate_driver_data;
        }
        if (skb->next != (struct sk_buff *)&priv->tx_queue) {
                struct ieee80211_tx_info *ni;
-               struct memrecord *mr;
+               struct p54_tx_info *mr;
 
                ni = IEEE80211_SKB_CB(skb->next);
-               mr = (struct memrecord *)ni->rate_driver_data;
-               freed = mr->start_addr - last_addr;
-       } else
-               freed = priv->rx_end - last_addr;
+               mr = (struct p54_tx_info *)ni->rate_driver_data;
+       }
        __skb_unlink(skb, &priv->tx_queue);
        spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
-       kfree_skb(skb);
-
-       if (freed >= priv->headroom + sizeof(struct p54_hdr) + 48 +
-                    IEEE80211_MAX_RTS_THRESHOLD + priv->tailroom)
-               p54_wake_free_queues(dev);
+       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 = (struct sk_buff *) priv->tx_queue.next;
+       struct sk_buff *entry;
        u32 addr = le32_to_cpu(hdr->req_id) - priv->headroom;
-       struct memrecord *range = NULL;
-       u32 freed = 0;
-       u32 last_addr = priv->rx_start;
+       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;
-               int pad = 0;
+               unsigned int pad = 0, frame_len;
 
                range = (void *)info->rate_driver_data;
                if (range->start_addr != addr) {
-                       last_addr = range->end_addr;
                        entry = entry->next;
                        continue;
                }
 
                if (entry->next != (struct sk_buff *)&priv->tx_queue) {
                        struct ieee80211_tx_info *ni;
-                       struct memrecord *mr;
+                       struct p54_tx_info *mr;
 
                        ni = IEEE80211_SKB_CB(entry->next);
-                       mr = (struct memrecord *)ni->rate_driver_data;
-                       freed = mr->start_addr - last_addr;
-               } else
-                       freed = priv->rx_end - last_addr;
+                       mr = (struct p54_tx_info *)ni->rate_driver_data;
+               }
 
-               last_addr = range->end_addr;
                __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.
                 */
@@ -636,8 +944,6 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
                BUILD_BUG_ON(offsetof(struct ieee80211_tx_info,
                                      status.ampdu_ack_len) != 23);
 
-               entry_hdr = (struct p54_hdr *) entry->data;
-               entry_data = (struct p54_tx_data *) entry_hdr->data;
                if (entry_hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))
                        pad = entry_data->align[0];
 
@@ -655,14 +961,36 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
                        }
                }
 
-               priv->tx_stats[entry_data->hw_queue].len--;
                if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
                     (!payload->status))
                        info->flags |= IEEE80211_TX_STAT_ACK;
-               if (payload->status & 0x02)
+               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;
@@ -670,9 +998,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
        spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
 
 out:
-       if (freed >= priv->headroom + sizeof(struct p54_hdr) + 48 +
-                    IEEE80211_MAX_RTS_THRESHOLD + priv->tailroom)
-               p54_wake_free_queues(dev);
+       p54_wake_free_queues(dev);
 }
 
 static void p54_rx_eeprom_readback(struct ieee80211_hw *dev,
@@ -685,7 +1011,13 @@ static void p54_rx_eeprom_readback(struct ieee80211_hw *dev,
        if (!priv->eeprom)
                return ;
 
-       memcpy(priv->eeprom, eeprom->data, le16_to_cpu(eeprom->len));
+       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);
 }
@@ -695,8 +1027,12 @@ 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 = le32_to_cpu(stats->tsf32);
+       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;
@@ -706,9 +1042,40 @@ static void p54_rx_stats(struct ieee80211_hw *dev, struct sk_buff *skb)
        priv->stats.dot11FCSErrorCount = le32_to_cpu(stats->rx_bad_fcs);
 
        priv->noise = p54_rssi_to_dbm(dev, le32_to_cpu(stats->noise));
-       complete(&priv->stats_comp);
 
-       mod_timer(&priv->stats_timer, jiffies + 5 * HZ);
+       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)
@@ -719,6 +1086,9 @@ static int p54_rx_control(struct ieee80211_hw *dev, struct sk_buff *skb)
        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:
@@ -739,9 +1109,9 @@ static int p54_rx_control(struct ieee80211_hw *dev, struct sk_buff *skb)
 /* returns zero if skb can be reused */
 int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb)
 {
-       u8 type = le16_to_cpu(*((__le16 *)skb->data)) >> 8;
+       u16 type = le16_to_cpu(*((__le16 *)skb->data));
 
-       if (type == 0x80)
+       if (type & P54_HDR_FLAG_CONTROL)
                return p54_rx_control(dev, skb);
        else
                return p54_rx_data(dev, skb);
@@ -754,17 +1124,17 @@ EXPORT_SYMBOL_GPL(p54_rx);
  * 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 frees
- * allocated areas.
+ * 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 = priv->tx_queue.next;
+       struct sk_buff *entry;
        struct sk_buff *target_skb = NULL;
        struct ieee80211_tx_info *info;
-       struct memrecord *range;
+       struct p54_tx_info *range;
        u32 last_addr = priv->rx_start;
        u32 largest_hole = 0;
        u32 target_addr = priv->rx_start;
@@ -776,7 +1146,30 @@ static int p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *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);
@@ -805,7 +1198,7 @@ static int p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb,
        if (!target_skb) {
                spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
                ieee80211_stop_queues(dev);
-               return -ENOMEM;
+               return -ENOSPC;
        }
 
        info = IEEE80211_SKB_CB(skb);
@@ -823,25 +1216,29 @@ static int p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb,
        return 0;
 }
 
-static struct sk_buff *p54_alloc_skb(struct ieee80211_hw *dev,
-               u16 hdr_flags, u16 len, u16 type, gfp_t memflags)
+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(len + priv->tx_hdr_len, memflags);
+       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(len - sizeof(*hdr));
+       hdr->len = cpu_to_le16(payload_len);
        hdr->type = cpu_to_le16(type);
        hdr->tries = hdr->rts_tries = 0;
 
-       if (unlikely(p54_assign_address(dev, skb, hdr, len))) {
+       if (p54_assign_address(dev, skb, hdr, frame_len)) {
                kfree_skb(skb);
                return NULL;
        }
@@ -851,16 +1248,21 @@ static struct sk_buff *p54_alloc_skb(struct ieee80211_hw *dev,
 int p54_read_eeprom(struct ieee80211_hw *dev)
 {
        struct p54_common *priv = dev->priv;
-       struct p54_hdr *hdr = NULL;
        struct p54_eeprom_lm86 *eeprom_hdr;
        struct sk_buff *skb;
-       size_t eeprom_size = 0x2020, offset = 0, blocksize;
+       size_t eeprom_size = 0x2020, offset = 0, blocksize, maxblocksize;
        int ret = -ENOMEM;
        void *eeprom = NULL;
 
-       skb = p54_alloc_skb(dev, 0x8000, sizeof(*hdr) + sizeof(*eeprom_hdr) +
-                           EEPROM_READBACK_LEN,
-                           P54_CONTROL_TYPE_EEPROM_READBACK, GFP_KERNEL);
+       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);
@@ -871,13 +1273,20 @@ int p54_read_eeprom(struct ieee80211_hw *dev)
                goto free;
 
        eeprom_hdr = (struct p54_eeprom_lm86 *) skb_put(skb,
-                    sizeof(*eeprom_hdr) + EEPROM_READBACK_LEN);
+                    sizeof(*eeprom_hdr) + maxblocksize);
 
        while (eeprom_size) {
-               blocksize = min(eeprom_size, (size_t)EEPROM_READBACK_LEN);
-               eeprom_hdr->offset = cpu_to_le16(offset);
-               eeprom_hdr->len = cpu_to_le16(blocksize);
-               priv->tx(dev, skb, 0);
+               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",
@@ -902,6 +1311,176 @@ free:
 }
 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);
@@ -909,34 +1488,49 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
        struct p54_common *priv = dev->priv;
        struct p54_hdr *hdr;
        struct p54_tx_data *txhdr;
-       size_t padding, len;
-       int i, j, ridx;
-       u8 rate;
+       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;
 
-       current_queue = &priv->tx_stats[skb_get_queue_mapping(skb) + 4];
-       if (unlikely(current_queue->len > current_queue->limit))
+       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)
+       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 = cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN);
-       else
-               hdr->flags = cpu_to_le16(0);
-       hdr->len = cpu_to_le16(len);
-       hdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1);
+               hdr_flags |= P54_HDR_FLAG_DATA_ALIGN;
+       hdr->type = cpu_to_le16(aid);
        hdr->rts_tries = info->control.rates[0].count;
 
        /*
@@ -1003,65 +1597,132 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
                        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->crypt_offset = 0;
        txhdr->rts_rate_idx = 0;
-       txhdr->key_type = 0;
-       txhdr->key_len = 0;
-       txhdr->hw_queue = skb_get_queue_mapping(skb) + 4;
-       txhdr->backlog = 32;
+       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;
-       txhdr->output_power = priv->output_power;
-       txhdr->cts_rate = cts_rate;
+       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))) {
-               skb_pull(skb, sizeof(*hdr) + sizeof(*txhdr) + padding);
-               return NETDEV_TX_BUSY;
-       }
-       priv->tx(dev, skb, 0);
-       return 0;
+       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, u16 mode, const u8 *bssid)
+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) +
-                           sizeof(struct p54_hdr), P54_CONTROL_TYPE_SETUP,
-                           GFP_ATOMIC);
+       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));
-       priv->mac_mode = mode;
+       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);
-       if (!bssid)
-               memset(setup->bssid, ~0, ETH_ALEN);
-       else
-               memcpy(setup->bssid, bssid, ETH_ALEN);
-       setup->rx_antenna = priv->rx_antenna;
+       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(0x15f);
+               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(500);
+               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(1000);
+               setup->v2.timer = cpu_to_le16(priv->wakeup_timer);
                setup->v2.truncate = cpu_to_le16(48896);
-               setup->v2.basic_rate_mask = cpu_to_le32(0x15f);
+               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;
@@ -1070,112 +1731,171 @@ static int p54_setup_mac(struct ieee80211_hw *dev, u16 mode, const u8 *bssid)
                setup->v2.lpf_bandwidth = cpu_to_le16(65535);
                setup->v2.osc_start_delay = cpu_to_le16(65535);
        }
-       priv->tx(dev, skb, 1);
+       priv->tx(dev, skb);
        return 0;
 }
 
-static int p54_set_freq(struct ieee80211_hw *dev, __le16 freq)
+static int p54_scan(struct ieee80211_hw *dev, u16 mode, u16 dwell)
 {
        struct p54_common *priv = dev->priv;
        struct sk_buff *skb;
-       struct p54_scan *chan;
+       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(*chan) +
-                           sizeof(struct p54_hdr), P54_CONTROL_TYPE_SCAN,
-                           GFP_ATOMIC);
+       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;
 
-       chan = (struct p54_scan *) skb_put(skb, sizeof(*chan));
-       memset(chan->padding1, 0, sizeof(chan->padding1));
-       chan->mode = cpu_to_le16(P54_SCAN_EXIT);
-       chan->dwell = cpu_to_le16(0x0);
+       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(&chan->iq_autocal, &priv->iq_autocal[i],
-                      sizeof(*priv->iq_autocal));
+               memcpy(iq_autocal, &priv->iq_autocal[i].params,
+                      sizeof(struct p54_iq_autocal_entry));
                break;
        }
        if (i == priv->iq_autocal_len)
                goto err;
 
-       for (i = 0; i < priv->output_limit_len; i++) {
-               if (priv->output_limit[i].freq != freq)
+       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;
 
-               chan->val_barker = 0x38;
-               chan->val_bpsk = chan->dup_bpsk =
-                       priv->output_limit[i].val_bpsk;
-               chan->val_qpsk = chan->dup_qpsk =
-                       priv->output_limit[i].val_qpsk;
-               chan->val_16qam = chan->dup_16qam =
-                       priv->output_limit[i].val_16qam;
-               chan->val_64qam = chan->dup_64qam =
-                       priv->output_limit[i].val_64qam;
+               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_len)
+       if (i == priv->output_limit->entries)
                goto err;
 
-       entry = priv->curve_data->data;
-       for (i = 0; i < priv->curve_data->channels; i++) {
+       entry = (void *)(priv->curve_data->data + priv->curve_data->offset);
+       for (i = 0; i < priv->curve_data->entries; i++) {
                if (*((__le16 *)entry) != freq) {
-                       entry += sizeof(__le16);
-                       entry += sizeof(struct p54_pa_curve_data_sample) *
-                                priv->curve_data->points_per_channel;
+                       entry += priv->curve_data->entry_size;
                        continue;
                }
 
-               entry += sizeof(__le16);
-               chan->pa_points_per_curve =
-                       min(priv->curve_data->points_per_channel, (u8) 8);
+               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;
 
-               memcpy(chan->curve_data, entry, sizeof(*chan->curve_data) *
-                      chan->pa_points_per_curve);
+                       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) {
-               chan->v1.rssical_mul = cpu_to_le16(130);
-               chan->v1.rssical_add = cpu_to_le16(0xfe70);
-       } else {
-               chan->v2.rssical_mul = cpu_to_le16(130);
-               chan->v2.rssical_add = cpu_to_le16(0xfe70);
-               chan->v2.basic_rate_mask = cpu_to_le32(0x15f);
-               memset(chan->v2.rts_rates, 0, 8);
+       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;
        }
-       priv->tx(dev, skb, 1);
+
+       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));
-       kfree_skb(skb);
+       p54_free_skb(dev, skb);
        return -EINVAL;
 }
 
-static int p54_set_leds(struct ieee80211_hw *dev, int mode, int link, int act)
+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) +
-                       sizeof(struct p54_hdr), P54_CONTROL_TYPE_LED,
-                       GFP_ATOMIC);
+       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->mode = cpu_to_le16(mode);
-       led->led_permanent = cpu_to_le16(link);
-       led->led_temporary = cpu_to_le16(act);
-       led->duration = cpu_to_le16(1000);
-       priv->tx(dev, skb, 1);
+       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;
 }
 
@@ -1193,9 +1913,8 @@ static int p54_set_edcf(struct ieee80211_hw *dev)
        struct sk_buff *skb;
        struct p54_edcf *edcf;
 
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*edcf) +
-                       sizeof(struct p54_hdr), P54_CONTROL_TYPE_DCFINIT,
-                       GFP_ATOMIC);
+       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*edcf),
+                           P54_CONTROL_TYPE_DCFINIT, GFP_ATOMIC);
        if (!skb)
                return -ENOMEM;
 
@@ -1212,23 +1931,125 @@ static int p54_set_edcf(struct ieee80211_hw *dev)
        /* (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, 1);
+       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_init_stats(struct ieee80211_hw *dev)
+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;
 
-       priv->cached_stats = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL,
-                       sizeof(struct p54_hdr) + sizeof(struct p54_statistics),
-                       P54_CONTROL_TYPE_STAT_READBACK, GFP_KERNEL);
-       if (!priv->cached_stats)
-                       return -ENOMEM;
+       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;
 
-       mod_timer(&priv->stats_timer, jiffies + HZ);
        return 0;
 }
 
@@ -1237,17 +2058,33 @@ 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)
-               priv->mode = NL80211_IFTYPE_MONITOR;
+       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)
-               err = p54_init_stats(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;
 }
 
@@ -1256,15 +2093,24 @@ static void p54_stop(struct ieee80211_hw *dev)
        struct p54_common *priv = dev->priv;
        struct sk_buff *skb;
 
-       del_timer(&priv->stats_timer);
-       p54_free_skb(dev, priv->cached_stats);
-       priv->cached_stats = NULL;
-       while ((skb = skb_dequeue(&priv->tx_queue)))
-               kfree_skb(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;
-       priv->mode = NL80211_IFTYPE_UNSPECIFIED;
+       mutex_unlock(&priv->conf_mutex);
 }
 
 static int p54_add_interface(struct ieee80211_hw *dev,
@@ -1272,32 +2118,29 @@ static int p54_add_interface(struct ieee80211_hw *dev,
 {
        struct p54_common *priv = dev->priv;
 
-       if (priv->mode != NL80211_IFTYPE_MONITOR)
+       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, P54_FILTER_TYPE_NONE, NULL);
-
-       switch (conf->type) {
-       case NL80211_IFTYPE_STATION:
-               p54_setup_mac(dev, P54_FILTER_TYPE_STATION, NULL);
-               break;
-       default:
-               BUG();  /* impossible */
-               break;
-       }
-
-       p54_set_leds(dev, 1, 0, 0);
-
+       p54_setup_mac(dev);
+       mutex_unlock(&priv->conf_mutex);
        return 0;
 }
 
@@ -1305,39 +2148,46 @@ 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);
-       p54_setup_mac(dev, P54_FILTER_TYPE_NONE, NULL);
+       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;
+       int ret = 0;
        struct p54_common *priv = dev->priv;
        struct ieee80211_conf *conf = &dev->conf;
 
        mutex_lock(&priv->conf_mutex);
-       priv->rx_antenna = 2; /* automatic */
-       priv->output_power = conf->power_level << 2;
-       ret = p54_set_freq(dev, cpu_to_le16(conf->channel->center_freq));
-       if (!ret)
-               ret = p54_set_edcf(dev);
-       mutex_unlock(&priv->conf_mutex);
-       return ret;
-}
-
-static int p54_config_interface(struct ieee80211_hw *dev,
-                               struct ieee80211_vif *vif,
-                               struct ieee80211_if_conf *conf)
-{
-       struct p54_common *priv = dev->priv;
+       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;
+       }
 
-       mutex_lock(&priv->conf_mutex);
-       p54_setup_mac(dev, P54_FILTER_TYPE_STATION, conf->bssid);
-       p54_set_leds(dev, 1, !is_multicast_ether_addr(conf->bssid), 0);
-       memcpy(priv->bssid, conf->bssid, ETH_ALEN);
+out:
        mutex_unlock(&priv->conf_mutex);
-       return 0;
+       return ret;
 }
 
 static void p54_configure_filter(struct ieee80211_hw *dev,
@@ -1347,39 +2197,30 @@ static void p54_configure_filter(struct ieee80211_hw *dev,
 {
        struct p54_common *priv = dev->priv;
 
-       *total_flags &= FIF_BCN_PRBRESP_PROMISC |
-                       FIF_PROMISC_IN_BSS |
-                       FIF_FCSFAIL;
+       *total_flags &= FIF_PROMISC_IN_BSS |
+                       FIF_OTHER_BSS;
 
        priv->filter_flags = *total_flags;
 
-       if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
-               if (*total_flags & FIF_BCN_PRBRESP_PROMISC)
-                       p54_setup_mac(dev, priv->mac_mode, NULL);
-               else
-                       p54_setup_mac(dev, priv->mac_mode, priv->bssid);
-       }
-
-       if (changed_flags & FIF_PROMISC_IN_BSS) {
-               if (*total_flags & FIF_PROMISC_IN_BSS)
-                       p54_setup_mac(dev, priv->mac_mode | 0x8, NULL);
-               else
-                       p54_setup_mac(dev, priv->mac_mode & ~0x8, priv->bssid);
-       }
+       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
-               return -EINVAL;
-
-       return p54_set_edcf(dev);
+               ret = -EINVAL;
+       mutex_unlock(&priv->conf_mutex);
+       return ret;
 }
 
 static int p54_init_xbow_synth(struct ieee80211_hw *dev)
@@ -1388,10 +2229,8 @@ static int p54_init_xbow_synth(struct ieee80211_hw *dev)
        struct sk_buff *skb;
        struct p54_xbow_synth *xbow;
 
-       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*xbow) +
-                           sizeof(struct p54_hdr),
-                           P54_CONTROL_TYPE_XBOW_SYNTH_CFG,
-                           GFP_KERNEL);
+       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*xbow),
+                           P54_CONTROL_TYPE_XBOW_SYNTH_CFG, GFP_KERNEL);
        if (!skb)
                return -ENOMEM;
 
@@ -1400,18 +2239,33 @@ static int p54_init_xbow_synth(struct ieee80211_hw *dev)
        xbow->magic2 = cpu_to_le16(0x2);
        xbow->freq = cpu_to_le16(5390);
        memset(xbow->padding, 0, sizeof(xbow->padding));
-       priv->tx(dev, skb, 1);
+       priv->tx(dev, skb);
        return 0;
 }
 
-static void p54_statistics_timer(unsigned long data)
+static void p54_work(struct work_struct *work)
 {
-       struct ieee80211_hw *dev = (struct ieee80211_hw *) data;
-       struct p54_common *priv = dev->priv;
+       struct p54_common *priv = container_of(work, struct p54_common,
+                                              work.work);
+       struct ieee80211_hw *dev = priv->hw;
+       struct sk_buff *skb;
 
-       BUG_ON(!priv->cached_stats);
+       if (unlikely(priv->mode == NL80211_IFTYPE_UNSPECIFIED))
+               return ;
 
-       priv->tx(dev, priv->cached_stats, 0);
+       /*
+        * 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,
@@ -1419,17 +2273,7 @@ static int p54_get_stats(struct ieee80211_hw *dev,
 {
        struct p54_common *priv = dev->priv;
 
-       del_timer(&priv->stats_timer);
-       p54_statistics_timer((unsigned long)dev);
-
-       if (!wait_for_completion_interruptible_timeout(&priv->stats_comp, HZ)) {
-               printk(KERN_ERR "%s: device does not respond!\n",
-                       wiphy_name(dev->wiphy));
-               return -EBUSY;
-       }
-
        memcpy(stats, &priv->stats, sizeof(*stats));
-
        return 0;
 }
 
@@ -1438,8 +2282,8 @@ static int p54_get_tx_stats(struct ieee80211_hw *dev,
 {
        struct p54_common *priv = dev->priv;
 
-       memcpy(stats, &priv->tx_stats[4], sizeof(stats[0]) * dev->queues);
-
+       memcpy(stats, &priv->tx_stats[P54_QUEUE_DATA],
+              sizeof(stats[0]) * dev->queues);
        return 0;
 }
 
@@ -1449,21 +2293,306 @@ static void p54_bss_info_changed(struct ieee80211_hw *dev,
                                 u32 changed)
 {
        struct p54_common *priv = dev->priv;
+       int ret;
 
-       if (changed & BSS_CHANGED_ERP_SLOT) {
+       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,
-       .config_interface       = p54_config_interface,
        .bss_info_changed       = p54_bss_info_changed,
        .configure_filter       = p54_configure_filter,
        .conf_tx                = p54_conf_tx,
@@ -1481,26 +2610,25 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
                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_HOST_BROADCAST_PS_BUFFERING | /* not sure */
-                    IEEE80211_HW_RX_INCLUDES_FCS |
+       dev->flags = IEEE80211_HW_RX_INCLUDES_FCS |
                     IEEE80211_HW_SIGNAL_DBM |
                     IEEE80211_HW_NOISE_DBM;
 
-       /*
-        * XXX: when this driver gets support for any mode that
-        *      requires beacons (AP, MESH, IBSS) then it must
-        *      implement IEEE80211_TX_CTL_ASSIGN_SEQ.
-        */
-       dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+       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[0].limit = 1;
-       priv->tx_stats[1].limit = 1;
-       priv->tx_stats[2].limit = 1;
-       priv->tx_stats[3].limit = 1;
-       priv->tx_stats[4].limit = 5;
+       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;
        /*
@@ -1518,33 +2646,43 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
 
        mutex_init(&priv->conf_mutex);
        init_completion(&priv->eeprom_comp);
-       init_completion(&priv->stats_comp);
-       setup_timer(&priv->stats_timer, p54_statistics_timer,
-               (unsigned long)dev);
+       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;
-       del_timer(&priv->stats_timer);
-       kfree_skb(priv->cached_stats);
        kfree(priv->iq_autocal);
        kfree(priv->output_limit);
        kfree(priv->curve_data);
-}
-EXPORT_SYMBOL_GPL(p54_free_common);
-
-static int __init p54_init(void)
-{
-       return 0;
-}
+       kfree(priv->used_rxkeys);
 
-static void __exit p54_exit(void)
-{
+#ifdef CONFIG_P54_LEDS
+       p54_unregister_leds(dev);
+#endif /* CONFIG_P54_LEDS */
 }
-
-module_init(p54_init);
-module_exit(p54_exit);
+EXPORT_SYMBOL_GPL(p54_free_common);