31 files changed, 24886 insertions, 1530 deletions

diff --git a/Documentation/networking/README.ipw2100 b/Documentation/networking/README.ipw2100
new file mode 100644
index 000000000000..2046948b020d
--- /dev/null
+++ b/Documentation/networking/README.ipw2100
@@ -0,0 +1,246 @@
+
+===========================
+Intel(R) PRO/Wireless 2100 Network Connection Driver for Linux
+README.ipw2100
+
+March 14, 2005
+
+===========================
+Index
+---------------------------
+0. Introduction
+1. Release 1.1.0 Current Features
+2. Command Line Parameters
+3. Sysfs Helper Files
+4. Radio Kill Switch
+5. Dynamic Firmware
+6. Power Management
+7. Support
+8. License
+
+
+===========================
+0. Introduction
+------------ -----   -----       ----       ---       --         -     
+
+This document provides a brief overview of the features supported by the 
+IPW2100 driver project.  The main project website, where the latest 
+development version of the driver can be found, is:
+
+        http://ipw2100.sourceforge.net
+
+There you can find the not only the latest releases, but also information about
+potential fixes and patches, as well as links to the development mailing list
+for the driver project.
+
+
+===========================
+1. Release 1.1.0 Current Supported Features
+---------------------------     
+- Managed (BSS) and Ad-Hoc (IBSS)
+- WEP (shared key and open)
+- Wireless Tools support 
+- 802.1x (tested with XSupplicant 1.0.1)
+
+Enabled (but not supported) features:
+- Monitor/RFMon mode
+- WPA/WPA2
+
+The distinction between officially supported and enabled is a reflection
+on the amount of validation and interoperability testing that has been
+performed on a given feature.
+
+
+===========================
+2. Command Line Parameters
+---------------------------     
+
+If the driver is built as a module, the following optional parameters are used
+by entering them on the command line with the modprobe command using this
+syntax:
+
+        modprobe ipw2100 [<option>=<VAL1><,VAL2>...]
+
+For example, to disable the radio on driver loading, enter:
+
+        modprobe ipw2100 disable=1
+
+The ipw2100 driver supports the following module parameters:
+
+Name            Value           Example:
+debug           0x0-0xffffffff  debug=1024
+mode            0,1,2           mode=1   /* AdHoc */
+channel         int             channel=3 /* Only valid in AdHoc or Monitor */
+associate       boolean         associate=0 /* Do NOT auto associate */
+disable         boolean         disable=1 /* Do not power the HW */
+
+
+===========================
+3. Sysfs Helper Files
+---------------------------     
+
+There are several ways to control the behavior of the driver.  Many of the 
+general capabilities are exposed through the Wireless Tools (iwconfig).  There
+are a few capabilities that are exposed through entries in the Linux Sysfs.
+
+
+----- Driver Level ------
+For the driver level files, look in /sys/bus/pci/drivers/ipw2100/
+
+  debug_level  
+        
+        This controls the same global as the 'debug' module parameter.  For 
+        information on the various debugging levels available, run the 'dvals'
+        script found in the driver source directory.
+
+        NOTE:  'debug_level' is only enabled if CONFIG_IPW2100_DEBUG is turn
+               on.
+
+----- Device Level ------
+For the device level files look in
+        
+        /sys/bus/pci/drivers/ipw2100/{PCI-ID}/
+
+For example:
+        /sys/bus/pci/drivers/ipw2100/0000:02:01.0
+
+For the device level files, see /sys/bus/pci/drivers/ipw2100:
+
+  rf_kill
+        read - 
+        0 = RF kill not enabled (radio on)
+        1 = SW based RF kill active (radio off)
+        2 = HW based RF kill active (radio off)
+        3 = Both HW and SW RF kill active (radio off)
+        write -
+        0 = If SW based RF kill active, turn the radio back on
+        1 = If radio is on, activate SW based RF kill
+
+        NOTE: If you enable the SW based RF kill and then toggle the HW
+        based RF kill from ON -> OFF -> ON, the radio will NOT come back on
+
+
+===========================
+4. Radio Kill Switch
+---------------------------
+Most laptops provide the ability for the user to physically disable the radio.
+Some vendors have implemented this as a physical switch that requires no
+software to turn the radio off and on.  On other laptops, however, the switch
+is controlled through a button being pressed and a software driver then making
+calls to turn the radio off and on.  This is referred to as a "software based
+RF kill switch"
+
+See the Sysfs helper file 'rf_kill' for determining the state of the RF switch
+on your system.
+
+
+===========================
+5. Dynamic Firmware
+---------------------------     
+As the firmware is licensed under a restricted use license, it can not be 
+included within the kernel sources.  To enable the IPW2100 you will need a 
+firmware image to load into the wireless NIC's processors.
+
+You can obtain these images from <http://ipw2100.sf.net/firmware.php>.
+
+See INSTALL for instructions on installing the firmware.
+
+
+===========================
+6. Power Management
+---------------------------     
+The IPW2100 supports the configuration of the Power Save Protocol 
+through a private wireless extension interface.  The IPW2100 supports 
+the following different modes:
+
+        off     No power management.  Radio is always on.
+        on      Automatic power management
+        1-5     Different levels of power management.  The higher the 
+                number the greater the power savings, but with an impact to 
+                packet latencies. 
+
+Power management works by powering down the radio after a certain 
+interval of time has passed where no packets are passed through the 
+radio.  Once powered down, the radio remains in that state for a given 
+period of time.  For higher power savings, the interval between last 
+packet processed to sleep is shorter and the sleep period is longer.
+
+When the radio is asleep, the access point sending data to the station 
+must buffer packets at the AP until the station wakes up and requests 
+any buffered packets.  If you have an AP that does not correctly support 
+the PSP protocol you may experience packet loss or very poor performance 
+while power management is enabled.  If this is the case, you will need 
+to try and find a firmware update for your AP, or disable power 
+management (via `iwconfig eth1 power off`)
+
+To configure the power level on the IPW2100 you use a combination of 
+iwconfig and iwpriv.  iwconfig is used to turn power management on, off, 
+and set it to auto.
+
+        iwconfig eth1 power off    Disables radio power down
+        iwconfig eth1 power on     Enables radio power management to 
+                                   last set level (defaults to AUTO)
+        iwpriv eth1 set_power 0    Sets power level to AUTO and enables 
+                                   power management if not previously 
+                                   enabled.
+        iwpriv eth1 set_power 1-5  Set the power level as specified, 
+                                   enabling power management if not 
+                                   previously enabled.
+
+You can view the current power level setting via:
+        
+        iwpriv eth1 get_power
+
+It will return the current period or timeout that is configured as a string
+in the form of xxxx/yyyy (z) where xxxx is the timeout interval (amount of
+time after packet processing), yyyy is the period to sleep (amount of time to 
+wait before powering the radio and querying the access point for buffered
+packets), and z is the 'power level'.  If power management is turned off the
+xxxx/yyyy will be replaced with 'off' -- the level reported will be the active
+level if `iwconfig eth1 power on` is invoked.
+
+
+===========================
+7. Support
+---------------------------     
+
+For general development information and support,
+go to:
+        
+    http://ipw2100.sf.net/
+
+The ipw2100 1.1.0 driver and firmware can be downloaded from:  
+
+    http://support.intel.com
+
+For installation support on the ipw2100 1.1.0 driver on Linux kernels 
+2.6.8 or greater, email support is available from:  
+
+    http://supportmail.intel.com
+
+===========================
+8. License
+---------------------------     
+
+  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it 
+  under the terms of the GNU General Public License (version 2) as 
+  published by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful, but WITHOUT 
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+  more details.
+  
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59 
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  License Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200
new file mode 100644
index 000000000000..6916080c5f03
--- /dev/null
+++ b/Documentation/networking/README.ipw2200
@@ -0,0 +1,300 @@
+
+Intel(R) PRO/Wireless 2915ABG Driver for Linux in support of:
+
+Intel(R) PRO/Wireless 2200BG Network Connection 
+Intel(R) PRO/Wireless 2915ABG Network Connection 
+
+Note: The Intel(R) PRO/Wireless 2915ABG Driver for Linux and Intel(R) 
+PRO/Wireless 2200BG Driver for Linux is a unified driver that works on 
+both hardware adapters listed above. In this document the Intel(R) 
+PRO/Wireless 2915ABG Driver for Linux will be used to reference the 
+unified driver.
+
+Copyright (C) 2004-2005, Intel Corporation
+
+README.ipw2200
+
+Version: 1.0.0
+Date   : January 31, 2005
+
+
+Index
+-----------------------------------------------
+1.   Introduction
+1.1. Overview of features
+1.2. Module parameters
+1.3. Wireless Extension Private Methods
+1.4. Sysfs Helper Files
+2.   About the Version Numbers
+3.   Support
+4.   License
+
+
+1.   Introduction
+-----------------------------------------------
+The following sections attempt to provide a brief introduction to using 
+the Intel(R) PRO/Wireless 2915ABG Driver for Linux.
+
+This document is not meant to be a comprehensive manual on 
+understanding or using wireless technologies, but should be sufficient 
+to get you moving without wires on Linux.
+
+For information on building and installing the driver, see the INSTALL
+file.
+
+
+1.1. Overview of Features
+-----------------------------------------------
+The current release (1.0.0) supports the following features:
+
++ BSS mode (Infrastructure, Managed)
++ IBSS mode (Ad-Hoc)
++ WEP (OPEN and SHARED KEY mode)
++ 802.1x EAP via wpa_supplicant and xsupplicant
++ Wireless Extension support 
++ Full B and G rate support (2200 and 2915)
++ Full A rate support (2915 only)
++ Transmit power control
++ S state support (ACPI suspend/resume)
++ long/short preamble support
+
+
+
+1.2. Command Line Parameters
+-----------------------------------------------
+
+Like many modules used in the Linux kernel, the Intel(R) PRO/Wireless 
+2915ABG Driver for Linux allows certain configuration options to be 
+provided as module parameters.  The most common way to specify a module 
+parameter is via the command line.  
+
+The general form is:
+
+% modprobe ipw2200 parameter=value
+
+Where the supported parameter are:
+
+  associate
+        Set to 0 to disable the auto scan-and-associate functionality of the
+        driver.  If disabled, the driver will not attempt to scan 
+        for and associate to a network until it has been configured with 
+        one or more properties for the target network, for example configuring 
+        the network SSID.  Default is 1 (auto-associate)
+        
+        Example: % modprobe ipw2200 associate=0
+
+  auto_create
+        Set to 0 to disable the auto creation of an Ad-Hoc network 
+        matching the channel and network name parameters provided.  
+        Default is 1.
+
+  channel
+        channel number for association.  The normal method for setting
+        the channel would be to use the standard wireless tools
+        (i.e. `iwconfig eth1 channel 10`), but it is useful sometimes
+        to set this while debugging.  Channel 0 means 'ANY'
+
+  debug
+        If using a debug build, this is used to control the amount of debug
+        info is logged.  See the 'dval' and 'load' script for more info on
+        how to use this (the dval and load scripts are provided as part 
+        of the ipw2200 development snapshot releases available from the 
+        SourceForge project at http://ipw2200.sf.net)
+
+  mode
+        Can be used to set the default mode of the adapter.  
+        0 = Managed, 1 = Ad-Hoc
+
+
+1.3. Wireless Extension Private Methods
+-----------------------------------------------
+
+As an interface designed to handle generic hardware, there are certain 
+capabilities not exposed through the normal Wireless Tool interface.  As 
+such, a provision is provided for a driver to declare custom, or 
+private, methods.  The Intel(R) PRO/Wireless 2915ABG Driver for Linux 
+defines several of these to configure various settings.
+
+The general form of using the private wireless methods is:
+
+        % iwpriv $IFNAME method parameters
+
+Where $IFNAME is the interface name the device is registered with 
+(typically eth1, customized via one of the various network interface
+name managers, such as ifrename)
+
+The supported private methods are:
+
+  get_mode
+        Can be used to report out which IEEE mode the driver is 
+        configured to support.  Example:
+        
+        % iwpriv eth1 get_mode
+        eth1    get_mode:802.11bg (6)
+
+  set_mode
+        Can be used to configure which IEEE mode the driver will 
+        support.  
+
+        Usage:
+        % iwpriv eth1 set_mode {mode}
+        Where {mode} is a number in the range 1-7:
+        1       802.11a (2915 only)
+        2       802.11b
+        3       802.11ab (2915 only)
+        4       802.11g 
+        5       802.11ag (2915 only)
+        6       802.11bg
+        7       802.11abg (2915 only)
+
+  get_preamble
+        Can be used to report configuration of preamble length.
+
+  set_preamble
+        Can be used to set the configuration of preamble length:
+
+        Usage:
+        % iwpriv eth1 set_preamble {mode}
+        Where {mode} is one of:
+        1       Long preamble only
+        0       Auto (long or short based on connection)
+        
+
+1.4. Sysfs Helper Files:
+-----------------------------------------------
+
+The Linux kernel provides a pseudo file system that can be used to 
+access various components of the operating system.  The Intel(R) 
+PRO/Wireless 2915ABG Driver for Linux exposes several configuration 
+parameters through this mechanism.
+
+An entry in the sysfs can support reading and/or writing.  You can 
+typically query the contents of a sysfs entry through the use of cat, 
+and can set the contents via echo.  For example:
+
+% cat /sys/bus/pci/drivers/ipw2200/debug_level
+
+Will report the current debug level of the driver's logging subsystem 
+(only available if CONFIG_IPW_DEBUG was configured when the driver was 
+built).
+
+You can set the debug level via:
+
+% echo $VALUE > /sys/bus/pci/drivers/ipw2200/debug_level
+
+Where $VALUE would be a number in the case of this sysfs entry.  The 
+input to sysfs files does not have to be a number.  For example, the 
+firmware loader used by hotplug utilizes sysfs entries for transferring 
+the firmware image from user space into the driver.
+
+The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries 
+at two levels -- driver level, which apply to all instances of the 
+driver (in the event that there are more than one device installed) and 
+device level, which applies only to the single specific instance.
+
+
+1.4.1 Driver Level Sysfs Helper Files
+-----------------------------------------------
+
+For the driver level files, look in /sys/bus/pci/drivers/ipw2200/
+
+  debug_level  
+        
+        This controls the same global as the 'debug' module parameter
+
+
+1.4.2 Device Level Sysfs Helper Files
+-----------------------------------------------
+
+For the device level files, look in
+        
+        /sys/bus/pci/drivers/ipw2200/{PCI-ID}/
+
+For example:
+        /sys/bus/pci/drivers/ipw2200/0000:02:01.0
+
+For the device level files, see /sys/bus/pci/[drivers/ipw2200:
+
+  rf_kill
+        read - 
+        0 = RF kill not enabled (radio on)
+        1 = SW based RF kill active (radio off)
+        2 = HW based RF kill active (radio off)
+        3 = Both HW and SW RF kill active (radio off)
+        write -
+        0 = If SW based RF kill active, turn the radio back on
+        1 = If radio is on, activate SW based RF kill
+
+        NOTE: If you enable the SW based RF kill and then toggle the HW
+        based RF kill from ON -> OFF -> ON, the radio will NOT come back on
+        
+  ucode 
+        read-only access to the ucode version number
+
+
+2.   About the Version Numbers
+-----------------------------------------------
+
+Due to the nature of open source development projects, there are 
+frequently changes being incorporated that have not gone through 
+a complete validation process.  These changes are incorporated into 
+development snapshot releases.
+
+Releases are numbered with a three level scheme: 
+
+        major.minor.development
+
+Any version where the 'development' portion is 0 (for example
+1.0.0, 1.1.0, etc.) indicates a stable version that will be made 
+available for kernel inclusion.
+
+Any version where the 'development' portion is not a 0 (for
+example 1.0.1, 1.1.5, etc.) indicates a development version that is
+being made available for testing and cutting edge users.  The stability 
+and functionality of the development releases are not know.  We make
+efforts to try and keep all snapshots reasonably stable, but due to the
+frequency of their release, and the desire to get those releases 
+available as quickly as possible, unknown anomalies should be expected.
+
+The major version number will be incremented when significant changes
+are made to the driver.  Currently, there are no major changes planned.
+
+
+3.  Support
+-----------------------------------------------
+
+For installation support of the 1.0.0 version, you can contact 
+http://supportmail.intel.com, or you can use the open source project 
+support.
+
+For general information and support, go to:
+        
+    http://ipw2200.sf.net/
+
+
+4.  License
+-----------------------------------------------
+
+  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it 
+  under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful, but WITHOUT 
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+  more details.
+  
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59 
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 30e8d589d167..3dbb1cb09ed8 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -7,7 +7,7 @@
  * of the original driver such as link fail-over and link management because
  * those should be done at higher levels.
  *
- * Copyright (C) 2004, Stephen Hemminger <shemminger@osdl.org>
+ * Copyright (C) 2004, 2005 Stephen Hemminger <shemminger@osdl.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,19 +42,20 @@
 #include "skge.h"
 
 #define DRV_NAME                "skge"
-#define DRV_VERSION             "0.6"
+#define DRV_VERSION             "0.7"
 #define PFX                     DRV_NAME " "
 
 #define DEFAULT_TX_RING_SIZE    128
 #define DEFAULT_RX_RING_SIZE    512
 #define MAX_TX_RING_SIZE        1024
 #define MAX_RX_RING_SIZE        4096
+#define RX_COPY_THRESHOLD       128
+#define RX_BUF_SIZE             1536
 #define PHY_RETRIES             1000
 #define ETH_JUMBO_MTU           9000
 #define TX_WATCHDOG             (5 * HZ)
 #define NAPI_WEIGHT             64
 #define BLINK_HZ                (HZ/4)
-#define LINK_POLL_HZ            (HZ/10)
 
 MODULE_DESCRIPTION("SysKonnect Gigabit Ethernet driver");
 MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
@@ -70,28 +71,17 @@ module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 
 static const struct pci_device_id skge_id_table[] = {
-        { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C940,
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C940B,
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE,
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU,
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_SYSKONNECT, 0x9E00, /* SK-9Exx  */
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE510T,
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_MARVELL, 0x4320, /* Gigabit Ethernet Controller */
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_MARVELL, 0x5005, /* Marvell (11ab), Belkin */
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD,
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1032,
-          PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1064,
-          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_DEVICE(PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C940) },
+        { PCI_DEVICE(PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C940B) },
+        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE) },
+        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU) },
+        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx  */
+        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE510T), },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */
+        { PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) },
+        { PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1032) },
+        { PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1064) },
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, skge_id_table);
@@ -99,19 +89,22 @@ MODULE_DEVICE_TABLE(pci, skge_id_table);
 static int skge_up(struct net_device *dev);
 static int skge_down(struct net_device *dev);
 static void skge_tx_clean(struct skge_port *skge);
-static void skge_xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
-static void skge_gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
+static void xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
+static void gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
 static void genesis_get_stats(struct skge_port *skge, u64 *data);
 static void yukon_get_stats(struct skge_port *skge, u64 *data);
 static void yukon_init(struct skge_hw *hw, int port);
 static void yukon_reset(struct skge_hw *hw, int port);
 static void genesis_mac_init(struct skge_hw *hw, int port);
 static void genesis_reset(struct skge_hw *hw, int port);
+static void genesis_link_up(struct skge_port *skge);
 
+/* Avoid conditionals by using array */
 static const int txqaddr[] = { Q_XA1, Q_XA2 };
 static const int rxqaddr[] = { Q_R1, Q_R2 };
 static const u32 rxirqmask[] = { IS_R1_F, IS_R2_F };
 static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F };
+static const u32 portirqmask[] = { IS_PORT_1, IS_PORT_2 };
 
 /* Don't need to look at whole 16K.
  * last interesting register is descriptor poll timer.
@@ -154,7 +147,7 @@ static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 static int wol_supported(const struct skge_hw *hw)
 {
         return !((hw->chip_id == CHIP_ID_GENESIS ||
-                  (hw->chip_id == CHIP_ID_YUKON && chip_rev(hw) == 0)));
+                  (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev == 0)));
 }
 
 static void skge_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
@@ -170,7 +163,7 @@ static int skge_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         struct skge_port *skge = netdev_priv(dev);
         struct skge_hw *hw = skge->hw;
 
-        if(wol->wolopts != WAKE_MAGIC && wol->wolopts != 0)
+        if (wol->wolopts != WAKE_MAGIC && wol->wolopts != 0)
                 return -EOPNOTSUPP;
 
         if (wol->wolopts == WAKE_MAGIC && !wol_supported(hw))
@@ -190,6 +183,36 @@ static int skge_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         return 0;
 }
 
+/* Determine supported/adverised modes based on hardware.
+ * Note: ethtoool ADVERTISED_xxx == SUPPORTED_xxx
+ */
+static u32 skge_supported_modes(const struct skge_hw *hw)
+{
+        u32 supported;
+
+        if (iscopper(hw)) {
+                supported = SUPPORTED_10baseT_Half
+                        | SUPPORTED_10baseT_Full
+                        | SUPPORTED_100baseT_Half
+                        | SUPPORTED_100baseT_Full
+                        | SUPPORTED_1000baseT_Half
+                        | SUPPORTED_1000baseT_Full
+                        | SUPPORTED_Autoneg| SUPPORTED_TP;
+
+                if (hw->chip_id == CHIP_ID_GENESIS)
+                        supported &= ~(SUPPORTED_10baseT_Half
+                                             | SUPPORTED_10baseT_Full
+                                             | SUPPORTED_100baseT_Half
+                                             | SUPPORTED_100baseT_Full);
+
+                else if (hw->chip_id == CHIP_ID_YUKON)
+                        supported &= ~SUPPORTED_1000baseT_Half;
+        } else
+                supported = SUPPORTED_1000baseT_Full | SUPPORTED_FIBRE
+                        | SUPPORTED_Autoneg;
+
+        return supported;
+}
 
 static int skge_get_settings(struct net_device *dev,
                              struct ethtool_cmd *ecmd)
@@ -198,38 +221,13 @@ static int skge_get_settings(struct net_device *dev,
         struct skge_hw *hw = skge->hw;
 
         ecmd->transceiver = XCVR_INTERNAL;
+        ecmd->supported = skge_supported_modes(hw);
 
         if (iscopper(hw)) {
-                if (hw->chip_id == CHIP_ID_GENESIS)
-                        ecmd->supported = SUPPORTED_1000baseT_Full
-                                | SUPPORTED_1000baseT_Half
-                                | SUPPORTED_Autoneg | SUPPORTED_TP;
-                else {
-                        ecmd->supported = SUPPORTED_10baseT_Half
-                                | SUPPORTED_10baseT_Full
-                                | SUPPORTED_100baseT_Half
-                                | SUPPORTED_100baseT_Full
-                                | SUPPORTED_1000baseT_Half
-                                | SUPPORTED_1000baseT_Full
-                                | SUPPORTED_Autoneg| SUPPORTED_TP;
-
-                        if (hw->chip_id == CHIP_ID_YUKON)
-                                ecmd->supported &= ~SUPPORTED_1000baseT_Half;
-
-                        else if (hw->chip_id == CHIP_ID_YUKON_FE)
-                                ecmd->supported &= ~(SUPPORTED_1000baseT_Half
-                                                     | SUPPORTED_1000baseT_Full);
-                }
-
                 ecmd->port = PORT_TP;
                 ecmd->phy_address = hw->phy_addr;
-        } else {
-                ecmd->supported = SUPPORTED_1000baseT_Full
-                        | SUPPORTED_FIBRE
-                        | SUPPORTED_Autoneg;
-
+        } else
                 ecmd->port = PORT_FIBRE;
-        }
 
         ecmd->advertising = skge->advertising;
         ecmd->autoneg = skge->autoneg;
@@ -238,65 +236,57 @@ static int skge_get_settings(struct net_device *dev,
         return 0;
 }
 
-static u32 skge_modes(const struct skge_hw *hw)
-{
-        u32 modes = ADVERTISED_Autoneg
-                | ADVERTISED_1000baseT_Full | ADVERTISED_1000baseT_Half
-                | ADVERTISED_100baseT_Full | ADVERTISED_100baseT_Half
-                | ADVERTISED_10baseT_Full | ADVERTISED_10baseT_Half;
-
-        if (iscopper(hw)) {
-                modes |= ADVERTISED_TP;
-                switch(hw->chip_id) {
-                case CHIP_ID_GENESIS:
-                        modes &= ~(ADVERTISED_100baseT_Full
-                                   | ADVERTISED_100baseT_Half
-                                   | ADVERTISED_10baseT_Full
-                                   | ADVERTISED_10baseT_Half);
-                        break;
-
-                case CHIP_ID_YUKON:
-                        modes &= ~ADVERTISED_1000baseT_Half;
-                        break;
-
-                case CHIP_ID_YUKON_FE:
-                        modes &= ~(ADVERTISED_1000baseT_Half|ADVERTISED_1000baseT_Full);
-                        break;
-                }
-        } else {
-                modes |= ADVERTISED_FIBRE;
-                modes &= ~ADVERTISED_1000baseT_Half;
-        }
-        return modes;
-}
-
 static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
         struct skge_port *skge = netdev_priv(dev);
         const struct skge_hw *hw = skge->hw;
+        u32 supported = skge_supported_modes(hw);
 
         if (ecmd->autoneg == AUTONEG_ENABLE) {
-                if (ecmd->advertising & skge_modes(hw))
-                        return -EINVAL;
+                ecmd->advertising = supported;
+                skge->duplex = -1;
+                skge->speed = -1;
         } else {
+                u32 setting;
+
                 switch(ecmd->speed) {
                 case SPEED_1000:
-                        if (hw->chip_id == CHIP_ID_YUKON_FE)
+                        if (ecmd->duplex == DUPLEX_FULL)
+                                setting = SUPPORTED_1000baseT_Full;
+                        else if (ecmd->duplex == DUPLEX_HALF)
+                                setting = SUPPORTED_1000baseT_Half;
+                        else
                                 return -EINVAL;
                         break;
                 case SPEED_100:
+                        if (ecmd->duplex == DUPLEX_FULL)
+                                setting = SUPPORTED_100baseT_Full;
+                        else if (ecmd->duplex == DUPLEX_HALF)
+                                setting = SUPPORTED_100baseT_Half;
+                        else
+                                return -EINVAL;
+                        break;
+
                 case SPEED_10:
-                        if (iscopper(hw) || hw->chip_id == CHIP_ID_GENESIS)
+                        if (ecmd->duplex == DUPLEX_FULL)
+                                setting = SUPPORTED_10baseT_Full;
+                        else if (ecmd->duplex == DUPLEX_HALF)
+                                setting = SUPPORTED_10baseT_Half;
+                        else
                                 return -EINVAL;
                         break;
                 default:
                         return -EINVAL;
                 }
+
+                if ((setting & supported) == 0)
+                        return -EINVAL;
+
+                skge->speed = ecmd->speed;
+                skge->duplex = ecmd->duplex;
         }
 
         skge->autoneg = ecmd->autoneg;
-        skge->speed = ecmd->speed;
-        skge->duplex = ecmd->duplex;
         skge->advertising = ecmd->advertising;
 
         if (netif_running(dev)) {
@@ -393,7 +383,7 @@ static void skge_get_strings(struct net_device *dev, u32 stringset, u8 *data)
 {
         int i;
 
-        switch(stringset) {
+        switch (stringset) {
         case ETH_SS_STATS:
                 for (i = 0; i < ARRAY_SIZE(skge_stats); i++)
                         memcpy(data + i * ETH_GSTRING_LEN,
@@ -511,14 +501,6 @@ static int skge_set_rx_csum(struct net_device *dev, u32 data)
         return 0;
 }
 
-/* Only Yukon II supports TSO (not implemented yet) */
-static int skge_set_tso(struct net_device *dev, u32 data)
-{
-        if (data)
-                return -EOPNOTSUPP;
-        return 0;
-}
-
 static void skge_get_pauseparam(struct net_device *dev,
                                 struct ethtool_pauseparam *ecmd)
 {
@@ -540,9 +522,9 @@ static int skge_set_pauseparam(struct net_device *dev,
         skge->autoneg = ecmd->autoneg;
         if (ecmd->rx_pause && ecmd->tx_pause)
                 skge->flow_control = FLOW_MODE_SYMMETRIC;
-        else if(ecmd->rx_pause && !ecmd->tx_pause)
+        else if (ecmd->rx_pause && !ecmd->tx_pause)
                 skge->flow_control = FLOW_MODE_REM_SEND;
-        else if(!ecmd->rx_pause && ecmd->tx_pause)
+        else if (!ecmd->rx_pause && ecmd->tx_pause)
                 skge->flow_control = FLOW_MODE_LOC_SEND;
         else
                 skge->flow_control = FLOW_MODE_NONE;
@@ -559,8 +541,6 @@ static inline u32 hwkhz(const struct skge_hw *hw)
 {
         if (hw->chip_id == CHIP_ID_GENESIS)
                 return 53215; /* or:  53.125 MHz */
-        else if (hw->chip_id == CHIP_ID_YUKON_EC)
-                return 125000; /* or: 125.000 MHz */
         else
                 return 78215; /* or:  78.125 MHz */
 }
@@ -643,30 +623,18 @@ static int skge_set_coalesce(struct net_device *dev,
 static void skge_led_on(struct skge_hw *hw, int port)
 {
         if (hw->chip_id == CHIP_ID_GENESIS) {
-                skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_ON);
+                skge_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_ON);
                 skge_write8(hw, B0_LED, LED_STAT_ON);
 
-                skge_write8(hw, SKGEMAC_REG(port, RX_LED_TST), LED_T_ON);
-                skge_write32(hw, SKGEMAC_REG(port, RX_LED_VAL), 100);
-                skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_START);
+                skge_write8(hw, SK_REG(port, RX_LED_TST), LED_T_ON);
+                skge_write32(hw, SK_REG(port, RX_LED_VAL), 100);
+                skge_write8(hw, SK_REG(port, RX_LED_CTRL), LED_START);
 
-                switch (hw->phy_type) {
-                case SK_PHY_BCOM:
-                        skge_xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL,
-                                          PHY_B_PEC_LED_ON);
-                        break;
-                case SK_PHY_LONE:
-                        skge_xm_phy_write(hw, port, PHY_LONE_LED_CFG,
-                                          0x0800);
-                        break;
-                default:
-                        skge_write8(hw, SKGEMAC_REG(port, TX_LED_TST), LED_T_ON);
-                        skge_write32(hw, SKGEMAC_REG(port, TX_LED_VAL), 100);
-                        skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_START);
-                }
+                /* For Broadcom Phy only */
+                xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL, PHY_B_PEC_LED_ON);
         } else {
-                skge_gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
-                skge_gm_phy_write(hw, port, PHY_MARV_LED_OVER,
+                gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
+                gm_phy_write(hw, port, PHY_MARV_LED_OVER,
                                   PHY_M_LED_MO_DUP(MO_LED_ON)  |
                                   PHY_M_LED_MO_10(MO_LED_ON)   |
                                   PHY_M_LED_MO_100(MO_LED_ON)  |
@@ -678,28 +646,17 @@ static void skge_led_on(struct skge_hw *hw, int port)
 static void skge_led_off(struct skge_hw *hw, int port)
 {
         if (hw->chip_id == CHIP_ID_GENESIS) {
-                skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_OFF);
+                skge_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
                 skge_write8(hw, B0_LED, LED_STAT_OFF);
 
-                skge_write32(hw, SKGEMAC_REG(port, RX_LED_VAL), 0);
-                skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_T_OFF);
+                skge_write32(hw, SK_REG(port, RX_LED_VAL), 0);
+                skge_write8(hw, SK_REG(port, RX_LED_CTRL), LED_T_OFF);
 
-                switch (hw->phy_type) {
-                case SK_PHY_BCOM:
-                        skge_xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL,
-                                          PHY_B_PEC_LED_OFF);
-                        break;
-                case SK_PHY_LONE:
-                        skge_xm_phy_write(hw, port, PHY_LONE_LED_CFG,
-                                          PHY_L_LC_LEDT);
-                        break;
-                default:
-                        skge_write32(hw, SKGEMAC_REG(port, TX_LED_VAL), 0);
-                        skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_T_OFF);
-                }
+                /* Broadcom only */
+                xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL, PHY_B_PEC_LED_OFF);
         } else {
-                skge_gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
-                skge_gm_phy_write(hw, port, PHY_MARV_LED_OVER,
+                gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
+                gm_phy_write(hw, port, PHY_MARV_LED_OVER,
                                   PHY_M_LED_MO_DUP(MO_LED_OFF)  |
                                   PHY_M_LED_MO_10(MO_LED_OFF)   |
                                   PHY_M_LED_MO_100(MO_LED_OFF)  |
@@ -730,7 +687,7 @@ static int skge_phys_id(struct net_device *dev, u32 data)
 {
         struct skge_port *skge = netdev_priv(dev);
 
-        if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
+        if (!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
                 data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
 
         /* start blinking */
@@ -763,8 +720,6 @@ static struct ethtool_ops skge_ethtool_ops = {
         .set_pauseparam = skge_set_pauseparam,
         .get_coalesce   = skge_get_coalesce,
         .set_coalesce   = skge_set_coalesce,
-        .get_tso        = ethtool_op_get_tso,
-        .set_tso        = skge_set_tso,
         .get_sg         = ethtool_op_get_sg,
         .set_sg         = skge_set_sg,
         .get_tx_csum    = ethtool_op_get_tx_csum,
@@ -793,6 +748,7 @@ static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u64 base)
 
         for (i = 0, e = ring->start, d = vaddr; i < ring->count; i++, e++, d++) {
                 e->desc = d;
+                e->skb = NULL;
                 if (i == ring->count - 1) {
                         e->next = ring->start;
                         d->next_offset = base;
@@ -806,24 +762,23 @@ static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u64 base)
         return 0;
 }
 
-/* Setup buffer for receiving */
-static inline int skge_rx_alloc(struct skge_port *skge,
-                                struct skge_element *e)
+static struct sk_buff *skge_rx_alloc(struct net_device *dev, unsigned int size)
 {
-        unsigned long bufsize = skge->netdev->mtu + ETH_HLEN; /* VLAN? */
-        struct skge_rx_desc *rd = e->desc;
-        struct sk_buff *skb;
-        u64 map;
+        struct sk_buff *skb = dev_alloc_skb(size);
 
-        skb = dev_alloc_skb(bufsize + NET_IP_ALIGN);
-        if (unlikely(!skb)) {
-                printk(KERN_DEBUG PFX "%s: out of memory for receive\n",
-                       skge->netdev->name);
-                return -ENOMEM;
+        if (likely(skb)) {
+                skb->dev = dev;
+                skb_reserve(skb, NET_IP_ALIGN);
         }
+        return skb;
+}
 
-        skb->dev = skge->netdev;
-        skb_reserve(skb, NET_IP_ALIGN);
+/* Allocate and setup a new buffer for receiving */
+static void skge_rx_setup(struct skge_port *skge, struct skge_element *e,
+                          struct sk_buff *skb, unsigned int bufsize)
+{
+        struct skge_rx_desc *rd = e->desc;
+        u64 map;
 
         map = pci_map_single(skge->hw->pdev, skb->data, bufsize,
                              PCI_DMA_FROMDEVICE);
@@ -841,55 +796,69 @@ static inline int skge_rx_alloc(struct skge_port *skge,
         rd->control = BMU_OWN | BMU_STF | BMU_IRQ_EOF | BMU_TCP_CHECK | bufsize;
         pci_unmap_addr_set(e, mapaddr, map);
         pci_unmap_len_set(e, maplen, bufsize);
-        return 0;
 }
 
-/* Free all unused buffers in receive ring, assumes receiver stopped */
+/* Resume receiving using existing skb,
+ * Note: DMA address is not changed by chip.
+ *       MTU not changed while receiver active.
+ */
+static void skge_rx_reuse(struct skge_element *e, unsigned int size)
+{
+        struct skge_rx_desc *rd = e->desc;
+
+        rd->csum2 = 0;
+        rd->csum2_start = ETH_HLEN;
+
+        wmb();
+
+        rd->control = BMU_OWN | BMU_STF | BMU_IRQ_EOF | BMU_TCP_CHECK | size;
+}
+
+
+/* Free all  buffers in receive ring, assumes receiver stopped */
 static void skge_rx_clean(struct skge_port *skge)
 {
         struct skge_hw *hw = skge->hw;
         struct skge_ring *ring = &skge->rx_ring;
         struct skge_element *e;
 
-        for (e = ring->to_clean; e != ring->to_use; e = e->next) {
+        e = ring->start;
+        do {
                 struct skge_rx_desc *rd = e->desc;
                 rd->control = 0;
-
-                pci_unmap_single(hw->pdev,
-                                 pci_unmap_addr(e, mapaddr),
-                                 pci_unmap_len(e, maplen),
-                                 PCI_DMA_FROMDEVICE);
-                dev_kfree_skb(e->skb);
-                e->skb = NULL;
-        }
-        ring->to_clean = e;
+                if (e->skb) {
+                        pci_unmap_single(hw->pdev,
+                                         pci_unmap_addr(e, mapaddr),
+                                         pci_unmap_len(e, maplen),
+                                         PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(e->skb);
+                        e->skb = NULL;
+                }
+        } while ((e = e->next) != ring->start);
 }
 
+
 /* Allocate buffers for receive ring
- * For receive: to_use   is refill location
- *              to_clean is next received frame.
- *
- * if (to_use == to_clean)
- *       then ring all frames in ring need buffers
- * if (to_use->next == to_clean)
- *       then ring all frames in ring have buffers
+ * For receive:  to_clean is next received frame.
  */
 static int skge_rx_fill(struct skge_port *skge)
 {
         struct skge_ring *ring = &skge->rx_ring;
         struct skge_element *e;
-        int ret = 0;
+        unsigned int bufsize = skge->rx_buf_size;
 
-        for (e = ring->to_use; e->next != ring->to_clean; e = e->next) {
-                if (skge_rx_alloc(skge, e)) {
-                        ret = 1;
-                        break;
-                }
+        e = ring->start;
+        do {
+                struct sk_buff *skb = skge_rx_alloc(skge->netdev, bufsize);
 
-        }
-        ring->to_use = e;
+                if (!skb)
+                        return -ENOMEM;
+
+                skge_rx_setup(skge, e, skb, bufsize);
+        } while ( (e = e->next) != ring->start);
 
-        return ret;
+        ring->to_clean = ring->start;
+        return 0;
 }
 
 static void skge_link_up(struct skge_port *skge)
@@ -919,50 +888,50 @@ static void skge_link_down(struct skge_port *skge)
                 printk(KERN_INFO PFX "%s: Link is down.\n", skge->netdev->name);
 }
 
-static u16 skge_xm_phy_read(struct skge_hw *hw, int port,  u16 reg)
+static u16 xm_phy_read(struct skge_hw *hw, int port, u16 reg)
 {
         int i;
         u16 v;
 
-        skge_xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr);
-        v = skge_xm_read16(hw, port, XM_PHY_DATA);
-        if (hw->phy_type != SK_PHY_XMAC) {
-                for (i = 0; i < PHY_RETRIES; i++) {
-                        udelay(1);
-                        if (skge_xm_read16(hw, port, XM_MMU_CMD)
-                            & XM_MMU_PHY_RDY)
-                                goto ready;
-                }
+        xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr);
+        v = xm_read16(hw, port, XM_PHY_DATA);
 
-                printk(KERN_WARNING PFX "%s: phy read timed out\n",
-                       hw->dev[port]->name);
-                return 0;
-        ready:
-                v = skge_xm_read16(hw, port, XM_PHY_DATA);
+        /* Need to wait for external PHY */
+        for (i = 0; i < PHY_RETRIES; i++) {
+                udelay(1);
+                if (xm_read16(hw, port, XM_MMU_CMD)
+                    & XM_MMU_PHY_RDY)
+                        goto ready;
         }
 
+        printk(KERN_WARNING PFX "%s: phy read timed out\n",
+               hw->dev[port]->name);
+        return 0;
+ ready:
+        v = xm_read16(hw, port, XM_PHY_DATA);
+
         return v;
 }
 
-static void skge_xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
+static void xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
 {
         int i;
 
-        skge_xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr);
+        xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr);
         for (i = 0; i < PHY_RETRIES; i++) {
-                if (!(skge_xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY))
+                if (!(xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY))
                         goto ready;
-                cpu_relax();
+                udelay(1);
         }
         printk(KERN_WARNING PFX "%s: phy write failed to come ready\n",
                hw->dev[port]->name);
 
 
  ready:
-        skge_xm_write16(hw, port, XM_PHY_DATA, val);
+        xm_write16(hw, port, XM_PHY_DATA, val);
         for (i = 0; i < PHY_RETRIES; i++) {
                 udelay(1);
-                if (!(skge_xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY))
+                if (!(xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY))
                         return;
         }
         printk(KERN_WARNING PFX "%s: phy write timed out\n",
@@ -999,34 +968,112 @@ static void genesis_init(struct skge_hw *hw)
 
 static void genesis_reset(struct skge_hw *hw, int port)
 {
-        int i;
-        u64 zero = 0;
+        const u8 zero[8]  = { 0 };
 
         /* reset the statistics module */
-        skge_xm_write32(hw, port, XM_GP_PORT, XM_GP_RES_STAT);
-        skge_xm_write16(hw, port, XM_IMSK, 0xffff);     /* disable XMAC IRQs */
-        skge_xm_write32(hw, port, XM_MODE, 0);          /* clear Mode Reg */
-        skge_xm_write16(hw, port, XM_TX_CMD, 0);        /* reset TX CMD Reg */
-        skge_xm_write16(hw, port, XM_RX_CMD, 0);        /* reset RX CMD Reg */
+        xm_write32(hw, port, XM_GP_PORT, XM_GP_RES_STAT);
+        xm_write16(hw, port, XM_IMSK, 0xffff);  /* disable XMAC IRQs */
+        xm_write32(hw, port, XM_MODE, 0);               /* clear Mode Reg */
+        xm_write16(hw, port, XM_TX_CMD, 0);     /* reset TX CMD Reg */
+        xm_write16(hw, port, XM_RX_CMD, 0);     /* reset RX CMD Reg */
 
-        /* disable all PHY IRQs */
-        if  (hw->phy_type == SK_PHY_BCOM)
-                skge_xm_write16(hw, port, PHY_BCOM_INT_MASK, 0xffff);
+        /* disable Broadcom PHY IRQ */
+        xm_write16(hw, port, PHY_BCOM_INT_MASK, 0xffff);
 
-        skge_xm_outhash(hw, port, XM_HSM, (u8 *) &zero);
-        for (i = 0; i < 15; i++)
-                skge_xm_outaddr(hw, port, XM_EXM(i), (u8 *) &zero);
-        skge_xm_outhash(hw, port, XM_SRC_CHK, (u8 *) &zero);
+        xm_outhash(hw, port, XM_HSM, zero);
 }
 
 
-static void genesis_mac_init(struct skge_hw *hw, int port)
+/* Convert mode to MII values  */
+static const u16 phy_pause_map[] = {
+        [FLOW_MODE_NONE] =      0,
+        [FLOW_MODE_LOC_SEND] =  PHY_AN_PAUSE_ASYM,
+        [FLOW_MODE_SYMMETRIC] = PHY_AN_PAUSE_CAP,
+        [FLOW_MODE_REM_SEND]  = PHY_AN_PAUSE_CAP | PHY_AN_PAUSE_ASYM,
+};
+
+
+/* Check status of Broadcom phy link */
+static void bcom_check_link(struct skge_hw *hw, int port)
 {
-        struct skge_port *skge = netdev_priv(hw->dev[port]);
+        struct net_device *dev = hw->dev[port];
+        struct skge_port *skge = netdev_priv(dev);
+        u16 status;
+
+        /* read twice because of latch */
+        (void) xm_phy_read(hw, port, PHY_BCOM_STAT);
+        status = xm_phy_read(hw, port, PHY_BCOM_STAT);
+
+        pr_debug("bcom_check_link status=0x%x\n", status);
+
+        if ((status & PHY_ST_LSYNC) == 0) {
+                u16 cmd = xm_read16(hw, port, XM_MMU_CMD);
+                cmd &= ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX);
+                xm_write16(hw, port, XM_MMU_CMD, cmd);
+                /* dummy read to ensure writing */
+                (void) xm_read16(hw, port, XM_MMU_CMD);
+
+                if (netif_carrier_ok(dev))
+                        skge_link_down(skge);
+        } else {
+                if (skge->autoneg == AUTONEG_ENABLE &&
+                    (status & PHY_ST_AN_OVER)) {
+                        u16 lpa = xm_phy_read(hw, port, PHY_BCOM_AUNE_LP);
+                        u16 aux = xm_phy_read(hw, port, PHY_BCOM_AUX_STAT);
+
+                        if (lpa & PHY_B_AN_RF) {
+                                printk(KERN_NOTICE PFX "%s: remote fault\n",
+                                       dev->name);
+                                return;
+                        }
+
+                        /* Check Duplex mismatch */
+                        switch(aux & PHY_B_AS_AN_RES_MSK) {
+                        case PHY_B_RES_1000FD:
+                                skge->duplex = DUPLEX_FULL;
+                                break;
+                        case PHY_B_RES_1000HD:
+                                skge->duplex = DUPLEX_HALF;
+                                break;
+                        default:
+                                printk(KERN_NOTICE PFX "%s: duplex mismatch\n",
+                                       dev->name);
+                                return;
+                        }
+
+
+                        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
+                        switch (aux & PHY_B_AS_PAUSE_MSK) {
+                        case PHY_B_AS_PAUSE_MSK:
+                                skge->flow_control = FLOW_MODE_SYMMETRIC;
+                                break;
+                        case PHY_B_AS_PRR:
+                                skge->flow_control = FLOW_MODE_REM_SEND;
+                                break;
+                        case PHY_B_AS_PRT:
+                                skge->flow_control = FLOW_MODE_LOC_SEND;
+                                break;
+                        default:
+                                skge->flow_control = FLOW_MODE_NONE;
+                        }
+
+                        skge->speed = SPEED_1000;
+                }
+
+                if (!netif_carrier_ok(dev))
+                        genesis_link_up(skge);
+        }
+}
+
+/* Broadcom 5400 only supports giagabit! SysKonnect did not put an additional
+ * Phy on for 100 or 10Mbit operation
+ */
+static void bcom_phy_init(struct skge_port *skge, int jumbo)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
         int i;
-        u32 r;
-        u16 id1;
-        u16 ctrl1, ctrl2, ctrl3, ctrl4, ctrl5;
+        u16 id1, r, ext, ctl;
 
         /* magic workaround patterns for Broadcom */
         static const struct {
@@ -1042,16 +1089,120 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
                 { 0x17, 0x0013 }, { 0x15, 0x0A04 }, { 0x18, 0x0420 },
         };
 
+        pr_debug("bcom_phy_init\n");
+
+        /* read Id from external PHY (all have the same address) */
+        id1 = xm_phy_read(hw, port, PHY_XMAC_ID1);
+
+        /* Optimize MDIO transfer by suppressing preamble. */
+        r = xm_read16(hw, port, XM_MMU_CMD);
+        r |=  XM_MMU_NO_PRE;
+        xm_write16(hw, port, XM_MMU_CMD,r);
+
+        switch(id1) {
+        case PHY_BCOM_ID1_C0:
+                /*
+                 * Workaround BCOM Errata for the C0 type.
+                 * Write magic patterns to reserved registers.
+                 */
+                for (i = 0; i < ARRAY_SIZE(C0hack); i++)
+                        xm_phy_write(hw, port,
+                                     C0hack[i].reg, C0hack[i].val);
+
+                break;
+        case PHY_BCOM_ID1_A1:
+                /*
+                 * Workaround BCOM Errata for the A1 type.
+                 * Write magic patterns to reserved registers.
+                 */
+                for (i = 0; i < ARRAY_SIZE(A1hack); i++)
+                        xm_phy_write(hw, port,
+                                     A1hack[i].reg, A1hack[i].val);
+                break;
+        }
+
+        /*
+         * Workaround BCOM Errata (#10523) for all BCom PHYs.
+         * Disable Power Management after reset.
+         */
+        r = xm_phy_read(hw, port, PHY_BCOM_AUX_CTRL);
+        r |= PHY_B_AC_DIS_PM;
+        xm_phy_write(hw, port, PHY_BCOM_AUX_CTRL, r);
+
+        /* Dummy read */
+        xm_read16(hw, port, XM_ISRC);
+
+        ext = PHY_B_PEC_EN_LTR; /* enable tx led */
+        ctl = PHY_CT_SP1000;    /* always 1000mbit */
+
+        if (skge->autoneg == AUTONEG_ENABLE) {
+                /*
+                 * Workaround BCOM Errata #1 for the C5 type.
+                 * 1000Base-T Link Acquisition Failure in Slave Mode
+                 * Set Repeater/DTE bit 10 of the 1000Base-T Control Register
+                 */
+                u16 adv = PHY_B_1000C_RD;
+                if (skge->advertising & ADVERTISED_1000baseT_Half)
+                        adv |= PHY_B_1000C_AHD;
+                if (skge->advertising & ADVERTISED_1000baseT_Full)
+                        adv |= PHY_B_1000C_AFD;
+                xm_phy_write(hw, port, PHY_BCOM_1000T_CTRL, adv);
+
+                ctl |= PHY_CT_ANE | PHY_CT_RE_CFG;
+        } else {
+                if (skge->duplex == DUPLEX_FULL)
+                        ctl |= PHY_CT_DUP_MD;
+                /* Force to slave */
+                xm_phy_write(hw, port, PHY_BCOM_1000T_CTRL, PHY_B_1000C_MSE);
+        }
+
+        /* Set autonegotiation pause parameters */
+        xm_phy_write(hw, port, PHY_BCOM_AUNE_ADV,
+                     phy_pause_map[skge->flow_control] | PHY_AN_CSMA);
+
+        /* Handle Jumbo frames */
+        if (jumbo) {
+                xm_phy_write(hw, port, PHY_BCOM_AUX_CTRL,
+                             PHY_B_AC_TX_TST | PHY_B_AC_LONG_PACK);
+
+                ext |= PHY_B_PEC_HIGH_LA;
+
+        }
+
+        xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL, ext);
+        xm_phy_write(hw, port, PHY_BCOM_CTRL, ctl);
+
+        /* Use link status change interrrupt */
+        xm_phy_write(hw, port, PHY_BCOM_INT_MASK, PHY_B_DEF_MSK);
+
+        bcom_check_link(hw, port);
+}
+
+static void genesis_mac_init(struct skge_hw *hw, int port)
+{
+        struct net_device *dev = hw->dev[port];
+        struct skge_port *skge = netdev_priv(dev);
+        int jumbo = hw->dev[port]->mtu > ETH_DATA_LEN;
+        int i;
+        u32 r;
+        const u8 zero[6]  = { 0 };
+
+        /* Clear MIB counters */
+        xm_write16(hw, port, XM_STAT_CMD,
+                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+        /* Clear two times according to Errata #3 */
+        xm_write16(hw, port, XM_STAT_CMD,
+                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
 
         /* initialize Rx, Tx and Link LED */
-        skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_ON);
-        skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_LINKSYNC_ON);
+        skge_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_ON);
+        skge_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_LINKSYNC_ON);
 
-        skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_START);
-        skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_START);
+        skge_write8(hw, SK_REG(port, RX_LED_CTRL), LED_START);
+        skge_write8(hw, SK_REG(port, TX_LED_CTRL), LED_START);
 
         /* Unreset the XMAC. */
-        skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
+        skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
 
         /*
          * Perform additional initialization for external PHYs,
@@ -1059,67 +1210,56 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
          * GMII mode.
          */
         spin_lock_bh(&hw->phy_lock);
-        if (hw->phy_type != SK_PHY_XMAC) {
-                /* Take PHY out of reset. */
-                r = skge_read32(hw, B2_GP_IO);
-                if (port == 0)
-                        r |= GP_DIR_0|GP_IO_0;
-                else
-                        r |= GP_DIR_2|GP_IO_2;
-
-                skge_write32(hw, B2_GP_IO, r);
-                skge_read32(hw, B2_GP_IO);
-
-                /* Enable GMII mode on the XMAC. */
-                skge_xm_write16(hw, port, XM_HW_CFG, XM_HW_GMII_MD);
-
-                id1 = skge_xm_phy_read(hw, port, PHY_XMAC_ID1);
-
-                /* Optimize MDIO transfer by suppressing preamble. */
-                skge_xm_write16(hw, port, XM_MMU_CMD,
-                                skge_xm_read16(hw, port, XM_MMU_CMD)
-                                | XM_MMU_NO_PRE);
-
-                if (id1 == PHY_BCOM_ID1_C0) {
-                        /*
-                         * Workaround BCOM Errata for the C0 type.
-                         * Write magic patterns to reserved registers.
-                         */
-                        for (i = 0; i < ARRAY_SIZE(C0hack); i++)
-                                skge_xm_phy_write(hw, port,
-                                          C0hack[i].reg, C0hack[i].val);
-
-                } else if (id1 == PHY_BCOM_ID1_A1) {
-                        /*
-                         * Workaround BCOM Errata for the A1 type.
-                         * Write magic patterns to reserved registers.
-                         */
-                        for (i = 0; i < ARRAY_SIZE(A1hack); i++)
-                                skge_xm_phy_write(hw, port,
-                                          A1hack[i].reg, A1hack[i].val);
-                }
+        /* Take external Phy out of reset */
+        r = skge_read32(hw, B2_GP_IO);
+        if (port == 0)
+                r |= GP_DIR_0|GP_IO_0;
+        else
+                r |= GP_DIR_2|GP_IO_2;
 
-                /*
-                 * Workaround BCOM Errata (#10523) for all BCom PHYs.
-                 * Disable Power Management after reset.
-                 */
-                r = skge_xm_phy_read(hw, port, PHY_BCOM_AUX_CTRL);
-                skge_xm_phy_write(hw, port, PHY_BCOM_AUX_CTRL, r | PHY_B_AC_DIS_PM);
-        }
+        skge_write32(hw, B2_GP_IO, r);
+        skge_read32(hw, B2_GP_IO);
+        spin_unlock_bh(&hw->phy_lock);
 
-        /* Dummy read */
-        skge_xm_read16(hw, port, XM_ISRC);
+        /* Enable GMII interfac */
+        xm_write16(hw, port, XM_HW_CFG, XM_HW_GMII_MD);
+
+        bcom_phy_init(skge, jumbo);
+
+        /* Set Station Address */
+        xm_outaddr(hw, port, XM_SA, dev->dev_addr);
+
+        /* We don't use match addresses so clear */
+        for (i = 1; i < 16; i++)
+                xm_outaddr(hw, port, XM_EXM(i), zero);
 
-        r = skge_xm_read32(hw, port, XM_MODE);
-        skge_xm_write32(hw, port, XM_MODE, r|XM_MD_CSA);
+        /* configure Rx High Water Mark (XM_RX_HI_WM) */
+        xm_write16(hw, port, XM_RX_HI_WM, 1450);
 
         /* We don't need the FCS appended to the packet. */
-        r = skge_xm_read16(hw, port, XM_RX_CMD);
-        skge_xm_write16(hw, port, XM_RX_CMD, r | XM_RX_STRIP_FCS);
+        r = XM_RX_LENERR_OK | XM_RX_STRIP_FCS;
+        if (jumbo)
+                r |= XM_RX_BIG_PK_OK;
+
+        if (skge->duplex == DUPLEX_HALF) {
+                /*
+                 * If in manual half duplex mode the other side might be in
+                 * full duplex mode, so ignore if a carrier extension is not seen
+                 * on frames received
+                 */
+                r |= XM_RX_DIS_CEXT;
+        }
+        xm_write16(hw, port, XM_RX_CMD, r);
+
 
         /* We want short frames padded to 60 bytes. */
-        r = skge_xm_read16(hw, port, XM_TX_CMD);
-        skge_xm_write16(hw, port, XM_TX_CMD, r | XM_TX_AUTO_PAD);
+        xm_write16(hw, port, XM_TX_CMD, XM_TX_AUTO_PAD);
+
+        /*
+         * Bump up the transmit threshold. This helps hold off transmit
+         * underruns when we're blasting traffic from both ports at once.
+         */
+        xm_write16(hw, port, XM_TX_THR, 512);
 
         /*
          * Enable the reception of all error frames. This is is
@@ -1135,19 +1275,22 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
          * case the XMAC will start transfering frames out of the
          * RX FIFO as soon as the FIFO threshold is reached.
          */
-        r = skge_xm_read32(hw, port, XM_MODE);
-        skge_xm_write32(hw, port, XM_MODE,
-                     XM_MD_RX_CRCE|XM_MD_RX_LONG|XM_MD_RX_RUNT|
-                     XM_MD_RX_ERR|XM_MD_RX_IRLE);
+        xm_write32(hw, port, XM_MODE, XM_DEF_MODE);
 
-        skge_xm_outaddr(hw, port, XM_SA, hw->dev[port]->dev_addr);
-        skge_xm_outaddr(hw, port, XM_EXM(0), hw->dev[port]->dev_addr);
 
         /*
-         * Bump up the transmit threshold. This helps hold off transmit
-         * underruns when we're blasting traffic from both ports at once.
+         * Initialize the Receive Counter Event Mask (XM_RX_EV_MSK)
+         *      - Enable all bits excepting 'Octets Rx OK Low CntOv'
+         *        and 'Octets Rx OK Hi Cnt Ov'.
          */
-        skge_xm_write16(hw, port, XM_TX_THR, 512);
+        xm_write32(hw, port, XM_RX_EV_MSK, XMR_DEF_MSK);
+
+        /*
+         * Initialize the Transmit Counter Event Mask (XM_TX_EV_MSK)
+         *      - Enable all bits excepting 'Octets Tx OK Low CntOv'
+         *        and 'Octets Tx OK Hi Cnt Ov'.
+         */
+        xm_write32(hw, port, XM_TX_EV_MSK, XMT_DEF_MSK);
 
         /* Configure MAC arbiter */
         skge_write16(hw, B3_MA_TO_CTRL, MA_RST_CLR);
@@ -1164,137 +1307,30 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
         skge_write8(hw, B3_MA_RCINI_TX2, 0);
 
         /* Configure Rx MAC FIFO */
-        skge_write8(hw, SKGEMAC_REG(port, RX_MFF_CTRL2), MFF_RST_CLR);
-        skge_write16(hw, SKGEMAC_REG(port, RX_MFF_CTRL1), MFF_ENA_TIM_PAT);
-        skge_write8(hw, SKGEMAC_REG(port, RX_MFF_CTRL2), MFF_ENA_OP_MD);
+        skge_write8(hw, SK_REG(port, RX_MFF_CTRL2), MFF_RST_CLR);
+        skge_write16(hw, SK_REG(port, RX_MFF_CTRL1), MFF_ENA_TIM_PAT);
+        skge_write8(hw, SK_REG(port, RX_MFF_CTRL2), MFF_ENA_OP_MD);
 
         /* Configure Tx MAC FIFO */
-        skge_write8(hw, SKGEMAC_REG(port, TX_MFF_CTRL2), MFF_RST_CLR);
-        skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1), MFF_TX_CTRL_DEF);
-        skge_write8(hw, SKGEMAC_REG(port, TX_MFF_CTRL2), MFF_ENA_OP_MD);
+        skge_write8(hw, SK_REG(port, TX_MFF_CTRL2), MFF_RST_CLR);
+        skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_TX_CTRL_DEF);
+        skge_write8(hw, SK_REG(port, TX_MFF_CTRL2), MFF_ENA_OP_MD);
 
-        if (hw->dev[port]->mtu > ETH_DATA_LEN) {
+        if (jumbo) {
                 /* Enable frame flushing if jumbo frames used */
-                skge_write16(hw, SKGEMAC_REG(port,RX_MFF_CTRL1), MFF_ENA_FLUSH);
+                skge_write16(hw, SK_REG(port,RX_MFF_CTRL1), MFF_ENA_FLUSH);
         } else {
                 /* enable timeout timers if normal frames */
                 skge_write16(hw, B3_PA_CTRL,
-                             port == 0 ? PA_ENA_TO_TX1 : PA_ENA_TO_TX2);
+                             (port == 0) ? PA_ENA_TO_TX1 : PA_ENA_TO_TX2);
         }
-
-
-        r = skge_xm_read16(hw, port, XM_RX_CMD);
-        if (hw->dev[port]->mtu > ETH_DATA_LEN)
-                skge_xm_write16(hw, port, XM_RX_CMD, r | XM_RX_BIG_PK_OK);
-        else
-                skge_xm_write16(hw, port, XM_RX_CMD, r & ~(XM_RX_BIG_PK_OK));
-
-        switch (hw->phy_type) {
-        case SK_PHY_XMAC:
-                if (skge->autoneg == AUTONEG_ENABLE) {
-                        ctrl1 = PHY_X_AN_FD | PHY_X_AN_HD;
-
-                        switch (skge->flow_control) {
-                        case FLOW_MODE_NONE:
-                                ctrl1 |= PHY_X_P_NO_PAUSE;
-                                break;
-                        case FLOW_MODE_LOC_SEND:
-                                ctrl1 |= PHY_X_P_ASYM_MD;
-                                break;
-                        case FLOW_MODE_SYMMETRIC:
-                                ctrl1 |= PHY_X_P_SYM_MD;
-                                break;
-                        case FLOW_MODE_REM_SEND:
-                                ctrl1 |= PHY_X_P_BOTH_MD;
-                                break;
-                        }
-
-                        skge_xm_phy_write(hw, port, PHY_XMAC_AUNE_ADV, ctrl1);
-                        ctrl2 = PHY_CT_ANE | PHY_CT_RE_CFG;
-                } else {
-                        ctrl2 = 0;
-                        if (skge->duplex == DUPLEX_FULL)
-                                ctrl2 |= PHY_CT_DUP_MD;
-                }
-
-                skge_xm_phy_write(hw, port, PHY_XMAC_CTRL, ctrl2);
-                break;
-
-        case SK_PHY_BCOM:
-                ctrl1 = PHY_CT_SP1000;
-                ctrl2 = 0;
-                ctrl3 = PHY_SEL_TYPE;
-                ctrl4 = PHY_B_PEC_EN_LTR;
-                ctrl5 = PHY_B_AC_TX_TST;
-
-                if (skge->autoneg == AUTONEG_ENABLE) {
-                        /*
-                         * Workaround BCOM Errata #1 for the C5 type.
-                         * 1000Base-T Link Acquisition Failure in Slave Mode
-                         * Set Repeater/DTE bit 10 of the 1000Base-T Control Register
-                         */
-                        ctrl2 |= PHY_B_1000C_RD;
-                        if (skge->advertising & ADVERTISED_1000baseT_Half)
-                                ctrl2 |= PHY_B_1000C_AHD;
-                        if (skge->advertising & ADVERTISED_1000baseT_Full)
-                                ctrl2 |= PHY_B_1000C_AFD;
-
-                        /* Set Flow-control capabilities */
-                        switch (skge->flow_control) {
-                        case FLOW_MODE_NONE:
-                                ctrl3 |= PHY_B_P_NO_PAUSE;
-                                break;
-                        case FLOW_MODE_LOC_SEND:
-                                ctrl3 |= PHY_B_P_ASYM_MD;
-                                break;
-                        case FLOW_MODE_SYMMETRIC:
-                                ctrl3 |= PHY_B_P_SYM_MD;
-                                break;
-                        case FLOW_MODE_REM_SEND:
-                                ctrl3 |= PHY_B_P_BOTH_MD;
-                                break;
-                        }
-
-                        /* Restart Auto-negotiation */
-                        ctrl1 |= PHY_CT_ANE | PHY_CT_RE_CFG;
-                } else {
-                        if (skge->duplex == DUPLEX_FULL)
-                                ctrl1 |= PHY_CT_DUP_MD;
-
-                        ctrl2 |= PHY_B_1000C_MSE;       /* set it to Slave */
-                }
-
-                skge_xm_phy_write(hw, port, PHY_BCOM_1000T_CTRL, ctrl2);
-                skge_xm_phy_write(hw, port, PHY_BCOM_AUNE_ADV, ctrl3);
-
-                if (skge->netdev->mtu > ETH_DATA_LEN) {
-                        ctrl4 |= PHY_B_PEC_HIGH_LA;
-                        ctrl5 |= PHY_B_AC_LONG_PACK;
-
-                        skge_xm_phy_write(hw, port,PHY_BCOM_AUX_CTRL, ctrl5);
-                }
-
-                skge_xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL, ctrl4);
-                skge_xm_phy_write(hw, port, PHY_BCOM_CTRL, ctrl1);
-                break;
-        }
-        spin_unlock_bh(&hw->phy_lock);
-
-        /* Clear MIB counters */
-        skge_xm_write16(hw, port, XM_STAT_CMD,
-                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
-        /* Clear two times according to Errata #3 */
-        skge_xm_write16(hw, port, XM_STAT_CMD,
-                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
-
-        /* Start polling for link status */
-        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
 }
 
 static void genesis_stop(struct skge_port *skge)
 {
         struct skge_hw *hw = skge->hw;
         int port = skge->port;
+        u32 reg;
 
         /* Clear Tx packet arbiter timeout IRQ */
         skge_write16(hw, B3_PA_CTRL,
@@ -1304,33 +1340,30 @@ static void genesis_stop(struct skge_port *skge)
          * If the transfer stucks at the MAC the STOP command will not
          * terminate if we don't flush the XMAC's transmit FIFO !
          */
-        skge_xm_write32(hw, port, XM_MODE,
-                        skge_xm_read32(hw, port, XM_MODE)|XM_MD_FTF);
+        xm_write32(hw, port, XM_MODE,
+                        xm_read32(hw, port, XM_MODE)|XM_MD_FTF);
 
 
         /* Reset the MAC */
-        skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
+        skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
 
         /* For external PHYs there must be special handling */
-        if (hw->phy_type != SK_PHY_XMAC) {
-                u32 reg = skge_read32(hw, B2_GP_IO);
-
-                if (port == 0) {
-                        reg |= GP_DIR_0;
-                        reg &= ~GP_IO_0;
-                } else {
-                        reg |= GP_DIR_2;
-                        reg &= ~GP_IO_2;
-                }
-                skge_write32(hw, B2_GP_IO, reg);
-                skge_read32(hw, B2_GP_IO);
+        reg = skge_read32(hw, B2_GP_IO);
+        if (port == 0) {
+                reg |= GP_DIR_0;
+                reg &= ~GP_IO_0;
+        } else {
+                reg |= GP_DIR_2;
+                reg &= ~GP_IO_2;
         }
+        skge_write32(hw, B2_GP_IO, reg);
+        skge_read32(hw, B2_GP_IO);
 
-        skge_xm_write16(hw, port, XM_MMU_CMD,
-                        skge_xm_read16(hw, port, XM_MMU_CMD)
+        xm_write16(hw, port, XM_MMU_CMD,
+                        xm_read16(hw, port, XM_MMU_CMD)
                         & ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX));
 
-        skge_xm_read16(hw, port, XM_MMU_CMD);
+        xm_read16(hw, port, XM_MMU_CMD);
 }
 
 
@@ -1341,11 +1374,11 @@ static void genesis_get_stats(struct skge_port *skge, u64 *data)
         int i;
         unsigned long timeout = jiffies + HZ;
 
-        skge_xm_write16(hw, port,
+        xm_write16(hw, port,
                         XM_STAT_CMD, XM_SC_SNP_TXC | XM_SC_SNP_RXC);
 
         /* wait for update to complete */
-        while (skge_xm_read16(hw, port, XM_STAT_CMD)
+        while (xm_read16(hw, port, XM_STAT_CMD)
                & (XM_SC_SNP_TXC | XM_SC_SNP_RXC)) {
                 if (time_after(jiffies, timeout))
                         break;
@@ -1353,68 +1386,60 @@ static void genesis_get_stats(struct skge_port *skge, u64 *data)
         }
 
         /* special case for 64 bit octet counter */
-        data[0] = (u64) skge_xm_read32(hw, port, XM_TXO_OK_HI) << 32
-                | skge_xm_read32(hw, port, XM_TXO_OK_LO);
-        data[1] = (u64) skge_xm_read32(hw, port, XM_RXO_OK_HI) << 32
-                | skge_xm_read32(hw, port, XM_RXO_OK_LO);
+        data[0] = (u64) xm_read32(hw, port, XM_TXO_OK_HI) << 32
+                | xm_read32(hw, port, XM_TXO_OK_LO);
+        data[1] = (u64) xm_read32(hw, port, XM_RXO_OK_HI) << 32
+                | xm_read32(hw, port, XM_RXO_OK_LO);
 
         for (i = 2; i < ARRAY_SIZE(skge_stats); i++)
-                data[i] = skge_xm_read32(hw, port, skge_stats[i].xmac_offset);
+                data[i] = xm_read32(hw, port, skge_stats[i].xmac_offset);
 }
 
 static void genesis_mac_intr(struct skge_hw *hw, int port)
 {
         struct skge_port *skge = netdev_priv(hw->dev[port]);
-        u16 status = skge_xm_read16(hw, port, XM_ISRC);
-
-        pr_debug("genesis_intr status %x\n", status);
-        if (hw->phy_type == SK_PHY_XMAC) {
-                /* LInk down, start polling for state change */
-                if (status & XM_IS_INP_ASS) {
-                        skge_xm_write16(hw, port, XM_IMSK,
-                                        skge_xm_read16(hw, port, XM_IMSK) | XM_IS_INP_ASS);
-                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
-                }
-                else if (status & XM_IS_AND)
-                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
-        }
+        u16 status = xm_read16(hw, port, XM_ISRC);
+
+        if (netif_msg_intr(skge))
+                printk(KERN_DEBUG PFX "%s: mac interrupt status 0x%x\n",
+                       skge->netdev->name, status);
 
         if (status & XM_IS_TXF_UR) {
-                skge_xm_write32(hw, port, XM_MODE, XM_MD_FTF);
+                xm_write32(hw, port, XM_MODE, XM_MD_FTF);
                 ++skge->net_stats.tx_fifo_errors;
         }
         if (status & XM_IS_RXF_OV) {
-                skge_xm_write32(hw, port, XM_MODE, XM_MD_FRF);
+                xm_write32(hw, port, XM_MODE, XM_MD_FRF);
                 ++skge->net_stats.rx_fifo_errors;
         }
 }
 
-static void skge_gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
+static void gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
 {
         int i;
 
-        skge_gma_write16(hw, port, GM_SMI_DATA, val);
-        skge_gma_write16(hw, port, GM_SMI_CTRL,
+        gma_write16(hw, port, GM_SMI_DATA, val);
+        gma_write16(hw, port, GM_SMI_CTRL,
                          GM_SMI_CT_PHY_AD(hw->phy_addr) | GM_SMI_CT_REG_AD(reg));
         for (i = 0; i < PHY_RETRIES; i++) {
                 udelay(1);
 
-                if (!(skge_gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_BUSY))
+                if (!(gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_BUSY))
                         break;
         }
 }
 
-static u16 skge_gm_phy_read(struct skge_hw *hw, int port, u16 reg)
+static u16 gm_phy_read(struct skge_hw *hw, int port, u16 reg)
 {
         int i;
 
-        skge_gma_write16(hw, port, GM_SMI_CTRL,
+        gma_write16(hw, port, GM_SMI_CTRL,
                          GM_SMI_CT_PHY_AD(hw->phy_addr)
                          | GM_SMI_CT_REG_AD(reg) | GM_SMI_CT_OP_RD);
 
         for (i = 0; i < PHY_RETRIES; i++) {
                 udelay(1);
-                if (skge_gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_RD_VAL)
+                if (gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_RD_VAL)
                         goto ready;
         }
 
@@ -1422,24 +1447,7 @@ static u16 skge_gm_phy_read(struct skge_hw *hw, int port, u16 reg)
                hw->dev[port]->name);
         return 0;
  ready:
-        return skge_gma_read16(hw, port, GM_SMI_DATA);
-}
-
-static void genesis_link_down(struct skge_port *skge)
-{
-        struct skge_hw *hw = skge->hw;
-        int port = skge->port;
-
-        pr_debug("genesis_link_down\n");
-
-        skge_xm_write16(hw, port, XM_MMU_CMD,
-                        skge_xm_read16(hw, port, XM_MMU_CMD)
-                        & ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX));
-
-        /* dummy read to ensure writing */
-        (void) skge_xm_read16(hw, port, XM_MMU_CMD);
-
-        skge_link_down(skge);
+        return gma_read16(hw, port, GM_SMI_DATA);
 }
 
 static void genesis_link_up(struct skge_port *skge)
@@ -1450,7 +1458,7 @@ static void genesis_link_up(struct skge_port *skge)
         u32 mode, msk;
 
         pr_debug("genesis_link_up\n");
-        cmd = skge_xm_read16(hw, port, XM_MMU_CMD);
+        cmd = xm_read16(hw, port, XM_MMU_CMD);
 
         /*
          * enabling pause frame reception is required for 1000BT
@@ -1458,14 +1466,15 @@ static void genesis_link_up(struct skge_port *skge)
          */
         if (skge->flow_control == FLOW_MODE_NONE ||
             skge->flow_control == FLOW_MODE_LOC_SEND)
+                /* Disable Pause Frame Reception */
                 cmd |= XM_MMU_IGN_PF;
         else
                 /* Enable Pause Frame Reception */
                 cmd &= ~XM_MMU_IGN_PF;
 
-        skge_xm_write16(hw, port, XM_MMU_CMD, cmd);
+        xm_write16(hw, port, XM_MMU_CMD, cmd);
 
-        mode = skge_xm_read32(hw, port, XM_MODE);
+        mode = xm_read32(hw, port, XM_MODE);
         if (skge->flow_control == FLOW_MODE_SYMMETRIC ||
             skge->flow_control == FLOW_MODE_LOC_SEND) {
                 /*
@@ -1479,10 +1488,10 @@ static void genesis_link_up(struct skge_port *skge)
                 /* XM_PAUSE_DA = '010000C28001' (default) */
                 /* XM_MAC_PTIME = 0xffff (maximum) */
                 /* remember this value is defined in big endian (!) */
-                skge_xm_write16(hw, port, XM_MAC_PTIME, 0xffff);
+                xm_write16(hw, port, XM_MAC_PTIME, 0xffff);
 
                 mode |= XM_PAUSE_MODE;
-                skge_write16(hw, SKGEMAC_REG(port, RX_MFF_CTRL1), MFF_ENA_PAUSE);
+                skge_write16(hw, SK_REG(port, RX_MFF_CTRL1), MFF_ENA_PAUSE);
         } else {
                 /*
                  * disable pause frame generation is required for 1000BT
@@ -1491,125 +1500,68 @@ static void genesis_link_up(struct skge_port *skge)
                 /* Disable Pause Mode in Mode Register */
                 mode &= ~XM_PAUSE_MODE;
 
-                skge_write16(hw, SKGEMAC_REG(port, RX_MFF_CTRL1), MFF_DIS_PAUSE);
+                skge_write16(hw, SK_REG(port, RX_MFF_CTRL1), MFF_DIS_PAUSE);
         }
 
-        skge_xm_write32(hw, port, XM_MODE, mode);
+        xm_write32(hw, port, XM_MODE, mode);
 
         msk = XM_DEF_MSK;
-        if (hw->phy_type != SK_PHY_XMAC)
-                msk |= XM_IS_INP_ASS;   /* disable GP0 interrupt bit */
+        /* disable GP0 interrupt bit for external Phy */
+        msk |= XM_IS_INP_ASS;
 
-        skge_xm_write16(hw, port, XM_IMSK, msk);
-        skge_xm_read16(hw, port, XM_ISRC);
+        xm_write16(hw, port, XM_IMSK, msk);
+        xm_read16(hw, port, XM_ISRC);
 
         /* get MMU Command Reg. */
-        cmd = skge_xm_read16(hw, port, XM_MMU_CMD);
-        if (hw->phy_type != SK_PHY_XMAC && skge->duplex == DUPLEX_FULL)
+        cmd = xm_read16(hw, port, XM_MMU_CMD);
+        if (skge->duplex == DUPLEX_FULL)
                 cmd |= XM_MMU_GMII_FD;
 
-        if (hw->phy_type == SK_PHY_BCOM) {
-                /*
-                 * Workaround BCOM Errata (#10523) for all BCom Phys
-                 * Enable Power Management after link up
-                 */
-                skge_xm_phy_write(hw, port, PHY_BCOM_AUX_CTRL,
-                                  skge_xm_phy_read(hw, port, PHY_BCOM_AUX_CTRL)
-                                  & ~PHY_B_AC_DIS_PM);
-                skge_xm_phy_write(hw, port, PHY_BCOM_INT_MASK,
-                                  PHY_B_DEF_MSK);
-        }
+        /*
+         * Workaround BCOM Errata (#10523) for all BCom Phys
+         * Enable Power Management after link up
+         */
+        xm_phy_write(hw, port, PHY_BCOM_AUX_CTRL,
+                     xm_phy_read(hw, port, PHY_BCOM_AUX_CTRL)
+                     & ~PHY_B_AC_DIS_PM);
+        xm_phy_write(hw, port, PHY_BCOM_INT_MASK, PHY_B_DEF_MSK);
 
         /* enable Rx/Tx */
-        skge_xm_write16(hw, port, XM_MMU_CMD,
+        xm_write16(hw, port, XM_MMU_CMD,
                         cmd | XM_MMU_ENA_RX | XM_MMU_ENA_TX);
         skge_link_up(skge);
 }
 
 
-static void genesis_bcom_intr(struct skge_port *skge)
+static inline void bcom_phy_intr(struct skge_port *skge)
 {
         struct skge_hw *hw = skge->hw;
         int port = skge->port;
-        u16 stat = skge_xm_phy_read(hw, port, PHY_BCOM_INT_STAT);
+        u16 isrc;
+
+        isrc = xm_phy_read(hw, port, PHY_BCOM_INT_STAT);
+        if (netif_msg_intr(skge))
+                printk(KERN_DEBUG PFX "%s: phy interrupt status 0x%x\n",
+                       skge->netdev->name, isrc);
 
-        pr_debug("genesis_bcom intr stat=%x\n", stat);
+        if (isrc & PHY_B_IS_PSE)
+                printk(KERN_ERR PFX "%s: uncorrectable pair swap error\n",
+                       hw->dev[port]->name);
 
         /* Workaround BCom Errata:
          *      enable and disable loopback mode if "NO HCD" occurs.
          */
-        if (stat & PHY_B_IS_NO_HDCL) {
-                u16 ctrl = skge_xm_phy_read(hw, port, PHY_BCOM_CTRL);
-                skge_xm_phy_write(hw, port, PHY_BCOM_CTRL,
+        if (isrc & PHY_B_IS_NO_HDCL) {
+                u16 ctrl = xm_phy_read(hw, port, PHY_BCOM_CTRL);
+                xm_phy_write(hw, port, PHY_BCOM_CTRL,
                                   ctrl | PHY_CT_LOOP);
-                skge_xm_phy_write(hw, port, PHY_BCOM_CTRL,
+                xm_phy_write(hw, port, PHY_BCOM_CTRL,
                                   ctrl & ~PHY_CT_LOOP);
         }
 
-        stat = skge_xm_phy_read(hw, port, PHY_BCOM_STAT);
-        if (stat & (PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE)) {
-                u16 aux = skge_xm_phy_read(hw, port, PHY_BCOM_AUX_STAT);
-                if ( !(aux & PHY_B_AS_LS) && netif_carrier_ok(skge->netdev))
-                        genesis_link_down(skge);
-
-                else if (stat & PHY_B_IS_LST_CHANGE) {
-                        if (aux & PHY_B_AS_AN_C) {
-                                switch (aux & PHY_B_AS_AN_RES_MSK) {
-                                case PHY_B_RES_1000FD:
-                                        skge->duplex = DUPLEX_FULL;
-                                        break;
-                                case PHY_B_RES_1000HD:
-                                        skge->duplex = DUPLEX_HALF;
-                                        break;
-                                }
-
-                                switch (aux & PHY_B_AS_PAUSE_MSK) {
-                                case PHY_B_AS_PAUSE_MSK:
-                                        skge->flow_control = FLOW_MODE_SYMMETRIC;
-                                        break;
-                                case PHY_B_AS_PRR:
-                                        skge->flow_control = FLOW_MODE_REM_SEND;
-                                        break;
-                                case PHY_B_AS_PRT:
-                                        skge->flow_control = FLOW_MODE_LOC_SEND;
-                                        break;
-                                default:
-                                        skge->flow_control = FLOW_MODE_NONE;
-                                }
-                                skge->speed = SPEED_1000;
-                        }
-                        genesis_link_up(skge);
-                }
-                else
-                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
-        }
-}
+        if (isrc & (PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE))
+                bcom_check_link(hw, port);
 
-/* Perodic poll of phy status to check for link transistion  */
-static void skge_link_timer(unsigned long __arg)
-{
-        struct skge_port *skge = (struct skge_port *) __arg;
-        struct skge_hw *hw = skge->hw;
-        int port = skge->port;
-
-        if (hw->chip_id != CHIP_ID_GENESIS || !netif_running(skge->netdev))
-                return;
-
-        spin_lock_bh(&hw->phy_lock);
-        if (hw->phy_type == SK_PHY_BCOM)
-                genesis_bcom_intr(skge);
-        else {
-                int i;
-                for (i = 0; i < 3; i++)
-                        if (skge_xm_read16(hw, port, XM_ISRC) & XM_IS_INP_ASS)
-                                break;
-
-                if (i == 3)
-                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
-                else
-                        genesis_link_up(skge);
-        }
-        spin_unlock_bh(&hw->phy_lock);
 }
 
 /* Marvell Phy Initailization */
@@ -1621,31 +1573,27 @@ static void yukon_init(struct skge_hw *hw, int port)
 
         pr_debug("yukon_init\n");
         if (skge->autoneg == AUTONEG_ENABLE) {
-                u16 ectrl = skge_gm_phy_read(hw, port, PHY_MARV_EXT_CTRL);
+                u16 ectrl = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL);
 
                 ectrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
                           PHY_M_EC_MAC_S_MSK);
                 ectrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ);
 
-                /* on PHY 88E1111 there is a change for downshift control */
-                if (hw->chip_id == CHIP_ID_YUKON_EC)
-                        ectrl |= PHY_M_EC_M_DSC_2(0) | PHY_M_EC_DOWN_S_ENA;
-                else
-                        ectrl |= PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
+                ectrl |= PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
 
-                skge_gm_phy_write(hw, port, PHY_MARV_EXT_CTRL, ectrl);
+                gm_phy_write(hw, port, PHY_MARV_EXT_CTRL, ectrl);
         }
 
-        ctrl = skge_gm_phy_read(hw, port, PHY_MARV_CTRL);
+        ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL);
         if (skge->autoneg == AUTONEG_DISABLE)
                 ctrl &= ~PHY_CT_ANE;
 
         ctrl |= PHY_CT_RESET;
-        skge_gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
+        gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
 
         ctrl = 0;
         ct1000 = 0;
-        adv = PHY_SEL_TYPE;
+        adv = PHY_AN_CSMA;
 
         if (skge->autoneg == AUTONEG_ENABLE) {
                 if (iscopper(hw)) {
@@ -1661,41 +1609,12 @@ static void yukon_init(struct skge_hw *hw, int port)
                                 adv |= PHY_M_AN_10_FD;
                         if (skge->advertising & ADVERTISED_10baseT_Half)
                                 adv |= PHY_M_AN_10_HD;
-
-                        /* Set Flow-control capabilities */
-                        switch (skge->flow_control) {
-                        case FLOW_MODE_NONE:
-                                adv |= PHY_B_P_NO_PAUSE;
-                                break;
-                        case FLOW_MODE_LOC_SEND:
-                                adv |= PHY_B_P_ASYM_MD;
-                                break;
-                        case FLOW_MODE_SYMMETRIC:
-                                adv |= PHY_B_P_SYM_MD;
-                                break;
-                        case FLOW_MODE_REM_SEND:
-                                adv |= PHY_B_P_BOTH_MD;
-                                break;
-                        }
-                } else {        /* special defines for FIBER (88E1011S only) */
+                } else  /* special defines for FIBER (88E1011S only) */
                         adv |= PHY_M_AN_1000X_AHD | PHY_M_AN_1000X_AFD;
 
-                        /* Set Flow-control capabilities */
-                        switch (skge->flow_control) {
-                        case FLOW_MODE_NONE:
-                                adv |= PHY_M_P_NO_PAUSE_X;
-                                break;
-                        case FLOW_MODE_LOC_SEND:
-                                adv |= PHY_M_P_ASYM_MD_X;
-                                break;
-                        case FLOW_MODE_SYMMETRIC:
-                                adv |= PHY_M_P_SYM_MD_X;
-                                break;
-                        case FLOW_MODE_REM_SEND:
-                                adv |= PHY_M_P_BOTH_MD_X;
-                                break;
-                        }
-                }
+                /* Set Flow-control capabilities */
+                adv |= phy_pause_map[skge->flow_control];
+
                 /* Restart Auto-negotiation */
                 ctrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
         } else {
@@ -1717,36 +1636,23 @@ static void yukon_init(struct skge_hw *hw, int port)
                 ctrl |= PHY_CT_RESET;
         }
 
-        if (hw->chip_id != CHIP_ID_YUKON_FE)
-                skge_gm_phy_write(hw, port, PHY_MARV_1000T_CTRL, ct1000);
+        gm_phy_write(hw, port, PHY_MARV_1000T_CTRL, ct1000);
 
-        skge_gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, adv);
-        skge_gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
+        gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, adv);
+        gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
 
         /* Setup Phy LED's */
         ledctrl = PHY_M_LED_PULS_DUR(PULS_170MS);
         ledover = 0;
 
-        if (hw->chip_id == CHIP_ID_YUKON_FE) {
-                /* on 88E3082 these bits are at 11..9 (shifted left) */
-                ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) << 1;
-
-                skge_gm_phy_write(hw, port, PHY_MARV_FE_LED_PAR,
-                                  ((skge_gm_phy_read(hw, port, PHY_MARV_FE_LED_PAR)
-
-                                    & ~PHY_M_FELP_LED1_MSK)
-                                   | PHY_M_FELP_LED1_CTRL(LED_PAR_CTRL_ACT_BL)));
-        } else {
-                /* set Tx LED (LED_TX) to blink mode on Rx OR Tx activity */
-                ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) | PHY_M_LEDC_TX_CTRL;
+        ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) | PHY_M_LEDC_TX_CTRL;
 
-                /* turn off the Rx LED (LED_RX) */
-                ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);
-        }
+        /* turn off the Rx LED (LED_RX) */
+        ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);
 
         /* disable blink mode (LED_DUPLEX) on collisions */
         ctrl |= PHY_M_LEDC_DP_CTRL;
-        skge_gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
+        gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
 
         if (skge->autoneg == AUTONEG_DISABLE || skge->speed == SPEED_100) {
                 /* turn on 100 Mbps LED (LED_LINK100) */
@@ -1754,25 +1660,25 @@ static void yukon_init(struct skge_hw *hw, int port)
         }
 
         if (ledover)
-                skge_gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover);
+                gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover);
 
         /* Enable phy interrupt on autonegotiation complete (or link up) */
         if (skge->autoneg == AUTONEG_ENABLE)
-                skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL);
+                gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL);
         else
-                skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+                gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
 }
 
 static void yukon_reset(struct skge_hw *hw, int port)
 {
-        skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);/* disable PHY IRQs */
-        skge_gma_write16(hw, port, GM_MC_ADDR_H1, 0);   /* clear MC hash */
-        skge_gma_write16(hw, port, GM_MC_ADDR_H2, 0);
-        skge_gma_write16(hw, port, GM_MC_ADDR_H3, 0);
-        skge_gma_write16(hw, port, GM_MC_ADDR_H4, 0);
+        gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);/* disable PHY IRQs */
+        gma_write16(hw, port, GM_MC_ADDR_H1, 0);        /* clear MC hash */
+        gma_write16(hw, port, GM_MC_ADDR_H2, 0);
+        gma_write16(hw, port, GM_MC_ADDR_H3, 0);
+        gma_write16(hw, port, GM_MC_ADDR_H4, 0);
 
-        skge_gma_write16(hw, port, GM_RX_CTRL,
-                         skge_gma_read16(hw, port, GM_RX_CTRL)
+        gma_write16(hw, port, GM_RX_CTRL,
+                         gma_read16(hw, port, GM_RX_CTRL)
                          | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
 }
 
@@ -1785,17 +1691,17 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
 
         /* WA code for COMA mode -- set PHY reset */
         if (hw->chip_id == CHIP_ID_YUKON_LITE &&
-            chip_rev(hw) == CHIP_REV_YU_LITE_A3)
+            hw->chip_rev == CHIP_REV_YU_LITE_A3)
                 skge_write32(hw, B2_GP_IO,
                              (skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9));
 
         /* hard reset */
-        skge_write32(hw, SKGEMAC_REG(port, GPHY_CTRL), GPC_RST_SET);
-        skge_write32(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_RST_SET);
+        skge_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
+        skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_RST_SET);
 
         /* WA code for COMA mode -- clear PHY reset */
         if (hw->chip_id == CHIP_ID_YUKON_LITE &&
-            chip_rev(hw) == CHIP_REV_YU_LITE_A3)
+            hw->chip_rev == CHIP_REV_YU_LITE_A3)
                 skge_write32(hw, B2_GP_IO,
                              (skge_read32(hw, B2_GP_IO) | GP_DIR_9)
                              & ~GP_IO_9);
@@ -1806,13 +1712,13 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
         reg |= iscopper(hw) ? GPC_HWCFG_GMII_COP : GPC_HWCFG_GMII_FIB;
 
         /* Clear GMC reset */
-        skge_write32(hw, SKGEMAC_REG(port, GPHY_CTRL), reg | GPC_RST_SET);
-        skge_write32(hw, SKGEMAC_REG(port, GPHY_CTRL), reg | GPC_RST_CLR);
-        skge_write32(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
+        skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_SET);
+        skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_CLR);
+        skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
         if (skge->autoneg == AUTONEG_DISABLE) {
                 reg = GM_GPCR_AU_ALL_DIS;
-                skge_gma_write16(hw, port, GM_GP_CTRL,
-                                 skge_gma_read16(hw, port, GM_GP_CTRL) | reg);
+                gma_write16(hw, port, GM_GP_CTRL,
+                                 gma_read16(hw, port, GM_GP_CTRL) | reg);
 
                 switch (skge->speed) {
                 case SPEED_1000:
@@ -1828,7 +1734,7 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
                 reg = GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100 | GM_GPCR_DUP_FULL;
         switch (skge->flow_control) {
         case FLOW_MODE_NONE:
-                skge_write32(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
+                skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
                 reg |= GM_GPCR_FC_TX_DIS | GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
                 break;
         case FLOW_MODE_LOC_SEND:
@@ -1836,7 +1742,7 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
                 reg |= GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
         }
 
-        skge_gma_write16(hw, port, GM_GP_CTRL, reg);
+        gma_write16(hw, port, GM_GP_CTRL, reg);
         skge_read16(hw, GMAC_IRQ_SRC);
 
         spin_lock_bh(&hw->phy_lock);
@@ -1844,25 +1750,25 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
         spin_unlock_bh(&hw->phy_lock);
 
         /* MIB clear */
-        reg = skge_gma_read16(hw, port, GM_PHY_ADDR);
-        skge_gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);
+        reg = gma_read16(hw, port, GM_PHY_ADDR);
+        gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);
 
         for (i = 0; i < GM_MIB_CNT_SIZE; i++)
-                skge_gma_read16(hw, port, GM_MIB_CNT_BASE + 8*i);
-        skge_gma_write16(hw, port, GM_PHY_ADDR, reg);
+                gma_read16(hw, port, GM_MIB_CNT_BASE + 8*i);
+        gma_write16(hw, port, GM_PHY_ADDR, reg);
 
         /* transmit control */
-        skge_gma_write16(hw, port, GM_TX_CTRL, TX_COL_THR(TX_COL_DEF));
+        gma_write16(hw, port, GM_TX_CTRL, TX_COL_THR(TX_COL_DEF));
 
         /* receive control reg: unicast + multicast + no FCS  */
-        skge_gma_write16(hw, port, GM_RX_CTRL,
+        gma_write16(hw, port, GM_RX_CTRL,
                          GM_RXCR_UCF_ENA | GM_RXCR_CRC_DIS | GM_RXCR_MCF_ENA);
 
         /* transmit flow control */
-        skge_gma_write16(hw, port, GM_TX_FLOW_CTRL, 0xffff);
+        gma_write16(hw, port, GM_TX_FLOW_CTRL, 0xffff);
 
         /* transmit parameter */
-        skge_gma_write16(hw, port, GM_TX_PARAM,
+        gma_write16(hw, port, GM_TX_PARAM,
                          TX_JAM_LEN_VAL(TX_JAM_LEN_DEF) |
                          TX_JAM_IPG_VAL(TX_JAM_IPG_DEF) |
                          TX_IPG_JAM_DATA(TX_IPG_JAM_DEF));
@@ -1872,33 +1778,33 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
         if (hw->dev[port]->mtu > 1500)
                 reg |= GM_SMOD_JUMBO_ENA;
 
-        skge_gma_write16(hw, port, GM_SERIAL_MODE, reg);
+        gma_write16(hw, port, GM_SERIAL_MODE, reg);
 
         /* physical address: used for pause frames */
-        skge_gm_set_addr(hw, port, GM_SRC_ADDR_1L, addr);
+        gma_set_addr(hw, port, GM_SRC_ADDR_1L, addr);
         /* virtual address for data */
-        skge_gm_set_addr(hw, port, GM_SRC_ADDR_2L, addr);
+        gma_set_addr(hw, port, GM_SRC_ADDR_2L, addr);
 
         /* enable interrupt mask for counter overflows */
-        skge_gma_write16(hw, port, GM_TX_IRQ_MSK, 0);
-        skge_gma_write16(hw, port, GM_RX_IRQ_MSK, 0);
-        skge_gma_write16(hw, port, GM_TR_IRQ_MSK, 0);
+        gma_write16(hw, port, GM_TX_IRQ_MSK, 0);
+        gma_write16(hw, port, GM_RX_IRQ_MSK, 0);
+        gma_write16(hw, port, GM_TR_IRQ_MSK, 0);
 
         /* Initialize Mac Fifo */
 
         /* Configure Rx MAC FIFO */
-        skge_write16(hw, SKGEMAC_REG(port, RX_GMF_FL_MSK), RX_FF_FL_DEF_MSK);
+        skge_write16(hw, SK_REG(port, RX_GMF_FL_MSK), RX_FF_FL_DEF_MSK);
         reg = GMF_OPER_ON | GMF_RX_F_FL_ON;
         if (hw->chip_id == CHIP_ID_YUKON_LITE &&
-            chip_rev(hw) == CHIP_REV_YU_LITE_A3)
+            hw->chip_rev == CHIP_REV_YU_LITE_A3)
                 reg &= ~GMF_RX_F_FL_ON;
-        skge_write8(hw, SKGEMAC_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);
-        skge_write16(hw, SKGEMAC_REG(port, RX_GMF_CTRL_T), reg);
-        skge_write16(hw, SKGEMAC_REG(port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF);
+        skge_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);
+        skge_write16(hw, SK_REG(port, RX_GMF_CTRL_T), reg);
+        skge_write16(hw, SK_REG(port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF);
 
         /* Configure Tx MAC FIFO */
-        skge_write8(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
-        skge_write16(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
+        skge_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
+        skge_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
 }
 
 static void yukon_stop(struct skge_port *skge)
@@ -1907,19 +1813,19 @@ static void yukon_stop(struct skge_port *skge)
         int port = skge->port;
 
         if (hw->chip_id == CHIP_ID_YUKON_LITE &&
-            chip_rev(hw) == CHIP_REV_YU_LITE_A3) {
+            hw->chip_rev == CHIP_REV_YU_LITE_A3) {
                 skge_write32(hw, B2_GP_IO,
                              skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9);
         }
 
-        skge_gma_write16(hw, port, GM_GP_CTRL,
-                         skge_gma_read16(hw, port, GM_GP_CTRL)
+        gma_write16(hw, port, GM_GP_CTRL,
+                         gma_read16(hw, port, GM_GP_CTRL)
                          & ~(GM_GPCR_RX_ENA|GM_GPCR_RX_ENA));
-        skge_gma_read16(hw, port, GM_GP_CTRL);
+        gma_read16(hw, port, GM_GP_CTRL);
 
         /* set GPHY Control reset */
-        skge_gma_write32(hw, port, GPHY_CTRL, GPC_RST_SET);
-        skge_gma_write32(hw, port, GMAC_CTRL, GMC_RST_SET);
+        gma_write32(hw, port, GPHY_CTRL, GPC_RST_SET);
+        gma_write32(hw, port, GMAC_CTRL, GMC_RST_SET);
 }
 
 static void yukon_get_stats(struct skge_port *skge, u64 *data)
@@ -1928,39 +1834,40 @@ static void yukon_get_stats(struct skge_port *skge, u64 *data)
         int port = skge->port;
         int i;
 
-        data[0] = (u64) skge_gma_read32(hw, port, GM_TXO_OK_HI) << 32
-                | skge_gma_read32(hw, port, GM_TXO_OK_LO);
-        data[1] = (u64) skge_gma_read32(hw, port, GM_RXO_OK_HI) << 32
-                | skge_gma_read32(hw, port, GM_RXO_OK_LO);
+        data[0] = (u64) gma_read32(hw, port, GM_TXO_OK_HI) << 32
+                | gma_read32(hw, port, GM_TXO_OK_LO);
+        data[1] = (u64) gma_read32(hw, port, GM_RXO_OK_HI) << 32
+                | gma_read32(hw, port, GM_RXO_OK_LO);
 
         for (i = 2; i < ARRAY_SIZE(skge_stats); i++)
-                data[i] = skge_gma_read32(hw, port,
+                data[i] = gma_read32(hw, port,
                                           skge_stats[i].gma_offset);
 }
 
 static void yukon_mac_intr(struct skge_hw *hw, int port)
 {
-        struct skge_port *skge = netdev_priv(hw->dev[port]);
-        u8 status = skge_read8(hw, SKGEMAC_REG(port, GMAC_IRQ_SRC));
+        struct net_device *dev = hw->dev[port];
+        struct skge_port *skge = netdev_priv(dev);
+        u8 status = skge_read8(hw, SK_REG(port, GMAC_IRQ_SRC));
+
+        if (netif_msg_intr(skge))
+                printk(KERN_DEBUG PFX "%s: mac interrupt status 0x%x\n",
+                       dev->name, status);
 
-        pr_debug("yukon_intr status %x\n", status);
         if (status & GM_IS_RX_FF_OR) {
                 ++skge->net_stats.rx_fifo_errors;
-                skge_gma_write8(hw, port, RX_GMF_CTRL_T, GMF_CLI_RX_FO);
+                gma_write8(hw, port, RX_GMF_CTRL_T, GMF_CLI_RX_FO);
         }
         if (status & GM_IS_TX_FF_UR) {
                 ++skge->net_stats.tx_fifo_errors;
-                skge_gma_write8(hw, port, TX_GMF_CTRL_T, GMF_CLI_TX_FU);
+                gma_write8(hw, port, TX_GMF_CTRL_T, GMF_CLI_TX_FU);
         }
 
 }
 
 static u16 yukon_speed(const struct skge_hw *hw, u16 aux)
 {
-        if (hw->chip_id == CHIP_ID_YUKON_FE)
-                return (aux & PHY_M_PS_SPEED_100) ? SPEED_100 : SPEED_10;
-
-        switch(aux & PHY_M_PS_SPEED_MSK) {
+        switch (aux & PHY_M_PS_SPEED_MSK) {
         case PHY_M_PS_SPEED_1000:
                 return SPEED_1000;
         case PHY_M_PS_SPEED_100:
@@ -1981,15 +1888,15 @@ static void yukon_link_up(struct skge_port *skge)
         /* Enable Transmit FIFO Underrun */
         skge_write8(hw, GMAC_IRQ_MSK, GMAC_DEF_MSK);
 
-        reg = skge_gma_read16(hw, port, GM_GP_CTRL);
+        reg = gma_read16(hw, port, GM_GP_CTRL);
         if (skge->duplex == DUPLEX_FULL || skge->autoneg == AUTONEG_ENABLE)
                 reg |= GM_GPCR_DUP_FULL;
 
         /* enable Rx/Tx */
         reg |= GM_GPCR_RX_ENA | GM_GPCR_TX_ENA;
-        skge_gma_write16(hw, port, GM_GP_CTRL, reg);
+        gma_write16(hw, port, GM_GP_CTRL, reg);
 
-        skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+        gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
         skge_link_up(skge);
 }
 
@@ -1999,16 +1906,15 @@ static void yukon_link_down(struct skge_port *skge)
         int port = skge->port;
 
         pr_debug("yukon_link_down\n");
-        skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
-        skge_gm_phy_write(hw, port, GM_GP_CTRL,
-                          skge_gm_phy_read(hw, port, GM_GP_CTRL)
+        gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
+        gm_phy_write(hw, port, GM_GP_CTRL,
+                          gm_phy_read(hw, port, GM_GP_CTRL)
                           & ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA));
 
-        if (hw->chip_id != CHIP_ID_YUKON_FE &&
-            skge->flow_control == FLOW_MODE_REM_SEND) {
+        if (skge->flow_control == FLOW_MODE_REM_SEND) {
                 /* restore Asymmetric Pause bit */
-                skge_gm_phy_write(hw, port, PHY_MARV_AUNE_ADV,
-                                  skge_gm_phy_read(hw, port,
+                gm_phy_write(hw, port, PHY_MARV_AUNE_ADV,
+                                  gm_phy_read(hw, port,
                                                    PHY_MARV_AUNE_ADV)
                                   | PHY_M_AN_ASP);
 
@@ -2027,20 +1933,21 @@ static void yukon_phy_intr(struct skge_port *skge)
         const char *reason = NULL;
         u16 istatus, phystat;
 
-        istatus = skge_gm_phy_read(hw, port, PHY_MARV_INT_STAT);
-        phystat = skge_gm_phy_read(hw, port, PHY_MARV_PHY_STAT);
-        pr_debug("yukon phy intr istat=%x phy_stat=%x\n", istatus, phystat);
+        istatus = gm_phy_read(hw, port, PHY_MARV_INT_STAT);
+        phystat = gm_phy_read(hw, port, PHY_MARV_PHY_STAT);
+
+        if (netif_msg_intr(skge))
+                printk(KERN_DEBUG PFX "%s: phy interrupt status 0x%x 0x%x\n",
+                       skge->netdev->name, istatus, phystat);
 
         if (istatus & PHY_M_IS_AN_COMPL) {
-                if (skge_gm_phy_read(hw, port, PHY_MARV_AUNE_LP)
+                if (gm_phy_read(hw, port, PHY_MARV_AUNE_LP)
                     & PHY_M_AN_RF) {
                         reason = "remote fault";
                         goto failed;
                 }
 
-                if (!(hw->chip_id == CHIP_ID_YUKON_FE || hw->chip_id == CHIP_ID_YUKON_EC)
-                    && (skge_gm_phy_read(hw, port, PHY_MARV_1000T_STAT)
-                        & PHY_B_1000S_MSF)) {
+                if (gm_phy_read(hw, port, PHY_MARV_1000T_STAT) & PHY_B_1000S_MSF) {
                         reason = "master/slave fault";
                         goto failed;
                 }
@@ -2054,10 +1961,6 @@ static void yukon_phy_intr(struct skge_port *skge)
                         ? DUPLEX_FULL : DUPLEX_HALF;
                 skge->speed = yukon_speed(hw, phystat);
 
-                /* Tx & Rx Pause Enabled bits are at 9..8 */
-                if (hw->chip_id == CHIP_ID_YUKON_XL)
-                        phystat >>= 6;
-
                 /* We are using IEEE 802.3z/D5.0 Table 37-4 */
                 switch (phystat & PHY_M_PS_PAUSE_MSK) {
                 case PHY_M_PS_PAUSE_MSK:
@@ -2075,9 +1978,9 @@ static void yukon_phy_intr(struct skge_port *skge)
 
                 if (skge->flow_control == FLOW_MODE_NONE ||
                     (skge->speed < SPEED_1000 && skge->duplex == DUPLEX_HALF))
-                        skge_write8(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
+                        skge_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
                 else
-                        skge_write8(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
+                        skge_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
                 yukon_link_up(skge);
                 return;
         }
@@ -2161,6 +2064,12 @@ static int skge_up(struct net_device *dev)
         if (netif_msg_ifup(skge))
                 printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
 
+        if (dev->mtu > RX_BUF_SIZE)
+                skge->rx_buf_size = dev->mtu + ETH_HLEN + NET_IP_ALIGN;
+        else
+                skge->rx_buf_size = RX_BUF_SIZE;
+
+
         rx_size = skge->rx_ring.count * sizeof(struct skge_rx_desc);
         tx_size = skge->tx_ring.count * sizeof(struct skge_tx_desc);
         skge->mem_size = tx_size + rx_size;
@@ -2173,7 +2082,8 @@ static int skge_up(struct net_device *dev)
         if ((err = skge_ring_alloc(&skge->rx_ring, skge->mem, skge->dma)))
                 goto free_pci_mem;
 
-        if (skge_rx_fill(skge))
+        err = skge_rx_fill(skge);
+        if (err)
                 goto free_rx_ring;
 
         if ((err = skge_ring_alloc(&skge->tx_ring, skge->mem + rx_size,
@@ -2182,6 +2092,10 @@ static int skge_up(struct net_device *dev)
 
         skge->tx_avail = skge->tx_ring.count - 1;
 
+        /* Enable IRQ from port */
+        hw->intr_mask |= portirqmask[port];
+        skge_write32(hw, B0_IMSK, hw->intr_mask);
+
         /* Initialze MAC */
         if (hw->chip_id == CHIP_ID_GENESIS)
                 genesis_mac_init(hw, port);
@@ -2189,7 +2103,7 @@ static int skge_up(struct net_device *dev)
                 yukon_mac_init(hw, port);
 
         /* Configure RAMbuffers */
-        chunk = hw->ram_size / (isdualport(hw) ? 4 : 2);
+        chunk = hw->ram_size / ((hw->ports + 1)*2);
         ram_addr = hw->ram_offset + 2 * chunk * port;
 
         skge_ramset(hw, rxqaddr[port], ram_addr, chunk);
@@ -2227,7 +2141,6 @@ static int skge_down(struct net_device *dev)
         netif_stop_queue(dev);
 
         del_timer_sync(&skge->led_blink);
-        del_timer_sync(&skge->link_check);
 
         /* Stop transmitter */
         skge_write8(hw, Q_ADDR(txqaddr[port], Q_CSR), CSR_STOP);
@@ -2240,12 +2153,12 @@ static int skge_down(struct net_device *dev)
                 yukon_stop(skge);
 
         /* Disable Force Sync bit and Enable Alloc bit */
-        skge_write8(hw, SKGEMAC_REG(port, TXA_CTRL),
+        skge_write8(hw, SK_REG(port, TXA_CTRL),
                     TXA_DIS_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);
 
         /* Stop Interval Timer and Limit Counter of Tx Arbiter */
-        skge_write32(hw, SKGEMAC_REG(port, TXA_ITI_INI), 0L);
-        skge_write32(hw, SKGEMAC_REG(port, TXA_LIM_INI), 0L);
+        skge_write32(hw, SK_REG(port, TXA_ITI_INI), 0L);
+        skge_write32(hw, SK_REG(port, TXA_LIM_INI), 0L);
 
         /* Reset PCI FIFO */
         skge_write32(hw, Q_ADDR(txqaddr[port], Q_CSR), CSR_SET_RESET);
@@ -2260,13 +2173,13 @@ static int skge_down(struct net_device *dev)
         skge_write32(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_SET_RESET);
 
         if (hw->chip_id == CHIP_ID_GENESIS) {
-                skge_write8(hw, SKGEMAC_REG(port, TX_MFF_CTRL2), MFF_RST_SET);
-                skge_write8(hw, SKGEMAC_REG(port, RX_MFF_CTRL2), MFF_RST_SET);
-                skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_STOP);
-                skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_STOP);
+                skge_write8(hw, SK_REG(port, TX_MFF_CTRL2), MFF_RST_SET);
+                skge_write8(hw, SK_REG(port, RX_MFF_CTRL2), MFF_RST_SET);
+                skge_write8(hw, SK_REG(port, TX_LED_CTRL), LED_STOP);
+                skge_write8(hw, SK_REG(port, RX_LED_CTRL), LED_STOP);
         } else {
-                skge_write8(hw, SKGEMAC_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
-                skge_write8(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
+                skge_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
+                skge_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
         }
 
         /* turn off led's */
@@ -2299,10 +2212,10 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 
         local_irq_save(flags);
         if (!spin_trylock(&skge->tx_lock)) {
-                /* Collision - tell upper layer to requeue */ 
-                local_irq_restore(flags); 
-                return NETDEV_TX_LOCKED; 
-        } 
+                /* Collision - tell upper layer to requeue */
+                local_irq_restore(flags);
+                return NETDEV_TX_LOCKED;
+        }
 
         if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
                 netif_stop_queue(dev);
@@ -2333,7 +2246,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                  * does.  Looks like hardware is wrong?
                  */
                 if (ip->protocol == IPPROTO_UDP
-                    && chip_rev(hw) == 0 && hw->chip_id == CHIP_ID_YUKON)
+                    && hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON)
                         control = BMU_TCP_CHECK;
                 else
                         control = BMU_UDP_CHECK;
@@ -2394,6 +2307,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 
 static inline void skge_tx_free(struct skge_hw *hw, struct skge_element *e)
 {
+        /* This ring element can be skb or fragment */
         if (e->skb) {
                 pci_unmap_single(hw->pdev,
                                pci_unmap_addr(e, mapaddr),
@@ -2438,16 +2352,17 @@ static void skge_tx_timeout(struct net_device *dev)
 static int skge_change_mtu(struct net_device *dev, int new_mtu)
 {
         int err = 0;
+        int running = netif_running(dev);
 
-        if(new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
+        if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
                 return -EINVAL;
 
-        dev->mtu = new_mtu;
 
-        if (netif_running(dev)) {
+        if (running)
                 skge_down(dev);
+        dev->mtu = new_mtu;
+        if (running)
                 skge_up(dev);
-        }
 
         return err;
 }
@@ -2462,7 +2377,9 @@ static void genesis_set_multicast(struct net_device *dev)
         u32 mode;
         u8 filter[8];
 
-        mode = skge_xm_read32(hw, port, XM_MODE);
+        pr_debug("genesis_set_multicast flags=%x count=%d\n", dev->flags, dev->mc_count);
+
+        mode = xm_read32(hw, port, XM_MODE);
         mode |= XM_MD_ENA_HASH;
         if (dev->flags & IFF_PROMISC)
                 mode |= XM_MD_ENA_PROM;
@@ -2473,17 +2390,16 @@ static void genesis_set_multicast(struct net_device *dev)
                 memset(filter, 0xff, sizeof(filter));
         else {
                 memset(filter, 0, sizeof(filter));
-                for(i = 0; list && i < count; i++, list = list->next) {
-                        u32 crc = crc32_le(~0, list->dmi_addr, ETH_ALEN);
-                        u8 bit = 63 - (crc & 63);
-
+                for (i = 0; list && i < count; i++, list = list->next) {
+                        u32 crc, bit;
+                        crc = ether_crc_le(ETH_ALEN, list->dmi_addr);
+                        bit = ~crc & 0x3f;
                         filter[bit/8] |= 1 << (bit%8);
                 }
         }
 
-        skge_xm_outhash(hw, port, XM_HSM, filter);
-
-        skge_xm_write32(hw, port, XM_MODE, mode);
+        xm_write32(hw, port, XM_MODE, mode);
+        xm_outhash(hw, port, XM_HSM, filter);
 }
 
 static void yukon_set_multicast(struct net_device *dev)
@@ -2497,7 +2413,7 @@ static void yukon_set_multicast(struct net_device *dev)
 
         memset(filter, 0, sizeof(filter));
 
-        reg = skge_gma_read16(hw, port, GM_RX_CTRL);
+        reg = gma_read16(hw, port, GM_RX_CTRL);
         reg |= GM_RXCR_UCF_ENA;
 
         if (dev->flags & IFF_PROMISC)           /* promiscious */
@@ -2510,23 +2426,23 @@ static void yukon_set_multicast(struct net_device *dev)
                 int i;
                 reg |= GM_RXCR_MCF_ENA;
 
-                for(i = 0; list && i < dev->mc_count; i++, list = list->next) {
+                for (i = 0; list && i < dev->mc_count; i++, list = list->next) {
                         u32 bit = ether_crc(ETH_ALEN, list->dmi_addr) & 0x3f;
                         filter[bit/8] |= 1 << (bit%8);
                 }
         }
 
 
-        skge_gma_write16(hw, port, GM_MC_ADDR_H1,
+        gma_write16(hw, port, GM_MC_ADDR_H1,
                          (u16)filter[0] | ((u16)filter[1] << 8));
-        skge_gma_write16(hw, port, GM_MC_ADDR_H2,
+        gma_write16(hw, port, GM_MC_ADDR_H2,
                          (u16)filter[2] | ((u16)filter[3] << 8));
-        skge_gma_write16(hw, port, GM_MC_ADDR_H3,
+        gma_write16(hw, port, GM_MC_ADDR_H3,
                          (u16)filter[4] | ((u16)filter[5] << 8));
-        skge_gma_write16(hw, port, GM_MC_ADDR_H4,
+        gma_write16(hw, port, GM_MC_ADDR_H4,
                          (u16)filter[6] | ((u16)filter[7] << 8));
 
-        skge_gma_write16(hw, port, GM_RX_CTRL, reg);
+        gma_write16(hw, port, GM_RX_CTRL, reg);
 }
 
 static inline int bad_phy_status(const struct skge_hw *hw, u32 status)
@@ -2545,28 +2461,76 @@ static void skge_rx_error(struct skge_port *skge, int slot,
                 printk(KERN_DEBUG PFX "%s: rx err, slot %d control 0x%x status 0x%x\n",
                        skge->netdev->name, slot, control, status);
 
-        if ((control & (BMU_EOF|BMU_STF)) != (BMU_STF|BMU_EOF)
-            || (control & BMU_BBC) > skge->netdev->mtu + VLAN_ETH_HLEN)
+        if ((control & (BMU_EOF|BMU_STF)) != (BMU_STF|BMU_EOF))
                 skge->net_stats.rx_length_errors++;
-        else {
-                if (skge->hw->chip_id == CHIP_ID_GENESIS) {
-                        if (status & (XMR_FS_RUNT|XMR_FS_LNG_ERR))
-                                skge->net_stats.rx_length_errors++;
-                        if (status & XMR_FS_FRA_ERR)
-                                skge->net_stats.rx_frame_errors++;
-                        if (status & XMR_FS_FCS_ERR)
-                                skge->net_stats.rx_crc_errors++;
-                } else {
-                        if (status & (GMR_FS_LONG_ERR|GMR_FS_UN_SIZE))
-                                skge->net_stats.rx_length_errors++;
-                        if (status & GMR_FS_FRAGMENT)
-                                skge->net_stats.rx_frame_errors++;
-                        if (status & GMR_FS_CRC_ERR)
-                                skge->net_stats.rx_crc_errors++;
+        else if (skge->hw->chip_id == CHIP_ID_GENESIS) {
+                if (status & (XMR_FS_RUNT|XMR_FS_LNG_ERR))
+                        skge->net_stats.rx_length_errors++;
+                if (status & XMR_FS_FRA_ERR)
+                        skge->net_stats.rx_frame_errors++;
+                if (status & XMR_FS_FCS_ERR)
+                        skge->net_stats.rx_crc_errors++;
+        } else {
+                if (status & (GMR_FS_LONG_ERR|GMR_FS_UN_SIZE))
+                        skge->net_stats.rx_length_errors++;
+                if (status & GMR_FS_FRAGMENT)
+                        skge->net_stats.rx_frame_errors++;
+                if (status & GMR_FS_CRC_ERR)
+                        skge->net_stats.rx_crc_errors++;
+        }
+}
+
+/* Get receive buffer from descriptor.
+ * Handles copy of small buffers and reallocation failures
+ */
+static inline struct sk_buff *skge_rx_get(struct skge_port *skge,
+                                          struct skge_element *e,
+                                          unsigned int len)
+{
+        struct sk_buff *nskb, *skb;
+
+        if (len < RX_COPY_THRESHOLD) {
+                nskb = skge_rx_alloc(skge->netdev, len + NET_IP_ALIGN);
+                if (unlikely(!nskb))
+                        return NULL;
+
+                pci_dma_sync_single_for_cpu(skge->hw->pdev,
+                                            pci_unmap_addr(e, mapaddr),
+                                            len, PCI_DMA_FROMDEVICE);
+                memcpy(nskb->data, e->skb->data, len);
+                pci_dma_sync_single_for_device(skge->hw->pdev,
+                                               pci_unmap_addr(e, mapaddr),
+                                               len, PCI_DMA_FROMDEVICE);
+
+                if (skge->rx_csum) {
+                        struct skge_rx_desc *rd = e->desc;
+                        nskb->csum = le16_to_cpu(rd->csum2);
+                        nskb->ip_summed = CHECKSUM_HW;
                 }
+                skge_rx_reuse(e, skge->rx_buf_size);
+                return nskb;
+        } else {
+                nskb = skge_rx_alloc(skge->netdev, skge->rx_buf_size);
+                if (unlikely(!nskb))
+                        return NULL;
+
+                pci_unmap_single(skge->hw->pdev,
+                                 pci_unmap_addr(e, mapaddr),
+                                 pci_unmap_len(e, maplen),
+                                 PCI_DMA_FROMDEVICE);
+                skb = e->skb;
+                if (skge->rx_csum) {
+                        struct skge_rx_desc *rd = e->desc;
+                        skb->csum = le16_to_cpu(rd->csum2);
+                        skb->ip_summed = CHECKSUM_HW;
+                }
+
+                skge_rx_setup(skge, e, nskb, skge->rx_buf_size);
+                return skb;
         }
 }
 
+
 static int skge_poll(struct net_device *dev, int *budget)
 {
         struct skge_port *skge = netdev_priv(dev);
@@ -2575,13 +2539,12 @@ static int skge_poll(struct net_device *dev, int *budget)
         struct skge_element *e;
         unsigned int to_do = min(dev->quota, *budget);
         unsigned int work_done = 0;
-        int done;
-        static const u32 irqmask[] = { IS_PORT_1, IS_PORT_2 };
 
-        for (e = ring->to_clean; e != ring->to_use && work_done < to_do;
-             e = e->next) {
+        pr_debug("skge_poll\n");
+
+        for (e = ring->to_clean; work_done < to_do; e = e->next) {
                 struct skge_rx_desc *rd = e->desc;
-                struct sk_buff *skb = e->skb;
+                struct sk_buff *skb;
                 u32 control, len, status;
 
                 rmb();
@@ -2590,19 +2553,12 @@ static int skge_poll(struct net_device *dev, int *budget)
                         break;
 
                 len = control & BMU_BBC;
-                e->skb = NULL;
-
-                pci_unmap_single(hw->pdev,
-                                 pci_unmap_addr(e, mapaddr),
-                                 pci_unmap_len(e, maplen),
-                                 PCI_DMA_FROMDEVICE);
-
                 status = rd->status;
-                if ((control & (BMU_EOF|BMU_STF)) != (BMU_STF|BMU_EOF)
-                     || len > dev->mtu + VLAN_ETH_HLEN
-                     || bad_phy_status(hw, status)) {
+
+                if (unlikely((control & (BMU_EOF|BMU_STF)) != (BMU_STF|BMU_EOF)
+                             || bad_phy_status(hw, status))) {
                         skge_rx_error(skge, e - ring->start, control, status);
-                        dev_kfree_skb(skb);
+                        skge_rx_reuse(e, skge->rx_buf_size);
                         continue;
                 }
 
@@ -2610,43 +2566,37 @@ static int skge_poll(struct net_device *dev, int *budget)
                     printk(KERN_DEBUG PFX "%s: rx slot %td status 0x%x len %d\n",
                            dev->name, e - ring->start, rd->status, len);
 
-                skb_put(skb, len);
-                skb->protocol = eth_type_trans(skb, dev);
-
-                if (skge->rx_csum) {
-                        skb->csum = le16_to_cpu(rd->csum2);
-                        skb->ip_summed = CHECKSUM_HW;
-                }
+                skb = skge_rx_get(skge, e, len);
+                if (likely(skb)) {
+                        skb_put(skb, len);
+                        skb->protocol = eth_type_trans(skb, dev);
 
-                dev->last_rx = jiffies;
-                netif_receive_skb(skb);
+                        dev->last_rx = jiffies;
+                        netif_receive_skb(skb);
 
-                ++work_done;
+                        ++work_done;
+                } else
+                        skge_rx_reuse(e, skge->rx_buf_size);
         }
         ring->to_clean = e;
 
-        *budget -= work_done;
-        dev->quota -= work_done;
-        done = work_done < to_do;
-
-        if (skge_rx_fill(skge))
-                done = 0;
-
         /* restart receiver */
         wmb();
         skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR),
                     CSR_START | CSR_IRQ_CL_F);
 
-        if (done) {
-                local_irq_disable();
-                hw->intr_mask |= irqmask[skge->port];
-                /* Order is important since data can get interrupted */
-                skge_write32(hw, B0_IMSK, hw->intr_mask);
-                __netif_rx_complete(dev);
-                local_irq_enable();
-        }
+        *budget -= work_done;
+        dev->quota -= work_done;
 
-        return !done;
+        if (work_done >=  to_do)
+                return 1; /* not done */
+
+        local_irq_disable();
+        __netif_rx_complete(dev);
+        hw->intr_mask |= portirqmask[skge->port];
+        skge_write32(hw, B0_IMSK, hw->intr_mask);
+        local_irq_enable();
+        return 0;
 }
 
 static inline void skge_tx_intr(struct net_device *dev)
@@ -2657,7 +2607,7 @@ static inline void skge_tx_intr(struct net_device *dev)
         struct skge_element *e;
 
         spin_lock(&skge->tx_lock);
-        for(e = ring->to_clean; e != ring->to_use; e = e->next) {
+        for (e = ring->to_clean; e != ring->to_use; e = e->next) {
                 struct skge_tx_desc *td = e->desc;
                 u32 control;
 
@@ -2690,12 +2640,12 @@ static void skge_mac_parity(struct skge_hw *hw, int port)
                : (port == 0 ? "(port A)": "(port B"));
 
         if (hw->chip_id == CHIP_ID_GENESIS)
-                skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1),
+                skge_write16(hw, SK_REG(port, TX_MFF_CTRL1),
                              MFF_CLR_PERR);
         else
                 /* HW-Bug #8: cleared by GMF_CLI_TX_FC instead of GMF_CLI_TX_PE */
-                skge_write8(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T),
-                            (hw->chip_id == CHIP_ID_YUKON && chip_rev(hw) == 0)
+                skge_write8(hw, SK_REG(port, TX_GMF_CTRL_T),
+                            (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev == 0)
                             ? GMF_CLI_TX_FC : GMF_CLI_TX_PE);
 }
 
@@ -2703,16 +2653,16 @@ static void skge_pci_clear(struct skge_hw *hw)
 {
         u16 status;
 
-        status = skge_read16(hw, SKGEPCI_REG(PCI_STATUS));
+        pci_read_config_word(hw->pdev, PCI_STATUS, &status);
         skge_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-        skge_write16(hw, SKGEPCI_REG(PCI_STATUS),
-                     status | PCI_STATUS_ERROR_BITS);
+        pci_write_config_word(hw->pdev, PCI_STATUS,
+                              status | PCI_STATUS_ERROR_BITS);
         skge_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 }
 
 static void skge_mac_intr(struct skge_hw *hw, int port)
 {
-        if (hw->chip_id == CHIP_ID_GENESIS) 
+        if (hw->chip_id == CHIP_ID_GENESIS)
                 genesis_mac_intr(hw, port);
         else
                 yukon_mac_intr(hw, port);
@@ -2726,9 +2676,9 @@ static void skge_error_irq(struct skge_hw *hw)
         if (hw->chip_id == CHIP_ID_GENESIS) {
                 /* clear xmac errors */
                 if (hwstatus & (IS_NO_STAT_M1|IS_NO_TIST_M1))
-                        skge_write16(hw, SKGEMAC_REG(0, RX_MFF_CTRL1), MFF_CLR_INSTAT);
+                        skge_write16(hw, SK_REG(0, RX_MFF_CTRL1), MFF_CLR_INSTAT);
                 if (hwstatus & (IS_NO_STAT_M2|IS_NO_TIST_M2))
-                        skge_write16(hw, SKGEMAC_REG(0, RX_MFF_CTRL2), MFF_CLR_INSTAT);
+                        skge_write16(hw, SK_REG(0, RX_MFF_CTRL2), MFF_CLR_INSTAT);
         } else {
                 /* Timestamp (unused) overflow */
                 if (hwstatus & IS_IRQ_TIST_OV)
@@ -2803,8 +2753,8 @@ static void skge_extirq(unsigned long data)
 
                         if (hw->chip_id != CHIP_ID_GENESIS)
                                 yukon_phy_intr(skge);
-                        else if (hw->phy_type == SK_PHY_BCOM)
-                                genesis_bcom_intr(skge);
+                        else
+                                bcom_phy_intr(skge);
                 }
         }
         spin_unlock(&hw->phy_lock);
@@ -2824,19 +2774,14 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)
                 return IRQ_NONE;
 
         status &= hw->intr_mask;
-
-        if ((status & IS_R1_F) && netif_rx_schedule_prep(hw->dev[0])) {
-                status &= ~IS_R1_F;
+        if (status & IS_R1_F) {
                 hw->intr_mask &= ~IS_R1_F;
-                skge_write32(hw, B0_IMSK, hw->intr_mask);
-                __netif_rx_schedule(hw->dev[0]);
+                netif_rx_schedule(hw->dev[0]);
         }
 
-        if ((status & IS_R2_F) && netif_rx_schedule_prep(hw->dev[1])) {
-                status &= ~IS_R2_F;
+        if (status & IS_R2_F) {
                 hw->intr_mask &= ~IS_R2_F;
-                skge_write32(hw, B0_IMSK, hw->intr_mask);
-                __netif_rx_schedule(hw->dev[1]);
+                netif_rx_schedule(hw->dev[1]);
         }
 
         if (status & IS_XA1_F)
@@ -2845,9 +2790,27 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)
         if (status & IS_XA2_F)
                 skge_tx_intr(hw->dev[1]);
 
+        if (status & IS_PA_TO_RX1) {
+                struct skge_port *skge = netdev_priv(hw->dev[0]);
+                ++skge->net_stats.rx_over_errors;
+                skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX1);
+        }
+
+        if (status & IS_PA_TO_RX2) {
+                struct skge_port *skge = netdev_priv(hw->dev[1]);
+                ++skge->net_stats.rx_over_errors;
+                skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX2);
+        }
+
+        if (status & IS_PA_TO_TX1)
+                skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX1);
+
+        if (status & IS_PA_TO_TX2)
+                skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX2);
+
         if (status & IS_MAC1)
                 skge_mac_intr(hw, 0);
-        
+
         if (status & IS_MAC2)
                 skge_mac_intr(hw, 1);
 
@@ -2859,8 +2822,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)
                 tasklet_schedule(&hw->ext_tasklet);
         }
 
-        if (status)
-                skge_write32(hw, B0_IMSK, hw->intr_mask);
+        skge_write32(hw, B0_IMSK, hw->intr_mask);
 
         return IRQ_HANDLED;
 }
@@ -2904,9 +2866,6 @@ static const struct {
         { CHIP_ID_YUKON,         "Yukon" },
         { CHIP_ID_YUKON_LITE,    "Yukon-Lite"},
         { CHIP_ID_YUKON_LP,      "Yukon-LP"},
-        { CHIP_ID_YUKON_XL,      "Yukon-2 XL"},
-        { CHIP_ID_YUKON_EC,      "YUKON-2 EC"},
-        { CHIP_ID_YUKON_FE,      "YUKON-2 FE"},
 };
 
 static const char *skge_board_name(const struct skge_hw *hw)
@@ -2930,8 +2889,8 @@ static const char *skge_board_name(const struct skge_hw *hw)
 static int skge_reset(struct skge_hw *hw)
 {
         u16 ctst;
-        u8 t8;
-        int i, ports;
+        u8 t8, mac_cfg;
+        int i;
 
         ctst = skge_read16(hw, B0_CTST);
 
@@ -2952,12 +2911,9 @@ static int skge_reset(struct skge_hw *hw)
         hw->phy_type = skge_read8(hw, B2_E_1) & 0xf;
         hw->pmd_type = skge_read8(hw, B2_PMD_TYP);
 
-        switch(hw->chip_id) {
+        switch (hw->chip_id) {
         case CHIP_ID_GENESIS:
                 switch (hw->phy_type) {
-                case SK_PHY_XMAC:
-                        hw->phy_addr = PHY_ADDR_XMAC;
-                        break;
                 case SK_PHY_BCOM:
                         hw->phy_addr = PHY_ADDR_BCOM;
                         break;
@@ -2986,8 +2942,9 @@ static int skge_reset(struct skge_hw *hw)
                 return -EOPNOTSUPP;
         }
 
-        hw->mac_cfg = skge_read8(hw, B2_MAC_CFG);
-        ports = isdualport(hw) ? 2 : 1;
+        mac_cfg = skge_read8(hw, B2_MAC_CFG);
+        hw->ports = (mac_cfg & CFG_SNG_MAC) ? 1 : 2;
+        hw->chip_rev = (mac_cfg & CFG_CHIP_R_MSK) >> 4;
 
         /* read the adapters RAM size */
         t8 = skge_read8(hw, B2_E_0);
@@ -3010,9 +2967,9 @@ static int skge_reset(struct skge_hw *hw)
                 /* switch power to VCC (WA for VAUX problem) */
                 skge_write8(hw, B0_POWER_CTRL,
                             PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_OFF | PC_VCC_ON);
-                for (i = 0; i < ports; i++) {
-                        skge_write16(hw, SKGEMAC_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
-                        skge_write16(hw, SKGEMAC_REG(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
+                for (i = 0; i < hw->ports; i++) {
+                        skge_write16(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
+                        skge_write16(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
                 }
         }
 
@@ -3022,8 +2979,8 @@ static int skge_reset(struct skge_hw *hw)
         skge_write8(hw, B0_LED, LED_STAT_ON);
 
         /* enable the Tx Arbiters */
-        for (i = 0; i < ports; i++)
-                skge_write8(hw, SKGEMAC_REG(i, TXA_CTRL), TXA_ENA_ARB);
+        for (i = 0; i < hw->ports; i++)
+                skge_write8(hw, SK_REG(i, TXA_CTRL), TXA_ENA_ARB);
 
         /* Initialize ram interface */
         skge_write16(hw, B3_RI_CTRL, RI_RST_CLR);
@@ -3050,16 +3007,14 @@ static int skge_reset(struct skge_hw *hw)
         skge_write32(hw, B2_IRQM_INI, skge_usecs2clk(hw, 100));
         skge_write32(hw, B2_IRQM_CTRL, TIM_START);
 
-        hw->intr_mask = IS_HW_ERR | IS_EXT_REG | IS_PORT_1;
-        if (isdualport(hw))
-                hw->intr_mask |= IS_PORT_2;
+        hw->intr_mask = IS_HW_ERR | IS_EXT_REG;
         skge_write32(hw, B0_IMSK, hw->intr_mask);
 
         if (hw->chip_id != CHIP_ID_GENESIS)
                 skge_write8(hw, GMAC_IRQ_MSK, 0);
 
         spin_lock_bh(&hw->phy_lock);
-        for (i = 0; i < ports; i++) {
+        for (i = 0; i < hw->ports; i++) {
                 if (hw->chip_id == CHIP_ID_GENESIS)
                         genesis_reset(hw, i);
                 else
@@ -3071,7 +3026,8 @@ static int skge_reset(struct skge_hw *hw)
 }
 
 /* Initialize network device */
-static struct net_device *skge_devinit(struct skge_hw *hw, int port)
+static struct net_device *skge_devinit(struct skge_hw *hw, int port,
+                                       int highmem)
 {
         struct skge_port *skge;
         struct net_device *dev = alloc_etherdev(sizeof(*skge));
@@ -3104,6 +3060,8 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port)
 #endif
         dev->irq = hw->pdev->irq;
         dev->features = NETIF_F_LLTX;
+        if (highmem)
+                dev->features |= NETIF_F_HIGHDMA;
 
         skge = netdev_priv(dev);
         skge->netdev = dev;
@@ -3117,7 +3075,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port)
         skge->flow_control = FLOW_MODE_SYMMETRIC;
         skge->duplex = -1;
         skge->speed = -1;
-        skge->advertising = skge_modes(hw);
+        skge->advertising = skge_supported_modes(hw);
 
         hw->dev[port] = dev;
 
@@ -3125,10 +3083,6 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port)
 
         spin_lock_init(&skge->tx_lock);
 
-        init_timer(&skge->link_check);
-        skge->link_check.function = skge_link_timer;
-        skge->link_check.data = (unsigned long) skge;
-
         init_timer(&skge->led_blink);
         skge->led_blink.function = skge_blink_timer;
         skge->led_blink.data = (unsigned long) skge;
@@ -3232,14 +3186,11 @@ static int __devinit skge_probe(struct pci_dev *pdev,
 
         printk(KERN_INFO PFX "addr 0x%lx irq %d chip %s rev %d\n",
                pci_resource_start(pdev, 0), pdev->irq,
-               skge_board_name(hw), chip_rev(hw));
+               skge_board_name(hw), hw->chip_rev);
 
-        if ((dev = skge_devinit(hw, 0)) == NULL)
+        if ((dev = skge_devinit(hw, 0, using_dac)) == NULL)
                 goto err_out_led_off;
 
-        if (using_dac)
-                dev->features |= NETIF_F_HIGHDMA;
-
         if ((err = register_netdev(dev))) {
                 printk(KERN_ERR PFX "%s: cannot register net device\n",
                        pci_name(pdev));
@@ -3248,10 +3199,7 @@ static int __devinit skge_probe(struct pci_dev *pdev,
 
         skge_show_addr(dev);
 
-        if (isdualport(hw) && (dev1 = skge_devinit(hw, 1))) {
-                if (using_dac)
-                        dev1->features |= NETIF_F_HIGHDMA;
-
+        if (hw->ports > 1 && (dev1 = skge_devinit(hw, 1, using_dac))) {
                 if (register_netdev(dev1) == 0)
                         skge_show_addr(dev1);
                 else {
@@ -3288,7 +3236,7 @@ static void __devexit skge_remove(struct pci_dev *pdev)
         struct skge_hw *hw  = pci_get_drvdata(pdev);
         struct net_device *dev0, *dev1;
 
-        if(!hw)
+        if (!hw)
                 return;
 
         if ((dev1 = hw->dev[1]))
@@ -3316,7 +3264,7 @@ static int skge_suspend(struct pci_dev *pdev, u32 state)
         struct skge_hw *hw  = pci_get_drvdata(pdev);
         int i, wol = 0;
 
-        for(i = 0; i < 2; i++) {
+        for (i = 0; i < 2; i++) {
                 struct net_device *dev = hw->dev[i];
 
                 if (dev) {
@@ -3349,11 +3297,11 @@ static int skge_resume(struct pci_dev *pdev)
 
         skge_reset(hw);
 
-        for(i = 0; i < 2; i++) {
+        for (i = 0; i < 2; i++) {
                 struct net_device *dev = hw->dev[i];
                 if (dev) {
                         netif_device_attach(dev);
-                        if(netif_running(dev))
+                        if (netif_running(dev))
                                 skge_up(dev);
                 }
         }
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 36c62b68fab4..14d0cc01fb9a 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -7,31 +7,6 @@
 /* PCI config registers */
 #define PCI_DEV_REG1    0x40
 #define PCI_DEV_REG2    0x44
-#ifndef PCI_VPD
-#define PCI_VPD         0x50
-#endif
-
-/*      PCI_OUR_REG_2           32 bit  Our Register 2 */
-enum {
-        PCI_VPD_WR_THR  = 0xff<<24, /* Bit 31..24:      VPD Write Threshold */
-        PCI_DEV_SEL     = 0x7f<<17, /* Bit 23..17:      EEPROM Device Select */
-        PCI_VPD_ROM_SZ  = 7   <<14, /* Bit 16..14:      VPD ROM Size    */
-                                    /* Bit 13..12:      reserved        */
-        PCI_EN_DUMMY_RD = 1<<3, /* Enable Dummy Read */
-        PCI_REV_DESC    = 1<<2, /* Reverse Desc. Bytes */
-        PCI_USEDATA64   = 1<<0, /* Use 64Bit Data bus ext */
-};
-
-/*      PCI_VPD_ADR_REG         16 bit  VPD Address Register */
-enum {
-        PCI_VPD_FLAG    = 1<<15,  /* starts VPD rd/wr cycle */
-        PCI_VPD_ADR_MSK =0x7fffL, /* Bit 14.. 0:        VPD Address Mask */
-        VPD_RES_ID      = 0x82,
-        VPD_RES_READ    = 0x90,
-        VPD_RES_WRITE   = 0x81,
-        VPD_RES_END     = 0x78,
-};
-
 
 #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
                                PCI_STATUS_SIG_SYSTEM_ERROR | \
@@ -39,7 +14,6 @@ enum {
                                PCI_STATUS_REC_TARGET_ABORT | \
                                PCI_STATUS_PARITY)
 
-
 enum csr_regs {
         B0_RAP  = 0x0000,
         B0_CTST = 0x0004,
@@ -229,8 +203,11 @@ enum {
         IS_XA2_F        = 1<<1,         /* Q_XA2 End of Frame */
         IS_XA2_C        = 1<<0,         /* Q_XA2 Encoding Error */
 
-        IS_PORT_1       = IS_XA1_F| IS_R1_F| IS_MAC1,
-        IS_PORT_2       = IS_XA2_F| IS_R2_F| IS_MAC2,
+        IS_TO_PORT1     = IS_PA_TO_RX1 | IS_PA_TO_TX1,
+        IS_TO_PORT2     = IS_PA_TO_RX2 | IS_PA_TO_TX2,
+
+        IS_PORT_1       = IS_XA1_F| IS_R1_F | IS_TO_PORT1 | IS_MAC1,
+        IS_PORT_2       = IS_XA2_F| IS_R2_F | IS_TO_PORT2 | IS_MAC2,
 };
 
 
@@ -288,14 +265,6 @@ enum {
         CHIP_REV_YU_LITE_A3  = 7,       /* Chip Rev. for YUKON-Lite A3 */
 };
 
-/*      B2_LD_TEST               8 bit  EPROM loader test register */
-enum {
-        LD_T_ON         = 1<<3, /* Loader Test mode on */
-        LD_T_OFF        = 1<<2, /* Loader Test mode off */
-        LD_T_STEP       = 1<<1, /* Decrement FPROM addr. Counter */
-        LD_START        = 1<<0, /* Start loading FPROM */
-};
-
 /*      B2_TI_CTRL               8 bit  Timer control */
 /*      B2_IRQM_CTRL     8 bit  IRQ Moderation Timer Control */
 enum {
@@ -313,16 +282,6 @@ enum {
         TIM_T_STEP      = 1<<0, /* Test step */
 };
 
-/*      B28_DPT_INI     32 bit  Descriptor Poll Timer Init Val */
-/*      B28_DPT_VAL     32 bit  Descriptor Poll Timer Curr Val */
-/*      B28_DPT_CTRL     8 bit  Descriptor Poll Timer Ctrl Reg */
-enum {
-        DPT_MSK = 0x00ffffffL,  /* Bit 23.. 0:  Desc Poll Timer Bits */
-
-        DPT_START       = 1<<1, /* Start Descriptor Poll Timer */
-        DPT_STOP        = 1<<0, /* Stop  Descriptor Poll Timer */
-};
-
 /*      B2_GP_IO                32 bit  General Purpose I/O Register */
 enum {
         GP_DIR_9 = 1<<25, /* IO_9 direct, 0=In/1=Out */
@@ -348,30 +307,6 @@ enum {
         GP_IO_0 = 1<<0, /* IO_0 pin */
 };
 
-/* Rx/Tx Path related Arbiter Test Registers */
-/*      B3_MA_TO_TEST   16 bit  MAC Arbiter Timeout Test Reg */
-/*      B3_MA_RC_TEST   16 bit  MAC Arbiter Recovery Test Reg */
-/*      B3_PA_TEST              16 bit  Packet Arbiter Test Register */
-/*                      Bit 15, 11, 7, and 3 are reserved in B3_PA_TEST */
-enum {
-        TX2_T_EV        = 1<<15,/* TX2 Timeout/Recv Event occured */
-        TX2_T_ON        = 1<<14,/* TX2 Timeout/Recv Timer Test On */
-        TX2_T_OFF       = 1<<13,/* TX2 Timeout/Recv Timer Tst Off */
-        TX2_T_STEP      = 1<<12,/* TX2 Timeout/Recv Timer Step */
-        TX1_T_EV        = 1<<11,/* TX1 Timeout/Recv Event occured */
-        TX1_T_ON        = 1<<10,/* TX1 Timeout/Recv Timer Test On */
-        TX1_T_OFF       = 1<<9, /* TX1 Timeout/Recv Timer Tst Off */
-        TX1_T_STEP      = 1<<8, /* TX1 Timeout/Recv Timer Step */
-        RX2_T_EV        = 1<<7, /* RX2 Timeout/Recv Event occured */
-        RX2_T_ON        = 1<<6, /* RX2 Timeout/Recv Timer Test On */
-        RX2_T_OFF       = 1<<5, /* RX2 Timeout/Recv Timer Tst Off */
-        RX2_T_STEP      = 1<<4, /* RX2 Timeout/Recv Timer Step */
-        RX1_T_EV        = 1<<3, /* RX1 Timeout/Recv Event occured */
-        RX1_T_ON        = 1<<2, /* RX1 Timeout/Recv Timer Test On */
-        RX1_T_OFF       = 1<<1, /* RX1 Timeout/Recv Timer Tst Off */
-        RX1_T_STEP      = 1<<0, /* RX1 Timeout/Recv Timer Step */
-};
-
 /* Descriptor Bit Definition */
 /*      TxCtrl          Transmit Buffer Control Field */
 /*      RxCtrl          Receive  Buffer Control Field */
@@ -428,14 +363,6 @@ enum {
         RI_RST_SET      = 1<<0, /* Set   RAM Interface Reset */
 };
 
-/*      B3_RI_TEST               8 bit  RAM Iface Test Register */
-enum {
-        RI_T_EV = 1<<3, /* Timeout Event occured */
-        RI_T_ON = 1<<2, /* Timeout Timer Test On */
-        RI_T_OFF        = 1<<1, /* Timeout Timer Test Off */
-        RI_T_STEP       = 1<<0, /* Timeout Timer Step */
-};
-
 /* MAC Arbiter Registers */
 /*      B3_MA_TO_CTRL   16 bit  MAC Arbiter Timeout Ctrl Reg */
 enum {
@@ -452,19 +379,6 @@ enum {
 #define SK_PKT_TO_MAX   0xffff          /* Maximum value */
 #define SK_RI_TO_53     36              /* RAM interface timeout */
 
-
-/*      B3_MA_RC_CTRL   16 bit  MAC Arbiter Recovery Ctrl Reg */
-enum {
-        MA_ENA_REC_TX2  = 1<<7, /* Enable  Recovery Timer TX2 */
-        MA_DIS_REC_TX2  = 1<<6, /* Disable Recovery Timer TX2 */
-        MA_ENA_REC_TX1  = 1<<5, /* Enable  Recovery Timer TX1 */
-        MA_DIS_REC_TX1  = 1<<4, /* Disable Recovery Timer TX1 */
-        MA_ENA_REC_RX2  = 1<<3, /* Enable  Recovery Timer RX2 */
-        MA_DIS_REC_RX2  = 1<<2, /* Disable Recovery Timer RX2 */
-        MA_ENA_REC_RX1  = 1<<1, /* Enable  Recovery Timer RX1 */
-        MA_DIS_REC_RX1  = 1<<0, /* Disable Recovery Timer RX1 */
-};
-
 /* Packet Arbiter Registers */
 /*      B3_PA_CTRL              16 bit  Packet Arbiter Ctrl Register */
 enum {
@@ -488,7 +402,7 @@ enum {
                                                 PA_ENA_TO_TX1 | PA_ENA_TO_TX2)
 
 
-/* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
+/* Transmit Arbiter Registers MAC 1 and 2, use SK_REG() to access */
 /*      TXA_ITI_INI             32 bit  Tx Arb Interval Timer Init Val */
 /*      TXA_ITI_VAL             32 bit  Tx Arb Interval Timer Value */
 /*      TXA_LIM_INI             32 bit  Tx Arb Limit Counter Init Val */
@@ -511,7 +425,7 @@ enum {
 /*
  *      Bank 4 - 5
  */
-/* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
+/* Transmit Arbiter Registers MAC 1 and 2, use SK_REG() to access */
 enum {
         TXA_ITI_INI     = 0x0200,/* 32 bit      Tx Arb Interval Timer Init Val*/
         TXA_ITI_VAL     = 0x0204,/* 32 bit      Tx Arb Interval Timer Value */
@@ -537,7 +451,7 @@ enum {
 
 /* Queue Register Offsets, use Q_ADDR() to access */
 enum {
-        B8_Q_REGS = 0x0400, /* base of Queue registers */       
+        B8_Q_REGS = 0x0400, /* base of Queue registers */
         Q_D     = 0x00, /* 8*32 bit     Current Descriptor */
         Q_DA_L  = 0x20, /* 32 bit       Current Descriptor Address Low dWord */
         Q_DA_H  = 0x24, /* 32 bit       Current Descriptor Address High dWord */
@@ -618,8 +532,7 @@ enum {
 enum {
         PHY_ADDR_XMAC   = 0<<8,
         PHY_ADDR_BCOM   = 1<<8,
-        PHY_ADDR_LONE   = 3<<8,
-        PHY_ADDR_NAT    = 0<<8,
+
 /* GPHY address (bits 15..11 of SMI control reg) */
         PHY_ADDR_MARV   = 0,
 };
@@ -986,7 +899,7 @@ enum {
         LINKLED_BLINK_OFF    = 0x10,
         LINKLED_BLINK_ON     = 0x20,
 };
-        
+
 /* GMAC and GPHY Control Registers (YUKON only) */
 enum {
         GMAC_CTRL       = 0x0f00,/* 32 bit      GMAC Control Reg */
@@ -1151,54 +1064,6 @@ enum {
         PHY_MARV_FE_SPEC_2      = 0x1c,/* 16 bit r/w    Specific Control Reg. 2 */
 };
 
-/* Level One-PHY Registers, indirect addressed over XMAC */
-enum {
-        PHY_LONE_CTRL           = 0x00,/* 16 bit r/w    PHY Control Register */
-        PHY_LONE_STAT           = 0x01,/* 16 bit r/o    PHY Status Register */
-        PHY_LONE_ID0            = 0x02,/* 16 bit r/o    PHY ID0 Register */
-        PHY_LONE_ID1            = 0x03,/* 16 bit r/o    PHY ID1 Register */
-        PHY_LONE_AUNE_ADV       = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
-        PHY_LONE_AUNE_LP        = 0x05,/* 16 bit r/o    Link Part Ability Reg */
-        PHY_LONE_AUNE_EXP       = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
-        PHY_LONE_NEPG           = 0x07,/* 16 bit r/w    Next Page Register */
-        PHY_LONE_NEPG_LP        = 0x08,/* 16 bit r/o    Next Page Link Partner */
-        /* Level One-specific registers */
-        PHY_LONE_1000T_CTRL     = 0x09,/* 16 bit r/w    1000Base-T Control Reg */
-        PHY_LONE_1000T_STAT     = 0x0a,/* 16 bit r/o    1000Base-T Status Reg */
-        PHY_LONE_EXT_STAT       = 0x0f,/* 16 bit r/o    Extended Status Reg */
-        PHY_LONE_PORT_CFG       = 0x10,/* 16 bit r/w    Port Configuration Reg*/
-        PHY_LONE_Q_STAT         = 0x11,/* 16 bit r/o    Quick Status Reg */
-        PHY_LONE_INT_ENAB       = 0x12,/* 16 bit r/w    Interrupt Enable Reg */
-        PHY_LONE_INT_STAT       = 0x13,/* 16 bit r/o    Interrupt Status Reg */
-        PHY_LONE_LED_CFG        = 0x14,/* 16 bit r/w    LED Configuration Reg */
-        PHY_LONE_PORT_CTRL      = 0x15,/* 16 bit r/w    Port Control Reg */
-        PHY_LONE_CIM            = 0x16,/* 16 bit r/o    CIM Reg */
-};
-
-/* National-PHY Registers, indirect addressed over XMAC */
-enum {
-        PHY_NAT_CTRL            = 0x00,/* 16 bit r/w    PHY Control Register */
-        PHY_NAT_STAT            = 0x01,/* 16 bit r/w    PHY Status Register */
-        PHY_NAT_ID0             = 0x02,/* 16 bit r/o    PHY ID0 Register */
-        PHY_NAT_ID1             = 0x03,/* 16 bit r/o    PHY ID1 Register */
-        PHY_NAT_AUNE_ADV        = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
-        PHY_NAT_AUNE_LP         = 0x05,/* 16 bit r/o    Link Partner Ability Reg */
-        PHY_NAT_AUNE_EXP        = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
-        PHY_NAT_NEPG            = 0x07,/* 16 bit r/w    Next Page Register */
-        PHY_NAT_NEPG_LP         = 0x08,/* 16 bit r/o    Next Page Link Partner Reg */
-        /* National-specific registers */
-        PHY_NAT_1000T_CTRL      = 0x09,/* 16 bit r/w    1000Base-T Control Reg */
-        PHY_NAT_1000T_STAT      = 0x0a,/* 16 bit r/o    1000Base-T Status Reg */
-        PHY_NAT_EXT_STAT        = 0x0f,/* 16 bit r/o    Extended Status Register */
-        PHY_NAT_EXT_CTRL1       = 0x10,/* 16 bit r/o    Extended Control Reg1 */
-        PHY_NAT_Q_STAT1         = 0x11,/* 16 bit r/o    Quick Status Reg1 */
-        PHY_NAT_10B_OP          = 0x12,/* 16 bit r/o    10Base-T Operations Reg */
-        PHY_NAT_EXT_CTRL2       = 0x13,/* 16 bit r/o    Extended Control Reg1 */
-        PHY_NAT_Q_STAT2         = 0x14,/* 16 bit r/o    Quick Status Reg2 */
-
-        PHY_NAT_PHY_ADDR        = 0x19,/* 16 bit r/o    PHY Address Register */
-};
-
 enum {
         PHY_CT_RESET    = 1<<15, /* Bit 15: (sc)        clear all PHY related regs */
         PHY_CT_LOOP     = 1<<14, /* Bit 14:     enable Loopback over PHY */
@@ -1253,8 +1118,29 @@ enum {
         PHY_MARV_ID1_Y2 = 0x0C91, /* Yukon-2 (PHY 88E1112) */
 };
 
+/* Advertisement register bits */
 enum {
         PHY_AN_NXT_PG   = 1<<15, /* Bit 15:     Request Next Page */
+        PHY_AN_ACK      = 1<<14, /* Bit 14:     (ro) Acknowledge Received */
+        PHY_AN_RF       = 1<<13, /* Bit 13:     Remote Fault Bits */
+
+        PHY_AN_PAUSE_ASYM = 1<<11,/* Bit 11:    Try for asymmetric */
+        PHY_AN_PAUSE_CAP = 1<<10, /* Bit 10:    Try for pause */
+        PHY_AN_100BASE4 = 1<<9, /* Bit 9:       Try for 100mbps 4k packets */
+        PHY_AN_100FULL  = 1<<8, /* Bit 8:       Try for 100mbps full-duplex */
+        PHY_AN_100HALF  = 1<<7, /* Bit 7:       Try for 100mbps half-duplex */
+        PHY_AN_10FULL   = 1<<6, /* Bit 6:       Try for 10mbps full-duplex */
+        PHY_AN_10HALF   = 1<<5, /* Bit 5:       Try for 10mbps half-duplex */
+        PHY_AN_CSMA     = 1<<0, /* Bit 0:       Only selector supported */
+        PHY_AN_SEL      = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+        PHY_AN_FULL     = PHY_AN_100FULL | PHY_AN_10FULL | PHY_AN_CSMA,
+        PHY_AN_ALL      = PHY_AN_10HALF | PHY_AN_10FULL |
+                          PHY_AN_100HALF | PHY_AN_100FULL,
+};
+
+/* Xmac Specific */
+enum {
+        PHY_X_AN_NXT_PG = 1<<15, /* Bit 15:     Request Next Page */
         PHY_X_AN_ACK    = 1<<14, /* Bit 14:     (ro) Acknowledge Received */
         PHY_X_AN_RFB    = 3<<12,/* Bit 13..12:  Remote Fault Bits */
 
@@ -1263,82 +1149,6 @@ enum {
         PHY_X_AN_FD     = 1<<5, /* Bit  5:      Full Duplex */
 };
 
-enum {
-        PHY_B_AN_RF     = 1<<13, /* Bit 13:     Remote Fault */
-
-        PHY_B_AN_ASP    = 1<<11, /* Bit 11:     Asymmetric Pause */
-        PHY_B_AN_PC     = 1<<10, /* Bit 10:     Pause Capable */
-        PHY_B_AN_SEL    = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
-};
-
-enum {
-        PHY_L_AN_RF     = 1<<13, /* Bit 13:     Remote Fault */
-                                                                /* Bit 12:      reserved */
-        PHY_L_AN_ASP    = 1<<11, /* Bit 11:     Asymmetric Pause */
-        PHY_L_AN_PC     = 1<<10, /* Bit 10:     Pause Capable */
-
-        PHY_L_AN_SEL    = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
-};
-
-/*  PHY_NAT_AUNE_ADV    16 bit r/w      Auto-Negotiation Advertisement */
-/*  PHY_NAT_AUNE_LP     16 bit r/o      Link Partner Ability Reg *****/
-/*  PHY_AN_NXT_PG       (see XMAC) Bit 15:      Request Next Page */
-enum {
-        PHY_N_AN_RF     = 1<<13, /* Bit 13:     Remote Fault */
-
-        PHY_N_AN_100F   = 1<<11, /* Bit 11:     100Base-T2 FD Support */
-        PHY_N_AN_100H   = 1<<10, /* Bit 10:     100Base-T2 HD Support */
-
-        PHY_N_AN_SEL    = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
-};
-
-/* field type definition for PHY_x_AN_SEL */
-enum {
-        PHY_SEL_TYPE     = 1,   /* 00001 = Ethernet */
-};
-
-enum {
-        PHY_ANE_LP_NP   = 1<<3, /* Bit  3:      Link Partner can Next Page */
-        PHY_ANE_LOC_NP  = 1<<2, /* Bit  2:      Local PHY can Next Page */
-        PHY_ANE_RX_PG   = 1<<1, /* Bit  1:      Page Received */
-};
-
-enum {
-        PHY_ANE_PAR_DF  = 1<<4, /* Bit  4:      Parallel Detection Fault */
-
-        PHY_ANE_LP_CAP  = 1<<0, /* Bit  0:      Link Partner Auto-Neg. Cap. */  
-};
-
-enum {
-        PHY_NP_MORE     = 1<<15, /* Bit 15:     More, Next Pages to follow */
-        PHY_NP_ACK1     = 1<<14, /* Bit 14: (ro)        Ack1, for receiving a message */
-        PHY_NP_MSG_VAL  = 1<<13, /* Bit 13:     Message Page valid */
-        PHY_NP_ACK2     = 1<<12, /* Bit 12:     Ack2, comply with msg content */
-        PHY_NP_TOG      = 1<<11, /* Bit 11:     Toggle Bit, ensure sync */
-        PHY_NP_MSG      = 0x07ff, /* Bit 10..0: Message from/to Link Partner */
-};
-
-enum {
-        PHY_X_EX_FD     = 1<<15, /* Bit 15:     Device Supports Full Duplex */
-        PHY_X_EX_HD     = 1<<14, /* Bit 14:     Device Supports Half Duplex */
-};
-
-enum {
-        PHY_X_RS_PAUSE  = 3<<7,/* Bit  8..7:    selected Pause Mode */
-        PHY_X_RS_HD     = 1<<6, /* Bit  6:      Half Duplex Mode selected */
-        PHY_X_RS_FD     = 1<<5, /* Bit  5:      Full Duplex Mode selected */
-        PHY_X_RS_ABLMIS = 1<<4, /* Bit  4:      duplex or pause cap mismatch */
-        PHY_X_RS_PAUMIS = 1<<3, /* Bit  3:      pause capability mismatch */
-};
-
-/** Remote Fault Bits (PHY_X_AN_RFB) encoding  */
-enum {
-        X_RFB_OK        = 0<<12,/* Bit 13..12   No errors, Link OK */
-        X_RFB_LF        = 1<<12, /* Bit 13..12  Link Failure */
-        X_RFB_OFF       = 2<<12,/* Bit 13..12   Offline */
-        X_RFB_AN_ERR    = 3<<12,/* Bit 13..12   Auto-Negotiation Error */
-};
-
 /* Pause Bits (PHY_X_AN_PAUSE and PHY_X_RS_PAUSE) encoding */
 enum {
         PHY_X_P_NO_PAUSE        = 0<<7,/* Bit  8..7:    no Pause Mode */
@@ -1418,6 +1228,16 @@ enum {
         PHY_B_PES_MLT3_ER       = 1<<0, /* Bit  0:      MLT3 code Error */
 };
 
+/*  PHY_BCOM_AUNE_ADV   16 bit r/w      Auto-Negotiation Advertisement *****/
+/*  PHY_BCOM_AUNE_LP    16 bit r/o      Link Partner Ability Reg *****/
+enum {
+        PHY_B_AN_RF     = 1<<13, /* Bit 13:     Remote Fault */
+
+        PHY_B_AN_ASP    = 1<<11, /* Bit 11:     Asymmetric Pause */
+        PHY_B_AN_PC     = 1<<10, /* Bit 10:     Pause Capable */
+};
+
+
 /*****  PHY_BCOM_FC_CTR         16 bit r/w      False Carrier Counter *****/
 enum {
         PHY_B_FC_CTR    = 0xff, /* Bit  7..0:   False Carrier Counter */
@@ -1478,7 +1298,9 @@ enum {
         PHY_B_IS_LST_CHANGE     = 1<<1, /* Bit  1:      Link Status Changed */
         PHY_B_IS_CRC_ER = 1<<0, /* Bit  0:      CRC Error */
 };
-#define PHY_B_DEF_MSK   (~(PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE))
+#define PHY_B_DEF_MSK   \
+        (~(PHY_B_IS_PSE | PHY_B_IS_AN_PR | PHY_B_IS_DUP_CHANGE | \
+            PHY_B_IS_LSP_CHANGE | PHY_B_IS_LST_CHANGE))
 
 /* Pause Bits (PHY_B_AN_ASP and PHY_B_AN_PC) encoding */
 enum {
@@ -1495,166 +1317,6 @@ enum {
         PHY_B_RES_1000HD        = 6<<8,/* Bit 10..8:    1000Base-T Half Dup. */
 };
 
-/*
- * Level One-Specific
- */
-/*****  PHY_LONE_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
-enum {
-        PHY_L_1000C_TEST        = 7<<13,/* Bit 15..13:  Test Modes */
-        PHY_L_1000C_MSE = 1<<12, /* Bit 12:     Master/Slave Enable */
-        PHY_L_1000C_MSC = 1<<11, /* Bit 11:     M/S Configuration */
-        PHY_L_1000C_RD  = 1<<10, /* Bit 10:     Repeater/DTE */
-        PHY_L_1000C_AFD = 1<<9, /* Bit  9:      Advertise Full Duplex */
-        PHY_L_1000C_AHD = 1<<8, /* Bit  8:      Advertise Half Duplex */
-};
-
-/*****  PHY_LONE_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
-enum {
-        PHY_L_1000S_MSF = 1<<15, /* Bit 15:     Master/Slave Fault */
-        PHY_L_1000S_MSR = 1<<14, /* Bit 14:     Master/Slave Result */
-        PHY_L_1000S_LRS = 1<<13, /* Bit 13:     Local Receiver Status */
-        PHY_L_1000S_RRS = 1<<12, /* Bit 12:     Remote Receiver Status */
-        PHY_L_1000S_LP_FD = 1<<11, /* Bit 11:   Link Partner can FD */
-        PHY_L_1000S_LP_HD = 1<<10, /* Bit 10:   Link Partner can HD */
-
-        PHY_L_1000S_IEC  = 0xff, /* Bit  7..0:  Idle Error Count */
-
-/*****  PHY_LONE_EXT_STAT       16 bit r/o      Extended Status Register *****/
-        PHY_L_ES_X_FD_CAP = 1<<15, /* Bit 15:   1000Base-X FD capable */
-        PHY_L_ES_X_HD_CAP = 1<<14, /* Bit 14:   1000Base-X HD capable */
-        PHY_L_ES_T_FD_CAP = 1<<13, /* Bit 13:   1000Base-T FD capable */
-        PHY_L_ES_T_HD_CAP = 1<<12, /* Bit 12:   1000Base-T HD capable */
-};
-
-/*****  PHY_LONE_PORT_CFG       16 bit r/w      Port Configuration Reg *****/
-enum {
-        PHY_L_PC_REP_MODE       = 1<<15, /* Bit 15:     Repeater Mode */
-
-        PHY_L_PC_TX_DIS = 1<<13, /* Bit 13:     Tx output Disabled */
-        PHY_L_PC_BY_SCR = 1<<12, /* Bit 12:     Bypass Scrambler */
-        PHY_L_PC_BY_45  = 1<<11, /* Bit 11:     Bypass 4B5B-Decoder */
-        PHY_L_PC_JAB_DIS        = 1<<10, /* Bit 10:     Jabber Disabled */
-        PHY_L_PC_SQE    = 1<<9, /* Bit  9:      Enable Heartbeat */
-        PHY_L_PC_TP_LOOP        = 1<<8, /* Bit  8:      TP Loopback */
-        PHY_L_PC_SSS    = 1<<7, /* Bit  7:      Smart Speed Selection */
-        PHY_L_PC_FIFO_SIZE      = 1<<6, /* Bit  6:      FIFO Size */
-        PHY_L_PC_PRE_EN = 1<<5, /* Bit  5:      Preamble Enable */
-        PHY_L_PC_CIM    = 1<<4, /* Bit  4:      Carrier Integrity Mon */
-        PHY_L_PC_10_SER = 1<<3, /* Bit  3:      Use Serial Output */
-        PHY_L_PC_ANISOL = 1<<2, /* Bit  2:      Unisolate Port */
-        PHY_L_PC_TEN_BIT        = 1<<1, /* Bit  1:      10bit iface mode on */
-        PHY_L_PC_ALTCLOCK       = 1<<0, /* Bit  0: (ro) ALTCLOCK Mode on */
-};
-
-/*****  PHY_LONE_Q_STAT         16 bit r/o      Quick Status Reg *****/
-enum {
-        PHY_L_QS_D_RATE = 3<<14,/* Bit 15..14:  Data Rate */
-        PHY_L_QS_TX_STAT        = 1<<13, /* Bit 13:     Transmitting */
-        PHY_L_QS_RX_STAT        = 1<<12, /* Bit 12:     Receiving */
-        PHY_L_QS_COL_STAT       = 1<<11, /* Bit 11:     Collision */
-        PHY_L_QS_L_STAT = 1<<10, /* Bit 10:     Link is up */
-        PHY_L_QS_DUP_MOD        = 1<<9, /* Bit  9:      Full/Half Duplex */
-        PHY_L_QS_AN     = 1<<8, /* Bit  8:      AutoNeg is On */
-        PHY_L_QS_AN_C   = 1<<7, /* Bit  7:      AN is Complete */
-        PHY_L_QS_LLE    = 7<<4,/* Bit  6..4:    Line Length Estim. */
-        PHY_L_QS_PAUSE  = 1<<3, /* Bit  3:      LP advertised Pause */
-        PHY_L_QS_AS_PAUSE       = 1<<2, /* Bit  2:      LP adv. asym. Pause */
-        PHY_L_QS_ISOLATE        = 1<<1, /* Bit  1:      CIM Isolated */
-        PHY_L_QS_EVENT  = 1<<0, /* Bit  0:      Event has occurred */
-};
-
-/*****  PHY_LONE_INT_ENAB       16 bit r/w      Interrupt Enable Reg *****/
-/*****  PHY_LONE_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
-enum {
-        PHY_L_IS_AN_F   = 1<<13, /* Bit 13:     Auto-Negotiation fault */
-        PHY_L_IS_CROSS  = 1<<11, /* Bit 11:     Crossover used */
-        PHY_L_IS_POL    = 1<<10, /* Bit 10:     Polarity correct. used */
-        PHY_L_IS_SS     = 1<<9, /* Bit  9:      Smart Speed Downgrade */
-        PHY_L_IS_CFULL  = 1<<8, /* Bit  8:      Counter Full */
-        PHY_L_IS_AN_C   = 1<<7, /* Bit  7:      AutoNeg Complete */
-        PHY_L_IS_SPEED  = 1<<6, /* Bit  6:      Speed Changed */
-        PHY_L_IS_DUP    = 1<<5, /* Bit  5:      Duplex Changed */
-        PHY_L_IS_LS     = 1<<4, /* Bit  4:      Link Status Changed */
-        PHY_L_IS_ISOL   = 1<<3, /* Bit  3:      Isolate Occured */
-        PHY_L_IS_MDINT  = 1<<2, /* Bit  2: (ro) STAT: MII Int Pending */
-        PHY_L_IS_INTEN  = 1<<1, /* Bit  1:      ENAB: Enable IRQs */
-        PHY_L_IS_FORCE  = 1<<0, /* Bit  0:      ENAB: Force Interrupt */
-};
-
-/* int. mask */
-#define PHY_L_DEF_MSK   (PHY_L_IS_LS | PHY_L_IS_ISOL | PHY_L_IS_INTEN)
-
-/*****  PHY_LONE_LED_CFG        16 bit r/w      LED Configuration Reg *****/
-enum {
-        PHY_L_LC_LEDC   = 3<<14,/* Bit 15..14:  Col/Blink/On/Off */
-        PHY_L_LC_LEDR   = 3<<12,/* Bit 13..12:  Rx/Blink/On/Off */
-        PHY_L_LC_LEDT   = 3<<10,/* Bit 11..10:  Tx/Blink/On/Off */
-        PHY_L_LC_LEDG   = 3<<8,/* Bit  9..8:    Giga/Blink/On/Off */
-        PHY_L_LC_LEDS   = 3<<6,/* Bit  7..6:    10-100/Blink/On/Off */
-        PHY_L_LC_LEDL   = 3<<4,/* Bit  5..4:    Link/Blink/On/Off */
-        PHY_L_LC_LEDF   = 3<<2,/* Bit  3..2:    Duplex/Blink/On/Off */
-        PHY_L_LC_PSTRECH= 1<<1, /* Bit  1:      Strech LED Pulses */
-        PHY_L_LC_FREQ   = 1<<0, /* Bit  0:      30/100 ms */
-};
-
-/*****  PHY_LONE_PORT_CTRL      16 bit r/w      Port Control Reg *****/
-enum {
-        PHY_L_PC_TX_TCLK = 1<<15, /* Bit 15:    Enable TX_TCLK */
-        PHY_L_PC_ALT_NP  = 1<<13, /* Bit 14:    Alternate Next Page */
-        PHY_L_PC_GMII_ALT= 1<<12, /* Bit 13:    Alternate GMII driver */
-        PHY_L_PC_TEN_CRS = 1<<10, /* Bit 10:    Extend CRS*/
-};
-
-/*****  PHY_LONE_CIM            16 bit r/o      CIM Reg *****/
-enum {
-        PHY_L_CIM_ISOL      = 0xff<<8,/* Bit 15..8:     Isolate Count */
-        PHY_L_CIM_FALSE_CAR = 0xff,   /* Bit  7..0:     False Carrier Count */
-};
-
-/*
- * Pause Bits (PHY_L_AN_ASP and PHY_L_AN_PC) encoding
- */
-enum {
-        PHY_L_P_NO_PAUSE= 0<<10,/* Bit 11..10:  no Pause Mode */
-        PHY_L_P_SYM_MD  = 1<<10, /* Bit 11..10: symmetric Pause Mode */
-        PHY_L_P_ASYM_MD = 2<<10,/* Bit 11..10:  asymmetric Pause Mode */
-        PHY_L_P_BOTH_MD = 3<<10,/* Bit 11..10:  both Pause Mode */
-};
-
-/*
- * National-Specific
- */
-/*****  PHY_NAT_1000T_CTRL      16 bit r/w      1000Base-T Control Reg *****/
-enum {
-        PHY_N_1000C_TEST= 7<<13,/* Bit 15..13:  Test Modes */
-        PHY_N_1000C_MSE = 1<<12, /* Bit 12:     Master/Slave Enable */
-        PHY_N_1000C_MSC = 1<<11, /* Bit 11:     M/S Configuration */
-        PHY_N_1000C_RD  = 1<<10, /* Bit 10:     Repeater/DTE */
-        PHY_N_1000C_AFD = 1<<9, /* Bit  9:      Advertise Full Duplex */
-        PHY_N_1000C_AHD = 1<<8, /* Bit  8:      Advertise Half Duplex */
-        PHY_N_1000C_APC = 1<<7, /* Bit  7:      Asymmetric Pause Cap. */};
-
-
-/*****  PHY_NAT_1000T_STAT      16 bit r/o      1000Base-T Status Reg *****/
-enum {
-        PHY_N_1000S_MSF = 1<<15, /* Bit 15:     Master/Slave Fault */
-        PHY_N_1000S_MSR = 1<<14, /* Bit 14:     Master/Slave Result */
-        PHY_N_1000S_LRS = 1<<13, /* Bit 13:     Local Receiver Status */
-        PHY_N_1000S_RRS = 1<<12, /* Bit 12:     Remote Receiver Status*/
-        PHY_N_1000S_LP_FD= 1<<11, /* Bit 11:    Link Partner can FD */
-        PHY_N_1000S_LP_HD= 1<<10, /* Bit 10:    Link Partner can HD */
-        PHY_N_1000C_LP_APC= 1<<9, /* Bit  9:    LP Asym. Pause Cap. */
-        PHY_N_1000S_IEC = 0xff, /* Bit  7..0:   Idle Error Count */
-};
-
-/*****  PHY_NAT_EXT_STAT        16 bit r/o      Extended Status Register *****/
-enum {
-        PHY_N_ES_X_FD_CAP= 1<<15, /* Bit 15:    1000Base-X FD capable */
-        PHY_N_ES_X_HD_CAP= 1<<14, /* Bit 14:    1000Base-X HD capable */
-        PHY_N_ES_T_FD_CAP= 1<<13, /* Bit 13:    1000Base-T FD capable */
-        PHY_N_ES_T_HD_CAP= 1<<12, /* Bit 12:    1000Base-T HD capable */
-};
-
 /** Marvell-Specific */
 enum {
         PHY_M_AN_NXT_PG = 1<<15, /* Request Next Page */
@@ -1718,7 +1380,7 @@ enum {
         PHY_M_PC_EN_DET_PLUS    = 3<<8, /* Energy Detect Plus (Mode 2) */
 };
 
-#define PHY_M_PC_MDI_XMODE(x)   (((x)<<5) & PHY_M_PC_MDIX_MSK)  
+#define PHY_M_PC_MDI_XMODE(x)   (((x)<<5) & PHY_M_PC_MDIX_MSK)
 
 enum {
         PHY_M_PC_MAN_MDI        = 0, /* 00 = Manual MDI configuration */
@@ -2105,7 +1767,7 @@ enum {
         GM_GPSR_FC_RX_DIS       = 1<<2, /* Bit  2:      Rx Flow-Control Mode Disabled */
         GM_GPSR_PROM_EN         = 1<<1, /* Bit  1:      Promiscuous Mode Enabled */
 };
-        
+
 /*      GM_GP_CTRL      16 bit r/w      General Purpose Control Register */
 enum {
         GM_GPCR_PROM_ENA        = 1<<14,        /* Bit 14:      Enable Promiscuous Mode */
@@ -2127,7 +1789,7 @@ enum {
 
 #define GM_GPCR_SPEED_1000      (GM_GPCR_GIGS_ENA | GM_GPCR_SPEED_100)
 #define GM_GPCR_AU_ALL_DIS      (GM_GPCR_AU_DUP_DIS | GM_GPCR_AU_FCT_DIS|GM_GPCR_AU_SPD_DIS)
-        
+
 /*      GM_TX_CTRL                      16 bit r/w      Transmit Control Register */
 enum {
         GM_TXCR_FORCE_JAM       = 1<<15, /* Bit 15:     Force Jam / Flow-Control */
@@ -2138,7 +1800,7 @@ enum {
 
 #define TX_COL_THR(x)           (((x)<<10) & GM_TXCR_COL_THR_MSK)
 #define TX_COL_DEF              0x04
-        
+
 /*      GM_RX_CTRL                      16 bit r/w      Receive Control Register */
 enum {
         GM_RXCR_UCF_ENA = 1<<15, /* Bit 15:     Enable Unicast filtering */
@@ -2146,7 +1808,7 @@ enum {
         GM_RXCR_CRC_DIS = 1<<13, /* Bit 13:     Remove 4-byte CRC */
         GM_RXCR_PASS_FC = 1<<12, /* Bit 12:     Pass FC packets to FIFO */
 };
-        
+
 /*      GM_TX_PARAM             16 bit r/w      Transmit Parameter Register */
 enum {
         GM_TXPA_JAMLEN_MSK      = 0x03<<14,     /* Bit 15..14:  Jam Length */
@@ -2171,7 +1833,7 @@ enum {
         GM_SMOD_JUMBO_ENA       = 1<<8, /* Bit  8:      Enable Jumbo (Max. Frame Len) */
          GM_SMOD_IPG_MSK        = 0x1f  /* Bit 4..0:    Inter-Packet Gap (IPG) */
 };
-        
+
 #define DATA_BLIND_VAL(x)       (((x)<<11) & GM_SMOD_DATABL_MSK)
 #define DATA_BLIND_DEF          0x04
 
@@ -2186,7 +1848,7 @@ enum {
         GM_SMI_CT_RD_VAL        = 1<<4, /* Bit  4:      Read Valid (Read completed) */
         GM_SMI_CT_BUSY          = 1<<3, /* Bit  3:      Busy (Operation in progress) */
 };
-        
+
 #define GM_SMI_CT_PHY_AD(x)     (((x)<<11) & GM_SMI_CT_PHY_A_MSK)
 #define GM_SMI_CT_REG_AD(x)     (((x)<<6) & GM_SMI_CT_REG_A_MSK)
 
@@ -2195,7 +1857,7 @@ enum {
         GM_PAR_MIB_CLR  = 1<<5, /* Bit  5:      Set MIB Clear Counter Mode */
         GM_PAR_MIB_TST  = 1<<4, /* Bit  4:      MIB Load Counter (Test Mode) */
 };
-        
+
 /* Receive Frame Status Encoding */
 enum {
         GMR_FS_LEN      = 0xffff<<16, /* Bit 31..16:    Rx Frame Length */
@@ -2217,12 +1879,12 @@ enum {
 /*
  * GMR_FS_ANY_ERR (analogous to XMR_FS_ANY_ERR)
  */
-        GMR_FS_ANY_ERR  = GMR_FS_CRC_ERR | GMR_FS_LONG_ERR | 
-                          GMR_FS_MII_ERR | GMR_FS_BAD_FC | GMR_FS_GOOD_FC | 
+        GMR_FS_ANY_ERR  = GMR_FS_CRC_ERR | GMR_FS_LONG_ERR |
+                          GMR_FS_MII_ERR | GMR_FS_BAD_FC | GMR_FS_GOOD_FC |
                           GMR_FS_JABBER,
 /* Rx GMAC FIFO Flush Mask (default) */
         RX_FF_FL_DEF_MSK = GMR_FS_CRC_ERR | GMR_FS_RX_FF_OV |GMR_FS_MII_ERR |
-                           GMR_FS_BAD_FC | GMR_FS_GOOD_FC | GMR_FS_UN_SIZE | 
+                           GMR_FS_BAD_FC | GMR_FS_GOOD_FC | GMR_FS_UN_SIZE |
                            GMR_FS_JABBER,
 };
 
@@ -2540,10 +2202,6 @@ enum {
 };
 
 
-/*      XM_PHY_ADDR     16 bit r/w      PHY Address Register */
-#define XM_PHY_ADDR_SZ  0x1f    /* Bit  4..0:   PHY Address bits */
-
-
 /*      XM_GP_PORT      32 bit r/w      General Purpose Port Register */
 enum {
         XM_GP_ANIP      = 1<<6, /* Bit  6: (ro) Auto-Neg. in progress */
@@ -2662,8 +2320,8 @@ enum {
 };
 
 #define XM_PAUSE_MODE   (XM_MD_SPOE_E | XM_MD_SPOL_I | XM_MD_SPOH_I)
-#define XM_DEF_MODE             (XM_MD_RX_RUNT | XM_MD_RX_IRLE | XM_MD_RX_LONG |\
-                                XM_MD_RX_CRCE | XM_MD_RX_ERR | XM_MD_CSA | XM_MD_CAA)
+#define XM_DEF_MODE     (XM_MD_RX_RUNT | XM_MD_RX_IRLE | XM_MD_RX_LONG |\
+                         XM_MD_RX_CRCE | XM_MD_RX_ERR | XM_MD_CSA)
 
 /*      XM_STAT_CMD     16 bit r/w      Statistics Command Register */
 enum {
@@ -2793,28 +2451,20 @@ struct skge_hw {
         u32                  intr_mask;
         struct net_device    *dev[2];
 
-        u8                   mac_cfg;
         u8                   chip_id;
+        u8                   chip_rev;
         u8                   phy_type;
         u8                   pmd_type;
         u16                  phy_addr;
+        u8                   ports;
 
         u32                  ram_size;
         u32                  ram_offset;
-        
+
         struct tasklet_struct ext_tasklet;
         spinlock_t           phy_lock;
 };
 
-static inline int isdualport(const struct skge_hw *hw)
-{
-        return !(hw->mac_cfg & CFG_SNG_MAC);
-}
-
-static inline u8 chip_rev(const struct skge_hw *hw)
-{
-        return (hw->mac_cfg & CFG_CHIP_R_MSK) >> 4;
-}
 
 static inline int iscopper(const struct skge_hw *hw)
 {
@@ -2827,7 +2477,7 @@ enum {
         FLOW_MODE_REM_SEND      = 2, /* Symmetric or just remote */
         FLOW_MODE_SYMMETRIC     = 3, /* Both stations may send PAUSE */
 };
-        
+
 struct skge_port {
         u32                  msg_enable;
         struct skge_hw       *hw;
@@ -2853,8 +2503,8 @@ struct skge_port {
         void                 *mem;      /* PCI memory for rings */
         dma_addr_t           dma;
         unsigned long        mem_size;
+        unsigned int         rx_buf_size;
 
-        struct timer_list    link_check;
         struct timer_list    led_blink;
 };
 
@@ -2863,7 +2513,6 @@ struct skge_port {
 static inline u32 skge_read32(const struct skge_hw *hw, int reg)
 {
         return readl(hw->regs + reg);
-
 }
 
 static inline u16 skge_read16(const struct skge_hw *hw, int reg)
@@ -2892,114 +2541,87 @@ static inline void skge_write8(const struct skge_hw *hw, int reg, u8 val)
 }
 
 /* MAC Related Registers inside the device. */
-#define SKGEMAC_REG(port,reg)   (((port)<<7)+(reg))
-
-/* PCI config space can be accessed via memory mapped space */
-#define SKGEPCI_REG(reg) ((reg)+ 0x380)
-
-#define SKGEXM_REG(port, reg) \
+#define SK_REG(port,reg)        (((port)<<7)+(reg))
+#define SK_XMAC_REG(port, reg) \
         ((BASE_XMAC_1 + (port) * (BASE_XMAC_2 - BASE_XMAC_1)) | (reg) << 1)
 
-static inline u32 skge_xm_read32(const struct skge_hw *hw, int port, int reg)
-{
-        return skge_read32(hw, SKGEXM_REG(port,reg));
-}
-
-static inline u16 skge_xm_read16(const struct skge_hw *hw, int port, int reg)
+static inline u32 xm_read32(const struct skge_hw *hw, int port, int reg)
 {
-        return skge_read16(hw, SKGEXM_REG(port,reg));
+        u32 v;
+        v = skge_read16(hw, SK_XMAC_REG(port, reg));
+        v |= (u32)skge_read16(hw, SK_XMAC_REG(port, reg+2)) << 16;
+        return v;
 }
 
-static inline u8 skge_xm_read8(const struct skge_hw *hw, int port, int reg)
+static inline u16 xm_read16(const struct skge_hw *hw, int port, int reg)
 {
-        return skge_read8(hw, SKGEXM_REG(port,reg));
+        return skge_read16(hw, SK_XMAC_REG(port,reg));
 }
 
-static inline void skge_xm_write32(const struct skge_hw *hw, int port, int r, u32 v)
+static inline void xm_write32(const struct skge_hw *hw, int port, int r, u32 v)
 {
-        skge_write32(hw, SKGEXM_REG(port,r), v);
+        skge_write16(hw, SK_XMAC_REG(port,r), v & 0xffff);
+        skge_write16(hw, SK_XMAC_REG(port,r+2), v >> 16);
 }
 
-static inline void skge_xm_write16(const struct skge_hw *hw, int port, int r, u16 v)
+static inline void xm_write16(const struct skge_hw *hw, int port, int r, u16 v)
 {
-        skge_write16(hw, SKGEXM_REG(port,r), v);
+        skge_write16(hw, SK_XMAC_REG(port,r), v);
 }
 
-static inline void skge_xm_write8(const struct skge_hw *hw, int port, int r, u8 v)
-{
-        skge_write8(hw, SKGEXM_REG(port,r), v);
-}
-
-static inline void skge_xm_outhash(const struct skge_hw *hw, int port, int reg,
+static inline void xm_outhash(const struct skge_hw *hw, int port, int reg,
                                    const u8 *hash)
 {
-        skge_xm_write16(hw, port, reg, 
-                        (u16)hash[0] | ((u16)hash[1] << 8));
-        skge_xm_write16(hw, port, reg+2, 
-                        (u16)hash[2] | ((u16)hash[3] << 8));
-        skge_xm_write16(hw, port, reg+4, 
-                        (u16)hash[4] | ((u16)hash[5] << 8));
-        skge_xm_write16(hw, port, reg+6, 
-                        (u16)hash[6] | ((u16)hash[7] << 8));
+        xm_write16(hw, port, reg,   (u16)hash[0] | ((u16)hash[1] << 8));
+        xm_write16(hw, port, reg+2, (u16)hash[2] | ((u16)hash[3] << 8));
+        xm_write16(hw, port, reg+4, (u16)hash[4] | ((u16)hash[5] << 8));
+        xm_write16(hw, port, reg+6, (u16)hash[6] | ((u16)hash[7] << 8));
 }
 
-static inline void skge_xm_outaddr(const struct skge_hw *hw, int port, int reg,
+static inline void xm_outaddr(const struct skge_hw *hw, int port, int reg,
                                    const u8 *addr)
 {
-        skge_xm_write16(hw, port, reg, 
-                        (u16)addr[0] | ((u16)addr[1] << 8));
-        skge_xm_write16(hw, port, reg, 
-                        (u16)addr[2] | ((u16)addr[3] << 8));
-        skge_xm_write16(hw, port, reg, 
-                        (u16)addr[4] | ((u16)addr[5] << 8));
+        xm_write16(hw, port, reg,   (u16)addr[0] | ((u16)addr[1] << 8));
+        xm_write16(hw, port, reg+2, (u16)addr[2] | ((u16)addr[3] << 8));
+        xm_write16(hw, port, reg+4, (u16)addr[4] | ((u16)addr[5] << 8));
 }
 
+#define SK_GMAC_REG(port,reg) \
+        (BASE_GMAC_1 + (port) * (BASE_GMAC_2-BASE_GMAC_1) + (reg))
 
-#define SKGEGMA_REG(port,reg) \
-        ((reg) + BASE_GMAC_1 + \
-         (port) * (BASE_GMAC_2-BASE_GMAC_1))
-
-static inline u16 skge_gma_read16(const struct skge_hw *hw, int port, int reg)
+static inline u16 gma_read16(const struct skge_hw *hw, int port, int reg)
 {
-        return skge_read16(hw, SKGEGMA_REG(port,reg));
+        return skge_read16(hw, SK_GMAC_REG(port,reg));
 }
 
-static inline u32 skge_gma_read32(const struct skge_hw *hw, int port, int reg)
+static inline u32 gma_read32(const struct skge_hw *hw, int port, int reg)
 {
-        return (u32) skge_read16(hw, SKGEGMA_REG(port,reg))
-                | ((u32)skge_read16(hw, SKGEGMA_REG(port,reg+4)) << 16);
+        return (u32) skge_read16(hw, SK_GMAC_REG(port,reg))
+                | ((u32)skge_read16(hw, SK_GMAC_REG(port,reg+4)) << 16);
 }
 
-static inline u8 skge_gma_read8(const struct skge_hw *hw, int port, int reg)
+static inline void gma_write16(const struct skge_hw *hw, int port, int r, u16 v)
 {
-        return skge_read8(hw, SKGEGMA_REG(port,reg));
+        skge_write16(hw, SK_GMAC_REG(port,r), v);
 }
 
-static inline void skge_gma_write16(const struct skge_hw *hw, int port, int r, u16 v)
+static inline void gma_write32(const struct skge_hw *hw, int port, int r, u32 v)
 {
-        skge_write16(hw, SKGEGMA_REG(port,r), v);
+        skge_write16(hw, SK_GMAC_REG(port, r), (u16) v);
+        skge_write32(hw, SK_GMAC_REG(port, r+4), (u16)(v >> 16));
 }
 
-static inline void skge_gma_write32(const struct skge_hw *hw, int port, int r, u32 v)
+static inline void gma_write8(const struct skge_hw *hw, int port, int r, u8 v)
 {
-        skge_write16(hw, SKGEGMA_REG(port, r), (u16) v);
-        skge_write32(hw, SKGEGMA_REG(port, r+4), (u16)(v >> 16));
+        skge_write8(hw, SK_GMAC_REG(port,r), v);
 }
 
-static inline void skge_gma_write8(const struct skge_hw *hw, int port, int r, u8 v)
-{
-        skge_write8(hw, SKGEGMA_REG(port,r), v);
-}
-
-static inline void skge_gm_set_addr(struct skge_hw *hw, int port, int reg,
+static inline void gma_set_addr(struct skge_hw *hw, int port, int reg,
                                     const u8 *addr)
 {
-        skge_gma_write16(hw, port, reg,
-                         (u16) addr[0] | ((u16) addr[1] << 8));
-        skge_gma_write16(hw, port, reg+4,
-                         (u16) addr[2] | ((u16) addr[3] << 8));
-        skge_gma_write16(hw, port, reg+8,
-                         (u16) addr[4] | ((u16) addr[5] << 8));
+        gma_write16(hw, port, reg,  (u16) addr[0] | ((u16) addr[1] << 8));
+        gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8));
+        gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8));
 }
-                
+
 #endif
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 1d3231cc471a..d20e0da05a26 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -137,6 +137,110 @@ config PCMCIA_RAYCS
 comment "Wireless 802.11b ISA/PCI cards support"
         depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
 
+config IPW2100
+        tristate "Intel PRO/Wireless 2100 Network Connection"
+        depends on NET_RADIO && PCI && IEEE80211
+        select FW_LOADER
+        ---help---
+          A driver for the Intel PRO/Wireless 2100 Network 
+          Connection 802.11b wireless network adapter.
+
+          See <file:Documentation/networking/README.ipw2100> for information on
+          the capabilities currently enabled in this driver and for tips
+          for debugging issues and problems.
+
+          In order to use this driver, you will need a firmware image for it.
+          You can obtain the firmware from
+          <http://ipw2100.sf.net/>.  Once you have the firmware image, you 
+          will need to place it in /etc/firmware.
+
+          You will also very likely need the Wireless Tools in order to
+          configure your card:
+
+          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
+ 
+          If you want to compile the driver as a module ( = code which can be
+          inserted in and remvoed from the running kernel whenever you want),
+          say M here and read <file:Documentation/modules.txt>.  The module
+          will be called ipw2100.ko.
+        
+config IPW2100_PROMISC
+        bool "Enable promiscuous mode"
+        depends on IPW2100
+        ---help---
+          Enables promiscuous/monitor mode support for the ipw2100 driver.
+          With this feature compiled into the driver, you can switch to 
+          promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+          mode, no packets can be sent.
+
+config IPW_DEBUG
+        bool "Enable full debugging output in IPW2100 module."
+        depends on IPW2100
+        ---help---
+          This option will enable debug tracing output for the IPW2100.  
+
+          This will result in the kernel module being ~60k larger.  You can 
+          control which debug output is sent to the kernel log by setting the 
+          value in 
+
+          /sys/bus/pci/drivers/ipw2100/debug_level
+
+          This entry will only exist if this option is enabled.
+
+          If you are not trying to debug or develop the IPW2100 driver, you 
+          most likely want to say N here.
+
+config IPW2200
+        tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
+        depends on IEEE80211 && PCI
+        select FW_LOADER
+        ---help---
+          A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
+          Connection adapters. 
+
+          See <file:Documentation/networking/README.ipw2200> for 
+          information on the capabilities currently enabled in this 
+          driver and for tips for debugging issues and problems.
+
+          In order to use this driver, you will need a firmware image for it.
+          You can obtain the firmware from
+          <http://ipw2200.sf.net/>.  See the above referenced README.ipw2200 
+          for information on where to install the firmare images.
+
+          You will also very likely need the Wireless Tools in order to
+          configure your card:
+
+          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
+ 
+          If you want to compile the driver as a module ( = code which can be
+          inserted in and remvoed from the running kernel whenever you want),
+          say M here and read <file:Documentation/modules.txt>.  The module
+          will be called ipw2200.ko.
+
+config IPW_DEBUG
+        bool "Enable full debugging output in IPW2200 module."
+        depends on IPW2200
+        ---help---
+          This option will enable debug tracing output for the IPW2200.  
+
+          This will result in the kernel module being ~100k larger.  You can 
+          control which debug output is sent to the kernel log by setting the 
+          value in 
+
+          /sys/bus/pci/drivers/ipw2200/debug_level
+
+          This entry will only exist if this option is enabled.
+
+          To set a value, simply echo an 8-byte hex value to the same file:
+
+          % echo 0x00000FFO > /sys/bus/pci/drivers/ipw2200/debug_level
+
+          You can find the list of debug mask values in 
+          drivers/net/wireless/ipw2200.h
+
+          If you are not trying to debug or develop the IPW2200 driver, you 
+          most likely want to say N here.
+
 config AIRO
         tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
         depends on NET_RADIO && ISA && (PCI || BROKEN)
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 2b87841322cc..0859787581bb 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -2,6 +2,10 @@
 # Makefile for the Linux Wireless network device drivers.
 #
 
+obj-$(CONFIG_IPW2100) += ipw2100.o
+
+obj-$(CONFIG_IPW2200) += ipw2200.o
+
 obj-$(CONFIG_STRIP) += strip.o
 obj-$(CONFIG_ARLAN) += arlan.o 
 
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 18a7d38d2a13..bed160a25cab 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -68,7 +68,7 @@
 #include <linux/device.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
-#include "ieee802_11.h"
+#include <net/ieee80211.h>
 #include "atmel.h"
 
 #define DRIVER_MAJOR 0
@@ -618,12 +618,12 @@ static int atmel_lock_mac(struct atmel_private *priv);
 static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data);
 static void atmel_command_irq(struct atmel_private *priv);
 static int atmel_validate_channel(struct atmel_private *priv, int channel);
-static void atmel_management_frame(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_hdr *header, 
                                    u16 frame_len, u8 rssi);
 static void atmel_management_timer(u_long a);
 static void atmel_send_command(struct atmel_private *priv, int command, void *cmd, int cmd_size);
 static int atmel_send_command_wait(struct atmel_private *priv, int command, void *cmd, int cmd_size);
-static void atmel_transmit_management_frame(struct atmel_private *priv, struct ieee802_11_hdr *header,
+static void atmel_transmit_management_frame(struct atmel_private *priv, struct ieee80211_hdr *header,
                                             u8 *body, int body_len);
 
 static u8 atmel_get_mib8(struct atmel_private *priv, u8 type, u8 index);
@@ -827,7 +827,7 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, u16 l
 static int start_tx (struct sk_buff *skb, struct net_device *dev)
 {
         struct atmel_private *priv = netdev_priv(dev);
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         unsigned long flags;
         u16 buff, frame_ctl, len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
         u8 SNAP_RFC1024[6] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
@@ -863,17 +863,17 @@ static int start_tx (struct sk_buff *skb, struct net_device *dev)
                 return 1;
         }
         
-        frame_ctl = IEEE802_11_FTYPE_DATA;
+        frame_ctl = IEEE80211_FTYPE_DATA;
         header.duration_id = 0;
         header.seq_ctl = 0;
         if (priv->wep_is_on)
-                frame_ctl |= IEEE802_11_FCTL_WEP;
+                frame_ctl |= IEEE80211_FCTL_WEP;
         if (priv->operating_mode == IW_MODE_ADHOC) {
                 memcpy(&header.addr1, skb->data, 6);
                 memcpy(&header.addr2, dev->dev_addr, 6);
                 memcpy(&header.addr3, priv->BSSID, 6);
         } else {
-                frame_ctl |= IEEE802_11_FCTL_TODS;
+                frame_ctl |= IEEE80211_FCTL_TODS;
                 memcpy(&header.addr1, priv->CurrentBSSID, 6);
                 memcpy(&header.addr2, dev->dev_addr, 6);
                 memcpy(&header.addr3, skb->data, 6);
@@ -902,7 +902,7 @@ static int start_tx (struct sk_buff *skb, struct net_device *dev)
 }
 
 static void atmel_transmit_management_frame(struct atmel_private *priv, 
-                                            struct ieee802_11_hdr *header,
+                                            struct ieee80211_hdr *header,
                                             u8 *body, int body_len)
 {
         u16 buff;
@@ -917,7 +917,7 @@ static void atmel_transmit_management_frame(struct atmel_private *priv,
         tx_update_descriptor(priv, header->addr1[0] & 0x01, len, buff, TX_PACKET_TYPE_MGMT);
 }
         
-static void fast_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void fast_rx_path(struct atmel_private *priv, struct ieee80211_hdr *header, 
                          u16 msdu_size, u16 rx_packet_loc, u32 crc)
 {
         /* fast path: unfragmented packet copy directly into skbuf */
@@ -955,7 +955,7 @@ static void fast_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *head
         }
         
         memcpy(skbp, header->addr1, 6); /* destination address */
-        if (le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_FROMDS) 
+        if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS) 
                 memcpy(&skbp[6], header->addr3, 6);
         else
                 memcpy(&skbp[6], header->addr2, 6); /* source address */
@@ -990,14 +990,14 @@ static int probe_crc(struct atmel_private *priv, u16 packet_loc, u16 msdu_size)
         return (crc ^ 0xffffffff) == netcrc;
 }
 
-static void frag_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void frag_rx_path(struct atmel_private *priv, struct ieee80211_hdr *header, 
                          u16 msdu_size, u16 rx_packet_loc, u32 crc, u16 seq_no, u8 frag_no, int more_frags)
 {
         u8 mac4[6]; 
         u8 source[6];
         struct sk_buff *skb;
 
-        if (le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_FROMDS) 
+        if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS) 
                 memcpy(source, header->addr3, 6);
         else
                 memcpy(source, header->addr2, 6); 
@@ -1082,7 +1082,7 @@ static void frag_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *head
 static void rx_done_irq(struct atmel_private *priv)
 {
         int i;
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         
         for (i = 0; 
              atmel_rmem8(priv, atmel_rx(priv, RX_DESC_FLAGS_OFFSET, priv->rx_desc_head)) == RX_DESC_FLAG_VALID &&
@@ -1117,7 +1117,7 @@ static void rx_done_irq(struct atmel_private *priv)
                 /* probe for CRC use here if needed  once five packets have arrived with
                    the same crc status, we assume we know what's happening and stop probing */
                 if (priv->probe_crc) {
-                        if (!priv->wep_is_on || !(frame_ctl & IEEE802_11_FCTL_WEP)) {
+                        if (!priv->wep_is_on || !(frame_ctl & IEEE80211_FCTL_WEP)) {
                                 priv->do_rx_crc = probe_crc(priv, rx_packet_loc, msdu_size);
                         } else {
                                 priv->do_rx_crc = probe_crc(priv, rx_packet_loc + 24, msdu_size - 24);
@@ -1132,16 +1132,16 @@ static void rx_done_irq(struct atmel_private *priv)
                 }
                     
                 /* don't CRC header when WEP in use */
-                if (priv->do_rx_crc && (!priv->wep_is_on || !(frame_ctl & IEEE802_11_FCTL_WEP))) {
+                if (priv->do_rx_crc && (!priv->wep_is_on || !(frame_ctl & IEEE80211_FCTL_WEP))) {
                         crc = crc32_le(0xffffffff, (unsigned char *)&header, 24);
                 }
                 msdu_size -= 24; /* header */
 
-                if ((frame_ctl & IEEE802_11_FCTL_FTYPE) == IEEE802_11_FTYPE_DATA) { 
+                if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) { 
                         
-                        int more_fragments = frame_ctl & IEEE802_11_FCTL_MOREFRAGS;
-                        u8 packet_fragment_no = seq_control & IEEE802_11_SCTL_FRAG;
-                        u16 packet_sequence_no = (seq_control & IEEE802_11_SCTL_SEQ) >> 4;
+                        int more_fragments = frame_ctl & IEEE80211_FCTL_MOREFRAGS;
+                        u8 packet_fragment_no = seq_control & IEEE80211_SCTL_FRAG;
+                        u16 packet_sequence_no = (seq_control & IEEE80211_SCTL_SEQ) >> 4;
                         
                         if (!more_fragments && packet_fragment_no == 0 ) {
                                 fast_rx_path(priv, &header, msdu_size, rx_packet_loc, crc);
@@ -1151,7 +1151,7 @@ static void rx_done_irq(struct atmel_private *priv)
                         }
                 }
                 
-                if ((frame_ctl & IEEE802_11_FCTL_FTYPE) == IEEE802_11_FTYPE_MGMT) {
+                if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {
                         /* copy rest of packet into buffer */
                         atmel_copy_to_host(priv->dev, (unsigned char *)&priv->rx_buf, rx_packet_loc + 24, msdu_size);
                         
@@ -2663,10 +2663,10 @@ static void handle_beacon_probe(struct atmel_private *priv, u16 capability, u8 c
  
 static void send_authentication_request(struct atmel_private *priv, u8 *challenge, int challenge_len)
 {
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         struct auth_body auth;
         
-        header.frame_ctl = cpu_to_le16(IEEE802_11_FTYPE_MGMT | IEEE802_11_STYPE_AUTH); 
+        header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH); 
         header.duration_id      = cpu_to_le16(0x8000);  
         header.seq_ctl = 0;
         memcpy(header.addr1, priv->CurrentBSSID, 6);
@@ -2677,7 +2677,7 @@ static void send_authentication_request(struct atmel_private *priv, u8 *challeng
                 auth.alg = cpu_to_le16(C80211_MGMT_AAN_SHAREDKEY); 
                 /* no WEP for authentication frames with TrSeqNo 1 */
                 if (priv->CurrentAuthentTransactionSeqNum != 1)
-                        header.frame_ctl |=  cpu_to_le16(IEEE802_11_FCTL_WEP); 
+                        header.frame_ctl |=  cpu_to_le16(IEEE80211_FCTL_WEP); 
         } else {
                 auth.alg = cpu_to_le16(C80211_MGMT_AAN_OPENSYSTEM);
         }
@@ -2701,7 +2701,7 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
 {
         u8 *ssid_el_p;
         int bodysize;
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         struct ass_req_format {
                 u16 capability;
                 u16 listen_interval; 
@@ -2714,8 +2714,8 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
                 u8 rates[4];
         } body;
                 
-        header.frame_ctl = cpu_to_le16(IEEE802_11_FTYPE_MGMT | 
-                (is_reassoc ? IEEE802_11_STYPE_REASSOC_REQ : IEEE802_11_STYPE_ASSOC_REQ));
+        header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | 
+                (is_reassoc ? IEEE80211_STYPE_REASSOC_REQ : IEEE80211_STYPE_ASSOC_REQ));
         header.duration_id = cpu_to_le16(0x8000);
         header.seq_ctl = 0;
 
@@ -2751,9 +2751,9 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
         atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize);
 }
 
-static int is_frame_from_current_bss(struct atmel_private *priv, struct ieee802_11_hdr *header)
+static int is_frame_from_current_bss(struct atmel_private *priv, struct ieee80211_hdr *header)
 {
-        if (le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_FROMDS)
+        if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS)
                 return memcmp(header->addr3, priv->CurrentBSSID, 6) == 0;
         else
                 return memcmp(header->addr2, priv->CurrentBSSID, 6) == 0;
@@ -2801,7 +2801,7 @@ static int retrieve_bss(struct atmel_private *priv)
 }
 
 
-static void store_bss_info(struct atmel_private *priv, struct ieee802_11_hdr *header,
+static void store_bss_info(struct atmel_private *priv, struct ieee80211_hdr *header,
                            u16 capability, u16 beacon_period, u8 channel, u8 rssi, 
                            u8 ssid_len, u8 *ssid, int is_beacon)
 {
@@ -3085,12 +3085,12 @@ static void atmel_smooth_qual(struct atmel_private *priv)
 }
 
 /* deals with incoming managment frames. */
-static void atmel_management_frame(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_hdr *header, 
                       u16 frame_len, u8 rssi)
 {
         u16 subtype;
         
-        switch (subtype = le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_STYPE) {
+        switch (subtype = le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_STYPE) {
         case C80211_SUBTYPE_MGMT_BEACON :
         case C80211_SUBTYPE_MGMT_ProbeResponse:
                 
diff --git a/drivers/net/wireless/ieee802_11.h b/drivers/net/wireless/ieee802_11.h
deleted file mode 100644
index 53dd5248f9f1..000000000000
--- a/drivers/net/wireless/ieee802_11.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _IEEE802_11_H
-#define _IEEE802_11_H
-
-#define IEEE802_11_DATA_LEN             2304
-/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
-   6.2.1.1.2.
-
-   The figure in section 7.1.2 suggests a body size of up to 2312
-   bytes is allowed, which is a bit confusing, I suspect this
-   represents the 2304 bytes of real data, plus a possible 8 bytes of
-   WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
-
-
-#define IEEE802_11_HLEN                 30
-#define IEEE802_11_FRAME_LEN            (IEEE802_11_DATA_LEN + IEEE802_11_HLEN)
-
-struct ieee802_11_hdr {
-        u16 frame_ctl;
-        u16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 addr3[ETH_ALEN];
-        u16 seq_ctl;
-        u8 addr4[ETH_ALEN];
-} __attribute__ ((packed));
-
-/* Frame control field constants */
-#define IEEE802_11_FCTL_VERS            0x0002
-#define IEEE802_11_FCTL_FTYPE           0x000c
-#define IEEE802_11_FCTL_STYPE           0x00f0
-#define IEEE802_11_FCTL_TODS            0x0100
-#define IEEE802_11_FCTL_FROMDS          0x0200
-#define IEEE802_11_FCTL_MOREFRAGS       0x0400
-#define IEEE802_11_FCTL_RETRY           0x0800
-#define IEEE802_11_FCTL_PM              0x1000
-#define IEEE802_11_FCTL_MOREDATA        0x2000
-#define IEEE802_11_FCTL_WEP             0x4000
-#define IEEE802_11_FCTL_ORDER           0x8000
-
-#define IEEE802_11_FTYPE_MGMT           0x0000
-#define IEEE802_11_FTYPE_CTL            0x0004
-#define IEEE802_11_FTYPE_DATA           0x0008
-
-/* management */
-#define IEEE802_11_STYPE_ASSOC_REQ      0x0000
-#define IEEE802_11_STYPE_ASSOC_RESP     0x0010
-#define IEEE802_11_STYPE_REASSOC_REQ    0x0020
-#define IEEE802_11_STYPE_REASSOC_RESP   0x0030
-#define IEEE802_11_STYPE_PROBE_REQ      0x0040
-#define IEEE802_11_STYPE_PROBE_RESP     0x0050
-#define IEEE802_11_STYPE_BEACON         0x0080
-#define IEEE802_11_STYPE_ATIM           0x0090
-#define IEEE802_11_STYPE_DISASSOC       0x00A0
-#define IEEE802_11_STYPE_AUTH           0x00B0
-#define IEEE802_11_STYPE_DEAUTH         0x00C0
-
-/* control */
-#define IEEE802_11_STYPE_PSPOLL         0x00A0
-#define IEEE802_11_STYPE_RTS            0x00B0
-#define IEEE802_11_STYPE_CTS            0x00C0
-#define IEEE802_11_STYPE_ACK            0x00D0
-#define IEEE802_11_STYPE_CFEND          0x00E0
-#define IEEE802_11_STYPE_CFENDACK       0x00F0
-
-/* data */
-#define IEEE802_11_STYPE_DATA           0x0000
-#define IEEE802_11_STYPE_DATA_CFACK     0x0010
-#define IEEE802_11_STYPE_DATA_CFPOLL    0x0020
-#define IEEE802_11_STYPE_DATA_CFACKPOLL 0x0030
-#define IEEE802_11_STYPE_NULLFUNC       0x0040
-#define IEEE802_11_STYPE_CFACK          0x0050
-#define IEEE802_11_STYPE_CFPOLL         0x0060
-#define IEEE802_11_STYPE_CFACKPOLL      0x0070
-
-#define IEEE802_11_SCTL_FRAG            0x000F
-#define IEEE802_11_SCTL_SEQ             0xFFF0
-
-#endif /* _IEEE802_11_H */
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
new file mode 100644
index 000000000000..189ad7b2cec9
--- /dev/null
+++ b/drivers/net/wireless/ipw2100.c
@@ -0,0 +1,8641 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+  Portions of this file are based on the sample_* files provided by Wireless
+  Extensions 0.26 package and copyright (c) 1997-2003 Jean Tourrilhes
+  <jt@hpl.hp.com>
+
+  Portions of this file are based on the Host AP project,
+  Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+    <jkmaline@cc.hut.fi>
+  Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+
+  Portions of ipw2100_mod_firmware_load, ipw2100_do_mod_firmware_load, and
+  ipw2100_fw_load are loosely based on drivers/sound/sound_firmware.c
+  available in the 2.4.25 kernel sources, and are copyright (c) Alan Cox
+
+******************************************************************************/
+/*
+
+ Initial driver on which this is based was developed by Janusz Gorycki,
+ Maciej Urbaniak, and Maciej Sosnowski.
+
+ Promiscuous mode support added by Jacek Wysoczynski and Maciej Urbaniak.
+
+Theory of Operation
+
+Tx - Commands and Data
+
+Firmware and host share a circular queue of Transmit Buffer Descriptors (TBDs)
+Each TBD contains a pointer to the physical (dma_addr_t) address of data being
+sent to the firmware as well as the length of the data.
+
+The host writes to the TBD queue at the WRITE index.  The WRITE index points
+to the _next_ packet to be written and is advanced when after the TBD has been
+filled.
+
+The firmware pulls from the TBD queue at the READ index.  The READ index points
+to the currently being read entry, and is advanced once the firmware is
+done with a packet.
+
+When data is sent to the firmware, the first TBD is used to indicate to the
+firmware if a Command or Data is being sent.  If it is Command, all of the
+command information is contained within the physical address referred to by the
+TBD.  If it is Data, the first TBD indicates the type of data packet, number
+of fragments, etc.  The next TBD then referrs to the actual packet location.
+
+The Tx flow cycle is as follows:
+
+1) ipw2100_tx() is called by kernel with SKB to transmit
+2) Packet is move from the tx_free_list and appended to the transmit pending
+   list (tx_pend_list)
+3) work is scheduled to move pending packets into the shared circular queue.
+4) when placing packet in the circular queue, the incoming SKB is DMA mapped
+   to a physical address.  That address is entered into a TBD.  Two TBDs are
+   filled out.  The first indicating a data packet, the second referring to the
+   actual payload data.
+5) the packet is removed from tx_pend_list and placed on the end of the
+   firmware pending list (fw_pend_list)
+6) firmware is notified that the WRITE index has
+7) Once the firmware has processed the TBD, INTA is triggered.
+8) For each Tx interrupt received from the firmware, the READ index is checked
+   to see which TBDs are done being processed.
+9) For each TBD that has been processed, the ISR pulls the oldest packet
+   from the fw_pend_list.
+10)The packet structure contained in the fw_pend_list is then used
+   to unmap the DMA address and to free the SKB originally passed to the driver
+   from the kernel.
+11)The packet structure is placed onto the tx_free_list
+
+The above steps are the same for commands, only the msg_free_list/msg_pend_list
+are used instead of tx_free_list/tx_pend_list
+
+...
+
+Critical Sections / Locking :
+
+There are two locks utilized.  The first is the low level lock (priv->low_lock)
+that protects the following:
+
+- Access to the Tx/Rx queue lists via priv->low_lock. The lists are as follows:
+
+  tx_free_list : Holds pre-allocated Tx buffers.
+    TAIL modified in __ipw2100_tx_process()
+    HEAD modified in ipw2100_tx()
+
+  tx_pend_list : Holds used Tx buffers waiting to go into the TBD ring
+    TAIL modified ipw2100_tx()
+    HEAD modified by X__ipw2100_tx_send_data()
+
+  msg_free_list : Holds pre-allocated Msg (Command) buffers
+    TAIL modified in __ipw2100_tx_process()
+    HEAD modified in ipw2100_hw_send_command()
+
+  msg_pend_list : Holds used Msg buffers waiting to go into the TBD ring
+    TAIL modified in ipw2100_hw_send_command()
+    HEAD modified in X__ipw2100_tx_send_commands()
+
+  The flow of data on the TX side is as follows:
+
+  MSG_FREE_LIST + COMMAND => MSG_PEND_LIST => TBD => MSG_FREE_LIST
+  TX_FREE_LIST + DATA => TX_PEND_LIST => TBD => TX_FREE_LIST
+
+  The methods that work on the TBD ring are protected via priv->low_lock.
+
+- The internal data state of the device itself
+- Access to the firmware read/write indexes for the BD queues
+  and associated logic
+
+All external entry functions are locked with the priv->action_lock to ensure
+that only one external action is invoked at a time.
+
+
+*/
+
+#include <linux/compiler.h>
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/if_arp.h>
+#include <linux/in6.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/kernel.h>
+#include <linux/kmod.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/proc_fs.h>
+#include <linux/skbuff.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#define __KERNEL_SYSCALLS__
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/unistd.h>
+#include <linux/stringify.h>
+#include <linux/tcp.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include <linux/time.h>
+#include <linux/firmware.h>
+#include <linux/acpi.h>
+#include <linux/ctype.h>
+
+#include "ipw2100.h"
+
+#define IPW2100_VERSION "1.1.0"
+
+#define DRV_NAME        "ipw2100"
+#define DRV_VERSION     IPW2100_VERSION
+#define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2004 Intel Corporation"
+
+
+/* Debugging stuff */
+#ifdef CONFIG_IPW_DEBUG
+#define CONFIG_IPW2100_RX_DEBUG   /* Reception debugging */
+#endif
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+static int debug = 0;
+static int mode = 0;
+static int channel = 0;
+static int associate = 1;
+static int disable = 0;
+#ifdef CONFIG_PM
+static struct ipw2100_fw ipw2100_firmware;
+#endif
+
+#include <linux/moduleparam.h>
+module_param(debug, int, 0444);
+module_param(mode, int, 0444);
+module_param(channel, int, 0444);
+module_param(associate, int, 0444);
+module_param(disable, int, 0444);
+
+MODULE_PARM_DESC(debug, "debug level");
+MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS,2=Monitor)");
+MODULE_PARM_DESC(channel, "channel");
+MODULE_PARM_DESC(associate, "auto associate when scanning (default on)");
+MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
+
+u32 ipw2100_debug_level = IPW_DL_NONE;
+
+#ifdef CONFIG_IPW_DEBUG
+static const char *command_types[] = {
+        "undefined",
+        "unused", /* HOST_ATTENTION */
+        "HOST_COMPLETE",
+        "unused", /* SLEEP */
+        "unused", /* HOST_POWER_DOWN */
+        "unused",
+        "SYSTEM_CONFIG",
+        "unused", /* SET_IMR */
+        "SSID",
+        "MANDATORY_BSSID",
+        "AUTHENTICATION_TYPE",
+        "ADAPTER_ADDRESS",
+        "PORT_TYPE",
+        "INTERNATIONAL_MODE",
+        "CHANNEL",
+        "RTS_THRESHOLD",
+        "FRAG_THRESHOLD",
+        "POWER_MODE",
+        "TX_RATES",
+        "BASIC_TX_RATES",
+        "WEP_KEY_INFO",
+        "unused",
+        "unused",
+        "unused",
+        "unused",
+        "WEP_KEY_INDEX",
+        "WEP_FLAGS",
+        "ADD_MULTICAST",
+        "CLEAR_ALL_MULTICAST",
+        "BEACON_INTERVAL",
+        "ATIM_WINDOW",
+        "CLEAR_STATISTICS",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "TX_POWER_INDEX",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "BROADCAST_SCAN",
+        "CARD_DISABLE",
+        "PREFERRED_BSSID",
+        "SET_SCAN_OPTIONS",
+        "SCAN_DWELL_TIME",
+        "SWEEP_TABLE",
+        "AP_OR_STATION_TABLE",
+        "GROUP_ORDINALS",
+        "SHORT_RETRY_LIMIT",
+        "LONG_RETRY_LIMIT",
+        "unused", /* SAVE_CALIBRATION */
+        "unused", /* RESTORE_CALIBRATION */
+        "undefined",
+        "undefined",
+        "undefined",
+        "HOST_PRE_POWER_DOWN",
+        "unused", /* HOST_INTERRUPT_COALESCING */
+        "undefined",
+        "CARD_DISABLE_PHY_OFF",
+        "MSDU_TX_RATES"
+        "undefined",
+        "undefined",
+        "SET_STATION_STAT_BITS",
+        "CLEAR_STATIONS_STAT_BITS",
+        "LEAP_ROGUE_MODE",
+        "SET_SECURITY_INFORMATION",
+        "DISASSOCIATION_BSSID",
+        "SET_WPA_ASS_IE"
+};
+#endif
+
+
+/* Pre-decl until we get the code solid and then we can clean it up */
+static void X__ipw2100_tx_send_commands(struct ipw2100_priv *priv);
+static void X__ipw2100_tx_send_data(struct ipw2100_priv *priv);
+static int ipw2100_adapter_setup(struct ipw2100_priv *priv);
+
+static void ipw2100_queues_initialize(struct ipw2100_priv *priv);
+static void ipw2100_queues_free(struct ipw2100_priv *priv);
+static int ipw2100_queues_allocate(struct ipw2100_priv *priv);
+
+
+static inline void read_register(struct net_device *dev, u32 reg, u32 *val)
+{
+        *val = readl((void *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("r: 0x%08X => 0x%08X\n", reg, *val);
+}
+
+static inline void write_register(struct net_device *dev, u32 reg, u32 val)
+{
+        writel(val, (void *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("w: 0x%08X <= 0x%08X\n", reg, val);
+}
+
+static inline void read_register_word(struct net_device *dev, u32 reg, u16 *val)
+{
+        *val = readw((void *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("r: 0x%08X => %04X\n", reg, *val);
+}
+
+static inline void read_register_byte(struct net_device *dev, u32 reg, u8 *val)
+{
+        *val = readb((void *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("r: 0x%08X => %02X\n", reg, *val);
+}
+
+static inline void write_register_word(struct net_device *dev, u32 reg, u16 val)
+{
+        writew(val, (void *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("w: 0x%08X <= %04X\n", reg, val);
+}
+
+
+static inline void write_register_byte(struct net_device *dev, u32 reg, u8 val)
+{
+        writeb(val, (void *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("w: 0x%08X =< %02X\n", reg, val);
+}
+
+static inline void read_nic_dword(struct net_device *dev, u32 addr, u32 *val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        read_register(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_dword(struct net_device *dev, u32 addr, u32 val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void read_nic_word(struct net_device *dev, u32 addr, u16 *val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        read_register_word(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_word(struct net_device *dev, u32 addr, u16 val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        write_register_word(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void read_nic_byte(struct net_device *dev, u32 addr, u8 *val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        read_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_byte(struct net_device *dev, u32 addr, u8 val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        write_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_auto_inc_address(struct net_device *dev, u32 addr)
+{
+        write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+}
+
+static inline void write_nic_dword_auto_inc(struct net_device *dev, u32 val)
+{
+        write_register(dev, IPW_REG_AUTOINCREMENT_DATA, val);
+}
+
+static inline void write_nic_memory(struct net_device *dev, u32 addr, u32 len,
+                                    const u8 *buf)
+{
+        u32 aligned_addr;
+        u32 aligned_len;
+        u32 dif_len;
+        u32 i;
+
+        /* read first nibble byte by byte */
+        aligned_addr = addr & (~0x3);
+        dif_len = addr - aligned_addr;
+        if (dif_len) {
+                /* Start reading at aligned_addr + dif_len */
+                write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                               aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        write_register_byte(
+                                dev, IPW_REG_INDIRECT_ACCESS_DATA + i,
+                                *buf);
+
+                len -= dif_len;
+                aligned_addr += 4;
+        }
+
+        /* read DWs through autoincrement registers */
+        write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
+                       aligned_addr);
+        aligned_len = len & (~0x3);
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                write_register(
+                        dev, IPW_REG_AUTOINCREMENT_DATA, *(u32 *)buf);
+
+        /* copy the last nibble */
+        dif_len = len - aligned_len;
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS, aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                write_register_byte(
+                        dev, IPW_REG_INDIRECT_ACCESS_DATA + i, *buf);
+}
+
+static inline void read_nic_memory(struct net_device *dev, u32 addr, u32 len,
+                                   u8 *buf)
+{
+        u32 aligned_addr;
+        u32 aligned_len;
+        u32 dif_len;
+        u32 i;
+
+        /* read first nibble byte by byte */
+        aligned_addr = addr & (~0x3);
+        dif_len = addr - aligned_addr;
+        if (dif_len) {
+                /* Start reading at aligned_addr + dif_len */
+                write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                               aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        read_register_byte(
+                                dev, IPW_REG_INDIRECT_ACCESS_DATA + i, buf);
+
+                len -= dif_len;
+                aligned_addr += 4;
+        }
+
+        /* read DWs through autoincrement registers */
+        write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
+                       aligned_addr);
+        aligned_len = len & (~0x3);
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                read_register(dev, IPW_REG_AUTOINCREMENT_DATA,
+                              (u32 *)buf);
+
+        /* copy the last nibble */
+        dif_len = len - aligned_len;
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                read_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA +
+                                   i, buf);
+}
+
+static inline int ipw2100_hw_is_adapter_in_system(struct net_device *dev)
+{
+        return (dev->base_addr &&
+                (readl((void *)(dev->base_addr + IPW_REG_DOA_DEBUG_AREA_START))
+                 == IPW_DATA_DOA_DEBUG_VALUE));
+}
+
+int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
+                        void *val, u32 *len)
+{
+        struct ipw2100_ordinals *ordinals = &priv->ordinals;
+        u32 addr;
+        u32 field_info;
+        u16 field_len;
+        u16 field_count;
+        u32 total_length;
+
+        if (ordinals->table1_addr == 0) {
+                IPW_DEBUG_WARNING(DRV_NAME ": attempt to use fw ordinals "
+                       "before they have been loaded.\n");
+                return -EINVAL;
+        }
+
+        if (IS_ORDINAL_TABLE_ONE(ordinals, ord)) {
+                if (*len < IPW_ORD_TAB_1_ENTRY_SIZE) {
+                        *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+
+                        IPW_DEBUG_WARNING(DRV_NAME
+                               ": ordinal buffer length too small, need %zd\n",
+                               IPW_ORD_TAB_1_ENTRY_SIZE);
+
+                        return -EINVAL;
+                }
+
+                read_nic_dword(priv->net_dev, ordinals->table1_addr + (ord << 2),
+                               &addr);
+                read_nic_dword(priv->net_dev, addr, val);
+
+                *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+
+                return 0;
+        }
+
+        if (IS_ORDINAL_TABLE_TWO(ordinals, ord)) {
+
+                ord -= IPW_START_ORD_TAB_2;
+
+                /* get the address of statistic */
+                read_nic_dword(priv->net_dev, ordinals->table2_addr + (ord << 3),
+                               &addr);
+
+                /* get the second DW of statistics ;
+                 * two 16-bit words - first is length, second is count */
+                read_nic_dword(priv->net_dev,
+                               ordinals->table2_addr + (ord << 3) + sizeof(u32),
+                               &field_info);
+
+                /* get each entry length */
+                field_len = *((u16 *)&field_info);
+
+                /* get number of entries */
+                field_count = *(((u16 *)&field_info) + 1);
+
+                /* abort if no enought memory */
+                total_length = field_len * field_count;
+                if (total_length > *len) {
+                        *len = total_length;
+                        return -EINVAL;
+                }
+
+                *len = total_length;
+                if (!total_length)
+                        return 0;
+
+                /* read the ordinal data from the SRAM */
+                read_nic_memory(priv->net_dev, addr, total_length, val);
+
+                return 0;
+        }
+
+        IPW_DEBUG_WARNING(DRV_NAME ": ordinal %d neither in table 1 nor "
+               "in table 2\n", ord);
+
+        return -EINVAL;
+}
+
+static int ipw2100_set_ordinal(struct ipw2100_priv *priv, u32 ord, u32 *val,
+                               u32 *len)
+{
+        struct ipw2100_ordinals *ordinals = &priv->ordinals;
+        u32 addr;
+
+        if (IS_ORDINAL_TABLE_ONE(ordinals, ord)) {
+                if (*len != IPW_ORD_TAB_1_ENTRY_SIZE) {
+                        *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+                        IPW_DEBUG_INFO("wrong size\n");
+                        return -EINVAL;
+                }
+
+                read_nic_dword(priv->net_dev, ordinals->table1_addr + (ord << 2),
+                               &addr);
+
+                write_nic_dword(priv->net_dev, addr, *val);
+
+                *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+
+                return 0;
+        }
+
+        IPW_DEBUG_INFO("wrong table\n");
+        if (IS_ORDINAL_TABLE_TWO(ordinals, ord))
+                return -EINVAL;
+
+        return -EINVAL;
+}
+
+static char *snprint_line(char *buf, size_t count,
+                          const u8 *data, u32 len, u32 ofs)
+{
+        int out, i, j, l;
+        char c;
+
+        out = snprintf(buf, count, "%08X", ofs);
+
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++)
+                        out += snprintf(buf + out, count - out, "%02X ",
+                                        data[(i * 8 + j)]);
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, "   ");
+        }
+
+        out += snprintf(buf + out, count - out, " ");
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++) {
+                        c = data[(i * 8 + j)];
+                        if (!isascii(c) || !isprint(c))
+                                c = '.';
+
+                        out += snprintf(buf + out, count - out, "%c", c);
+                }
+
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, " ");
+        }
+
+        return buf;
+}
+
+static void printk_buf(int level, const u8 *data, u32 len)
+{
+        char line[81];
+        u32 ofs = 0;
+        if (!(ipw2100_debug_level & level))
+                return;
+
+        while (len) {
+                printk(KERN_DEBUG "%s\n",
+                       snprint_line(line, sizeof(line), &data[ofs],
+                                    min(len, 16U), ofs));
+                ofs += 16;
+                len -= min(len, 16U);
+        }
+}
+
+
+
+#define MAX_RESET_BACKOFF 10
+
+static inline void schedule_reset(struct ipw2100_priv *priv)
+{
+        unsigned long now = get_seconds();
+
+        /* If we haven't received a reset request within the backoff period,
+         * then we can reset the backoff interval so this reset occurs
+         * immediately */
+        if (priv->reset_backoff &&
+            (now - priv->last_reset > priv->reset_backoff))
+                priv->reset_backoff = 0;
+
+        priv->last_reset = get_seconds();
+
+        if (!(priv->status & STATUS_RESET_PENDING)) {
+                IPW_DEBUG_INFO("%s: Scheduling firmware restart (%ds).\n",
+                               priv->net_dev->name, priv->reset_backoff);
+                netif_carrier_off(priv->net_dev);
+                netif_stop_queue(priv->net_dev);
+                priv->status |= STATUS_RESET_PENDING;
+                if (priv->reset_backoff)
+                        queue_delayed_work(priv->workqueue, &priv->reset_work,
+                                           priv->reset_backoff * HZ);
+                else
+                        queue_work(priv->workqueue, &priv->reset_work);
+
+                if (priv->reset_backoff < MAX_RESET_BACKOFF)
+                        priv->reset_backoff++;
+
+                wake_up_interruptible(&priv->wait_command_queue);
+        } else
+                IPW_DEBUG_INFO("%s: Firmware restart already in progress.\n",
+                               priv->net_dev->name);
+
+}
+
+#define HOST_COMPLETE_TIMEOUT (2 * HZ)
+static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
+                                   struct host_command * cmd)
+{
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        unsigned long flags;
+        int err = 0;
+
+        IPW_DEBUG_HC("Sending %s command (#%d), %d bytes\n",
+                     command_types[cmd->host_command], cmd->host_command,
+                     cmd->host_command_length);
+        printk_buf(IPW_DL_HC, (u8*)cmd->host_command_parameters,
+                   cmd->host_command_length);
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (priv->fatal_error) {
+                IPW_DEBUG_INFO("Attempt to send command while hardware in fatal error condition.\n");
+                err = -EIO;
+                goto fail_unlock;
+        }
+
+        if (!(priv->status & STATUS_RUNNING)) {
+                IPW_DEBUG_INFO("Attempt to send command while hardware is not running.\n");
+                err = -EIO;
+                goto fail_unlock;
+        }
+
+        if (priv->status & STATUS_CMD_ACTIVE) {
+                IPW_DEBUG_INFO("Attempt to send command while another command is pending.\n");
+                err = -EBUSY;
+                goto fail_unlock;
+        }
+
+        if (list_empty(&priv->msg_free_list)) {
+                IPW_DEBUG_INFO("no available msg buffers\n");
+                goto fail_unlock;
+        }
+
+        priv->status |= STATUS_CMD_ACTIVE;
+        priv->messages_sent++;
+
+        element = priv->msg_free_list.next;
+
+        packet = list_entry(element, struct ipw2100_tx_packet, list);
+        packet->jiffy_start = jiffies;
+
+        /* initialize the firmware command packet */
+        packet->info.c_struct.cmd->host_command_reg = cmd->host_command;
+        packet->info.c_struct.cmd->host_command_reg1 = cmd->host_command1;
+        packet->info.c_struct.cmd->host_command_len_reg = cmd->host_command_length;
+        packet->info.c_struct.cmd->sequence = cmd->host_command_sequence;
+
+        memcpy(packet->info.c_struct.cmd->host_command_params_reg,
+               cmd->host_command_parameters,
+               sizeof(packet->info.c_struct.cmd->host_command_params_reg));
+
+        list_del(element);
+        DEC_STAT(&priv->msg_free_stat);
+
+        list_add_tail(element, &priv->msg_pend_list);
+        INC_STAT(&priv->msg_pend_stat);
+
+        X__ipw2100_tx_send_commands(priv);
+        X__ipw2100_tx_send_data(priv);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        /*
+         * We must wait for this command to complete before another
+         * command can be sent...  but if we wait more than 3 seconds
+         * then there is a problem.
+         */
+
+        err = wait_event_interruptible_timeout(
+                priv->wait_command_queue, !(priv->status & STATUS_CMD_ACTIVE),
+                HOST_COMPLETE_TIMEOUT);
+
+        if (err == 0) {
+                IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
+                               HOST_COMPLETE_TIMEOUT / (HZ / 100));
+                priv->fatal_error = IPW2100_ERR_MSG_TIMEOUT;
+                priv->status &= ~STATUS_CMD_ACTIVE;
+                schedule_reset(priv);
+                return -EIO;
+        }
+
+        if (priv->fatal_error) {
+                IPW_DEBUG_WARNING("%s: firmware fatal error\n",
+                       priv->net_dev->name);
+                return -EIO;
+        }
+
+        /* !!!!! HACK TEST !!!!!
+         * When lots of debug trace statements are enabled, the driver
+         * doesn't seem to have as many firmware restart cycles...
+         *
+         * As a test, we're sticking in a 1/100s delay here */
+        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout(HZ / 100);
+
+        return 0;
+
+ fail_unlock:
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        return err;
+}
+
+
+/*
+ * Verify the values and data access of the hardware
+ * No locks needed or used.  No functions called.
+ */
+static int ipw2100_verify(struct ipw2100_priv *priv)
+{
+        u32 data1, data2;
+        u32 address;
+
+        u32 val1 = 0x76543210;
+        u32 val2 = 0xFEDCBA98;
+
+        /* Domain 0 check - all values should be DOA_DEBUG */
+        for (address = IPW_REG_DOA_DEBUG_AREA_START;
+             address < IPW_REG_DOA_DEBUG_AREA_END;
+             address += sizeof(u32)) {
+                read_register(priv->net_dev, address, &data1);
+                if (data1 != IPW_DATA_DOA_DEBUG_VALUE)
+                        return -EIO;
+        }
+
+        /* Domain 1 check - use arbitrary read/write compare  */
+        for (address = 0; address < 5; address++) {
+                /* The memory area is not used now */
+                write_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x32,
+                               val1);
+                write_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x36,
+                               val2);
+                read_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x32,
+                              &data1);
+                read_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x36,
+                              &data2);
+                if (val1 == data1 && val2 == data2)
+                        return 0;
+        }
+
+        return -EIO;
+}
+
+/*
+ *
+ * Loop until the CARD_DISABLED bit is the same value as the
+ * supplied parameter
+ *
+ * TODO: See if it would be more efficient to do a wait/wake
+ *       cycle and have the completion event trigger the wakeup
+ *
+ */
+#define IPW_CARD_DISABLE_COMPLETE_WAIT              100 // 100 milli
+static int ipw2100_wait_for_card_state(struct ipw2100_priv *priv, int state)
+{
+        int i;
+        u32 card_state;
+        u32 len = sizeof(card_state);
+        int err;
+
+        for (i = 0; i <= IPW_CARD_DISABLE_COMPLETE_WAIT * 1000; i += 50) {
+                err = ipw2100_get_ordinal(priv, IPW_ORD_CARD_DISABLED,
+                                          &card_state, &len);
+                if (err) {
+                        IPW_DEBUG_INFO("Query of CARD_DISABLED ordinal "
+                                       "failed.\n");
+                        return 0;
+                }
+
+                /* We'll break out if either the HW state says it is
+                 * in the state we want, or if HOST_COMPLETE command
+                 * finishes */
+                if ((card_state == state) ||
+                    ((priv->status & STATUS_ENABLED) ?
+                     IPW_HW_STATE_ENABLED : IPW_HW_STATE_DISABLED) == state) {
+                        if (state == IPW_HW_STATE_ENABLED)
+                                priv->status |= STATUS_ENABLED;
+                        else
+                                priv->status &= ~STATUS_ENABLED;
+
+                        return 0;
+                }
+
+                udelay(50);
+        }
+
+        IPW_DEBUG_INFO("ipw2100_wait_for_card_state to %s state timed out\n",
+                       state ? "DISABLED" : "ENABLED");
+        return -EIO;
+}
+
+
+/*********************************************************************
+    Procedure   :   sw_reset_and_clock
+    Purpose     :   Asserts s/w reset, asserts clock initialization
+                    and waits for clock stabilization
+ ********************************************************************/
+static int sw_reset_and_clock(struct ipw2100_priv *priv)
+{
+        int i;
+        u32 r;
+
+        // assert s/w reset
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_SW_RESET);
+
+        // wait for clock stabilization
+        for (i = 0; i < 1000; i++) {
+                udelay(IPW_WAIT_RESET_ARC_COMPLETE_DELAY);
+
+                // check clock ready bit
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &r);
+                if (r & IPW_AUX_HOST_RESET_REG_PRINCETON_RESET)
+                        break;
+        }
+
+        if (i == 1000)
+                return -EIO;    // TODO: better error value
+
+        /* set "initialization complete" bit to move adapter to
+         * D0 state */
+        write_register(priv->net_dev, IPW_REG_GP_CNTRL,
+                       IPW_AUX_HOST_GP_CNTRL_BIT_INIT_DONE);
+
+        /* wait for clock stabilization */
+        for (i = 0; i < 10000; i++) {
+                udelay(IPW_WAIT_CLOCK_STABILIZATION_DELAY * 4);
+
+                /* check clock ready bit */
+                read_register(priv->net_dev, IPW_REG_GP_CNTRL, &r);
+                if (r & IPW_AUX_HOST_GP_CNTRL_BIT_CLOCK_READY)
+                        break;
+        }
+
+        if (i == 10000)
+                return -EIO;    /* TODO: better error value */
+
+        /* set D0 standby bit */
+        read_register(priv->net_dev, IPW_REG_GP_CNTRL, &r);
+        write_register(priv->net_dev, IPW_REG_GP_CNTRL,
+                       r | IPW_AUX_HOST_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY);
+
+        return 0;
+}
+
+/*********************************************************************
+    Procedure   :   ipw2100_download_firmware
+    Purpose     :   Initiaze adapter after power on.
+                    The sequence is:
+                    1. assert s/w reset first!
+                    2. awake clocks & wait for clock stabilization
+                    3. hold ARC (don't ask me why...)
+                    4. load Dino ucode and reset/clock init again
+                    5. zero-out shared mem
+                    6. download f/w
+ *******************************************************************/
+static int ipw2100_download_firmware(struct ipw2100_priv *priv)
+{
+        u32 address;
+        int err;
+
+#ifndef CONFIG_PM
+        /* Fetch the firmware and microcode */
+        struct ipw2100_fw ipw2100_firmware;
+#endif
+
+        if (priv->fatal_error) {
+                IPW_DEBUG_ERROR("%s: ipw2100_download_firmware called after "
+                       "fatal error %d.  Interface must be brought down.\n",
+                       priv->net_dev->name, priv->fatal_error);
+                return -EINVAL;
+        }
+
+#ifdef CONFIG_PM
+        if (!ipw2100_firmware.version) {
+                err = ipw2100_get_firmware(priv, &ipw2100_firmware);
+                if (err) {
+                        IPW_DEBUG_ERROR("%s: ipw2100_get_firmware failed: %d\n",
+                               priv->net_dev->name, err);
+                        priv->fatal_error = IPW2100_ERR_FW_LOAD;
+                        goto fail;
+                }
+        }
+#else
+        err = ipw2100_get_firmware(priv, &ipw2100_firmware);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: ipw2100_get_firmware failed: %d\n",
+                       priv->net_dev->name, err);
+                priv->fatal_error = IPW2100_ERR_FW_LOAD;
+                goto fail;
+        }
+#endif
+        priv->firmware_version = ipw2100_firmware.version;
+
+        /* s/w reset and clock stabilization */
+        err = sw_reset_and_clock(priv);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: sw_reset_and_clock failed: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        err = ipw2100_verify(priv);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: ipw2100_verify failed: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        /* Hold ARC */
+        write_nic_dword(priv->net_dev,
+                        IPW_INTERNAL_REGISTER_HALT_AND_RESET,
+                        0x80000000);
+
+        /* allow ARC to run */
+        write_register(priv->net_dev, IPW_REG_RESET_REG, 0);
+
+        /* load microcode */
+        err = ipw2100_ucode_download(priv, &ipw2100_firmware);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: Error loading microcode: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        /* release ARC */
+        write_nic_dword(priv->net_dev,
+                        IPW_INTERNAL_REGISTER_HALT_AND_RESET,
+                        0x00000000);
+
+        /* s/w reset and clock stabilization (again!!!) */
+        err = sw_reset_and_clock(priv);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: sw_reset_and_clock failed: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        /* load f/w */
+        err = ipw2100_fw_download(priv, &ipw2100_firmware);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: Error loading firmware: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+#ifndef CONFIG_PM
+        /*
+         * When the .resume method of the driver is called, the other
+         * part of the system, i.e. the ide driver could still stay in
+         * the suspend stage. This prevents us from loading the firmware
+         * from the disk.  --YZ
+         */
+
+        /* free any storage allocated for firmware image */
+        ipw2100_release_firmware(priv, &ipw2100_firmware);
+#endif
+
+        /* zero out Domain 1 area indirectly (Si requirement) */
+        for (address = IPW_HOST_FW_SHARED_AREA0;
+             address < IPW_HOST_FW_SHARED_AREA0_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_SHARED_AREA1;
+             address < IPW_HOST_FW_SHARED_AREA1_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_SHARED_AREA2;
+             address < IPW_HOST_FW_SHARED_AREA2_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_SHARED_AREA3;
+             address < IPW_HOST_FW_SHARED_AREA3_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_INTERRUPT_AREA;
+             address < IPW_HOST_FW_INTERRUPT_AREA_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+
+        return 0;
+
+ fail:
+        ipw2100_release_firmware(priv, &ipw2100_firmware);
+        return err;
+}
+
+static inline void ipw2100_enable_interrupts(struct ipw2100_priv *priv)
+{
+        if (priv->status & STATUS_INT_ENABLED)
+                return;
+        priv->status |= STATUS_INT_ENABLED;
+        write_register(priv->net_dev, IPW_REG_INTA_MASK, IPW_INTERRUPT_MASK);
+}
+
+static inline void ipw2100_disable_interrupts(struct ipw2100_priv *priv)
+{
+        if (!(priv->status & STATUS_INT_ENABLED))
+                return;
+        priv->status &= ~STATUS_INT_ENABLED;
+        write_register(priv->net_dev, IPW_REG_INTA_MASK, 0x0);
+}
+
+
+static void ipw2100_initialize_ordinals(struct ipw2100_priv *priv)
+{
+        struct ipw2100_ordinals *ord = &priv->ordinals;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_ORDINALS_TABLE_1,
+                      &ord->table1_addr);
+
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_ORDINALS_TABLE_2,
+                      &ord->table2_addr);
+
+        read_nic_dword(priv->net_dev, ord->table1_addr, &ord->table1_size);
+        read_nic_dword(priv->net_dev, ord->table2_addr, &ord->table2_size);
+
+        ord->table2_size &= 0x0000FFFF;
+
+        IPW_DEBUG_INFO("table 1 size: %d\n", ord->table1_size);
+        IPW_DEBUG_INFO("table 2 size: %d\n", ord->table2_size);
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static inline void ipw2100_hw_set_gpio(struct ipw2100_priv *priv)
+{
+        u32 reg = 0;
+        /*
+         * Set GPIO 3 writable by FW; GPIO 1 writable
+         * by driver and enable clock
+         */
+        reg = (IPW_BIT_GPIO_GPIO3_MASK | IPW_BIT_GPIO_GPIO1_ENABLE |
+               IPW_BIT_GPIO_LED_OFF);
+        write_register(priv->net_dev, IPW_REG_GPIO, reg);
+}
+
+static inline int rf_kill_active(struct ipw2100_priv *priv)
+{
+#define MAX_RF_KILL_CHECKS 5
+#define RF_KILL_CHECK_DELAY 40
+
+        unsigned short value = 0;
+        u32 reg = 0;
+        int i;
+
+        if (!(priv->hw_features & HW_FEATURE_RFKILL)) {
+                priv->status &= ~STATUS_RF_KILL_HW;
+                return 0;
+        }
+
+        for (i = 0; i < MAX_RF_KILL_CHECKS; i++) {
+                udelay(RF_KILL_CHECK_DELAY);
+                read_register(priv->net_dev, IPW_REG_GPIO, &reg);
+                value = (value << 1) | ((reg & IPW_BIT_GPIO_RF_KILL) ? 0 : 1);
+        }
+
+        if (value == 0)
+                priv->status |= STATUS_RF_KILL_HW;
+        else
+                priv->status &= ~STATUS_RF_KILL_HW;
+
+        return (value == 0);
+}
+
+static int ipw2100_get_hw_features(struct ipw2100_priv *priv)
+{
+        u32 addr, len;
+        u32 val;
+
+        /*
+         * EEPROM_SRAM_DB_START_ADDRESS using ordinal in ordinal table 1
+         */
+        len = sizeof(addr);
+        if (ipw2100_get_ordinal(
+                    priv, IPW_ORD_EEPROM_SRAM_DB_BLOCK_START_ADDRESS,
+                    &addr, &len)) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                       __LINE__);
+                return -EIO;
+        }
+
+        IPW_DEBUG_INFO("EEPROM address: %08X\n", addr);
+
+        /*
+         * EEPROM version is the byte at offset 0xfd in firmware
+         * We read 4 bytes, then shift out the byte we actually want */
+        read_nic_dword(priv->net_dev, addr + 0xFC, &val);
+        priv->eeprom_version = (val >> 24) & 0xFF;
+        IPW_DEBUG_INFO("EEPROM version: %d\n", priv->eeprom_version);
+
+        /*
+         *  HW RF Kill enable is bit 0 in byte at offset 0x21 in firmware
+         *
+         *  notice that the EEPROM bit is reverse polarity, i.e.
+         *     bit = 0  signifies HW RF kill switch is supported
+         *     bit = 1  signifies HW RF kill switch is NOT supported
+         */
+        read_nic_dword(priv->net_dev, addr + 0x20, &val);
+        if (!((val >> 24) & 0x01))
+                priv->hw_features |= HW_FEATURE_RFKILL;
+
+        IPW_DEBUG_INFO("HW RF Kill: %ssupported.\n",
+                           (priv->hw_features & HW_FEATURE_RFKILL) ?
+                           "" : "not ");
+
+        return 0;
+}
+
+/*
+ * Start firmware execution after power on and intialization
+ * The sequence is:
+ *  1. Release ARC
+ *  2. Wait for f/w initialization completes;
+ */
+static int ipw2100_start_adapter(struct ipw2100_priv *priv)
+{
+        int i;
+        u32 inta, inta_mask, gpio;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->status & STATUS_RUNNING)
+                return 0;
+
+        /*
+         * Initialize the hw - drive adapter to DO state by setting
+         * init_done bit. Wait for clk_ready bit and Download
+         * fw & dino ucode
+         */
+        if (ipw2100_download_firmware(priv)) {
+                IPW_DEBUG_ERROR("%s: Failed to power on the adapter.\n",
+                       priv->net_dev->name);
+                return -EIO;
+        }
+
+        /* Clear the Tx, Rx and Msg queues and the r/w indexes
+         * in the firmware RBD and TBD ring queue */
+        ipw2100_queues_initialize(priv);
+
+        ipw2100_hw_set_gpio(priv);
+
+        /* TODO -- Look at disabling interrupts here to make sure none
+         * get fired during FW initialization */
+
+        /* Release ARC - clear reset bit */
+        write_register(priv->net_dev, IPW_REG_RESET_REG, 0);
+
+        /* wait for f/w intialization complete */
+        IPW_DEBUG_FW("Waiting for f/w initialization to complete...\n");
+        i = 5000;
+        do {
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(40 * HZ / 1000);
+                /* Todo... wait for sync command ... */
+
+                read_register(priv->net_dev, IPW_REG_INTA, &inta);
+
+                /* check "init done" bit */
+                if (inta & IPW2100_INTA_FW_INIT_DONE) {
+                        /* reset "init done" bit */
+                        write_register(priv->net_dev, IPW_REG_INTA,
+                                       IPW2100_INTA_FW_INIT_DONE);
+                        break;
+                }
+
+                /* check error conditions : we check these after the firmware
+                 * check so that if there is an error, the interrupt handler
+                 * will see it and the adapter will be reset */
+                if (inta &
+                    (IPW2100_INTA_FATAL_ERROR | IPW2100_INTA_PARITY_ERROR)) {
+                        /* clear error conditions */
+                        write_register(priv->net_dev, IPW_REG_INTA,
+                                       IPW2100_INTA_FATAL_ERROR |
+                                       IPW2100_INTA_PARITY_ERROR);
+                }
+        } while (i--);
+
+        /* Clear out any pending INTAs since we aren't supposed to have
+         * interrupts enabled at this point... */
+        read_register(priv->net_dev, IPW_REG_INTA, &inta);
+        read_register(priv->net_dev, IPW_REG_INTA_MASK, &inta_mask);
+        inta &= IPW_INTERRUPT_MASK;
+        /* Clear out any pending interrupts */
+        if (inta & inta_mask)
+                write_register(priv->net_dev, IPW_REG_INTA, inta);
+
+        IPW_DEBUG_FW("f/w initialization complete: %s\n",
+                     i ? "SUCCESS" : "FAILED");
+
+        if (!i) {
+                IPW_DEBUG_WARNING("%s: Firmware did not initialize.\n",
+                       priv->net_dev->name);
+                return -EIO;
+        }
+
+        /* allow firmware to write to GPIO1 & GPIO3 */
+        read_register(priv->net_dev, IPW_REG_GPIO, &gpio);
+
+        gpio |= (IPW_BIT_GPIO_GPIO1_MASK | IPW_BIT_GPIO_GPIO3_MASK);
+
+        write_register(priv->net_dev, IPW_REG_GPIO, gpio);
+
+        /* Ready to receive commands */
+        priv->status |= STATUS_RUNNING;
+
+        /* The adapter has been reset; we are not associated */
+        priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+static inline void ipw2100_reset_fatalerror(struct ipw2100_priv *priv)
+{
+        if (!priv->fatal_error)
+                return;
+
+        priv->fatal_errors[priv->fatal_index++] = priv->fatal_error;
+        priv->fatal_index %= IPW2100_ERROR_QUEUE;
+        priv->fatal_error = 0;
+}
+
+
+/* NOTE: Our interrupt is disabled when this method is called */
+static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
+{
+        u32 reg;
+        int i;
+
+        IPW_DEBUG_INFO("Power cycling the hardware.\n");
+
+        ipw2100_hw_set_gpio(priv);
+
+        /* Step 1. Stop Master Assert */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
+
+        /* Step 2. Wait for stop Master Assert
+         *         (not more then 50us, otherwise ret error */
+        i = 5;
+        do {
+                udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY);
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &reg);
+
+                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
+                        break;
+        }  while(i--);
+
+        priv->status &= ~STATUS_RESET_PENDING;
+
+        if (!i) {
+                IPW_DEBUG_INFO("exit - waited too long for master assert stop\n");
+                return -EIO;
+        }
+
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_SW_RESET);
+
+
+        /* Reset any fatal_error conditions */
+        ipw2100_reset_fatalerror(priv);
+
+        /* At this point, the adapter is now stopped and disabled */
+        priv->status &= ~(STATUS_RUNNING | STATUS_ASSOCIATING |
+                          STATUS_ASSOCIATED | STATUS_ENABLED);
+
+        return 0;
+}
+
+/*
+ * Send the CARD_DISABLE_PHY_OFF comamnd to the card to disable it
+ *
+ * After disabling, if the card was associated, a STATUS_ASSN_LOST will be sent.
+ *
+ * STATUS_CARD_DISABLE_NOTIFICATION will be sent regardless of
+ * if STATUS_ASSN_LOST is sent.
+ */
+static int ipw2100_hw_phy_off(struct ipw2100_priv *priv)
+{
+
+#define HW_PHY_OFF_LOOP_DELAY (HZ / 5000)
+
+        struct host_command cmd = {
+                .host_command = CARD_DISABLE_PHY_OFF,
+                .host_command_sequence = 0,
+                .host_command_length = 0,
+        };
+        int err, i;
+        u32 val1, val2;
+
+        IPW_DEBUG_HC("CARD_DISABLE_PHY_OFF\n");
+
+        /* Turn off the radio */
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        for (i = 0; i < 2500; i++) {
+                read_nic_dword(priv->net_dev, IPW2100_CONTROL_REG, &val1);
+                read_nic_dword(priv->net_dev, IPW2100_COMMAND, &val2);
+
+                if ((val1 & IPW2100_CONTROL_PHY_OFF) &&
+                    (val2 & IPW2100_COMMAND_PHY_OFF))
+                        return 0;
+
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(HW_PHY_OFF_LOOP_DELAY);
+        }
+
+        return -EIO;
+}
+
+
+static int ipw2100_enable_adapter(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = HOST_COMPLETE,
+                .host_command_sequence = 0,
+                .host_command_length = 0
+        };
+        int err = 0;
+
+        IPW_DEBUG_HC("HOST_COMPLETE\n");
+
+        if (priv->status & STATUS_ENABLED)
+                return 0;
+
+        down(&priv->adapter_sem);
+
+        if (rf_kill_active(priv)) {
+                IPW_DEBUG_HC("Command aborted due to RF kill active.\n");
+                goto fail_up;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err) {
+                IPW_DEBUG_INFO("Failed to send HOST_COMPLETE command\n");
+                goto fail_up;
+        }
+
+        err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_ENABLED);
+        if (err) {
+                IPW_DEBUG_INFO(
+                       "%s: card not responding to init command.\n",
+                       priv->net_dev->name);
+                goto fail_up;
+        }
+
+        if (priv->stop_hang_check) {
+                priv->stop_hang_check = 0;
+                queue_delayed_work(priv->workqueue, &priv->hang_check, HZ / 2);
+        }
+
+fail_up:
+        up(&priv->adapter_sem);
+        return err;
+}
+
+static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
+{
+#define HW_POWER_DOWN_DELAY (HZ / 10)
+
+        struct host_command cmd = {
+                .host_command = HOST_PRE_POWER_DOWN,
+                .host_command_sequence = 0,
+                .host_command_length = 0,
+        };
+        int err, i;
+        u32 reg;
+
+        if (!(priv->status & STATUS_RUNNING))
+                return 0;
+
+        priv->status |= STATUS_STOPPING;
+
+        /* We can only shut down the card if the firmware is operational.  So,
+         * if we haven't reset since a fatal_error, then we can not send the
+         * shutdown commands. */
+        if (!priv->fatal_error) {
+                /* First, make sure the adapter is enabled so that the PHY_OFF
+                 * command can shut it down */
+                ipw2100_enable_adapter(priv);
+
+                err = ipw2100_hw_phy_off(priv);
+                if (err)
+                        IPW_DEBUG_WARNING("Error disabling radio %d\n", err);
+
+                /*
+                 * If in D0-standby mode going directly to D3 may cause a
+                 * PCI bus violation.  Therefore we must change out of the D0
+                 * state.
+                 *
+                 * Sending the PREPARE_FOR_POWER_DOWN will restrict the
+                 * hardware from going into standby mode and will transition
+                 * out of D0-standy if it is already in that state.
+                 *
+                 * STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the
+                 * driver upon completion.  Once received, the driver can
+                 * proceed to the D3 state.
+                 *
+                 * Prepare for power down command to fw.  This command would
+                 * take HW out of D0-standby and prepare it for D3 state.
+                 *
+                 * Currently FW does not support event notification for this
+                 * event. Therefore, skip waiting for it.  Just wait a fixed
+                 * 100ms
+                 */
+                IPW_DEBUG_HC("HOST_PRE_POWER_DOWN\n");
+
+                err = ipw2100_hw_send_command(priv, &cmd);
+                if (err)
+                        IPW_DEBUG_WARNING(
+                               "%s: Power down command failed: Error %d\n",
+                               priv->net_dev->name, err);
+                else {
+                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout(HW_POWER_DOWN_DELAY);
+                }
+        }
+
+        priv->status &= ~STATUS_ENABLED;
+
+        /*
+         * Set GPIO 3 writable by FW; GPIO 1 writable
+         * by driver and enable clock
+         */
+        ipw2100_hw_set_gpio(priv);
+
+        /*
+         * Power down adapter.  Sequence:
+         * 1. Stop master assert (RESET_REG[9]=1)
+         * 2. Wait for stop master (RESET_REG[8]==1)
+         * 3. S/w reset assert (RESET_REG[7] = 1)
+         */
+
+        /* Stop master assert */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
+
+        /* wait stop master not more than 50 usec.
+         * Otherwise return error. */
+        for (i = 5; i > 0; i--) {
+                udelay(10);
+
+                /* Check master stop bit */
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &reg);
+
+                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
+                        break;
+        }
+
+        if (i == 0)
+                IPW_DEBUG_WARNING(DRV_NAME
+                       ": %s: Could now power down adapter.\n",
+                       priv->net_dev->name);
+
+        /* assert s/w reset */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_SW_RESET);
+
+        priv->status &= ~(STATUS_RUNNING | STATUS_STOPPING);
+
+        return 0;
+}
+
+
+static int ipw2100_disable_adapter(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = CARD_DISABLE,
+                .host_command_sequence = 0,
+                .host_command_length = 0
+        };
+        int err = 0;
+
+        IPW_DEBUG_HC("CARD_DISABLE\n");
+
+        if (!(priv->status & STATUS_ENABLED))
+                return 0;
+
+        /* Make sure we clear the associated state */
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+
+        if (!priv->stop_hang_check) {
+                priv->stop_hang_check = 1;
+                cancel_delayed_work(&priv->hang_check);
+        }
+
+        down(&priv->adapter_sem);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err) {
+                IPW_DEBUG_WARNING("exit - failed to send CARD_DISABLE command\n");
+                goto fail_up;
+        }
+
+        err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_DISABLED);
+        if (err) {
+                IPW_DEBUG_WARNING("exit - card failed to change to DISABLED\n");
+                goto fail_up;
+        }
+
+        IPW_DEBUG_INFO("TODO: implement scan state machine\n");
+
+fail_up:
+        up(&priv->adapter_sem);
+        return err;
+}
+
+int ipw2100_set_scan_options(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = SET_SCAN_OPTIONS,
+                .host_command_sequence = 0,
+                .host_command_length = 8
+        };
+        int err;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        IPW_DEBUG_SCAN("setting scan options\n");
+
+        cmd.host_command_parameters[0] = 0;
+
+        if (!(priv->config & CFG_ASSOCIATE))
+                cmd.host_command_parameters[0] |= IPW_SCAN_NOASSOCIATE;
+        if ((priv->sec.flags & SEC_ENABLED) && priv->sec.enabled)
+                cmd.host_command_parameters[0] |= IPW_SCAN_MIXED_CELL;
+        if (priv->config & CFG_PASSIVE_SCAN)
+                cmd.host_command_parameters[0] |= IPW_SCAN_PASSIVE;
+
+        cmd.host_command_parameters[1] = priv->channel_mask;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        IPW_DEBUG_HC("SET_SCAN_OPTIONS 0x%04X\n",
+                     cmd.host_command_parameters[0]);
+
+        return err;
+}
+
+int ipw2100_start_scan(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = BROADCAST_SCAN,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        IPW_DEBUG_HC("START_SCAN\n");
+
+        cmd.host_command_parameters[0] = 0;
+
+        /* No scanning if in monitor mode */
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR)
+                return 1;
+
+        if (priv->status & STATUS_SCANNING) {
+                IPW_DEBUG_SCAN("Scan requested while already in scan...\n");
+                return 0;
+        }
+
+        IPW_DEBUG_INFO("enter\n");
+
+        /* Not clearing here; doing so makes iwlist always return nothing...
+         *
+         * We should modify the table logic to use aging tables vs. clearing
+         * the table on each scan start.
+         */
+        IPW_DEBUG_SCAN("starting scan\n");
+
+        priv->status |= STATUS_SCANNING;
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                priv->status &= ~STATUS_SCANNING;
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return err;
+}
+
+static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
+{
+        unsigned long flags;
+        int rc = 0;
+        u32 lock;
+        u32 ord_len = sizeof(lock);
+
+        /* Quite if manually disabled. */
+        if (priv->status & STATUS_RF_KILL_SW) {
+                IPW_DEBUG_INFO("%s: Radio is disabled by Manual Disable "
+                               "switch\n", priv->net_dev->name);
+                return 0;
+        }
+
+        /* If the interrupt is enabled, turn it off... */
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_disable_interrupts(priv);
+
+        /* Reset any fatal_error conditions */
+        ipw2100_reset_fatalerror(priv);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        if (priv->status & STATUS_POWERED ||
+            (priv->status & STATUS_RESET_PENDING)) {
+                /* Power cycle the card ... */
+                if (ipw2100_power_cycle_adapter(priv)) {
+                        IPW_DEBUG_WARNING("%s: Could not cycle adapter.\n",
+                                          priv->net_dev->name);
+                        rc = 1;
+                        goto exit;
+                }
+        } else
+                priv->status |= STATUS_POWERED;
+
+        /* Load the firmware, start the clocks, etc. */
+        if (ipw2100_start_adapter(priv)) {
+                IPW_DEBUG_ERROR("%s: Failed to start the firmware.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        ipw2100_initialize_ordinals(priv);
+
+        /* Determine capabilities of this particular HW configuration */
+        if (ipw2100_get_hw_features(priv)) {
+                IPW_DEBUG_ERROR("%s: Failed to determine HW features.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        lock = LOCK_NONE;
+        if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {
+                IPW_DEBUG_ERROR("%s: Failed to clear ordinal lock.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        priv->status &= ~STATUS_SCANNING;
+
+        if (rf_kill_active(priv)) {
+                printk(KERN_INFO "%s: Radio is disabled by RF switch.\n",
+                       priv->net_dev->name);
+
+                if (priv->stop_rf_kill) {
+                        priv->stop_rf_kill = 0;
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
+                }
+
+                deferred = 1;
+        }
+
+        /* Turn on the interrupt so that commands can be processed */
+        ipw2100_enable_interrupts(priv);
+
+        /* Send all of the commands that must be sent prior to
+         * HOST_COMPLETE */
+        if (ipw2100_adapter_setup(priv)) {
+                IPW_DEBUG_ERROR("%s: Failed to start the card.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        if (!deferred) {
+                /* Enable the adapter - sends HOST_COMPLETE */
+                if (ipw2100_enable_adapter(priv)) {
+                        IPW_DEBUG_ERROR(
+                                "%s: failed in call to enable adapter.\n",
+                                priv->net_dev->name);
+                        ipw2100_hw_stop_adapter(priv);
+                        rc = 1;
+                        goto exit;
+                }
+
+
+                /* Start a scan . . . */
+                ipw2100_set_scan_options(priv);
+                ipw2100_start_scan(priv);
+        }
+
+ exit:
+        return rc;
+}
+
+/* Called by register_netdev() */
+static int ipw2100_net_init(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ipw2100_up(priv, 1);
+}
+
+static void ipw2100_down(struct ipw2100_priv *priv)
+{
+        unsigned long flags;
+        union iwreq_data wrqu = {
+                .ap_addr = {
+                        .sa_family = ARPHRD_ETHER
+                }
+        };
+        int associated = priv->status & STATUS_ASSOCIATED;
+
+        /* Kill the RF switch timer */
+        if (!priv->stop_rf_kill) {
+                priv->stop_rf_kill = 1;
+                cancel_delayed_work(&priv->rf_kill);
+        }
+
+        /* Kill the firmare hang check timer */
+        if (!priv->stop_hang_check) {
+                priv->stop_hang_check = 1;
+                cancel_delayed_work(&priv->hang_check);
+        }
+
+        /* Kill any pending resets */
+        if (priv->status & STATUS_RESET_PENDING)
+                cancel_delayed_work(&priv->reset_work);
+
+        /* Make sure the interrupt is on so that FW commands will be
+         * processed correctly */
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_enable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        if (ipw2100_hw_stop_adapter(priv))
+                IPW_DEBUG_ERROR("%s: Error stopping adapter.\n",
+                       priv->net_dev->name);
+
+        /* Do not disable the interrupt until _after_ we disable
+         * the adaptor.  Otherwise the CARD_DISABLE command will never
+         * be ack'd by the firmware */
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        if (priv->config & CFG_C3_DISABLED) {
+                IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n");
+                acpi_set_cstate_limit(priv->cstate_limit);
+                priv->config &= ~CFG_C3_DISABLED;
+        }
+#endif
+
+        /* We have to signal any supplicant if we are disassociating */
+        if (associated)
+                wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+        netif_carrier_off(priv->net_dev);
+        netif_stop_queue(priv->net_dev);
+}
+
+void ipw2100_reset_adapter(struct ipw2100_priv *priv)
+{
+        unsigned long flags;
+        union iwreq_data wrqu = {
+                .ap_addr = {
+                        .sa_family = ARPHRD_ETHER
+                }
+        };
+        int associated = priv->status & STATUS_ASSOCIATED;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+        IPW_DEBUG_INFO(DRV_NAME ": %s: Restarting adapter.\n",
+                       priv->net_dev->name);
+        priv->resets++;
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+        priv->status |= STATUS_SECURITY_UPDATED;
+
+        /* Force a power cycle even if interface hasn't been opened
+         * yet */
+        cancel_delayed_work(&priv->reset_work);
+        priv->status |= STATUS_RESET_PENDING;
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        down(&priv->action_sem);
+        /* stop timed checks so that they don't interfere with reset */
+        priv->stop_hang_check = 1;
+        cancel_delayed_work(&priv->hang_check);
+
+        /* We have to signal any supplicant if we are disassociating */
+        if (associated)
+                wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+
+        ipw2100_up(priv, 0);
+        up(&priv->action_sem);
+
+}
+
+
+static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
+{
+
+#define MAC_ASSOCIATION_READ_DELAY (HZ)
+        int ret, len, essid_len;
+        char essid[IW_ESSID_MAX_SIZE];
+        u32 txrate;
+        u32 chan;
+        char *txratename;
+        u8 bssid[ETH_ALEN];
+
+        /*
+         * TBD: BSSID is usually 00:00:00:00:00:00 here and not
+         *      an actual MAC of the AP. Seems like FW sets this
+         *      address too late. Read it later and expose through
+         *      /proc or schedule a later task to query and update
+         */
+
+        essid_len = IW_ESSID_MAX_SIZE;
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_SSID,
+                                  essid, &essid_len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+
+        len = sizeof(u32);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE,
+                                  &txrate, &len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+
+        len = sizeof(u32);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_OUR_FREQ, &chan, &len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+        len = ETH_ALEN;
+        ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, &bssid,  &len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+        memcpy(priv->ieee->bssid, bssid, ETH_ALEN);
+
+
+        switch (txrate) {
+        case TX_RATE_1_MBIT:
+                txratename = "1Mbps";
+                break;
+        case TX_RATE_2_MBIT:
+                txratename = "2Mbsp";
+                break;
+        case TX_RATE_5_5_MBIT:
+                txratename = "5.5Mbps";
+                break;
+        case TX_RATE_11_MBIT:
+                txratename = "11Mbps";
+                break;
+        default:
+                IPW_DEBUG_INFO("Unknown rate: %d\n", txrate);
+                txratename = "unknown rate";
+                break;
+        }
+
+        IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID="
+                       MAC_FMT ")\n",
+                       priv->net_dev->name, escape_essid(essid, essid_len),
+                       txratename, chan, MAC_ARG(bssid));
+
+        /* now we copy read ssid into dev */
+        if (!(priv->config & CFG_STATIC_ESSID)) {
+                priv->essid_len = min((u8)essid_len, (u8)IW_ESSID_MAX_SIZE);
+                memcpy(priv->essid, essid, priv->essid_len);
+        }
+        priv->channel = chan;
+        memcpy(priv->bssid, bssid, ETH_ALEN);
+
+        priv->status |= STATUS_ASSOCIATING;
+        priv->connect_start = get_seconds();
+
+        queue_delayed_work(priv->workqueue, &priv->wx_event_work, HZ / 10);
+}
+
+
+int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
+                      int length, int batch_mode)
+{
+        int ssid_len = min(length, IW_ESSID_MAX_SIZE);
+        struct host_command cmd = {
+                .host_command = SSID,
+                .host_command_sequence = 0,
+                .host_command_length = ssid_len
+        };
+        int err;
+
+        IPW_DEBUG_HC("SSID: '%s'\n", escape_essid(essid, ssid_len));
+
+        if (ssid_len)
+                memcpy((char*)cmd.host_command_parameters,
+                       essid, ssid_len);
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        /* Bug in FW currently doesn't honor bit 0 in SET_SCAN_OPTIONS to
+         * disable auto association -- so we cheat by setting a bogus SSID */
+        if (!ssid_len && !(priv->config & CFG_ASSOCIATE)) {
+                int i;
+                u8 *bogus = (u8*)cmd.host_command_parameters;
+                for (i = 0; i < IW_ESSID_MAX_SIZE; i++)
+                        bogus[i] = 0x18 + i;
+                cmd.host_command_length = IW_ESSID_MAX_SIZE;
+        }
+
+        /* NOTE:  We always send the SSID command even if the provided ESSID is
+         * the same as what we currently think is set. */
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (!err) {
+                memset(priv->essid + ssid_len, 0,
+                       IW_ESSID_MAX_SIZE - ssid_len);
+                memcpy(priv->essid, essid, ssid_len);
+                priv->essid_len = ssid_len;
+        }
+
+        if (!batch_mode) {
+                if (ipw2100_enable_adapter(priv))
+                        err = -EIO;
+        }
+
+        return err;
+}
+
+static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                  "disassociated: '%s' " MAC_FMT " \n",
+                  escape_essid(priv->essid, priv->essid_len),
+                  MAC_ARG(priv->bssid));
+
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+
+        if (priv->status & STATUS_STOPPING) {
+                IPW_DEBUG_INFO("Card is stopping itself, discard ASSN_LOST.\n");
+                return;
+        }
+
+        memset(priv->bssid, 0, ETH_ALEN);
+        memset(priv->ieee->bssid, 0, ETH_ALEN);
+
+        netif_carrier_off(priv->net_dev);
+        netif_stop_queue(priv->net_dev);
+
+        if (!(priv->status & STATUS_RUNNING))
+                return;
+
+        if (priv->status & STATUS_SECURITY_UPDATED)
+                queue_work(priv->workqueue, &priv->security_work);
+
+        queue_work(priv->workqueue, &priv->wx_event_work);
+}
+
+static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG_INFO("%s: RF Kill state changed to radio OFF.\n",
+               priv->net_dev->name);
+
+        /* RF_KILL is now enabled (else we wouldn't be here) */
+        priv->status |= STATUS_RF_KILL_HW;
+
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        if (priv->config & CFG_C3_DISABLED) {
+                IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n");
+                acpi_set_cstate_limit(priv->cstate_limit);
+                priv->config &= ~CFG_C3_DISABLED;
+        }
+#endif
+
+        /* Make sure the RF Kill check timer is running */
+        priv->stop_rf_kill = 0;
+        cancel_delayed_work(&priv->rf_kill);
+        queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
+}
+
+static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG_SCAN("scan complete\n");
+        /* Age the scan results... */
+        priv->ieee->scans++;
+        priv->status &= ~STATUS_SCANNING;
+}
+
+#ifdef CONFIG_IPW_DEBUG
+#define IPW2100_HANDLER(v, f) { v, f, # v }
+struct ipw2100_status_indicator {
+        int status;
+        void (*cb)(struct ipw2100_priv *priv, u32 status);
+        char *name;
+};
+#else
+#define IPW2100_HANDLER(v, f) { v, f }
+struct ipw2100_status_indicator {
+        int status;
+        void (*cb)(struct ipw2100_priv *priv, u32 status);
+};
+#endif /* CONFIG_IPW_DEBUG */
+
+static void isr_indicate_scanning(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG_SCAN("Scanning...\n");
+        priv->status |= STATUS_SCANNING;
+}
+
+const struct ipw2100_status_indicator status_handlers[] = {
+        IPW2100_HANDLER(IPW_STATE_INITIALIZED, 0),
+        IPW2100_HANDLER(IPW_STATE_COUNTRY_FOUND, 0),
+        IPW2100_HANDLER(IPW_STATE_ASSOCIATED, isr_indicate_associated),
+        IPW2100_HANDLER(IPW_STATE_ASSN_LOST, isr_indicate_association_lost),
+        IPW2100_HANDLER(IPW_STATE_ASSN_CHANGED, 0),
+        IPW2100_HANDLER(IPW_STATE_SCAN_COMPLETE, isr_scan_complete),
+        IPW2100_HANDLER(IPW_STATE_ENTERED_PSP, 0),
+        IPW2100_HANDLER(IPW_STATE_LEFT_PSP, 0),
+        IPW2100_HANDLER(IPW_STATE_RF_KILL, isr_indicate_rf_kill),
+        IPW2100_HANDLER(IPW_STATE_DISABLED, 0),
+        IPW2100_HANDLER(IPW_STATE_POWER_DOWN, 0),
+        IPW2100_HANDLER(IPW_STATE_SCANNING, isr_indicate_scanning),
+        IPW2100_HANDLER(-1, 0)
+};
+
+
+static void isr_status_change(struct ipw2100_priv *priv, int status)
+{
+        int i;
+
+        if (status == IPW_STATE_SCANNING &&
+            priv->status & STATUS_ASSOCIATED &&
+            !(priv->status & STATUS_SCANNING)) {
+                IPW_DEBUG_INFO("Scan detected while associated, with "
+                               "no scan request.  Restarting firmware.\n");
+
+                /* Wake up any sleeping jobs */
+                schedule_reset(priv);
+        }
+
+        for (i = 0; status_handlers[i].status != -1; i++) {
+                if (status == status_handlers[i].status) {
+                        IPW_DEBUG_NOTIF("Status change: %s\n",
+                                         status_handlers[i].name);
+                        if (status_handlers[i].cb)
+                                status_handlers[i].cb(priv, status);
+                        priv->wstats.status = status;
+                        return;
+                }
+        }
+
+        IPW_DEBUG_NOTIF("unknown status received: %04x\n", status);
+}
+
+static void isr_rx_complete_command(
+        struct ipw2100_priv *priv,
+        struct ipw2100_cmd_header *cmd)
+{
+#ifdef CONFIG_IPW_DEBUG
+        if (cmd->host_command_reg < ARRAY_SIZE(command_types)) {
+                IPW_DEBUG_HC("Command completed '%s (%d)'\n",
+                             command_types[cmd->host_command_reg],
+                             cmd->host_command_reg);
+        }
+#endif
+        if (cmd->host_command_reg == HOST_COMPLETE)
+                priv->status |= STATUS_ENABLED;
+
+        if (cmd->host_command_reg == CARD_DISABLE)
+                priv->status &= ~STATUS_ENABLED;
+
+        priv->status &= ~STATUS_CMD_ACTIVE;
+
+        wake_up_interruptible(&priv->wait_command_queue);
+}
+
+#ifdef CONFIG_IPW_DEBUG
+const char *frame_types[] = {
+        "COMMAND_STATUS_VAL",
+        "STATUS_CHANGE_VAL",
+        "P80211_DATA_VAL",
+        "P8023_DATA_VAL",
+        "HOST_NOTIFICATION_VAL"
+};
+#endif
+
+
+static inline int ipw2100_alloc_skb(
+        struct ipw2100_priv *priv,
+        struct ipw2100_rx_packet *packet)
+{
+        packet->skb = dev_alloc_skb(sizeof(struct ipw2100_rx));
+        if (!packet->skb)
+                return -ENOMEM;
+
+        packet->rxp = (struct ipw2100_rx *)packet->skb->data;
+        packet->dma_addr = pci_map_single(priv->pci_dev, packet->skb->data,
+                                          sizeof(struct ipw2100_rx),
+                                          PCI_DMA_FROMDEVICE);
+        /* NOTE: pci_map_single does not return an error code, and 0 is a valid
+         *       dma_addr */
+
+        return 0;
+}
+
+
+#define SEARCH_ERROR   0xffffffff
+#define SEARCH_FAIL    0xfffffffe
+#define SEARCH_SUCCESS 0xfffffff0
+#define SEARCH_DISCARD 0
+#define SEARCH_SNAPSHOT 1
+
+#define SNAPSHOT_ADDR(ofs) (priv->snapshot[((ofs) >> 12) & 0xff] + ((ofs) & 0xfff))
+static inline int ipw2100_snapshot_alloc(struct ipw2100_priv *priv)
+{
+        int i;
+        if (priv->snapshot[0])
+                return 1;
+        for (i = 0; i < 0x30; i++) {
+                priv->snapshot[i] = (u8*)kmalloc(0x1000, GFP_ATOMIC);
+                if (!priv->snapshot[i]) {
+                        IPW_DEBUG_INFO("%s: Error allocating snapshot "
+                               "buffer %d\n", priv->net_dev->name, i);
+                        while (i > 0)
+                                kfree(priv->snapshot[--i]);
+                        priv->snapshot[0] = NULL;
+                        return 0;
+                }
+        }
+
+        return 1;
+}
+
+static inline void ipw2100_snapshot_free(struct ipw2100_priv *priv)
+{
+        int i;
+        if (!priv->snapshot[0])
+                return;
+        for (i = 0; i < 0x30; i++)
+                kfree(priv->snapshot[i]);
+        priv->snapshot[0] = NULL;
+}
+
+static inline u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 *in_buf,
+                                    size_t len, int mode)
+{
+        u32 i, j;
+        u32 tmp;
+        u8 *s, *d;
+        u32 ret;
+
+        s = in_buf;
+        if (mode == SEARCH_SNAPSHOT) {
+                if (!ipw2100_snapshot_alloc(priv))
+                        mode = SEARCH_DISCARD;
+        }
+
+        for (ret = SEARCH_FAIL, i = 0; i < 0x30000; i += 4) {
+                read_nic_dword(priv->net_dev, i, &tmp);
+                if (mode == SEARCH_SNAPSHOT)
+                        *(u32 *)SNAPSHOT_ADDR(i) = tmp;
+                if (ret == SEARCH_FAIL) {
+                        d = (u8*)&tmp;
+                        for (j = 0; j < 4; j++) {
+                                if (*s != *d) {
+                                        s = in_buf;
+                                        continue;
+                                }
+
+                                s++;
+                                d++;
+
+                                if ((s - in_buf) == len)
+                                        ret = (i + j) - len + 1;
+                        }
+                } else if (mode == SEARCH_DISCARD)
+                        return ret;
+        }
+
+        return ret;
+}
+
+/*
+ *
+ * 0) Disconnect the SKB from the firmware (just unmap)
+ * 1) Pack the ETH header into the SKB
+ * 2) Pass the SKB to the network stack
+ *
+ * When packet is provided by the firmware, it contains the following:
+ *
+ * .  ieee80211_hdr
+ * .  ieee80211_snap_hdr
+ *
+ * The size of the constructed ethernet
+ *
+ */
+#ifdef CONFIG_IPW2100_RX_DEBUG
+u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH];
+#endif
+
+static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv,
+                                               int i)
+{
+#ifdef CONFIG_IPW_DEBUG_C3
+        struct ipw2100_status *status = &priv->status_queue.drv[i];
+        u32 match, reg;
+        int j;
+#endif
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        int limit;
+#endif
+
+        IPW_DEBUG_INFO(DRV_NAME ": PCI latency error detected at "
+                       "0x%04zX.\n", i * sizeof(struct ipw2100_status));
+
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        IPW_DEBUG_INFO(DRV_NAME ": Disabling C3 transitions.\n");
+        limit = acpi_get_cstate_limit();
+        if (limit > 2) {
+                priv->cstate_limit = limit;
+                acpi_set_cstate_limit(2);
+                priv->config |= CFG_C3_DISABLED;
+        }
+#endif
+
+#ifdef CONFIG_IPW_DEBUG_C3
+        /* Halt the fimrware so we can get a good image */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
+        j = 5;
+        do {
+                udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY);
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &reg);
+
+                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
+                        break;
+        }  while (j--);
+
+        match = ipw2100_match_buf(priv, (u8*)status,
+                                  sizeof(struct ipw2100_status),
+                                  SEARCH_SNAPSHOT);
+        if (match < SEARCH_SUCCESS)
+                IPW_DEBUG_INFO("%s: DMA status match in Firmware at "
+                               "offset 0x%06X, length %d:\n",
+                               priv->net_dev->name, match,
+                               sizeof(struct ipw2100_status));
+        else
+                IPW_DEBUG_INFO("%s: No DMA status match in "
+                               "Firmware.\n", priv->net_dev->name);
+
+        printk_buf((u8*)priv->status_queue.drv,
+                   sizeof(struct ipw2100_status) * RX_QUEUE_LENGTH);
+#endif
+
+        priv->fatal_error = IPW2100_ERR_C3_CORRUPTION;
+        priv->ieee->stats.rx_errors++;
+        schedule_reset(priv);
+}
+
+static inline void isr_rx(struct ipw2100_priv *priv, int i,
+                          struct ieee80211_rx_stats *stats)
+{
+        struct ipw2100_status *status = &priv->status_queue.drv[i];
+        struct ipw2100_rx_packet *packet = &priv->rx_buffers[i];
+
+        IPW_DEBUG_RX("Handler...\n");
+
+        if (unlikely(status->frame_size > skb_tailroom(packet->skb))) {
+                IPW_DEBUG_INFO("%s: frame_size (%u) > skb_tailroom (%u)!"
+                               "  Dropping.\n",
+                               priv->net_dev->name,
+                               status->frame_size, skb_tailroom(packet->skb));
+                priv->ieee->stats.rx_errors++;
+                return;
+        }
+
+        if (unlikely(!netif_running(priv->net_dev))) {
+                priv->ieee->stats.rx_errors++;
+                priv->wstats.discard.misc++;
+                IPW_DEBUG_DROP("Dropping packet while interface is not up.\n");
+                return;
+        }
+
+        if (unlikely(priv->ieee->iw_mode == IW_MODE_MONITOR &&
+                     status->flags & IPW_STATUS_FLAG_CRC_ERROR)) {
+                IPW_DEBUG_RX("CRC error in packet.  Dropping.\n");
+                priv->ieee->stats.rx_errors++;
+                return;
+        }
+
+        if (unlikely(priv->ieee->iw_mode != IW_MODE_MONITOR &&
+                !(priv->status & STATUS_ASSOCIATED))) {
+                IPW_DEBUG_DROP("Dropping packet while not associated.\n");
+                priv->wstats.discard.misc++;
+                return;
+        }
+
+
+        pci_unmap_single(priv->pci_dev,
+                         packet->dma_addr,
+                         sizeof(struct ipw2100_rx),
+                         PCI_DMA_FROMDEVICE);
+
+        skb_put(packet->skb, status->frame_size);
+
+#ifdef CONFIG_IPW2100_RX_DEBUG
+        /* Make a copy of the frame so we can dump it to the logs if
+         * ieee80211_rx fails */
+        memcpy(packet_data, packet->skb->data,
+               min_t(u32, status->frame_size, IPW_RX_NIC_BUFFER_LENGTH));
+#endif
+
+        if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {
+#ifdef CONFIG_IPW2100_RX_DEBUG
+                IPW_DEBUG_DROP("%s: Non consumed packet:\n",
+                               priv->net_dev->name);
+                printk_buf(IPW_DL_DROP, packet_data, status->frame_size);
+#endif
+                priv->ieee->stats.rx_errors++;
+
+                /* ieee80211_rx failed, so it didn't free the SKB */
+                dev_kfree_skb_any(packet->skb);
+                packet->skb = NULL;
+        }
+
+        /* We need to allocate a new SKB and attach it to the RDB. */
+        if (unlikely(ipw2100_alloc_skb(priv, packet))) {
+                IPW_DEBUG_WARNING(
+                        "%s: Unable to allocate SKB onto RBD ring - disabling "
+                        "adapter.\n", priv->net_dev->name);
+                /* TODO: schedule adapter shutdown */
+                IPW_DEBUG_INFO("TODO: Shutdown adapter...\n");
+        }
+
+        /* Update the RDB entry */
+        priv->rx_queue.drv[i].host_addr = packet->dma_addr;
+}
+
+static inline int ipw2100_corruption_check(struct ipw2100_priv *priv, int i)
+{
+        struct ipw2100_status *status = &priv->status_queue.drv[i];
+        struct ipw2100_rx *u = priv->rx_buffers[i].rxp;
+        u16 frame_type = status->status_fields & STATUS_TYPE_MASK;
+
+        switch (frame_type) {
+        case COMMAND_STATUS_VAL:
+                return (status->frame_size != sizeof(u->rx_data.command));
+        case STATUS_CHANGE_VAL:
+                return (status->frame_size != sizeof(u->rx_data.status));
+        case HOST_NOTIFICATION_VAL:
+                return (status->frame_size < sizeof(u->rx_data.notification));
+        case P80211_DATA_VAL:
+        case P8023_DATA_VAL:
+#ifdef CONFIG_IPW2100_MONITOR
+                return 0;
+#else
+                switch (WLAN_FC_GET_TYPE(u->rx_data.header.frame_ctl)) {
+                case IEEE80211_FTYPE_MGMT:
+                case IEEE80211_FTYPE_CTL:
+                        return 0;
+                case IEEE80211_FTYPE_DATA:
+                        return (status->frame_size >
+                                IPW_MAX_802_11_PAYLOAD_LENGTH);
+                }
+#endif
+        }
+
+        return 1;
+}
+
+/*
+ * ipw2100 interrupts are disabled at this point, and the ISR
+ * is the only code that calls this method.  So, we do not need
+ * to play with any locks.
+ *
+ * RX Queue works as follows:
+ *
+ * Read index - firmware places packet in entry identified by the
+ *              Read index and advances Read index.  In this manner,
+ *              Read index will always point to the next packet to
+ *              be filled--but not yet valid.
+ *
+ * Write index - driver fills this entry with an unused RBD entry.
+ *               This entry has not filled by the firmware yet.
+ *
+ * In between the W and R indexes are the RBDs that have been received
+ * but not yet processed.
+ *
+ * The process of handling packets will start at WRITE + 1 and advance
+ * until it reaches the READ index.
+ *
+ * The WRITE index is cached in the variable 'priv->rx_queue.next'.
+ *
+ */
+static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
+{
+        struct ipw2100_bd_queue *rxq = &priv->rx_queue;
+        struct ipw2100_status_queue *sq = &priv->status_queue;
+        struct ipw2100_rx_packet *packet;
+        u16 frame_type;
+        u32 r, w, i, s;
+        struct ipw2100_rx *u;
+        struct ieee80211_rx_stats stats = {
+                .mac_time = jiffies,
+        };
+
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_RX_READ_INDEX, &r);
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_RX_WRITE_INDEX, &w);
+
+        if (r >= rxq->entries) {
+                IPW_DEBUG_RX("exit - bad read index\n");
+                return;
+        }
+
+        i = (rxq->next + 1) % rxq->entries;
+        s = i;
+        while (i != r) {
+                /* IPW_DEBUG_RX("r = %d : w = %d : processing = %d\n",
+                   r, rxq->next, i); */
+
+                packet = &priv->rx_buffers[i];
+
+                /* Sync the DMA for the STATUS buffer so CPU is sure to get
+                 * the correct values */
+                pci_dma_sync_single_for_cpu(
+                        priv->pci_dev,
+                        sq->nic + sizeof(struct ipw2100_status) * i,
+                        sizeof(struct ipw2100_status),
+                        PCI_DMA_FROMDEVICE);
+
+                /* Sync the DMA for the RX buffer so CPU is sure to get
+                 * the correct values */
+                pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr,
+                                            sizeof(struct ipw2100_rx),
+                                            PCI_DMA_FROMDEVICE);
+
+                if (unlikely(ipw2100_corruption_check(priv, i))) {
+                        ipw2100_corruption_detected(priv, i);
+                        goto increment;
+                }
+
+                u = packet->rxp;
+                frame_type = sq->drv[i].status_fields &
+                        STATUS_TYPE_MASK;
+                stats.rssi = sq->drv[i].rssi + IPW2100_RSSI_TO_DBM;
+                stats.len = sq->drv[i].frame_size;
+
+                stats.mask = 0;
+                if (stats.rssi != 0)
+                        stats.mask |= IEEE80211_STATMASK_RSSI;
+                stats.freq = IEEE80211_24GHZ_BAND;
+
+                IPW_DEBUG_RX(
+                        "%s: '%s' frame type received (%d).\n",
+                        priv->net_dev->name, frame_types[frame_type],
+                        stats.len);
+
+                switch (frame_type) {
+                case COMMAND_STATUS_VAL:
+                        /* Reset Rx watchdog */
+                        isr_rx_complete_command(
+                                priv, &u->rx_data.command);
+                        break;
+
+                case STATUS_CHANGE_VAL:
+                        isr_status_change(priv, u->rx_data.status);
+                        break;
+
+                case P80211_DATA_VAL:
+                case P8023_DATA_VAL:
+#ifdef CONFIG_IPW2100_MONITOR
+                        if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                                isr_rx(priv, i, &stats);
+                                break;
+                        }
+#endif
+                        if (stats.len < sizeof(u->rx_data.header))
+                                break;
+                        switch (WLAN_FC_GET_TYPE(u->rx_data.header.
+                                                 frame_ctl)) {
+                        case IEEE80211_FTYPE_MGMT:
+                                ieee80211_rx_mgt(priv->ieee,
+                                                 &u->rx_data.header,
+                                                 &stats);
+                                break;
+
+                        case IEEE80211_FTYPE_CTL:
+                                break;
+
+                        case IEEE80211_FTYPE_DATA:
+                                isr_rx(priv, i, &stats);
+                                break;
+
+                        }
+                        break;
+                }
+
+        increment:
+                /* clear status field associated with this RBD */
+                rxq->drv[i].status.info.field = 0;
+
+                i = (i + 1) % rxq->entries;
+        }
+
+        if (i != s) {
+                /* backtrack one entry, wrapping to end if at 0 */
+                rxq->next = (i ? i : rxq->entries) - 1;
+
+                write_register(priv->net_dev,
+                               IPW_MEM_HOST_SHARED_RX_WRITE_INDEX,
+                               rxq->next);
+        }
+}
+
+
+/*
+ * __ipw2100_tx_process
+ *
+ * This routine will determine whether the next packet on
+ * the fw_pend_list has been processed by the firmware yet.
+ *
+ * If not, then it does nothing and returns.
+ *
+ * If so, then it removes the item from the fw_pend_list, frees
+ * any associated storage, and places the item back on the
+ * free list of its source (either msg_free_list or tx_free_list)
+ *
+ * TX Queue works as follows:
+ *
+ * Read index - points to the next TBD that the firmware will
+ *              process.  The firmware will read the data, and once
+ *              done processing, it will advance the Read index.
+ *
+ * Write index - driver fills this entry with an constructed TBD
+ *               entry.  The Write index is not advanced until the
+ *               packet has been configured.
+ *
+ * In between the W and R indexes are the TBDs that have NOT been
+ * processed.  Lagging behind the R index are packets that have
+ * been processed but have not been freed by the driver.
+ *
+ * In order to free old storage, an internal index will be maintained
+ * that points to the next packet to be freed.  When all used
+ * packets have been freed, the oldest index will be the same as the
+ * firmware's read index.
+ *
+ * The OLDEST index is cached in the variable 'priv->tx_queue.oldest'
+ *
+ * Because the TBD structure can not contain arbitrary data, the
+ * driver must keep an internal queue of cached allocations such that
+ * it can put that data back into the tx_free_list and msg_free_list
+ * for use by future command and data packets.
+ *
+ */
+static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
+{
+        struct ipw2100_bd_queue *txq = &priv->tx_queue;
+        struct ipw2100_bd *tbd;
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        int descriptors_used;
+        int e, i;
+        u32 r, w, frag_num = 0;
+
+        if (list_empty(&priv->fw_pend_list))
+                return 0;
+
+        element = priv->fw_pend_list.next;
+
+        packet = list_entry(element, struct ipw2100_tx_packet, list);
+        tbd = &txq->drv[packet->index];
+
+        /* Determine how many TBD entries must be finished... */
+        switch (packet->type) {
+        case COMMAND:
+                /* COMMAND uses only one slot; don't advance */
+                descriptors_used = 1;
+                e = txq->oldest;
+                break;
+
+        case DATA:
+                /* DATA uses two slots; advance and loop position. */
+                descriptors_used = tbd->num_fragments;
+                frag_num = tbd->num_fragments - 1;
+                e = txq->oldest + frag_num;
+                e %= txq->entries;
+                break;
+
+        default:
+                IPW_DEBUG_WARNING("%s: Bad fw_pend_list entry!\n",
+                                   priv->net_dev->name);
+                return 0;
+        }
+
+        /* if the last TBD is not done by NIC yet, then packet is
+         * not ready to be released.
+         *
+         */
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_TX_QUEUE_READ_INDEX,
+                      &r);
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
+                      &w);
+        if (w != txq->next)
+                IPW_DEBUG_WARNING("%s: write index mismatch\n",
+                       priv->net_dev->name);
+
+        /*
+         * txq->next is the index of the last packet written txq->oldest is
+         * the index of the r is the index of the next packet to be read by
+         * firmware
+         */
+
+
+        /*
+         * Quick graphic to help you visualize the following
+         * if / else statement
+         *
+         * ===>|                     s---->|===============
+         *                               e>|
+         * | a | b | c | d | e | f | g | h | i | j | k | l
+         *       r---->|
+         *               w
+         *
+         * w - updated by driver
+         * r - updated by firmware
+         * s - start of oldest BD entry (txq->oldest)
+         * e - end of oldest BD entry
+         *
+         */
+        if (!((r <= w && (e < r || e >= w)) || (e < r && e >= w))) {
+                IPW_DEBUG_TX("exit - no processed packets ready to release.\n");
+                return 0;
+        }
+
+        list_del(element);
+        DEC_STAT(&priv->fw_pend_stat);
+
+#ifdef CONFIG_IPW_DEBUG
+        {
+                int i = txq->oldest;
+                IPW_DEBUG_TX(
+                        "TX%d V=%p P=%04X T=%04X L=%d\n", i,
+                        &txq->drv[i],
+                        (u32)(txq->nic + i * sizeof(struct ipw2100_bd)),
+                        txq->drv[i].host_addr,
+                        txq->drv[i].buf_length);
+
+                if (packet->type == DATA) {
+                        i = (i + 1) % txq->entries;
+
+                        IPW_DEBUG_TX(
+                                "TX%d V=%p P=%04X T=%04X L=%d\n", i,
+                                &txq->drv[i],
+                                (u32)(txq->nic + i *
+                                sizeof(struct ipw2100_bd)),
+                                (u32)txq->drv[i].host_addr,
+                                txq->drv[i].buf_length);
+                }
+        }
+#endif
+
+        switch (packet->type) {
+        case DATA:
+                if (txq->drv[txq->oldest].status.info.fields.txType != 0)
+                        IPW_DEBUG_WARNING("%s: Queue mismatch.  "
+                               "Expecting DATA TBD but pulled "
+                               "something else: ids %d=%d.\n",
+                               priv->net_dev->name, txq->oldest, packet->index);
+
+                /* DATA packet; we have to unmap and free the SKB */
+                priv->ieee->stats.tx_packets++;
+                for (i = 0; i < frag_num; i++) {
+                        tbd = &txq->drv[(packet->index + 1 + i) %
+                                        txq->entries];
+
+                        IPW_DEBUG_TX(
+                                "TX%d P=%08x L=%d\n",
+                                (packet->index + 1 + i) % txq->entries,
+                                tbd->host_addr, tbd->buf_length);
+
+                        pci_unmap_single(priv->pci_dev,
+                                         tbd->host_addr,
+                                         tbd->buf_length,
+                                         PCI_DMA_TODEVICE);
+                }
+
+                priv->ieee->stats.tx_bytes += packet->info.d_struct.txb->payload_size;
+                ieee80211_txb_free(packet->info.d_struct.txb);
+                packet->info.d_struct.txb = NULL;
+
+                list_add_tail(element, &priv->tx_free_list);
+                INC_STAT(&priv->tx_free_stat);
+
+                /* We have a free slot in the Tx queue, so wake up the
+                 * transmit layer if it is stopped. */
+                if (priv->status & STATUS_ASSOCIATED &&
+                    netif_queue_stopped(priv->net_dev)) {
+                        IPW_DEBUG_INFO(KERN_INFO
+                                           "%s: Waking net queue.\n",
+                                           priv->net_dev->name);
+                        netif_wake_queue(priv->net_dev);
+                }
+
+                /* A packet was processed by the hardware, so update the
+                 * watchdog */
+                priv->net_dev->trans_start = jiffies;
+
+                break;
+
+        case COMMAND:
+                if (txq->drv[txq->oldest].status.info.fields.txType != 1)
+                        IPW_DEBUG_WARNING("%s: Queue mismatch.  "
+                               "Expecting COMMAND TBD but pulled "
+                               "something else: ids %d=%d.\n",
+                               priv->net_dev->name, txq->oldest, packet->index);
+
+#ifdef CONFIG_IPW_DEBUG
+                if (packet->info.c_struct.cmd->host_command_reg <
+                    sizeof(command_types) / sizeof(*command_types))
+                        IPW_DEBUG_TX(
+                                "Command '%s (%d)' processed: %d.\n",
+                                command_types[packet->info.c_struct.cmd->host_command_reg],
+                                packet->info.c_struct.cmd->host_command_reg,
+                                packet->info.c_struct.cmd->cmd_status_reg);
+#endif
+
+                list_add_tail(element, &priv->msg_free_list);
+                INC_STAT(&priv->msg_free_stat);
+                break;
+        }
+
+        /* advance oldest used TBD pointer to start of next entry */
+        txq->oldest = (e + 1) % txq->entries;
+        /* increase available TBDs number */
+        txq->available += descriptors_used;
+        SET_STAT(&priv->txq_stat, txq->available);
+
+        IPW_DEBUG_TX("packet latency (send to process)  %ld jiffies\n",
+                         jiffies - packet->jiffy_start);
+
+        return (!list_empty(&priv->fw_pend_list));
+}
+
+
+static inline void __ipw2100_tx_complete(struct ipw2100_priv *priv)
+{
+        int i = 0;
+
+        while (__ipw2100_tx_process(priv) && i < 200) i++;
+
+        if (i == 200) {
+                IPW_DEBUG_WARNING(
+                       "%s: Driver is running slow (%d iters).\n",
+                       priv->net_dev->name, i);
+        }
+}
+
+
+static void X__ipw2100_tx_send_commands(struct ipw2100_priv *priv)
+{
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        struct ipw2100_bd_queue *txq = &priv->tx_queue;
+        struct ipw2100_bd *tbd;
+        int next = txq->next;
+
+        while (!list_empty(&priv->msg_pend_list)) {
+                /* if there isn't enough space in TBD queue, then
+                 * don't stuff a new one in.
+                 * NOTE: 3 are needed as a command will take one,
+                 *       and there is a minimum of 2 that must be
+                 *       maintained between the r and w indexes
+                 */
+                if (txq->available <= 3) {
+                        IPW_DEBUG_TX("no room in tx_queue\n");
+                        break;
+                }
+
+                element = priv->msg_pend_list.next;
+                list_del(element);
+                DEC_STAT(&priv->msg_pend_stat);
+
+                packet = list_entry(element,
+                                    struct ipw2100_tx_packet, list);
+
+                IPW_DEBUG_TX("using TBD at virt=%p, phys=%p\n",
+                                 &txq->drv[txq->next],
+                                 (void*)(txq->nic + txq->next *
+                                         sizeof(struct ipw2100_bd)));
+
+                packet->index = txq->next;
+
+                tbd = &txq->drv[txq->next];
+
+                /* initialize TBD */
+                tbd->host_addr = packet->info.c_struct.cmd_phys;
+                tbd->buf_length = sizeof(struct ipw2100_cmd_header);
+                /* not marking number of fragments causes problems
+                 * with f/w debug version */
+                tbd->num_fragments = 1;
+                tbd->status.info.field =
+                        IPW_BD_STATUS_TX_FRAME_COMMAND |
+                        IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
+
+                /* update TBD queue counters */
+                txq->next++;
+                txq->next %= txq->entries;
+                txq->available--;
+                DEC_STAT(&priv->txq_stat);
+
+                list_add_tail(element, &priv->fw_pend_list);
+                INC_STAT(&priv->fw_pend_stat);
+        }
+
+        if (txq->next != next) {
+                /* kick off the DMA by notifying firmware the
+                 * write index has moved; make sure TBD stores are sync'd */
+                wmb();
+                write_register(priv->net_dev,
+                               IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
+                               txq->next);
+        }
+}
+
+
+/*
+ * X__ipw2100_tx_send_data
+ *
+ */
+static void X__ipw2100_tx_send_data(struct ipw2100_priv *priv)
+{
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        struct ipw2100_bd_queue *txq = &priv->tx_queue;
+        struct ipw2100_bd *tbd;
+        int next = txq->next;
+        int i = 0;
+        struct ipw2100_data_header *ipw_hdr;
+        struct ieee80211_hdr *hdr;
+
+        while (!list_empty(&priv->tx_pend_list)) {
+                /* if there isn't enough space in TBD queue, then
+                 * don't stuff a new one in.
+                 * NOTE: 4 are needed as a data will take two,
+                 *       and there is a minimum of 2 that must be
+                 *       maintained between the r and w indexes
+                 */
+                element = priv->tx_pend_list.next;
+                packet = list_entry(element, struct ipw2100_tx_packet, list);
+
+                if (unlikely(1 + packet->info.d_struct.txb->nr_frags >
+                             IPW_MAX_BDS)) {
+                        /* TODO: Support merging buffers if more than
+                         * IPW_MAX_BDS are used */
+                        IPW_DEBUG_INFO(
+                               "%s: Maximum BD theshold exceeded.  "
+                               "Increase fragmentation level.\n",
+                               priv->net_dev->name);
+                }
+
+                if (txq->available <= 3 +
+                    packet->info.d_struct.txb->nr_frags) {
+                        IPW_DEBUG_TX("no room in tx_queue\n");
+                        break;
+                }
+
+                list_del(element);
+                DEC_STAT(&priv->tx_pend_stat);
+
+                tbd = &txq->drv[txq->next];
+
+                packet->index = txq->next;
+
+                ipw_hdr = packet->info.d_struct.data;
+                hdr = (struct ieee80211_hdr *)packet->info.d_struct.txb->
+                        fragments[0]->data;
+
+                if (priv->ieee->iw_mode == IW_MODE_INFRA) {
+                        /* To DS: Addr1 = BSSID, Addr2 = SA,
+                           Addr3 = DA */
+                        memcpy(ipw_hdr->src_addr, hdr->addr2, ETH_ALEN);
+                        memcpy(ipw_hdr->dst_addr, hdr->addr3, ETH_ALEN);
+                } else if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                        /* not From/To DS: Addr1 = DA, Addr2 = SA,
+                           Addr3 = BSSID */
+                        memcpy(ipw_hdr->src_addr, hdr->addr2, ETH_ALEN);
+                        memcpy(ipw_hdr->dst_addr, hdr->addr1, ETH_ALEN);
+                }
+
+                ipw_hdr->host_command_reg = SEND;
+                ipw_hdr->host_command_reg1 = 0;
+
+                /* For now we only support host based encryption */
+                ipw_hdr->needs_encryption = 0;
+                ipw_hdr->encrypted = packet->info.d_struct.txb->encrypted;
+                if (packet->info.d_struct.txb->nr_frags > 1)
+                        ipw_hdr->fragment_size =
+                                packet->info.d_struct.txb->frag_size - IEEE80211_3ADDR_LEN;
+                else
+                        ipw_hdr->fragment_size = 0;
+
+                tbd->host_addr = packet->info.d_struct.data_phys;
+                tbd->buf_length = sizeof(struct ipw2100_data_header);
+                tbd->num_fragments = 1 + packet->info.d_struct.txb->nr_frags;
+                tbd->status.info.field =
+                        IPW_BD_STATUS_TX_FRAME_802_3 |
+                        IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
+                txq->next++;
+                txq->next %= txq->entries;
+
+                IPW_DEBUG_TX(
+                        "data header tbd TX%d P=%08x L=%d\n",
+                        packet->index, tbd->host_addr,
+                        tbd->buf_length);
+#ifdef CONFIG_IPW_DEBUG
+                if (packet->info.d_struct.txb->nr_frags > 1)
+                        IPW_DEBUG_FRAG("fragment Tx: %d frames\n",
+                                       packet->info.d_struct.txb->nr_frags);
+#endif
+
+                for (i = 0; i < packet->info.d_struct.txb->nr_frags; i++) {
+                        tbd = &txq->drv[txq->next];
+                        if (i == packet->info.d_struct.txb->nr_frags - 1)
+                                tbd->status.info.field =
+                                        IPW_BD_STATUS_TX_FRAME_802_3 |
+                                        IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
+                        else
+                                tbd->status.info.field =
+                                        IPW_BD_STATUS_TX_FRAME_802_3 |
+                                        IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
+
+                        tbd->buf_length = packet->info.d_struct.txb->
+                                fragments[i]->len - IEEE80211_3ADDR_LEN;
+
+                        tbd->host_addr = pci_map_single(
+                                priv->pci_dev,
+                                packet->info.d_struct.txb->fragments[i]->data +
+                                IEEE80211_3ADDR_LEN,
+                                tbd->buf_length,
+                                PCI_DMA_TODEVICE);
+
+                        IPW_DEBUG_TX(
+                                "data frag tbd TX%d P=%08x L=%d\n",
+                                txq->next, tbd->host_addr, tbd->buf_length);
+
+                        pci_dma_sync_single_for_device(
+                                priv->pci_dev, tbd->host_addr,
+                                tbd->buf_length,
+                                PCI_DMA_TODEVICE);
+
+                        txq->next++;
+                        txq->next %= txq->entries;
+                }
+
+                txq->available -= 1 + packet->info.d_struct.txb->nr_frags;
+                SET_STAT(&priv->txq_stat, txq->available);
+
+                list_add_tail(element, &priv->fw_pend_list);
+                INC_STAT(&priv->fw_pend_stat);
+        }
+
+        if (txq->next != next) {
+                /* kick off the DMA by notifying firmware the
+                 * write index has moved; make sure TBD stores are sync'd */
+                write_register(priv->net_dev,
+                               IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
+                               txq->next);
+        }
+        return;
+}
+
+static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
+{
+        struct net_device *dev = priv->net_dev;
+        unsigned long flags;
+        u32 inta, tmp;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_disable_interrupts(priv);
+
+        read_register(dev, IPW_REG_INTA, &inta);
+
+        IPW_DEBUG_ISR("enter - INTA: 0x%08lX\n",
+                      (unsigned long)inta & IPW_INTERRUPT_MASK);
+
+        priv->in_isr++;
+        priv->interrupts++;
+
+        /* We do not loop and keep polling for more interrupts as this
+         * is frowned upon and doesn't play nicely with other potentially
+         * chained IRQs */
+        IPW_DEBUG_ISR("INTA: 0x%08lX\n",
+                      (unsigned long)inta & IPW_INTERRUPT_MASK);
+
+        if (inta & IPW2100_INTA_FATAL_ERROR) {
+                IPW_DEBUG_WARNING(DRV_NAME
+                                  ": Fatal interrupt. Scheduling firmware restart.\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_FATAL_ERROR);
+
+                read_nic_dword(dev, IPW_NIC_FATAL_ERROR, &priv->fatal_error);
+                IPW_DEBUG_INFO("%s: Fatal error value: 0x%08X\n",
+                               priv->net_dev->name, priv->fatal_error);
+
+                read_nic_dword(dev, IPW_ERROR_ADDR(priv->fatal_error), &tmp);
+                IPW_DEBUG_INFO("%s: Fatal error address value: 0x%08X\n",
+                               priv->net_dev->name, tmp);
+
+                /* Wake up any sleeping jobs */
+                schedule_reset(priv);
+        }
+
+        if (inta & IPW2100_INTA_PARITY_ERROR) {
+                IPW_DEBUG_ERROR("***** PARITY ERROR INTERRUPT !!!! \n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_PARITY_ERROR);
+        }
+
+        if (inta & IPW2100_INTA_RX_TRANSFER) {
+                IPW_DEBUG_ISR("RX interrupt\n");
+
+                priv->rx_interrupts++;
+
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_RX_TRANSFER);
+
+                __ipw2100_rx_process(priv);
+                __ipw2100_tx_complete(priv);
+        }
+
+        if (inta & IPW2100_INTA_TX_TRANSFER) {
+                IPW_DEBUG_ISR("TX interrupt\n");
+
+                priv->tx_interrupts++;
+
+                write_register(dev, IPW_REG_INTA,
+                               IPW2100_INTA_TX_TRANSFER);
+
+                __ipw2100_tx_complete(priv);
+                X__ipw2100_tx_send_commands(priv);
+                X__ipw2100_tx_send_data(priv);
+        }
+
+        if (inta & IPW2100_INTA_TX_COMPLETE) {
+                IPW_DEBUG_ISR("TX complete\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_TX_COMPLETE);
+
+                __ipw2100_tx_complete(priv);
+        }
+
+        if (inta & IPW2100_INTA_EVENT_INTERRUPT) {
+                /* ipw2100_handle_event(dev); */
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_EVENT_INTERRUPT);
+        }
+
+        if (inta & IPW2100_INTA_FW_INIT_DONE) {
+                IPW_DEBUG_ISR("FW init done interrupt\n");
+                priv->inta_other++;
+
+                read_register(dev, IPW_REG_INTA, &tmp);
+                if (tmp & (IPW2100_INTA_FATAL_ERROR |
+                           IPW2100_INTA_PARITY_ERROR)) {
+                        write_register(
+                                dev, IPW_REG_INTA,
+                                IPW2100_INTA_FATAL_ERROR |
+                                IPW2100_INTA_PARITY_ERROR);
+                }
+
+                write_register(dev, IPW_REG_INTA,
+                               IPW2100_INTA_FW_INIT_DONE);
+        }
+
+        if (inta & IPW2100_INTA_STATUS_CHANGE) {
+                IPW_DEBUG_ISR("Status change interrupt\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_STATUS_CHANGE);
+        }
+
+        if (inta & IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE) {
+                IPW_DEBUG_ISR("slave host mode interrupt\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE);
+        }
+
+        priv->in_isr--;
+        ipw2100_enable_interrupts(priv);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        IPW_DEBUG_ISR("exit\n");
+}
+
+
+static irqreturn_t ipw2100_interrupt(int irq, void *data,
+                                     struct pt_regs *regs)
+{
+        struct ipw2100_priv *priv = data;
+        u32 inta, inta_mask;
+
+        if (!data)
+                return IRQ_NONE;
+
+        spin_lock(&priv->low_lock);
+
+        /* We check to see if we should be ignoring interrupts before
+         * we touch the hardware.  During ucode load if we try and handle
+         * an interrupt we can cause keyboard problems as well as cause
+         * the ucode to fail to initialize */
+        if (!(priv->status & STATUS_INT_ENABLED)) {
+                /* Shared IRQ */
+                goto none;
+        }
+
+        read_register(priv->net_dev, IPW_REG_INTA_MASK, &inta_mask);
+        read_register(priv->net_dev, IPW_REG_INTA, &inta);
+
+        if (inta == 0xFFFFFFFF) {
+                /* Hardware disappeared */
+                IPW_DEBUG_WARNING("IRQ INTA == 0xFFFFFFFF\n");
+                goto none;
+        }
+
+        inta &= IPW_INTERRUPT_MASK;
+
+        if (!(inta & inta_mask)) {
+                /* Shared interrupt */
+                goto none;
+        }
+
+        /* We disable the hardware interrupt here just to prevent unneeded
+         * calls to be made.  We disable this again within the actual
+         * work tasklet, so if another part of the code re-enables the
+         * interrupt, that is fine */
+        ipw2100_disable_interrupts(priv);
+
+        tasklet_schedule(&priv->irq_tasklet);
+        spin_unlock(&priv->low_lock);
+
+        return IRQ_HANDLED;
+ none:
+        spin_unlock(&priv->low_lock);
+        return IRQ_NONE;
+}
+
+static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                IPW_DEBUG_INFO("Can not transmit when not connected.\n");
+                priv->ieee->stats.tx_carrier_errors++;
+                netif_stop_queue(dev);
+                goto fail_unlock;
+        }
+
+        if (list_empty(&priv->tx_free_list))
+                goto fail_unlock;
+
+        element = priv->tx_free_list.next;
+        packet = list_entry(element, struct ipw2100_tx_packet, list);
+
+        packet->info.d_struct.txb = txb;
+
+        IPW_DEBUG_TX("Sending fragment (%d bytes):\n",
+                         txb->fragments[0]->len);
+        printk_buf(IPW_DL_TX, txb->fragments[0]->data,
+                   txb->fragments[0]->len);
+
+        packet->jiffy_start = jiffies;
+
+        list_del(element);
+        DEC_STAT(&priv->tx_free_stat);
+
+        list_add_tail(element, &priv->tx_pend_list);
+        INC_STAT(&priv->tx_pend_stat);
+
+        X__ipw2100_tx_send_data(priv);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+        return 0;
+
+ fail_unlock:
+        netif_stop_queue(dev);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+        return 1;
+}
+
+
+static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
+{
+        int i, j, err = -EINVAL;
+        void *v;
+        dma_addr_t p;
+
+        priv->msg_buffers = (struct ipw2100_tx_packet *)kmalloc(
+                IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
+                GFP_KERNEL);
+        if (!priv->msg_buffers) {
+                IPW_DEBUG_ERROR("%s: PCI alloc failed for msg "
+                       "buffers.\n", priv->net_dev->name);
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {
+                v = pci_alloc_consistent(
+                        priv->pci_dev,
+                        sizeof(struct ipw2100_cmd_header),
+                        &p);
+                if (!v) {
+                        IPW_DEBUG_ERROR(
+                               "%s: PCI alloc failed for msg "
+                               "buffers.\n",
+                               priv->net_dev->name);
+                        err = -ENOMEM;
+                        break;
+                }
+
+                memset(v, 0, sizeof(struct ipw2100_cmd_header));
+
+                priv->msg_buffers[i].type = COMMAND;
+                priv->msg_buffers[i].info.c_struct.cmd =
+                        (struct ipw2100_cmd_header*)v;
+                priv->msg_buffers[i].info.c_struct.cmd_phys = p;
+        }
+
+        if (i == IPW_COMMAND_POOL_SIZE)
+                return 0;
+
+        for (j = 0; j < i; j++) {
+                pci_free_consistent(
+                        priv->pci_dev,
+                        sizeof(struct ipw2100_cmd_header),
+                        priv->msg_buffers[j].info.c_struct.cmd,
+                        priv->msg_buffers[j].info.c_struct.cmd_phys);
+        }
+
+        kfree(priv->msg_buffers);
+        priv->msg_buffers = NULL;
+
+        return err;
+}
+
+static int ipw2100_msg_initialize(struct ipw2100_priv *priv)
+{
+        int i;
+
+        INIT_LIST_HEAD(&priv->msg_free_list);
+        INIT_LIST_HEAD(&priv->msg_pend_list);
+
+        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++)
+                list_add_tail(&priv->msg_buffers[i].list, &priv->msg_free_list);
+        SET_STAT(&priv->msg_free_stat, i);
+
+        return 0;
+}
+
+static void ipw2100_msg_free(struct ipw2100_priv *priv)
+{
+        int i;
+
+        if (!priv->msg_buffers)
+                return;
+
+        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {
+                pci_free_consistent(priv->pci_dev,
+                                    sizeof(struct ipw2100_cmd_header),
+                                    priv->msg_buffers[i].info.c_struct.cmd,
+                                    priv->msg_buffers[i].info.c_struct.cmd_phys);
+        }
+
+        kfree(priv->msg_buffers);
+        priv->msg_buffers = NULL;
+}
+
+static ssize_t show_pci(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct pci_dev *pci_dev = container_of(d, struct pci_dev, dev);
+        char *out = buf;
+        int i, j;
+        u32 val;
+
+        for (i = 0; i < 16; i++) {
+                out += sprintf(out, "[%08X] ", i * 16);
+                for (j = 0; j < 16; j += 4) {
+                        pci_read_config_dword(pci_dev, i * 16 + j, &val);
+                        out += sprintf(out, "%08X ", val);
+                }
+                out += sprintf(out, "\n");
+        }
+
+        return out - buf;
+}
+static DEVICE_ATTR(pci, S_IRUGO, show_pci, NULL);
+
+static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct ipw2100_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->config);
+}
+static DEVICE_ATTR(cfg, S_IRUGO, show_cfg, NULL);
+
+static ssize_t show_status(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct ipw2100_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->status);
+}
+static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
+
+static ssize_t show_capability(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->capability);
+}
+static DEVICE_ATTR(capability, S_IRUGO, show_capability, NULL);
+
+
+#define IPW2100_REG(x) { IPW_ ##x, #x }
+const struct {
+        u32 addr;
+        const char *name;
+} hw_data[] = {
+        IPW2100_REG(REG_GP_CNTRL),
+        IPW2100_REG(REG_GPIO),
+        IPW2100_REG(REG_INTA),
+        IPW2100_REG(REG_INTA_MASK),
+        IPW2100_REG(REG_RESET_REG),
+};
+#define IPW2100_NIC(x, s) { x, #x, s }
+const struct {
+        u32 addr;
+        const char *name;
+        size_t size;
+} nic_data[] = {
+        IPW2100_NIC(IPW2100_CONTROL_REG, 2),
+        IPW2100_NIC(0x210014, 1),
+        IPW2100_NIC(0x210000, 1),
+};
+#define IPW2100_ORD(x, d) { IPW_ORD_ ##x, #x, d }
+const struct {
+        u8 index;
+        const char *name;
+        const char *desc;
+} ord_data[] = {
+        IPW2100_ORD(STAT_TX_HOST_REQUESTS, "requested Host Tx's (MSDU)"),
+        IPW2100_ORD(STAT_TX_HOST_COMPLETE, "successful Host Tx's (MSDU)"),
+        IPW2100_ORD(STAT_TX_DIR_DATA,      "successful Directed Tx's (MSDU)"),
+        IPW2100_ORD(STAT_TX_DIR_DATA1,     "successful Directed Tx's (MSDU) @ 1MB"),
+        IPW2100_ORD(STAT_TX_DIR_DATA2,     "successful Directed Tx's (MSDU) @ 2MB"),
+        IPW2100_ORD(STAT_TX_DIR_DATA5_5,   "successful Directed Tx's (MSDU) @ 5_5MB"),
+        IPW2100_ORD(STAT_TX_DIR_DATA11,    "successful Directed Tx's (MSDU) @ 11MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA1,   "successful Non_Directed Tx's (MSDU) @ 1MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA2,   "successful Non_Directed Tx's (MSDU) @ 2MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA5_5, "successful Non_Directed Tx's (MSDU) @ 5.5MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA11,  "successful Non_Directed Tx's (MSDU) @ 11MB"),
+        IPW2100_ORD(STAT_NULL_DATA,        "successful NULL data Tx's"),
+        IPW2100_ORD(STAT_TX_RTS,           "successful Tx RTS"),
+        IPW2100_ORD(STAT_TX_CTS,           "successful Tx CTS"),
+        IPW2100_ORD(STAT_TX_ACK,           "successful Tx ACK"),
+        IPW2100_ORD(STAT_TX_ASSN,          "successful Association Tx's"),
+        IPW2100_ORD(STAT_TX_ASSN_RESP,     "successful Association response Tx's"),
+        IPW2100_ORD(STAT_TX_REASSN,        "successful Reassociation Tx's"),
+        IPW2100_ORD(STAT_TX_REASSN_RESP,   "successful Reassociation response Tx's"),
+        IPW2100_ORD(STAT_TX_PROBE,         "probes successfully transmitted"),
+        IPW2100_ORD(STAT_TX_PROBE_RESP,    "probe responses successfully transmitted"),
+        IPW2100_ORD(STAT_TX_BEACON,        "tx beacon"),
+        IPW2100_ORD(STAT_TX_ATIM,          "Tx ATIM"),
+        IPW2100_ORD(STAT_TX_DISASSN,       "successful Disassociation TX"),
+        IPW2100_ORD(STAT_TX_AUTH,          "successful Authentication Tx"),
+        IPW2100_ORD(STAT_TX_DEAUTH,        "successful Deauthentication TX"),
+        IPW2100_ORD(STAT_TX_TOTAL_BYTES,   "Total successful Tx data bytes"),
+        IPW2100_ORD(STAT_TX_RETRIES,       "Tx retries"),
+        IPW2100_ORD(STAT_TX_RETRY1,        "Tx retries at 1MBPS"),
+        IPW2100_ORD(STAT_TX_RETRY2,        "Tx retries at 2MBPS"),
+        IPW2100_ORD(STAT_TX_RETRY5_5,      "Tx retries at 5.5MBPS"),
+        IPW2100_ORD(STAT_TX_RETRY11,       "Tx retries at 11MBPS"),
+        IPW2100_ORD(STAT_TX_FAILURES,      "Tx Failures"),
+        IPW2100_ORD(STAT_TX_MAX_TRIES_IN_HOP,"times max tries in a hop failed"),
+        IPW2100_ORD(STAT_TX_DISASSN_FAIL,       "times disassociation failed"),
+        IPW2100_ORD(STAT_TX_ERR_CTS,         "missed/bad CTS frames"),
+        IPW2100_ORD(STAT_TX_ERR_ACK,    "tx err due to acks"),
+        IPW2100_ORD(STAT_RX_HOST,       "packets passed to host"),
+        IPW2100_ORD(STAT_RX_DIR_DATA,   "directed packets"),
+        IPW2100_ORD(STAT_RX_DIR_DATA1,  "directed packets at 1MB"),
+        IPW2100_ORD(STAT_RX_DIR_DATA2,  "directed packets at 2MB"),
+        IPW2100_ORD(STAT_RX_DIR_DATA5_5,        "directed packets at 5.5MB"),
+        IPW2100_ORD(STAT_RX_DIR_DATA11, "directed packets at 11MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA,"nondirected packets"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA1,        "nondirected packets at 1MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA2,        "nondirected packets at 2MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA5_5,      "nondirected packets at 5.5MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA11,       "nondirected packets at 11MB"),
+        IPW2100_ORD(STAT_RX_NULL_DATA,  "null data rx's"),
+        IPW2100_ORD(STAT_RX_RTS,        "Rx RTS"),
+        IPW2100_ORD(STAT_RX_CTS,        "Rx CTS"),
+        IPW2100_ORD(STAT_RX_ACK,        "Rx ACK"),
+        IPW2100_ORD(STAT_RX_CFEND,      "Rx CF End"),
+        IPW2100_ORD(STAT_RX_CFEND_ACK,  "Rx CF End + CF Ack"),
+        IPW2100_ORD(STAT_RX_ASSN,       "Association Rx's"),
+        IPW2100_ORD(STAT_RX_ASSN_RESP,  "Association response Rx's"),
+        IPW2100_ORD(STAT_RX_REASSN,     "Reassociation Rx's"),
+        IPW2100_ORD(STAT_RX_REASSN_RESP,        "Reassociation response Rx's"),
+        IPW2100_ORD(STAT_RX_PROBE,      "probe Rx's"),
+        IPW2100_ORD(STAT_RX_PROBE_RESP, "probe response Rx's"),
+        IPW2100_ORD(STAT_RX_BEACON,     "Rx beacon"),
+        IPW2100_ORD(STAT_RX_ATIM,       "Rx ATIM"),
+        IPW2100_ORD(STAT_RX_DISASSN,    "disassociation Rx"),
+        IPW2100_ORD(STAT_RX_AUTH,       "authentication Rx"),
+        IPW2100_ORD(STAT_RX_DEAUTH,     "deauthentication Rx"),
+        IPW2100_ORD(STAT_RX_TOTAL_BYTES,"Total rx data bytes received"),
+        IPW2100_ORD(STAT_RX_ERR_CRC,     "packets with Rx CRC error"),
+        IPW2100_ORD(STAT_RX_ERR_CRC1,    "Rx CRC errors at 1MB"),
+        IPW2100_ORD(STAT_RX_ERR_CRC2,    "Rx CRC errors at 2MB"),
+        IPW2100_ORD(STAT_RX_ERR_CRC5_5,  "Rx CRC errors at 5.5MB"),
+        IPW2100_ORD(STAT_RX_ERR_CRC11,   "Rx CRC errors at 11MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE1, "duplicate rx packets at 1MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE2,  "duplicate rx packets at 2MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE5_5,        "duplicate rx packets at 5.5MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE11,         "duplicate rx packets at 11MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE, "duplicate rx packets"),
+        IPW2100_ORD(PERS_DB_LOCK,       "locking fw permanent  db"),
+        IPW2100_ORD(PERS_DB_SIZE,       "size of fw permanent  db"),
+        IPW2100_ORD(PERS_DB_ADDR,       "address of fw permanent  db"),
+        IPW2100_ORD(STAT_RX_INVALID_PROTOCOL,   "rx frames with invalid protocol"),
+        IPW2100_ORD(SYS_BOOT_TIME,      "Boot time"),
+        IPW2100_ORD(STAT_RX_NO_BUFFER,  "rx frames rejected due to no buffer"),
+        IPW2100_ORD(STAT_RX_MISSING_FRAG,       "rx frames dropped due to missing fragment"),
+        IPW2100_ORD(STAT_RX_ORPHAN_FRAG,        "rx frames dropped due to non-sequential fragment"),
+        IPW2100_ORD(STAT_RX_ORPHAN_FRAME,       "rx frames dropped due to unmatched 1st frame"),
+        IPW2100_ORD(STAT_RX_FRAG_AGEOUT,        "rx frames dropped due to uncompleted frame"),
+        IPW2100_ORD(STAT_RX_ICV_ERRORS, "ICV errors during decryption"),
+        IPW2100_ORD(STAT_PSP_SUSPENSION,"times adapter suspended"),
+        IPW2100_ORD(STAT_PSP_BCN_TIMEOUT,       "beacon timeout"),
+        IPW2100_ORD(STAT_PSP_POLL_TIMEOUT,      "poll response timeouts"),
+        IPW2100_ORD(STAT_PSP_NONDIR_TIMEOUT, "timeouts waiting for last {broad,multi}cast pkt"),
+        IPW2100_ORD(STAT_PSP_RX_DTIMS,  "PSP DTIMs received"),
+        IPW2100_ORD(STAT_PSP_RX_TIMS,   "PSP TIMs received"),
+        IPW2100_ORD(STAT_PSP_STATION_ID,"PSP Station ID"),
+        IPW2100_ORD(LAST_ASSN_TIME,     "RTC time of last association"),
+        IPW2100_ORD(STAT_PERCENT_MISSED_BCNS,"current calculation of % missed beacons"),
+        IPW2100_ORD(STAT_PERCENT_RETRIES,"current calculation of % missed tx retries"),
+        IPW2100_ORD(ASSOCIATED_AP_PTR,  "0 if not associated, else pointer to AP table entry"),
+        IPW2100_ORD(AVAILABLE_AP_CNT,   "AP's decsribed in the AP table"),
+        IPW2100_ORD(AP_LIST_PTR,        "Ptr to list of available APs"),
+        IPW2100_ORD(STAT_AP_ASSNS,      "associations"),
+        IPW2100_ORD(STAT_ASSN_FAIL,     "association failures"),
+        IPW2100_ORD(STAT_ASSN_RESP_FAIL,"failures due to response fail"),
+        IPW2100_ORD(STAT_FULL_SCANS,    "full scans"),
+        IPW2100_ORD(CARD_DISABLED,      "Card Disabled"),
+        IPW2100_ORD(STAT_ROAM_INHIBIT,  "times roaming was inhibited due to activity"),
+        IPW2100_ORD(RSSI_AT_ASSN,       "RSSI of associated AP at time of association"),
+        IPW2100_ORD(STAT_ASSN_CAUSE1,   "reassociation: no probe response or TX on hop"),
+        IPW2100_ORD(STAT_ASSN_CAUSE2,   "reassociation: poor tx/rx quality"),
+        IPW2100_ORD(STAT_ASSN_CAUSE3,   "reassociation: tx/rx quality (excessive AP load"),
+        IPW2100_ORD(STAT_ASSN_CAUSE4,   "reassociation: AP RSSI level"),
+        IPW2100_ORD(STAT_ASSN_CAUSE5,   "reassociations due to load leveling"),
+        IPW2100_ORD(STAT_AUTH_FAIL,     "times authentication failed"),
+        IPW2100_ORD(STAT_AUTH_RESP_FAIL,"times authentication response failed"),
+        IPW2100_ORD(STATION_TABLE_CNT,  "entries in association table"),
+        IPW2100_ORD(RSSI_AVG_CURR,      "Current avg RSSI"),
+        IPW2100_ORD(POWER_MGMT_MODE,    "Power mode - 0=CAM, 1=PSP"),
+        IPW2100_ORD(COUNTRY_CODE,       "IEEE country code as recv'd from beacon"),
+        IPW2100_ORD(COUNTRY_CHANNELS,   "channels suported by country"),
+        IPW2100_ORD(RESET_CNT,  "adapter resets (warm)"),
+        IPW2100_ORD(BEACON_INTERVAL,    "Beacon interval"),
+        IPW2100_ORD(ANTENNA_DIVERSITY,  "TRUE if antenna diversity is disabled"),
+        IPW2100_ORD(DTIM_PERIOD,        "beacon intervals between DTIMs"),
+        IPW2100_ORD(OUR_FREQ,   "current radio freq lower digits - channel ID"),
+        IPW2100_ORD(RTC_TIME,   "current RTC time"),
+        IPW2100_ORD(PORT_TYPE,  "operating mode"),
+        IPW2100_ORD(CURRENT_TX_RATE,    "current tx rate"),
+        IPW2100_ORD(SUPPORTED_RATES,    "supported tx rates"),
+        IPW2100_ORD(ATIM_WINDOW,        "current ATIM Window"),
+        IPW2100_ORD(BASIC_RATES,        "basic tx rates"),
+        IPW2100_ORD(NIC_HIGHEST_RATE,   "NIC highest tx rate"),
+        IPW2100_ORD(AP_HIGHEST_RATE,    "AP highest tx rate"),
+        IPW2100_ORD(CAPABILITIES,       "Management frame capability field"),
+        IPW2100_ORD(AUTH_TYPE,  "Type of authentication"),
+        IPW2100_ORD(RADIO_TYPE, "Adapter card platform type"),
+        IPW2100_ORD(RTS_THRESHOLD,      "Min packet length for RTS handshaking"),
+        IPW2100_ORD(INT_MODE,   "International mode"),
+        IPW2100_ORD(FRAGMENTATION_THRESHOLD,    "protocol frag threshold"),
+        IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_START_ADDRESS, "EEPROM offset in SRAM"),
+        IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_SIZE,  "EEPROM size in SRAM"),
+        IPW2100_ORD(EEPROM_SKU_CAPABILITY,      "EEPROM SKU Capability"),
+        IPW2100_ORD(EEPROM_IBSS_11B_CHANNELS,   "EEPROM IBSS 11b channel set"),
+        IPW2100_ORD(MAC_VERSION,        "MAC Version"),
+        IPW2100_ORD(MAC_REVISION,       "MAC Revision"),
+        IPW2100_ORD(RADIO_VERSION,      "Radio Version"),
+        IPW2100_ORD(NIC_MANF_DATE_TIME, "MANF Date/Time STAMP"),
+        IPW2100_ORD(UCODE_VERSION,      "Ucode Version"),
+};
+
+
+static ssize_t show_registers(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        int i;
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        char * out = buf;
+        u32 val = 0;
+
+        out += sprintf(out, "%30s [Address ] : Hex\n", "Register");
+
+        for (i = 0; i < (sizeof(hw_data) / sizeof(*hw_data)); i++) {
+                read_register(dev, hw_data[i].addr, &val);
+                out += sprintf(out, "%30s [%08X] : %08X\n",
+                               hw_data[i].name, hw_data[i].addr, val);
+        }
+
+        return out - buf;
+}
+static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);
+
+
+static ssize_t show_hardware(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        char * out = buf;
+        int i;
+
+        out += sprintf(out, "%30s [Address ] : Hex\n", "NIC entry");
+
+        for (i = 0; i < (sizeof(nic_data) / sizeof(*nic_data)); i++) {
+                u8 tmp8;
+                u16 tmp16;
+                u32 tmp32;
+
+                switch (nic_data[i].size) {
+                case 1:
+                        read_nic_byte(dev, nic_data[i].addr, &tmp8);
+                        out += sprintf(out, "%30s [%08X] : %02X\n",
+                                       nic_data[i].name, nic_data[i].addr,
+                                       tmp8);
+                        break;
+                case 2:
+                        read_nic_word(dev, nic_data[i].addr, &tmp16);
+                        out += sprintf(out, "%30s [%08X] : %04X\n",
+                                       nic_data[i].name, nic_data[i].addr,
+                                       tmp16);
+                        break;
+                case 4:
+                        read_nic_dword(dev, nic_data[i].addr, &tmp32);
+                        out += sprintf(out, "%30s [%08X] : %08X\n",
+                                       nic_data[i].name, nic_data[i].addr,
+                                       tmp32);
+                        break;
+                }
+        }
+        return out - buf;
+}
+static DEVICE_ATTR(hardware, S_IRUGO, show_hardware, NULL);
+
+
+static ssize_t show_memory(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        static unsigned long loop = 0;
+        int len = 0;
+        u32 buffer[4];
+        int i;
+        char line[81];
+
+        if (loop >= 0x30000)
+                loop = 0;
+
+        /* sysfs provides us PAGE_SIZE buffer */
+        while (len < PAGE_SIZE - 128 && loop < 0x30000) {
+
+                if (priv->snapshot[0]) for (i = 0; i < 4; i++)
+                        buffer[i] = *(u32 *)SNAPSHOT_ADDR(loop + i * 4);
+                else for (i = 0; i < 4; i++)
+                        read_nic_dword(dev, loop + i * 4, &buffer[i]);
+
+                if (priv->dump_raw)
+                        len += sprintf(buf + len,
+                                       "%c%c%c%c"
+                                       "%c%c%c%c"
+                                       "%c%c%c%c"
+                                       "%c%c%c%c",
+                                       ((u8*)buffer)[0x0],
+                                       ((u8*)buffer)[0x1],
+                                       ((u8*)buffer)[0x2],
+                                       ((u8*)buffer)[0x3],
+                                       ((u8*)buffer)[0x4],
+                                       ((u8*)buffer)[0x5],
+                                       ((u8*)buffer)[0x6],
+                                       ((u8*)buffer)[0x7],
+                                       ((u8*)buffer)[0x8],
+                                       ((u8*)buffer)[0x9],
+                                       ((u8*)buffer)[0xa],
+                                       ((u8*)buffer)[0xb],
+                                       ((u8*)buffer)[0xc],
+                                       ((u8*)buffer)[0xd],
+                                       ((u8*)buffer)[0xe],
+                                       ((u8*)buffer)[0xf]);
+                else
+                        len += sprintf(buf + len, "%s\n",
+                                       snprint_line(line, sizeof(line),
+                                                    (u8*)buffer, 16, loop));
+                loop += 16;
+        }
+
+        return len;
+}
+
+static ssize_t store_memory(struct device *d, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        const char *p = buf;
+
+        if (count < 1)
+                return count;
+
+        if (p[0] == '1' ||
+            (count >= 2 && tolower(p[0]) == 'o' && tolower(p[1]) == 'n')) {
+                IPW_DEBUG_INFO("%s: Setting memory dump to RAW mode.\n",
+                       dev->name);
+                priv->dump_raw = 1;
+
+        } else if (p[0] == '0' || (count >= 2 && tolower(p[0]) == 'o' &&
+                                  tolower(p[1]) == 'f')) {
+                IPW_DEBUG_INFO("%s: Setting memory dump to HEX mode.\n",
+                       dev->name);
+                priv->dump_raw = 0;
+
+        } else if (tolower(p[0]) == 'r') {
+                IPW_DEBUG_INFO("%s: Resetting firmware snapshot.\n",
+                       dev->name);
+                ipw2100_snapshot_free(priv);
+
+        } else
+                IPW_DEBUG_INFO("%s: Usage: 0|on = HEX, 1|off = RAW, "
+                       "reset = clear memory snapshot\n",
+                       dev->name);
+
+        return count;
+}
+static DEVICE_ATTR(memory, S_IWUSR|S_IRUGO, show_memory, store_memory);
+
+
+static ssize_t show_ordinals(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        u32 val = 0;
+        int len = 0;
+        u32 val_len;
+        static int loop = 0;
+
+        if (loop >= sizeof(ord_data) / sizeof(*ord_data))
+                loop = 0;
+
+        /* sysfs provides us PAGE_SIZE buffer */
+        while (len < PAGE_SIZE - 128 &&
+               loop < (sizeof(ord_data) / sizeof(*ord_data))) {
+
+                val_len = sizeof(u32);
+
+                if (ipw2100_get_ordinal(priv, ord_data[loop].index, &val,
+                                        &val_len))
+                        len += sprintf(buf + len, "[0x%02X] = ERROR    %s\n",
+                                       ord_data[loop].index,
+                                       ord_data[loop].desc);
+                else
+                        len += sprintf(buf + len, "[0x%02X] = 0x%08X %s\n",
+                                       ord_data[loop].index, val,
+                                       ord_data[loop].desc);
+                loop++;
+        }
+
+        return len;
+}
+static DEVICE_ATTR(ordinals, S_IRUGO, show_ordinals, NULL);
+
+
+static ssize_t show_stats(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        char * out = buf;
+
+        out += sprintf(out, "interrupts: %d {tx: %d, rx: %d, other: %d}\n",
+                       priv->interrupts, priv->tx_interrupts,
+                       priv->rx_interrupts, priv->inta_other);
+        out += sprintf(out, "firmware resets: %d\n", priv->resets);
+        out += sprintf(out, "firmware hangs: %d\n", priv->hangs);
+#ifdef CONFIG_IPW_DEBUG
+        out += sprintf(out, "packet mismatch image: %s\n",
+                       priv->snapshot[0] ? "YES" : "NO");
+#endif
+
+        return out - buf;
+}
+static DEVICE_ATTR(stats, S_IRUGO, show_stats, NULL);
+
+
+int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)
+{
+        int err;
+
+        if (mode == priv->ieee->iw_mode)
+                return 0;
+
+        err = ipw2100_disable_adapter(priv);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n",
+                       priv->net_dev->name, err);
+                return err;
+        }
+
+        switch (mode) {
+        case IW_MODE_INFRA:
+                priv->net_dev->type = ARPHRD_ETHER;
+                break;
+        case IW_MODE_ADHOC:
+                priv->net_dev->type = ARPHRD_ETHER;
+                break;
+#ifdef CONFIG_IPW2100_MONITOR
+        case IW_MODE_MONITOR:
+                priv->last_mode = priv->ieee->iw_mode;
+                priv->net_dev->type = ARPHRD_IEEE80211;
+                break;
+#endif /* CONFIG_IPW2100_MONITOR */
+        }
+
+        priv->ieee->iw_mode = mode;
+
+#ifdef CONFIG_PM
+        /* Indicate ipw2100_download_firmware download firmware
+         * from disk instead of memory. */
+        ipw2100_firmware.version = 0;
+#endif
+
+        printk(KERN_INFO "%s: Reseting on mode change.\n",
+                priv->net_dev->name);
+        priv->reset_backoff = 0;
+        schedule_reset(priv);
+
+        return 0;
+}
+
+static ssize_t show_internals(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        int len = 0;
+
+#define DUMP_VAR(x,y) len += sprintf(buf + len, # x ": %" # y "\n", priv-> x)
+
+        if (priv->status & STATUS_ASSOCIATED)
+                len += sprintf(buf + len, "connected: %lu\n",
+                               get_seconds() - priv->connect_start);
+        else
+                len += sprintf(buf + len, "not connected\n");
+
+        DUMP_VAR(ieee->crypt[priv->ieee->tx_keyidx], p);
+        DUMP_VAR(status, 08lx);
+        DUMP_VAR(config, 08lx);
+        DUMP_VAR(capability, 08lx);
+
+        len += sprintf(buf + len, "last_rtc: %lu\n", (unsigned long)priv->last_rtc);
+
+        DUMP_VAR(fatal_error, d);
+        DUMP_VAR(stop_hang_check, d);
+        DUMP_VAR(stop_rf_kill, d);
+        DUMP_VAR(messages_sent, d);
+
+        DUMP_VAR(tx_pend_stat.value, d);
+        DUMP_VAR(tx_pend_stat.hi, d);
+
+        DUMP_VAR(tx_free_stat.value, d);
+        DUMP_VAR(tx_free_stat.lo, d);
+
+        DUMP_VAR(msg_free_stat.value, d);
+        DUMP_VAR(msg_free_stat.lo, d);
+
+        DUMP_VAR(msg_pend_stat.value, d);
+        DUMP_VAR(msg_pend_stat.hi, d);
+
+        DUMP_VAR(fw_pend_stat.value, d);
+        DUMP_VAR(fw_pend_stat.hi, d);
+
+        DUMP_VAR(txq_stat.value, d);
+        DUMP_VAR(txq_stat.lo, d);
+
+        DUMP_VAR(ieee->scans, d);
+        DUMP_VAR(reset_backoff, d);
+
+        return len;
+}
+static DEVICE_ATTR(internals, S_IRUGO, show_internals, NULL);
+
+
+static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        char essid[IW_ESSID_MAX_SIZE + 1];
+        u8 bssid[ETH_ALEN];
+        u32 chan = 0;
+        char * out = buf;
+        int length;
+        int ret;
+
+        memset(essid, 0, sizeof(essid));
+        memset(bssid, 0, sizeof(bssid));
+
+        length = IW_ESSID_MAX_SIZE;
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_SSID, essid, &length);
+        if (ret)
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                               __LINE__);
+
+        length = sizeof(bssid);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID,
+                                  bssid, &length);
+        if (ret)
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                               __LINE__);
+
+        length = sizeof(u32);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_OUR_FREQ, &chan, &length);
+        if (ret)
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                               __LINE__);
+
+        out += sprintf(out, "ESSID: %s\n", essid);
+        out += sprintf(out, "BSSID:   %02x:%02x:%02x:%02x:%02x:%02x\n",
+                       bssid[0], bssid[1], bssid[2],
+                       bssid[3], bssid[4], bssid[5]);
+        out += sprintf(out, "Channel: %d\n", chan);
+
+        return out - buf;
+}
+static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL);
+
+
+#ifdef CONFIG_IPW_DEBUG
+static ssize_t show_debug_level(struct device_driver *d, char *buf)
+{
+        return sprintf(buf, "0x%08X\n", ipw2100_debug_level);
+}
+
+static ssize_t store_debug_level(struct device_driver *d, const char *buf,
+                                 size_t count)
+{
+        char *p = (char *)buf;
+        u32 val;
+
+        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
+                p++;
+                if (p[0] == 'x' || p[0] == 'X')
+                        p++;
+                val = simple_strtoul(p, &p, 16);
+        } else
+                val = simple_strtoul(p, &p, 10);
+        if (p == buf)
+                IPW_DEBUG_INFO(DRV_NAME
+                       ": %s is not in hex or decimal form.\n", buf);
+        else
+                ipw2100_debug_level = val;
+
+        return strnlen(buf, count);
+}
+static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, show_debug_level,
+                   store_debug_level);
+#endif /* CONFIG_IPW_DEBUG */
+
+
+static ssize_t show_fatal_error(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        char *out = buf;
+        int i;
+
+        if (priv->fatal_error)
+                out += sprintf(out, "0x%08X\n",
+                               priv->fatal_error);
+        else
+                out += sprintf(out, "0\n");
+
+        for (i = 1; i <= IPW2100_ERROR_QUEUE; i++) {
+                if (!priv->fatal_errors[(priv->fatal_index - i) %
+                                        IPW2100_ERROR_QUEUE])
+                        continue;
+
+                out += sprintf(out, "%d. 0x%08X\n", i,
+                               priv->fatal_errors[(priv->fatal_index - i) %
+                                                  IPW2100_ERROR_QUEUE]);
+        }
+
+        return out - buf;
+}
+
+static ssize_t store_fatal_error(struct device *d,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        schedule_reset(priv);
+        return count;
+}
+static DEVICE_ATTR(fatal_error, S_IWUSR|S_IRUGO, show_fatal_error, store_fatal_error);
+
+
+static ssize_t show_scan_age(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        return sprintf(buf, "%d\n", priv->ieee->scan_age);
+}
+
+static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        char buffer[] = "00000000";
+        unsigned long len =
+            (sizeof(buffer) - 1) > count ? count : sizeof(buffer) - 1;
+        unsigned long val;
+        char *p = buffer;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        strncpy(buffer, buf, len);
+        buffer[len] = 0;
+
+        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
+                p++;
+                if (p[0] == 'x' || p[0] == 'X')
+                        p++;
+                val = simple_strtoul(p, &p, 16);
+        } else
+                val = simple_strtoul(p, &p, 10);
+        if (p == buffer) {
+                IPW_DEBUG_INFO("%s: user supplied invalid value.\n",
+                       dev->name);
+        } else {
+                priv->ieee->scan_age = val;
+                IPW_DEBUG_INFO("set scan_age = %u\n", priv->ieee->scan_age);
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+        return len;
+}
+static DEVICE_ATTR(scan_age, S_IWUSR | S_IRUGO, show_scan_age, store_scan_age);
+
+
+static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        /* 0 - RF kill not enabled
+           1 - SW based RF kill active (sysfs)
+           2 - HW based RF kill active
+           3 - Both HW and SW baed RF kill active */
+        struct ipw2100_priv *priv = (struct ipw2100_priv *)d->driver_data;
+        int val = ((priv->status & STATUS_RF_KILL_SW) ? 0x1 : 0x0) |
+                (rf_kill_active(priv) ? 0x2 : 0x0);
+        return sprintf(buf, "%i\n", val);
+}
+
+static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)
+{
+        if ((disable_radio ? 1 : 0) ==
+            (priv->status & STATUS_RF_KILL_SW ? 1 : 0))
+                return 0 ;
+
+        IPW_DEBUG_RF_KILL("Manual SW RF Kill set to: RADIO  %s\n",
+                          disable_radio ? "OFF" : "ON");
+
+        down(&priv->action_sem);
+
+        if (disable_radio) {
+                priv->status |= STATUS_RF_KILL_SW;
+                ipw2100_down(priv);
+        } else {
+                priv->status &= ~STATUS_RF_KILL_SW;
+                if (rf_kill_active(priv)) {
+                        IPW_DEBUG_RF_KILL("Can not turn radio back on - "
+                                          "disabled by HW switch\n");
+                        /* Make sure the RF_KILL check timer is running */
+                        priv->stop_rf_kill = 0;
+                        cancel_delayed_work(&priv->rf_kill);
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
+                                           HZ);
+                } else
+                        schedule_reset(priv);
+        }
+
+        up(&priv->action_sem);
+        return 1;
+}
+
+static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        ipw_radio_kill_sw(priv, buf[0] == '1');
+        return count;
+}
+static DEVICE_ATTR(rf_kill, S_IWUSR|S_IRUGO, show_rf_kill, store_rf_kill);
+
+
+static struct attribute *ipw2100_sysfs_entries[] = {
+        &dev_attr_hardware.attr,
+        &dev_attr_registers.attr,
+        &dev_attr_ordinals.attr,
+        &dev_attr_pci.attr,
+        &dev_attr_stats.attr,
+        &dev_attr_internals.attr,
+        &dev_attr_bssinfo.attr,
+        &dev_attr_memory.attr,
+        &dev_attr_scan_age.attr,
+        &dev_attr_fatal_error.attr,
+        &dev_attr_rf_kill.attr,
+        &dev_attr_cfg.attr,
+        &dev_attr_status.attr,
+        &dev_attr_capability.attr,
+        NULL,
+};
+
+static struct attribute_group ipw2100_attribute_group = {
+        .attrs = ipw2100_sysfs_entries,
+};
+
+
+static int status_queue_allocate(struct ipw2100_priv *priv, int entries)
+{
+        struct ipw2100_status_queue *q = &priv->status_queue;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        q->size = entries * sizeof(struct ipw2100_status);
+        q->drv = (struct ipw2100_status *)pci_alloc_consistent(
+                priv->pci_dev, q->size, &q->nic);
+        if (!q->drv) {
+                IPW_DEBUG_WARNING(
+                       "Can not allocate status queue.\n");
+                return -ENOMEM;
+        }
+
+        memset(q->drv, 0, q->size);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+static void status_queue_free(struct ipw2100_priv *priv)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->status_queue.drv) {
+                pci_free_consistent(
+                        priv->pci_dev, priv->status_queue.size,
+                        priv->status_queue.drv, priv->status_queue.nic);
+                priv->status_queue.drv = NULL;
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static int bd_queue_allocate(struct ipw2100_priv *priv,
+                             struct ipw2100_bd_queue *q, int entries)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        memset(q, 0, sizeof(struct ipw2100_bd_queue));
+
+        q->entries = entries;
+        q->size = entries * sizeof(struct ipw2100_bd);
+        q->drv = pci_alloc_consistent(priv->pci_dev, q->size, &q->nic);
+        if (!q->drv) {
+                IPW_DEBUG_INFO("can't allocate shared memory for buffer descriptors\n");
+                return -ENOMEM;
+        }
+        memset(q->drv, 0, q->size);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+static void bd_queue_free(struct ipw2100_priv *priv,
+                          struct ipw2100_bd_queue *q)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        if (!q)
+                return;
+
+        if (q->drv) {
+                pci_free_consistent(priv->pci_dev,
+                                    q->size, q->drv, q->nic);
+                q->drv = NULL;
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static void bd_queue_initialize(
+        struct ipw2100_priv *priv, struct ipw2100_bd_queue * q,
+        u32 base, u32 size, u32 r, u32 w)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        IPW_DEBUG_INFO("initializing bd queue at virt=%p, phys=%08x\n", q->drv, (u32)q->nic);
+
+        write_register(priv->net_dev, base, q->nic);
+        write_register(priv->net_dev, size, q->entries);
+        write_register(priv->net_dev, r, q->oldest);
+        write_register(priv->net_dev, w, q->next);
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static void ipw2100_kill_workqueue(struct ipw2100_priv *priv)
+{
+        if (priv->workqueue) {
+                priv->stop_rf_kill = 1;
+                priv->stop_hang_check = 1;
+                cancel_delayed_work(&priv->reset_work);
+                cancel_delayed_work(&priv->security_work);
+                cancel_delayed_work(&priv->wx_event_work);
+                cancel_delayed_work(&priv->hang_check);
+                cancel_delayed_work(&priv->rf_kill);
+                destroy_workqueue(priv->workqueue);
+                priv->workqueue = NULL;
+        }
+}
+
+static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
+{
+        int i, j, err = -EINVAL;
+        void *v;
+        dma_addr_t p;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        err = bd_queue_allocate(priv, &priv->tx_queue, TX_QUEUE_LENGTH);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: failed bd_queue_allocate\n",
+                       priv->net_dev->name);
+                return err;
+        }
+
+        priv->tx_buffers = (struct ipw2100_tx_packet *)kmalloc(
+                TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet),
+                GFP_ATOMIC);
+        if (!priv->tx_buffers) {
+                IPW_DEBUG_ERROR("%s: alloc failed form tx buffers.\n",
+                       priv->net_dev->name);
+                bd_queue_free(priv, &priv->tx_queue);
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
+                v = pci_alloc_consistent(
+                        priv->pci_dev, sizeof(struct ipw2100_data_header), &p);
+                if (!v) {
+                        IPW_DEBUG_ERROR("%s: PCI alloc failed for tx "
+                               "buffers.\n", priv->net_dev->name);
+                        err = -ENOMEM;
+                        break;
+                }
+
+                priv->tx_buffers[i].type = DATA;
+                priv->tx_buffers[i].info.d_struct.data = (struct ipw2100_data_header*)v;
+                priv->tx_buffers[i].info.d_struct.data_phys = p;
+                priv->tx_buffers[i].info.d_struct.txb = NULL;
+        }
+
+        if (i == TX_PENDED_QUEUE_LENGTH)
+                return 0;
+
+        for (j = 0; j < i; j++) {
+                pci_free_consistent(
+                        priv->pci_dev,
+                        sizeof(struct ipw2100_data_header),
+                        priv->tx_buffers[j].info.d_struct.data,
+                        priv->tx_buffers[j].info.d_struct.data_phys);
+        }
+
+        kfree(priv->tx_buffers);
+        priv->tx_buffers = NULL;
+
+        return err;
+}
+
+static void ipw2100_tx_initialize(struct ipw2100_priv *priv)
+{
+        int i;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        /*
+         * reinitialize packet info lists
+         */
+        INIT_LIST_HEAD(&priv->fw_pend_list);
+        INIT_STAT(&priv->fw_pend_stat);
+
+        /*
+         * reinitialize lists
+         */
+        INIT_LIST_HEAD(&priv->tx_pend_list);
+        INIT_LIST_HEAD(&priv->tx_free_list);
+        INIT_STAT(&priv->tx_pend_stat);
+        INIT_STAT(&priv->tx_free_stat);
+
+        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
+                /* We simply drop any SKBs that have been queued for
+                 * transmit */
+                if (priv->tx_buffers[i].info.d_struct.txb) {
+                        ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.txb);
+                        priv->tx_buffers[i].info.d_struct.txb = NULL;
+                }
+
+                list_add_tail(&priv->tx_buffers[i].list, &priv->tx_free_list);
+        }
+
+        SET_STAT(&priv->tx_free_stat, i);
+
+        priv->tx_queue.oldest = 0;
+        priv->tx_queue.available = priv->tx_queue.entries;
+        priv->tx_queue.next = 0;
+        INIT_STAT(&priv->txq_stat);
+        SET_STAT(&priv->txq_stat, priv->tx_queue.available);
+
+        bd_queue_initialize(priv, &priv->tx_queue,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_BD_BASE,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_BD_SIZE,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_READ_INDEX,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX);
+
+        IPW_DEBUG_INFO("exit\n");
+
+}
+
+static void ipw2100_tx_free(struct ipw2100_priv *priv)
+{
+        int i;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        bd_queue_free(priv, &priv->tx_queue);
+
+        if (!priv->tx_buffers)
+                return;
+
+        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
+                if (priv->tx_buffers[i].info.d_struct.txb) {
+                        ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.txb);
+                        priv->tx_buffers[i].info.d_struct.txb = NULL;
+                }
+                if (priv->tx_buffers[i].info.d_struct.data)
+                        pci_free_consistent(
+                                priv->pci_dev,
+                                sizeof(struct ipw2100_data_header),
+                                priv->tx_buffers[i].info.d_struct.data,
+                                priv->tx_buffers[i].info.d_struct.data_phys);
+        }
+
+        kfree(priv->tx_buffers);
+        priv->tx_buffers = NULL;
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+
+
+static int ipw2100_rx_allocate(struct ipw2100_priv *priv)
+{
+        int i, j, err = -EINVAL;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        err = bd_queue_allocate(priv, &priv->rx_queue, RX_QUEUE_LENGTH);
+        if (err) {
+                IPW_DEBUG_INFO("failed bd_queue_allocate\n");
+                return err;
+        }
+
+        err = status_queue_allocate(priv, RX_QUEUE_LENGTH);
+        if (err) {
+                IPW_DEBUG_INFO("failed status_queue_allocate\n");
+                bd_queue_free(priv, &priv->rx_queue);
+                return err;
+        }
+
+        /*
+         * allocate packets
+         */
+        priv->rx_buffers = (struct ipw2100_rx_packet *)
+            kmalloc(RX_QUEUE_LENGTH * sizeof(struct ipw2100_rx_packet),
+                    GFP_KERNEL);
+        if (!priv->rx_buffers) {
+                IPW_DEBUG_INFO("can't allocate rx packet buffer table\n");
+
+                bd_queue_free(priv, &priv->rx_queue);
+
+                status_queue_free(priv);
+
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < RX_QUEUE_LENGTH; i++) {
+                struct ipw2100_rx_packet *packet = &priv->rx_buffers[i];
+
+                err = ipw2100_alloc_skb(priv, packet);
+                if (unlikely(err)) {
+                        err = -ENOMEM;
+                        break;
+                }
+
+                /* The BD holds the cache aligned address */
+                priv->rx_queue.drv[i].host_addr = packet->dma_addr;
+                priv->rx_queue.drv[i].buf_length = IPW_RX_NIC_BUFFER_LENGTH;
+                priv->status_queue.drv[i].status_fields = 0;
+        }
+
+        if (i == RX_QUEUE_LENGTH)
+                return 0;
+
+        for (j = 0; j < i; j++) {
+                pci_unmap_single(priv->pci_dev, priv->rx_buffers[j].dma_addr,
+                                 sizeof(struct ipw2100_rx_packet),
+                                 PCI_DMA_FROMDEVICE);
+                dev_kfree_skb(priv->rx_buffers[j].skb);
+        }
+
+        kfree(priv->rx_buffers);
+        priv->rx_buffers = NULL;
+
+        bd_queue_free(priv, &priv->rx_queue);
+
+        status_queue_free(priv);
+
+        return err;
+}
+
+static void ipw2100_rx_initialize(struct ipw2100_priv *priv)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        priv->rx_queue.oldest = 0;
+        priv->rx_queue.available = priv->rx_queue.entries - 1;
+        priv->rx_queue.next = priv->rx_queue.entries - 1;
+
+        INIT_STAT(&priv->rxq_stat);
+        SET_STAT(&priv->rxq_stat, priv->rx_queue.available);
+
+        bd_queue_initialize(priv, &priv->rx_queue,
+                            IPW_MEM_HOST_SHARED_RX_BD_BASE,
+                            IPW_MEM_HOST_SHARED_RX_BD_SIZE,
+                            IPW_MEM_HOST_SHARED_RX_READ_INDEX,
+                            IPW_MEM_HOST_SHARED_RX_WRITE_INDEX);
+
+        /* set up the status queue */
+        write_register(priv->net_dev, IPW_MEM_HOST_SHARED_RX_STATUS_BASE,
+                       priv->status_queue.nic);
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static void ipw2100_rx_free(struct ipw2100_priv *priv)
+{
+        int i;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        bd_queue_free(priv, &priv->rx_queue);
+        status_queue_free(priv);
+
+        if (!priv->rx_buffers)
+                return;
+
+        for (i = 0; i < RX_QUEUE_LENGTH; i++) {
+                if (priv->rx_buffers[i].rxp) {
+                        pci_unmap_single(priv->pci_dev,
+                                         priv->rx_buffers[i].dma_addr,
+                                         sizeof(struct ipw2100_rx),
+                                         PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(priv->rx_buffers[i].skb);
+                }
+        }
+
+        kfree(priv->rx_buffers);
+        priv->rx_buffers = NULL;
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
+{
+        u32 length = ETH_ALEN;
+        u8 mac[ETH_ALEN];
+
+        int err;
+
+        err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC,
+                                  mac, &length);
+        if (err) {
+                IPW_DEBUG_INFO("MAC address read failed\n");
+                return -EIO;
+        }
+        IPW_DEBUG_INFO("card MAC is %02X:%02X:%02X:%02X:%02X:%02X\n",
+               mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+        memcpy(priv->net_dev->dev_addr, mac, ETH_ALEN);
+
+        return 0;
+}
+
+/********************************************************************
+ *
+ * Firmware Commands
+ *
+ ********************************************************************/
+
+int ipw2100_set_mac_address(struct ipw2100_priv *priv, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = ADAPTER_ADDRESS,
+                .host_command_sequence = 0,
+                .host_command_length = ETH_ALEN
+        };
+        int err;
+
+        IPW_DEBUG_HC("SET_MAC_ADDRESS\n");
+
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->config & CFG_CUSTOM_MAC) {
+                memcpy(cmd.host_command_parameters, priv->mac_addr,
+                       ETH_ALEN);
+                memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+        } else
+                memcpy(cmd.host_command_parameters, priv->net_dev->dev_addr,
+                       ETH_ALEN);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        IPW_DEBUG_INFO("exit\n");
+        return err;
+}
+
+int ipw2100_set_port_type(struct ipw2100_priv *priv, u32 port_type,
+                                 int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = PORT_TYPE,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(u32)
+        };
+        int err;
+
+        switch (port_type) {
+        case IW_MODE_INFRA:
+                cmd.host_command_parameters[0] = IPW_BSS;
+                break;
+        case IW_MODE_ADHOC:
+                cmd.host_command_parameters[0] = IPW_IBSS;
+                break;
+        }
+
+        IPW_DEBUG_HC("PORT_TYPE: %s\n",
+                     port_type == IPW_IBSS ? "Ad-Hoc" : "Managed");
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err) {
+                        IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+
+int ipw2100_set_channel(struct ipw2100_priv *priv, u32 channel, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = CHANNEL,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(u32)
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = channel;
+
+        IPW_DEBUG_HC("CHANNEL: %d\n", channel);
+
+        /* If BSS then we don't support channel selection */
+        if (priv->ieee->iw_mode == IW_MODE_INFRA)
+                return 0;
+
+        if ((channel != 0) &&
+            ((channel < REG_MIN_CHANNEL) || (channel > REG_MAX_CHANNEL)))
+                return -EINVAL;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err) {
+                IPW_DEBUG_INFO("Failed to set channel to %d",
+                               channel);
+                return err;
+        }
+
+        if (channel)
+                priv->config |= CFG_STATIC_CHANNEL;
+        else
+                priv->config &= ~CFG_STATIC_CHANNEL;
+
+        priv->channel = channel;
+
+        if (!batch_mode) {
+                err = ipw2100_enable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+int ipw2100_system_config(struct ipw2100_priv *priv, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = SYSTEM_CONFIG,
+                .host_command_sequence = 0,
+                .host_command_length = 12,
+        };
+        u32 ibss_mask, len = sizeof(u32);
+        int err;
+
+        /* Set system configuration */
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC)
+                cmd.host_command_parameters[0] |= IPW_CFG_IBSS_AUTO_START;
+
+        cmd.host_command_parameters[0] |= IPW_CFG_IBSS_MASK |
+                IPW_CFG_BSS_MASK |
+                IPW_CFG_802_1x_ENABLE;
+
+        if (!(priv->config & CFG_LONG_PREAMBLE))
+                cmd.host_command_parameters[0] |= IPW_CFG_PREAMBLE_AUTO;
+
+        err = ipw2100_get_ordinal(priv,
+                                  IPW_ORD_EEPROM_IBSS_11B_CHANNELS,
+                                  &ibss_mask,  &len);
+        if (err)
+                ibss_mask = IPW_IBSS_11B_DEFAULT_MASK;
+
+        cmd.host_command_parameters[1] = REG_CHANNEL_MASK;
+        cmd.host_command_parameters[2] = REG_CHANNEL_MASK & ibss_mask;
+
+        /* 11b only */
+        /*cmd.host_command_parameters[0] |= DIVERSITY_ANTENNA_A;*/
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+/* If IPv6 is configured in the kernel then we don't want to filter out all
+ * of the multicast packets as IPv6 needs some. */
+#if !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)
+        cmd.host_command = ADD_MULTICAST;
+        cmd.host_command_sequence = 0;
+        cmd.host_command_length = 0;
+
+        ipw2100_hw_send_command(priv, &cmd);
+#endif
+        if (!batch_mode) {
+                err = ipw2100_enable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+int ipw2100_set_tx_rates(struct ipw2100_priv *priv, u32 rate, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = BASIC_TX_RATES,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = rate & TX_RATE_MASK;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        /* Set BASIC TX Rate first */
+        ipw2100_hw_send_command(priv, &cmd);
+
+        /* Set TX Rate */
+        cmd.host_command = TX_RATES;
+        ipw2100_hw_send_command(priv, &cmd);
+
+        /* Set MSDU TX Rate */
+        cmd.host_command = MSDU_TX_RATES;
+        ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode) {
+                err = ipw2100_enable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        priv->tx_rates = rate;
+
+        return 0;
+}
+
+int ipw2100_set_power_mode(struct ipw2100_priv *priv,
+                           int power_level)
+{
+        struct host_command cmd = {
+                .host_command = POWER_MODE,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = power_level;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        if (power_level == IPW_POWER_MODE_CAM)
+                priv->power_mode = IPW_POWER_LEVEL(priv->power_mode);
+        else
+                priv->power_mode = IPW_POWER_ENABLED | power_level;
+
+#ifdef CONFIG_IPW2100_TX_POWER
+        if (priv->port_type == IBSS &&
+            priv->adhoc_power != DFTL_IBSS_TX_POWER) {
+                /* Set beacon interval */
+                cmd.host_command = TX_POWER_INDEX;
+                cmd.host_command_parameters[0] = (u32)priv->adhoc_power;
+
+                err = ipw2100_hw_send_command(priv, &cmd);
+                if (err)
+                        return err;
+        }
+#endif
+
+        return 0;
+}
+
+
+int ipw2100_set_rts_threshold(struct ipw2100_priv *priv, u32 threshold)
+{
+        struct host_command cmd = {
+                .host_command = RTS_THRESHOLD,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        if (threshold & RTS_DISABLED)
+                cmd.host_command_parameters[0] = MAX_RTS_THRESHOLD;
+        else
+                cmd.host_command_parameters[0] = threshold & ~RTS_DISABLED;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        priv->rts_threshold = threshold;
+
+        return 0;
+}
+
+#if 0
+int ipw2100_set_fragmentation_threshold(struct ipw2100_priv *priv,
+                                        u32 threshold, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = FRAG_THRESHOLD,
+                .host_command_sequence = 0,
+                .host_command_length = 4,
+                .host_command_parameters[0] = 0,
+        };
+        int err;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        if (threshold == 0)
+                threshold = DEFAULT_FRAG_THRESHOLD;
+        else {
+                threshold = max(threshold, MIN_FRAG_THRESHOLD);
+                threshold = min(threshold, MAX_FRAG_THRESHOLD);
+        }
+
+        cmd.host_command_parameters[0] = threshold;
+
+        IPW_DEBUG_HC("FRAG_THRESHOLD: %u\n", threshold);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        if (!err)
+                priv->frag_threshold = threshold;
+
+        return err;
+}
+#endif
+
+int ipw2100_set_short_retry(struct ipw2100_priv *priv, u32 retry)
+{
+        struct host_command cmd = {
+                .host_command = SHORT_RETRY_LIMIT,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = retry;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        priv->short_retry_limit = retry;
+
+        return 0;
+}
+
+int ipw2100_set_long_retry(struct ipw2100_priv *priv, u32 retry)
+{
+        struct host_command cmd = {
+                .host_command = LONG_RETRY_LIMIT,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = retry;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        priv->long_retry_limit = retry;
+
+        return 0;
+}
+
+
+int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 *bssid,
+                                int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = MANDATORY_BSSID,
+                .host_command_sequence = 0,
+                .host_command_length = (bssid == NULL) ? 0 : ETH_ALEN
+        };
+        int err;
+
+#ifdef CONFIG_IPW_DEBUG
+        if (bssid != NULL)
+                IPW_DEBUG_HC(
+                        "MANDATORY_BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
+                        bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
+                        bssid[5]);
+        else
+                IPW_DEBUG_HC("MANDATORY_BSSID: <clear>\n");
+#endif
+        /* if BSSID is empty then we disable mandatory bssid mode */
+        if (bssid != NULL)
+                memcpy((u8 *)cmd.host_command_parameters, bssid, ETH_ALEN);
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+#ifdef CONFIG_IEEE80211_WPA
+static int ipw2100_disassociate_bssid(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = DISASSOCIATION_BSSID,
+                .host_command_sequence = 0,
+                .host_command_length = ETH_ALEN
+        };
+        int err;
+        int len;
+
+        IPW_DEBUG_HC("DISASSOCIATION_BSSID\n");
+
+        len = ETH_ALEN;
+        /* The Firmware currently ignores the BSSID and just disassociates from
+         * the currently associated AP -- but in the off chance that a future
+         * firmware does use the BSSID provided here, we go ahead and try and
+         * set it to the currently associated AP's BSSID */
+        memcpy(cmd.host_command_parameters, priv->bssid, ETH_ALEN);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        return err;
+}
+#endif
+
+/*
+ * Pseudo code for setting up wpa_frame:
+ */
+#if 0
+void x(struct ieee80211_assoc_frame *wpa_assoc)
+{
+        struct ipw2100_wpa_assoc_frame frame;
+        frame->fixed_ie_mask = IPW_WPA_CAPABILTIES |
+                IPW_WPA_LISTENINTERVAL |
+                IPW_WPA_AP_ADDRESS;
+        frame->capab_info = wpa_assoc->capab_info;
+        frame->lisen_interval = wpa_assoc->listent_interval;
+        memcpy(frame->current_ap, wpa_assoc->current_ap, ETH_ALEN);
+
+        /* UNKNOWN -- I'm not postivive about this part; don't have any WPA
+         * setup here to test it with.
+         *
+         * Walk the IEs in the wpa_assoc and figure out the total size of all
+         * that data.  Stick that into frame->var_ie_len.  Then memcpy() all of
+         * the IEs from wpa_frame into frame.
+         */
+        frame->var_ie_len = calculate_ie_len(wpa_assoc);
+        memcpy(frame->var_ie,  wpa_assoc->variable, frame->var_ie_len);
+
+        ipw2100_set_wpa_ie(priv, &frame, 0);
+}
+#endif
+
+
+
+
+static int ipw2100_set_wpa_ie(struct ipw2100_priv *,
+                              struct ipw2100_wpa_assoc_frame *, int)
+__attribute__ ((unused));
+
+static int ipw2100_set_wpa_ie(struct ipw2100_priv *priv,
+                              struct ipw2100_wpa_assoc_frame *wpa_frame,
+                              int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = SET_WPA_IE,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(struct ipw2100_wpa_assoc_frame),
+        };
+        int err;
+
+        IPW_DEBUG_HC("SET_WPA_IE\n");
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        memcpy(cmd.host_command_parameters, wpa_frame,
+               sizeof(struct ipw2100_wpa_assoc_frame));
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode) {
+                if (ipw2100_enable_adapter(priv))
+                        err = -EIO;
+        }
+
+        return err;
+}
+
+struct security_info_params {
+        u32 allowed_ciphers;
+        u16 version;
+        u8 auth_mode;
+        u8 replay_counters_number;
+        u8 unicast_using_group;
+} __attribute__ ((packed));
+
+int ipw2100_set_security_information(struct ipw2100_priv *priv,
+                                     int auth_mode,
+                                     int security_level,
+                                     int unicast_using_group,
+                                     int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = SET_SECURITY_INFORMATION,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(struct security_info_params)
+        };
+        struct security_info_params *security =
+                (struct security_info_params *)&cmd.host_command_parameters;
+        int err;
+        memset(security, 0, sizeof(*security));
+
+        /* If shared key AP authentication is turned on, then we need to
+         * configure the firmware to try and use it.
+         *
+         * Actual data encryption/decryption is handled by the host. */
+        security->auth_mode = auth_mode;
+        security->unicast_using_group = unicast_using_group;
+
+        switch (security_level) {
+        default:
+        case SEC_LEVEL_0:
+                security->allowed_ciphers = IPW_NONE_CIPHER;
+                break;
+        case SEC_LEVEL_1:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER;
+                break;
+        case SEC_LEVEL_2:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER | IPW_TKIP_CIPHER;
+                break;
+        case SEC_LEVEL_2_CKIP:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER | IPW_CKIP_CIPHER;
+                break;
+        case SEC_LEVEL_3:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER | IPW_TKIP_CIPHER | IPW_CCMP_CIPHER;
+                break;
+        }
+
+        IPW_DEBUG_HC(
+                "SET_SECURITY_INFORMATION: auth:%d cipher:0x%02X (level %d)\n",
+                security->auth_mode, security->allowed_ciphers, security_level);
+
+        security->replay_counters_number = 0;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+int ipw2100_set_tx_power(struct ipw2100_priv *priv,
+                         u32 tx_power)
+{
+        struct host_command cmd = {
+                .host_command = TX_POWER_INDEX,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err = 0;
+
+        cmd.host_command_parameters[0] = tx_power;
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC)
+                err = ipw2100_hw_send_command(priv, &cmd);
+        if (!err)
+                priv->tx_power = tx_power;
+
+        return 0;
+}
+
+int ipw2100_set_ibss_beacon_interval(struct ipw2100_priv *priv,
+                                     u32 interval, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = BEACON_INTERVAL,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = interval;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                if (!batch_mode) {
+                        err = ipw2100_disable_adapter(priv);
+                        if (err)
+                                return err;
+                }
+
+                ipw2100_hw_send_command(priv, &cmd);
+
+                if (!batch_mode) {
+                        err = ipw2100_enable_adapter(priv);
+                        if (err)
+                                return err;
+                }
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+
+void ipw2100_queues_initialize(struct ipw2100_priv *priv)
+{
+        ipw2100_tx_initialize(priv);
+        ipw2100_rx_initialize(priv);
+        ipw2100_msg_initialize(priv);
+}
+
+void ipw2100_queues_free(struct ipw2100_priv *priv)
+{
+        ipw2100_tx_free(priv);
+        ipw2100_rx_free(priv);
+        ipw2100_msg_free(priv);
+}
+
+int ipw2100_queues_allocate(struct ipw2100_priv *priv)
+{
+        if (ipw2100_tx_allocate(priv) ||
+            ipw2100_rx_allocate(priv) ||
+            ipw2100_msg_allocate(priv))
+                goto fail;
+
+        return 0;
+
+ fail:
+        ipw2100_tx_free(priv);
+        ipw2100_rx_free(priv);
+        ipw2100_msg_free(priv);
+        return -ENOMEM;
+}
+
+#define IPW_PRIVACY_CAPABLE 0x0008
+
+static int ipw2100_set_wep_flags(struct ipw2100_priv *priv, u32 flags,
+                                 int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = WEP_FLAGS,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = flags;
+
+        IPW_DEBUG_HC("WEP_FLAGS: flags = 0x%08X\n", flags);
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err) {
+                        IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+struct ipw2100_wep_key {
+        u8 idx;
+        u8 len;
+        u8 key[13];
+};
+
+/* Macros to ease up priting WEP keys */
+#define WEP_FMT_64  "%02X%02X%02X%02X-%02X"
+#define WEP_FMT_128 "%02X%02X%02X%02X-%02X%02X%02X%02X-%02X%02X%02X"
+#define WEP_STR_64(x) x[0],x[1],x[2],x[3],x[4]
+#define WEP_STR_128(x) x[0],x[1],x[2],x[3],x[4],x[5],x[6],x[7],x[8],x[9],x[10]
+
+
+/**
+ * Set a the wep key
+ *
+ * @priv: struct to work on
+ * @idx: index of the key we want to set
+ * @key: ptr to the key data to set
+ * @len: length of the buffer at @key
+ * @batch_mode: FIXME perform the operation in batch mode, not
+ *              disabling the device.
+ *
+ * @returns 0 if OK, < 0 errno code on error.
+ *
+ * Fill out a command structure with the new wep key, length an
+ * index and send it down the wire.
+ */
+static int ipw2100_set_key(struct ipw2100_priv *priv,
+                           int idx, char *key, int len, int batch_mode)
+{
+        int keylen = len ? (len <= 5 ? 5 : 13) : 0;
+        struct host_command cmd = {
+                .host_command = WEP_KEY_INFO,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(struct ipw2100_wep_key),
+        };
+        struct ipw2100_wep_key *wep_key = (void*)cmd.host_command_parameters;
+        int err;
+
+        IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
+                                 idx, keylen, len);
+
+        /* NOTE: We don't check cached values in case the firmware was reset
+         * or some other problem is occuring.  If the user is setting the key,
+         * then we push the change */
+
+        wep_key->idx = idx;
+        wep_key->len = keylen;
+
+        if (keylen) {
+                memcpy(wep_key->key, key, len);
+                memset(wep_key->key + len, 0, keylen - len);
+        }
+
+        /* Will be optimized out on debug not being configured in */
+        if (keylen == 0)
+                IPW_DEBUG_WEP("%s: Clearing key %d\n",
+                                  priv->net_dev->name, wep_key->idx);
+        else if (keylen == 5)
+                IPW_DEBUG_WEP("%s: idx: %d, len: %d key: " WEP_FMT_64 "\n",
+                                  priv->net_dev->name, wep_key->idx, wep_key->len,
+                                  WEP_STR_64(wep_key->key));
+        else
+                IPW_DEBUG_WEP("%s: idx: %d, len: %d key: " WEP_FMT_128
+                                  "\n",
+                                  priv->net_dev->name, wep_key->idx, wep_key->len,
+                                  WEP_STR_128(wep_key->key));
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                /* FIXME: IPG: shouldn't this prink be in _disable_adapter()? */
+                if (err) {
+                        IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode) {
+                int err2 = ipw2100_enable_adapter(priv);
+                if (err == 0)
+                        err = err2;
+        }
+        return err;
+}
+
+static int ipw2100_set_key_index(struct ipw2100_priv *priv,
+                                 int idx, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = WEP_KEY_INDEX,
+                .host_command_sequence = 0,
+                .host_command_length = 4,
+                .host_command_parameters = { idx },
+        };
+        int err;
+
+        IPW_DEBUG_HC("WEP_KEY_INDEX: index = %d\n", idx);
+
+        if (idx < 0 || idx > 3)
+                return -EINVAL;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err) {
+                        IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+
+static int ipw2100_configure_security(struct ipw2100_priv *priv,
+                                      int batch_mode)
+{
+        int i, err, auth_mode, sec_level, use_group;
+
+        if (!(priv->status & STATUS_RUNNING))
+                return 0;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        if (!priv->sec.enabled) {
+                err = ipw2100_set_security_information(
+                        priv, IPW_AUTH_OPEN, SEC_LEVEL_0, 0, 1);
+        } else {
+                auth_mode = IPW_AUTH_OPEN;
+                if ((priv->sec.flags & SEC_AUTH_MODE) &&
+                    (priv->sec.auth_mode == WLAN_AUTH_SHARED_KEY))
+                        auth_mode = IPW_AUTH_SHARED;
+
+                sec_level = SEC_LEVEL_0;
+                if (priv->sec.flags & SEC_LEVEL)
+                        sec_level = priv->sec.level;
+
+                use_group = 0;
+                if (priv->sec.flags & SEC_UNICAST_GROUP)
+                        use_group = priv->sec.unicast_uses_group;
+
+                err = ipw2100_set_security_information(
+                            priv, auth_mode, sec_level, use_group, 1);
+        }
+
+        if (err)
+                goto exit;
+
+        if (priv->sec.enabled) {
+                for (i = 0; i < 4; i++) {
+                        if (!(priv->sec.flags & (1 << i))) {
+                                memset(priv->sec.keys[i], 0, WEP_KEY_LEN);
+                                priv->sec.key_sizes[i] = 0;
+                        } else {
+                                err = ipw2100_set_key(priv, i,
+                                                      priv->sec.keys[i],
+                                                      priv->sec.key_sizes[i],
+                                                      1);
+                                if (err)
+                                        goto exit;
+                        }
+                }
+
+                ipw2100_set_key_index(priv, priv->ieee->tx_keyidx, 1);
+        }
+
+        /* Always enable privacy so the Host can filter WEP packets if
+         * encrypted data is sent up */
+        err = ipw2100_set_wep_flags(
+                priv, priv->sec.enabled ? IPW_PRIVACY_CAPABLE : 0, 1);
+        if (err)
+                goto exit;
+
+        priv->status &= ~STATUS_SECURITY_UPDATED;
+
+ exit:
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+static void ipw2100_security_work(struct ipw2100_priv *priv)
+{
+        /* If we happen to have reconnected before we get a chance to
+         * process this, then update the security settings--which causes
+         * a disassociation to occur */
+        if (!(priv->status & STATUS_ASSOCIATED) &&
+            priv->status & STATUS_SECURITY_UPDATED)
+                ipw2100_configure_security(priv, 0);
+}
+
+static void shim__set_security(struct net_device *dev,
+                               struct ieee80211_security *sec)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int i, force_update = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED))
+                goto done;
+
+        for (i = 0; i < 4; i++) {
+                if (sec->flags & (1 << i)) {
+                        priv->sec.key_sizes[i] = sec->key_sizes[i];
+                        if (sec->key_sizes[i] == 0)
+                                priv->sec.flags &= ~(1 << i);
+                        else
+                                memcpy(priv->sec.keys[i], sec->keys[i],
+                                       sec->key_sizes[i]);
+                        priv->sec.flags |= (1 << i);
+                        priv->status |= STATUS_SECURITY_UPDATED;
+                }
+        }
+
+        if ((sec->flags & SEC_ACTIVE_KEY) &&
+            priv->sec.active_key != sec->active_key) {
+                if (sec->active_key <= 3) {
+                        priv->sec.active_key = sec->active_key;
+                        priv->sec.flags |= SEC_ACTIVE_KEY;
+                } else
+                        priv->sec.flags &= ~SEC_ACTIVE_KEY;
+
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        if ((sec->flags & SEC_AUTH_MODE) &&
+            (priv->sec.auth_mode != sec->auth_mode)) {
+                priv->sec.auth_mode = sec->auth_mode;
+                priv->sec.flags |= SEC_AUTH_MODE;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        if (sec->flags & SEC_ENABLED &&
+            priv->sec.enabled != sec->enabled) {
+                priv->sec.flags |= SEC_ENABLED;
+                priv->sec.enabled = sec->enabled;
+                priv->status |= STATUS_SECURITY_UPDATED;
+                force_update = 1;
+        }
+
+        if (sec->flags & SEC_LEVEL &&
+            priv->sec.level != sec->level) {
+                priv->sec.level = sec->level;
+                priv->sec.flags |= SEC_LEVEL;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        IPW_DEBUG_WEP("Security flags: %c %c%c%c%c %c%c%c%c\n",
+                          priv->sec.flags & (1<<8) ? '1' : '0',
+                          priv->sec.flags & (1<<7) ? '1' : '0',
+                          priv->sec.flags & (1<<6) ? '1' : '0',
+                          priv->sec.flags & (1<<5) ? '1' : '0',
+                          priv->sec.flags & (1<<4) ? '1' : '0',
+                          priv->sec.flags & (1<<3) ? '1' : '0',
+                          priv->sec.flags & (1<<2) ? '1' : '0',
+                          priv->sec.flags & (1<<1) ? '1' : '0',
+                          priv->sec.flags & (1<<0) ? '1' : '0');
+
+/* As a temporary work around to enable WPA until we figure out why
+ * wpa_supplicant toggles the security capability of the driver, which
+ * forces a disassocation with force_update...
+ *
+ *      if (force_update || !(priv->status & STATUS_ASSOCIATED))*/
+        if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)))
+                ipw2100_configure_security(priv, 0);
+done:
+        up(&priv->action_sem);
+}
+
+static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
+{
+        int err;
+        int batch_mode = 1;
+        u8 *bssid;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        err = ipw2100_disable_adapter(priv);
+        if (err)
+                return err;
+#ifdef CONFIG_IPW2100_MONITOR
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                err = ipw2100_set_channel(priv, priv->channel, batch_mode);
+                if (err)
+                        return err;
+
+                IPW_DEBUG_INFO("exit\n");
+
+                return 0;
+        }
+#endif /* CONFIG_IPW2100_MONITOR */
+
+        err = ipw2100_read_mac_address(priv);
+        if (err)
+                return -EIO;
+
+        err = ipw2100_set_mac_address(priv, batch_mode);
+        if (err)
+                return err;
+
+        err = ipw2100_set_port_type(priv, priv->ieee->iw_mode, batch_mode);
+        if (err)
+                return err;
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                err = ipw2100_set_channel(priv, priv->channel, batch_mode);
+                if (err)
+                        return err;
+        }
+
+        err  = ipw2100_system_config(priv, batch_mode);
+        if (err)
+                return err;
+
+        err = ipw2100_set_tx_rates(priv, priv->tx_rates, batch_mode);
+        if (err)
+                return err;
+
+        /* Default to power mode OFF */
+        err = ipw2100_set_power_mode(priv, IPW_POWER_MODE_CAM);
+        if (err)
+                return err;
+
+        err = ipw2100_set_rts_threshold(priv, priv->rts_threshold);
+        if (err)
+                return err;
+
+        if (priv->config & CFG_STATIC_BSSID)
+                bssid = priv->bssid;
+        else
+                bssid = NULL;
+        err = ipw2100_set_mandatory_bssid(priv, bssid, batch_mode);
+        if (err)
+                return err;
+
+        if (priv->config & CFG_STATIC_ESSID)
+                err = ipw2100_set_essid(priv, priv->essid, priv->essid_len,
+                                        batch_mode);
+        else
+                err = ipw2100_set_essid(priv, NULL, 0, batch_mode);
+        if (err)
+                return err;
+
+        err = ipw2100_configure_security(priv, batch_mode);
+        if (err)
+                return err;
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                err = ipw2100_set_ibss_beacon_interval(
+                        priv, priv->beacon_interval, batch_mode);
+                if (err)
+                        return err;
+
+                err = ipw2100_set_tx_power(priv, priv->tx_power);
+                if (err)
+                        return err;
+        }
+
+        /*
+          err = ipw2100_set_fragmentation_threshold(
+          priv, priv->frag_threshold, batch_mode);
+          if (err)
+          return err;
+        */
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+
+/*************************************************************************
+ *
+ * EXTERNALLY CALLED METHODS
+ *
+ *************************************************************************/
+
+/* This method is called by the network layer -- not to be confused with
+ * ipw2100_set_mac_address() declared above called by this driver (and this
+ * method as well) to talk to the firmware */
+static int ipw2100_set_address(struct net_device *dev, void *p)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct sockaddr *addr = p;
+        int err = 0;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        down(&priv->action_sem);
+
+        priv->config |= CFG_CUSTOM_MAC;
+        memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
+
+        err = ipw2100_set_mac_address(priv, 0);
+        if (err)
+                goto done;
+
+        priv->reset_backoff = 0;
+        up(&priv->action_sem);
+        ipw2100_reset_adapter(priv);
+        return 0;
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_open(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        unsigned long flags;
+        IPW_DEBUG_INFO("dev->open\n");
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+        if (priv->status & STATUS_ASSOCIATED)
+                netif_start_queue(dev);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        return 0;
+}
+
+static int ipw2100_close(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        unsigned long flags;
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (priv->status & STATUS_ASSOCIATED)
+                netif_carrier_off(dev);
+        netif_stop_queue(dev);
+
+        /* Flush the TX queue ... */
+        while (!list_empty(&priv->tx_pend_list)) {
+                element = priv->tx_pend_list.next;
+                packet = list_entry(element, struct ipw2100_tx_packet, list);
+
+                list_del(element);
+                DEC_STAT(&priv->tx_pend_stat);
+
+                ieee80211_txb_free(packet->info.d_struct.txb);
+                packet->info.d_struct.txb = NULL;
+
+                list_add_tail(element, &priv->tx_free_list);
+                INC_STAT(&priv->tx_free_stat);
+        }
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+
+
+/*
+ * TODO:  Fix this function... its just wrong
+ */
+static void ipw2100_tx_timeout(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        priv->ieee->stats.tx_errors++;
+
+#ifdef CONFIG_IPW2100_MONITOR
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR)
+                return;
+#endif
+
+        IPW_DEBUG_INFO("%s: TX timed out.  Scheduling firmware restart.\n",
+                       dev->name);
+        schedule_reset(priv);
+}
+
+
+/*
+ * TODO: reimplement it so that it reads statistics
+ *       from the adapter using ordinal tables
+ *       instead of/in addition to collecting them
+ *       in the driver
+ */
+static struct net_device_stats *ipw2100_stats(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        return &priv->ieee->stats;
+}
+
+/* Support for wpa_supplicant. Will be replaced with WEXT once
+ * they get WPA support. */
+#ifdef CONFIG_IEEE80211_WPA
+
+/* following definitions must match definitions in driver_ipw2100.c */
+
+#define IPW2100_IOCTL_WPA_SUPPLICANT            SIOCIWFIRSTPRIV+30
+
+#define IPW2100_CMD_SET_WPA_PARAM               1
+#define IPW2100_CMD_SET_WPA_IE                  2
+#define IPW2100_CMD_SET_ENCRYPTION              3
+#define IPW2100_CMD_MLME                        4
+
+#define IPW2100_PARAM_WPA_ENABLED               1
+#define IPW2100_PARAM_TKIP_COUNTERMEASURES      2
+#define IPW2100_PARAM_DROP_UNENCRYPTED          3
+#define IPW2100_PARAM_PRIVACY_INVOKED           4
+#define IPW2100_PARAM_AUTH_ALGS                 5
+#define IPW2100_PARAM_IEEE_802_1X               6
+
+#define IPW2100_MLME_STA_DEAUTH                 1
+#define IPW2100_MLME_STA_DISASSOC               2
+
+#define IPW2100_CRYPT_ERR_UNKNOWN_ALG           2
+#define IPW2100_CRYPT_ERR_UNKNOWN_ADDR          3
+#define IPW2100_CRYPT_ERR_CRYPT_INIT_FAILED     4
+#define IPW2100_CRYPT_ERR_KEY_SET_FAILED        5
+#define IPW2100_CRYPT_ERR_TX_KEY_SET_FAILED     6
+#define IPW2100_CRYPT_ERR_CARD_CONF_FAILED      7
+
+#define IPW2100_CRYPT_ALG_NAME_LEN              16
+
+struct ipw2100_param {
+        u32 cmd;
+        u8 sta_addr[ETH_ALEN];
+        union {
+                struct {
+                        u8 name;
+                        u32 value;
+                } wpa_param;
+                struct {
+                        u32 len;
+                        u8 *data;
+                } wpa_ie;
+                struct{
+                        int command;
+                        int reason_code;
+                } mlme;
+                struct {
+                        u8 alg[IPW2100_CRYPT_ALG_NAME_LEN];
+                        u8 set_tx;
+                        u32 err;
+                        u8 idx;
+                        u8 seq[8]; /* sequence counter (set: RX, get: TX) */
+                        u16 key_len;
+                        u8 key[0];
+                } crypt;
+
+        } u;
+};
+
+/* end of driver_ipw2100.c code */
+
+static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value){
+
+        struct ieee80211_device *ieee = priv->ieee;
+        struct ieee80211_security sec = {
+                .flags = SEC_LEVEL | SEC_ENABLED,
+        };
+        int ret = 0;
+
+        ieee->wpa_enabled = value;
+
+        if (value){
+                sec.level = SEC_LEVEL_3;
+                sec.enabled = 1;
+        } else {
+                sec.level = SEC_LEVEL_0;
+                sec.enabled = 0;
+        }
+
+        if (ieee->set_security)
+                ieee->set_security(ieee->dev, &sec);
+        else
+                ret = -EOPNOTSUPP;
+
+        return ret;
+}
+
+#define AUTH_ALG_OPEN_SYSTEM                    0x1
+#define AUTH_ALG_SHARED_KEY                     0x2
+
+static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value){
+
+        struct ieee80211_device *ieee = priv->ieee;
+        struct ieee80211_security sec = {
+                .flags = SEC_AUTH_MODE,
+        };
+        int ret = 0;
+
+        if (value & AUTH_ALG_SHARED_KEY){
+                sec.auth_mode = WLAN_AUTH_SHARED_KEY;
+                ieee->open_wep = 0;
+        } else {
+                sec.auth_mode = WLAN_AUTH_OPEN;
+                ieee->open_wep = 1;
+        }
+
+        if (ieee->set_security)
+                ieee->set_security(ieee->dev, &sec);
+        else
+                ret = -EOPNOTSUPP;
+
+        return ret;
+}
+
+
+static int ipw2100_wpa_set_param(struct net_device *dev, u8 name, u32 value){
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int ret=0;
+
+        switch(name){
+                case IPW2100_PARAM_WPA_ENABLED:
+                        ret = ipw2100_wpa_enable(priv, value);
+                        break;
+
+                case IPW2100_PARAM_TKIP_COUNTERMEASURES:
+                        priv->ieee->tkip_countermeasures=value;
+                        break;
+
+                case IPW2100_PARAM_DROP_UNENCRYPTED:
+                        priv->ieee->drop_unencrypted=value;
+                        break;
+
+                case IPW2100_PARAM_PRIVACY_INVOKED:
+                        priv->ieee->privacy_invoked=value;
+                        break;
+
+                case IPW2100_PARAM_AUTH_ALGS:
+                        ret = ipw2100_wpa_set_auth_algs(priv, value);
+                        break;
+
+                case IPW2100_PARAM_IEEE_802_1X:
+                        priv->ieee->ieee802_1x=value;
+                        break;
+
+                default:
+                        IPW_DEBUG_ERROR("%s: Unknown WPA param: %d\n",
+                                            dev->name, name);
+                        ret = -EOPNOTSUPP;
+        }
+
+        return ret;
+}
+
+static int ipw2100_wpa_mlme(struct net_device *dev, int command, int reason){
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int ret=0;
+
+        switch(command){
+                case IPW2100_MLME_STA_DEAUTH:
+                        // silently ignore
+                        break;
+
+                case IPW2100_MLME_STA_DISASSOC:
+                        ipw2100_disassociate_bssid(priv);
+                        break;
+
+                default:
+                        IPW_DEBUG_ERROR("%s: Unknown MLME request: %d\n",
+                                            dev->name, command);
+                        ret = -EOPNOTSUPP;
+        }
+
+        return ret;
+}
+
+
+void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
+                             char *wpa_ie, int wpa_ie_len){
+
+        struct ipw2100_wpa_assoc_frame frame;
+
+        frame.fixed_ie_mask = 0;
+
+        /* copy WPA IE */
+        memcpy(frame.var_ie, wpa_ie, wpa_ie_len);
+        frame.var_ie_len = wpa_ie_len;
+
+        /* make sure WPA is enabled */
+        ipw2100_wpa_enable(priv, 1);
+        ipw2100_set_wpa_ie(priv, &frame, 0);
+}
+
+
+static int ipw2100_wpa_set_wpa_ie(struct net_device *dev,
+                                struct ipw2100_param *param, int plen){
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ieee80211_device *ieee = priv->ieee;
+        u8 *buf;
+
+        if (! ieee->wpa_enabled)
+            return -EOPNOTSUPP;
+
+        if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
+           (param->u.wpa_ie.len &&
+                param->u.wpa_ie.data==NULL))
+                return -EINVAL;
+
+        if (param->u.wpa_ie.len){
+                buf = kmalloc(param->u.wpa_ie.len, GFP_KERNEL);
+                if (buf == NULL)
+                        return -ENOMEM;
+
+                memcpy(buf, param->u.wpa_ie.data, param->u.wpa_ie.len);
+
+                kfree(ieee->wpa_ie);
+                ieee->wpa_ie = buf;
+                ieee->wpa_ie_len = param->u.wpa_ie.len;
+
+        } else {
+                kfree(ieee->wpa_ie);
+                ieee->wpa_ie = NULL;
+                ieee->wpa_ie_len = 0;
+        }
+
+        ipw2100_wpa_assoc_frame(priv, ieee->wpa_ie, ieee->wpa_ie_len);
+
+        return 0;
+}
+
+/* implementation borrowed from hostap driver */
+
+static int ipw2100_wpa_set_encryption(struct net_device *dev,
+                                struct ipw2100_param *param, int param_len){
+
+        int ret = 0;
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ieee80211_device *ieee = priv->ieee;
+        struct ieee80211_crypto_ops *ops;
+        struct ieee80211_crypt_data **crypt;
+
+        struct ieee80211_security sec = {
+                .flags = 0,
+        };
+
+        param->u.crypt.err = 0;
+        param->u.crypt.alg[IPW2100_CRYPT_ALG_NAME_LEN - 1] = '\0';
+
+        if (param_len !=
+            (int) ((char *) param->u.crypt.key - (char *) param) +
+            param->u.crypt.key_len){
+                IPW_DEBUG_INFO("Len mismatch %d, %d\n", param_len, param->u.crypt.key_len);
+                return -EINVAL;
+        }
+        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
+            param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
+            param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
+                if (param->u.crypt.idx >= WEP_KEYS)
+                        return -EINVAL;
+                crypt = &ieee->crypt[param->u.crypt.idx];
+        } else {
+                return -EINVAL;
+        }
+
+        if (strcmp(param->u.crypt.alg, "none") == 0) {
+                if (crypt){
+                        sec.enabled = 0;
+                        sec.level = SEC_LEVEL_0;
+                        sec.flags |= SEC_ENABLED | SEC_LEVEL;
+                        ieee80211_crypt_delayed_deinit(ieee, crypt);
+                }
+                goto done;
+        }
+        sec.enabled = 1;
+        sec.flags |= SEC_ENABLED;
+
+        ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
+                request_module("ieee80211_crypt_wep");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
+                request_module("ieee80211_crypt_tkip");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {
+                request_module("ieee80211_crypt_ccmp");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        }
+        if (ops == NULL) {
+                IPW_DEBUG_INFO("%s: unknown crypto alg '%s'\n",
+                       dev->name, param->u.crypt.alg);
+                param->u.crypt.err = IPW2100_CRYPT_ERR_UNKNOWN_ALG;
+                ret = -EINVAL;
+                goto done;
+        }
+
+        if (*crypt == NULL || (*crypt)->ops != ops) {
+                struct ieee80211_crypt_data *new_crypt;
+
+                ieee80211_crypt_delayed_deinit(ieee, crypt);
+
+                new_crypt = (struct ieee80211_crypt_data *)
+                        kmalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL);
+                if (new_crypt == NULL) {
+                        ret = -ENOMEM;
+                        goto done;
+                }
+                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+                new_crypt->ops = ops;
+                if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
+                        new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
+
+                if (new_crypt->priv == NULL) {
+                        kfree(new_crypt);
+                        param->u.crypt.err =
+                                IPW2100_CRYPT_ERR_CRYPT_INIT_FAILED;
+                        ret = -EINVAL;
+                        goto done;
+                }
+
+                *crypt = new_crypt;
+        }
+
+        if (param->u.crypt.key_len > 0 && (*crypt)->ops->set_key &&
+            (*crypt)->ops->set_key(param->u.crypt.key,
+                                   param->u.crypt.key_len, param->u.crypt.seq,
+                                   (*crypt)->priv) < 0) {
+                IPW_DEBUG_INFO("%s: key setting failed\n",
+                       dev->name);
+                param->u.crypt.err = IPW2100_CRYPT_ERR_KEY_SET_FAILED;
+                ret = -EINVAL;
+                goto done;
+        }
+
+        if (param->u.crypt.set_tx){
+                ieee->tx_keyidx = param->u.crypt.idx;
+                sec.active_key = param->u.crypt.idx;
+                sec.flags |= SEC_ACTIVE_KEY;
+        }
+
+        if (ops->name != NULL){
+
+                if (strcmp(ops->name, "WEP") == 0) {
+                        memcpy(sec.keys[param->u.crypt.idx], param->u.crypt.key, param->u.crypt.key_len);
+                        sec.key_sizes[param->u.crypt.idx] = param->u.crypt.key_len;
+                        sec.flags |= (1 << param->u.crypt.idx);
+                        sec.flags |= SEC_LEVEL;
+                        sec.level = SEC_LEVEL_1;
+                } else if (strcmp(ops->name, "TKIP") == 0) {
+                        sec.flags |= SEC_LEVEL;
+                        sec.level = SEC_LEVEL_2;
+                } else if (strcmp(ops->name, "CCMP") == 0) {
+                        sec.flags |= SEC_LEVEL;
+                        sec.level = SEC_LEVEL_3;
+                }
+        }
+ done:
+        if (ieee->set_security)
+                ieee->set_security(ieee->dev, &sec);
+
+        /* Do not reset port if card is in Managed mode since resetting will
+         * generate new IEEE 802.11 authentication which may end up in looping
+         * with IEEE 802.1X.  If your hardware requires a reset after WEP
+         * configuration (for example... Prism2), implement the reset_port in
+         * the callbacks structures used to initialize the 802.11 stack. */
+        if (ieee->reset_on_keychange &&
+            ieee->iw_mode != IW_MODE_INFRA &&
+            ieee->reset_port &&
+            ieee->reset_port(dev)) {
+                IPW_DEBUG_INFO("%s: reset_port failed\n", dev->name);
+                param->u.crypt.err = IPW2100_CRYPT_ERR_CARD_CONF_FAILED;
+                return -EINVAL;
+        }
+
+        return ret;
+}
+
+
+static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p){
+
+        struct ipw2100_param *param;
+        int ret=0;
+
+        IPW_DEBUG_IOCTL("wpa_supplicant: len=%d\n", p->length);
+
+        if (p->length < sizeof(struct ipw2100_param) || !p->pointer)
+                return -EINVAL;
+
+        param = (struct ipw2100_param *)kmalloc(p->length, GFP_KERNEL);
+        if (param == NULL)
+                return -ENOMEM;
+
+        if (copy_from_user(param, p->pointer, p->length)){
+                kfree(param);
+                return -EFAULT;
+        }
+
+        switch (param->cmd){
+
+        case IPW2100_CMD_SET_WPA_PARAM:
+                ret = ipw2100_wpa_set_param(dev, param->u.wpa_param.name,
+                                            param->u.wpa_param.value);
+                break;
+
+        case IPW2100_CMD_SET_WPA_IE:
+                ret = ipw2100_wpa_set_wpa_ie(dev, param, p->length);
+                break;
+
+        case IPW2100_CMD_SET_ENCRYPTION:
+                ret = ipw2100_wpa_set_encryption(dev, param, p->length);
+                break;
+
+        case IPW2100_CMD_MLME:
+                ret = ipw2100_wpa_mlme(dev, param->u.mlme.command,
+                                       param->u.mlme.reason_code);
+                break;
+
+        default:
+                IPW_DEBUG_ERROR("%s: Unknown WPA supplicant request: %d\n",
+                                dev->name, param->cmd);
+                ret = -EOPNOTSUPP;
+
+        }
+
+        if (ret == 0 && copy_to_user(p->pointer, param, p->length))
+                ret = -EFAULT;
+
+        kfree(param);
+        return ret;
+}
+#endif /* CONFIG_IEEE80211_WPA */
+
+static int ipw2100_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+#ifdef CONFIG_IEEE80211_WPA
+        struct iwreq *wrq = (struct iwreq *) rq;
+        int ret=-1;
+        switch (cmd){
+            case IPW2100_IOCTL_WPA_SUPPLICANT:
+                ret = ipw2100_wpa_supplicant(dev, &wrq->u.data);
+                return ret;
+
+            default:
+                return -EOPNOTSUPP;
+        }
+
+#endif /* CONFIG_IEEE80211_WPA */
+
+        return -EOPNOTSUPP;
+}
+
+
+static void ipw_ethtool_get_drvinfo(struct net_device *dev,
+                                    struct ethtool_drvinfo *info)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        char fw_ver[64], ucode_ver[64];
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+
+        ipw2100_get_fwversion(priv, fw_ver, sizeof(fw_ver));
+        ipw2100_get_ucodeversion(priv, ucode_ver, sizeof(ucode_ver));
+
+        snprintf(info->fw_version, sizeof(info->fw_version), "%s:%d:%s",
+                 fw_ver, priv->eeprom_version, ucode_ver);
+
+        strcpy(info->bus_info, pci_name(priv->pci_dev));
+}
+
+static u32 ipw2100_ethtool_get_link(struct net_device *dev)
+{
+    struct ipw2100_priv *priv = ieee80211_priv(dev);
+    return (priv->status & STATUS_ASSOCIATED) ? 1 : 0;
+}
+
+
+static struct ethtool_ops ipw2100_ethtool_ops = {
+    .get_link        = ipw2100_ethtool_get_link,
+    .get_drvinfo     = ipw_ethtool_get_drvinfo,
+};
+
+static void ipw2100_hang_check(void *adapter)
+{
+        struct ipw2100_priv *priv = adapter;
+        unsigned long flags;
+        u32 rtc = 0xa5a5a5a5;
+        u32 len = sizeof(rtc);
+        int restart = 0;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (priv->fatal_error != 0) {
+                /* If fatal_error is set then we need to restart */
+                IPW_DEBUG_INFO("%s: Hardware fatal error detected.\n",
+                               priv->net_dev->name);
+
+                restart = 1;
+        } else if (ipw2100_get_ordinal(priv, IPW_ORD_RTC_TIME, &rtc, &len) ||
+                   (rtc == priv->last_rtc)) {
+                /* Check if firmware is hung */
+                IPW_DEBUG_INFO("%s: Firmware RTC stalled.\n",
+                               priv->net_dev->name);
+
+                restart = 1;
+        }
+
+        if (restart) {
+                /* Kill timer */
+                priv->stop_hang_check = 1;
+                priv->hangs++;
+
+                /* Restart the NIC */
+                schedule_reset(priv);
+        }
+
+        priv->last_rtc = rtc;
+
+        if (!priv->stop_hang_check)
+                queue_delayed_work(priv->workqueue, &priv->hang_check, HZ / 2);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+}
+
+
+static void ipw2100_rf_kill(void *adapter)
+{
+        struct ipw2100_priv *priv = adapter;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (rf_kill_active(priv)) {
+                IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
+                if (!priv->stop_rf_kill)
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
+                goto exit_unlock;
+        }
+
+        /* RF Kill is now disabled, so bring the device back up */
+
+        if (!(priv->status & STATUS_RF_KILL_MASK)) {
+                IPW_DEBUG_RF_KILL("HW RF Kill no longer active, restarting "
+                                  "device\n");
+                schedule_reset(priv);
+        } else
+                IPW_DEBUG_RF_KILL("HW RF Kill deactivated.  SW RF Kill still "
+                                  "enabled\n");
+
+ exit_unlock:
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+}
+
+static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
+
+/* Look into using netdev destructor to shutdown ieee80211? */
+
+static struct net_device *ipw2100_alloc_device(
+        struct pci_dev *pci_dev,
+        char *base_addr,
+        unsigned long mem_start,
+        unsigned long mem_len)
+{
+        struct ipw2100_priv *priv;
+        struct net_device *dev;
+
+        dev = alloc_ieee80211(sizeof(struct ipw2100_priv));
+        if (!dev)
+                return NULL;
+        priv = ieee80211_priv(dev);
+        priv->ieee = netdev_priv(dev);
+        priv->pci_dev = pci_dev;
+        priv->net_dev = dev;
+
+        priv->ieee->hard_start_xmit = ipw2100_tx;
+        priv->ieee->set_security = shim__set_security;
+
+        dev->open = ipw2100_open;
+        dev->stop = ipw2100_close;
+        dev->init = ipw2100_net_init;
+        dev->do_ioctl = ipw2100_ioctl;
+        dev->get_stats = ipw2100_stats;
+        dev->ethtool_ops = &ipw2100_ethtool_ops;
+        dev->tx_timeout = ipw2100_tx_timeout;
+        dev->wireless_handlers = &ipw2100_wx_handler_def;
+        dev->get_wireless_stats = ipw2100_wx_wireless_stats;
+        dev->set_mac_address = ipw2100_set_address;
+        dev->watchdog_timeo = 3*HZ;
+        dev->irq = 0;
+
+        dev->base_addr = (unsigned long)base_addr;
+        dev->mem_start = mem_start;
+        dev->mem_end = dev->mem_start + mem_len - 1;
+
+        /* NOTE: We don't use the wireless_handlers hook
+         * in dev as the system will start throwing WX requests
+         * to us before we're actually initialized and it just
+         * ends up causing problems.  So, we just handle
+         * the WX extensions through the ipw2100_ioctl interface */
+
+
+        /* memset() puts everything to 0, so we only have explicitely set
+         * those values that need to be something else */
+
+        /* If power management is turned on, default to AUTO mode */
+        priv->power_mode = IPW_POWER_AUTO;
+
+
+
+#ifdef CONFIG_IEEE80211_WPA
+        priv->ieee->wpa_enabled = 0;
+        priv->ieee->tkip_countermeasures = 0;
+        priv->ieee->drop_unencrypted = 0;
+        priv->ieee->privacy_invoked = 0;
+        priv->ieee->ieee802_1x = 1;
+#endif /* CONFIG_IEEE80211_WPA */
+
+        /* Set module parameters */
+        switch (mode) {
+        case 1:
+                priv->ieee->iw_mode = IW_MODE_ADHOC;
+                break;
+#ifdef CONFIG_IPW2100_MONITOR
+        case 2:
+                priv->ieee->iw_mode = IW_MODE_MONITOR;
+                break;
+#endif
+        default:
+        case 0:
+                priv->ieee->iw_mode = IW_MODE_INFRA;
+                break;
+        }
+
+        if (disable == 1)
+                priv->status |= STATUS_RF_KILL_SW;
+
+        if (channel != 0 &&
+            ((channel >= REG_MIN_CHANNEL) &&
+             (channel <= REG_MAX_CHANNEL))) {
+                priv->config |= CFG_STATIC_CHANNEL;
+                priv->channel = channel;
+        }
+
+        if (associate)
+                priv->config |= CFG_ASSOCIATE;
+
+        priv->beacon_interval = DEFAULT_BEACON_INTERVAL;
+        priv->short_retry_limit = DEFAULT_SHORT_RETRY_LIMIT;
+        priv->long_retry_limit = DEFAULT_LONG_RETRY_LIMIT;
+        priv->rts_threshold = DEFAULT_RTS_THRESHOLD | RTS_DISABLED;
+        priv->frag_threshold = DEFAULT_FTS | FRAG_DISABLED;
+        priv->tx_power = IPW_TX_POWER_DEFAULT;
+        priv->tx_rates = DEFAULT_TX_RATES;
+
+        strcpy(priv->nick, "ipw2100");
+
+        spin_lock_init(&priv->low_lock);
+        sema_init(&priv->action_sem, 1);
+        sema_init(&priv->adapter_sem, 1);
+
+        init_waitqueue_head(&priv->wait_command_queue);
+
+        netif_carrier_off(dev);
+
+        INIT_LIST_HEAD(&priv->msg_free_list);
+        INIT_LIST_HEAD(&priv->msg_pend_list);
+        INIT_STAT(&priv->msg_free_stat);
+        INIT_STAT(&priv->msg_pend_stat);
+
+        INIT_LIST_HEAD(&priv->tx_free_list);
+        INIT_LIST_HEAD(&priv->tx_pend_list);
+        INIT_STAT(&priv->tx_free_stat);
+        INIT_STAT(&priv->tx_pend_stat);
+
+        INIT_LIST_HEAD(&priv->fw_pend_list);
+        INIT_STAT(&priv->fw_pend_stat);
+
+
+#ifdef CONFIG_SOFTWARE_SUSPEND2
+        priv->workqueue = create_workqueue(DRV_NAME, 0);
+#else
+        priv->workqueue = create_workqueue(DRV_NAME);
+#endif
+        INIT_WORK(&priv->reset_work,
+                  (void (*)(void *))ipw2100_reset_adapter, priv);
+        INIT_WORK(&priv->security_work,
+                  (void (*)(void *))ipw2100_security_work, priv);
+        INIT_WORK(&priv->wx_event_work,
+                  (void (*)(void *))ipw2100_wx_event_work, priv);
+        INIT_WORK(&priv->hang_check, ipw2100_hang_check, priv);
+        INIT_WORK(&priv->rf_kill, ipw2100_rf_kill, priv);
+
+        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
+                     ipw2100_irq_tasklet, (unsigned long)priv);
+
+        /* NOTE:  We do not start the deferred work for status checks yet */
+        priv->stop_rf_kill = 1;
+        priv->stop_hang_check = 1;
+
+        return dev;
+}
+
+static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
+                                const struct pci_device_id *ent)
+{
+        unsigned long mem_start, mem_len, mem_flags;
+        char *base_addr = NULL;
+        struct net_device *dev = NULL;
+        struct ipw2100_priv *priv = NULL;
+        int err = 0;
+        int registered = 0;
+        u32 val;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        mem_start = pci_resource_start(pci_dev, 0);
+        mem_len = pci_resource_len(pci_dev, 0);
+        mem_flags = pci_resource_flags(pci_dev, 0);
+
+        if ((mem_flags & IORESOURCE_MEM) != IORESOURCE_MEM) {
+                IPW_DEBUG_INFO("weird - resource type is not memory\n");
+                err = -ENODEV;
+                goto fail;
+        }
+
+        base_addr = ioremap_nocache(mem_start, mem_len);
+        if (!base_addr) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling ioremap_nocache.\n");
+                err = -EIO;
+                goto fail;
+        }
+
+        /* allocate and initialize our net_device */
+        dev = ipw2100_alloc_device(pci_dev, base_addr, mem_start, mem_len);
+        if (!dev) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling ipw2100_alloc_device.\n");
+                err = -ENOMEM;
+                goto fail;
+        }
+
+        /* set up PCI mappings for device */
+        err = pci_enable_device(pci_dev);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling pci_enable_device.\n");
+                return err;
+        }
+
+        priv = ieee80211_priv(dev);
+
+        pci_set_master(pci_dev);
+        pci_set_drvdata(pci_dev, priv);
+
+        err = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling pci_set_dma_mask.\n");
+                pci_disable_device(pci_dev);
+                return err;
+        }
+
+        err = pci_request_regions(pci_dev, DRV_NAME);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling pci_request_regions.\n");
+                pci_disable_device(pci_dev);
+                return err;
+        }
+
+        /* We disable the RETRY_TIMEOUT register (0x41) to keep
+         * PCI Tx retries from interfering with C3 CPU state */
+        pci_read_config_dword(pci_dev, 0x40, &val);
+        if ((val & 0x0000ff00) != 0)
+                pci_write_config_dword(pci_dev, 0x40, val & 0xffff00ff);
+
+        pci_set_power_state(pci_dev, PCI_D0);
+
+        if (!ipw2100_hw_is_adapter_in_system(dev)) {
+                printk(KERN_WARNING DRV_NAME
+                       "Device not found via register read.\n");
+                err = -ENODEV;
+                goto fail;
+        }
+
+        SET_NETDEV_DEV(dev, &pci_dev->dev);
+
+        /* Force interrupts to be shut off on the device */
+        priv->status |= STATUS_INT_ENABLED;
+        ipw2100_disable_interrupts(priv);
+
+        /* Allocate and initialize the Tx/Rx queues and lists */
+        if (ipw2100_queues_allocate(priv)) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calilng ipw2100_queues_allocate.\n");
+                err = -ENOMEM;
+                goto fail;
+        }
+        ipw2100_queues_initialize(priv);
+
+        err = request_irq(pci_dev->irq,
+                          ipw2100_interrupt, SA_SHIRQ,
+                          dev->name, priv);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling request_irq: %d.\n",
+                       pci_dev->irq);
+                goto fail;
+        }
+        dev->irq = pci_dev->irq;
+
+        IPW_DEBUG_INFO("Attempting to register device...\n");
+
+        SET_MODULE_OWNER(dev);
+
+        printk(KERN_INFO DRV_NAME
+               ": Detected Intel PRO/Wireless 2100 Network Connection\n");
+
+        /* Bring up the interface.  Pre 0.46, after we registered the
+         * network device we would call ipw2100_up.  This introduced a race
+         * condition with newer hotplug configurations (network was coming
+         * up and making calls before the device was initialized).
+         *
+         * If we called ipw2100_up before we registered the device, then the
+         * device name wasn't registered.  So, we instead use the net_dev->init
+         * member to call a function that then just turns and calls ipw2100_up.
+         * net_dev->init is called after name allocation but before the
+         * notifier chain is called */
+        down(&priv->action_sem);
+        err = register_netdev(dev);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling register_netdev.\n");
+                goto fail_unlock;
+        }
+        registered = 1;
+
+        IPW_DEBUG_INFO("%s: Bound to %s\n", dev->name, pci_name(pci_dev));
+
+        /* perform this after register_netdev so that dev->name is set */
+        sysfs_create_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+        netif_carrier_off(dev);
+
+        /* If the RF Kill switch is disabled, go ahead and complete the
+         * startup sequence */
+        if (!(priv->status & STATUS_RF_KILL_MASK)) {
+                /* Enable the adapter - sends HOST_COMPLETE */
+                if (ipw2100_enable_adapter(priv)) {
+                        printk(KERN_WARNING DRV_NAME
+                               ": %s: failed in call to enable adapter.\n",
+                               priv->net_dev->name);
+                        ipw2100_hw_stop_adapter(priv);
+                        err = -EIO;
+                        goto fail_unlock;
+                }
+
+                /* Start a scan . . . */
+                ipw2100_set_scan_options(priv);
+                ipw2100_start_scan(priv);
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+
+        priv->status |= STATUS_INITIALIZED;
+
+        up(&priv->action_sem);
+
+        return 0;
+
+ fail_unlock:
+        up(&priv->action_sem);
+
+ fail:
+        if (dev) {
+                if (registered)
+                        unregister_netdev(dev);
+
+                ipw2100_hw_stop_adapter(priv);
+
+                ipw2100_disable_interrupts(priv);
+
+                if (dev->irq)
+                        free_irq(dev->irq, priv);
+
+                ipw2100_kill_workqueue(priv);
+
+                /* These are safe to call even if they weren't allocated */
+                ipw2100_queues_free(priv);
+                sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+
+                free_ieee80211(dev);
+                pci_set_drvdata(pci_dev, NULL);
+        }
+
+        if (base_addr)
+                iounmap((char*)base_addr);
+
+        pci_release_regions(pci_dev);
+        pci_disable_device(pci_dev);
+
+        return err;
+}
+
+static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
+{
+        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
+        struct net_device *dev;
+
+        if (priv) {
+                down(&priv->action_sem);
+
+                priv->status &= ~STATUS_INITIALIZED;
+
+                dev = priv->net_dev;
+                sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+
+#ifdef CONFIG_PM
+                if (ipw2100_firmware.version)
+                        ipw2100_release_firmware(priv, &ipw2100_firmware);
+#endif
+                /* Take down the hardware */
+                ipw2100_down(priv);
+
+                /* Release the semaphore so that the network subsystem can
+                 * complete any needed calls into the driver... */
+                up(&priv->action_sem);
+
+                /* Unregister the device first - this results in close()
+                 * being called if the device is open.  If we free storage
+                 * first, then close() will crash. */
+                unregister_netdev(dev);
+
+                /* ipw2100_down will ensure that there is no more pending work
+                 * in the workqueue's, so we can safely remove them now. */
+                ipw2100_kill_workqueue(priv);
+
+                ipw2100_queues_free(priv);
+
+                /* Free potential debugging firmware snapshot */
+                ipw2100_snapshot_free(priv);
+
+                if (dev->irq)
+                        free_irq(dev->irq, priv);
+
+                if (dev->base_addr)
+                        iounmap((unsigned char *)dev->base_addr);
+
+                free_ieee80211(dev);
+        }
+
+        pci_release_regions(pci_dev);
+        pci_disable_device(pci_dev);
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+
+#ifdef CONFIG_PM
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
+static int ipw2100_suspend(struct pci_dev *pci_dev, u32 state)
+#else
+static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
+#endif
+{
+        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
+        struct net_device *dev = priv->net_dev;
+
+        IPW_DEBUG_INFO("%s: Going into suspend...\n",
+               dev->name);
+
+        down(&priv->action_sem);
+        if (priv->status & STATUS_INITIALIZED) {
+                /* Take down the device; powers it off, etc. */
+                ipw2100_down(priv);
+        }
+
+        /* Remove the PRESENT state of the device */
+        netif_device_detach(dev);
+
+        pci_save_state(pci_dev);
+        pci_disable_device (pci_dev);
+        pci_set_power_state(pci_dev, PCI_D3hot);
+
+        up(&priv->action_sem);
+
+        return 0;
+}
+
+static int ipw2100_resume(struct pci_dev *pci_dev)
+{
+        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
+        struct net_device *dev = priv->net_dev;
+        u32 val;
+
+        if (IPW2100_PM_DISABLED)
+                return 0;
+
+        down(&priv->action_sem);
+
+        IPW_DEBUG_INFO("%s: Coming out of suspend...\n",
+               dev->name);
+
+        pci_set_power_state(pci_dev, PCI_D0);
+        pci_enable_device(pci_dev);
+        pci_restore_state(pci_dev);
+
+        /*
+         * Suspend/Resume resets the PCI configuration space, so we have to
+         * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
+         * from interfering with C3 CPU state. pci_restore_state won't help
+         * here since it only restores the first 64 bytes pci config header.
+         */
+        pci_read_config_dword(pci_dev, 0x40, &val);
+        if ((val & 0x0000ff00) != 0)
+                pci_write_config_dword(pci_dev, 0x40, val & 0xffff00ff);
+
+        /* Set the device back into the PRESENT state; this will also wake
+         * the queue of needed */
+        netif_device_attach(dev);
+
+        /* Bring the device back up */
+        if (!(priv->status & STATUS_RF_KILL_SW))
+                ipw2100_up(priv, 0);
+
+        up(&priv->action_sem);
+
+        return 0;
+}
+#endif
+
+
+#define IPW2100_DEV_ID(x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x }
+
+static struct pci_device_id ipw2100_pci_id_table[] __devinitdata = {
+        IPW2100_DEV_ID(0x2520), /* IN 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2521), /* IN 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2524), /* IN 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2525), /* IN 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2526), /* IN 2100A mPCI Gen A3 */
+        IPW2100_DEV_ID(0x2522), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2523), /* IN 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2527), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2528), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2529), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x252B), /* IN 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x252C), /* IN 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x252D), /* IN 2100 mPCI 3A */
+
+        IPW2100_DEV_ID(0x2550), /* IB 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2551), /* IB 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2553), /* IB 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2554), /* IB 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2555), /* IB 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x2560), /* DE 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2562), /* DE 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2563), /* DE 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2561), /* DE 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2565), /* DE 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2566), /* DE 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2567), /* DE 2100 mPCI 3A */
+
+        IPW2100_DEV_ID(0x2570), /* GA 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x2580), /* TO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2582), /* TO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2583), /* TO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2581), /* TO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2585), /* TO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2586), /* TO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2587), /* TO 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x2590), /* SO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2592), /* SO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2591), /* SO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2593), /* SO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2596), /* SO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2598), /* SO 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x25A0), /* HP 2100 mPCI 3B */
+        {0,},
+};
+
+MODULE_DEVICE_TABLE(pci, ipw2100_pci_id_table);
+
+static struct pci_driver ipw2100_pci_driver = {
+        .name = DRV_NAME,
+        .id_table = ipw2100_pci_id_table,
+        .probe = ipw2100_pci_init_one,
+        .remove = __devexit_p(ipw2100_pci_remove_one),
+#ifdef CONFIG_PM
+        .suspend = ipw2100_suspend,
+        .resume = ipw2100_resume,
+#endif
+};
+
+
+/**
+ * Initialize the ipw2100 driver/module
+ *
+ * @returns 0 if ok, < 0 errno node con error.
+ *
+ * Note: we cannot init the /proc stuff until the PCI driver is there,
+ * or we risk an unlikely race condition on someone accessing
+ * uninitialized data in the PCI dev struct through /proc.
+ */
+static int __init ipw2100_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
+        printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
+
+#ifdef CONFIG_IEEE80211_NOWEP
+        IPW_DEBUG_INFO(DRV_NAME ": Compiled with WEP disabled.\n");
+#endif
+
+        ret = pci_module_init(&ipw2100_pci_driver);
+
+#ifdef CONFIG_IPW_DEBUG
+        ipw2100_debug_level = debug;
+        driver_create_file(&ipw2100_pci_driver.driver,
+                           &driver_attr_debug_level);
+#endif
+
+        return ret;
+}
+
+
+/**
+ * Cleanup ipw2100 driver registration
+ */
+static void __exit ipw2100_exit(void)
+{
+        /* FIXME: IPG: check that we have no instances of the devices open */
+#ifdef CONFIG_IPW_DEBUG
+        driver_remove_file(&ipw2100_pci_driver.driver,
+                           &driver_attr_debug_level);
+#endif
+        pci_unregister_driver(&ipw2100_pci_driver);
+}
+
+module_init(ipw2100_init);
+module_exit(ipw2100_exit);
+
+#define WEXT_USECHANNELS 1
+
+const long ipw2100_frequencies[] = {
+        2412, 2417, 2422, 2427,
+        2432, 2437, 2442, 2447,
+        2452, 2457, 2462, 2467,
+        2472, 2484
+};
+
+#define FREQ_COUNT (sizeof(ipw2100_frequencies) / \
+                    sizeof(ipw2100_frequencies[0]))
+
+const long ipw2100_rates_11b[] = {
+        1000000,
+        2000000,
+        5500000,
+        11000000
+};
+
+#define RATE_COUNT (sizeof(ipw2100_rates_11b) / sizeof(ipw2100_rates_11b[0]))
+
+static int ipw2100_wx_get_name(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        if (!(priv->status & STATUS_ASSOCIATED))
+                strcpy(wrqu->name, "unassociated");
+        else
+                snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11b");
+
+        IPW_DEBUG_WX("Name: %s\n", wrqu->name);
+        return 0;
+}
+
+
+static int ipw2100_wx_set_freq(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct iw_freq *fwrq = &wrqu->freq;
+        int err = 0;
+
+        if (priv->ieee->iw_mode == IW_MODE_INFRA)
+                return -EOPNOTSUPP;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        /* if setting by freq convert to channel */
+        if (fwrq->e == 1) {
+                if ((fwrq->m >= (int) 2.412e8 &&
+                     fwrq->m <= (int) 2.487e8)) {
+                        int f = fwrq->m / 100000;
+                        int c = 0;
+
+                        while ((c < REG_MAX_CHANNEL) &&
+                               (f != ipw2100_frequencies[c]))
+                                c++;
+
+                        /* hack to fall through */
+                        fwrq->e = 0;
+                        fwrq->m = c + 1;
+                }
+        }
+
+        if (fwrq->e > 0 || fwrq->m > 1000)
+                return -EOPNOTSUPP;
+        else { /* Set the channel */
+                IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
+                err = ipw2100_set_channel(priv, fwrq->m, 0);
+        }
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+
+static int ipw2100_wx_get_freq(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->freq.e = 0;
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured CHANNEL then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_CHANNEL ||
+            priv->status & STATUS_ASSOCIATED)
+                wrqu->freq.m = priv->channel;
+        else
+                wrqu->freq.m = 0;
+
+        IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel);
+        return 0;
+
+}
+
+static int ipw2100_wx_set_mode(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode);
+
+        if (wrqu->mode == priv->ieee->iw_mode)
+                return 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        switch (wrqu->mode) {
+#ifdef CONFIG_IPW2100_MONITOR
+        case IW_MODE_MONITOR:
+                err = ipw2100_switch_mode(priv, IW_MODE_MONITOR);
+                break;
+#endif /* CONFIG_IPW2100_MONITOR */
+        case IW_MODE_ADHOC:
+                err = ipw2100_switch_mode(priv, IW_MODE_ADHOC);
+                break;
+        case IW_MODE_INFRA:
+        case IW_MODE_AUTO:
+        default:
+                err = ipw2100_switch_mode(priv, IW_MODE_INFRA);
+                break;
+        }
+
+done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_mode(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->mode = priv->ieee->iw_mode;
+        IPW_DEBUG_WX("GET Mode -> %d\n", wrqu->mode);
+
+        return 0;
+}
+
+
+#define POWER_MODES 5
+
+/* Values are in microsecond */
+const s32 timeout_duration[POWER_MODES] = {
+        350000,
+        250000,
+        75000,
+        37000,
+        25000,
+};
+
+const s32 period_duration[POWER_MODES] = {
+        400000,
+        700000,
+        1000000,
+        1000000,
+        1000000
+};
+
+static int ipw2100_wx_get_range(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct iw_range *range = (struct iw_range *)extra;
+        u16 val;
+        int i, level;
+
+        wrqu->data.length = sizeof(*range);
+        memset(range, 0, sizeof(*range));
+
+        /* Let's try to keep this struct in the same order as in
+         * linux/include/wireless.h
+         */
+
+        /* TODO: See what values we can set, and remove the ones we can't
+         * set, or fill them with some default data.
+         */
+
+        /* ~5 Mb/s real (802.11b) */
+        range->throughput = 5 * 1000 * 1000;
+
+//      range->sensitivity;     /* signal level threshold range */
+
+        range->max_qual.qual = 100;
+        /* TODO: Find real max RSSI and stick here */
+        range->max_qual.level = 0;
+        range->max_qual.noise = 0;
+        range->max_qual.updated = 7; /* Updated all three */
+
+        range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */
+        /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
+        range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM;
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = 7; /* Updated all three */
+
+        range->num_bitrates = RATE_COUNT;
+
+        for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) {
+                range->bitrate[i] = ipw2100_rates_11b[i];
+        }
+
+        range->min_rts = MIN_RTS_THRESHOLD;
+        range->max_rts = MAX_RTS_THRESHOLD;
+        range->min_frag = MIN_FRAG_THRESHOLD;
+        range->max_frag = MAX_FRAG_THRESHOLD;
+
+        range->min_pmp = period_duration[0];    /* Minimal PM period */
+        range->max_pmp = period_duration[POWER_MODES-1];/* Maximal PM period */
+        range->min_pmt = timeout_duration[POWER_MODES-1];       /* Minimal PM timeout */
+        range->max_pmt = timeout_duration[0];/* Maximal PM timeout */
+
+        /* How to decode max/min PM period */
+        range->pmp_flags = IW_POWER_PERIOD;
+        /* How to decode max/min PM period */
+        range->pmt_flags = IW_POWER_TIMEOUT;
+        /* What PM options are supported */
+        range->pm_capa = IW_POWER_TIMEOUT | IW_POWER_PERIOD;
+
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13;           /* Different token sizes */
+        range->num_encoding_sizes = 2;          /* Number of entry in the list */
+        range->max_encoding_tokens = WEP_KEYS;  /* Max number of tokens */
+//      range->encoding_login_index;            /* token index for login token */
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                range->txpower_capa = IW_TXPOW_DBM;
+                range->num_txpower = IW_MAX_TXPOWER;
+                for (i = 0, level = (IPW_TX_POWER_MAX_DBM * 16); i < IW_MAX_TXPOWER;
+                     i++, level -= ((IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM) * 16) /
+                             (IW_MAX_TXPOWER - 1))
+                        range->txpower[i] = level / 16;
+        } else {
+                range->txpower_capa = 0;
+                range->num_txpower = 0;
+        }
+
+
+        /* Set the Wireless Extension versions */
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 16;
+
+//      range->retry_capa;      /* What retry options are supported */
+//      range->retry_flags;     /* How to decode max/min retry limit */
+//      range->r_time_flags;    /* How to decode max/min retry life */
+//      range->min_retry;       /* Minimal number of retries */
+//      range->max_retry;       /* Maximal number of retries */
+//      range->min_r_time;      /* Minimal retry lifetime */
+//      range->max_r_time;      /* Maximal retry lifetime */
+
+        range->num_channels = FREQ_COUNT;
+
+        val = 0;
+        for (i = 0; i < FREQ_COUNT; i++) {
+                // TODO: Include only legal frequencies for some countries
+//              if (local->channel_mask & (1 << i)) {
+                        range->freq[val].i = i + 1;
+                        range->freq[val].m = ipw2100_frequencies[i] * 100000;
+                        range->freq[val].e = 1;
+                        val++;
+//              }
+                if (val == IW_MAX_FREQUENCIES)
+                break;
+        }
+        range->num_frequency = val;
+
+        IPW_DEBUG_WX("GET Range\n");
+
+        return 0;
+}
+
+static int ipw2100_wx_set_wap(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        static const unsigned char any[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
+        static const unsigned char off[] = {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+
+        // sanity checks
+        if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
+                return -EINVAL;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (!memcmp(any, wrqu->ap_addr.sa_data, ETH_ALEN) ||
+            !memcmp(off, wrqu->ap_addr.sa_data, ETH_ALEN)) {
+                /* we disable mandatory BSSID association */
+                IPW_DEBUG_WX("exit - disable mandatory BSSID\n");
+                priv->config &= ~CFG_STATIC_BSSID;
+                err = ipw2100_set_mandatory_bssid(priv, NULL, 0);
+                goto done;
+        }
+
+        priv->config |= CFG_STATIC_BSSID;
+        memcpy(priv->mandatory_bssid_mac, wrqu->ap_addr.sa_data, ETH_ALEN);
+
+        err = ipw2100_set_mandatory_bssid(priv, wrqu->ap_addr.sa_data, 0);
+
+        IPW_DEBUG_WX("SET BSSID -> %02X:%02X:%02X:%02X:%02X:%02X\n",
+                     wrqu->ap_addr.sa_data[0] & 0xff,
+                     wrqu->ap_addr.sa_data[1] & 0xff,
+                     wrqu->ap_addr.sa_data[2] & 0xff,
+                     wrqu->ap_addr.sa_data[3] & 0xff,
+                     wrqu->ap_addr.sa_data[4] & 0xff,
+                     wrqu->ap_addr.sa_data[5] & 0xff);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_wap(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured BSSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_BSSID ||
+            priv->status & STATUS_ASSOCIATED) {
+                wrqu->ap_addr.sa_family = ARPHRD_ETHER;
+                memcpy(wrqu->ap_addr.sa_data, &priv->bssid, ETH_ALEN);
+        } else
+                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+
+        IPW_DEBUG_WX("Getting WAP BSSID: " MAC_FMT "\n",
+                     MAC_ARG(wrqu->ap_addr.sa_data));
+        return 0;
+}
+
+static int ipw2100_wx_set_essid(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        char *essid = ""; /* ANY */
+        int length = 0;
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->essid.flags && wrqu->essid.length) {
+                length = wrqu->essid.length - 1;
+                essid = extra;
+        }
+
+        if (length == 0) {
+                IPW_DEBUG_WX("Setting ESSID to ANY\n");
+                priv->config &= ~CFG_STATIC_ESSID;
+                err = ipw2100_set_essid(priv, NULL, 0, 0);
+                goto done;
+        }
+
+        length = min(length, IW_ESSID_MAX_SIZE);
+
+        priv->config |= CFG_STATIC_ESSID;
+
+        if (priv->essid_len == length && !memcmp(priv->essid, extra, length)) {
+                IPW_DEBUG_WX("ESSID set to current ESSID.\n");
+                err = 0;
+                goto done;
+        }
+
+        IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(essid, length),
+                     length);
+
+        priv->essid_len = length;
+        memcpy(priv->essid, essid, priv->essid_len);
+
+        err = ipw2100_set_essid(priv, essid, length, 0);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_essid(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured ESSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_ESSID ||
+            priv->status & STATUS_ASSOCIATED) {
+                IPW_DEBUG_WX("Getting essid: '%s'\n",
+                             escape_essid(priv->essid, priv->essid_len));
+                memcpy(extra, priv->essid, priv->essid_len);
+                wrqu->essid.length = priv->essid_len;
+                wrqu->essid.flags = 1; /* active */
+        } else {
+                IPW_DEBUG_WX("Getting essid: ANY\n");
+                wrqu->essid.length = 0;
+                wrqu->essid.flags = 0; /* active */
+        }
+
+        return 0;
+}
+
+static int ipw2100_wx_set_nick(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (wrqu->data.length > IW_ESSID_MAX_SIZE)
+                return -E2BIG;
+
+        wrqu->data.length = min((size_t)wrqu->data.length, sizeof(priv->nick));
+        memset(priv->nick, 0, sizeof(priv->nick));
+        memcpy(priv->nick, extra,  wrqu->data.length);
+
+        IPW_DEBUG_WX("SET Nickname -> %s \n", priv->nick);
+
+        return 0;
+}
+
+static int ipw2100_wx_get_nick(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->data.length = strlen(priv->nick) + 1;
+        memcpy(extra, priv->nick, wrqu->data.length);
+        wrqu->data.flags = 1; /* active */
+
+        IPW_DEBUG_WX("GET Nickname -> %s \n", extra);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_rate(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        u32 target_rate = wrqu->bitrate.value;
+        u32 rate;
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        rate = 0;
+
+        if (target_rate == 1000000 ||
+            (!wrqu->bitrate.fixed && target_rate > 1000000))
+                rate |= TX_RATE_1_MBIT;
+        if (target_rate == 2000000 ||
+            (!wrqu->bitrate.fixed && target_rate > 2000000))
+                rate |= TX_RATE_2_MBIT;
+        if (target_rate == 5500000 ||
+            (!wrqu->bitrate.fixed && target_rate > 5500000))
+                rate |= TX_RATE_5_5_MBIT;
+        if (target_rate == 11000000 ||
+            (!wrqu->bitrate.fixed && target_rate > 11000000))
+                rate |= TX_RATE_11_MBIT;
+        if (rate == 0)
+                rate = DEFAULT_TX_RATES;
+
+        err = ipw2100_set_tx_rates(priv, rate, 0);
+
+        IPW_DEBUG_WX("SET Rate -> %04X \n", rate);
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+
+static int ipw2100_wx_get_rate(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int val;
+        int len = sizeof(val);
+        int err = 0;
+
+        if (!(priv->status & STATUS_ENABLED) ||
+            priv->status & STATUS_RF_KILL_MASK ||
+            !(priv->status & STATUS_ASSOCIATED)) {
+                wrqu->bitrate.value = 0;
+                return 0;
+        }
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        err = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE, &val, &len);
+        if (err) {
+                IPW_DEBUG_WX("failed querying ordinals.\n");
+                return err;
+        }
+
+        switch (val & TX_RATE_MASK) {
+        case TX_RATE_1_MBIT:
+                wrqu->bitrate.value = 1000000;
+                break;
+        case TX_RATE_2_MBIT:
+                wrqu->bitrate.value = 2000000;
+                break;
+        case TX_RATE_5_5_MBIT:
+                wrqu->bitrate.value = 5500000;
+                break;
+        case TX_RATE_11_MBIT:
+                wrqu->bitrate.value = 11000000;
+                break;
+        default:
+                wrqu->bitrate.value = 0;
+        }
+
+        IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_set_rts(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int value, err;
+
+        /* Auto RTS not yet supported */
+        if (wrqu->rts.fixed == 0)
+                return -EINVAL;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->rts.disabled)
+                value = priv->rts_threshold | RTS_DISABLED;
+        else {
+                if (wrqu->rts.value < 1 ||
+                    wrqu->rts.value > 2304) {
+                        err = -EINVAL;
+                        goto done;
+                }
+                value = wrqu->rts.value;
+        }
+
+        err = ipw2100_set_rts_threshold(priv, value);
+
+        IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X \n", value);
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_rts(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->rts.value = priv->rts_threshold & ~RTS_DISABLED;
+        wrqu->rts.fixed = 1; /* no auto select */
+
+        /* If RTS is set to the default value, then it is disabled */
+        wrqu->rts.disabled = (priv->rts_threshold & RTS_DISABLED) ? 1 : 0;
+
+        IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X \n", wrqu->rts.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_txpow(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0, value;
+
+        if (priv->ieee->iw_mode != IW_MODE_ADHOC)
+                return -EINVAL;
+
+        if (wrqu->txpower.disabled == 1 || wrqu->txpower.fixed == 0)
+                value = IPW_TX_POWER_DEFAULT;
+        else {
+                if (wrqu->txpower.value < IPW_TX_POWER_MIN_DBM ||
+                    wrqu->txpower.value > IPW_TX_POWER_MAX_DBM)
+                        return -EINVAL;
+
+                value = (wrqu->txpower.value - IPW_TX_POWER_MIN_DBM) * 16 /
+                        (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
+        }
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        err = ipw2100_set_tx_power(priv, value);
+
+        IPW_DEBUG_WX("SET TX Power -> %d \n", value);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_txpow(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (priv->ieee->iw_mode != IW_MODE_ADHOC) {
+                wrqu->power.disabled = 1;
+                return 0;
+        }
+
+        if (priv->tx_power == IPW_TX_POWER_DEFAULT) {
+                wrqu->power.fixed = 0;
+                wrqu->power.value = IPW_TX_POWER_MAX_DBM;
+                wrqu->power.disabled = 1;
+        } else {
+                wrqu->power.disabled = 0;
+                wrqu->power.fixed = 1;
+                wrqu->power.value =
+                        (priv->tx_power *
+                         (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM)) /
+                        (IPW_TX_POWER_MAX - IPW_TX_POWER_MIN) +
+                        IPW_TX_POWER_MIN_DBM;
+        }
+
+        wrqu->power.flags = IW_TXPOW_DBM;
+
+        IPW_DEBUG_WX("GET TX Power -> %d \n", wrqu->power.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_frag(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (!wrqu->frag.fixed)
+                return -EINVAL;
+
+        if (wrqu->frag.disabled) {
+                priv->frag_threshold |= FRAG_DISABLED;
+                priv->ieee->fts = DEFAULT_FTS;
+        } else {
+                if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||
+                    wrqu->frag.value > MAX_FRAG_THRESHOLD)
+                        return -EINVAL;
+
+                priv->ieee->fts = wrqu->frag.value & ~0x1;
+                priv->frag_threshold = priv->ieee->fts;
+        }
+
+        IPW_DEBUG_WX("SET Frag Threshold -> %d \n", priv->ieee->fts);
+
+        return 0;
+}
+
+static int ipw2100_wx_get_frag(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        wrqu->frag.value = priv->frag_threshold & ~FRAG_DISABLED;
+        wrqu->frag.fixed = 0;   /* no auto select */
+        wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;
+
+        IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_retry(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        if (wrqu->retry.flags & IW_RETRY_LIFETIME ||
+            wrqu->retry.disabled)
+                return -EINVAL;
+
+        if (!(wrqu->retry.flags & IW_RETRY_LIMIT))
+                return 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->retry.flags & IW_RETRY_MIN) {
+                err = ipw2100_set_short_retry(priv, wrqu->retry.value);
+                IPW_DEBUG_WX("SET Short Retry Limit -> %d \n",
+                       wrqu->retry.value);
+                goto done;
+        }
+
+        if (wrqu->retry.flags & IW_RETRY_MAX) {
+                err = ipw2100_set_long_retry(priv, wrqu->retry.value);
+                IPW_DEBUG_WX("SET Long Retry Limit -> %d \n",
+                       wrqu->retry.value);
+                goto done;
+        }
+
+        err = ipw2100_set_short_retry(priv, wrqu->retry.value);
+        if (!err)
+                err = ipw2100_set_long_retry(priv, wrqu->retry.value);
+
+        IPW_DEBUG_WX("SET Both Retry Limits -> %d \n", wrqu->retry.value);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_retry(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->retry.disabled = 0; /* can't be disabled */
+
+        if ((wrqu->retry.flags & IW_RETRY_TYPE) ==
+            IW_RETRY_LIFETIME)
+                return -EINVAL;
+
+        if (wrqu->retry.flags & IW_RETRY_MAX) {
+                wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MAX;
+                wrqu->retry.value = priv->long_retry_limit;
+        } else {
+                wrqu->retry.flags =
+                    (priv->short_retry_limit !=
+                     priv->long_retry_limit) ?
+                    IW_RETRY_LIMIT & IW_RETRY_MIN : IW_RETRY_LIMIT;
+
+                wrqu->retry.value = priv->short_retry_limit;
+        }
+
+        IPW_DEBUG_WX("GET Retry -> %d \n", wrqu->retry.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_scan(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        IPW_DEBUG_WX("Initiating scan...\n");
+        if (ipw2100_set_scan_options(priv) ||
+            ipw2100_start_scan(priv)) {
+                IPW_DEBUG_WX("Start scan failed.\n");
+
+                /* TODO: Mark a scan as pending so when hardware initialized
+                 *       a scan starts */
+        }
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_scan(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra);
+}
+
+
+/*
+ * Implementation based on code in hostap-driver v0.1.3 hostap_ioctl.c
+ */
+static int ipw2100_wx_set_encode(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 union iwreq_data *wrqu, char *key)
+{
+        /*
+         * No check of STATUS_INITIALIZED required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw2100_wx_get_encode(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 union iwreq_data *wrqu, char *key)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw2100_wx_set_power(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->power.disabled) {
+                priv->power_mode = IPW_POWER_LEVEL(priv->power_mode);
+                err = ipw2100_set_power_mode(priv, IPW_POWER_MODE_CAM);
+                IPW_DEBUG_WX("SET Power Management Mode -> off\n");
+                goto done;
+        }
+
+        switch (wrqu->power.flags & IW_POWER_MODE) {
+        case IW_POWER_ON:    /* If not specified */
+        case IW_POWER_MODE:  /* If set all mask */
+        case IW_POWER_ALL_R: /* If explicitely state all */
+                break;
+        default: /* Otherwise we don't support it */
+                IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
+                             wrqu->power.flags);
+                err = -EOPNOTSUPP;
+                goto done;
+        }
+
+        /* If the user hasn't specified a power management mode yet, default
+         * to BATTERY */
+        priv->power_mode = IPW_POWER_ENABLED | priv->power_mode;
+        err = ipw2100_set_power_mode(priv, IPW_POWER_LEVEL(priv->power_mode));
+
+        IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n",
+                     priv->power_mode);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+
+}
+
+static int ipw2100_wx_get_power(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED)) {
+                wrqu->power.disabled = 1;
+        } else {
+                wrqu->power.disabled = 0;
+                wrqu->power.flags = 0;
+        }
+
+        IPW_DEBUG_WX("GET Power Management Mode -> %02X\n", priv->power_mode);
+
+        return 0;
+}
+
+
+/*
+ *
+ * IWPRIV handlers
+ *
+ */
+#ifdef CONFIG_IPW2100_MONITOR
+static int ipw2100_wx_set_promisc(struct net_device *dev,
+                                  struct iw_request_info *info,
+                                  union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int *parms = (int *)extra;
+        int enable = (parms[0] > 0);
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (enable) {
+                if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                        err = ipw2100_set_channel(priv, parms[1], 0);
+                        goto done;
+                }
+                priv->channel = parms[1];
+                err = ipw2100_switch_mode(priv, IW_MODE_MONITOR);
+        } else {
+                if (priv->ieee->iw_mode == IW_MODE_MONITOR)
+                        err = ipw2100_switch_mode(priv, priv->last_mode);
+        }
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_reset(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        if (priv->status & STATUS_INITIALIZED)
+                schedule_reset(priv);
+        return 0;
+}
+
+#endif
+
+static int ipw2100_wx_set_powermode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0, mode = *(int *)extra;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if ((mode < 1) || (mode > POWER_MODES))
+                mode = IPW_POWER_AUTO;
+
+        if (priv->power_mode != mode)
+                err = ipw2100_set_power_mode(priv, mode);
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+#define MAX_POWER_STRING 80
+static int ipw2100_wx_get_powermode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int level = IPW_POWER_LEVEL(priv->power_mode);
+        s32 timeout, period;
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED)) {
+                snprintf(extra, MAX_POWER_STRING,
+                         "Power save level: %d (Off)", level);
+        } else {
+                switch (level) {
+                case IPW_POWER_MODE_CAM:
+                        snprintf(extra, MAX_POWER_STRING,
+                                 "Power save level: %d (None)", level);
+                        break;
+                case IPW_POWER_AUTO:
+                snprintf(extra, MAX_POWER_STRING,
+                         "Power save level: %d (Auto)", 0);
+                        break;
+                default:
+                        timeout = timeout_duration[level - 1] / 1000;
+                        period = period_duration[level - 1] / 1000;
+                        snprintf(extra, MAX_POWER_STRING,
+                                 "Power save level: %d "
+                                 "(Timeout %dms, Period %dms)",
+                                 level, timeout, period);
+                }
+        }
+
+        wrqu->data.length = strlen(extra) + 1;
+
+        return 0;
+}
+
+
+static int ipw2100_wx_set_preamble(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err, mode = *(int *)extra;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (mode == 1)
+                priv->config |= CFG_LONG_PREAMBLE;
+        else if (mode == 0)
+                priv->config &= ~CFG_LONG_PREAMBLE;
+        else {
+                err = -EINVAL;
+                goto done;
+        }
+
+        err = ipw2100_system_config(priv, 0);
+
+done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_preamble(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (priv->config & CFG_LONG_PREAMBLE)
+                snprintf(wrqu->name, IFNAMSIZ, "long (1)");
+        else
+                snprintf(wrqu->name, IFNAMSIZ, "auto (0)");
+
+        return 0;
+}
+
+static iw_handler ipw2100_wx_handlers[] =
+{
+        NULL,                     /* SIOCSIWCOMMIT */
+        ipw2100_wx_get_name,      /* SIOCGIWNAME */
+        NULL,                     /* SIOCSIWNWID */
+        NULL,                     /* SIOCGIWNWID */
+        ipw2100_wx_set_freq,      /* SIOCSIWFREQ */
+        ipw2100_wx_get_freq,      /* SIOCGIWFREQ */
+        ipw2100_wx_set_mode,      /* SIOCSIWMODE */
+        ipw2100_wx_get_mode,      /* SIOCGIWMODE */
+        NULL,                     /* SIOCSIWSENS */
+        NULL,                     /* SIOCGIWSENS */
+        NULL,                     /* SIOCSIWRANGE */
+        ipw2100_wx_get_range,     /* SIOCGIWRANGE */
+        NULL,                     /* SIOCSIWPRIV */
+        NULL,                     /* SIOCGIWPRIV */
+        NULL,                     /* SIOCSIWSTATS */
+        NULL,                     /* SIOCGIWSTATS */
+        NULL,                     /* SIOCSIWSPY */
+        NULL,                     /* SIOCGIWSPY */
+        NULL,                     /* SIOCGIWTHRSPY */
+        NULL,                     /* SIOCWIWTHRSPY */
+        ipw2100_wx_set_wap,       /* SIOCSIWAP */
+        ipw2100_wx_get_wap,       /* SIOCGIWAP */
+        NULL,                     /* -- hole -- */
+        NULL,                     /* SIOCGIWAPLIST -- deprecated */
+        ipw2100_wx_set_scan,      /* SIOCSIWSCAN */
+        ipw2100_wx_get_scan,      /* SIOCGIWSCAN */
+        ipw2100_wx_set_essid,     /* SIOCSIWESSID */
+        ipw2100_wx_get_essid,     /* SIOCGIWESSID */
+        ipw2100_wx_set_nick,      /* SIOCSIWNICKN */
+        ipw2100_wx_get_nick,      /* SIOCGIWNICKN */
+        NULL,                     /* -- hole -- */
+        NULL,                     /* -- hole -- */
+        ipw2100_wx_set_rate,      /* SIOCSIWRATE */
+        ipw2100_wx_get_rate,      /* SIOCGIWRATE */
+        ipw2100_wx_set_rts,       /* SIOCSIWRTS */
+        ipw2100_wx_get_rts,       /* SIOCGIWRTS */
+        ipw2100_wx_set_frag,      /* SIOCSIWFRAG */
+        ipw2100_wx_get_frag,      /* SIOCGIWFRAG */
+        ipw2100_wx_set_txpow,     /* SIOCSIWTXPOW */
+        ipw2100_wx_get_txpow,     /* SIOCGIWTXPOW */
+        ipw2100_wx_set_retry,     /* SIOCSIWRETRY */
+        ipw2100_wx_get_retry,     /* SIOCGIWRETRY */
+        ipw2100_wx_set_encode,    /* SIOCSIWENCODE */
+        ipw2100_wx_get_encode,    /* SIOCGIWENCODE */
+        ipw2100_wx_set_power,     /* SIOCSIWPOWER */
+        ipw2100_wx_get_power,     /* SIOCGIWPOWER */
+};
+
+#define IPW2100_PRIV_SET_MONITOR        SIOCIWFIRSTPRIV
+#define IPW2100_PRIV_RESET              SIOCIWFIRSTPRIV+1
+#define IPW2100_PRIV_SET_POWER          SIOCIWFIRSTPRIV+2
+#define IPW2100_PRIV_GET_POWER          SIOCIWFIRSTPRIV+3
+#define IPW2100_PRIV_SET_LONGPREAMBLE   SIOCIWFIRSTPRIV+4
+#define IPW2100_PRIV_GET_LONGPREAMBLE   SIOCIWFIRSTPRIV+5
+
+static const struct iw_priv_args ipw2100_private_args[] = {
+
+#ifdef CONFIG_IPW2100_MONITOR
+        {
+                IPW2100_PRIV_SET_MONITOR,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor"
+        },
+        {
+                IPW2100_PRIV_RESET,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset"
+        },
+#endif /* CONFIG_IPW2100_MONITOR */
+
+        {
+                IPW2100_PRIV_SET_POWER,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_power"
+        },
+        {
+                IPW2100_PRIV_GET_POWER,
+                0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_POWER_STRING, "get_power"
+        },
+        {
+                IPW2100_PRIV_SET_LONGPREAMBLE,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"
+        },
+        {
+                IPW2100_PRIV_GET_LONGPREAMBLE,
+                0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | IFNAMSIZ, "get_preamble"
+        },
+};
+
+static iw_handler ipw2100_private_handler[] = {
+#ifdef CONFIG_IPW2100_MONITOR
+        ipw2100_wx_set_promisc,
+        ipw2100_wx_reset,
+#else /* CONFIG_IPW2100_MONITOR */
+        NULL,
+        NULL,
+#endif /* CONFIG_IPW2100_MONITOR */
+        ipw2100_wx_set_powermode,
+        ipw2100_wx_get_powermode,
+        ipw2100_wx_set_preamble,
+        ipw2100_wx_get_preamble,
+};
+
+struct iw_handler_def ipw2100_wx_handler_def =
+{
+        .standard = ipw2100_wx_handlers,
+        .num_standard = sizeof(ipw2100_wx_handlers) / sizeof(iw_handler),
+        .num_private = sizeof(ipw2100_private_handler) / sizeof(iw_handler),
+        .num_private_args = sizeof(ipw2100_private_args) /
+        sizeof(struct iw_priv_args),
+        .private = (iw_handler *)ipw2100_private_handler,
+        .private_args = (struct iw_priv_args *)ipw2100_private_args,
+};
+
+/*
+ * Get wireless statistics.
+ * Called by /proc/net/wireless
+ * Also called by SIOCGIWSTATS
+ */
+struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
+{
+        enum {
+                POOR = 30,
+                FAIR = 60,
+                GOOD = 80,
+                VERY_GOOD = 90,
+                EXCELLENT = 95,
+                PERFECT = 100
+        };
+        int rssi_qual;
+        int tx_qual;
+        int beacon_qual;
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct iw_statistics *wstats;
+        u32 rssi, quality, tx_retries, missed_beacons, tx_failures;
+        u32 ord_len = sizeof(u32);
+
+        if (!priv)
+                return (struct iw_statistics *) NULL;
+
+        wstats = &priv->wstats;
+
+        /* if hw is disabled, then ipw2100_get_ordinal() can't be called.
+         * ipw2100_wx_wireless_stats seems to be called before fw is
+         * initialized.  STATUS_ASSOCIATED will only be set if the hw is up
+         * and associated; if not associcated, the values are all meaningless
+         * anyway, so set them all to NULL and INVALID */
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                wstats->miss.beacon = 0;
+                wstats->discard.retries = 0;
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+                wstats->qual.noise = 0;
+                wstats->qual.updated = 7;
+                wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
+                        IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+                return wstats;
+        }
+
+        if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_PERCENT_MISSED_BCNS,
+                                &missed_beacons, &ord_len))
+                goto fail_get_ordinal;
+
+        /* If we don't have a connection the quality and level is 0*/
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+        } else {
+                if (ipw2100_get_ordinal(priv, IPW_ORD_RSSI_AVG_CURR,
+                                        &rssi, &ord_len))
+                        goto fail_get_ordinal;
+                wstats->qual.level = rssi + IPW2100_RSSI_TO_DBM;
+                if (rssi < 10)
+                        rssi_qual = rssi * POOR / 10;
+                else if (rssi < 15)
+                        rssi_qual = (rssi - 10) * (FAIR - POOR) / 5 + POOR;
+                else if (rssi < 20)
+                        rssi_qual = (rssi - 15) * (GOOD - FAIR) / 5 + FAIR;
+                else if (rssi < 30)
+                        rssi_qual = (rssi - 20) * (VERY_GOOD - GOOD) /
+                                10 + GOOD;
+                else
+                        rssi_qual = (rssi - 30) * (PERFECT - VERY_GOOD) /
+                                10 + VERY_GOOD;
+
+                if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_PERCENT_RETRIES,
+                                        &tx_retries, &ord_len))
+                        goto fail_get_ordinal;
+
+                if (tx_retries > 75)
+                        tx_qual = (90 - tx_retries) * POOR / 15;
+                else if (tx_retries > 70)
+                        tx_qual = (75 - tx_retries) * (FAIR - POOR) / 5 + POOR;
+                else if (tx_retries > 65)
+                        tx_qual = (70 - tx_retries) * (GOOD - FAIR) / 5 + FAIR;
+                else if (tx_retries > 50)
+                        tx_qual = (65 - tx_retries) * (VERY_GOOD - GOOD) /
+                                15 + GOOD;
+                else
+                        tx_qual = (50 - tx_retries) *
+                                (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
+
+                if (missed_beacons > 50)
+                        beacon_qual = (60 - missed_beacons) * POOR / 10;
+                else if (missed_beacons > 40)
+                        beacon_qual = (50 - missed_beacons) * (FAIR - POOR) /
+                                10 + POOR;
+                else if (missed_beacons > 32)
+                        beacon_qual = (40 - missed_beacons) * (GOOD - FAIR) /
+                                18 + FAIR;
+                else if (missed_beacons > 20)
+                        beacon_qual = (32 - missed_beacons) *
+                                (VERY_GOOD - GOOD) / 20 + GOOD;
+                else
+                        beacon_qual = (20 - missed_beacons) *
+                                (PERFECT - VERY_GOOD) / 20 + VERY_GOOD;
+
+                quality = min(beacon_qual, min(tx_qual, rssi_qual));
+
+#ifdef CONFIG_IPW_DEBUG
+                if (beacon_qual == quality)
+                        IPW_DEBUG_WX("Quality clamped by Missed Beacons\n");
+                else if (tx_qual == quality)
+                        IPW_DEBUG_WX("Quality clamped by Tx Retries\n");
+                else if (quality != 100)
+                        IPW_DEBUG_WX("Quality clamped by Signal Strength\n");
+                else
+                        IPW_DEBUG_WX("Quality not clamped.\n");
+#endif
+
+                wstats->qual.qual = quality;
+                wstats->qual.level = rssi + IPW2100_RSSI_TO_DBM;
+        }
+
+        wstats->qual.noise = 0;
+        wstats->qual.updated = 7;
+        wstats->qual.updated |= IW_QUAL_NOISE_INVALID;
+
+        /* FIXME: this is percent and not a # */
+        wstats->miss.beacon = missed_beacons;
+
+        if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_TX_FAILURES,
+                                &tx_failures, &ord_len))
+                goto fail_get_ordinal;
+        wstats->discard.retries = tx_failures;
+
+        return wstats;
+
+ fail_get_ordinal:
+        IPW_DEBUG_WX("failed querying ordinals.\n");
+
+        return (struct iw_statistics *) NULL;
+}
+
+void ipw2100_wx_event_work(struct ipw2100_priv *priv)
+{
+        union iwreq_data wrqu;
+        int len = ETH_ALEN;
+
+        if (priv->status & STATUS_STOPPING)
+                return;
+
+        down(&priv->action_sem);
+
+        IPW_DEBUG_WX("enter\n");
+
+        up(&priv->action_sem);
+
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+
+        /* Fetch BSSID from the hardware */
+        if (!(priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED)) ||
+            priv->status & STATUS_RF_KILL_MASK ||
+            ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID,
+                                &priv->bssid,  &len)) {
+                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        } else {
+                /* We now have the BSSID, so can finish setting to the full
+                 * associated state */
+                memcpy(wrqu.ap_addr.sa_data, priv->bssid, ETH_ALEN);
+                memcpy(&priv->ieee->bssid, priv->bssid, ETH_ALEN);
+                priv->status &= ~STATUS_ASSOCIATING;
+                priv->status |= STATUS_ASSOCIATED;
+                netif_carrier_on(priv->net_dev);
+                if (netif_queue_stopped(priv->net_dev)) {
+                        IPW_DEBUG_INFO("Waking net queue.\n");
+                        netif_wake_queue(priv->net_dev);
+                } else {
+                        IPW_DEBUG_INFO("Starting net queue.\n");
+                        netif_start_queue(priv->net_dev);
+                }
+        }
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                IPW_DEBUG_WX("Configuring ESSID\n");
+                down(&priv->action_sem);
+                /* This is a disassociation event, so kick the firmware to
+                 * look for another AP */
+                if (priv->config & CFG_STATIC_ESSID)
+                        ipw2100_set_essid(priv, priv->essid, priv->essid_len, 0);
+                else
+                        ipw2100_set_essid(priv, NULL, 0, 0);
+                up(&priv->action_sem);
+        }
+
+        wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+}
+
+#define IPW2100_FW_MAJOR_VERSION 1
+#define IPW2100_FW_MINOR_VERSION 3
+
+#define IPW2100_FW_MINOR(x) ((x & 0xff) >> 8)
+#define IPW2100_FW_MAJOR(x) (x & 0xff)
+
+#define IPW2100_FW_VERSION ((IPW2100_FW_MINOR_VERSION << 8) | \
+                             IPW2100_FW_MAJOR_VERSION)
+
+#define IPW2100_FW_PREFIX "ipw2100-" __stringify(IPW2100_FW_MAJOR_VERSION) \
+"." __stringify(IPW2100_FW_MINOR_VERSION)
+
+#define IPW2100_FW_NAME(x) IPW2100_FW_PREFIX "" x ".fw"
+
+
+/*
+
+BINARY FIRMWARE HEADER FORMAT
+
+offset      length   desc
+0           2        version
+2           2        mode == 0:BSS,1:IBSS,2:MONITOR
+4           4        fw_len
+8           4        uc_len
+C           fw_len   firmware data
+12 + fw_len uc_len   microcode data
+
+*/
+
+struct ipw2100_fw_header {
+        short version;
+        short mode;
+        unsigned int fw_size;
+        unsigned int uc_size;
+} __attribute__ ((packed));
+
+
+
+static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
+{
+        struct ipw2100_fw_header *h =
+                (struct ipw2100_fw_header *)fw->fw_entry->data;
+
+        if (IPW2100_FW_MAJOR(h->version) != IPW2100_FW_MAJOR_VERSION) {
+                IPW_DEBUG_WARNING("Firmware image not compatible "
+                       "(detected version id of %u). "
+                       "See Documentation/networking/README.ipw2100\n",
+                       h->version);
+                return 1;
+        }
+
+        fw->version = h->version;
+        fw->fw.data = fw->fw_entry->data + sizeof(struct ipw2100_fw_header);
+        fw->fw.size = h->fw_size;
+        fw->uc.data = fw->fw.data + h->fw_size;
+        fw->uc.size = h->uc_size;
+
+        return 0;
+}
+
+
+int ipw2100_get_firmware(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
+{
+        char *fw_name;
+        int rc;
+
+        IPW_DEBUG_INFO("%s: Using hotplug firmware load.\n",
+               priv->net_dev->name);
+
+        switch (priv->ieee->iw_mode) {
+        case IW_MODE_ADHOC:
+                fw_name = IPW2100_FW_NAME("-i");
+                break;
+#ifdef CONFIG_IPW2100_MONITOR
+        case IW_MODE_MONITOR:
+                fw_name = IPW2100_FW_NAME("-p");
+                break;
+#endif
+        case IW_MODE_INFRA:
+        default:
+                fw_name = IPW2100_FW_NAME("");
+                break;
+        }
+
+        rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev);
+
+        if (rc < 0) {
+                IPW_DEBUG_ERROR(
+                       "%s: Firmware '%s' not available or load failed.\n",
+                       priv->net_dev->name, fw_name);
+                return rc;
+        }
+        IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data,
+                           fw->fw_entry->size);
+
+        ipw2100_mod_firmware_load(fw);
+
+        return 0;
+}
+
+void ipw2100_release_firmware(struct ipw2100_priv *priv,
+                              struct ipw2100_fw *fw)
+{
+        fw->version = 0;
+        if (fw->fw_entry)
+                release_firmware(fw->fw_entry);
+        fw->fw_entry = NULL;
+}
+
+
+int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf, size_t max)
+{
+        char ver[MAX_FW_VERSION_LEN];
+        u32 len = MAX_FW_VERSION_LEN;
+        u32 tmp;
+        int i;
+        /* firmware version is an ascii string (max len of 14) */
+        if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_FW_VER_NUM,
+                                ver, &len))
+                return -EIO;
+        tmp = max;
+        if (len >= max)
+                len = max - 1;
+        for (i = 0; i < len; i++)
+                buf[i] = ver[i];
+        buf[i] = '\0';
+        return tmp;
+}
+
+int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf, size_t max)
+{
+        u32 ver;
+        u32 len = sizeof(ver);
+        /* microcode version is a 32 bit integer */
+        if (ipw2100_get_ordinal(priv, IPW_ORD_UCODE_VERSION,
+                                &ver, &len))
+                return -EIO;
+        return snprintf(buf, max, "%08X", ver);
+}
+
+/*
+ * On exit, the firmware will have been freed from the fw list
+ */
+int ipw2100_fw_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
+{
+        /* firmware is constructed of N contiguous entries, each entry is
+         * structured as:
+         *
+         * offset    sie         desc
+         * 0         4           address to write to
+         * 4         2           length of data run
+         * 6         length      data
+         */
+        unsigned int addr;
+        unsigned short len;
+
+        const unsigned char *firmware_data = fw->fw.data;
+        unsigned int firmware_data_left = fw->fw.size;
+
+        while (firmware_data_left > 0) {
+                addr = *(u32 *)(firmware_data);
+                firmware_data      += 4;
+                firmware_data_left -= 4;
+
+                len = *(u16 *)(firmware_data);
+                firmware_data      += 2;
+                firmware_data_left -= 2;
+
+                if (len > 32) {
+                        IPW_DEBUG_ERROR(
+                               "Invalid firmware run-length of %d bytes\n",
+                               len);
+                        return -EINVAL;
+                }
+
+                write_nic_memory(priv->net_dev, addr, len, firmware_data);
+                firmware_data      += len;
+                firmware_data_left -= len;
+        }
+
+        return 0;
+}
+
+struct symbol_alive_response {
+        u8 cmd_id;
+        u8 seq_num;
+        u8 ucode_rev;
+        u8 eeprom_valid;
+        u16 valid_flags;
+        u8 IEEE_addr[6];
+        u16 flags;
+        u16 pcb_rev;
+        u16 clock_settle_time;  // 1us LSB
+        u16 powerup_settle_time;        // 1us LSB
+        u16 hop_settle_time;    // 1us LSB
+        u8 date[3];             // month, day, year
+        u8 time[2];             // hours, minutes
+        u8 ucode_valid;
+};
+
+int ipw2100_ucode_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
+{
+        struct net_device *dev = priv->net_dev;
+        const unsigned char *microcode_data = fw->uc.data;
+        unsigned int microcode_data_left = fw->uc.size;
+
+        struct symbol_alive_response response;
+        int i, j;
+        u8 data;
+
+        /* Symbol control */
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x703);
+        readl((void *)(dev->base_addr));
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x707);
+        readl((void *)(dev->base_addr));
+
+        /* HW config */
+        write_nic_byte(dev, 0x210014, 0x72);    /* fifo width =16 */
+        readl((void *)(dev->base_addr));
+        write_nic_byte(dev, 0x210014, 0x72);    /* fifo width =16 */
+        readl((void *)(dev->base_addr));
+
+        /* EN_CS_ACCESS bit to reset control store pointer */
+        write_nic_byte(dev, 0x210000, 0x40);
+        readl((void *)(dev->base_addr));
+        write_nic_byte(dev, 0x210000, 0x0);
+        readl((void *)(dev->base_addr));
+        write_nic_byte(dev, 0x210000, 0x40);
+        readl((void *)(dev->base_addr));
+
+        /* copy microcode from buffer into Symbol */
+
+        while (microcode_data_left > 0) {
+                write_nic_byte(dev, 0x210010, *microcode_data++);
+                write_nic_byte(dev, 0x210010, *microcode_data++);
+                microcode_data_left -= 2;
+        }
+
+        /* EN_CS_ACCESS bit to reset the control store pointer */
+        write_nic_byte(dev, 0x210000, 0x0);
+        readl((void *)(dev->base_addr));
+
+        /* Enable System (Reg 0)
+         * first enable causes garbage in RX FIFO */
+        write_nic_byte(dev, 0x210000, 0x0);
+        readl((void *)(dev->base_addr));
+        write_nic_byte(dev, 0x210000, 0x80);
+        readl((void *)(dev->base_addr));
+
+        /* Reset External Baseband Reg */
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x703);
+        readl((void *)(dev->base_addr));
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x707);
+        readl((void *)(dev->base_addr));
+
+        /* HW Config (Reg 5) */
+        write_nic_byte(dev, 0x210014, 0x72);    // fifo width =16
+        readl((void *)(dev->base_addr));
+        write_nic_byte(dev, 0x210014, 0x72);    // fifo width =16
+        readl((void *)(dev->base_addr));
+
+        /* Enable System (Reg 0)
+         * second enable should be OK */
+        write_nic_byte(dev, 0x210000, 0x00);    // clear enable system
+        readl((void *)(dev->base_addr));
+        write_nic_byte(dev, 0x210000, 0x80);    // set enable system
+
+        /* check Symbol is enabled - upped this from 5 as it wasn't always
+         * catching the update */
+        for (i = 0; i < 10; i++) {
+                udelay(10);
+
+                /* check Dino is enabled bit */
+                read_nic_byte(dev, 0x210000, &data);
+                if (data & 0x1)
+                        break;
+        }
+
+        if (i == 10) {
+                IPW_DEBUG_ERROR("%s: Error initializing Symbol\n",
+                       dev->name);
+                return -EIO;
+        }
+
+        /* Get Symbol alive response */
+        for (i = 0; i < 30; i++) {
+                /* Read alive response structure */
+                for (j = 0;
+                     j < (sizeof(struct symbol_alive_response) >> 1);
+                     j++)
+                        read_nic_word(dev, 0x210004,
+                                      ((u16 *)&response) + j);
+
+                if ((response.cmd_id == 1) &&
+                    (response.ucode_valid == 0x1))
+                        break;
+                udelay(10);
+        }
+
+        if (i == 30) {
+                IPW_DEBUG_ERROR("%s: No response from Symbol - hw not alive\n",
+                       dev->name);
+                printk_buf(IPW_DL_ERROR, (u8*)&response, sizeof(response));
+                return -EIO;
+        }
+
+        return 0;
+}
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
new file mode 100644
index 000000000000..95a05b554c1a
--- /dev/null
+++ b/drivers/net/wireless/ipw2100.h
@@ -0,0 +1,1195 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+#ifndef _IPW2100_H
+#define _IPW2100_H
+
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <asm/io.h>
+#include <linux/socket.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+#include <linux/version.h>
+#include <net/iw_handler.h>     // new driver API
+
+#include <net/ieee80211.h>
+
+#include <linux/workqueue.h>
+
+struct ipw2100_priv;
+struct ipw2100_tx_packet;
+struct ipw2100_rx_packet;
+
+#ifdef CONFIG_IPW_DEBUG
+enum { IPW_DEBUG_ENABLED = 1 };
+extern u32 ipw2100_debug_level;
+#define IPW_DEBUG(level, message...) \
+do { \
+        if (ipw2100_debug_level & (level)) { \
+                printk(KERN_DEBUG "ipw2100: %c %s ", \
+                       in_interrupt() ? 'I' : 'U',  __FUNCTION__); \
+                printk(message); \
+        } \
+} while (0)
+#else
+enum { IPW_DEBUG_ENABLED = 0 };
+#define IPW_DEBUG(level, message...) do {} while (0)
+#endif /* CONFIG_IPW_DEBUG */
+
+#define IPW_DL_UNINIT    0x80000000
+#define IPW_DL_NONE      0x00000000
+#define IPW_DL_ALL       0x7FFFFFFF
+
+/*
+ * To use the debug system;
+ *
+ * If you are defining a new debug classification, simply add it to the #define
+ * list here in the form of:
+ *
+ * #define IPW_DL_xxxx VALUE
+ *
+ * shifting value to the left one bit from the previous entry.  xxxx should be
+ * the name of the classification (for example, WEP)
+ *
+ * You then need to either add a IPW2100_xxxx_DEBUG() macro definition for your
+ * classification, or use IPW_DEBUG(IPW_DL_xxxx, ...) whenever you want
+ * to send output to that classification.
+ *
+ * To add your debug level to the list of levels seen when you perform
+ *
+ * % cat /proc/net/ipw2100/debug_level
+ *
+ * you simply need to add your entry to the ipw2100_debug_levels array.
+ *
+ * If you do not see debug_level in /proc/net/ipw2100 then you do not have
+ * CONFIG_IPW_DEBUG defined in your kernel configuration
+ *
+ */
+
+#define IPW_DL_ERROR         (1<<0)
+#define IPW_DL_WARNING       (1<<1)
+#define IPW_DL_INFO          (1<<2)
+#define IPW_DL_WX            (1<<3)
+#define IPW_DL_HC            (1<<5)
+#define IPW_DL_STATE         (1<<6)
+
+#define IPW_DL_NOTIF         (1<<10)
+#define IPW_DL_SCAN          (1<<11)
+#define IPW_DL_ASSOC         (1<<12)
+#define IPW_DL_DROP          (1<<13)
+
+#define IPW_DL_IOCTL         (1<<14)
+#define IPW_DL_RF_KILL       (1<<17)
+
+
+#define IPW_DL_MANAGE        (1<<15)
+#define IPW_DL_FW            (1<<16)
+
+#define IPW_DL_FRAG          (1<<21)
+#define IPW_DL_WEP           (1<<22)
+#define IPW_DL_TX            (1<<23)
+#define IPW_DL_RX            (1<<24)
+#define IPW_DL_ISR           (1<<25)
+#define IPW_DL_IO            (1<<26)
+#define IPW_DL_TRACE         (1<<28)
+
+#define IPW_DEBUG_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+#define IPW_DEBUG_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
+#define IPW_DEBUG_INFO(f...)    IPW_DEBUG(IPW_DL_INFO, ## f)
+#define IPW_DEBUG_WX(f...)     IPW_DEBUG(IPW_DL_WX, ## f)
+#define IPW_DEBUG_SCAN(f...)   IPW_DEBUG(IPW_DL_SCAN, ## f)
+#define IPW_DEBUG_NOTIF(f...) IPW_DEBUG(IPW_DL_NOTIF, ## f)
+#define IPW_DEBUG_TRACE(f...)  IPW_DEBUG(IPW_DL_TRACE, ## f)
+#define IPW_DEBUG_RX(f...)     IPW_DEBUG(IPW_DL_RX, ## f)
+#define IPW_DEBUG_TX(f...)     IPW_DEBUG(IPW_DL_TX, ## f)
+#define IPW_DEBUG_ISR(f...)    IPW_DEBUG(IPW_DL_ISR, ## f)
+#define IPW_DEBUG_MANAGEMENT(f...) IPW_DEBUG(IPW_DL_MANAGE, ## f)
+#define IPW_DEBUG_WEP(f...)    IPW_DEBUG(IPW_DL_WEP, ## f)
+#define IPW_DEBUG_HC(f...) IPW_DEBUG(IPW_DL_HC, ## f)
+#define IPW_DEBUG_FRAG(f...) IPW_DEBUG(IPW_DL_FRAG, ## f)
+#define IPW_DEBUG_FW(f...) IPW_DEBUG(IPW_DL_FW, ## f)
+#define IPW_DEBUG_RF_KILL(f...) IPW_DEBUG(IPW_DL_RF_KILL, ## f)
+#define IPW_DEBUG_DROP(f...) IPW_DEBUG(IPW_DL_DROP, ## f)
+#define IPW_DEBUG_IO(f...) IPW_DEBUG(IPW_DL_IO, ## f)
+#define IPW_DEBUG_IOCTL(f...) IPW_DEBUG(IPW_DL_IOCTL, ## f)
+#define IPW_DEBUG_STATE(f, a...) IPW_DEBUG(IPW_DL_STATE | IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+#define IPW_DEBUG_ASSOC(f, a...) IPW_DEBUG(IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+
+enum {
+        IPW_HW_STATE_DISABLED = 1,
+        IPW_HW_STATE_ENABLED = 0
+};
+
+struct ssid_context {
+        char ssid[IW_ESSID_MAX_SIZE + 1];
+        int ssid_len;
+        unsigned char bssid[ETH_ALEN];
+        int port_type;
+        int channel;
+
+};
+
+extern const char *port_type_str[];
+extern const char *band_str[];
+
+#define NUMBER_OF_BD_PER_COMMAND_PACKET         1
+#define NUMBER_OF_BD_PER_DATA_PACKET            2
+
+#define IPW_MAX_BDS 6
+#define NUMBER_OF_OVERHEAD_BDS_PER_PACKETR      2
+#define NUMBER_OF_BDS_TO_LEAVE_FOR_COMMANDS     1
+
+#define REQUIRED_SPACE_IN_RING_FOR_COMMAND_PACKET \
+    (IPW_BD_QUEUE_W_R_MIN_SPARE + NUMBER_OF_BD_PER_COMMAND_PACKET)
+
+struct bd_status {
+        union {
+                struct { u8 nlf:1, txType:2, intEnabled:1, reserved:4;} fields;
+                u8 field;
+        } info;
+} __attribute__ ((packed));
+
+struct ipw2100_bd {
+        u32 host_addr;
+        u32 buf_length;
+        struct bd_status status;
+        /* number of fragments for frame (should be set only for
+         * 1st TBD) */
+        u8 num_fragments;
+        u8 reserved[6];
+} __attribute__ ((packed));
+
+#define IPW_BD_QUEUE_LENGTH(n) (1<<n)
+#define IPW_BD_ALIGNMENT(L)    (L*sizeof(struct ipw2100_bd))
+
+#define IPW_BD_STATUS_TX_FRAME_802_3             0x00
+#define IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT 0x01
+#define IPW_BD_STATUS_TX_FRAME_COMMAND           0x02
+#define IPW_BD_STATUS_TX_FRAME_802_11            0x04
+#define IPW_BD_STATUS_TX_INTERRUPT_ENABLE        0x08
+
+struct ipw2100_bd_queue {
+        /* driver (virtual) pointer to queue */
+        struct ipw2100_bd *drv;
+
+        /* firmware (physical) pointer to queue */
+        dma_addr_t nic;
+
+        /* Length of phy memory allocated for BDs */
+        u32 size;
+
+        /* Number of BDs in queue (and in array) */
+        u32 entries;
+
+        /* Number of available BDs (invalid for NIC BDs) */
+        u32 available;
+
+        /* Offset of oldest used BD in array (next one to
+         * check for completion) */
+        u32 oldest;
+
+        /* Offset of next available (unused) BD */
+        u32 next;
+};
+
+#define RX_QUEUE_LENGTH 256
+#define TX_QUEUE_LENGTH 256
+#define HW_QUEUE_LENGTH 256
+
+#define TX_PENDED_QUEUE_LENGTH (TX_QUEUE_LENGTH / NUMBER_OF_BD_PER_DATA_PACKET)
+
+#define STATUS_TYPE_MASK        0x0000000f
+#define COMMAND_STATUS_VAL      0
+#define STATUS_CHANGE_VAL       1
+#define P80211_DATA_VAL         2
+#define P8023_DATA_VAL          3
+#define HOST_NOTIFICATION_VAL   4
+
+#define IPW2100_RSSI_TO_DBM (-98)
+
+struct ipw2100_status {
+        u32 frame_size;
+        u16 status_fields;
+        u8 flags;
+#define IPW_STATUS_FLAG_DECRYPTED       (1<<0)
+#define IPW_STATUS_FLAG_WEP_ENCRYPTED   (1<<1)
+#define IPW_STATUS_FLAG_CRC_ERROR       (1<<2)
+        u8 rssi;
+} __attribute__ ((packed));
+
+struct ipw2100_status_queue {
+        /* driver (virtual) pointer to queue */
+        struct ipw2100_status *drv;
+
+        /* firmware (physical) pointer to queue */
+        dma_addr_t nic;
+
+        /* Length of phy memory allocated for BDs */
+        u32 size;
+};
+
+#define HOST_COMMAND_PARAMS_REG_LEN     100
+#define CMD_STATUS_PARAMS_REG_LEN       3
+
+#define IPW_WPA_CAPABILITIES   0x1
+#define IPW_WPA_LISTENINTERVAL 0x2
+#define IPW_WPA_AP_ADDRESS     0x4
+
+#define IPW_MAX_VAR_IE_LEN ((HOST_COMMAND_PARAMS_REG_LEN - 4) * sizeof(u32))
+
+struct ipw2100_wpa_assoc_frame {
+        u16 fixed_ie_mask;
+        struct {
+                u16 capab_info;
+                u16 listen_interval;
+                u8 current_ap[ETH_ALEN];
+        } fixed_ies;
+        u32 var_ie_len;
+        u8 var_ie[IPW_MAX_VAR_IE_LEN];
+};
+
+#define IPW_BSS     1
+#define IPW_MONITOR 2
+#define IPW_IBSS    3
+
+/**
+ * @struct _tx_cmd - HWCommand
+ * @brief H/W command structure.
+ */
+struct ipw2100_cmd_header {
+        u32 host_command_reg;
+        u32 host_command_reg1;
+        u32 sequence;
+        u32 host_command_len_reg;
+        u32 host_command_params_reg[HOST_COMMAND_PARAMS_REG_LEN];
+        u32 cmd_status_reg;
+        u32 cmd_status_params_reg[CMD_STATUS_PARAMS_REG_LEN];
+        u32 rxq_base_ptr;
+        u32 rxq_next_ptr;
+        u32 rxq_host_ptr;
+        u32 txq_base_ptr;
+        u32 txq_next_ptr;
+        u32 txq_host_ptr;
+        u32 tx_status_reg;
+        u32 reserved;
+        u32 status_change_reg;
+        u32 reserved1[3];
+        u32 *ordinal1_ptr;
+        u32 *ordinal2_ptr;
+} __attribute__ ((packed));
+
+struct ipw2100_data_header {
+        u32 host_command_reg;
+        u32 host_command_reg1;
+        u8 encrypted;   // BOOLEAN in win! TRUE if frame is enc by driver
+        u8 needs_encryption;    // BOOLEAN in win! TRUE if frma need to be enc in NIC
+        u8 wep_index;           // 0 no key, 1-4 key index, 0xff immediate key
+        u8 key_size;    // 0 no imm key, 0x5 64bit encr, 0xd 128bit encr, 0x10 128bit encr and 128bit IV
+        u8 key[16];
+        u8 reserved[10];        // f/w reserved
+        u8 src_addr[ETH_ALEN];
+        u8 dst_addr[ETH_ALEN];
+        u16 fragment_size;
+} __attribute__ ((packed));
+
+/* Host command data structure */
+struct host_command {
+        u32 host_command;               // COMMAND ID
+        u32 host_command1;              // COMMAND ID
+        u32 host_command_sequence;      // UNIQUE COMMAND NUMBER (ID)
+        u32 host_command_length;        // LENGTH
+        u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN];       // COMMAND PARAMETERS
+} __attribute__ ((packed));
+
+
+typedef enum {
+        POWER_ON_RESET,
+        EXIT_POWER_DOWN_RESET,
+        SW_RESET,
+        EEPROM_RW,
+        SW_RE_INIT
+} ipw2100_reset_event;
+
+enum {
+        COMMAND = 0xCAFE,
+        DATA,
+        RX
+};
+
+
+struct ipw2100_tx_packet {
+        int type;
+        int index;
+        union {
+                struct { /* COMMAND */
+                        struct ipw2100_cmd_header* cmd;
+                        dma_addr_t cmd_phys;
+                } c_struct;
+                struct { /* DATA */
+                        struct ipw2100_data_header* data;
+                        dma_addr_t data_phys;
+                        struct ieee80211_txb *txb;
+                } d_struct;
+        } info;
+        int jiffy_start;
+
+        struct list_head list;
+};
+
+
+struct ipw2100_rx_packet {
+        struct ipw2100_rx *rxp;
+        dma_addr_t dma_addr;
+        int jiffy_start;
+        struct sk_buff *skb;
+        struct list_head list;
+};
+
+#define FRAG_DISABLED             (1<<31)
+#define RTS_DISABLED              (1<<31)
+#define MAX_RTS_THRESHOLD         2304U
+#define MIN_RTS_THRESHOLD         1U
+#define DEFAULT_RTS_THRESHOLD     1000U
+
+#define DEFAULT_BEACON_INTERVAL   100U
+#define DEFAULT_SHORT_RETRY_LIMIT 7U
+#define DEFAULT_LONG_RETRY_LIMIT  4U
+
+struct ipw2100_ordinals {
+        u32 table1_addr;
+        u32 table2_addr;
+        u32 table1_size;
+        u32 table2_size;
+};
+
+/* Host Notification header */
+struct ipw2100_notification {
+        u32 hnhdr_subtype;      /* type of host notification */
+        u32 hnhdr_size;         /* size in bytes of data
+                                   or number of entries, if table.
+                                   Does NOT include header */
+} __attribute__ ((packed));
+
+#define MAX_KEY_SIZE    16
+#define MAX_KEYS        8
+
+#define IPW2100_WEP_ENABLE     (1<<1)
+#define IPW2100_WEP_DROP_CLEAR (1<<2)
+
+#define IPW_NONE_CIPHER   (1<<0)
+#define IPW_WEP40_CIPHER  (1<<1)
+#define IPW_TKIP_CIPHER   (1<<2)
+#define IPW_CCMP_CIPHER   (1<<4)
+#define IPW_WEP104_CIPHER (1<<5)
+#define IPW_CKIP_CIPHER   (1<<6)
+
+#define IPW_AUTH_OPEN     0
+#define IPW_AUTH_SHARED   1
+
+struct statistic {
+        int value;
+        int hi;
+        int lo;
+};
+
+#define INIT_STAT(x) do {  \
+  (x)->value = (x)->hi = 0; \
+  (x)->lo = 0x7fffffff; \
+} while (0)
+#define SET_STAT(x,y) do { \
+  (x)->value = y; \
+  if ((x)->value > (x)->hi) (x)->hi = (x)->value; \
+  if ((x)->value < (x)->lo) (x)->lo = (x)->value; \
+} while (0)
+#define INC_STAT(x) do { if (++(x)->value > (x)->hi) (x)->hi = (x)->value; } \
+while (0)
+#define DEC_STAT(x) do { if (--(x)->value < (x)->lo) (x)->lo = (x)->value; } \
+while (0)
+
+#define IPW2100_ERROR_QUEUE 5
+
+/* Power management code: enable or disable? */
+enum {
+#ifdef CONFIG_PM
+        IPW2100_PM_DISABLED = 0,
+        PM_STATE_SIZE = 16,
+#else
+        IPW2100_PM_DISABLED = 1,
+        PM_STATE_SIZE = 0,
+#endif
+};
+
+#define STATUS_POWERED          (1<<0)
+#define STATUS_CMD_ACTIVE       (1<<1)  /**< host command in progress */
+#define STATUS_RUNNING          (1<<2)  /* Card initialized, but not enabled */
+#define STATUS_ENABLED          (1<<3)  /* Card enabled -- can scan,Tx,Rx */
+#define STATUS_STOPPING         (1<<4)  /* Card is in shutdown phase */
+#define STATUS_INITIALIZED      (1<<5)  /* Card is ready for external calls */
+#define STATUS_ASSOCIATING      (1<<9)  /* Associated, but no BSSID yet */
+#define STATUS_ASSOCIATED       (1<<10) /* Associated and BSSID valid */
+#define STATUS_INT_ENABLED      (1<<11)
+#define STATUS_RF_KILL_HW       (1<<12)
+#define STATUS_RF_KILL_SW       (1<<13)
+#define STATUS_RF_KILL_MASK     (STATUS_RF_KILL_HW | STATUS_RF_KILL_SW)
+#define STATUS_EXIT_PENDING     (1<<14)
+
+#define STATUS_SCAN_PENDING     (1<<23)
+#define STATUS_SCANNING         (1<<24)
+#define STATUS_SCAN_ABORTING    (1<<25)
+#define STATUS_SCAN_COMPLETE    (1<<26)
+#define STATUS_WX_EVENT_PENDING (1<<27)
+#define STATUS_RESET_PENDING    (1<<29)
+#define STATUS_SECURITY_UPDATED (1<<30) /* Security sync needed */
+
+
+
+/* Internal NIC states */
+#define IPW_STATE_INITIALIZED   (1<<0)
+#define IPW_STATE_COUNTRY_FOUND (1<<1)
+#define IPW_STATE_ASSOCIATED    (1<<2)
+#define IPW_STATE_ASSN_LOST     (1<<3)
+#define IPW_STATE_ASSN_CHANGED  (1<<4)
+#define IPW_STATE_SCAN_COMPLETE (1<<5)
+#define IPW_STATE_ENTERED_PSP   (1<<6)
+#define IPW_STATE_LEFT_PSP      (1<<7)
+#define IPW_STATE_RF_KILL       (1<<8)
+#define IPW_STATE_DISABLED      (1<<9)
+#define IPW_STATE_POWER_DOWN    (1<<10)
+#define IPW_STATE_SCANNING      (1<<11)
+
+
+
+#define CFG_STATIC_CHANNEL      (1<<0) /* Restrict assoc. to single channel */
+#define CFG_STATIC_ESSID        (1<<1) /* Restrict assoc. to single SSID */
+#define CFG_STATIC_BSSID        (1<<2) /* Restrict assoc. to single BSSID */
+#define CFG_CUSTOM_MAC          (1<<3)
+#define CFG_LONG_PREAMBLE       (1<<4)
+#define CFG_ASSOCIATE           (1<<6)
+#define CFG_FIXED_RATE          (1<<7)
+#define CFG_ADHOC_CREATE        (1<<8)
+#define CFG_C3_DISABLED         (1<<9)
+#define CFG_PASSIVE_SCAN        (1<<10)
+
+#define CAP_SHARED_KEY          (1<<0) /* Off = OPEN */
+#define CAP_PRIVACY_ON          (1<<1) /* Off = No privacy */
+
+struct ipw2100_priv {
+
+        int stop_hang_check; /* Set 1 when shutting down to kill hang_check */
+        int stop_rf_kill; /* Set 1 when shutting down to kill rf_kill */
+
+        struct ieee80211_device *ieee;
+        unsigned long status;
+        unsigned long config;
+        unsigned long capability;
+
+        /* Statistics */
+        int resets;
+        int reset_backoff;
+
+        /* Context */
+        u8 essid[IW_ESSID_MAX_SIZE];
+        u8 essid_len;
+        u8 bssid[ETH_ALEN];
+        u8 channel;
+        int last_mode;
+        int cstate_limit;
+
+        unsigned long connect_start;
+        unsigned long last_reset;
+
+        u32 channel_mask;
+        u32 fatal_error;
+        u32 fatal_errors[IPW2100_ERROR_QUEUE];
+        u32 fatal_index;
+        int eeprom_version;
+        int firmware_version;
+        unsigned long hw_features;
+        int hangs;
+        u32 last_rtc;
+        int dump_raw; /* 1 to dump raw bytes in /sys/.../memory */
+        u8* snapshot[0x30];
+
+        u8 mandatory_bssid_mac[ETH_ALEN];
+        u8 mac_addr[ETH_ALEN];
+
+        int power_mode;
+
+        /* WEP data */
+        struct ieee80211_security sec;
+        int messages_sent;
+
+
+        int short_retry_limit;
+        int long_retry_limit;
+
+        u32 rts_threshold;
+        u32 frag_threshold;
+
+        int in_isr;
+
+        u32 tx_rates;
+        int tx_power;
+        u32 beacon_interval;
+
+        char nick[IW_ESSID_MAX_SIZE + 1];
+
+        struct ipw2100_status_queue status_queue;
+
+        struct statistic txq_stat;
+        struct statistic rxq_stat;
+        struct ipw2100_bd_queue rx_queue;
+        struct ipw2100_bd_queue tx_queue;
+        struct ipw2100_rx_packet *rx_buffers;
+
+        struct statistic fw_pend_stat;
+        struct list_head fw_pend_list;
+
+        struct statistic msg_free_stat;
+        struct statistic msg_pend_stat;
+        struct list_head msg_free_list;
+        struct list_head msg_pend_list;
+        struct ipw2100_tx_packet *msg_buffers;
+
+        struct statistic tx_free_stat;
+        struct statistic tx_pend_stat;
+        struct list_head tx_free_list;
+        struct list_head tx_pend_list;
+        struct ipw2100_tx_packet *tx_buffers;
+
+        struct ipw2100_ordinals ordinals;
+
+        struct pci_dev *pci_dev;
+
+        struct proc_dir_entry *dir_dev;
+
+        struct net_device *net_dev;
+        struct iw_statistics wstats;
+
+        struct tasklet_struct irq_tasklet;
+
+        struct workqueue_struct *workqueue;
+        struct work_struct reset_work;
+        struct work_struct security_work;
+        struct work_struct wx_event_work;
+        struct work_struct hang_check;
+        struct work_struct rf_kill;
+
+        u32 interrupts;
+        int tx_interrupts;
+        int rx_interrupts;
+        int inta_other;
+
+        spinlock_t low_lock;
+        struct semaphore action_sem;
+        struct semaphore adapter_sem;
+
+        wait_queue_head_t wait_command_queue;
+};
+
+
+/*********************************************************
+ * Host Command -> From Driver to FW
+ *********************************************************/
+
+/**
+ * Host command identifiers
+ */
+#define HOST_COMPLETE           2
+#define SYSTEM_CONFIG           6
+#define SSID                    8
+#define MANDATORY_BSSID         9
+#define AUTHENTICATION_TYPE    10
+#define ADAPTER_ADDRESS        11
+#define PORT_TYPE              12
+#define INTERNATIONAL_MODE     13
+#define CHANNEL                14
+#define RTS_THRESHOLD          15
+#define FRAG_THRESHOLD         16
+#define POWER_MODE             17
+#define TX_RATES               18
+#define BASIC_TX_RATES         19
+#define WEP_KEY_INFO           20
+#define WEP_KEY_INDEX          25
+#define WEP_FLAGS              26
+#define ADD_MULTICAST          27
+#define CLEAR_ALL_MULTICAST    28
+#define BEACON_INTERVAL        29
+#define ATIM_WINDOW            30
+#define CLEAR_STATISTICS       31
+#define SEND                   33
+#define TX_POWER_INDEX         36
+#define BROADCAST_SCAN         43
+#define CARD_DISABLE           44
+#define PREFERRED_BSSID        45
+#define SET_SCAN_OPTIONS       46
+#define SCAN_DWELL_TIME        47
+#define SWEEP_TABLE            48
+#define AP_OR_STATION_TABLE    49
+#define GROUP_ORDINALS         50
+#define SHORT_RETRY_LIMIT      51
+#define LONG_RETRY_LIMIT       52
+
+#define HOST_PRE_POWER_DOWN    58
+#define CARD_DISABLE_PHY_OFF   61
+#define MSDU_TX_RATES          62
+
+
+/* Rogue AP Detection */
+#define SET_STATION_STAT_BITS      64
+#define CLEAR_STATIONS_STAT_BITS   65
+#define LEAP_ROGUE_MODE            66   //TODO tbw replaced by CFG_LEAP_ROGUE_AP
+#define SET_SECURITY_INFORMATION   67
+#define DISASSOCIATION_BSSID       68
+#define SET_WPA_IE                 69
+
+
+
+/* system configuration bit mask: */
+#define IPW_CFG_MONITOR               0x00004
+#define IPW_CFG_PREAMBLE_AUTO        0x00010
+#define IPW_CFG_IBSS_AUTO_START     0x00020
+#define IPW_CFG_LOOPBACK            0x00100
+#define IPW_CFG_ANSWER_BCSSID_PROBE 0x00800
+#define IPW_CFG_BT_SIDEBAND_SIGNAL      0x02000
+#define IPW_CFG_802_1x_ENABLE       0x04000
+#define IPW_CFG_BSS_MASK                0x08000
+#define IPW_CFG_IBSS_MASK               0x10000
+
+#define IPW_SCAN_NOASSOCIATE (1<<0)
+#define IPW_SCAN_MIXED_CELL (1<<1)
+/* RESERVED (1<<2) */
+#define IPW_SCAN_PASSIVE (1<<3)
+
+#define IPW_NIC_FATAL_ERROR 0x2A7F0
+#define IPW_ERROR_ADDR(x) (x & 0x3FFFF)
+#define IPW_ERROR_CODE(x) ((x & 0xFF000000) >> 24)
+#define IPW2100_ERR_C3_CORRUPTION (0x10 << 24)
+#define IPW2100_ERR_MSG_TIMEOUT   (0x11 << 24)
+#define IPW2100_ERR_FW_LOAD       (0x12 << 24)
+
+#define IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND                    0x200
+#define IPW_MEM_SRAM_HOST_INTERRUPT_AREA_LOWER_BOUND    IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x0D80
+
+#define IPW_MEM_HOST_SHARED_RX_BD_BASE                  (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x40)
+#define IPW_MEM_HOST_SHARED_RX_STATUS_BASE              (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x44)
+#define IPW_MEM_HOST_SHARED_RX_BD_SIZE                  (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x48)
+#define IPW_MEM_HOST_SHARED_RX_READ_INDEX               (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0xa0)
+
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_BD_BASE          (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x00)
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_BD_SIZE          (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x04)
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_READ_INDEX       (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x80)
+
+#define IPW_MEM_HOST_SHARED_RX_WRITE_INDEX \
+    (IPW_MEM_SRAM_HOST_INTERRUPT_AREA_LOWER_BOUND + 0x20)
+
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX \
+    (IPW_MEM_SRAM_HOST_INTERRUPT_AREA_LOWER_BOUND)
+
+#define IPW_MEM_HOST_SHARED_ORDINALS_TABLE_1   (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x180)
+#define IPW_MEM_HOST_SHARED_ORDINALS_TABLE_2   (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x184)
+
+#define IPW2100_INTA_TX_TRANSFER               (0x00000001)     // Bit 0 (LSB)
+#define IPW2100_INTA_RX_TRANSFER               (0x00000002)     // Bit 1
+#define IPW2100_INTA_TX_COMPLETE               (0x00000004)     // Bit 2
+#define IPW2100_INTA_EVENT_INTERRUPT           (0x00000008)     // Bit 3
+#define IPW2100_INTA_STATUS_CHANGE             (0x00000010)     // Bit 4
+#define IPW2100_INTA_BEACON_PERIOD_EXPIRED     (0x00000020)     // Bit 5
+#define IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE  (0x00010000) // Bit 16
+#define IPW2100_INTA_FW_INIT_DONE              (0x01000000)     // Bit 24
+#define IPW2100_INTA_FW_CALIBRATION_CALC       (0x02000000)     // Bit 25
+#define IPW2100_INTA_FATAL_ERROR               (0x40000000)     // Bit 30
+#define IPW2100_INTA_PARITY_ERROR              (0x80000000)     // Bit 31 (MSB)
+
+#define IPW_AUX_HOST_RESET_REG_PRINCETON_RESET              (0x00000001)
+#define IPW_AUX_HOST_RESET_REG_FORCE_NMI                    (0x00000002)
+#define IPW_AUX_HOST_RESET_REG_PCI_HOST_CLUSTER_FATAL_NMI   (0x00000004)
+#define IPW_AUX_HOST_RESET_REG_CORE_FATAL_NMI               (0x00000008)
+#define IPW_AUX_HOST_RESET_REG_SW_RESET                     (0x00000080)
+#define IPW_AUX_HOST_RESET_REG_MASTER_DISABLED              (0x00000100)
+#define IPW_AUX_HOST_RESET_REG_STOP_MASTER                  (0x00000200)
+
+#define IPW_AUX_HOST_GP_CNTRL_BIT_CLOCK_READY           (0x00000001)    // Bit 0 (LSB)
+#define IPW_AUX_HOST_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY   (0x00000002)    // Bit 1
+#define IPW_AUX_HOST_GP_CNTRL_BIT_INIT_DONE             (0x00000004)    // Bit 2
+#define IPW_AUX_HOST_GP_CNTRL_BITS_SYS_CONFIG           (0x000007c0)    // Bits 6-10
+#define IPW_AUX_HOST_GP_CNTRL_BIT_BUS_TYPE              (0x00000200)    // Bit 9
+#define IPW_AUX_HOST_GP_CNTRL_BIT_BAR0_BLOCK_SIZE       (0x00000400)    // Bit 10
+#define IPW_AUX_HOST_GP_CNTRL_BIT_USB_MODE              (0x20000000)    // Bit 29
+#define IPW_AUX_HOST_GP_CNTRL_BIT_HOST_FORCES_SYS_CLK   (0x40000000)    // Bit 30
+#define IPW_AUX_HOST_GP_CNTRL_BIT_FW_FORCES_SYS_CLK     (0x80000000)    // Bit 31 (MSB)
+
+#define IPW_BIT_GPIO_GPIO1_MASK         0x0000000C
+#define IPW_BIT_GPIO_GPIO3_MASK         0x000000C0
+#define IPW_BIT_GPIO_GPIO1_ENABLE       0x00000008
+#define IPW_BIT_GPIO_RF_KILL            0x00010000
+
+#define IPW_BIT_GPIO_LED_OFF            0x00002000      // Bit 13 = 1
+
+#define IPW_REG_DOMAIN_0_OFFSET         0x0000
+#define IPW_REG_DOMAIN_1_OFFSET         IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND
+
+#define IPW_REG_INTA                    IPW_REG_DOMAIN_0_OFFSET + 0x0008
+#define IPW_REG_INTA_MASK               IPW_REG_DOMAIN_0_OFFSET + 0x000C
+#define IPW_REG_INDIRECT_ACCESS_ADDRESS IPW_REG_DOMAIN_0_OFFSET + 0x0010
+#define IPW_REG_INDIRECT_ACCESS_DATA    IPW_REG_DOMAIN_0_OFFSET + 0x0014
+#define IPW_REG_AUTOINCREMENT_ADDRESS   IPW_REG_DOMAIN_0_OFFSET + 0x0018
+#define IPW_REG_AUTOINCREMENT_DATA      IPW_REG_DOMAIN_0_OFFSET + 0x001C
+#define IPW_REG_RESET_REG               IPW_REG_DOMAIN_0_OFFSET + 0x0020
+#define IPW_REG_GP_CNTRL                IPW_REG_DOMAIN_0_OFFSET + 0x0024
+#define IPW_REG_GPIO                    IPW_REG_DOMAIN_0_OFFSET + 0x0030
+#define IPW_REG_FW_TYPE                 IPW_REG_DOMAIN_1_OFFSET + 0x0188
+#define IPW_REG_FW_VERSION              IPW_REG_DOMAIN_1_OFFSET + 0x018C
+#define IPW_REG_FW_COMPATABILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
+
+#define IPW_REG_INDIRECT_ADDR_MASK      0x00FFFFFC
+
+#define IPW_INTERRUPT_MASK              0xC1010013
+
+#define IPW2100_CONTROL_REG             0x220000
+#define IPW2100_CONTROL_PHY_OFF         0x8
+
+#define IPW2100_COMMAND                 0x00300004
+#define IPW2100_COMMAND_PHY_ON          0x0
+#define IPW2100_COMMAND_PHY_OFF         0x1
+
+/* in DEBUG_AREA, values of memory always 0xd55555d5 */
+#define IPW_REG_DOA_DEBUG_AREA_START    IPW_REG_DOMAIN_0_OFFSET + 0x0090
+#define IPW_REG_DOA_DEBUG_AREA_END      IPW_REG_DOMAIN_0_OFFSET + 0x00FF
+#define IPW_DATA_DOA_DEBUG_VALUE        0xd55555d5
+
+#define IPW_INTERNAL_REGISTER_HALT_AND_RESET    0x003000e0
+
+#define IPW_WAIT_CLOCK_STABILIZATION_DELAY          50  // micro seconds
+#define IPW_WAIT_RESET_ARC_COMPLETE_DELAY           10  // micro seconds
+#define IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY 10  // micro seconds
+
+// BD ring queue read/write difference
+#define IPW_BD_QUEUE_W_R_MIN_SPARE 2
+
+#define IPW_CACHE_LINE_LENGTH_DEFAULT               0x80
+
+#define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT      100 // 100 milli
+#define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT        100 // 100 milli
+
+
+
+
+#define IPW_HEADER_802_11_SIZE           sizeof(struct ieee80211_hdr_3addr)
+#define IPW_MAX_80211_PAYLOAD_SIZE              2304U
+#define IPW_MAX_802_11_PAYLOAD_LENGTH           2312
+#define IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH      1536
+#define IPW_MIN_ACCEPTABLE_RX_FRAME_LENGTH      60
+#define IPW_MAX_ACCEPTABLE_RX_FRAME_LENGTH \
+        (IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH + IPW_HEADER_802_11_SIZE - \
+        sizeof(struct ethhdr))
+
+#define IPW_802_11_FCS_LENGTH 4
+#define IPW_RX_NIC_BUFFER_LENGTH \
+        (IPW_MAX_802_11_PAYLOAD_LENGTH + IPW_HEADER_802_11_SIZE + \
+                IPW_802_11_FCS_LENGTH)
+
+#define IPW_802_11_PAYLOAD_OFFSET \
+        (sizeof(struct ieee80211_hdr_3addr) + \
+         sizeof(struct ieee80211_snap_hdr))
+
+struct ipw2100_rx {
+        union {
+                unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH];
+                struct ieee80211_hdr header;
+                u32 status;
+                struct ipw2100_notification notification;
+                struct ipw2100_cmd_header command;
+        } rx_data;
+} __attribute__ ((packed));
+
+/* Bit 0-7 are for 802.11b tx rates - .  Bit 5-7 are reserved */
+#define TX_RATE_1_MBIT              0x0001
+#define TX_RATE_2_MBIT              0x0002
+#define TX_RATE_5_5_MBIT            0x0004
+#define TX_RATE_11_MBIT             0x0008
+#define TX_RATE_MASK                0x000F
+#define DEFAULT_TX_RATES            0x000F
+
+#define IPW_POWER_MODE_CAM           0x00       //(always on)
+#define IPW_POWER_INDEX_1            0x01
+#define IPW_POWER_INDEX_2            0x02
+#define IPW_POWER_INDEX_3            0x03
+#define IPW_POWER_INDEX_4            0x04
+#define IPW_POWER_INDEX_5            0x05
+#define IPW_POWER_AUTO               0x06
+#define IPW_POWER_MASK               0x0F
+#define IPW_POWER_ENABLED            0x10
+#define IPW_POWER_LEVEL(x)           ((x) & IPW_POWER_MASK)
+
+#define IPW_TX_POWER_AUTO            0
+#define IPW_TX_POWER_ENHANCED        1
+
+#define IPW_TX_POWER_DEFAULT         32
+#define IPW_TX_POWER_MIN             0
+#define IPW_TX_POWER_MAX             16
+#define IPW_TX_POWER_MIN_DBM         (-12)
+#define IPW_TX_POWER_MAX_DBM         16
+
+#define FW_SCAN_DONOT_ASSOCIATE     0x0001 // Dont Attempt to Associate after Scan
+#define FW_SCAN_PASSIVE             0x0008 // Force PASSSIVE Scan
+
+#define REG_MIN_CHANNEL             0
+#define REG_MAX_CHANNEL             14
+
+#define REG_CHANNEL_MASK            0x00003FFF
+#define IPW_IBSS_11B_DEFAULT_MASK   0x87ff
+
+#define DIVERSITY_EITHER            0   // Use both antennas
+#define DIVERSITY_ANTENNA_A         1   // Use antenna A
+#define DIVERSITY_ANTENNA_B         2   // Use antenna B
+
+
+#define HOST_COMMAND_WAIT 0
+#define HOST_COMMAND_NO_WAIT 1
+
+#define LOCK_NONE 0
+#define LOCK_DRIVER 1
+#define LOCK_FW 2
+
+#define TYPE_SWEEP_ORD                  0x000D
+#define TYPE_IBSS_STTN_ORD              0x000E
+#define TYPE_BSS_AP_ORD                 0x000F
+#define TYPE_RAW_BEACON_ENTRY           0x0010
+#define TYPE_CALIBRATION_DATA           0x0011
+#define TYPE_ROGUE_AP_DATA              0x0012
+#define TYPE_ASSOCIATION_REQUEST        0x0013
+#define TYPE_REASSOCIATION_REQUEST      0x0014
+
+
+#define HW_FEATURE_RFKILL (0x0001)
+#define RF_KILLSWITCH_OFF (1)
+#define RF_KILLSWITCH_ON  (0)
+
+#define IPW_COMMAND_POOL_SIZE        40
+
+#define IPW_START_ORD_TAB_1                     1
+#define IPW_START_ORD_TAB_2                     1000
+
+#define IPW_ORD_TAB_1_ENTRY_SIZE                sizeof(u32)
+
+#define IS_ORDINAL_TABLE_ONE(mgr,id) \
+    ((id >= IPW_START_ORD_TAB_1) && (id < mgr->table1_size))
+#define IS_ORDINAL_TABLE_TWO(mgr,id) \
+    ((id >= IPW_START_ORD_TAB_2) && (id < (mgr->table2_size + IPW_START_ORD_TAB_2)))
+
+#define BSS_ID_LENGTH               6
+
+// Fixed size data: Ordinal Table 1
+typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
+// Transmit statistics
+        IPW_ORD_STAT_TX_HOST_REQUESTS = 1,// # of requested Host Tx's (MSDU)
+        IPW_ORD_STAT_TX_HOST_COMPLETE,  // # of successful Host Tx's (MSDU)
+        IPW_ORD_STAT_TX_DIR_DATA,       // # of successful Directed Tx's (MSDU)
+
+        IPW_ORD_STAT_TX_DIR_DATA1 = 4,  // # of successful Directed Tx's (MSDU) @ 1MB
+        IPW_ORD_STAT_TX_DIR_DATA2,      // # of successful Directed Tx's (MSDU) @ 2MB
+        IPW_ORD_STAT_TX_DIR_DATA5_5,    // # of successful Directed Tx's (MSDU) @ 5_5MB
+        IPW_ORD_STAT_TX_DIR_DATA11,     // # of successful Directed Tx's (MSDU) @ 11MB
+        IPW_ORD_STAT_TX_DIR_DATA22,     // # of successful Directed Tx's (MSDU) @ 22MB
+
+        IPW_ORD_STAT_TX_NODIR_DATA1 = 13,// # of successful Non_Directed Tx's (MSDU) @ 1MB
+        IPW_ORD_STAT_TX_NODIR_DATA2,    // # of successful Non_Directed Tx's (MSDU) @ 2MB
+        IPW_ORD_STAT_TX_NODIR_DATA5_5,  // # of successful Non_Directed Tx's (MSDU) @ 5.5MB
+        IPW_ORD_STAT_TX_NODIR_DATA11,   // # of successful Non_Directed Tx's (MSDU) @ 11MB
+
+        IPW_ORD_STAT_NULL_DATA = 21,    // # of successful NULL data Tx's
+        IPW_ORD_STAT_TX_RTS,            // # of successful Tx RTS
+        IPW_ORD_STAT_TX_CTS,            // # of successful Tx CTS
+        IPW_ORD_STAT_TX_ACK,            // # of successful Tx ACK
+        IPW_ORD_STAT_TX_ASSN,           // # of successful Association Tx's
+        IPW_ORD_STAT_TX_ASSN_RESP,      // # of successful Association response Tx's
+        IPW_ORD_STAT_TX_REASSN,         // # of successful Reassociation Tx's
+        IPW_ORD_STAT_TX_REASSN_RESP,    // # of successful Reassociation response Tx's
+        IPW_ORD_STAT_TX_PROBE,          // # of probes successfully transmitted
+        IPW_ORD_STAT_TX_PROBE_RESP,     // # of probe responses successfully transmitted
+        IPW_ORD_STAT_TX_BEACON,         // # of tx beacon
+        IPW_ORD_STAT_TX_ATIM,           // # of Tx ATIM
+        IPW_ORD_STAT_TX_DISASSN,        // # of successful Disassociation TX
+        IPW_ORD_STAT_TX_AUTH,           // # of successful Authentication Tx
+        IPW_ORD_STAT_TX_DEAUTH,         // # of successful Deauthentication TX
+
+        IPW_ORD_STAT_TX_TOTAL_BYTES = 41,// Total successful Tx data bytes
+        IPW_ORD_STAT_TX_RETRIES,         // # of Tx retries
+        IPW_ORD_STAT_TX_RETRY1,          // # of Tx retries at 1MBPS
+        IPW_ORD_STAT_TX_RETRY2,          // # of Tx retries at 2MBPS
+        IPW_ORD_STAT_TX_RETRY5_5,        // # of Tx retries at 5.5MBPS
+        IPW_ORD_STAT_TX_RETRY11,         // # of Tx retries at 11MBPS
+
+        IPW_ORD_STAT_TX_FAILURES = 51,  // # of Tx Failures
+        IPW_ORD_STAT_TX_ABORT_AT_HOP,   //NS // # of Tx's aborted at hop time
+        IPW_ORD_STAT_TX_MAX_TRIES_IN_HOP,// # of times max tries in a hop failed
+        IPW_ORD_STAT_TX_ABORT_LATE_DMA, //NS // # of times tx aborted due to late dma setup
+        IPW_ORD_STAT_TX_ABORT_STX,      //NS // # of times backoff aborted
+        IPW_ORD_STAT_TX_DISASSN_FAIL,   // # of times disassociation failed
+        IPW_ORD_STAT_TX_ERR_CTS,         // # of missed/bad CTS frames
+        IPW_ORD_STAT_TX_BPDU,           //NS // # of spanning tree BPDUs sent
+        IPW_ORD_STAT_TX_ERR_ACK,        // # of tx err due to acks
+
+        // Receive statistics
+        IPW_ORD_STAT_RX_HOST = 61,      // # of packets passed to host
+        IPW_ORD_STAT_RX_DIR_DATA,       // # of directed packets
+        IPW_ORD_STAT_RX_DIR_DATA1,      // # of directed packets at 1MB
+        IPW_ORD_STAT_RX_DIR_DATA2,      // # of directed packets at 2MB
+        IPW_ORD_STAT_RX_DIR_DATA5_5,    // # of directed packets at 5.5MB
+        IPW_ORD_STAT_RX_DIR_DATA11,     // # of directed packets at 11MB
+        IPW_ORD_STAT_RX_DIR_DATA22,     // # of directed packets at 22MB
+
+        IPW_ORD_STAT_RX_NODIR_DATA = 71,// # of nondirected packets
+        IPW_ORD_STAT_RX_NODIR_DATA1,    // # of nondirected packets at 1MB
+        IPW_ORD_STAT_RX_NODIR_DATA2,    // # of nondirected packets at 2MB
+        IPW_ORD_STAT_RX_NODIR_DATA5_5,  // # of nondirected packets at 5.5MB
+        IPW_ORD_STAT_RX_NODIR_DATA11,   // # of nondirected packets at 11MB
+
+        IPW_ORD_STAT_RX_NULL_DATA = 80, // # of null data rx's
+        IPW_ORD_STAT_RX_POLL,   //NS // # of poll rx
+        IPW_ORD_STAT_RX_RTS,    // # of Rx RTS
+        IPW_ORD_STAT_RX_CTS,    // # of Rx CTS
+        IPW_ORD_STAT_RX_ACK,    // # of Rx ACK
+        IPW_ORD_STAT_RX_CFEND,  // # of Rx CF End
+        IPW_ORD_STAT_RX_CFEND_ACK,      // # of Rx CF End + CF Ack
+        IPW_ORD_STAT_RX_ASSN,   // # of Association Rx's
+        IPW_ORD_STAT_RX_ASSN_RESP,      // # of Association response Rx's
+        IPW_ORD_STAT_RX_REASSN, // # of Reassociation Rx's
+        IPW_ORD_STAT_RX_REASSN_RESP,    // # of Reassociation response Rx's
+        IPW_ORD_STAT_RX_PROBE,  // # of probe Rx's
+        IPW_ORD_STAT_RX_PROBE_RESP,     // # of probe response Rx's
+        IPW_ORD_STAT_RX_BEACON, // # of Rx beacon
+        IPW_ORD_STAT_RX_ATIM,   // # of Rx ATIM
+        IPW_ORD_STAT_RX_DISASSN,        // # of disassociation Rx
+        IPW_ORD_STAT_RX_AUTH,   // # of authentication Rx
+        IPW_ORD_STAT_RX_DEAUTH, // # of deauthentication Rx
+
+        IPW_ORD_STAT_RX_TOTAL_BYTES = 101,// Total rx data bytes received
+        IPW_ORD_STAT_RX_ERR_CRC,         // # of packets with Rx CRC error
+        IPW_ORD_STAT_RX_ERR_CRC1,        // # of Rx CRC errors at 1MB
+        IPW_ORD_STAT_RX_ERR_CRC2,        // # of Rx CRC errors at 2MB
+        IPW_ORD_STAT_RX_ERR_CRC5_5,      // # of Rx CRC errors at 5.5MB
+        IPW_ORD_STAT_RX_ERR_CRC11,       // # of Rx CRC errors at 11MB
+
+        IPW_ORD_STAT_RX_DUPLICATE1 = 112, // # of duplicate rx packets at 1MB
+        IPW_ORD_STAT_RX_DUPLICATE2,      // # of duplicate rx packets at 2MB
+        IPW_ORD_STAT_RX_DUPLICATE5_5,    // # of duplicate rx packets at 5.5MB
+        IPW_ORD_STAT_RX_DUPLICATE11,     // # of duplicate rx packets at 11MB
+        IPW_ORD_STAT_RX_DUPLICATE = 119, // # of duplicate rx packets
+
+        IPW_ORD_PERS_DB_LOCK = 120,     // # locking fw permanent  db
+        IPW_ORD_PERS_DB_SIZE,   // # size of fw permanent  db
+        IPW_ORD_PERS_DB_ADDR,   // # address of fw permanent  db
+        IPW_ORD_STAT_RX_INVALID_PROTOCOL,       // # of rx frames with invalid protocol
+        IPW_ORD_SYS_BOOT_TIME,  // # Boot time
+        IPW_ORD_STAT_RX_NO_BUFFER,      // # of rx frames rejected due to no buffer
+        IPW_ORD_STAT_RX_ABORT_LATE_DMA, //NS // # of rx frames rejected due to dma setup too late
+        IPW_ORD_STAT_RX_ABORT_AT_HOP,   //NS // # of rx frames aborted due to hop
+        IPW_ORD_STAT_RX_MISSING_FRAG,   // # of rx frames dropped due to missing fragment
+        IPW_ORD_STAT_RX_ORPHAN_FRAG,    // # of rx frames dropped due to non-sequential fragment
+        IPW_ORD_STAT_RX_ORPHAN_FRAME,   // # of rx frames dropped due to unmatched 1st frame
+        IPW_ORD_STAT_RX_FRAG_AGEOUT,    // # of rx frames dropped due to uncompleted frame
+        IPW_ORD_STAT_RX_BAD_SSID,       //NS // Bad SSID (unused)
+        IPW_ORD_STAT_RX_ICV_ERRORS,     // # of ICV errors during decryption
+
+// PSP Statistics
+        IPW_ORD_STAT_PSP_SUSPENSION = 137,// # of times adapter suspended
+        IPW_ORD_STAT_PSP_BCN_TIMEOUT,   // # of beacon timeout
+        IPW_ORD_STAT_PSP_POLL_TIMEOUT,  // # of poll response timeouts
+        IPW_ORD_STAT_PSP_NONDIR_TIMEOUT,// # of timeouts waiting for last broadcast/muticast pkt
+        IPW_ORD_STAT_PSP_RX_DTIMS,      // # of PSP DTIMs received
+        IPW_ORD_STAT_PSP_RX_TIMS,       // # of PSP TIMs received
+        IPW_ORD_STAT_PSP_STATION_ID,    // PSP Station ID
+
+// Association and roaming
+        IPW_ORD_LAST_ASSN_TIME = 147,   // RTC time of last association
+        IPW_ORD_STAT_PERCENT_MISSED_BCNS,// current calculation of % missed beacons
+        IPW_ORD_STAT_PERCENT_RETRIES,   // current calculation of % missed tx retries
+        IPW_ORD_ASSOCIATED_AP_PTR,      // If associated, this is ptr to the associated
+        // AP table entry. set to 0 if not associated
+        IPW_ORD_AVAILABLE_AP_CNT,       // # of AP's decsribed in the AP table
+        IPW_ORD_AP_LIST_PTR,    // Ptr to list of available APs
+        IPW_ORD_STAT_AP_ASSNS,  // # of associations
+        IPW_ORD_STAT_ASSN_FAIL, // # of association failures
+        IPW_ORD_STAT_ASSN_RESP_FAIL,    // # of failuresdue to response fail
+        IPW_ORD_STAT_FULL_SCANS,        // # of full scans
+
+        IPW_ORD_CARD_DISABLED,  // # Card Disabled
+        IPW_ORD_STAT_ROAM_INHIBIT,      // # of times roaming was inhibited due to ongoing activity
+        IPW_FILLER_40,
+        IPW_ORD_RSSI_AT_ASSN = 160,     // RSSI of associated AP at time of association
+        IPW_ORD_STAT_ASSN_CAUSE1,       // # of reassociations due to no tx from AP in last N
+        // hops or no prob_ responses in last 3 minutes
+        IPW_ORD_STAT_ASSN_CAUSE2,       // # of reassociations due to poor tx/rx quality
+        IPW_ORD_STAT_ASSN_CAUSE3,       // # of reassociations due to tx/rx quality with excessive
+        // load at the AP
+        IPW_ORD_STAT_ASSN_CAUSE4,       // # of reassociations due to AP RSSI level fell below
+        // eligible group
+        IPW_ORD_STAT_ASSN_CAUSE5,       // # of reassociations due to load leveling
+        IPW_ORD_STAT_ASSN_CAUSE6,       //NS // # of reassociations due to dropped by Ap
+        IPW_FILLER_41,
+        IPW_FILLER_42,
+        IPW_FILLER_43,
+        IPW_ORD_STAT_AUTH_FAIL, // # of times authentication failed
+        IPW_ORD_STAT_AUTH_RESP_FAIL,    // # of times authentication response failed
+        IPW_ORD_STATION_TABLE_CNT,      // # of entries in association table
+
+// Other statistics
+        IPW_ORD_RSSI_AVG_CURR = 173,    // Current avg RSSI
+        IPW_ORD_STEST_RESULTS_CURR,     //NS // Current self test results word
+        IPW_ORD_STEST_RESULTS_CUM,      //NS // Cummulative self test results word
+        IPW_ORD_SELF_TEST_STATUS,       //NS //
+        IPW_ORD_POWER_MGMT_MODE,        // Power mode - 0=CAM, 1=PSP
+        IPW_ORD_POWER_MGMT_INDEX,       //NS //
+        IPW_ORD_COUNTRY_CODE,   // IEEE country code as recv'd from beacon
+        IPW_ORD_COUNTRY_CHANNELS,       // channels suported by country
+// IPW_ORD_COUNTRY_CHANNELS:
+// For 11b the lower 2-byte are used for channels from 1-14
+//   and the higher 2-byte are not used.
+        IPW_ORD_RESET_CNT,      // # of adapter resets (warm)
+        IPW_ORD_BEACON_INTERVAL,        // Beacon interval
+
+        IPW_ORD_PRINCETON_VERSION = 184,        //NS // Princeton Version
+        IPW_ORD_ANTENNA_DIVERSITY,      // TRUE if antenna diversity is disabled
+        IPW_ORD_CCA_RSSI,       //NS // CCA RSSI value (factory programmed)
+        IPW_ORD_STAT_EEPROM_UPDATE,     //NS // # of times config EEPROM updated
+        IPW_ORD_DTIM_PERIOD,    // # of beacon intervals between DTIMs
+        IPW_ORD_OUR_FREQ,       // current radio freq lower digits - channel ID
+
+        IPW_ORD_RTC_TIME = 190, // current RTC time
+        IPW_ORD_PORT_TYPE,      // operating mode
+        IPW_ORD_CURRENT_TX_RATE,        // current tx rate
+        IPW_ORD_SUPPORTED_RATES,        // Bitmap of supported tx rates
+        IPW_ORD_ATIM_WINDOW,    // current ATIM Window
+        IPW_ORD_BASIC_RATES,    // bitmap of basic tx rates
+        IPW_ORD_NIC_HIGHEST_RATE,       // bitmap of basic tx rates
+        IPW_ORD_AP_HIGHEST_RATE,        // bitmap of basic tx rates
+        IPW_ORD_CAPABILITIES,   // Management frame capability field
+        IPW_ORD_AUTH_TYPE,      // Type of authentication
+        IPW_ORD_RADIO_TYPE,     // Adapter card platform type
+        IPW_ORD_RTS_THRESHOLD = 201,    // Min length of packet after which RTS handshaking is used
+        IPW_ORD_INT_MODE,       // International mode
+        IPW_ORD_FRAGMENTATION_THRESHOLD,        // protocol frag threshold
+        IPW_ORD_EEPROM_SRAM_DB_BLOCK_START_ADDRESS,     // EEPROM offset in SRAM
+        IPW_ORD_EEPROM_SRAM_DB_BLOCK_SIZE,      // EEPROM size in SRAM
+        IPW_ORD_EEPROM_SKU_CAPABILITY,  // EEPROM SKU Capability    206 =
+        IPW_ORD_EEPROM_IBSS_11B_CHANNELS,       // EEPROM IBSS 11b channel set
+
+        IPW_ORD_MAC_VERSION = 209,      // MAC Version
+        IPW_ORD_MAC_REVISION,   // MAC Revision
+        IPW_ORD_RADIO_VERSION,  // Radio Version
+        IPW_ORD_NIC_MANF_DATE_TIME,     // MANF Date/Time STAMP
+        IPW_ORD_UCODE_VERSION,  // Ucode Version
+        IPW_ORD_HW_RF_SWITCH_STATE = 214,       // HW RF Kill Switch State
+} ORDINALTABLE1;
+
+// ordinal table 2
+// Variable length data:
+#define IPW_FIRST_VARIABLE_LENGTH_ORDINAL   1001
+
+typedef enum _ORDINAL_TABLE_2 { // NS - means Not Supported by FW
+        IPW_ORD_STAT_BASE = 1000,       // contains number of variable ORDs
+        IPW_ORD_STAT_ADAPTER_MAC = 1001,        // 6 bytes: our adapter MAC address
+        IPW_ORD_STAT_PREFERRED_BSSID = 1002,    // 6 bytes: BSSID of the preferred AP
+        IPW_ORD_STAT_MANDATORY_BSSID = 1003,    // 6 bytes: BSSID of the mandatory AP
+        IPW_FILL_1,             //NS //
+        IPW_ORD_STAT_COUNTRY_TEXT = 1005,       // 36 bytes: Country name text, First two bytes are Country code
+        IPW_ORD_STAT_ASSN_SSID = 1006,  // 32 bytes: ESSID String
+        IPW_ORD_STATION_TABLE = 1007,   // ? bytes: Station/AP table (via Direct SSID Scans)
+        IPW_ORD_STAT_SWEEP_TABLE = 1008,        // ? bytes: Sweep/Host Table table (via Broadcast Scans)
+        IPW_ORD_STAT_ROAM_LOG = 1009,   // ? bytes: Roaming log
+        IPW_ORD_STAT_RATE_LOG = 1010,   //NS // 0 bytes: Rate log
+        IPW_ORD_STAT_FIFO = 1011,       //NS // 0 bytes: Fifo buffer data structures
+        IPW_ORD_STAT_FW_VER_NUM = 1012, // 14 bytes: fw version ID string as in (a.bb.ccc; "0.08.011")
+        IPW_ORD_STAT_FW_DATE = 1013,    // 14 bytes: fw date string (mmm dd yyyy; "Mar 13 2002")
+        IPW_ORD_STAT_ASSN_AP_BSSID = 1014,      // 6 bytes: MAC address of associated AP
+        IPW_ORD_STAT_DEBUG = 1015,      //NS // ? bytes:
+        IPW_ORD_STAT_NIC_BPA_NUM = 1016,        // 11 bytes: NIC BPA number in ASCII
+        IPW_ORD_STAT_UCODE_DATE = 1017, // 5 bytes: uCode date
+        IPW_ORD_SECURITY_NGOTIATION_RESULT = 1018,
+} ORDINALTABLE2;                // NS - means Not Supported by FW
+
+#define IPW_LAST_VARIABLE_LENGTH_ORDINAL   1018
+
+#ifndef WIRELESS_SPY
+#define WIRELESS_SPY            // enable iwspy support
+#endif
+
+extern struct iw_handler_def ipw2100_wx_handler_def;
+extern struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev);
+extern void ipw2100_wx_event_work(struct ipw2100_priv *priv);
+
+#define IPW_HOST_FW_SHARED_AREA0        0x0002f200
+#define IPW_HOST_FW_SHARED_AREA0_END    0x0002f510      // 0x310 bytes
+
+#define IPW_HOST_FW_SHARED_AREA1        0x0002f610
+#define IPW_HOST_FW_SHARED_AREA1_END    0x0002f630      // 0x20 bytes
+
+#define IPW_HOST_FW_SHARED_AREA2        0x0002fa00
+#define IPW_HOST_FW_SHARED_AREA2_END    0x0002fa20      // 0x20 bytes
+
+#define IPW_HOST_FW_SHARED_AREA3        0x0002fc00
+#define IPW_HOST_FW_SHARED_AREA3_END    0x0002fc10      // 0x10 bytes
+
+#define IPW_HOST_FW_INTERRUPT_AREA      0x0002ff80
+#define IPW_HOST_FW_INTERRUPT_AREA_END  0x00030000      // 0x80 bytes
+
+struct ipw2100_fw_chunk {
+        unsigned char *buf;
+        long len;
+        long pos;
+        struct list_head list;
+};
+
+struct ipw2100_fw_chunk_set {
+        const void *data;
+        unsigned long size;
+};
+
+struct ipw2100_fw {
+        int version;
+        struct ipw2100_fw_chunk_set fw;
+        struct ipw2100_fw_chunk_set uc;
+        const struct firmware *fw_entry;
+};
+
+int ipw2100_get_firmware(struct ipw2100_priv *priv, struct ipw2100_fw *fw);
+void ipw2100_release_firmware(struct ipw2100_priv *priv, struct ipw2100_fw *fw);
+int ipw2100_fw_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw);
+int ipw2100_ucode_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw);
+
+#define MAX_FW_VERSION_LEN 14
+
+int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf, size_t max);
+int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf, size_t max);
+
+#endif /* _IPW2100_H */
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
new file mode 100644
index 000000000000..16cfd907e715
--- /dev/null
+++ b/drivers/net/wireless/ipw2200.c
@@ -0,0 +1,7361 @@
+/******************************************************************************
+  
+  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
+
+  802.11 status code portion of this file from ethereal-0.10.6:
+    Copyright 2000, Axis Communications AB
+    Ethereal - Network traffic analyzer
+    By Gerald Combs <gerald@ethereal.com>
+    Copyright 1998 Gerald Combs
+
+  This program is free software; you can redistribute it and/or modify it 
+  under the terms of version 2 of the GNU General Public License as 
+  published by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful, but WITHOUT 
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+  more details.
+  
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59 
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+#include "ipw2200.h"
+
+#define IPW2200_VERSION "1.0.0"
+#define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2200/2915 Network Driver"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2004 Intel Corporation"
+#define DRV_VERSION     IPW2200_VERSION
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+static int debug = 0;
+static int channel = 0;
+static char *ifname;
+static int mode = 0;
+
+static u32 ipw_debug_level;
+static int associate = 1;
+static int auto_create = 1;
+static int disable = 0;
+static const char ipw_modes[] = {
+        'a', 'b', 'g', '?'
+};
+
+static void ipw_rx(struct ipw_priv *priv);
+static int ipw_queue_tx_reclaim(struct ipw_priv *priv, 
+                                struct clx2_tx_queue *txq, int qindex);
+static int ipw_queue_reset(struct ipw_priv *priv);
+
+static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,
+                             int len, int sync);
+
+static void ipw_tx_queue_free(struct ipw_priv *);
+
+static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *);
+static void ipw_rx_queue_free(struct ipw_priv *, struct ipw_rx_queue *);
+static void ipw_rx_queue_replenish(void *);
+
+static int ipw_up(struct ipw_priv *);
+static void ipw_down(struct ipw_priv *);
+static int ipw_config(struct ipw_priv *);
+static int init_supported_rates(struct ipw_priv *priv, struct ipw_supported_rates *prates);
+
+static u8 band_b_active_channel[MAX_B_CHANNELS] = {
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0
+};
+static u8 band_a_active_channel[MAX_A_CHANNELS] = {
+        36, 40, 44, 48, 149, 153, 157, 161, 165, 52, 56, 60, 64, 0
+};
+
+static int is_valid_channel(int mode_mask, int channel)
+{
+        int i;
+
+        if (!channel)
+                return 0;
+
+        if (mode_mask & IEEE_A)
+                for (i = 0; i < MAX_A_CHANNELS; i++)
+                        if (band_a_active_channel[i] == channel)
+                                return IEEE_A;
+
+        if (mode_mask & (IEEE_B | IEEE_G))
+                for (i = 0; i < MAX_B_CHANNELS; i++)
+                        if (band_b_active_channel[i] == channel)
+                                return mode_mask & (IEEE_B | IEEE_G);
+
+        return 0;
+}
+
+static char *snprint_line(char *buf, size_t count, 
+                          const u8 *data, u32 len, u32 ofs)
+{
+        int out, i, j, l;
+        char c;
+        
+        out = snprintf(buf, count, "%08X", ofs);
+
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++) 
+                        out += snprintf(buf + out, count - out, "%02X ", 
+                                        data[(i * 8 + j)]);
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, "   ");
+        }
+        
+        out += snprintf(buf + out, count - out, " ");
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++) {
+                        c = data[(i * 8 + j)];
+                        if (!isascii(c) || !isprint(c))
+                                c = '.';
+                        
+                        out += snprintf(buf + out, count - out, "%c", c);
+                }
+
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, " ");
+        }
+        
+        return buf;
+}
+
+static void printk_buf(int level, const u8 *data, u32 len)
+{
+        char line[81];
+        u32 ofs = 0;
+        if (!(ipw_debug_level & level))
+                return;
+
+        while (len) {
+                printk(KERN_DEBUG "%s\n",
+                       snprint_line(line, sizeof(line), &data[ofs], 
+                                    min(len, 16U), ofs));
+                ofs += 16;
+                len -= min(len, 16U);
+        }
+}
+
+static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg);
+#define ipw_read_reg32(a, b) _ipw_read_reg32(a, b)
+
+static u8 _ipw_read_reg8(struct ipw_priv *ipw, u32 reg);
+#define ipw_read_reg8(a, b) _ipw_read_reg8(a, b)
+
+static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value);
+static inline void ipw_write_reg8(struct ipw_priv *a, u32 b, u8 c)
+{
+        IPW_DEBUG_IO("%s %d: write_indirect8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(b), (u32)(c)); 
+        _ipw_write_reg8(a, b, c);
+}
+
+static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value);
+static inline void ipw_write_reg16(struct ipw_priv *a, u32 b, u16 c)
+{
+        IPW_DEBUG_IO("%s %d: write_indirect16(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(b), (u32)(c)); 
+        _ipw_write_reg16(a, b, c);
+}
+
+static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value);
+static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c)
+{
+        IPW_DEBUG_IO("%s %d: write_indirect32(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(b), (u32)(c));      
+        _ipw_write_reg32(a, b, c);
+}
+
+#define _ipw_write8(ipw, ofs, val) writeb((val), (ipw)->hw_base + (ofs))
+#define ipw_write8(ipw, ofs, val) \
+ IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
+ _ipw_write8(ipw, ofs, val)
+
+#define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs))
+#define ipw_write16(ipw, ofs, val) \
+ IPW_DEBUG_IO("%s %d: write_direct16(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
+ _ipw_write16(ipw, ofs, val)
+
+#define _ipw_write32(ipw, ofs, val) writel((val), (ipw)->hw_base + (ofs))
+#define ipw_write32(ipw, ofs, val) \
+ IPW_DEBUG_IO("%s %d: write_direct32(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
+ _ipw_write32(ipw, ofs, val)
+
+#define _ipw_read8(ipw, ofs) readb((ipw)->hw_base + (ofs))
+static inline u8 __ipw_read8(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) {
+        IPW_DEBUG_IO("%s %d: read_direct8(0x%08X)\n", f, l, (u32)(ofs));
+        return _ipw_read8(ipw, ofs);
+}
+#define ipw_read8(ipw, ofs) __ipw_read8(__FILE__, __LINE__, ipw, ofs)
+
+#define _ipw_read16(ipw, ofs) readw((ipw)->hw_base + (ofs))
+static inline u16 __ipw_read16(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) {
+        IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", f, l, (u32)(ofs));
+        return _ipw_read16(ipw, ofs);
+}
+#define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)
+
+#define _ipw_read32(ipw, ofs) readl((ipw)->hw_base + (ofs))
+static inline u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) {
+        IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32)(ofs));
+        return _ipw_read32(ipw, ofs);
+}
+#define ipw_read32(ipw, ofs) __ipw_read32(__FILE__, __LINE__, ipw, ofs)
+
+static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);
+#define ipw_read_indirect(a, b, c, d) \
+        IPW_DEBUG_IO("%s %d: read_inddirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \
+        _ipw_read_indirect(a, b, c, d)
+
+static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 *data, int num);
+#define ipw_write_indirect(a, b, c, d) \
+        IPW_DEBUG_IO("%s %d: write_indirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \
+        _ipw_write_indirect(a, b, c, d)
+
+/* indirect write s */
+static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg,
+                             u32 value)
+{
+        IPW_DEBUG_IO(" %p : reg = 0x%8X : value = 0x%8X\n", 
+                     priv, reg, value);
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg);
+        _ipw_write32(priv, CX2_INDIRECT_DATA, value);
+}
+
+
+static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value)
+{
+        IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
+        _ipw_write8(priv, CX2_INDIRECT_DATA, value);
+        IPW_DEBUG_IO(" reg = 0x%8lX : value = 0x%8X\n", 
+                     (unsigned long)(priv->hw_base + CX2_INDIRECT_DATA),
+                     value);
+}
+
+static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg,
+                             u16 value)
+{
+        IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
+        _ipw_write16(priv, CX2_INDIRECT_DATA, value);
+}
+
+/* indirect read s */
+
+static u8 _ipw_read_reg8(struct ipw_priv *priv, u32 reg)
+{
+        u32 word;
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
+        IPW_DEBUG_IO(" reg = 0x%8X : \n", reg);
+        word = _ipw_read32(priv, CX2_INDIRECT_DATA);
+        return (word >> ((reg & 0x3)*8)) & 0xff;
+}
+
+static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg)
+{
+        u32 value;
+
+        IPW_DEBUG_IO("%p : reg = 0x%08x\n", priv, reg);
+
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg);
+        value = _ipw_read32(priv, CX2_INDIRECT_DATA);
+        IPW_DEBUG_IO(" reg = 0x%4X : value = 0x%4x \n", reg, value);
+        return value;
+}
+
+/* iterative/auto-increment 32 bit reads and writes */
+static void _ipw_read_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
+                               int num)
+{
+        u32 aligned_addr = addr & CX2_INDIRECT_ADDR_MASK;
+        u32 dif_len = addr - aligned_addr;
+        u32 aligned_len;
+        u32 i;
+        
+        IPW_DEBUG_IO("addr = %i, buf = %p, num = %i\n", addr, buf, num);
+
+        /* Read the first nibble byte by byte */
+        if (unlikely(dif_len)) {
+                /* Start reading at aligned_addr + dif_len */
+                _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        *buf = _ipw_read8(priv, CX2_INDIRECT_DATA + i);
+                num -= dif_len;
+                aligned_addr += 4;
+        }
+
+        /* Read DWs through autoinc register */
+        _ipw_write32(priv, CX2_AUTOINC_ADDR, aligned_addr);
+        aligned_len = num & CX2_INDIRECT_ADDR_MASK;
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                *(u32*)buf = ipw_read32(priv, CX2_AUTOINC_DATA);
+        
+        /* Copy the last nibble */
+        dif_len = num - aligned_len;
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                *buf = ipw_read8(priv, CX2_INDIRECT_DATA + i);
+}
+
+static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 *buf, 
+                                int num)
+{
+        u32 aligned_addr = addr & CX2_INDIRECT_ADDR_MASK;
+        u32 dif_len = addr - aligned_addr;
+        u32 aligned_len;
+        u32 i;
+        
+        IPW_DEBUG_IO("addr = %i, buf = %p, num = %i\n", addr, buf, num);
+        
+        /* Write the first nibble byte by byte */
+        if (unlikely(dif_len)) {
+                /* Start writing at aligned_addr + dif_len */
+                _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        _ipw_write8(priv, CX2_INDIRECT_DATA + i, *buf);
+                num -= dif_len;
+                aligned_addr += 4;
+        }
+        
+        /* Write DWs through autoinc register */
+        _ipw_write32(priv, CX2_AUTOINC_ADDR, aligned_addr);
+        aligned_len = num & CX2_INDIRECT_ADDR_MASK;
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                _ipw_write32(priv, CX2_AUTOINC_DATA, *(u32*)buf);
+        
+        /* Copy the last nibble */
+        dif_len = num - aligned_len;
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                _ipw_write8(priv, CX2_INDIRECT_DATA + i, *buf);
+}
+
+static void ipw_write_direct(struct ipw_priv *priv, u32 addr, void *buf, 
+                             int num)
+{
+        memcpy_toio((priv->hw_base + addr), buf, num);
+}
+
+static inline void ipw_set_bit(struct ipw_priv *priv, u32 reg, u32 mask)
+{
+        ipw_write32(priv, reg, ipw_read32(priv, reg) | mask);
+}
+
+static inline void ipw_clear_bit(struct ipw_priv *priv, u32 reg, u32 mask)
+{
+        ipw_write32(priv, reg, ipw_read32(priv, reg) & ~mask);
+}
+
+static inline void ipw_enable_interrupts(struct ipw_priv *priv)
+{
+        if (priv->status & STATUS_INT_ENABLED)
+                return;
+        priv->status |= STATUS_INT_ENABLED;
+        ipw_write32(priv, CX2_INTA_MASK_R, CX2_INTA_MASK_ALL);
+}
+
+static inline void ipw_disable_interrupts(struct ipw_priv *priv)
+{
+        if (!(priv->status & STATUS_INT_ENABLED))
+                return;
+        priv->status &= ~STATUS_INT_ENABLED;
+        ipw_write32(priv, CX2_INTA_MASK_R, ~CX2_INTA_MASK_ALL);
+}
+
+static char *ipw_error_desc(u32 val)
+{
+        switch (val) {
+        case IPW_FW_ERROR_OK: 
+                return "ERROR_OK";
+        case IPW_FW_ERROR_FAIL: 
+                return "ERROR_FAIL";
+        case IPW_FW_ERROR_MEMORY_UNDERFLOW: 
+                return "MEMORY_UNDERFLOW";
+        case IPW_FW_ERROR_MEMORY_OVERFLOW: 
+                return "MEMORY_OVERFLOW";
+        case IPW_FW_ERROR_BAD_PARAM: 
+                return "ERROR_BAD_PARAM";
+        case IPW_FW_ERROR_BAD_CHECKSUM: 
+                return "ERROR_BAD_CHECKSUM";
+        case IPW_FW_ERROR_NMI_INTERRUPT: 
+                return "ERROR_NMI_INTERRUPT";
+        case IPW_FW_ERROR_BAD_DATABASE: 
+                return "ERROR_BAD_DATABASE";
+        case IPW_FW_ERROR_ALLOC_FAIL: 
+                return "ERROR_ALLOC_FAIL";
+        case IPW_FW_ERROR_DMA_UNDERRUN: 
+                return "ERROR_DMA_UNDERRUN";
+        case IPW_FW_ERROR_DMA_STATUS: 
+                return "ERROR_DMA_STATUS";
+        case IPW_FW_ERROR_DINOSTATUS_ERROR: 
+                return "ERROR_DINOSTATUS_ERROR";
+        case IPW_FW_ERROR_EEPROMSTATUS_ERROR: 
+                return "ERROR_EEPROMSTATUS_ERROR";
+        case IPW_FW_ERROR_SYSASSERT: 
+                return "ERROR_SYSASSERT";
+        case IPW_FW_ERROR_FATAL_ERROR: 
+                return "ERROR_FATALSTATUS_ERROR";
+        default: 
+                return "UNKNOWNSTATUS_ERROR";
+        }
+}
+
+static void ipw_dump_nic_error_log(struct ipw_priv *priv)
+{
+        u32 desc, time, blink1, blink2, ilink1, ilink2, idata, i, count, base;
+
+        base = ipw_read32(priv, IPWSTATUS_ERROR_LOG);
+        count = ipw_read_reg32(priv, base);
+        
+        if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
+                IPW_ERROR("Start IPW Error Log Dump:\n");
+                IPW_ERROR("Status: 0x%08X, Config: %08X\n",
+                          priv->status, priv->config);
+        }
+
+        for (i = ERROR_START_OFFSET; 
+             i <= count * ERROR_ELEM_SIZE; 
+             i += ERROR_ELEM_SIZE) {
+                desc   = ipw_read_reg32(priv, base + i);
+                time   = ipw_read_reg32(priv, base + i + 1*sizeof(u32));
+                blink1 = ipw_read_reg32(priv, base + i + 2*sizeof(u32));
+                blink2 = ipw_read_reg32(priv, base + i + 3*sizeof(u32));
+                ilink1 = ipw_read_reg32(priv, base + i + 4*sizeof(u32));
+                ilink2 = ipw_read_reg32(priv, base + i + 5*sizeof(u32));
+                idata =  ipw_read_reg32(priv, base + i + 6*sizeof(u32));
+
+                IPW_ERROR(
+                        "%s %i 0x%08x  0x%08x  0x%08x  0x%08x  0x%08x\n", 
+                        ipw_error_desc(desc), time, blink1, blink2, 
+                        ilink1, ilink2, idata);
+        }
+}
+
+static void ipw_dump_nic_event_log(struct ipw_priv *priv)
+{
+        u32 ev, time, data, i, count, base;
+
+        base = ipw_read32(priv, IPW_EVENT_LOG);
+        count = ipw_read_reg32(priv, base);
+        
+        if (EVENT_START_OFFSET <= count * EVENT_ELEM_SIZE)
+                IPW_ERROR("Start IPW Event Log Dump:\n");
+
+        for (i = EVENT_START_OFFSET; 
+             i <= count * EVENT_ELEM_SIZE; 
+             i += EVENT_ELEM_SIZE) {
+                ev = ipw_read_reg32(priv, base + i);
+                time  = ipw_read_reg32(priv, base + i + 1*sizeof(u32));
+                data  = ipw_read_reg32(priv, base + i + 2*sizeof(u32));
+
+#ifdef CONFIG_IPW_DEBUG
+                IPW_ERROR("%i\t0x%08x\t%i\n", time, data, ev);
+#endif
+        }
+}
+
+static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val,
+                           u32 *len)
+{
+        u32 addr, field_info, field_len, field_count, total_len;
+
+        IPW_DEBUG_ORD("ordinal = %i\n", ord);
+
+        if (!priv || !val || !len) {
+                IPW_DEBUG_ORD("Invalid argument\n");
+                return -EINVAL;
+        }
+        
+        /* verify device ordinal tables have been initialized */
+        if (!priv->table0_addr || !priv->table1_addr || !priv->table2_addr) {
+                IPW_DEBUG_ORD("Access ordinals before initialization\n");
+                return -EINVAL;
+        }
+
+        switch (IPW_ORD_TABLE_ID_MASK & ord) {
+        case IPW_ORD_TABLE_0_MASK:
+                /*
+                 * TABLE 0: Direct access to a table of 32 bit values
+                 *
+                 * This is a very simple table with the data directly 
+                 * read from the table
+                 */
+
+                /* remove the table id from the ordinal */
+                ord &= IPW_ORD_TABLE_VALUE_MASK;
+
+                /* boundary check */
+                if (ord > priv->table0_len) {
+                        IPW_DEBUG_ORD("ordinal value (%i) longer then "
+                                      "max (%i)\n", ord, priv->table0_len);
+                        return -EINVAL;
+                }
+
+                /* verify we have enough room to store the value */
+                if (*len < sizeof(u32)) {
+                        IPW_DEBUG_ORD("ordinal buffer length too small, "
+                                      "need %zd\n", sizeof(u32));
+                        return -EINVAL;
+                }
+
+                IPW_DEBUG_ORD("Reading TABLE0[%i] from offset 0x%08x\n",
+                              ord, priv->table0_addr + (ord  << 2));
+
+                *len = sizeof(u32);
+                ord <<= 2;
+                *((u32 *)val) = ipw_read32(priv, priv->table0_addr + ord);
+                break;
+
+        case IPW_ORD_TABLE_1_MASK:
+                /*
+                 * TABLE 1: Indirect access to a table of 32 bit values
+                 * 
+                 * This is a fairly large table of u32 values each 
+                 * representing starting addr for the data (which is
+                 * also a u32)
+                 */
+
+                /* remove the table id from the ordinal */
+                ord &= IPW_ORD_TABLE_VALUE_MASK;
+                
+                /* boundary check */
+                if (ord > priv->table1_len) {
+                        IPW_DEBUG_ORD("ordinal value too long\n");
+                        return -EINVAL;
+                }
+
+                /* verify we have enough room to store the value */
+                if (*len < sizeof(u32)) {
+                        IPW_DEBUG_ORD("ordinal buffer length too small, "
+                                      "need %zd\n", sizeof(u32));
+                        return -EINVAL;
+                }
+
+                *((u32 *)val) = ipw_read_reg32(priv, (priv->table1_addr + (ord << 2)));
+                *len = sizeof(u32);
+                break;
+
+        case IPW_ORD_TABLE_2_MASK:
+                /*
+                 * TABLE 2: Indirect access to a table of variable sized values
+                 *
+                 * This table consist of six values, each containing
+                 *     - dword containing the starting offset of the data
+                 *     - dword containing the lengh in the first 16bits
+                 *       and the count in the second 16bits
+                 */
+
+                /* remove the table id from the ordinal */
+                ord &= IPW_ORD_TABLE_VALUE_MASK;
+
+                /* boundary check */
+                if (ord > priv->table2_len) {
+                        IPW_DEBUG_ORD("ordinal value too long\n");
+                        return -EINVAL;
+                }
+
+                /* get the address of statistic */
+                addr = ipw_read_reg32(priv, priv->table2_addr + (ord << 3));
+                
+                /* get the second DW of statistics ; 
+                 * two 16-bit words - first is length, second is count */
+                field_info = ipw_read_reg32(priv, priv->table2_addr + (ord << 3) + sizeof(u32));
+                
+                /* get each entry length */
+                field_len = *((u16 *)&field_info);
+                
+                /* get number of entries */
+                field_count = *(((u16 *)&field_info) + 1);
+                
+                /* abort if not enought memory */
+                total_len = field_len * field_count;
+                if (total_len > *len) {
+                        *len = total_len;
+                        return -EINVAL;
+                }
+                
+                *len = total_len;
+                if (!total_len)
+                        return 0;
+
+                IPW_DEBUG_ORD("addr = 0x%08x, total_len = %i, "
+                              "field_info = 0x%08x\n", 
+                              addr, total_len, field_info);
+                ipw_read_indirect(priv, addr, val, total_len);
+                break;
+
+        default:
+                IPW_DEBUG_ORD("Invalid ordinal!\n");
+                return -EINVAL;
+
+        }
+
+        
+        return 0;
+}
+
+static void ipw_init_ordinals(struct ipw_priv *priv)
+{
+        priv->table0_addr = IPW_ORDINALS_TABLE_LOWER;
+        priv->table0_len = ipw_read32(priv, priv->table0_addr); 
+
+        IPW_DEBUG_ORD("table 0 offset at 0x%08x, len = %i\n",
+                      priv->table0_addr, priv->table0_len);
+
+        priv->table1_addr = ipw_read32(priv, IPW_ORDINALS_TABLE_1);
+        priv->table1_len = ipw_read_reg32(priv, priv->table1_addr);
+
+        IPW_DEBUG_ORD("table 1 offset at 0x%08x, len = %i\n",
+                      priv->table1_addr, priv->table1_len);
+
+        priv->table2_addr = ipw_read32(priv, IPW_ORDINALS_TABLE_2);
+        priv->table2_len = ipw_read_reg32(priv, priv->table2_addr);
+        priv->table2_len &= 0x0000ffff; /* use first two bytes */
+
+        IPW_DEBUG_ORD("table 2 offset at 0x%08x, len = %i\n",
+                      priv->table2_addr, priv->table2_len);
+
+}
+
+/*
+ * The following adds a new attribute to the sysfs representation
+ * of this device driver (i.e. a new file in /sys/bus/pci/drivers/ipw/)
+ * used for controling the debug level.
+ * 
+ * See the level definitions in ipw for details.
+ */
+static ssize_t show_debug_level(struct device_driver *d, char *buf)
+{
+        return sprintf(buf, "0x%08X\n", ipw_debug_level);
+}
+static ssize_t store_debug_level(struct device_driver *d,
+                                const char *buf, size_t count)
+{
+        char *p = (char *)buf;
+        u32 val;
+
+        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
+                p++;
+                if (p[0] == 'x' || p[0] == 'X')
+                        p++;
+                val = simple_strtoul(p, &p, 16);
+        } else
+                val = simple_strtoul(p, &p, 10);
+        if (p == buf) 
+                printk(KERN_INFO DRV_NAME 
+                       ": %s is not in hex or decimal form.\n", buf);
+        else
+                ipw_debug_level = val;
+
+        return strnlen(buf, count);
+}
+
+static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, 
+                   show_debug_level, store_debug_level);
+
+static ssize_t show_status(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        struct ipw_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->status);
+}
+static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
+
+static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct ipw_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->config);
+}
+static DEVICE_ATTR(cfg, S_IRUGO, show_cfg, NULL);
+
+static ssize_t show_nic_type(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        struct ipw_priv *p = d->driver_data;
+        u8 type = p->eeprom[EEPROM_NIC_TYPE];
+
+        switch (type) {
+        case EEPROM_NIC_TYPE_STANDARD:
+                return sprintf(buf, "STANDARD\n");
+        case EEPROM_NIC_TYPE_DELL:
+                return sprintf(buf, "DELL\n");
+        case EEPROM_NIC_TYPE_FUJITSU:
+                return sprintf(buf, "FUJITSU\n");
+        case EEPROM_NIC_TYPE_IBM:
+                return sprintf(buf, "IBM\n");
+        case EEPROM_NIC_TYPE_HP:
+                return sprintf(buf, "HP\n");
+        }
+                
+        return sprintf(buf, "UNKNOWN\n");
+}
+static DEVICE_ATTR(nic_type, S_IRUGO, show_nic_type, NULL);
+
+static ssize_t dump_error_log(struct device *d,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        char *p = (char *)buf;
+
+        if (p[0] == '1') 
+                ipw_dump_nic_error_log((struct ipw_priv*)d->driver_data);
+
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, dump_error_log);
+
+static ssize_t dump_event_log(struct device *d,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        char *p = (char *)buf;
+
+        if (p[0] == '1') 
+                ipw_dump_nic_event_log((struct ipw_priv*)d->driver_data);
+
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
+
+static ssize_t show_ucode_version(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        u32 len = sizeof(u32), tmp = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        if(ipw_get_ordinal(p, IPW_ORD_STAT_UCODE_VERSION, &tmp, &len))
+                return 0;
+
+        return sprintf(buf, "0x%08x\n", tmp);
+}
+static DEVICE_ATTR(ucode_version, S_IWUSR|S_IRUGO, show_ucode_version, NULL);
+
+static ssize_t show_rtc(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        u32 len = sizeof(u32), tmp = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        if(ipw_get_ordinal(p, IPW_ORD_STAT_RTC, &tmp, &len))
+                return 0;
+
+        return sprintf(buf, "0x%08x\n", tmp);
+}
+static DEVICE_ATTR(rtc, S_IWUSR|S_IRUGO, show_rtc, NULL);
+
+/*
+ * Add a device attribute to view/control the delay between eeprom
+ * operations.
+ */
+static ssize_t show_eeprom_delay(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        int n = ((struct ipw_priv*)d->driver_data)->eeprom_delay;
+        return sprintf(buf, "%i\n", n);
+}
+static ssize_t store_eeprom_delay(struct device *d,
+                        struct device_attribute *attr, const char *buf,
+                        size_t count)
+{
+        struct ipw_priv *p = d->driver_data;
+        sscanf(buf, "%i", &p->eeprom_delay);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(eeprom_delay, S_IWUSR|S_IRUGO, 
+                   show_eeprom_delay,store_eeprom_delay);
+
+static ssize_t show_command_event_reg(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        reg = ipw_read_reg32(p, CX2_INTERNAL_CMD_EVENT);
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_command_event_reg(struct device *d,
+                                struct device_attribute *attr, const char *buf,
+                                size_t count)
+{
+        u32 reg;
+        struct ipw_priv *p = d->driver_data;
+
+        sscanf(buf, "%x", &reg);
+        ipw_write_reg32(p, CX2_INTERNAL_CMD_EVENT, reg);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(command_event_reg, S_IWUSR|S_IRUGO, 
+                   show_command_event_reg,store_command_event_reg);
+
+static ssize_t show_mem_gpio_reg(struct device *d,
+                                struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        reg = ipw_read_reg32(p, 0x301100);
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_mem_gpio_reg(struct device *d,
+                        struct device_attribute *attr, const char *buf,
+                        size_t count)
+{
+        u32 reg;
+        struct ipw_priv *p = d->driver_data;
+
+        sscanf(buf, "%x", &reg);
+        ipw_write_reg32(p, 0x301100, reg);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(mem_gpio_reg, S_IWUSR|S_IRUGO,
+                   show_mem_gpio_reg,store_mem_gpio_reg);
+
+static ssize_t show_indirect_dword(struct device *d,
+                                struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *priv = d->driver_data;
+        if (priv->status & STATUS_INDIRECT_DWORD) 
+                reg = ipw_read_reg32(priv, priv->indirect_dword);
+        else 
+                reg = 0;
+        
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_indirect_dword(struct device *d,
+                                struct device_attribute *attr, const char *buf,
+                                size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+
+        sscanf(buf, "%x", &priv->indirect_dword);
+        priv->status |= STATUS_INDIRECT_DWORD;
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(indirect_dword, S_IWUSR|S_IRUGO, 
+                   show_indirect_dword,store_indirect_dword);
+
+static ssize_t show_indirect_byte(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        u8 reg = 0;
+        struct ipw_priv *priv = d->driver_data;
+        if (priv->status & STATUS_INDIRECT_BYTE) 
+                reg = ipw_read_reg8(priv, priv->indirect_byte);
+        else 
+                reg = 0;
+
+        return sprintf(buf, "0x%02x\n", reg);
+}
+static ssize_t store_indirect_byte(struct device *d,
+                                struct device_attribute *attr, const char *buf,
+                                size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+
+        sscanf(buf, "%x", &priv->indirect_byte);
+        priv->status |= STATUS_INDIRECT_BYTE;
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(indirect_byte, S_IWUSR|S_IRUGO, 
+                   show_indirect_byte, store_indirect_byte);
+
+static ssize_t show_direct_dword(struct device *d,
+                                struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *priv = d->driver_data;
+
+        if (priv->status & STATUS_DIRECT_DWORD) 
+                reg = ipw_read32(priv, priv->direct_dword);
+        else 
+                reg = 0;
+
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_direct_dword(struct device *d,
+                        struct device_attribute *attr, const char *buf,
+                        size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+
+        sscanf(buf, "%x", &priv->direct_dword);
+        priv->status |= STATUS_DIRECT_DWORD;
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(direct_dword, S_IWUSR|S_IRUGO, 
+                   show_direct_dword,store_direct_dword);
+
+
+static inline int rf_kill_active(struct ipw_priv *priv)
+{
+        if (0 == (ipw_read32(priv, 0x30) & 0x10000))
+                priv->status |= STATUS_RF_KILL_HW;
+        else
+                priv->status &= ~STATUS_RF_KILL_HW;
+
+        return (priv->status & STATUS_RF_KILL_HW) ? 1 : 0;
+}
+
+static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        /* 0 - RF kill not enabled
+           1 - SW based RF kill active (sysfs) 
+           2 - HW based RF kill active
+           3 - Both HW and SW baed RF kill active */
+        struct ipw_priv *priv = d->driver_data;
+        int val = ((priv->status & STATUS_RF_KILL_SW) ? 0x1 : 0x0) |
+                (rf_kill_active(priv) ? 0x2 : 0x0);
+        return sprintf(buf, "%i\n", val);
+}
+
+static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)
+{
+        if ((disable_radio ? 1 : 0) == 
+            (priv->status & STATUS_RF_KILL_SW ? 1 : 0))
+                return 0 ;
+
+        IPW_DEBUG_RF_KILL("Manual SW RF Kill set to: RADIO  %s\n",
+                          disable_radio ? "OFF" : "ON");
+
+        if (disable_radio) {
+                priv->status |= STATUS_RF_KILL_SW;
+
+                if (priv->workqueue) { 
+                        cancel_delayed_work(&priv->request_scan);
+                }
+                wake_up_interruptible(&priv->wait_command_queue);
+                queue_work(priv->workqueue, &priv->down);
+        } else {
+                priv->status &= ~STATUS_RF_KILL_SW;
+                if (rf_kill_active(priv)) {
+                        IPW_DEBUG_RF_KILL("Can not turn radio back on - "
+                                          "disabled by HW switch\n");
+                        /* Make sure the RF_KILL check timer is running */
+                        cancel_delayed_work(&priv->rf_kill);
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill, 
+                                           2 * HZ);
+                } else 
+                        queue_work(priv->workqueue, &priv->up);
+        }
+
+        return 1;
+}
+
+static ssize_t store_rf_kill(struct device *d,  struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+        
+        ipw_radio_kill_sw(priv, buf[0] == '1');
+
+        return count;
+}
+static DEVICE_ATTR(rf_kill, S_IWUSR|S_IRUGO, show_rf_kill, store_rf_kill);
+
+static void ipw_irq_tasklet(struct ipw_priv *priv)
+{
+        u32 inta, inta_mask, handled = 0;
+        unsigned long flags;
+        int rc = 0;
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        inta = ipw_read32(priv, CX2_INTA_RW);
+        inta_mask = ipw_read32(priv, CX2_INTA_MASK_R);
+        inta &= (CX2_INTA_MASK_ALL & inta_mask);
+
+        /* Add any cached INTA values that need to be handled */
+        inta |= priv->isr_inta;
+
+        /* handle all the justifications for the interrupt */
+        if (inta & CX2_INTA_BIT_RX_TRANSFER) {
+                ipw_rx(priv);
+                handled |= CX2_INTA_BIT_RX_TRANSFER;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_CMD_QUEUE) {
+                IPW_DEBUG_HC("Command completed.\n");
+                rc = ipw_queue_tx_reclaim( priv, &priv->txq_cmd, -1);
+                priv->status &= ~STATUS_HCMD_ACTIVE;
+                wake_up_interruptible(&priv->wait_command_queue);
+                handled |= CX2_INTA_BIT_TX_CMD_QUEUE;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_1) {
+                IPW_DEBUG_TX("TX_QUEUE_1\n");
+                rc = ipw_queue_tx_reclaim( priv, &priv->txq[0], 0);
+                handled |= CX2_INTA_BIT_TX_QUEUE_1;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_2) {
+                IPW_DEBUG_TX("TX_QUEUE_2\n");
+                rc = ipw_queue_tx_reclaim( priv, &priv->txq[1], 1);
+                handled |= CX2_INTA_BIT_TX_QUEUE_2;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_3) {
+                IPW_DEBUG_TX("TX_QUEUE_3\n");
+                rc = ipw_queue_tx_reclaim( priv, &priv->txq[2], 2);
+                handled |= CX2_INTA_BIT_TX_QUEUE_3;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_4) {
+                IPW_DEBUG_TX("TX_QUEUE_4\n");
+                rc = ipw_queue_tx_reclaim( priv, &priv->txq[3], 3);
+                handled |= CX2_INTA_BIT_TX_QUEUE_4;
+        }
+
+        if (inta & CX2_INTA_BIT_STATUS_CHANGE) {
+                IPW_WARNING("STATUS_CHANGE\n");
+                handled |= CX2_INTA_BIT_STATUS_CHANGE;
+        }
+
+        if (inta & CX2_INTA_BIT_BEACON_PERIOD_EXPIRED) {
+                IPW_WARNING("TX_PERIOD_EXPIRED\n");
+                handled |= CX2_INTA_BIT_BEACON_PERIOD_EXPIRED;
+        }
+
+        if (inta & CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE) {
+                IPW_WARNING("HOST_CMD_DONE\n");
+                handled |= CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE;
+        }
+
+        if (inta & CX2_INTA_BIT_FW_INITIALIZATION_DONE) {
+                IPW_WARNING("FW_INITIALIZATION_DONE\n");
+                handled |= CX2_INTA_BIT_FW_INITIALIZATION_DONE;
+        }
+
+        if (inta & CX2_INTA_BIT_FW_CARD_DISABLE_PHY_OFF_DONE) {
+                IPW_WARNING("PHY_OFF_DONE\n");
+                handled |= CX2_INTA_BIT_FW_CARD_DISABLE_PHY_OFF_DONE;
+        }
+
+        if (inta & CX2_INTA_BIT_RF_KILL_DONE) {
+                IPW_DEBUG_RF_KILL("RF_KILL_DONE\n");
+                priv->status |= STATUS_RF_KILL_HW;
+                wake_up_interruptible(&priv->wait_command_queue);
+                netif_carrier_off(priv->net_dev);
+                netif_stop_queue(priv->net_dev);
+                cancel_delayed_work(&priv->request_scan);
+                queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ);
+                handled |= CX2_INTA_BIT_RF_KILL_DONE;
+        }
+        
+        if (inta & CX2_INTA_BIT_FATAL_ERROR) {
+                IPW_ERROR("Firmware error detected.  Restarting.\n");
+#ifdef CONFIG_IPW_DEBUG
+                if (ipw_debug_level & IPW_DL_FW_ERRORS) {
+                        ipw_dump_nic_error_log(priv);
+                        ipw_dump_nic_event_log(priv);
+                }
+#endif
+                queue_work(priv->workqueue, &priv->adapter_restart);
+                handled |= CX2_INTA_BIT_FATAL_ERROR;
+        }
+
+        if (inta & CX2_INTA_BIT_PARITY_ERROR) {
+                IPW_ERROR("Parity error\n");
+                handled |= CX2_INTA_BIT_PARITY_ERROR;
+        }
+
+        if (handled != inta) {
+                IPW_ERROR("Unhandled INTA bits 0x%08x\n", 
+                                inta & ~handled);
+        }
+
+        /* enable all interrupts */
+        ipw_enable_interrupts(priv);
+
+        spin_unlock_irqrestore(&priv->lock, flags);
+}
+ 
+#ifdef CONFIG_IPW_DEBUG
+#define IPW_CMD(x) case IPW_CMD_ ## x : return #x
+static char *get_cmd_string(u8 cmd)
+{
+        switch (cmd) {
+                IPW_CMD(HOST_COMPLETE);
+                IPW_CMD(POWER_DOWN); 
+                IPW_CMD(SYSTEM_CONFIG); 
+                IPW_CMD(MULTICAST_ADDRESS); 
+                IPW_CMD(SSID); 
+                IPW_CMD(ADAPTER_ADDRESS); 
+                IPW_CMD(PORT_TYPE); 
+                IPW_CMD(RTS_THRESHOLD); 
+                IPW_CMD(FRAG_THRESHOLD); 
+                IPW_CMD(POWER_MODE); 
+                IPW_CMD(WEP_KEY); 
+                IPW_CMD(TGI_TX_KEY); 
+                IPW_CMD(SCAN_REQUEST); 
+                IPW_CMD(SCAN_REQUEST_EXT); 
+                IPW_CMD(ASSOCIATE); 
+                IPW_CMD(SUPPORTED_RATES); 
+                IPW_CMD(SCAN_ABORT); 
+                IPW_CMD(TX_FLUSH); 
+                IPW_CMD(QOS_PARAMETERS); 
+                IPW_CMD(DINO_CONFIG); 
+                IPW_CMD(RSN_CAPABILITIES); 
+                IPW_CMD(RX_KEY); 
+                IPW_CMD(CARD_DISABLE); 
+                IPW_CMD(SEED_NUMBER); 
+                IPW_CMD(TX_POWER); 
+                IPW_CMD(COUNTRY_INFO); 
+                IPW_CMD(AIRONET_INFO); 
+                IPW_CMD(AP_TX_POWER); 
+                IPW_CMD(CCKM_INFO); 
+                IPW_CMD(CCX_VER_INFO); 
+                IPW_CMD(SET_CALIBRATION); 
+                IPW_CMD(SENSITIVITY_CALIB); 
+                IPW_CMD(RETRY_LIMIT); 
+                IPW_CMD(IPW_PRE_POWER_DOWN); 
+                IPW_CMD(VAP_BEACON_TEMPLATE); 
+                IPW_CMD(VAP_DTIM_PERIOD); 
+                IPW_CMD(EXT_SUPPORTED_RATES); 
+                IPW_CMD(VAP_LOCAL_TX_PWR_CONSTRAINT); 
+                IPW_CMD(VAP_QUIET_INTERVALS); 
+                IPW_CMD(VAP_CHANNEL_SWITCH); 
+                IPW_CMD(VAP_MANDATORY_CHANNELS); 
+                IPW_CMD(VAP_CELL_PWR_LIMIT); 
+                IPW_CMD(VAP_CF_PARAM_SET); 
+                IPW_CMD(VAP_SET_BEACONING_STATE); 
+                IPW_CMD(MEASUREMENT); 
+                IPW_CMD(POWER_CAPABILITY); 
+                IPW_CMD(SUPPORTED_CHANNELS); 
+                IPW_CMD(TPC_REPORT); 
+                IPW_CMD(WME_INFO); 
+                IPW_CMD(PRODUCTION_COMMAND); 
+        default: 
+                return "UNKNOWN";
+        }
+}
+#endif /* CONFIG_IPW_DEBUG */
+
+#define HOST_COMPLETE_TIMEOUT HZ
+static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
+{
+        int rc = 0;
+
+        if (priv->status & STATUS_HCMD_ACTIVE) {
+                IPW_ERROR("Already sending a command\n");
+                return -1;
+        }
+
+        priv->status |= STATUS_HCMD_ACTIVE;
+        
+        IPW_DEBUG_HC("Sending %s command (#%d), %d bytes\n", 
+                     get_cmd_string(cmd->cmd), cmd->cmd, cmd->len);
+        printk_buf(IPW_DL_HOST_COMMAND, (u8*)cmd->param, cmd->len);
+
+        rc = ipw_queue_tx_hcmd(priv, cmd->cmd, &cmd->param, cmd->len, 0);
+        if (rc)
+                return rc;
+
+        rc = wait_event_interruptible_timeout(
+                priv->wait_command_queue, !(priv->status & STATUS_HCMD_ACTIVE),
+                HOST_COMPLETE_TIMEOUT);
+        if (rc == 0) {
+                IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
+                               HOST_COMPLETE_TIMEOUT / (HZ / 1000));
+                priv->status &= ~STATUS_HCMD_ACTIVE;
+                return -EIO;
+        }
+        if (priv->status & STATUS_RF_KILL_MASK) {
+                IPW_DEBUG_INFO("Command aborted due to RF Kill Switch\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int ipw_send_host_complete(struct ipw_priv *priv)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_HOST_COMPLETE,
+                .len = 0
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send HOST_COMPLETE command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+static int ipw_send_system_config(struct ipw_priv *priv, 
+                                  struct ipw_sys_config *config)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SYSTEM_CONFIG,
+                .len = sizeof(*config)
+        };
+
+        if (!priv || !config) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param,config,sizeof(*config));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SYSTEM_CONFIG command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_ssid(struct ipw_priv *priv, u8 *ssid, int len)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SSID,
+                .len = min(len, IW_ESSID_MAX_SIZE)
+        };
+
+        if (!priv || !ssid) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, ssid, cmd.len);
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SSID command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+static int ipw_send_adapter_address(struct ipw_priv *priv, u8 *mac)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_ADAPTER_ADDRESS,
+                .len = ETH_ALEN
+        };
+
+        if (!priv || !mac) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        IPW_DEBUG_INFO("%s: Setting MAC to " MAC_FMT "\n",
+                       priv->net_dev->name, MAC_ARG(mac));
+
+        memcpy(&cmd.param, mac, ETH_ALEN);
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send ADAPTER_ADDRESS command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+static void ipw_adapter_restart(void *adapter)
+{
+        struct ipw_priv *priv = adapter;
+
+        if (priv->status & STATUS_RF_KILL_MASK)
+                return;
+
+        ipw_down(priv);
+        if (ipw_up(priv)) {
+                IPW_ERROR("Failed to up device\n");
+                return;
+        }
+}
+
+
+
+
+#define IPW_SCAN_CHECK_WATCHDOG (5 * HZ)
+
+static void ipw_scan_check(void *data)
+{
+        struct ipw_priv *priv = data;
+        if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) {
+                IPW_DEBUG_SCAN("Scan completion watchdog resetting "
+                               "adapter (%dms).\n", 
+                               IPW_SCAN_CHECK_WATCHDOG / 100);
+                ipw_adapter_restart(priv);
+        }
+}
+
+static int ipw_send_scan_request_ext(struct ipw_priv *priv,
+                                     struct ipw_scan_request_ext *request)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SCAN_REQUEST_EXT,
+                .len = sizeof(*request)
+        };
+
+        if (!priv || !request) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param,request,sizeof(*request));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SCAN_REQUEST_EXT command\n");
+                return -1;
+        }
+        
+        queue_delayed_work(priv->workqueue, &priv->scan_check, 
+                           IPW_SCAN_CHECK_WATCHDOG);
+        return 0;
+}
+
+static int ipw_send_scan_abort(struct ipw_priv *priv)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SCAN_ABORT,
+                .len = 0
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SCAN_ABORT command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+static int ipw_set_sensitivity(struct ipw_priv *priv, u16 sens)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SENSITIVITY_CALIB,
+                .len = sizeof(struct ipw_sensitivity_calib)
+        };
+        struct ipw_sensitivity_calib *calib = (struct ipw_sensitivity_calib *)
+                &cmd.param;
+        calib->beacon_rssi_raw = sens;
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SENSITIVITY CALIB command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_associate(struct ipw_priv *priv,
+                              struct ipw_associate *associate)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_ASSOCIATE,
+                .len = sizeof(*associate)
+        };
+
+        if (!priv || !associate) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param,associate,sizeof(*associate));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send ASSOCIATE command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+static int ipw_send_supported_rates(struct ipw_priv *priv,
+                                    struct ipw_supported_rates *rates)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SUPPORTED_RATES,
+                .len = sizeof(*rates)
+        };
+
+        if (!priv || !rates) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param,rates,sizeof(*rates));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SUPPORTED_RATES command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+static int ipw_set_random_seed(struct ipw_priv *priv)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SEED_NUMBER,
+                .len = sizeof(u32)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        get_random_bytes(&cmd.param, sizeof(u32));
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SEED_NUMBER command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+#if 0
+static int ipw_send_card_disable(struct ipw_priv *priv, u32 phy_off)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_CARD_DISABLE,
+                .len = sizeof(u32)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        *((u32*)&cmd.param) = phy_off;
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send CARD_DISABLE command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+#endif
+
+static int ipw_send_tx_power(struct ipw_priv *priv,
+                             struct ipw_tx_power *power)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_TX_POWER,
+                .len = sizeof(*power)
+        };
+
+        if (!priv || !power) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param,power,sizeof(*power));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send TX_POWER command\n");
+                return -1;
+        }
+        
+        return 0;
+}
+
+static int ipw_send_rts_threshold(struct ipw_priv *priv, u16 rts)
+{
+        struct ipw_rts_threshold rts_threshold = {
+                .rts_threshold = rts,
+        };
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_RTS_THRESHOLD,
+                .len = sizeof(rts_threshold)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, &rts_threshold, sizeof(rts_threshold));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send RTS_THRESHOLD command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_frag_threshold(struct ipw_priv *priv, u16 frag)
+{
+        struct ipw_frag_threshold frag_threshold = {
+                .frag_threshold = frag,
+        };
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_FRAG_THRESHOLD,
+                .len = sizeof(frag_threshold)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, &frag_threshold, sizeof(frag_threshold));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send FRAG_THRESHOLD command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_power_mode(struct ipw_priv *priv, u32 mode)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_POWER_MODE,
+                .len = sizeof(u32)
+        };
+        u32 *param = (u32*)(&cmd.param);
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+        
+        /* If on battery, set to 3, if AC set to CAM, else user
+         * level */
+        switch (mode) {
+        case IPW_POWER_BATTERY:
+                *param = IPW_POWER_INDEX_3;
+                break;
+        case IPW_POWER_AC:
+                *param = IPW_POWER_MODE_CAM;
+                break;
+        default:
+                *param = mode;
+                break;
+        }
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send POWER_MODE command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * The IPW device contains a Microwire compatible EEPROM that stores
+ * various data like the MAC address.  Usually the firmware has exclusive
+ * access to the eeprom, but during device initialization (before the
+ * device driver has sent the HostComplete command to the firmware) the
+ * device driver has read access to the EEPROM by way of indirect addressing
+ * through a couple of memory mapped registers.
+ *
+ * The following is a simplified implementation for pulling data out of the
+ * the eeprom, along with some helper functions to find information in
+ * the per device private data's copy of the eeprom.
+ *
+ * NOTE: To better understand how these functions work (i.e what is a chip
+ *       select and why do have to keep driving the eeprom clock?), read
+ *       just about any data sheet for a Microwire compatible EEPROM.
+ */
+
+/* write a 32 bit value into the indirect accessor register */
+static inline void eeprom_write_reg(struct ipw_priv *p, u32 data)
+{
+        ipw_write_reg32(p, FW_MEM_REG_EEPROM_ACCESS, data);
+        
+        /* the eeprom requires some time to complete the operation */
+        udelay(p->eeprom_delay);
+
+        return;
+}
+
+/* perform a chip select operation */
+static inline void eeprom_cs(struct ipw_priv* priv)
+{
+        eeprom_write_reg(priv,0);
+        eeprom_write_reg(priv,EEPROM_BIT_CS);
+        eeprom_write_reg(priv,EEPROM_BIT_CS|EEPROM_BIT_SK);
+        eeprom_write_reg(priv,EEPROM_BIT_CS);
+}
+
+/* perform a chip select operation */
+static inline void eeprom_disable_cs(struct ipw_priv* priv)
+{
+        eeprom_write_reg(priv,EEPROM_BIT_CS);
+        eeprom_write_reg(priv,0);
+        eeprom_write_reg(priv,EEPROM_BIT_SK);
+}
+
+/* push a single bit down to the eeprom */
+static inline void eeprom_write_bit(struct ipw_priv *p,u8 bit)
+{
+        int d = ( bit ? EEPROM_BIT_DI : 0);
+        eeprom_write_reg(p,EEPROM_BIT_CS|d);
+        eeprom_write_reg(p,EEPROM_BIT_CS|d|EEPROM_BIT_SK);
+}
+
+/* push an opcode followed by an address down to the eeprom */
+static void eeprom_op(struct ipw_priv* priv, u8 op, u8 addr)
+{
+        int i;
+
+        eeprom_cs(priv);
+        eeprom_write_bit(priv,1);
+        eeprom_write_bit(priv,op&2);
+        eeprom_write_bit(priv,op&1);
+        for ( i=7; i>=0; i-- ) {
+                eeprom_write_bit(priv,addr&(1<<i));
+        }
+}
+
+/* pull 16 bits off the eeprom, one bit at a time */
+static u16 eeprom_read_u16(struct ipw_priv* priv, u8 addr)
+{
+        int i;
+        u16 r=0;
+        
+        /* Send READ Opcode */
+        eeprom_op(priv,EEPROM_CMD_READ,addr);
+
+        /* Send dummy bit */
+        eeprom_write_reg(priv,EEPROM_BIT_CS);
+
+        /* Read the byte off the eeprom one bit at a time */
+        for ( i=0; i<16; i++ ) {
+                u32 data = 0;
+                eeprom_write_reg(priv,EEPROM_BIT_CS|EEPROM_BIT_SK);
+                eeprom_write_reg(priv,EEPROM_BIT_CS);
+                data = ipw_read_reg32(priv,FW_MEM_REG_EEPROM_ACCESS);
+                r = (r<<1) | ((data & EEPROM_BIT_DO)?1:0);
+        }
+        
+        /* Send another dummy bit */
+        eeprom_write_reg(priv,0);
+        eeprom_disable_cs(priv);
+        
+        return r;
+}
+
+/* helper function for pulling the mac address out of the private */
+/* data's copy of the eeprom data                                 */
+static void eeprom_parse_mac(struct ipw_priv* priv, u8* mac)
+{
+        u8* ee = (u8*)priv->eeprom;
+        memcpy(mac, &ee[EEPROM_MAC_ADDRESS], 6);
+}
+
+/*
+ * Either the device driver (i.e. the host) or the firmware can
+ * load eeprom data into the designated region in SRAM.  If neither
+ * happens then the FW will shutdown with a fatal error.
+ *
+ * In order to signal the FW to load the EEPROM, the EEPROM_LOAD_DISABLE
+ * bit needs region of shared SRAM needs to be non-zero.
+ */
+static void ipw_eeprom_init_sram(struct ipw_priv *priv)
+{
+        int i;
+        u16 *eeprom = (u16 *)priv->eeprom;
+  
+        IPW_DEBUG_TRACE(">>\n");
+
+        /* read entire contents of eeprom into private buffer */
+        for ( i=0; i<128; i++ )
+                eeprom[i] = eeprom_read_u16(priv,(u8)i);
+
+        /* 
+           If the data looks correct, then copy it to our private 
+           copy.  Otherwise let the firmware know to perform the operation
+           on it's own
+        */
+        if ((priv->eeprom + EEPROM_VERSION) != 0) {
+                IPW_DEBUG_INFO("Writing EEPROM data into SRAM\n");
+
+                /* write the eeprom data to sram */
+                for( i=0; i<CX2_EEPROM_IMAGE_SIZE; i++ )
+                        ipw_write8(priv, IPW_EEPROM_DATA + i, 
+                                   priv->eeprom[i]);
+
+                /* Do not load eeprom data on fatal error or suspend */
+                ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 0);
+        } else {
+                IPW_DEBUG_INFO("Enabling FW initializationg of SRAM\n");
+
+                /* Load eeprom data on fatal error or suspend */
+                ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 1);
+        }
+
+        IPW_DEBUG_TRACE("<<\n");
+}
+
+
+static inline void ipw_zero_memory(struct ipw_priv *priv, u32 start, u32 count)
+{
+        count >>= 2;
+        if (!count) return;
+        _ipw_write32(priv, CX2_AUTOINC_ADDR, start);
+        while (count--) 
+                _ipw_write32(priv, CX2_AUTOINC_DATA, 0);
+}
+
+static inline void ipw_fw_dma_reset_command_blocks(struct ipw_priv *priv)
+{
+        ipw_zero_memory(priv, CX2_SHARED_SRAM_DMA_CONTROL,
+                        CB_NUMBER_OF_ELEMENTS_SMALL * 
+                        sizeof(struct command_block));
+}
+
+static int ipw_fw_dma_enable(struct ipw_priv *priv)
+{ /* start dma engine but no transfers yet*/
+
+        IPW_DEBUG_FW(">> : \n");
+    
+        /* Start the dma */
+        ipw_fw_dma_reset_command_blocks(priv);
+        
+        /* Write CB base address */
+        ipw_write_reg32(priv, CX2_DMA_I_CB_BASE, CX2_SHARED_SRAM_DMA_CONTROL);
+
+        IPW_DEBUG_FW("<< : \n");
+        return 0;
+}
+
+static void ipw_fw_dma_abort(struct ipw_priv *priv)
+{
+        u32 control = 0;
+
+        IPW_DEBUG_FW(">> :\n");
+    
+        //set the Stop and Abort bit    
+        control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_STOP_AND_ABORT;
+        ipw_write_reg32(priv, CX2_DMA_I_DMA_CONTROL, control);
+        priv->sram_desc.last_cb_index = 0;
+        
+        IPW_DEBUG_FW("<< \n");
+}
+
+static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index, struct command_block *cb)
+{
+        u32 address = CX2_SHARED_SRAM_DMA_CONTROL + (sizeof(struct command_block) * index); 
+        IPW_DEBUG_FW(">> :\n");
+
+        ipw_write_indirect(priv, address, (u8*)cb, (int)sizeof(struct command_block));
+
+        IPW_DEBUG_FW("<< :\n");
+        return 0;
+
+}
+
+static int ipw_fw_dma_kick(struct ipw_priv *priv)
+{
+        u32 control = 0;
+        u32 index=0;
+
+        IPW_DEBUG_FW(">> :\n");
+    
+        for (index = 0; index < priv->sram_desc.last_cb_index; index++)
+                ipw_fw_dma_write_command_block(priv, index, &priv->sram_desc.cb_list[index]);
+
+        /* Enable the DMA in the CSR register */
+        ipw_clear_bit(priv, CX2_RESET_REG,CX2_RESET_REG_MASTER_DISABLED | CX2_RESET_REG_STOP_MASTER);
+        
+        /* Set the Start bit. */
+        control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_START;
+        ipw_write_reg32(priv, CX2_DMA_I_DMA_CONTROL, control);
+
+        IPW_DEBUG_FW("<< :\n");
+        return 0;
+}
+
+static void ipw_fw_dma_dump_command_block(struct ipw_priv *priv)
+{
+        u32 address;
+        u32 register_value=0;
+        u32 cb_fields_address=0;
+
+        IPW_DEBUG_FW(">> :\n");
+        address = ipw_read_reg32(priv,CX2_DMA_I_CURRENT_CB);
+        IPW_DEBUG_FW_INFO("Current CB is 0x%x \n",address);
+
+        /* Read the DMA Controlor register */
+        register_value = ipw_read_reg32(priv, CX2_DMA_I_DMA_CONTROL);
+        IPW_DEBUG_FW_INFO("CX2_DMA_I_DMA_CONTROL is 0x%x \n",register_value);
+
+        /* Print the CB values*/
+        cb_fields_address = address;
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB ControlField is 0x%x \n",register_value);
+
+        cb_fields_address += sizeof(u32);
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x \n",register_value);
+
+        cb_fields_address += sizeof(u32);
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB Destination Field is 0x%x \n",
+                          register_value);
+
+        cb_fields_address += sizeof(u32);
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x \n",register_value);
+
+        IPW_DEBUG_FW(">> :\n");
+}
+
+static int ipw_fw_dma_command_block_index(struct ipw_priv *priv)
+{
+        u32 current_cb_address = 0;
+        u32 current_cb_index = 0;
+
+        IPW_DEBUG_FW("<< :\n");
+        current_cb_address= ipw_read_reg32(priv, CX2_DMA_I_CURRENT_CB);
+        
+        current_cb_index = (current_cb_address - CX2_SHARED_SRAM_DMA_CONTROL )/
+                sizeof (struct command_block);
+        
+        IPW_DEBUG_FW_INFO("Current CB index 0x%x address = 0x%X \n",
+                          current_cb_index, current_cb_address );
+
+        IPW_DEBUG_FW(">> :\n");
+        return current_cb_index;
+
+}
+
+static int ipw_fw_dma_add_command_block(struct ipw_priv *priv,
+                                        u32 src_address,
+                                        u32 dest_address,
+                                        u32 length,
+                                        int interrupt_enabled,
+                                        int is_last)
+{
+
+        u32 control = CB_VALID | CB_SRC_LE | CB_DEST_LE | CB_SRC_AUTOINC | 
+                CB_SRC_IO_GATED | CB_DEST_AUTOINC | CB_SRC_SIZE_LONG | 
+                CB_DEST_SIZE_LONG;
+        struct command_block *cb;
+        u32 last_cb_element=0;
+
+        IPW_DEBUG_FW_INFO("src_address=0x%x dest_address=0x%x length=0x%x\n",
+                          src_address, dest_address, length);
+
+        if (priv->sram_desc.last_cb_index >= CB_NUMBER_OF_ELEMENTS_SMALL)
+                return -1;
+
+        last_cb_element = priv->sram_desc.last_cb_index;
+        cb = &priv->sram_desc.cb_list[last_cb_element];
+        priv->sram_desc.last_cb_index++;
+
+        /* Calculate the new CB control word */
+        if (interrupt_enabled )
+                control |= CB_INT_ENABLED;
+
+        if (is_last)
+                control |= CB_LAST_VALID;
+        
+        control |= length;
+
+        /* Calculate the CB Element's checksum value */
+        cb->status = control ^src_address ^dest_address;
+
+        /* Copy the Source and Destination addresses */
+        cb->dest_addr = dest_address;
+        cb->source_addr = src_address;
+
+        /* Copy the Control Word last */
+        cb->control = control;
+
+        return 0;
+}
+
+static int ipw_fw_dma_add_buffer(struct ipw_priv *priv,
+                                 u32 src_phys,
+                                 u32 dest_address,
+                                 u32 length)
+{
+        u32 bytes_left = length;
+        u32 src_offset=0;
+        u32 dest_offset=0;
+        int status = 0;
+        IPW_DEBUG_FW(">> \n");
+        IPW_DEBUG_FW_INFO("src_phys=0x%x dest_address=0x%x length=0x%x\n",
+                          src_phys, dest_address, length);
+        while (bytes_left > CB_MAX_LENGTH) {
+                status = ipw_fw_dma_add_command_block( priv,
+                                                       src_phys + src_offset,
+                                                       dest_address + dest_offset,
+                                                       CB_MAX_LENGTH, 0, 0);
+                if (status) {
+                        IPW_DEBUG_FW_INFO(": Failed\n");
+                        return -1;
+                } else 
+                        IPW_DEBUG_FW_INFO(": Added new cb\n");
+
+                src_offset += CB_MAX_LENGTH;
+                dest_offset += CB_MAX_LENGTH;
+                bytes_left -= CB_MAX_LENGTH;
+        }
+
+        /* add the buffer tail */
+        if (bytes_left > 0) {
+                status = ipw_fw_dma_add_command_block(
+                        priv, src_phys + src_offset,
+                        dest_address + dest_offset,
+                        bytes_left, 0, 0);
+                if (status) {
+                        IPW_DEBUG_FW_INFO(": Failed on the buffer tail\n");
+                        return -1;
+                } else 
+                        IPW_DEBUG_FW_INFO(": Adding new cb - the buffer tail\n");
+        }
+        
+        
+        IPW_DEBUG_FW("<< \n");
+        return 0;
+}
+
+static int ipw_fw_dma_wait(struct ipw_priv *priv)
+{
+        u32 current_index = 0;
+        u32 watchdog = 0;
+
+        IPW_DEBUG_FW(">> : \n");
+
+        current_index = ipw_fw_dma_command_block_index(priv);
+        IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%8X\n", 
+                          (int) priv->sram_desc.last_cb_index);
+
+        while (current_index < priv->sram_desc.last_cb_index) {
+                udelay(50);
+                current_index = ipw_fw_dma_command_block_index(priv);
+
+                watchdog++;
+
+                if (watchdog > 400) {
+                        IPW_DEBUG_FW_INFO("Timeout\n");
+                        ipw_fw_dma_dump_command_block(priv);
+                        ipw_fw_dma_abort(priv);
+                        return -1;
+                }
+        }
+
+        ipw_fw_dma_abort(priv);
+
+        /*Disable the DMA in the CSR register*/
+        ipw_set_bit(priv, CX2_RESET_REG, 
+                    CX2_RESET_REG_MASTER_DISABLED | CX2_RESET_REG_STOP_MASTER);
+
+        IPW_DEBUG_FW("<< dmaWaitSync \n");
+        return 0;
+}
+
+static void ipw_remove_current_network(struct ipw_priv *priv) 
+{
+        struct list_head *element, *safe;
+        struct ieee80211_network *network = NULL;       
+        list_for_each_safe(element, safe, &priv->ieee->network_list) {
+                network = list_entry(element, struct ieee80211_network, list);
+                if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
+                        list_del(element);
+                        list_add_tail(&network->list, 
+                                      &priv->ieee->network_free_list);
+                }
+        }
+}
+
+/**
+ * Check that card is still alive. 
+ * Reads debug register from domain0.
+ * If card is present, pre-defined value should
+ * be found there.
+ * 
+ * @param priv
+ * @return 1 if card is present, 0 otherwise
+ */
+static inline int ipw_alive(struct ipw_priv *priv)
+{
+        return ipw_read32(priv, 0x90) == 0xd55555d5;
+}
+
+static inline int ipw_poll_bit(struct ipw_priv *priv, u32 addr, u32 mask,
+                               int timeout)
+{
+        int i = 0;
+
+        do {
+                if ((ipw_read32(priv, addr) & mask) == mask) 
+                        return i;
+                mdelay(10);
+                i += 10;
+        } while (i < timeout);
+        
+        return -ETIME;
+}
+
+/* These functions load the firmware and micro code for the operation of 
+ * the ipw hardware.  It assumes the buffer has all the bits for the
+ * image and the caller is handling the memory allocation and clean up.
+ */
+
+
+static int ipw_stop_master(struct ipw_priv * priv)
+{
+        int rc;
+        
+        IPW_DEBUG_TRACE(">> \n");
+        /* stop master. typical delay - 0 */
+        ipw_set_bit(priv, CX2_RESET_REG, CX2_RESET_REG_STOP_MASTER);
+
+        rc = ipw_poll_bit(priv, CX2_RESET_REG,
+                          CX2_RESET_REG_MASTER_DISABLED, 100);
+        if (rc < 0) {
+                IPW_ERROR("stop master failed in 10ms\n");
+                return -1;
+        }
+
+        IPW_DEBUG_INFO("stop master %dms\n", rc);
+
+        return rc;
+}
+
+static void ipw_arc_release(struct ipw_priv *priv)
+{
+        IPW_DEBUG_TRACE(">> \n");
+        mdelay(5);
+
+        ipw_clear_bit(priv, CX2_RESET_REG, CBD_RESET_REG_PRINCETON_RESET);
+
+        /* no one knows timing, for safety add some delay */
+        mdelay(5);
+}
+
+struct fw_header {
+        u32 version;
+        u32 mode;
+};
+
+struct fw_chunk {
+        u32 address;
+        u32 length;
+};
+
+#define IPW_FW_MAJOR_VERSION 2
+#define IPW_FW_MINOR_VERSION 2
+
+#define IPW_FW_MINOR(x) ((x & 0xff) >> 8)
+#define IPW_FW_MAJOR(x) (x & 0xff)
+
+#define IPW_FW_VERSION ((IPW_FW_MINOR_VERSION << 8) | \
+                         IPW_FW_MAJOR_VERSION)
+
+#define IPW_FW_PREFIX "ipw-" __stringify(IPW_FW_MAJOR_VERSION) \
+"." __stringify(IPW_FW_MINOR_VERSION) "-"
+
+#if IPW_FW_MAJOR_VERSION >= 2 && IPW_FW_MINOR_VERSION > 0
+#define IPW_FW_NAME(x) IPW_FW_PREFIX "" x ".fw"
+#else
+#define IPW_FW_NAME(x) "ipw2200_" x ".fw"
+#endif
+
+static int ipw_load_ucode(struct ipw_priv *priv, u8 * data,
+                          size_t len)
+{
+        int rc = 0, i, addr;
+        u8 cr = 0;
+        u16 *image;
+
+        image = (u16 *)data;
+        
+        IPW_DEBUG_TRACE(">> \n");
+
+        rc = ipw_stop_master(priv);
+
+        if (rc < 0)
+                return rc;
+        
+//      spin_lock_irqsave(&priv->lock, flags);
+        
+        for (addr = CX2_SHARED_LOWER_BOUND;
+             addr < CX2_REGISTER_DOMAIN1_END; addr += 4) {
+                ipw_write32(priv, addr, 0);
+        }
+
+        /* no ucode (yet) */
+        memset(&priv->dino_alive, 0, sizeof(priv->dino_alive));
+        /* destroy DMA queues */
+        /* reset sequence */
+
+        ipw_write_reg32(priv, CX2_MEM_HALT_AND_RESET ,CX2_BIT_HALT_RESET_ON);
+        ipw_arc_release(priv);
+        ipw_write_reg32(priv, CX2_MEM_HALT_AND_RESET, CX2_BIT_HALT_RESET_OFF);
+        mdelay(1);
+
+        /* reset PHY */
+        ipw_write_reg32(priv, CX2_INTERNAL_CMD_EVENT, CX2_BASEBAND_POWER_DOWN);
+        mdelay(1);
+        
+        ipw_write_reg32(priv, CX2_INTERNAL_CMD_EVENT, 0);
+        mdelay(1);
+        
+        /* enable ucode store */
+        ipw_write_reg8(priv, DINO_CONTROL_REG, 0x0);
+        ipw_write_reg8(priv, DINO_CONTROL_REG, DINO_ENABLE_CS);
+        mdelay(1);
+
+        /* write ucode */
+        /**
+         * @bug
+         * Do NOT set indirect address register once and then
+         * store data to indirect data register in the loop.
+         * It seems very reasonable, but in this case DINO do not
+         * accept ucode. It is essential to set address each time.
+         */
+        /* load new ipw uCode */
+        for (i = 0; i < len / 2; i++)
+                ipw_write_reg16(priv, CX2_BASEBAND_CONTROL_STORE, image[i]);
+
+        
+        /* enable DINO */
+        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, 0);
+        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS,
+                       DINO_ENABLE_SYSTEM );
+
+        /* this is where the igx / win driver deveates from the VAP driver.*/
+
+        /* wait for alive response */
+        for (i = 0; i < 100; i++) {
+                /* poll for incoming data */
+                cr = ipw_read_reg8(priv, CX2_BASEBAND_CONTROL_STATUS);
+                if (cr & DINO_RXFIFO_DATA)
+                        break;
+                mdelay(1);
+        }
+
+        if (cr & DINO_RXFIFO_DATA) {
+                /* alive_command_responce size is NOT multiple of 4 */
+                u32 response_buffer[(sizeof(priv->dino_alive) + 3) / 4];
+                
+                for (i = 0; i < ARRAY_SIZE(response_buffer); i++) 
+                        response_buffer[i] =
+                                ipw_read_reg32(priv, 
+                                               CX2_BASEBAND_RX_FIFO_READ);
+                memcpy(&priv->dino_alive, response_buffer,
+                       sizeof(priv->dino_alive));
+                if (priv->dino_alive.alive_command == 1
+                    && priv->dino_alive.ucode_valid == 1) {
+                        rc = 0;
+                        IPW_DEBUG_INFO(
+                                "Microcode OK, rev. %d (0x%x) dev. %d (0x%x) "
+                                "of %02d/%02d/%02d %02d:%02d\n",
+                                priv->dino_alive.software_revision,
+                                priv->dino_alive.software_revision,
+                                priv->dino_alive.device_identifier,
+                                priv->dino_alive.device_identifier,
+                                priv->dino_alive.time_stamp[0],
+                                priv->dino_alive.time_stamp[1],
+                                priv->dino_alive.time_stamp[2],
+                                priv->dino_alive.time_stamp[3],
+                                priv->dino_alive.time_stamp[4]);
+                } else {
+                        IPW_DEBUG_INFO("Microcode is not alive\n");
+                        rc = -EINVAL;
+                }
+        } else {
+                IPW_DEBUG_INFO("No alive response from DINO\n");
+                rc = -ETIME;
+        }
+
+        /* disable DINO, otherwise for some reason
+           firmware have problem getting alive resp. */
+        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, 0);
+
+//      spin_unlock_irqrestore(&priv->lock, flags);
+
+        return rc;
+}
+
+static int ipw_load_firmware(struct ipw_priv *priv, u8 * data,
+                             size_t len)
+{
+        int rc = -1;
+        int offset = 0;
+        struct fw_chunk *chunk;
+        dma_addr_t shared_phys;
+        u8 *shared_virt;
+
+        IPW_DEBUG_TRACE("<< : \n");
+        shared_virt = pci_alloc_consistent(priv->pci_dev, len, &shared_phys);
+
+        if (!shared_virt)
+                return -ENOMEM;
+
+        memmove(shared_virt, data, len);
+
+        /* Start the Dma */
+        rc = ipw_fw_dma_enable(priv);
+
+        if (priv->sram_desc.last_cb_index > 0) {
+                /* the DMA is already ready this would be a bug. */
+                BUG();
+                goto out;
+        }
+
+        do {
+                chunk = (struct fw_chunk *)(data + offset);
+                offset += sizeof(struct fw_chunk);
+                /* build DMA packet and queue up for sending */
+                /* dma to chunk->address, the chunk->length bytes from data + 
+                 * offeset*/
+                /* Dma loading */
+                rc = ipw_fw_dma_add_buffer(priv, shared_phys + offset,
+                                           chunk->address, chunk->length);
+                if (rc) {
+                        IPW_DEBUG_INFO("dmaAddBuffer Failed\n");
+                        goto out;
+                }
+                
+                offset += chunk->length;
+        } while (offset < len);
+
+        /* Run the DMA and wait for the answer*/
+        rc = ipw_fw_dma_kick(priv);
+        if (rc) {
+                IPW_ERROR("dmaKick Failed\n");
+                goto out;
+        }
+
+        rc = ipw_fw_dma_wait(priv);
+        if (rc) {
+                IPW_ERROR("dmaWaitSync Failed\n");
+                goto out;
+        }
+ out:
+        pci_free_consistent( priv->pci_dev, len, shared_virt, shared_phys);
+        return rc;
+}
+
+/* stop nic */
+static int ipw_stop_nic(struct ipw_priv *priv)
+{
+        int rc = 0;
+
+        /* stop*/
+        ipw_write32(priv, CX2_RESET_REG, CX2_RESET_REG_STOP_MASTER);
+        
+        rc = ipw_poll_bit(priv, CX2_RESET_REG, 
+                          CX2_RESET_REG_MASTER_DISABLED, 500); 
+        if (rc < 0) {
+                IPW_ERROR("wait for reg master disabled failed\n");
+                return rc;
+        }   
+
+        ipw_set_bit(priv, CX2_RESET_REG, CBD_RESET_REG_PRINCETON_RESET);
+        
+        return rc;
+}
+
+static void ipw_start_nic(struct ipw_priv *priv)
+{
+        IPW_DEBUG_TRACE(">>\n");
+
+        /* prvHwStartNic  release ARC*/
+        ipw_clear_bit(priv, CX2_RESET_REG,
+                      CX2_RESET_REG_MASTER_DISABLED | 
+                      CX2_RESET_REG_STOP_MASTER | 
+                      CBD_RESET_REG_PRINCETON_RESET);
+        
+        /* enable power management */
+        ipw_set_bit(priv, CX2_GP_CNTRL_RW, CX2_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY);
+
+        IPW_DEBUG_TRACE("<<\n");
+}
+        
+static int ipw_init_nic(struct ipw_priv *priv)
+{
+        int rc;
+
+        IPW_DEBUG_TRACE(">>\n");
+        /* reset */     
+        /*prvHwInitNic */
+        /* set "initialization complete" bit to move adapter to D0 state */
+        ipw_set_bit(priv, CX2_GP_CNTRL_RW, CX2_GP_CNTRL_BIT_INIT_DONE);
+
+        /* low-level PLL activation */
+        ipw_write32(priv, CX2_READ_INT_REGISTER,  CX2_BIT_INT_HOST_SRAM_READ_INT_REGISTER);
+
+        /* wait for clock stabilization */
+        rc = ipw_poll_bit(priv, CX2_GP_CNTRL_RW, 
+                          CX2_GP_CNTRL_BIT_CLOCK_READY, 250); 
+        if (rc < 0 )
+                IPW_DEBUG_INFO("FAILED wait for clock stablization\n");
+
+        /* assert SW reset */
+        ipw_set_bit(priv, CX2_RESET_REG, CX2_RESET_REG_SW_RESET);
+
+        udelay(10);
+
+        /* set "initialization complete" bit to move adapter to D0 state */
+        ipw_set_bit(priv, CX2_GP_CNTRL_RW, CX2_GP_CNTRL_BIT_INIT_DONE);
+
+        IPW_DEBUG_TRACE(">>\n");
+        return 0;
+}
+
+
+/* Call this function from process context, it will sleep in request_firmware. 
+ * Probe is an ok place to call this from.
+ */
+static int ipw_reset_nic(struct ipw_priv *priv)
+{
+        int rc = 0;
+
+        IPW_DEBUG_TRACE(">>\n");
+        
+        rc = ipw_init_nic(priv);
+        
+        /* Clear the 'host command active' bit... */
+        priv->status &= ~STATUS_HCMD_ACTIVE;
+        wake_up_interruptible(&priv->wait_command_queue);
+
+        IPW_DEBUG_TRACE("<<\n");
+        return rc;
+} 
+
+static int ipw_get_fw(struct ipw_priv *priv, 
+                      const struct firmware **fw, const char *name)
+{
+        struct fw_header *header;
+        int rc;
+
+        /* ask firmware_class module to get the boot firmware off disk */
+        rc = request_firmware(fw, name, &priv->pci_dev->dev);
+        if (rc < 0) {
+                IPW_ERROR("%s load failed: Reason %d\n", name, rc);
+                return rc;
+        } 
+
+        header = (struct fw_header *)(*fw)->data;
+        if (IPW_FW_MAJOR(header->version) != IPW_FW_MAJOR_VERSION) {
+                IPW_ERROR("'%s' firmware version not compatible (%d != %d)\n",
+                          name,
+                          IPW_FW_MAJOR(header->version), IPW_FW_MAJOR_VERSION);
+                return -EINVAL;
+        }
+
+        IPW_DEBUG_INFO("Loading firmware '%s' file v%d.%d (%zd bytes)\n",
+                       name,
+                       IPW_FW_MAJOR(header->version),
+                       IPW_FW_MINOR(header->version),
+                       (*fw)->size - sizeof(struct fw_header));
+        return 0;
+}
+
+#define CX2_RX_BUF_SIZE (3000)
+
+static inline void ipw_rx_queue_reset(struct ipw_priv *priv,
+                                      struct ipw_rx_queue *rxq)
+{
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+
+        INIT_LIST_HEAD(&rxq->rx_free);
+        INIT_LIST_HEAD(&rxq->rx_used);
+
+        /* Fill the rx_used queue with _all_ of the Rx buffers */
+        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {
+                /* In the reset function, these buffers may have been allocated
+                 * to an SKB, so we need to unmap and free potential storage */
+                if (rxq->pool[i].skb != NULL) {
+                        pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr,
+                                         CX2_RX_BUF_SIZE,
+                                         PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(rxq->pool[i].skb);
+                }
+                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
+        }
+        
+        /* Set us so that we have processed and used all buffers, but have
+         * not restocked the Rx queue with fresh buffers */
+        rxq->read = rxq->write = 0;
+        rxq->processed = RX_QUEUE_SIZE - 1;
+        rxq->free_count = 0;
+        spin_unlock_irqrestore(&rxq->lock, flags);
+}
+
+#ifdef CONFIG_PM
+static int fw_loaded = 0;
+static const struct firmware *bootfw = NULL;
+static const struct firmware *firmware = NULL;
+static const struct firmware *ucode = NULL;
+#endif
+
+static int ipw_load(struct ipw_priv *priv)
+{
+#ifndef CONFIG_PM
+        const struct firmware *bootfw = NULL;
+        const struct firmware *firmware = NULL;
+        const struct firmware *ucode = NULL;
+#endif
+        int rc = 0, retries = 3;
+
+#ifdef CONFIG_PM
+        if (!fw_loaded) {
+#endif
+                rc = ipw_get_fw(priv, &bootfw, IPW_FW_NAME("boot"));
+                if (rc) 
+                        goto error;
+                
+                switch (priv->ieee->iw_mode) {
+                case IW_MODE_ADHOC:
+                        rc = ipw_get_fw(priv, &ucode, 
+                                        IPW_FW_NAME("ibss_ucode"));
+                        if (rc) 
+                                goto error;
+                
+                        rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("ibss"));
+                        break;
+                        
+#ifdef CONFIG_IPW_PROMISC
+                case IW_MODE_MONITOR:
+                        rc = ipw_get_fw(priv, &ucode, 
+                                        IPW_FW_NAME("ibss_ucode"));
+                        if (rc) 
+                                goto error;
+                
+                        rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("sniffer"));
+                        break;
+#endif
+                case IW_MODE_INFRA:
+                        rc = ipw_get_fw(priv, &ucode, 
+                                        IPW_FW_NAME("bss_ucode"));
+                        if (rc) 
+                                goto error;
+                
+                        rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("bss"));
+                        break;
+                        
+                default:
+                        rc = -EINVAL;
+                }
+
+                if (rc) 
+                        goto error;
+
+#ifdef CONFIG_PM
+                fw_loaded = 1;
+        }
+#endif
+
+        if (!priv->rxq)
+                priv->rxq = ipw_rx_queue_alloc(priv);
+        else
+                ipw_rx_queue_reset(priv, priv->rxq);
+        if (!priv->rxq) {
+                IPW_ERROR("Unable to initialize Rx queue\n");
+                goto error;
+        }
+
+ retry:
+        /* Ensure interrupts are disabled */
+        ipw_write32(priv, CX2_INTA_MASK_R, ~CX2_INTA_MASK_ALL);
+        priv->status &= ~STATUS_INT_ENABLED;
+
+        /* ack pending interrupts */
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_MASK_ALL);
+        
+        ipw_stop_nic(priv);
+
+        rc = ipw_reset_nic(priv);
+        if (rc) {
+                IPW_ERROR("Unable to reset NIC\n");
+                goto error;
+        }
+
+        ipw_zero_memory(priv, CX2_NIC_SRAM_LOWER_BOUND, 
+                        CX2_NIC_SRAM_UPPER_BOUND - CX2_NIC_SRAM_LOWER_BOUND);
+
+        /* DMA the initial boot firmware into the device */
+        rc = ipw_load_firmware(priv, bootfw->data + sizeof(struct fw_header), 
+                               bootfw->size - sizeof(struct fw_header));
+        if (rc < 0) {
+                IPW_ERROR("Unable to load boot firmware\n");
+                goto error;
+        }
+
+        /* kick start the device */
+        ipw_start_nic(priv);
+
+        /* wait for the device to finish it's initial startup sequence */
+        rc = ipw_poll_bit(priv, CX2_INTA_RW, 
+                          CX2_INTA_BIT_FW_INITIALIZATION_DONE, 500); 
+        if (rc < 0) {
+                IPW_ERROR("device failed to boot initial fw image\n");
+                goto error;
+        }
+        IPW_DEBUG_INFO("initial device response after %dms\n", rc);
+
+        /* ack fw init done interrupt */        
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_BIT_FW_INITIALIZATION_DONE);
+
+        /* DMA the ucode into the device */
+        rc = ipw_load_ucode(priv, ucode->data + sizeof(struct fw_header), 
+                            ucode->size - sizeof(struct fw_header));
+        if (rc < 0) {
+                IPW_ERROR("Unable to load ucode\n");
+                goto error;
+        }
+        
+        /* stop nic */
+        ipw_stop_nic(priv);
+
+        /* DMA bss firmware into the device */
+        rc = ipw_load_firmware(priv, firmware->data + 
+                               sizeof(struct fw_header), 
+                               firmware->size - sizeof(struct fw_header));
+        if (rc < 0 ) {
+                IPW_ERROR("Unable to load firmware\n");
+                goto error;
+        }
+
+        ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 0);
+
+        rc = ipw_queue_reset(priv);
+        if (rc) {
+                IPW_ERROR("Unable to initialize queues\n");
+                goto error;
+        }
+
+        /* Ensure interrupts are disabled */
+        ipw_write32(priv, CX2_INTA_MASK_R, ~CX2_INTA_MASK_ALL);
+        
+        /* kick start the device */
+        ipw_start_nic(priv);
+
+        if (ipw_read32(priv, CX2_INTA_RW) & CX2_INTA_BIT_PARITY_ERROR) {
+                if (retries > 0) {
+                        IPW_WARNING("Parity error.  Retrying init.\n");
+                        retries--;
+                        goto retry;
+                }
+
+                IPW_ERROR("TODO: Handle parity error -- schedule restart?\n");
+                rc = -EIO;
+                goto error;
+        }
+
+        /* wait for the device */
+        rc = ipw_poll_bit(priv, CX2_INTA_RW, 
+                          CX2_INTA_BIT_FW_INITIALIZATION_DONE, 500); 
+        if (rc < 0) {
+                IPW_ERROR("device failed to start after 500ms\n");
+                goto error;
+        }
+        IPW_DEBUG_INFO("device response after %dms\n", rc);
+
+        /* ack fw init done interrupt */
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_BIT_FW_INITIALIZATION_DONE);
+
+        /* read eeprom data and initialize the eeprom region of sram */
+        priv->eeprom_delay = 1;
+        ipw_eeprom_init_sram(priv);     
+
+        /* enable interrupts */
+        ipw_enable_interrupts(priv);
+
+        /* Ensure our queue has valid packets */
+        ipw_rx_queue_replenish(priv);
+
+        ipw_write32(priv, CX2_RX_READ_INDEX, priv->rxq->read);
+
+        /* ack pending interrupts */
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_MASK_ALL);
+
+#ifndef CONFIG_PM
+        release_firmware(bootfw);
+        release_firmware(ucode);
+        release_firmware(firmware);
+#endif
+        return 0;
+
+ error:
+        if (priv->rxq) {
+                ipw_rx_queue_free(priv, priv->rxq);
+                priv->rxq = NULL;
+        }
+        ipw_tx_queue_free(priv);
+        if (bootfw)
+                release_firmware(bootfw);
+        if (ucode)
+                release_firmware(ucode);
+        if (firmware)
+                release_firmware(firmware);
+#ifdef CONFIG_PM
+        fw_loaded = 0;
+        bootfw = ucode = firmware = NULL;
+#endif
+
+        return rc;
+}
+
+/** 
+ * DMA services
+ *
+ * Theory of operation
+ *
+ * A queue is a circular buffers with 'Read' and 'Write' pointers.
+ * 2 empty entries always kept in the buffer to protect from overflow.
+ *
+ * For Tx queue, there are low mark and high mark limits. If, after queuing
+ * the packet for Tx, free space become < low mark, Tx queue stopped. When 
+ * reclaiming packets (on 'tx done IRQ), if free space become > high mark, 
+ * Tx queue resumed.
+ *
+ * The IPW operates with six queues, one receive queue in the device's
+ * sram, one transmit queue for sending commands to the device firmware,
+ * and four transmit queues for data.  
+ *
+ * The four transmit queues allow for performing quality of service (qos) 
+ * transmissions as per the 802.11 protocol.  Currently Linux does not
+ * provide a mechanism to the user for utilizing prioritized queues, so 
+ * we only utilize the first data transmit queue (queue1).
+ */
+
+/**
+ * Driver allocates buffers of this size for Rx
+ */
+
+static inline int ipw_queue_space(const struct clx2_queue *q)
+{
+        int s = q->last_used - q->first_empty;
+        if (s <= 0)
+                s += q->n_bd;
+        s -= 2;                 /* keep some reserve to not confuse empty and full situations */
+        if (s < 0)
+                s = 0;
+        return s;
+}
+
+static inline int ipw_queue_inc_wrap(int index, int n_bd)
+{
+        return (++index == n_bd) ? 0 : index;
+}
+
+/**
+ * Initialize common DMA queue structure
+ * 
+ * @param q                queue to init
+ * @param count            Number of BD's to allocate. Should be power of 2
+ * @param read_register    Address for 'read' register
+ *                         (not offset within BAR, full address)
+ * @param write_register   Address for 'write' register
+ *                         (not offset within BAR, full address)
+ * @param base_register    Address for 'base' register
+ *                         (not offset within BAR, full address)
+ * @param size             Address for 'size' register
+ *                         (not offset within BAR, full address)
+ */
+static void ipw_queue_init(struct ipw_priv *priv, struct clx2_queue *q, 
+                           int count, u32 read, u32 write,
+                           u32 base, u32 size)
+{
+        q->n_bd = count;
+
+        q->low_mark = q->n_bd / 4;
+        if (q->low_mark < 4)
+                q->low_mark = 4;
+
+        q->high_mark = q->n_bd / 8;
+        if (q->high_mark < 2)
+                q->high_mark = 2;
+
+        q->first_empty = q->last_used = 0;
+        q->reg_r = read;
+        q->reg_w = write;
+
+        ipw_write32(priv, base, q->dma_addr);
+        ipw_write32(priv, size, count);
+        ipw_write32(priv, read, 0);
+        ipw_write32(priv, write, 0);
+
+        _ipw_read32(priv, 0x90);
+}
+
+static int ipw_queue_tx_init(struct ipw_priv *priv, 
+                             struct clx2_tx_queue *q,
+                             int count, u32 read, u32 write,
+                             u32 base, u32 size)
+{
+        struct pci_dev *dev = priv->pci_dev;
+
+        q->txb = kmalloc(sizeof(q->txb[0]) * count, GFP_KERNEL);
+        if (!q->txb) {
+                IPW_ERROR("vmalloc for auxilary BD structures failed\n");
+                return -ENOMEM;
+        }
+
+        q->bd = pci_alloc_consistent(dev,sizeof(q->bd[0])*count, &q->q.dma_addr);
+        if (!q->bd) {
+                IPW_ERROR("pci_alloc_consistent(%zd) failed\n",
+                                sizeof(q->bd[0]) * count);
+                kfree(q->txb);
+                q->txb = NULL;
+                return -ENOMEM;
+        }
+
+        ipw_queue_init(priv, &q->q, count, read, write, base, size);
+        return 0;
+}
+
+/**
+ * Free one TFD, those at index [txq->q.last_used].
+ * Do NOT advance any indexes
+ * 
+ * @param dev
+ * @param txq
+ */
+static void ipw_queue_tx_free_tfd(struct ipw_priv *priv,
+                                  struct clx2_tx_queue *txq)
+{
+        struct tfd_frame *bd = &txq->bd[txq->q.last_used];
+        struct pci_dev *dev = priv->pci_dev;
+        int i;
+        
+        /* classify bd */
+        if (bd->control_flags.message_type == TX_HOST_COMMAND_TYPE)
+                /* nothing to cleanup after for host commands */
+                return;
+
+        /* sanity check */
+        if (bd->u.data.num_chunks > NUM_TFD_CHUNKS) {
+                IPW_ERROR("Too many chunks: %i\n", bd->u.data.num_chunks);
+                /** @todo issue fatal error, it is quite serious situation */
+                return;
+        }
+
+        /* unmap chunks if any */
+        for (i = 0; i < bd->u.data.num_chunks; i++) {
+                pci_unmap_single(dev, bd->u.data.chunk_ptr[i],
+                                 bd->u.data.chunk_len[i], PCI_DMA_TODEVICE);
+                if (txq->txb[txq->q.last_used]) {
+                        ieee80211_txb_free(txq->txb[txq->q.last_used]);
+                        txq->txb[txq->q.last_used] = NULL;
+                }
+        }
+}
+
+/**
+ * Deallocate DMA queue.
+ * 
+ * Empty queue by removing and destroying all BD's.
+ * Free all buffers.
+ * 
+ * @param dev
+ * @param q
+ */
+static void ipw_queue_tx_free(struct ipw_priv *priv,
+                            struct clx2_tx_queue *txq)
+{
+        struct clx2_queue *q = &txq->q;
+        struct pci_dev *dev = priv->pci_dev;
+
+        if (q->n_bd == 0) 
+                return; 
+
+        /* first, empty all BD's */
+        for (; q->first_empty != q->last_used;
+             q->last_used = ipw_queue_inc_wrap(q->last_used, q->n_bd)) {
+                ipw_queue_tx_free_tfd(priv, txq);
+        }
+        
+        /* free buffers belonging to queue itself */
+        pci_free_consistent(dev, sizeof(txq->bd[0])*q->n_bd, txq->bd, 
+                            q->dma_addr);
+        kfree(txq->txb);
+
+        /* 0 fill whole structure */
+        memset(txq, 0, sizeof(*txq));
+}
+
+
+/**
+ * Destroy all DMA queues and structures
+ * 
+ * @param priv
+ */
+static void ipw_tx_queue_free(struct ipw_priv *priv)
+{
+        /* Tx CMD queue */
+        ipw_queue_tx_free(priv, &priv->txq_cmd);
+
+        /* Tx queues */
+        ipw_queue_tx_free(priv, &priv->txq[0]);
+        ipw_queue_tx_free(priv, &priv->txq[1]);
+        ipw_queue_tx_free(priv, &priv->txq[2]);
+        ipw_queue_tx_free(priv, &priv->txq[3]);
+}
+
+static void inline __maybe_wake_tx(struct ipw_priv *priv)
+{
+        if (netif_running(priv->net_dev)) {
+                switch (priv->port_type) {
+                case DCR_TYPE_MU_BSS:
+                case DCR_TYPE_MU_IBSS:
+                        if (!(priv->status & STATUS_ASSOCIATED)) {
+                                return;
+                        }
+                }
+                netif_wake_queue(priv->net_dev);
+        }
+
+}
+
+static inline void ipw_create_bssid(struct ipw_priv *priv, u8 *bssid)
+{
+        /* First 3 bytes are manufacturer */
+        bssid[0] = priv->mac_addr[0];
+        bssid[1] = priv->mac_addr[1];
+        bssid[2] = priv->mac_addr[2];
+
+        /* Last bytes are random */
+        get_random_bytes(&bssid[3], ETH_ALEN-3);
+
+        bssid[0] &= 0xfe;       /* clear multicast bit */
+        bssid[0] |= 0x02;       /* set local assignment bit (IEEE802) */
+}
+
+static inline u8 ipw_add_station(struct ipw_priv *priv, u8 *bssid)
+{
+        struct ipw_station_entry entry;
+        int i;
+
+        for (i = 0; i < priv->num_stations; i++) {
+                if (!memcmp(priv->stations[i], bssid, ETH_ALEN)) {
+                        /* Another node is active in network */
+                        priv->missed_adhoc_beacons = 0;
+                        if (!(priv->config & CFG_STATIC_CHANNEL))
+                                /* when other nodes drop out, we drop out */
+                                priv->config &= ~CFG_ADHOC_PERSIST;
+
+                        return i;
+                }
+        }
+
+        if (i == MAX_STATIONS)
+                return IPW_INVALID_STATION;
+
+        IPW_DEBUG_SCAN("Adding AdHoc station: " MAC_FMT "\n", MAC_ARG(bssid));
+
+        entry.reserved = 0;
+        entry.support_mode = 0;
+        memcpy(entry.mac_addr, bssid, ETH_ALEN);
+        memcpy(priv->stations[i], bssid, ETH_ALEN);
+        ipw_write_direct(priv, IPW_STATION_TABLE_LOWER + i * sizeof(entry),
+                         &entry,
+                         sizeof(entry));
+        priv->num_stations++;
+
+        return i;
+}
+
+static inline u8 ipw_find_station(struct ipw_priv *priv, u8 *bssid)
+{
+        int i;
+
+        for (i = 0; i < priv->num_stations; i++) 
+                if (!memcmp(priv->stations[i], bssid, ETH_ALEN)) 
+                        return i;
+
+        return IPW_INVALID_STATION;
+}
+
+static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
+{
+        int err;
+
+        if (!(priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED))) {
+                IPW_DEBUG_ASSOC("Disassociating while not associated.\n");
+                return;
+        }
+
+        IPW_DEBUG_ASSOC("Disassocation attempt from " MAC_FMT " "
+                        "on channel %d.\n",
+                        MAC_ARG(priv->assoc_request.bssid), 
+                        priv->assoc_request.channel);
+
+        priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
+        priv->status |= STATUS_DISASSOCIATING;
+
+        if (quiet)
+                priv->assoc_request.assoc_type = HC_DISASSOC_QUIET;
+        else
+                priv->assoc_request.assoc_type = HC_DISASSOCIATE;
+        err = ipw_send_associate(priv, &priv->assoc_request);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send [dis]associate command "
+                             "failed.\n");
+                return;
+        }
+
+}
+
+static void ipw_disassociate(void *data)
+{
+        ipw_send_disassociate(data, 0);
+}
+
+static void notify_wx_assoc_event(struct ipw_priv *priv)
+{
+        union iwreq_data wrqu;
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        if (priv->status & STATUS_ASSOCIATED)
+                memcpy(wrqu.ap_addr.sa_data, priv->bssid, ETH_ALEN);
+        else
+                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+}
+
+struct ipw_status_code {
+        u16 status;
+        const char *reason;
+};
+
+static const struct ipw_status_code ipw_status_codes[] = {
+        {0x00, "Successful"},
+        {0x01, "Unspecified failure"},
+        {0x0A, "Cannot support all requested capabilities in the "
+         "Capability information field"},
+        {0x0B, "Reassociation denied due to inability to confirm that "
+         "association exists"},
+        {0x0C, "Association denied due to reason outside the scope of this "
+         "standard"},
+        {0x0D, "Responding station does not support the specified authentication "
+         "algorithm"},
+        {0x0E, "Received an Authentication frame with authentication sequence "
+         "transaction sequence number out of expected sequence"},
+        {0x0F, "Authentication rejected because of challenge failure"},
+        {0x10, "Authentication rejected due to timeout waiting for next "
+         "frame in sequence"},
+        {0x11, "Association denied because AP is unable to handle additional "
+         "associated stations"},
+        {0x12, "Association denied due to requesting station not supporting all "
+         "of the datarates in the BSSBasicServiceSet Parameter"},
+        {0x13, "Association denied due to requesting station not supporting "
+         "short preamble operation"},
+        {0x14, "Association denied due to requesting station not supporting "
+         "PBCC encoding"},
+        {0x15, "Association denied due to requesting station not supporting "
+         "channel agility"},
+        {0x19, "Association denied due to requesting station not supporting "
+         "short slot operation"},
+        {0x1A, "Association denied due to requesting station not supporting "
+         "DSSS-OFDM operation"},
+        {0x28, "Invalid Information Element"},
+        {0x29, "Group Cipher is not valid"},
+        {0x2A, "Pairwise Cipher is not valid"},
+        {0x2B, "AKMP is not valid"},
+        {0x2C, "Unsupported RSN IE version"},
+        {0x2D, "Invalid RSN IE Capabilities"},
+        {0x2E, "Cipher suite is rejected per security policy"},
+};
+
+#ifdef CONFIG_IPW_DEBUG
+static const char *ipw_get_status_code(u16 status) 
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ipw_status_codes); i++) 
+                if (ipw_status_codes[i].status == status)
+                        return ipw_status_codes[i].reason;
+        return "Unknown status value.";
+}
+#endif
+
+static void inline average_init(struct average *avg)
+{
+        memset(avg, 0, sizeof(*avg));
+}
+
+static void inline average_add(struct average *avg, s16 val)
+{
+        avg->sum -= avg->entries[avg->pos];
+        avg->sum += val;
+        avg->entries[avg->pos++] = val;
+        if (unlikely(avg->pos == AVG_ENTRIES)) {
+                avg->init = 1;
+                avg->pos = 0;
+        }
+}
+
+static s16 inline average_value(struct average *avg)
+{
+        if (!unlikely(avg->init)) {
+                if (avg->pos)
+                        return avg->sum / avg->pos;
+                return 0;
+        }
+
+        return avg->sum / AVG_ENTRIES;
+}
+
+static void ipw_reset_stats(struct ipw_priv *priv)
+{
+        u32 len = sizeof(u32);
+
+        priv->quality = 0;
+
+        average_init(&priv->average_missed_beacons);
+        average_init(&priv->average_rssi);
+        average_init(&priv->average_noise);
+
+        priv->last_rate = 0;
+        priv->last_missed_beacons = 0;
+        priv->last_rx_packets = 0;
+        priv->last_tx_packets = 0;
+        priv->last_tx_failures = 0;
+        
+        /* Firmware managed, reset only when NIC is restarted, so we have to
+         * normalize on the current value */
+        ipw_get_ordinal(priv, IPW_ORD_STAT_RX_ERR_CRC, 
+                        &priv->last_rx_err, &len);
+        ipw_get_ordinal(priv, IPW_ORD_STAT_TX_FAILURE, 
+                        &priv->last_tx_failures, &len);
+
+        /* Driver managed, reset with each association */
+        priv->missed_adhoc_beacons = 0;
+        priv->missed_beacons = 0;
+        priv->tx_packets = 0;
+        priv->rx_packets = 0;
+
+}
+
+
+static inline u32 ipw_get_max_rate(struct ipw_priv *priv)
+{
+        u32 i = 0x80000000;
+        u32 mask = priv->rates_mask;
+        /* If currently associated in B mode, restrict the maximum
+         * rate match to B rates */
+        if (priv->assoc_request.ieee_mode == IPW_B_MODE)
+                mask &= IEEE80211_CCK_RATES_MASK;
+
+        /* TODO: Verify that the rate is supported by the current rates
+         * list. */
+
+        while (i && !(mask & i)) i >>= 1;
+        switch (i) {
+        case IEEE80211_CCK_RATE_1MB_MASK: return 1000000;
+        case IEEE80211_CCK_RATE_2MB_MASK: return 2000000;
+        case IEEE80211_CCK_RATE_5MB_MASK: return 5500000;
+        case IEEE80211_OFDM_RATE_6MB_MASK: return 6000000;
+        case IEEE80211_OFDM_RATE_9MB_MASK: return 9000000;
+        case IEEE80211_CCK_RATE_11MB_MASK: return 11000000;
+        case IEEE80211_OFDM_RATE_12MB_MASK: return 12000000;
+        case IEEE80211_OFDM_RATE_18MB_MASK: return 18000000;
+        case IEEE80211_OFDM_RATE_24MB_MASK: return 24000000;
+        case IEEE80211_OFDM_RATE_36MB_MASK: return 36000000;
+        case IEEE80211_OFDM_RATE_48MB_MASK: return 48000000;
+        case IEEE80211_OFDM_RATE_54MB_MASK: return 54000000;
+        }
+
+        if (priv->ieee->mode == IEEE_B) 
+                return 11000000;
+        else
+                return 54000000;
+}
+
+static u32 ipw_get_current_rate(struct ipw_priv *priv)
+{
+        u32 rate, len = sizeof(rate);
+        int err;
+
+        if (!(priv->status & STATUS_ASSOCIATED)) 
+                return 0;
+
+        if (priv->tx_packets > IPW_REAL_RATE_RX_PACKET_THRESHOLD) {
+                err = ipw_get_ordinal(priv, IPW_ORD_STAT_TX_CURR_RATE, &rate, 
+                                      &len);
+                if (err) {
+                        IPW_DEBUG_INFO("failed querying ordinals.\n");
+                        return 0;
+                }
+        } else 
+                return ipw_get_max_rate(priv);
+
+        switch (rate) {
+        case IPW_TX_RATE_1MB:  return  1000000; 
+        case IPW_TX_RATE_2MB:  return  2000000; 
+        case IPW_TX_RATE_5MB:  return  5500000; 
+        case IPW_TX_RATE_6MB:  return  6000000; 
+        case IPW_TX_RATE_9MB:  return  9000000; 
+        case IPW_TX_RATE_11MB: return 11000000; 
+        case IPW_TX_RATE_12MB: return 12000000; 
+        case IPW_TX_RATE_18MB: return 18000000; 
+        case IPW_TX_RATE_24MB: return 24000000; 
+        case IPW_TX_RATE_36MB: return 36000000; 
+        case IPW_TX_RATE_48MB: return 48000000; 
+        case IPW_TX_RATE_54MB: return 54000000; 
+        }
+
+        return 0;
+}
+
+#define PERFECT_RSSI (-50)
+#define WORST_RSSI   (-85)
+#define IPW_STATS_INTERVAL (2 * HZ)
+static void ipw_gather_stats(struct ipw_priv *priv)
+{
+        u32 rx_err, rx_err_delta, rx_packets_delta;
+        u32 tx_failures, tx_failures_delta, tx_packets_delta;
+        u32 missed_beacons_percent, missed_beacons_delta;
+        u32 quality = 0;
+        u32 len = sizeof(u32);
+        s16 rssi;
+        u32 beacon_quality, signal_quality, tx_quality, rx_quality, 
+                rate_quality;
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                priv->quality = 0;
+                return;
+        }
+
+        /* Update the statistics */
+        ipw_get_ordinal(priv, IPW_ORD_STAT_MISSED_BEACONS, 
+                        &priv->missed_beacons, &len);
+        missed_beacons_delta = priv->missed_beacons - 
+                priv->last_missed_beacons;
+        priv->last_missed_beacons = priv->missed_beacons;
+        if (priv->assoc_request.beacon_interval) {
+                missed_beacons_percent = missed_beacons_delta *
+                        (HZ * priv->assoc_request.beacon_interval) /
+                        (IPW_STATS_INTERVAL * 10);
+        } else {
+                missed_beacons_percent = 0;
+        }
+        average_add(&priv->average_missed_beacons, missed_beacons_percent);
+
+        ipw_get_ordinal(priv, IPW_ORD_STAT_RX_ERR_CRC, &rx_err, &len);
+        rx_err_delta = rx_err - priv->last_rx_err;
+        priv->last_rx_err = rx_err;
+
+        ipw_get_ordinal(priv, IPW_ORD_STAT_TX_FAILURE, &tx_failures, &len);
+        tx_failures_delta = tx_failures - priv->last_tx_failures;
+        priv->last_tx_failures = tx_failures;
+
+        rx_packets_delta = priv->rx_packets - priv->last_rx_packets;
+        priv->last_rx_packets = priv->rx_packets;
+
+        tx_packets_delta = priv->tx_packets - priv->last_tx_packets;
+        priv->last_tx_packets = priv->tx_packets;
+
+        /* Calculate quality based on the following:
+         * 
+         * Missed beacon: 100% = 0, 0% = 70% missed
+         * Rate: 60% = 1Mbs, 100% = Max
+         * Rx and Tx errors represent a straight % of total Rx/Tx
+         * RSSI: 100% = > -50,  0% = < -80
+         * Rx errors: 100% = 0, 0% = 50% missed
+         * 
+         * The lowest computed quality is used.
+         *
+         */
+#define BEACON_THRESHOLD 5
+        beacon_quality = 100 - missed_beacons_percent;
+        if (beacon_quality < BEACON_THRESHOLD)
+                beacon_quality = 0;
+        else
+                beacon_quality = (beacon_quality - BEACON_THRESHOLD) * 100 / 
+                        (100 - BEACON_THRESHOLD);
+        IPW_DEBUG_STATS("Missed beacon: %3d%% (%d%%)\n", 
+                        beacon_quality, missed_beacons_percent);
+        
+        priv->last_rate = ipw_get_current_rate(priv);
+        rate_quality =  priv->last_rate * 40 / priv->last_rate + 60;
+        IPW_DEBUG_STATS("Rate quality : %3d%% (%dMbs)\n",
+                        rate_quality, priv->last_rate / 1000000);
+        
+        if (rx_packets_delta > 100 && 
+            rx_packets_delta + rx_err_delta) 
+                rx_quality = 100 - (rx_err_delta * 100) / 
+                        (rx_packets_delta + rx_err_delta);
+        else
+                rx_quality = 100;
+        IPW_DEBUG_STATS("Rx quality   : %3d%% (%u errors, %u packets)\n",
+                        rx_quality, rx_err_delta, rx_packets_delta);
+        
+        if (tx_packets_delta > 100 && 
+            tx_packets_delta + tx_failures_delta) 
+                tx_quality = 100 - (tx_failures_delta * 100) / 
+                        (tx_packets_delta + tx_failures_delta);
+        else
+                tx_quality = 100;
+        IPW_DEBUG_STATS("Tx quality   : %3d%% (%u errors, %u packets)\n",
+                        tx_quality, tx_failures_delta, tx_packets_delta);
+        
+        rssi = average_value(&priv->average_rssi);
+        if (rssi > PERFECT_RSSI)
+                signal_quality = 100;
+        else if (rssi < WORST_RSSI)
+                signal_quality = 0;
+        else
+                signal_quality = (rssi - WORST_RSSI) * 100 / 
+                        (PERFECT_RSSI - WORST_RSSI);
+        IPW_DEBUG_STATS("Signal level : %3d%% (%d dBm)\n",
+                        signal_quality, rssi);
+        
+        quality = min(beacon_quality, 
+                      min(rate_quality,
+                          min(tx_quality, min(rx_quality, signal_quality))));
+        if (quality == beacon_quality)
+                IPW_DEBUG_STATS(
+                        "Quality (%d%%): Clamped to missed beacons.\n", 
+                        quality);
+        if (quality == rate_quality)
+                IPW_DEBUG_STATS(
+                        "Quality (%d%%): Clamped to rate quality.\n", 
+                        quality);
+        if (quality == tx_quality)
+                IPW_DEBUG_STATS(
+                        "Quality (%d%%): Clamped to Tx quality.\n", 
+                        quality);
+        if (quality == rx_quality)
+                IPW_DEBUG_STATS(
+                        "Quality (%d%%): Clamped to Rx quality.\n", 
+                        quality);
+        if (quality == signal_quality)
+                IPW_DEBUG_STATS(
+                        "Quality (%d%%): Clamped to signal quality.\n", 
+                        quality);
+
+        priv->quality = quality;
+        
+        queue_delayed_work(priv->workqueue, &priv->gather_stats, 
+                           IPW_STATS_INTERVAL);
+}
+
+/**
+ * Handle host notification packet.
+ * Called from interrupt routine
+ */
+static inline void ipw_rx_notification(struct ipw_priv* priv,
+                                       struct ipw_rx_notification *notif)
+{
+        IPW_DEBUG_NOTIF("type = %i (%d bytes)\n", 
+                        notif->subtype, notif->size);
+        
+        switch (notif->subtype) {
+        case HOST_NOTIFICATION_STATUS_ASSOCIATED: {
+                struct notif_association *assoc = &notif->u.assoc;
+                
+                switch (assoc->state) {
+                case CMAS_ASSOCIATED: {
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "associated: '%s' " MAC_FMT " \n", 
+                                  escape_essid(priv->essid, priv->essid_len),
+                                  MAC_ARG(priv->bssid));
+                        
+                        switch (priv->ieee->iw_mode) {
+                        case IW_MODE_INFRA:
+                                memcpy(priv->ieee->bssid, priv->bssid, 
+                                       ETH_ALEN);
+                                break;
+
+                        case IW_MODE_ADHOC:
+                                memcpy(priv->ieee->bssid, priv->bssid, 
+                                       ETH_ALEN);
+                                
+                                /* clear out the station table */
+                                priv->num_stations = 0;
+
+                                IPW_DEBUG_ASSOC("queueing adhoc check\n");
+                                queue_delayed_work(priv->workqueue, 
+                                                   &priv->adhoc_check,
+                                                   priv->assoc_request.beacon_interval);
+                                break;
+                        }
+
+                        priv->status &= ~STATUS_ASSOCIATING;
+                        priv->status |= STATUS_ASSOCIATED;
+
+                        netif_carrier_on(priv->net_dev);
+                        if (netif_queue_stopped(priv->net_dev)) {
+                                IPW_DEBUG_NOTIF("waking queue\n");
+                                netif_wake_queue(priv->net_dev);
+                        } else {
+                                IPW_DEBUG_NOTIF("starting queue\n");
+                                netif_start_queue(priv->net_dev);
+                        }
+
+                        ipw_reset_stats(priv);
+                        /* Ensure the rate is updated immediately */
+                        priv->last_rate = ipw_get_current_rate(priv);
+                        schedule_work(&priv->gather_stats);
+                        notify_wx_assoc_event(priv);
+
+/*                      queue_delayed_work(priv->workqueue, 
+                                           &priv->request_scan,
+                                           SCAN_ASSOCIATED_INTERVAL);
+*/
+                        break;
+                }
+                        
+                case CMAS_AUTHENTICATED: {
+                        if (priv->status & (STATUS_ASSOCIATED | STATUS_AUTH)) {
+#ifdef CONFIG_IPW_DEBUG
+                                struct notif_authenticate *auth = &notif->u.auth;
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                          "deauthenticated: '%s' " MAC_FMT ": (0x%04X) - %s \n", 
+                                          escape_essid(priv->essid, priv->essid_len),
+                                          MAC_ARG(priv->bssid),
+                                          ntohs(auth->status),
+                                          ipw_get_status_code(ntohs(auth->status)));
+#endif
+
+                                priv->status &= ~(STATUS_ASSOCIATING |
+                                                  STATUS_AUTH |
+                                                  STATUS_ASSOCIATED);
+
+                                netif_carrier_off(priv->net_dev);
+                                netif_stop_queue(priv->net_dev);
+                                queue_work(priv->workqueue, &priv->request_scan);
+                                notify_wx_assoc_event(priv);                    
+                                break;
+                        } 
+
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "authenticated: '%s' " MAC_FMT "\n", 
+                                  escape_essid(priv->essid, priv->essid_len),
+                                  MAC_ARG(priv->bssid));        
+                        break;
+                }
+                        
+                case CMAS_INIT: {
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "disassociated: '%s' " MAC_FMT " \n", 
+                                  escape_essid(priv->essid, priv->essid_len),
+                                  MAC_ARG(priv->bssid));
+
+                        priv->status &= ~(
+                                STATUS_DISASSOCIATING |
+                                STATUS_ASSOCIATING | 
+                                STATUS_ASSOCIATED |
+                                STATUS_AUTH);
+                        
+                        netif_stop_queue(priv->net_dev);
+                        if (!(priv->status & STATUS_ROAMING)) {
+                                netif_carrier_off(priv->net_dev);
+                                notify_wx_assoc_event(priv);
+
+                                /* Cancel any queued work ... */
+                                cancel_delayed_work(&priv->request_scan);
+                                cancel_delayed_work(&priv->adhoc_check);
+
+                                /* Queue up another scan... */
+                                queue_work(priv->workqueue, 
+                                           &priv->request_scan);
+
+                                cancel_delayed_work(&priv->gather_stats);
+                        } else {
+                                priv->status |= STATUS_ROAMING;
+                                queue_work(priv->workqueue, 
+                                           &priv->request_scan);
+                        }
+                        
+                        ipw_reset_stats(priv);
+                        break;
+                }
+                        
+                default: 
+                        IPW_ERROR("assoc: unknown (%d)\n",
+                                  assoc->state);
+                        break;
+                }
+
+                break;
+        }
+
+        case HOST_NOTIFICATION_STATUS_AUTHENTICATE: {
+                struct notif_authenticate *auth = &notif->u.auth;
+                switch (auth->state) {
+                case CMAS_AUTHENTICATED:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                  "authenticated: '%s' " MAC_FMT " \n", 
+                                  escape_essid(priv->essid, priv->essid_len),
+                                  MAC_ARG(priv->bssid));
+                        priv->status |= STATUS_AUTH;
+                        break;
+
+                case CMAS_INIT:
+                        if (priv->status & STATUS_AUTH) {
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                          "authentication failed (0x%04X): %s\n",
+                                          ntohs(auth->status),
+                                          ipw_get_status_code(ntohs(auth->status)));
+                        } 
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "deauthenticated: '%s' " MAC_FMT "\n", 
+                                  escape_essid(priv->essid, priv->essid_len),
+                                  MAC_ARG(priv->bssid));
+
+                        priv->status &= ~(STATUS_ASSOCIATING |
+                                          STATUS_AUTH |
+                                          STATUS_ASSOCIATED);
+
+                        netif_carrier_off(priv->net_dev);
+                        netif_stop_queue(priv->net_dev);
+                        queue_work(priv->workqueue, &priv->request_scan);
+                        notify_wx_assoc_event(priv);
+                        break;
+                        
+                case CMAS_TX_AUTH_SEQ_1:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "AUTH_SEQ_1\n");
+                        break;
+                case CMAS_RX_AUTH_SEQ_2:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "AUTH_SEQ_2\n");
+                        break;
+                case CMAS_AUTH_SEQ_1_PASS:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "AUTH_SEQ_1_PASS\n");
+                        break;
+                case CMAS_AUTH_SEQ_1_FAIL:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "AUTH_SEQ_1_FAIL\n");
+                        break;
+                case CMAS_TX_AUTH_SEQ_3:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "AUTH_SEQ_3\n");
+                        break;
+                case CMAS_RX_AUTH_SEQ_4:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "RX_AUTH_SEQ_4\n");
+                        break;
+                case CMAS_AUTH_SEQ_2_PASS:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "AUTH_SEQ_2_PASS\n");
+                        break;
+                case CMAS_AUTH_SEQ_2_FAIL:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "AUT_SEQ_2_FAIL\n");
+                        break;
+                case CMAS_TX_ASSOC:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "TX_ASSOC\n");
+                        break;
+                case CMAS_RX_ASSOC_RESP:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "RX_ASSOC_RESP\n");
+                        break;
+                case CMAS_ASSOCIATED:
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                                  "ASSOCIATED\n");
+                        break;
+                default:
+                        IPW_DEBUG_NOTIF("auth: failure - %d\n", auth->state);
+                        break;
+                }
+                break;
+        }
+
+        case HOST_NOTIFICATION_STATUS_SCAN_CHANNEL_RESULT: {
+                struct notif_channel_result *x = &notif->u.channel_result;
+                
+                if (notif->size == sizeof(*x)) {
+                        IPW_DEBUG_SCAN("Scan result for channel %d\n", 
+                                       x->channel_num);
+                } else {
+                        IPW_DEBUG_SCAN("Scan result of wrong size %d "
+                                       "(should be %zd)\n",
+                                       notif->size, sizeof(*x));
+                }
+                break;
+        }
+
+        case HOST_NOTIFICATION_STATUS_SCAN_COMPLETED: {
+                struct notif_scan_complete* x = &notif->u.scan_complete;
+                if (notif->size == sizeof(*x)) {
+                        IPW_DEBUG_SCAN("Scan completed: type %d, %d channels, "
+                                       "%d status\n",
+                                       x->scan_type, 
+                                       x->num_channels, 
+                                       x->status);
+                } else {
+                        IPW_ERROR("Scan completed of wrong size %d "
+                                  "(should be %zd)\n",
+                                  notif->size, sizeof(*x));
+                }
+        
+                priv->status &= ~(STATUS_SCANNING | STATUS_SCAN_ABORTING);
+
+                cancel_delayed_work(&priv->scan_check);
+                
+                if (!(priv->status & (STATUS_ASSOCIATED | 
+                                      STATUS_ASSOCIATING |
+                                      STATUS_ROAMING |
+                                      STATUS_DISASSOCIATING)))
+                        queue_work(priv->workqueue, &priv->associate);
+                else if (priv->status & STATUS_ROAMING) {
+                        /* If a scan completed and we are in roam mode, then
+                         * the scan that completed was the one requested as a
+                         * result of entering roam... so, schedule the 
+                         * roam work */
+                        queue_work(priv->workqueue, &priv->roam);
+                } else if (priv->status & STATUS_SCAN_PENDING)
+                        queue_work(priv->workqueue, &priv->request_scan);
+
+                priv->ieee->scans++;
+                break;
+        }
+
+        case HOST_NOTIFICATION_STATUS_FRAG_LENGTH: {
+                struct notif_frag_length *x = &notif->u.frag_len;
+
+                if (notif->size == sizeof(*x)) {
+                        IPW_ERROR("Frag length: %d\n", x->frag_length);
+                } else {
+                        IPW_ERROR("Frag length of wrong size %d "
+                                  "(should be %zd)\n",
+                                  notif->size, sizeof(*x));
+                }
+                break;
+        }
+
+        case HOST_NOTIFICATION_STATUS_LINK_DETERIORATION: {
+                struct notif_link_deterioration *x = 
+                        &notif->u.link_deterioration;
+                if (notif->size==sizeof(*x)) {
+                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                  "link deterioration: '%s' " MAC_FMT " \n", 
+                                  escape_essid(priv->essid, priv->essid_len),
+                                  MAC_ARG(priv->bssid));
+                        memcpy(&priv->last_link_deterioration, x, sizeof(*x));
+                } else {
+                        IPW_ERROR("Link Deterioration of wrong size %d "
+                                  "(should be %zd)\n",
+                                  notif->size, sizeof(*x));
+                }
+                break;
+        }
+
+        case HOST_NOTIFICATION_DINO_CONFIG_RESPONSE: {
+                IPW_ERROR("Dino config\n");
+                if (priv->hcmd && priv->hcmd->cmd == HOST_CMD_DINO_CONFIG) {
+                        /* TODO: Do anything special? */
+                } else {
+                        IPW_ERROR("Unexpected DINO_CONFIG_RESPONSE\n");
+                }
+                break;
+        }
+
+        case HOST_NOTIFICATION_STATUS_BEACON_STATE: {
+                struct notif_beacon_state *x = &notif->u.beacon_state;
+                if (notif->size != sizeof(*x)) {
+                        IPW_ERROR("Beacon state of wrong size %d (should "
+                                  "be %zd)\n", notif->size, sizeof(*x));
+                        break;
+                }
+
+                if (x->state == HOST_NOTIFICATION_STATUS_BEACON_MISSING) {
+                        if (priv->status & STATUS_SCANNING) {
+                                /* Stop scan to keep fw from getting
+                                 * stuck... */
+                                queue_work(priv->workqueue,
+                                           &priv->abort_scan);
+                        }
+
+                        if (x->number > priv->missed_beacon_threshold &&
+                            priv->status & STATUS_ASSOCIATED) {
+                                IPW_DEBUG(IPW_DL_INFO | IPW_DL_NOTIF | 
+                                          IPW_DL_STATE,
+                                          "Missed beacon: %d - disassociate\n",
+                                          x->number);
+                                queue_work(priv->workqueue, 
+                                           &priv->disassociate);
+                        } else if (x->number > priv->roaming_threshold) {
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE, 
+                                          "Missed beacon: %d - initiate "
+                                          "roaming\n",
+                                          x->number);
+                                queue_work(priv->workqueue,
+                                           &priv->roam);
+                        } else {
+                                IPW_DEBUG_NOTIF("Missed beacon: %d\n",
+                                                x->number);
+                        }
+
+                        priv->notif_missed_beacons = x->number;
+
+                }
+
+
+                break;
+        }
+
+        case HOST_NOTIFICATION_STATUS_TGI_TX_KEY: {
+                struct notif_tgi_tx_key *x = &notif->u.tgi_tx_key;
+                if (notif->size==sizeof(*x)) {
+                        IPW_ERROR("TGi Tx Key: state 0x%02x sec type "
+                                  "0x%02x station %d\n",
+                                  x->key_state,x->security_type,
+                                  x->station_index);
+                        break;
+                } 
+
+                IPW_ERROR("TGi Tx Key of wrong size %d (should be %zd)\n",
+                          notif->size, sizeof(*x));
+                break;
+        }
+
+        case HOST_NOTIFICATION_CALIB_KEEP_RESULTS: {
+                struct notif_calibration *x = &notif->u.calibration;
+
+                if (notif->size == sizeof(*x)) {
+                        memcpy(&priv->calib, x, sizeof(*x));
+                        IPW_DEBUG_INFO("TODO: Calibration\n");
+                        break;
+                } 
+                
+                IPW_ERROR("Calibration of wrong size %d (should be %zd)\n",
+                          notif->size, sizeof(*x));
+                break;
+        }
+
+        case HOST_NOTIFICATION_NOISE_STATS: {
+                if (notif->size == sizeof(u32)) {
+                        priv->last_noise = (u8)(notif->u.noise.value & 0xff);
+                        average_add(&priv->average_noise, priv->last_noise);
+                        break;
+                }
+
+                IPW_ERROR("Noise stat is wrong size %d (should be %zd)\n",
+                          notif->size, sizeof(u32));
+                break;
+        }
+
+        default:
+                IPW_ERROR("Unknown notification: "
+                          "subtype=%d,flags=0x%2x,size=%d\n",
+                          notif->subtype, notif->flags, notif->size);
+        }
+}
+
+/**
+ * Destroys all DMA structures and initialise them again
+ * 
+ * @param priv
+ * @return error code
+ */
+static int ipw_queue_reset(struct ipw_priv *priv)
+{
+        int rc = 0;
+        /** @todo customize queue sizes */
+        int nTx = 64, nTxCmd = 8;
+        ipw_tx_queue_free(priv);
+        /* Tx CMD queue */
+        rc = ipw_queue_tx_init(priv, &priv->txq_cmd, nTxCmd,
+                               CX2_TX_CMD_QUEUE_READ_INDEX,
+                               CX2_TX_CMD_QUEUE_WRITE_INDEX,
+                               CX2_TX_CMD_QUEUE_BD_BASE,
+                               CX2_TX_CMD_QUEUE_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx Cmd queue init failed\n");
+                goto error;
+        }
+        /* Tx queue(s) */
+        rc = ipw_queue_tx_init(priv, &priv->txq[0], nTx,
+                               CX2_TX_QUEUE_0_READ_INDEX,
+                               CX2_TX_QUEUE_0_WRITE_INDEX,
+                               CX2_TX_QUEUE_0_BD_BASE,
+                               CX2_TX_QUEUE_0_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 0 queue init failed\n");
+                goto error;
+        }
+        rc = ipw_queue_tx_init(priv, &priv->txq[1], nTx,
+                               CX2_TX_QUEUE_1_READ_INDEX,
+                               CX2_TX_QUEUE_1_WRITE_INDEX,
+                               CX2_TX_QUEUE_1_BD_BASE,
+                               CX2_TX_QUEUE_1_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 1 queue init failed\n");
+                goto error;
+        }
+        rc = ipw_queue_tx_init(priv, &priv->txq[2], nTx,
+                               CX2_TX_QUEUE_2_READ_INDEX,
+                               CX2_TX_QUEUE_2_WRITE_INDEX,
+                               CX2_TX_QUEUE_2_BD_BASE,
+                               CX2_TX_QUEUE_2_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 2 queue init failed\n");
+                goto error;
+        }
+        rc = ipw_queue_tx_init(priv, &priv->txq[3], nTx,
+                               CX2_TX_QUEUE_3_READ_INDEX,
+                               CX2_TX_QUEUE_3_WRITE_INDEX,
+                               CX2_TX_QUEUE_3_BD_BASE,
+                               CX2_TX_QUEUE_3_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 3 queue init failed\n");
+                goto error;
+        }
+        /* statistics */
+        priv->rx_bufs_min = 0;
+        priv->rx_pend_max = 0;
+        return rc;
+
+ error:
+        ipw_tx_queue_free(priv);
+        return rc;
+}
+
+/**
+ * Reclaim Tx queue entries no more used by NIC.
+ * 
+ * When FW adwances 'R' index, all entries between old and
+ * new 'R' index need to be reclaimed. As result, some free space
+ * forms. If there is enough free space (> low mark), wake Tx queue.
+ * 
+ * @note Need to protect against garbage in 'R' index
+ * @param priv
+ * @param txq
+ * @param qindex
+ * @return Number of used entries remains in the queue
+ */
+static int ipw_queue_tx_reclaim(struct ipw_priv *priv, 
+                                struct clx2_tx_queue *txq, int qindex)
+{
+        u32 hw_tail;
+        int used;
+        struct clx2_queue *q = &txq->q;
+
+        hw_tail = ipw_read32(priv, q->reg_r);
+        if (hw_tail >= q->n_bd) {
+                IPW_ERROR
+                        ("Read index for DMA queue (%d) is out of range [0-%d)\n",
+                         hw_tail, q->n_bd);
+                goto done;
+        }
+        for (; q->last_used != hw_tail;
+             q->last_used = ipw_queue_inc_wrap(q->last_used, q->n_bd)) {
+                ipw_queue_tx_free_tfd(priv, txq);
+                priv->tx_packets++;
+        }
+ done:
+        if (ipw_queue_space(q) > q->low_mark && qindex >= 0) {
+                __maybe_wake_tx(priv);
+        }
+        used = q->first_empty - q->last_used;
+        if (used < 0)
+                used += q->n_bd;
+
+        return used;
+}
+
+static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,
+                             int len, int sync)
+{
+        struct clx2_tx_queue *txq = &priv->txq_cmd;
+        struct clx2_queue *q = &txq->q;
+        struct tfd_frame *tfd;
+
+        if (ipw_queue_space(q) < (sync ? 1 : 2)) {
+                IPW_ERROR("No space for Tx\n");
+                return -EBUSY;
+        }
+
+        tfd = &txq->bd[q->first_empty];
+        txq->txb[q->first_empty] = NULL;
+
+        memset(tfd, 0, sizeof(*tfd));
+        tfd->control_flags.message_type = TX_HOST_COMMAND_TYPE;
+        tfd->control_flags.control_bits = TFD_NEED_IRQ_MASK;
+        priv->hcmd_seq++;
+        tfd->u.cmd.index = hcmd;
+        tfd->u.cmd.length = len;
+        memcpy(tfd->u.cmd.payload, buf, len);
+        q->first_empty = ipw_queue_inc_wrap(q->first_empty, q->n_bd);
+        ipw_write32(priv, q->reg_w, q->first_empty);
+        _ipw_read32(priv, 0x90);
+
+        return 0;
+}
+
+
+
+/* 
+ * Rx theory of operation
+ *
+ * The host allocates 32 DMA target addresses and passes the host address
+ * to the firmware at register CX2_RFDS_TABLE_LOWER + N * RFD_SIZE where N is
+ * 0 to 31
+ *
+ * Rx Queue Indexes
+ * The host/firmware share two index registers for managing the Rx buffers.
+ *
+ * The READ index maps to the first position that the firmware may be writing 
+ * to -- the driver can read up to (but not including) this position and get 
+ * good data.  
+ * The READ index is managed by the firmware once the card is enabled.
+ *
+ * The WRITE index maps to the last position the driver has read from -- the
+ * position preceding WRITE is the last slot the firmware can place a packet.
+ *
+ * The queue is empty (no good data) if WRITE = READ - 1, and is full if
+ * WRITE = READ.  
+ *
+ * During initialization the host sets up the READ queue position to the first 
+ * INDEX position, and WRITE to the last (READ - 1 wrapped)
+ *
+ * When the firmware places a packet in a buffer it will advance the READ index
+ * and fire the RX interrupt.  The driver can then query the READ index and
+ * process as many packets as possible, moving the WRITE index forward as it
+ * resets the Rx queue buffers with new memory.
+ * 
+ * The management in the driver is as follows:
+ * + A list of pre-allocated SKBs is stored in ipw->rxq->rx_free.  When 
+ *   ipw->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
+ *   to replensish the ipw->rxq->rx_free.  
+ * + In ipw_rx_queue_replenish (scheduled) if 'processed' != 'read' then the
+ *   ipw->rxq is replenished and the READ INDEX is updated (updating the
+ *   'processed' and 'read' driver indexes as well)
+ * + A received packet is processed and handed to the kernel network stack,
+ *   detached from the ipw->rxq.  The driver 'processed' index is updated.
+ * + The Host/Firmware ipw->rxq is replenished at tasklet time from the rx_free
+ *   list. If there are no allocated buffers in ipw->rxq->rx_free, the READ 
+ *   INDEX is not incremented and ipw->status(RX_STALLED) is set.  If there 
+ *   were enough free buffers and RX_STALLED is set it is cleared.
+ *
+ *
+ * Driver sequence:
+ *
+ * ipw_rx_queue_alloc()       Allocates rx_free 
+ * ipw_rx_queue_replenish()   Replenishes rx_free list from rx_used, and calls
+ *                            ipw_rx_queue_restock
+ * ipw_rx_queue_restock()     Moves available buffers from rx_free into Rx
+ *                            queue, updates firmware pointers, and updates
+ *                            the WRITE index.  If insufficient rx_free buffers
+ *                            are available, schedules ipw_rx_queue_replenish
+ *
+ * -- enable interrupts --
+ * ISR - ipw_rx()             Detach ipw_rx_mem_buffers from pool up to the
+ *                            READ INDEX, detaching the SKB from the pool. 
+ *                            Moves the packet buffer from queue to rx_used.
+ *                            Calls ipw_rx_queue_restock to refill any empty
+ *                            slots.
+ * ...
+ *
+ */
+
+/* 
+ * If there are slots in the RX queue that  need to be restocked,
+ * and we have free pre-allocated buffers, fill the ranks as much
+ * as we can pulling from rx_free.
+ *
+ * This moves the 'write' index forward to catch up with 'processed', and
+ * also updates the memory address in the firmware to reference the new
+ * target buffer.
+ */
+static void ipw_rx_queue_restock(struct ipw_priv *priv)
+{
+        struct ipw_rx_queue *rxq = priv->rxq;
+        struct list_head *element;
+        struct ipw_rx_mem_buffer *rxb;
+        unsigned long flags;
+        int write;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+        write = rxq->write;
+        while ((rxq->write != rxq->processed) && (rxq->free_count)) {
+                element = rxq->rx_free.next;
+                rxb = list_entry(element, struct ipw_rx_mem_buffer, list);
+                list_del(element);
+
+                ipw_write32(priv, CX2_RFDS_TABLE_LOWER + rxq->write * RFD_SIZE,
+                            rxb->dma_addr);
+                rxq->queue[rxq->write] = rxb;
+                rxq->write = (rxq->write + 1) % RX_QUEUE_SIZE;
+                rxq->free_count--;
+        }
+        spin_unlock_irqrestore(&rxq->lock, flags);
+
+        /* If the pre-allocated buffer pool is dropping low, schedule to 
+         * refill it */
+        if (rxq->free_count <= RX_LOW_WATERMARK)
+                queue_work(priv->workqueue, &priv->rx_replenish);
+
+        /* If we've added more space for the firmware to place data, tell it */
+        if (write != rxq->write) 
+                ipw_write32(priv, CX2_RX_WRITE_INDEX, rxq->write);
+}
+
+/*
+ * Move all used packet from rx_used to rx_free, allocating a new SKB for each.
+ * Also restock the Rx queue via ipw_rx_queue_restock.  
+ * 
+ * This is called as a scheduled work item (except for during intialization)
+ */
+static void ipw_rx_queue_replenish(void *data)
+{
+        struct ipw_priv *priv = data;
+        struct ipw_rx_queue *rxq = priv->rxq;
+        struct list_head *element;
+        struct ipw_rx_mem_buffer *rxb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+        while (!list_empty(&rxq->rx_used)) {
+                element = rxq->rx_used.next;
+                rxb = list_entry(element, struct ipw_rx_mem_buffer, list);
+                rxb->skb = alloc_skb(CX2_RX_BUF_SIZE, GFP_ATOMIC);
+                if (!rxb->skb) {
+                        printk(KERN_CRIT "%s: Can not allocate SKB buffers.\n",
+                               priv->net_dev->name);
+                        /* We don't reschedule replenish work here -- we will
+                         * call the restock method and if it still needs
+                         * more buffers it will schedule replenish */
+                        break;
+                }
+                list_del(element);
+                
+                rxb->rxb = (struct ipw_rx_buffer *)rxb->skb->data;
+                rxb->dma_addr = pci_map_single(
+                        priv->pci_dev, rxb->skb->data, CX2_RX_BUF_SIZE,
+                        PCI_DMA_FROMDEVICE);
+                
+                list_add_tail(&rxb->list, &rxq->rx_free);
+                rxq->free_count++;
+        }
+        spin_unlock_irqrestore(&rxq->lock, flags);
+
+        ipw_rx_queue_restock(priv);
+}
+
+/* Assumes that the skb field of the buffers in 'pool' is kept accurate.
+ * If an SKB has been detached, the POOL needs to have it's SKB set to NULL
+ * This free routine walks the list of POOL entries and if SKB is set to 
+ * non NULL it is unmapped and freed
+ */
+static void ipw_rx_queue_free(struct ipw_priv *priv, 
+                              struct ipw_rx_queue *rxq)
+{
+        int i;
+
+        if (!rxq)
+                return;
+        
+        for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
+                if (rxq->pool[i].skb != NULL) {
+                        pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr,
+                                         CX2_RX_BUF_SIZE,
+                                         PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(rxq->pool[i].skb);
+                }
+        }
+
+        kfree(rxq);
+}
+
+static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv)
+{
+        struct ipw_rx_queue *rxq;
+        int i;
+
+        rxq = (struct ipw_rx_queue *)kmalloc(sizeof(*rxq), GFP_KERNEL);
+        memset(rxq, 0, sizeof(*rxq));
+        spin_lock_init(&rxq->lock);
+        INIT_LIST_HEAD(&rxq->rx_free);
+        INIT_LIST_HEAD(&rxq->rx_used);
+
+        /* Fill the rx_used queue with _all_ of the Rx buffers */
+        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) 
+                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
+
+        /* Set us so that we have processed and used all buffers, but have
+         * not restocked the Rx queue with fresh buffers */
+        rxq->read = rxq->write = 0;
+        rxq->processed = RX_QUEUE_SIZE - 1;
+        rxq->free_count = 0;
+
+        return rxq;
+}
+
+static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate)
+{
+        rate &= ~IEEE80211_BASIC_RATE_MASK;
+        if (ieee_mode == IEEE_A) {
+                switch (rate) {
+                case IEEE80211_OFDM_RATE_6MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ? 
+                                1 : 0;
+                case IEEE80211_OFDM_RATE_9MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ? 
+                                1 : 0;
+                case IEEE80211_OFDM_RATE_12MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 
+                                1 : 0;
+                case IEEE80211_OFDM_RATE_18MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 
+                                1 : 0;
+                case IEEE80211_OFDM_RATE_24MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 
+                                1 : 0;
+                case IEEE80211_OFDM_RATE_36MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 
+                                1 : 0;
+                case IEEE80211_OFDM_RATE_48MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 
+                                1 : 0;
+                case IEEE80211_OFDM_RATE_54MB: 
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 
+                                1 : 0;
+                default:
+                        return 0;
+                }
+        }
+        
+        /* B and G mixed */
+        switch (rate) {
+        case IEEE80211_CCK_RATE_1MB: 
+                return priv->rates_mask & IEEE80211_CCK_RATE_1MB_MASK ? 1 : 0;
+        case IEEE80211_CCK_RATE_2MB: 
+                return priv->rates_mask & IEEE80211_CCK_RATE_2MB_MASK ? 1 : 0;
+        case IEEE80211_CCK_RATE_5MB: 
+                return priv->rates_mask & IEEE80211_CCK_RATE_5MB_MASK ? 1 : 0;
+        case IEEE80211_CCK_RATE_11MB: 
+                return priv->rates_mask & IEEE80211_CCK_RATE_11MB_MASK ? 1 : 0;
+        }
+
+        /* If we are limited to B modulations, bail at this point */
+        if (ieee_mode == IEEE_B)
+                return 0;
+
+        /* G */
+        switch (rate) {
+        case IEEE80211_OFDM_RATE_6MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_9MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_12MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_18MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_24MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_36MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_48MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_54MB: 
+                return priv->rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0;
+        }
+
+        return 0;
+}
+
+static int ipw_compatible_rates(struct ipw_priv *priv, 
+                                const struct ieee80211_network *network,
+                                struct ipw_supported_rates *rates)
+{
+        int num_rates, i;
+
+        memset(rates, 0, sizeof(*rates));
+        num_rates = min(network->rates_len, (u8)IPW_MAX_RATES);
+        rates->num_rates = 0;
+        for (i = 0; i < num_rates; i++) {
+                if (!ipw_is_rate_in_mask(priv, network->mode, network->rates[i])) {
+                        IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
+                                       network->rates[i], priv->rates_mask);
+                        continue;
+                }
+                
+                rates->supported_rates[rates->num_rates++] = network->rates[i];
+        }
+
+        num_rates = min(network->rates_ex_len, (u8)(IPW_MAX_RATES - num_rates));
+        for (i = 0; i < num_rates; i++) {
+                if (!ipw_is_rate_in_mask(priv, network->mode, network->rates_ex[i])) {
+                        IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
+                                       network->rates_ex[i], priv->rates_mask);
+                        continue;
+                }
+                
+                rates->supported_rates[rates->num_rates++] = network->rates_ex[i];
+        }
+
+        return rates->num_rates;
+}
+
+static inline void ipw_copy_rates(struct ipw_supported_rates *dest,
+                                  const struct ipw_supported_rates *src)
+{
+        u8 i;
+        for (i = 0; i < src->num_rates; i++)
+                dest->supported_rates[i] = src->supported_rates[i];
+        dest->num_rates = src->num_rates;
+}
+
+/* TODO: Look at sniffed packets in the air to determine if the basic rate
+ * mask should ever be used -- right now all callers to add the scan rates are
+ * set with the modulation = CCK, so BASIC_RATE_MASK is never set... */
+static void ipw_add_cck_scan_rates(struct ipw_supported_rates *rates,
+                               u8 modulation, u32 rate_mask)
+{
+        u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ? 
+                IEEE80211_BASIC_RATE_MASK : 0;
+  
+        if (rate_mask & IEEE80211_CCK_RATE_1MB_MASK)
+                rates->supported_rates[rates->num_rates++] = 
+                        IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB;
+
+        if (rate_mask & IEEE80211_CCK_RATE_2MB_MASK)
+                rates->supported_rates[rates->num_rates++] = 
+                        IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
+
+        if (rate_mask & IEEE80211_CCK_RATE_5MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask | 
+                        IEEE80211_CCK_RATE_5MB;
+
+        if (rate_mask & IEEE80211_CCK_RATE_11MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask | 
+                        IEEE80211_CCK_RATE_11MB;
+}
+
+static void ipw_add_ofdm_scan_rates(struct ipw_supported_rates *rates,
+                                u8 modulation, u32 rate_mask)
+{
+        u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ? 
+                IEEE80211_BASIC_RATE_MASK : 0;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_6MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask | 
+                        IEEE80211_OFDM_RATE_6MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_9MB_MASK)
+                rates->supported_rates[rates->num_rates++] = 
+                        IEEE80211_OFDM_RATE_9MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_12MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask | 
+                        IEEE80211_OFDM_RATE_12MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_18MB_MASK)
+                rates->supported_rates[rates->num_rates++] = 
+                        IEEE80211_OFDM_RATE_18MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_24MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask | 
+                        IEEE80211_OFDM_RATE_24MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_36MB_MASK)
+                rates->supported_rates[rates->num_rates++] = 
+                        IEEE80211_OFDM_RATE_36MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_48MB_MASK)
+                rates->supported_rates[rates->num_rates++] = 
+                        IEEE80211_OFDM_RATE_48MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_54MB_MASK)
+                rates->supported_rates[rates->num_rates++] = 
+                        IEEE80211_OFDM_RATE_54MB;
+}
+
+struct ipw_network_match {
+        struct ieee80211_network *network;
+        struct ipw_supported_rates rates;
+};
+
+static int ipw_best_network(
+        struct ipw_priv *priv,
+        struct ipw_network_match *match,
+        struct ieee80211_network *network,
+        int roaming)
+{
+        struct ipw_supported_rates rates;
+
+        /* Verify that this network's capability is compatible with the
+         * current mode (AdHoc or Infrastructure) */
+        if ((priv->ieee->iw_mode == IW_MODE_INFRA &&
+             !(network->capability & WLAN_CAPABILITY_BSS)) || 
+            (priv->ieee->iw_mode == IW_MODE_ADHOC &&
+             !(network->capability & WLAN_CAPABILITY_IBSS))) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "
+                                "capability mismatch.\n", 
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+
+        /* If we do not have an ESSID for this AP, we can not associate with
+         * it */
+        if (network->flags & NETWORK_EMPTY_ESSID) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of hidden ESSID.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+        
+        if (unlikely(roaming)) {
+                /* If we are roaming, then ensure check if this is a valid
+                 * network to try and roam to */
+                if ((network->ssid_len != match->network->ssid_len) ||
+                    memcmp(network->ssid, match->network->ssid, 
+                           network->ssid_len)) {
+                        IPW_DEBUG_ASSOC("Netowrk '%s (" MAC_FMT ")' excluded "
+                                        "because of non-network ESSID.\n",
+                                        escape_essid(network->ssid, 
+                                                     network->ssid_len),
+                                        MAC_ARG(network->bssid));
+                        return 0;
+                }
+        } else {
+                /* If an ESSID has been configured then compare the broadcast 
+                 * ESSID to ours */             
+                if ((priv->config & CFG_STATIC_ESSID) && 
+                    ((network->ssid_len != priv->essid_len) ||
+                     memcmp(network->ssid, priv->essid, 
+                            min(network->ssid_len, priv->essid_len)))) {
+                        char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
+                        strncpy(escaped, escape_essid(
+                                        network->ssid, network->ssid_len),
+                                sizeof(escaped));
+                        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                        "because of ESSID mismatch: '%s'.\n", 
+                                        escaped, MAC_ARG(network->bssid),
+                                        escape_essid(priv->essid, priv->essid_len));
+                        return 0;
+                }
+        }
+
+        /* If the old network rate is better than this one, don't bother
+         * testing everything else. */
+        if (match->network && match->network->stats.rssi > 
+            network->stats.rssi) {
+                char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
+                strncpy(escaped, 
+                        escape_essid(network->ssid, network->ssid_len), 
+                        sizeof(escaped));
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded because "
+                                "'%s (" MAC_FMT ")' has a stronger signal.\n",
+                                escaped, MAC_ARG(network->bssid),
+                                escape_essid(match->network->ssid,
+                                             match->network->ssid_len),
+                                MAC_ARG(match->network->bssid));
+                return 0;
+        }
+        
+        /* If this network has already had an association attempt within the
+         * last 3 seconds, do not try and associate again... */
+        if (network->last_associate &&
+            time_after(network->last_associate + (HZ * 5UL), jiffies)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of storming (%lu since last "
+                                "assoc attempt).\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                (jiffies - network->last_associate) / HZ);
+                return 0;
+        }
+
+        /* Now go through and see if the requested network is valid... */
+        if (priv->ieee->scan_age != 0 && 
+            jiffies - network->last_scanned > priv->ieee->scan_age) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of age: %lums.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                (jiffies - network->last_scanned) / (HZ / 100));
+                return 0;
+        }       
+
+        if ((priv->config & CFG_STATIC_CHANNEL) && 
+            (network->channel != priv->channel)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of channel mismatch: %d != %d.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                network->channel, priv->channel);
+                return 0;
+        }
+        
+        /* Verify privacy compatability */
+        if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) != 
+            ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of privacy mismatch: %s != %s.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                priv->capability & CAP_PRIVACY_ON ? "on" : 
+                                "off",
+                                network->capability & 
+                                WLAN_CAPABILITY_PRIVACY ?"on" : "off");
+                return 0;
+        }
+        
+        if ((priv->config & CFG_STATIC_BSSID) && 
+            memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of BSSID mismatch: " MAC_FMT ".\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                MAC_ARG(priv->bssid));
+                return 0;
+        }
+        
+        /* Filter out any incompatible freq / mode combinations */
+        if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of invalid frequency/mode "
+                                "combination.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+        
+        ipw_compatible_rates(priv, network, &rates);
+        if (rates.num_rates == 0) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of no compatible rates.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+        
+        /* TODO: Perform any further minimal comparititive tests.  We do not
+         * want to put too much policy logic here; intelligent scan selection
+         * should occur within a generic IEEE 802.11 user space tool.  */
+
+        /* Set up 'new' AP to this network */
+        ipw_copy_rates(&match->rates, &rates);
+        match->network = network;
+
+        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' is a viable match.\n",
+                        escape_essid(network->ssid, network->ssid_len),
+                        MAC_ARG(network->bssid));
+
+        return 1;
+}
+
+
+static void ipw_adhoc_create(struct ipw_priv *priv, 
+                            struct ieee80211_network *network)
+{
+        /*
+         * For the purposes of scanning, we can set our wireless mode
+         * to trigger scans across combinations of bands, but when it
+         * comes to creating a new ad-hoc network, we have tell the FW
+         * exactly which band to use.
+         *
+         * We also have the possibility of an invalid channel for the 
+         * chossen band.  Attempting to create a new ad-hoc network
+         * with an invalid channel for wireless mode will trigger a
+         * FW fatal error.
+         */
+        network->mode = is_valid_channel(priv->ieee->mode, priv->channel);
+        if (network->mode) {
+                network->channel = priv->channel;
+        } else {
+                IPW_WARNING("Overriding invalid channel\n");
+                if (priv->ieee->mode & IEEE_A) {
+                        network->mode = IEEE_A;
+                        priv->channel = band_a_active_channel[0];
+                } else if (priv->ieee->mode & IEEE_G) {
+                        network->mode = IEEE_G;
+                        priv->channel = band_b_active_channel[0];
+                } else {
+                        network->mode = IEEE_B;
+                        priv->channel = band_b_active_channel[0];
+                }
+        }
+
+        network->channel = priv->channel;
+        priv->config |= CFG_ADHOC_PERSIST;
+        ipw_create_bssid(priv, network->bssid);
+        network->ssid_len = priv->essid_len;
+        memcpy(network->ssid, priv->essid, priv->essid_len);
+        memset(&network->stats, 0, sizeof(network->stats));
+        network->capability = WLAN_CAPABILITY_IBSS;
+        if (priv->capability & CAP_PRIVACY_ON)
+                network->capability |= WLAN_CAPABILITY_PRIVACY;
+        network->rates_len = min(priv->rates.num_rates, MAX_RATES_LENGTH);
+        memcpy(network->rates, priv->rates.supported_rates, 
+               network->rates_len);
+        network->rates_ex_len = priv->rates.num_rates - network->rates_len;
+        memcpy(network->rates_ex, 
+               &priv->rates.supported_rates[network->rates_len],
+               network->rates_ex_len);
+        network->last_scanned = 0;
+        network->flags = 0;
+        network->last_associate = 0;
+        network->time_stamp[0] = 0;
+        network->time_stamp[1] = 0;
+        network->beacon_interval = 100; /* Default */
+        network->listen_interval = 10;  /* Default */
+        network->atim_window = 0;       /* Default */
+#ifdef CONFIG_IEEE80211_WPA             
+        network->wpa_ie_len = 0;
+        network->rsn_ie_len = 0;
+#endif /* CONFIG_IEEE80211_WPA */       
+}
+
+static void ipw_send_wep_keys(struct ipw_priv *priv)
+{
+        struct ipw_wep_key *key;
+        int i;
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_WEP_KEY,
+                .len = sizeof(*key)
+        };
+
+        key = (struct ipw_wep_key *)&cmd.param;
+        key->cmd_id = DINO_CMD_WEP_KEY;
+        key->seq_num = 0;
+
+        for (i = 0; i < 4; i++) { 
+                key->key_index = i;
+                if (!(priv->sec.flags & (1 << i))) {
+                        key->key_size = 0;
+                } else {
+                        key->key_size = priv->sec.key_sizes[i];
+                        memcpy(key->key, priv->sec.keys[i], key->key_size);
+                }
+
+                if (ipw_send_cmd(priv, &cmd)) {
+                        IPW_ERROR("failed to send WEP_KEY command\n");
+                        return;
+                }
+        }   
+}
+
+static void ipw_adhoc_check(void *data)
+{
+        struct ipw_priv *priv = data;
+        
+        if (priv->missed_adhoc_beacons++ > priv->missed_beacon_threshold &&
+            !(priv->config & CFG_ADHOC_PERSIST)) {
+                IPW_DEBUG_SCAN("Disassociating due to missed beacons\n");
+                ipw_remove_current_network(priv);
+                ipw_disassociate(priv);
+                return;
+        }
+
+        queue_delayed_work(priv->workqueue, &priv->adhoc_check, 
+                           priv->assoc_request.beacon_interval);
+}
+
+#ifdef CONFIG_IPW_DEBUG
+static void ipw_debug_config(struct ipw_priv *priv)
+{
+        IPW_DEBUG_INFO("Scan completed, no valid APs matched "
+                       "[CFG 0x%08X]\n", priv->config);
+        if (priv->config & CFG_STATIC_CHANNEL)
+                IPW_DEBUG_INFO("Channel locked to %d\n", 
+                               priv->channel);
+        else
+                IPW_DEBUG_INFO("Channel unlocked.\n");
+        if (priv->config & CFG_STATIC_ESSID)
+                IPW_DEBUG_INFO("ESSID locked to '%s'\n", 
+                               escape_essid(priv->essid, 
+                                            priv->essid_len));
+        else
+                IPW_DEBUG_INFO("ESSID unlocked.\n");
+        if (priv->config & CFG_STATIC_BSSID)
+                IPW_DEBUG_INFO("BSSID locked to %d\n", priv->channel);
+        else
+                IPW_DEBUG_INFO("BSSID unlocked.\n");
+        if (priv->capability & CAP_PRIVACY_ON)
+                IPW_DEBUG_INFO("PRIVACY on\n");
+        else
+                IPW_DEBUG_INFO("PRIVACY off\n");
+        IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask);
+}
+#else
+#define ipw_debug_config(x) do {} while (0);
+#endif
+
+static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
+                                      struct ieee80211_network *network)
+{
+        /* TODO: Verify that this works... */
+        struct ipw_fixed_rate fr = {
+                .tx_rates = priv->rates_mask
+        };
+        u32 reg;
+        u16 mask = 0;
+
+        /* Identify 'current FW band' and match it with the fixed 
+         * Tx rates */
+                
+        switch (priv->ieee->freq_band) {
+        case IEEE80211_52GHZ_BAND: /* A only */
+                /* IEEE_A */
+                if (priv->rates_mask & ~IEEE80211_OFDM_RATES_MASK) {
+                        /* Invalid fixed rate mask */
+                        fr.tx_rates = 0;
+                        break;
+                }
+                        
+                fr.tx_rates >>= IEEE80211_OFDM_SHIFT_MASK_A;
+                break;
+
+        default: /* 2.4Ghz or Mixed */
+                /* IEEE_B */
+                if (network->mode == IEEE_B) {
+                        if (fr.tx_rates & ~IEEE80211_CCK_RATES_MASK) {
+                                /* Invalid fixed rate mask */
+                                fr.tx_rates = 0;
+                        }
+                        break;
+                } 
+
+                /* IEEE_G */
+                if (fr.tx_rates & ~(IEEE80211_CCK_RATES_MASK |
+                                    IEEE80211_OFDM_RATES_MASK)) {
+                        /* Invalid fixed rate mask */
+                        fr.tx_rates = 0;
+                        break;
+                }
+
+                if (IEEE80211_OFDM_RATE_6MB_MASK & fr.tx_rates) {
+                        mask |= (IEEE80211_OFDM_RATE_6MB_MASK >> 1);
+                        fr.tx_rates &= ~IEEE80211_OFDM_RATE_6MB_MASK;
+                }
+                
+                if (IEEE80211_OFDM_RATE_9MB_MASK & fr.tx_rates) {
+                        mask |= (IEEE80211_OFDM_RATE_9MB_MASK >> 1);
+                        fr.tx_rates &= ~IEEE80211_OFDM_RATE_9MB_MASK;
+                }
+                
+                if (IEEE80211_OFDM_RATE_12MB_MASK & fr.tx_rates) {
+                        mask |= (IEEE80211_OFDM_RATE_12MB_MASK >> 1);
+                        fr.tx_rates &= ~IEEE80211_OFDM_RATE_12MB_MASK;
+                }
+                
+                fr.tx_rates |= mask;
+                break;
+        }
+
+        reg = ipw_read32(priv, IPW_MEM_FIXED_OVERRIDE);
+        ipw_write_reg32(priv, reg, *(u32*)&fr);
+}
+
+static int ipw_associate_network(struct ipw_priv *priv,
+                                 struct ieee80211_network *network,
+                                 struct ipw_supported_rates *rates,
+                                 int roaming)
+{
+        int err;
+
+        if (priv->config & CFG_FIXED_RATE)
+                ipw_set_fixed_rate(priv, network);
+
+        if (!(priv->config & CFG_STATIC_ESSID)) {
+                priv->essid_len = min(network->ssid_len, 
+                                      (u8)IW_ESSID_MAX_SIZE);
+                memcpy(priv->essid, network->ssid, priv->essid_len);
+        }
+
+        network->last_associate = jiffies;
+
+        memset(&priv->assoc_request, 0, sizeof(priv->assoc_request));
+        priv->assoc_request.channel = network->channel;
+        if ((priv->capability & CAP_PRIVACY_ON) &&
+            (priv->capability & CAP_SHARED_KEY)) {
+                priv->assoc_request.auth_type = AUTH_SHARED_KEY;
+                priv->assoc_request.auth_key = priv->sec.active_key;
+        } else {
+                priv->assoc_request.auth_type = AUTH_OPEN;
+                priv->assoc_request.auth_key = 0;
+        }
+
+        if (priv->capability & CAP_PRIVACY_ON) 
+                ipw_send_wep_keys(priv);
+
+        /* 
+         * It is valid for our ieee device to support multiple modes, but 
+         * when it comes to associating to a given network we have to choose 
+         * just one mode.
+         */
+        if (network->mode & priv->ieee->mode & IEEE_A)
+                priv->assoc_request.ieee_mode = IPW_A_MODE;
+        else if (network->mode & priv->ieee->mode & IEEE_G)
+                priv->assoc_request.ieee_mode = IPW_G_MODE;
+        else if (network->mode & priv->ieee->mode & IEEE_B)
+                priv->assoc_request.ieee_mode = IPW_B_MODE;
+
+        IPW_DEBUG_ASSOC("%sssocation attempt: '%s', channel %d, "
+                        "802.11%c [%d], enc=%s%s%s%c%c\n",
+                        roaming ? "Rea" : "A",
+                        escape_essid(priv->essid, priv->essid_len), 
+                        network->channel, 
+                        ipw_modes[priv->assoc_request.ieee_mode], 
+                        rates->num_rates, 
+                        priv->capability & CAP_PRIVACY_ON ? "on " : "off",
+                        priv->capability & CAP_PRIVACY_ON ? 
+                        (priv->capability & CAP_SHARED_KEY ? "(shared)" : 
+                         "(open)") : "",
+                        priv->capability & CAP_PRIVACY_ON ? " key=" : "",
+                        priv->capability & CAP_PRIVACY_ON ? 
+                        '1' + priv->sec.active_key : '.',
+                        priv->capability & CAP_PRIVACY_ON ? 
+                        '.' : ' ');
+
+        priv->assoc_request.beacon_interval = network->beacon_interval;
+        if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
+            (network->time_stamp[0] == 0) &&
+            (network->time_stamp[1] == 0)) {
+                priv->assoc_request.assoc_type = HC_IBSS_START;
+                priv->assoc_request.assoc_tsf_msw = 0;
+                priv->assoc_request.assoc_tsf_lsw = 0;
+        } else {
+                if (unlikely(roaming))
+                        priv->assoc_request.assoc_type = HC_REASSOCIATE;
+                else
+                        priv->assoc_request.assoc_type = HC_ASSOCIATE;
+                priv->assoc_request.assoc_tsf_msw = network->time_stamp[1];
+                priv->assoc_request.assoc_tsf_lsw = network->time_stamp[0];
+        }
+
+        memcpy(&priv->assoc_request.bssid, network->bssid, ETH_ALEN);
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                memset(&priv->assoc_request.dest, 0xFF, ETH_ALEN);
+                priv->assoc_request.atim_window = network->atim_window;
+        } else {
+                memcpy(&priv->assoc_request.dest, network->bssid, 
+                       ETH_ALEN);
+                priv->assoc_request.atim_window = 0;
+        }
+
+        priv->assoc_request.capability = network->capability;
+        priv->assoc_request.listen_interval = network->listen_interval;
+        
+        err = ipw_send_ssid(priv, priv->essid, priv->essid_len);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send SSID command failed.\n");
+                return err;
+        }
+
+        rates->ieee_mode = priv->assoc_request.ieee_mode;
+        rates->purpose = IPW_RATE_CONNECT;
+        ipw_send_supported_rates(priv, rates);
+        
+        if (priv->assoc_request.ieee_mode == IPW_G_MODE)
+                priv->sys_config.dot11g_auto_detection = 1;
+        else
+                priv->sys_config.dot11g_auto_detection = 0;
+        err = ipw_send_system_config(priv, &priv->sys_config);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send sys config command failed.\n");
+                return err;
+        }
+        
+        IPW_DEBUG_ASSOC("Association sensitivity: %d\n", network->stats.rssi);
+        err = ipw_set_sensitivity(priv, network->stats.rssi);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send associate command failed.\n");
+                return err;
+        }
+
+        /*
+         * If preemption is enabled, it is possible for the association
+         * to complete before we return from ipw_send_associate.  Therefore
+         * we have to be sure and update our priviate data first.
+         */
+        priv->channel = network->channel;
+        memcpy(priv->bssid, network->bssid, ETH_ALEN);
+        priv->status |= STATUS_ASSOCIATING;     
+        priv->status &= ~STATUS_SECURITY_UPDATED;
+
+        priv->assoc_network = network;
+
+        err = ipw_send_associate(priv, &priv->assoc_request);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send associate command failed.\n");
+                return err;
+        }
+        
+        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' " MAC_FMT " \n", 
+                  escape_essid(priv->essid, priv->essid_len),
+                  MAC_ARG(priv->bssid));
+
+        return 0;
+}
+
+static void ipw_roam(void *data)
+{
+        struct ipw_priv *priv = data;
+        struct ieee80211_network *network = NULL;
+        struct ipw_network_match match = {
+                .network = priv->assoc_network
+        };
+
+        /* The roaming process is as follows:
+         * 
+         * 1.  Missed beacon threshold triggers the roaming process by 
+         *     setting the status ROAM bit and requesting a scan.
+         * 2.  When the scan completes, it schedules the ROAM work
+         * 3.  The ROAM work looks at all of the known networks for one that
+         *     is a better network than the currently associated.  If none
+         *     found, the ROAM process is over (ROAM bit cleared)
+         * 4.  If a better network is found, a disassociation request is
+         *     sent.
+         * 5.  When the disassociation completes, the roam work is again
+         *     scheduled.  The second time through, the driver is no longer
+         *     associated, and the newly selected network is sent an
+         *     association request.  
+         * 6.  At this point ,the roaming process is complete and the ROAM
+         *     status bit is cleared.
+         */
+
+        /* If we are no longer associated, and the roaming bit is no longer
+         * set, then we are not actively roaming, so just return */
+        if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ROAMING)))
+                return;
+        
+        if (priv->status & STATUS_ASSOCIATED) {
+                /* First pass through ROAM process -- look for a better 
+                 * network */
+                u8 rssi = priv->assoc_network->stats.rssi;
+                priv->assoc_network->stats.rssi = -128;
+                list_for_each_entry(network, &priv->ieee->network_list, list) {
+                        if (network != priv->assoc_network)
+                                ipw_best_network(priv, &match, network, 1);
+                }
+                priv->assoc_network->stats.rssi = rssi;
+                
+                if (match.network == priv->assoc_network) {
+                        IPW_DEBUG_ASSOC("No better APs in this network to "
+                                        "roam to.\n");
+                        priv->status &= ~STATUS_ROAMING;
+                        ipw_debug_config(priv);
+                        return;
+                }
+                
+                ipw_send_disassociate(priv, 1);
+                priv->assoc_network = match.network;
+
+                return;
+        } 
+
+        /* Second pass through ROAM process -- request association */
+        ipw_compatible_rates(priv, priv->assoc_network, &match.rates);
+        ipw_associate_network(priv, priv->assoc_network, &match.rates, 1);
+        priv->status &= ~STATUS_ROAMING;
+}
+
+static void ipw_associate(void *data)
+{
+        struct ipw_priv *priv = data;
+
+        struct ieee80211_network *network = NULL;
+        struct ipw_network_match match = {
+                .network = NULL
+        };
+        struct ipw_supported_rates *rates;
+        struct list_head *element;
+
+        if (!(priv->config & CFG_ASSOCIATE) &&
+            !(priv->config & (CFG_STATIC_ESSID |
+                              CFG_STATIC_CHANNEL |
+                              CFG_STATIC_BSSID))) {
+                IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n");
+                return;
+        }
+
+        list_for_each_entry(network, &priv->ieee->network_list, list) 
+                ipw_best_network(priv, &match, network, 0);
+
+        network = match.network;
+        rates = &match.rates;
+
+        if (network == NULL &&
+            priv->ieee->iw_mode == IW_MODE_ADHOC &&
+            priv->config & CFG_ADHOC_CREATE &&
+            priv->config & CFG_STATIC_ESSID &&
+            !list_empty(&priv->ieee->network_free_list)) {
+                element = priv->ieee->network_free_list.next;
+                network = list_entry(element, struct ieee80211_network, 
+                                     list);
+                ipw_adhoc_create(priv, network);
+                rates = &priv->rates;
+                list_del(element);
+                list_add_tail(&network->list, &priv->ieee->network_list);
+        }
+            
+        /* If we reached the end of the list, then we don't have any valid
+         * matching APs */
+        if (!network) {
+                ipw_debug_config(priv);
+
+                queue_delayed_work(priv->workqueue, &priv->request_scan, 
+                                   SCAN_INTERVAL);
+                
+                return;
+        }
+
+        ipw_associate_network(priv, network, rates, 0);
+}
+        
+static inline void ipw_handle_data_packet(struct ipw_priv *priv, 
+                                              struct ipw_rx_mem_buffer *rxb,
+                                              struct ieee80211_rx_stats *stats)
+{
+        struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data;
+
+        /* We received data from the HW, so stop the watchdog */
+        priv->net_dev->trans_start = jiffies;
+
+        /* We only process data packets if the 
+         * interface is open */
+        if (unlikely((pkt->u.frame.length + IPW_RX_FRAME_SIZE) > 
+                     skb_tailroom(rxb->skb))) {
+                priv->ieee->stats.rx_errors++;
+                priv->wstats.discard.misc++;
+                IPW_DEBUG_DROP("Corruption detected! Oh no!\n");
+                return;
+        } else if (unlikely(!netif_running(priv->net_dev))) {
+                priv->ieee->stats.rx_dropped++;
+                priv->wstats.discard.misc++;
+                IPW_DEBUG_DROP("Dropping packet while interface is not up.\n");
+                return;
+        }
+
+        /* Advance skb->data to the start of the actual payload */
+        skb_reserve(rxb->skb, offsetof(struct ipw_rx_packet, u.frame.data));
+
+        /* Set the size of the skb to the size of the frame */
+        skb_put(rxb->skb, pkt->u.frame.length);
+
+        IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len);
+
+        if (!ieee80211_rx(priv->ieee, rxb->skb, stats)) 
+                priv->ieee->stats.rx_errors++;
+        else /* ieee80211_rx succeeded, so it now owns the SKB */
+                rxb->skb = NULL;
+}
+
+
+/*
+ * Main entry function for recieving a packet with 80211 headers.  This
+ * should be called when ever the FW has notified us that there is a new
+ * skb in the recieve queue.
+ */
+static void ipw_rx(struct ipw_priv *priv)
+{
+        struct ipw_rx_mem_buffer *rxb;
+        struct ipw_rx_packet *pkt;
+        struct ieee80211_hdr *header;
+        u32 r, w, i;
+        u8 network_packet;
+
+        r = ipw_read32(priv, CX2_RX_READ_INDEX);
+        w = ipw_read32(priv, CX2_RX_WRITE_INDEX);
+        i = (priv->rxq->processed + 1) % RX_QUEUE_SIZE;
+
+        while (i != r) {
+                rxb = priv->rxq->queue[i];
+#ifdef CONFIG_IPW_DEBUG
+                if (unlikely(rxb == NULL)) {
+                        printk(KERN_CRIT "Queue not allocated!\n");
+                        break;
+                }
+#endif
+                priv->rxq->queue[i] = NULL;
+
+                pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->dma_addr,
+                                            CX2_RX_BUF_SIZE, 
+                                            PCI_DMA_FROMDEVICE);
+
+                pkt = (struct ipw_rx_packet *)rxb->skb->data;
+                IPW_DEBUG_RX("Packet: type=%02X seq=%02X bits=%02X\n",
+                             pkt->header.message_type,
+                             pkt->header.rx_seq_num,
+                             pkt->header.control_bits);
+
+                switch (pkt->header.message_type) {
+                case RX_FRAME_TYPE: /* 802.11 frame */ {
+                        struct ieee80211_rx_stats stats = {
+                                .rssi = pkt->u.frame.rssi_dbm - 
+                                IPW_RSSI_TO_DBM,
+                                .signal = pkt->u.frame.signal,
+                                .rate = pkt->u.frame.rate,
+                                .mac_time = jiffies,
+                                .received_channel = 
+                                pkt->u.frame.received_channel,
+                                .freq = (pkt->u.frame.control & (1<<0)) ? 
+                                IEEE80211_24GHZ_BAND : IEEE80211_52GHZ_BAND,
+                                .len = pkt->u.frame.length,
+                        };
+
+                        if (stats.rssi != 0)
+                                stats.mask |= IEEE80211_STATMASK_RSSI;
+                        if (stats.signal != 0)
+                                stats.mask |= IEEE80211_STATMASK_SIGNAL;
+                        if (stats.rate != 0)
+                                stats.mask |= IEEE80211_STATMASK_RATE;
+
+                        priv->rx_packets++;
+
+#ifdef CONFIG_IPW_PROMISC
+                        if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                                ipw_handle_data_packet(priv, rxb, &stats);
+                                break;
+                        }
+#endif
+                        
+                        header = (struct ieee80211_hdr *)(rxb->skb->data + 
+                                                          IPW_RX_FRAME_SIZE);
+                                /* TODO: Check Ad-Hoc dest/source and make sure
+                                 * that we are actually parsing these packets
+                                 * correctly -- we should probably use the 
+                                 * frame control of the packet and disregard
+                                 * the current iw_mode */
+                        switch (priv->ieee->iw_mode) {
+                        case IW_MODE_ADHOC:
+                                network_packet = 
+                                        !memcmp(header->addr1, 
+                                                priv->net_dev->dev_addr, 
+                                                ETH_ALEN) ||
+                                        !memcmp(header->addr3, 
+                                                priv->bssid, ETH_ALEN) ||
+                                        is_broadcast_ether_addr(header->addr1) ||
+                                        is_multicast_ether_addr(header->addr1);
+                                break;
+
+                        case IW_MODE_INFRA:
+                        default:
+                                network_packet = 
+                                        !memcmp(header->addr3, 
+                                                priv->bssid, ETH_ALEN) ||
+                                        !memcmp(header->addr1, 
+                                                priv->net_dev->dev_addr, 
+                                                ETH_ALEN) ||
+                                        is_broadcast_ether_addr(header->addr1) ||
+                                        is_multicast_ether_addr(header->addr1);
+                                break;
+                        }
+                        
+                        if (network_packet && priv->assoc_network) {
+                                priv->assoc_network->stats.rssi = stats.rssi;
+                                average_add(&priv->average_rssi, 
+                                            stats.rssi);
+                                priv->last_rx_rssi = stats.rssi;
+                        }
+
+                        IPW_DEBUG_RX("Frame: len=%u\n", pkt->u.frame.length);
+
+                        if (pkt->u.frame.length < frame_hdr_len(header)) {
+                                IPW_DEBUG_DROP("Received packet is too small. "
+                                               "Dropping.\n");
+                                priv->ieee->stats.rx_errors++;
+                                priv->wstats.discard.misc++;
+                                break;
+                        }
+                        
+                        switch (WLAN_FC_GET_TYPE(header->frame_ctl)) {
+                        case IEEE80211_FTYPE_MGMT:
+                                ieee80211_rx_mgt(priv->ieee, header, &stats);
+                                if (priv->ieee->iw_mode == IW_MODE_ADHOC &&
+                                    ((WLAN_FC_GET_STYPE(header->frame_ctl) ==
+                                      IEEE80211_STYPE_PROBE_RESP) ||
+                                     (WLAN_FC_GET_STYPE(header->frame_ctl) ==
+                                      IEEE80211_STYPE_BEACON)) &&
+                                    !memcmp(header->addr3, priv->bssid, ETH_ALEN))
+                                        ipw_add_station(priv, header->addr2);
+                                break;
+                                
+                        case IEEE80211_FTYPE_CTL:
+                                break;
+                                
+                        case IEEE80211_FTYPE_DATA:
+                                if (network_packet)
+                                        ipw_handle_data_packet(priv, rxb, &stats);
+                                else
+                                        IPW_DEBUG_DROP("Dropping: " MAC_FMT 
+                                                       ", " MAC_FMT ", " MAC_FMT "\n",
+                                                       MAC_ARG(header->addr1), MAC_ARG(header->addr2), 
+                                                       MAC_ARG(header->addr3));
+                                break;
+                        }
+                        break;
+                }
+
+                case RX_HOST_NOTIFICATION_TYPE: {
+                        IPW_DEBUG_RX("Notification: subtype=%02X flags=%02X size=%d\n",
+                                     pkt->u.notification.subtype,
+                                     pkt->u.notification.flags,
+                                     pkt->u.notification.size);
+                        ipw_rx_notification(priv, &pkt->u.notification);
+                        break;
+                }
+
+                default:
+                        IPW_DEBUG_RX("Bad Rx packet of type %d\n",
+                                     pkt->header.message_type);
+                        break;
+                }
+                
+                /* For now we just don't re-use anything.  We can tweak this 
+                 * later to try and re-use notification packets and SKBs that 
+                 * fail to Rx correctly */
+                if (rxb->skb != NULL) {
+                        dev_kfree_skb_any(rxb->skb);
+                        rxb->skb = NULL;
+                }
+                
+                pci_unmap_single(priv->pci_dev, rxb->dma_addr,
+                                 CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                list_add_tail(&rxb->list, &priv->rxq->rx_used);
+                
+                i = (i + 1) % RX_QUEUE_SIZE;
+        }
+
+        /* Backtrack one entry */
+        priv->rxq->processed = (i ? i : RX_QUEUE_SIZE) - 1;
+
+        ipw_rx_queue_restock(priv);
+}
+
+static void ipw_abort_scan(struct ipw_priv *priv)
+{
+        int err;
+
+        if (priv->status & STATUS_SCAN_ABORTING) {
+                IPW_DEBUG_HC("Ignoring concurrent scan abort request.\n");
+                return;
+        }
+        priv->status |= STATUS_SCAN_ABORTING;
+
+        err = ipw_send_scan_abort(priv);
+        if (err) 
+                IPW_DEBUG_HC("Request to abort scan failed.\n");
+}
+
+static int ipw_request_scan(struct ipw_priv *priv)
+{
+        struct ipw_scan_request_ext scan;
+        int channel_index = 0;
+        int i, err, scan_type;
+        
+        if (priv->status & STATUS_EXIT_PENDING) {
+                IPW_DEBUG_SCAN("Aborting scan due to device shutdown\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                return 0;
+        }
+
+        if (priv->status & STATUS_SCANNING) {
+                IPW_DEBUG_HC("Concurrent scan requested.  Aborting first.\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                ipw_abort_scan(priv);
+                return 0;
+        }
+        
+        if (priv->status & STATUS_SCAN_ABORTING) {
+                IPW_DEBUG_HC("Scan request while abort pending.  Queuing.\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                return 0;
+        }
+
+        if (priv->status & STATUS_RF_KILL_MASK) {
+                IPW_DEBUG_HC("Aborting scan due to RF Kill activation\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                return 0;
+        }
+
+        memset(&scan, 0, sizeof(scan));
+
+        scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_SCAN] = 20;
+        scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN] = 20;
+        scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = 20;
+
+        scan.full_scan_index = ieee80211_get_scans(priv->ieee);
+        /* If we are roaming, then make this a directed scan for the current
+         * network.  Otherwise, ensure that every other scan is a fast 
+         * channel hop scan */
+        if ((priv->status & STATUS_ROAMING) || (
+                    !(priv->status & STATUS_ASSOCIATED) && 
+                    (priv->config & CFG_STATIC_ESSID) && 
+                    (scan.full_scan_index % 2))) {
+                err = ipw_send_ssid(priv, priv->essid, priv->essid_len);
+                if (err) {
+                        IPW_DEBUG_HC("Attempt to send SSID command failed.\n");
+                        return err;
+                }
+                
+                scan_type = IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN;
+        } else {
+                scan_type = IPW_SCAN_ACTIVE_BROADCAST_SCAN;
+        }
+        
+        if (priv->ieee->freq_band & IEEE80211_52GHZ_BAND) {
+                int start = channel_index;
+                for (i = 0; i < MAX_A_CHANNELS; i++) {
+                        if (band_a_active_channel[i] == 0)
+                                break;
+                        if ((priv->status & STATUS_ASSOCIATED) &&
+                            band_a_active_channel[i] == priv->channel)
+                                continue;
+                        channel_index++;
+                        scan.channels_list[channel_index] = 
+                                band_a_active_channel[i];
+                        ipw_set_scan_type(&scan, channel_index, scan_type);
+                }
+                
+                if (start != channel_index) {
+                        scan.channels_list[start] = (u8)(IPW_A_MODE << 6) | 
+                                (channel_index - start);
+                        channel_index++;
+                }
+        }
+
+        if (priv->ieee->freq_band & IEEE80211_24GHZ_BAND) {
+                int start = channel_index;
+                for (i = 0; i < MAX_B_CHANNELS; i++) {
+                        if (band_b_active_channel[i] == 0)
+                                break;
+                        if ((priv->status & STATUS_ASSOCIATED) &&
+                            band_b_active_channel[i] == priv->channel)
+                                continue;
+                        channel_index++;
+                        scan.channels_list[channel_index] = 
+                                band_b_active_channel[i];
+                        ipw_set_scan_type(&scan, channel_index, scan_type);
+                }
+
+                if (start != channel_index) {
+                        scan.channels_list[start] = (u8)(IPW_B_MODE << 6) | 
+                                (channel_index - start);
+                }
+        }
+        
+        err = ipw_send_scan_request_ext(priv, &scan);
+        if (err) {
+                IPW_DEBUG_HC("Sending scan command failed: %08X\n",
+                             err);
+                return -EIO;
+        }
+
+        priv->status |= STATUS_SCANNING;
+        priv->status &= ~STATUS_SCAN_PENDING;
+
+        return 0;
+}
+
+/*
+ * This file defines the Wireless Extension handlers.  It does not
+ * define any methods of hardware manipulation and relies on the
+ * functions defined in ipw_main to provide the HW interaction.
+ * 
+ * The exception to this is the use of the ipw_get_ordinal() 
+ * function used to poll the hardware vs. making unecessary calls.
+ *
+ */
+
+static int ipw_wx_get_name(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        if (!(priv->status & STATUS_ASSOCIATED))
+                strcpy(wrqu->name, "unassociated");
+        else 
+                snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11%c",
+                         ipw_modes[priv->assoc_request.ieee_mode]);
+        IPW_DEBUG_WX("Name: %s\n", wrqu->name);
+        return 0;
+}
+
+static int ipw_set_channel(struct ipw_priv *priv, u8 channel)
+{
+        if (channel == 0) {
+                IPW_DEBUG_INFO("Setting channel to ANY (0)\n");
+                priv->config &= ~CFG_STATIC_CHANNEL;
+                if (!(priv->status & (STATUS_SCANNING | STATUS_ASSOCIATED |
+                                      STATUS_ASSOCIATING))) {
+                        IPW_DEBUG_ASSOC("Attempting to associate with new "
+                                        "parameters.\n");
+                        ipw_associate(priv);
+                }
+
+                return 0;
+        }
+
+        priv->config |= CFG_STATIC_CHANNEL;
+
+        if (priv->channel == channel) {
+                IPW_DEBUG_INFO(
+                        "Request to set channel to current value (%d)\n",
+                        channel);
+                return 0;
+        }
+
+        IPW_DEBUG_INFO("Setting channel to %i\n", (int)channel);
+        priv->channel = channel;
+
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new channel (causing us to disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                IPW_DEBUG_ASSOC("Disassociating due to channel change.\n");
+                ipw_disassociate(priv);
+        } else {
+                ipw_associate(priv);
+        }
+
+        return 0;
+}
+
+static int ipw_wx_set_freq(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra) 
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct iw_freq *fwrq = &wrqu->freq;
+        
+        /* if setting by freq convert to channel */
+        if (fwrq->e == 1) {
+                if ((fwrq->m >= (int) 2.412e8 &&
+                     fwrq->m <= (int) 2.487e8)) {
+                        int f = fwrq->m / 100000;
+                        int c = 0;
+                        
+                        while ((c < REG_MAX_CHANNEL) &&
+                               (f != ipw_frequencies[c]))
+                                c++;
+                        
+                        /* hack to fall through */
+                        fwrq->e = 0;
+                        fwrq->m = c + 1;
+                }
+        }
+        
+        if (fwrq->e > 0 || fwrq->m > 1000) 
+                return -EOPNOTSUPP;
+
+        IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
+        return ipw_set_channel(priv, (u8)fwrq->m);
+        
+        return 0;
+}
+
+
+static int ipw_wx_get_freq(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        wrqu->freq.e = 0;
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured CHANNEL then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_CHANNEL ||
+            priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED))
+                wrqu->freq.m = priv->channel;
+        else 
+                wrqu->freq.m = 0;
+
+        IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel);
+        return 0;
+}
+
+static int ipw_wx_set_mode(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        IPW_DEBUG_WX("Set MODE: %d\n", wrqu->mode);
+
+        if (wrqu->mode == priv->ieee->iw_mode)
+                return 0;
+
+        switch (wrqu->mode) {
+#ifdef CONFIG_IPW_PROMISC
+        case IW_MODE_MONITOR:
+#endif
+        case IW_MODE_ADHOC:
+        case IW_MODE_INFRA:
+                break;
+        case IW_MODE_AUTO:
+                wrqu->mode = IW_MODE_INFRA;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+#ifdef CONFIG_IPW_PROMISC
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR) 
+                priv->net_dev->type = ARPHRD_ETHER;
+        
+        if (wrqu->mode == IW_MODE_MONITOR) 
+                priv->net_dev->type = ARPHRD_IEEE80211;
+#endif /* CONFIG_IPW_PROMISC */
+        
+#ifdef CONFIG_PM
+        /* Free the existing firmware and reset the fw_loaded 
+         * flag so ipw_load() will bring in the new firmawre */
+        if (fw_loaded) {
+                fw_loaded = 0;
+        }
+
+        release_firmware(bootfw);
+        release_firmware(ucode);
+        release_firmware(firmware);
+        bootfw = ucode = firmware = NULL;
+#endif
+
+        priv->ieee->iw_mode = wrqu->mode;
+        ipw_adapter_restart(priv);
+        
+        return err;
+}
+
+static int ipw_wx_get_mode(struct net_device *dev, 
+                               struct iw_request_info *info, 
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        wrqu->mode = priv->ieee->iw_mode;
+        IPW_DEBUG_WX("Get MODE -> %d\n", wrqu->mode);
+
+        return 0;
+}
+
+
+#define DEFAULT_RTS_THRESHOLD     2304U
+#define MIN_RTS_THRESHOLD         1U
+#define MAX_RTS_THRESHOLD         2304U
+#define DEFAULT_BEACON_INTERVAL   100U
+#define DEFAULT_SHORT_RETRY_LIMIT 7U
+#define DEFAULT_LONG_RETRY_LIMIT  4U
+
+/* Values are in microsecond */
+static const s32 timeout_duration[] = {
+        350000,
+        250000,
+        75000,
+        37000,
+        25000,
+};
+
+static const s32 period_duration[] = {
+        400000,
+        700000,
+        1000000,
+        1000000,
+        1000000
+};
+
+static int ipw_wx_get_range(struct net_device *dev, 
+                            struct iw_request_info *info, 
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct iw_range *range = (struct iw_range *)extra;
+        u16 val;
+        int i;
+
+        wrqu->data.length = sizeof(*range);
+        memset(range, 0, sizeof(*range));
+
+        /* 54Mbs == ~27 Mb/s real (802.11g) */
+        range->throughput = 27 * 1000 * 1000;     
+
+        range->max_qual.qual = 100;
+        /* TODO: Find real max RSSI and stick here */
+        range->max_qual.level = 0;
+        range->max_qual.noise = 0;
+        range->max_qual.updated = 7; /* Updated all three */
+
+        range->avg_qual.qual = 70;
+        /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
+        range->avg_qual.level = 0; /* FIXME to real average level */
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = 7; /* Updated all three */
+
+        range->num_bitrates = min(priv->rates.num_rates, (u8)IW_MAX_BITRATES);
+
+        for (i = 0; i < range->num_bitrates; i++) 
+                range->bitrate[i] = (priv->rates.supported_rates[i] & 0x7F) * 
+                        500000;
+        
+        range->max_rts = DEFAULT_RTS_THRESHOLD;
+        range->min_frag = MIN_FRAG_THRESHOLD;
+        range->max_frag = MAX_FRAG_THRESHOLD;
+
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13; 
+        range->num_encoding_sizes = 2;
+        range->max_encoding_tokens = WEP_KEYS;
+
+        /* Set the Wireless Extension versions */
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 16;
+
+        range->num_channels = FREQ_COUNT;
+
+        val = 0;
+        for (i = 0; i < FREQ_COUNT; i++) {
+                range->freq[val].i = i + 1;
+                range->freq[val].m = ipw_frequencies[i] * 100000;
+                range->freq[val].e = 1;
+                val++;
+
+                if (val == IW_MAX_FREQUENCIES)
+                        break;
+        }
+        range->num_frequency = val;
+
+        IPW_DEBUG_WX("GET Range\n");
+        return 0;
+}
+
+static int ipw_wx_set_wap(struct net_device *dev, 
+                          struct iw_request_info *info, 
+                          union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        static const unsigned char any[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
+        static const unsigned char off[] = {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+
+        if (wrqu->ap_addr.sa_family != ARPHRD_ETHER) 
+                return -EINVAL;
+
+        if (!memcmp(any, wrqu->ap_addr.sa_data, ETH_ALEN) ||
+            !memcmp(off, wrqu->ap_addr.sa_data, ETH_ALEN)) {
+                /* we disable mandatory BSSID association */
+                IPW_DEBUG_WX("Setting AP BSSID to ANY\n");
+                priv->config &= ~CFG_STATIC_BSSID;
+                if (!(priv->status & (STATUS_SCANNING | STATUS_ASSOCIATED |
+                                      STATUS_ASSOCIATING))) {
+                        IPW_DEBUG_ASSOC("Attempting to associate with new "
+                                        "parameters.\n");
+                        ipw_associate(priv);
+                }
+
+                return 0;
+        }
+
+        priv->config |= CFG_STATIC_BSSID;
+        if (!memcmp(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN)) {
+                IPW_DEBUG_WX("BSSID set to current BSSID.\n");
+                return 0;
+        }
+
+        IPW_DEBUG_WX("Setting mandatory BSSID to " MAC_FMT "\n",
+                     MAC_ARG(wrqu->ap_addr.sa_data));
+
+        memcpy(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
+
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new BSSID (causing us to disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                IPW_DEBUG_ASSOC("Disassociating due to BSSID change.\n");
+                ipw_disassociate(priv);
+        } else {
+                ipw_associate(priv);
+        }
+
+        return 0;
+}
+
+static int ipw_wx_get_wap(struct net_device *dev, 
+                          struct iw_request_info *info, 
+                          union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        /* If we are associated, trying to associate, or have a statically
+         * configured BSSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_BSSID || 
+            priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                wrqu->ap_addr.sa_family = ARPHRD_ETHER;
+                memcpy(wrqu->ap_addr.sa_data, &priv->bssid, ETH_ALEN);
+        } else
+                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+
+        IPW_DEBUG_WX("Getting WAP BSSID: " MAC_FMT "\n",
+                     MAC_ARG(wrqu->ap_addr.sa_data));
+        return 0;
+}
+
+static int ipw_wx_set_essid(struct net_device *dev, 
+                            struct iw_request_info *info, 
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        char *essid = ""; /* ANY */
+        int length = 0;
+  
+        if (wrqu->essid.flags && wrqu->essid.length) {
+                length = wrqu->essid.length - 1;
+                essid = extra;
+        }
+        if (length == 0) {
+                IPW_DEBUG_WX("Setting ESSID to ANY\n");
+                priv->config &= ~CFG_STATIC_ESSID;
+                if (!(priv->status & (STATUS_SCANNING | STATUS_ASSOCIATED |
+                                      STATUS_ASSOCIATING))) {
+                        IPW_DEBUG_ASSOC("Attempting to associate with new "
+                                        "parameters.\n");
+                        ipw_associate(priv);
+                }
+
+                return 0;
+        }
+
+        length = min(length, IW_ESSID_MAX_SIZE);
+
+        priv->config |= CFG_STATIC_ESSID;
+
+        if (priv->essid_len == length && !memcmp(priv->essid, extra, length)) {
+                IPW_DEBUG_WX("ESSID set to current ESSID.\n");
+                return 0;
+        }
+
+        IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(essid, length),
+                     length);
+
+        priv->essid_len = length;
+        memcpy(priv->essid, essid, priv->essid_len);
+        
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new ESSID (causing us to disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                IPW_DEBUG_ASSOC("Disassociating due to ESSID change.\n");
+                ipw_disassociate(priv);
+        } else {
+                ipw_associate(priv);
+        }
+
+        return 0;
+}
+
+static int ipw_wx_get_essid(struct net_device *dev, 
+                            struct iw_request_info *info, 
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured ESSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_ESSID ||
+            priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) { 
+                IPW_DEBUG_WX("Getting essid: '%s'\n", 
+                             escape_essid(priv->essid, priv->essid_len));
+                memcpy(extra, priv->essid, priv->essid_len); 
+                wrqu->essid.length = priv->essid_len;
+                wrqu->essid.flags = 1; /* active */
+        } else {
+                IPW_DEBUG_WX("Getting essid: ANY\n");
+                wrqu->essid.length = 0;
+                wrqu->essid.flags = 0; /* active */
+        }
+
+        return 0;
+}
+
+static int ipw_wx_set_nick(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        IPW_DEBUG_WX("Setting nick to '%s'\n", extra);
+        if (wrqu->data.length > IW_ESSID_MAX_SIZE)
+                return -E2BIG;
+
+        wrqu->data.length = min((size_t)wrqu->data.length, sizeof(priv->nick));
+        memset(priv->nick, 0, sizeof(priv->nick));
+        memcpy(priv->nick, extra,  wrqu->data.length);
+        IPW_DEBUG_TRACE("<<\n");
+        return 0;
+
+}
+
+
+static int ipw_wx_get_nick(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_WX("Getting nick\n");
+        wrqu->data.length = strlen(priv->nick) + 1;
+        memcpy(extra, priv->nick, wrqu->data.length);
+        wrqu->data.flags = 1; /* active */
+        return 0;
+}
+
+
+static int ipw_wx_set_rate(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{ 
+        IPW_DEBUG_WX("0x%p, 0x%p, 0x%p\n", dev, info, wrqu);
+        return -EOPNOTSUPP; 
+}
+
+static int ipw_wx_get_rate(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv * priv = ieee80211_priv(dev);
+        wrqu->bitrate.value = priv->last_rate;
+
+        IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
+        return 0;
+}
+
+
+static int ipw_wx_set_rts(struct net_device *dev, 
+                          struct iw_request_info *info, 
+                          union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (wrqu->rts.disabled)
+                priv->rts_threshold = DEFAULT_RTS_THRESHOLD;
+        else {
+                if (wrqu->rts.value < MIN_RTS_THRESHOLD ||
+                    wrqu->rts.value > MAX_RTS_THRESHOLD)
+                        return -EINVAL;
+                
+                priv->rts_threshold = wrqu->rts.value;
+        }
+
+        ipw_send_rts_threshold(priv, priv->rts_threshold);
+        IPW_DEBUG_WX("SET RTS Threshold -> %d \n", priv->rts_threshold);
+        return 0;
+}
+
+static int ipw_wx_get_rts(struct net_device *dev, 
+                          struct iw_request_info *info, 
+                          union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        wrqu->rts.value = priv->rts_threshold;
+        wrqu->rts.fixed = 0;    /* no auto select */
+        wrqu->rts.disabled = 
+                (wrqu->rts.value == DEFAULT_RTS_THRESHOLD);
+
+        IPW_DEBUG_WX("GET RTS Threshold -> %d \n", wrqu->rts.value);
+        return 0;
+}
+
+
+static int ipw_wx_set_txpow(struct net_device *dev, 
+                            struct iw_request_info *info, 
+                            union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct ipw_tx_power tx_power;
+        int i;
+
+        if (ipw_radio_kill_sw(priv, wrqu->power.disabled))
+                return -EINPROGRESS;
+
+        if (wrqu->power.flags != IW_TXPOW_DBM)
+                return -EINVAL;
+
+        if ((wrqu->power.value > 20) || 
+            (wrqu->power.value < -12))
+                return -EINVAL;
+
+        priv->tx_power = wrqu->power.value;
+
+        memset(&tx_power, 0, sizeof(tx_power));
+
+        /* configure device for 'G' band */
+        tx_power.ieee_mode = IPW_G_MODE;
+        tx_power.num_channels = 11;
+        for (i = 0; i < 11; i++) {
+                tx_power.channels_tx_power[i].channel_number = i + 1;
+                tx_power.channels_tx_power[i].tx_power = priv->tx_power;
+        }
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        /* configure device to also handle 'B' band */
+        tx_power.ieee_mode = IPW_B_MODE;
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        return 0;
+
+ error:
+        return -EIO;
+}
+
+
+static int ipw_wx_get_txpow(struct net_device *dev, 
+                            struct iw_request_info *info, 
+                            union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        wrqu->power.value = priv->tx_power;
+        wrqu->power.fixed = 1;
+        wrqu->power.flags = IW_TXPOW_DBM;
+        wrqu->power.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;
+
+        IPW_DEBUG_WX("GET TX Power -> %s %d \n", 
+                     wrqu->power.disabled ? "ON" : "OFF",
+                     wrqu->power.value);
+
+        return 0;
+}
+
+static int ipw_wx_set_frag(struct net_device *dev, 
+                               struct iw_request_info *info, 
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (wrqu->frag.disabled)
+                priv->ieee->fts = DEFAULT_FTS;
+        else {
+                if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||
+                    wrqu->frag.value > MAX_FRAG_THRESHOLD)
+                        return -EINVAL;
+                
+                priv->ieee->fts = wrqu->frag.value & ~0x1;
+        }
+
+        ipw_send_frag_threshold(priv, wrqu->frag.value);
+        IPW_DEBUG_WX("SET Frag Threshold -> %d \n", wrqu->frag.value);
+        return 0;
+}
+
+static int ipw_wx_get_frag(struct net_device *dev, 
+                               struct iw_request_info *info, 
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        wrqu->frag.value = priv->ieee->fts;
+        wrqu->frag.fixed = 0;   /* no auto select */
+        wrqu->frag.disabled = 
+                (wrqu->frag.value == DEFAULT_FTS);
+
+        IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
+
+        return 0;
+}
+
+static int ipw_wx_set_retry(struct net_device *dev, 
+                            struct iw_request_info *info, 
+                            union iwreq_data *wrqu, char *extra)
+{ 
+        IPW_DEBUG_WX("0x%p, 0x%p, 0x%p\n", dev, info, wrqu);
+        return -EOPNOTSUPP; 
+}
+
+
+static int ipw_wx_get_retry(struct net_device *dev, 
+                            struct iw_request_info *info, 
+                            union iwreq_data *wrqu, char *extra)
+{ 
+        IPW_DEBUG_WX("0x%p, 0x%p, 0x%p\n", dev, info, wrqu);
+        return -EOPNOTSUPP; 
+}
+
+
+static int ipw_wx_set_scan(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_WX("Start scan\n");
+        if (ipw_request_scan(priv))
+                return -EIO;
+        return 0;
+}
+
+static int ipw_wx_get_scan(struct net_device *dev, 
+                           struct iw_request_info *info, 
+                           union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra);
+}
+
+static int ipw_wx_set_encode(struct net_device *dev, 
+                                 struct iw_request_info *info, 
+                                 union iwreq_data *wrqu, char *key)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw_wx_get_encode(struct net_device *dev, 
+                                 struct iw_request_info *info, 
+                                 union iwreq_data *wrqu, char *key)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw_wx_set_power(struct net_device *dev, 
+                                struct iw_request_info *info, 
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int err;
+
+        if (wrqu->power.disabled) {
+                priv->power_mode = IPW_POWER_LEVEL(priv->power_mode);
+                err = ipw_send_power_mode(priv, IPW_POWER_MODE_CAM);
+                if (err) {
+                        IPW_DEBUG_WX("failed setting power mode.\n");
+                        return err;
+                }
+
+                IPW_DEBUG_WX("SET Power Management Mode -> off\n");
+
+                return 0;
+        } 
+
+        switch (wrqu->power.flags & IW_POWER_MODE) {
+        case IW_POWER_ON:    /* If not specified */
+        case IW_POWER_MODE:  /* If set all mask */
+        case IW_POWER_ALL_R: /* If explicitely state all */
+                break;
+        default: /* Otherwise we don't support it */
+                IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
+                             wrqu->power.flags);
+                return -EOPNOTSUPP; 
+        }
+        
+        /* If the user hasn't specified a power management mode yet, default
+         * to BATTERY */
+        if (IPW_POWER_LEVEL(priv->power_mode) == IPW_POWER_AC)
+                priv->power_mode = IPW_POWER_ENABLED | IPW_POWER_BATTERY;
+        else 
+                priv->power_mode = IPW_POWER_ENABLED | priv->power_mode;
+        err = ipw_send_power_mode(priv, IPW_POWER_LEVEL(priv->power_mode));
+        if (err) {
+                IPW_DEBUG_WX("failed setting power mode.\n");
+                return err;
+        }
+
+        IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n",
+                     priv->power_mode);
+        
+        return 0;
+}
+
+static int ipw_wx_get_power(struct net_device *dev, 
+                                struct iw_request_info *info, 
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED)) {
+                wrqu->power.disabled = 1;
+        } else {
+                wrqu->power.disabled = 0;
+        }
+
+        IPW_DEBUG_WX("GET Power Management Mode -> %02X\n", priv->power_mode);
+        
+        return 0;
+}
+
+static int ipw_wx_set_powermode(struct net_device *dev, 
+                                    struct iw_request_info *info, 
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int mode = *(int *)extra;
+        int err;
+        
+        if ((mode < 1) || (mode > IPW_POWER_LIMIT)) {
+                mode = IPW_POWER_AC;
+                priv->power_mode = mode;
+        } else {
+                priv->power_mode = IPW_POWER_ENABLED | mode;
+        }
+        
+        if (priv->power_mode != mode) {
+                err = ipw_send_power_mode(priv, mode);
+                
+                if (err) {
+                        IPW_DEBUG_WX("failed setting power mode.\n");
+                        return err;
+                }
+        }
+        
+        return 0;
+}
+
+#define MAX_WX_STRING 80
+static int ipw_wx_get_powermode(struct net_device *dev, 
+                                    struct iw_request_info *info, 
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int level = IPW_POWER_LEVEL(priv->power_mode);
+        char *p = extra;
+
+        p += snprintf(p, MAX_WX_STRING, "Power save level: %d ", level);
+
+        switch (level) {
+        case IPW_POWER_AC:
+                p += snprintf(p, MAX_WX_STRING - (p - extra), "(AC)");
+                break;
+        case IPW_POWER_BATTERY:
+                p += snprintf(p, MAX_WX_STRING - (p - extra), "(BATTERY)");
+                break;
+        default:
+                p += snprintf(p, MAX_WX_STRING - (p - extra),
+                              "(Timeout %dms, Period %dms)", 
+                              timeout_duration[level - 1] / 1000,
+                              period_duration[level - 1] / 1000);
+        }
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED))
+                p += snprintf(p, MAX_WX_STRING - (p - extra)," OFF");
+
+        wrqu->data.length = p - extra + 1;
+
+        return 0;
+}
+
+static int ipw_wx_set_wireless_mode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int mode = *(int *)extra;
+        u8 band = 0, modulation = 0;
+
+        if (mode == 0 || mode & ~IEEE_MODE_MASK) {
+                IPW_WARNING("Attempt to set invalid wireless mode: %d\n",
+                            mode);
+                return -EINVAL;
+        }
+                
+        if (priv->adapter == IPW_2915ABG) {
+                priv->ieee->abg_ture = 1;
+                if (mode & IEEE_A) {
+                        band |= IEEE80211_52GHZ_BAND;
+                        modulation |= IEEE80211_OFDM_MODULATION;
+                } else
+                        priv->ieee->abg_ture = 0;
+        } else {
+                if (mode & IEEE_A) {
+                        IPW_WARNING("Attempt to set 2200BG into "
+                                    "802.11a mode\n");
+                        return -EINVAL;
+                }
+
+                priv->ieee->abg_ture = 0;
+        }
+
+        if (mode & IEEE_B) {
+                band |= IEEE80211_24GHZ_BAND;
+                modulation |= IEEE80211_CCK_MODULATION;
+        } else
+                priv->ieee->abg_ture = 0;
+        
+        if (mode & IEEE_G) {
+                band |= IEEE80211_24GHZ_BAND;
+                modulation |= IEEE80211_OFDM_MODULATION;
+        } else
+                priv->ieee->abg_ture = 0;
+
+        priv->ieee->mode = mode;
+        priv->ieee->freq_band = band;
+        priv->ieee->modulation = modulation;
+        init_supported_rates(priv, &priv->rates);
+
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new configuration (causing us to 
+         * disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                /* The resulting association will trigger 
+                 * the new rates to be sent to the device */
+                IPW_DEBUG_ASSOC("Disassociating due to mode change.\n");
+                ipw_disassociate(priv);
+        } else
+                ipw_send_supported_rates(priv, &priv->rates);
+
+        IPW_DEBUG_WX("PRIV SET MODE: %c%c%c\n", 
+                     mode & IEEE_A ? 'a' : '.',
+                     mode & IEEE_B ? 'b' : '.',
+                     mode & IEEE_G ? 'g' : '.');
+        return 0;
+}
+
+static int ipw_wx_get_wireless_mode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        switch (priv->ieee->freq_band) {
+        case IEEE80211_24GHZ_BAND:
+                switch (priv->ieee->modulation) {
+                case IEEE80211_CCK_MODULATION:
+                        strncpy(extra, "802.11b (2)", MAX_WX_STRING);
+                        break;
+                case IEEE80211_OFDM_MODULATION: 
+                        strncpy(extra, "802.11g (4)", MAX_WX_STRING);
+                        break;
+                default:
+                        strncpy(extra, "802.11bg (6)", MAX_WX_STRING);
+                        break;
+                }
+                break;
+
+        case IEEE80211_52GHZ_BAND: 
+                strncpy(extra, "802.11a (1)", MAX_WX_STRING);
+                break;
+
+        default: /* Mixed Band */
+                switch (priv->ieee->modulation) {
+                case IEEE80211_CCK_MODULATION:
+                        strncpy(extra, "802.11ab (3)", MAX_WX_STRING);
+                        break;
+                case IEEE80211_OFDM_MODULATION: 
+                        strncpy(extra, "802.11ag (5)", MAX_WX_STRING);
+                        break;
+                default:
+                        strncpy(extra, "802.11abg (7)", MAX_WX_STRING);
+                        break;
+                }
+                break;
+        } 
+        
+        IPW_DEBUG_WX("PRIV GET MODE: %s\n", extra);
+
+        wrqu->data.length = strlen(extra) + 1;
+
+        return 0;
+}
+
+#ifdef CONFIG_IPW_PROMISC
+static int ipw_wx_set_promisc(struct net_device *dev, 
+                              struct iw_request_info *info, 
+                              union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int *parms = (int *)extra;
+        int enable = (parms[0] > 0);
+
+        IPW_DEBUG_WX("SET PROMISC: %d %d\n", enable, parms[1]);
+        if (enable) {
+                if (priv->ieee->iw_mode != IW_MODE_MONITOR) {
+                        priv->net_dev->type = ARPHRD_IEEE80211;
+                        ipw_adapter_restart(priv);
+                }
+                
+                ipw_set_channel(priv, parms[1]);
+        } else {
+                if (priv->ieee->iw_mode != IW_MODE_MONITOR)
+                        return 0;
+                priv->net_dev->type = ARPHRD_ETHER;
+                ipw_adapter_restart(priv);
+        }
+        return 0;
+}
+
+
+static int ipw_wx_reset(struct net_device *dev, 
+                        struct iw_request_info *info, 
+                        union iwreq_data *wrqu, char *extra)
+{ 
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_WX("RESET\n");
+        ipw_adapter_restart(priv);
+        return 0;
+}
+#endif // CONFIG_IPW_PROMISC
+
+/* Rebase the WE IOCTLs to zero for the handler array */
+#define IW_IOCTL(x) [(x)-SIOCSIWCOMMIT]
+static iw_handler ipw_wx_handlers[] =
+{
+        IW_IOCTL(SIOCGIWNAME)   = ipw_wx_get_name,
+        IW_IOCTL(SIOCSIWFREQ)   = ipw_wx_set_freq,
+        IW_IOCTL(SIOCGIWFREQ)   = ipw_wx_get_freq,
+        IW_IOCTL(SIOCSIWMODE)   = ipw_wx_set_mode,
+        IW_IOCTL(SIOCGIWMODE)   = ipw_wx_get_mode,
+        IW_IOCTL(SIOCGIWRANGE)  = ipw_wx_get_range,
+        IW_IOCTL(SIOCSIWAP)     = ipw_wx_set_wap,
+        IW_IOCTL(SIOCGIWAP)     = ipw_wx_get_wap,
+        IW_IOCTL(SIOCSIWSCAN)   = ipw_wx_set_scan,
+        IW_IOCTL(SIOCGIWSCAN)   = ipw_wx_get_scan,
+        IW_IOCTL(SIOCSIWESSID)  = ipw_wx_set_essid,
+        IW_IOCTL(SIOCGIWESSID)  = ipw_wx_get_essid,
+        IW_IOCTL(SIOCSIWNICKN)  = ipw_wx_set_nick,
+        IW_IOCTL(SIOCGIWNICKN)  = ipw_wx_get_nick,
+        IW_IOCTL(SIOCSIWRATE)   = ipw_wx_set_rate,
+        IW_IOCTL(SIOCGIWRATE)   = ipw_wx_get_rate,
+        IW_IOCTL(SIOCSIWRTS)    = ipw_wx_set_rts,
+        IW_IOCTL(SIOCGIWRTS)    = ipw_wx_get_rts,
+        IW_IOCTL(SIOCSIWFRAG)   = ipw_wx_set_frag,
+        IW_IOCTL(SIOCGIWFRAG)   = ipw_wx_get_frag,
+        IW_IOCTL(SIOCSIWTXPOW)  = ipw_wx_set_txpow,
+        IW_IOCTL(SIOCGIWTXPOW)  = ipw_wx_get_txpow,
+        IW_IOCTL(SIOCSIWRETRY)  = ipw_wx_set_retry,
+        IW_IOCTL(SIOCGIWRETRY)  = ipw_wx_get_retry,
+        IW_IOCTL(SIOCSIWENCODE) = ipw_wx_set_encode,
+        IW_IOCTL(SIOCGIWENCODE) = ipw_wx_get_encode,
+        IW_IOCTL(SIOCSIWPOWER)  = ipw_wx_set_power,
+        IW_IOCTL(SIOCGIWPOWER)  = ipw_wx_get_power,
+};
+
+#define IPW_PRIV_SET_POWER      SIOCIWFIRSTPRIV
+#define IPW_PRIV_GET_POWER      SIOCIWFIRSTPRIV+1
+#define IPW_PRIV_SET_MODE       SIOCIWFIRSTPRIV+2
+#define IPW_PRIV_GET_MODE       SIOCIWFIRSTPRIV+3
+#define IPW_PRIV_SET_PROMISC    SIOCIWFIRSTPRIV+4
+#define IPW_PRIV_RESET          SIOCIWFIRSTPRIV+5
+
+
+static struct iw_priv_args ipw_priv_args[] = { 
+        {
+                .cmd = IPW_PRIV_SET_POWER,
+                .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 
+                .name = "set_power"
+        }, 
+        {
+                .cmd = IPW_PRIV_GET_POWER,
+                .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+                .name = "get_power" 
+        },
+        {
+                .cmd = IPW_PRIV_SET_MODE,
+                .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+                .name = "set_mode" 
+        },
+        {
+                .cmd = IPW_PRIV_GET_MODE,
+                .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+                .name = "get_mode" 
+        },
+#ifdef CONFIG_IPW_PROMISC
+        {
+                IPW_PRIV_SET_PROMISC, 
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor" 
+        }, 
+        {
+                IPW_PRIV_RESET, 
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset" 
+        },
+#endif /* CONFIG_IPW_PROMISC */
+};
+
+static iw_handler ipw_priv_handler[] = {
+        ipw_wx_set_powermode,
+        ipw_wx_get_powermode,
+        ipw_wx_set_wireless_mode,
+        ipw_wx_get_wireless_mode,
+#ifdef CONFIG_IPW_PROMISC
+        ipw_wx_set_promisc,
+        ipw_wx_reset, 
+#endif
+};
+
+static struct iw_handler_def ipw_wx_handler_def = 
+{
+        .standard       = ipw_wx_handlers,
+        .num_standard   = ARRAY_SIZE(ipw_wx_handlers),
+        .num_private    = ARRAY_SIZE(ipw_priv_handler),
+        .num_private_args = ARRAY_SIZE(ipw_priv_args),
+        .private        = ipw_priv_handler, 
+        .private_args   = ipw_priv_args,        
+};
+
+
+
+
+/*
+ * Get wireless statistics.
+ * Called by /proc/net/wireless
+ * Also called by SIOCGIWSTATS
+ */
+static struct iw_statistics *ipw_get_wireless_stats(struct net_device * dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct iw_statistics *wstats;
+        
+        wstats = &priv->wstats;
+
+        /* if hw is disabled, then ipw2100_get_ordinal() can't be called.
+         * ipw2100_wx_wireless_stats seems to be called before fw is 
+         * initialized.  STATUS_ASSOCIATED will only be set if the hw is up
+         * and associated; if not associcated, the values are all meaningless
+         * anyway, so set them all to NULL and INVALID */
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                wstats->miss.beacon = 0;
+                wstats->discard.retries = 0;
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+                wstats->qual.noise = 0;
+                wstats->qual.updated = 7;
+                wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
+                        IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+                return wstats;
+        } 
+
+        wstats->qual.qual = priv->quality;
+        wstats->qual.level = average_value(&priv->average_rssi);
+        wstats->qual.noise = average_value(&priv->average_noise);
+        wstats->qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |
+                IW_QUAL_NOISE_UPDATED;
+
+        wstats->miss.beacon = average_value(&priv->average_missed_beacons);
+        wstats->discard.retries = priv->last_tx_failures;
+        wstats->discard.code = priv->ieee->ieee_stats.rx_discards_undecryptable;
+        
+/*      if (ipw_get_ordinal(priv, IPW_ORD_STAT_TX_RETRY, &tx_retry, &len))
+        goto fail_get_ordinal;
+        wstats->discard.retries += tx_retry; */
+        
+        return wstats;
+}
+
+
+/* net device stuff */
+
+static inline void init_sys_config(struct ipw_sys_config *sys_config)
+{
+        memset(sys_config, 0, sizeof(struct ipw_sys_config));
+        sys_config->bt_coexistence = 1; /* We may need to look into prvStaBtConfig */
+        sys_config->answer_broadcast_ssid_probe = 0;
+        sys_config->accept_all_data_frames = 0;
+        sys_config->accept_non_directed_frames = 1;
+        sys_config->exclude_unicast_unencrypted = 0;
+        sys_config->disable_unicast_decryption = 1;
+        sys_config->exclude_multicast_unencrypted = 0;
+        sys_config->disable_multicast_decryption = 1;
+        sys_config->antenna_diversity = CFG_SYS_ANTENNA_BOTH;
+        sys_config->pass_crc_to_host = 0; /* TODO: See if 1 gives us FCS */
+        sys_config->dot11g_auto_detection = 0;
+        sys_config->enable_cts_to_self = 0; 
+        sys_config->bt_coexist_collision_thr = 0;
+        sys_config->pass_noise_stats_to_host = 1;
+}
+
+static int ipw_net_open(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_INFO("dev->open\n");
+        /* we should be verifying the device is ready to be opened */
+        if (!(priv->status & STATUS_RF_KILL_MASK) && 
+            (priv->status & STATUS_ASSOCIATED)) 
+                netif_start_queue(dev);
+        return 0;
+}
+
+static int ipw_net_stop(struct net_device *dev)
+{
+        IPW_DEBUG_INFO("dev->close\n");
+        netif_stop_queue(dev);
+        return 0;
+}
+
+/*
+todo:
+
+modify to send one tfd per fragment instead of using chunking.  otherwise
+we need to heavily modify the ieee80211_skb_to_txb.
+*/
+
+static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)
+                txb->fragments[0]->data;
+        int i = 0;
+        struct tfd_frame *tfd;
+        struct clx2_tx_queue *txq = &priv->txq[0];
+        struct clx2_queue *q = &txq->q;
+        u8 id, hdr_len, unicast;
+        u16 remaining_bytes;
+
+        switch (priv->ieee->iw_mode) {
+        case IW_MODE_ADHOC:
+                hdr_len = IEEE80211_3ADDR_LEN;
+                unicast = !is_broadcast_ether_addr(hdr->addr1) &&
+                        !is_multicast_ether_addr(hdr->addr1);
+                id = ipw_find_station(priv, hdr->addr1);
+                if (id == IPW_INVALID_STATION) {
+                        id = ipw_add_station(priv, hdr->addr1);
+                        if (id == IPW_INVALID_STATION) {
+                                IPW_WARNING("Attempt to send data to "
+                                            "invalid cell: " MAC_FMT "\n", 
+                                            MAC_ARG(hdr->addr1));
+                                goto drop;
+                        }
+                }
+                break;
+
+        case IW_MODE_INFRA:
+        default:
+                unicast = !is_broadcast_ether_addr(hdr->addr3) &&
+                        !is_multicast_ether_addr(hdr->addr3);
+                hdr_len = IEEE80211_3ADDR_LEN;
+                id = 0;
+                break;
+        }
+
+        tfd = &txq->bd[q->first_empty];
+        txq->txb[q->first_empty] = txb;
+        memset(tfd, 0, sizeof(*tfd));
+        tfd->u.data.station_number = id;
+
+        tfd->control_flags.message_type = TX_FRAME_TYPE;
+        tfd->control_flags.control_bits = TFD_NEED_IRQ_MASK;
+
+        tfd->u.data.cmd_id = DINO_CMD_TX;
+        tfd->u.data.len = txb->payload_size;
+        remaining_bytes = txb->payload_size;
+        if (unlikely(!unicast))
+                tfd->u.data.tx_flags = DCT_FLAG_NO_WEP;
+        else
+                tfd->u.data.tx_flags = DCT_FLAG_NO_WEP | DCT_FLAG_ACK_REQD;
+        
+        if (priv->assoc_request.ieee_mode == IPW_B_MODE)
+                tfd->u.data.tx_flags_ext = DCT_FLAG_EXT_MODE_CCK;
+        else
+                tfd->u.data.tx_flags_ext = DCT_FLAG_EXT_MODE_OFDM;
+
+        if (priv->config & CFG_PREAMBLE)
+                tfd->u.data.tx_flags |= DCT_FLAG_SHORT_PREMBL;
+
+        memcpy(&tfd->u.data.tfd.tfd_24.mchdr, hdr, hdr_len);
+
+        /* payload */
+        tfd->u.data.num_chunks = min((u8)(NUM_TFD_CHUNKS - 2), txb->nr_frags);
+        for (i = 0; i < tfd->u.data.num_chunks; i++) {
+                IPW_DEBUG_TX("Dumping TX packet frag %i of %i (%d bytes):\n", 
+                             i, tfd->u.data.num_chunks,
+                             txb->fragments[i]->len - hdr_len);
+                printk_buf(IPW_DL_TX, txb->fragments[i]->data + hdr_len, 
+                           txb->fragments[i]->len - hdr_len);
+
+                tfd->u.data.chunk_ptr[i] = pci_map_single(
+                        priv->pci_dev, txb->fragments[i]->data + hdr_len,
+                        txb->fragments[i]->len - hdr_len, PCI_DMA_TODEVICE);
+                tfd->u.data.chunk_len[i] = txb->fragments[i]->len - hdr_len;
+        }
+
+        if (i != txb->nr_frags) {
+                struct sk_buff *skb;
+                u16 remaining_bytes = 0;
+                int j;
+
+                for (j = i; j < txb->nr_frags; j++)
+                        remaining_bytes += txb->fragments[j]->len - hdr_len;
+
+                printk(KERN_INFO "Trying to reallocate for %d bytes\n",
+                       remaining_bytes);
+                skb = alloc_skb(remaining_bytes, GFP_ATOMIC);
+                if (skb != NULL) {
+                        tfd->u.data.chunk_len[i] = remaining_bytes;
+                        for (j = i; j < txb->nr_frags; j++) {
+                                int size = txb->fragments[j]->len - hdr_len;
+                                printk(KERN_INFO "Adding frag %d %d...\n",
+                                        j, size);
+                                memcpy(skb_put(skb, size),
+                                        txb->fragments[j]->data + hdr_len,
+                                        size);
+                        }
+                        dev_kfree_skb_any(txb->fragments[i]);
+                        txb->fragments[i] = skb;
+                        tfd->u.data.chunk_ptr[i] = pci_map_single(
+                                priv->pci_dev, skb->data,
+                                tfd->u.data.chunk_len[i], PCI_DMA_TODEVICE);
+                        tfd->u.data.num_chunks++;
+                } 
+        }
+
+        /* kick DMA */
+        q->first_empty = ipw_queue_inc_wrap(q->first_empty, q->n_bd);
+        ipw_write32(priv, q->reg_w, q->first_empty);
+
+        if (ipw_queue_space(q) < q->high_mark) 
+                netif_stop_queue(priv->net_dev);
+
+        return;
+
+ drop:
+        IPW_DEBUG_DROP("Silently dropping Tx packet.\n");
+        ieee80211_txb_free(txb);
+}
+
+static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb,
+                                   struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        unsigned long flags;
+
+        IPW_DEBUG_TX("dev->xmit(%d bytes)\n", txb->payload_size);
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                IPW_DEBUG_INFO("Tx attempt while not associated.\n");
+                priv->ieee->stats.tx_carrier_errors++;
+                netif_stop_queue(dev);
+                goto fail_unlock;
+        }
+
+        ipw_tx_skb(priv, txb);
+
+        spin_unlock_irqrestore(&priv->lock, flags);
+        return 0;
+
+ fail_unlock:
+        spin_unlock_irqrestore(&priv->lock, flags);
+        return 1;
+}
+
+static struct net_device_stats *ipw_net_get_stats(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        
+        priv->ieee->stats.tx_packets = priv->tx_packets;
+        priv->ieee->stats.rx_packets = priv->rx_packets;
+        return &priv->ieee->stats;
+}
+
+static void ipw_net_set_multicast_list(struct net_device *dev)
+{
+
+}
+
+static int ipw_net_set_mac_address(struct net_device *dev, void *p)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct sockaddr *addr = p;
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+        priv->config |= CFG_CUSTOM_MAC;
+        memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
+        printk(KERN_INFO "%s: Setting MAC to " MAC_FMT "\n",
+               priv->net_dev->name, MAC_ARG(priv->mac_addr));
+        ipw_adapter_restart(priv);
+        return 0;
+}
+
+static void ipw_ethtool_get_drvinfo(struct net_device *dev, 
+                                    struct ethtool_drvinfo *info)
+{
+        struct ipw_priv *p = ieee80211_priv(dev);
+        char vers[64];
+        char date[32];
+        u32 len;
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+
+        len = sizeof(vers);
+        ipw_get_ordinal(p, IPW_ORD_STAT_FW_VERSION, vers, &len);
+        len = sizeof(date);
+        ipw_get_ordinal(p, IPW_ORD_STAT_FW_DATE, date, &len);
+
+        snprintf(info->fw_version, sizeof(info->fw_version),"%s (%s)", 
+                 vers, date);
+        strcpy(info->bus_info, pci_name(p->pci_dev));
+        info->eedump_len = CX2_EEPROM_IMAGE_SIZE;
+}
+
+static u32 ipw_ethtool_get_link(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return (priv->status & STATUS_ASSOCIATED) != 0;
+}
+
+static int ipw_ethtool_get_eeprom_len(struct net_device *dev)
+{
+        return CX2_EEPROM_IMAGE_SIZE;
+}
+
+static int ipw_ethtool_get_eeprom(struct net_device *dev,
+                                  struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+        struct ipw_priv *p = ieee80211_priv(dev);
+
+        if (eeprom->offset + eeprom->len > CX2_EEPROM_IMAGE_SIZE)
+                return -EINVAL;
+        
+        memcpy(bytes, &((u8 *)p->eeprom)[eeprom->offset], eeprom->len);
+        return 0;
+}
+
+static int ipw_ethtool_set_eeprom(struct net_device *dev,
+                                  struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+        struct ipw_priv *p = ieee80211_priv(dev);
+        int i;
+
+        if (eeprom->offset + eeprom->len > CX2_EEPROM_IMAGE_SIZE)
+                return -EINVAL;
+
+        memcpy(&((u8 *)p->eeprom)[eeprom->offset], bytes, eeprom->len);
+        for (i = IPW_EEPROM_DATA; 
+             i < IPW_EEPROM_DATA + CX2_EEPROM_IMAGE_SIZE; 
+             i++)
+                ipw_write8(p, i, p->eeprom[i]);
+
+        return 0;
+}
+
+static struct ethtool_ops ipw_ethtool_ops = {
+         .get_link       = ipw_ethtool_get_link,
+         .get_drvinfo    = ipw_ethtool_get_drvinfo,
+         .get_eeprom_len = ipw_ethtool_get_eeprom_len,
+         .get_eeprom     = ipw_ethtool_get_eeprom,
+         .set_eeprom     = ipw_ethtool_set_eeprom,
+};
+
+static irqreturn_t ipw_isr(int irq, void *data, struct pt_regs *regs)
+{
+        struct ipw_priv *priv = data;
+        u32 inta, inta_mask;
+        
+        if (!priv)
+                return IRQ_NONE;
+
+        spin_lock(&priv->lock);
+
+        if (!(priv->status & STATUS_INT_ENABLED)) {
+                /* Shared IRQ */
+                goto none;
+        }
+
+        inta = ipw_read32(priv, CX2_INTA_RW);
+        inta_mask = ipw_read32(priv, CX2_INTA_MASK_R);
+        
+        if (inta == 0xFFFFFFFF) {
+                /* Hardware disappeared */
+                IPW_WARNING("IRQ INTA == 0xFFFFFFFF\n");
+                goto none;
+        }
+
+        if (!(inta & (CX2_INTA_MASK_ALL & inta_mask))) {
+                /* Shared interrupt */
+                goto none;
+        }
+
+        /* tell the device to stop sending interrupts */
+        ipw_disable_interrupts(priv);
+            
+        /* ack current interrupts */
+        inta &= (CX2_INTA_MASK_ALL & inta_mask);
+        ipw_write32(priv, CX2_INTA_RW, inta);
+            
+        /* Cache INTA value for our tasklet */
+        priv->isr_inta = inta;
+
+        tasklet_schedule(&priv->irq_tasklet);
+
+        spin_unlock(&priv->lock);
+
+        return IRQ_HANDLED;
+ none:
+        spin_unlock(&priv->lock);
+        return IRQ_NONE;
+}
+
+static void ipw_rf_kill(void *adapter)
+{
+        struct ipw_priv *priv = adapter;
+        unsigned long flags;
+        
+        spin_lock_irqsave(&priv->lock, flags);
+
+        if (rf_kill_active(priv)) {
+                IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
+                if (priv->workqueue)
+                        queue_delayed_work(priv->workqueue,
+                                           &priv->rf_kill, 2 * HZ);
+                goto exit_unlock;
+        }
+
+        /* RF Kill is now disabled, so bring the device back up */
+
+        if (!(priv->status & STATUS_RF_KILL_MASK)) {
+                IPW_DEBUG_RF_KILL("HW RF Kill no longer active, restarting "
+                                  "device\n");
+
+                /* we can not do an adapter restart while inside an irq lock */
+                queue_work(priv->workqueue, &priv->adapter_restart);
+        } else 
+                IPW_DEBUG_RF_KILL("HW RF Kill deactivated.  SW RF Kill still "
+                                  "enabled\n");
+
+ exit_unlock:
+        spin_unlock_irqrestore(&priv->lock, flags);
+}
+
+static int ipw_setup_deferred_work(struct ipw_priv *priv)
+{
+        int ret = 0;
+
+#ifdef CONFIG_SOFTWARE_SUSPEND2
+        priv->workqueue = create_workqueue(DRV_NAME, 0);
+#else
+        priv->workqueue = create_workqueue(DRV_NAME);
+#endif  
+        init_waitqueue_head(&priv->wait_command_queue);
+
+        INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv);
+        INIT_WORK(&priv->associate, ipw_associate, priv);
+        INIT_WORK(&priv->disassociate, ipw_disassociate, priv);
+        INIT_WORK(&priv->rx_replenish, ipw_rx_queue_replenish, priv);
+        INIT_WORK(&priv->adapter_restart, ipw_adapter_restart, priv);
+        INIT_WORK(&priv->rf_kill, ipw_rf_kill, priv);
+        INIT_WORK(&priv->up, (void (*)(void *))ipw_up, priv);
+        INIT_WORK(&priv->down, (void (*)(void *))ipw_down, priv);
+        INIT_WORK(&priv->request_scan, 
+                  (void (*)(void *))ipw_request_scan, priv);
+        INIT_WORK(&priv->gather_stats, 
+                  (void (*)(void *))ipw_gather_stats, priv);
+        INIT_WORK(&priv->abort_scan, (void (*)(void *))ipw_abort_scan, priv);
+        INIT_WORK(&priv->roam, ipw_roam, priv);
+        INIT_WORK(&priv->scan_check, ipw_scan_check, priv);
+
+        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
+                     ipw_irq_tasklet, (unsigned long)priv);
+
+        return ret;
+}
+
+
+static void shim__set_security(struct net_device *dev,
+                               struct ieee80211_security *sec)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int i;
+
+        for (i = 0; i < 4; i++) { 
+                if (sec->flags & (1 << i)) {
+                        priv->sec.key_sizes[i] = sec->key_sizes[i];
+                        if (sec->key_sizes[i] == 0)
+                                priv->sec.flags &= ~(1 << i);
+                        else
+                                memcpy(priv->sec.keys[i], sec->keys[i], 
+                                       sec->key_sizes[i]);
+                        priv->sec.flags |= (1 << i);
+                        priv->status |= STATUS_SECURITY_UPDATED;
+                } 
+        }
+
+        if ((sec->flags & SEC_ACTIVE_KEY) &&
+            priv->sec.active_key != sec->active_key) {
+                if (sec->active_key <= 3) {
+                        priv->sec.active_key = sec->active_key;
+                        priv->sec.flags |= SEC_ACTIVE_KEY;
+                } else 
+                        priv->sec.flags &= ~SEC_ACTIVE_KEY;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        if ((sec->flags & SEC_AUTH_MODE) &&
+            (priv->sec.auth_mode != sec->auth_mode)) {
+                priv->sec.auth_mode = sec->auth_mode;
+                priv->sec.flags |= SEC_AUTH_MODE;
+                if (sec->auth_mode == WLAN_AUTH_SHARED_KEY)
+                        priv->capability |= CAP_SHARED_KEY;
+                else
+                        priv->capability &= ~CAP_SHARED_KEY;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+        
+        if (sec->flags & SEC_ENABLED &&
+            priv->sec.enabled != sec->enabled) {
+                priv->sec.flags |= SEC_ENABLED;
+                priv->sec.enabled = sec->enabled;
+                priv->status |= STATUS_SECURITY_UPDATED;
+                if (sec->enabled) 
+                        priv->capability |= CAP_PRIVACY_ON;
+                else
+                        priv->capability &= ~CAP_PRIVACY_ON;
+        }
+        
+        if (sec->flags & SEC_LEVEL &&
+            priv->sec.level != sec->level) {
+                priv->sec.level = sec->level;
+                priv->sec.flags |= SEC_LEVEL;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        /* To match current functionality of ipw2100 (which works well w/ 
+         * various supplicants, we don't force a disassociate if the 
+         * privacy capability changes ... */
+#if 0
+        if ((priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) &&
+            (((priv->assoc_request.capability & 
+               WLAN_CAPABILITY_PRIVACY) && !sec->enabled) ||
+             (!(priv->assoc_request.capability & 
+                 WLAN_CAPABILITY_PRIVACY) && sec->enabled))) {
+                IPW_DEBUG_ASSOC("Disassociating due to capability "
+                                "change.\n");
+                ipw_disassociate(priv);
+        }
+#endif
+}
+
+static int init_supported_rates(struct ipw_priv *priv, 
+                                struct ipw_supported_rates *rates)
+{
+        /* TODO: Mask out rates based on priv->rates_mask */
+
+        memset(rates, 0, sizeof(*rates));
+        /* configure supported rates */
+        switch (priv->ieee->freq_band) {
+        case IEEE80211_52GHZ_BAND:
+                rates->ieee_mode = IPW_A_MODE;
+                rates->purpose = IPW_RATE_CAPABILITIES;
+                ipw_add_ofdm_scan_rates(rates, IEEE80211_CCK_MODULATION,
+                                        IEEE80211_OFDM_DEFAULT_RATES_MASK);
+                break;
+
+        default: /* Mixed or 2.4Ghz */
+                rates->ieee_mode = IPW_G_MODE;
+                rates->purpose = IPW_RATE_CAPABILITIES;
+                ipw_add_cck_scan_rates(rates, IEEE80211_CCK_MODULATION,
+                                       IEEE80211_CCK_DEFAULT_RATES_MASK);
+                if (priv->ieee->modulation & IEEE80211_OFDM_MODULATION) {
+                        ipw_add_ofdm_scan_rates(rates, IEEE80211_CCK_MODULATION,
+                                                IEEE80211_OFDM_DEFAULT_RATES_MASK);
+                }
+                break;
+        }
+
+        return 0;
+}
+
+static int ipw_config(struct ipw_priv *priv) 
+{
+        int i;
+        struct ipw_tx_power tx_power;
+
+        memset(&priv->sys_config, 0, sizeof(priv->sys_config));
+        memset(&tx_power, 0, sizeof(tx_power));
+
+        /* This is only called from ipw_up, which resets/reloads the firmware
+           so, we don't need to first disable the card before we configure
+           it */
+
+        /* configure device for 'G' band */
+        tx_power.ieee_mode = IPW_G_MODE;
+        tx_power.num_channels = 11;
+        for (i = 0; i < 11; i++) {
+                tx_power.channels_tx_power[i].channel_number = i + 1;
+                tx_power.channels_tx_power[i].tx_power = priv->tx_power;
+        }
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        /* configure device to also handle 'B' band */
+        tx_power.ieee_mode = IPW_B_MODE;
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        /* initialize adapter address */
+        if (ipw_send_adapter_address(priv, priv->net_dev->dev_addr))
+                goto error;
+
+        /* set basic system config settings */
+        init_sys_config(&priv->sys_config);
+        if (ipw_send_system_config(priv, &priv->sys_config))
+                goto error;
+
+        init_supported_rates(priv, &priv->rates);
+        if (ipw_send_supported_rates(priv, &priv->rates))
+                goto error;
+
+        /* Set request-to-send threshold */
+        if (priv->rts_threshold) {
+                if (ipw_send_rts_threshold(priv, priv->rts_threshold))
+                        goto error;
+        }
+
+        if (ipw_set_random_seed(priv))
+                goto error;
+        
+        /* final state transition to the RUN state */
+        if (ipw_send_host_complete(priv))
+                goto error;
+
+        /* If configured to try and auto-associate, kick off a scan */
+        if ((priv->config & CFG_ASSOCIATE) && ipw_request_scan(priv))
+                goto error;
+
+        return 0;
+        
+ error:
+        return -EIO;
+}
+
+#define MAX_HW_RESTARTS 5
+static int ipw_up(struct ipw_priv *priv)
+{
+        int rc, i;
+
+        if (priv->status & STATUS_EXIT_PENDING)
+                return -EIO;
+
+        for (i = 0; i < MAX_HW_RESTARTS; i++ ) {
+                /* Load the microcode, firmware, and eeprom.  
+                 * Also start the clocks. */
+                rc = ipw_load(priv);
+                if (rc) {
+                        IPW_ERROR("Unable to load firmware: 0x%08X\n",
+                                        rc);
+                        return rc;
+                }
+
+                ipw_init_ordinals(priv);
+                if (!(priv->config & CFG_CUSTOM_MAC))
+                        eeprom_parse_mac(priv, priv->mac_addr);
+                memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+
+                if (priv->status & STATUS_RF_KILL_MASK)
+                        return 0;
+
+                rc = ipw_config(priv);
+                if (!rc) {
+                        IPW_DEBUG_INFO("Configured device on count %i\n", i);
+                        priv->notif_missed_beacons = 0;
+                        netif_start_queue(priv->net_dev);
+                        return 0;
+                } else {
+                        IPW_DEBUG_INFO("Device configuration failed: 0x%08X\n",
+                                       rc);
+                }
+                
+                IPW_DEBUG_INFO("Failed to config device on retry %d of %d\n",
+                               i, MAX_HW_RESTARTS);
+
+                /* We had an error bringing up the hardware, so take it
+                 * all the way back down so we can try again */
+                ipw_down(priv);
+        }
+
+        /* tried to restart and config the device for as long as our 
+         * patience could withstand */
+        IPW_ERROR("Unable to initialize device after %d attempts.\n",
+                  i);
+        return -EIO;
+}
+
+static void ipw_down(struct ipw_priv *priv)
+{
+        /* Attempt to disable the card */
+#if 0
+        ipw_send_card_disable(priv, 0);
+#endif
+
+        /* tell the device to stop sending interrupts */
+        ipw_disable_interrupts(priv);
+
+        /* Clear all bits but the RF Kill */
+        priv->status &= STATUS_RF_KILL_MASK;
+
+        netif_carrier_off(priv->net_dev);
+        netif_stop_queue(priv->net_dev);
+
+        ipw_stop_nic(priv);
+}
+
+/* Called by register_netdev() */
+static int ipw_net_init(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (priv->status & STATUS_RF_KILL_SW) {
+                IPW_WARNING("Radio disabled by module parameter.\n");
+                return 0;
+        } else if (rf_kill_active(priv)) {
+                IPW_WARNING("Radio Frequency Kill Switch is On:\n"
+                            "Kill switch must be turned off for "
+                            "wireless networking to work.\n");
+                queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ);
+                return 0;
+        }
+
+        if (ipw_up(priv))
+                return -EIO;
+
+        return 0;
+}
+
+/* PCI driver stuff */
+static struct pci_device_id card_ids[] = {
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2701, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2702, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2711, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2712, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2721, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2722, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2731, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2732, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2741, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x103c, 0x2741, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2742, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2751, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2752, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2753, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2754, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x104f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x4220, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
+        {PCI_VENDOR_ID_INTEL, 0x4221, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* 2225BG */
+        {PCI_VENDOR_ID_INTEL, 0x4223, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+        {PCI_VENDOR_ID_INTEL, 0x4224, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+        
+        /* required last entry */
+        {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, card_ids);
+
+static struct attribute *ipw_sysfs_entries[] = {
+        &dev_attr_rf_kill.attr,
+        &dev_attr_direct_dword.attr,
+        &dev_attr_indirect_byte.attr,
+        &dev_attr_indirect_dword.attr,
+        &dev_attr_mem_gpio_reg.attr,
+        &dev_attr_command_event_reg.attr,
+        &dev_attr_nic_type.attr,
+        &dev_attr_status.attr,
+        &dev_attr_cfg.attr,
+        &dev_attr_dump_errors.attr,
+        &dev_attr_dump_events.attr,
+        &dev_attr_eeprom_delay.attr,
+        &dev_attr_ucode_version.attr,
+        &dev_attr_rtc.attr,
+        NULL
+};
+
+static struct attribute_group ipw_attribute_group = {
+        .name = NULL,           /* put in device directory */
+        .attrs  = ipw_sysfs_entries,
+};
+
+static int ipw_pci_probe(struct pci_dev *pdev,
+                         const struct pci_device_id *ent)
+{
+        int err = 0;
+        struct net_device *net_dev;
+        void __iomem *base;
+        u32 length, val;
+        struct ipw_priv *priv;
+        int band, modulation;
+
+        net_dev = alloc_ieee80211(sizeof(struct ipw_priv));
+        if (net_dev == NULL) {
+                err = -ENOMEM;
+                goto out;
+        }
+
+        priv = ieee80211_priv(net_dev);
+        priv->ieee = netdev_priv(net_dev);
+        priv->net_dev = net_dev;
+        priv->pci_dev = pdev;
+#ifdef CONFIG_IPW_DEBUG
+        ipw_debug_level = debug;
+#endif
+        spin_lock_init(&priv->lock);
+
+        if (pci_enable_device(pdev)) {
+                err = -ENODEV;
+                goto out_free_ieee80211;
+        }
+
+        pci_set_master(pdev);
+
+        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (!err) 
+                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n");
+                goto out_pci_disable_device;
+        }
+
+        pci_set_drvdata(pdev, priv);
+
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err) 
+                goto out_pci_disable_device;
+
+        /* We disable the RETRY_TIMEOUT register (0x41) to keep 
+         * PCI Tx retries from interfering with C3 CPU state */
+        pci_read_config_dword(pdev, 0x40, &val); 
+        if ((val & 0x0000ff00) != 0) 
+                pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+        
+        length = pci_resource_len(pdev, 0);
+        priv->hw_len = length;
+        
+        base = ioremap_nocache(pci_resource_start(pdev, 0), length);
+        if (!base) {
+                err = -ENODEV;
+                goto out_pci_release_regions;
+        }
+
+        priv->hw_base = base;
+        IPW_DEBUG_INFO("pci_resource_len = 0x%08x\n", length);
+        IPW_DEBUG_INFO("pci_resource_base = %p\n", base);
+
+        err = ipw_setup_deferred_work(priv);
+        if (err) {
+                IPW_ERROR("Unable to setup deferred work\n");
+                goto out_iounmap;
+        }
+
+        /* Initialize module parameter values here */
+        if (ifname)
+                strncpy(net_dev->name, ifname, IFNAMSIZ);
+
+        if (associate) 
+                priv->config |= CFG_ASSOCIATE;
+        else
+                IPW_DEBUG_INFO("Auto associate disabled.\n");
+        
+        if (auto_create) 
+                priv->config |= CFG_ADHOC_CREATE;
+        else
+                IPW_DEBUG_INFO("Auto adhoc creation disabled.\n");
+        
+        if (disable) {
+                priv->status |= STATUS_RF_KILL_SW;
+                IPW_DEBUG_INFO("Radio disabled.\n");
+        }
+
+        if (channel != 0) {
+                priv->config |= CFG_STATIC_CHANNEL;
+                priv->channel = channel;
+                IPW_DEBUG_INFO("Bind to static channel %d\n", channel);
+                IPW_DEBUG_INFO("Bind to static channel %d\n", channel);
+                /* TODO: Validate that provided channel is in range */
+        }
+
+        switch (mode) {
+        case 1:
+                priv->ieee->iw_mode = IW_MODE_ADHOC;
+                break;
+#ifdef CONFIG_IPW_PROMISC       
+        case 2:
+                priv->ieee->iw_mode = IW_MODE_MONITOR;
+                break;
+#endif
+        default:
+        case 0:
+                priv->ieee->iw_mode = IW_MODE_INFRA;
+                break;
+        }
+
+        if ((priv->pci_dev->device == 0x4223) ||
+            (priv->pci_dev->device == 0x4224)) {
+                printk(KERN_INFO DRV_NAME 
+                       ": Detected Intel PRO/Wireless 2915ABG Network "
+                       "Connection\n");
+                priv->ieee->abg_ture = 1;
+                band = IEEE80211_52GHZ_BAND | IEEE80211_24GHZ_BAND;
+                modulation = IEEE80211_OFDM_MODULATION |
+                        IEEE80211_CCK_MODULATION;
+                priv->adapter = IPW_2915ABG;
+                priv->ieee->mode = IEEE_A|IEEE_G|IEEE_B;
+        } else {
+                if (priv->pci_dev->device == 0x4221) 
+                        printk(KERN_INFO DRV_NAME 
+                               ": Detected Intel PRO/Wireless 2225BG Network "
+                               "Connection\n");
+                else
+                        printk(KERN_INFO DRV_NAME 
+                               ": Detected Intel PRO/Wireless 2200BG Network "
+                               "Connection\n");
+                
+                priv->ieee->abg_ture = 0;
+                band = IEEE80211_24GHZ_BAND;
+                modulation = IEEE80211_OFDM_MODULATION |
+                        IEEE80211_CCK_MODULATION;
+                priv->adapter = IPW_2200BG;
+                priv->ieee->mode = IEEE_G|IEEE_B;
+        }
+
+        priv->ieee->freq_band = band;
+        priv->ieee->modulation = modulation;
+
+        priv->rates_mask = IEEE80211_DEFAULT_RATES_MASK;
+
+        priv->missed_beacon_threshold = IPW_MB_DISASSOCIATE_THRESHOLD_DEFAULT;
+        priv->roaming_threshold = IPW_MB_ROAMING_THRESHOLD_DEFAULT;
+
+        priv->rts_threshold = DEFAULT_RTS_THRESHOLD;
+
+        /* If power management is turned on, default to AC mode */
+        priv->power_mode = IPW_POWER_AC;
+        priv->tx_power = IPW_DEFAULT_TX_POWER;
+
+        err = request_irq(pdev->irq, ipw_isr, SA_SHIRQ, DRV_NAME, 
+                          priv);
+        if (err) {
+                IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
+                goto out_destroy_workqueue;
+        }
+
+        SET_MODULE_OWNER(net_dev);
+        SET_NETDEV_DEV(net_dev, &pdev->dev);
+
+        priv->ieee->hard_start_xmit = ipw_net_hard_start_xmit;
+        priv->ieee->set_security = shim__set_security;
+
+        net_dev->open = ipw_net_open;
+        net_dev->stop = ipw_net_stop;
+        net_dev->init = ipw_net_init;
+        net_dev->get_stats = ipw_net_get_stats;
+        net_dev->set_multicast_list = ipw_net_set_multicast_list;
+        net_dev->set_mac_address = ipw_net_set_mac_address;
+        net_dev->get_wireless_stats = ipw_get_wireless_stats;
+        net_dev->wireless_handlers = &ipw_wx_handler_def;
+        net_dev->ethtool_ops = &ipw_ethtool_ops;
+        net_dev->irq = pdev->irq;
+        net_dev->base_addr = (unsigned long )priv->hw_base;
+        net_dev->mem_start = pci_resource_start(pdev, 0);
+        net_dev->mem_end = net_dev->mem_start + pci_resource_len(pdev, 0) - 1;
+
+        err = sysfs_create_group(&pdev->dev.kobj, &ipw_attribute_group);
+        if (err) {
+                IPW_ERROR("failed to create sysfs device attributes\n");
+                goto out_release_irq;
+        }
+
+        err = register_netdev(net_dev);
+        if (err) {
+                IPW_ERROR("failed to register network device\n");
+                goto out_remove_group;
+        }
+
+        return 0;
+
+ out_remove_group:
+        sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
+ out_release_irq:
+        free_irq(pdev->irq, priv);
+ out_destroy_workqueue:
+        destroy_workqueue(priv->workqueue);
+        priv->workqueue = NULL;
+ out_iounmap:
+        iounmap(priv->hw_base);
+ out_pci_release_regions:
+        pci_release_regions(pdev);
+ out_pci_disable_device:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+ out_free_ieee80211:
+        free_ieee80211(priv->net_dev);
+ out:
+        return err;
+}
+
+static void ipw_pci_remove(struct pci_dev *pdev)
+{
+        struct ipw_priv *priv = pci_get_drvdata(pdev);
+        if (!priv)
+                return;
+
+        priv->status |= STATUS_EXIT_PENDING;
+
+        sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
+
+        ipw_down(priv);
+
+        unregister_netdev(priv->net_dev);
+
+        if (priv->rxq) {
+                ipw_rx_queue_free(priv, priv->rxq);
+                priv->rxq = NULL;
+        }
+        ipw_tx_queue_free(priv);
+
+        /* ipw_down will ensure that there is no more pending work
+         * in the workqueue's, so we can safely remove them now. */
+        if (priv->workqueue) { 
+                cancel_delayed_work(&priv->adhoc_check);
+                cancel_delayed_work(&priv->gather_stats);
+                cancel_delayed_work(&priv->request_scan);
+                cancel_delayed_work(&priv->rf_kill);
+                cancel_delayed_work(&priv->scan_check);
+                destroy_workqueue(priv->workqueue);
+                priv->workqueue = NULL;
+        }
+
+        free_irq(pdev->irq, priv);
+        iounmap(priv->hw_base);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        free_ieee80211(priv->net_dev);
+
+#ifdef CONFIG_PM
+        if (fw_loaded) {
+                release_firmware(bootfw);
+                release_firmware(ucode);
+                release_firmware(firmware);
+                fw_loaded = 0;
+        }
+#endif
+}
+
+
+#ifdef CONFIG_PM
+static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
+{
+        struct ipw_priv *priv = pci_get_drvdata(pdev);
+        struct net_device *dev = priv->net_dev;
+
+        printk(KERN_INFO "%s: Going into suspend...\n", dev->name);
+
+        /* Take down the device; powers it off, etc. */
+        ipw_down(priv);
+
+        /* Remove the PRESENT state of the device */
+        netif_device_detach(dev);
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+        pci_save_state(pdev, priv->pm_state);
+#else
+        pci_save_state(pdev);
+#endif
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, state);
+        
+        return 0;
+}
+
+static int ipw_pci_resume(struct pci_dev *pdev)
+{
+        struct ipw_priv *priv = pci_get_drvdata(pdev);
+        struct net_device *dev = priv->net_dev;
+        u32 val;
+        
+        printk(KERN_INFO "%s: Coming out of suspend...\n", dev->name);
+
+        pci_set_power_state(pdev, 0);
+        pci_enable_device(pdev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+        pci_restore_state(pdev, priv->pm_state);
+#else
+        pci_restore_state(pdev);
+#endif
+        /*
+         * Suspend/Resume resets the PCI configuration space, so we have to
+         * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
+         * from interfering with C3 CPU state. pci_restore_state won't help
+         * here since it only restores the first 64 bytes pci config header.
+         */
+        pci_read_config_dword(pdev, 0x40, &val); 
+        if ((val & 0x0000ff00) != 0) 
+                pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+
+        /* Set the device back into the PRESENT state; this will also wake
+         * the queue of needed */
+        netif_device_attach(dev);
+
+        /* Bring the device back up */
+        queue_work(priv->workqueue, &priv->up);
+        
+        return 0;
+}
+#endif
+
+/* driver initialization stuff */
+static struct pci_driver ipw_driver = {
+        .name = DRV_NAME,
+        .id_table = card_ids,
+        .probe = ipw_pci_probe,
+        .remove = __devexit_p(ipw_pci_remove),
+#ifdef CONFIG_PM
+        .suspend = ipw_pci_suspend,
+        .resume = ipw_pci_resume,
+#endif
+};
+
+static int __init ipw_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
+
+        ret = pci_module_init(&ipw_driver);
+        if (ret) {
+                IPW_ERROR("Unable to initialize PCI module\n");
+                return ret;
+        }
+
+        ret = driver_create_file(&ipw_driver.driver, 
+                                 &driver_attr_debug_level);
+        if (ret) {
+                IPW_ERROR("Unable to create driver sysfs file\n");
+                pci_unregister_driver(&ipw_driver);
+                return ret;
+        }
+
+        return ret;
+}
+
+static void __exit ipw_exit(void)
+{
+        driver_remove_file(&ipw_driver.driver, &driver_attr_debug_level);
+        pci_unregister_driver(&ipw_driver);
+}
+
+module_param(disable, int, 0444);
+MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
+
+module_param(associate, int, 0444);
+MODULE_PARM_DESC(associate, "auto associate when scanning (default on)");
+
+module_param(auto_create, int, 0444);
+MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");
+
+module_param(debug, int, 0444);
+MODULE_PARM_DESC(debug, "debug output mask");
+
+module_param(channel, int, 0444);
+MODULE_PARM_DESC(channel, "channel to limit associate to (default 0 [ANY])"); 
+
+module_param(ifname, charp, 0444);
+MODULE_PARM_DESC(ifname, "network device name (default eth%d)");
+
+#ifdef CONFIG_IPW_PROMISC       
+module_param(mode, int, 0444);
+MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS,2=Monitor)");
+#else
+module_param(mode, int, 0444);
+MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS)");
+#endif
+
+module_exit(ipw_exit);
+module_init(ipw_init);
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
new file mode 100644
index 000000000000..4e8b75e7962a
--- /dev/null
+++ b/drivers/net/wireless/ipw2200.h
@@ -0,0 +1,1770 @@
+/******************************************************************************
+  
+  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
+  
+  This program is free software; you can redistribute it and/or modify it 
+  under the terms of version 2 of the GNU General Public License as 
+  published by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful, but WITHOUT 
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+  more details.
+  
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59 
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+#ifndef __ipw2200_h__
+#define __ipw2200_h__
+
+#define WEXT_USECHANNELS 1
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/config.h>
+#include <linux/init.h>
+
+#include <linux/version.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/skbuff.h>
+#include <linux/etherdevice.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+
+#include <linux/firmware.h>
+#include <linux/wireless.h>
+#include <asm/io.h>
+
+#include <net/ieee80211.h>
+
+#define DRV_NAME        "ipw2200"
+
+#include <linux/workqueue.h>
+
+#ifndef IRQ_NONE
+typedef void irqreturn_t;
+#define IRQ_NONE 
+#define IRQ_HANDLED 
+#define IRQ_RETVAL(x)
+#endif
+
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) )
+#define __iomem
+#endif
+
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
+#define pci_dma_sync_single_for_cpu     pci_dma_sync_single
+#define pci_dma_sync_single_for_device  pci_dma_sync_single
+#endif
+
+#ifndef HAVE_FREE_NETDEV
+#define free_netdev(x) kfree(x)
+#endif
+
+/* Authentication  and Association States */
+enum connection_manager_assoc_states
+{
+        CMAS_INIT = 0,
+        CMAS_TX_AUTH_SEQ_1,
+        CMAS_RX_AUTH_SEQ_2,
+        CMAS_AUTH_SEQ_1_PASS,
+        CMAS_AUTH_SEQ_1_FAIL,
+        CMAS_TX_AUTH_SEQ_3,
+        CMAS_RX_AUTH_SEQ_4,
+        CMAS_AUTH_SEQ_2_PASS,
+        CMAS_AUTH_SEQ_2_FAIL,
+        CMAS_AUTHENTICATED,
+        CMAS_TX_ASSOC,
+        CMAS_RX_ASSOC_RESP,
+        CMAS_ASSOCIATED,
+        CMAS_LAST
+};
+
+
+#define IPW_NORMAL                   0
+#define IPW_NOWAIT                   0
+#define IPW_WAIT                     (1<<0)
+#define IPW_QUIET                    (1<<1)
+#define IPW_ROAMING                  (1<<2)
+
+#define IPW_POWER_MODE_CAM           0x00       //(always on)
+#define IPW_POWER_INDEX_1            0x01
+#define IPW_POWER_INDEX_2            0x02
+#define IPW_POWER_INDEX_3            0x03
+#define IPW_POWER_INDEX_4            0x04
+#define IPW_POWER_INDEX_5            0x05
+#define IPW_POWER_AC                 0x06
+#define IPW_POWER_BATTERY            0x07
+#define IPW_POWER_LIMIT              0x07
+#define IPW_POWER_MASK               0x0F
+#define IPW_POWER_ENABLED            0x10
+#define IPW_POWER_LEVEL(x)           ((x) & IPW_POWER_MASK)
+
+#define IPW_CMD_HOST_COMPLETE                 2
+#define IPW_CMD_POWER_DOWN                    4
+#define IPW_CMD_SYSTEM_CONFIG                 6
+#define IPW_CMD_MULTICAST_ADDRESS             7
+#define IPW_CMD_SSID                          8
+#define IPW_CMD_ADAPTER_ADDRESS              11
+#define IPW_CMD_PORT_TYPE                    12
+#define IPW_CMD_RTS_THRESHOLD                15
+#define IPW_CMD_FRAG_THRESHOLD               16
+#define IPW_CMD_POWER_MODE                   17
+#define IPW_CMD_WEP_KEY                      18
+#define IPW_CMD_TGI_TX_KEY                   19
+#define IPW_CMD_SCAN_REQUEST                 20
+#define IPW_CMD_ASSOCIATE                    21
+#define IPW_CMD_SUPPORTED_RATES              22
+#define IPW_CMD_SCAN_ABORT                   23
+#define IPW_CMD_TX_FLUSH                     24
+#define IPW_CMD_QOS_PARAMETERS               25
+#define IPW_CMD_SCAN_REQUEST_EXT             26
+#define IPW_CMD_DINO_CONFIG                  30
+#define IPW_CMD_RSN_CAPABILITIES             31
+#define IPW_CMD_RX_KEY                       32
+#define IPW_CMD_CARD_DISABLE                 33
+#define IPW_CMD_SEED_NUMBER                  34
+#define IPW_CMD_TX_POWER                     35
+#define IPW_CMD_COUNTRY_INFO                 36
+#define IPW_CMD_AIRONET_INFO                 37
+#define IPW_CMD_AP_TX_POWER                  38
+#define IPW_CMD_CCKM_INFO                    39
+#define IPW_CMD_CCX_VER_INFO                 40
+#define IPW_CMD_SET_CALIBRATION              41
+#define IPW_CMD_SENSITIVITY_CALIB            42
+#define IPW_CMD_RETRY_LIMIT                  51
+#define IPW_CMD_IPW_PRE_POWER_DOWN           58
+#define IPW_CMD_VAP_BEACON_TEMPLATE          60
+#define IPW_CMD_VAP_DTIM_PERIOD              61
+#define IPW_CMD_EXT_SUPPORTED_RATES          62
+#define IPW_CMD_VAP_LOCAL_TX_PWR_CONSTRAINT  63
+#define IPW_CMD_VAP_QUIET_INTERVALS          64
+#define IPW_CMD_VAP_CHANNEL_SWITCH           65
+#define IPW_CMD_VAP_MANDATORY_CHANNELS       66
+#define IPW_CMD_VAP_CELL_PWR_LIMIT           67
+#define IPW_CMD_VAP_CF_PARAM_SET             68
+#define IPW_CMD_VAP_SET_BEACONING_STATE      69
+#define IPW_CMD_MEASUREMENT                  80
+#define IPW_CMD_POWER_CAPABILITY             81
+#define IPW_CMD_SUPPORTED_CHANNELS           82
+#define IPW_CMD_TPC_REPORT                   83
+#define IPW_CMD_WME_INFO                     84
+#define IPW_CMD_PRODUCTION_COMMAND           85
+#define IPW_CMD_LINKSYS_EOU_INFO             90
+
+#define RFD_SIZE                              4
+#define NUM_TFD_CHUNKS                        6
+
+#define TX_QUEUE_SIZE                        32
+#define RX_QUEUE_SIZE                        32
+
+#define DINO_CMD_WEP_KEY                   0x08
+#define DINO_CMD_TX                        0x0B
+#define DCT_ANTENNA_A                      0x01
+#define DCT_ANTENNA_B                      0x02
+
+#define IPW_A_MODE                         0
+#define IPW_B_MODE                         1
+#define IPW_G_MODE                         2
+
+/* 
+ * TX Queue Flag Definitions 
+ */
+
+/* abort attempt if mgmt frame is rx'd */
+#define DCT_FLAG_ABORT_MGMT                0x01 
+ 
+/* require CTS */
+#define DCT_FLAG_CTS_REQUIRED              0x02
+
+/* use short preamble */
+#define DCT_FLAG_SHORT_PREMBL              0x04  
+
+/* RTS/CTS first */
+#define DCT_FLAG_RTS_REQD                  0x08
+
+/* dont calculate duration field */
+#define DCT_FLAG_DUR_SET                   0x10
+
+/* even if MAC WEP set (allows pre-encrypt) */
+#define DCT_FLAG_NO_WEP              0x20
+#define IPW_
+/* overwrite TSF field */
+#define DCT_FLAG_TSF_REQD                  0x40
+
+/* ACK rx is expected to follow */
+#define DCT_FLAG_ACK_REQD                  0x80  
+
+#define DCT_FLAG_EXT_MODE_CCK  0x01
+#define DCT_FLAG_EXT_MODE_OFDM 0x00
+
+
+#define TX_RX_TYPE_MASK                    0xFF
+#define TX_FRAME_TYPE                      0x00
+#define TX_HOST_COMMAND_TYPE               0x01
+#define RX_FRAME_TYPE                      0x09
+#define RX_HOST_NOTIFICATION_TYPE          0x03
+#define RX_HOST_CMD_RESPONSE_TYPE          0x04
+#define RX_TX_FRAME_RESPONSE_TYPE          0x05
+#define TFD_NEED_IRQ_MASK                  0x04
+
+#define HOST_CMD_DINO_CONFIG               30
+
+#define HOST_NOTIFICATION_STATUS_ASSOCIATED             10
+#define HOST_NOTIFICATION_STATUS_AUTHENTICATE           11
+#define HOST_NOTIFICATION_STATUS_SCAN_CHANNEL_RESULT    12
+#define HOST_NOTIFICATION_STATUS_SCAN_COMPLETED         13
+#define HOST_NOTIFICATION_STATUS_FRAG_LENGTH            14
+#define HOST_NOTIFICATION_STATUS_LINK_DETERIORATION     15
+#define HOST_NOTIFICATION_DINO_CONFIG_RESPONSE          16
+#define HOST_NOTIFICATION_STATUS_BEACON_STATE           17
+#define HOST_NOTIFICATION_STATUS_TGI_TX_KEY             18
+#define HOST_NOTIFICATION_TX_STATUS                     19
+#define HOST_NOTIFICATION_CALIB_KEEP_RESULTS            20
+#define HOST_NOTIFICATION_MEASUREMENT_STARTED           21
+#define HOST_NOTIFICATION_MEASUREMENT_ENDED             22
+#define HOST_NOTIFICATION_CHANNEL_SWITCHED              23
+#define HOST_NOTIFICATION_RX_DURING_QUIET_PERIOD        24
+#define HOST_NOTIFICATION_NOISE_STATS                   25
+#define HOST_NOTIFICATION_S36_MEASUREMENT_ACCEPTED      30 
+#define HOST_NOTIFICATION_S36_MEASUREMENT_REFUSED       31
+
+#define HOST_NOTIFICATION_STATUS_BEACON_MISSING         1
+#define IPW_MB_DISASSOCIATE_THRESHOLD_DEFAULT           24
+#define IPW_MB_ROAMING_THRESHOLD_DEFAULT                8
+#define IPW_REAL_RATE_RX_PACKET_THRESHOLD               300    
+
+#define MACADRR_BYTE_LEN                     6
+
+#define DCR_TYPE_AP                       0x01
+#define DCR_TYPE_WLAP                     0x02
+#define DCR_TYPE_MU_ESS                   0x03
+#define DCR_TYPE_MU_IBSS                  0x04
+#define DCR_TYPE_MU_PIBSS                 0x05
+#define DCR_TYPE_SNIFFER                  0x06
+#define DCR_TYPE_MU_BSS        DCR_TYPE_MU_ESS
+
+/**
+ * Generic queue structure
+ * 
+ * Contains common data for Rx and Tx queues
+ */
+struct clx2_queue {
+        int n_bd;                      /**< number of BDs in this queue */
+        int first_empty;               /**< 1-st empty entry (index) */
+        int last_used;                 /**< last used entry (index) */
+        u32 reg_w;                   /**< 'write' reg (queue head), addr in domain 1 */
+        u32 reg_r;                   /**< 'read' reg (queue tail), addr in domain 1 */
+        dma_addr_t dma_addr;            /**< physical addr for BD's */
+        int low_mark;                  /**< low watermark, resume queue if free space more than this */
+        int high_mark;                 /**< high watermark, stop queue if free space less than this */
+} __attribute__ ((packed));
+
+struct machdr32
+{
+        u16 frame_ctl;
+        u16 duration;     // watch out for endians!
+        u8 addr1[ MACADRR_BYTE_LEN ];
+        u8 addr2[ MACADRR_BYTE_LEN ];
+        u8 addr3[ MACADRR_BYTE_LEN ];
+        u16 seq_ctrl;     // more endians!
+        u8 addr4[ MACADRR_BYTE_LEN ];
+        u16 qos_ctrl;
+} __attribute__ ((packed)) ;
+
+struct machdr30
+{
+        u16 frame_ctl;
+        u16 duration;     // watch out for endians!
+        u8 addr1[ MACADRR_BYTE_LEN ];
+        u8 addr2[ MACADRR_BYTE_LEN ];
+        u8 addr3[ MACADRR_BYTE_LEN ];
+        u16 seq_ctrl;     // more endians!
+        u8 addr4[ MACADRR_BYTE_LEN ];
+} __attribute__ ((packed)) ;
+
+struct machdr26
+{
+        u16 frame_ctl;
+        u16 duration;     // watch out for endians!
+        u8 addr1[ MACADRR_BYTE_LEN ];
+        u8 addr2[ MACADRR_BYTE_LEN ];
+        u8 addr3[ MACADRR_BYTE_LEN ];
+        u16 seq_ctrl;     // more endians!
+        u16 qos_ctrl;
+} __attribute__ ((packed)) ;
+
+struct machdr24
+{
+        u16 frame_ctl;
+        u16 duration;     // watch out for endians!
+        u8 addr1[ MACADRR_BYTE_LEN ];
+        u8 addr2[ MACADRR_BYTE_LEN ];
+        u8 addr3[ MACADRR_BYTE_LEN ];
+        u16 seq_ctrl;     // more endians!
+} __attribute__ ((packed)) ;
+
+// TX TFD with 32 byte MAC Header
+struct tx_tfd_32
+{   
+        struct machdr32    mchdr;                      // 32
+        u32                uivplaceholder[2];          // 8
+} __attribute__ ((packed)) ;
+
+// TX TFD with 30 byte MAC Header
+struct tx_tfd_30
+{
+        struct machdr30    mchdr;                      // 30
+        u8                 reserved[2];                // 2
+        u32                uivplaceholder[2];          // 8
+} __attribute__ ((packed)) ;
+
+// tx tfd with 26 byte mac header
+struct tx_tfd_26
+{
+        struct machdr26    mchdr;                      // 26
+        u8                 reserved1[2];               // 2
+        u32                uivplaceholder[2];          // 8
+        u8                 reserved2[4];               // 4
+} __attribute__ ((packed)) ;
+
+// tx tfd with 24 byte mac header
+struct tx_tfd_24
+{
+        struct machdr24    mchdr;                      // 24
+        u32                uivplaceholder[2];          // 8
+        u8                 reserved[8];                // 8
+} __attribute__ ((packed)) ;
+
+
+#define DCT_WEP_KEY_FIELD_LENGTH 16
+
+struct tfd_command
+{
+        u8 index;
+        u8 length;
+        u16 reserved;
+        u8 payload[0];
+} __attribute__ ((packed)) ;
+
+struct tfd_data {
+        /* Header */
+        u32 work_area_ptr;
+        u8 station_number; /* 0 for BSS */
+        u8 reserved1;
+        u16 reserved2;
+
+        /* Tx Parameters */
+        u8 cmd_id;
+        u8 seq_num;    
+        u16 len;  
+        u8 priority;
+        u8 tx_flags;
+        u8 tx_flags_ext;
+        u8 key_index;
+        u8 wepkey[DCT_WEP_KEY_FIELD_LENGTH];
+        u8 rate;
+        u8 antenna;
+        u16 next_packet_duration;
+        u16 next_frag_len;  
+        u16 back_off_counter; //////txop;
+        u8 retrylimit;
+        u16 cwcurrent;  
+        u8 reserved3;
+
+        /* 802.11 MAC Header */
+        union
+        {
+                struct tx_tfd_24 tfd_24;
+                struct tx_tfd_26 tfd_26;
+                struct tx_tfd_30 tfd_30;
+                struct tx_tfd_32 tfd_32;
+        } tfd;
+
+        /* Payload DMA info */
+        u32 num_chunks;
+        u32 chunk_ptr[NUM_TFD_CHUNKS];
+        u16 chunk_len[NUM_TFD_CHUNKS];
+} __attribute__ ((packed));
+
+struct txrx_control_flags
+{
+        u8 message_type;
+        u8 rx_seq_num;
+        u8 control_bits;
+        u8 reserved;
+} __attribute__ ((packed));
+
+#define  TFD_SIZE                           128
+#define  TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH   (TFD_SIZE - sizeof(struct txrx_control_flags))
+
+struct tfd_frame
+{
+        struct txrx_control_flags control_flags;
+        union {
+                struct tfd_data data;
+                struct tfd_command cmd;
+                u8 raw[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
+        } u;
+} __attribute__ ((packed)) ;
+
+typedef void destructor_func(const void*);
+
+/**
+ * Tx Queue for DMA. Queue consists of circular buffer of
+ * BD's and required locking structures.
+ */
+struct clx2_tx_queue {
+        struct clx2_queue q;
+        struct tfd_frame* bd;
+        struct ieee80211_txb **txb;
+};
+
+/*
+ * RX related structures and functions
+ */
+#define RX_FREE_BUFFERS 32
+#define RX_LOW_WATERMARK 8
+
+#define SUP_RATE_11A_MAX_NUM_CHANNELS  (8)
+#define SUP_RATE_11B_MAX_NUM_CHANNELS  (4)
+#define SUP_RATE_11G_MAX_NUM_CHANNELS  (12)
+
+// Used for passing to driver number of successes and failures per rate
+struct rate_histogram
+{
+        union {
+                u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+                u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+                u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+        } success;
+        union {
+                u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+                u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+                u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+        } failed;
+} __attribute__ ((packed));
+
+/* statistics command response */       
+struct ipw_cmd_stats {
+        u8 cmd_id;
+        u8 seq_num;
+        u16 good_sfd;               
+        u16 bad_plcp;               
+        u16 wrong_bssid;            
+        u16 valid_mpdu;             
+        u16 bad_mac_header;         
+        u16 reserved_frame_types;   
+        u16 rx_ina;                 
+        u16 bad_crc32;              
+        u16 invalid_cts;            
+        u16 invalid_acks;           
+        u16 long_distance_ina_fina; 
+        u16 dsp_silence_unreachable;
+        u16 accumulated_rssi;      
+        u16 rx_ovfl_frame_tossed;  
+        u16 rssi_silence_threshold;
+        u16 rx_ovfl_frame_supplied;
+        u16 last_rx_frame_signal;  
+        u16 last_rx_frame_noise;   
+        u16 rx_autodetec_no_ofdm;  
+        u16 rx_autodetec_no_barker;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct notif_channel_result {
+        u8 channel_num;
+        struct ipw_cmd_stats stats;
+        u8 uReserved;
+} __attribute__ ((packed));
+
+struct notif_scan_complete {
+        u8 scan_type;
+        u8 num_channels;
+        u8 status;
+        u8 reserved;
+}  __attribute__ ((packed));
+
+struct notif_frag_length {
+        u16 frag_length;
+        u16 reserved;
+}  __attribute__ ((packed));
+
+struct notif_beacon_state {
+        u32 state;
+        u32 number;
+} __attribute__ ((packed));
+
+struct notif_tgi_tx_key {
+        u8 key_state;
+        u8 security_type;
+        u8 station_index;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct notif_link_deterioration {
+        struct ipw_cmd_stats stats;
+        u8 rate;
+        u8 modulation;
+        struct rate_histogram histogram;
+        u8 reserved1;
+        u16 reserved2;
+} __attribute__ ((packed));
+
+struct notif_association {
+        u8 state;
+} __attribute__ ((packed));
+
+struct notif_authenticate {
+        u8 state;
+        struct machdr24 addr;
+        u16 status;
+} __attribute__ ((packed));
+
+struct temperature
+{
+        s32 measured;
+        s32 active;
+} __attribute__ ((packed));
+
+struct notif_calibration {
+        u8 data[104];
+} __attribute__ ((packed));
+
+struct notif_noise {
+        u32 value;
+} __attribute__ ((packed));
+
+struct ipw_rx_notification {
+        u8 reserved[8];
+        u8 subtype;
+        u8 flags;
+        u16 size;
+        union {
+                struct notif_association assoc;
+                struct notif_authenticate auth;
+                struct notif_channel_result channel_result;
+                struct notif_scan_complete scan_complete;
+                struct notif_frag_length frag_len;
+                struct notif_beacon_state beacon_state;
+                struct notif_tgi_tx_key tgi_tx_key;
+                struct notif_link_deterioration link_deterioration;
+                struct notif_calibration calibration;
+                struct notif_noise noise;
+                u8 raw[0];
+        } u;
+} __attribute__ ((packed));
+
+struct ipw_rx_frame {
+        u32 reserved1; 
+        u8 parent_tsf[4];     // fw_use[0] is boolean for OUR_TSF_IS_GREATER
+        u8 received_channel;  // The channel that this frame was received on.
+                              // Note that for .11b this does not have to be 
+                              // the same as the channel that it was sent. 
+                              // Filled by LMAC
+        u8 frameStatus;
+        u8 rate;
+        u8 rssi;
+        u8 agc;
+        u8 rssi_dbm;
+        u16 signal;
+        u16 noise;
+        u8 antennaAndPhy;
+        u8 control;           // control bit should be on in bg
+        u8 rtscts_rate;       // rate of rts or cts (in rts cts sequence rate 
+                              // is identical)
+        u8 rtscts_seen;       // 0x1 RTS seen ; 0x2 CTS seen
+        u16 length;
+        u8 data[0];
+} __attribute__ ((packed));
+                    
+struct ipw_rx_header {
+        u8 message_type;
+        u8 rx_seq_num;
+        u8 control_bits;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct ipw_rx_packet
+{
+        struct ipw_rx_header header;
+        union {
+                struct ipw_rx_frame frame;
+                struct ipw_rx_notification notification;
+        } u;
+} __attribute__ ((packed));
+
+#define IPW_RX_NOTIFICATION_SIZE sizeof(struct ipw_rx_header) + 12
+#define IPW_RX_FRAME_SIZE        sizeof(struct ipw_rx_header) + \
+                                 sizeof(struct ipw_rx_frame)
+
+struct ipw_rx_mem_buffer {
+        dma_addr_t dma_addr;
+        struct ipw_rx_buffer *rxb;
+        struct sk_buff *skb;
+        struct list_head list;
+}; /* Not transferred over network, so not  __attribute__ ((packed)) */
+
+struct ipw_rx_queue {
+        struct ipw_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
+        struct ipw_rx_mem_buffer *queue[RX_QUEUE_SIZE];
+        u32 processed; /* Internal index to last handled Rx packet */
+        u32 read;      /* Shared index to newest available Rx buffer */
+        u32 write;     /* Shared index to oldest written Rx packet */
+        u32 free_count;/* Number of pre-allocated buffers in rx_free */
+        /* Each of these lists is used as a FIFO for ipw_rx_mem_buffers */
+        struct list_head rx_free;  /* Own an SKBs */
+        struct list_head rx_used;  /* No SKB allocated */
+        spinlock_t lock;
+}; /* Not transferred over network, so not  __attribute__ ((packed)) */
+
+
+struct alive_command_responce {
+        u8 alive_command;
+        u8 sequence_number;
+        u16 software_revision;
+        u8 device_identifier;
+        u8 reserved1[5];
+        u16 reserved2;
+        u16 reserved3;
+        u16 clock_settle_time;
+        u16 powerup_settle_time;
+        u16 reserved4;
+        u8 time_stamp[5];       /* month, day, year, hours, minutes */
+        u8 ucode_valid;
+} __attribute__ ((packed));
+
+#define IPW_MAX_RATES 12
+
+struct ipw_rates {
+        u8 num_rates;
+        u8 rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct command_block
+{
+        unsigned int control;
+        u32 source_addr;
+        u32 dest_addr;
+        unsigned int status;
+} __attribute__ ((packed));
+
+#define CB_NUMBER_OF_ELEMENTS_SMALL 64
+struct fw_image_desc
+{
+        unsigned long last_cb_index;
+        unsigned long current_cb_index;
+        struct command_block cb_list[CB_NUMBER_OF_ELEMENTS_SMALL];
+        void * v_addr;
+        unsigned long p_addr;
+        unsigned long len;
+};
+
+struct ipw_sys_config
+{
+        u8 bt_coexistence;
+        u8 reserved1;
+        u8 answer_broadcast_ssid_probe;
+        u8 accept_all_data_frames;
+        u8 accept_non_directed_frames;
+        u8 exclude_unicast_unencrypted;
+        u8 disable_unicast_decryption;
+        u8 exclude_multicast_unencrypted;
+        u8 disable_multicast_decryption;
+        u8 antenna_diversity;
+        u8 pass_crc_to_host;
+        u8 dot11g_auto_detection;
+        u8 enable_cts_to_self;
+        u8 enable_multicast_filtering;
+        u8 bt_coexist_collision_thr;
+        u8 reserved2;
+        u8 accept_all_mgmt_bcpr;
+        u8 accept_all_mgtm_frames;
+        u8 pass_noise_stats_to_host;
+        u8 reserved3;
+} __attribute__ ((packed));
+
+struct ipw_multicast_addr
+{
+        u8 num_of_multicast_addresses;
+        u8 reserved[3];
+        u8 mac1[6];
+        u8 mac2[6];
+        u8 mac3[6];
+        u8 mac4[6];
+} __attribute__ ((packed));
+
+struct ipw_wep_key
+{
+        u8 cmd_id;
+        u8 seq_num;
+        u8 key_index;
+        u8 key_size;
+        u8 key[16];
+} __attribute__ ((packed));
+
+struct ipw_tgi_tx_key
+{ 
+        u8 key_id;  
+        u8 security_type;
+        u8 station_index;
+        u8 flags;
+        u8 key[16];
+        u32 tx_counter[2];
+} __attribute__ ((packed));
+
+#define IPW_SCAN_CHANNELS 54
+
+struct ipw_scan_request 
+{
+        u8 scan_type;
+        u16 dwell_time;
+        u8 channels_list[IPW_SCAN_CHANNELS];
+        u8 channels_reserved[3];
+} __attribute__ ((packed));
+
+enum {
+        IPW_SCAN_PASSIVE_TILL_FIRST_BEACON_SCAN = 0,
+        IPW_SCAN_PASSIVE_FULL_DWELL_SCAN,
+        IPW_SCAN_ACTIVE_DIRECT_SCAN,
+        IPW_SCAN_ACTIVE_BROADCAST_SCAN,
+        IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN,
+        IPW_SCAN_TYPES
+};
+
+struct ipw_scan_request_ext
+{
+        u32 full_scan_index;
+        u8 channels_list[IPW_SCAN_CHANNELS];
+        u8 scan_type[IPW_SCAN_CHANNELS / 2];
+        u8 reserved;
+        u16 dwell_time[IPW_SCAN_TYPES];
+} __attribute__ ((packed));
+
+extern inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index) 
+{
+        if (index % 2)
+                return scan->scan_type[index / 2] & 0x0F;
+        else
+                return (scan->scan_type[index / 2] & 0xF0) >> 4;
+}
+
+extern inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan, 
+                                     u8 index, u8 scan_type)
+{
+        if (index % 2) 
+                scan->scan_type[index / 2] = 
+                        (scan->scan_type[index / 2] & 0xF0) | 
+                        (scan_type & 0x0F);
+        else
+                scan->scan_type[index / 2] = 
+                        (scan->scan_type[index / 2] & 0x0F) | 
+                        ((scan_type & 0x0F) << 4);
+}
+
+struct ipw_associate
+{
+        u8 channel;
+        u8 auth_type:4,
+           auth_key:4;
+        u8 assoc_type;
+        u8 reserved;
+        u16 policy_support;
+        u8 preamble_length;
+        u8 ieee_mode;
+        u8 bssid[ETH_ALEN];
+        u32 assoc_tsf_msw;
+        u32 assoc_tsf_lsw;
+        u16 capability;
+        u16 listen_interval;
+        u16 beacon_interval;
+        u8 dest[ETH_ALEN];
+        u16 atim_window;
+        u8 smr;
+        u8 reserved1;
+        u16 reserved2;
+} __attribute__ ((packed));
+
+struct ipw_supported_rates
+{
+        u8 ieee_mode;
+        u8 num_rates;
+        u8 purpose;
+        u8 reserved;
+        u8 supported_rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct ipw_rts_threshold
+{
+        u16 rts_threshold;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_frag_threshold
+{
+        u16 frag_threshold;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_retry_limit
+{
+        u8 short_retry_limit;
+        u8 long_retry_limit;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_dino_config
+{
+        u32 dino_config_addr;
+        u16 dino_config_size;
+        u8 dino_response;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct ipw_aironet_info
+{
+        u8 id;
+        u8 length;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_rx_key
+{
+        u8 station_index;
+        u8 key_type;
+        u8 key_id;
+        u8 key_flag;
+        u8 key[16];
+        u8 station_address[6];
+        u8 key_index;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct ipw_country_channel_info
+{
+        u8 first_channel;
+        u8 no_channels;
+        s8 max_tx_power;
+} __attribute__ ((packed));
+
+struct ipw_country_info
+{
+        u8 id;
+        u8 length;
+        u8 country_str[3];
+        struct ipw_country_channel_info groups[7];
+} __attribute__ ((packed));
+
+struct ipw_channel_tx_power
+{
+        u8 channel_number;
+        s8 tx_power;
+} __attribute__ ((packed));
+
+#define SCAN_ASSOCIATED_INTERVAL (HZ)
+#define SCAN_INTERVAL (HZ / 10)
+#define MAX_A_CHANNELS  37
+#define MAX_B_CHANNELS  14
+
+struct ipw_tx_power
+{
+        u8 num_channels;
+        u8 ieee_mode;
+        struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
+} __attribute__ ((packed));
+
+struct ipw_qos_parameters
+{
+        u16 cw_min[4];
+        u16 cw_max[4];
+        u8 aifs[4];
+        u8 flag[4];
+        u16 tx_op_limit[4];
+} __attribute__ ((packed));
+
+struct ipw_rsn_capabilities
+{
+        u8 id;
+        u8 length;
+        u16 version;
+} __attribute__ ((packed));
+
+struct ipw_sensitivity_calib
+{
+        u16 beacon_rssi_raw;
+        u16 reserved;
+} __attribute__ ((packed));
+
+/**
+ * Host command structure.
+ * 
+ * On input, the following fields should be filled:
+ * - cmd
+ * - len
+ * - status_len
+ * - param (if needed)
+ * 
+ * On output, 
+ * - \a status contains status;
+ * - \a param filled with status parameters.
+ */
+struct ipw_cmd {
+  u32 cmd;         /**< Host command */
+  u32 status;      /**< Status */
+  u32 status_len;  /**< How many 32 bit parameters in the status */
+  u32 len;         /**< incoming parameters length, bytes */
+  /**
+   * command parameters. 
+   * There should be enough space for incoming and 
+   * outcoming parameters.
+   * Incoming parameters listed 1-st, followed by outcoming params.
+   * nParams=(len+3)/4+status_len
+   */
+  u32 param[0];
+} __attribute__ ((packed));
+
+#define STATUS_HCMD_ACTIVE      (1<<0)  /**< host command in progress */
+
+#define STATUS_INT_ENABLED      (1<<1)
+#define STATUS_RF_KILL_HW       (1<<2)
+#define STATUS_RF_KILL_SW       (1<<3)
+#define STATUS_RF_KILL_MASK     (STATUS_RF_KILL_HW | STATUS_RF_KILL_SW)
+
+#define STATUS_INIT             (1<<5)
+#define STATUS_AUTH             (1<<6)
+#define STATUS_ASSOCIATED       (1<<7)
+#define STATUS_STATE_MASK       (STATUS_INIT | STATUS_AUTH | STATUS_ASSOCIATED)
+
+#define STATUS_ASSOCIATING      (1<<8)
+#define STATUS_DISASSOCIATING   (1<<9)
+#define STATUS_ROAMING          (1<<10)
+#define STATUS_EXIT_PENDING     (1<<11)
+#define STATUS_DISASSOC_PENDING (1<<12)
+#define STATUS_STATE_PENDING    (1<<13)
+
+#define STATUS_SCAN_PENDING     (1<<20)
+#define STATUS_SCANNING         (1<<21) 
+#define STATUS_SCAN_ABORTING    (1<<22) 
+
+#define STATUS_INDIRECT_BYTE    (1<<28) /* sysfs entry configured for access */
+#define STATUS_INDIRECT_DWORD   (1<<29) /* sysfs entry configured for access */
+#define STATUS_DIRECT_DWORD     (1<<30) /* sysfs entry configured for access */
+
+#define STATUS_SECURITY_UPDATED (1<<31) /* Security sync needed */
+
+#define CFG_STATIC_CHANNEL      (1<<0) /* Restrict assoc. to single channel */
+#define CFG_STATIC_ESSID        (1<<1) /* Restrict assoc. to single SSID */
+#define CFG_STATIC_BSSID        (1<<2) /* Restrict assoc. to single BSSID */
+#define CFG_CUSTOM_MAC          (1<<3)
+#define CFG_PREAMBLE            (1<<4)
+#define CFG_ADHOC_PERSIST       (1<<5)
+#define CFG_ASSOCIATE           (1<<6)
+#define CFG_FIXED_RATE          (1<<7)
+#define CFG_ADHOC_CREATE        (1<<8)
+
+#define CAP_SHARED_KEY          (1<<0) /* Off = OPEN */
+#define CAP_PRIVACY_ON          (1<<1) /* Off = No privacy */
+
+#define MAX_STATIONS            32
+#define IPW_INVALID_STATION     (0xff)
+
+struct ipw_station_entry {
+        u8 mac_addr[ETH_ALEN];
+        u8 reserved;
+        u8 support_mode;
+};
+
+#define AVG_ENTRIES 8
+struct average {
+        s16 entries[AVG_ENTRIES];
+        u8 pos;
+        u8 init;
+        s32 sum;
+};
+
+struct ipw_priv {
+        /* ieee device used by generic ieee processing code */
+        struct ieee80211_device *ieee;
+        struct ieee80211_security sec;
+
+        /* spinlock */
+        spinlock_t lock;
+
+        /* basic pci-network driver stuff */
+        struct pci_dev *pci_dev;
+        struct net_device *net_dev;
+
+        /* pci hardware address support */
+        void __iomem *hw_base;
+        unsigned long hw_len;
+        
+        struct fw_image_desc sram_desc;
+
+        /* result of ucode download */
+        struct alive_command_responce dino_alive;
+
+        wait_queue_head_t wait_command_queue;
+        wait_queue_head_t wait_state;
+
+        /* Rx and Tx DMA processing queues */
+        struct ipw_rx_queue *rxq;
+        struct clx2_tx_queue txq_cmd;
+        struct clx2_tx_queue txq[4];
+        u32 status;
+        u32 config;
+        u32 capability;
+
+        u8 last_rx_rssi;
+        u8 last_noise;
+        struct average average_missed_beacons;
+        struct average average_rssi;
+        struct average average_noise;
+        u32 port_type;
+        int rx_bufs_min;          /**< minimum number of bufs in Rx queue */
+        int rx_pend_max;          /**< maximum pending buffers for one IRQ */
+        u32 hcmd_seq;             /**< sequence number for hcmd */
+        u32 missed_beacon_threshold;
+        u32 roaming_threshold; 
+
+        struct ipw_associate assoc_request;
+        struct ieee80211_network *assoc_network;
+
+        unsigned long ts_scan_abort;
+        struct ipw_supported_rates rates;
+        struct ipw_rates phy[3];           /**< PHY restrictions, per band */
+        struct ipw_rates supp;             /**< software defined */
+        struct ipw_rates extended;         /**< use for corresp. IE, AP only */
+
+        struct notif_link_deterioration last_link_deterioration; /** for statistics */
+        struct ipw_cmd* hcmd; /**< host command currently executed */
+
+        wait_queue_head_t hcmd_wq;     /**< host command waits for execution */
+        u32 tsf_bcn[2];              /**< TSF from latest beacon */
+
+        struct notif_calibration calib; /**< last calibration */
+
+        /* ordinal interface with firmware */
+        u32 table0_addr;
+        u32 table0_len;
+        u32 table1_addr;
+        u32 table1_len;
+        u32 table2_addr;
+        u32 table2_len;
+
+        /* context information */
+        u8 essid[IW_ESSID_MAX_SIZE];
+        u8 essid_len;
+        u8 nick[IW_ESSID_MAX_SIZE];
+        u16 rates_mask;
+        u8 channel;
+        struct ipw_sys_config sys_config;
+        u32 power_mode;
+        u8 bssid[ETH_ALEN];  
+        u16 rts_threshold;
+        u8 mac_addr[ETH_ALEN];
+        u8 num_stations;
+        u8 stations[MAX_STATIONS][ETH_ALEN]; 
+
+        u32 notif_missed_beacons;
+
+        /* Statistics and counters normalized with each association */
+        u32 last_missed_beacons;
+        u32 last_tx_packets;
+        u32 last_rx_packets;
+        u32 last_tx_failures;
+        u32 last_rx_err;
+        u32 last_rate;
+
+        u32 missed_adhoc_beacons;
+        u32 missed_beacons;
+        u32 rx_packets;
+        u32 tx_packets;
+        u32 quality;
+
+        /* eeprom */
+        u8 eeprom[0x100];  /* 256 bytes of eeprom */  
+        int eeprom_delay;
+
+        struct iw_statistics wstats; 
+
+        struct workqueue_struct *workqueue;
+        
+        struct work_struct adhoc_check;
+        struct work_struct associate;
+        struct work_struct disassociate;
+        struct work_struct rx_replenish;
+        struct work_struct request_scan;
+        struct work_struct adapter_restart;
+        struct work_struct rf_kill;
+        struct work_struct up;
+        struct work_struct down;
+        struct work_struct gather_stats;
+        struct work_struct abort_scan;
+        struct work_struct roam;
+        struct work_struct scan_check;
+
+        struct tasklet_struct irq_tasklet;
+
+
+#define IPW_2200BG  1
+#define IPW_2915ABG 2
+        u8 adapter;
+
+#define IPW_DEFAULT_TX_POWER 0x14
+        u8 tx_power;
+
+#ifdef CONFIG_PM        
+        u32 pm_state[16];
+#endif
+
+        /* network state */
+
+        /* Used to pass the current INTA value from ISR to Tasklet */
+        u32 isr_inta;
+
+        /* debugging info */
+        u32 indirect_dword;
+        u32 direct_dword;
+        u32 indirect_byte;
+};                              /*ipw_priv */
+
+
+/* debug macros */
+
+#ifdef CONFIG_IPW_DEBUG
+#define IPW_DEBUG(level, fmt, args...) \
+do { if (ipw_debug_level & (level)) \
+  printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \
+         in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
+#else
+#define IPW_DEBUG(level, fmt, args...) do {} while (0)
+#endif                          /* CONFIG_IPW_DEBUG */
+
+/*
+ * To use the debug system;
+ *
+ * If you are defining a new debug classification, simply add it to the #define
+ * list here in the form of:
+ *
+ * #define IPW_DL_xxxx VALUE
+ * 
+ * shifting value to the left one bit from the previous entry.  xxxx should be
+ * the name of the classification (for example, WEP)
+ *
+ * You then need to either add a IPW_xxxx_DEBUG() macro definition for your
+ * classification, or use IPW_DEBUG(IPW_DL_xxxx, ...) whenever you want
+ * to send output to that classification.
+ *
+ * To add your debug level to the list of levels seen when you perform
+ *
+ * % cat /proc/net/ipw/debug_level
+ *
+ * you simply need to add your entry to the ipw_debug_levels array.
+ *
+ * If you do not see debug_level in /proc/net/ipw then you do not have 
+ * CONFIG_IPW_DEBUG defined in your kernel configuration
+ *
+ */
+
+#define IPW_DL_ERROR         (1<<0)
+#define IPW_DL_WARNING       (1<<1)
+#define IPW_DL_INFO          (1<<2)
+#define IPW_DL_WX            (1<<3)
+#define IPW_DL_HOST_COMMAND  (1<<5)
+#define IPW_DL_STATE         (1<<6)
+
+#define IPW_DL_NOTIF         (1<<10)
+#define IPW_DL_SCAN          (1<<11)
+#define IPW_DL_ASSOC         (1<<12)
+#define IPW_DL_DROP          (1<<13)
+#define IPW_DL_IOCTL         (1<<14)
+
+#define IPW_DL_MANAGE        (1<<15)
+#define IPW_DL_FW            (1<<16)
+#define IPW_DL_RF_KILL       (1<<17)
+#define IPW_DL_FW_ERRORS     (1<<18)
+
+
+#define IPW_DL_ORD           (1<<20)
+
+#define IPW_DL_FRAG          (1<<21)
+#define IPW_DL_WEP           (1<<22)
+#define IPW_DL_TX            (1<<23)
+#define IPW_DL_RX            (1<<24)
+#define IPW_DL_ISR           (1<<25)
+#define IPW_DL_FW_INFO       (1<<26)
+#define IPW_DL_IO            (1<<27)
+#define IPW_DL_TRACE         (1<<28)
+
+#define IPW_DL_STATS         (1<<29)
+
+
+#define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
+#define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
+
+#define IPW_DEBUG_WX(f, a...)     IPW_DEBUG(IPW_DL_WX, f, ## a)
+#define IPW_DEBUG_SCAN(f, a...)   IPW_DEBUG(IPW_DL_SCAN, f, ## a)
+#define IPW_DEBUG_STATUS(f, a...) IPW_DEBUG(IPW_DL_STATUS, f, ## a)
+#define IPW_DEBUG_TRACE(f, a...)  IPW_DEBUG(IPW_DL_TRACE, f, ## a)
+#define IPW_DEBUG_RX(f, a...)     IPW_DEBUG(IPW_DL_RX, f, ## a)
+#define IPW_DEBUG_TX(f, a...)     IPW_DEBUG(IPW_DL_TX, f, ## a)
+#define IPW_DEBUG_ISR(f, a...)    IPW_DEBUG(IPW_DL_ISR, f, ## a)
+#define IPW_DEBUG_MANAGEMENT(f, a...) IPW_DEBUG(IPW_DL_MANAGE, f, ## a)
+#define IPW_DEBUG_WEP(f, a...)    IPW_DEBUG(IPW_DL_WEP, f, ## a)
+#define IPW_DEBUG_HC(f, a...) IPW_DEBUG(IPW_DL_HOST_COMMAND, f, ## a)
+#define IPW_DEBUG_FRAG(f, a...) IPW_DEBUG(IPW_DL_FRAG, f, ## a)
+#define IPW_DEBUG_FW(f, a...) IPW_DEBUG(IPW_DL_FW, f, ## a)
+#define IPW_DEBUG_RF_KILL(f, a...) IPW_DEBUG(IPW_DL_RF_KILL, f, ## a)
+#define IPW_DEBUG_DROP(f, a...) IPW_DEBUG(IPW_DL_DROP, f, ## a)
+#define IPW_DEBUG_IO(f, a...) IPW_DEBUG(IPW_DL_IO, f, ## a)
+#define IPW_DEBUG_ORD(f, a...) IPW_DEBUG(IPW_DL_ORD, f, ## a)
+#define IPW_DEBUG_FW_INFO(f, a...) IPW_DEBUG(IPW_DL_FW_INFO, f, ## a)
+#define IPW_DEBUG_NOTIF(f, a...) IPW_DEBUG(IPW_DL_NOTIF, f, ## a)
+#define IPW_DEBUG_STATE(f, a...) IPW_DEBUG(IPW_DL_STATE | IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+#define IPW_DEBUG_ASSOC(f, a...) IPW_DEBUG(IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+#define IPW_DEBUG_STATS(f, a...) IPW_DEBUG(IPW_DL_STATS, f, ## a)
+
+#include <linux/ctype.h>
+
+/*
+* Register bit definitions
+*/
+
+/* Dino control registers bits */
+
+#define DINO_ENABLE_SYSTEM 0x80
+#define DINO_ENABLE_CS     0x40
+#define DINO_RXFIFO_DATA   0x01 
+#define DINO_CONTROL_REG   0x00200000
+
+#define CX2_INTA_RW       0x00000008
+#define CX2_INTA_MASK_R   0x0000000C
+#define CX2_INDIRECT_ADDR 0x00000010
+#define CX2_INDIRECT_DATA 0x00000014
+#define CX2_AUTOINC_ADDR  0x00000018
+#define CX2_AUTOINC_DATA  0x0000001C
+#define CX2_RESET_REG     0x00000020
+#define CX2_GP_CNTRL_RW   0x00000024
+
+#define CX2_READ_INT_REGISTER 0xFF4
+
+#define CX2_GP_CNTRL_BIT_INIT_DONE      0x00000004
+
+#define CX2_REGISTER_DOMAIN1_END        0x00001000
+#define CX2_SRAM_READ_INT_REGISTER      0x00000ff4
+
+#define CX2_SHARED_LOWER_BOUND          0x00000200
+#define CX2_INTERRUPT_AREA_LOWER_BOUND  0x00000f80
+
+#define CX2_NIC_SRAM_LOWER_BOUND        0x00000000
+#define CX2_NIC_SRAM_UPPER_BOUND        0x00030000
+
+#define CX2_BIT_INT_HOST_SRAM_READ_INT_REGISTER (1 << 29)
+#define CX2_GP_CNTRL_BIT_CLOCK_READY    0x00000001
+#define CX2_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY 0x00000002
+
+/*
+ * RESET Register Bit Indexes
+ */
+#define CBD_RESET_REG_PRINCETON_RESET 0x00000001  /* Bit 0 (LSB) */
+#define CX2_RESET_REG_SW_RESET        0x00000080  /* Bit 7       */
+#define CX2_RESET_REG_MASTER_DISABLED 0x00000100  /* Bit 8       */
+#define CX2_RESET_REG_STOP_MASTER     0x00000200  /* Bit 9       */
+#define CX2_ARC_KESHET_CONFIG         0x08000000  /* Bit 27      */
+#define CX2_START_STANDBY             0x00000004  /* Bit 2       */
+
+#define CX2_CSR_CIS_UPPER_BOUND 0x00000200
+#define CX2_DOMAIN_0_END 0x1000
+#define CLX_MEM_BAR_SIZE 0x1000
+
+#define CX2_BASEBAND_CONTROL_STATUS     0X00200000
+#define CX2_BASEBAND_TX_FIFO_WRITE      0X00200004
+#define CX2_BASEBAND_RX_FIFO_READ       0X00200004
+#define CX2_BASEBAND_CONTROL_STORE      0X00200010
+
+#define CX2_INTERNAL_CMD_EVENT  0X00300004
+#define CX2_BASEBAND_POWER_DOWN 0x00000001
+
+#define CX2_MEM_HALT_AND_RESET  0x003000e0
+
+/* defgroup bits_halt_reset MEM_HALT_AND_RESET register bits */
+#define CX2_BIT_HALT_RESET_ON   0x80000000
+#define CX2_BIT_HALT_RESET_OFF  0x00000000
+
+#define CB_LAST_VALID     0x20000000
+#define CB_INT_ENABLED    0x40000000
+#define CB_VALID          0x80000000
+#define CB_SRC_LE         0x08000000
+#define CB_DEST_LE        0x04000000
+#define CB_SRC_AUTOINC    0x00800000
+#define CB_SRC_IO_GATED   0x00400000
+#define CB_DEST_AUTOINC   0x00080000
+#define CB_SRC_SIZE_LONG  0x00200000
+#define CB_DEST_SIZE_LONG 0x00020000
+
+
+/* DMA DEFINES */
+
+#define DMA_CONTROL_SMALL_CB_CONST_VALUE 0x00540000
+#define DMA_CB_STOP_AND_ABORT            0x00000C00
+#define DMA_CB_START                     0x00000100 
+
+
+#define CX2_SHARED_SRAM_SIZE               0x00030000
+#define CX2_SHARED_SRAM_DMA_CONTROL        0x00027000
+#define CB_MAX_LENGTH                      0x1FFF
+
+#define CX2_HOST_EEPROM_DATA_SRAM_SIZE 0xA18
+#define CX2_EEPROM_IMAGE_SIZE          0x100
+
+
+/* DMA defs */
+#define CX2_DMA_I_CURRENT_CB  0x003000D0
+#define CX2_DMA_O_CURRENT_CB  0x003000D4
+#define CX2_DMA_I_DMA_CONTROL 0x003000A4
+#define CX2_DMA_I_CB_BASE     0x003000A0
+
+#define CX2_TX_CMD_QUEUE_BD_BASE        (0x00000200)
+#define CX2_TX_CMD_QUEUE_BD_SIZE        (0x00000204)
+#define CX2_TX_QUEUE_0_BD_BASE          (0x00000208)
+#define CX2_TX_QUEUE_0_BD_SIZE          (0x0000020C)
+#define CX2_TX_QUEUE_1_BD_BASE          (0x00000210)
+#define CX2_TX_QUEUE_1_BD_SIZE          (0x00000214)
+#define CX2_TX_QUEUE_2_BD_BASE          (0x00000218)
+#define CX2_TX_QUEUE_2_BD_SIZE          (0x0000021C)
+#define CX2_TX_QUEUE_3_BD_BASE          (0x00000220)
+#define CX2_TX_QUEUE_3_BD_SIZE          (0x00000224)
+#define CX2_RX_BD_BASE                  (0x00000240)
+#define CX2_RX_BD_SIZE                  (0x00000244)
+#define CX2_RFDS_TABLE_LOWER            (0x00000500)
+
+#define CX2_TX_CMD_QUEUE_READ_INDEX     (0x00000280)
+#define CX2_TX_QUEUE_0_READ_INDEX       (0x00000284)
+#define CX2_TX_QUEUE_1_READ_INDEX       (0x00000288)
+#define CX2_TX_QUEUE_2_READ_INDEX       (0x0000028C)
+#define CX2_TX_QUEUE_3_READ_INDEX       (0x00000290)
+#define CX2_RX_READ_INDEX               (0x000002A0)
+
+#define CX2_TX_CMD_QUEUE_WRITE_INDEX    (0x00000F80)
+#define CX2_TX_QUEUE_0_WRITE_INDEX      (0x00000F84)
+#define CX2_TX_QUEUE_1_WRITE_INDEX      (0x00000F88)
+#define CX2_TX_QUEUE_2_WRITE_INDEX      (0x00000F8C)
+#define CX2_TX_QUEUE_3_WRITE_INDEX      (0x00000F90)
+#define CX2_RX_WRITE_INDEX              (0x00000FA0)
+
+/*
+ * EEPROM Related Definitions
+ */
+
+#define IPW_EEPROM_DATA_SRAM_ADDRESS (CX2_SHARED_LOWER_BOUND + 0x814)
+#define IPW_EEPROM_DATA_SRAM_SIZE    (CX2_SHARED_LOWER_BOUND + 0x818)
+#define IPW_EEPROM_LOAD_DISABLE      (CX2_SHARED_LOWER_BOUND + 0x81C)
+#define IPW_EEPROM_DATA              (CX2_SHARED_LOWER_BOUND + 0x820)
+#define IPW_EEPROM_UPPER_ADDRESS     (CX2_SHARED_LOWER_BOUND + 0x9E0)
+
+#define IPW_STATION_TABLE_LOWER      (CX2_SHARED_LOWER_BOUND + 0xA0C)
+#define IPW_STATION_TABLE_UPPER      (CX2_SHARED_LOWER_BOUND + 0xB0C)
+#define IPW_REQUEST_ATIM             (CX2_SHARED_LOWER_BOUND + 0xB0C)
+#define IPW_ATIM_SENT                (CX2_SHARED_LOWER_BOUND + 0xB10)
+#define IPW_WHO_IS_AWAKE             (CX2_SHARED_LOWER_BOUND + 0xB14)
+#define IPW_DURING_ATIM_WINDOW       (CX2_SHARED_LOWER_BOUND + 0xB18)
+
+
+#define MSB                             1
+#define LSB                             0
+#define WORD_TO_BYTE(_word)             ((_word) * sizeof(u16))
+
+#define GET_EEPROM_ADDR(_wordoffset,_byteoffset) \
+    ( WORD_TO_BYTE(_wordoffset) + (_byteoffset) )
+
+/* EEPROM access by BYTE */
+#define EEPROM_PME_CAPABILITY   (GET_EEPROM_ADDR(0x09,MSB))     /* 1 byte   */
+#define EEPROM_MAC_ADDRESS      (GET_EEPROM_ADDR(0x21,LSB))     /* 6 byte   */
+#define EEPROM_VERSION          (GET_EEPROM_ADDR(0x24,MSB))     /* 1 byte   */
+#define EEPROM_NIC_TYPE         (GET_EEPROM_ADDR(0x25,LSB))     /* 1 byte   */
+#define EEPROM_SKU_CAPABILITY   (GET_EEPROM_ADDR(0x25,MSB))     /* 1 byte   */
+#define EEPROM_COUNTRY_CODE     (GET_EEPROM_ADDR(0x26,LSB))     /* 3 bytes  */
+#define EEPROM_IBSS_CHANNELS_BG (GET_EEPROM_ADDR(0x28,LSB))     /* 2 bytes  */
+#define EEPROM_IBSS_CHANNELS_A  (GET_EEPROM_ADDR(0x29,MSB))     /* 5 bytes  */
+#define EEPROM_BSS_CHANNELS_BG  (GET_EEPROM_ADDR(0x2c,LSB))     /* 2 bytes  */
+#define EEPROM_HW_VERSION       (GET_EEPROM_ADDR(0x72,LSB))     /* 2 bytes  */
+
+/* NIC type as found in the one byte EEPROM_NIC_TYPE  offset*/
+#define EEPROM_NIC_TYPE_STANDARD        0
+#define EEPROM_NIC_TYPE_DELL            1
+#define EEPROM_NIC_TYPE_FUJITSU         2
+#define EEPROM_NIC_TYPE_IBM             3
+#define EEPROM_NIC_TYPE_HP              4
+
+#define FW_MEM_REG_LOWER_BOUND          0x00300000
+#define FW_MEM_REG_EEPROM_ACCESS        (FW_MEM_REG_LOWER_BOUND + 0x40)        
+
+#define EEPROM_BIT_SK                   (1<<0)
+#define EEPROM_BIT_CS                   (1<<1)
+#define EEPROM_BIT_DI                   (1<<2)
+#define EEPROM_BIT_DO                   (1<<4)
+
+#define EEPROM_CMD_READ                 0x2
+
+/* Interrupts masks */
+#define CX2_INTA_NONE   0x00000000
+
+#define CX2_INTA_BIT_RX_TRANSFER                   0x00000002
+#define CX2_INTA_BIT_STATUS_CHANGE                 0x00000010
+#define CX2_INTA_BIT_BEACON_PERIOD_EXPIRED         0x00000020
+
+//Inta Bits for CF
+#define CX2_INTA_BIT_TX_CMD_QUEUE                  0x00000800
+#define CX2_INTA_BIT_TX_QUEUE_1                    0x00001000
+#define CX2_INTA_BIT_TX_QUEUE_2                    0x00002000
+#define CX2_INTA_BIT_TX_QUEUE_3                    0x00004000
+#define CX2_INTA_BIT_TX_QUEUE_4                    0x00008000
+
+#define CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE      0x00010000
+
+#define CX2_INTA_BIT_PREPARE_FOR_POWER_DOWN        0x00100000
+#define CX2_INTA_BIT_POWER_DOWN                    0x00200000
+
+#define CX2_INTA_BIT_FW_INITIALIZATION_DONE        0x01000000
+#define CX2_INTA_BIT_FW_CARD_DISABLE_PHY_OFF_DONE  0x02000000
+#define CX2_INTA_BIT_RF_KILL_DONE                  0x04000000
+#define CX2_INTA_BIT_FATAL_ERROR             0x40000000
+#define CX2_INTA_BIT_PARITY_ERROR            0x80000000
+
+/* Interrupts enabled at init time. */
+#define CX2_INTA_MASK_ALL                        \
+        (CX2_INTA_BIT_TX_QUEUE_1               | \
+         CX2_INTA_BIT_TX_QUEUE_2               | \
+         CX2_INTA_BIT_TX_QUEUE_3               | \
+         CX2_INTA_BIT_TX_QUEUE_4               | \
+         CX2_INTA_BIT_TX_CMD_QUEUE             | \
+         CX2_INTA_BIT_RX_TRANSFER              | \
+         CX2_INTA_BIT_FATAL_ERROR              | \
+         CX2_INTA_BIT_PARITY_ERROR             | \
+         CX2_INTA_BIT_STATUS_CHANGE            | \
+         CX2_INTA_BIT_FW_INITIALIZATION_DONE   | \
+         CX2_INTA_BIT_BEACON_PERIOD_EXPIRED    | \
+         CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE | \
+         CX2_INTA_BIT_PREPARE_FOR_POWER_DOWN   | \
+         CX2_INTA_BIT_POWER_DOWN               | \
+         CX2_INTA_BIT_RF_KILL_DONE )
+
+#define IPWSTATUS_ERROR_LOG     (CX2_SHARED_LOWER_BOUND + 0x410)
+#define IPW_EVENT_LOG     (CX2_SHARED_LOWER_BOUND + 0x414)
+
+/* FW event log definitions */
+#define EVENT_ELEM_SIZE     (3 * sizeof(u32))
+#define EVENT_START_OFFSET  (1 * sizeof(u32) + 2 * sizeof(u16))
+
+/* FW error log definitions */
+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
+#define ERROR_START_OFFSET  (1 * sizeof(u32))
+
+enum {
+        IPW_FW_ERROR_OK = 0,
+        IPW_FW_ERROR_FAIL,
+        IPW_FW_ERROR_MEMORY_UNDERFLOW,
+        IPW_FW_ERROR_MEMORY_OVERFLOW,
+        IPW_FW_ERROR_BAD_PARAM,
+        IPW_FW_ERROR_BAD_CHECKSUM,
+        IPW_FW_ERROR_NMI_INTERRUPT,
+        IPW_FW_ERROR_BAD_DATABASE,
+        IPW_FW_ERROR_ALLOC_FAIL,
+        IPW_FW_ERROR_DMA_UNDERRUN,
+        IPW_FW_ERROR_DMA_STATUS,
+        IPW_FW_ERROR_DINOSTATUS_ERROR,
+        IPW_FW_ERROR_EEPROMSTATUS_ERROR,
+        IPW_FW_ERROR_SYSASSERT,
+        IPW_FW_ERROR_FATAL_ERROR
+};
+
+#define AUTH_OPEN       0
+#define AUTH_SHARED_KEY 1
+#define AUTH_IGNORE     3
+
+#define HC_ASSOCIATE      0
+#define HC_REASSOCIATE    1
+#define HC_DISASSOCIATE   2
+#define HC_IBSS_START     3
+#define HC_IBSS_RECONF    4
+#define HC_DISASSOC_QUIET 5
+
+#define IPW_RATE_CAPABILITIES 1
+#define IPW_RATE_CONNECT      0
+
+
+/* 
+ * Rate values and masks 
+ */
+#define IPW_TX_RATE_1MB  0x0A
+#define IPW_TX_RATE_2MB  0x14
+#define IPW_TX_RATE_5MB  0x37
+#define IPW_TX_RATE_6MB  0x0D
+#define IPW_TX_RATE_9MB  0x0F
+#define IPW_TX_RATE_11MB 0x6E   
+#define IPW_TX_RATE_12MB 0x05
+#define IPW_TX_RATE_18MB 0x07
+#define IPW_TX_RATE_24MB 0x09
+#define IPW_TX_RATE_36MB 0x0B
+#define IPW_TX_RATE_48MB 0x01
+#define IPW_TX_RATE_54MB 0x03
+
+#define IPW_ORD_TABLE_ID_MASK             0x0000FF00
+#define IPW_ORD_TABLE_VALUE_MASK          0x000000FF
+
+#define IPW_ORD_TABLE_0_MASK              0x0000F000  
+#define IPW_ORD_TABLE_1_MASK              0x0000F100  
+#define IPW_ORD_TABLE_2_MASK              0x0000F200  
+#define IPW_ORD_TABLE_3_MASK              0x0000F300  
+#define IPW_ORD_TABLE_4_MASK              0x0000F400  
+#define IPW_ORD_TABLE_5_MASK              0x0000F500  
+#define IPW_ORD_TABLE_6_MASK              0x0000F600  
+#define IPW_ORD_TABLE_7_MASK              0x0000F700  
+
+/*
+ * Table 0 Entries (all entries are 32 bits)
+ */
+enum {           
+        IPW_ORD_STAT_TX_CURR_RATE = IPW_ORD_TABLE_0_MASK + 1,
+        IPW_ORD_STAT_FRAG_TRESHOLD,
+        IPW_ORD_STAT_RTS_THRESHOLD,
+        IPW_ORD_STAT_TX_HOST_REQUESTS,              
+        IPW_ORD_STAT_TX_HOST_COMPLETE,              
+        IPW_ORD_STAT_TX_DIR_DATA,                  
+        IPW_ORD_STAT_TX_DIR_DATA_B_1,
+        IPW_ORD_STAT_TX_DIR_DATA_B_2,
+        IPW_ORD_STAT_TX_DIR_DATA_B_5_5,
+        IPW_ORD_STAT_TX_DIR_DATA_B_11,
+        /* Hole */
+
+
+
+
+
+
+
+        IPW_ORD_STAT_TX_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 19,
+        IPW_ORD_STAT_TX_DIR_DATA_G_2,
+        IPW_ORD_STAT_TX_DIR_DATA_G_5_5,
+        IPW_ORD_STAT_TX_DIR_DATA_G_6,
+        IPW_ORD_STAT_TX_DIR_DATA_G_9,
+        IPW_ORD_STAT_TX_DIR_DATA_G_11,        
+        IPW_ORD_STAT_TX_DIR_DATA_G_12,
+        IPW_ORD_STAT_TX_DIR_DATA_G_18,
+        IPW_ORD_STAT_TX_DIR_DATA_G_24,
+        IPW_ORD_STAT_TX_DIR_DATA_G_36,
+        IPW_ORD_STAT_TX_DIR_DATA_G_48,
+        IPW_ORD_STAT_TX_DIR_DATA_G_54,
+        IPW_ORD_STAT_TX_NON_DIR_DATA, 
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_1,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_2,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_5_5,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_11,  
+        /* Hole */
+
+
+
+
+
+
+
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 44,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_2,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_5_5,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_6,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_9,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_11,        
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_12,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_18,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_24,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_36,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_48,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_54,
+        IPW_ORD_STAT_TX_RETRY,
+        IPW_ORD_STAT_TX_FAILURE,
+        IPW_ORD_STAT_RX_ERR_CRC,
+        IPW_ORD_STAT_RX_ERR_ICV,
+        IPW_ORD_STAT_RX_NO_BUFFER,
+        IPW_ORD_STAT_FULL_SCANS,
+        IPW_ORD_STAT_PARTIAL_SCANS,
+        IPW_ORD_STAT_TGH_ABORTED_SCANS,
+        IPW_ORD_STAT_TX_TOTAL_BYTES,    
+        IPW_ORD_STAT_CURR_RSSI_RAW,
+        IPW_ORD_STAT_RX_BEACON,
+        IPW_ORD_STAT_MISSED_BEACONS,
+        IPW_ORD_TABLE_0_LAST  
+};                       
+
+#define IPW_RSSI_TO_DBM 112
+
+/* Table 1 Entries
+ */
+enum {
+        IPW_ORD_TABLE_1_LAST = IPW_ORD_TABLE_1_MASK | 1,
+};
+
+/*
+ * Table 2 Entries
+ *
+ * FW_VERSION:    16 byte string
+ * FW_DATE:       16 byte string (only 14 bytes used)
+ * UCODE_VERSION: 4 byte version code
+ * UCODE_DATE:    5 bytes code code
+ * ADDAPTER_MAC:  6 byte MAC address
+ * RTC:           4 byte clock
+ */
+enum {           
+        IPW_ORD_STAT_FW_VERSION = IPW_ORD_TABLE_2_MASK | 1,
+        IPW_ORD_STAT_FW_DATE,   
+        IPW_ORD_STAT_UCODE_VERSION,
+        IPW_ORD_STAT_UCODE_DATE,                     
+        IPW_ORD_STAT_ADAPTER_MAC,                    
+        IPW_ORD_STAT_RTC,     
+        IPW_ORD_TABLE_2_LAST                     
+};                      
+
+/* Table 3 */
+enum {
+        IPW_ORD_STAT_TX_PACKET = IPW_ORD_TABLE_3_MASK | 0,
+        IPW_ORD_STAT_TX_PACKET_FAILURE,
+        IPW_ORD_STAT_TX_PACKET_SUCCESS,
+        IPW_ORD_STAT_TX_PACKET_ABORTED,
+        IPW_ORD_TABLE_3_LAST
+};
+
+/* Table 4 */
+enum {
+        IPW_ORD_TABLE_4_LAST = IPW_ORD_TABLE_4_MASK
+};
+
+/* Table 5 */
+enum {
+        IPW_ORD_STAT_AVAILABLE_AP_COUNT = IPW_ORD_TABLE_5_MASK,
+        IPW_ORD_STAT_AP_ASSNS,
+        IPW_ORD_STAT_ROAM,
+        IPW_ORD_STAT_ROAM_CAUSE_MISSED_BEACONS,
+        IPW_ORD_STAT_ROAM_CAUSE_UNASSOC,
+        IPW_ORD_STAT_ROAM_CAUSE_RSSI,
+        IPW_ORD_STAT_ROAM_CAUSE_LINK_QUALITY,
+        IPW_ORD_STAT_ROAM_CAUSE_AP_LOAD_BALANCE,
+        IPW_ORD_STAT_ROAM_CAUSE_AP_NO_TX,
+        IPW_ORD_STAT_LINK_UP,
+        IPW_ORD_STAT_LINK_DOWN,
+        IPW_ORD_ANTENNA_DIVERSITY,
+        IPW_ORD_CURR_FREQ,
+        IPW_ORD_TABLE_5_LAST
+};
+
+/* Table 6 */
+enum {
+        IPW_ORD_COUNTRY_CODE = IPW_ORD_TABLE_6_MASK,
+        IPW_ORD_CURR_BSSID,
+        IPW_ORD_CURR_SSID,
+        IPW_ORD_TABLE_6_LAST
+};
+
+/* Table 7 */
+enum {
+        IPW_ORD_STAT_PERCENT_MISSED_BEACONS = IPW_ORD_TABLE_7_MASK,
+        IPW_ORD_STAT_PERCENT_TX_RETRIES,
+        IPW_ORD_STAT_PERCENT_LINK_QUALITY,
+        IPW_ORD_STAT_CURR_RSSI_DBM,
+        IPW_ORD_TABLE_7_LAST
+};
+
+#define IPW_ORDINALS_TABLE_LOWER        (CX2_SHARED_LOWER_BOUND + 0x500)
+#define IPW_ORDINALS_TABLE_0            (CX2_SHARED_LOWER_BOUND + 0x180)
+#define IPW_ORDINALS_TABLE_1            (CX2_SHARED_LOWER_BOUND + 0x184)
+#define IPW_ORDINALS_TABLE_2            (CX2_SHARED_LOWER_BOUND + 0x188)
+#define IPW_MEM_FIXED_OVERRIDE          (CX2_SHARED_LOWER_BOUND + 0x41C)
+
+struct ipw_fixed_rate {
+        u16 tx_rates;
+        u16 reserved;
+} __attribute__ ((packed));
+
+#define CX2_INDIRECT_ADDR_MASK (~0x3ul)
+
+struct host_cmd {
+        u8 cmd;
+        u8 len;
+        u16 reserved;
+        u32 param[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
+} __attribute__ ((packed));
+
+#define CFG_BT_COEXISTENCE_MIN                  0x00
+#define CFG_BT_COEXISTENCE_DEFER                0x02
+#define CFG_BT_COEXISTENCE_KILL                 0x04
+#define CFG_BT_COEXISTENCE_WME_OVER_BT          0x08
+#define CFG_BT_COEXISTENCE_OOB                  0x10
+#define CFG_BT_COEXISTENCE_MAX                  0xFF
+#define CFG_BT_COEXISTENCE_DEF                  0x80 /* read Bt from EEPROM*/ 
+
+#define CFG_CTS_TO_ITSELF_ENABLED_MIN   0x0
+#define CFG_CTS_TO_ITSELF_ENABLED_MAX   0x1
+#define CFG_CTS_TO_ITSELF_ENABLED_DEF   CFG_CTS_TO_ITSELF_ENABLED_MIN
+
+#define CFG_SYS_ANTENNA_BOTH                      0x000
+#define CFG_SYS_ANTENNA_A                         0x001
+#define CFG_SYS_ANTENNA_B                         0x003
+
+/*
+ * The definitions below were lifted off the ipw2100 driver, which only 
+ * supports 'b' mode, so I'm sure these are not exactly correct.
+ * 
+ * Somebody fix these!!
+ */
+#define REG_MIN_CHANNEL             0
+#define REG_MAX_CHANNEL             14
+
+#define REG_CHANNEL_MASK            0x00003FFF
+#define IPW_IBSS_11B_DEFAULT_MASK   0x87ff
+
+static const long ipw_frequencies[] = {  
+        2412, 2417, 2422, 2427, 
+        2432, 2437, 2442, 2447, 
+        2452, 2457, 2462, 2467, 
+        2472, 2484  
+};
+
+#define FREQ_COUNT ARRAY_SIZE(ipw_frequencies)
+
+#define IPW_MAX_CONFIG_RETRIES 10
+
+static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr)
+{
+        u32 retval;
+        u16 fc;
+
+        retval = sizeof(struct ieee80211_hdr);
+        fc = le16_to_cpu(hdr->frame_ctl);
+
+        /*
+         * Function     ToDS    FromDS
+         * IBSS         0       0
+         * To AP        1       0
+         * From AP      0       1
+         * WDS (bridge) 1       1
+         *
+         * Only WDS frames use Address4 among them. --YZ
+         */
+        if (!(fc & IEEE80211_FCTL_TODS) || !(fc & IEEE80211_FCTL_FROMDS))
+                retval -= ETH_ALEN;
+
+        return retval;
+}
+
+#endif /* __ipw2200_h__ */
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index aabcdc2be05e..4d0b5a336bd7 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -94,6 +94,8 @@
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
 
+#include <net/ieee80211.h>
+
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
@@ -101,7 +103,6 @@
 #include "hermes.h"
 #include "hermes_rid.h"
 #include "orinoco.h"
-#include "ieee802_11.h"
 
 /********************************************************************/
 /* Module information                                               */
@@ -150,7 +151,7 @@ static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
 #define ENCAPS_OVERHEAD         (sizeof(encaps_hdr) + 2)
 
 #define ORINOCO_MIN_MTU         256
-#define ORINOCO_MAX_MTU         (IEEE802_11_DATA_LEN - ENCAPS_OVERHEAD)
+#define ORINOCO_MAX_MTU         (IEEE80211_DATA_LEN - ENCAPS_OVERHEAD)
 
 #define SYMBOL_MAX_VER_LEN      (14)
 #define USER_BAP                0
@@ -442,7 +443,7 @@ static int orinoco_change_mtu(struct net_device *dev, int new_mtu)
         if ( (new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU) )
                 return -EINVAL;
 
-        if ( (new_mtu + ENCAPS_OVERHEAD + IEEE802_11_HLEN) >
+        if ( (new_mtu + ENCAPS_OVERHEAD + IEEE80211_HLEN) >
              (priv->nicbuf_size - ETH_HLEN) )
                 return -EINVAL;
 
@@ -918,7 +919,7 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)
                    data. */
                 return;
         }
-        if (length > IEEE802_11_DATA_LEN) {
+        if (length > IEEE80211_DATA_LEN) {
                 printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",
                        dev->name, length);
                 stats->rx_length_errors++;
@@ -2272,7 +2273,7 @@ static int orinoco_init(struct net_device *dev)
 
         /* No need to lock, the hw_unavailable flag is already set in
          * alloc_orinocodev() */
-        priv->nicbuf_size = IEEE802_11_FRAME_LEN + ETH_HLEN;
+        priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN;
 
         /* Initialize the firmware */
         err = orinoco_reinit_firmware(dev);
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index 8636d9306785..b5719437e981 100644
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -2,7 +2,7 @@
 #define __WL3501_H__
 
 #include <linux/spinlock.h>
-#include "ieee802_11.h"
+#include <net/ieee80211.h>
 
 /* define for WLA 2.0 */
 #define WL3501_BLKSZ 256
@@ -548,7 +548,7 @@ struct wl3501_80211_tx_plcp_hdr {
 
 struct wl3501_80211_tx_hdr {
         struct wl3501_80211_tx_plcp_hdr pclp_hdr;
-        struct ieee802_11_hdr           mac_hdr;
+        struct ieee80211_hdr            mac_hdr;
 } __attribute__ ((packed));
 
 /*
diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile
index 16f352195512..fe3fd4115e1e 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
@@ -8,5 +8,3 @@ obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
 obj-$(CONFIG_USB_RTL8150)       += rtl8150.o
 obj-$(CONFIG_USB_USBNET)        += usbnet.o
 obj-$(CONFIG_USB_ZD1201)        += zd1201.o
-
-CFLAGS_zd1201.o = -Idrivers/net/wireless/
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c
index 3b387b005739..72b06129e20a 100644
--- a/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@ -21,7 +21,7 @@
 #include <linux/string.h>
 #include <linux/if_arp.h>
 #include <linux/firmware.h>
-#include <ieee802_11.h>
+#include <net/ieee80211.h>
 #include "zd1201.h"
 
 static struct usb_device_id zd1201_table[] = {
@@ -337,25 +337,25 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
                         goto resubmit;
                 }
                         
-                if ((seq & IEEE802_11_SCTL_FRAG) ||
-                    (fc & IEEE802_11_FCTL_MOREFRAGS)) {
+                if ((seq & IEEE80211_SCTL_FRAG) ||
+                    (fc & IEEE80211_FCTL_MOREFRAGS)) {
                         struct zd1201_frag *frag = NULL;
                         char *ptr;
 
                         if (datalen<14)
                                 goto resubmit;
-                        if ((seq & IEEE802_11_SCTL_FRAG) == 0) {
+                        if ((seq & IEEE80211_SCTL_FRAG) == 0) {
                                 frag = kmalloc(sizeof(struct zd1201_frag*),
                                     GFP_ATOMIC);
                                 if (!frag)
                                         goto resubmit;
-                                skb = dev_alloc_skb(IEEE802_11_DATA_LEN +14+2);
+                                skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2);
                                 if (!skb) {
                                         kfree(frag);
                                         goto resubmit;
                                 }
                                 frag->skb = skb;
-                                frag->seq = seq & IEEE802_11_SCTL_SEQ;
+                                frag->seq = seq & IEEE80211_SCTL_SEQ;
                                 skb_reserve(skb, 2);
                                 memcpy(skb_put(skb, 12), &data[datalen-14], 12);
                                 memcpy(skb_put(skb, 2), &data[6], 2);
@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
                                 goto resubmit;
                         }
                         hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
-                                if(frag->seq == (seq&IEEE802_11_SCTL_SEQ))
+                                if(frag->seq == (seq&IEEE80211_SCTL_SEQ))
                                         break;
                         if (!frag)
                                 goto resubmit;
@@ -372,7 +372,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
                         ptr = skb_put(skb, len);
                         if (ptr)
                                 memcpy(ptr, data+8, len);
-                        if (fc & IEEE802_11_FCTL_MOREFRAGS)
+                        if (fc & IEEE80211_FCTL_MOREFRAGS)
                                 goto resubmit;
                         hlist_del_init(&frag->fnode);
                         kfree(frag);
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index a1478258d002..8a2df4dfbc59 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -65,7 +65,7 @@ static inline int is_zero_ether_addr(const u8 *addr)
  */
 static inline int is_multicast_ether_addr(const u8 *addr)
 {
-        return addr[0] & 0x01;
+        return ((addr[0] != 0xff) && (0x01 & addr[0]));
 }
 
 /**
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 7fe57f957a51..065b702df563 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -20,7 +20,6 @@
  */
 #ifndef IEEE80211_H
 #define IEEE80211_H
-
 #include <linux/if_ether.h> /* ETH_ALEN */
 #include <linux/kernel.h>   /* ARRAY_SIZE */
 
@@ -94,6 +93,8 @@ struct eapol {
         u16 length;
 } __attribute__ ((packed));
 
+#define IEEE80211_1ADDR_LEN 10
+#define IEEE80211_2ADDR_LEN 16
 #define IEEE80211_3ADDR_LEN 24
 #define IEEE80211_4ADDR_LEN 30
 #define IEEE80211_FCS_LEN    4
@@ -300,23 +301,6 @@ struct ieee80211_snap_hdr {
 #define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9
 
 
-/* Information Element IDs */
-#define WLAN_EID_SSID 0
-#define WLAN_EID_SUPP_RATES 1
-#define WLAN_EID_FH_PARAMS 2
-#define WLAN_EID_DS_PARAMS 3
-#define WLAN_EID_CF_PARAMS 4
-#define WLAN_EID_TIM 5
-#define WLAN_EID_IBSS_PARAMS 6
-#define WLAN_EID_CHALLENGE 16
-#define WLAN_EID_RSN 48
-#define WLAN_EID_GENERIC 221
-
-#define IEEE80211_MGMT_HDR_LEN 24
-#define IEEE80211_DATA_HDR3_LEN 24
-#define IEEE80211_DATA_HDR4_LEN 30
-
-
 #define IEEE80211_STATMASK_SIGNAL (1<<0)
 #define IEEE80211_STATMASK_RSSI (1<<1)
 #define IEEE80211_STATMASK_NOISE (1<<2)
@@ -441,6 +425,8 @@ struct ieee80211_stats {
 
 struct ieee80211_device;
 
+#include "ieee80211_crypt.h"
+
 #define SEC_KEY_1         (1<<0)
 #define SEC_KEY_2         (1<<1)
 #define SEC_KEY_3         (1<<2)
@@ -488,15 +474,6 @@ Total: 28-2340 bytes
 
 */
 
-struct ieee80211_header_data {
-        u16 frame_ctl;
-        u16 duration_id;
-        u8 addr1[6];
-        u8 addr2[6];
-        u8 addr3[6];
-        u16 seq_ctrl;
-};
-
 #define BEACON_PROBE_SSID_ID_POSITION 12
 
 /* Management Frame Information Element Types */
@@ -541,7 +518,7 @@ struct ieee80211_info_element {
 */
 
 struct ieee80211_authentication {
-        struct ieee80211_header_data header;
+        struct ieee80211_hdr_3addr header;
         u16 algorithm;
         u16 transaction;
         u16 status;
@@ -550,7 +527,7 @@ struct ieee80211_authentication {
 
 
 struct ieee80211_probe_response {
-        struct ieee80211_header_data header;
+        struct ieee80211_hdr_3addr header;
         u32 time_stamp[2];
         u16 beacon_interval;
         u16 capability;
@@ -648,12 +625,6 @@ enum ieee80211_state {
 #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
 
 
-extern inline int is_broadcast_ether_addr(const u8 *addr)
-{
-        return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
-                (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
-}
-
 #define CFG_IEEE80211_RESERVE_FCS (1<<0)
 #define CFG_IEEE80211_COMPUTE_FCS (1<<1)
 
@@ -787,21 +758,21 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
 
 extern inline int ieee80211_get_hdrlen(u16 fc)
 {
-        int hdrlen = 24;
+        int hdrlen = IEEE80211_3ADDR_LEN;
 
         switch (WLAN_FC_GET_TYPE(fc)) {
         case IEEE80211_FTYPE_DATA:
                 if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))
-                        hdrlen = 30; /* Addr4 */
+                        hdrlen = IEEE80211_4ADDR_LEN;
                 break;
         case IEEE80211_FTYPE_CTL:
                 switch (WLAN_FC_GET_STYPE(fc)) {
                 case IEEE80211_STYPE_CTS:
                 case IEEE80211_STYPE_ACK:
-                        hdrlen = 10;
+                        hdrlen = IEEE80211_1ADDR_LEN;
                         break;
                 default:
-                        hdrlen = 16;
+                        hdrlen = IEEE80211_2ADDR_LEN;
                         break;
                 }
                 break;
@@ -878,5 +849,4 @@ static inline const char *escape_essid(const char *essid, u8 essid_len) {
         *d = '\0';
         return escaped;
 }
-
 #endif /* IEEE80211_H */
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
new file mode 100644
index 000000000000..b58a3bcc0dc0
--- /dev/null
+++ b/include/net/ieee80211_crypt.h
@@ -0,0 +1,86 @@
+/*
+ * Original code based on Host AP (software wireless LAN access point) driver
+ * for Intersil Prism2/2.5/3.
+ *
+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+ * <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * Adaption to a generic IEEE 802.11 stack by James Ketrenos
+ * <jketreno@linux.intel.com>
+ *
+ * Copyright (c) 2004, Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ */
+
+/*
+ * This file defines the interface to the ieee80211 crypto module.
+ */
+#ifndef IEEE80211_CRYPT_H
+#define IEEE80211_CRYPT_H
+
+#include <linux/skbuff.h>
+
+struct ieee80211_crypto_ops {
+        const char *name;
+
+        /* init new crypto context (e.g., allocate private data space,
+         * select IV, etc.); returns NULL on failure or pointer to allocated
+         * private data on success */
+        void * (*init)(int keyidx);
+
+        /* deinitialize crypto context and free allocated private data */
+        void (*deinit)(void *priv);
+
+        /* encrypt/decrypt return < 0 on error or >= 0 on success. The return
+         * value from decrypt_mpdu is passed as the keyidx value for
+         * decrypt_msdu. skb must have enough head and tail room for the
+         * encryption; if not, error will be returned; these functions are
+         * called for all MPDUs (i.e., fragments).
+         */
+        int (*encrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv);
+        int (*decrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv);
+
+        /* These functions are called for full MSDUs, i.e. full frames.
+         * These can be NULL if full MSDU operations are not needed. */
+        int (*encrypt_msdu)(struct sk_buff *skb, int hdr_len, void *priv);
+        int (*decrypt_msdu)(struct sk_buff *skb, int keyidx, int hdr_len,
+                            void *priv);
+
+        int (*set_key)(void *key, int len, u8 *seq, void *priv);
+        int (*get_key)(void *key, int len, u8 *seq, void *priv);
+
+        /* procfs handler for printing out key information and possible
+         * statistics */
+        char * (*print_stats)(char *p, void *priv);
+
+        /* maximum number of bytes added by encryption; encrypt buf is
+         * allocated with extra_prefix_len bytes, copy of in_buf, and
+         * extra_postfix_len; encrypt need not use all this space, but
+         * the result must start at the beginning of the buffer and correct
+         * length must be returned */
+        int extra_prefix_len, extra_postfix_len;
+
+        struct module *owner;
+};
+
+struct ieee80211_crypt_data {
+        struct list_head list; /* delayed deletion list */
+        struct ieee80211_crypto_ops *ops;
+        void *priv;
+        atomic_t refcnt;
+};
+
+int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
+int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
+struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name);
+void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int);
+void ieee80211_crypt_deinit_handler(unsigned long);
+void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
+                                    struct ieee80211_crypt_data **crypt);
+
+#endif
diff --git a/net/Kconfig b/net/Kconfig
index 9251b28e8d5d..8a12ea8f0c05 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -640,6 +640,8 @@ source "net/irda/Kconfig"
 
 source "net/bluetooth/Kconfig"
 
+source "net/ieee80211/Kconfig"
+
 source "drivers/net/Kconfig"
 
 endmenu
diff --git a/net/Makefile b/net/Makefile
index 8e2bdc025ab8..83bc52d87bae 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_DECNET)		+= decnet/
 obj-$(CONFIG_ECONET)            += econet/
 obj-$(CONFIG_VLAN_8021Q)        += 8021q/
 obj-$(CONFIG_IP_SCTP)           += sctp/
+obj-$(CONFIG_IEEE80211)         += ieee80211/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)            += sysctl_net.o
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
new file mode 100644
index 000000000000..961c711eda97
--- /dev/null
+++ b/net/ieee80211/Kconfig
@@ -0,0 +1,69 @@
+config IEEE80211
+        tristate "Generic IEEE 802.11 Networking Stack"
+        select NET_RADIO
+        ---help---
+        This option enables the hardware independent IEEE 802.11 
+        networking stack.
+
+config IEEE80211_DEBUG
+        bool "Enable full debugging output"
+        depends on IEEE80211
+        ---help---
+          This option will enable debug tracing output for the 
+          ieee80211 network stack.  
+
+          This will result in the kernel module being ~70k larger.  You 
+          can control which debug output is sent to the kernel log by 
+          setting the value in 
+
+          /proc/net/ieee80211/debug_level
+
+          For example:
+
+          % echo 0x00000FFO > /proc/net/ieee80211/debug_level
+
+          For a list of values you can assign to debug_level, you 
+          can look at the bit mask values in <net/ieee80211.h>
+
+          If you are not trying to debug or develop the ieee80211 
+          subsystem, you most likely want to say N here.
+
+config IEEE80211_CRYPT_WEP
+        tristate "IEEE 802.11 WEP encryption (802.1x)"
+        depends on IEEE80211
+        select CRYPTO
+        select CRYPTO_ARC4
+        select CRC32
+        ---help---
+        Include software based cipher suites in support of IEEE 
+        802.11's WEP.  This is needed for WEP as well as 802.1x.
+
+        This can be compiled as a modules and it will be called
+        "ieee80211_crypt_wep".
+
+config IEEE80211_CRYPT_CCMP
+        tristate "IEEE 802.11i CCMP support"
+        depends on IEEE80211
+        select CRYPTO
+        select CRYPTO_AES
+        ---help---
+        Include software based cipher suites in support of IEEE 802.11i 
+        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled 
+        networks.
+
+        This can be compiled as a modules and it will be called
+        "ieee80211_crypt_ccmp".
+
+config IEEE80211_CRYPT_TKIP
+        tristate "IEEE 802.11i TKIP encryption"
+        depends on IEEE80211
+        select CRYPTO
+        select CRYPTO_MICHAEL_MIC
+        ---help---
+        Include software based cipher suites in support of IEEE 802.11i 
+        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled 
+        networks.
+
+        This can be compiled as a modules and it will be called
+        "ieee80211_crypt_tkip".
+
diff --git a/net/ieee80211/Makefile b/net/ieee80211/Makefile
new file mode 100644
index 000000000000..29be9cae1def
--- /dev/null
+++ b/net/ieee80211/Makefile
@@ -0,0 +1,11 @@
+obj-$(CONFIG_IEEE80211) += ieee80211.o 
+obj-$(CONFIG_IEEE80211) += ieee80211_crypt.o
+obj-$(CONFIG_IEEE80211_CRYPT_WEP) += ieee80211_crypt_wep.o
+obj-$(CONFIG_IEEE80211_CRYPT_CCMP) += ieee80211_crypt_ccmp.o
+obj-$(CONFIG_IEEE80211_CRYPT_TKIP) += ieee80211_crypt_tkip.o
+ieee80211-objs := \
+        ieee80211_module.o \
+        ieee80211_tx.o \
+        ieee80211_rx.o \
+        ieee80211_wx.o
+
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
new file mode 100644
index 000000000000..05a6f2f298db
--- /dev/null
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -0,0 +1,259 @@
+/*
+ * Host AP crypto routines
+ *
+ * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Portions Copyright (C) 2004, Intel Corporation <jketreno@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <asm/string.h>
+#include <asm/errno.h>
+
+#include <net/ieee80211.h>
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("HostAP crypto");
+MODULE_LICENSE("GPL");
+
+struct ieee80211_crypto_alg {
+        struct list_head list;
+        struct ieee80211_crypto_ops *ops;
+};
+
+
+struct ieee80211_crypto {
+        struct list_head algs;
+        spinlock_t lock;
+};
+
+static struct ieee80211_crypto *hcrypt;
+
+void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee,
+                                           int force)
+{
+        struct list_head *ptr, *n;
+        struct ieee80211_crypt_data *entry;
+
+        for (ptr = ieee->crypt_deinit_list.next, n = ptr->next;
+             ptr != &ieee->crypt_deinit_list; ptr = n, n = ptr->next) {
+                entry = list_entry(ptr, struct ieee80211_crypt_data, list);
+
+                if (atomic_read(&entry->refcnt) != 0 && !force)
+                        continue;
+
+                list_del(ptr);
+
+                if (entry->ops) {
+                        entry->ops->deinit(entry->priv);
+                        module_put(entry->ops->owner);
+                }
+                kfree(entry);
+        }
+}
+
+void ieee80211_crypt_deinit_handler(unsigned long data)
+{
+        struct ieee80211_device *ieee = (struct ieee80211_device *)data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ieee->lock, flags);
+        ieee80211_crypt_deinit_entries(ieee, 0);
+        if (!list_empty(&ieee->crypt_deinit_list)) {
+                printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
+                       "deletion list\n", ieee->dev->name);
+                ieee->crypt_deinit_timer.expires = jiffies + HZ;
+                add_timer(&ieee->crypt_deinit_timer);
+        }
+        spin_unlock_irqrestore(&ieee->lock, flags);
+
+}
+
+void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
+                                    struct ieee80211_crypt_data **crypt)
+{
+        struct ieee80211_crypt_data *tmp;
+        unsigned long flags;
+
+        if (*crypt == NULL)
+                return;
+
+        tmp = *crypt;
+        *crypt = NULL;
+
+        /* must not run ops->deinit() while there may be pending encrypt or
+         * decrypt operations. Use a list of delayed deinits to avoid needing
+         * locking. */
+
+        spin_lock_irqsave(&ieee->lock, flags);
+        list_add(&tmp->list, &ieee->crypt_deinit_list);
+        if (!timer_pending(&ieee->crypt_deinit_timer)) {
+                ieee->crypt_deinit_timer.expires = jiffies + HZ;
+                add_timer(&ieee->crypt_deinit_timer);
+        }
+        spin_unlock_irqrestore(&ieee->lock, flags);
+}
+
+int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
+{
+        unsigned long flags;
+        struct ieee80211_crypto_alg *alg;
+
+        if (hcrypt == NULL)
+                return -1;
+
+        alg = kmalloc(sizeof(*alg), GFP_KERNEL);
+        if (alg == NULL)
+                return -ENOMEM;
+
+        memset(alg, 0, sizeof(*alg));
+        alg->ops = ops;
+
+        spin_lock_irqsave(&hcrypt->lock, flags);
+        list_add(&alg->list, &hcrypt->algs);
+        spin_unlock_irqrestore(&hcrypt->lock, flags);
+
+        printk(KERN_DEBUG "ieee80211_crypt: registered algorithm '%s'\n",
+               ops->name);
+
+        return 0;
+}
+
+int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
+{
+        unsigned long flags;
+        struct list_head *ptr;
+        struct ieee80211_crypto_alg *del_alg = NULL;
+
+        if (hcrypt == NULL)
+                return -1;
+
+        spin_lock_irqsave(&hcrypt->lock, flags);
+        for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) {
+                struct ieee80211_crypto_alg *alg =
+                        (struct ieee80211_crypto_alg *) ptr;
+                if (alg->ops == ops) {
+                        list_del(&alg->list);
+                        del_alg = alg;
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&hcrypt->lock, flags);
+
+        if (del_alg) {
+                printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
+                       "'%s'\n", ops->name);
+                kfree(del_alg);
+        }
+
+        return del_alg ? 0 : -1;
+}
+
+
+struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
+{
+        unsigned long flags;
+        struct list_head *ptr;
+        struct ieee80211_crypto_alg *found_alg = NULL;
+
+        if (hcrypt == NULL)
+                return NULL;
+
+        spin_lock_irqsave(&hcrypt->lock, flags);
+        for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) {
+                struct ieee80211_crypto_alg *alg =
+                        (struct ieee80211_crypto_alg *) ptr;
+                if (strcmp(alg->ops->name, name) == 0) {
+                        found_alg = alg;
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&hcrypt->lock, flags);
+
+        if (found_alg)
+                return found_alg->ops;
+        else
+                return NULL;
+}
+
+
+static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
+static void ieee80211_crypt_null_deinit(void *priv) {}
+
+static struct ieee80211_crypto_ops ieee80211_crypt_null = {
+        .name                   = "NULL",
+        .init                   = ieee80211_crypt_null_init,
+        .deinit                 = ieee80211_crypt_null_deinit,
+        .encrypt_mpdu           = NULL,
+        .decrypt_mpdu           = NULL,
+        .encrypt_msdu           = NULL,
+        .decrypt_msdu           = NULL,
+        .set_key                = NULL,
+        .get_key                = NULL,
+        .extra_prefix_len       = 0,
+        .extra_postfix_len      = 0,
+        .owner                  = THIS_MODULE,
+};
+
+
+static int __init ieee80211_crypto_init(void)
+{
+        int ret = -ENOMEM;
+
+        hcrypt = kmalloc(sizeof(*hcrypt), GFP_KERNEL);
+        if (!hcrypt)
+                goto out;
+
+        memset(hcrypt, 0, sizeof(*hcrypt));
+        INIT_LIST_HEAD(&hcrypt->algs);
+        spin_lock_init(&hcrypt->lock);
+
+        ret = ieee80211_register_crypto_ops(&ieee80211_crypt_null);
+        if (ret < 0) {
+                kfree(hcrypt);
+                hcrypt = NULL;
+        }
+out:
+        return ret;
+}
+
+
+static void __exit ieee80211_crypto_deinit(void)
+{
+        struct list_head *ptr, *n;
+
+        if (hcrypt == NULL)
+                return;
+
+        for (ptr = hcrypt->algs.next, n = ptr->next; ptr != &hcrypt->algs;
+             ptr = n, n = ptr->next) {
+                struct ieee80211_crypto_alg *alg =
+                        (struct ieee80211_crypto_alg *) ptr;
+                list_del(ptr);
+                printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
+                       "'%s' (deinit)\n", alg->ops->name);
+                kfree(alg);
+        }
+
+        kfree(hcrypt);
+}
+
+EXPORT_SYMBOL(ieee80211_crypt_deinit_entries);
+EXPORT_SYMBOL(ieee80211_crypt_deinit_handler);
+EXPORT_SYMBOL(ieee80211_crypt_delayed_deinit);
+
+EXPORT_SYMBOL(ieee80211_register_crypto_ops);
+EXPORT_SYMBOL(ieee80211_unregister_crypto_ops);
+EXPORT_SYMBOL(ieee80211_get_crypto_ops);
+
+module_init(ieee80211_crypto_init);
+module_exit(ieee80211_crypto_deinit);
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
new file mode 100644
index 000000000000..11d15573b26a
--- /dev/null
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -0,0 +1,470 @@
+/*
+ * Host AP crypt: host-based CCMP encryption implementation for Host AP driver
+ *
+ * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ */
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/if_ether.h>
+#include <linux/if_arp.h>
+#include <asm/string.h>
+#include <linux/wireless.h>
+
+#include <net/ieee80211.h>
+
+
+#include <linux/crypto.h>
+#include <asm/scatterlist.h>
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Host AP crypt: CCMP");
+MODULE_LICENSE("GPL");
+
+#define AES_BLOCK_LEN 16
+#define CCMP_HDR_LEN 8
+#define CCMP_MIC_LEN 8
+#define CCMP_TK_LEN 16
+#define CCMP_PN_LEN 6
+
+struct ieee80211_ccmp_data {
+        u8 key[CCMP_TK_LEN];
+        int key_set;
+
+        u8 tx_pn[CCMP_PN_LEN];
+        u8 rx_pn[CCMP_PN_LEN];
+
+        u32 dot11RSNAStatsCCMPFormatErrors;
+        u32 dot11RSNAStatsCCMPReplays;
+        u32 dot11RSNAStatsCCMPDecryptErrors;
+
+        int key_idx;
+
+        struct crypto_tfm *tfm;
+
+        /* scratch buffers for virt_to_page() (crypto API) */
+        u8 tx_b0[AES_BLOCK_LEN], tx_b[AES_BLOCK_LEN],
+                tx_e[AES_BLOCK_LEN], tx_s0[AES_BLOCK_LEN];
+        u8 rx_b0[AES_BLOCK_LEN], rx_b[AES_BLOCK_LEN], rx_a[AES_BLOCK_LEN];
+};
+
+static void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
+                                       const u8 pt[16], u8 ct[16])
+{
+        struct scatterlist src, dst;
+
+        src.page = virt_to_page(pt);
+        src.offset = offset_in_page(pt);
+        src.length = AES_BLOCK_LEN;
+
+        dst.page = virt_to_page(ct);
+        dst.offset = offset_in_page(ct);
+        dst.length = AES_BLOCK_LEN;
+
+        crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN);
+}
+
+static void * ieee80211_ccmp_init(int key_idx)
+{
+        struct ieee80211_ccmp_data *priv;
+
+        priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+        if (priv == NULL)
+                goto fail;
+        memset(priv, 0, sizeof(*priv));
+        priv->key_idx = key_idx;
+
+        priv->tfm = crypto_alloc_tfm("aes", 0);
+        if (priv->tfm == NULL) {
+                printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
+                       "crypto API aes\n");
+                goto fail;
+        }
+
+        return priv;
+
+fail:
+        if (priv) {
+                if (priv->tfm)
+                        crypto_free_tfm(priv->tfm);
+                kfree(priv);
+        }
+
+        return NULL;
+}
+
+
+static void ieee80211_ccmp_deinit(void *priv)
+{
+        struct ieee80211_ccmp_data *_priv = priv;
+        if (_priv && _priv->tfm)
+                crypto_free_tfm(_priv->tfm);
+        kfree(priv);
+}
+
+
+static inline void xor_block(u8 *b, u8 *a, size_t len)
+{
+        int i;
+        for (i = 0; i < len; i++)
+                b[i] ^= a[i];
+}
+
+
+static void ccmp_init_blocks(struct crypto_tfm *tfm,
+                             struct ieee80211_hdr *hdr,
+                             u8 *pn, size_t dlen, u8 *b0, u8 *auth,
+                             u8 *s0)
+{
+        u8 *pos, qc = 0;
+        size_t aad_len;
+        u16 fc;
+        int a4_included, qc_included;
+        u8 aad[2 * AES_BLOCK_LEN];
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        a4_included = ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+                       (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS));
+        qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
+                       (WLAN_FC_GET_STYPE(fc) & 0x08));
+        aad_len = 22;
+        if (a4_included)
+                aad_len += 6;
+        if (qc_included) {
+                pos = (u8 *) &hdr->addr4;
+                if (a4_included)
+                        pos += 6;
+                qc = *pos & 0x0f;
+                aad_len += 2;
+        }
+
+        /* CCM Initial Block:
+         * Flag (Include authentication header, M=3 (8-octet MIC),
+         *       L=1 (2-octet Dlen))
+         * Nonce: 0x00 | A2 | PN
+         * Dlen */
+        b0[0] = 0x59;
+        b0[1] = qc;
+        memcpy(b0 + 2, hdr->addr2, ETH_ALEN);
+        memcpy(b0 + 8, pn, CCMP_PN_LEN);
+        b0[14] = (dlen >> 8) & 0xff;
+        b0[15] = dlen & 0xff;
+
+        /* AAD:
+         * FC with bits 4..6 and 11..13 masked to zero; 14 is always one
+         * A1 | A2 | A3
+         * SC with bits 4..15 (seq#) masked to zero
+         * A4 (if present)
+         * QC (if present)
+         */
+        pos = (u8 *) hdr;
+        aad[0] = 0; /* aad_len >> 8 */
+        aad[1] = aad_len & 0xff;
+        aad[2] = pos[0] & 0x8f;
+        aad[3] = pos[1] & 0xc7;
+        memcpy(aad + 4, hdr->addr1, 3 * ETH_ALEN);
+        pos = (u8 *) &hdr->seq_ctl;
+        aad[22] = pos[0] & 0x0f;
+        aad[23] = 0; /* all bits masked */
+        memset(aad + 24, 0, 8);
+        if (a4_included)
+                memcpy(aad + 24, hdr->addr4, ETH_ALEN);
+        if (qc_included) {
+                aad[a4_included ? 30 : 24] = qc;
+                /* rest of QC masked */
+        }
+
+        /* Start with the first block and AAD */
+        ieee80211_ccmp_aes_encrypt(tfm, b0, auth);
+        xor_block(auth, aad, AES_BLOCK_LEN);
+        ieee80211_ccmp_aes_encrypt(tfm, auth, auth);
+        xor_block(auth, &aad[AES_BLOCK_LEN], AES_BLOCK_LEN);
+        ieee80211_ccmp_aes_encrypt(tfm, auth, auth);
+        b0[0] &= 0x07;
+        b0[14] = b0[15] = 0;
+        ieee80211_ccmp_aes_encrypt(tfm, b0, s0);
+}
+
+
+static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
+{
+        struct ieee80211_ccmp_data *key = priv;
+        int data_len, i, blocks, last, len;
+        u8 *pos, *mic;
+        struct ieee80211_hdr *hdr;
+        u8 *b0 = key->tx_b0;
+        u8 *b = key->tx_b;
+        u8 *e = key->tx_e;
+        u8 *s0 = key->tx_s0;
+
+        if (skb_headroom(skb) < CCMP_HDR_LEN ||
+            skb_tailroom(skb) < CCMP_MIC_LEN ||
+            skb->len < hdr_len)
+                return -1;
+
+        data_len = skb->len - hdr_len;
+        pos = skb_push(skb, CCMP_HDR_LEN);
+        memmove(pos, pos + CCMP_HDR_LEN, hdr_len);
+        pos += hdr_len;
+        mic = skb_put(skb, CCMP_MIC_LEN);
+
+        i = CCMP_PN_LEN - 1;
+        while (i >= 0) {
+                key->tx_pn[i]++;
+                if (key->tx_pn[i] != 0)
+                        break;
+                i--;
+        }
+
+        *pos++ = key->tx_pn[5];
+        *pos++ = key->tx_pn[4];
+        *pos++ = 0;
+        *pos++ = (key->key_idx << 6) | (1 << 5) /* Ext IV included */;
+        *pos++ = key->tx_pn[3];
+        *pos++ = key->tx_pn[2];
+        *pos++ = key->tx_pn[1];
+        *pos++ = key->tx_pn[0];
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
+
+        blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+        last = data_len % AES_BLOCK_LEN;
+
+        for (i = 1; i <= blocks; i++) {
+                len = (i == blocks && last) ? last : AES_BLOCK_LEN;
+                /* Authentication */
+                xor_block(b, pos, len);
+                ieee80211_ccmp_aes_encrypt(key->tfm, b, b);
+                /* Encryption, with counter */
+                b0[14] = (i >> 8) & 0xff;
+                b0[15] = i & 0xff;
+                ieee80211_ccmp_aes_encrypt(key->tfm, b0, e);
+                xor_block(pos, e, len);
+                pos += len;
+        }
+
+        for (i = 0; i < CCMP_MIC_LEN; i++)
+                mic[i] = b[i] ^ s0[i];
+
+        return 0;
+}
+
+
+static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
+{
+        struct ieee80211_ccmp_data *key = priv;
+        u8 keyidx, *pos;
+        struct ieee80211_hdr *hdr;
+        u8 *b0 = key->rx_b0;
+        u8 *b = key->rx_b;
+        u8 *a = key->rx_a;
+        u8 pn[6];
+        int i, blocks, last, len;
+        size_t data_len = skb->len - hdr_len - CCMP_HDR_LEN - CCMP_MIC_LEN;
+        u8 *mic = skb->data + skb->len - CCMP_MIC_LEN;
+
+        if (skb->len < hdr_len + CCMP_HDR_LEN + CCMP_MIC_LEN) {
+                key->dot11RSNAStatsCCMPFormatErrors++;
+                return -1;
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        pos = skb->data + hdr_len;
+        keyidx = pos[3];
+        if (!(keyidx & (1 << 5))) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "CCMP: received packet without ExtIV"
+                               " flag from " MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                }
+                key->dot11RSNAStatsCCMPFormatErrors++;
+                return -2;
+        }
+        keyidx >>= 6;
+        if (key->key_idx != keyidx) {
+                printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame "
+                       "keyidx=%d priv=%p\n", key->key_idx, keyidx, priv);
+                return -6;
+        }
+        if (!key->key_set) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "CCMP: received packet from " MAC_FMT
+                               " with keyid=%d that does not have a configured"
+                               " key\n", MAC_ARG(hdr->addr2), keyidx);
+                }
+                return -3;
+        }
+
+        pn[0] = pos[7];
+        pn[1] = pos[6];
+        pn[2] = pos[5];
+        pn[3] = pos[4];
+        pn[4] = pos[1];
+        pn[5] = pos[0];
+        pos += 8;
+
+        if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "CCMP: replay detected: STA=" MAC_FMT
+                               " previous PN %02x%02x%02x%02x%02x%02x "
+                               "received PN %02x%02x%02x%02x%02x%02x\n",
+                               MAC_ARG(hdr->addr2), MAC_ARG(key->rx_pn),
+                               MAC_ARG(pn));
+                }
+                key->dot11RSNAStatsCCMPReplays++;
+                return -4;
+        }
+
+        ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b);
+        xor_block(mic, b, CCMP_MIC_LEN);
+
+        blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+        last = data_len % AES_BLOCK_LEN;
+
+        for (i = 1; i <= blocks; i++) {
+                len = (i == blocks && last) ? last : AES_BLOCK_LEN;
+                /* Decrypt, with counter */
+                b0[14] = (i >> 8) & 0xff;
+                b0[15] = i & 0xff;
+                ieee80211_ccmp_aes_encrypt(key->tfm, b0, b);
+                xor_block(pos, b, len);
+                /* Authentication */
+                xor_block(a, pos, len);
+                ieee80211_ccmp_aes_encrypt(key->tfm, a, a);
+                pos += len;
+        }
+
+        if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "CCMP: decrypt failed: STA="
+                               MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                }
+                key->dot11RSNAStatsCCMPDecryptErrors++;
+                return -5;
+        }
+
+        memcpy(key->rx_pn, pn, CCMP_PN_LEN);
+
+        /* Remove hdr and MIC */
+        memmove(skb->data + CCMP_HDR_LEN, skb->data, hdr_len);
+        skb_pull(skb, CCMP_HDR_LEN);
+        skb_trim(skb, skb->len - CCMP_MIC_LEN);
+
+        return keyidx;
+}
+
+
+static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv)
+{
+        struct ieee80211_ccmp_data *data = priv;
+        int keyidx;
+        struct crypto_tfm *tfm = data->tfm;
+
+        keyidx = data->key_idx;
+        memset(data, 0, sizeof(*data));
+        data->key_idx = keyidx;
+        data->tfm = tfm;
+        if (len == CCMP_TK_LEN) {
+                memcpy(data->key, key, CCMP_TK_LEN);
+                data->key_set = 1;
+                if (seq) {
+                        data->rx_pn[0] = seq[5];
+                        data->rx_pn[1] = seq[4];
+                        data->rx_pn[2] = seq[3];
+                        data->rx_pn[3] = seq[2];
+                        data->rx_pn[4] = seq[1];
+                        data->rx_pn[5] = seq[0];
+                }
+                crypto_cipher_setkey(data->tfm, data->key, CCMP_TK_LEN);
+        } else if (len == 0)
+                data->key_set = 0;
+        else
+                return -1;
+
+        return 0;
+}
+
+
+static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
+{
+        struct ieee80211_ccmp_data *data = priv;
+
+        if (len < CCMP_TK_LEN)
+                return -1;
+
+        if (!data->key_set)
+                return 0;
+        memcpy(key, data->key, CCMP_TK_LEN);
+
+        if (seq) {
+                seq[0] = data->tx_pn[5];
+                seq[1] = data->tx_pn[4];
+                seq[2] = data->tx_pn[3];
+                seq[3] = data->tx_pn[2];
+                seq[4] = data->tx_pn[1];
+                seq[5] = data->tx_pn[0];
+        }
+
+        return CCMP_TK_LEN;
+}
+
+
+static char * ieee80211_ccmp_print_stats(char *p, void *priv)
+{
+        struct ieee80211_ccmp_data *ccmp = priv;
+        p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
+                     "tx_pn=%02x%02x%02x%02x%02x%02x "
+                     "rx_pn=%02x%02x%02x%02x%02x%02x "
+                     "format_errors=%d replays=%d decrypt_errors=%d\n",
+                     ccmp->key_idx, ccmp->key_set,
+                     MAC_ARG(ccmp->tx_pn), MAC_ARG(ccmp->rx_pn),
+                     ccmp->dot11RSNAStatsCCMPFormatErrors,
+                     ccmp->dot11RSNAStatsCCMPReplays,
+                     ccmp->dot11RSNAStatsCCMPDecryptErrors);
+
+        return p;
+}
+
+
+static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
+        .name                   = "CCMP",
+        .init                   = ieee80211_ccmp_init,
+        .deinit                 = ieee80211_ccmp_deinit,
+        .encrypt_mpdu           = ieee80211_ccmp_encrypt,
+        .decrypt_mpdu           = ieee80211_ccmp_decrypt,
+        .encrypt_msdu           = NULL,
+        .decrypt_msdu           = NULL,
+        .set_key                = ieee80211_ccmp_set_key,
+        .get_key                = ieee80211_ccmp_get_key,
+        .print_stats            = ieee80211_ccmp_print_stats,
+        .extra_prefix_len       = CCMP_HDR_LEN,
+        .extra_postfix_len      = CCMP_MIC_LEN,
+        .owner                  = THIS_MODULE,
+};
+
+
+static int __init ieee80211_crypto_ccmp_init(void)
+{
+        return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp);
+}
+
+
+static void __exit ieee80211_crypto_ccmp_exit(void)
+{
+        ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp);
+}
+
+
+module_init(ieee80211_crypto_ccmp_init);
+module_exit(ieee80211_crypto_ccmp_exit);
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
new file mode 100644
index 000000000000..f91d92c6df25
--- /dev/null
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -0,0 +1,708 @@
+/*
+ * Host AP crypt: host-based TKIP encryption implementation for Host AP driver
+ *
+ * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ */
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/if_ether.h>
+#include <linux/if_arp.h>
+#include <asm/string.h>
+
+#include <net/ieee80211.h>
+
+
+#include <linux/crypto.h>
+#include <asm/scatterlist.h>
+#include <linux/crc32.h>
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Host AP crypt: TKIP");
+MODULE_LICENSE("GPL");
+
+struct ieee80211_tkip_data {
+#define TKIP_KEY_LEN 32
+        u8 key[TKIP_KEY_LEN];
+        int key_set;
+
+        u32 tx_iv32;
+        u16 tx_iv16;
+        u16 tx_ttak[5];
+        int tx_phase1_done;
+
+        u32 rx_iv32;
+        u16 rx_iv16;
+        u16 rx_ttak[5];
+        int rx_phase1_done;
+        u32 rx_iv32_new;
+        u16 rx_iv16_new;
+
+        u32 dot11RSNAStatsTKIPReplays;
+        u32 dot11RSNAStatsTKIPICVErrors;
+        u32 dot11RSNAStatsTKIPLocalMICFailures;
+
+        int key_idx;
+
+        struct crypto_tfm *tfm_arc4;
+        struct crypto_tfm *tfm_michael;
+
+        /* scratch buffers for virt_to_page() (crypto API) */
+        u8 rx_hdr[16], tx_hdr[16];
+};
+
+static void * ieee80211_tkip_init(int key_idx)
+{
+        struct ieee80211_tkip_data *priv;
+
+        priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+        if (priv == NULL)
+                goto fail;
+        memset(priv, 0, sizeof(*priv));
+        priv->key_idx = key_idx;
+
+        priv->tfm_arc4 = crypto_alloc_tfm("arc4", 0);
+        if (priv->tfm_arc4 == NULL) {
+                printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
+                       "crypto API arc4\n");
+                goto fail;
+        }
+
+        priv->tfm_michael = crypto_alloc_tfm("michael_mic", 0);
+        if (priv->tfm_michael == NULL) {
+                printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
+                       "crypto API michael_mic\n");
+                goto fail;
+        }
+
+        return priv;
+
+fail:
+        if (priv) {
+                if (priv->tfm_michael)
+                        crypto_free_tfm(priv->tfm_michael);
+                if (priv->tfm_arc4)
+                        crypto_free_tfm(priv->tfm_arc4);
+                kfree(priv);
+        }
+
+        return NULL;
+}
+
+
+static void ieee80211_tkip_deinit(void *priv)
+{
+        struct ieee80211_tkip_data *_priv = priv;
+        if (_priv && _priv->tfm_michael)
+                crypto_free_tfm(_priv->tfm_michael);
+        if (_priv && _priv->tfm_arc4)
+                crypto_free_tfm(_priv->tfm_arc4);
+        kfree(priv);
+}
+
+
+static inline u16 RotR1(u16 val)
+{
+        return (val >> 1) | (val << 15);
+}
+
+
+static inline u8 Lo8(u16 val)
+{
+        return val & 0xff;
+}
+
+
+static inline u8 Hi8(u16 val)
+{
+        return val >> 8;
+}
+
+
+static inline u16 Lo16(u32 val)
+{
+        return val & 0xffff;
+}
+
+
+static inline u16 Hi16(u32 val)
+{
+        return val >> 16;
+}
+
+
+static inline u16 Mk16(u8 hi, u8 lo)
+{
+        return lo | (((u16) hi) << 8);
+}
+
+
+static inline u16 Mk16_le(u16 *v)
+{
+        return le16_to_cpu(*v);
+}
+
+
+static const u16 Sbox[256] =
+{
+        0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
+        0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
+        0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
+        0x41EC, 0xB367, 0x5FFD, 0x45EA, 0x23BF, 0x53F7, 0xE496, 0x9B5B,
+        0x75C2, 0xE11C, 0x3DAE, 0x4C6A, 0x6C5A, 0x7E41, 0xF502, 0x834F,
+        0x685C, 0x51F4, 0xD134, 0xF908, 0xE293, 0xAB73, 0x6253, 0x2A3F,
+        0x080C, 0x9552, 0x4665, 0x9D5E, 0x3028, 0x37A1, 0x0A0F, 0x2FB5,
+        0x0E09, 0x2436, 0x1B9B, 0xDF3D, 0xCD26, 0x4E69, 0x7FCD, 0xEA9F,
+        0x121B, 0x1D9E, 0x5874, 0x342E, 0x362D, 0xDCB2, 0xB4EE, 0x5BFB,
+        0xA4F6, 0x764D, 0xB761, 0x7DCE, 0x527B, 0xDD3E, 0x5E71, 0x1397,
+        0xA6F5, 0xB968, 0x0000, 0xC12C, 0x4060, 0xE31F, 0x79C8, 0xB6ED,
+        0xD4BE, 0x8D46, 0x67D9, 0x724B, 0x94DE, 0x98D4, 0xB0E8, 0x854A,
+        0xBB6B, 0xC52A, 0x4FE5, 0xED16, 0x86C5, 0x9AD7, 0x6655, 0x1194,
+        0x8ACF, 0xE910, 0x0406, 0xFE81, 0xA0F0, 0x7844, 0x25BA, 0x4BE3,
+        0xA2F3, 0x5DFE, 0x80C0, 0x058A, 0x3FAD, 0x21BC, 0x7048, 0xF104,
+        0x63DF, 0x77C1, 0xAF75, 0x4263, 0x2030, 0xE51A, 0xFD0E, 0xBF6D,
+        0x814C, 0x1814, 0x2635, 0xC32F, 0xBEE1, 0x35A2, 0x88CC, 0x2E39,
+        0x9357, 0x55F2, 0xFC82, 0x7A47, 0xC8AC, 0xBAE7, 0x322B, 0xE695,
+        0xC0A0, 0x1998, 0x9ED1, 0xA37F, 0x4466, 0x547E, 0x3BAB, 0x0B83,
+        0x8CCA, 0xC729, 0x6BD3, 0x283C, 0xA779, 0xBCE2, 0x161D, 0xAD76,
+        0xDB3B, 0x6456, 0x744E, 0x141E, 0x92DB, 0x0C0A, 0x486C, 0xB8E4,
+        0x9F5D, 0xBD6E, 0x43EF, 0xC4A6, 0x39A8, 0x31A4, 0xD337, 0xF28B,
+        0xD532, 0x8B43, 0x6E59, 0xDAB7, 0x018C, 0xB164, 0x9CD2, 0x49E0,
+        0xD8B4, 0xACFA, 0xF307, 0xCF25, 0xCAAF, 0xF48E, 0x47E9, 0x1018,
+        0x6FD5, 0xF088, 0x4A6F, 0x5C72, 0x3824, 0x57F1, 0x73C7, 0x9751,
+        0xCB23, 0xA17C, 0xE89C, 0x3E21, 0x96DD, 0x61DC, 0x0D86, 0x0F85,
+        0xE090, 0x7C42, 0x71C4, 0xCCAA, 0x90D8, 0x0605, 0xF701, 0x1C12,
+        0xC2A3, 0x6A5F, 0xAEF9, 0x69D0, 0x1791, 0x9958, 0x3A27, 0x27B9,
+        0xD938, 0xEB13, 0x2BB3, 0x2233, 0xD2BB, 0xA970, 0x0789, 0x33A7,
+        0x2DB6, 0x3C22, 0x1592, 0xC920, 0x8749, 0xAAFF, 0x5078, 0xA57A,
+        0x038F, 0x59F8, 0x0980, 0x1A17, 0x65DA, 0xD731, 0x84C6, 0xD0B8,
+        0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A,
+};
+
+
+static inline u16 _S_(u16 v)
+{
+        u16 t = Sbox[Hi8(v)];
+        return Sbox[Lo8(v)] ^ ((t << 8) | (t >> 8));
+}
+
+
+#define PHASE1_LOOP_COUNT 8
+
+static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
+{
+        int i, j;
+
+        /* Initialize the 80-bit TTAK from TSC (IV32) and TA[0..5] */
+        TTAK[0] = Lo16(IV32);
+        TTAK[1] = Hi16(IV32);
+        TTAK[2] = Mk16(TA[1], TA[0]);
+        TTAK[3] = Mk16(TA[3], TA[2]);
+        TTAK[4] = Mk16(TA[5], TA[4]);
+
+        for (i = 0; i < PHASE1_LOOP_COUNT; i++) {
+                j = 2 * (i & 1);
+                TTAK[0] += _S_(TTAK[4] ^ Mk16(TK[1 + j], TK[0 + j]));
+                TTAK[1] += _S_(TTAK[0] ^ Mk16(TK[5 + j], TK[4 + j]));
+                TTAK[2] += _S_(TTAK[1] ^ Mk16(TK[9 + j], TK[8 + j]));
+                TTAK[3] += _S_(TTAK[2] ^ Mk16(TK[13 + j], TK[12 + j]));
+                TTAK[4] += _S_(TTAK[3] ^ Mk16(TK[1 + j], TK[0 + j])) + i;
+        }
+}
+
+
+static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
+                               u16 IV16)
+{
+        /* Make temporary area overlap WEP seed so that the final copy can be
+         * avoided on little endian hosts. */
+        u16 *PPK = (u16 *) &WEPSeed[4];
+
+        /* Step 1 - make copy of TTAK and bring in TSC */
+        PPK[0] = TTAK[0];
+        PPK[1] = TTAK[1];
+        PPK[2] = TTAK[2];
+        PPK[3] = TTAK[3];
+        PPK[4] = TTAK[4];
+        PPK[5] = TTAK[4] + IV16;
+
+        /* Step 2 - 96-bit bijective mixing using S-box */
+        PPK[0] += _S_(PPK[5] ^ Mk16_le((u16 *) &TK[0]));
+        PPK[1] += _S_(PPK[0] ^ Mk16_le((u16 *) &TK[2]));
+        PPK[2] += _S_(PPK[1] ^ Mk16_le((u16 *) &TK[4]));
+        PPK[3] += _S_(PPK[2] ^ Mk16_le((u16 *) &TK[6]));
+        PPK[4] += _S_(PPK[3] ^ Mk16_le((u16 *) &TK[8]));
+        PPK[5] += _S_(PPK[4] ^ Mk16_le((u16 *) &TK[10]));
+
+        PPK[0] += RotR1(PPK[5] ^ Mk16_le((u16 *) &TK[12]));
+        PPK[1] += RotR1(PPK[0] ^ Mk16_le((u16 *) &TK[14]));
+        PPK[2] += RotR1(PPK[1]);
+        PPK[3] += RotR1(PPK[2]);
+        PPK[4] += RotR1(PPK[3]);
+        PPK[5] += RotR1(PPK[4]);
+
+        /* Step 3 - bring in last of TK bits, assign 24-bit WEP IV value
+         * WEPSeed[0..2] is transmitted as WEP IV */
+        WEPSeed[0] = Hi8(IV16);
+        WEPSeed[1] = (Hi8(IV16) | 0x20) & 0x7F;
+        WEPSeed[2] = Lo8(IV16);
+        WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((u16 *) &TK[0])) >> 1);
+
+#ifdef __BIG_ENDIAN
+        {
+                int i;
+                for (i = 0; i < 6; i++)
+                        PPK[i] = (PPK[i] << 8) | (PPK[i] >> 8);
+        }
+#endif
+}
+
+static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
+{
+        struct ieee80211_tkip_data *tkey = priv;
+        int len;
+        u8 rc4key[16], *pos, *icv;
+        struct ieee80211_hdr *hdr;
+        u32 crc;
+        struct scatterlist sg;
+
+        if (skb_headroom(skb) < 8 || skb_tailroom(skb) < 4 ||
+            skb->len < hdr_len)
+                return -1;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        if (!tkey->tx_phase1_done) {
+                tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,
+                                   tkey->tx_iv32);
+                tkey->tx_phase1_done = 1;
+        }
+        tkip_mixing_phase2(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16);
+
+        len = skb->len - hdr_len;
+        pos = skb_push(skb, 8);
+        memmove(pos, pos + 8, hdr_len);
+        pos += hdr_len;
+        icv = skb_put(skb, 4);
+
+        *pos++ = rc4key[0];
+        *pos++ = rc4key[1];
+        *pos++ = rc4key[2];
+        *pos++ = (tkey->key_idx << 6) | (1 << 5) /* Ext IV included */;
+        *pos++ = tkey->tx_iv32 & 0xff;
+        *pos++ = (tkey->tx_iv32 >> 8) & 0xff;
+        *pos++ = (tkey->tx_iv32 >> 16) & 0xff;
+        *pos++ = (tkey->tx_iv32 >> 24) & 0xff;
+
+        crc = ~crc32_le(~0, pos, len);
+        icv[0] = crc;
+        icv[1] = crc >> 8;
+        icv[2] = crc >> 16;
+        icv[3] = crc >> 24;
+
+        crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16);
+        sg.page = virt_to_page(pos);
+        sg.offset = offset_in_page(pos);
+        sg.length = len + 4;
+        crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4);
+
+        tkey->tx_iv16++;
+        if (tkey->tx_iv16 == 0) {
+                tkey->tx_phase1_done = 0;
+                tkey->tx_iv32++;
+        }
+
+        return 0;
+}
+
+static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
+{
+        struct ieee80211_tkip_data *tkey = priv;
+        u8 rc4key[16];
+        u8 keyidx, *pos;
+        u32 iv32;
+        u16 iv16;
+        struct ieee80211_hdr *hdr;
+        u8 icv[4];
+        u32 crc;
+        struct scatterlist sg;
+        int plen;
+
+        if (skb->len < hdr_len + 8 + 4)
+                return -1;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        pos = skb->data + hdr_len;
+        keyidx = pos[3];
+        if (!(keyidx & (1 << 5))) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "TKIP: received packet without ExtIV"
+                               " flag from " MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                }
+                return -2;
+        }
+        keyidx >>= 6;
+        if (tkey->key_idx != keyidx) {
+                printk(KERN_DEBUG "TKIP: RX tkey->key_idx=%d frame "
+                       "keyidx=%d priv=%p\n", tkey->key_idx, keyidx, priv);
+                return -6;
+        }
+        if (!tkey->key_set) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "TKIP: received packet from " MAC_FMT
+                               " with keyid=%d that does not have a configured"
+                               " key\n", MAC_ARG(hdr->addr2), keyidx);
+                }
+                return -3;
+        }
+        iv16 = (pos[0] << 8) | pos[2];
+        iv32 = pos[4] | (pos[5] << 8) | (pos[6] << 16) | (pos[7] << 24);
+        pos += 8;
+
+        if (iv32 < tkey->rx_iv32 ||
+            (iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "TKIP: replay detected: STA=" MAC_FMT
+                               " previous TSC %08x%04x received TSC "
+                               "%08x%04x\n", MAC_ARG(hdr->addr2),
+                               tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
+                }
+                tkey->dot11RSNAStatsTKIPReplays++;
+                return -4;
+        }
+
+        if (iv32 != tkey->rx_iv32 || !tkey->rx_phase1_done) {
+                tkip_mixing_phase1(tkey->rx_ttak, tkey->key, hdr->addr2, iv32);
+                tkey->rx_phase1_done = 1;
+        }
+        tkip_mixing_phase2(rc4key, tkey->key, tkey->rx_ttak, iv16);
+
+        plen = skb->len - hdr_len - 12;
+
+        crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16);
+        sg.page = virt_to_page(pos);
+        sg.offset = offset_in_page(pos);
+        sg.length = plen + 4;
+        crypto_cipher_decrypt(tkey->tfm_arc4, &sg, &sg, plen + 4);
+
+        crc = ~crc32_le(~0, pos, plen);
+        icv[0] = crc;
+        icv[1] = crc >> 8;
+        icv[2] = crc >> 16;
+        icv[3] = crc >> 24;
+        if (memcmp(icv, pos + plen, 4) != 0) {
+                if (iv32 != tkey->rx_iv32) {
+                        /* Previously cached Phase1 result was already lost, so
+                         * it needs to be recalculated for the next packet. */
+                        tkey->rx_phase1_done = 0;
+                }
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "TKIP: ICV error detected: STA="
+                               MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                }
+                tkey->dot11RSNAStatsTKIPICVErrors++;
+                return -5;
+        }
+
+        /* Update real counters only after Michael MIC verification has
+         * completed */
+        tkey->rx_iv32_new = iv32;
+        tkey->rx_iv16_new = iv16;
+
+        /* Remove IV and ICV */
+        memmove(skb->data + 8, skb->data, hdr_len);
+        skb_pull(skb, 8);
+        skb_trim(skb, skb->len - 4);
+
+        return keyidx;
+}
+
+
+static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
+                       u8 *data, size_t data_len, u8 *mic)
+{
+        struct scatterlist sg[2];
+
+        if (tkey->tfm_michael == NULL) {
+                printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+                return -1;
+        }
+        sg[0].page = virt_to_page(hdr);
+        sg[0].offset = offset_in_page(hdr);
+        sg[0].length = 16;
+
+        sg[1].page = virt_to_page(data);
+        sg[1].offset = offset_in_page(data);
+        sg[1].length = data_len;
+
+        crypto_digest_init(tkey->tfm_michael);
+        crypto_digest_setkey(tkey->tfm_michael, key, 8);
+        crypto_digest_update(tkey->tfm_michael, sg, 2);
+        crypto_digest_final(tkey->tfm_michael, mic);
+
+        return 0;
+}
+
+static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
+{
+        struct ieee80211_hdr *hdr11;
+
+        hdr11 = (struct ieee80211_hdr *) skb->data;
+        switch (le16_to_cpu(hdr11->frame_ctl) &
+                (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
+        case IEEE80211_FCTL_TODS:
+                memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
+                break;
+        case IEEE80211_FCTL_FROMDS:
+                memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr3, ETH_ALEN); /* SA */
+                break;
+        case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:
+                memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr4, ETH_ALEN); /* SA */
+                break;
+        case 0:
+                memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
+                break;
+        }
+
+        hdr[12] = 0; /* priority */
+        hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */
+}
+
+
+static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)
+{
+        struct ieee80211_tkip_data *tkey = priv;
+        u8 *pos;
+
+        if (skb_tailroom(skb) < 8 || skb->len < hdr_len) {
+                printk(KERN_DEBUG "Invalid packet for Michael MIC add "
+                       "(tailroom=%d hdr_len=%d skb->len=%d)\n",
+                       skb_tailroom(skb), hdr_len, skb->len);
+                return -1;
+        }
+
+        michael_mic_hdr(skb, tkey->tx_hdr);
+        pos = skb_put(skb, 8);
+        if (michael_mic(tkey, &tkey->key[16], tkey->tx_hdr,
+                        skb->data + hdr_len, skb->len - 8 - hdr_len, pos))
+                return -1;
+
+        return 0;
+}
+
+
+#if WIRELESS_EXT >= 18
+static void ieee80211_michael_mic_failure(struct net_device *dev,
+                                       struct ieee80211_hdr *hdr,
+                                       int keyidx)
+{
+        union iwreq_data wrqu;
+        struct iw_michaelmicfailure ev;
+
+        /* TODO: needed parameters: count, keyid, key type, TSC */
+        memset(&ev, 0, sizeof(ev));
+        ev.flags = keyidx & IW_MICFAILURE_KEY_ID;
+        if (hdr->addr1[0] & 0x01)
+                ev.flags |= IW_MICFAILURE_GROUP;
+        else
+                ev.flags |= IW_MICFAILURE_PAIRWISE;
+        ev.src_addr.sa_family = ARPHRD_ETHER;
+        memcpy(ev.src_addr.sa_data, hdr->addr2, ETH_ALEN);
+        memset(&wrqu, 0, sizeof(wrqu));
+        wrqu.data.length = sizeof(ev);
+        wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *) &ev);
+}
+#elif WIRELESS_EXT >= 15
+static void ieee80211_michael_mic_failure(struct net_device *dev,
+                                       struct ieee80211_hdr *hdr,
+                                       int keyidx)
+{
+        union iwreq_data wrqu;
+        char buf[128];
+
+        /* TODO: needed parameters: count, keyid, key type, TSC */
+        sprintf(buf, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr="
+                MAC_FMT ")", keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
+                MAC_ARG(hdr->addr2));
+        memset(&wrqu, 0, sizeof(wrqu));
+        wrqu.data.length = strlen(buf);
+        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
+}
+#else /* WIRELESS_EXT >= 15 */
+static inline void ieee80211_michael_mic_failure(struct net_device *dev,
+                                              struct ieee80211_hdr *hdr,
+                                              int keyidx)
+{
+}
+#endif /* WIRELESS_EXT >= 15 */
+
+
+static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
+                                     int hdr_len, void *priv)
+{
+        struct ieee80211_tkip_data *tkey = priv;
+        u8 mic[8];
+
+        if (!tkey->key_set)
+                return -1;
+
+        michael_mic_hdr(skb, tkey->rx_hdr);
+        if (michael_mic(tkey, &tkey->key[24], tkey->rx_hdr,
+                        skb->data + hdr_len, skb->len - 8 - hdr_len, mic))
+                return -1;
+        if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) {
+                struct ieee80211_hdr *hdr;
+                hdr = (struct ieee80211_hdr *) skb->data;
+                printk(KERN_DEBUG "%s: Michael MIC verification failed for "
+                       "MSDU from " MAC_FMT " keyidx=%d\n",
+                       skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
+                       keyidx);
+                if (skb->dev)
+                        ieee80211_michael_mic_failure(skb->dev, hdr, keyidx);
+                tkey->dot11RSNAStatsTKIPLocalMICFailures++;
+                return -1;
+        }
+
+        /* Update TSC counters for RX now that the packet verification has
+         * completed. */
+        tkey->rx_iv32 = tkey->rx_iv32_new;
+        tkey->rx_iv16 = tkey->rx_iv16_new;
+
+        skb_trim(skb, skb->len - 8);
+
+        return 0;
+}
+
+
+static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
+{
+        struct ieee80211_tkip_data *tkey = priv;
+        int keyidx;
+        struct crypto_tfm *tfm = tkey->tfm_michael;
+        struct crypto_tfm *tfm2 = tkey->tfm_arc4;
+
+        keyidx = tkey->key_idx;
+        memset(tkey, 0, sizeof(*tkey));
+        tkey->key_idx = keyidx;
+        tkey->tfm_michael = tfm;
+        tkey->tfm_arc4 = tfm2;
+        if (len == TKIP_KEY_LEN) {
+                memcpy(tkey->key, key, TKIP_KEY_LEN);
+                tkey->key_set = 1;
+                tkey->tx_iv16 = 1; /* TSC is initialized to 1 */
+                if (seq) {
+                        tkey->rx_iv32 = (seq[5] << 24) | (seq[4] << 16) |
+                                (seq[3] << 8) | seq[2];
+                        tkey->rx_iv16 = (seq[1] << 8) | seq[0];
+                }
+        } else if (len == 0)
+                tkey->key_set = 0;
+        else
+                return -1;
+
+        return 0;
+}
+
+
+static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
+{
+        struct ieee80211_tkip_data *tkey = priv;
+
+        if (len < TKIP_KEY_LEN)
+                return -1;
+
+        if (!tkey->key_set)
+                return 0;
+        memcpy(key, tkey->key, TKIP_KEY_LEN);
+
+        if (seq) {
+                /* Return the sequence number of the last transmitted frame. */
+                u16 iv16 = tkey->tx_iv16;
+                u32 iv32 = tkey->tx_iv32;
+                if (iv16 == 0)
+                        iv32--;
+                iv16--;
+                seq[0] = tkey->tx_iv16;
+                seq[1] = tkey->tx_iv16 >> 8;
+                seq[2] = tkey->tx_iv32;
+                seq[3] = tkey->tx_iv32 >> 8;
+                seq[4] = tkey->tx_iv32 >> 16;
+                seq[5] = tkey->tx_iv32 >> 24;
+        }
+
+        return TKIP_KEY_LEN;
+}
+
+
+static char * ieee80211_tkip_print_stats(char *p, void *priv)
+{
+        struct ieee80211_tkip_data *tkip = priv;
+        p += sprintf(p, "key[%d] alg=TKIP key_set=%d "
+                     "tx_pn=%02x%02x%02x%02x%02x%02x "
+                     "rx_pn=%02x%02x%02x%02x%02x%02x "
+                     "replays=%d icv_errors=%d local_mic_failures=%d\n",
+                     tkip->key_idx, tkip->key_set,
+                     (tkip->tx_iv32 >> 24) & 0xff,
+                     (tkip->tx_iv32 >> 16) & 0xff,
+                     (tkip->tx_iv32 >> 8) & 0xff,
+                     tkip->tx_iv32 & 0xff,
+                     (tkip->tx_iv16 >> 8) & 0xff,
+                     tkip->tx_iv16 & 0xff,
+                     (tkip->rx_iv32 >> 24) & 0xff,
+                     (tkip->rx_iv32 >> 16) & 0xff,
+                     (tkip->rx_iv32 >> 8) & 0xff,
+                     tkip->rx_iv32 & 0xff,
+                     (tkip->rx_iv16 >> 8) & 0xff,
+                     tkip->rx_iv16 & 0xff,
+                     tkip->dot11RSNAStatsTKIPReplays,
+                     tkip->dot11RSNAStatsTKIPICVErrors,
+                     tkip->dot11RSNAStatsTKIPLocalMICFailures);
+        return p;
+}
+
+
+static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
+        .name                   = "TKIP",
+        .init                   = ieee80211_tkip_init,
+        .deinit                 = ieee80211_tkip_deinit,
+        .encrypt_mpdu           = ieee80211_tkip_encrypt,
+        .decrypt_mpdu           = ieee80211_tkip_decrypt,
+        .encrypt_msdu           = ieee80211_michael_mic_add,
+        .decrypt_msdu           = ieee80211_michael_mic_verify,
+        .set_key                = ieee80211_tkip_set_key,
+        .get_key                = ieee80211_tkip_get_key,
+        .print_stats            = ieee80211_tkip_print_stats,
+        .extra_prefix_len       = 4 + 4, /* IV + ExtIV */
+        .extra_postfix_len      = 8 + 4, /* MIC + ICV */
+        .owner                  = THIS_MODULE,
+};
+
+
+static int __init ieee80211_crypto_tkip_init(void)
+{
+        return ieee80211_register_crypto_ops(&ieee80211_crypt_tkip);
+}
+
+
+static void __exit ieee80211_crypto_tkip_exit(void)
+{
+        ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
+}
+
+
+module_init(ieee80211_crypto_tkip_init);
+module_exit(ieee80211_crypto_tkip_exit);
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
new file mode 100644
index 000000000000..bec1d3470d39
--- /dev/null
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -0,0 +1,272 @@
+/*
+ * Host AP crypt: host-based WEP encryption implementation for Host AP driver
+ *
+ * Copyright (c) 2002-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ */
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <asm/string.h>
+
+#include <net/ieee80211.h>
+
+
+#include <linux/crypto.h>
+#include <asm/scatterlist.h>
+#include <linux/crc32.h>
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Host AP crypt: WEP");
+MODULE_LICENSE("GPL");
+
+
+struct prism2_wep_data {
+        u32 iv;
+#define WEP_KEY_LEN 13
+        u8 key[WEP_KEY_LEN + 1];
+        u8 key_len;
+        u8 key_idx;
+        struct crypto_tfm *tfm;
+};
+
+
+static void * prism2_wep_init(int keyidx)
+{
+        struct prism2_wep_data *priv;
+
+        priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+        if (priv == NULL)
+                goto fail;
+        memset(priv, 0, sizeof(*priv));
+        priv->key_idx = keyidx;
+
+        priv->tfm = crypto_alloc_tfm("arc4", 0);
+        if (priv->tfm == NULL) {
+                printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
+                       "crypto API arc4\n");
+                goto fail;
+        }
+
+        /* start WEP IV from a random value */
+        get_random_bytes(&priv->iv, 4);
+
+        return priv;
+
+fail:
+        if (priv) {
+                if (priv->tfm)
+                        crypto_free_tfm(priv->tfm);
+                kfree(priv);
+        }
+        return NULL;
+}
+
+
+static void prism2_wep_deinit(void *priv)
+{
+        struct prism2_wep_data *_priv = priv;
+        if (_priv && _priv->tfm)
+                crypto_free_tfm(_priv->tfm);
+        kfree(priv);
+}
+
+
+/* Perform WEP encryption on given skb that has at least 4 bytes of headroom
+ * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted,
+ * so the payload length increases with 8 bytes.
+ *
+ * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data))
+ */
+static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
+{
+        struct prism2_wep_data *wep = priv;
+        u32 crc, klen, len;
+        u8 key[WEP_KEY_LEN + 3];
+        u8 *pos, *icv;
+        struct scatterlist sg;
+
+        if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 ||
+            skb->len < hdr_len)
+                return -1;
+
+        len = skb->len - hdr_len;
+        pos = skb_push(skb, 4);
+        memmove(pos, pos + 4, hdr_len);
+        pos += hdr_len;
+
+        klen = 3 + wep->key_len;
+
+        wep->iv++;
+
+        /* Fluhrer, Mantin, and Shamir have reported weaknesses in the key
+         * scheduling algorithm of RC4. At least IVs (KeyByte + 3, 0xff, N)
+         * can be used to speedup attacks, so avoid using them. */
+        if ((wep->iv & 0xff00) == 0xff00) {
+                u8 B = (wep->iv >> 16) & 0xff;
+                if (B >= 3 && B < klen)
+                        wep->iv += 0x0100;
+        }
+
+        /* Prepend 24-bit IV to RC4 key and TX frame */
+        *pos++ = key[0] = (wep->iv >> 16) & 0xff;
+        *pos++ = key[1] = (wep->iv >> 8) & 0xff;
+        *pos++ = key[2] = wep->iv & 0xff;
+        *pos++ = wep->key_idx << 6;
+
+        /* Copy rest of the WEP key (the secret part) */
+        memcpy(key + 3, wep->key, wep->key_len);
+
+        /* Append little-endian CRC32 and encrypt it to produce ICV */
+        crc = ~crc32_le(~0, pos, len);
+        icv = skb_put(skb, 4);
+        icv[0] = crc;
+        icv[1] = crc >> 8;
+        icv[2] = crc >> 16;
+        icv[3] = crc >> 24;
+
+        crypto_cipher_setkey(wep->tfm, key, klen);
+        sg.page = virt_to_page(pos);
+        sg.offset = offset_in_page(pos);
+        sg.length = len + 4;
+        crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4);
+
+        return 0;
+}
+
+
+/* Perform WEP decryption on given buffer. Buffer includes whole WEP part of
+ * the frame: IV (4 bytes), encrypted payload (including SNAP header),
+ * ICV (4 bytes). len includes both IV and ICV.
+ *
+ * Returns 0 if frame was decrypted successfully and ICV was correct and -1 on
+ * failure. If frame is OK, IV and ICV will be removed.
+ */
+static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
+{
+        struct prism2_wep_data *wep = priv;
+        u32 crc, klen, plen;
+        u8 key[WEP_KEY_LEN + 3];
+        u8 keyidx, *pos, icv[4];
+        struct scatterlist sg;
+
+        if (skb->len < hdr_len + 8)
+                return -1;
+
+        pos = skb->data + hdr_len;
+        key[0] = *pos++;
+        key[1] = *pos++;
+        key[2] = *pos++;
+        keyidx = *pos++ >> 6;
+        if (keyidx != wep->key_idx)
+                return -1;
+
+        klen = 3 + wep->key_len;
+
+        /* Copy rest of the WEP key (the secret part) */
+        memcpy(key + 3, wep->key, wep->key_len);
+
+        /* Apply RC4 to data and compute CRC32 over decrypted data */
+        plen = skb->len - hdr_len - 8;
+
+        crypto_cipher_setkey(wep->tfm, key, klen);
+        sg.page = virt_to_page(pos);
+        sg.offset = offset_in_page(pos);
+        sg.length = plen + 4;
+        crypto_cipher_decrypt(wep->tfm, &sg, &sg, plen + 4);
+
+        crc = ~crc32_le(~0, pos, plen);
+        icv[0] = crc;
+        icv[1] = crc >> 8;
+        icv[2] = crc >> 16;
+        icv[3] = crc >> 24;
+        if (memcmp(icv, pos + plen, 4) != 0) {
+                /* ICV mismatch - drop frame */
+                return -2;
+        }
+
+        /* Remove IV and ICV */
+        memmove(skb->data + 4, skb->data, hdr_len);
+        skb_pull(skb, 4);
+        skb_trim(skb, skb->len - 4);
+
+        return 0;
+}
+
+
+static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv)
+{
+        struct prism2_wep_data *wep = priv;
+
+        if (len < 0 || len > WEP_KEY_LEN)
+                return -1;
+
+        memcpy(wep->key, key, len);
+        wep->key_len = len;
+
+        return 0;
+}
+
+
+static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
+{
+        struct prism2_wep_data *wep = priv;
+
+        if (len < wep->key_len)
+                return -1;
+
+        memcpy(key, wep->key, wep->key_len);
+
+        return wep->key_len;
+}
+
+
+static char * prism2_wep_print_stats(char *p, void *priv)
+{
+        struct prism2_wep_data *wep = priv;
+        p += sprintf(p, "key[%d] alg=WEP len=%d\n",
+                     wep->key_idx, wep->key_len);
+        return p;
+}
+
+
+static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
+        .name                   = "WEP",
+        .init                   = prism2_wep_init,
+        .deinit                 = prism2_wep_deinit,
+        .encrypt_mpdu           = prism2_wep_encrypt,
+        .decrypt_mpdu           = prism2_wep_decrypt,
+        .encrypt_msdu           = NULL,
+        .decrypt_msdu           = NULL,
+        .set_key                = prism2_wep_set_key,
+        .get_key                = prism2_wep_get_key,
+        .print_stats            = prism2_wep_print_stats,
+        .extra_prefix_len       = 4, /* IV */
+        .extra_postfix_len      = 4, /* ICV */
+        .owner                  = THIS_MODULE,
+};
+
+
+static int __init ieee80211_crypto_wep_init(void)
+{
+        return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
+}
+
+
+static void __exit ieee80211_crypto_wep_exit(void)
+{
+        ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
+}
+
+
+module_init(ieee80211_crypto_wep_init);
+module_exit(ieee80211_crypto_wep_exit);
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
new file mode 100644
index 000000000000..e0802b8755a0
--- /dev/null
+++ b/net/ieee80211/ieee80211_module.c
@@ -0,0 +1,273 @@
+/*******************************************************************************
+
+  Copyright(c) 2004 Intel Corporation. All rights reserved.
+
+  Portions of this file are based on the WEP enablement code provided by the
+  Host AP project hostap-drivers v0.1.3
+  Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+  <jkmaline@cc.hut.fi>
+  Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#include <linux/compiler.h>
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/if_arp.h>
+#include <linux/in6.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/proc_fs.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/tcp.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include <linux/wireless.h>
+#include <linux/etherdevice.h>
+#include <asm/uaccess.h>
+#include <net/arp.h>
+
+#include <net/ieee80211.h>
+
+MODULE_DESCRIPTION("802.11 data/management/control stack");
+MODULE_AUTHOR("Copyright (C) 2004 Intel Corporation <jketreno@linux.intel.com>");
+MODULE_LICENSE("GPL");
+
+#define DRV_NAME "ieee80211"
+
+static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
+{
+        if (ieee->networks)
+                return 0;
+
+        ieee->networks = kmalloc(
+                MAX_NETWORK_COUNT * sizeof(struct ieee80211_network),
+                GFP_KERNEL);
+        if (!ieee->networks) {
+                printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
+                       ieee->dev->name);
+                return -ENOMEM;
+        }
+
+        memset(ieee->networks, 0,
+               MAX_NETWORK_COUNT * sizeof(struct ieee80211_network));
+
+        return 0;
+}
+
+static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
+{
+        if (!ieee->networks)
+                return;
+        kfree(ieee->networks);
+        ieee->networks = NULL;
+}
+
+static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee)
+{
+        int i;
+
+        INIT_LIST_HEAD(&ieee->network_free_list);
+        INIT_LIST_HEAD(&ieee->network_list);
+        for (i = 0; i < MAX_NETWORK_COUNT; i++)
+                list_add_tail(&ieee->networks[i].list, &ieee->network_free_list);
+}
+
+
+struct net_device *alloc_ieee80211(int sizeof_priv)
+{
+        struct ieee80211_device *ieee;
+        struct net_device *dev;
+        int err;
+
+        IEEE80211_DEBUG_INFO("Initializing...\n");
+
+        dev = alloc_etherdev(sizeof(struct ieee80211_device) + sizeof_priv);
+        if (!dev) {
+                IEEE80211_ERROR("Unable to network device.\n");
+                goto failed;
+        }
+        ieee = netdev_priv(dev);
+        dev->hard_start_xmit = ieee80211_xmit;
+
+        ieee->dev = dev;
+
+        err = ieee80211_networks_allocate(ieee);
+        if (err) {
+                IEEE80211_ERROR("Unable to allocate beacon storage: %d\n",
+                                err);
+                goto failed;
+        }
+        ieee80211_networks_initialize(ieee);
+
+        /* Default fragmentation threshold is maximum payload size */
+        ieee->fts = DEFAULT_FTS;
+        ieee->scan_age = DEFAULT_MAX_SCAN_AGE;
+        ieee->open_wep = 1;
+
+        /* Default to enabling full open WEP with host based encrypt/decrypt */
+        ieee->host_encrypt = 1;
+        ieee->host_decrypt = 1;
+        ieee->ieee802_1x = 1; /* Default to supporting 802.1x */
+
+        INIT_LIST_HEAD(&ieee->crypt_deinit_list);
+        init_timer(&ieee->crypt_deinit_timer);
+        ieee->crypt_deinit_timer.data = (unsigned long)ieee;
+        ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler;
+
+        spin_lock_init(&ieee->lock);
+
+        ieee->wpa_enabled = 0;
+        ieee->tkip_countermeasures = 0;
+        ieee->drop_unencrypted = 0;
+        ieee->privacy_invoked = 0;
+        ieee->ieee802_1x = 1;
+
+        return dev;
+
+ failed:
+        if (dev)
+                free_netdev(dev);
+        return NULL;
+}
+
+
+void free_ieee80211(struct net_device *dev)
+{
+        struct ieee80211_device *ieee = netdev_priv(dev);
+
+        int i;
+
+        del_timer_sync(&ieee->crypt_deinit_timer);
+        ieee80211_crypt_deinit_entries(ieee, 1);
+
+        for (i = 0; i < WEP_KEYS; i++) {
+                struct ieee80211_crypt_data *crypt = ieee->crypt[i];
+                if (crypt) {
+                        if (crypt->ops) {
+                                crypt->ops->deinit(crypt->priv);
+                                module_put(crypt->ops->owner);
+                        }
+                        kfree(crypt);
+                        ieee->crypt[i] = NULL;
+                }
+        }
+
+        ieee80211_networks_free(ieee);
+        free_netdev(dev);
+}
+
+#ifdef CONFIG_IEEE80211_DEBUG
+
+static int debug = 0;
+u32 ieee80211_debug_level = 0;
+struct proc_dir_entry *ieee80211_proc = NULL;
+
+static int show_debug_level(char *page, char **start, off_t offset,
+                            int count, int *eof, void *data)
+{
+        return snprintf(page, count, "0x%08X\n", ieee80211_debug_level);
+}
+
+static int store_debug_level(struct file *file, const char __user *buffer,
+                             unsigned long count, void *data)
+{
+        char buf[] = "0x00000000";
+        char *p = (char *)buf;
+        unsigned long val;
+
+        if (count > sizeof(buf) - 1)
+                count = sizeof(buf) - 1;
+
+        if (copy_from_user(buf, buffer, count))
+                return count;
+        buf[count] = 0;
+        /*
+         * what a FPOS...  What, sscanf(buf, "%i", &val) would be too
+         * scary?
+         */
+        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
+                p++;
+                if (p[0] == 'x' || p[0] == 'X')
+                        p++;
+                val = simple_strtoul(p, &p, 16);
+        } else
+                val = simple_strtoul(p, &p, 10);
+        if (p == buf)
+                printk(KERN_INFO DRV_NAME
+                       ": %s is not in hex or decimal form.\n", buf);
+        else
+                ieee80211_debug_level = val;
+
+        return strlen(buf);
+}
+
+static int __init ieee80211_init(void)
+{
+        struct proc_dir_entry *e;
+
+        ieee80211_debug_level = debug;
+        ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, proc_net);
+        if (ieee80211_proc == NULL) {
+                IEEE80211_ERROR("Unable to create " DRV_NAME
+                                " proc directory\n");
+                return -EIO;
+        }
+        e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR,
+                              ieee80211_proc);
+        if (!e) {
+                remove_proc_entry(DRV_NAME, proc_net);
+                ieee80211_proc = NULL;
+                return -EIO;
+        }
+        e->read_proc = show_debug_level;
+        e->write_proc = store_debug_level;
+        e->data = NULL;
+
+        return 0;
+}
+
+static void __exit ieee80211_exit(void)
+{
+        if (ieee80211_proc) {
+                remove_proc_entry("debug_level", ieee80211_proc);
+                remove_proc_entry(DRV_NAME, proc_net);
+                ieee80211_proc = NULL;
+        }
+}
+
+#include <linux/moduleparam.h>
+module_param(debug, int, 0444);
+MODULE_PARM_DESC(debug, "debug output mask");
+
+
+module_exit(ieee80211_exit);
+module_init(ieee80211_init);
+#endif
+
+EXPORT_SYMBOL(alloc_ieee80211);
+EXPORT_SYMBOL(free_ieee80211);
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
new file mode 100644
index 000000000000..0dd102993ef4
--- /dev/null
+++ b/net/ieee80211/ieee80211_rx.c
@@ -0,0 +1,1205 @@
+/*
+ * Original code based Host AP (software wireless LAN access point) driver
+ * for Intersil Prism2/2.5/3 - hostap.o module, common routines
+ *
+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+ * <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004, Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ */
+
+#include <linux/compiler.h>
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/if_arp.h>
+#include <linux/in6.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/proc_fs.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/tcp.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include <linux/wireless.h>
+#include <linux/etherdevice.h>
+#include <asm/uaccess.h>
+#include <linux/ctype.h>
+
+#include <net/ieee80211.h>
+
+static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
+                                        struct sk_buff *skb,
+                                        struct ieee80211_rx_stats *rx_stats)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        u16 fc = le16_to_cpu(hdr->frame_ctl);
+
+        skb->dev = ieee->dev;
+        skb->mac.raw = skb->data;
+        skb_pull(skb, ieee80211_get_hdrlen(fc));
+        skb->pkt_type = PACKET_OTHERHOST;
+        skb->protocol = __constant_htons(ETH_P_80211_RAW);
+        memset(skb->cb, 0, sizeof(skb->cb));
+        netif_rx(skb);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static struct ieee80211_frag_entry *
+ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
+                          unsigned int frag, u8 *src, u8 *dst)
+{
+        struct ieee80211_frag_entry *entry;
+        int i;
+
+        for (i = 0; i < IEEE80211_FRAG_CACHE_LEN; i++) {
+                entry = &ieee->frag_cache[i];
+                if (entry->skb != NULL &&
+                    time_after(jiffies, entry->first_frag_time + 2 * HZ)) {
+                        IEEE80211_DEBUG_FRAG(
+                                "expiring fragment cache entry "
+                                "seq=%u last_frag=%u\n",
+                                entry->seq, entry->last_frag);
+                        dev_kfree_skb_any(entry->skb);
+                        entry->skb = NULL;
+                }
+
+                if (entry->skb != NULL && entry->seq == seq &&
+                    (entry->last_frag + 1 == frag || frag == -1) &&
+                    memcmp(entry->src_addr, src, ETH_ALEN) == 0 &&
+                    memcmp(entry->dst_addr, dst, ETH_ALEN) == 0)
+                        return entry;
+        }
+
+        return NULL;
+}
+
+/* Called only as a tasklet (software IRQ) */
+static struct sk_buff *
+ieee80211_frag_cache_get(struct ieee80211_device *ieee,
+                         struct ieee80211_hdr *hdr)
+{
+        struct sk_buff *skb = NULL;
+        u16 sc;
+        unsigned int frag, seq;
+        struct ieee80211_frag_entry *entry;
+
+        sc = le16_to_cpu(hdr->seq_ctl);
+        frag = WLAN_GET_SEQ_FRAG(sc);
+        seq = WLAN_GET_SEQ_SEQ(sc);
+
+        if (frag == 0) {
+                /* Reserve enough space to fit maximum frame length */
+                skb = dev_alloc_skb(ieee->dev->mtu +
+                                    sizeof(struct ieee80211_hdr) +
+                                    8 /* LLC */ +
+                                    2 /* alignment */ +
+                                    8 /* WEP */ + ETH_ALEN /* WDS */);
+                if (skb == NULL)
+                        return NULL;
+
+                entry = &ieee->frag_cache[ieee->frag_next_idx];
+                ieee->frag_next_idx++;
+                if (ieee->frag_next_idx >= IEEE80211_FRAG_CACHE_LEN)
+                        ieee->frag_next_idx = 0;
+
+                if (entry->skb != NULL)
+                        dev_kfree_skb_any(entry->skb);
+
+                entry->first_frag_time = jiffies;
+                entry->seq = seq;
+                entry->last_frag = frag;
+                entry->skb = skb;
+                memcpy(entry->src_addr, hdr->addr2, ETH_ALEN);
+                memcpy(entry->dst_addr, hdr->addr1, ETH_ALEN);
+        } else {
+                /* received a fragment of a frame for which the head fragment
+                 * should have already been received */
+                entry = ieee80211_frag_cache_find(ieee, seq, frag, hdr->addr2,
+                                                  hdr->addr1);
+                if (entry != NULL) {
+                        entry->last_frag = frag;
+                        skb = entry->skb;
+                }
+        }
+
+        return skb;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
+                                           struct ieee80211_hdr *hdr)
+{
+        u16 sc;
+        unsigned int seq;
+        struct ieee80211_frag_entry *entry;
+
+        sc = le16_to_cpu(hdr->seq_ctl);
+        seq = WLAN_GET_SEQ_SEQ(sc);
+
+        entry = ieee80211_frag_cache_find(ieee, seq, -1, hdr->addr2,
+                                          hdr->addr1);
+
+        if (entry == NULL) {
+                IEEE80211_DEBUG_FRAG(
+                        "could not invalidate fragment cache "
+                        "entry (seq=%u)\n", seq);
+                return -1;
+        }
+
+        entry->skb = NULL;
+        return 0;
+}
+
+
+#ifdef NOT_YET
+/* ieee80211_rx_frame_mgtmt
+ *
+ * Responsible for handling management control frames
+ *
+ * Called by ieee80211_rx */
+static inline int
+ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
+                        struct ieee80211_rx_stats *rx_stats, u16 type,
+                        u16 stype)
+{
+        if (ieee->iw_mode == IW_MODE_MASTER) {
+                printk(KERN_DEBUG "%s: Master mode not yet suppported.\n",
+                       ieee->dev->name);
+                return 0;
+/*
+  hostap_update_sta_ps(ieee, (struct hostap_ieee80211_hdr *)
+  skb->data);*/
+        }
+
+        if (ieee->hostapd && type == WLAN_FC_TYPE_MGMT) {
+                if (stype == WLAN_FC_STYPE_BEACON &&
+                    ieee->iw_mode == IW_MODE_MASTER) {
+                        struct sk_buff *skb2;
+                        /* Process beacon frames also in kernel driver to
+                         * update STA(AP) table statistics */
+                        skb2 = skb_clone(skb, GFP_ATOMIC);
+                        if (skb2)
+                                hostap_rx(skb2->dev, skb2, rx_stats);
+                }
+
+                /* send management frames to the user space daemon for
+                 * processing */
+                ieee->apdevstats.rx_packets++;
+                ieee->apdevstats.rx_bytes += skb->len;
+                prism2_rx_80211(ieee->apdev, skb, rx_stats, PRISM2_RX_MGMT);
+                return 0;
+        }
+
+            if (ieee->iw_mode == IW_MODE_MASTER) {
+                if (type != WLAN_FC_TYPE_MGMT && type != WLAN_FC_TYPE_CTRL) {
+                        printk(KERN_DEBUG "%s: unknown management frame "
+                               "(type=0x%02x, stype=0x%02x) dropped\n",
+                               skb->dev->name, type, stype);
+                        return -1;
+                }
+
+                hostap_rx(skb->dev, skb, rx_stats);
+                return 0;
+        }
+
+        printk(KERN_DEBUG "%s: hostap_rx_frame_mgmt: management frame "
+               "received in non-Host AP mode\n", skb->dev->name);
+        return -1;
+}
+#endif
+
+
+/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
+/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
+static unsigned char rfc1042_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
+static unsigned char bridge_tunnel_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+/* No encapsulation header if EtherType < 0x600 (=length) */
+
+/* Called by ieee80211_rx_frame_decrypt */
+static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,
+                                    struct sk_buff *skb)
+{
+        struct net_device *dev = ieee->dev;
+        u16 fc, ethertype;
+        struct ieee80211_hdr *hdr;
+        u8 *pos;
+
+        if (skb->len < 24)
+                return 0;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+
+        /* check that the frame is unicast frame to us */
+        if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+            IEEE80211_FCTL_TODS &&
+            memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0 &&
+            memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) {
+                /* ToDS frame with own addr BSSID and DA */
+        } else if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+                   IEEE80211_FCTL_FROMDS &&
+                   memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0) {
+                /* FromDS frame with own addr as DA */
+        } else
+                return 0;
+
+        if (skb->len < 24 + 8)
+                return 0;
+
+        /* check for port access entity Ethernet type */
+        pos = skb->data + 24;
+        ethertype = (pos[6] << 8) | pos[7];
+        if (ethertype == ETH_P_PAE)
+                return 1;
+
+        return 0;
+}
+
+/* Called only as a tasklet (software IRQ), by ieee80211_rx */
+static inline int
+ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
+                           struct ieee80211_crypt_data *crypt)
+{
+        struct ieee80211_hdr *hdr;
+        int res, hdrlen;
+
+        if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
+                return 0;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
+
+#ifdef CONFIG_IEEE80211_CRYPT_TKIP
+        if (ieee->tkip_countermeasures &&
+            strcmp(crypt->ops->name, "TKIP") == 0) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+                               "received packet from " MAC_FMT "\n",
+                               ieee->dev->name, MAC_ARG(hdr->addr2));
+                }
+                return -1;
+        }
+#endif
+
+        atomic_inc(&crypt->refcnt);
+        res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
+        atomic_dec(&crypt->refcnt);
+        if (res < 0) {
+                IEEE80211_DEBUG_DROP(
+                        "decryption failed (SA=" MAC_FMT
+                        ") res=%d\n", MAC_ARG(hdr->addr2), res);
+                if (res == -2)
+                        IEEE80211_DEBUG_DROP("Decryption failed ICV "
+                                             "mismatch (key %d)\n",
+                                             skb->data[hdrlen + 3] >> 6);
+                ieee->ieee_stats.rx_discards_undecryptable++;
+                return -1;
+        }
+
+        return res;
+}
+
+
+/* Called only as a tasklet (software IRQ), by ieee80211_rx */
+static inline int
+ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb,
+                             int keyidx, struct ieee80211_crypt_data *crypt)
+{
+        struct ieee80211_hdr *hdr;
+        int res, hdrlen;
+
+        if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
+                return 0;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
+
+        atomic_inc(&crypt->refcnt);
+        res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
+        atomic_dec(&crypt->refcnt);
+        if (res < 0) {
+                printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
+                       " (SA=" MAC_FMT " keyidx=%d)\n",
+                       ieee->dev->name, MAC_ARG(hdr->addr2), keyidx);
+                return -1;
+        }
+
+        return 0;
+}
+
+
+/* All received frames are sent to this function. @skb contains the frame in
+ * IEEE 802.11 format, i.e., in the format it was sent over air.
+ * This function is called only as a tasklet (software IRQ). */
+int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
+                 struct ieee80211_rx_stats *rx_stats)
+{
+        struct net_device *dev = ieee->dev;
+        struct ieee80211_hdr *hdr;
+        size_t hdrlen;
+        u16 fc, type, stype, sc;
+        struct net_device_stats *stats;
+        unsigned int frag;
+        u8 *payload;
+        u16 ethertype;
+#ifdef NOT_YET
+        struct net_device *wds = NULL;
+        struct sk_buff *skb2 = NULL;
+        struct net_device *wds = NULL;
+        int frame_authorized = 0;
+        int from_assoc_ap = 0;
+        void *sta = NULL;
+#endif
+        u8 dst[ETH_ALEN];
+        u8 src[ETH_ALEN];
+        struct ieee80211_crypt_data *crypt = NULL;
+        int keyidx = 0;
+
+        hdr = (struct ieee80211_hdr *)skb->data;
+        stats = &ieee->stats;
+
+        if (skb->len < 10) {
+                printk(KERN_INFO "%s: SKB length < 10\n",
+                       dev->name);
+                goto rx_dropped;
+        }
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        type = WLAN_FC_GET_TYPE(fc);
+        stype = WLAN_FC_GET_STYPE(fc);
+        sc = le16_to_cpu(hdr->seq_ctl);
+        frag = WLAN_GET_SEQ_FRAG(sc);
+        hdrlen = ieee80211_get_hdrlen(fc);
+
+#ifdef NOT_YET
+#if WIRELESS_EXT > 15
+        /* Put this code here so that we avoid duplicating it in all
+         * Rx paths. - Jean II */
+#ifdef IW_WIRELESS_SPY          /* defined in iw_handler.h */
+        /* If spy monitoring on */
+        if (iface->spy_data.spy_number > 0) {
+                struct iw_quality wstats;
+                wstats.level = rx_stats->signal;
+                wstats.noise = rx_stats->noise;
+                wstats.updated = 6;     /* No qual value */
+                /* Update spy records */
+                wireless_spy_update(dev, hdr->addr2, &wstats);
+        }
+#endif /* IW_WIRELESS_SPY */
+#endif /* WIRELESS_EXT > 15 */
+        hostap_update_rx_stats(local->ap, hdr, rx_stats);
+#endif
+
+#if WIRELESS_EXT > 15
+        if (ieee->iw_mode == IW_MODE_MONITOR) {
+                ieee80211_monitor_rx(ieee, skb, rx_stats);
+                stats->rx_packets++;
+                stats->rx_bytes += skb->len;
+                return 1;
+        }
+#endif
+
+        if (ieee->host_decrypt) {
+                int idx = 0;
+                if (skb->len >= hdrlen + 3)
+                        idx = skb->data[hdrlen + 3] >> 6;
+                crypt = ieee->crypt[idx];
+#ifdef NOT_YET
+                sta = NULL;
+
+                /* Use station specific key to override default keys if the
+                 * receiver address is a unicast address ("individual RA"). If
+                 * bcrx_sta_key parameter is set, station specific key is used
+                 * even with broad/multicast targets (this is against IEEE
+                 * 802.11, but makes it easier to use different keys with
+                 * stations that do not support WEP key mapping). */
+
+                if (!(hdr->addr1[0] & 0x01) || local->bcrx_sta_key)
+                        (void) hostap_handle_sta_crypto(local, hdr, &crypt,
+                                                        &sta);
+#endif
+
+                /* allow NULL decrypt to indicate an station specific override
+                 * for default encryption */
+                if (crypt && (crypt->ops == NULL ||
+                              crypt->ops->decrypt_mpdu == NULL))
+                        crypt = NULL;
+
+                if (!crypt && (fc & IEEE80211_FCTL_WEP)) {
+                        /* This seems to be triggered by some (multicast?)
+                         * frames from other than current BSS, so just drop the
+                         * frames silently instead of filling system log with
+                         * these reports. */
+                        IEEE80211_DEBUG_DROP("Decryption failed (not set)"
+                                             " (SA=" MAC_FMT ")\n",
+                                             MAC_ARG(hdr->addr2));
+                        ieee->ieee_stats.rx_discards_undecryptable++;
+                        goto rx_dropped;
+                }
+        }
+
+#ifdef NOT_YET
+        if (type != WLAN_FC_TYPE_DATA) {
+                if (type == WLAN_FC_TYPE_MGMT && stype == WLAN_FC_STYPE_AUTH &&
+                    fc & IEEE80211_FCTL_WEP && ieee->host_decrypt &&
+                    (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0)
+                {
+                        printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
+                               "from " MAC_FMT "\n", dev->name,
+                               MAC_ARG(hdr->addr2));
+                        /* TODO: could inform hostapd about this so that it
+                         * could send auth failure report */
+                        goto rx_dropped;
+                }
+
+                if (ieee80211_rx_frame_mgmt(ieee, skb, rx_stats, type, stype))
+                        goto rx_dropped;
+                else
+                        goto rx_exit;
+        }
+#endif
+
+        /* Data frame - extract src/dst addresses */
+        if (skb->len < IEEE80211_3ADDR_LEN)
+                goto rx_dropped;
+
+        switch (fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
+        case IEEE80211_FCTL_FROMDS:
+                memcpy(dst, hdr->addr1, ETH_ALEN);
+                memcpy(src, hdr->addr3, ETH_ALEN);
+                break;
+        case IEEE80211_FCTL_TODS:
+                memcpy(dst, hdr->addr3, ETH_ALEN);
+                memcpy(src, hdr->addr2, ETH_ALEN);
+                break;
+        case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:
+                if (skb->len < IEEE80211_4ADDR_LEN)
+                        goto rx_dropped;
+                memcpy(dst, hdr->addr3, ETH_ALEN);
+                memcpy(src, hdr->addr4, ETH_ALEN);
+                break;
+        case 0:
+                memcpy(dst, hdr->addr1, ETH_ALEN);
+                memcpy(src, hdr->addr2, ETH_ALEN);
+                break;
+        }
+
+#ifdef NOT_YET
+        if (hostap_rx_frame_wds(ieee, hdr, fc, &wds))
+                goto rx_dropped;
+        if (wds) {
+                skb->dev = dev = wds;
+                stats = hostap_get_stats(dev);
+        }
+
+        if (ieee->iw_mode == IW_MODE_MASTER && !wds &&
+            (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS &&
+            ieee->stadev &&
+            memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) {
+                /* Frame from BSSID of the AP for which we are a client */
+                skb->dev = dev = ieee->stadev;
+                stats = hostap_get_stats(dev);
+                from_assoc_ap = 1;
+        }
+#endif
+
+        dev->last_rx = jiffies;
+
+#ifdef NOT_YET
+        if ((ieee->iw_mode == IW_MODE_MASTER ||
+             ieee->iw_mode == IW_MODE_REPEAT) &&
+            !from_assoc_ap) {
+                switch (hostap_handle_sta_rx(ieee, dev, skb, rx_stats,
+                                             wds != NULL)) {
+                case AP_RX_CONTINUE_NOT_AUTHORIZED:
+                        frame_authorized = 0;
+                        break;
+                case AP_RX_CONTINUE:
+                        frame_authorized = 1;
+                        break;
+                case AP_RX_DROP:
+                        goto rx_dropped;
+                case AP_RX_EXIT:
+                        goto rx_exit;
+                }
+        }
+#endif
+
+        /* Nullfunc frames may have PS-bit set, so they must be passed to
+         * hostap_handle_sta_rx() before being dropped here. */
+        if (stype != IEEE80211_STYPE_DATA &&
+            stype != IEEE80211_STYPE_DATA_CFACK &&
+            stype != IEEE80211_STYPE_DATA_CFPOLL &&
+            stype != IEEE80211_STYPE_DATA_CFACKPOLL) {
+                if (stype != IEEE80211_STYPE_NULLFUNC)
+                        IEEE80211_DEBUG_DROP(
+                                "RX: dropped data frame "
+                                "with no data (type=0x%02x, "
+                                "subtype=0x%02x, len=%d)\n",
+                                type, stype, skb->len);
+                goto rx_dropped;
+        }
+
+        /* skb: hdr + (possibly fragmented, possibly encrypted) payload */
+
+        if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+            (keyidx = ieee80211_rx_frame_decrypt(ieee, skb, crypt)) < 0)
+                goto rx_dropped;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+
+        /* skb: hdr + (possibly fragmented) plaintext payload */
+        // PR: FIXME: hostap has additional conditions in the "if" below:
+        // ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+        if ((frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) {
+                int flen;
+                struct sk_buff *frag_skb = ieee80211_frag_cache_get(ieee, hdr);
+                IEEE80211_DEBUG_FRAG("Rx Fragment received (%u)\n", frag);
+
+                if (!frag_skb) {
+                        IEEE80211_DEBUG(IEEE80211_DL_RX | IEEE80211_DL_FRAG,
+                                        "Rx cannot get skb from fragment "
+                                        "cache (morefrag=%d seq=%u frag=%u)\n",
+                                        (fc & IEEE80211_FCTL_MOREFRAGS) != 0,
+                                        WLAN_GET_SEQ_SEQ(sc), frag);
+                        goto rx_dropped;
+                }
+
+                flen = skb->len;
+                if (frag != 0)
+                        flen -= hdrlen;
+
+                if (frag_skb->tail + flen > frag_skb->end) {
+                        printk(KERN_WARNING "%s: host decrypted and "
+                               "reassembled frame did not fit skb\n",
+                               dev->name);
+                        ieee80211_frag_cache_invalidate(ieee, hdr);
+                        goto rx_dropped;
+                }
+
+                if (frag == 0) {
+                        /* copy first fragment (including full headers) into
+                         * beginning of the fragment cache skb */
+                        memcpy(skb_put(frag_skb, flen), skb->data, flen);
+                } else {
+                        /* append frame payload to the end of the fragment
+                         * cache skb */
+                        memcpy(skb_put(frag_skb, flen), skb->data + hdrlen,
+                               flen);
+                }
+                dev_kfree_skb_any(skb);
+                skb = NULL;
+
+                if (fc & IEEE80211_FCTL_MOREFRAGS) {
+                        /* more fragments expected - leave the skb in fragment
+                         * cache for now; it will be delivered to upper layers
+                         * after all fragments have been received */
+                        goto rx_exit;
+                }
+
+                /* this was the last fragment and the frame will be
+                 * delivered, so remove skb from fragment cache */
+                skb = frag_skb;
+                hdr = (struct ieee80211_hdr *) skb->data;
+                ieee80211_frag_cache_invalidate(ieee, hdr);
+        }
+
+        /* skb: hdr + (possible reassembled) full MSDU payload; possibly still
+         * encrypted/authenticated */
+        if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+            ieee80211_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt))
+                goto rx_dropped;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep) {
+                if (/*ieee->ieee802_1x &&*/
+                    ieee80211_is_eapol_frame(ieee, skb)) {
+#ifdef CONFIG_IEEE80211_DEBUG
+                        /* pass unencrypted EAPOL frames even if encryption is
+                         * configured */
+                        struct eapol *eap = (struct eapol *)(skb->data +
+                                24);
+                        IEEE80211_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n",
+                                                eap_get_type(eap->type));
+#endif
+                } else {
+                        IEEE80211_DEBUG_DROP(
+                                "encryption configured, but RX "
+                                "frame not encrypted (SA=" MAC_FMT ")\n",
+                                MAC_ARG(hdr->addr2));
+                        goto rx_dropped;
+                }
+        }
+
+#ifdef CONFIG_IEEE80211_DEBUG
+        if (crypt && !(fc & IEEE80211_FCTL_WEP) &&
+            ieee80211_is_eapol_frame(ieee, skb)) {
+                        struct eapol *eap = (struct eapol *)(skb->data +
+                                24);
+                        IEEE80211_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n",
+                                                eap_get_type(eap->type));
+        }
+#endif
+
+        if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep &&
+            !ieee80211_is_eapol_frame(ieee, skb)) {
+                IEEE80211_DEBUG_DROP(
+                        "dropped unencrypted RX data "
+                        "frame from " MAC_FMT
+                        " (drop_unencrypted=1)\n",
+                        MAC_ARG(hdr->addr2));
+                goto rx_dropped;
+        }
+
+        /* skb: hdr + (possible reassembled) full plaintext payload */
+
+        payload = skb->data + hdrlen;
+        ethertype = (payload[6] << 8) | payload[7];
+
+#ifdef NOT_YET
+        /* If IEEE 802.1X is used, check whether the port is authorized to send
+         * the received frame. */
+        if (ieee->ieee802_1x && ieee->iw_mode == IW_MODE_MASTER) {
+                if (ethertype == ETH_P_PAE) {
+                        printk(KERN_DEBUG "%s: RX: IEEE 802.1X frame\n",
+                               dev->name);
+                        if (ieee->hostapd && ieee->apdev) {
+                                /* Send IEEE 802.1X frames to the user
+                                 * space daemon for processing */
+                                prism2_rx_80211(ieee->apdev, skb, rx_stats,
+                                                PRISM2_RX_MGMT);
+                                ieee->apdevstats.rx_packets++;
+                                ieee->apdevstats.rx_bytes += skb->len;
+                                goto rx_exit;
+                        }
+                } else if (!frame_authorized) {
+                        printk(KERN_DEBUG "%s: dropped frame from "
+                               "unauthorized port (IEEE 802.1X): "
+                               "ethertype=0x%04x\n",
+                               dev->name, ethertype);
+                        goto rx_dropped;
+                }
+        }
+#endif
+
+        /* convert hdr + possible LLC headers into Ethernet header */
+        if (skb->len - hdrlen >= 8 &&
+            ((memcmp(payload, rfc1042_header, SNAP_SIZE) == 0 &&
+              ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
+             memcmp(payload, bridge_tunnel_header, SNAP_SIZE) == 0)) {
+                /* remove RFC1042 or Bridge-Tunnel encapsulation and
+                 * replace EtherType */
+                skb_pull(skb, hdrlen + SNAP_SIZE);
+                memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
+                memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
+        } else {
+                u16 len;
+                /* Leave Ethernet header part of hdr and full payload */
+                skb_pull(skb, hdrlen);
+                len = htons(skb->len);
+                memcpy(skb_push(skb, 2), &len, 2);
+                memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
+                memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
+        }
+
+#ifdef NOT_YET
+        if (wds && ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+                    IEEE80211_FCTL_TODS) &&
+            skb->len >= ETH_HLEN + ETH_ALEN) {
+                /* Non-standard frame: get addr4 from its bogus location after
+                 * the payload */
+                memcpy(skb->data + ETH_ALEN,
+                       skb->data + skb->len - ETH_ALEN, ETH_ALEN);
+                skb_trim(skb, skb->len - ETH_ALEN);
+        }
+#endif
+
+        stats->rx_packets++;
+        stats->rx_bytes += skb->len;
+
+#ifdef NOT_YET
+        if (ieee->iw_mode == IW_MODE_MASTER && !wds &&
+            ieee->ap->bridge_packets) {
+                if (dst[0] & 0x01) {
+                        /* copy multicast frame both to the higher layers and
+                         * to the wireless media */
+                        ieee->ap->bridged_multicast++;
+                        skb2 = skb_clone(skb, GFP_ATOMIC);
+                        if (skb2 == NULL)
+                                printk(KERN_DEBUG "%s: skb_clone failed for "
+                                       "multicast frame\n", dev->name);
+                } else if (hostap_is_sta_assoc(ieee->ap, dst)) {
+                        /* send frame directly to the associated STA using
+                         * wireless media and not passing to higher layers */
+                        ieee->ap->bridged_unicast++;
+                        skb2 = skb;
+                        skb = NULL;
+                }
+        }
+
+        if (skb2 != NULL) {
+                /* send to wireless media */
+                skb2->protocol = __constant_htons(ETH_P_802_3);
+                skb2->mac.raw = skb2->nh.raw = skb2->data;
+                /* skb2->nh.raw = skb2->data + ETH_HLEN; */
+                skb2->dev = dev;
+                dev_queue_xmit(skb2);
+        }
+
+#endif
+
+        if (skb) {
+                skb->protocol = eth_type_trans(skb, dev);
+                memset(skb->cb, 0, sizeof(skb->cb));
+                skb->dev = dev;
+                skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */
+                netif_rx(skb);
+        }
+
+ rx_exit:
+#ifdef NOT_YET
+        if (sta)
+                hostap_handle_sta_release(sta);
+#endif
+        return 1;
+
+ rx_dropped:
+        stats->rx_dropped++;
+
+        /* Returning 0 indicates to caller that we have not handled the SKB--
+         * so it is still allocated and can be used again by underlying
+         * hardware as a DMA target */
+        return 0;
+}
+
+#define MGMT_FRAME_FIXED_PART_LENGTH            0x24
+
+static inline int ieee80211_is_ofdm_rate(u8 rate)
+{
+        switch (rate & ~IEEE80211_BASIC_RATE_MASK) {
+        case IEEE80211_OFDM_RATE_6MB:
+        case IEEE80211_OFDM_RATE_9MB:
+        case IEEE80211_OFDM_RATE_12MB:
+        case IEEE80211_OFDM_RATE_18MB:
+        case IEEE80211_OFDM_RATE_24MB:
+        case IEEE80211_OFDM_RATE_36MB:
+        case IEEE80211_OFDM_RATE_48MB:
+        case IEEE80211_OFDM_RATE_54MB:
+                return 1;
+        }
+        return 0;
+}
+
+
+static inline int ieee80211_network_init(
+        struct ieee80211_device *ieee,
+        struct ieee80211_probe_response *beacon,
+        struct ieee80211_network *network,
+        struct ieee80211_rx_stats *stats)
+{
+#ifdef CONFIG_IEEE80211_DEBUG
+        char rates_str[64];
+        char *p;
+#endif
+        struct ieee80211_info_element *info_element;
+        u16 left;
+        u8 i;
+
+        /* Pull out fixed field data */
+        memcpy(network->bssid, beacon->header.addr3, ETH_ALEN);
+        network->capability = beacon->capability;
+        network->last_scanned = jiffies;
+        network->time_stamp[0] = beacon->time_stamp[0];
+        network->time_stamp[1] = beacon->time_stamp[1];
+        network->beacon_interval = beacon->beacon_interval;
+        /* Where to pull this? beacon->listen_interval;*/
+        network->listen_interval = 0x0A;
+        network->rates_len = network->rates_ex_len = 0;
+        network->last_associate = 0;
+        network->ssid_len = 0;
+        network->flags = 0;
+        network->atim_window = 0;
+
+        if (stats->freq == IEEE80211_52GHZ_BAND) {
+                /* for A band (No DS info) */
+                network->channel = stats->received_channel;
+        } else
+                network->flags |= NETWORK_HAS_CCK;
+
+        network->wpa_ie_len = 0;
+        network->rsn_ie_len = 0;
+
+        info_element = &beacon->info_element;
+        left = stats->len - ((void *)info_element - (void *)beacon);
+        while (left >= sizeof(struct ieee80211_info_element_hdr)) {
+                if (sizeof(struct ieee80211_info_element_hdr) + info_element->len > left) {
+                        IEEE80211_DEBUG_SCAN("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%d left=%d.\n",
+                                             info_element->len + sizeof(struct ieee80211_info_element),
+                                             left);
+                        return 1;
+                }
+
+                switch (info_element->id) {
+                case MFIE_TYPE_SSID:
+                        if (ieee80211_is_empty_essid(info_element->data,
+                                                     info_element->len)) {
+                                network->flags |= NETWORK_EMPTY_ESSID;
+                                break;
+                        }
+
+                        network->ssid_len = min(info_element->len,
+                                                (u8)IW_ESSID_MAX_SIZE);
+                        memcpy(network->ssid, info_element->data, network->ssid_len);
+                        if (network->ssid_len < IW_ESSID_MAX_SIZE)
+                                memset(network->ssid + network->ssid_len, 0,
+                                       IW_ESSID_MAX_SIZE - network->ssid_len);
+
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_SSID: '%s' len=%d.\n",
+                                             network->ssid, network->ssid_len);
+                        break;
+
+                case MFIE_TYPE_RATES:
+#ifdef CONFIG_IEEE80211_DEBUG
+                        p = rates_str;
+#endif
+                        network->rates_len = min(info_element->len, MAX_RATES_LENGTH);
+                        for (i = 0; i < network->rates_len; i++) {
+                                network->rates[i] = info_element->data[i];
+#ifdef CONFIG_IEEE80211_DEBUG
+                                p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]);
+#endif
+                                if (ieee80211_is_ofdm_rate(info_element->data[i])) {
+                                        network->flags |= NETWORK_HAS_OFDM;
+                                        if (info_element->data[i] &
+                                            IEEE80211_BASIC_RATE_MASK)
+                                                network->flags &=
+                                                        ~NETWORK_HAS_CCK;
+                                }
+                        }
+
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_RATES: '%s' (%d)\n",
+                                             rates_str, network->rates_len);
+                        break;
+
+                case MFIE_TYPE_RATES_EX:
+#ifdef CONFIG_IEEE80211_DEBUG
+                        p = rates_str;
+#endif
+                        network->rates_ex_len = min(info_element->len, MAX_RATES_EX_LENGTH);
+                        for (i = 0; i < network->rates_ex_len; i++) {
+                                network->rates_ex[i] = info_element->data[i];
+#ifdef CONFIG_IEEE80211_DEBUG
+                                p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]);
+#endif
+                                if (ieee80211_is_ofdm_rate(info_element->data[i])) {
+                                        network->flags |= NETWORK_HAS_OFDM;
+                                        if (info_element->data[i] &
+                                            IEEE80211_BASIC_RATE_MASK)
+                                                network->flags &=
+                                                        ~NETWORK_HAS_CCK;
+                                }
+                        }
+
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_RATES_EX: '%s' (%d)\n",
+                                             rates_str, network->rates_ex_len);
+                        break;
+
+                case MFIE_TYPE_DS_SET:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_DS_SET: %d\n",
+                                             info_element->data[0]);
+                        if (stats->freq == IEEE80211_24GHZ_BAND)
+                                network->channel = info_element->data[0];
+                        break;
+
+                case MFIE_TYPE_FH_SET:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_FH_SET: ignored\n");
+                        break;
+
+                case MFIE_TYPE_CF_SET:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_CF_SET: ignored\n");
+                        break;
+
+                case MFIE_TYPE_TIM:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_TIM: ignored\n");
+                        break;
+
+                case MFIE_TYPE_IBSS_SET:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_IBSS_SET: ignored\n");
+                        break;
+
+                case MFIE_TYPE_CHALLENGE:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_CHALLENGE: ignored\n");
+                        break;
+
+                case MFIE_TYPE_GENERIC:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_GENERIC: %d bytes\n",
+                                             info_element->len);
+                        if (info_element->len >= 4  &&
+                            info_element->data[0] == 0x00 &&
+                            info_element->data[1] == 0x50 &&
+                            info_element->data[2] == 0xf2 &&
+                            info_element->data[3] == 0x01) {
+                                network->wpa_ie_len = min(info_element->len + 2,
+                                                         MAX_WPA_IE_LEN);
+                                memcpy(network->wpa_ie, info_element,
+                                       network->wpa_ie_len);
+                        }
+                        break;
+
+                case MFIE_TYPE_RSN:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_RSN: %d bytes\n",
+                                             info_element->len);
+                        network->rsn_ie_len = min(info_element->len + 2,
+                                                 MAX_WPA_IE_LEN);
+                        memcpy(network->rsn_ie, info_element,
+                               network->rsn_ie_len);
+                        break;
+
+                default:
+                        IEEE80211_DEBUG_SCAN("unsupported IE %d\n",
+                                             info_element->id);
+                        break;
+                }
+
+                left -= sizeof(struct ieee80211_info_element_hdr) +
+                        info_element->len;
+                info_element = (struct ieee80211_info_element *)
+                        &info_element->data[info_element->len];
+        }
+
+        network->mode = 0;
+        if (stats->freq == IEEE80211_52GHZ_BAND)
+                network->mode = IEEE_A;
+        else {
+                if (network->flags & NETWORK_HAS_OFDM)
+                        network->mode |= IEEE_G;
+                if (network->flags & NETWORK_HAS_CCK)
+                        network->mode |= IEEE_B;
+        }
+
+        if (network->mode == 0) {
+                IEEE80211_DEBUG_SCAN("Filtered out '%s (" MAC_FMT ")' "
+                                     "network.\n",
+                                     escape_essid(network->ssid,
+                                                  network->ssid_len),
+                                     MAC_ARG(network->bssid));
+                return 1;
+        }
+
+        if (ieee80211_is_empty_essid(network->ssid, network->ssid_len))
+                network->flags |= NETWORK_EMPTY_ESSID;
+
+        memcpy(&network->stats, stats, sizeof(network->stats));
+
+        return 0;
+}
+
+static inline int is_same_network(struct ieee80211_network *src,
+                                  struct ieee80211_network *dst)
+{
+        /* A network is only a duplicate if the channel, BSSID, and ESSID
+         * all match.  We treat all <hidden> with the same BSSID and channel
+         * as one network */
+        return ((src->ssid_len == dst->ssid_len) &&
+                (src->channel == dst->channel) &&
+                !memcmp(src->bssid, dst->bssid, ETH_ALEN) &&
+                !memcmp(src->ssid, dst->ssid, src->ssid_len));
+}
+
+static inline void update_network(struct ieee80211_network *dst,
+                                  struct ieee80211_network *src)
+{
+        memcpy(&dst->stats, &src->stats, sizeof(struct ieee80211_rx_stats));
+        dst->capability = src->capability;
+        memcpy(dst->rates, src->rates, src->rates_len);
+        dst->rates_len = src->rates_len;
+        memcpy(dst->rates_ex, src->rates_ex, src->rates_ex_len);
+        dst->rates_ex_len = src->rates_ex_len;
+
+        dst->mode = src->mode;
+        dst->flags = src->flags;
+        dst->time_stamp[0] = src->time_stamp[0];
+        dst->time_stamp[1] = src->time_stamp[1];
+
+        dst->beacon_interval = src->beacon_interval;
+        dst->listen_interval = src->listen_interval;
+        dst->atim_window = src->atim_window;
+
+        memcpy(dst->wpa_ie, src->wpa_ie, src->wpa_ie_len);
+        dst->wpa_ie_len = src->wpa_ie_len;
+        memcpy(dst->rsn_ie, src->rsn_ie, src->rsn_ie_len);
+        dst->rsn_ie_len = src->rsn_ie_len;
+
+        dst->last_scanned = jiffies;
+        /* dst->last_associate is not overwritten */
+}
+
+static inline void ieee80211_process_probe_response(
+        struct ieee80211_device *ieee,
+        struct ieee80211_probe_response *beacon,
+        struct ieee80211_rx_stats *stats)
+{
+        struct ieee80211_network network;
+        struct ieee80211_network *target;
+        struct ieee80211_network *oldest = NULL;
+#ifdef CONFIG_IEEE80211_DEBUG
+        struct ieee80211_info_element *info_element = &beacon->info_element;
+#endif
+        unsigned long flags;
+
+        IEEE80211_DEBUG_SCAN(
+                "'%s' (" MAC_FMT "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
+                escape_essid(info_element->data, info_element->len),
+                MAC_ARG(beacon->header.addr3),
+                (beacon->capability & (1<<0xf)) ? '1' : '0',
+                (beacon->capability & (1<<0xe)) ? '1' : '0',
+                (beacon->capability & (1<<0xd)) ? '1' : '0',
+                (beacon->capability & (1<<0xc)) ? '1' : '0',
+                (beacon->capability & (1<<0xb)) ? '1' : '0',
+                (beacon->capability & (1<<0xa)) ? '1' : '0',
+                (beacon->capability & (1<<0x9)) ? '1' : '0',
+                (beacon->capability & (1<<0x8)) ? '1' : '0',
+                (beacon->capability & (1<<0x7)) ? '1' : '0',
+                (beacon->capability & (1<<0x6)) ? '1' : '0',
+                (beacon->capability & (1<<0x5)) ? '1' : '0',
+                (beacon->capability & (1<<0x4)) ? '1' : '0',
+                (beacon->capability & (1<<0x3)) ? '1' : '0',
+                (beacon->capability & (1<<0x2)) ? '1' : '0',
+                (beacon->capability & (1<<0x1)) ? '1' : '0',
+                (beacon->capability & (1<<0x0)) ? '1' : '0');
+
+        if (ieee80211_network_init(ieee, beacon, &network, stats)) {
+                IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
+                                     escape_essid(info_element->data,
+                                                  info_element->len),
+                                     MAC_ARG(beacon->header.addr3),
+                                     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
+                                     IEEE80211_STYPE_PROBE_RESP ?
+                                     "PROBE RESPONSE" : "BEACON");
+                return;
+        }
+
+        /* The network parsed correctly -- so now we scan our known networks
+         * to see if we can find it in our list.
+         *
+         * NOTE:  This search is definitely not optimized.  Once its doing
+         *        the "right thing" we'll optimize it for efficiency if
+         *        necessary */
+
+        /* Search for this entry in the list and update it if it is
+         * already there. */
+
+        spin_lock_irqsave(&ieee->lock, flags);
+
+        list_for_each_entry(target, &ieee->network_list, list) {
+                if (is_same_network(target, &network))
+                        break;
+
+                if ((oldest == NULL) ||
+                    (target->last_scanned < oldest->last_scanned))
+                        oldest = target;
+        }
+
+        /* If we didn't find a match, then get a new network slot to initialize
+         * with this beacon's information */
+        if (&target->list == &ieee->network_list) {
+                if (list_empty(&ieee->network_free_list)) {
+                        /* If there are no more slots, expire the oldest */
+                        list_del(&oldest->list);
+                        target = oldest;
+                        IEEE80211_DEBUG_SCAN("Expired '%s' (" MAC_FMT ") from "
+                                             "network list.\n",
+                                             escape_essid(target->ssid,
+                                                          target->ssid_len),
+                                             MAC_ARG(target->bssid));
+                } else {
+                        /* Otherwise just pull from the free list */
+                        target = list_entry(ieee->network_free_list.next,
+                                            struct ieee80211_network, list);
+                        list_del(ieee->network_free_list.next);
+                }
+
+
+#ifdef CONFIG_IEEE80211_DEBUG
+                IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",
+                                     escape_essid(network.ssid,
+                                                  network.ssid_len),
+                                     MAC_ARG(network.bssid),
+                                     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
+                                     IEEE80211_STYPE_PROBE_RESP ?
+                                     "PROBE RESPONSE" : "BEACON");
+#endif
+                memcpy(target, &network, sizeof(*target));
+                list_add_tail(&target->list, &ieee->network_list);
+        } else {
+                IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",
+                                     escape_essid(target->ssid,
+                                                  target->ssid_len),
+                                     MAC_ARG(target->bssid),
+                                     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
+                                     IEEE80211_STYPE_PROBE_RESP ?
+                                     "PROBE RESPONSE" : "BEACON");
+                update_network(target, &network);
+        }
+
+        spin_unlock_irqrestore(&ieee->lock, flags);
+}
+
+void ieee80211_rx_mgt(struct ieee80211_device *ieee,
+                      struct ieee80211_hdr *header,
+                      struct ieee80211_rx_stats *stats)
+{
+        switch (WLAN_FC_GET_STYPE(header->frame_ctl)) {
+        case IEEE80211_STYPE_ASSOC_RESP:
+                IEEE80211_DEBUG_MGMT("received ASSOCIATION RESPONSE (%d)\n",
+                                     WLAN_FC_GET_STYPE(header->frame_ctl));
+                break;
+
+        case IEEE80211_STYPE_REASSOC_RESP:
+                IEEE80211_DEBUG_MGMT("received REASSOCIATION RESPONSE (%d)\n",
+                                     WLAN_FC_GET_STYPE(header->frame_ctl));
+                break;
+
+        case IEEE80211_STYPE_PROBE_RESP:
+                IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
+                                     WLAN_FC_GET_STYPE(header->frame_ctl));
+                IEEE80211_DEBUG_SCAN("Probe response\n");
+                ieee80211_process_probe_response(
+                        ieee, (struct ieee80211_probe_response *)header, stats);
+                break;
+
+        case IEEE80211_STYPE_BEACON:
+                IEEE80211_DEBUG_MGMT("received BEACON (%d)\n",
+                                     WLAN_FC_GET_STYPE(header->frame_ctl));
+                IEEE80211_DEBUG_SCAN("Beacon\n");
+                ieee80211_process_probe_response(
+                        ieee, (struct ieee80211_probe_response *)header, stats);
+                break;
+
+        default:
+                IEEE80211_DEBUG_MGMT("received UNKNOWN (%d)\n",
+                                     WLAN_FC_GET_STYPE(header->frame_ctl));
+                IEEE80211_WARNING("%s: Unknown management packet: %d\n",
+                                  ieee->dev->name,
+                                  WLAN_FC_GET_STYPE(header->frame_ctl));
+                break;
+        }
+}
+
+
+EXPORT_SYMBOL(ieee80211_rx_mgt);
+EXPORT_SYMBOL(ieee80211_rx);
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
new file mode 100644
index 000000000000..d1049edcd14d
--- /dev/null
+++ b/net/ieee80211/ieee80211_tx.c
@@ -0,0 +1,447 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+#include <linux/compiler.h>
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/if_arp.h>
+#include <linux/in6.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/proc_fs.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/tcp.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include <linux/wireless.h>
+#include <linux/etherdevice.h>
+#include <asm/uaccess.h>
+
+#include <net/ieee80211.h>
+
+
+/*
+
+
+802.11 Data Frame
+
+      ,-------------------------------------------------------------------.
+Bytes |  2   |  2   |    6    |    6    |    6    |  2   | 0..2312 |   4  |
+      |------|------|---------|---------|---------|------|---------|------|
+Desc. | ctrl | dura |  DA/RA  |   TA    |    SA   | Sequ |  Frame  |  fcs |
+      |      | tion | (BSSID) |         |         | ence |  data   |      |
+      `--------------------------------------------------|         |------'
+Total: 28 non-data bytes                                 `----.----'
+                                                              |
+       .- 'Frame data' expands to <---------------------------'
+       |
+       V
+      ,---------------------------------------------------.
+Bytes |  1   |  1   |    1    |    3     |  2   |  0-2304 |
+      |------|------|---------|----------|------|---------|
+Desc. | SNAP | SNAP | Control |Eth Tunnel| Type | IP      |
+      | DSAP | SSAP |         |          |      | Packet  |
+      | 0xAA | 0xAA |0x03 (UI)|0x00-00-F8|      |         |
+      `-----------------------------------------|         |
+Total: 8 non-data bytes                         `----.----'
+                                                     |
+       .- 'IP Packet' expands, if WEP enabled, to <--'
+       |
+       V
+      ,-----------------------.
+Bytes |  4  |   0-2296  |  4  |
+      |-----|-----------|-----|
+Desc. | IV  | Encrypted | ICV |
+      |     | IP Packet |     |
+      `-----------------------'
+Total: 8 non-data bytes
+
+
+802.3 Ethernet Data Frame
+
+      ,-----------------------------------------.
+Bytes |   6   |   6   |  2   |  Variable |   4  |
+      |-------|-------|------|-----------|------|
+Desc. | Dest. | Source| Type | IP Packet |  fcs |
+      |  MAC  |  MAC  |      |           |      |
+      `-----------------------------------------'
+Total: 18 non-data bytes
+
+In the event that fragmentation is required, the incoming payload is split into
+N parts of size ieee->fts.  The first fragment contains the SNAP header and the
+remaining packets are just data.
+
+If encryption is enabled, each fragment payload size is reduced by enough space
+to add the prefix and postfix (IV and ICV totalling 8 bytes in the case of WEP)
+So if you have 1500 bytes of payload with ieee->fts set to 500 without
+encryption it will take 3 frames.  With WEP it will take 4 frames as the
+payload of each frame is reduced to 492 bytes.
+
+* SKB visualization
+*
+*  ,- skb->data
+* |
+* |    ETHERNET HEADER        ,-<-- PAYLOAD
+* |                           |     14 bytes from skb->data
+* |  2 bytes for Type --> ,T. |     (sizeof ethhdr)
+* |                       | | |
+* |,-Dest.--. ,--Src.---. | | |
+* |  6 bytes| | 6 bytes | | | |
+* v         | |         | | | |
+* 0         | v       1 | v | v           2
+* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
+*     ^     | ^         | ^ |
+*     |     | |         | | |
+*     |     | |         | `T' <---- 2 bytes for Type
+*     |     | |         |
+*     |     | '---SNAP--' <-------- 6 bytes for SNAP
+*     |     |
+*     `-IV--' <-------------------- 4 bytes for IV (WEP)
+*
+*      SNAP HEADER
+*
+*/
+
+static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 };
+static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
+
+static inline int ieee80211_put_snap(u8 *data, u16 h_proto)
+{
+        struct ieee80211_snap_hdr *snap;
+        u8 *oui;
+
+        snap = (struct ieee80211_snap_hdr *)data;
+        snap->dsap = 0xaa;
+        snap->ssap = 0xaa;
+        snap->ctrl = 0x03;
+
+        if (h_proto == 0x8137 || h_proto == 0x80f3)
+                oui = P802_1H_OUI;
+        else
+                oui = RFC1042_OUI;
+        snap->oui[0] = oui[0];
+        snap->oui[1] = oui[1];
+        snap->oui[2] = oui[2];
+
+        *(u16 *)(data + SNAP_SIZE) = htons(h_proto);
+
+        return SNAP_SIZE + sizeof(u16);
+}
+
+static inline int ieee80211_encrypt_fragment(
+        struct ieee80211_device *ieee,
+        struct sk_buff *frag,
+        int hdr_len)
+{
+        struct ieee80211_crypt_data* crypt = ieee->crypt[ieee->tx_keyidx];
+        int res;
+
+#ifdef CONFIG_IEEE80211_CRYPT_TKIP
+        struct ieee80211_hdr *header;
+
+        if (ieee->tkip_countermeasures &&
+            crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
+                header = (struct ieee80211_hdr *) frag->data;
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+                               "TX packet to " MAC_FMT "\n",
+                               ieee->dev->name, MAC_ARG(header->addr1));
+                }
+                return -1;
+        }
+#endif
+        /* To encrypt, frame format is:
+         * IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */
+
+        // PR: FIXME: Copied from hostap. Check fragmentation/MSDU/MPDU encryption.
+        /* Host-based IEEE 802.11 fragmentation for TX is not yet supported, so
+         * call both MSDU and MPDU encryption functions from here. */
+        atomic_inc(&crypt->refcnt);
+        res = 0;
+        if (crypt->ops->encrypt_msdu)
+                res = crypt->ops->encrypt_msdu(frag, hdr_len, crypt->priv);
+        if (res == 0 && crypt->ops->encrypt_mpdu)
+                res = crypt->ops->encrypt_mpdu(frag, hdr_len, crypt->priv);
+
+        atomic_dec(&crypt->refcnt);
+        if (res < 0) {
+                printk(KERN_INFO "%s: Encryption failed: len=%d.\n",
+                       ieee->dev->name, frag->len);
+                ieee->ieee_stats.tx_discards++;
+                return -1;
+        }
+
+        return 0;
+}
+
+
+void ieee80211_txb_free(struct ieee80211_txb *txb) {
+        int i;
+        if (unlikely(!txb))
+                return;
+        for (i = 0; i < txb->nr_frags; i++)
+                if (txb->fragments[i])
+                        dev_kfree_skb_any(txb->fragments[i]);
+        kfree(txb);
+}
+
+static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
+                                                 int gfp_mask)
+{
+        struct ieee80211_txb *txb;
+        int i;
+        txb = kmalloc(
+                sizeof(struct ieee80211_txb) + (sizeof(u8*) * nr_frags),
+                gfp_mask);
+        if (!txb)
+                return NULL;
+
+        memset(txb, 0, sizeof(struct ieee80211_txb));
+        txb->nr_frags = nr_frags;
+        txb->frag_size = txb_size;
+
+        for (i = 0; i < nr_frags; i++) {
+                txb->fragments[i] = dev_alloc_skb(txb_size);
+                if (unlikely(!txb->fragments[i])) {
+                        i--;
+                        break;
+                }
+        }
+        if (unlikely(i != nr_frags)) {
+                while (i >= 0)
+                        dev_kfree_skb_any(txb->fragments[i--]);
+                kfree(txb);
+                return NULL;
+        }
+        return txb;
+}
+
+/* SKBs are added to the ieee->tx_queue. */
+int ieee80211_xmit(struct sk_buff *skb,
+                   struct net_device *dev)
+{
+        struct ieee80211_device *ieee = netdev_priv(dev);
+        struct ieee80211_txb *txb = NULL;
+        struct ieee80211_hdr *frag_hdr;
+        int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size;
+        unsigned long flags;
+        struct net_device_stats *stats = &ieee->stats;
+        int ether_type, encrypt;
+        int bytes, fc, hdr_len;
+        struct sk_buff *skb_frag;
+        struct ieee80211_hdr header = { /* Ensure zero initialized */
+                .duration_id = 0,
+                .seq_ctl = 0
+        };
+        u8 dest[ETH_ALEN], src[ETH_ALEN];
+
+        struct ieee80211_crypt_data* crypt;
+
+        spin_lock_irqsave(&ieee->lock, flags);
+
+        /* If there is no driver handler to take the TXB, dont' bother
+         * creating it... */
+        if (!ieee->hard_start_xmit) {
+                printk(KERN_WARNING "%s: No xmit handler.\n",
+                       ieee->dev->name);
+                goto success;
+        }
+
+        if (unlikely(skb->len < SNAP_SIZE + sizeof(u16))) {
+                printk(KERN_WARNING "%s: skb too small (%d).\n",
+                       ieee->dev->name, skb->len);
+                goto success;
+        }
+
+        ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto);
+
+        crypt = ieee->crypt[ieee->tx_keyidx];
+
+        encrypt = !(ether_type == ETH_P_PAE && ieee->ieee802_1x) &&
+                ieee->host_encrypt && crypt && crypt->ops;
+
+        if (!encrypt && ieee->ieee802_1x &&
+            ieee->drop_unencrypted && ether_type != ETH_P_PAE) {
+                stats->tx_dropped++;
+                goto success;
+        }
+
+#ifdef CONFIG_IEEE80211_DEBUG
+        if (crypt && !encrypt && ether_type == ETH_P_PAE) {
+                struct eapol *eap = (struct eapol *)(skb->data +
+                        sizeof(struct ethhdr) - SNAP_SIZE - sizeof(u16));
+                IEEE80211_DEBUG_EAP("TX: IEEE 802.11 EAPOL frame: %s\n",
+                        eap_get_type(eap->type));
+        }
+#endif
+
+        /* Save source and destination addresses */
+        memcpy(&dest, skb->data, ETH_ALEN);
+        memcpy(&src, skb->data+ETH_ALEN, ETH_ALEN);
+
+        /* Advance the SKB to the start of the payload */
+        skb_pull(skb, sizeof(struct ethhdr));
+
+        /* Determine total amount of storage required for TXB packets */
+        bytes = skb->len + SNAP_SIZE + sizeof(u16);
+
+        if (encrypt)
+                fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
+                        IEEE80211_FCTL_WEP;
+        else
+                fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;
+
+        if (ieee->iw_mode == IW_MODE_INFRA) {
+                fc |= IEEE80211_FCTL_TODS;
+                /* To DS: Addr1 = BSSID, Addr2 = SA,
+                   Addr3 = DA */
+                memcpy(&header.addr1, ieee->bssid, ETH_ALEN);
+                memcpy(&header.addr2, &src, ETH_ALEN);
+                memcpy(&header.addr3, &dest, ETH_ALEN);
+        } else if (ieee->iw_mode == IW_MODE_ADHOC) {
+                /* not From/To DS: Addr1 = DA, Addr2 = SA,
+                   Addr3 = BSSID */
+                memcpy(&header.addr1, dest, ETH_ALEN);
+                memcpy(&header.addr2, src, ETH_ALEN);
+                memcpy(&header.addr3, ieee->bssid, ETH_ALEN);
+        }
+        header.frame_ctl = cpu_to_le16(fc);
+        hdr_len = IEEE80211_3ADDR_LEN;
+
+        /* Determine fragmentation size based on destination (multicast
+         * and broadcast are not fragmented) */
+        if (is_multicast_ether_addr(dest) ||
+            is_broadcast_ether_addr(dest))
+                frag_size = MAX_FRAG_THRESHOLD;
+        else
+                frag_size = ieee->fts;
+
+        /* Determine amount of payload per fragment.  Regardless of if
+         * this stack is providing the full 802.11 header, one will
+         * eventually be affixed to this fragment -- so we must account for
+         * it when determining the amount of payload space. */
+        bytes_per_frag = frag_size - IEEE80211_3ADDR_LEN;
+        if (ieee->config &
+            (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
+                bytes_per_frag -= IEEE80211_FCS_LEN;
+
+        /* Each fragment may need to have room for encryptiong pre/postfix */
+        if (encrypt)
+                bytes_per_frag -= crypt->ops->extra_prefix_len +
+                        crypt->ops->extra_postfix_len;
+
+        /* Number of fragments is the total bytes_per_frag /
+         * payload_per_fragment */
+        nr_frags = bytes / bytes_per_frag;
+        bytes_last_frag = bytes % bytes_per_frag;
+        if (bytes_last_frag)
+                nr_frags++;
+        else
+                bytes_last_frag = bytes_per_frag;
+
+        /* When we allocate the TXB we allocate enough space for the reserve
+         * and full fragment bytes (bytes_per_frag doesn't include prefix,
+         * postfix, header, FCS, etc.) */
+        txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC);
+        if (unlikely(!txb)) {
+                printk(KERN_WARNING "%s: Could not allocate TXB\n",
+                       ieee->dev->name);
+                goto failed;
+        }
+        txb->encrypted = encrypt;
+        txb->payload_size = bytes;
+
+        for (i = 0; i < nr_frags; i++) {
+                skb_frag = txb->fragments[i];
+
+                if (encrypt)
+                        skb_reserve(skb_frag, crypt->ops->extra_prefix_len);
+
+                frag_hdr = (struct ieee80211_hdr *)skb_put(skb_frag, hdr_len);
+                memcpy(frag_hdr, &header, hdr_len);
+
+                /* If this is not the last fragment, then add the MOREFRAGS
+                 * bit to the frame control */
+                if (i != nr_frags - 1) {
+                        frag_hdr->frame_ctl = cpu_to_le16(
+                                fc | IEEE80211_FCTL_MOREFRAGS);
+                        bytes = bytes_per_frag;
+                } else {
+                        /* The last fragment takes the remaining length */
+                        bytes = bytes_last_frag;
+                }
+
+                /* Put a SNAP header on the first fragment */
+                if (i == 0) {
+                        ieee80211_put_snap(
+                                skb_put(skb_frag, SNAP_SIZE + sizeof(u16)),
+                                ether_type);
+                        bytes -= SNAP_SIZE + sizeof(u16);
+                }
+
+                memcpy(skb_put(skb_frag, bytes), skb->data, bytes);
+
+                /* Advance the SKB... */
+                skb_pull(skb, bytes);
+
+                /* Encryption routine will move the header forward in order
+                 * to insert the IV between the header and the payload */
+                if (encrypt)
+                        ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len);
+                if (ieee->config &
+                    (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
+                        skb_put(skb_frag, 4);
+        }
+
+
+ success:
+        spin_unlock_irqrestore(&ieee->lock, flags);
+
+        dev_kfree_skb_any(skb);
+
+        if (txb) {
+                if ((*ieee->hard_start_xmit)(txb, dev) == 0) {
+                        stats->tx_packets++;
+                        stats->tx_bytes += txb->payload_size;
+                        return 0;
+                }
+                ieee80211_txb_free(txb);
+        }
+
+        return 0;
+
+ failed:
+        spin_unlock_irqrestore(&ieee->lock, flags);
+        netif_stop_queue(dev);
+        stats->tx_errors++;
+        return 1;
+
+}
+
+EXPORT_SYMBOL(ieee80211_txb_free);
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
new file mode 100644
index 000000000000..25a868c2e2f7
--- /dev/null
+++ b/net/ieee80211/ieee80211_wx.c
@@ -0,0 +1,471 @@
+/******************************************************************************
+
+  Copyright(c) 2004 Intel Corporation. All rights reserved.
+
+  Portions of this file are based on the WEP enablement code provided by the
+  Host AP project hostap-drivers v0.1.3
+  Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+  <jkmaline@cc.hut.fi>
+  Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+#include <linux/wireless.h>
+#include <linux/version.h>
+#include <linux/kmod.h>
+#include <linux/module.h>
+
+#include <net/ieee80211.h>
+static const char *ieee80211_modes[] = {
+        "?", "a", "b", "ab", "g", "ag", "bg", "abg"
+};
+
+#define MAX_CUSTOM_LEN 64
+static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
+                                           char *start, char *stop,
+                                           struct ieee80211_network *network)
+{
+        char custom[MAX_CUSTOM_LEN];
+        char *p;
+        struct iw_event iwe;
+        int i, j;
+        u8 max_rate, rate;
+
+        /* First entry *MUST* be the AP MAC address */
+        iwe.cmd = SIOCGIWAP;
+        iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+        memcpy(iwe.u.ap_addr.sa_data, network->bssid, ETH_ALEN);
+        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_ADDR_LEN);
+
+        /* Remaining entries will be displayed in the order we provide them */
+
+        /* Add the ESSID */
+        iwe.cmd = SIOCGIWESSID;
+        iwe.u.data.flags = 1;
+        if (network->flags & NETWORK_EMPTY_ESSID) {
+                iwe.u.data.length = sizeof("<hidden>");
+                start = iwe_stream_add_point(start, stop, &iwe, "<hidden>");
+        } else {
+                iwe.u.data.length = min(network->ssid_len, (u8)32);
+                start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
+        }
+
+        /* Add the protocol name */
+        iwe.cmd = SIOCGIWNAME;
+        snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s", ieee80211_modes[network->mode]);
+        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN);
+
+        /* Add mode */
+        iwe.cmd = SIOCGIWMODE;
+        if (network->capability &
+            (WLAN_CAPABILITY_BSS | WLAN_CAPABILITY_IBSS)) {
+                if (network->capability & WLAN_CAPABILITY_BSS)
+                        iwe.u.mode = IW_MODE_MASTER;
+                else
+                        iwe.u.mode = IW_MODE_ADHOC;
+
+                start = iwe_stream_add_event(start, stop, &iwe,
+                                             IW_EV_UINT_LEN);
+        }
+
+        /* Add frequency/channel */
+        iwe.cmd = SIOCGIWFREQ;
+/*      iwe.u.freq.m = ieee80211_frequency(network->channel, network->mode);
+        iwe.u.freq.e = 3; */
+        iwe.u.freq.m = network->channel;
+        iwe.u.freq.e = 0;
+        iwe.u.freq.i = 0;
+        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
+
+        /* Add encryption capability */
+        iwe.cmd = SIOCGIWENCODE;
+        if (network->capability & 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;
+        start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
+
+        /* Add basic and extended rates */
+        max_rate = 0;
+        p = custom;
+        p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Rates (Mb/s): ");
+        for (i = 0, j = 0; i < network->rates_len; ) {
+                if (j < network->rates_ex_len &&
+                    ((network->rates_ex[j] & 0x7F) <
+                     (network->rates[i] & 0x7F)))
+                        rate = network->rates_ex[j++] & 0x7F;
+                else
+                        rate = network->rates[i++] & 0x7F;
+                if (rate > max_rate)
+                        max_rate = rate;
+                p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
+                              "%d%s ", rate >> 1, (rate & 1) ? ".5" : "");
+        }
+        for (; j < network->rates_ex_len; j++) {
+                rate = network->rates_ex[j] & 0x7F;
+                p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
+                              "%d%s ", rate >> 1, (rate & 1) ? ".5" : "");
+                if (rate > max_rate)
+                        max_rate = rate;
+        }
+
+        iwe.cmd = SIOCGIWRATE;
+        iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+        iwe.u.bitrate.value = max_rate * 500000;
+        start = iwe_stream_add_event(start, stop, &iwe,
+                                     IW_EV_PARAM_LEN);
+
+        iwe.cmd = IWEVCUSTOM;
+        iwe.u.data.length = p - custom;
+        if (iwe.u.data.length)
+                start = iwe_stream_add_point(start, stop, &iwe, custom);
+
+        /* Add quality statistics */
+        /* TODO: Fix these values... */
+        iwe.cmd = IWEVQUAL;
+        iwe.u.qual.qual = network->stats.signal;
+        iwe.u.qual.level = network->stats.rssi;
+        iwe.u.qual.noise = network->stats.noise;
+        iwe.u.qual.updated = network->stats.mask & IEEE80211_STATMASK_WEMASK;
+        if (!(network->stats.mask & IEEE80211_STATMASK_RSSI))
+                iwe.u.qual.updated |= IW_QUAL_LEVEL_INVALID;
+        if (!(network->stats.mask & IEEE80211_STATMASK_NOISE))
+                iwe.u.qual.updated |= IW_QUAL_NOISE_INVALID;
+        if (!(network->stats.mask & IEEE80211_STATMASK_SIGNAL))
+                iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID;
+
+        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);
+
+        iwe.cmd = IWEVCUSTOM;
+        p = custom;
+
+        iwe.u.data.length = p - custom;
+        if (iwe.u.data.length)
+                start = iwe_stream_add_point(start, stop, &iwe, custom);
+
+        if (ieee->wpa_enabled && network->wpa_ie_len){
+                char buf[MAX_WPA_IE_LEN * 2 + 30];
+
+                u8 *p = buf;
+                p += sprintf(p, "wpa_ie=");
+                for (i = 0; i < network->wpa_ie_len; i++) {
+                        p += sprintf(p, "%02x", network->wpa_ie[i]);
+                }
+
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVCUSTOM;
+                iwe.u.data.length = strlen(buf);
+                start = iwe_stream_add_point(start, stop, &iwe, buf);
+        }
+
+        if (ieee->wpa_enabled && network->rsn_ie_len){
+                char buf[MAX_WPA_IE_LEN * 2 + 30];
+
+                u8 *p = buf;
+                p += sprintf(p, "rsn_ie=");
+                for (i = 0; i < network->rsn_ie_len; i++) {
+                        p += sprintf(p, "%02x", network->rsn_ie[i]);
+                }
+
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVCUSTOM;
+                iwe.u.data.length = strlen(buf);
+                start = iwe_stream_add_point(start, stop, &iwe, buf);
+        }
+
+        /* Add EXTRA: Age to display seconds since last beacon/probe response
+         * for given network. */
+        iwe.cmd = IWEVCUSTOM;
+        p = custom;
+        p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
+                      " Last beacon: %lums ago", (jiffies - network->last_scanned) / (HZ / 100));
+        iwe.u.data.length = p - custom;
+        if (iwe.u.data.length)
+                start = iwe_stream_add_point(start, stop, &iwe, custom);
+
+
+        return start;
+}
+
+int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra)
+{
+        struct ieee80211_network *network;
+        unsigned long flags;
+
+        char *ev = extra;
+        char *stop = ev + IW_SCAN_MAX_DATA;
+        int i = 0;
+
+        IEEE80211_DEBUG_WX("Getting scan\n");
+
+        spin_lock_irqsave(&ieee->lock, flags);
+
+        list_for_each_entry(network, &ieee->network_list, list) {
+                i++;
+                if (ieee->scan_age == 0 ||
+                    time_after(network->last_scanned + ieee->scan_age, jiffies))
+                        ev = ipw2100_translate_scan(ieee, ev, stop, network);
+                else
+                        IEEE80211_DEBUG_SCAN(
+                                "Not showing network '%s ("
+                                MAC_FMT ")' due to age (%lums).\n",
+                                escape_essid(network->ssid,
+                                             network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                (jiffies - network->last_scanned) / (HZ / 100));
+        }
+
+        spin_unlock_irqrestore(&ieee->lock, flags);
+
+        wrqu->data.length = ev -  extra;
+        wrqu->data.flags = 0;
+
+        IEEE80211_DEBUG_WX("exit: %d networks returned.\n", i);
+
+        return 0;
+}
+
+int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *keybuf)
+{
+        struct iw_point *erq = &(wrqu->encoding);
+        struct net_device *dev = ieee->dev;
+        struct ieee80211_security sec = {
+                .flags = 0
+        };
+        int i, key, key_provided, len;
+        struct ieee80211_crypt_data **crypt;
+
+        IEEE80211_DEBUG_WX("SET_ENCODE\n");
+
+        key = erq->flags & IW_ENCODE_INDEX;
+        if (key) {
+                if (key > WEP_KEYS)
+                        return -EINVAL;
+                key--;
+                key_provided = 1;
+        } else {
+                key_provided = 0;
+                key = ieee->tx_keyidx;
+        }
+
+        IEEE80211_DEBUG_WX("Key: %d [%s]\n", key, key_provided ?
+                           "provided" : "default");
+
+        crypt = &ieee->crypt[key];
+
+        if (erq->flags & IW_ENCODE_DISABLED) {
+                if (key_provided && *crypt) {
+                        IEEE80211_DEBUG_WX("Disabling encryption on key %d.\n",
+                                           key);
+                        ieee80211_crypt_delayed_deinit(ieee, crypt);
+                } else
+                        IEEE80211_DEBUG_WX("Disabling encryption.\n");
+
+                /* Check all the keys to see if any are still configured,
+                 * and if no key index was provided, de-init them all */
+                for (i = 0; i < WEP_KEYS; i++) {
+                        if (ieee->crypt[i] != NULL) {
+                                if (key_provided)
+                                        break;
+                                ieee80211_crypt_delayed_deinit(
+                                        ieee, &ieee->crypt[i]);
+                        }
+                }
+
+                if (i == WEP_KEYS) {
+                        sec.enabled = 0;
+                        sec.level = SEC_LEVEL_0;
+                        sec.flags |= SEC_ENABLED | SEC_LEVEL;
+                }
+
+                goto done;
+        }
+
+
+
+        sec.enabled = 1;
+        sec.flags |= SEC_ENABLED;
+
+        if (*crypt != NULL && (*crypt)->ops != NULL &&
+            strcmp((*crypt)->ops->name, "WEP") != 0) {
+                /* changing to use WEP; deinit previously used algorithm
+                 * on this key */
+                ieee80211_crypt_delayed_deinit(ieee, crypt);
+        }
+
+        if (*crypt == NULL) {
+                struct ieee80211_crypt_data *new_crypt;
+
+                /* take WEP into use */
+                new_crypt = kmalloc(sizeof(struct ieee80211_crypt_data),
+                                    GFP_KERNEL);
+                if (new_crypt == NULL)
+                        return -ENOMEM;
+                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+                new_crypt->ops = ieee80211_get_crypto_ops("WEP");
+                if (!new_crypt->ops) {
+                        request_module("ieee80211_crypt_wep");
+                        new_crypt->ops = ieee80211_get_crypto_ops("WEP");
+                }
+
+                if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
+                        new_crypt->priv = new_crypt->ops->init(key);
+
+                if (!new_crypt->ops || !new_crypt->priv) {
+                        kfree(new_crypt);
+                        new_crypt = NULL;
+
+                        printk(KERN_WARNING "%s: could not initialize WEP: "
+                               "load module ieee80211_crypt_wep\n",
+                               dev->name);
+                        return -EOPNOTSUPP;
+                }
+                *crypt = new_crypt;
+        }
+
+        /* If a new key was provided, set it up */
+        if (erq->length > 0) {
+                len = erq->length <= 5 ? 5 : 13;
+                memcpy(sec.keys[key], keybuf, erq->length);
+                if (len > erq->length)
+                        memset(sec.keys[key] + erq->length, 0,
+                               len - erq->length);
+                IEEE80211_DEBUG_WX("Setting key %d to '%s' (%d:%d bytes)\n",
+                                   key, escape_essid(sec.keys[key], len),
+                                   erq->length, len);
+                sec.key_sizes[key] = len;
+                (*crypt)->ops->set_key(sec.keys[key], len, NULL,
+                                       (*crypt)->priv);
+                sec.flags |= (1 << key);
+                /* This ensures a key will be activated if no key is
+                 * explicitely set */
+                if (key == sec.active_key)
+                        sec.flags |= SEC_ACTIVE_KEY;
+        } else {
+                len = (*crypt)->ops->get_key(sec.keys[key], WEP_KEY_LEN,
+                                             NULL, (*crypt)->priv);
+                if (len == 0) {
+                        /* Set a default key of all 0 */
+                        IEEE80211_DEBUG_WX("Setting key %d to all zero.\n",
+                                           key);
+                        memset(sec.keys[key], 0, 13);
+                        (*crypt)->ops->set_key(sec.keys[key], 13, NULL,
+                                               (*crypt)->priv);
+                        sec.key_sizes[key] = 13;
+                        sec.flags |= (1 << key);
+                }
+
+                /* No key data - just set the default TX key index */
+                if (key_provided) {
+                        IEEE80211_DEBUG_WX(
+                                "Setting key %d to default Tx key.\n", key);
+                        ieee->tx_keyidx = key;
+                        sec.active_key = key;
+                        sec.flags |= SEC_ACTIVE_KEY;
+                }
+        }
+
+ done:
+        ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED);
+        sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;
+        sec.flags |= SEC_AUTH_MODE;
+        IEEE80211_DEBUG_WX("Auth: %s\n", sec.auth_mode == WLAN_AUTH_OPEN ?
+                           "OPEN" : "SHARED KEY");
+
+        /* For now we just support WEP, so only set that security level...
+         * TODO: When WPA is added this is one place that needs to change */
+        sec.flags |= SEC_LEVEL;
+        sec.level = SEC_LEVEL_1; /* 40 and 104 bit WEP */
+
+        if (ieee->set_security)
+                ieee->set_security(dev, &sec);
+
+        /* Do not reset port if card is in Managed mode since resetting will
+         * generate new IEEE 802.11 authentication which may end up in looping
+         * with IEEE 802.1X.  If your hardware requires a reset after WEP
+         * configuration (for example... Prism2), implement the reset_port in
+         * the callbacks structures used to initialize the 802.11 stack. */
+        if (ieee->reset_on_keychange &&
+            ieee->iw_mode != IW_MODE_INFRA &&
+            ieee->reset_port && ieee->reset_port(dev)) {
+                printk(KERN_DEBUG "%s: reset_port failed\n", dev->name);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *keybuf)
+{
+        struct iw_point *erq = &(wrqu->encoding);
+        int len, key;
+        struct ieee80211_crypt_data *crypt;
+
+        IEEE80211_DEBUG_WX("GET_ENCODE\n");
+
+        key = erq->flags & IW_ENCODE_INDEX;
+        if (key) {
+                if (key > WEP_KEYS)
+                        return -EINVAL;
+                key--;
+        } else
+                key = ieee->tx_keyidx;
+
+        crypt = ieee->crypt[key];
+        erq->flags = key + 1;
+
+        if (crypt == NULL || crypt->ops == NULL) {
+                erq->length = 0;
+                erq->flags |= IW_ENCODE_DISABLED;
+                return 0;
+        }
+
+        if (strcmp(crypt->ops->name, "WEP") != 0) {
+                /* only WEP is supported with wireless extensions, so just
+                 * report that encryption is used */
+                erq->length = 0;
+                erq->flags |= IW_ENCODE_ENABLED;
+                return 0;
+        }
+
+        len = crypt->ops->get_key(keybuf, WEP_KEY_LEN, NULL, crypt->priv);
+        erq->length = (len >= 0 ? len : 0);
+
+        erq->flags |= IW_ENCODE_ENABLED;
+
+        if (ieee->open_wep)
+                erq->flags |= IW_ENCODE_OPEN;
+        else
+                erq->flags |= IW_ENCODE_RESTRICTED;
+
+        return 0;
+}
+
+EXPORT_SYMBOL(ieee80211_wx_get_scan);
+EXPORT_SYMBOL(ieee80211_wx_set_encode);
+EXPORT_SYMBOL(ieee80211_wx_get_encode);