Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Oct 2008 19:48:59 +0000 (15:48 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 21:52:01 +0000 (13:52 -0800)
This updates drivers/staging/at76_usb to correspond with the latest
version previously available in wireless-testing.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/at76_usb/Kconfig
drivers/staging/at76_usb/at76_usb.c
drivers/staging/at76_usb/at76_usb.h

index 8606f96216248633a14edaf4d03d679314b6fb00..4c0e55e15448948f81de57cf306ef2727f9c7e08 100644 (file)
@@ -1,6 +1,6 @@
 config USB_ATMEL
        tristate "Atmel at76c503/at76c505/at76c505a USB cards"
-       depends on WLAN_80211 && USB
+       depends on MAC80211 && WLAN_80211 && USB
        default N
        select FW_LOADER
        ---help---
index 174e2bec922323775f9fefa99927bdc98bd71e1d..4f7ea6f6ca9b4376b27ee6e276f2fd25ff583523 100644 (file)
@@ -6,6 +6,7 @@
  * Copyright (c) 2004 Nick Jones
  * Copyright (c) 2004 Balint Seeber <n0_5p4m_p13453@hotmail.com>
  * Copyright (c) 2007 Guido Guenther <agx@sigxcpu.org>
+ * Copyright (c) 2007 Kalle Valo <kalle.valo@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * Atmel AT76C503A/505/505A.
  *
  * Some iw_handler code was taken from airo.c, (C) 1999 Benjamin Reed
+ *
+ * TODO for the mac80211 port:
+ * o adhoc support
+ * o RTS/CTS support
+ * o Power Save Mode support
+ * o support for short/long preambles
+ * o export variables through debugfs/sysfs
  */
 
 #include <linux/init.h>
@@ -36,7 +44,7 @@
 #include <net/ieee80211_radiotap.h>
 #include <linux/firmware.h>
 #include <linux/leds.h>
-#include <net/ieee80211.h>
+#include <net/mac80211.h>
 
 #include "at76_usb.h"
 
@@ -76,6 +84,8 @@
 #define DBG_WE_EVENTS          0x08000000      /* dump wireless events */
 #define DBG_FW                 0x10000000      /* firmware download */
 #define DBG_DFU                        0x20000000      /* device firmware upgrade */
+#define DBG_CMD                        0x40000000
+#define DBG_MAC80211           0x80000000
 
 #define DBG_DEFAULTS           0
 
                printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \
        } while (0)
 
+#define at76_dbg_dump(bits, buf, len, format, arg...)  \
+       do { \
+               if (at76_debug & (bits)) { \
+               printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \
+               print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, len); \
+               }                                                       \
+       } while (0)
+
 static int at76_debug = DBG_DEFAULTS;
 
+#define FIRMWARE_IS_WPA(ver) ((ver.major == 1) && (ver.minor == 103))
+
 /* Protect against concurrent firmware loading and parsing */
 static struct mutex fw_mutex;
 
 static struct fwentry firmwares[] = {
-       [0] = {""},
-       [BOARD_503_ISL3861] = {"atmel_at76c503-i3861.bin"},
-       [BOARD_503_ISL3863] = {"atmel_at76c503-i3863.bin"},
-       [BOARD_503] = {"atmel_at76c503-rfmd.bin"},
-       [BOARD_503_ACC] = {"atmel_at76c503-rfmd-acc.bin"},
-       [BOARD_505] = {"atmel_at76c505-rfmd.bin"},
-       [BOARD_505_2958] = {"atmel_at76c505-rfmd2958.bin"},
-       [BOARD_505A] = {"atmel_at76c505a-rfmd2958.bin"},
-       [BOARD_505AMX] = {"atmel_at76c505amx-rfmd.bin"},
+       [0] = { "" },
+       [BOARD_503_ISL3861] = { "atmel_at76c503-i3861.bin" },
+       [BOARD_503_ISL3863] = { "atmel_at76c503-i3863.bin" },
+       [BOARD_503] = { "atmel_at76c503-rfmd.bin" },
+       [BOARD_503_ACC] = { "atmel_at76c503-rfmd-acc.bin" },
+       [BOARD_505] = { "atmel_at76c505-rfmd.bin" },
+       [BOARD_505_2958] = { "atmel_at76c505-rfmd2958.bin" },
+       [BOARD_505A] = { "atmel_at76c505a-rfmd2958.bin" },
+       [BOARD_505AMX] = { "atmel_at76c505amx-rfmd.bin" },
 };
 
 #define USB_DEVICE_DATA(__ops) .driver_info = (kernel_ulong_t)(__ops)
@@ -110,133 +130,133 @@ static struct usb_device_id dev_table[] = {
         * at76c503-i3861
         */
        /* Generic AT76C503/3861 device */
-       {USB_DEVICE(0x03eb, 0x7603), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x03eb, 0x7603), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Linksys WUSB11 v2.1/v2.6 */
-       {USB_DEVICE(0x066b, 0x2211), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x066b, 0x2211), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Netgear MA101 rev. A */
-       {USB_DEVICE(0x0864, 0x4100), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x0864, 0x4100), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Tekram U300C / Allnet ALL0193 */
-       {USB_DEVICE(0x0b3b, 0x1612), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x0b3b, 0x1612), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* HP HN210W J7801A */
-       {USB_DEVICE(0x03f0, 0x011c), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x03f0, 0x011c), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Sitecom/Z-Com/Zyxel M4Y-750 */
-       {USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Dynalink/Askey WLL013 (intersil) */
-       {USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* EZ connect 11Mpbs Wireless USB Adapter SMC2662W v1 */
-       {USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* BenQ AWL300 */
-       {USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Addtron AWU-120, Compex WLU11 */
-       {USB_DEVICE(0x05dd, 0xff31), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x05dd, 0xff31), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Intel AP310 AnyPoint II USB */
-       {USB_DEVICE(0x8086, 0x0200), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x8086, 0x0200), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Dynalink L11U */
-       {USB_DEVICE(0x0d8e, 0x7100), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x0d8e, 0x7100), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* Arescom WL-210, FCC id 07J-GL2411USB */
-       {USB_DEVICE(0x0d8e, 0x7110), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x0d8e, 0x7110), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* I-O DATA WN-B11/USB */
-       {USB_DEVICE(0x04bb, 0x0919), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x04bb, 0x0919), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /* BT Voyager 1010 */
-       {USB_DEVICE(0x069a, 0x0821), USB_DEVICE_DATA(BOARD_503_ISL3861)},
+       { USB_DEVICE(0x069a, 0x0821), USB_DEVICE_DATA(BOARD_503_ISL3861) },
        /*
         * at76c503-i3863
         */
        /* Generic AT76C503/3863 device */
-       {USB_DEVICE(0x03eb, 0x7604), USB_DEVICE_DATA(BOARD_503_ISL3863)},
+       { USB_DEVICE(0x03eb, 0x7604), USB_DEVICE_DATA(BOARD_503_ISL3863) },
        /* Samsung SWL-2100U */
-       {USB_DEVICE(0x055d, 0xa000), USB_DEVICE_DATA(BOARD_503_ISL3863)},
+       { USB_DEVICE(0x055d, 0xa000), USB_DEVICE_DATA(BOARD_503_ISL3863) },
        /*
         * at76c503-rfmd
         */
        /* Generic AT76C503/RFMD device */
-       {USB_DEVICE(0x03eb, 0x7605), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x03eb, 0x7605), USB_DEVICE_DATA(BOARD_503) },
        /* Dynalink/Askey WLL013 (rfmd) */
-       {USB_DEVICE(0x069a, 0x0321), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x069a, 0x0321), USB_DEVICE_DATA(BOARD_503) },
        /* Linksys WUSB11 v2.6 */
-       {USB_DEVICE(0x077b, 0x2219), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x077b, 0x2219), USB_DEVICE_DATA(BOARD_503) },
        /* Network Everywhere NWU11B */
-       {USB_DEVICE(0x077b, 0x2227), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x077b, 0x2227), USB_DEVICE_DATA(BOARD_503) },
        /* Netgear MA101 rev. B */
-       {USB_DEVICE(0x0864, 0x4102), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x0864, 0x4102), USB_DEVICE_DATA(BOARD_503) },
        /* D-Link DWL-120 rev. E */
-       {USB_DEVICE(0x2001, 0x3200), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x2001, 0x3200), USB_DEVICE_DATA(BOARD_503) },
        /* Actiontec 802UAT1, HWU01150-01UK */
-       {USB_DEVICE(0x1668, 0x7605), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x1668, 0x7605), USB_DEVICE_DATA(BOARD_503) },
        /* AirVast W-Buddie WN210 */
-       {USB_DEVICE(0x03eb, 0x4102), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x03eb, 0x4102), USB_DEVICE_DATA(BOARD_503) },
        /* Dick Smith Electronics XH1153 802.11b USB adapter */
-       {USB_DEVICE(0x1371, 0x5743), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x1371, 0x5743), USB_DEVICE_DATA(BOARD_503) },
        /* CNet CNUSB611 */
-       {USB_DEVICE(0x1371, 0x0001), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x1371, 0x0001), USB_DEVICE_DATA(BOARD_503) },
        /* FiberLine FL-WL200U */
-       {USB_DEVICE(0x1371, 0x0002), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x1371, 0x0002), USB_DEVICE_DATA(BOARD_503) },
        /* BenQ AWL400 USB stick */
-       {USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503) },
        /* 3Com 3CRSHEW696 */
-       {USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503) },
        /* Siemens Santis ADSL WLAN USB adapter WLL 013 */
-       {USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503) },
        /* Belkin F5D6050, version 2 */
-       {USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503) },
        /* iBlitzz, BWU613 (not *B or *SB) */
-       {USB_DEVICE(0x07b8, 0xb000), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x07b8, 0xb000), USB_DEVICE_DATA(BOARD_503) },
        /* Gigabyte GN-WLBM101 */
-       {USB_DEVICE(0x1044, 0x8003), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x1044, 0x8003), USB_DEVICE_DATA(BOARD_503) },
        /* Planex GW-US11S */
-       {USB_DEVICE(0x2019, 0x3220), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x2019, 0x3220), USB_DEVICE_DATA(BOARD_503) },
        /* Internal WLAN adapter in h5[4,5]xx series iPAQs */
-       {USB_DEVICE(0x049f, 0x0032), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x049f, 0x0032), USB_DEVICE_DATA(BOARD_503) },
        /* Corega Wireless LAN USB-11 mini */
-       {USB_DEVICE(0x07aa, 0x0011), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x07aa, 0x0011), USB_DEVICE_DATA(BOARD_503) },
        /* Corega Wireless LAN USB-11 mini2 */
-       {USB_DEVICE(0x07aa, 0x0018), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x07aa, 0x0018), USB_DEVICE_DATA(BOARD_503) },
        /* Uniden PCW100 */
-       {USB_DEVICE(0x05dd, 0xff35), USB_DEVICE_DATA(BOARD_503)},
+       { USB_DEVICE(0x05dd, 0xff35), USB_DEVICE_DATA(BOARD_503) },
        /*
         * at76c503-rfmd-acc
         */
        /* SMC2664W */
-       {USB_DEVICE(0x083a, 0x3501), USB_DEVICE_DATA(BOARD_503_ACC)},
+       { USB_DEVICE(0x083a, 0x3501), USB_DEVICE_DATA(BOARD_503_ACC) },
        /* Belkin F5D6050, SMC2662W v2, SMC2662W-AR */
-       {USB_DEVICE(0x0d5c, 0xa002), USB_DEVICE_DATA(BOARD_503_ACC)},
+       { USB_DEVICE(0x0d5c, 0xa002), USB_DEVICE_DATA(BOARD_503_ACC) },
        /*
         * at76c505-rfmd
         */
        /* Generic AT76C505/RFMD */
-       {USB_DEVICE(0x03eb, 0x7606), USB_DEVICE_DATA(BOARD_505)},
+       { USB_DEVICE(0x03eb, 0x7606), USB_DEVICE_DATA(BOARD_505) },
        /*
         * at76c505-rfmd2958
         */
        /* Generic AT76C505/RFMD, OvisLink WL-1130USB */
-       {USB_DEVICE(0x03eb, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)},
+       { USB_DEVICE(0x03eb, 0x7613), USB_DEVICE_DATA(BOARD_505_2958) },
        /* Fiberline FL-WL240U */
-       {USB_DEVICE(0x1371, 0x0014), USB_DEVICE_DATA(BOARD_505_2958)},
+       { USB_DEVICE(0x1371, 0x0014), USB_DEVICE_DATA(BOARD_505_2958) },
        /* CNet CNUSB-611G */
-       {USB_DEVICE(0x1371, 0x0013), USB_DEVICE_DATA(BOARD_505_2958)},
+       { USB_DEVICE(0x1371, 0x0013), USB_DEVICE_DATA(BOARD_505_2958) },
        /* Linksys WUSB11 v2.8 */
-       {USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958)},
+       { USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958) },
        /* Xterasys XN-2122B, IBlitzz BWU613B/BWU613SB */
-       {USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958)},
+       { USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958) },
        /* Corega WLAN USB Stick 11 */
-       {USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)},
+       { USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958) },
        /* Microstar MSI Box MS6978 */
-       {USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958)},
+       { USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958) },
        /*
         * at76c505a-rfmd2958
         */
        /* Generic AT76C505A device */
-       {USB_DEVICE(0x03eb, 0x7614), USB_DEVICE_DATA(BOARD_505A)},
+       { USB_DEVICE(0x03eb, 0x7614), USB_DEVICE_DATA(BOARD_505A) },
        /* Generic AT76C505AS device */
-       {USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A)},
+       { USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A) },
        /* Siemens Gigaset USB WLAN Adapter 11 */
-       {USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A)},
+       { USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A) },
        /*
         * at76c505amx-rfmd
         */
        /* Generic AT76C505AMX device */
-       {USB_DEVICE(0x03eb, 0x7615), USB_DEVICE_DATA(BOARD_505AMX)},
-       {}
+       { USB_DEVICE(0x03eb, 0x7615), USB_DEVICE_DATA(BOARD_505AMX) },
+       { }
 };
 
 MODULE_DEVICE_TABLE(usb, dev_table);
@@ -244,26 +264,8 @@ MODULE_DEVICE_TABLE(usb, dev_table);
 /* Supported rates of this hardware, bit 7 marks basic rates */
 static const u8 hw_rates[] = { 0x82, 0x84, 0x0b, 0x16 };
 
-/* Frequency of each channel in MHz */
-static const long channel_frequency[] = {
-       2412, 2417, 2422, 2427, 2432, 2437, 2442,
-       2447, 2452, 2457, 2462, 2467, 2472, 2484
-};
-
-#define NUM_CHANNELS ARRAY_SIZE(channel_frequency)
-
 static const char *const preambles[] = { "long", "short", "auto" };
 
-static const char *const mac_states[] = {
-       [MAC_INIT] = "INIT",
-       [MAC_SCANNING] = "SCANNING",
-       [MAC_AUTH] = "AUTH",
-       [MAC_ASSOC] = "ASSOC",
-       [MAC_JOINING] = "JOINING",
-       [MAC_CONNECTED] = "CONNECTED",
-       [MAC_OWN_IBSS] = "OWN_IBSS"
-};
-
 /* Firmware download */
 /* DFU states */
 #define STATE_IDLE                     0x00
@@ -306,6 +308,11 @@ static inline int at76_is_503rfmd(enum board_type board)
        return (board == BOARD_503 || board == BOARD_503_ACC);
 }
 
+static inline int at76_is_505(enum board_type board)
+{
+       return (board == BOARD_505 || BOARD_505_2958);
+}
+
 static inline int at76_is_505a(enum board_type board)
 {
        return (board == BOARD_505A || board == BOARD_505AMX);
@@ -489,41 +496,6 @@ exit:
        return ret;
 }
 
-/* Report that the scan results are ready */
-static inline void at76_iwevent_scan_complete(struct net_device *netdev)
-{
-       union iwreq_data wrqu;
-       wrqu.data.length = 0;
-       wrqu.data.flags = 0;
-       wireless_send_event(netdev, SIOCGIWSCAN, &wrqu, NULL);
-       at76_dbg(DBG_WE_EVENTS, "%s: SIOCGIWSCAN sent", netdev->name);
-}
-
-static inline void at76_iwevent_bss_connect(struct net_device *netdev,
-                                           u8 *bssid)
-{
-       union iwreq_data wrqu;
-       wrqu.data.length = 0;
-       wrqu.data.flags = 0;
-       memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
-       wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-       wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL);
-       at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev->name,
-                __func__);
-}
-
-static inline void at76_iwevent_bss_disconnect(struct net_device *netdev)
-{
-       union iwreq_data wrqu;
-       wrqu.data.length = 0;
-       wrqu.data.flags = 0;
-       memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
-       wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-       wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL);
-       at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev->name,
-                __func__);
-}
-
 #define HEX2STR_BUFFERS 4
 #define HEX2STR_MAX_LEN 64
 #define BIN2HEX(x) ((x) < 10 ? '0' + (x) : (x) + 'A' - 10)
@@ -595,37 +567,6 @@ static void at76_ledtrig_tx_activity(void)
                mod_timer(&ledtrig_tx_timer, jiffies + HZ / 4);
 }
 
-/* Check if the given ssid is hidden */
-static inline int at76_is_hidden_ssid(u8 *ssid, int length)
-{
-       static const u8 zeros[32];
-
-       if (length == 0)
-               return 1;
-
-       if (length == 1 && ssid[0] == ' ')
-               return 1;
-
-       return (memcmp(ssid, zeros, length) == 0);
-}
-
-static inline void at76_free_bss_list(struct at76_priv *priv)
-{
-       struct list_head *next, *ptr;
-       unsigned long flags;
-
-       spin_lock_irqsave(&priv->bss_list_spinlock, flags);
-
-       priv->curr_bss = NULL;
-
-       list_for_each_safe(ptr, next, &priv->bss_list) {
-               list_del(ptr);
-               kfree(list_entry(ptr, struct bss_info, list));
-       }
-
-       spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
-}
-
 static int at76_remap(struct usb_device *udev)
 {
        int ret;
@@ -720,7 +661,7 @@ exit:
        kfree(hwcfg);
        if (ret < 0)
                printk(KERN_ERR "%s: cannot get HW Config (error %d)\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -729,15 +670,15 @@ static struct reg_domain const *at76_get_reg_domain(u16 code)
 {
        int i;
        static struct reg_domain const fd_tab[] = {
-               {0x10, "FCC (USA)", 0x7ff},     /* ch 1-11 */
-               {0x20, "IC (Canada)", 0x7ff},   /* ch 1-11 */
-               {0x30, "ETSI (most of Europe)", 0x1fff},        /* ch 1-13 */
-               {0x31, "Spain", 0x600}, /* ch 10-11 */
-               {0x32, "France", 0x1e00},       /* ch 10-13 */
-               {0x40, "MKK (Japan)", 0x2000},  /* ch 14 */
-               {0x41, "MKK1 (Japan)", 0x3fff}, /* ch 1-14 */
-               {0x50, "Israel", 0x3fc},        /* ch 3-9 */
-               {0x00, "<unknown>", 0xffffffff} /* ch 1-32 */
+               { 0x10, "FCC (USA)", 0x7ff },   /* ch 1-11 */
+               { 0x20, "IC (Canada)", 0x7ff }, /* ch 1-11 */
+               { 0x30, "ETSI (most of Europe)", 0x1fff },      /* ch 1-13 */
+               { 0x31, "Spain", 0x600 },       /* ch 10-11 */
+               { 0x32, "France", 0x1e00 },     /* ch 10-13 */
+               { 0x40, "MKK (Japan)", 0x2000 },        /* ch 14 */
+               { 0x41, "MKK1 (Japan)", 0x3fff },       /* ch 1-14 */
+               { 0x50, "Israel", 0x3fc },      /* ch 3-9 */
+               { 0x00, "<unknown>", 0xffffffff }       /* ch 1-32 */
        };
 
        /* Last entry is fallback for unknown domain code */
@@ -778,6 +719,24 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)
        return stat_buf[5];
 }
 
+#define MAKE_CMD_CASE(c) case (c): return #c
+
+static const char *at76_get_cmd_string(u8 cmd_status)
+{
+       switch (cmd_status) {
+               MAKE_CMD_CASE(CMD_SET_MIB);
+               MAKE_CMD_CASE(CMD_GET_MIB);
+               MAKE_CMD_CASE(CMD_SCAN);
+               MAKE_CMD_CASE(CMD_JOIN);
+               MAKE_CMD_CASE(CMD_START_IBSS);
+               MAKE_CMD_CASE(CMD_RADIO_ON);
+               MAKE_CMD_CASE(CMD_RADIO_OFF);
+               MAKE_CMD_CASE(CMD_STARTUP);
+       }
+
+       return "UNKNOWN";
+}
+
 static int at76_set_card_command(struct usb_device *udev, int cmd, void *buf,
                                 int buf_size)
 {
@@ -793,6 +752,10 @@ static int at76_set_card_command(struct usb_device *udev, int cmd, void *buf,
        cmd_buf->size = cpu_to_le16(buf_size);
        memcpy(cmd_buf->data, buf, buf_size);
 
+       at76_dbg_dump(DBG_CMD, cmd_buf, sizeof(struct at76_command) + buf_size,
+                     "issuing command %s (0x%02x)",
+                     at76_get_cmd_string(cmd), cmd);
+
        ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e,
                              USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
                              0, 0, cmd_buf,
@@ -830,13 +793,13 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd)
                status = at76_get_cmd_status(priv->udev, cmd);
                if (status < 0) {
                        printk(KERN_ERR "%s: at76_get_cmd_status failed: %d\n",
-                              priv->netdev->name, status);
+                              wiphy_name(priv->hw->wiphy), status);
                        break;
                }
 
                at76_dbg(DBG_WAIT_COMPLETE,
                         "%s: Waiting on cmd %d, status = %d (%s)",
-                        priv->netdev->name, cmd, status,
+                        wiphy_name(priv->hw->wiphy), cmd, status,
                         at76_get_cmd_status_string(status));
 
                if (status != CMD_STATUS_IN_PROGRESS
@@ -847,7 +810,7 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd)
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR
                               "%s: completion timeout for command %d\n",
-                              priv->netdev->name, cmd);
+                              wiphy_name(priv->hw->wiphy), cmd);
                        status = -ETIMEDOUT;
                        break;
                }
@@ -870,7 +833,7 @@ static int at76_set_mib(struct at76_priv *priv, struct set_mib_buffer *buf)
        if (ret != CMD_STATUS_COMPLETE) {
                printk(KERN_INFO
                       "%s: set_mib: at76_wait_completion failed "
-                      "with %d\n", priv->netdev->name, ret);
+                      "with %d\n", wiphy_name(priv->hw->wiphy), ret);
                ret = -EIO;
        }
 
@@ -891,7 +854,7 @@ static int at76_set_radio(struct at76_priv *priv, int enable)
        ret = at76_set_card_command(priv->udev, cmd, NULL, 0);
        if (ret < 0)
                printk(KERN_ERR "%s: at76_set_card_command(%d) failed: %d\n",
-                      priv->netdev->name, cmd, ret);
+                      wiphy_name(priv->hw->wiphy), cmd, ret);
        else
                ret = 1;
 
@@ -912,7 +875,7 @@ static int at76_set_pm_mode(struct at76_priv *priv)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (pm_mode) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -930,7 +893,7 @@ static int at76_set_associd(struct at76_priv *priv, u16 id)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (associd) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -949,7 +912,7 @@ static int at76_set_listen_interval(struct at76_priv *priv, u16 interval)
        if (ret < 0)
                printk(KERN_ERR
                       "%s: set_mib (listen_interval) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -966,7 +929,7 @@ static int at76_set_preamble(struct at76_priv *priv, u8 type)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (preamble) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -983,7 +946,7 @@ static int at76_set_frag(struct at76_priv *priv, u16 size)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (frag threshold) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -1000,7 +963,7 @@ static int at76_set_rts(struct at76_priv *priv, u16 size)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (rts) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -1017,7 +980,7 @@ static int at76_set_autorate_fallback(struct at76_priv *priv, int onoff)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (autorate fallback) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -1034,7 +997,41 @@ static int at76_add_mac_address(struct at76_priv *priv, void *addr)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (MAC_ADDR, mac_addr) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
+
+       return ret;
+}
+
+static int at76_set_tkip_bssid(struct at76_priv *priv, const void *addr)
+{
+       int ret = 0;
+
+       priv->mib_buf.type = MIB_MAC_ENCRYPTION;
+       priv->mib_buf.size = ETH_ALEN;
+       priv->mib_buf.index = offsetof(struct mib_mac_encryption, tkip_bssid);
+       memcpy(priv->mib_buf.data.addr, addr, ETH_ALEN);
+
+       ret = at76_set_mib(priv, &priv->mib_buf);
+       if (ret < 0)
+               printk(KERN_ERR "%s: set_mib (MAC_ENCRYPTION, tkip_bssid) failed: %d\n",
+                      wiphy_name(priv->hw->wiphy), ret);
+
+       return ret;
+}
+
+static int at76_reset_rsc(struct at76_priv *priv)
+{
+       int ret = 0;
+
+       priv->mib_buf.type = MIB_MAC_ENCRYPTION;
+       priv->mib_buf.size = 4 * 8;
+       priv->mib_buf.index = offsetof(struct mib_mac_encryption, key_rsc);
+       memset(priv->mib_buf.data.data, 0 , priv->mib_buf.size);
+
+       ret = at76_set_mib(priv, &priv->mib_buf);
+       if (ret < 0)
+               printk(KERN_ERR "%s: set_mib (MAC_ENCRYPTION, key_rsc) failed: %d\n",
+                      wiphy_name(priv->hw->wiphy), ret);
 
        return ret;
 }
@@ -1053,16 +1050,16 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv)
                           sizeof(struct mib_mac_addr));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_get_mib (MAC_ADDR) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                goto exit;
        }
 
        at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: mac_addr %s res 0x%x 0x%x",
-                priv->netdev->name,
+                wiphy_name(priv->hw->wiphy),
                 mac2str(m->mac_addr), m->res[0], m->res[1]);
        for (i = 0; i < ARRAY_SIZE(m->group_addr); i++)
                at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: group addr %d: %s, "
-                        "status %d", priv->netdev->name, i,
+                        "status %d", wiphy_name(priv->hw->wiphy), i,
                         mac2str(m->group_addr[i]), m->group_addr_status[i]);
 exit:
        kfree(m);
@@ -1082,13 +1079,13 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
                           sizeof(struct mib_mac_wep));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_get_mib (MAC_WEP) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                goto exit;
        }
 
        at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: priv_invoked %u def_key_id %u "
                 "key_len %u excl_unencr %u wep_icv_err %u wep_excluded %u "
-                "encr_level %u key %d", priv->netdev->name,
+                "encr_level %u key %d", wiphy_name(priv->hw->wiphy),
                 m->privacy_invoked, m->wep_default_key_id,
                 m->wep_key_mapping_len, m->exclude_unencrypted,
                 le32_to_cpu(m->wep_icv_error_count),
@@ -1100,12 +1097,51 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
 
        for (i = 0; i < WEP_KEYS; i++)
                at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: key %d: %s",
-                        priv->netdev->name, i,
+                        wiphy_name(priv->hw->wiphy), i,
                         hex2str(m->wep_default_keyvalue[i], key_len));
 exit:
        kfree(m);
 }
 
+static void at76_dump_mib_mac_encryption(struct at76_priv *priv)
+{
+       int i;
+       int ret;
+       /*int key_len;*/
+       struct mib_mac_encryption *m = kmalloc(sizeof(struct mib_mac_encryption), GFP_KERNEL);
+
+       if (!m)
+               return;
+
+       ret = at76_get_mib(priv->udev, MIB_MAC_ENCRYPTION, m,
+                          sizeof(struct mib_mac_encryption));
+       if (ret < 0) {
+               printk(KERN_ERR "%s: at76_get_mib (MAC_ENCRYPTION) failed: %d\n",
+                      wiphy_name(priv->hw->wiphy), ret);
+               goto exit;
+       }
+
+       at76_dbg(DBG_MIB, "%s: MIB MAC_ENCRYPTION: tkip_bssid %s priv_invoked %u "
+                "ciph_key_id %u grp_key_id %u excl_unencr %u "
+                "ckip_key_perm %u wep_icv_err %u wep_excluded %u",
+                wiphy_name(priv->hw->wiphy), mac2str(m->tkip_bssid),
+                m->privacy_invoked, m->cipher_default_key_id,
+                m->cipher_default_group_key_id, m->exclude_unencrypted,
+                m->ckip_key_permutation,
+                le32_to_cpu(m->wep_icv_error_count),
+                le32_to_cpu(m->wep_excluded_count));
+
+       /*key_len = (m->encryption_level == 1) ?
+           WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;*/
+
+       for (i = 0; i < CIPHER_KEYS; i++)
+               at76_dbg(DBG_MIB, "%s: MIB MAC_ENCRYPTION: key %d: %s",
+                        wiphy_name(priv->hw->wiphy), i,
+                        hex2str(m->cipher_default_keyvalue[i], CIPHER_KEY_LEN));
+exit:
+       kfree(m);
+}
+
 static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
 {
        int ret;
@@ -1119,7 +1155,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
                           sizeof(struct mib_mac_mgmt));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_get_mib (MAC_MGMT) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                goto exit;
        }
 
@@ -1130,7 +1166,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
                 "pm_mode %d ibss_change %d res %d "
                 "multi_domain_capability_implemented %d "
                 "international_roaming %d country_string %.3s",
-                priv->netdev->name, le16_to_cpu(m->beacon_period),
+                wiphy_name(priv->hw->wiphy), le16_to_cpu(m->beacon_period),
                 le16_to_cpu(m->CFP_max_duration),
                 le16_to_cpu(m->medium_occupancy_limit),
                 le16_to_cpu(m->station_id), le16_to_cpu(m->ATIM_window),
@@ -1155,7 +1191,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
        ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_get_mib (MAC) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                goto exit;
        }
 
@@ -1165,7 +1201,8 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
                 "scan_type %d scan_channel %d probe_delay %u "
                 "min_channel_time %d max_channel_time %d listen_int %d "
                 "desired_ssid %s desired_bssid %s desired_bsstype %d",
-                priv->netdev->name, le32_to_cpu(m->max_tx_msdu_lifetime),
+                wiphy_name(priv->hw->wiphy),
+                le32_to_cpu(m->max_tx_msdu_lifetime),
                 le32_to_cpu(m->max_rx_lifetime),
                 le16_to_cpu(m->frag_threshold), le16_to_cpu(m->rts_threshold),
                 le16_to_cpu(m->cwmin), le16_to_cpu(m->cwmax),
@@ -1191,7 +1228,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
        ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_get_mib (PHY) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                goto exit;
        }
 
@@ -1200,7 +1237,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
                 "mpdu_max_length %d cca_mode_supported %d operation_rate_set "
                 "0x%x 0x%x 0x%x 0x%x channel_id %d current_cca_mode %d "
                 "phy_type %d current_reg_domain %d",
-                priv->netdev->name, le32_to_cpu(m->ed_threshold),
+                wiphy_name(priv->hw->wiphy), le32_to_cpu(m->ed_threshold),
                 le16_to_cpu(m->slot_time), le16_to_cpu(m->sifs_time),
                 le16_to_cpu(m->preamble_length),
                 le16_to_cpu(m->plcp_header_length),
@@ -1224,13 +1261,14 @@ static void at76_dump_mib_local(struct at76_priv *priv)
        ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_get_mib (LOCAL) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                goto exit;
        }
 
        at76_dbg(DBG_MIB, "%s: MIB LOCAL: beacon_enable %d "
                 "txautorate_fallback %d ssid_size %d promiscuous_mode %d "
-                "preamble_type %d", priv->netdev->name, m->beacon_enable,
+                "preamble_type %d", wiphy_name(priv->hw->wiphy),
+                m->beacon_enable,
                 m->txautorate_fallback, m->ssid_size, m->promiscuous_mode,
                 m->preamble_type);
 exit:
@@ -1249,118 +1287,21 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv)
                           sizeof(struct mib_mdomain));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_get_mib (MDOMAIN) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                goto exit;
        }
 
        at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s",
-                priv->netdev->name,
+                wiphy_name(priv->hw->wiphy),
                 hex2str(m->channel_list, sizeof(m->channel_list)));
 
        at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: tx_powerlevel %s",
-                priv->netdev->name,
+                wiphy_name(priv->hw->wiphy),
                 hex2str(m->tx_powerlevel, sizeof(m->tx_powerlevel)));
 exit:
        kfree(m);
 }
 
-static int at76_get_current_bssid(struct at76_priv *priv)
-{
-       int ret = 0;
-       struct mib_mac_mgmt *mac_mgmt =
-           kmalloc(sizeof(struct mib_mac_mgmt), GFP_KERNEL);
-
-       if (!mac_mgmt) {
-               ret = -ENOMEM;
-               goto exit;
-       }
-
-       ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, mac_mgmt,
-                          sizeof(struct mib_mac_mgmt));
-       if (ret < 0) {
-               printk(KERN_ERR "%s: at76_get_mib failed: %d\n",
-                      priv->netdev->name, ret);
-               goto error;
-       }
-       memcpy(priv->bssid, mac_mgmt->current_bssid, ETH_ALEN);
-       printk(KERN_INFO "%s: using BSSID %s\n", priv->netdev->name,
-              mac2str(priv->bssid));
-error:
-       kfree(mac_mgmt);
-exit:
-       return ret;
-}
-
-static int at76_get_current_channel(struct at76_priv *priv)
-{
-       int ret = 0;
-       struct mib_phy *phy = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);
-
-       if (!phy) {
-               ret = -ENOMEM;
-               goto exit;
-       }
-       ret = at76_get_mib(priv->udev, MIB_PHY, phy, sizeof(struct mib_phy));
-       if (ret < 0) {
-               printk(KERN_ERR "%s: at76_get_mib(MIB_PHY) failed: %d\n",
-                      priv->netdev->name, ret);
-               goto error;
-       }
-       priv->channel = phy->channel_id;
-error:
-       kfree(phy);
-exit:
-       return ret;
-}
-
-/**
- * at76_start_scan - start a scan
- *
- * @use_essid - use the configured ESSID in non passive mode
- */
-static int at76_start_scan(struct at76_priv *priv, int use_essid)
-{
-       struct at76_req_scan scan;
-
-       memset(&scan, 0, sizeof(struct at76_req_scan));
-       memset(scan.bssid, 0xff, ETH_ALEN);
-
-       if (use_essid) {
-               memcpy(scan.essid, priv->essid, IW_ESSID_MAX_SIZE);
-               scan.essid_size = priv->essid_size;
-       } else
-               scan.essid_size = 0;
-
-       /* jal: why should we start at a certain channel? we do scan the whole
-          range allowed by reg domain. */
-       scan.channel = priv->channel;
-
-       /* atmelwlandriver differs between scan type 0 and 1 (active/passive)
-          For ad-hoc mode, it uses type 0 only. */
-       scan.scan_type = priv->scan_mode;
-
-       /* INFO: For probe_delay, not multiplying by 1024 as this will be
-          slightly less than min_channel_time
-          (per spec: probe delay < min. channel time) */
-       scan.min_channel_time = cpu_to_le16(priv->scan_min_time);
-       scan.max_channel_time = cpu_to_le16(priv->scan_max_time);
-       scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000);
-       scan.international_scan = 0;
-
-       /* other values are set to 0 for type 0 */
-
-       at76_dbg(DBG_PROGRESS, "%s: start_scan (use_essid = %d, intl = %d, "
-                "channel = %d, probe_delay = %d, scan_min_time = %d, "
-                "scan_max_time = %d)",
-                priv->netdev->name, use_essid,
-                scan.international_scan, scan.channel,
-                le16_to_cpu(scan.probe_delay),
-                le16_to_cpu(scan.min_channel_time),
-                le16_to_cpu(scan.max_channel_time));
-
-       return at76_set_card_command(priv->udev, CMD_SCAN, &scan, sizeof(scan));
-}
-
 /* Enable monitor mode */
 static int at76_start_monitor(struct at76_priv *priv)
 {
@@ -1381,86 +1322,6 @@ static int at76_start_monitor(struct at76_priv *priv)
        return ret;
 }
 
-static int at76_start_ibss(struct at76_priv *priv)
-{
-       struct at76_req_ibss bss;
-       int ret;
-
-       WARN_ON(priv->mac_state != MAC_OWN_IBSS);
-       if (priv->mac_state != MAC_OWN_IBSS)
-               return -EBUSY;
-
-       memset(&bss, 0, sizeof(struct at76_req_ibss));
-       memset(bss.bssid, 0xff, ETH_ALEN);
-       memcpy(bss.essid, priv->essid, IW_ESSID_MAX_SIZE);
-       bss.essid_size = priv->essid_size;
-       bss.bss_type = ADHOC_MODE;
-       bss.channel = priv->channel;
-
-       ret = at76_set_card_command(priv->udev, CMD_START_IBSS, &bss,
-                                   sizeof(struct at76_req_ibss));
-       if (ret < 0) {
-               printk(KERN_ERR "%s: start_ibss failed: %d\n",
-                      priv->netdev->name, ret);
-               return ret;
-       }
-
-       ret = at76_wait_completion(priv, CMD_START_IBSS);
-       if (ret != CMD_STATUS_COMPLETE) {
-               printk(KERN_ERR "%s: start_ibss failed to complete, %d\n",
-                      priv->netdev->name, ret);
-               return ret;
-       }
-
-       ret = at76_get_current_bssid(priv);
-       if (ret < 0)
-               return ret;
-
-       ret = at76_get_current_channel(priv);
-       if (ret < 0)
-               return ret;
-
-       /* not sure what this is good for ??? */
-       priv->mib_buf.type = MIB_MAC_MGMT;
-       priv->mib_buf.size = 1;
-       priv->mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change);
-       priv->mib_buf.data.byte = 0;
-
-       ret = at76_set_mib(priv, &priv->mib_buf);
-       if (ret < 0) {
-               printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n",
-                      priv->netdev->name, ret);
-               return ret;
-       }
-
-       netif_carrier_on(priv->netdev);
-       netif_start_queue(priv->netdev);
-       return 0;
-}
-
-/* Request card to join BSS in managed or ad-hoc mode */
-static int at76_join_bss(struct at76_priv *priv, struct bss_info *ptr)
-{
-       struct at76_req_join join;
-
-       BUG_ON(!ptr);
-
-       memset(&join, 0, sizeof(struct at76_req_join));
-       memcpy(join.bssid, ptr->bssid, ETH_ALEN);
-       memcpy(join.essid, ptr->ssid, ptr->ssid_len);
-       join.essid_size = ptr->ssid_len;
-       join.bss_type = (priv->iw_mode == IW_MODE_ADHOC ? 1 : 2);
-       join.channel = ptr->channel;
-       join.timeout = cpu_to_le16(2000);
-
-       at76_dbg(DBG_PROGRESS,
-                "%s join addr %s ssid %s type %d ch %d timeout %d",
-                priv->netdev->name, mac2str(join.bssid), join.essid,
-                join.bss_type, join.channel, le16_to_cpu(join.timeout));
-       return at76_set_card_command(priv->udev, CMD_JOIN, &join,
-                                    sizeof(struct at76_req_join));
-}
-
 /* Calculate padding from txbuf->wlength (which excludes the USB TX header),
    likely to compensate a flaw in the AT76C503A USB part ... */
 static inline int at76_calc_padding(int wlen)
@@ -1479,14 +1340,6 @@ static inline int at76_calc_padding(int wlen)
        return 0;
 }
 
-/* We are doing a lot of things here in an interrupt. Need
-   a bh handler (Watching TV with a TV card is probably
-   a good test: if you see flickers, we are doing too much.
-   Currently I do see flickers... even with our tasklet :-( )
-   Maybe because the bttv driver and usb-uhci use the same interrupt
-*/
-/* Or maybe because our BH handler is preempting bttv's BH handler.. BHs don't
- * solve everything.. (alex) */
 static void at76_rx_callback(struct urb *urb)
 {
        struct at76_priv *priv = urb->context;
@@ -1496,1926 +1349,82 @@ static void at76_rx_callback(struct urb *urb)
        return;
 }
 
-static void at76_tx_callback(struct urb *urb)
+static int at76_submit_rx_urb(struct at76_priv *priv)
 {
-       struct at76_priv *priv = urb->context;
-       struct net_device_stats *stats = &priv->stats;
-       unsigned long flags;
-       struct at76_tx_buffer *mgmt_buf;
        int ret;
+       int size;
+       struct sk_buff *skb = priv->rx_skb;
 
-       switch (urb->status) {
-       case 0:
-               stats->tx_packets++;
-               break;
-       case -ENOENT:
-       case -ECONNRESET:
-               /* urb has been unlinked */
-               return;
-       default:
-               at76_dbg(DBG_URB, "%s - nonzero tx status received: %d",
-                        __func__, urb->status);
-               stats->tx_errors++;
-               break;
+       if (!priv->rx_urb) {
+               printk(KERN_ERR "%s: %s: priv->rx_urb is NULL\n",
+                      wiphy_name(priv->hw->wiphy), __func__);
+               return -EFAULT;
        }
 
-       spin_lock_irqsave(&priv->mgmt_spinlock, flags);
-       mgmt_buf = priv->next_mgmt_bulk;
-       priv->next_mgmt_bulk = NULL;
-       spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
+       if (!skb) {
+               skb = dev_alloc_skb(sizeof(struct at76_rx_buffer));
+               if (!skb) {
+                       printk(KERN_ERR "%s: cannot allocate rx skbuff\n",
+                              wiphy_name(priv->hw->wiphy));
+                       ret = -ENOMEM;
+                       goto exit;
+               }
+               priv->rx_skb = skb;
+       } else {
+               skb_push(skb, skb_headroom(skb));
+               skb_trim(skb, 0);
+       }
 
-       if (!mgmt_buf) {
-               netif_wake_queue(priv->netdev);
-               return;
+       size = skb_tailroom(skb);
+       usb_fill_bulk_urb(priv->rx_urb, priv->udev, priv->rx_pipe,
+                         skb_put(skb, size), size, at76_rx_callback, priv);
+       ret = usb_submit_urb(priv->rx_urb, GFP_ATOMIC);
+       if (ret < 0) {
+               if (ret == -ENODEV)
+                       at76_dbg(DBG_DEVSTART,
+                                "usb_submit_urb returned -ENODEV");
+               else
+                       printk(KERN_ERR "%s: rx, usb_submit_urb failed: %d\n",
+                              wiphy_name(priv->hw->wiphy), ret);
        }
 
-       /* we don't copy the padding bytes, but add them
-          to the length */
-       memcpy(priv->bulk_out_buffer, mgmt_buf,
-              le16_to_cpu(mgmt_buf->wlength) + AT76_TX_HDRLEN);
-       usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe,
-                         priv->bulk_out_buffer,
-                         le16_to_cpu(mgmt_buf->wlength) + mgmt_buf->padding +
-                         AT76_TX_HDRLEN, at76_tx_callback, priv);
-       ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
-       if (ret)
-               printk(KERN_ERR "%s: error in tx submit urb: %d\n",
-                      priv->netdev->name, ret);
+exit:
+       if (ret < 0 && ret != -ENODEV)
+               printk(KERN_ERR "%s: cannot submit rx urb - please unload the "
+                      "driver and/or power cycle the device\n",
+                      wiphy_name(priv->hw->wiphy));
 
-       kfree(mgmt_buf);
+       return ret;
 }
 
-/* Send a management frame on bulk-out.  txbuf->wlength must be set */
-static int at76_tx_mgmt(struct at76_priv *priv, struct at76_tx_buffer *txbuf)
+/* Download external firmware */
+static int at76_load_external_fw(struct usb_device *udev, struct fwentry *fwe)
 {
-       unsigned long flags;
        int ret;
-       int urb_status;
-       void *oldbuf = NULL;
+       int op_mode;
+       int blockno = 0;
+       int bsize;
+       u8 *block;
+       u8 *buf = fwe->extfw;
+       int size = fwe->extfw_size;
 
-       netif_carrier_off(priv->netdev);        /* stop netdev watchdog */
-       netif_stop_queue(priv->netdev); /* stop tx data packets */
+       if (!buf || !size)
+               return -ENOENT;
 
-       spin_lock_irqsave(&priv->mgmt_spinlock, flags);
+       op_mode = at76_get_op_mode(udev);
+       at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
 
-       urb_status = priv->tx_urb->status;
-       if (urb_status == -EINPROGRESS) {
-               /* cannot transmit now, put in the queue */
-               oldbuf = priv->next_mgmt_bulk;
-               priv->next_mgmt_bulk = txbuf;
-       }
-       spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
-
-       if (oldbuf) {
-               /* a data/mgmt tx is already pending in the URB -
-                  if this is no error in some situations we must
-                  implement a queue or silently modify the old msg */
-               printk(KERN_ERR "%s: removed pending mgmt buffer %s\n",
-                      priv->netdev->name, hex2str(oldbuf, 64));
-               kfree(oldbuf);
-               return 0;
+       if (op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
+               dev_printk(KERN_ERR, &udev->dev, "unexpected opmode %d\n",
+                          op_mode);
+               return -EINVAL;
        }
 
-       txbuf->tx_rate = TX_RATE_1MBIT;
-       txbuf->padding = at76_calc_padding(le16_to_cpu(txbuf->wlength));
-       memset(txbuf->reserved, 0, sizeof(txbuf->reserved));
-
-       if (priv->next_mgmt_bulk)
-               printk(KERN_ERR "%s: URB status %d, but mgmt is pending\n",
-                      priv->netdev->name, urb_status);
-
-       at76_dbg(DBG_TX_MGMT,
-                "%s: tx mgmt: wlen %d tx_rate %d pad %d %s",
-                priv->netdev->name, le16_to_cpu(txbuf->wlength),
-                txbuf->tx_rate, txbuf->padding,
-                hex2str(txbuf->packet, le16_to_cpu(txbuf->wlength)));
-
-       /* txbuf was not consumed above -> send mgmt msg immediately */
-       memcpy(priv->bulk_out_buffer, txbuf,
-              le16_to_cpu(txbuf->wlength) + AT76_TX_HDRLEN);
-       usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe,
-                         priv->bulk_out_buffer,
-                         le16_to_cpu(txbuf->wlength) + txbuf->padding +
-                         AT76_TX_HDRLEN, at76_tx_callback, priv);
-       ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
-       if (ret)
-               printk(KERN_ERR "%s: error in tx submit urb: %d\n",
-                      priv->netdev->name, ret);
-
-       kfree(txbuf);
-
-       return ret;
-}
+       block = kmalloc(FW_BLOCK_SIZE, GFP_KERNEL);
+       if (!block)
+               return -ENOMEM;
 
-/* Go to the next information element */
-static inline void next_ie(struct ieee80211_info_element **ie)
-{
-       *ie = (struct ieee80211_info_element *)(&(*ie)->data[(*ie)->len]);
-}
-
-/* Challenge is the challenge string (in TLV format)
-   we got with seq_nr 2 for shared secret authentication only and
-   send in seq_nr 3 WEP encrypted to prove we have the correct WEP key;
-   otherwise it is NULL */
-static int at76_auth_req(struct at76_priv *priv, struct bss_info *bss,
-                        int seq_nr, struct ieee80211_info_element *challenge)
-{
-       struct at76_tx_buffer *tx_buffer;
-       struct ieee80211_hdr_3addr *mgmt;
-       struct ieee80211_auth *req;
-       int buf_len = (seq_nr != 3 ? AUTH_FRAME_SIZE :
-                      AUTH_FRAME_SIZE + 1 + 1 + challenge->len);
-
-       BUG_ON(!bss);
-       BUG_ON(seq_nr == 3 && !challenge);
-       tx_buffer = kmalloc(buf_len + MAX_PADDING_SIZE, GFP_ATOMIC);
-       if (!tx_buffer)
-               return -ENOMEM;
-
-       req = (struct ieee80211_auth *)tx_buffer->packet;
-       mgmt = &req->header;
-
-       /* make wireless header */
-       /* first auth msg is not encrypted, only the second (seq_nr == 3) */
-       mgmt->frame_ctl =
-           cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH |
-                       (seq_nr == 3 ? IEEE80211_FCTL_PROTECTED : 0));
-
-       mgmt->duration_id = cpu_to_le16(0x8000);
-       memcpy(mgmt->addr1, bss->bssid, ETH_ALEN);
-       memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
-       memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
-       mgmt->seq_ctl = cpu_to_le16(0);
-
-       req->algorithm = cpu_to_le16(priv->auth_mode);
-       req->transaction = cpu_to_le16(seq_nr);
-       req->status = cpu_to_le16(0);
-
-       if (seq_nr == 3)
-               memcpy(req->info_element, challenge, 1 + 1 + challenge->len);
-
-       /* init. at76_priv tx header */
-       tx_buffer->wlength = cpu_to_le16(buf_len - AT76_TX_HDRLEN);
-       at76_dbg(DBG_TX_MGMT, "%s: AuthReq bssid %s alg %d seq_nr %d",
-                priv->netdev->name, mac2str(mgmt->addr3),
-                le16_to_cpu(req->algorithm), le16_to_cpu(req->transaction));
-       if (seq_nr == 3)
-               at76_dbg(DBG_TX_MGMT, "%s: AuthReq challenge: %s ...",
-                        priv->netdev->name, hex2str(req->info_element, 18));
-
-       /* either send immediately (if no data tx is pending
-          or put it in pending list */
-       return at76_tx_mgmt(priv, tx_buffer);
-}
-
-static int at76_assoc_req(struct at76_priv *priv, struct bss_info *bss)
-{
-       struct at76_tx_buffer *tx_buffer;
-       struct ieee80211_hdr_3addr *mgmt;
-       struct ieee80211_assoc_request *req;
-       struct ieee80211_info_element *ie;
-       char *essid;
-       int essid_len;
-       u16 capa;
-
-       BUG_ON(!bss);
-
-       tx_buffer = kmalloc(ASSOCREQ_MAX_SIZE + MAX_PADDING_SIZE, GFP_ATOMIC);
-       if (!tx_buffer)
-               return -ENOMEM;
-
-       req = (struct ieee80211_assoc_request *)tx_buffer->packet;
-       mgmt = &req->header;
-       ie = req->info_element;
-
-       /* make wireless header */
-       mgmt->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                     IEEE80211_STYPE_ASSOC_REQ);
-
-       mgmt->duration_id = cpu_to_le16(0x8000);
-       memcpy(mgmt->addr1, bss->bssid, ETH_ALEN);
-       memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
-       memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
-       mgmt->seq_ctl = cpu_to_le16(0);
-
-       /* we must set the Privacy bit in the capabilities to assure an
-          Agere-based AP with optional WEP transmits encrypted frames
-          to us.  AP only set the Privacy bit in their capabilities
-          if WEP is mandatory in the BSS! */
-       capa = bss->capa;
-       if (priv->wep_enabled)
-               capa |= WLAN_CAPABILITY_PRIVACY;
-       if (priv->preamble_type != PREAMBLE_TYPE_LONG)
-               capa |= WLAN_CAPABILITY_SHORT_PREAMBLE;
-       req->capability = cpu_to_le16(capa);
-
-       req->listen_interval = cpu_to_le16(2 * bss->beacon_interval);
-
-       /* write TLV data elements */
-
-       ie->id = MFIE_TYPE_SSID;
-       ie->len = bss->ssid_len;
-       memcpy(ie->data, bss->ssid, bss->ssid_len);
-       next_ie(&ie);
-
-       ie->id = MFIE_TYPE_RATES;
-       ie->len = sizeof(hw_rates);
-       memcpy(ie->data, hw_rates, sizeof(hw_rates));
-       next_ie(&ie);           /* ie points behind the supp_rates field */
-
-       /* init. at76_priv tx header */
-       tx_buffer->wlength = cpu_to_le16((u8 *)ie - (u8 *)mgmt);
-
-       ie = req->info_element;
-       essid = ie->data;
-       essid_len = min_t(int, IW_ESSID_MAX_SIZE, ie->len);
-
-       next_ie(&ie);           /* points to IE of rates now */
-       at76_dbg(DBG_TX_MGMT,
-                "%s: AssocReq bssid %s capa 0x%04x ssid %.*s rates %s",
-                priv->netdev->name, mac2str(mgmt->addr3),
-                le16_to_cpu(req->capability), essid_len, essid,
-                hex2str(ie->data, ie->len));
-
-       /* either send immediately (if no data tx is pending
-          or put it in pending list */
-       return at76_tx_mgmt(priv, tx_buffer);
-}
-
-/* We got to check the bss_list for old entries */
-static void at76_bss_list_timeout(unsigned long par)
-{
-       struct at76_priv *priv = (struct at76_priv *)par;
-       unsigned long flags;
-       struct list_head *lptr, *nptr;
-       struct bss_info *ptr;
-
-       spin_lock_irqsave(&priv->bss_list_spinlock, flags);
-
-       list_for_each_safe(lptr, nptr, &priv->bss_list) {
-
-               ptr = list_entry(lptr, struct bss_info, list);
-
-               if (ptr != priv->curr_bss
-                   && time_after(jiffies, ptr->last_rx + BSS_LIST_TIMEOUT)) {
-                       at76_dbg(DBG_BSS_TABLE_RM,
-                                "%s: bss_list: removing old BSS %s ch %d",
-                                priv->netdev->name, mac2str(ptr->bssid),
-                                ptr->channel);
-                       list_del(&ptr->list);
-                       kfree(ptr);
-               }
-       }
-       spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
-       /* restart the timer */
-       mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
-}
-
-static inline void at76_set_mac_state(struct at76_priv *priv,
-                                     enum mac_state mac_state)
-{
-       at76_dbg(DBG_MAC_STATE, "%s state: %s", priv->netdev->name,
-                mac_states[mac_state]);
-       priv->mac_state = mac_state;
-}
-
-static void at76_dump_bss_table(struct at76_priv *priv)
-{
-       struct bss_info *ptr;
-       unsigned long flags;
-       struct list_head *lptr;
-
-       spin_lock_irqsave(&priv->bss_list_spinlock, flags);
-
-       at76_dbg(DBG_BSS_TABLE, "%s BSS table (curr=%p):", priv->netdev->name,
-                priv->curr_bss);
-
-       list_for_each(lptr, &priv->bss_list) {
-               ptr = list_entry(lptr, struct bss_info, list);
-               at76_dbg(DBG_BSS_TABLE, "0x%p: bssid %s channel %d ssid %.*s "
-                        "(%s) capa 0x%04x rates %s rssi %d link %d noise %d",
-                        ptr, mac2str(ptr->bssid), ptr->channel, ptr->ssid_len,
-                        ptr->ssid, hex2str(ptr->ssid, ptr->ssid_len),
-                        ptr->capa, hex2str(ptr->rates, ptr->rates_len),
-                        ptr->rssi, ptr->link_qual, ptr->noise_level);
-       }
-       spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
-}
-
-/* Called upon successful association to mark interface as connected */
-static void at76_work_assoc_done(struct work_struct *work)
-{
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             work_assoc_done);
-
-       mutex_lock(&priv->mtx);
-
-       WARN_ON(priv->mac_state != MAC_ASSOC);
-       WARN_ON(!priv->curr_bss);
-       if (priv->mac_state != MAC_ASSOC || !priv->curr_bss)
-               goto exit;
-
-       if (priv->iw_mode == IW_MODE_INFRA) {
-               if (priv->pm_mode != AT76_PM_OFF) {
-                       /* calculate the listen interval in units of
-                          beacon intervals of the curr_bss */
-                       u32 pm_period_beacon = (priv->pm_period >> 10) /
-                           priv->curr_bss->beacon_interval;
-
-                       pm_period_beacon = max(pm_period_beacon, 2u);
-                       pm_period_beacon = min(pm_period_beacon, 0xffffu);
-
-                       at76_dbg(DBG_PM,
-                                "%s: pm_mode %d assoc id 0x%x listen int %d",
-                                priv->netdev->name, priv->pm_mode,
-                                priv->assoc_id, pm_period_beacon);
-
-                       at76_set_associd(priv, priv->assoc_id);
-                       at76_set_listen_interval(priv, (u16)pm_period_beacon);
-               }
-               schedule_delayed_work(&priv->dwork_beacon, BEACON_TIMEOUT);
-       }
-       at76_set_pm_mode(priv);
-
-       netif_carrier_on(priv->netdev);
-       netif_wake_queue(priv->netdev);
-       at76_set_mac_state(priv, MAC_CONNECTED);
-       at76_iwevent_bss_connect(priv->netdev, priv->curr_bss->bssid);
-       at76_dbg(DBG_PROGRESS, "%s: connected to BSSID %s",
-                priv->netdev->name, mac2str(priv->curr_bss->bssid));
-
-exit:
-       mutex_unlock(&priv->mtx);
-}
-
-/* We only store the new mac address in netdev struct,
-   it gets set when the netdev is opened. */
-static int at76_set_mac_address(struct net_device *netdev, void *addr)
-{
-       struct sockaddr *mac = addr;
-       memcpy(netdev->dev_addr, mac->sa_data, ETH_ALEN);
-       return 1;
-}
-
-static struct net_device_stats *at76_get_stats(struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       return &priv->stats;
-}
-
-static struct iw_statistics *at76_get_wireless_stats(struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_IOCTL, "RETURN qual %d level %d noise %d updated %d",
-                priv->wstats.qual.qual, priv->wstats.qual.level,
-                priv->wstats.qual.noise, priv->wstats.qual.updated);
-
-       return &priv->wstats;
-}
-
-static void at76_set_multicast(struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int promisc;
-
-       promisc = ((netdev->flags & IFF_PROMISC) != 0);
-       if (promisc != priv->promisc) {
-               /* This gets called in interrupt, must reschedule */
-               priv->promisc = promisc;
-               schedule_work(&priv->work_set_promisc);
-       }
-}
-
-/* Stop all network activity, flush all pending tasks */
-static void at76_quiesce(struct at76_priv *priv)
-{
-       unsigned long flags;
-
-       netif_stop_queue(priv->netdev);
-       netif_carrier_off(priv->netdev);
-
-       at76_set_mac_state(priv, MAC_INIT);
-
-       cancel_delayed_work(&priv->dwork_get_scan);
-       cancel_delayed_work(&priv->dwork_beacon);
-       cancel_delayed_work(&priv->dwork_auth);
-       cancel_delayed_work(&priv->dwork_assoc);
-       cancel_delayed_work(&priv->dwork_restart);
-
-       spin_lock_irqsave(&priv->mgmt_spinlock, flags);
-       kfree(priv->next_mgmt_bulk);
-       priv->next_mgmt_bulk = NULL;
-       spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
-}
-
-/*******************************************************************************
- * at76_priv implementations of iw_handler functions:
- */
-static int at76_iw_handler_commit(struct net_device *netdev,
-                                 struct iw_request_info *info,
-                                 void *null, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_IOCTL, "%s %s: restarting the device", netdev->name,
-                __func__);
-
-       if (priv->mac_state != MAC_INIT)
-               at76_quiesce(priv);
-
-       /* Wait half second before the restart to process subsequent
-        * requests from the same iwconfig in a single restart */
-       schedule_delayed_work(&priv->dwork_restart, HZ / 2);
-
-       return 0;
-}
-
-static int at76_iw_handler_get_name(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   char *name, char *extra)
-{
-       strcpy(name, "IEEE 802.11b");
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWNAME - name %s", netdev->name, name);
-       return 0;
-}
-
-static int at76_iw_handler_set_freq(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   struct iw_freq *freq, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int chan = -1;
-       int ret = -EIWCOMMIT;
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - freq.m %d freq.e %d",
-                netdev->name, freq->m, freq->e);
-
-       if ((freq->e == 0) && (freq->m <= 1000))
-               /* Setting by channel number */
-               chan = freq->m;
-       else {
-               /* Setting by frequency - search the table */
-               int mult = 1;
-               int i;
-
-               for (i = 0; i < (6 - freq->e); i++)
-                       mult *= 10;
-
-               for (i = 0; i < NUM_CHANNELS; i++) {
-                       if (freq->m == (channel_frequency[i] * mult))
-                               chan = i + 1;
-               }
-       }
-
-       if (chan < 1 || !priv->domain)
-               /* non-positive channels are invalid
-                * we need a domain info to set the channel
-                * either that or an invalid frequency was
-                * provided by the user */
-               ret = -EINVAL;
-       else if (!(priv->domain->channel_map & (1 << (chan - 1)))) {
-               printk(KERN_INFO "%s: channel %d not allowed for domain %s\n",
-                      priv->netdev->name, chan, priv->domain->name);
-               ret = -EINVAL;
-       }
-
-       if (ret == -EIWCOMMIT) {
-               priv->channel = chan;
-               at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - ch %d", netdev->name,
-                        chan);
-       }
-
-       return ret;
-}
-
-static int at76_iw_handler_get_freq(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   struct iw_freq *freq, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       freq->m = priv->channel;
-       freq->e = 0;
-
-       if (priv->channel)
-               at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - freq %ld x 10e%d",
-                        netdev->name, channel_frequency[priv->channel - 1], 6);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - ch %d", netdev->name,
-                priv->channel);
-
-       return 0;
-}
-
-static int at76_iw_handler_set_mode(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   __u32 *mode, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWMODE - %d", netdev->name, *mode);
-
-       if ((*mode != IW_MODE_ADHOC) && (*mode != IW_MODE_INFRA) &&
-           (*mode != IW_MODE_MONITOR))
-               return -EINVAL;
-
-       priv->iw_mode = *mode;
-       if (priv->iw_mode != IW_MODE_INFRA)
-               priv->pm_mode = AT76_PM_OFF;
-
-       return -EIWCOMMIT;
-}
-
-static int at76_iw_handler_get_mode(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   __u32 *mode, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       *mode = priv->iw_mode;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWMODE - %d", netdev->name, *mode);
-
-       return 0;
-}
-
-static int at76_iw_handler_get_range(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_point *data, char *extra)
-{
-       /* inspired by atmel.c */
-       struct at76_priv *priv = netdev_priv(netdev);
-       struct iw_range *range = (struct iw_range *)extra;
-       int i;
-
-       data->length = sizeof(struct iw_range);
-       memset(range, 0, sizeof(struct iw_range));
-
-       /* TODO: range->throughput = xxxxxx; */
-
-       range->min_nwid = 0x0000;
-       range->max_nwid = 0x0000;
-
-       /* this driver doesn't maintain sensitivity information */
-       range->sensitivity = 0;
-
-       range->max_qual.qual = 100;
-       range->max_qual.level = 100;
-       range->max_qual.noise = 0;
-       range->max_qual.updated = IW_QUAL_NOISE_INVALID;
-
-       range->avg_qual.qual = 50;
-       range->avg_qual.level = 50;
-       range->avg_qual.noise = 0;
-       range->avg_qual.updated = IW_QUAL_NOISE_INVALID;
-
-       range->bitrate[0] = 1000000;
-       range->bitrate[1] = 2000000;
-       range->bitrate[2] = 5500000;
-       range->bitrate[3] = 11000000;
-       range->num_bitrates = 4;
-
-       range->min_rts = 0;
-       range->max_rts = MAX_RTS_THRESHOLD;
-
-       range->min_frag = MIN_FRAG_THRESHOLD;
-       range->max_frag = MAX_FRAG_THRESHOLD;
-
-       range->pmp_flags = IW_POWER_PERIOD;
-       range->pmt_flags = IW_POWER_ON;
-       range->pm_capa = IW_POWER_PERIOD | IW_POWER_ALL_R;
-
-       range->encoding_size[0] = WEP_SMALL_KEY_LEN;
-       range->encoding_size[1] = WEP_LARGE_KEY_LEN;
-       range->num_encoding_sizes = 2;
-       range->max_encoding_tokens = WEP_KEYS;
-
-       /* both WL-240U and Linksys WUSB11 v2.6 specify 15 dBm as output power
-          - take this for all (ignore antenna gains) */
-       range->txpower[0] = 15;
-       range->num_txpower = 1;
-       range->txpower_capa = IW_TXPOW_DBM;
-
-       range->we_version_source = WIRELESS_EXT;
-       range->we_version_compiled = WIRELESS_EXT;
-
-       /* same as the values used in atmel.c */
-       range->retry_capa = IW_RETRY_LIMIT;
-       range->retry_flags = IW_RETRY_LIMIT;
-       range->r_time_flags = 0;
-       range->min_retry = 1;
-       range->max_retry = 255;
-
-       range->num_channels = NUM_CHANNELS;
-       range->num_frequency = 0;
-
-       for (i = 0; i < NUM_CHANNELS; i++) {
-               /* test if channel map bit is raised */
-               if (priv->domain->channel_map & (0x1 << i)) {
-                       range->num_frequency += 1;
-
-                       range->freq[i].i = i + 1;
-                       range->freq[i].m = channel_frequency[i] * 100000;
-                       range->freq[i].e = 1;   /* freq * 10^1 */
-               }
-       }
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWRANGE", netdev->name);
-
-       return 0;
-}
-
-static int at76_iw_handler_set_spy(struct net_device *netdev,
-                                  struct iw_request_info *info,
-                                  struct iw_point *data, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = 0;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWSPY - number of addresses %d",
-                netdev->name, data->length);
-
-       spin_lock_bh(&priv->spy_spinlock);
-       ret = iw_handler_set_spy(priv->netdev, info, (union iwreq_data *)data,
-                                extra);
-       spin_unlock_bh(&priv->spy_spinlock);
-
-       return ret;
-}
-
-static int at76_iw_handler_get_spy(struct net_device *netdev,
-                                  struct iw_request_info *info,
-                                  struct iw_point *data, char *extra)
-{
-
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = 0;
-
-       spin_lock_bh(&priv->spy_spinlock);
-       ret = iw_handler_get_spy(priv->netdev, info,
-                                (union iwreq_data *)data, extra);
-       spin_unlock_bh(&priv->spy_spinlock);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWSPY - number of addresses %d",
-                netdev->name, data->length);
-
-       return ret;
-}
-
-static int at76_iw_handler_set_thrspy(struct net_device *netdev,
-                                     struct iw_request_info *info,
-                                     struct iw_point *data, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWTHRSPY - number of addresses %d)",
-                netdev->name, data->length);
-
-       spin_lock_bh(&priv->spy_spinlock);
-       ret = iw_handler_set_thrspy(netdev, info, (union iwreq_data *)data,
-                                   extra);
-       spin_unlock_bh(&priv->spy_spinlock);
-
-       return ret;
-}
-
-static int at76_iw_handler_get_thrspy(struct net_device *netdev,
-                                     struct iw_request_info *info,
-                                     struct iw_point *data, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret;
-
-       spin_lock_bh(&priv->spy_spinlock);
-       ret = iw_handler_get_thrspy(netdev, info, (union iwreq_data *)data,
-                                   extra);
-       spin_unlock_bh(&priv->spy_spinlock);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWTHRSPY - number of addresses %d)",
-                netdev->name, data->length);
-
-       return ret;
-}
-
-static int at76_iw_handler_set_wap(struct net_device *netdev,
-                                  struct iw_request_info *info,
-                                  struct sockaddr *ap_addr, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWAP - wap/bssid %s", netdev->name,
-                mac2str(ap_addr->sa_data));
-
-       /* if the incoming address == ff:ff:ff:ff:ff:ff, the user has
-          chosen any or auto AP preference */
-       if (is_broadcast_ether_addr(ap_addr->sa_data)
-           || is_zero_ether_addr(ap_addr->sa_data))
-               priv->wanted_bssid_valid = 0;
-       else {
-               /* user wants to set a preferred AP address */
-               priv->wanted_bssid_valid = 1;
-               memcpy(priv->wanted_bssid, ap_addr->sa_data, ETH_ALEN);
-       }
-
-       return -EIWCOMMIT;
-}
-
-static int at76_iw_handler_get_wap(struct net_device *netdev,
-                                  struct iw_request_info *info,
-                                  struct sockaddr *ap_addr, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       ap_addr->sa_family = ARPHRD_ETHER;
-       memcpy(ap_addr->sa_data, priv->bssid, ETH_ALEN);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWAP - wap/bssid %s", netdev->name,
-                mac2str(ap_addr->sa_data));
-
-       return 0;
-}
-
-static int at76_iw_handler_set_scan(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *wrqu, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = 0;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWSCAN", netdev->name);
-
-       if (mutex_lock_interruptible(&priv->mtx))
-               return -EINTR;
-
-       if (!netif_running(netdev)) {
-               ret = -ENETDOWN;
-               goto exit;
-       }
-
-       /* jal: we don't allow "iwlist ethX scan" while we are
-          in monitor mode */
-       if (priv->iw_mode == IW_MODE_MONITOR) {
-               ret = -EBUSY;
-               goto exit;
-       }
-
-       /* Discard old scan results */
-       if ((jiffies - priv->last_scan) > (20 * HZ))
-               priv->scan_state = SCAN_IDLE;
-       priv->last_scan = jiffies;
-
-       /* Initiate a scan command */
-       if (priv->scan_state == SCAN_IN_PROGRESS) {
-               ret = -EBUSY;
-               goto exit;
-       }
-
-       priv->scan_state = SCAN_IN_PROGRESS;
-
-       at76_quiesce(priv);
-
-       /* Try to do passive or active scan if WE asks as. */
-       if (wrqu->data.length
-           && wrqu->data.length == sizeof(struct iw_scan_req)) {
-               struct iw_scan_req *req = (struct iw_scan_req *)extra;
-
-               if (req->scan_type == IW_SCAN_TYPE_PASSIVE)
-                       priv->scan_mode = SCAN_TYPE_PASSIVE;
-               else if (req->scan_type == IW_SCAN_TYPE_ACTIVE)
-                       priv->scan_mode = SCAN_TYPE_ACTIVE;
-
-               /* Sanity check values? */
-               if (req->min_channel_time > 0)
-                       priv->scan_min_time = req->min_channel_time;
-
-               if (req->max_channel_time > 0)
-                       priv->scan_max_time = req->max_channel_time;
-       }
-
-       /* change to scanning state */
-       at76_set_mac_state(priv, MAC_SCANNING);
-       schedule_work(&priv->work_start_scan);
-
-exit:
-       mutex_unlock(&priv->mtx);
-       return ret;
-}
-
-static int at76_iw_handler_get_scan(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   struct iw_point *data, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       unsigned long flags;
-       struct list_head *lptr, *nptr;
-       struct bss_info *curr_bss;
-       struct iw_event *iwe = kmalloc(sizeof(struct iw_event), GFP_KERNEL);
-       char *curr_val, *curr_pos = extra;
-       int i;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWSCAN", netdev->name);
-
-       if (!iwe)
-               return -ENOMEM;
-
-       if (priv->scan_state != SCAN_COMPLETED) {
-               /* scan not yet finished */
-               kfree(iwe);
-               return -EAGAIN;
-       }
-
-       spin_lock_irqsave(&priv->bss_list_spinlock, flags);
-
-       list_for_each_safe(lptr, nptr, &priv->bss_list) {
-               curr_bss = list_entry(lptr, struct bss_info, list);
-
-               iwe->cmd = SIOCGIWAP;
-               iwe->u.ap_addr.sa_family = ARPHRD_ETHER;
-               memcpy(iwe->u.ap_addr.sa_data, curr_bss->bssid, 6);
-               curr_pos = iwe_stream_add_event(info, curr_pos,
-                                               extra + IW_SCAN_MAX_DATA, iwe,
-                                               IW_EV_ADDR_LEN);
-
-               iwe->u.data.length = curr_bss->ssid_len;
-               iwe->cmd = SIOCGIWESSID;
-               iwe->u.data.flags = 1;
-
-               curr_pos = iwe_stream_add_point(info, curr_pos,
-                                               extra + IW_SCAN_MAX_DATA, iwe,
-                                               curr_bss->ssid);
-
-               iwe->cmd = SIOCGIWMODE;
-               iwe->u.mode = (curr_bss->capa & WLAN_CAPABILITY_IBSS) ?
-                   IW_MODE_ADHOC :
-                   (curr_bss->capa & WLAN_CAPABILITY_ESS) ?
-                   IW_MODE_MASTER : IW_MODE_AUTO;
-               /* IW_MODE_AUTO = 0 which I thought is
-                * the most logical value to return in this case */
-               curr_pos = iwe_stream_add_event(info, curr_pos,
-                                               extra + IW_SCAN_MAX_DATA, iwe,
-                                               IW_EV_UINT_LEN);
-
-               iwe->cmd = SIOCGIWFREQ;
-               iwe->u.freq.m = curr_bss->channel;
-               iwe->u.freq.e = 0;
-               curr_pos = iwe_stream_add_event(info, curr_pos,
-                                               extra + IW_SCAN_MAX_DATA, iwe,
-                                               IW_EV_FREQ_LEN);
-
-               iwe->cmd = SIOCGIWENCODE;
-               if (curr_bss->capa & WLAN_CAPABILITY_PRIVACY)
-                       iwe->u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-               else
-                       iwe->u.data.flags = IW_ENCODE_DISABLED;
-
-               iwe->u.data.length = 0;
-               curr_pos = iwe_stream_add_point(info, curr_pos,
-                                               extra + IW_SCAN_MAX_DATA, iwe,
-                                               NULL);
-
-               /* Add quality statistics */
-               iwe->cmd = IWEVQUAL;
-               iwe->u.qual.noise = 0;
-               iwe->u.qual.updated =
-                   IW_QUAL_NOISE_INVALID | IW_QUAL_LEVEL_UPDATED;
-               iwe->u.qual.level = (curr_bss->rssi * 100 / 42);
-               if (iwe->u.qual.level > 100)
-                       iwe->u.qual.level = 100;
-               if (at76_is_intersil(priv->board_type))
-                       iwe->u.qual.qual = curr_bss->link_qual;
-               else {
-                       iwe->u.qual.qual = 0;
-                       iwe->u.qual.updated |= IW_QUAL_QUAL_INVALID;
-               }
-               /* Add new value to event */
-               curr_pos = iwe_stream_add_event(info, curr_pos,
-                                               extra + IW_SCAN_MAX_DATA, iwe,
-                                               IW_EV_QUAL_LEN);
-
-               /* Rate: stuffing multiple values in a single event requires
-                * a bit more of magic - Jean II */
-               curr_val = curr_pos + IW_EV_LCP_LEN;
-
-               iwe->cmd = SIOCGIWRATE;
-               /* Those two flags are ignored... */
-               iwe->u.bitrate.fixed = 0;
-               iwe->u.bitrate.disabled = 0;
-               /* Max 8 values */
-               for (i = 0; i < curr_bss->rates_len; i++) {
-                       /* Bit rate given in 500 kb/s units (+ 0x80) */
-                       iwe->u.bitrate.value =
-                           ((curr_bss->rates[i] & 0x7f) * 500000);
-                       /* Add new value to event */
-                       curr_val = iwe_stream_add_value(info, curr_pos,
-                                                       curr_val,
-                                                       extra +
-                                                       IW_SCAN_MAX_DATA, iwe,
-                                                       IW_EV_PARAM_LEN);
-               }
-
-               /* Check if we added any event */
-               if ((curr_val - curr_pos) > IW_EV_LCP_LEN)
-                       curr_pos = curr_val;
-
-               /* more information may be sent back using IWECUSTOM */
-
-       }
-
-       spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
-
-       data->length = (curr_pos - extra);
-       data->flags = 0;
-
-       kfree(iwe);
-       return 0;
-}
-
-static int at76_iw_handler_set_essid(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_point *data, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWESSID - %s", netdev->name, extra);
-
-       if (data->flags) {
-               memcpy(priv->essid, extra, data->length);
-               priv->essid_size = data->length;
-       } else
-               priv->essid_size = 0;   /* Use any SSID */
-
-       return -EIWCOMMIT;
-}
-
-static int at76_iw_handler_get_essid(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_point *data, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       if (priv->essid_size) {
-               /* not the ANY ssid in priv->essid */
-               data->flags = 1;
-               data->length = priv->essid_size;
-               memcpy(extra, priv->essid, data->length);
-       } else {
-               /* the ANY ssid was specified */
-               if (priv->mac_state == MAC_CONNECTED && priv->curr_bss) {
-                       /* report the SSID we have found */
-                       data->flags = 1;
-                       data->length = priv->curr_bss->ssid_len;
-                       memcpy(extra, priv->curr_bss->ssid, data->length);
-               } else {
-                       /* report ANY back */
-                       data->flags = 0;
-                       data->length = 0;
-               }
-       }
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWESSID - %.*s", netdev->name,
-                data->length, extra);
-
-       return 0;
-}
-
-static int at76_iw_handler_set_rate(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   struct iw_param *bitrate, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = -EIWCOMMIT;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWRATE - %d", netdev->name,
-                bitrate->value);
-
-       switch (bitrate->value) {
-       case -1:
-               priv->txrate = TX_RATE_AUTO;
-               break;          /* auto rate */
-       case 1000000:
-               priv->txrate = TX_RATE_1MBIT;
-               break;
-       case 2000000:
-               priv->txrate = TX_RATE_2MBIT;
-               break;
-       case 5500000:
-               priv->txrate = TX_RATE_5_5MBIT;
-               break;
-       case 11000000:
-               priv->txrate = TX_RATE_11MBIT;
-               break;
-       default:
-               ret = -EINVAL;
-       }
-
-       return ret;
-}
-
-static int at76_iw_handler_get_rate(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   struct iw_param *bitrate, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = 0;
-
-       switch (priv->txrate) {
-               /* return max rate if RATE_AUTO */
-       case TX_RATE_AUTO:
-               bitrate->value = 11000000;
-               break;
-       case TX_RATE_1MBIT:
-               bitrate->value = 1000000;
-               break;
-       case TX_RATE_2MBIT:
-               bitrate->value = 2000000;
-               break;
-       case TX_RATE_5_5MBIT:
-               bitrate->value = 5500000;
-               break;
-       case TX_RATE_11MBIT:
-               bitrate->value = 11000000;
-               break;
-       default:
-               ret = -EINVAL;
-       }
-
-       bitrate->fixed = (priv->txrate != TX_RATE_AUTO);
-       bitrate->disabled = 0;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWRATE - %d", netdev->name,
-                bitrate->value);
-
-       return ret;
-}
-
-static int at76_iw_handler_set_rts(struct net_device *netdev,
-                                  struct iw_request_info *info,
-                                  struct iw_param *rts, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = -EIWCOMMIT;
-       int rthr = rts->value;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWRTS - value %d disabled %s",
-                netdev->name, rts->value, (rts->disabled) ? "true" : "false");
-
-       if (rts->disabled)
-               rthr = MAX_RTS_THRESHOLD;
-
-       if ((rthr < 0) || (rthr > MAX_RTS_THRESHOLD))
-               ret = -EINVAL;
-       else
-               priv->rts_threshold = rthr;
-
-       return ret;
-}
-
-static int at76_iw_handler_get_rts(struct net_device *netdev,
-                                  struct iw_request_info *info,
-                                  struct iw_param *rts, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       rts->value = priv->rts_threshold;
-       rts->disabled = (rts->value >= MAX_RTS_THRESHOLD);
-       rts->fixed = 1;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWRTS - value %d disabled %s",
-                netdev->name, rts->value, (rts->disabled) ? "true" : "false");
-
-       return 0;
-}
-
-static int at76_iw_handler_set_frag(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   struct iw_param *frag, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = -EIWCOMMIT;
-       int fthr = frag->value;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWFRAG - value %d, disabled %s",
-                netdev->name, frag->value,
-                (frag->disabled) ? "true" : "false");
-
-       if (frag->disabled)
-               fthr = MAX_FRAG_THRESHOLD;
-
-       if ((fthr < MIN_FRAG_THRESHOLD) || (fthr > MAX_FRAG_THRESHOLD))
-               ret = -EINVAL;
-       else
-               priv->frag_threshold = fthr & ~0x1;     /* get an even value */
-
-       return ret;
-}
-
-static int at76_iw_handler_get_frag(struct net_device *netdev,
-                                   struct iw_request_info *info,
-                                   struct iw_param *frag, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       frag->value = priv->frag_threshold;
-       frag->disabled = (frag->value >= MAX_FRAG_THRESHOLD);
-       frag->fixed = 1;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWFRAG - value %d, disabled %s",
-                netdev->name, frag->value,
-                (frag->disabled) ? "true" : "false");
-
-       return 0;
-}
-
-static int at76_iw_handler_get_txpow(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_param *power, char *extra)
-{
-       power->value = 15;
-       power->fixed = 1;       /* No power control */
-       power->disabled = 0;
-       power->flags = IW_TXPOW_DBM;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWTXPOW - txpow %d dBm", netdev->name,
-                power->value);
-
-       return 0;
-}
-
-/* jal: short retry is handled by the firmware (at least 0.90.x),
-   while long retry is not (?) */
-static int at76_iw_handler_set_retry(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_param *retry, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = -EIWCOMMIT;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWRETRY disabled %d flags 0x%x val %d",
-                netdev->name, retry->disabled, retry->flags, retry->value);
-
-       if (!retry->disabled && (retry->flags & IW_RETRY_LIMIT)) {
-               if ((retry->flags & IW_RETRY_MIN) ||
-                   !(retry->flags & IW_RETRY_MAX))
-                       priv->short_retry_limit = retry->value;
-               else
-                       ret = -EINVAL;
-       } else
-               ret = -EINVAL;
-
-       return ret;
-}
-
-/* Adapted (ripped) from atmel.c */
-static int at76_iw_handler_get_retry(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_param *retry, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWRETRY", netdev->name);
-
-       retry->disabled = 0;    /* Can't be disabled */
-       retry->flags = IW_RETRY_LIMIT;
-       retry->value = priv->short_retry_limit;
-
-       return 0;
-}
-
-static int at76_iw_handler_set_encode(struct net_device *netdev,
-                                     struct iw_request_info *info,
-                                     struct iw_point *encoding, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int index = (encoding->flags & IW_ENCODE_INDEX) - 1;
-       int len = encoding->length;
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - enc.flags %08x "
-                "pointer %p len %d", netdev->name, encoding->flags,
-                encoding->pointer, encoding->length);
-       at76_dbg(DBG_IOCTL,
-                "%s: SIOCSIWENCODE - old wepstate: enabled %s key_id %d "
-                "auth_mode %s", netdev->name,
-                (priv->wep_enabled) ? "true" : "false", priv->wep_key_id,
-                (priv->auth_mode ==
-                 WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
-
-       /* take the old default key if index is invalid */
-       if ((index < 0) || (index >= WEP_KEYS))
-               index = priv->wep_key_id;
-
-       if (len > 0) {
-               if (len > WEP_LARGE_KEY_LEN)
-                       len = WEP_LARGE_KEY_LEN;
-
-               memset(priv->wep_keys[index], 0, WEP_KEY_LEN);
-               memcpy(priv->wep_keys[index], extra, len);
-               priv->wep_keys_len[index] = (len <= WEP_SMALL_KEY_LEN) ?
-                   WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;
-               priv->wep_enabled = 1;
-       }
-
-       priv->wep_key_id = index;
-       priv->wep_enabled = ((encoding->flags & IW_ENCODE_DISABLED) == 0);
-
-       if (encoding->flags & IW_ENCODE_RESTRICTED)
-               priv->auth_mode = WLAN_AUTH_SHARED_KEY;
-       if (encoding->flags & IW_ENCODE_OPEN)
-               priv->auth_mode = WLAN_AUTH_OPEN;
-
-       at76_dbg(DBG_IOCTL,
-                "%s: SIOCSIWENCODE - new wepstate: enabled %s key_id %d "
-                "key_len %d auth_mode %s", netdev->name,
-                (priv->wep_enabled) ? "true" : "false", priv->wep_key_id + 1,
-                priv->wep_keys_len[priv->wep_key_id],
-                (priv->auth_mode ==
-                 WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
-
-       return -EIWCOMMIT;
-}
-
-static int at76_iw_handler_get_encode(struct net_device *netdev,
-                                     struct iw_request_info *info,
-                                     struct iw_point *encoding, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int index = (encoding->flags & IW_ENCODE_INDEX) - 1;
-
-       if ((index < 0) || (index >= WEP_KEYS))
-               index = priv->wep_key_id;
-
-       encoding->flags =
-           (priv->auth_mode == WLAN_AUTH_SHARED_KEY) ?
-           IW_ENCODE_RESTRICTED : IW_ENCODE_OPEN;
-
-       if (!priv->wep_enabled)
-               encoding->flags |= IW_ENCODE_DISABLED;
-
-       if (encoding->pointer) {
-               encoding->length = priv->wep_keys_len[index];
-
-               memcpy(extra, priv->wep_keys[index], priv->wep_keys_len[index]);
-
-               encoding->flags |= (index + 1);
-       }
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWENCODE - enc.flags %08x "
-                "pointer %p len %d", netdev->name, encoding->flags,
-                encoding->pointer, encoding->length);
-       at76_dbg(DBG_IOCTL,
-                "%s: SIOCGIWENCODE - wepstate: enabled %s key_id %d "
-                "key_len %d auth_mode %s", netdev->name,
-                (priv->wep_enabled) ? "true" : "false", priv->wep_key_id + 1,
-                priv->wep_keys_len[priv->wep_key_id],
-                (priv->auth_mode ==
-                 WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
-
-       return 0;
-}
-
-static int at76_iw_handler_set_power(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_param *prq, char *extra)
-{
-       int err = -EIWCOMMIT;
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_IOCTL,
-                "%s: SIOCSIWPOWER - disabled %s flags 0x%x value 0x%x",
-                netdev->name, (prq->disabled) ? "true" : "false", prq->flags,
-                prq->value);
-
-       if (prq->disabled)
-               priv->pm_mode = AT76_PM_OFF;
-       else {
-               switch (prq->flags & IW_POWER_MODE) {
-               case IW_POWER_ALL_R:
-               case IW_POWER_ON:
-                       break;
-               default:
-                       err = -EINVAL;
-                       goto exit;
-               }
-               if (prq->flags & IW_POWER_PERIOD)
-                       priv->pm_period = prq->value;
-
-               if (prq->flags & IW_POWER_TIMEOUT) {
-                       err = -EINVAL;
-                       goto exit;
-               }
-               priv->pm_mode = AT76_PM_ON;
-       }
-exit:
-       return err;
-}
-
-static int at76_iw_handler_get_power(struct net_device *netdev,
-                                    struct iw_request_info *info,
-                                    struct iw_param *power, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       power->disabled = (priv->pm_mode == AT76_PM_OFF);
-       if (!power->disabled) {
-               power->flags = IW_POWER_PERIOD | IW_POWER_ALL_R;
-               power->value = priv->pm_period;
-       }
-
-       at76_dbg(DBG_IOCTL, "%s: SIOCGIWPOWER - %s flags 0x%x value 0x%x",
-                netdev->name, power->disabled ? "disabled" : "enabled",
-                power->flags, power->value);
-
-       return 0;
-}
-
-/*******************************************************************************
- * Private IOCTLS
- */
-static int at76_iw_set_short_preamble(struct net_device *netdev,
-                                     struct iw_request_info *info, char *name,
-                                     char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int val = *((int *)name);
-       int ret = -EIWCOMMIT;
-
-       at76_dbg(DBG_IOCTL, "%s: AT76_SET_SHORT_PREAMBLE, %d",
-                netdev->name, val);
-
-       if (val < PREAMBLE_TYPE_LONG || val > PREAMBLE_TYPE_AUTO)
-               ret = -EINVAL;
-       else
-               priv->preamble_type = val;
-
-       return ret;
-}
-
-static int at76_iw_get_short_preamble(struct net_device *netdev,
-                                     struct iw_request_info *info,
-                                     union iwreq_data *wrqu, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       snprintf(wrqu->name, sizeof(wrqu->name), "%s (%d)",
-                preambles[priv->preamble_type], priv->preamble_type);
-       return 0;
-}
-
-static int at76_iw_set_debug(struct net_device *netdev,
-                            struct iw_request_info *info,
-                            struct iw_point *data, char *extra)
-{
-       char *ptr;
-       u32 val;
-
-       if (data->length > 0) {
-               val = simple_strtol(extra, &ptr, 0);
-
-               if (ptr == extra)
-                       val = DBG_DEFAULTS;
-
-               at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG input %d: %s -> 0x%x",
-                        netdev->name, data->length, extra, val);
-       } else
-               val = DBG_DEFAULTS;
-
-       at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG, old 0x%x, new 0x%x",
-                netdev->name, at76_debug, val);
-
-       /* jal: some more output to pin down lockups */
-       at76_dbg(DBG_IOCTL, "%s: netif running %d queue_stopped %d "
-                "carrier_ok %d", netdev->name, netif_running(netdev),
-                netif_queue_stopped(netdev), netif_carrier_ok(netdev));
-
-       at76_debug = val;
-
-       return 0;
-}
-
-static int at76_iw_get_debug(struct net_device *netdev,
-                            struct iw_request_info *info,
-                            union iwreq_data *wrqu, char *extra)
-{
-       snprintf(wrqu->name, sizeof(wrqu->name), "0x%08x", at76_debug);
-       return 0;
-}
-
-static int at76_iw_set_powersave_mode(struct net_device *netdev,
-                                     struct iw_request_info *info, char *name,
-                                     char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int val = *((int *)name);
-       int ret = -EIWCOMMIT;
-
-       at76_dbg(DBG_IOCTL, "%s: AT76_SET_POWERSAVE_MODE, %d (%s)",
-                netdev->name, val,
-                val == AT76_PM_OFF ? "active" : val == AT76_PM_ON ? "save" :
-                val == AT76_PM_SMART ? "smart save" : "<invalid>");
-       if (val < AT76_PM_OFF || val > AT76_PM_SMART)
-               ret = -EINVAL;
-       else
-               priv->pm_mode = val;
-
-       return ret;
-}
-
-static int at76_iw_get_powersave_mode(struct net_device *netdev,
-                                     struct iw_request_info *info,
-                                     union iwreq_data *wrqu, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int *param = (int *)extra;
-
-       param[0] = priv->pm_mode;
-       return 0;
-}
-
-static int at76_iw_set_scan_times(struct net_device *netdev,
-                                 struct iw_request_info *info, char *name,
-                                 char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int mint = *((int *)name);
-       int maxt = *((int *)name + 1);
-       int ret = -EIWCOMMIT;
-
-       at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_TIMES - min %d max %d",
-                netdev->name, mint, maxt);
-       if (mint <= 0 || maxt <= 0 || mint > maxt)
-               ret = -EINVAL;
-       else {
-               priv->scan_min_time = mint;
-               priv->scan_max_time = maxt;
-       }
-
-       return ret;
-}
-
-static int at76_iw_get_scan_times(struct net_device *netdev,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *wrqu, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int *param = (int *)extra;
-
-       param[0] = priv->scan_min_time;
-       param[1] = priv->scan_max_time;
-       return 0;
-}
-
-static int at76_iw_set_scan_mode(struct net_device *netdev,
-                                struct iw_request_info *info, char *name,
-                                char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int val = *((int *)name);
-       int ret = -EIWCOMMIT;
-
-       at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_MODE - mode %s",
-                netdev->name, (val = SCAN_TYPE_ACTIVE) ? "active" :
-                (val = SCAN_TYPE_PASSIVE) ? "passive" : "<invalid>");
-
-       if (val != SCAN_TYPE_ACTIVE && val != SCAN_TYPE_PASSIVE)
-               ret = -EINVAL;
-       else
-               priv->scan_mode = val;
-
-       return ret;
-}
-
-static int at76_iw_get_scan_mode(struct net_device *netdev,
-                                struct iw_request_info *info,
-                                union iwreq_data *wrqu, char *extra)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int *param = (int *)extra;
-
-       param[0] = priv->scan_mode;
-       return 0;
-}
-
-#define AT76_SET_HANDLER(h, f) [h - SIOCIWFIRST] = (iw_handler) f
-
-/* Standard wireless handlers */
-static const iw_handler at76_handlers[] = {
-       AT76_SET_HANDLER(SIOCSIWCOMMIT, at76_iw_handler_commit),
-       AT76_SET_HANDLER(SIOCGIWNAME, at76_iw_handler_get_name),
-       AT76_SET_HANDLER(SIOCSIWFREQ, at76_iw_handler_set_freq),
-       AT76_SET_HANDLER(SIOCGIWFREQ, at76_iw_handler_get_freq),
-       AT76_SET_HANDLER(SIOCSIWMODE, at76_iw_handler_set_mode),
-       AT76_SET_HANDLER(SIOCGIWMODE, at76_iw_handler_get_mode),
-       AT76_SET_HANDLER(SIOCGIWRANGE, at76_iw_handler_get_range),
-       AT76_SET_HANDLER(SIOCSIWSPY, at76_iw_handler_set_spy),
-       AT76_SET_HANDLER(SIOCGIWSPY, at76_iw_handler_get_spy),
-       AT76_SET_HANDLER(SIOCSIWTHRSPY, at76_iw_handler_set_thrspy),
-       AT76_SET_HANDLER(SIOCGIWTHRSPY, at76_iw_handler_get_thrspy),
-       AT76_SET_HANDLER(SIOCSIWAP, at76_iw_handler_set_wap),
-       AT76_SET_HANDLER(SIOCGIWAP, at76_iw_handler_get_wap),
-       AT76_SET_HANDLER(SIOCSIWSCAN, at76_iw_handler_set_scan),
-       AT76_SET_HANDLER(SIOCGIWSCAN, at76_iw_handler_get_scan),
-       AT76_SET_HANDLER(SIOCSIWESSID, at76_iw_handler_set_essid),
-       AT76_SET_HANDLER(SIOCGIWESSID, at76_iw_handler_get_essid),
-       AT76_SET_HANDLER(SIOCSIWRATE, at76_iw_handler_set_rate),
-       AT76_SET_HANDLER(SIOCGIWRATE, at76_iw_handler_get_rate),
-       AT76_SET_HANDLER(SIOCSIWRTS, at76_iw_handler_set_rts),
-       AT76_SET_HANDLER(SIOCGIWRTS, at76_iw_handler_get_rts),
-       AT76_SET_HANDLER(SIOCSIWFRAG, at76_iw_handler_set_frag),
-       AT76_SET_HANDLER(SIOCGIWFRAG, at76_iw_handler_get_frag),
-       AT76_SET_HANDLER(SIOCGIWTXPOW, at76_iw_handler_get_txpow),
-       AT76_SET_HANDLER(SIOCSIWRETRY, at76_iw_handler_set_retry),
-       AT76_SET_HANDLER(SIOCGIWRETRY, at76_iw_handler_get_retry),
-       AT76_SET_HANDLER(SIOCSIWENCODE, at76_iw_handler_set_encode),
-       AT76_SET_HANDLER(SIOCGIWENCODE, at76_iw_handler_get_encode),
-       AT76_SET_HANDLER(SIOCSIWPOWER, at76_iw_handler_set_power),
-       AT76_SET_HANDLER(SIOCGIWPOWER, at76_iw_handler_get_power)
-};
-
-#define AT76_SET_PRIV(h, f) [h - SIOCIWFIRSTPRIV] = (iw_handler) f
-
-/* Private wireless handlers */
-static const iw_handler at76_priv_handlers[] = {
-       AT76_SET_PRIV(AT76_SET_SHORT_PREAMBLE, at76_iw_set_short_preamble),
-       AT76_SET_PRIV(AT76_GET_SHORT_PREAMBLE, at76_iw_get_short_preamble),
-       AT76_SET_PRIV(AT76_SET_DEBUG, at76_iw_set_debug),
-       AT76_SET_PRIV(AT76_GET_DEBUG, at76_iw_get_debug),
-       AT76_SET_PRIV(AT76_SET_POWERSAVE_MODE, at76_iw_set_powersave_mode),
-       AT76_SET_PRIV(AT76_GET_POWERSAVE_MODE, at76_iw_get_powersave_mode),
-       AT76_SET_PRIV(AT76_SET_SCAN_TIMES, at76_iw_set_scan_times),
-       AT76_SET_PRIV(AT76_GET_SCAN_TIMES, at76_iw_get_scan_times),
-       AT76_SET_PRIV(AT76_SET_SCAN_MODE, at76_iw_set_scan_mode),
-       AT76_SET_PRIV(AT76_GET_SCAN_MODE, at76_iw_get_scan_mode),
-};
-
-/* Names and arguments of private wireless handlers */
-static const struct iw_priv_args at76_priv_args[] = {
-       /* 0 - long, 1 - short */
-       {AT76_SET_SHORT_PREAMBLE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"},
-
-       {AT76_GET_SHORT_PREAMBLE,
-        0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_preamble"},
-
-       /* we must pass the new debug mask as a string, because iwpriv cannot
-        * parse hex numbers starting with 0x :-(  */
-       {AT76_SET_DEBUG,
-        IW_PRIV_TYPE_CHAR | 10, 0, "set_debug"},
-
-       {AT76_GET_DEBUG,
-        0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_debug"},
-
-       /* 1 - active, 2 - power save, 3 - smart power save */
-       {AT76_SET_POWERSAVE_MODE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_powersave"},
-
-       {AT76_GET_POWERSAVE_MODE,
-        0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_powersave"},
-
-       /* min_channel_time, max_channel_time */
-       {AT76_SET_SCAN_TIMES,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "set_scan_times"},
-
-       {AT76_GET_SCAN_TIMES,
-        0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, "get_scan_times"},
-
-       /* 0 - active, 1 - passive scan */
-       {AT76_SET_SCAN_MODE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_scan_mode"},
-
-       {AT76_GET_SCAN_MODE,
-        0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_scan_mode"},
-};
-
-static const struct iw_handler_def at76_handler_def = {
-       .num_standard = ARRAY_SIZE(at76_handlers),
-       .num_private = ARRAY_SIZE(at76_priv_handlers),
-       .num_private_args = ARRAY_SIZE(at76_priv_args),
-       .standard = at76_handlers,
-       .private = at76_priv_handlers,
-       .private_args = at76_priv_args,
-       .get_wireless_stats = at76_get_wireless_stats,
-};
-
-static const u8 snapsig[] = { 0xaa, 0xaa, 0x03 };
-
-/* RFC 1042 encapsulates Ethernet frames in 802.2 SNAP (0xaa, 0xaa, 0x03) with
- * a SNAP OID of 0 (0x00, 0x00, 0x00) */
-static const u8 rfc1042sig[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
-
-static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       struct net_device_stats *stats = &priv->stats;
-       int ret = 0;
-       int wlen;
-       int submit_len;
-       struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;
-       struct ieee80211_hdr_3addr *i802_11_hdr =
-           (struct ieee80211_hdr_3addr *)tx_buffer->packet;
-       u8 *payload = i802_11_hdr->payload;
-       struct ethhdr *eh = (struct ethhdr *)skb->data;
-
-       if (netif_queue_stopped(netdev)) {
-               printk(KERN_ERR "%s: %s called while netdev is stopped\n",
-                      netdev->name, __func__);
-               /* skip this packet */
-               dev_kfree_skb(skb);
-               return 0;
-       }
-
-       if (priv->tx_urb->status == -EINPROGRESS) {
-               printk(KERN_ERR "%s: %s called while tx urb is pending\n",
-                      netdev->name, __func__);
-               /* skip this packet */
-               dev_kfree_skb(skb);
-               return 0;
-       }
-
-       if (skb->len < ETH_HLEN) {
-               printk(KERN_ERR "%s: %s: skb too short (%d)\n",
-                      netdev->name, __func__, skb->len);
-               dev_kfree_skb(skb);
-               return 0;
-       }
-
-       at76_ledtrig_tx_activity();     /* tell ledtrigger we send a packet */
-
-       /* we can get rid of memcpy if we set netdev->hard_header_len to
-          reserve enough space, but we would need to keep the skb around */
-
-       if (ntohs(eh->h_proto) <= ETH_DATA_LEN) {
-               /* this is a 802.3 packet */
-               if (skb->len >= ETH_HLEN + sizeof(rfc1042sig)
-                   && skb->data[ETH_HLEN] == rfc1042sig[0]
-                   && skb->data[ETH_HLEN + 1] == rfc1042sig[1]) {
-                       /* higher layer delivered SNAP header - keep it */
-                       memcpy(payload, skb->data + ETH_HLEN,
-                              skb->len - ETH_HLEN);
-                       wlen = IEEE80211_3ADDR_LEN + skb->len - ETH_HLEN;
-               } else {
-                       printk(KERN_ERR "%s: dropping non-SNAP 802.2 packet "
-                              "(DSAP 0x%02x SSAP 0x%02x cntrl 0x%02x)\n",
-                              priv->netdev->name, skb->data[ETH_HLEN],
-                              skb->data[ETH_HLEN + 1],
-                              skb->data[ETH_HLEN + 2]);
-                       dev_kfree_skb(skb);
-                       return 0;
-               }
-       } else {
-               /* add RFC 1042 header in front */
-               memcpy(payload, rfc1042sig, sizeof(rfc1042sig));
-               memcpy(payload + sizeof(rfc1042sig), &eh->h_proto,
-                      skb->len - offsetof(struct ethhdr, h_proto));
-               wlen = IEEE80211_3ADDR_LEN + sizeof(rfc1042sig) + skb->len -
-                   offsetof(struct ethhdr, h_proto);
-       }
-
-       /* make wireless header */
-       i802_11_hdr->frame_ctl =
-           cpu_to_le16(IEEE80211_FTYPE_DATA |
-                       (priv->wep_enabled ? IEEE80211_FCTL_PROTECTED : 0) |
-                       (priv->iw_mode ==
-                        IW_MODE_INFRA ? IEEE80211_FCTL_TODS : 0));
-
-       if (priv->iw_mode == IW_MODE_ADHOC) {
-               memcpy(i802_11_hdr->addr1, eh->h_dest, ETH_ALEN);
-               memcpy(i802_11_hdr->addr2, eh->h_source, ETH_ALEN);
-               memcpy(i802_11_hdr->addr3, priv->bssid, ETH_ALEN);
-       } else if (priv->iw_mode == IW_MODE_INFRA) {
-               memcpy(i802_11_hdr->addr1, priv->bssid, ETH_ALEN);
-               memcpy(i802_11_hdr->addr2, eh->h_source, ETH_ALEN);
-               memcpy(i802_11_hdr->addr3, eh->h_dest, ETH_ALEN);
-       }
-
-       i802_11_hdr->duration_id = cpu_to_le16(0);
-       i802_11_hdr->seq_ctl = cpu_to_le16(0);
-
-       /* setup 'Atmel' header */
-       tx_buffer->wlength = cpu_to_le16(wlen);
-       tx_buffer->tx_rate = priv->txrate;
-       /* for broadcast destination addresses, the firmware 0.100.x
-          seems to choose the highest rate set with CMD_STARTUP in
-          basic_rate_set replacing this value */
-
-       memset(tx_buffer->reserved, 0, sizeof(tx_buffer->reserved));
-
-       tx_buffer->padding = at76_calc_padding(wlen);
-       submit_len = wlen + AT76_TX_HDRLEN + tx_buffer->padding;
-
-       at76_dbg(DBG_TX_DATA_CONTENT, "%s skb->data %s", priv->netdev->name,
-                hex2str(skb->data, 32));
-       at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr %s",
-                priv->netdev->name,
-                le16_to_cpu(tx_buffer->wlength),
-                tx_buffer->padding, tx_buffer->tx_rate,
-                hex2str(i802_11_hdr, sizeof(*i802_11_hdr)));
-       at76_dbg(DBG_TX_DATA_CONTENT, "%s payload %s", priv->netdev->name,
-                hex2str(payload, 48));
-
-       /* send stuff */
-       netif_stop_queue(netdev);
-       netdev->trans_start = jiffies;
-
-       usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, tx_buffer,
-                         submit_len, at76_tx_callback, priv);
-       ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
-       if (ret) {
-               stats->tx_errors++;
-               printk(KERN_ERR "%s: error in tx submit urb: %d\n",
-                      netdev->name, ret);
-               if (ret == -EINVAL)
-                       printk(KERN_ERR
-                              "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
-                              priv->netdev->name, priv->tx_urb,
-                              priv->tx_urb->hcpriv, priv->tx_urb->complete);
-       } else {
-               stats->tx_bytes += skb->len;
-               dev_kfree_skb(skb);
-       }
-
-       return ret;
-}
-
-static void at76_tx_timeout(struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       if (!priv)
-               return;
-       dev_warn(&netdev->dev, "tx timeout.");
-
-       usb_unlink_urb(priv->tx_urb);
-       priv->stats.tx_errors++;
-}
-
-static int at76_submit_rx_urb(struct at76_priv *priv)
-{
-       int ret;
-       int size;
-       struct sk_buff *skb = priv->rx_skb;
-
-       if (!priv->rx_urb) {
-               printk(KERN_ERR "%s: %s: priv->rx_urb is NULL\n",
-                      priv->netdev->name, __func__);
-               return -EFAULT;
-       }
-
-       if (!skb) {
-               skb = dev_alloc_skb(sizeof(struct at76_rx_buffer));
-               if (!skb) {
-                       printk(KERN_ERR "%s: cannot allocate rx skbuff\n",
-                              priv->netdev->name);
-                       ret = -ENOMEM;
-                       goto exit;
-               }
-               priv->rx_skb = skb;
-       } else {
-               skb_push(skb, skb_headroom(skb));
-               skb_trim(skb, 0);
-       }
-
-       size = skb_tailroom(skb);
-       usb_fill_bulk_urb(priv->rx_urb, priv->udev, priv->rx_pipe,
-                         skb_put(skb, size), size, at76_rx_callback, priv);
-       ret = usb_submit_urb(priv->rx_urb, GFP_ATOMIC);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       at76_dbg(DBG_DEVSTART,
-                                "usb_submit_urb returned -ENODEV");
-               else
-                       printk(KERN_ERR "%s: rx, usb_submit_urb failed: %d\n",
-                              priv->netdev->name, ret);
-       }
-
-exit:
-       if (ret < 0 && ret != -ENODEV)
-               printk(KERN_ERR "%s: cannot submit rx urb - please unload the "
-                      "driver and/or power cycle the device\n",
-                      priv->netdev->name);
-
-       return ret;
-}
-
-static int at76_open(struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       int ret = 0;
-
-       at76_dbg(DBG_PROC_ENTRY, "%s(): entry", __func__);
-
-       if (mutex_lock_interruptible(&priv->mtx))
-               return -EINTR;
-
-       /* if netdev->dev_addr != priv->mac_addr we must
-          set the mac address in the device ! */
-       if (compare_ether_addr(netdev->dev_addr, priv->mac_addr)) {
-               if (at76_add_mac_address(priv, netdev->dev_addr) >= 0)
-                       at76_dbg(DBG_PROGRESS, "%s: set new MAC addr %s",
-                                netdev->name, mac2str(netdev->dev_addr));
-       }
-
-       priv->scan_state = SCAN_IDLE;
-       priv->last_scan = jiffies;
-
-       ret = at76_submit_rx_urb(priv);
-       if (ret < 0) {
-               printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n",
-                      netdev->name, ret);
-               goto error;
-       }
-
-       schedule_delayed_work(&priv->dwork_restart, 0);
-
-       at76_dbg(DBG_PROC_ENTRY, "%s(): end", __func__);
-error:
-       mutex_unlock(&priv->mtx);
-       return ret < 0 ? ret : 0;
-}
-
-static int at76_stop(struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       at76_dbg(DBG_DEVSTART, "%s: ENTER", __func__);
-
-       if (mutex_lock_interruptible(&priv->mtx))
-               return -EINTR;
-
-       at76_quiesce(priv);
-
-       if (!priv->device_unplugged) {
-               /* We are called by "ifconfig ethX down", not because the
-                * device is not available anymore. */
-               at76_set_radio(priv, 0);
-
-               /* We unlink rx_urb because at76_open() re-submits it.
-                * If unplugged, at76_delete_device() takes care of it. */
-               usb_kill_urb(priv->rx_urb);
-       }
-
-       /* free the bss_list */
-       at76_free_bss_list(priv);
-
-       mutex_unlock(&priv->mtx);
-       at76_dbg(DBG_DEVSTART, "%s: EXIT", __func__);
-
-       return 0;
-}
-
-static void at76_ethtool_get_drvinfo(struct net_device *netdev,
-                                    struct ethtool_drvinfo *info)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-
-       strncpy(info->driver, DRIVER_NAME, sizeof(info->driver));
-       strncpy(info->version, DRIVER_VERSION, sizeof(info->version));
-
-       usb_make_path(priv->udev, info->bus_info, sizeof(info->bus_info));
-
-       snprintf(info->fw_version, sizeof(info->fw_version), "%d.%d.%d-%d",
-                priv->fw_version.major, priv->fw_version.minor,
-                priv->fw_version.patch, priv->fw_version.build);
-}
-
-static u32 at76_ethtool_get_link(struct net_device *netdev)
-{
-       struct at76_priv *priv = netdev_priv(netdev);
-       return priv->mac_state == MAC_CONNECTED;
-}
-
-static struct ethtool_ops at76_ethtool_ops = {
-       .get_drvinfo = at76_ethtool_get_drvinfo,
-       .get_link = at76_ethtool_get_link,
-};
-
-/* Download external firmware */
-static int at76_load_external_fw(struct usb_device *udev, struct fwentry *fwe)
-{
-       int ret;
-       int op_mode;
-       int blockno = 0;
-       int bsize;
-       u8 *block;
-       u8 *buf = fwe->extfw;
-       int size = fwe->extfw_size;
-
-       if (!buf || !size)
-               return -ENOENT;
-
-       op_mode = at76_get_op_mode(udev);
-       at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
-
-       if (op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
-               dev_printk(KERN_ERR, &udev->dev, "unexpected opmode %d\n",
-                          op_mode);
-               return -EINVAL;
-       }
-
-       block = kmalloc(FW_BLOCK_SIZE, GFP_KERNEL);
-       if (!block)
-               return -ENOMEM;
-
-       at76_dbg(DBG_DEVSTART, "downloading external firmware");
+       at76_dbg(DBG_DEVSTART, "downloading external firmware");
 
        /* for fw >= 0.100, the device needs an extra empty block */
        do {
@@ -3446,442 +1455,42 @@ exit:
        if (ret < 0)
                dev_printk(KERN_ERR, &udev->dev,
                           "downloading external firmware failed: %d\n", ret);
-       return ret;
-}
-
-/* Download internal firmware */
-static int at76_load_internal_fw(struct usb_device *udev, struct fwentry *fwe)
-{
-       int ret;
-       int need_remap = !at76_is_505a(fwe->board_type);
-
-       ret = at76_usbdfu_download(udev, fwe->intfw, fwe->intfw_size,
-                                  need_remap ? 0 : 2 * HZ);
-
-       if (ret < 0) {
-               dev_printk(KERN_ERR, &udev->dev,
-                          "downloading internal fw failed with %d\n", ret);
-               goto exit;
-       }
-
-       at76_dbg(DBG_DEVSTART, "sending REMAP");
-
-       /* no REMAP for 505A (see SF driver) */
-       if (need_remap) {
-               ret = at76_remap(udev);
-               if (ret < 0) {
-                       dev_printk(KERN_ERR, &udev->dev,
-                                  "sending REMAP failed with %d\n", ret);
-                       goto exit;
-               }
-       }
-
-       at76_dbg(DBG_DEVSTART, "sleeping for 2 seconds");
-       schedule_timeout_interruptible(2 * HZ + 1);
-       usb_reset_device(udev);
-
-exit:
-       return ret;
-}
-
-static int at76_match_essid(struct at76_priv *priv, struct bss_info *ptr)
-{
-       /* common criteria for both modi */
-
-       int ret = (priv->essid_size == 0 /* ANY ssid */  ||
-                  (priv->essid_size == ptr->ssid_len &&
-                   !memcmp(priv->essid, ptr->ssid, ptr->ssid_len)));
-       if (!ret)
-               at76_dbg(DBG_BSS_MATCH,
-                        "%s bss table entry %p: essid didn't match",
-                        priv->netdev->name, ptr);
-       return ret;
-}
-
-static inline int at76_match_mode(struct at76_priv *priv, struct bss_info *ptr)
-{
-       int ret;
-
-       if (priv->iw_mode == IW_MODE_ADHOC)
-               ret = ptr->capa & WLAN_CAPABILITY_IBSS;
-       else
-               ret = ptr->capa & WLAN_CAPABILITY_ESS;
-       if (!ret)
-               at76_dbg(DBG_BSS_MATCH,
-                        "%s bss table entry %p: mode didn't match",
-                        priv->netdev->name, ptr);
-       return ret;
-}
-
-static int at76_match_rates(struct at76_priv *priv, struct bss_info *ptr)
-{
-       int i;
-
-       for (i = 0; i < ptr->rates_len; i++) {
-               u8 rate = ptr->rates[i];
-
-               if (!(rate & 0x80))
-                       continue;
-
-               /* this is a basic rate we have to support
-                  (see IEEE802.11, ch. 7.3.2.2) */
-               if (rate != (0x80 | hw_rates[0])
-                   && rate != (0x80 | hw_rates[1])
-                   && rate != (0x80 | hw_rates[2])
-                   && rate != (0x80 | hw_rates[3])) {
-                       at76_dbg(DBG_BSS_MATCH,
-                                "%s: bss table entry %p: basic rate %02x not "
-                                "supported", priv->netdev->name, ptr, rate);
-                       return 0;
-               }
-       }
-
-       /* if we use short preamble, the bss must support it */
-       if (priv->preamble_type == PREAMBLE_TYPE_SHORT &&
-           !(ptr->capa & WLAN_CAPABILITY_SHORT_PREAMBLE)) {
-               at76_dbg(DBG_BSS_MATCH,
-                        "%s: %p does not support short preamble",
-                        priv->netdev->name, ptr);
-               return 0;
-       } else
-               return 1;
-}
-
-static inline int at76_match_wep(struct at76_priv *priv, struct bss_info *ptr)
-{
-       if (!priv->wep_enabled && ptr->capa & WLAN_CAPABILITY_PRIVACY) {
-               /* we have disabled WEP, but the BSS signals privacy */
-               at76_dbg(DBG_BSS_MATCH,
-                        "%s: bss table entry %p: requires encryption",
-                        priv->netdev->name, ptr);
-               return 0;
-       }
-       /* otherwise if the BSS does not signal privacy it may well
-          accept encrypted packets from us ... */
-       return 1;
-}
-
-static inline int at76_match_bssid(struct at76_priv *priv, struct bss_info *ptr)
-{
-       if (!priv->wanted_bssid_valid ||
-           !compare_ether_addr(ptr->bssid, priv->wanted_bssid))
-               return 1;
-
-       at76_dbg(DBG_BSS_MATCH,
-                "%s: requested bssid - %s does not match",
-                priv->netdev->name, mac2str(priv->wanted_bssid));
-       at76_dbg(DBG_BSS_MATCH,
-                "      AP bssid - %s of bss table entry %p",
-                mac2str(ptr->bssid), ptr);
-       return 0;
-}
-
-/**
- * at76_match_bss - try to find a matching bss in priv->bss
- *
- * last - last bss tried
- *
- * last == NULL signals a new round starting with priv->bss_list.next
- * this function must be called inside an acquired priv->bss_list_spinlock
- * otherwise the timeout on bss may remove the newly chosen entry
- */
-static struct bss_info *at76_match_bss(struct at76_priv *priv,
-                                      struct bss_info *last)
-{
-       struct bss_info *ptr = NULL;
-       struct list_head *curr;
-
-       curr = last ? last->list.next : priv->bss_list.next;
-       while (curr != &priv->bss_list) {
-               ptr = list_entry(curr, struct bss_info, list);
-               if (at76_match_essid(priv, ptr) && at76_match_mode(priv, ptr)
-                   && at76_match_wep(priv, ptr) && at76_match_rates(priv, ptr)
-                   && at76_match_bssid(priv, ptr))
-                       break;
-               curr = curr->next;
-       }
-
-       if (curr == &priv->bss_list)
-               ptr = NULL;
-       /* otherwise ptr points to the struct bss_info we have chosen */
-
-       at76_dbg(DBG_BSS_TABLE, "%s %s: returned %p", priv->netdev->name,
-                __func__, ptr);
-       return ptr;
-}
-
-/* Start joining a matching BSS, or create own IBSS */
-static void at76_work_join(struct work_struct *work)
-{
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             work_join);
-       int ret;
-       unsigned long flags;
-
-       mutex_lock(&priv->mtx);
-
-       WARN_ON(priv->mac_state != MAC_JOINING);
-       if (priv->mac_state != MAC_JOINING)
-               goto exit;
-
-       /* secure the access to priv->curr_bss ! */
-       spin_lock_irqsave(&priv->bss_list_spinlock, flags);
-       priv->curr_bss = at76_match_bss(priv, priv->curr_bss);
-       spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
-
-       if (!priv->curr_bss) {
-               /* here we haven't found a matching (i)bss ... */
-               if (priv->iw_mode == IW_MODE_ADHOC) {
-                       at76_set_mac_state(priv, MAC_OWN_IBSS);
-                       at76_start_ibss(priv);
-                       goto exit;
-               }
-               /* haven't found a matching BSS in infra mode - try again */
-               at76_set_mac_state(priv, MAC_SCANNING);
-               schedule_work(&priv->work_start_scan);
-               goto exit;
-       }
-
-       ret = at76_join_bss(priv, priv->curr_bss);
-       if (ret < 0) {
-               printk(KERN_ERR "%s: join_bss failed with %d\n",
-                      priv->netdev->name, ret);
-               goto exit;
-       }
-
-       ret = at76_wait_completion(priv, CMD_JOIN);
-       if (ret != CMD_STATUS_COMPLETE) {
-               if (ret != CMD_STATUS_TIME_OUT)
-                       printk(KERN_ERR "%s: join_bss completed with %d\n",
-                              priv->netdev->name, ret);
-               else
-                       printk(KERN_INFO "%s: join_bss ssid %s timed out\n",
-                              priv->netdev->name,
-                              mac2str(priv->curr_bss->bssid));
-
-               /* retry next BSS immediately */
-               schedule_work(&priv->work_join);
-               goto exit;
-       }
-
-       /* here we have joined the (I)BSS */
-       if (priv->iw_mode == IW_MODE_ADHOC) {
-               struct bss_info *bptr = priv->curr_bss;
-               at76_set_mac_state(priv, MAC_CONNECTED);
-               /* get ESSID, BSSID and channel for priv->curr_bss */
-               priv->essid_size = bptr->ssid_len;
-               memcpy(priv->essid, bptr->ssid, bptr->ssid_len);
-               memcpy(priv->bssid, bptr->bssid, ETH_ALEN);
-               priv->channel = bptr->channel;
-               at76_iwevent_bss_connect(priv->netdev, bptr->bssid);
-               netif_carrier_on(priv->netdev);
-               netif_start_queue(priv->netdev);
-               /* just to be sure */
-               cancel_delayed_work(&priv->dwork_get_scan);
-               cancel_delayed_work(&priv->dwork_auth);
-               cancel_delayed_work(&priv->dwork_assoc);
-       } else {
-               /* send auth req */
-               priv->retries = AUTH_RETRIES;
-               at76_set_mac_state(priv, MAC_AUTH);
-               at76_auth_req(priv, priv->curr_bss, 1, NULL);
-               at76_dbg(DBG_MGMT_TIMER,
-                        "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__);
-               schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT);
-       }
-
-exit:
-       mutex_unlock(&priv->mtx);
-}
-
-/* Reap scan results */
-static void at76_dwork_get_scan(struct work_struct *work)
-{
-       int status;
-       int ret;
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             dwork_get_scan.work);
-
-       mutex_lock(&priv->mtx);
-       WARN_ON(priv->mac_state != MAC_SCANNING);
-       if (priv->mac_state != MAC_SCANNING)
-               goto exit;
-
-       status = at76_get_cmd_status(priv->udev, CMD_SCAN);
-       if (status < 0) {
-               printk(KERN_ERR "%s: %s: at76_get_cmd_status failed with %d\n",
-                      priv->netdev->name, __func__, status);
-               status = CMD_STATUS_IN_PROGRESS;
-               /* INFO: Hope it was a one off error - if not, scanning
-                  further down the line and stop this cycle */
-       }
-       at76_dbg(DBG_PROGRESS,
-                "%s %s: got cmd_status %d (state %s, need_any %d)",
-                priv->netdev->name, __func__, status,
-                mac_states[priv->mac_state], priv->scan_need_any);
-
-       if (status != CMD_STATUS_COMPLETE) {
-               if ((status != CMD_STATUS_IN_PROGRESS) &&
-                   (status != CMD_STATUS_IDLE))
-                       printk(KERN_ERR "%s: %s: Bad scan status: %s\n",
-                              priv->netdev->name, __func__,
-                              at76_get_cmd_status_string(status));
-
-               /* the first cmd status after scan start is always a IDLE ->
-                  start the timer to poll again until COMPLETED */
-               at76_dbg(DBG_MGMT_TIMER,
-                        "%s:%d: starting mgmt_timer for %d ticks",
-                        __func__, __LINE__, SCAN_POLL_INTERVAL);
-               schedule_delayed_work(&priv->dwork_get_scan,
-                                     SCAN_POLL_INTERVAL);
-               goto exit;
-       }
-
-       if (at76_debug & DBG_BSS_TABLE)
-               at76_dump_bss_table(priv);
-
-       if (priv->scan_need_any) {
-               ret = at76_start_scan(priv, 0);
-               if (ret < 0)
-                       printk(KERN_ERR
-                              "%s: %s: start_scan (ANY) failed with %d\n",
-                              priv->netdev->name, __func__, ret);
-               at76_dbg(DBG_MGMT_TIMER,
-                        "%s:%d: starting mgmt_timer for %d ticks", __func__,
-                        __LINE__, SCAN_POLL_INTERVAL);
-               schedule_delayed_work(&priv->dwork_get_scan,
-                                     SCAN_POLL_INTERVAL);
-               priv->scan_need_any = 0;
-       } else {
-               priv->scan_state = SCAN_COMPLETED;
-               /* report the end of scan to user space */
-               at76_iwevent_scan_complete(priv->netdev);
-               at76_set_mac_state(priv, MAC_JOINING);
-               schedule_work(&priv->work_join);
-       }
-
-exit:
-       mutex_unlock(&priv->mtx);
-}
-
-/* Handle loss of beacons from the AP */
-static void at76_dwork_beacon(struct work_struct *work)
-{
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             dwork_beacon.work);
-
-       mutex_lock(&priv->mtx);
-       if (priv->mac_state != MAC_CONNECTED || priv->iw_mode != IW_MODE_INFRA)
-               goto exit;
-
-       /* We haven't received any beacons from out AP for BEACON_TIMEOUT */
-       printk(KERN_INFO "%s: lost beacon bssid %s\n",
-              priv->netdev->name, mac2str(priv->curr_bss->bssid));
-
-       netif_carrier_off(priv->netdev);
-       netif_stop_queue(priv->netdev);
-       at76_iwevent_bss_disconnect(priv->netdev);
-       at76_set_mac_state(priv, MAC_SCANNING);
-       schedule_work(&priv->work_start_scan);
-
-exit:
-       mutex_unlock(&priv->mtx);
-}
-
-/* Handle authentication response timeout */
-static void at76_dwork_auth(struct work_struct *work)
-{
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             dwork_auth.work);
-
-       mutex_lock(&priv->mtx);
-       WARN_ON(priv->mac_state != MAC_AUTH);
-       if (priv->mac_state != MAC_AUTH)
-               goto exit;
-
-       at76_dbg(DBG_PROGRESS, "%s: authentication response timeout",
-                priv->netdev->name);
-
-       if (priv->retries-- >= 0) {
-               at76_auth_req(priv, priv->curr_bss, 1, NULL);
-               at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
-                        __func__, __LINE__);
-               schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT);
-       } else {
-               /* try to get next matching BSS */
-               at76_set_mac_state(priv, MAC_JOINING);
-               schedule_work(&priv->work_join);
-       }
-
-exit:
-       mutex_unlock(&priv->mtx);
-}
-
-/* Handle association response timeout */
-static void at76_dwork_assoc(struct work_struct *work)
-{
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             dwork_assoc.work);
-
-       mutex_lock(&priv->mtx);
-       WARN_ON(priv->mac_state != MAC_ASSOC);
-       if (priv->mac_state != MAC_ASSOC)
-               goto exit;
-
-       at76_dbg(DBG_PROGRESS, "%s: association response timeout",
-                priv->netdev->name);
-
-       if (priv->retries-- >= 0) {
-               at76_assoc_req(priv, priv->curr_bss);
-               at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
-                        __func__, __LINE__);
-               schedule_delayed_work(&priv->dwork_assoc, ASSOC_TIMEOUT);
-       } else {
-               /* try to get next matching BSS */
-               at76_set_mac_state(priv, MAC_JOINING);
-               schedule_work(&priv->work_join);
-       }
-
-exit:
-       mutex_unlock(&priv->mtx);
+       return ret;
 }
 
-/* Read new bssid in ad-hoc mode */
-static void at76_work_new_bss(struct work_struct *work)
+/* Download internal firmware */
+static int at76_load_internal_fw(struct usb_device *udev, struct fwentry *fwe)
 {
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             work_new_bss);
        int ret;
-       struct mib_mac_mgmt mac_mgmt;
+       int need_remap = !at76_is_505a(fwe->board_type);
 
-       mutex_lock(&priv->mtx);
+       ret = at76_usbdfu_download(udev, fwe->intfw, fwe->intfw_size,
+                                  need_remap ? 0 : 2 * HZ);
 
-       ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, &mac_mgmt,
-                          sizeof(struct mib_mac_mgmt));
        if (ret < 0) {
-               printk(KERN_ERR "%s: at76_get_mib failed: %d\n",
-                      priv->netdev->name, ret);
+               dev_printk(KERN_ERR, &udev->dev,
+                          "downloading internal fw failed with %d\n", ret);
                goto exit;
        }
 
-       at76_dbg(DBG_PROGRESS, "ibss_change = 0x%2x", mac_mgmt.ibss_change);
-       memcpy(priv->bssid, mac_mgmt.current_bssid, ETH_ALEN);
-       at76_dbg(DBG_PROGRESS, "using BSSID %s", mac2str(priv->bssid));
-
-       at76_iwevent_bss_connect(priv->netdev, priv->bssid);
+       at76_dbg(DBG_DEVSTART, "sending REMAP");
 
-       priv->mib_buf.type = MIB_MAC_MGMT;
-       priv->mib_buf.size = 1;
-       priv->mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change);
-       priv->mib_buf.data.byte = 0;
+       /* no REMAP for 505A (see SF driver) */
+       if (need_remap) {
+               ret = at76_remap(udev);
+               if (ret < 0) {
+                       dev_printk(KERN_ERR, &udev->dev,
+                                  "sending REMAP failed with %d\n", ret);
+                       goto exit;
+               }
+       }
 
-       ret = at76_set_mib(priv, &priv->mib_buf);
-       if (ret < 0)
-               printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n",
-                      priv->netdev->name, ret);
+       at76_dbg(DBG_DEVSTART, "sleeping for 2 seconds");
+       schedule_timeout_interruptible(2 * HZ + 1);
+       usb_reset_device(udev);
 
 exit:
-       mutex_unlock(&priv->mtx);
+       return ret;
 }
 
 static int at76_startup_device(struct at76_priv *priv)
@@ -3891,14 +1500,14 @@ static int at76_startup_device(struct at76_priv *priv)
 
        at76_dbg(DBG_PARAMS,
                 "%s param: ssid %.*s (%s) mode %s ch %d wep %s key %d "
-                "keylen %d", priv->netdev->name, priv->essid_size, priv->essid,
-                hex2str(priv->essid, IW_ESSID_MAX_SIZE),
+                "keylen %d", wiphy_name(priv->hw->wiphy), priv->essid_size,
+                priv->essid, hex2str(priv->essid, IW_ESSID_MAX_SIZE),
                 priv->iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra",
                 priv->channel, priv->wep_enabled ? "enabled" : "disabled",
                 priv->wep_key_id, priv->wep_keys_len[priv->wep_key_id]);
        at76_dbg(DBG_PARAMS,
                 "%s param: preamble %s rts %d retry %d frag %d "
-                "txrate %s auth_mode %d", priv->netdev->name,
+                "txrate %s auth_mode %d", wiphy_name(priv->hw->wiphy),
                 preambles[priv->preamble_type], priv->rts_threshold,
                 priv->short_retry_limit, priv->frag_threshold,
                 priv->txrate == TX_RATE_1MBIT ? "1MBit" : priv->txrate ==
@@ -3909,7 +1518,7 @@ static int at76_startup_device(struct at76_priv *priv)
        at76_dbg(DBG_PARAMS,
                 "%s param: pm_mode %d pm_period %d auth_mode %s "
                 "scan_times %d %d scan_mode %s",
-                priv->netdev->name, priv->pm_mode, priv->pm_period,
+                wiphy_name(priv->hw->wiphy), priv->pm_mode, priv->pm_period,
                 priv->auth_mode == WLAN_AUTH_OPEN ? "open" : "shared_secret",
                 priv->scan_min_time, priv->scan_max_time,
                 priv->scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive");
@@ -3943,7 +1552,8 @@ static int at76_startup_device(struct at76_priv *priv)
        ccfg->ssid_len = priv->essid_size;
 
        ccfg->wep_default_key_id = priv->wep_key_id;
-       memcpy(ccfg->wep_default_key_value, priv->wep_keys, 4 * WEP_KEY_LEN);
+       memcpy(ccfg->wep_default_key_value, priv->wep_keys,
+              sizeof(priv->wep_keys));
 
        ccfg->short_preamble = priv->preamble_type;
        ccfg->beacon_period = cpu_to_le16(priv->beacon_period);
@@ -3952,7 +1562,7 @@ static int at76_startup_device(struct at76_priv *priv)
                                    sizeof(struct at76_card_config));
        if (ret < 0) {
                printk(KERN_ERR "%s: at76_set_card_command failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
                return ret;
        }
 
@@ -3998,69 +1608,6 @@ static int at76_startup_device(struct at76_priv *priv)
        return 0;
 }
 
-/* Restart the interface */
-static void at76_dwork_restart(struct work_struct *work)
-{
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             dwork_restart.work);
-
-       mutex_lock(&priv->mtx);
-
-       netif_carrier_off(priv->netdev);        /* stop netdev watchdog */
-       netif_stop_queue(priv->netdev); /* stop tx data packets */
-
-       at76_startup_device(priv);
-
-       if (priv->iw_mode != IW_MODE_MONITOR) {
-               priv->netdev->type = ARPHRD_ETHER;
-               at76_set_mac_state(priv, MAC_SCANNING);
-               schedule_work(&priv->work_start_scan);
-       } else {
-               priv->netdev->type = ARPHRD_IEEE80211_RADIOTAP;
-               at76_start_monitor(priv);
-       }
-
-       mutex_unlock(&priv->mtx);
-}
-
-/* Initiate scanning */
-static void at76_work_start_scan(struct work_struct *work)
-{
-       struct at76_priv *priv = container_of(work, struct at76_priv,
-                                             work_start_scan);
-       int ret;
-
-       mutex_lock(&priv->mtx);
-
-       WARN_ON(priv->mac_state != MAC_SCANNING);
-       if (priv->mac_state != MAC_SCANNING)
-               goto exit;
-
-       /* only clear the bss list when a scan is actively initiated,
-        * otherwise simply rely on at76_bss_list_timeout */
-       if (priv->scan_state == SCAN_IN_PROGRESS) {
-               at76_free_bss_list(priv);
-               priv->scan_need_any = 1;
-       } else
-               priv->scan_need_any = 0;
-
-       ret = at76_start_scan(priv, 1);
-
-       if (ret < 0)
-               printk(KERN_ERR "%s: %s: start_scan failed with %d\n",
-                      priv->netdev->name, __func__, ret);
-       else {
-               at76_dbg(DBG_MGMT_TIMER,
-                        "%s:%d: starting mgmt_timer for %d ticks",
-                        __func__, __LINE__, SCAN_POLL_INTERVAL);
-               schedule_delayed_work(&priv->dwork_get_scan,
-                                     SCAN_POLL_INTERVAL);
-       }
-
-exit:
-       mutex_unlock(&priv->mtx);
-}
-
 /* Enable or disable promiscuous mode */
 static void at76_work_set_promisc(struct work_struct *work)
 {
@@ -4078,7 +1625,7 @@ static void at76_work_set_promisc(struct work_struct *work)
        ret = at76_set_mib(priv, &priv->mib_buf);
        if (ret < 0)
                printk(KERN_ERR "%s: set_mib (promiscuous_mode) failed: %d\n",
-                      priv->netdev->name, ret);
+                      wiphy_name(priv->hw->wiphy), ret);
 
        mutex_unlock(&priv->mtx);
 }
@@ -4094,1088 +1641,757 @@ static void at76_work_submit_rx(struct work_struct *work)
        mutex_unlock(&priv->mtx);
 }
 
-/* We got an association response */
-static void at76_rx_mgmt_assoc(struct at76_priv *priv,
-                              struct at76_rx_buffer *buf)
+static void at76_rx_tasklet(unsigned long param)
 {
-       struct ieee80211_assoc_response *resp =
-           (struct ieee80211_assoc_response *)buf->packet;
-       u16 assoc_id = le16_to_cpu(resp->aid);
-       u16 status = le16_to_cpu(resp->status);
-
-       at76_dbg(DBG_RX_MGMT, "%s: rx AssocResp bssid %s capa 0x%04x status "
-                "0x%04x assoc_id 0x%04x rates %s", priv->netdev->name,
-                mac2str(resp->header.addr3), le16_to_cpu(resp->capability),
-                status, assoc_id, hex2str(resp->info_element->data,
-                                          resp->info_element->len));
-
-       if (priv->mac_state != MAC_ASSOC) {
-               printk(KERN_INFO "%s: AssocResp in state %s ignored\n",
-                      priv->netdev->name, mac_states[priv->mac_state]);
-               return;
-       }
-
-       BUG_ON(!priv->curr_bss);
-
-       cancel_delayed_work(&priv->dwork_assoc);
-       if (status == WLAN_STATUS_SUCCESS) {
-               struct bss_info *ptr = priv->curr_bss;
-               priv->assoc_id = assoc_id & 0x3fff;
-               /* update iwconfig params */
-               memcpy(priv->bssid, ptr->bssid, ETH_ALEN);
-               memcpy(priv->essid, ptr->ssid, ptr->ssid_len);
-               priv->essid_size = ptr->ssid_len;
-               priv->channel = ptr->channel;
-               schedule_work(&priv->work_assoc_done);
-       } else {
-               at76_set_mac_state(priv, MAC_JOINING);
-               schedule_work(&priv->work_join);
-       }
-}
+       struct urb *urb = (struct urb *)param;
+       struct at76_priv *priv = urb->context;
+       struct at76_rx_buffer *buf;
+       struct ieee80211_rx_status rx_status = { 0 };
 
-/* Process disassociation request from the AP */
-static void at76_rx_mgmt_disassoc(struct at76_priv *priv,
-                                 struct at76_rx_buffer *buf)
-{
-       struct ieee80211_disassoc *resp =
-           (struct ieee80211_disassoc *)buf->packet;
-       struct ieee80211_hdr_3addr *mgmt = &resp->header;
-
-       at76_dbg(DBG_RX_MGMT,
-                "%s: rx DisAssoc bssid %s reason 0x%04x destination %s",
-                priv->netdev->name, mac2str(mgmt->addr3),
-                le16_to_cpu(resp->reason), mac2str(mgmt->addr1));
-
-       /* We are not connected, ignore */
-       if (priv->mac_state == MAC_SCANNING || priv->mac_state == MAC_INIT
-           || !priv->curr_bss)
+       if (priv->device_unplugged) {
+               at76_dbg(DBG_DEVSTART, "device unplugged");
+               if (urb)
+                       at76_dbg(DBG_DEVSTART, "urb status %d", urb->status);
                return;
+       }
 
-       /* Not our BSSID, ignore */
-       if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid))
+       if (!priv->rx_skb || !priv->rx_skb->data)
                return;
 
-       /* Not for our STA and not broadcast, ignore */
-       if (compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1)
-           && !is_broadcast_ether_addr(mgmt->addr1))
-               return;
+       buf = (struct at76_rx_buffer *)priv->rx_skb->data;
 
-       if (priv->mac_state != MAC_ASSOC && priv->mac_state != MAC_CONNECTED
-           && priv->mac_state != MAC_JOINING) {
-               printk(KERN_INFO "%s: DisAssoc in state %s ignored\n",
-                      priv->netdev->name, mac_states[priv->mac_state]);
+       if (urb->status != 0) {
+               if (urb->status != -ENOENT && urb->status != -ECONNRESET)
+                       at76_dbg(DBG_URB,
+                                "%s %s: - nonzero Rx bulk status received: %d",
+                                __func__, wiphy_name(priv->hw->wiphy),
+                                urb->status);
                return;
        }
 
-       if (priv->mac_state == MAC_CONNECTED) {
-               netif_carrier_off(priv->netdev);
-               netif_stop_queue(priv->netdev);
-               at76_iwevent_bss_disconnect(priv->netdev);
-       }
-       cancel_delayed_work(&priv->dwork_get_scan);
-       cancel_delayed_work(&priv->dwork_beacon);
-       cancel_delayed_work(&priv->dwork_auth);
-       cancel_delayed_work(&priv->dwork_assoc);
-       at76_set_mac_state(priv, MAC_JOINING);
-       schedule_work(&priv->work_join);
+       at76_dbg(DBG_RX_ATMEL_HDR,
+                "%s: rx frame: rate %d rssi %d noise %d link %d",
+                wiphy_name(priv->hw->wiphy), buf->rx_rate, buf->rssi,
+                buf->noise_level, buf->link_quality);
+
+       skb_trim(priv->rx_skb, le16_to_cpu(buf->wlength) + AT76_RX_HDRLEN);
+       at76_dbg_dump(DBG_RX_DATA, &priv->rx_skb->data[AT76_RX_HDRLEN],
+                     priv->rx_skb->len, "RX: len=%d", (int)(priv->rx_skb->len - AT76_RX_HDRLEN));
+
+       rx_status.signal = buf->rssi;
+       rx_status.rate_idx = buf->rx_rate;      /* FIXME: is rate_idx still present in structure? */
+       rx_status.flag |= RX_FLAG_DECRYPTED;
+       rx_status.flag |= RX_FLAG_IV_STRIPPED;
+
+       skb_pull(priv->rx_skb, AT76_RX_HDRLEN);
+       at76_dbg(DBG_MAC80211, "calling ieee80211_rx_irqsafe(): %d/%d",
+                priv->rx_skb->len, priv->rx_skb->data_len);
+       ieee80211_rx_irqsafe(priv->hw, priv->rx_skb, &rx_status);
+
+       /* Use a new skb for the next receive */
+       priv->rx_skb = NULL;
+
+       at76_submit_rx_urb(priv);
 }
 
-static void at76_rx_mgmt_auth(struct at76_priv *priv,
-                             struct at76_rx_buffer *buf)
+/* Load firmware into kernel memory and parse it */
+static struct fwentry *at76_load_firmware(struct usb_device *udev,
+                                         enum board_type board_type)
 {
-       struct ieee80211_auth *resp = (struct ieee80211_auth *)buf->packet;
-       struct ieee80211_hdr_3addr *mgmt = &resp->header;
-       int seq_nr = le16_to_cpu(resp->transaction);
-       int alg = le16_to_cpu(resp->algorithm);
-       int status = le16_to_cpu(resp->status);
-
-       at76_dbg(DBG_RX_MGMT,
-                "%s: rx AuthFrame bssid %s alg %d seq_nr %d status %d "
-                "destination %s", priv->netdev->name, mac2str(mgmt->addr3),
-                alg, seq_nr, status, mac2str(mgmt->addr1));
-
-       if (alg == WLAN_AUTH_SHARED_KEY && seq_nr == 2)
-               at76_dbg(DBG_RX_MGMT, "%s: AuthFrame challenge %s ...",
-                        priv->netdev->name, hex2str(resp->info_element, 18));
-
-       if (priv->mac_state != MAC_AUTH) {
-               printk(KERN_INFO "%s: ignored AuthFrame in state %s\n",
-                      priv->netdev->name, mac_states[priv->mac_state]);
-               return;
-       }
-       if (priv->auth_mode != alg) {
-               printk(KERN_INFO "%s: ignored AuthFrame for alg %d\n",
-                      priv->netdev->name, alg);
-               return;
+       int ret;
+       char *str;
+       struct at76_fw_header *fwh;
+       struct fwentry *fwe = &firmwares[board_type];
+
+       mutex_lock(&fw_mutex);
+
+       if (fwe->loaded) {
+               at76_dbg(DBG_FW, "re-using previously loaded fw");
+               goto exit;
        }
 
-       BUG_ON(!priv->curr_bss);
+       at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname);
+       ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev);
+       if (ret < 0) {
+               dev_printk(KERN_ERR, &udev->dev, "firmware %s not found!\n",
+                          fwe->fwname);
+               dev_printk(KERN_ERR, &udev->dev,
+                          "you may need to download the firmware from "
+                          "http://developer.berlios.de/projects/at76c503a/\n");
+               goto exit;
+       }
 
-       /* Not our BSSID or not for our STA, ignore */
-       if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid)
-           || compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1))
-               return;
+       at76_dbg(DBG_FW, "got it.");
+       fwh = (struct at76_fw_header *)(fwe->fw->data);
 
-       cancel_delayed_work(&priv->dwork_auth);
-       if (status != WLAN_STATUS_SUCCESS) {
-               /* try to join next bss */
-               at76_set_mac_state(priv, MAC_JOINING);
-               schedule_work(&priv->work_join);
-               return;
+       if (fwe->fw->size <= sizeof(*fwh)) {
+               dev_printk(KERN_ERR, &udev->dev,
+                          "firmware is too short (0x%zx)\n", fwe->fw->size);
+               goto exit;
        }
 
-       if (priv->auth_mode == WLAN_AUTH_OPEN || seq_nr == 4) {
-               priv->retries = ASSOC_RETRIES;
-               at76_set_mac_state(priv, MAC_ASSOC);
-               at76_assoc_req(priv, priv->curr_bss);
-               at76_dbg(DBG_MGMT_TIMER,
-                        "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__);
-               schedule_delayed_work(&priv->dwork_assoc, ASSOC_TIMEOUT);
-               return;
+       /* CRC currently not checked */
+       fwe->board_type = le32_to_cpu(fwh->board_type);
+       if (fwe->board_type != board_type) {
+               dev_printk(KERN_ERR, &udev->dev,
+                          "board type mismatch, requested %u, got %u\n",
+                          board_type, fwe->board_type);
+               goto exit;
        }
 
-       WARN_ON(seq_nr != 2);
-       at76_auth_req(priv, priv->curr_bss, seq_nr + 1, resp->info_element);
-       at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ", __func__,
-                __LINE__);
-       schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT);
+       fwe->fw_version.major = fwh->major;
+       fwe->fw_version.minor = fwh->minor;
+       fwe->fw_version.patch = fwh->patch;
+       fwe->fw_version.build = fwh->build;
+
+       str = (char *)fwh + le32_to_cpu(fwh->str_offset);
+       fwe->intfw = (u8 *)fwh + le32_to_cpu(fwh->int_fw_offset);
+       fwe->intfw_size = le32_to_cpu(fwh->int_fw_len);
+       fwe->extfw = (u8 *)fwh + le32_to_cpu(fwh->ext_fw_offset);
+       fwe->extfw_size = le32_to_cpu(fwh->ext_fw_len);
+
+       fwe->loaded = 1;
+
+       dev_printk(KERN_DEBUG, &udev->dev,
+                  "using firmware %s (version %d.%d.%d-%d)\n",
+                  fwe->fwname, fwh->major, fwh->minor, fwh->patch, fwh->build);
+
+       at76_dbg(DBG_DEVSTART, "board %u, int %d:%d, ext %d:%d", board_type,
+                le32_to_cpu(fwh->int_fw_offset), le32_to_cpu(fwh->int_fw_len),
+                le32_to_cpu(fwh->ext_fw_offset), le32_to_cpu(fwh->ext_fw_len));
+       at76_dbg(DBG_DEVSTART, "firmware id %s", str);
+
+exit:
+       mutex_unlock(&fw_mutex);
+
+       if (fwe->loaded)
+               return fwe;
+       else
+               return NULL;
 }
 
-static void at76_rx_mgmt_deauth(struct at76_priv *priv,
-                               struct at76_rx_buffer *buf)
+static void at76_mac80211_tx_callback(struct urb *urb)
 {
-       struct ieee80211_disassoc *resp =
-           (struct ieee80211_disassoc *)buf->packet;
-       struct ieee80211_hdr_3addr *mgmt = &resp->header;
-
-       at76_dbg(DBG_RX_MGMT | DBG_PROGRESS,
-                "%s: rx DeAuth bssid %s reason 0x%04x destination %s",
-                priv->netdev->name, mac2str(mgmt->addr3),
-                le16_to_cpu(resp->reason), mac2str(mgmt->addr1));
-
-       if (priv->mac_state != MAC_AUTH && priv->mac_state != MAC_ASSOC
-           && priv->mac_state != MAC_CONNECTED) {
-               printk(KERN_INFO "%s: DeAuth in state %s ignored\n",
-                      priv->netdev->name, mac_states[priv->mac_state]);
-               return;
-       }
+       struct at76_priv *priv = urb->context;
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(priv->tx_skb);
 
-       BUG_ON(!priv->curr_bss);
+       at76_dbg(DBG_MAC80211, "%s()", __func__);
 
-       /* Not our BSSID, ignore */
-       if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid))
-               return;
+       switch (urb->status) {
+       case 0:
+               /* success */
+               info->flags |= IEEE80211_TX_STAT_ACK;   /* FIXME: is the frame really ACKed when tx_callback is called ? */
+               break;
+       case -ENOENT:
+       case -ECONNRESET:
+               /* fail, urb has been unlinked */
+               /* FIXME: add error message */
+               break;
+       default:
+               at76_dbg(DBG_URB, "%s - nonzero tx status received: %d",
+                        __func__, urb->status);
+               break;
+       }
 
-       /* Not for our STA and not broadcast, ignore */
-       if (compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1)
-           && !is_broadcast_ether_addr(mgmt->addr1))
-               return;
+       memset(&info->status, 0, sizeof(info->status));
+
+       ieee80211_tx_status_irqsafe(priv->hw, priv->tx_skb);
 
-       if (priv->mac_state == MAC_CONNECTED)
-               at76_iwevent_bss_disconnect(priv->netdev);
+       priv->tx_skb = NULL;
 
-       at76_set_mac_state(priv, MAC_JOINING);
-       schedule_work(&priv->work_join);
-       cancel_delayed_work(&priv->dwork_get_scan);
-       cancel_delayed_work(&priv->dwork_beacon);
-       cancel_delayed_work(&priv->dwork_auth);
-       cancel_delayed_work(&priv->dwork_assoc);
+       ieee80211_wake_queues(priv->hw);
 }
 
-static void at76_rx_mgmt_beacon(struct at76_priv *priv,
-                               struct at76_rx_buffer *buf)
+static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
-       int varpar_len;
-       /* beacon content */
-       struct ieee80211_beacon *bdata = (struct ieee80211_beacon *)buf->packet;
-       struct ieee80211_hdr_3addr *mgmt = &bdata->header;
-
-       struct list_head *lptr;
-       struct bss_info *match; /* entry matching addr3 with its bssid */
-       int new_entry = 0;
-       int len;
-       struct ieee80211_info_element *ie;
-       int have_ssid = 0;
-       int have_rates = 0;
-       int have_channel = 0;
-       int keep_going = 1;
-       unsigned long flags;
-
-       spin_lock_irqsave(&priv->bss_list_spinlock, flags);
-       if (priv->mac_state == MAC_CONNECTED) {
-               /* in state MAC_CONNECTED we use the mgmt_timer to control
-                  the beacon of the BSS */
-               BUG_ON(!priv->curr_bss);
-
-               if (!compare_ether_addr(priv->curr_bss->bssid, mgmt->addr3)) {
-                       /* We got our AP's beacon, defer the timeout handler.
-                          Kill pending work first, as schedule_delayed_work()
-                          won't do it. */
-                       cancel_delayed_work(&priv->dwork_beacon);
-                       schedule_delayed_work(&priv->dwork_beacon,
-                                             BEACON_TIMEOUT);
-                       priv->curr_bss->rssi = buf->rssi;
-                       priv->beacons_received++;
-                       goto exit;
-               }
-       }
+       struct at76_priv *priv = hw->priv;
+       struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       int padding, submit_len, ret;
 
-       /* look if we have this BSS already in the list */
-       match = NULL;
+       at76_dbg(DBG_MAC80211, "%s()", __func__);
 
-       if (!list_empty(&priv->bss_list)) {
-               list_for_each(lptr, &priv->bss_list) {
-                       struct bss_info *bss_ptr =
-                           list_entry(lptr, struct bss_info, list);
-                       if (!compare_ether_addr(bss_ptr->bssid, mgmt->addr3)) {
-                               match = bss_ptr;
-                               break;
-                       }
-               }
+       if (priv->tx_urb->status == -EINPROGRESS) {
+               printk(KERN_ERR "%s: %s called while tx urb is pending\n",
+                      wiphy_name(priv->hw->wiphy), __func__);
+               return NETDEV_TX_BUSY;
        }
 
-       if (!match) {
-               /* BSS not in the list - append it */
-               match = kzalloc(sizeof(struct bss_info), GFP_ATOMIC);
-               if (!match) {
-                       at76_dbg(DBG_BSS_TABLE,
-                                "%s: cannot kmalloc new bss info (%zd byte)",
-                                priv->netdev->name, sizeof(struct bss_info));
-                       goto exit;
-               }
-               new_entry = 1;
-               list_add_tail(&match->list, &priv->bss_list);
-       }
+       ieee80211_stop_queues(hw);
 
-       match->capa = le16_to_cpu(bdata->capability);
-       match->beacon_interval = le16_to_cpu(bdata->beacon_interval);
-       match->rssi = buf->rssi;
-       match->link_qual = buf->link_quality;
-       match->noise_level = buf->noise_level;
-       memcpy(match->bssid, mgmt->addr3, ETH_ALEN);
-       at76_dbg(DBG_RX_BEACON, "%s: bssid %s", priv->netdev->name,
-                mac2str(match->bssid));
-
-       ie = bdata->info_element;
-
-       /* length of var length beacon parameters */
-       varpar_len = min_t(int, le16_to_cpu(buf->wlength) -
-                          sizeof(struct ieee80211_beacon),
-                          BEACON_MAX_DATA_LENGTH);
-
-       /* This routine steps through the bdata->data array to get
-        * some useful information about the access point.
-        * Currently, this implementation supports receipt of: SSID,
-        * supported transfer rates and channel, in any order, with some
-        * tolerance for intermittent unknown codes (although this
-        * functionality may not be necessary as the useful information will
-        * usually arrive in consecutively, but there have been some
-        * reports of some of the useful information fields arriving in a
-        * different order).
-        * It does not support any more IE types although MFIE_TYPE_TIM may
-        * be supported (on my AP at least).
-        * The bdata->data array is about 1500 bytes long but only ~36 of those
-        * bytes are useful, hence the have_ssid etc optimizations. */
-
-       while (keep_going &&
-              ((&ie->data[ie->len] - (u8 *)bdata->info_element) <=
-               varpar_len)) {
-
-               switch (ie->id) {
-
-               case MFIE_TYPE_SSID:
-                       if (have_ssid)
-                               break;
+       at76_ledtrig_tx_activity();     /* tell ledtrigger we send a packet */
 
-                       len = min_t(int, IW_ESSID_MAX_SIZE, ie->len);
+       WARN_ON(priv->tx_skb != NULL);
 
-                       /* we copy only if this is a new entry,
-                          or the incoming SSID is not a hidden SSID. This
-                          will protect us from overwriting a real SSID read
-                          in a ProbeResponse with a hidden one from a
-                          following beacon. */
-                       if (!new_entry && at76_is_hidden_ssid(ie->data, len)) {
-                               have_ssid = 1;
-                               break;
-                       }
+       priv->tx_skb = skb;
+       padding = at76_calc_padding(skb->len);
+       submit_len = AT76_TX_HDRLEN + skb->len + padding;
 
-                       match->ssid_len = len;
-                       memcpy(match->ssid, ie->data, len);
-                       at76_dbg(DBG_RX_BEACON, "%s: SSID - %.*s",
-                                priv->netdev->name, len, match->ssid);
-                       have_ssid = 1;
-                       break;
+       /* setup 'Atmel' header */
+       memset(tx_buffer, 0, sizeof(*tx_buffer));
+       tx_buffer->padding = padding;
+       tx_buffer->wlength = cpu_to_le16(skb->len);
+       tx_buffer->tx_rate = ieee80211_get_tx_rate(hw, info)->hw_value;
+       if (FIRMWARE_IS_WPA(priv->fw_version) && info->control.hw_key) {
+               tx_buffer->key_id = (info->control.hw_key->keyidx);
+               tx_buffer->cipher_type = priv->keys[info->control.hw_key->keyidx].cipher;
+               tx_buffer->cipher_length = priv->keys[info->control.hw_key->keyidx].keylen;
+               tx_buffer->reserved = 0;
+       } else {
+               tx_buffer->key_id = 0;
+               tx_buffer->cipher_type = 0;
+               tx_buffer->cipher_length = 0;
+               tx_buffer->reserved = 0;
+       };
+       /* memset(tx_buffer->reserved, 0, sizeof(tx_buffer->reserved)); */
+       memcpy(tx_buffer->packet, skb->data, skb->len);
 
-               case MFIE_TYPE_RATES:
-                       if (have_rates)
-                               break;
+       at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr",
+                wiphy_name(priv->hw->wiphy), le16_to_cpu(tx_buffer->wlength),
+                tx_buffer->padding, tx_buffer->tx_rate);
 
-                       match->rates_len =
-                           min_t(int, sizeof(match->rates), ie->len);
-                       memcpy(match->rates, ie->data, match->rates_len);
-                       have_rates = 1;
-                       at76_dbg(DBG_RX_BEACON, "%s: SUPPORTED RATES %s",
-                                priv->netdev->name,
-                                hex2str(ie->data, ie->len));
-                       break;
+       /* send stuff */
+       at76_dbg_dump(DBG_TX_DATA_CONTENT, tx_buffer, submit_len,
+                     "%s(): tx_buffer %d bytes:", __func__, submit_len);
+       usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, tx_buffer,
+                         submit_len, at76_mac80211_tx_callback, priv);
+       ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
+       if (ret) {
+               printk(KERN_ERR "%s: error in tx submit urb: %d\n",
+                      wiphy_name(priv->hw->wiphy), ret);
+               if (ret == -EINVAL)
+                       printk(KERN_ERR
+                              "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
+                              wiphy_name(priv->hw->wiphy), priv->tx_urb,
+                              priv->tx_urb->hcpriv, priv->tx_urb->complete);
+       }
 
-               case MFIE_TYPE_DS_SET:
-                       if (have_channel)
-                               break;
+       return 0;
+}
 
-                       match->channel = ie->data[0];
-                       have_channel = 1;
-                       at76_dbg(DBG_RX_BEACON, "%s: CHANNEL - %d",
-                                priv->netdev->name, match->channel);
-                       break;
+static int at76_mac80211_start(struct ieee80211_hw *hw)
+{
+       struct at76_priv *priv = hw->priv;
+       int ret;
 
-               case MFIE_TYPE_CF_SET:
-               case MFIE_TYPE_TIM:
-               case MFIE_TYPE_IBSS_SET:
-               default:
-                       at76_dbg(DBG_RX_BEACON, "%s: beacon IE id %d len %d %s",
-                                priv->netdev->name, ie->id, ie->len,
-                                hex2str(ie->data, ie->len));
-                       break;
-               }
+       at76_dbg(DBG_MAC80211, "%s()", __func__);
 
-               /* advance to the next informational element */
-               next_ie(&ie);
+       mutex_lock(&priv->mtx);
 
-               /* Optimization: after all, the bdata->data array is
-                * varpar_len bytes long, whereas we get all of the useful
-                * information after only ~36 bytes, this saves us a lot of
-                * time (and trouble as the remaining portion of the array
-                * could be full of junk)
-                * Comment this out if you want to see what other information
-                * comes from the AP - although little of it may be useful */
+       ret = at76_submit_rx_urb(priv);
+       if (ret < 0) {
+               printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n",
+                      wiphy_name(priv->hw->wiphy), ret);
+               goto error;
        }
 
-       at76_dbg(DBG_RX_BEACON, "%s: Finished processing beacon data",
-                priv->netdev->name);
+       at76_startup_device(priv);
 
-       match->last_rx = jiffies;       /* record last rx of beacon */
+       at76_start_monitor(priv);
 
-exit:
-       spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
+error:
+       mutex_unlock(&priv->mtx);
+
+       return 0;
 }
 
-/* Calculate the link level from a given rx_buffer */
-static void at76_calc_level(struct at76_priv *priv, struct at76_rx_buffer *buf,
-                           struct iw_quality *qual)
+static void at76_mac80211_stop(struct ieee80211_hw *hw)
 {
-       /* just a guess for now, might be different for other chips */
-       int max_rssi = 42;
+       struct at76_priv *priv = hw->priv;
+
+       at76_dbg(DBG_MAC80211, "%s()", __func__);
+
+       mutex_lock(&priv->mtx);
+
+       if (!priv->device_unplugged) {
+               /* We are called by "ifconfig ethX down", not because the
+                * device is not available anymore. */
+               if (at76_set_radio(priv, 0) == 1)
+                       at76_wait_completion(priv, CMD_RADIO_ON);
+
+               /* We unlink rx_urb because at76_open() re-submits it.
+                * If unplugged, at76_delete_device() takes care of it. */
+               usb_kill_urb(priv->rx_urb);
+       }
 
-       qual->level = (buf->rssi * 100 / max_rssi);
-       if (qual->level > 100)
-               qual->level = 100;
-       qual->updated |= IW_QUAL_LEVEL_UPDATED;
+       mutex_unlock(&priv->mtx);
 }
 
-/* Calculate the link quality from a given rx_buffer */
-static void at76_calc_qual(struct at76_priv *priv, struct at76_rx_buffer *buf,
-                          struct iw_quality *qual)
+static int at76_add_interface(struct ieee80211_hw *hw,
+                             struct ieee80211_if_init_conf *conf)
 {
-       if (at76_is_intersil(priv->board_type))
-               qual->qual = buf->link_quality;
-       else {
-               unsigned long elapsed;
+       struct at76_priv *priv = hw->priv;
+       int ret = 0;
 
-               /* Update qual at most once a second */
-               elapsed = jiffies - priv->beacons_last_qual;
-               if (elapsed < 1 * HZ)
-                       return;
+       at76_dbg(DBG_MAC80211, "%s()", __func__);
 
-               qual->qual = qual->level * priv->beacons_received *
-                   msecs_to_jiffies(priv->beacon_period) / elapsed;
+       mutex_lock(&priv->mtx);
 
-               priv->beacons_last_qual = jiffies;
-               priv->beacons_received = 0;
+       switch (conf->type) {
+       case NL80211_IFTYPE_STATION:
+               priv->iw_mode = IW_MODE_INFRA;
+               break;
+       default:
+               ret = -EOPNOTSUPP;
+               goto exit;
        }
-       qual->qual = (qual->qual > 100) ? 100 : qual->qual;
-       qual->updated |= IW_QUAL_QUAL_UPDATED;
-}
 
-/* Calculate the noise quality from a given rx_buffer */
-static void at76_calc_noise(struct at76_priv *priv, struct at76_rx_buffer *buf,
-                           struct iw_quality *qual)
-{
-       qual->noise = 0;
-       qual->updated |= IW_QUAL_NOISE_INVALID;
+exit:
+       mutex_unlock(&priv->mtx);
+
+       return ret;
 }
 
-static void at76_update_wstats(struct at76_priv *priv,
-                              struct at76_rx_buffer *buf)
+static void at76_remove_interface(struct ieee80211_hw *hw,
+                                 struct ieee80211_if_init_conf *conf)
 {
-       struct iw_quality *qual = &priv->wstats.qual;
-
-       if (buf->rssi && priv->mac_state == MAC_CONNECTED) {
-               qual->updated = 0;
-               at76_calc_level(priv, buf, qual);
-               at76_calc_qual(priv, buf, qual);
-               at76_calc_noise(priv, buf, qual);
-       } else {
-               qual->qual = 0;
-               qual->level = 0;
-               qual->noise = 0;
-               qual->updated = IW_QUAL_ALL_INVALID;
-       }
+       at76_dbg(DBG_MAC80211, "%s()", __func__);
 }
 
-static void at76_rx_mgmt(struct at76_priv *priv, struct at76_rx_buffer *buf)
+static int at76_join(struct at76_priv *priv)
 {
-       struct ieee80211_hdr_3addr *mgmt =
-           (struct ieee80211_hdr_3addr *)buf->packet;
-       u16 framectl = le16_to_cpu(mgmt->frame_ctl);
-
-       /* update wstats */
-       if (priv->mac_state != MAC_INIT && priv->mac_state != MAC_SCANNING) {
-               /* jal: this is a dirty hack needed by Tim in ad-hoc mode */
-               /* Data packets always seem to have a 0 link level, so we
-                  only read link quality info from management packets.
-                  Atmel driver actually averages the present, and previous
-                  values, we just present the raw value at the moment - TJS */
-               if (priv->iw_mode == IW_MODE_ADHOC
-                   || (priv->curr_bss
-                       && !compare_ether_addr(mgmt->addr3,
-                                              priv->curr_bss->bssid)))
-                       at76_update_wstats(priv, buf);
-       }
-
-       at76_dbg(DBG_RX_MGMT_CONTENT, "%s rx mgmt framectl 0x%x %s",
-                priv->netdev->name, framectl,
-                hex2str(mgmt, le16_to_cpu(buf->wlength)));
-
-       switch (framectl & IEEE80211_FCTL_STYPE) {
-       case IEEE80211_STYPE_BEACON:
-       case IEEE80211_STYPE_PROBE_RESP:
-               at76_rx_mgmt_beacon(priv, buf);
-               break;
-
-       case IEEE80211_STYPE_ASSOC_RESP:
-               at76_rx_mgmt_assoc(priv, buf);
-               break;
+       struct at76_req_join join;
+       int ret;
 
-       case IEEE80211_STYPE_DISASSOC:
-               at76_rx_mgmt_disassoc(priv, buf);
-               break;
+       memset(&join, 0, sizeof(struct at76_req_join));
+       memcpy(join.essid, priv->essid, priv->essid_size);
+       join.essid_size = priv->essid_size;
+       memcpy(join.bssid, priv->bssid, ETH_ALEN);
+       join.bss_type = INFRASTRUCTURE_MODE;
+       join.channel = priv->channel;
+       join.timeout = cpu_to_le16(2000);
 
-       case IEEE80211_STYPE_AUTH:
-               at76_rx_mgmt_auth(priv, buf);
-               break;
+       at76_dbg(DBG_MAC80211, "%s: sending CMD_JOIN", __func__);
+       ret = at76_set_card_command(priv->udev, CMD_JOIN, &join,
+                                   sizeof(struct at76_req_join));
 
-       case IEEE80211_STYPE_DEAUTH:
-               at76_rx_mgmt_deauth(priv, buf);
-               break;
+       if (ret < 0) {
+               printk(KERN_ERR "%s: at76_set_card_command failed: %d\n",
+                      wiphy_name(priv->hw->wiphy), ret);
+               return 0;
+       }
 
-       default:
-               printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n",
-                      priv->netdev->name, framectl);
+       ret = at76_wait_completion(priv, CMD_JOIN);
+       at76_dbg(DBG_MAC80211, "%s: CMD_JOIN returned: 0x%02x", __func__, ret);
+       if (ret != CMD_STATUS_COMPLETE) {
+               printk(KERN_ERR "%s: at76_wait_completion failed: %d\n",
+                      wiphy_name(priv->hw->wiphy), ret);
+               return 0;
        }
 
-       return;
+       at76_set_tkip_bssid(priv, priv->bssid);
+       at76_set_pm_mode(priv);
+
+       return 0;
 }
 
-/* Convert the 802.11 header into an ethernet-style header, make skb
- * ready for consumption by netif_rx() */
-static void at76_ieee80211_to_eth(struct sk_buff *skb, int iw_mode)
+static void at76_dwork_hw_scan(struct work_struct *work)
 {
-       struct ieee80211_hdr_3addr *i802_11_hdr;
-       struct ethhdr *eth_hdr_p;
-       u8 *src_addr;
-       u8 *dest_addr;
+       struct at76_priv *priv = container_of(work, struct at76_priv,
+                                             dwork_hw_scan.work);
+       int ret;
 
-       i802_11_hdr = (struct ieee80211_hdr_3addr *)skb->data;
+       ret = at76_get_cmd_status(priv->udev, CMD_SCAN);
+       at76_dbg(DBG_MAC80211, "%s: CMD_SCAN status 0x%02x", __func__, ret);
 
-       /* That would be the ethernet header if the hardware converted
-        * the frame for us.  Make sure the source and the destination
-        * match the 802.11 header.  Which hardware does it? */
-       eth_hdr_p = (struct ethhdr *)skb_pull(skb, IEEE80211_3ADDR_LEN);
+       /* FIXME: add maximum time for scan to complete */
 
-       dest_addr = i802_11_hdr->addr1;
-       if (iw_mode == IW_MODE_ADHOC)
-               src_addr = i802_11_hdr->addr2;
-       else
-               src_addr = i802_11_hdr->addr3;
+       if (ret != CMD_STATUS_COMPLETE) {
+               queue_delayed_work(priv->hw->workqueue, &priv->dwork_hw_scan,
+                                  SCAN_POLL_INTERVAL);
+               goto exit;
+       }
 
-       if (!compare_ether_addr(eth_hdr_p->h_source, src_addr) &&
-           !compare_ether_addr(eth_hdr_p->h_dest, dest_addr))
-               /* Yes, we already have an ethernet header */
-               skb_reset_mac_header(skb);
-       else {
-               u16 len;
-
-               /* Need to build an ethernet header */
-               if (!memcmp(skb->data, snapsig, sizeof(snapsig))) {
-                       /* SNAP frame - decapsulate, keep proto */
-                       skb_push(skb, offsetof(struct ethhdr, h_proto) -
-                                sizeof(rfc1042sig));
-                       len = 0;
-               } else {
-                       /* 802.3 frame, proto is length */
-                       len = skb->len;
-                       skb_push(skb, ETH_HLEN);
-               }
+       ieee80211_scan_completed(priv->hw);
 
-               skb_reset_mac_header(skb);
-               eth_hdr_p = eth_hdr(skb);
-               /* This needs to be done in this order (eth_hdr_p->h_dest may
-                * overlap src_addr) */
-               memcpy(eth_hdr_p->h_source, src_addr, ETH_ALEN);
-               memcpy(eth_hdr_p->h_dest, dest_addr, ETH_ALEN);
-               if (len)
-                       eth_hdr_p->h_proto = htons(len);
+       if (is_valid_ether_addr(priv->bssid)) {
+               ieee80211_wake_queues(priv->hw);
+               at76_join(priv);
        }
 
-       skb->protocol = eth_type_trans(skb, skb->dev);
+       ieee80211_wake_queues(priv->hw);
+
+exit:
+       return;
 }
 
-/* Check for fragmented data in priv->rx_skb. If the packet was no fragment
-   or it was the last of a fragment set a skb containing the whole packet
-   is returned for further processing. Otherwise we get NULL and are
-   done and the packet is either stored inside the fragment buffer
-   or thrown away.  Every returned skb starts with the ieee802_11 header
-   and contains _no_ FCS at the end */
-static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *priv)
+static int at76_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
 {
-       struct sk_buff *skb = priv->rx_skb;
-       struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data;
-       struct ieee80211_hdr_3addr *i802_11_hdr =
-           (struct ieee80211_hdr_3addr *)buf->packet;
-       /* seq_ctrl, fragment_number, sequence number of new packet */
-       u16 sctl = le16_to_cpu(i802_11_hdr->seq_ctl);
-       u16 fragnr = sctl & 0xf;
-       u16 seqnr = sctl >> 4;
-       u16 frame_ctl = le16_to_cpu(i802_11_hdr->frame_ctl);
+       struct at76_priv *priv = hw->priv;
+       struct at76_req_scan scan;
+       int ret;
 
-       /* Length including the IEEE802.11 header, but without the trailing
-        * FCS and without the Atmel Rx header */
-       int length = le16_to_cpu(buf->wlength) - IEEE80211_FCS_LEN;
+       at76_dbg(DBG_MAC80211, "%s():", __func__);
+       at76_dbg_dump(DBG_MAC80211, ssid, len, "ssid %zd bytes:", len);
 
-       /* where does the data payload start in skb->data ? */
-       u8 *data = i802_11_hdr->payload;
+       mutex_lock(&priv->mtx);
 
-       /* length of payload, excl. the trailing FCS */
-       int data_len = length - IEEE80211_3ADDR_LEN;
+       ieee80211_stop_queues(hw);
 
-       int i;
-       struct rx_data_buf *bptr, *optr;
-       unsigned long oldest = ~0UL;
-
-       at76_dbg(DBG_RX_FRAGS,
-                "%s: rx data frame_ctl %04x addr2 %s seq/frag %d/%d "
-                "length %d data %d: %s ...", priv->netdev->name, frame_ctl,
-                mac2str(i802_11_hdr->addr2), seqnr, fragnr, length, data_len,
-                hex2str(data, 32));
-
-       at76_dbg(DBG_RX_FRAGS_SKB, "%s: incoming skb: head %p data %p "
-                "tail %p end %p len %d", priv->netdev->name, skb->head,
-                skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
-                skb->len);
-
-       if (data_len < 0) {
-               /* make sure data starts in the buffer */
-               printk(KERN_INFO "%s: data frame too short\n",
-                      priv->netdev->name);
-               return NULL;
+       memset(&scan, 0, sizeof(struct at76_req_scan));
+       memset(scan.bssid, 0xFF, ETH_ALEN);
+       scan.scan_type = SCAN_TYPE_ACTIVE;
+       if (priv->essid_size > 0) {
+               memcpy(scan.essid, ssid, len);
+               scan.essid_size = len;
        }
+       scan.min_channel_time = cpu_to_le16(priv->scan_min_time);
+       scan.max_channel_time = cpu_to_le16(priv->scan_max_time);
+       scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000);
+       scan.international_scan = 0;
 
-       WARN_ON(length <= AT76_RX_HDRLEN);
-       if (length <= AT76_RX_HDRLEN)
-               return NULL;
+       at76_dbg(DBG_MAC80211, "%s: sending CMD_SCAN", __func__);
+       ret = at76_set_card_command(priv->udev, CMD_SCAN, &scan, sizeof(scan));
 
-       /* remove the at76_rx_buffer header - we don't need it anymore */
-       /* we need the IEEE802.11 header (for the addresses) if this packet
-          is the first of a chain */
-       skb_pull(skb, AT76_RX_HDRLEN);
-
-       /* remove FCS at end */
-       skb_trim(skb, length);
-
-       at76_dbg(DBG_RX_FRAGS_SKB, "%s: trimmed skb: head %p data %p tail %p "
-                "end %p len %d data %p data_len %d", priv->netdev->name,
-                skb->head, skb->data, skb_tail_pointer(skb),
-                skb_end_pointer(skb), skb->len, data, data_len);
-
-       if (fragnr == 0 && !(frame_ctl & IEEE80211_FCTL_MOREFRAGS)) {
-               /* unfragmented packet received */
-               /* Use a new skb for the next receive */
-               priv->rx_skb = NULL;
-               at76_dbg(DBG_RX_FRAGS, "%s: unfragmented", priv->netdev->name);
-               return skb;
+       if (ret < 0) {
+               err("CMD_SCAN failed: %d", ret);
+               goto exit;
        }
 
-       /* look if we've got a chain for the sender address.
-          afterwards optr points to first free or the oldest entry,
-          or, if i < NR_RX_DATA_BUF, bptr points to the entry for the
-          sender address */
-       /* determining the oldest entry doesn't cope with jiffies wrapping
-          but I don't care to delete a young entry at these rare moments ... */
-
-       bptr = priv->rx_data;
-       optr = NULL;
-       for (i = 0; i < NR_RX_DATA_BUF; i++, bptr++) {
-               if (!bptr->skb) {
-                       optr = bptr;
-                       oldest = 0UL;
-                       continue;
-               }
-
-               if (!compare_ether_addr(i802_11_hdr->addr2, bptr->sender))
-                       break;
-
-               if (!optr) {
-                       optr = bptr;
-                       oldest = bptr->last_rx;
-               } else if (bptr->last_rx < oldest)
-                       optr = bptr;
-       }
+       queue_delayed_work(priv->hw->workqueue, &priv->dwork_hw_scan,
+                          SCAN_POLL_INTERVAL);
 
-       if (i < NR_RX_DATA_BUF) {
-
-               at76_dbg(DBG_RX_FRAGS, "%s: %d. cacheentry (seq/frag = %d/%d) "
-                        "matched sender addr",
-                        priv->netdev->name, i, bptr->seqnr, bptr->fragnr);
-
-               /* bptr points to an entry for the sender address */
-               if (bptr->seqnr == seqnr) {
-                       int left;
-                       /* the fragment has the current sequence number */
-                       if (((bptr->fragnr + 1) & 0xf) != fragnr) {
-                               /* wrong fragment number -> ignore it */
-                               /* is & 0xf necessary above ??? */
-                               at76_dbg(DBG_RX_FRAGS,
-                                        "%s: frag nr mismatch: %d + 1 != %d",
-                                        priv->netdev->name, bptr->fragnr,
-                                        fragnr);
-                               return NULL;
-                       }
-                       bptr->last_rx = jiffies;
-                       /* the next following fragment number ->
-                          add the data at the end */
-
-                       /* for test only ??? */
-                       left = skb_tailroom(bptr->skb);
-                       if (left < data_len)
-                               printk(KERN_INFO
-                                      "%s: only %d byte free (need %d)\n",
-                                      priv->netdev->name, left, data_len);
-                       else
-                               memcpy(skb_put(bptr->skb, data_len), data,
-                                      data_len);
-
-                       bptr->fragnr = fragnr;
-                       if (frame_ctl & IEEE80211_FCTL_MOREFRAGS)
-                               return NULL;
-
-                       /* this was the last fragment - send it */
-                       skb = bptr->skb;
-                       bptr->skb = NULL;       /* free the entry */
-                       at76_dbg(DBG_RX_FRAGS, "%s: last frag of seq %d",
-                                priv->netdev->name, seqnr);
-                       return skb;
-               }
+exit:
+       mutex_unlock(&priv->mtx);
 
-               /* got another sequence number */
-               if (fragnr == 0) {
-                       /* it's the start of a new chain - replace the
-                          old one by this */
-                       /* bptr->sender has the correct value already */
-                       at76_dbg(DBG_RX_FRAGS,
-                                "%s: start of new seq %d, removing old seq %d",
-                                priv->netdev->name, seqnr, bptr->seqnr);
-                       bptr->seqnr = seqnr;
-                       bptr->fragnr = 0;
-                       bptr->last_rx = jiffies;
-                       /* swap bptr->skb and priv->rx_skb */
-                       skb = bptr->skb;
-                       bptr->skb = priv->rx_skb;
-                       priv->rx_skb = skb;
-               } else {
-                       /* it from the middle of a new chain ->
-                          delete the old entry and skip the new one */
-                       at76_dbg(DBG_RX_FRAGS,
-                                "%s: middle of new seq %d (%d) "
-                                "removing old seq %d",
-                                priv->netdev->name, seqnr, fragnr,
-                                bptr->seqnr);
-                       dev_kfree_skb(bptr->skb);
-                       bptr->skb = NULL;
-               }
-               return NULL;
-       }
+       return 0;
+}
 
-       /* if we didn't find a chain for the sender address, optr
-          points either to the first free or the oldest entry */
+static int at76_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
+{
+       struct at76_priv *priv = hw->priv;
 
-       if (fragnr != 0) {
-               /* this is not the begin of a fragment chain ... */
-               at76_dbg(DBG_RX_FRAGS,
-                        "%s: no chain for non-first fragment (%d)",
-                        priv->netdev->name, fragnr);
-               return NULL;
-       }
+       at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d",
+                __func__, conf->channel->hw_value, conf->radio_enabled);
+       at76_dbg_dump(DBG_MAC80211, priv->essid, priv->essid_size, "ssid:");
+       at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:");
 
-       BUG_ON(!optr);
-       if (optr->skb) {
-               /* swap the skb's */
-               skb = optr->skb;
-               optr->skb = priv->rx_skb;
-               priv->rx_skb = skb;
+       mutex_lock(&priv->mtx);
 
-               at76_dbg(DBG_RX_FRAGS,
-                        "%s: free old contents: sender %s seq/frag %d/%d",
-                        priv->netdev->name, mac2str(optr->sender),
-                        optr->seqnr, optr->fragnr);
+       priv->channel = conf->channel->hw_value;
 
+       if (is_valid_ether_addr(priv->bssid)) {
+               at76_join(priv);
+               ieee80211_wake_queues(priv->hw);
        } else {
-               /* take the skb from priv->rx_skb */
-               optr->skb = priv->rx_skb;
-               /* let at76_submit_rx_urb() allocate a new skb */
-               priv->rx_skb = NULL;
+               ieee80211_stop_queues(priv->hw);
+               at76_start_monitor(priv);
+       };
 
-               at76_dbg(DBG_RX_FRAGS, "%s: use a free entry",
-                        priv->netdev->name);
-       }
-       memcpy(optr->sender, i802_11_hdr->addr2, ETH_ALEN);
-       optr->seqnr = seqnr;
-       optr->fragnr = 0;
-       optr->last_rx = jiffies;
+       mutex_unlock(&priv->mtx);
 
-       return NULL;
+       return 0;
 }
 
-/* Rx interrupt: we expect the complete data buffer in priv->rx_skb */
-static void at76_rx_data(struct at76_priv *priv)
+static int at76_config_interface(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_if_conf *conf)
 {
-       struct net_device *netdev = priv->netdev;
-       struct net_device_stats *stats = &priv->stats;
-       struct sk_buff *skb = priv->rx_skb;
-       struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data;
-       struct ieee80211_hdr_3addr *i802_11_hdr;
-       int length = le16_to_cpu(buf->wlength);
-
-       at76_dbg(DBG_RX_DATA, "%s received data packet: %s", netdev->name,
-                hex2str(skb->data, AT76_RX_HDRLEN));
-
-       at76_dbg(DBG_RX_DATA_CONTENT, "rx packet: %s",
-                hex2str(skb->data + AT76_RX_HDRLEN, length));
+       struct at76_priv *priv = hw->priv;
 
-       skb = at76_check_for_rx_frags(priv);
-       if (!skb)
-               return;
-
-       /* Atmel header and the FCS are already removed */
-       i802_11_hdr = (struct ieee80211_hdr_3addr *)skb->data;
+       at76_dbg(DBG_MAC80211, "%s(): ssid_len=%zd", __func__, conf->ssid_len);
+       at76_dbg_dump(DBG_MAC80211, conf->ssid, conf->ssid_len, "ssid:");
+       at76_dbg_dump(DBG_MAC80211, conf->bssid, ETH_ALEN, "bssid:");
 
-       skb->dev = netdev;
-       skb->ip_summed = CHECKSUM_NONE; /* TODO: should check CRC */
+       mutex_lock(&priv->mtx);
 
-       if (is_broadcast_ether_addr(i802_11_hdr->addr1)) {
-               if (!compare_ether_addr(i802_11_hdr->addr1, netdev->broadcast))
-                       skb->pkt_type = PACKET_BROADCAST;
-               else
-                       skb->pkt_type = PACKET_MULTICAST;
-       } else if (compare_ether_addr(i802_11_hdr->addr1, netdev->dev_addr))
-               skb->pkt_type = PACKET_OTHERHOST;
+       memcpy(priv->bssid, conf->bssid, ETH_ALEN);
+       memcpy(priv->essid, conf->ssid, conf->ssid_len);
+       priv->essid_size = conf->ssid_len;
 
-       at76_ieee80211_to_eth(skb, priv->iw_mode);
+       if (is_valid_ether_addr(priv->bssid)) {
+               /* mac80211 is joining a bss */
+               ieee80211_wake_queues(priv->hw);
+               at76_join(priv);
+       } else
+               ieee80211_stop_queues(priv->hw);
 
-       netdev->last_rx = jiffies;
-       netif_rx(skb);
-       stats->rx_packets++;
-       stats->rx_bytes += length;
+       mutex_unlock(&priv->mtx);
 
-       return;
+       return 0;
 }
 
-static void at76_rx_monitor_mode(struct at76_priv *priv)
+/* must be atomic */
+static void at76_configure_filter(struct ieee80211_hw *hw,
+                                 unsigned int changed_flags,
+                                 unsigned int *total_flags, int mc_count,
+                                 struct dev_addr_list *mc_list)
 {
-       struct at76_rx_radiotap *rt;
-       u8 *payload;
-       int skblen;
-       struct net_device *netdev = priv->netdev;
-       struct at76_rx_buffer *buf =
-           (struct at76_rx_buffer *)priv->rx_skb->data;
-       /* length including the IEEE802.11 header and the trailing FCS,
-          but not at76_rx_buffer */
-       int length = le16_to_cpu(buf->wlength);
-       struct sk_buff *skb = priv->rx_skb;
-       struct net_device_stats *stats = &priv->stats;
+       struct at76_priv *priv = hw->priv;
+       int flags;
 
-       if (length < IEEE80211_FCS_LEN) {
-               /* buffer contains no data */
-               at76_dbg(DBG_MONITOR_MODE,
-                        "%s: MONITOR MODE: rx skb without data",
-                        priv->netdev->name);
-               return;
-       }
+       at76_dbg(DBG_MAC80211, "%s(): changed_flags=0x%08x "
+                "total_flags=0x%08x mc_count=%d",
+                __func__, changed_flags, *total_flags, mc_count);
 
-       skblen = sizeof(struct at76_rx_radiotap) + length;
+       flags = changed_flags & AT76_SUPPORTED_FILTERS;
+       *total_flags = AT76_SUPPORTED_FILTERS;
 
-       skb = dev_alloc_skb(skblen);
-       if (!skb) {
-               printk(KERN_ERR "%s: MONITOR MODE: dev_alloc_skb for radiotap "
-                      "header returned NULL\n", priv->netdev->name);
+       /* FIXME: access to priv->promisc should be protected with
+        * priv->mtx, but it's impossible because this function needs to be
+        * atomic */
+
+       if (flags && !priv->promisc) {
+               /* mac80211 wants us to enable promiscuous mode */
+               priv->promisc = 1;
+       } else if (!flags && priv->promisc) {
+               /* we need to disable promiscuous mode */
+               priv->promisc = 0;
+       } else
                return;
-       }
 
-       skb_put(skb, skblen);
-
-       rt = (struct at76_rx_radiotap *)skb->data;
-       payload = skb->data + sizeof(struct at76_rx_radiotap);
-
-       rt->rt_hdr.it_version = 0;
-       rt->rt_hdr.it_pad = 0;
-       rt->rt_hdr.it_len = cpu_to_le16(sizeof(struct at76_rx_radiotap));
-       rt->rt_hdr.it_present = cpu_to_le32(AT76_RX_RADIOTAP_PRESENT);
-
-       rt->rt_tsft = cpu_to_le64(le32_to_cpu(buf->rx_time));
-       rt->rt_rate = hw_rates[buf->rx_rate] & (~0x80);
-       rt->rt_signal = buf->rssi;
-       rt->rt_noise = buf->noise_level;
-       rt->rt_flags = IEEE80211_RADIOTAP_F_FCS;
-       if (buf->fragmentation)
-               rt->rt_flags |= IEEE80211_RADIOTAP_F_FRAG;
-
-       memcpy(payload, buf->packet, length);
-       skb->dev = netdev;
-       skb->ip_summed = CHECKSUM_NONE;
-       skb_reset_mac_header(skb);
-       skb->pkt_type = PACKET_OTHERHOST;
-       skb->protocol = htons(ETH_P_802_2);
-
-       netdev->last_rx = jiffies;
-       netif_rx(skb);
-       stats->rx_packets++;
-       stats->rx_bytes += length;
+       queue_work(hw->workqueue, &priv->work_set_promisc);
 }
 
-/* Check if we spy on the sender address in buf and update stats */
-static void at76_iwspy_update(struct at76_priv *priv,
-                             struct at76_rx_buffer *buf)
+static int at76_set_key_oldfw(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                       const u8 *local_address, const u8 *address,
+                       struct ieee80211_key_conf *key)
 {
-       struct ieee80211_hdr_3addr *hdr =
-           (struct ieee80211_hdr_3addr *)buf->packet;
-       struct iw_quality qual;
+       struct at76_priv *priv = hw->priv;
 
-       /* We can only set the level here */
-       qual.updated = IW_QUAL_QUAL_INVALID | IW_QUAL_NOISE_INVALID;
-       qual.level = 0;
-       qual.noise = 0;
-       at76_calc_level(priv, buf, &qual);
+       int i;
 
-       spin_lock_bh(&priv->spy_spinlock);
+       at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "
+                "key->keylen %d",
+                __func__, cmd, key->alg, key->keyidx, key->keylen);
 
-       if (priv->spy_data.spy_number > 0)
-               wireless_spy_update(priv->netdev, hdr->addr2, &qual);
+       if (key->alg != ALG_WEP)
+               return -EOPNOTSUPP;
 
-       spin_unlock_bh(&priv->spy_spinlock);
-}
+       key->hw_key_idx = key->keyidx;
 
-static void at76_rx_tasklet(unsigned long param)
-{
-       struct urb *urb = (struct urb *)param;
-       struct at76_priv *priv = urb->context;
-       struct net_device *netdev = priv->netdev;
-       struct at76_rx_buffer *buf;
-       struct ieee80211_hdr_3addr *i802_11_hdr;
-       u16 frame_ctl;
+       mutex_lock(&priv->mtx);
 
-       if (priv->device_unplugged) {
-               at76_dbg(DBG_DEVSTART, "device unplugged");
-               if (urb)
-                       at76_dbg(DBG_DEVSTART, "urb status %d", urb->status);
-               return;
+       switch (cmd) {
+       case SET_KEY:
+               memcpy(priv->wep_keys[key->keyidx], key->key, key->keylen);
+               priv->wep_keys_len[key->keyidx] = key->keylen;
+
+               /* FIXME: find out how to do this properly */
+               priv->wep_key_id = key->keyidx;
+
+               break;
+       case DISABLE_KEY:
+       default:
+               priv->wep_keys_len[key->keyidx] = 0;
+               break;
        }
 
-       if (!priv->rx_skb || !netdev || !priv->rx_skb->data)
-               return;
+       priv->wep_enabled = 0;
 
-       buf = (struct at76_rx_buffer *)priv->rx_skb->data;
+       for (i = 0; i < WEP_KEYS; i++) {
+               if (priv->wep_keys_len[i] != 0)
+                       priv->wep_enabled = 1;
+       }
 
-       i802_11_hdr = (struct ieee80211_hdr_3addr *)buf->packet;
+       at76_startup_device(priv);
 
-       frame_ctl = le16_to_cpu(i802_11_hdr->frame_ctl);
+       mutex_unlock(&priv->mtx);
 
-       if (urb->status != 0) {
-               if (urb->status != -ENOENT && urb->status != -ECONNRESET)
-                       at76_dbg(DBG_URB,
-                                "%s %s: - nonzero Rx bulk status received: %d",
-                                __func__, netdev->name, urb->status);
-               return;
-       }
+       return 0;
+}
 
-       at76_dbg(DBG_RX_ATMEL_HDR,
-                "%s: rx frame: rate %d rssi %d noise %d link %d %s",
-                priv->netdev->name, buf->rx_rate, buf->rssi, buf->noise_level,
-                buf->link_quality, hex2str(i802_11_hdr, 48));
-       if (priv->iw_mode == IW_MODE_MONITOR) {
-               at76_rx_monitor_mode(priv);
-               goto exit;
-       }
+static int at76_set_key_newfw(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                       const u8 *local_address, const u8 *address,
+                       struct ieee80211_key_conf *key)
+{
+       struct at76_priv *priv = hw->priv;
+       int ret = -EOPNOTSUPP;
 
-       /* there is a new bssid around, accept it: */
-       if (buf->newbss && priv->iw_mode == IW_MODE_ADHOC) {
-               at76_dbg(DBG_PROGRESS, "%s: rx newbss", netdev->name);
-               schedule_work(&priv->work_new_bss);
-       }
+       at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "
+                "key->keylen %d",
+                __func__, cmd, key->alg, key->keyidx, key->keylen);
 
-       switch (frame_ctl & IEEE80211_FCTL_FTYPE) {
-       case IEEE80211_FTYPE_DATA:
-               at76_rx_data(priv);
-               break;
+       mutex_lock(&priv->mtx);
 
-       case IEEE80211_FTYPE_MGMT:
-               /* jal: TODO: find out if we can update iwspy also on
-                  other frames than management (might depend on the
-                  radio chip / firmware version !) */
+       priv->mib_buf.type = MIB_MAC_ENCRYPTION;
 
-               at76_iwspy_update(priv, buf);
+       if (cmd == DISABLE_KEY) {
+               priv->mib_buf.size = CIPHER_KEY_LEN;
+               priv->mib_buf.index = offsetof(struct mib_mac_encryption,
+                               cipher_default_keyvalue[key->keyidx]);
+               memset(priv->mib_buf.data.data, 0, CIPHER_KEY_LEN);
+               if (at76_set_mib(priv, &priv->mib_buf) != CMD_STATUS_COMPLETE)
+                       ret = -EOPNOTSUPP; /* -EIO would be probably better */
+               else {
 
-               at76_rx_mgmt(priv, buf);
-               break;
+                       priv->keys[key->keyidx].cipher = CIPHER_NONE;
+                       priv->keys[key->keyidx].keylen = 0;
+               };
+               if (priv->default_group_key == key->keyidx)
+                       priv->default_group_key = 0xff;
 
-       case IEEE80211_FTYPE_CTL:
-               at76_dbg(DBG_RX_CTRL, "%s: ignored ctrl frame: %04x",
-                        priv->netdev->name, frame_ctl);
-               break;
+               if (priv->default_pairwise_key == key->keyidx)
+                       priv->default_pairwise_key = 0xff;
+               /* If default pairwise key is removed, fall back to
+                * group key? */
+               ret = 0;
+               goto exit;
+       };
 
-       default:
-               printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n",
-                      priv->netdev->name, frame_ctl);
-       }
-exit:
-       at76_submit_rx_urb(priv);
-}
+       if (cmd == SET_KEY) {
+               /* store key into MIB */
+               priv->mib_buf.size = CIPHER_KEY_LEN;
+               priv->mib_buf.index = offsetof(struct mib_mac_encryption,
+                               cipher_default_keyvalue[key->keyidx]);
+               memset(priv->mib_buf.data.data, 0, CIPHER_KEY_LEN);
+               memcpy(priv->mib_buf.data.data, key->key, key->keylen);
+
+               switch (key->alg) {
+                       case ALG_WEP:
+                               if (key->keylen == 5) {
+                                       priv->keys[key->keyidx].cipher =
+                                               CIPHER_WEP64;
+                                       priv->keys[key->keyidx].keylen = 8;
+                               } else if (key->keylen == 13) {
+                                       priv->keys[key->keyidx].cipher =
+                                               CIPHER_WEP128;
+                                       /* Firmware needs this */
+                                       priv->keys[key->keyidx].keylen = 8;
+                               } else {
+                                       ret = -EOPNOTSUPP;
+                                       goto exit;
+                               };
+                               break;
+                       case ALG_TKIP:
+                               key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+                               priv->keys[key->keyidx].cipher = CIPHER_TKIP;
+                               priv->keys[key->keyidx].keylen = 12;
+                               break;
 
-/* Load firmware into kernel memory and parse it */
-static struct fwentry *at76_load_firmware(struct usb_device *udev,
-                                         enum board_type board_type)
-{
-       int ret;
-       char *str;
-       struct at76_fw_header *fwh;
-       struct fwentry *fwe = &firmwares[board_type];
+                       case ALG_CCMP:
+                               if (!at76_is_505a(priv->board_type)) {
+                                       ret = -EOPNOTSUPP;
+                                       goto exit;
+                               };
+                               key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+                               priv->keys[key->keyidx].cipher = CIPHER_CCMP;
+                               priv->keys[key->keyidx].keylen = 16;
+                               break;
 
-       mutex_lock(&fw_mutex);
+                       default:
+                               ret = -EOPNOTSUPP;
+                               goto exit;
 
-       if (fwe->loaded) {
-               at76_dbg(DBG_FW, "re-using previously loaded fw");
-               goto exit;
-       }
+               };
 
-       at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname);
-       ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev);
-       if (ret < 0) {
-               dev_printk(KERN_ERR, &udev->dev, "firmware %s not found!\n",
-                          fwe->fwname);
-               dev_printk(KERN_ERR, &udev->dev,
-                          "you may need to download the firmware from "
-                          "http://developer.berlios.de/projects/at76c503a/");
-               goto exit;
-       }
+               priv->mib_buf.data.data[38] = priv->keys[key->keyidx].cipher;
+               priv->mib_buf.data.data[39] = 1; /* Taken from atmelwlandriver,
+                                                   not documented */
 
-       at76_dbg(DBG_FW, "got it.");
-       fwh = (struct at76_fw_header *)(fwe->fw->data);
+               if (is_valid_ether_addr(address))
+                       /* Pairwise key */
+                       priv->mib_buf.data.data[39] |= (KEY_PAIRWISE | KEY_TX);
+               else if (is_broadcast_ether_addr(address))
+                       /* Group key */
+                       priv->mib_buf.data.data[39] |= (KEY_TX);
+               else    /* Key used only for transmission ??? */
+                       priv->mib_buf.data.data[39] |= (KEY_TX);
 
-       if (fwe->fw->size <= sizeof(*fwh)) {
-               dev_printk(KERN_ERR, &udev->dev,
-                          "firmware is too short (0x%zx)\n", fwe->fw->size);
-               goto exit;
-       }
+               if (at76_set_mib(priv, &priv->mib_buf) !=
+                               CMD_STATUS_COMPLETE) {
+                       ret = -EOPNOTSUPP; /* -EIO would be probably better */
+                       goto exit;
+               };
 
-       /* CRC currently not checked */
-       fwe->board_type = le32_to_cpu(fwh->board_type);
-       if (fwe->board_type != board_type) {
-               dev_printk(KERN_ERR, &udev->dev,
-                          "board type mismatch, requested %u, got %u\n",
-                          board_type, fwe->board_type);
-               goto exit;
-       }
+               if ((key->alg == ALG_TKIP) || (key->alg == ALG_CCMP))
+                       at76_reset_rsc(priv);
 
-       fwe->fw_version.major = fwh->major;
-       fwe->fw_version.minor = fwh->minor;
-       fwe->fw_version.patch = fwh->patch;
-       fwe->fw_version.build = fwh->build;
+               key->hw_key_idx = key->keyidx;
 
-       str = (char *)fwh + le32_to_cpu(fwh->str_offset);
-       fwe->intfw = (u8 *)fwh + le32_to_cpu(fwh->int_fw_offset);
-       fwe->intfw_size = le32_to_cpu(fwh->int_fw_len);
-       fwe->extfw = (u8 *)fwh + le32_to_cpu(fwh->ext_fw_offset);
-       fwe->extfw_size = le32_to_cpu(fwh->ext_fw_len);
+               /* Set up default keys */
+               if (is_broadcast_ether_addr(address))
+                       priv->default_group_key = key->keyidx;
+               if (is_valid_ether_addr(address))
+                       priv->default_pairwise_key = key->keyidx;
 
-       fwe->loaded = 1;
+               /* Set up encryption MIBs */
 
-       dev_printk(KERN_DEBUG, &udev->dev,
-                  "using firmware %s (version %d.%d.%d-%d)\n",
-                  fwe->fwname, fwh->major, fwh->minor, fwh->patch, fwh->build);
+               /* first block of settings */
+               priv->mib_buf.size = 3;
+               priv->mib_buf.index = offsetof(struct mib_mac_encryption,
+                               privacy_invoked);
+               priv->mib_buf.data.data[0] = 1; /* privacy_invoked */
+               priv->mib_buf.data.data[1] = priv->default_pairwise_key;
+               priv->mib_buf.data.data[2] = priv->default_group_key;
 
-       at76_dbg(DBG_DEVSTART, "board %u, int %d:%d, ext %d:%d", board_type,
-                le32_to_cpu(fwh->int_fw_offset), le32_to_cpu(fwh->int_fw_len),
-                le32_to_cpu(fwh->ext_fw_offset), le32_to_cpu(fwh->ext_fw_len));
-       at76_dbg(DBG_DEVSTART, "firmware id %s", str);
+               if ((ret = at76_set_mib(priv, &priv->mib_buf)) !=
+                               CMD_STATUS_COMPLETE)
+                       goto exit;
 
+               /* second block of settings */
+               priv->mib_buf.size = 3;
+               priv->mib_buf.index = offsetof(struct mib_mac_encryption,
+                               exclude_unencrypted);
+               priv->mib_buf.data.data[0] = 1; /* exclude_unencrypted */
+               priv->mib_buf.data.data[1] = 0; /* wep_encryption_type */
+               priv->mib_buf.data.data[2] = 0; /* ckip_key_permutation */
+
+               if ((ret = at76_set_mib(priv, &priv->mib_buf)) !=
+                               CMD_STATUS_COMPLETE)
+                       goto exit;
+               ret = 0;
+       };
 exit:
-       mutex_unlock(&fw_mutex);
+       at76_dump_mib_mac_encryption(priv);
+       mutex_unlock(&priv->mtx);
+       return ret;
+}
 
-       if (fwe->loaded)
-               return fwe;
+static int at76_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                       const u8 *local_address, const u8 *address,
+                       struct ieee80211_key_conf *key)
+{
+       struct at76_priv *priv = hw->priv;
+
+       // int i;
+
+       at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "
+                "key->keylen %d",
+                __func__, cmd, key->alg, key->keyidx, key->keylen);
+
+       if (FIRMWARE_IS_WPA(priv->fw_version))
+               return at76_set_key_newfw(hw, cmd, local_address, address, key);
        else
-               return NULL;
+               return at76_set_key_oldfw(hw, cmd, local_address, address, key);
+
 }
 
+static const struct ieee80211_ops at76_ops = {
+       .tx = at76_mac80211_tx,
+       .add_interface = at76_add_interface,
+       .remove_interface = at76_remove_interface,
+       .config = at76_config,
+       .config_interface = at76_config_interface,
+       .configure_filter = at76_configure_filter,
+       .start = at76_mac80211_start,
+       .stop = at76_mac80211_stop,
+       .hw_scan = at76_hw_scan,
+       .set_key = at76_set_key,
+};
+
 /* Allocate network device and initialize private data */
 static struct at76_priv *at76_alloc_new_device(struct usb_device *udev)
 {
-       struct net_device *netdev;
+       struct ieee80211_hw *hw;
        struct at76_priv *priv;
-       int i;
 
-       /* allocate memory for our device state and initialize it */
-       netdev = alloc_etherdev(sizeof(struct at76_priv));
-       if (!netdev) {
-               dev_printk(KERN_ERR, &udev->dev, "out of memory\n");
+       hw = ieee80211_alloc_hw(sizeof(struct at76_priv), &at76_ops);
+       if (!hw) {
+               printk(KERN_ERR DRIVER_NAME ": could not register"
+                      " ieee80211_hw\n");
                return NULL;
        }
 
-       priv = netdev_priv(netdev);
+       priv = hw->priv;
+       priv->hw = hw;
 
        priv->udev = udev;
-       priv->netdev = netdev;
 
        mutex_init(&priv->mtx);
-       INIT_WORK(&priv->work_assoc_done, at76_work_assoc_done);
-       INIT_WORK(&priv->work_join, at76_work_join);
-       INIT_WORK(&priv->work_new_bss, at76_work_new_bss);
-       INIT_WORK(&priv->work_start_scan, at76_work_start_scan);
        INIT_WORK(&priv->work_set_promisc, at76_work_set_promisc);
        INIT_WORK(&priv->work_submit_rx, at76_work_submit_rx);
-       INIT_DELAYED_WORK(&priv->dwork_restart, at76_dwork_restart);
-       INIT_DELAYED_WORK(&priv->dwork_get_scan, at76_dwork_get_scan);
-       INIT_DELAYED_WORK(&priv->dwork_beacon, at76_dwork_beacon);
-       INIT_DELAYED_WORK(&priv->dwork_auth, at76_dwork_auth);
-       INIT_DELAYED_WORK(&priv->dwork_assoc, at76_dwork_assoc);
-
-       spin_lock_init(&priv->mgmt_spinlock);
-       priv->next_mgmt_bulk = NULL;
-       priv->mac_state = MAC_INIT;
-
-       /* initialize empty BSS list */
-       priv->curr_bss = NULL;
-       INIT_LIST_HEAD(&priv->bss_list);
-       spin_lock_init(&priv->bss_list_spinlock);
-
-       init_timer(&priv->bss_list_timer);
-       priv->bss_list_timer.data = (unsigned long)priv;
-       priv->bss_list_timer.function = at76_bss_list_timeout;
-
-       spin_lock_init(&priv->spy_spinlock);
-
-       /* mark all rx data entries as unused */
-       for (i = 0; i < NR_RX_DATA_BUF; i++)
-               priv->rx_data[i].skb = NULL;
+       INIT_DELAYED_WORK(&priv->dwork_hw_scan, at76_dwork_hw_scan);
 
        priv->rx_tasklet.func = at76_rx_tasklet;
        priv->rx_tasklet.data = 0;
@@ -5183,6 +2399,9 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev)
        priv->pm_mode = AT76_PM_OFF;
        priv->pm_period = 0;
 
+       /* unit us */
+       priv->hw->channel_change_time = 100000;
+
        return priv;
 }
 
@@ -5245,11 +2464,41 @@ static int at76_alloc_urbs(struct at76_priv *priv,
        return 0;
 }
 
+static struct ieee80211_rate at76_rates[] = {
+       { .bitrate = 10, .hw_value = TX_RATE_1MBIT, },
+       { .bitrate = 20, .hw_value = TX_RATE_2MBIT, },
+       { .bitrate = 55, .hw_value = TX_RATE_5_5MBIT, },
+       { .bitrate = 110, .hw_value = TX_RATE_11MBIT, },
+};
+
+static struct ieee80211_channel at76_channels[] = {
+       { .center_freq = 2412, .hw_value = 1 },
+       { .center_freq = 2417, .hw_value = 2 },
+       { .center_freq = 2422, .hw_value = 3 },
+       { .center_freq = 2427, .hw_value = 4 },
+       { .center_freq = 2432, .hw_value = 5 },
+       { .center_freq = 2437, .hw_value = 6 },
+       { .center_freq = 2442, .hw_value = 7 },
+       { .center_freq = 2447, .hw_value = 8 },
+       { .center_freq = 2452, .hw_value = 9 },
+       { .center_freq = 2457, .hw_value = 10 },
+       { .center_freq = 2462, .hw_value = 11 },
+       { .center_freq = 2467, .hw_value = 12 },
+       { .center_freq = 2472, .hw_value = 13 },
+       { .center_freq = 2484, .hw_value = 14 }
+};
+
+static struct ieee80211_supported_band at76_supported_band = {
+       .channels = at76_channels,
+       .n_channels = ARRAY_SIZE(at76_channels),
+       .bitrates = at76_rates,
+       .n_bitrates = ARRAY_SIZE(at76_rates),
+};
+
 /* Register network device and initialize the hardware */
 static int at76_init_new_device(struct at76_priv *priv,
                                struct usb_interface *interface)
 {
-       struct net_device *netdev = priv->netdev;
        int ret;
 
        /* set up the endpoint information */
@@ -5271,8 +2520,6 @@ static int at76_init_new_device(struct at76_priv *priv,
        }
 
        priv->domain = at76_get_reg_domain(priv->regulatory_domain);
-       /* init. netdev->dev_addr */
-       memcpy(netdev->dev_addr, priv->mac_addr, ETH_ALEN);
 
        priv->channel = DEF_CHANNEL;
        priv->iw_mode = IW_MODE_INFRA;
@@ -5282,47 +2529,55 @@ static int at76_init_new_device(struct at76_priv *priv,
        priv->txrate = TX_RATE_AUTO;
        priv->preamble_type = PREAMBLE_TYPE_LONG;
        priv->beacon_period = 100;
-       priv->beacons_last_qual = jiffies;
        priv->auth_mode = WLAN_AUTH_OPEN;
        priv->scan_min_time = DEF_SCAN_MIN_TIME;
        priv->scan_max_time = DEF_SCAN_MAX_TIME;
        priv->scan_mode = SCAN_TYPE_ACTIVE;
+       priv->default_pairwise_key = 0xff;
+       priv->default_group_key = 0xff;
+
+       /* mac80211 initialisation */
+       priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &at76_supported_band;
 
-       netdev->flags &= ~IFF_MULTICAST;        /* not yet or never */
-       netdev->open = at76_open;
-       netdev->stop = at76_stop;
-       netdev->get_stats = at76_get_stats;
-       netdev->ethtool_ops = &at76_ethtool_ops;
-
-       /* Add pointers to enable iwspy support. */
-       priv->wireless_data.spy_data = &priv->spy_data;
-       netdev->wireless_data = &priv->wireless_data;
-
-       netdev->hard_start_xmit = at76_tx;
-       netdev->tx_timeout = at76_tx_timeout;
-       netdev->watchdog_timeo = 2 * HZ;
-       netdev->wireless_handlers = &at76_handler_def;
-       netdev->set_multicast_list = at76_set_multicast;
-       netdev->set_mac_address = at76_set_mac_address;
-       dev_alloc_name(netdev, "wlan%d");
-
-       ret = register_netdev(priv->netdev);
+       if (FIRMWARE_IS_WPA(priv->fw_version) &&
+               (at76_is_503rfmd(priv->board_type) ||
+                at76_is_505(priv->board_type)))
+               priv->hw->flags = IEEE80211_HW_SIGNAL_UNSPEC;
+       else
+               priv->hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
+                                 IEEE80211_HW_SIGNAL_UNSPEC;
+
+       priv->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+
+       SET_IEEE80211_DEV(priv->hw, &interface->dev);
+       SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
+
+       ret = ieee80211_register_hw(priv->hw);
        if (ret) {
-               dev_printk(KERN_ERR, &interface->dev,
-                          "cannot register netdevice (status %d)!\n", ret);
+               printk(KERN_ERR "cannot register mac80211 hw (status %d)!\n",
+                      ret);
                goto exit;
        }
-       priv->netdev_registered = 1;
+
+       priv->mac80211_registered = 1;
 
        printk(KERN_INFO "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n",
-              netdev->name, interface->dev.bus_id, mac2str(priv->mac_addr),
+              wiphy_name(priv->hw->wiphy),
+              interface->dev.bus_id, mac2str(priv->mac_addr),
               priv->fw_version.major, priv->fw_version.minor,
               priv->fw_version.patch, priv->fw_version.build);
-       printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n", netdev->name,
+       printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n",
+              wiphy_name(priv->hw->wiphy),
               priv->regulatory_domain, priv->domain->name);
-
-       /* we let this timer run the whole time this driver instance lives */
-       mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
+       printk(KERN_INFO "%s: WPA support: ", wiphy_name(priv->hw->wiphy));
+       if (!FIRMWARE_IS_WPA(priv->fw_version))
+               printk("none\n");
+       else {
+               if (!at76_is_505a(priv->board_type))
+                       printk("TKIP\n");
+               else
+                       printk("TKIP, AES/CCMP\n");
+       };
 
 exit:
        return ret;
@@ -5330,15 +2585,13 @@ exit:
 
 static void at76_delete_device(struct at76_priv *priv)
 {
-       int i;
-
        at76_dbg(DBG_PROC_ENTRY, "%s: ENTER", __func__);
 
        /* The device is gone, don't bother turning it off */
        priv->device_unplugged = 1;
 
-       if (priv->netdev_registered)
-               unregister_netdev(priv->netdev);
+       if (priv->mac80211_registered)
+               ieee80211_unregister_hw(priv->hw);
 
        /* assuming we used keventd, it must quiesce too */
        flush_scheduled_work();
@@ -5359,25 +2612,11 @@ static void at76_delete_device(struct at76_priv *priv)
        if (priv->rx_skb)
                kfree_skb(priv->rx_skb);
 
-       at76_free_bss_list(priv);
-       del_timer_sync(&priv->bss_list_timer);
-       cancel_delayed_work(&priv->dwork_get_scan);
-       cancel_delayed_work(&priv->dwork_beacon);
-       cancel_delayed_work(&priv->dwork_auth);
-       cancel_delayed_work(&priv->dwork_assoc);
-
-       if (priv->mac_state == MAC_CONNECTED)
-               at76_iwevent_bss_disconnect(priv->netdev);
-
-       for (i = 0; i < NR_RX_DATA_BUF; i++)
-               if (priv->rx_data[i].skb) {
-                       dev_kfree_skb(priv->rx_data[i].skb);
-                       priv->rx_data[i].skb = NULL;
-               }
        usb_put_dev(priv->udev);
 
-       at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/netdev", __func__);
-       free_netdev(priv->netdev);      /* priv is in netdev */
+       at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/ieee80211_hw",
+                __func__);
+       ieee80211_free_hw(priv->hw);
 
        at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__);
 }
@@ -5473,7 +2712,6 @@ static int at76_probe(struct usb_interface *interface,
                goto error;
        }
 
-       SET_NETDEV_DEV(priv->netdev, &interface->dev);
        usb_set_intfdata(interface, priv);
 
        memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version));
@@ -5501,7 +2739,7 @@ static void at76_disconnect(struct usb_interface *interface)
        if (!priv)
                return;
 
-       printk(KERN_INFO "%s: disconnecting\n", priv->netdev->name);
+       printk(KERN_INFO "%s: disconnecting\n", wiphy_name(priv->hw->wiphy));
        at76_delete_device(priv);
        dev_printk(KERN_INFO, &interface->dev, "disconnected\n");
 }
@@ -5557,5 +2795,8 @@ MODULE_AUTHOR("Alex <alex@foogod.com>");
 MODULE_AUTHOR("Nick Jones");
 MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453@hotmail.com>");
 MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>");
+MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
+MODULE_AUTHOR("Kalle Valo <kalle.valo@iki.fi>");
+MODULE_AUTHOR("Milan Plzik <milan.plzik@gmail.com>");
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
index b20be9da1fa15608d31d71701ae7102ba3daac9f..8bb352f16d4598492d074d8ed8d27751ae09af18 100644 (file)
@@ -34,23 +34,6 @@ enum board_type {
        BOARD_505AMX = 8
 };
 
-/* our private ioctl's */
-/* preamble length (0 - long, 1 - short, 2 - auto) */
-#define AT76_SET_SHORT_PREAMBLE                (SIOCIWFIRSTPRIV + 0)
-#define AT76_GET_SHORT_PREAMBLE                (SIOCIWFIRSTPRIV + 1)
-/* which debug channels are enabled */
-#define AT76_SET_DEBUG                 (SIOCIWFIRSTPRIV + 2)
-#define AT76_GET_DEBUG                 (SIOCIWFIRSTPRIV + 3)
-/* power save mode (incl. the Atmel proprietary smart save mode) */
-#define AT76_SET_POWERSAVE_MODE                (SIOCIWFIRSTPRIV + 4)
-#define AT76_GET_POWERSAVE_MODE                (SIOCIWFIRSTPRIV + 5)
-/* min and max channel times for scan */
-#define AT76_SET_SCAN_TIMES            (SIOCIWFIRSTPRIV + 6)
-#define AT76_GET_SCAN_TIMES            (SIOCIWFIRSTPRIV + 7)
-/* scan mode (0 - active, 1 - passive) */
-#define AT76_SET_SCAN_MODE             (SIOCIWFIRSTPRIV + 8)
-#define AT76_GET_SCAN_MODE             (SIOCIWFIRSTPRIV + 9)
-
 #define CMD_STATUS_IDLE                                0x00
 #define CMD_STATUS_COMPLETE                    0x01
 #define CMD_STATUS_UNKNOWN                     0x02
@@ -82,6 +65,7 @@ enum board_type {
 #define MIB_MAC                        0x03
 #define MIB_MAC_MGMT           0x05
 #define MIB_MAC_WEP            0x06
+#define MIB_MAC_ENCRYPTION     0x06
 #define MIB_PHY                        0x07
 #define MIB_FW_VERSION         0x08
 #define MIB_MDOMAIN            0x09
@@ -106,6 +90,26 @@ enum board_type {
 #define AT76_PM_ON             2
 #define AT76_PM_SMART          3
 
+/* cipher values for encryption keys */
+#define CIPHER_NONE            0       /* this value is only guessed */
+#define CIPHER_WEP64           1
+#define CIPHER_TKIP            2
+#define CIPHER_CCMP            3
+#define CIPHER_CCX             4       /* for consistency sake only */
+#define CIPHER_WEP128          5
+
+/* bit flags key types for encryption keys */
+#define KEY_PAIRWISE           2
+#define KEY_TX                 4
+
+#define CIPHER_KEYS            (4)
+#define CIPHER_KEY_LEN         (40)
+
+struct key_config {
+       u8 cipher;
+       u8 keylen;
+};
+
 struct hwcfg_r505 {
        u8 cr39_values[14];
        u8 reserved1[14];
@@ -147,6 +151,9 @@ union at76_hwcfg {
 
 #define WEP_SMALL_KEY_LEN      (40 / 8)
 #define WEP_LARGE_KEY_LEN      (104 / 8)
+#define WEP_KEYS               (4)
+
+
 
 struct at76_card_config {
        u8 exclude_unencrypted;
@@ -161,7 +168,7 @@ struct at76_card_config {
        u8 privacy_invoked;
        u8 wep_default_key_id;  /* 0..3 */
        u8 current_ssid[32];
-       u8 wep_default_key_value[4][WEP_KEY_LEN];
+       u8 wep_default_key_value[4][WEP_LARGE_KEY_LEN];
        u8 ssid_len;
        u8 short_preamble;
        __le16 beacon_period;
@@ -186,7 +193,7 @@ struct at76_rx_buffer {
        u8 link_quality;
        u8 noise_level;
        __le32 rx_time;
-       u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN];
+       u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
 } __attribute__((packed));
 
 /* Length of Atmel-specific Tx header before 802.11 frame */
@@ -196,8 +203,11 @@ struct at76_tx_buffer {
        __le16 wlength;
        u8 tx_rate;
        u8 padding;
-       u8 reserved[4];
-       u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN];
+       u8 key_id;
+       u8 cipher_type;
+       u8 cipher_length;
+       u8 reserved;
+       u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
 } __attribute__((packed));
 
 /* defines for scan_type below */
@@ -244,6 +254,7 @@ struct set_mib_buffer {
                u8 byte;
                __le16 word;
                u8 addr[ETH_ALEN];
+               u8 data[256];   /* we need more space for mib_mac_encryption */
        } data;
 } __attribute__((packed));
 
@@ -317,10 +328,24 @@ struct mib_mac_wep {
        u8 exclude_unencrypted;
        __le32 wep_icv_error_count;
        __le32 wep_excluded_count;
-       u8 wep_default_keyvalue[WEP_KEYS][WEP_KEY_LEN];
+       u8 wep_default_keyvalue[WEP_KEYS][WEP_LARGE_KEY_LEN];
        u8 encryption_level;    /* 1 for 40bit, 2 for 104bit encryption */
 } __attribute__((packed));
 
+struct mib_mac_encryption {
+       u8 cipher_default_keyvalue[CIPHER_KEYS][CIPHER_KEY_LEN];
+       u8 tkip_bssid[6];
+       u8 privacy_invoked;
+       u8 cipher_default_key_id;
+       u8 cipher_default_group_key_id;
+       u8 exclude_unencrypted;
+       u8 wep_encryption_type;
+       u8 ckip_key_permutation;        /* bool */
+       __le32 wep_icv_error_count;
+       __le32 wep_excluded_count;
+       u8 key_rsc[CIPHER_KEYS][8];
+} __attribute__((packed));
+
 struct mib_phy {
        __le32 ed_threshold;
 
@@ -364,16 +389,6 @@ struct at76_fw_header {
        __le32 ext_fw_len;      /* external firmware image length */
 } __attribute__((packed));
 
-enum mac_state {
-       MAC_INIT,
-       MAC_SCANNING,
-       MAC_AUTH,
-       MAC_ASSOC,
-       MAC_JOINING,
-       MAC_CONNECTED,
-       MAC_OWN_IBSS
-};
-
 /* a description of a regulatory domain and the allowed channels */
 struct reg_domain {
        u16 code;
@@ -381,47 +396,6 @@ struct reg_domain {
        u32 channel_map;        /* if bit N is set, channel (N+1) is allowed */
 };
 
-/* how long do we keep a (I)BSS in the bss_list in jiffies
-   this should be long enough for the user to retrieve the table
-   (by iwlist ?) after the device started, because all entries from
-   other channels than the one the device locks on get removed, too */
-#define BSS_LIST_TIMEOUT       (120 * HZ)
-/* struct to store BSS info found during scan */
-#define BSS_LIST_MAX_RATE_LEN  32      /* 32 rates should be enough ... */
-
-struct bss_info {
-       struct list_head list;
-
-       u8 bssid[ETH_ALEN];     /* bssid */
-       u8 ssid[IW_ESSID_MAX_SIZE];     /* essid */
-       u8 ssid_len;            /* length of ssid above */
-       u8 channel;
-       u16 capa;               /* BSS capabilities */
-       u16 beacon_interval;    /* beacon interval, Kus (1024 microseconds) */
-       u8 rates[BSS_LIST_MAX_RATE_LEN];        /* supported rates in units of
-                                                  500 kbps, ORed with 0x80 for
-                                                  basic rates */
-       u8 rates_len;
-
-       /* quality of received beacon */
-       u8 rssi;
-       u8 link_qual;
-       u8 noise_level;
-
-       unsigned long last_rx;  /* time (jiffies) of last beacon received */
-};
-
-/* a rx data buffer to collect rx fragments */
-struct rx_data_buf {
-       u8 sender[ETH_ALEN];    /* sender address */
-       u16 seqnr;              /* sequence number */
-       u16 fragnr;             /* last fragment received */
-       unsigned long last_rx;  /* jiffies of last rx */
-       struct sk_buff *skb;    /* == NULL if entry is free */
-};
-
-#define NR_RX_DATA_BUF         8
-
 /* Data for one loaded firmware file */
 struct fwentry {
        const char *const fwname;
@@ -438,11 +412,9 @@ struct fwentry {
 
 struct at76_priv {
        struct usb_device *udev;        /* USB device pointer */
-       struct net_device *netdev;      /* net device pointer */
-       struct net_device_stats stats;  /* net device stats */
-       struct iw_statistics wstats;    /* wireless stats */
 
        struct sk_buff *rx_skb; /* skbuff for receiving data */
+       struct sk_buff *tx_skb; /* skbuff for transmitting data */
        void *bulk_out_buffer;  /* buffer for sending data */
 
        struct urb *tx_urb;     /* URB for sending data */
@@ -454,26 +426,17 @@ struct at76_priv {
        struct mutex mtx;       /* locks this structure */
 
        /* work queues */
-       struct work_struct work_assoc_done;
-       struct work_struct work_join;
-       struct work_struct work_new_bss;
-       struct work_struct work_start_scan;
        struct work_struct work_set_promisc;
        struct work_struct work_submit_rx;
-       struct delayed_work dwork_restart;
-       struct delayed_work dwork_get_scan;
-       struct delayed_work dwork_beacon;
-       struct delayed_work dwork_auth;
-       struct delayed_work dwork_assoc;
+       struct delayed_work dwork_hw_scan;
 
        struct tasklet_struct rx_tasklet;
 
        /* the WEP stuff */
        int wep_enabled;        /* 1 if WEP is enabled */
        int wep_key_id;         /* key id to be used */
-       u8 wep_keys[WEP_KEYS][WEP_KEY_LEN];     /* the four WEP keys,
-                                                  5 or 13 bytes are used */
-       u8 wep_keys_len[WEP_KEYS];      /* the length of the above keys */
+       u8 wep_keys[WEP_KEYS][WEP_LARGE_KEY_LEN];       /* WEP keys */
+       u8 wep_keys_len[WEP_KEYS];      /* length of WEP keys */
 
        int channel;
        int iw_mode;
@@ -495,44 +458,13 @@ struct at76_priv {
        int scan_mode;          /* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */
        int scan_need_any;      /* if set, need to scan for any ESSID */
 
-       /* the list we got from scanning */
-       spinlock_t bss_list_spinlock;   /* protects bss_list operations */
-       struct list_head bss_list;      /* list of BSS we got beacons from */
-       struct timer_list bss_list_timer;       /* timer to purge old entries
-                                                  from bss_list */
-       struct bss_info *curr_bss;      /* current BSS */
        u16 assoc_id;           /* current association ID, if associated */
 
-       u8 wanted_bssid[ETH_ALEN];
-       int wanted_bssid_valid; /* != 0 if wanted_bssid is to be used */
-
-       /* some data for infrastructure mode only */
-       spinlock_t mgmt_spinlock;       /* this spinlock protects access to
-                                          next_mgmt_bulk */
-
-       struct at76_tx_buffer *next_mgmt_bulk;  /* pending management msg to
-                                                  send via bulk out */
-       enum mac_state mac_state;
-       enum {
-               SCAN_IDLE,
-               SCAN_IN_PROGRESS,
-               SCAN_COMPLETED
-       } scan_state;
-       time_t last_scan;
-
-       int retries;            /* remaining retries in case of timeout when
-                                * sending AuthReq or AssocReq */
        u8 pm_mode;             /* power management mode */
        u32 pm_period;          /* power management period in microseconds */
 
        struct reg_domain const *domain;        /* reg domain description */
 
-       /* iwspy support */
-       spinlock_t spy_spinlock;
-       struct iw_spy_data spy_data;
-
-       struct iw_public_data wireless_data;
-
        /* These fields contain HW config provided by the device (not all of
         * these fields are used by all board types) */
        u8 mac_addr[ETH_ALEN];
@@ -540,9 +472,6 @@ struct at76_priv {
 
        struct at76_card_config card_config;
 
-       /* store rx fragments until complete */
-       struct rx_data_buf rx_data[NR_RX_DATA_BUF];
-
        enum board_type board_type;
        struct mib_fw_version fw_version;
 
@@ -550,58 +479,20 @@ struct at76_priv {
        unsigned int netdev_registered:1;
        struct set_mib_buffer mib_buf;  /* global buffer for set_mib calls */
 
-       /* beacon counting */
        int beacon_period;      /* period of mgmt beacons, Kus */
-       int beacons_received;
-       unsigned long beacons_last_qual;        /* time we restarted counting
-                                                  beacons */
-};
 
-struct at76_rx_radiotap {
-       struct ieee80211_radiotap_header rt_hdr;
-       __le64 rt_tsft;
-       u8 rt_flags;
-       u8 rt_rate;
-       s8 rt_signal;
-       s8 rt_noise;
-};
-
-#define AT76_RX_RADIOTAP_PRESENT                 \
-       ((1 << IEEE80211_RADIOTAP_TSFT)         | \
-       (1 << IEEE80211_RADIOTAP_FLAGS)         | \
-       (1 << IEEE80211_RADIOTAP_RATE)          | \
-       (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL)  | \
-       (1 << IEEE80211_RADIOTAP_DB_ANTNOISE))
-
-#define BEACON_MAX_DATA_LENGTH 1500
-
-/* the maximum size of an AssocReq packet */
-#define ASSOCREQ_MAX_SIZE \
-  (AT76_TX_HDRLEN + sizeof(struct ieee80211_assoc_request) + \
-   1 + 1 + IW_ESSID_MAX_SIZE + 1 + 1 + 4)
-
-/* for shared secret auth, add the challenge text size */
-#define AUTH_FRAME_SIZE (AT76_TX_HDRLEN + sizeof(struct ieee80211_auth))
+       struct ieee80211_hw *hw;
+       int mac80211_registered;
 
-/* Maximal number of AuthReq retries */
-#define AUTH_RETRIES           3
-
-/* Maximal number of AssocReq retries */
-#define ASSOC_RETRIES          3
-
-/* Beacon timeout in managed mode when we are connected */
-#define BEACON_TIMEOUT         (10 * HZ)
-
-/* Timeout for authentication response */
-#define AUTH_TIMEOUT           (1 * HZ)
+       struct key_config keys[4];      /* installed key types */
+       u8 default_pairwise_key;
+       u8 default_group_key;
+};
 
-/* Timeout for association response */
-#define ASSOC_TIMEOUT          (1 * HZ)
+#define AT76_SUPPORTED_FILTERS FIF_PROMISC_IN_BSS
 
-/* Polling interval when scan is running */
 #define SCAN_POLL_INTERVAL     (HZ / 4)
 
-/* Command completion timeout */
 #define CMD_COMPLETION_TIMEOUT (5 * HZ)
 
 #define DEF_RTS_THRESHOLD      1536
@@ -611,8 +502,6 @@ struct at76_rx_radiotap {
 #define DEF_SCAN_MIN_TIME      10
 #define DEF_SCAN_MAX_TIME      120
 
-#define MAX_RTS_THRESHOLD      (MAX_FRAG_THRESHOLD + 1)
-
 /* the max padding size for tx in bytes (see calc_padding) */
 #define MAX_PADDING_SIZE       53