Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (107 commits)
  smc911x: fix compilation breakage wjen debug is on
  [netdrvr] eexpress: minor corrections
  add NAPI support to sb1250-mac.c
  ixgb: ROUND_UP macro cleanup in drivers/net/ixgb
  e1000: ROUND_UP macro cleanup in drivers/net/e1000
  Generic HDLC sparse annotations
  e100: Optionally use I/O mode only to access register space
  e100: allow bad MAC address when running with invalid eeprom csum
  ehea: fix for dlpar support
  ehea: fix for sysfs entries
  3C509: Remove unnecessary include of <linux/pm_legacy.h>
  NetXen: Fix for vmalloc issues
  NetXen: Fixes for Power PC architecture
  NetXen: Port swap feature for multi port cards
  NetXen: Removal of redundant macros
  NetXen: Multi PCI support for Quad cards
  NetXen: Removal of redundant argument passing
  NetXen: Use multiple PCI functions
  [netdrvr e100] experiment with doing RX in a similar manner to eepro100
  [PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX
  ...

170 files changed, 29413 insertions, 6144 deletions

diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 0bb90237e230..b61dfc79e1b8 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -236,6 +236,12 @@ X!Ilib/string.c
 !Enet/core/dev.c
 !Enet/ethernet/eth.c
 !Iinclude/linux/etherdevice.h
+!Edrivers/net/phy/phy.c
+!Idrivers/net/phy/phy.c
+!Edrivers/net/phy/phy_device.c
+!Idrivers/net/phy/phy_device.c
+!Edrivers/net/phy/mdio_bus.c
+!Idrivers/net/phy/mdio_bus.c
 <!-- FIXME: Removed for now since no structured comments in source
 X!Enet/core/wireless.c
 -->
diff --git a/Documentation/networking/bcm43xx.txt b/Documentation/networking/bcm43xx.txt
index 28541d2bee1e..a136721499bf 100644
--- a/Documentation/networking/bcm43xx.txt
+++ b/Documentation/networking/bcm43xx.txt
@@ -2,35 +2,88 @@
                         BCM43xx Linux Driver Project
                         ============================
 
-About this software
--------------------
+Introduction
+------------
 
-The goal of this project is to develop a linux driver for Broadcom
-BCM43xx chips, based on the specification at 
-http://bcm-specs.sipsolutions.net/
+Many of the wireless devices found in modern notebook computers are
+based on the wireless chips produced by Broadcom. These devices have
+been a problem for Linux users as there is no open-source driver
+available. In addition, Broadcom has not released specifications
+for the device, and driver availability has been limited to the
+binary-only form used in the GPL versions of AP hardware such as the
+Linksys WRT54G, and the Windows and OS X drivers.  Before this project
+began, the only way to use these devices were to use the Windows or
+OS X drivers with either the Linuxant or ndiswrapper modules. There
+is a strong penalty if this method is used as loading the binary-only
+module "taints" the kernel, and no kernel developer will help diagnose
+any kernel problems.
 
-The project page is http://bcm43xx.berlios.de/
+Development
+-----------
 
+This driver has been developed using
+a clean-room technique that is described at
+http://bcm-specs.sipsolutions.net/ReverseEngineeringProcess. For legal
+reasons, none of the clean-room crew works on the on the Linux driver,
+and none of the Linux developers sees anything but the specifications,
+which are the ultimate product of the reverse-engineering group.
 
-Requirements
-------------
+Software
+--------
+
+Since the release of the 2.6.17 kernel, the bcm43xx driver has been
+distributed with the kernel source, and is prebuilt in most, if not
+all, distributions.  There is, however, additional software that is
+required. The firmware used by the chip is the intellectual property
+of Broadcom and they have not given the bcm43xx team redistribution
+rights to this firmware.  Since we cannot legally redistribute
+the firwmare we cannot include it with the driver. Furthermore, it
+cannot be placed in the downloadable archives of any distributing
+organization; therefore, the user is responsible for obtaining the
+firmware and placing it in the appropriate location so that the driver
+can find it when initializing.
+
+To help with this process, the bcm43xx developers provide a separate
+program named bcm43xx-fwcutter to "cut" the firmware out of a
+Windows or OS X driver and write the extracted files to the proper
+location. This program is usually provided with the distribution;
+however, it may be downloaded from
+
+http://developer.berlios.de/project/showfiles.php?group_id=4547
 
-1)      Linux Kernel 2.6.16 or later
-        http://www.kernel.org/
+The firmware is available in two versions. V3 firmware is used with
+the in-kernel bcm43xx driver that uses a software MAC layer called
+SoftMAC, and will have a microcode revision of 0x127 or smaller. The
+V4 firmware is used by an out-of-kernel driver employing a variation of
+the Devicescape MAC layer known as d80211. Once bcm43xx-d80211 reaches
+a satisfactory level of development, it will replace bcm43xx-softmac
+in the kernel as it is much more flexible and powerful.
 
-        You may want to configure your kernel with:
+A source for the latest V3 firmware is
 
-        CONFIG_DEBUG_FS (optional):
-                -> Kernel hacking
-                  -> Debug Filesystem
+http://downloads.openwrt.org/sources/wl_apsta-3.130.20.0.o
 
-2)      SoftMAC IEEE 802.11 Networking Stack extension and patched ieee80211
-        modules:
-        http://softmac.sipsolutions.net/
+Once this file is downloaded, the command
+'bcm43xx-fwcutter -w <dir> <filename>'
+will extract the microcode and write it to directory
+<dir>. The correct directory will depend on your distribution;
+however, most use '/lib/firmware'. Once this step is completed,
+the bcm3xx driver should load when the system is booted. To see
+any messages relating to the driver, issue the command 'dmesg |
+grep bcm43xx' from a terminal window. If there are any problems,
+please send that output to Bcm43xx-dev@lists.berlios.de.
 
-3)      Firmware Files
+Although the driver has been in-kernel since 2.6.17, the earliest
+version is quite limited in its capability. Patches that include
+all features of later versions are available for the stable kernel
+versions from 2.6.18. These will be needed if you use a BCM4318,
+or a PCI Express version (BCM4311 and BCM4312). In addition, if you
+have an early BCM4306 and more than 1 GB RAM, your kernel will need
+to be patched.  These patches, which are being updated regularly,
+are available at ftp://lwfinger.dynalias.org/patches. Look for
+combined_2.6.YY.patch. Of course you will need kernel source downloaded
+from kernel.org, or the source from your distribution.
 
-        Please try fwcutter. Fwcutter can extract the firmware from various 
-        binary driver files. It supports driver files from Windows, MacOS and 
-        Linux. You can get fwcutter from http://bcm43xx.berlios.de/.
-        Also, fwcutter comes with a README file for further instructions.
+If you build your own kernel, please enable CONFIG_BCM43XX_DEBUG
+and CONFIG_IEEE80211_SOFTMAC_DEBUG. The log information provided is
+essential for solving any problems.
diff --git a/MAINTAINERS b/MAINTAINERS
index 993e2a69440e..af1c7926c153 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1582,9 +1582,9 @@ S:	Supported
 
 HOST AP DRIVER
 P:      Jouni Malinen
-M:      jkmaline@cc.hut.fi
+M:      j@w1.fi
+L:      hostap@shmoo.com (subscribers-only)
 L:      linux-wireless@vger.kernel.org
-L:      hostap@shmoo.com
 W:      http://hostap.epitest.fi/
 S:      Maintained
 
@@ -1811,6 +1811,7 @@ P:	Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1825,6 +1826,7 @@ P:	Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1839,6 +1841,7 @@ P:	Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -2500,6 +2503,19 @@ M:	adaplas@gmail.com
 L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
+NETERION (S2IO) Xframe 10GbE DRIVER
+P:      Ramkrishna Vepa
+M:      ram.vepa@neterion.com
+P:      Rastapur Santosh
+M:      santosh.rastapur@neterion.com
+P:      Sivakumar Subramani
+M:      sivakumar.subramani@neterion.com
+P:      Sreenivasa Honnur
+M:      sreenivasa.honnur@neterion.com
+L:      netdev@vger.kernel.org
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
+S:      Supported
+
 OPENCORES I2C BUS DRIVER
 P:      Peter Korsgaard
 M:      jacmet@sunsite.dk
diff --git a/arch/mips/mips-boards/sim/Makefile b/arch/mips/mips-boards/sim/Makefile
index 6aeebc9122f2..dc0bfda11427 100644
--- a/arch/mips/mips-boards/sim/Makefile
+++ b/arch/mips/mips-boards/sim/Makefile
@@ -17,7 +17,8 @@
 # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
-obj-y := sim_setup.o sim_mem.o sim_time.o sim_int.o sim_cmdline.o
+obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o \
+         sim_cmdline.o
 
 obj-$(CONFIG_EARLY_PRINTK) += sim_console.o
 obj-$(CONFIG_SMP) += sim_smp.o
diff --git a/arch/mips/mips-boards/sim/sim_platform.c b/arch/mips/mips-boards/sim/sim_platform.c
new file mode 100644
index 000000000000..53210a8c5dec
--- /dev/null
+++ b/arch/mips/mips-boards/sim/sim_platform.c
@@ -0,0 +1,35 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 by Ralf Baechle (ralf@linux-mips.org)
+ */
+#include <linux/init.h>
+#include <linux/if_ether.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+
+static char mipsnet_string[] = "mipsnet";
+
+static struct platform_device eth1_device = {
+        .name           = mipsnet_string,
+        .id             = 0,
+};
+
+/*
+ * Create a platform device for the GPI port that receives the
+ * image data from the embedded camera.
+ */
+static int __init mipsnet_devinit(void)
+{
+        int err;
+
+        err = platform_device_register(&eth1_device);
+        if (err)
+                printk(KERN_ERR "%s: registration failed\n", mipsnet_string);
+
+        return err;
+}
+
+device_initcall(mipsnet_devinit);
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index a457ac1c6639..66137bf2dfb0 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -210,6 +210,9 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
         uf_regs = uccf->uf_regs;
         uccf->p_ucce = (u32 *) & (uf_regs->ucce);
         uccf->p_uccm = (u32 *) & (uf_regs->uccm);
+#ifdef CONFIG_UGETH_TX_ON_DEMAND
+        uccf->p_utodr = (u16 *) & (uf_regs->utodr);
+#endif
 #ifdef STATISTICS
         uccf->tx_frames = 0;
         uccf->rx_frames = 0;
diff --git a/crypto/michael_mic.c b/crypto/michael_mic.c
index 094397b48849..9e917b8011b1 100644
--- a/crypto/michael_mic.c
+++ b/crypto/michael_mic.c
@@ -3,7 +3,7 @@
  *
  * Michael MIC (IEEE 802.11i/TKIP) keyed digest
  *
- * Copyright (c) 2004 Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004 Jouni Malinen <j@w1.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
@@ -173,4 +173,4 @@ module_exit(michael_mic_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Michael MIC");
-MODULE_AUTHOR("Jouni Malinen <jkmaline@cc.hut.fi>");
+MODULE_AUTHOR("Jouni Malinen <j@w1.fi>");
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index c7511c4d3b68..9588da3a30e7 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -83,7 +83,6 @@ static int max_interrupt_work = 10;
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/skbuff.h>
 #include <linux/delay.h>        /* for udelay() */
 #include <linux/spinlock.h>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a3d46ea37126..545c405a5cb0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -486,8 +486,8 @@ config SGI_IOC3_ETH_HW_TX_CSUM
           enables offloading for checksums on transmit.  If unsure, say Y.
 
 config MIPS_SIM_NET
-        tristate "MIPS simulator Network device (EXPERIMENTAL)"
-        depends on MIPS_SIM && EXPERIMENTAL
+        tristate "MIPS simulator Network device"
+        depends on NET_ETHERNET && MIPS_SIM
         help
           The MIPSNET device is a simple Ethernet network device which is
           emulated by the MIPS Simulator.
@@ -1444,7 +1444,8 @@ config CS89x0
 
 config TC35815
         tristate "TOSHIBA TC35815 Ethernet support"
-        depends on NET_PCI && PCI && TOSHIBA_JMR3927
+        depends on NET_PCI && PCI && MIPS
+        select MII
 
 config DGRS
         tristate "Digi Intl. RightSwitch SE-X support"
@@ -2291,14 +2292,10 @@ config UGETH_FILTERING
         bool "Mac address filtering support"
         depends on UCC_GETH
 
-config UGETH_TX_ON_DEMOND
-        bool "Transmit on Demond support"
+config UGETH_TX_ON_DEMAND
+        bool "Transmit on Demand support"
         depends on UCC_GETH
 
-config UGETH_HAS_GIGA
-        bool
-        depends on UCC_GETH && PPC_MPC836x
-
 config MV643XX_ETH
         tristate "MV-643XX Ethernet support"
         depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 58527322a39d..59c0459a037c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -18,7 +18,7 @@ gianfar_driver-objs := gianfar.o \
                 gianfar_sysfs.o
 
 obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
-ucc_geth_driver-objs := ucc_geth.o ucc_geth_phy.o
+ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o
 
 #
 # link order important here
diff --git a/drivers/net/chelsio/Makefile b/drivers/net/chelsio/Makefile
index 382d23f810ab..743ad8b41b5e 100644
--- a/drivers/net/chelsio/Makefile
+++ b/drivers/net/chelsio/Makefile
@@ -4,8 +4,6 @@
 
 obj-$(CONFIG_CHELSIO_T1) += cxgb.o
 
-cxgb-$(CONFIG_CHELSIO_T1_1G) += ixf1010.o mac.o mv88e1xxx.o vsc7326.o vsc8244.o
+cxgb-$(CONFIG_CHELSIO_T1_1G) += mac.o mv88e1xxx.o vsc7326.o
 cxgb-objs := cxgb2.o espi.o tp.o pm3393.o sge.o subr.o \
              mv88x201x.o my3126.o $(cxgb-y)
-
-
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index 787f2f2820fe..8ba702c8b560 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -322,9 +322,9 @@ struct board_info {
         unsigned char           mdio_mdiinv;
         unsigned char           mdio_mdc;
         unsigned char           mdio_phybaseaddr;
-        struct gmac            *gmac;
-        struct gphy            *gphy;
-        struct mdio_ops        *mdio_ops;
+        const struct gmac      *gmac;
+        const struct gphy      *gphy;
+        const struct mdio_ops  *mdio_ops;
         const char             *desc;
 };
 
diff --git a/drivers/net/chelsio/cphy.h b/drivers/net/chelsio/cphy.h
index cf9143499882..79d855e267e0 100644
--- a/drivers/net/chelsio/cphy.h
+++ b/drivers/net/chelsio/cphy.h
@@ -100,7 +100,7 @@ struct cphy {
 
         u32 elmer_gpo;
 
-        struct cphy_ops *ops;                /* PHY operations */
+        const struct cphy_ops *ops;            /* PHY operations */
         int (*mdio_read)(adapter_t *adapter, int phy_addr, int mmd_addr,
                          int reg_addr, unsigned int *val);
         int (*mdio_write)(adapter_t *adapter, int phy_addr, int mmd_addr,
@@ -136,7 +136,7 @@ static inline int simple_mdio_write(struct cphy *cphy, int reg,
 /* Convenience initializer */
 static inline void cphy_init(struct cphy *phy, adapter_t *adapter,
                              int phy_addr, struct cphy_ops *phy_ops,
-                             struct mdio_ops *mdio_ops)
+                             const struct mdio_ops *mdio_ops)
 {
         phy->adapter = adapter;
         phy->addr    = phy_addr;
@@ -151,7 +151,7 @@ static inline void cphy_init(struct cphy *phy, adapter_t *adapter,
 struct gphy {
         /* Construct a PHY instance with the given PHY address */
         struct cphy *(*create)(adapter_t *adapter, int phy_addr,
-                               struct mdio_ops *mdio_ops);
+                               const struct mdio_ops *mdio_ops);
 
         /*
          * Reset the PHY chip.  This resets the whole PHY chip, not individual
@@ -160,11 +160,9 @@ struct gphy {
         int (*reset)(adapter_t *adapter);
 };
 
-extern struct gphy t1_my3126_ops;
-extern struct gphy t1_mv88e1xxx_ops;
-extern struct gphy t1_vsc8244_ops;
-extern struct gphy t1_xpak_ops;
-extern struct gphy t1_mv88x201x_ops;
-extern struct gphy t1_dummy_phy_ops;
+extern const struct gphy t1_my3126_ops;
+extern const struct gphy t1_mv88e1xxx_ops;
+extern const struct gphy t1_vsc8244_ops;
+extern const struct gphy t1_mv88x201x_ops;
 
 #endif /* _CXGB_CPHY_H_ */
diff --git a/drivers/net/chelsio/gmac.h b/drivers/net/chelsio/gmac.h
index 006a2eb2d362..d42337457cf7 100644
--- a/drivers/net/chelsio/gmac.h
+++ b/drivers/net/chelsio/gmac.h
@@ -126,7 +126,7 @@ typedef struct _cmac_instance cmac_instance;
 struct cmac {
         struct cmac_statistics stats;
         adapter_t *adapter;
-        struct cmac_ops *ops;
+        const struct cmac_ops *ops;
         cmac_instance *instance;
 };
 
@@ -136,11 +136,7 @@ struct gmac {
         int (*reset)(adapter_t *);
 };
 
-extern struct gmac t1_pm3393_ops;
-extern struct gmac t1_chelsio_mac_ops;
-extern struct gmac t1_vsc7321_ops;
-extern struct gmac t1_vsc7326_ops;
-extern struct gmac t1_ixf1010_ops;
-extern struct gmac t1_dummy_mac_ops;
+extern const struct gmac t1_pm3393_ops;
+extern const struct gmac t1_vsc7326_ops;
 
 #endif /* _CXGB_GMAC_H_ */
diff --git a/drivers/net/chelsio/ixf1010.c b/drivers/net/chelsio/ixf1010.c
deleted file mode 100644
index 10b2a9a19006..000000000000
--- a/drivers/net/chelsio/ixf1010.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/* $Date: 2005/11/12 02:13:49 $ $RCSfile: ixf1010.c,v $ $Revision: 1.36 $ */
-#include "gmac.h"
-#include "elmer0.h"
-
-/* Update fast changing statistics every 15 seconds */
-#define STATS_TICK_SECS 15
-/* 30 minutes for full statistics update */
-#define MAJOR_UPDATE_TICKS (1800 / STATS_TICK_SECS)
-
-/*
- * The IXF1010 can handle frames up to 16383 bytes but it's optimized for
- * frames up to 9831 (0x2667) bytes, so we limit jumbo frame size to this.
- * This length includes ethernet header and FCS.
- */
-#define MAX_FRAME_SIZE 0x2667
-
-/* MAC registers */
-enum {
-        /* Per-port registers */
-        REG_MACADDR_LOW = 0,
-        REG_MACADDR_HIGH = 0x4,
-        REG_FDFC_TYPE = 0xC,
-        REG_FC_TX_TIMER_VALUE = 0x1c,
-        REG_IPG_RX_TIME1 = 0x28,
-        REG_IPG_RX_TIME2 = 0x2c,
-        REG_IPG_TX_TIME = 0x30,
-        REG_PAUSE_THRES = 0x38,
-        REG_MAX_FRAME_SIZE = 0x3c,
-        REG_RGMII_SPEED = 0x40,
-        REG_FC_ENABLE = 0x48,
-        REG_DISCARD_CTRL_FRAMES = 0x54,
-        REG_DIVERSE_CONFIG = 0x60,
-        REG_RX_FILTER = 0x64,
-        REG_MC_ADDR_LOW = 0x68,
-        REG_MC_ADDR_HIGH = 0x6c,
-
-        REG_RX_OCTETS_OK = 0x80,
-        REG_RX_OCTETS_BAD = 0x84,
-        REG_RX_UC_PKTS = 0x88,
-        REG_RX_MC_PKTS = 0x8c,
-        REG_RX_BC_PKTS = 0x90,
-        REG_RX_FCS_ERR = 0xb0,
-        REG_RX_TAGGED = 0xb4,
-        REG_RX_DATA_ERR = 0xb8,
-        REG_RX_ALIGN_ERR = 0xbc,
-        REG_RX_LONG_ERR = 0xc0,
-        REG_RX_JABBER_ERR = 0xc4,
-        REG_RX_PAUSE_FRAMES = 0xc8,
-        REG_RX_UNKNOWN_CTRL_FRAMES = 0xcc,
-        REG_RX_VERY_LONG_ERR = 0xd0,
-        REG_RX_RUNT_ERR = 0xd4,
-        REG_RX_SHORT_ERR = 0xd8,
-        REG_RX_SYMBOL_ERR = 0xe4,
-
-        REG_TX_OCTETS_OK = 0x100,
-        REG_TX_OCTETS_BAD = 0x104,
-        REG_TX_UC_PKTS = 0x108,
-        REG_TX_MC_PKTS = 0x10c,
-        REG_TX_BC_PKTS = 0x110,
-        REG_TX_EXCESSIVE_LEN_DROP = 0x14c,
-        REG_TX_UNDERRUN = 0x150,
-        REG_TX_TAGGED = 0x154,
-        REG_TX_PAUSE_FRAMES = 0x15C,
-
-        /* Global registers */
-        REG_PORT_ENABLE = 0x1400,
-
-        REG_JTAG_ID = 0x1430,
-
-        RX_FIFO_HIGH_WATERMARK_BASE = 0x1600,
-        RX_FIFO_LOW_WATERMARK_BASE = 0x1628,
-        RX_FIFO_FRAMES_REMOVED_BASE = 0x1650,
-
-        REG_RX_ERR_DROP = 0x167c,
-        REG_RX_FIFO_OVERFLOW_EVENT = 0x1680,
-
-        TX_FIFO_HIGH_WATERMARK_BASE = 0x1800,
-        TX_FIFO_LOW_WATERMARK_BASE = 0x1828,
-        TX_FIFO_XFER_THRES_BASE = 0x1850,
-
-        REG_TX_FIFO_OVERFLOW_EVENT = 0x1878,
-        REG_TX_FIFO_OOS_EVENT = 0x1884,
-
-        TX_FIFO_FRAMES_REMOVED_BASE = 0x1888,
-
-        REG_SPI_RX_BURST = 0x1c00,
-        REG_SPI_RX_TRAINING = 0x1c04,
-        REG_SPI_RX_CALENDAR = 0x1c08,
-        REG_SPI_TX_SYNC = 0x1c0c
-};
-
-enum {                     /* RMON registers */
-        REG_RxOctetsTotalOK = 0x80,
-        REG_RxOctetsBad = 0x84,
-        REG_RxUCPkts = 0x88,
-        REG_RxMCPkts = 0x8c,
-        REG_RxBCPkts = 0x90,
-        REG_RxJumboPkts = 0xac,
-        REG_RxFCSErrors = 0xb0,
-        REG_RxDataErrors = 0xb8,
-        REG_RxAlignErrors = 0xbc,
-        REG_RxLongErrors = 0xc0,
-        REG_RxJabberErrors = 0xc4,
-        REG_RxPauseMacControlCounter = 0xc8,
-        REG_RxVeryLongErrors = 0xd0,
-        REG_RxRuntErrors = 0xd4,
-        REG_RxShortErrors = 0xd8,
-        REG_RxSequenceErrors = 0xe0,
-        REG_RxSymbolErrors = 0xe4,
-
-        REG_TxOctetsTotalOK = 0x100,
-        REG_TxOctetsBad = 0x104,
-        REG_TxUCPkts = 0x108,
-        REG_TxMCPkts = 0x10c,
-        REG_TxBCPkts = 0x110,
-        REG_TxJumboPkts = 0x12C,
-        REG_TxTotalCollisions = 0x134,
-        REG_TxExcessiveLengthDrop = 0x14c,
-        REG_TxUnderrun = 0x150,
-        REG_TxCRCErrors = 0x158,
-        REG_TxPauseFrames = 0x15c
-};
-
-enum {
-        DIVERSE_CONFIG_PAD_ENABLE = 0x80,
-        DIVERSE_CONFIG_CRC_ADD = 0x40
-};
-
-#define MACREG_BASE            0
-#define MACREG(mac, mac_reg)   ((mac)->instance->mac_base + (mac_reg))
-
-struct _cmac_instance {
-        u32 mac_base;
-        u32 index;
-        u32 version;
-        u32 ticks;
-};
-
-static void disable_port(struct cmac *mac)
-{
-        u32 val;
-
-        t1_tpi_read(mac->adapter, REG_PORT_ENABLE, &val);
-        val &= ~(1 << mac->instance->index);
-        t1_tpi_write(mac->adapter, REG_PORT_ENABLE, val);
-}
-
-/*
- * Read the current values of the RMON counters and add them to the cumulative
- * port statistics.  The HW RMON counters are cleared by this operation.
- */
-static void port_stats_update(struct cmac *mac)
-{
-        static struct {
-                unsigned int reg;
-                unsigned int offset;
-        } hw_stats[] = {
-
-#define HW_STAT(name, stat_name) \
-        { REG_##name, \
-          (&((struct cmac_statistics *)NULL)->stat_name) - (u64 *)NULL }
-
-                /* Rx stats */
-                HW_STAT(RxOctetsTotalOK, RxOctetsOK),
-                HW_STAT(RxOctetsBad, RxOctetsBad),
-                HW_STAT(RxUCPkts, RxUnicastFramesOK),
-                HW_STAT(RxMCPkts, RxMulticastFramesOK),
-                HW_STAT(RxBCPkts, RxBroadcastFramesOK),
-                HW_STAT(RxJumboPkts, RxJumboFramesOK),
-                HW_STAT(RxFCSErrors, RxFCSErrors),
-                HW_STAT(RxAlignErrors, RxAlignErrors),
-                HW_STAT(RxLongErrors, RxFrameTooLongErrors),
-                HW_STAT(RxVeryLongErrors, RxFrameTooLongErrors),
-                HW_STAT(RxPauseMacControlCounter, RxPauseFrames),
-                HW_STAT(RxDataErrors, RxDataErrors),
-                HW_STAT(RxJabberErrors, RxJabberErrors),
-                HW_STAT(RxRuntErrors, RxRuntErrors),
-                HW_STAT(RxShortErrors, RxRuntErrors),
-                HW_STAT(RxSequenceErrors, RxSequenceErrors),
-                HW_STAT(RxSymbolErrors, RxSymbolErrors),
-
-                /* Tx stats (skip collision stats as we are full-duplex only) */
-                HW_STAT(TxOctetsTotalOK, TxOctetsOK),
-                HW_STAT(TxOctetsBad, TxOctetsBad),
-                HW_STAT(TxUCPkts, TxUnicastFramesOK),
-                HW_STAT(TxMCPkts, TxMulticastFramesOK),
-                HW_STAT(TxBCPkts, TxBroadcastFramesOK),
-                HW_STAT(TxJumboPkts, TxJumboFramesOK),
-                HW_STAT(TxPauseFrames, TxPauseFrames),
-                HW_STAT(TxExcessiveLengthDrop, TxLengthErrors),
-                HW_STAT(TxUnderrun, TxUnderrun),
-                HW_STAT(TxCRCErrors, TxFCSErrors)
-        }, *p = hw_stats;
-        u64 *stats = (u64 *) &mac->stats;
-        unsigned int i;
-
-        for (i = 0; i < ARRAY_SIZE(hw_stats); i++) {
-                u32 val;
-
-                t1_tpi_read(mac->adapter, MACREG(mac, p->reg), &val);
-                stats[p->offset] += val;
-        }
-}
-
-/* No-op interrupt operation as this MAC does not support interrupts */
-static int mac_intr_op(struct cmac *mac)
-{
-        return 0;
-}
-
-/* Expect MAC address to be in network byte order. */
-static int mac_set_address(struct cmac *mac, u8 addr[6])
-{
-        u32 addr_lo, addr_hi;
-
-        addr_lo = addr[2];
-        addr_lo = (addr_lo << 8) | addr[3];
-        addr_lo = (addr_lo << 8) | addr[4];
-        addr_lo = (addr_lo << 8) | addr[5];
-
-        addr_hi = addr[0];
-        addr_hi = (addr_hi << 8) | addr[1];
-
-        t1_tpi_write(mac->adapter, MACREG(mac, REG_MACADDR_LOW), addr_lo);
-        t1_tpi_write(mac->adapter, MACREG(mac, REG_MACADDR_HIGH), addr_hi);
-        return 0;
-}
-
-static int mac_get_address(struct cmac *mac, u8 addr[6])
-{
-        u32 addr_lo, addr_hi;
-
-        t1_tpi_read(mac->adapter, MACREG(mac, REG_MACADDR_LOW), &addr_lo);
-        t1_tpi_read(mac->adapter, MACREG(mac, REG_MACADDR_HIGH), &addr_hi);
-
-        addr[0] = (u8) (addr_hi >> 8);
-        addr[1] = (u8) addr_hi;
-        addr[2] = (u8) (addr_lo >> 24);
-        addr[3] = (u8) (addr_lo >> 16);
-        addr[4] = (u8) (addr_lo >> 8);
-        addr[5] = (u8) addr_lo;
-        return 0;
-}
-
-/* This is intended to reset a port, not the whole MAC */
-static int mac_reset(struct cmac *mac)
-{
-        return 0;
-}
-
-static int mac_set_rx_mode(struct cmac *mac, struct t1_rx_mode *rm)
-{
-        u32 val, new_mode;
-        adapter_t *adapter = mac->adapter;
-        u32 addr_lo, addr_hi;
-        u8 *addr;
-
-        t1_tpi_read(adapter, MACREG(mac, REG_RX_FILTER), &val);
-        new_mode = val & ~7;
-        if (!t1_rx_mode_promisc(rm) && mac->instance->version > 0)
-                new_mode |= 1;     /* only set if version > 0 due to erratum */
-        if (!t1_rx_mode_promisc(rm) && !t1_rx_mode_allmulti(rm)
-             && t1_rx_mode_mc_cnt(rm) <= 1)
-                new_mode |= 2;
-        if (new_mode != val)
-                t1_tpi_write(adapter, MACREG(mac, REG_RX_FILTER), new_mode);
-        switch (t1_rx_mode_mc_cnt(rm)) {
-        case 0:
-                t1_tpi_write(adapter, MACREG(mac, REG_MC_ADDR_LOW), 0);
-                t1_tpi_write(adapter, MACREG(mac, REG_MC_ADDR_HIGH), 0);
-                break;
-        case 1:
-                addr = t1_get_next_mcaddr(rm);
-                addr_lo = (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |
-                        addr[5];
-                addr_hi = (addr[0] << 8) | addr[1];
-                t1_tpi_write(adapter, MACREG(mac, REG_MC_ADDR_LOW), addr_lo);
-                t1_tpi_write(adapter, MACREG(mac, REG_MC_ADDR_HIGH), addr_hi);
-                break;
-        default:
-                break;
-        }
-        return 0;
-}
-
-static int mac_set_mtu(struct cmac *mac, int mtu)
-{
-        /* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */
-        if (mtu > (MAX_FRAME_SIZE - 14 - 4))
-                return -EINVAL;
-        t1_tpi_write(mac->adapter, MACREG(mac, REG_MAX_FRAME_SIZE),
-                     mtu + 14 + 4);
-        return 0;
-}
-
-static int mac_set_speed_duplex_fc(struct cmac *mac, int speed, int duplex,
-                                   int fc)
-{
-        u32 val;
-
-        if (speed >= 0 && speed != SPEED_100 && speed != SPEED_1000)
-                return -1;
-        if (duplex >= 0 && duplex != DUPLEX_FULL)
-                return -1;
-
-        if (speed >= 0) {
-                val = speed == SPEED_100 ? 1 : 2;
-                t1_tpi_write(mac->adapter, MACREG(mac, REG_RGMII_SPEED), val);
-        }
-
-        t1_tpi_read(mac->adapter, MACREG(mac, REG_FC_ENABLE), &val);
-        val &= ~3;
-        if (fc & PAUSE_RX)
-                val |= 1;
-        if (fc & PAUSE_TX)
-                val |= 2;
-        t1_tpi_write(mac->adapter, MACREG(mac, REG_FC_ENABLE), val);
-        return 0;
-}
-
-static int mac_get_speed_duplex_fc(struct cmac *mac, int *speed, int *duplex,
-                                   int *fc)
-{
-        u32 val;
-
-        if (duplex)
-                *duplex = DUPLEX_FULL;
-        if (speed) {
-                t1_tpi_read(mac->adapter, MACREG(mac, REG_RGMII_SPEED),
-                         &val);
-                *speed = (val & 2) ? SPEED_1000 : SPEED_100;
-        }
-        if (fc) {
-                t1_tpi_read(mac->adapter, MACREG(mac, REG_FC_ENABLE), &val);
-                *fc = 0;
-                if (val & 1)
-                        *fc |= PAUSE_RX;
-                if (val & 2)
-                        *fc |= PAUSE_TX;
-        }
-        return 0;
-}
-
-static void enable_port(struct cmac *mac)
-{
-        u32 val;
-        u32 index = mac->instance->index;
-        adapter_t *adapter = mac->adapter;
-
-        t1_tpi_read(adapter, MACREG(mac, REG_DIVERSE_CONFIG), &val);
-        val |= DIVERSE_CONFIG_CRC_ADD | DIVERSE_CONFIG_PAD_ENABLE;
-        t1_tpi_write(adapter, MACREG(mac, REG_DIVERSE_CONFIG), val);
-        if (mac->instance->version > 0)
-                t1_tpi_write(adapter, MACREG(mac, REG_RX_FILTER), 3);
-        else /* Don't enable unicast address filtering due to IXF1010 bug */
-                t1_tpi_write(adapter, MACREG(mac, REG_RX_FILTER), 2);
-
-        t1_tpi_read(adapter, REG_RX_ERR_DROP, &val);
-        val |= (1 << index);
-        t1_tpi_write(adapter, REG_RX_ERR_DROP, val);
-
-        /*
-         * Clear the port RMON registers by adding their current values to the
-         * cumulatice port stats and then clearing the stats.  Really.
-         */
-        port_stats_update(mac);
-        memset(&mac->stats, 0, sizeof(struct cmac_statistics));
-        mac->instance->ticks = 0;
-
-        t1_tpi_read(adapter, REG_PORT_ENABLE, &val);
-        val |= (1 << index);
-        t1_tpi_write(adapter, REG_PORT_ENABLE, val);
-
-        index <<= 2;
-        if (is_T2(adapter)) {
-                /* T204: set the Fifo water level & threshold */
-                t1_tpi_write(adapter, RX_FIFO_HIGH_WATERMARK_BASE + index, 0x740);
-                t1_tpi_write(adapter, RX_FIFO_LOW_WATERMARK_BASE + index, 0x730);
-                t1_tpi_write(adapter, TX_FIFO_HIGH_WATERMARK_BASE + index, 0x600);
-                t1_tpi_write(adapter, TX_FIFO_LOW_WATERMARK_BASE + index, 0x1d0);
-                t1_tpi_write(adapter, TX_FIFO_XFER_THRES_BASE + index, 0x1100);
-        } else {
-        /*
-         * Set the TX Fifo Threshold to 0x400 instead of 0x100 to work around
-         * Underrun problem. Intel has blessed this solution.
-         */
-                t1_tpi_write(adapter, TX_FIFO_XFER_THRES_BASE + index, 0x400);
-        }
-}
-
-/* IXF1010 ports do not have separate enables for TX and RX */
-static int mac_enable(struct cmac *mac, int which)
-{
-        if (which & (MAC_DIRECTION_RX | MAC_DIRECTION_TX))
-                enable_port(mac);
-        return 0;
-}
-
-static int mac_disable(struct cmac *mac, int which)
-{
-        if (which & (MAC_DIRECTION_RX | MAC_DIRECTION_TX))
-                disable_port(mac);
-        return 0;
-}
-
-#define RMON_UPDATE(mac, name, stat_name) \
-        t1_tpi_read((mac)->adapter, MACREG(mac, REG_##name), &val); \
-        (mac)->stats.stat_name += val;
-
-/*
- * This function is called periodically to accumulate the current values of the
- * RMON counters into the port statistics.  Since the counters are only 32 bits
- * some of them can overflow in less than a minute at GigE speeds, so this
- * function should be called every 30 seconds or so.
- *
- * To cut down on reading costs we update only the octet counters at each tick
- * and do a full update at major ticks, which can be every 30 minutes or more.
- */
-static const struct cmac_statistics *mac_update_statistics(struct cmac *mac,
-                                                           int flag)
-{
-        if (flag == MAC_STATS_UPDATE_FULL ||
-            MAJOR_UPDATE_TICKS <= mac->instance->ticks) {
-                port_stats_update(mac);
-                mac->instance->ticks = 0;
-        } else {
-                u32 val;
-
-                RMON_UPDATE(mac, RxOctetsTotalOK, RxOctetsOK);
-                RMON_UPDATE(mac, TxOctetsTotalOK, TxOctetsOK);
-                mac->instance->ticks++;
-        }
-        return &mac->stats;
-}
-
-static void mac_destroy(struct cmac *mac)
-{
-        kfree(mac);
-}
-
-static struct cmac_ops ixf1010_ops = {
-        .destroy                  = mac_destroy,
-        .reset                    = mac_reset,
-        .interrupt_enable         = mac_intr_op,
-        .interrupt_disable        = mac_intr_op,
-        .interrupt_clear          = mac_intr_op,
-        .enable                   = mac_enable,
-        .disable                  = mac_disable,
-        .set_mtu                  = mac_set_mtu,
-        .set_rx_mode              = mac_set_rx_mode,
-        .set_speed_duplex_fc      = mac_set_speed_duplex_fc,
-        .get_speed_duplex_fc      = mac_get_speed_duplex_fc,
-        .statistics_update        = mac_update_statistics,
-        .macaddress_get           = mac_get_address,
-        .macaddress_set           = mac_set_address,
-};
-
-static int ixf1010_mac_reset(adapter_t *adapter)
-{
-        u32 val;
-
-        t1_tpi_read(adapter, A_ELMER0_GPO, &val);
-        if ((val & 1) != 0) {
-                val &= ~1;
-                t1_tpi_write(adapter, A_ELMER0_GPO, val);
-                udelay(2);
-        }
-        val |= 1;
-        t1_tpi_write(adapter, A_ELMER0_GPO, val);
-        udelay(2);
-
-        t1_tpi_write(adapter, REG_PORT_ENABLE, 0);
-        return 0;
-}
-
-static struct cmac *ixf1010_mac_create(adapter_t *adapter, int index)
-{
-        struct cmac *mac;
-        u32 val;
-
-        if (index > 9)
-                return NULL;
-
-        mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL);
-        if (!mac)
-                return NULL;
-
-        mac->ops = &ixf1010_ops;
-        mac->instance = (cmac_instance *)(mac + 1);
-
-        mac->instance->mac_base = MACREG_BASE + (index * 0x200);
-        mac->instance->index    = index;
-        mac->adapter  = adapter;
-        mac->instance->ticks    = 0;
-
-        t1_tpi_read(adapter, REG_JTAG_ID, &val);
-        mac->instance->version = val >> 28;
-        return mac;
-}
-
-struct gmac t1_ixf1010_ops = {
-        STATS_TICK_SECS,
-        ixf1010_mac_create,
-        ixf1010_mac_reset
-};
diff --git a/drivers/net/chelsio/mac.c b/drivers/net/chelsio/mac.c
index 6af39dc70459..1d972825eac3 100644
--- a/drivers/net/chelsio/mac.c
+++ b/drivers/net/chelsio/mac.c
@@ -363,6 +363,6 @@ static struct cmac *mac_create(adapter_t *adapter, int index)
         return mac;
 }
 
-struct gmac t1_chelsio_mac_ops = {
+const struct gmac t1_chelsio_mac_ops = {
         .create = mac_create
 };
diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/chelsio/mv88e1xxx.c
index 5867e3b0a887..0632be0d6494 100644
--- a/drivers/net/chelsio/mv88e1xxx.c
+++ b/drivers/net/chelsio/mv88e1xxx.c
@@ -354,7 +354,7 @@ static struct cphy_ops mv88e1xxx_ops = {
 };
 
 static struct cphy *mv88e1xxx_phy_create(adapter_t *adapter, int phy_addr,
-                                         struct mdio_ops *mdio_ops)
+                                         const struct mdio_ops *mdio_ops)
 {
         struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);
 
@@ -390,7 +390,7 @@ static int mv88e1xxx_phy_reset(adapter_t* adapter)
         return 0;
 }
 
-struct gphy t1_mv88e1xxx_ops = {
-        mv88e1xxx_phy_create,
-        mv88e1xxx_phy_reset
+const struct gphy t1_mv88e1xxx_ops = {
+        .create = mv88e1xxx_phy_create,
+        .reset =  mv88e1xxx_phy_reset
 };
diff --git a/drivers/net/chelsio/mv88x201x.c b/drivers/net/chelsio/mv88x201x.c
index c8e89480d906..cd856041af34 100644
--- a/drivers/net/chelsio/mv88x201x.c
+++ b/drivers/net/chelsio/mv88x201x.c
@@ -208,7 +208,7 @@ static struct cphy_ops mv88x201x_ops = {
 };
 
 static struct cphy *mv88x201x_phy_create(adapter_t *adapter, int phy_addr,
-                                         struct mdio_ops *mdio_ops)
+                                         const struct mdio_ops *mdio_ops)
 {
         u32 val;
         struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);
@@ -252,7 +252,7 @@ static int mv88x201x_phy_reset(adapter_t *adapter)
         return 0;
 }
 
-struct gphy t1_mv88x201x_ops = {
-        mv88x201x_phy_create,
-        mv88x201x_phy_reset
+const struct gphy t1_mv88x201x_ops = {
+        .create = mv88x201x_phy_create,
+        .reset = mv88x201x_phy_reset
 };
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/chelsio/my3126.c
index 87dde3e60046..040acd29995a 100644
--- a/drivers/net/chelsio/my3126.c
+++ b/drivers/net/chelsio/my3126.c
@@ -166,7 +166,7 @@ static struct cphy_ops my3126_ops = {
 };
 
 static struct cphy *my3126_phy_create(adapter_t *adapter,
-                        int phy_addr, struct mdio_ops *mdio_ops)
+                        int phy_addr, const struct mdio_ops *mdio_ops)
 {
         struct cphy *cphy = kzalloc(sizeof (*cphy), GFP_KERNEL);
 
@@ -201,7 +201,7 @@ static int my3126_phy_reset(adapter_t * adapter)
         return 0;
 }
 
-struct gphy t1_my3126_ops = {
-        my3126_phy_create,
-        my3126_phy_reset
+const struct gphy t1_my3126_ops = {
+        .create = my3126_phy_create,
+        .reset = my3126_phy_reset
 };
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
index 69129edeefd6..678778a8d133 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/chelsio/pm3393.c
@@ -807,8 +807,8 @@ static int pm3393_mac_reset(adapter_t * adapter)
         return successful_reset ? 0 : 1;
 }
 
-struct gmac t1_pm3393_ops = {
-        STATS_TICK_SECS,
-        pm3393_mac_create,
-        pm3393_mac_reset
+const struct gmac t1_pm3393_ops = {
+        .stats_update_period = STATS_TICK_SECS,
+        .create              = pm3393_mac_create,
+        .reset               = pm3393_mac_reset,
 };
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c
index c2522cdfab37..7de9a611e1f7 100644
--- a/drivers/net/chelsio/subr.c
+++ b/drivers/net/chelsio/subr.c
@@ -321,10 +321,10 @@ static int mi1_mdio_write(adapter_t *adapter, int phy_addr, int mmd_addr,
 }
 
 #if defined(CONFIG_CHELSIO_T1_1G) || defined(CONFIG_CHELSIO_T1_COUGAR)
-static struct mdio_ops mi1_mdio_ops = {
-        mi1_mdio_init,
-        mi1_mdio_read,
-        mi1_mdio_write
+static const struct mdio_ops mi1_mdio_ops = {
+        .init = mi1_mdio_init,
+        .read = mi1_mdio_read,
+        .write = mi1_mdio_write
 };
 #endif
 
@@ -377,10 +377,10 @@ static int mi1_mdio_ext_write(adapter_t *adapter, int phy_addr, int mmd_addr,
         return 0;
 }
 
-static struct mdio_ops mi1_mdio_ext_ops = {
-        mi1_mdio_init,
-        mi1_mdio_ext_read,
-        mi1_mdio_ext_write
+static const struct mdio_ops mi1_mdio_ext_ops = {
+        .init = mi1_mdio_init,
+        .read = mi1_mdio_ext_read,
+        .write = mi1_mdio_ext_write
 };
 
 enum {
@@ -392,63 +392,136 @@ enum {
         CH_BRD_N204_4CU,
 };
 
-static struct board_info t1_board[] = {
-
-{ CHBT_BOARD_CHT110, 1/*ports#*/,
-  SUPPORTED_10000baseT_Full /*caps*/, CHBT_TERM_T1,
-  CHBT_MAC_PM3393, CHBT_PHY_MY3126,
-  125000000/*clk-core*/, 150000000/*clk-mc3*/, 125000000/*clk-mc4*/,
-  1/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 1/*mdien*/,
-  1/*mdiinv*/, 1/*mdc*/, 1/*phybaseaddr*/, &t1_pm3393_ops,
-  &t1_my3126_ops, &mi1_mdio_ext_ops,
-  "Chelsio T110 1x10GBase-CX4 TOE" },
-
-{ CHBT_BOARD_N110, 1/*ports#*/,
-  SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE /*caps*/, CHBT_TERM_T1,
-  CHBT_MAC_PM3393, CHBT_PHY_88X2010,
-  125000000/*clk-core*/, 0/*clk-mc3*/, 0/*clk-mc4*/,
-  1/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 0/*mdien*/,
-  0/*mdiinv*/, 1/*mdc*/, 0/*phybaseaddr*/, &t1_pm3393_ops,
-  &t1_mv88x201x_ops, &mi1_mdio_ext_ops,
-  "Chelsio N110 1x10GBaseX NIC" },
-
-{ CHBT_BOARD_N210, 1/*ports#*/,
-  SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE /*caps*/, CHBT_TERM_T2,
-  CHBT_MAC_PM3393, CHBT_PHY_88X2010,
-  125000000/*clk-core*/, 0/*clk-mc3*/, 0/*clk-mc4*/,
-  1/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 0/*mdien*/,
-  0/*mdiinv*/, 1/*mdc*/, 0/*phybaseaddr*/, &t1_pm3393_ops,
-  &t1_mv88x201x_ops, &mi1_mdio_ext_ops,
-  "Chelsio N210 1x10GBaseX NIC" },
-
-{ CHBT_BOARD_CHT210, 1/*ports#*/,
-  SUPPORTED_10000baseT_Full /*caps*/, CHBT_TERM_T2,
-  CHBT_MAC_PM3393, CHBT_PHY_88X2010,
-  125000000/*clk-core*/, 133000000/*clk-mc3*/, 125000000/*clk-mc4*/,
-  1/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 0/*mdien*/,
-  0/*mdiinv*/, 1/*mdc*/, 0/*phybaseaddr*/, &t1_pm3393_ops,
-  &t1_mv88x201x_ops, &mi1_mdio_ext_ops,
-  "Chelsio T210 1x10GBaseX TOE" },
-
-{ CHBT_BOARD_CHT210, 1/*ports#*/,
-  SUPPORTED_10000baseT_Full /*caps*/, CHBT_TERM_T2,
-  CHBT_MAC_PM3393, CHBT_PHY_MY3126,
-  125000000/*clk-core*/, 133000000/*clk-mc3*/, 125000000/*clk-mc4*/,
-  1/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 1/*mdien*/,
-  1/*mdiinv*/, 1/*mdc*/, 1/*phybaseaddr*/, &t1_pm3393_ops,
-  &t1_my3126_ops, &mi1_mdio_ext_ops,
-  "Chelsio T210 1x10GBase-CX4 TOE" },
+static const struct board_info t1_board[] = {
+        {
+                .board          = CHBT_BOARD_CHT110,
+                .port_number    = 1,
+                .caps           = SUPPORTED_10000baseT_Full,
+                .chip_term      = CHBT_TERM_T1,
+                .chip_mac       = CHBT_MAC_PM3393,
+                .chip_phy       = CHBT_PHY_MY3126,
+                .clock_core     = 125000000,
+                .clock_mc3      = 150000000,
+                .clock_mc4      = 125000000,
+                .espi_nports    = 1,
+                .clock_elmer0   = 44,
+                .mdio_mdien     = 1,
+                .mdio_mdiinv    = 1,
+                .mdio_mdc       = 1,
+                .mdio_phybaseaddr = 1,
+                .gmac           = &t1_pm3393_ops,
+                .gphy           = &t1_my3126_ops,
+                .mdio_ops       = &mi1_mdio_ext_ops,
+                .desc           = "Chelsio T110 1x10GBase-CX4 TOE",
+        },
+
+        {
+                .board          = CHBT_BOARD_N110,
+                .port_number    = 1,
+                .caps           = SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE,
+                .chip_term      = CHBT_TERM_T1,
+                .chip_mac       = CHBT_MAC_PM3393,
+                .chip_phy       = CHBT_PHY_88X2010,
+                .clock_core     = 125000000,
+                .espi_nports    = 1,
+                .clock_elmer0   = 44,
+                .mdio_mdien     = 0,
+                .mdio_mdiinv    = 0,
+                .mdio_mdc       = 1,
+                .mdio_phybaseaddr = 0,
+                .gmac           = &t1_pm3393_ops,
+                .gphy           = &t1_mv88x201x_ops,
+                .mdio_ops       = &mi1_mdio_ext_ops,
+                .desc           = "Chelsio N110 1x10GBaseX NIC",
+        },
+
+        {
+                .board          = CHBT_BOARD_N210,
+                .port_number    = 1,
+                .caps           = SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE,
+                .chip_term      = CHBT_TERM_T2,
+                .chip_mac       = CHBT_MAC_PM3393,
+                .chip_phy       = CHBT_PHY_88X2010,
+                .clock_core     = 125000000,
+                .espi_nports    = 1,
+                .clock_elmer0   = 44,
+                .mdio_mdien     = 0,
+                .mdio_mdiinv    = 0,
+                .mdio_mdc       = 1,
+                .mdio_phybaseaddr = 0,
+                .gmac           = &t1_pm3393_ops,
+                .gphy           = &t1_mv88x201x_ops,
+                .mdio_ops       = &mi1_mdio_ext_ops,
+                .desc           = "Chelsio N210 1x10GBaseX NIC",
+        },
+
+        {
+                .board          = CHBT_BOARD_CHT210,
+                .port_number    = 1,
+                .caps           = SUPPORTED_10000baseT_Full,
+                .chip_term      = CHBT_TERM_T2,
+                .chip_mac       = CHBT_MAC_PM3393,
+                .chip_phy       = CHBT_PHY_88X2010,
+                .clock_core     = 125000000,
+                .clock_mc3      = 133000000,
+                .clock_mc4      = 125000000,
+                .espi_nports    = 1,
+                .clock_elmer0   = 44,
+                .mdio_mdien     = 0,
+                .mdio_mdiinv    = 0,
+                .mdio_mdc       = 1,
+                .mdio_phybaseaddr = 0,
+                .gmac           = &t1_pm3393_ops,
+                .gphy           = &t1_mv88x201x_ops,
+                .mdio_ops       = &mi1_mdio_ext_ops,
+                .desc           = "Chelsio T210 1x10GBaseX TOE",
+        },
+
+        {
+                .board          = CHBT_BOARD_CHT210,
+                .port_number    = 1,
+                .caps           = SUPPORTED_10000baseT_Full,
+                .chip_term      = CHBT_TERM_T2,
+                .chip_mac       = CHBT_MAC_PM3393,
+                .chip_phy       = CHBT_PHY_MY3126,
+                .clock_core     = 125000000,
+                .clock_mc3      = 133000000,
+                .clock_mc4      = 125000000,
+                .espi_nports    = 1,
+                .clock_elmer0   = 44,
+                .mdio_mdien     = 1,
+                .mdio_mdiinv    = 1,
+                .mdio_mdc       = 1,
+                .mdio_phybaseaddr = 1,
+                .gmac           = &t1_pm3393_ops,
+                .gphy           = &t1_my3126_ops,
+                .mdio_ops       = &mi1_mdio_ext_ops,
+                .desc           = "Chelsio T210 1x10GBase-CX4 TOE",
+        },
 
 #ifdef CONFIG_CHELSIO_T1_1G
-{ CHBT_BOARD_CHN204, 4/*ports#*/,
-  SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half |
-  SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |
-  SUPPORTED_PAUSE | SUPPORTED_TP /*caps*/, CHBT_TERM_T2, CHBT_MAC_VSC7321, CHBT_PHY_88E1111,
-  100000000/*clk-core*/, 0/*clk-mc3*/, 0/*clk-mc4*/,
-  4/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 0/*mdien*/,
-  0/*mdiinv*/, 1/*mdc*/, 4/*phybaseaddr*/, &t1_vsc7326_ops,
-  &t1_mv88e1xxx_ops, &mi1_mdio_ops,
-  "Chelsio N204 4x100/1000BaseT NIC" },
+        {
+                .board          = CHBT_BOARD_CHN204,
+                .port_number    = 4,
+                .caps           = SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full
+                                | SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full
+                                | SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |
+                                  SUPPORTED_PAUSE | SUPPORTED_TP,
+                .chip_term      = CHBT_TERM_T2,
+                .chip_mac       = CHBT_MAC_VSC7321,
+                .chip_phy       = CHBT_PHY_88E1111,
+                .clock_core     = 100000000,
+                .espi_nports    = 4,
+                .clock_elmer0   = 44,
+                .mdio_mdien     = 0,
+                .mdio_mdiinv    = 0,
+                .mdio_mdc       = 0,
+                .mdio_phybaseaddr = 4,
+                .gmac           = &t1_vsc7326_ops,
+                .gphy           = &t1_mv88e1xxx_ops,
+                .mdio_ops       = &mi1_mdio_ops,
+                .desc           = "Chelsio N204 4x100/1000BaseT NIC",
+        },
 #endif
 
 };
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/chelsio/vsc7326.c
index 534ffa0f616e..99b51f61fe77 100644
--- a/drivers/net/chelsio/vsc7326.c
+++ b/drivers/net/chelsio/vsc7326.c
@@ -723,7 +723,7 @@ static int vsc7326_mac_reset(adapter_t *adapter)
         return 0;
 }
 
-struct gmac t1_vsc7326_ops = {
+const struct gmac t1_vsc7326_ops = {
         .stats_update_period = STATS_TICK_SECS,
         .create              = vsc7326_mac_create,
         .reset               = vsc7326_mac_reset,
diff --git a/drivers/net/chelsio/vsc8244.c b/drivers/net/chelsio/vsc8244.c
deleted file mode 100644
index 251d4859c91d..000000000000
--- a/drivers/net/chelsio/vsc8244.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * This file is part of the Chelsio T2 Ethernet driver.
- *
- * Copyright (C) 2005 Chelsio Communications.  All rights reserved.
- *
- * 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 LICENSE file included in this
- * release for licensing terms and conditions.
- */
-
-#include "common.h"
-#include "cphy.h"
-#include "elmer0.h"
-
-#ifndef ADVERTISE_PAUSE_CAP
-# define ADVERTISE_PAUSE_CAP 0x400
-#endif
-#ifndef ADVERTISE_PAUSE_ASYM
-# define ADVERTISE_PAUSE_ASYM 0x800
-#endif
-
-/* Gigabit MII registers */
-#ifndef MII_CTRL1000
-# define MII_CTRL1000 9
-#endif
-
-#ifndef ADVERTISE_1000FULL
-# define ADVERTISE_1000FULL 0x200
-# define ADVERTISE_1000HALF 0x100
-#endif
-
-/* VSC8244 PHY specific registers. */
-enum {
-        VSC8244_INTR_ENABLE   = 25,
-        VSC8244_INTR_STATUS   = 26,
-        VSC8244_AUX_CTRL_STAT = 28,
-};
-
-enum {
-        VSC_INTR_RX_ERR     = 1 << 0,
-        VSC_INTR_MS_ERR     = 1 << 1,  /* master/slave resolution error */
-        VSC_INTR_CABLE      = 1 << 2,  /* cable impairment */
-        VSC_INTR_FALSE_CARR = 1 << 3,  /* false carrier */
-        VSC_INTR_MEDIA_CHG  = 1 << 4,  /* AMS media change */
-        VSC_INTR_RX_FIFO    = 1 << 5,  /* Rx FIFO over/underflow */
-        VSC_INTR_TX_FIFO    = 1 << 6,  /* Tx FIFO over/underflow */
-        VSC_INTR_DESCRAMBL  = 1 << 7,  /* descrambler lock-lost */
-        VSC_INTR_SYMBOL_ERR = 1 << 8,  /* symbol error */
-        VSC_INTR_NEG_DONE   = 1 << 10, /* autoneg done */
-        VSC_INTR_NEG_ERR    = 1 << 11, /* autoneg error */
-        VSC_INTR_LINK_CHG   = 1 << 13, /* link change */
-        VSC_INTR_ENABLE     = 1 << 15, /* interrupt enable */
-};
-
-#define CFG_CHG_INTR_MASK (VSC_INTR_LINK_CHG | VSC_INTR_NEG_ERR | \
-                           VSC_INTR_NEG_DONE)
-#define INTR_MASK (CFG_CHG_INTR_MASK | VSC_INTR_TX_FIFO | VSC_INTR_RX_FIFO | \
-                   VSC_INTR_ENABLE)
-
-/* PHY specific auxiliary control & status register fields */
-#define S_ACSR_ACTIPHY_TMR    0
-#define M_ACSR_ACTIPHY_TMR    0x3
-#define V_ACSR_ACTIPHY_TMR(x) ((x) << S_ACSR_ACTIPHY_TMR)
-
-#define S_ACSR_SPEED    3
-#define M_ACSR_SPEED    0x3
-#define G_ACSR_SPEED(x) (((x) >> S_ACSR_SPEED) & M_ACSR_SPEED)
-
-#define S_ACSR_DUPLEX 5
-#define F_ACSR_DUPLEX (1 << S_ACSR_DUPLEX)
-
-#define S_ACSR_ACTIPHY 6
-#define F_ACSR_ACTIPHY (1 << S_ACSR_ACTIPHY)
-
-/*
- * Reset the PHY.  This PHY completes reset immediately so we never wait.
- */
-static int vsc8244_reset(struct cphy *cphy, int wait)
-{
-        int err;
-        unsigned int ctl;
-
-        err = simple_mdio_read(cphy, MII_BMCR, &ctl);
-        if (err)
-                return err;
-
-        ctl &= ~BMCR_PDOWN;
-        ctl |= BMCR_RESET;
-        return simple_mdio_write(cphy, MII_BMCR, ctl);
-}
-
-static int vsc8244_intr_enable(struct cphy *cphy)
-{
-        simple_mdio_write(cphy, VSC8244_INTR_ENABLE, INTR_MASK);
-
-        /* Enable interrupts through Elmer */
-        if (t1_is_asic(cphy->adapter)) {
-                u32 elmer;
-
-                t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
-                elmer |= ELMER0_GP_BIT1;
-                if (is_T2(cphy->adapter))
-                    elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4;
-                t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
-        }
-
-        return 0;
-}
-
-static int vsc8244_intr_disable(struct cphy *cphy)
-{
-        simple_mdio_write(cphy, VSC8244_INTR_ENABLE, 0);
-
-        if (t1_is_asic(cphy->adapter)) {
-                u32 elmer;
-
-                t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
-                elmer &= ~ELMER0_GP_BIT1;
-                if (is_T2(cphy->adapter))
-                    elmer &= ~(ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4);
-                t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
-        }
-
-        return 0;
-}
-
-static int vsc8244_intr_clear(struct cphy *cphy)
-{
-        u32 val;
-        u32 elmer;
-
-        /* Clear PHY interrupts by reading the register. */
-        simple_mdio_read(cphy, VSC8244_INTR_ENABLE, &val);
-
-        if (t1_is_asic(cphy->adapter)) {
-                t1_tpi_read(cphy->adapter, A_ELMER0_INT_CAUSE, &elmer);
-                elmer |= ELMER0_GP_BIT1;
-                if (is_T2(cphy->adapter))
-                    elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4;
-                t1_tpi_write(cphy->adapter, A_ELMER0_INT_CAUSE, elmer);
-        }
-
-        return 0;
-}
-
-/*
- * Force the PHY speed and duplex.  This also disables auto-negotiation, except
- * for 1Gb/s, where auto-negotiation is mandatory.
- */
-static int vsc8244_set_speed_duplex(struct cphy *phy, int speed, int duplex)
-{
-        int err;
-        unsigned int ctl;
-
-        err = simple_mdio_read(phy, MII_BMCR, &ctl);
-        if (err)
-                return err;
-
-        if (speed >= 0) {
-                ctl &= ~(BMCR_SPEED100 | BMCR_SPEED1000 | BMCR_ANENABLE);
-                if (speed == SPEED_100)
-                        ctl |= BMCR_SPEED100;
-                else if (speed == SPEED_1000)
-                        ctl |= BMCR_SPEED1000;
-        }
-        if (duplex >= 0) {
-                ctl &= ~(BMCR_FULLDPLX | BMCR_ANENABLE);
-                if (duplex == DUPLEX_FULL)
-                        ctl |= BMCR_FULLDPLX;
-        }
-        if (ctl & BMCR_SPEED1000)  /* auto-negotiation required for 1Gb/s */
-                ctl |= BMCR_ANENABLE;
-        return simple_mdio_write(phy, MII_BMCR, ctl);
-}
-
-int t1_mdio_set_bits(struct cphy *phy, int mmd, int reg, unsigned int bits)
-{
-        int ret;
-        unsigned int val;
-
-        ret = mdio_read(phy, mmd, reg, &val);
-        if (!ret)
-                ret = mdio_write(phy, mmd, reg, val | bits);
-        return ret;
-}
-
-static int vsc8244_autoneg_enable(struct cphy *cphy)
-{
-        return t1_mdio_set_bits(cphy, 0, MII_BMCR,
-                                BMCR_ANENABLE | BMCR_ANRESTART);
-}
-
-static int vsc8244_autoneg_restart(struct cphy *cphy)
-{
-        return t1_mdio_set_bits(cphy, 0, MII_BMCR, BMCR_ANRESTART);
-}
-
-static int vsc8244_advertise(struct cphy *phy, unsigned int advertise_map)
-{
-        int err;
-        unsigned int val = 0;
-
-        err = simple_mdio_read(phy, MII_CTRL1000, &val);
-        if (err)
-                return err;
-
-        val &= ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-        if (advertise_map & ADVERTISED_1000baseT_Half)
-                val |= ADVERTISE_1000HALF;
-        if (advertise_map & ADVERTISED_1000baseT_Full)
-                val |= ADVERTISE_1000FULL;
-
-        err = simple_mdio_write(phy, MII_CTRL1000, val);
-        if (err)
-                return err;
-
-        val = 1;
-        if (advertise_map & ADVERTISED_10baseT_Half)
-                val |= ADVERTISE_10HALF;
-        if (advertise_map & ADVERTISED_10baseT_Full)
-                val |= ADVERTISE_10FULL;
-        if (advertise_map & ADVERTISED_100baseT_Half)
-                val |= ADVERTISE_100HALF;
-        if (advertise_map & ADVERTISED_100baseT_Full)
-                val |= ADVERTISE_100FULL;
-        if (advertise_map & ADVERTISED_PAUSE)
-                val |= ADVERTISE_PAUSE_CAP;
-        if (advertise_map & ADVERTISED_ASYM_PAUSE)
-                val |= ADVERTISE_PAUSE_ASYM;
-        return simple_mdio_write(phy, MII_ADVERTISE, val);
-}
-
-static int vsc8244_get_link_status(struct cphy *cphy, int *link_ok,
-                                   int *speed, int *duplex, int *fc)
-{
-        unsigned int bmcr, status, lpa, adv;
-        int err, sp = -1, dplx = -1, pause = 0;
-
-        err = simple_mdio_read(cphy, MII_BMCR, &bmcr);
-        if (!err)
-                err = simple_mdio_read(cphy, MII_BMSR, &status);
-        if (err)
-                return err;
-
-        if (link_ok) {
-                /*
-                 * BMSR_LSTATUS is latch-low, so if it is 0 we need to read it
-                 * once more to get the current link state.
-                 */
-                if (!(status & BMSR_LSTATUS))
-                        err = simple_mdio_read(cphy, MII_BMSR, &status);
-                if (err)
-                        return err;
-                *link_ok = (status & BMSR_LSTATUS) != 0;
-        }
-        if (!(bmcr & BMCR_ANENABLE)) {
-                dplx = (bmcr & BMCR_FULLDPLX) ? DUPLEX_FULL : DUPLEX_HALF;
-                if (bmcr & BMCR_SPEED1000)
-                        sp = SPEED_1000;
-                else if (bmcr & BMCR_SPEED100)
-                        sp = SPEED_100;
-                else
-                        sp = SPEED_10;
-        } else if (status & BMSR_ANEGCOMPLETE) {
-                err = simple_mdio_read(cphy, VSC8244_AUX_CTRL_STAT, &status);
-                if (err)
-                        return err;
-
-                dplx = (status & F_ACSR_DUPLEX) ? DUPLEX_FULL : DUPLEX_HALF;
-                sp = G_ACSR_SPEED(status);
-                if (sp == 0)
-                        sp = SPEED_10;
-                else if (sp == 1)
-                        sp = SPEED_100;
-                else
-                        sp = SPEED_1000;
-
-                if (fc && dplx == DUPLEX_FULL) {
-                        err = simple_mdio_read(cphy, MII_LPA, &lpa);
-                        if (!err)
-                                err = simple_mdio_read(cphy, MII_ADVERTISE,
-                                                       &adv);
-                        if (err)
-                                return err;
-
-                        if (lpa & adv & ADVERTISE_PAUSE_CAP)
-                                pause = PAUSE_RX | PAUSE_TX;
-                        else if ((lpa & ADVERTISE_PAUSE_CAP) &&
-                                 (lpa & ADVERTISE_PAUSE_ASYM) &&
-                                 (adv & ADVERTISE_PAUSE_ASYM))
-                                pause = PAUSE_TX;
-                        else if ((lpa & ADVERTISE_PAUSE_ASYM) &&
-                                 (adv & ADVERTISE_PAUSE_CAP))
-                                pause = PAUSE_RX;
-                }
-        }
-        if (speed)
-                *speed = sp;
-        if (duplex)
-                *duplex = dplx;
-        if (fc)
-                *fc = pause;
-        return 0;
-}
-
-static int vsc8244_intr_handler(struct cphy *cphy)
-{
-        unsigned int cause;
-        int err, cphy_cause = 0;
-
-        err = simple_mdio_read(cphy, VSC8244_INTR_STATUS, &cause);
-        if (err)
-                return err;
-
-        cause &= INTR_MASK;
-        if (cause & CFG_CHG_INTR_MASK)
-                cphy_cause |= cphy_cause_link_change;
-        if (cause & (VSC_INTR_RX_FIFO | VSC_INTR_TX_FIFO))
-                cphy_cause |= cphy_cause_fifo_error;
-        return cphy_cause;
-}
-
-static void vsc8244_destroy(struct cphy *cphy)
-{
-        kfree(cphy);
-}
-
-static struct cphy_ops vsc8244_ops = {
-        .destroy              = vsc8244_destroy,
-        .reset                = vsc8244_reset,
-        .interrupt_enable     = vsc8244_intr_enable,
-        .interrupt_disable    = vsc8244_intr_disable,
-        .interrupt_clear      = vsc8244_intr_clear,
-        .interrupt_handler    = vsc8244_intr_handler,
-        .autoneg_enable       = vsc8244_autoneg_enable,
-        .autoneg_restart      = vsc8244_autoneg_restart,
-        .advertise            = vsc8244_advertise,
-        .set_speed_duplex     = vsc8244_set_speed_duplex,
-        .get_link_status      = vsc8244_get_link_status
-};
-
-static struct cphy* vsc8244_phy_create(adapter_t *adapter, int phy_addr,
-                                       struct mdio_ops *mdio_ops)
-{
-        struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);
-
-        if (!cphy)
-                return NULL;
-
-        cphy_init(cphy, adapter, phy_addr, &vsc8244_ops, mdio_ops);
-
-        return cphy;
-}
-
-
-static int vsc8244_phy_reset(adapter_t* adapter)
-{
-        return 0;
-}
-
-struct gphy t1_vsc8244_ops = {
-        vsc8244_phy_create,
-        vsc8244_phy_reset
-};
-
-
diff --git a/drivers/net/chelsio/vsc8244_reg.h b/drivers/net/chelsio/vsc8244_reg.h
deleted file mode 100644
index d3c1829055cb..000000000000
--- a/drivers/net/chelsio/vsc8244_reg.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $Date: 2005/11/23 16:28:53 $ $RCSfile: vsc8244_reg.h,v $ $Revision: 1.1 $ */
-#ifndef CHELSIO_MV8E1XXX_H
-#define CHELSIO_MV8E1XXX_H
-
-#ifndef BMCR_SPEED1000
-# define BMCR_SPEED1000 0x40
-#endif
-
-#ifndef ADVERTISE_PAUSE
-# define ADVERTISE_PAUSE 0x400
-#endif
-#ifndef ADVERTISE_PAUSE_ASYM
-# define ADVERTISE_PAUSE_ASYM 0x800
-#endif
-
-/* Gigabit MII registers */
-#define MII_GBMR 1       /* 1000Base-T mode register */
-#define MII_GBCR 9       /* 1000Base-T control register */
-#define MII_GBSR 10      /* 1000Base-T status register */
-
-/* 1000Base-T control register fields */
-#define GBCR_ADV_1000HALF         0x100
-#define GBCR_ADV_1000FULL         0x200
-#define GBCR_PREFER_MASTER        0x400
-#define GBCR_MANUAL_AS_MASTER     0x800
-#define GBCR_MANUAL_CONFIG_ENABLE 0x1000
-
-/* 1000Base-T status register fields */
-#define GBSR_LP_1000HALF  0x400
-#define GBSR_LP_1000FULL  0x800
-#define GBSR_REMOTE_OK    0x1000
-#define GBSR_LOCAL_OK     0x2000
-#define GBSR_LOCAL_MASTER 0x4000
-#define GBSR_MASTER_FAULT 0x8000
-
-/* Vitesse PHY interrupt status bits. */
-#if 0
-#define VSC8244_INTR_JABBER          0x0001
-#define VSC8244_INTR_POLARITY_CHNG   0x0002
-#define VSC8244_INTR_ENG_DETECT_CHNG 0x0010
-#define VSC8244_INTR_DOWNSHIFT       0x0020
-#define VSC8244_INTR_MDI_XOVER_CHNG  0x0040
-#define VSC8244_INTR_FIFO_OVER_UNDER 0x0080
-#define VSC8244_INTR_FALSE_CARRIER   0x0100
-#define VSC8244_INTR_SYMBOL_ERROR    0x0200
-#define VSC8244_INTR_LINK_CHNG       0x0400
-#define VSC8244_INTR_AUTONEG_DONE    0x0800
-#define VSC8244_INTR_PAGE_RECV       0x1000
-#define VSC8244_INTR_DUPLEX_CHNG     0x2000
-#define VSC8244_INTR_SPEED_CHNG      0x4000
-#define VSC8244_INTR_AUTONEG_ERR     0x8000
-#else
-//#define VSC8244_INTR_JABBER          0x0001
-//#define VSC8244_INTR_POLARITY_CHNG   0x0002
-//#define VSC8244_INTR_BIT2            0x0004
-//#define VSC8244_INTR_BIT3            0x0008
-#define VSC8244_INTR_RX_ERR          0x0001
-#define VSC8244_INTR_MASTER_SLAVE    0x0002
-#define VSC8244_INTR_CABLE_IMPAIRED  0x0004
-#define VSC8244_INTR_FALSE_CARRIER   0x0008
-//#define VSC8244_INTR_ENG_DETECT_CHNG 0x0010
-//#define VSC8244_INTR_DOWNSHIFT       0x0020
-//#define VSC8244_INTR_MDI_XOVER_CHNG  0x0040
-//#define VSC8244_INTR_FIFO_OVER_UNDER 0x0080
-#define VSC8244_INTR_BIT4            0x0010
-#define VSC8244_INTR_FIFO_RX         0x0020
-#define VSC8244_INTR_FIFO_OVER_UNDER 0x0040
-#define VSC8244_INTR_LOCK_LOST       0x0080
-//#define VSC8244_INTR_FALSE_CARRIER   0x0100
-//#define VSC8244_INTR_SYMBOL_ERROR    0x0200
-//#define VSC8244_INTR_LINK_CHNG       0x0400
-//#define VSC8244_INTR_AUTONEG_DONE    0x0800
-#define VSC8244_INTR_SYMBOL_ERROR    0x0100
-#define VSC8244_INTR_ENG_DETECT_CHNG 0x0200
-#define VSC8244_INTR_AUTONEG_DONE    0x0400
-#define VSC8244_INTR_AUTONEG_ERR     0x0800
-//#define VSC8244_INTR_PAGE_RECV       0x1000
-//#define VSC8244_INTR_DUPLEX_CHNG     0x2000
-//#define VSC8244_INTR_SPEED_CHNG      0x4000
-//#define VSC8244_INTR_AUTONEG_ERR     0x8000
-#define VSC8244_INTR_DUPLEX_CHNG     0x1000
-#define VSC8244_INTR_LINK_CHNG       0x2000
-#define VSC8244_INTR_SPEED_CHNG      0x4000
-#define VSC8244_INTR_STATUS          0x8000
-#endif
-
-
-/* Vitesse PHY specific registers. */
-#define VSC8244_SPECIFIC_CNTRL_REGISTER               16
-#define VSC8244_SPECIFIC_STATUS_REGISTER              0x1c
-#define VSC8244_INTERRUPT_ENABLE_REGISTER             0x19
-#define VSC8244_INTERRUPT_STATUS_REGISTER             0x1a
-#define VSC8244_EXT_PHY_SPECIFIC_CNTRL_REGISTER       20
-#define VSC8244_RECV_ERR_CNTR_REGISTER                21
-#define VSC8244_RES_REGISTER                          22
-#define VSC8244_GLOBAL_STATUS_REGISTER                23
-#define VSC8244_LED_CONTROL_REGISTER                  24
-#define VSC8244_MANUAL_LED_OVERRIDE_REGISTER          25
-#define VSC8244_EXT_PHY_SPECIFIC_CNTRL_2_REGISTER     26
-#define VSC8244_EXT_PHY_SPECIFIC_STATUS_REGISTER      27
-#define VSC8244_VIRTUAL_CABLE_TESTER_REGISTER         28
-#define VSC8244_EXTENDED_ADDR_REGISTER                29
-#define VSC8244_EXTENDED_REGISTER                     30
-
-/* PHY specific control register fields */
-#define S_PSCR_MDI_XOVER_MODE    5
-#define M_PSCR_MDI_XOVER_MODE    0x3
-#define V_PSCR_MDI_XOVER_MODE(x) ((x) << S_PSCR_MDI_XOVER_MODE)
-#define G_PSCR_MDI_XOVER_MODE(x) (((x) >> S_PSCR_MDI_XOVER_MODE) & M_PSCR_MDI_XOVER_MODE)
-
-/* Extended PHY specific control register fields */
-#define S_DOWNSHIFT_ENABLE 8
-#define V_DOWNSHIFT_ENABLE (1 << S_DOWNSHIFT_ENABLE)
-
-#define S_DOWNSHIFT_CNT    9
-#define M_DOWNSHIFT_CNT    0x7
-#define V_DOWNSHIFT_CNT(x) ((x) << S_DOWNSHIFT_CNT)
-#define G_DOWNSHIFT_CNT(x) (((x) >> S_DOWNSHIFT_CNT) & M_DOWNSHIFT_CNT)
-
-/* PHY specific status register fields */
-#define S_PSSR_JABBER 0
-#define V_PSSR_JABBER (1 << S_PSSR_JABBER)
-
-#define S_PSSR_POLARITY 1
-#define V_PSSR_POLARITY (1 << S_PSSR_POLARITY)
-
-#define S_PSSR_RX_PAUSE 2
-#define V_PSSR_RX_PAUSE (1 << S_PSSR_RX_PAUSE)
-
-#define S_PSSR_TX_PAUSE 3
-#define V_PSSR_TX_PAUSE (1 << S_PSSR_TX_PAUSE)
-
-#define S_PSSR_ENERGY_DETECT 4
-#define V_PSSR_ENERGY_DETECT (1 << S_PSSR_ENERGY_DETECT)
-
-#define S_PSSR_DOWNSHIFT_STATUS 5
-#define V_PSSR_DOWNSHIFT_STATUS (1 << S_PSSR_DOWNSHIFT_STATUS)
-
-#define S_PSSR_MDI 6
-#define V_PSSR_MDI (1 << S_PSSR_MDI)
-
-#define S_PSSR_CABLE_LEN    7
-#define M_PSSR_CABLE_LEN    0x7
-#define V_PSSR_CABLE_LEN(x) ((x) << S_PSSR_CABLE_LEN)
-#define G_PSSR_CABLE_LEN(x) (((x) >> S_PSSR_CABLE_LEN) & M_PSSR_CABLE_LEN)
-
-//#define S_PSSR_LINK 10
-//#define S_PSSR_LINK 13
-#define S_PSSR_LINK 2
-#define V_PSSR_LINK (1 << S_PSSR_LINK)
-
-//#define S_PSSR_STATUS_RESOLVED 11
-//#define S_PSSR_STATUS_RESOLVED 10
-#define S_PSSR_STATUS_RESOLVED 15
-#define V_PSSR_STATUS_RESOLVED (1 << S_PSSR_STATUS_RESOLVED)
-
-#define S_PSSR_PAGE_RECEIVED 12
-#define V_PSSR_PAGE_RECEIVED (1 << S_PSSR_PAGE_RECEIVED)
-
-//#define S_PSSR_DUPLEX 13
-//#define S_PSSR_DUPLEX 12
-#define S_PSSR_DUPLEX 5
-#define V_PSSR_DUPLEX (1 << S_PSSR_DUPLEX)
-
-//#define S_PSSR_SPEED    14
-//#define S_PSSR_SPEED    14
-#define S_PSSR_SPEED    3
-#define M_PSSR_SPEED    0x3
-#define V_PSSR_SPEED(x) ((x) << S_PSSR_SPEED)
-#define G_PSSR_SPEED(x) (((x) >> S_PSSR_SPEED) & M_PSSR_SPEED)
-
-#endif
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 4d0e0aea72bf..61696637a21e 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -159,7 +159,7 @@
 
 #define DRV_NAME                "e100"
 #define DRV_EXT                 "-NAPI"
-#define DRV_VERSION             "3.5.17-k2"DRV_EXT
+#define DRV_VERSION             "3.5.17-k4"DRV_EXT
 #define DRV_DESCRIPTION         "Intel(R) PRO/100 Network Driver"
 #define DRV_COPYRIGHT           "Copyright(c) 1999-2006 Intel Corporation"
 #define PFX                     DRV_NAME ": "
@@ -174,10 +174,13 @@ MODULE_VERSION(DRV_VERSION);
 
 static int debug = 3;
 static int eeprom_bad_csum_allow = 0;
+static int use_io = 0;
 module_param(debug, int, 0);
 module_param(eeprom_bad_csum_allow, int, 0);
+module_param(use_io, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
+MODULE_PARM_DESC(use_io, "Force use of i/o access mode");
 #define DPRINTK(nlevel, klevel, fmt, args...) \
         (void)((NETIF_MSG_##nlevel & nic->msg_enable) && \
         printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \
@@ -282,12 +285,6 @@ enum scb_status {
         rus_mask         = 0x3C,
 };
 
-enum ru_state  {
-        RU_SUSPENDED = 0,
-        RU_RUNNING       = 1,
-        RU_UNINITIALIZED = -1,
-};
-
 enum scb_stat_ack {
         stat_ack_not_ours    = 0x00,
         stat_ack_sw_gen      = 0x04,
@@ -529,7 +526,6 @@ struct nic {
         struct rx *rx_to_use;
         struct rx *rx_to_clean;
         struct rfd blank_rfd;
-        enum ru_state ru_running;
 
         spinlock_t cb_lock                      ____cacheline_aligned;
         spinlock_t cmd_lock;
@@ -591,7 +587,7 @@ static inline void e100_write_flush(struct nic *nic)
 {
         /* Flush previous PCI writes through intermediate bridges
          * by doing a benign read */
-        (void)readb(&nic->csr->scb.status);
+        (void)ioread8(&nic->csr->scb.status);
 }
 
 static void e100_enable_irq(struct nic *nic)
@@ -599,7 +595,7 @@ static void e100_enable_irq(struct nic *nic)
         unsigned long flags;
 
         spin_lock_irqsave(&nic->cmd_lock, flags);
-        writeb(irq_mask_none, &nic->csr->scb.cmd_hi);
+        iowrite8(irq_mask_none, &nic->csr->scb.cmd_hi);
         e100_write_flush(nic);
         spin_unlock_irqrestore(&nic->cmd_lock, flags);
 }
@@ -609,7 +605,7 @@ static void e100_disable_irq(struct nic *nic)
         unsigned long flags;
 
         spin_lock_irqsave(&nic->cmd_lock, flags);
-        writeb(irq_mask_all, &nic->csr->scb.cmd_hi);
+        iowrite8(irq_mask_all, &nic->csr->scb.cmd_hi);
         e100_write_flush(nic);
         spin_unlock_irqrestore(&nic->cmd_lock, flags);
 }
@@ -618,11 +614,11 @@ static void e100_hw_reset(struct nic *nic)
 {
         /* Put CU and RU into idle with a selective reset to get
          * device off of PCI bus */
-        writel(selective_reset, &nic->csr->port);
+        iowrite32(selective_reset, &nic->csr->port);
         e100_write_flush(nic); udelay(20);
 
         /* Now fully reset device */
-        writel(software_reset, &nic->csr->port);
+        iowrite32(software_reset, &nic->csr->port);
         e100_write_flush(nic); udelay(20);
 
         /* Mask off our interrupt line - it's unmasked after reset */
@@ -639,7 +635,7 @@ static int e100_self_test(struct nic *nic)
         nic->mem->selftest.signature = 0;
         nic->mem->selftest.result = 0xFFFFFFFF;
 
-        writel(selftest | dma_addr, &nic->csr->port);
+        iowrite32(selftest | dma_addr, &nic->csr->port);
         e100_write_flush(nic);
         /* Wait 10 msec for self-test to complete */
         msleep(10);
@@ -677,23 +673,23 @@ static void e100_eeprom_write(struct nic *nic, u16 addr_len, u16 addr, u16 data)
         for(j = 0; j < 3; j++) {
 
                 /* Chip select */
-                writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
 
                 for(i = 31; i >= 0; i--) {
                         ctrl = (cmd_addr_data[j] & (1 << i)) ?
                                 eecs | eedi : eecs;
-                        writeb(ctrl, &nic->csr->eeprom_ctrl_lo);
+                        iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
                         e100_write_flush(nic); udelay(4);
 
-                        writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
+                        iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
                         e100_write_flush(nic); udelay(4);
                 }
                 /* Wait 10 msec for cmd to complete */
                 msleep(10);
 
                 /* Chip deselect */
-                writeb(0, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(0, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
         }
 };
@@ -709,21 +705,21 @@ static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
         cmd_addr_data = ((op_read << *addr_len) | addr) << 16;
 
         /* Chip select */
-        writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
+        iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
         e100_write_flush(nic); udelay(4);
 
         /* Bit-bang to read word from eeprom */
         for(i = 31; i >= 0; i--) {
                 ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs;
-                writeb(ctrl, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
 
-                writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
 
                 /* Eeprom drives a dummy zero to EEDO after receiving
                  * complete address.  Use this to adjust addr_len. */
-                ctrl = readb(&nic->csr->eeprom_ctrl_lo);
+                ctrl = ioread8(&nic->csr->eeprom_ctrl_lo);
                 if(!(ctrl & eedo) && i > 16) {
                         *addr_len -= (i - 16);
                         i = 17;
@@ -733,7 +729,7 @@ static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
         }
 
         /* Chip deselect */
-        writeb(0, &nic->csr->eeprom_ctrl_lo);
+        iowrite8(0, &nic->csr->eeprom_ctrl_lo);
         e100_write_flush(nic); udelay(4);
 
         return le16_to_cpu(data);
@@ -804,7 +800,7 @@ static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
 
         /* Previous command is accepted when SCB clears */
         for(i = 0; i < E100_WAIT_SCB_TIMEOUT; i++) {
-                if(likely(!readb(&nic->csr->scb.cmd_lo)))
+                if(likely(!ioread8(&nic->csr->scb.cmd_lo)))
                         break;
                 cpu_relax();
                 if(unlikely(i > E100_WAIT_SCB_FAST))
@@ -816,8 +812,8 @@ static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
         }
 
         if(unlikely(cmd != cuc_resume))
-                writel(dma_addr, &nic->csr->scb.gen_ptr);
-        writeb(cmd, &nic->csr->scb.cmd_lo);
+                iowrite32(dma_addr, &nic->csr->scb.gen_ptr);
+        iowrite8(cmd, &nic->csr->scb.cmd_lo);
 
 err_unlock:
         spin_unlock_irqrestore(&nic->cmd_lock, flags);
@@ -895,7 +891,7 @@ static u16 mdio_ctrl(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
          */
         spin_lock_irqsave(&nic->mdio_lock, flags);
         for (i = 100; i; --i) {
-                if (readl(&nic->csr->mdi_ctrl) & mdi_ready)
+                if (ioread32(&nic->csr->mdi_ctrl) & mdi_ready)
                         break;
                 udelay(20);
         }
@@ -905,11 +901,11 @@ static u16 mdio_ctrl(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
                 spin_unlock_irqrestore(&nic->mdio_lock, flags);
                 return 0;               /* No way to indicate timeout error */
         }
-        writel((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
+        iowrite32((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
 
         for (i = 0; i < 100; i++) {
                 udelay(20);
-                if ((data_out = readl(&nic->csr->mdi_ctrl)) & mdi_ready)
+                if ((data_out = ioread32(&nic->csr->mdi_ctrl)) & mdi_ready)
                         break;
         }
         spin_unlock_irqrestore(&nic->mdio_lock, flags);
@@ -951,7 +947,7 @@ static void e100_get_defaults(struct nic *nic)
                 ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
 
         /* Template for a freshly allocated RFD */
-        nic->blank_rfd.command = cpu_to_le16(cb_el);
+        nic->blank_rfd.command = cpu_to_le16(cb_el & cb_s);
         nic->blank_rfd.rbd = 0xFFFFFFFF;
         nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
 
@@ -1318,7 +1314,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb,
         }
 
         /* ack any interupts, something could have been set */
-        writeb(~0, &nic->csr->scb.stat_ack);
+        iowrite8(~0, &nic->csr->scb.stat_ack);
 
         /* if the command failed, or is not OK, notify and return */
         if (!counter || !(cb->status & cpu_to_le16(cb_ok))) {
@@ -1580,7 +1576,7 @@ static void e100_watchdog(unsigned long data)
          * accidentally, due to hardware that shares a register between the
          * interrupt mask bit and the SW Interrupt generation bit */
         spin_lock_irq(&nic->cmd_lock);
-        writeb(readb(&nic->csr->scb.cmd_hi) | irq_sw_gen,&nic->csr->scb.cmd_hi);
+        iowrite8(ioread8(&nic->csr->scb.cmd_hi) | irq_sw_gen,&nic->csr->scb.cmd_hi);
         e100_write_flush(nic);
         spin_unlock_irq(&nic->cmd_lock);
 
@@ -1746,19 +1742,11 @@ static int e100_alloc_cbs(struct nic *nic)
         return 0;
 }
 
-static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
+static inline void e100_start_receiver(struct nic *nic)
 {
-        if(!nic->rxs) return;
-        if(RU_SUSPENDED != nic->ru_running) return;
-
-        /* handle init time starts */
-        if(!rx) rx = nic->rxs;
-
-        /* (Re)start RU if suspended or idle and RFA is non-NULL */
-        if(rx->skb) {
-                e100_exec_cmd(nic, ruc_start, rx->dma_addr);
-                nic->ru_running = RU_RUNNING;
-        }
+        /* Start if RFA is non-NULL */
+        if(nic->rx_to_clean->skb)
+                e100_exec_cmd(nic, ruc_start, nic->rx_to_clean->dma_addr);
 }
 
 #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
@@ -1787,7 +1775,7 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
                 put_unaligned(cpu_to_le32(rx->dma_addr),
                         (u32 *)&prev_rfd->link);
                 wmb();
-                prev_rfd->command &= ~cpu_to_le16(cb_el);
+                prev_rfd->command &= ~cpu_to_le16(cb_el & cb_s);
                 pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr,
                         sizeof(struct rfd), PCI_DMA_TODEVICE);
         }
@@ -1825,10 +1813,6 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
         pci_unmap_single(nic->pdev, rx->dma_addr,
                 RFD_BUF_LEN, PCI_DMA_FROMDEVICE);
 
-        /* this allows for a fast restart without re-enabling interrupts */
-        if(le16_to_cpu(rfd->command) & cb_el)
-                nic->ru_running = RU_SUSPENDED;
-
         /* Pull off the RFD and put the actual data (minus eth hdr) */
         skb_reserve(skb, sizeof(struct rfd));
         skb_put(skb, actual_size);
@@ -1859,45 +1843,18 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
         unsigned int work_to_do)
 {
         struct rx *rx;
-        int restart_required = 0;
-        struct rx *rx_to_start = NULL;
-
-        /* are we already rnr? then pay attention!!! this ensures that
-         * the state machine progression never allows a start with a
-         * partially cleaned list, avoiding a race between hardware
-         * and rx_to_clean when in NAPI mode */
-        if(RU_SUSPENDED == nic->ru_running)
-                restart_required = 1;
 
         /* Indicate newly arrived packets */
         for(rx = nic->rx_to_clean; rx->skb; rx = nic->rx_to_clean = rx->next) {
-                int err = e100_rx_indicate(nic, rx, work_done, work_to_do);
-                if(-EAGAIN == err) {
-                        /* hit quota so have more work to do, restart once
-                         * cleanup is complete */
-                        restart_required = 0;
-                        break;
-                } else if(-ENODATA == err)
+                if(e100_rx_indicate(nic, rx, work_done, work_to_do))
                         break; /* No more to clean */
         }
 
-        /* save our starting point as the place we'll restart the receiver */
-        if(restart_required)
-                rx_to_start = nic->rx_to_clean;
-
         /* Alloc new skbs to refill list */
         for(rx = nic->rx_to_use; !rx->skb; rx = nic->rx_to_use = rx->next) {
                 if(unlikely(e100_rx_alloc_skb(nic, rx)))
                         break; /* Better luck next time (see watchdog) */
         }
-
-        if(restart_required) {
-                // ack the rnr?
-                writeb(stat_ack_rnr, &nic->csr->scb.stat_ack);
-                e100_start_receiver(nic, rx_to_start);
-                if(work_done)
-                        (*work_done)++;
-        }
 }
 
 static void e100_rx_clean_list(struct nic *nic)
@@ -1905,8 +1862,6 @@ static void e100_rx_clean_list(struct nic *nic)
         struct rx *rx;
         unsigned int i, count = nic->params.rfds.count;
 
-        nic->ru_running = RU_UNINITIALIZED;
-
         if(nic->rxs) {
                 for(rx = nic->rxs, i = 0; i < count; rx++, i++) {
                         if(rx->skb) {
@@ -1928,7 +1883,6 @@ static int e100_rx_alloc_list(struct nic *nic)
         unsigned int i, count = nic->params.rfds.count;
 
         nic->rx_to_use = nic->rx_to_clean = NULL;
-        nic->ru_running = RU_UNINITIALIZED;
 
         if(!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
                 return -ENOMEM;
@@ -1943,7 +1897,6 @@ static int e100_rx_alloc_list(struct nic *nic)
         }
 
         nic->rx_to_use = nic->rx_to_clean = nic->rxs;
-        nic->ru_running = RU_SUSPENDED;
 
         return 0;
 }
@@ -1952,7 +1905,7 @@ static irqreturn_t e100_intr(int irq, void *dev_id)
 {
         struct net_device *netdev = dev_id;
         struct nic *nic = netdev_priv(netdev);
-        u8 stat_ack = readb(&nic->csr->scb.stat_ack);
+        u8 stat_ack = ioread8(&nic->csr->scb.stat_ack);
 
         DPRINTK(INTR, DEBUG, "stat_ack = 0x%02X\n", stat_ack);
 
@@ -1961,11 +1914,7 @@ static irqreturn_t e100_intr(int irq, void *dev_id)
                 return IRQ_NONE;
 
         /* Ack interrupt(s) */
-        writeb(stat_ack, &nic->csr->scb.stat_ack);
-
-        /* We hit Receive No Resource (RNR); restart RU after cleaning */
-        if(stat_ack & stat_ack_rnr)
-                nic->ru_running = RU_SUSPENDED;
+        iowrite8(stat_ack, &nic->csr->scb.stat_ack);
 
         if(likely(netif_rx_schedule_prep(netdev))) {
                 e100_disable_irq(nic);
@@ -2058,7 +2007,7 @@ static int e100_up(struct nic *nic)
         if((err = e100_hw_init(nic)))
                 goto err_clean_cbs;
         e100_set_multicast_list(nic->netdev);
-        e100_start_receiver(nic, NULL);
+        e100_start_receiver(nic);
         mod_timer(&nic->watchdog, jiffies);
         if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
                 nic->netdev->name, nic->netdev)))
@@ -2107,7 +2056,7 @@ static void e100_tx_timeout_task(struct work_struct *work)
         struct net_device *netdev = nic->netdev;
 
         DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
-                readb(&nic->csr->scb.status));
+                ioread8(&nic->csr->scb.status));
         e100_down(netdev_priv(netdev));
         e100_up(netdev_priv(netdev));
 }
@@ -2139,7 +2088,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
                 mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR,
                         BMCR_LOOPBACK);
 
-        e100_start_receiver(nic, NULL);
+        e100_start_receiver(nic);
 
         if(!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
                 err = -ENOMEM;
@@ -2230,9 +2179,9 @@ static void e100_get_regs(struct net_device *netdev,
         int i;
 
         regs->version = (1 << 24) | nic->rev_id;
-        buff[0] = readb(&nic->csr->scb.cmd_hi) << 24 |
-                readb(&nic->csr->scb.cmd_lo) << 16 |
-                readw(&nic->csr->scb.status);
+        buff[0] = ioread8(&nic->csr->scb.cmd_hi) << 24 |
+                ioread8(&nic->csr->scb.cmd_lo) << 16 |
+                ioread16(&nic->csr->scb.status);
         for(i = E100_PHY_REGS; i >= 0; i--)
                 buff[1 + E100_PHY_REGS - i] =
                         mdio_read(netdev, nic->mii.phy_id, i);
@@ -2604,7 +2553,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
         SET_MODULE_OWNER(netdev);
         SET_NETDEV_DEV(netdev, &pdev->dev);
 
-        nic->csr = ioremap(pci_resource_start(pdev, 0), sizeof(struct csr));
+        if (use_io)
+                DPRINTK(PROBE, INFO, "using i/o access mode\n");
+
+        nic->csr = pci_iomap(pdev, (use_io ? 1 : 0), sizeof(struct csr));
         if(!nic->csr) {
                 DPRINTK(PROBE, ERR, "Cannot map device registers, aborting.\n");
                 err = -ENOMEM;
@@ -2651,11 +2603,16 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
         memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
-        if(!is_valid_ether_addr(netdev->perm_addr)) {
-                DPRINTK(PROBE, ERR, "Invalid MAC address from "
-                        "EEPROM, aborting.\n");
-                err = -EAGAIN;
-                goto err_out_free;
+        if (!is_valid_ether_addr(netdev->perm_addr)) {
+                if (!eeprom_bad_csum_allow) {
+                        DPRINTK(PROBE, ERR, "Invalid MAC address from "
+                                "EEPROM, aborting.\n");
+                        err = -EAGAIN;
+                        goto err_out_free;
+                } else {
+                        DPRINTK(PROBE, ERR, "Invalid MAC address from EEPROM, "
+                                "you MUST configure one.\n");
+                }
         }
 
         /* Wol magic packet can be enabled from eeprom */
@@ -2676,7 +2633,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, "
                 "MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
-                (unsigned long long)pci_resource_start(pdev, 0), pdev->irq,
+                (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), pdev->irq,
                 netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
                 netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
 
@@ -2685,7 +2642,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 err_out_free:
         e100_free(nic);
 err_out_iounmap:
-        iounmap(nic->csr);
+        pci_iounmap(pdev, nic->csr);
 err_out_free_res:
         pci_release_regions(pdev);
 err_out_disable_pdev:
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index dd4b728ac4b5..a9ea67e75c1b 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -155,9 +155,6 @@ struct e1000_adapter;
 /* Number of packet split data buffers (not including the header buffer) */
 #define PS_PAGE_BUFFERS MAX_PS_BUFFERS-1
 
-/* only works for sizes that are powers of 2 */
-#define E1000_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
-
 /* wrapper around a pointer to a socket buffer,
  * so a DMA handle can be stored along with the buffer */
 struct e1000_buffer {
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 6777887295f5..bb08375b5f13 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -654,14 +654,11 @@ e1000_set_ringparam(struct net_device *netdev,
         e1000_mac_type mac_type = adapter->hw.mac_type;
         struct e1000_tx_ring *txdr, *tx_old;
         struct e1000_rx_ring *rxdr, *rx_old;
-        int i, err, tx_ring_size, rx_ring_size;
+        int i, err;
 
         if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
 
-        tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
-        rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
-
         while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
                 msleep(1);
 
@@ -672,11 +669,11 @@ e1000_set_ringparam(struct net_device *netdev,
         rx_old = adapter->rx_ring;
 
         err = -ENOMEM;
-        txdr = kzalloc(tx_ring_size, GFP_KERNEL);
+        txdr = kcalloc(adapter->num_tx_queues, sizeof(struct e1000_tx_ring), GFP_KERNEL);
         if (!txdr)
                 goto err_alloc_tx;
 
-        rxdr = kzalloc(rx_ring_size, GFP_KERNEL);
+        rxdr = kcalloc(adapter->num_rx_queues, sizeof(struct e1000_rx_ring), GFP_KERNEL);
         if (!rxdr)
                 goto err_alloc_rx;
 
@@ -686,12 +683,12 @@ e1000_set_ringparam(struct net_device *netdev,
         rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
         rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
                 E1000_MAX_RXD : E1000_MAX_82544_RXD));
-        E1000_ROUNDUP(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+        rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
 
         txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
         txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
                 E1000_MAX_TXD : E1000_MAX_82544_TXD));
-        E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+        txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
 
         for (i = 0; i < adapter->num_tx_queues; i++)
                 txdr[i].count = txdr->count;
@@ -742,7 +739,7 @@ err_setup:
         uint32_t pat, value;                                                   \
         uint32_t test[] =                                                      \
                 {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};              \
-        for (pat = 0; pat < sizeof(test)/sizeof(test[0]); pat++) {              \
+        for (pat = 0; pat < ARRAY_SIZE(test); pat++) {              \
                 E1000_WRITE_REG(&adapter->hw, R, (test[pat] & W));             \
                 value = E1000_READ_REG(&adapter->hw, R);                       \
                 if (value != (test[pat] & W & M)) {                             \
@@ -1053,23 +1050,24 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
         struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
         struct pci_dev *pdev = adapter->pdev;
         uint32_t rctl;
-        int size, i, ret_val;
+        int i, ret_val;
 
         /* Setup Tx descriptor ring and Tx buffers */
 
         if (!txdr->count)
                 txdr->count = E1000_DEFAULT_TXD;
 
-        size = txdr->count * sizeof(struct e1000_buffer);
-        if (!(txdr->buffer_info = kmalloc(size, GFP_KERNEL))) {
+        if (!(txdr->buffer_info = kcalloc(txdr->count,
+                                          sizeof(struct e1000_buffer),
+                                          GFP_KERNEL))) {
                 ret_val = 1;
                 goto err_nomem;
         }
-        memset(txdr->buffer_info, 0, size);
 
         txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
-        E1000_ROUNDUP(txdr->size, 4096);
-        if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma))) {
+        txdr->size = ALIGN(txdr->size, 4096);
+        if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size,
+                                                &txdr->dma))) {
                 ret_val = 2;
                 goto err_nomem;
         }
@@ -1116,12 +1114,12 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
         if (!rxdr->count)
                 rxdr->count = E1000_DEFAULT_RXD;
 
-        size = rxdr->count * sizeof(struct e1000_buffer);
-        if (!(rxdr->buffer_info = kmalloc(size, GFP_KERNEL))) {
+        if (!(rxdr->buffer_info = kcalloc(rxdr->count,
+                                          sizeof(struct e1000_buffer),
+                                          GFP_KERNEL))) {
                 ret_val = 4;
                 goto err_nomem;
         }
-        memset(rxdr->buffer_info, 0, size);
 
         rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
         if (!(rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma))) {
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9267f16b1b32..3a03a74c0609 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -748,9 +748,9 @@ e1000_reset(struct e1000_adapter *adapter)
                                VLAN_TAG_SIZE;
                 min_tx_space = min_rx_space;
                 min_tx_space *= 2;
-                E1000_ROUNDUP(min_tx_space, 1024);
+                min_tx_space = ALIGN(min_tx_space, 1024);
                 min_tx_space >>= 10;
-                E1000_ROUNDUP(min_rx_space, 1024);
+                min_rx_space = ALIGN(min_rx_space, 1024);
                 min_rx_space >>= 10;
 
                 /* If current Tx allocation is less than the min Tx FIFO size,
@@ -1354,31 +1354,27 @@ e1000_sw_init(struct e1000_adapter *adapter)
 static int __devinit
 e1000_alloc_queues(struct e1000_adapter *adapter)
 {
-        int size;
-
-        size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
-        adapter->tx_ring = kmalloc(size, GFP_KERNEL);
+        adapter->tx_ring = kcalloc(adapter->num_tx_queues,
+                                   sizeof(struct e1000_tx_ring), GFP_KERNEL);
         if (!adapter->tx_ring)
                 return -ENOMEM;
-        memset(adapter->tx_ring, 0, size);
 
-        size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
-        adapter->rx_ring = kmalloc(size, GFP_KERNEL);
+        adapter->rx_ring = kcalloc(adapter->num_rx_queues,
+                                   sizeof(struct e1000_rx_ring), GFP_KERNEL);
         if (!adapter->rx_ring) {
                 kfree(adapter->tx_ring);
                 return -ENOMEM;
         }
-        memset(adapter->rx_ring, 0, size);
 
 #ifdef CONFIG_E1000_NAPI
-        size = sizeof(struct net_device) * adapter->num_rx_queues;
-        adapter->polling_netdev = kmalloc(size, GFP_KERNEL);
+        adapter->polling_netdev = kcalloc(adapter->num_rx_queues,
+                                          sizeof(struct net_device),
+                                          GFP_KERNEL);
         if (!adapter->polling_netdev) {
                 kfree(adapter->tx_ring);
                 kfree(adapter->rx_ring);
                 return -ENOMEM;
         }
-        memset(adapter->polling_netdev, 0, size);
 #endif
 
         return E1000_SUCCESS;
@@ -1560,7 +1556,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
         /* round up to nearest 4K */
 
         txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
-        E1000_ROUNDUP(txdr->size, 4096);
+        txdr->size = ALIGN(txdr->size, 4096);
 
         txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
         if (!txdr->desc) {
@@ -1774,18 +1770,18 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
         }
         memset(rxdr->buffer_info, 0, size);
 
-        size = sizeof(struct e1000_ps_page) * rxdr->count;
-        rxdr->ps_page = kmalloc(size, GFP_KERNEL);
+        rxdr->ps_page = kcalloc(rxdr->count, sizeof(struct e1000_ps_page),
+                                GFP_KERNEL);
         if (!rxdr->ps_page) {
                 vfree(rxdr->buffer_info);
                 DPRINTK(PROBE, ERR,
                 "Unable to allocate memory for the receive descriptor ring\n");
                 return -ENOMEM;
         }
-        memset(rxdr->ps_page, 0, size);
 
-        size = sizeof(struct e1000_ps_page_dma) * rxdr->count;
-        rxdr->ps_page_dma = kmalloc(size, GFP_KERNEL);
+        rxdr->ps_page_dma = kcalloc(rxdr->count,
+                                    sizeof(struct e1000_ps_page_dma),
+                                    GFP_KERNEL);
         if (!rxdr->ps_page_dma) {
                 vfree(rxdr->buffer_info);
                 kfree(rxdr->ps_page);
@@ -1793,7 +1789,6 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
                 "Unable to allocate memory for the receive descriptor ring\n");
                 return -ENOMEM;
         }
-        memset(rxdr->ps_page_dma, 0, size);
 
         if (adapter->hw.mac_type <= e1000_82547_rev_2)
                 desc_len = sizeof(struct e1000_rx_desc);
@@ -1803,7 +1798,7 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
         /* Round up to nearest 4K */
 
         rxdr->size = rxdr->count * desc_len;
-        E1000_ROUNDUP(rxdr->size, 4096);
+        rxdr->size = ALIGN(rxdr->size, 4096);
 
         rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
 
@@ -2667,7 +2662,7 @@ e1000_watchdog(unsigned long data)
 
                         netif_carrier_on(netdev);
                         netif_wake_queue(netdev);
-                        mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
+                        mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
                         adapter->smartspeed = 0;
                 } else {
                         /* make sure the receive unit is started */
@@ -2684,7 +2679,7 @@ e1000_watchdog(unsigned long data)
                         DPRINTK(LINK, INFO, "NIC Link is Down\n");
                         netif_carrier_off(netdev);
                         netif_stop_queue(netdev);
-                        mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
+                        mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
 
                         /* 80003ES2LAN workaround--
                          * For packet buffer work-around on link down event;
@@ -2736,7 +2731,7 @@ e1000_watchdog(unsigned long data)
                 e1000_rar_set(&adapter->hw, adapter->hw.mac_addr, 0);
 
         /* Reset the timer */
-        mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+        mod_timer(&adapter->watchdog_timer, round_jiffies(jiffies + 2 * HZ));
 }
 
 enum latency_range {
@@ -3175,7 +3170,7 @@ e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
         uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
         uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
 
-        E1000_ROUNDUP(skb_fifo_len, E1000_FIFO_HDR);
+        skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
 
         if (adapter->link_duplex != HALF_DUPLEX)
                 goto no_fifo_stall_required;
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index f8862e203ac9..f485874a63f5 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -305,7 +305,7 @@ e1000_check_options(struct e1000_adapter *adapter)
                 if (num_TxDescriptors > bd) {
                         tx_ring->count = TxDescriptors[bd];
                         e1000_validate_option(&tx_ring->count, &opt, adapter);
-                        E1000_ROUNDUP(tx_ring->count,
+                        tx_ring->count = ALIGN(tx_ring->count,
                                                 REQ_TX_DESCRIPTOR_MULTIPLE);
                 } else {
                         tx_ring->count = opt.def;
@@ -331,7 +331,7 @@ e1000_check_options(struct e1000_adapter *adapter)
                 if (num_RxDescriptors > bd) {
                         rx_ring->count = RxDescriptors[bd];
                         e1000_validate_option(&rx_ring->count, &opt, adapter);
-                        E1000_ROUNDUP(rx_ring->count,
+                        rx_ring->count = ALIGN(rx_ring->count,
                                                 REQ_RX_DESCRIPTOR_MULTIPLE);
                 } else {
                         rx_ring->count = opt.def;
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 8aaf5ec0c360..7934ea37f944 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -115,6 +115,7 @@
 #include <linux/mca-legacy.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
+#include <linux/jiffies.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -556,7 +557,7 @@ static void unstick_cu(struct net_device *dev)
 
         if (lp->started)
         {
-                if ((jiffies - dev->trans_start)>50)
+                if (time_after(jiffies, dev->trans_start + 50))
                 {
                         if (lp->tx_link==lp->last_tx_restart)
                         {
@@ -612,7 +613,7 @@ static void unstick_cu(struct net_device *dev)
         }
         else
         {
-                if ((jiffies-lp->init_time)>10)
+                if (time_after(jiffies, lp->init_time + 10))
                 {
                         unsigned short status = scb_status(dev);
                         printk(KERN_WARNING "%s: i82586 startup timed out, status %04x, resetting...\n",
@@ -776,7 +777,7 @@ static unsigned short eexp_start_irq(struct net_device *dev,
 static void eexp_cmd_clear(struct net_device *dev)
 {
         unsigned long int oldtime = jiffies;
-        while (scb_rdcmd(dev) && ((jiffies-oldtime)<10));
+        while (scb_rdcmd(dev) && (time_before(jiffies, oldtime + 10)));
         if (scb_rdcmd(dev)) {
                 printk("%s: command didn't clear\n", dev->name);
         }
@@ -1649,7 +1650,7 @@ eexp_set_multicast(struct net_device *dev)
 #endif
                 oj = jiffies;
                 while ((SCB_CUstat(scb_status(dev)) == 2) &&
-                       ((jiffies-oj) < 2000));
+                       (time_before(jiffies, oj + 2000)));
                 if (SCB_CUstat(scb_status(dev)) == 2)
                         printk("%s: warning, CU didn't stop\n", dev->name);
                 lp->started &= ~(STARTED_CU);
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 42295d61ecd8..602872dbe15f 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0046"
+#define DRV_VERSION     "EHEA_0058"
 
 #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
         | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -78,10 +78,7 @@
 #define EHEA_RQ2_PKT_SIZE       1522
 #define EHEA_L_PKT_SIZE         256     /* low latency */
 
-#define EHEA_POLL_MAX_RWQE      1000
-
 /* Send completion signaling */
-#define EHEA_SIG_IV_LONG           1
 
 /* Protection Domain Identifier */
 #define EHEA_PD_ID        0xaabcdeff
@@ -108,11 +105,7 @@
 #define EHEA_CACHE_LINE          128
 
 /* Memory Regions */
-#define EHEA_MR_MAX_TX_PAGES   20
-#define EHEA_MR_TX_DATA_PN      3
 #define EHEA_MR_ACC_CTRL       0x00800000
-#define EHEA_RWQES_PER_MR_RQ2  10
-#define EHEA_RWQES_PER_MR_RQ3  10
 
 #define EHEA_WATCH_DOG_TIMEOUT 10*HZ
 
@@ -311,6 +304,7 @@ struct ehea_cq {
  * Memory Region
  */
 struct ehea_mr {
+        struct ehea_adapter *adapter;
         u64 handle;
         u64 vaddr;
         u32 lkey;
@@ -319,17 +313,12 @@ struct ehea_mr {
 /*
  * Port state information
  */
-struct port_state {
-        int poll_max_processed;
+struct port_stats {
         int poll_receive_errors;
-        int ehea_poll;
         int queue_stopped;
-        int min_swqe_avail;
-        u64 sqc_stop_sum;
-        int pkt_send;
-        int pkt_xmit;
-        int send_tasklet;
-        int nwqe;
+        int err_tcp_cksum;
+        int err_ip_cksum;
+        int err_frame_crc;
 };
 
 #define EHEA_IRQ_NAME_SIZE 20
@@ -348,6 +337,7 @@ struct ehea_q_skb_arr {
  * Port resources
  */
 struct ehea_port_res {
+        struct port_stats p_stats;
         struct ehea_mr send_mr;         /* send memory region */
         struct ehea_mr recv_mr;         /* receive memory region */
         spinlock_t xmit_lock;
@@ -357,9 +347,8 @@ struct ehea_port_res {
         struct ehea_qp *qp;
         struct ehea_cq *send_cq;
         struct ehea_cq *recv_cq;
-        struct ehea_eq *send_eq;
-        struct ehea_eq *recv_eq;
-        spinlock_t send_lock;
+        struct ehea_eq *eq;
+        struct net_device *d_netdev;
         struct ehea_q_skb_arr rq1_skba;
         struct ehea_q_skb_arr rq2_skba;
         struct ehea_q_skb_arr rq3_skba;
@@ -369,21 +358,18 @@ struct ehea_port_res {
         int swqe_refill_th;
         atomic_t swqe_avail;
         int swqe_ll_count;
-        int swqe_count;
         u32 swqe_id_counter;
         u64 tx_packets;
-        struct tasklet_struct send_comp_task;
-        spinlock_t recv_lock;
-        struct port_state p_state;
         u64 rx_packets;
         u32 poll_counter;
 };
 
 
+#define EHEA_MAX_PORTS 16
 struct ehea_adapter {
         u64 handle;
-        u8 num_ports;
-        struct ehea_port *port[16];
+        struct ibmebus_dev *ebus_dev;
+        struct ehea_port *port[EHEA_MAX_PORTS];
         struct ehea_eq *neq;       /* notification event queue */
         struct workqueue_struct *ehea_wq;
         struct tasklet_struct neq_tasklet;
@@ -406,7 +392,7 @@ struct ehea_port {
         struct net_device *netdev;
         struct net_device_stats stats;
         struct ehea_port_res port_res[EHEA_MAX_PORT_RES];
-        struct device_node *of_dev_node; /* Open Firmware Device Node */
+        struct of_device  ofdev; /* Open Firmware Device */
         struct ehea_mc_list *mc_list;    /* Multicast MAC addresses */
         struct vlan_group *vgrp;
         struct ehea_eq *qp_eq;
@@ -415,7 +401,9 @@ struct ehea_port {
         char int_aff_name[EHEA_IRQ_NAME_SIZE];
         int allmulti;                    /* Indicates IFF_ALLMULTI state */
         int promisc;                     /* Indicates IFF_PROMISC state */
+        int num_tx_qps;
         int num_add_tx_qps;
+        int num_mcs;
         int resets;
         u64 mac_addr;
         u32 logical_port_id;
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index 9f57c2e78ced..decec8cfe96b 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -144,8 +144,8 @@ static int ehea_nway_reset(struct net_device *dev)
 static void ehea_get_drvinfo(struct net_device *dev,
                                struct ethtool_drvinfo *info)
 {
-        strlcpy(info->driver, DRV_NAME, sizeof(info->driver) - 1);
-        strlcpy(info->version, DRV_VERSION, sizeof(info->version) - 1);
+        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
+        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
 }
 
 static u32 ehea_get_msglevel(struct net_device *dev)
@@ -166,33 +166,23 @@ static u32 ehea_get_rx_csum(struct net_device *dev)
 }
 
 static char ehea_ethtool_stats_keys[][ETH_GSTRING_LEN] = {
-        {"poll_max_processed"},
-        {"queue_stopped"},
-        {"min_swqe_avail"},
-        {"poll_receive_err"},
-        {"pkt_send"},
-        {"pkt_xmit"},
-        {"send_tasklet"},
-        {"ehea_poll"},
-        {"nwqe"},
-        {"swqe_available_0"},
         {"sig_comp_iv"},
         {"swqe_refill_th"},
         {"port resets"},
-        {"rxo"},
-        {"rx64"},
-        {"rx65"},
-        {"rx128"},
-        {"rx256"},
-        {"rx512"},
-        {"rx1024"},
-        {"txo"},
-        {"tx64"},
-        {"tx65"},
-        {"tx128"},
-        {"tx256"},
-        {"tx512"},
-        {"tx1024"},
+        {"Receive errors"},
+        {"TCP cksum errors"},
+        {"IP cksum errors"},
+        {"Frame cksum errors"},
+        {"num SQ stopped"},
+        {"SQ stopped"},
+        {"PR0 free_swqes"},
+        {"PR1 free_swqes"},
+        {"PR2 free_swqes"},
+        {"PR3 free_swqes"},
+        {"PR4 free_swqes"},
+        {"PR5 free_swqes"},
+        {"PR6 free_swqes"},
+        {"PR7 free_swqes"},
 };
 
 static void ehea_get_strings(struct net_device *dev, u32 stringset, u8 *data)
@@ -211,63 +201,44 @@ static int ehea_get_stats_count(struct net_device *dev)
 static void ehea_get_ethtool_stats(struct net_device *dev,
                                      struct ethtool_stats *stats, u64 *data)
 {
-        u64 hret;
-        int i;
+        int i, k, tmp;
         struct ehea_port *port = netdev_priv(dev);
-        struct ehea_adapter *adapter = port->adapter;
-        struct ehea_port_res *pr = &port->port_res[0];
-        struct port_state *p_state = &pr->p_state;
-        struct hcp_ehea_port_cb6 *cb6;
 
         for (i = 0; i < ehea_get_stats_count(dev); i++)
                 data[i] = 0;
-
         i = 0;
 
-        data[i++] = p_state->poll_max_processed;
-        data[i++] = p_state->queue_stopped;
-        data[i++] = p_state->min_swqe_avail;
-        data[i++] = p_state->poll_receive_errors;
-        data[i++] = p_state->pkt_send;
-        data[i++] = p_state->pkt_xmit;
-        data[i++] = p_state->send_tasklet;
-        data[i++] = p_state->ehea_poll;
-        data[i++] = p_state->nwqe;
-        data[i++] = atomic_read(&port->port_res[0].swqe_avail);
         data[i++] = port->sig_comp_iv;
         data[i++] = port->port_res[0].swqe_refill_th;
         data[i++] = port->resets;
 
-        cb6 = kzalloc(PAGE_SIZE, GFP_KERNEL);
-        if (!cb6) {
-                ehea_error("no mem for cb6");
-                return;
-        }
+        for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
+                tmp += port->port_res[k].p_stats.poll_receive_errors;
+        data[i++] = tmp;
+
+        for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
+                tmp += port->port_res[k].p_stats.err_tcp_cksum;
+        data[i++] = tmp;
+
+        for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
+                tmp += port->port_res[k].p_stats.err_ip_cksum;
+        data[i++] = tmp;
+
+        for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
+                tmp += port->port_res[k].p_stats.err_frame_crc;
+        data[i++] = tmp;
+
+        for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
+                tmp += port->port_res[k].p_stats.queue_stopped;
+        data[i++] = tmp;
+
+        for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
+                tmp |= port->port_res[k].queue_stopped;
+        data[i++] = tmp;
+
+        for (k = 0; k < 8; k++)
+                data[i++] = atomic_read(&port->port_res[k].swqe_avail);
 
-        hret = ehea_h_query_ehea_port(adapter->handle, port->logical_port_id,
-                                      H_PORT_CB6, H_PORT_CB6_ALL, cb6);
-        if (netif_msg_hw(port))
-                ehea_dump(cb6, sizeof(*cb6), "ehea_get_ethtool_stats");
-
-        if (hret == H_SUCCESS) {
-                data[i++] = cb6->rxo;
-                data[i++] = cb6->rx64;
-                data[i++] = cb6->rx65;
-                data[i++] = cb6->rx128;
-                data[i++] = cb6->rx256;
-                data[i++] = cb6->rx512;
-                data[i++] = cb6->rx1024;
-                data[i++] = cb6->txo;
-                data[i++] = cb6->tx64;
-                data[i++] = cb6->tx65;
-                data[i++] = cb6->tx128;
-                data[i++] = cb6->tx256;
-                data[i++] = cb6->tx512;
-                data[i++] = cb6->tx1024;
-        } else
-                ehea_error("query_ehea_port failed");
-
-        kfree(cb6);
 }
 
 const struct ethtool_ops ehea_ethtool_ops = {
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 58364a0ff378..c7a5614e66c0 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -51,13 +51,18 @@ static int rq1_entries = EHEA_DEF_ENTRIES_RQ1;
 static int rq2_entries = EHEA_DEF_ENTRIES_RQ2;
 static int rq3_entries = EHEA_DEF_ENTRIES_RQ3;
 static int sq_entries = EHEA_DEF_ENTRIES_SQ;
+static int use_mcs = 0;
+static int num_tx_qps = EHEA_NUM_TX_QP;
 
 module_param(msg_level, int, 0);
 module_param(rq1_entries, int, 0);
 module_param(rq2_entries, int, 0);
 module_param(rq3_entries, int, 0);
 module_param(sq_entries, int, 0);
+module_param(use_mcs, int, 0);
+module_param(num_tx_qps, int, 0);
 
+MODULE_PARM_DESC(num_tx_qps, "Number of TX-QPS");
 MODULE_PARM_DESC(msg_level, "msg_level");
 MODULE_PARM_DESC(rq3_entries, "Number of entries for Receive Queue 3 "
                  "[2^x - 1], x = [6..14]. Default = "
@@ -71,6 +76,29 @@ MODULE_PARM_DESC(rq1_entries, "Number of entries for Receive Queue 1 "
 MODULE_PARM_DESC(sq_entries, " Number of entries for the Send Queue  "
                  "[2^x - 1], x = [6..14]. Default = "
                  __MODULE_STRING(EHEA_DEF_ENTRIES_SQ) ")");
+MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 1 ");
+
+static int port_name_cnt = 0;
+
+static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
+                                        const struct of_device_id *id);
+
+static int __devexit ehea_remove(struct ibmebus_dev *dev);
+
+static struct of_device_id ehea_device_table[] = {
+        {
+                .name = "lhea",
+                .compatible = "IBM,lhea",
+        },
+        {},
+};
+
+static struct ibmebus_driver ehea_driver = {
+        .name = "ehea",
+        .id_table = ehea_device_table,
+        .probe = ehea_probe_adapter,
+        .remove = ehea_remove,
+};
 
 void ehea_dump(void *adr, int len, char *msg) {
         int x;
@@ -197,7 +225,7 @@ static int ehea_refill_rq_def(struct ehea_port_res *pr,
                 struct sk_buff *skb = netdev_alloc_skb(dev, packet_size);
                 if (!skb) {
                         ehea_error("%s: no mem for skb/%d wqes filled",
-                                   dev->name, i);
+                                   pr->port->netdev->name, i);
                         q_skba->os_skbs = fill_wqes - i;
                         ret = -ENOMEM;
                         break;
@@ -321,6 +349,13 @@ static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq,
 {
         struct sk_buff *skb;
 
+        if (cqe->status & EHEA_CQE_STAT_ERR_TCP)
+                pr->p_stats.err_tcp_cksum++;
+        if (cqe->status & EHEA_CQE_STAT_ERR_IP)
+                pr->p_stats.err_ip_cksum++;
+        if (cqe->status & EHEA_CQE_STAT_ERR_CRC)
+                pr->p_stats.err_frame_crc++;
+
         if (netif_msg_rx_err(pr->port)) {
                 ehea_error("CQE Error for QP %d", pr->qp->init_attr.qp_nr);
                 ehea_dump(cqe, sizeof(*cqe), "CQE");
@@ -345,10 +380,11 @@ static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq,
         return 0;
 }
 
-static int ehea_poll(struct net_device *dev, int *budget)
+static struct ehea_cqe *ehea_proc_rwqes(struct net_device *dev,
+                                        struct ehea_port_res *pr,
+                                        int *budget)
 {
-        struct ehea_port *port = netdev_priv(dev);
-        struct ehea_port_res *pr = &port->port_res[0];
+        struct ehea_port *port = pr->port;
         struct ehea_qp *qp = pr->qp;
         struct ehea_cqe *cqe;
         struct sk_buff *skb;
@@ -359,14 +395,12 @@ static int ehea_poll(struct net_device *dev, int *budget)
         int skb_arr_rq2_len = pr->rq2_skba.len;
         int skb_arr_rq3_len = pr->rq3_skba.len;
         int processed, processed_rq1, processed_rq2, processed_rq3;
-        int wqe_index, last_wqe_index, rq, intreq, my_quota, port_reset;
+        int wqe_index, last_wqe_index, rq, my_quota, port_reset;
 
         processed = processed_rq1 = processed_rq2 = processed_rq3 = 0;
         last_wqe_index = 0;
         my_quota = min(*budget, dev->quota);
-        my_quota = min(my_quota, EHEA_POLL_MAX_RWQE);
 
-        /* rq0 is low latency RQ */
         cqe = ehea_poll_rq1(qp, &wqe_index);
         while ((my_quota > 0) && cqe) {
                 ehea_inc_rq1(qp);
@@ -386,7 +420,8 @@ static int ehea_poll(struct net_device *dev, int *budget)
                                 if (unlikely(!skb)) {
                                         if (netif_msg_rx_err(port))
                                                 ehea_error("LL rq1: skb=NULL");
-                                        skb = netdev_alloc_skb(dev,
+
+                                        skb = netdev_alloc_skb(port->netdev,
                                                                EHEA_L_PKT_SIZE);
                                         if (!skb)
                                                 break;
@@ -402,7 +437,7 @@ static int ehea_poll(struct net_device *dev, int *budget)
                                                 ehea_error("rq2: skb=NULL");
                                         break;
                                 }
-                                ehea_fill_skb(dev, skb, cqe);
+                                ehea_fill_skb(port->netdev, skb, cqe);
                                 processed_rq2++;
                         } else {  /* RQ3 */
                                 skb = get_skb_by_index(skb_arr_rq3,
@@ -412,7 +447,7 @@ static int ehea_poll(struct net_device *dev, int *budget)
                                                 ehea_error("rq3: skb=NULL");
                                         break;
                                 }
-                                ehea_fill_skb(dev, skb, cqe);
+                                ehea_fill_skb(port->netdev, skb, cqe);
                                 processed_rq3++;
                         }
 
@@ -421,9 +456,8 @@ static int ehea_poll(struct net_device *dev, int *budget)
                                                          cqe->vlan_tag);
                         else
                                 netif_receive_skb(skb);
-
-                } else { /* Error occured */
-                        pr->p_state.poll_receive_errors++;
+                } else {
+                        pr->p_stats.poll_receive_errors++;
                         port_reset = ehea_treat_poll_error(pr, rq, cqe,
                                                            &processed_rq2,
                                                            &processed_rq3);
@@ -433,72 +467,32 @@ static int ehea_poll(struct net_device *dev, int *budget)
                 cqe = ehea_poll_rq1(qp, &wqe_index);
         }
 
-        dev->quota -= processed;
-        *budget -= processed;
-
-        pr->p_state.ehea_poll += 1;
         pr->rx_packets += processed;
+        *budget -= processed;
 
         ehea_refill_rq1(pr, last_wqe_index, processed_rq1);
         ehea_refill_rq2(pr, processed_rq2);
         ehea_refill_rq3(pr, processed_rq3);
 
-        intreq = ((pr->p_state.ehea_poll & 0xF) == 0xF);
-
-        if (!cqe || intreq) {
-                netif_rx_complete(dev);
-                ehea_reset_cq_ep(pr->recv_cq);
-                ehea_reset_cq_n1(pr->recv_cq);
-                cqe = hw_qeit_get_valid(&qp->hw_rqueue1);
-                if (!cqe || intreq)
-                        return 0;
-                if (!netif_rx_reschedule(dev, my_quota))
-                        return 0;
-        }
-        return 1;
+        cqe = ehea_poll_rq1(qp, &wqe_index);
+        return cqe;
 }
 
-void free_sent_skbs(struct ehea_cqe *cqe, struct ehea_port_res *pr)
+static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota)
 {
         struct sk_buff *skb;
-        int index, max_index_mask, i;
-
-        index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, cqe->wr_id);
-        max_index_mask = pr->sq_skba.len - 1;
-        for (i = 0; i < EHEA_BMASK_GET(EHEA_WR_ID_REFILL, cqe->wr_id); i++) {
-                skb = pr->sq_skba.arr[index];
-                if (likely(skb)) {
-                        dev_kfree_skb(skb);
-                        pr->sq_skba.arr[index] = NULL;
-                } else {
-                        ehea_error("skb=NULL, wr_id=%lX, loop=%d, index=%d",
-                                   cqe->wr_id, i, index);
-                }
-                index--;
-                index &= max_index_mask;
-        }
-}
-
-#define MAX_SENDCOMP_QUOTA 400
-void ehea_send_irq_tasklet(unsigned long data)
-{
-        struct ehea_port_res *pr = (struct ehea_port_res*)data;
         struct ehea_cq *send_cq = pr->send_cq;
         struct ehea_cqe *cqe;
-        int quota = MAX_SENDCOMP_QUOTA;
+        int quota = my_quota;
         int cqe_counter = 0;
         int swqe_av = 0;
+        int index;
         unsigned long flags;
 
-        do {
-                cqe = ehea_poll_cq(send_cq);
-                if (!cqe) {
-                        ehea_reset_cq_ep(send_cq);
-                        ehea_reset_cq_n1(send_cq);
-                        cqe = ehea_poll_cq(send_cq);
-                        if (!cqe)
-                                break;
-                }
+        cqe = ehea_poll_cq(send_cq);
+        while(cqe && (quota > 0)) {
+                ehea_inc_cq(send_cq);
+
                 cqe_counter++;
                 rmb();
                 if (cqe->status & EHEA_CQE_STAT_ERR_MASK) {
@@ -514,17 +508,25 @@ void ehea_send_irq_tasklet(unsigned long data)
                         ehea_dump(cqe, sizeof(*cqe), "CQE");
 
                 if (likely(EHEA_BMASK_GET(EHEA_WR_ID_TYPE, cqe->wr_id)
-                           == EHEA_SWQE2_TYPE))
-                        free_sent_skbs(cqe, pr);
+                           == EHEA_SWQE2_TYPE)) {
+
+                        index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, cqe->wr_id);
+                        skb = pr->sq_skba.arr[index];
+                        dev_kfree_skb(skb);
+                        pr->sq_skba.arr[index] = NULL;
+                }
 
                 swqe_av += EHEA_BMASK_GET(EHEA_WR_ID_REFILL, cqe->wr_id);
                 quota--;
-        } while (quota > 0);
+
+                cqe = ehea_poll_cq(send_cq);
+        };
 
         ehea_update_feca(send_cq, cqe_counter);
         atomic_add(swqe_av, &pr->swqe_avail);
 
         spin_lock_irqsave(&pr->netif_queue, flags);
+
         if (pr->queue_stopped && (atomic_read(&pr->swqe_avail)
                                   >= pr->swqe_refill_th)) {
                 netif_wake_queue(pr->port->netdev);
@@ -532,22 +534,55 @@ void ehea_send_irq_tasklet(unsigned long data)
         }
         spin_unlock_irqrestore(&pr->netif_queue, flags);
 
-        if (unlikely(cqe))
-                tasklet_hi_schedule(&pr->send_comp_task);
+        return cqe;
 }
 
-static irqreturn_t ehea_send_irq_handler(int irq, void *param)
+#define EHEA_NAPI_POLL_NUM_BEFORE_IRQ 16
+
+static int ehea_poll(struct net_device *dev, int *budget)
 {
-        struct ehea_port_res *pr = param;
-        tasklet_hi_schedule(&pr->send_comp_task);
-        return IRQ_HANDLED;
+        struct ehea_port_res *pr = dev->priv;
+        struct ehea_cqe *cqe;
+        struct ehea_cqe *cqe_skb = NULL;
+        int force_irq, wqe_index;
+
+        cqe = ehea_poll_rq1(pr->qp, &wqe_index);
+        cqe_skb = ehea_poll_cq(pr->send_cq);
+
+        force_irq = (pr->poll_counter > EHEA_NAPI_POLL_NUM_BEFORE_IRQ);
+
+        if ((!cqe && !cqe_skb) || force_irq) {
+                pr->poll_counter = 0;
+                netif_rx_complete(dev);
+                ehea_reset_cq_ep(pr->recv_cq);
+                ehea_reset_cq_ep(pr->send_cq);
+                ehea_reset_cq_n1(pr->recv_cq);
+                ehea_reset_cq_n1(pr->send_cq);
+                cqe = ehea_poll_rq1(pr->qp, &wqe_index);
+                cqe_skb = ehea_poll_cq(pr->send_cq);
+
+                if (!cqe && !cqe_skb)
+                        return 0;
+
+                if (!netif_rx_reschedule(dev, dev->quota))
+                        return 0;
+        }
+
+        cqe = ehea_proc_rwqes(dev, pr, budget);
+        cqe_skb = ehea_proc_cqes(pr, 300);
+
+        if (cqe || cqe_skb)
+                pr->poll_counter++;
+
+        return 1;
 }
 
 static irqreturn_t ehea_recv_irq_handler(int irq, void *param)
 {
         struct ehea_port_res *pr = param;
-        struct ehea_port *port = pr->port;
-        netif_rx_schedule(port->netdev);
+
+        netif_rx_schedule(pr->d_netdev);
+
         return IRQ_HANDLED;
 }
 
@@ -580,7 +615,7 @@ static struct ehea_port *ehea_get_port(struct ehea_adapter *adapter,
 {
         int i;
 
-        for (i = 0; i < adapter->num_ports; i++)
+        for (i = 0; i < EHEA_MAX_PORTS; i++)
                 if (adapter->port[i])
                         if (adapter->port[i]->logical_port_id == logical_port)
                                 return adapter->port[i];
@@ -650,19 +685,25 @@ int ehea_sense_port_attr(struct ehea_port *port)
         }
 
         port->autoneg = 1;
+        port->num_mcs = cb0->num_default_qps;
 
         /* Number of default QPs */
-        port->num_def_qps = cb0->num_default_qps;
+        if (use_mcs)
+                port->num_def_qps = cb0->num_default_qps;
+        else
+                port->num_def_qps = 1;
 
         if (!port->num_def_qps) {
                 ret = -EINVAL;
                 goto out_free;
         }
 
-        if (port->num_def_qps >= EHEA_NUM_TX_QP)
+        port->num_tx_qps = num_tx_qps;
+
+        if (port->num_def_qps >= port->num_tx_qps)
                 port->num_add_tx_qps = 0;
         else
-                port->num_add_tx_qps = EHEA_NUM_TX_QP - port->num_def_qps;
+                port->num_add_tx_qps = port->num_tx_qps - port->num_def_qps;
 
         ret = 0;
 out_free:
@@ -882,23 +923,6 @@ static int ehea_reg_interrupts(struct net_device *dev)
         struct ehea_port_res *pr;
         int i, ret;
 
-        for (i = 0; i < port->num_def_qps; i++) {
-                pr = &port->port_res[i];
-                snprintf(pr->int_recv_name, EHEA_IRQ_NAME_SIZE - 1
-                         , "%s-recv%d", dev->name, i);
-                ret = ibmebus_request_irq(NULL, pr->recv_eq->attr.ist1,
-                                          ehea_recv_irq_handler,
-                                          IRQF_DISABLED, pr->int_recv_name, pr);
-                if (ret) {
-                        ehea_error("failed registering irq for ehea_recv_int:"
-                                   "port_res_nr:%d, ist=%X", i,
-                                   pr->recv_eq->attr.ist1);
-                        goto out_free_seq;
-                }
-                if (netif_msg_ifup(port))
-                        ehea_info("irq_handle 0x%X for funct ehea_recv_int %d "
-                                  "registered", pr->recv_eq->attr.ist1, i);
-        }
 
         snprintf(port->int_aff_name, EHEA_IRQ_NAME_SIZE - 1, "%s-aff",
                  dev->name);
@@ -916,41 +940,41 @@ static int ehea_reg_interrupts(struct net_device *dev)
                 ehea_info("irq_handle 0x%X for function qp_aff_irq_handler "
                           "registered", port->qp_eq->attr.ist1);
 
+
         for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) {
                 pr = &port->port_res[i];
                 snprintf(pr->int_send_name, EHEA_IRQ_NAME_SIZE - 1,
-                         "%s-send%d", dev->name, i);
-                ret = ibmebus_request_irq(NULL, pr->send_eq->attr.ist1,
-                                          ehea_send_irq_handler,
+                         "%s-queue%d", dev->name, i);
+                ret = ibmebus_request_irq(NULL, pr->eq->attr.ist1,
+                                          ehea_recv_irq_handler,
                                           IRQF_DISABLED, pr->int_send_name,
                                           pr);
                 if (ret) {
-                        ehea_error("failed registering irq for ehea_send "
+                        ehea_error("failed registering irq for ehea_queue "
                                    "port_res_nr:%d, ist=%X", i,
-                                   pr->send_eq->attr.ist1);
+                                   pr->eq->attr.ist1);
                         goto out_free_req;
                 }
                 if (netif_msg_ifup(port))
-                        ehea_info("irq_handle 0x%X for function ehea_send_int "
-                                  "%d registered", pr->send_eq->attr.ist1, i);
+                        ehea_info("irq_handle 0x%X for function ehea_queue_int "
+                                  "%d registered", pr->eq->attr.ist1, i);
         }
 out:
         return ret;
 
+
 out_free_req:
         while (--i >= 0) {
-                u32 ist = port->port_res[i].send_eq->attr.ist1;
+                u32 ist = port->port_res[i].eq->attr.ist1;
                 ibmebus_free_irq(NULL, ist, &port->port_res[i]);
         }
+
 out_free_qpeq:
         ibmebus_free_irq(NULL, port->qp_eq->attr.ist1, port);
         i = port->num_def_qps;
-out_free_seq:
-        while (--i >= 0) {
-                u32 ist = port->port_res[i].recv_eq->attr.ist1;
-                ibmebus_free_irq(NULL, ist, &port->port_res[i]);
-        }
+
         goto out;
+
 }
 
 static void ehea_free_interrupts(struct net_device *dev)
@@ -960,21 +984,13 @@ static void ehea_free_interrupts(struct net_device *dev)
         int i;
 
         /* send */
+
         for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) {
                 pr = &port->port_res[i];
-                ibmebus_free_irq(NULL, pr->send_eq->attr.ist1, pr);
+                ibmebus_free_irq(NULL, pr->eq->attr.ist1, pr);
                 if (netif_msg_intr(port))
                         ehea_info("free send irq for res %d with handle 0x%X",
-                                  i, pr->send_eq->attr.ist1);
-        }
-
-        /* receive */
-        for (i = 0; i < port->num_def_qps; i++) {
-                pr = &port->port_res[i];
-                ibmebus_free_irq(NULL, pr->recv_eq->attr.ist1, pr);
-                if (netif_msg_intr(port))
-                        ehea_info("free recv irq for res %d with handle 0x%X",
-                                  i, pr->recv_eq->attr.ist1);
+                                  i, pr->eq->attr.ist1);
         }
 
         /* associated events */
@@ -1003,8 +1019,13 @@ static int ehea_configure_port(struct ehea_port *port)
                                       PXLY_RC_VLAN_FILTER)
                      | EHEA_BMASK_SET(PXLY_RC_JUMBO_FRAME, 1);
 
-        for (i = 0; i < port->num_def_qps; i++)
-                cb0->default_qpn_arr[i] = port->port_res[0].qp->init_attr.qp_nr;
+        for (i = 0; i < port->num_mcs; i++)
+                if (use_mcs)
+                        cb0->default_qpn_arr[i] =
+                                port->port_res[i].qp->init_attr.qp_nr;
+                else
+                        cb0->default_qpn_arr[i] =
+                                port->port_res[0].qp->init_attr.qp_nr;
 
         if (netif_msg_ifup(port))
                 ehea_dump(cb0, sizeof(*cb0), "ehea_configure_port");
@@ -1027,52 +1048,35 @@ out:
         return ret;
 }
 
-static int ehea_gen_smrs(struct ehea_port_res *pr)
+int ehea_gen_smrs(struct ehea_port_res *pr)
 {
-        u64 hret;
+        int ret;
         struct ehea_adapter *adapter = pr->port->adapter;
 
-        hret = ehea_h_register_smr(adapter->handle, adapter->mr.handle,
-                                   adapter->mr.vaddr, EHEA_MR_ACC_CTRL,
-                                   adapter->pd, &pr->send_mr);
-        if (hret != H_SUCCESS)
+        ret = ehea_gen_smr(adapter, &adapter->mr, &pr->send_mr);
+        if (ret)
                 goto out;
 
-        hret = ehea_h_register_smr(adapter->handle, adapter->mr.handle,
-                                   adapter->mr.vaddr, EHEA_MR_ACC_CTRL,
-                                   adapter->pd, &pr->recv_mr);
-        if (hret != H_SUCCESS)
-                goto out_freeres;
+        ret = ehea_gen_smr(adapter, &adapter->mr, &pr->recv_mr);
+        if (ret)
+                goto out_free;
 
         return 0;
 
-out_freeres:
-        hret = ehea_h_free_resource(adapter->handle, pr->send_mr.handle);
-        if (hret != H_SUCCESS)
-                ehea_error("failed freeing SMR");
+out_free:
+        ehea_rem_mr(&pr->send_mr);
 out:
+        ehea_error("Generating SMRS failed\n");
         return -EIO;
 }
 
-static int ehea_rem_smrs(struct ehea_port_res *pr)
+int ehea_rem_smrs(struct ehea_port_res *pr)
 {
-        struct ehea_adapter *adapter = pr->port->adapter;
-        int ret = 0;
-        u64 hret;
-
-        hret = ehea_h_free_resource(adapter->handle, pr->send_mr.handle);
-        if (hret != H_SUCCESS) {
-                ret = -EIO;
-                ehea_error("failed freeing send SMR for pr=%p", pr);
-        }
-
-        hret = ehea_h_free_resource(adapter->handle, pr->recv_mr.handle);
-        if (hret != H_SUCCESS) {
-                ret = -EIO;
-                ehea_error("failed freeing recv SMR for pr=%p", pr);
-        }
-
-        return ret;
+        if ((ehea_rem_mr(&pr->send_mr))
+            || (ehea_rem_mr(&pr->recv_mr)))
+                return -EIO;
+        else
+                return 0;
 }
 
 static int ehea_init_q_skba(struct ehea_q_skb_arr *q_skba, int max_q_entries)
@@ -1103,25 +1107,17 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,
         memset(pr, 0, sizeof(struct ehea_port_res));
 
         pr->port = port;
-        spin_lock_init(&pr->send_lock);
-        spin_lock_init(&pr->recv_lock);
         spin_lock_init(&pr->xmit_lock);
         spin_lock_init(&pr->netif_queue);
 
-        pr->recv_eq = ehea_create_eq(adapter, eq_type, EHEA_MAX_ENTRIES_EQ, 0);
-        if (!pr->recv_eq) {
-                ehea_error("create_eq failed (recv_eq)");
-                goto out_free;
-        }
-
-        pr->send_eq = ehea_create_eq(adapter, eq_type, EHEA_MAX_ENTRIES_EQ, 0);
-        if (!pr->send_eq) {
-                ehea_error("create_eq failed (send_eq)");
+        pr->eq = ehea_create_eq(adapter, eq_type, EHEA_MAX_ENTRIES_EQ, 0);
+        if (!pr->eq) {
+                ehea_error("create_eq failed (eq)");
                 goto out_free;
         }
 
         pr->recv_cq = ehea_create_cq(adapter, pr_cfg->max_entries_rcq,
-                                     pr->recv_eq->fw_handle,
+                                     pr->eq->fw_handle,
                                      port->logical_port_id);
         if (!pr->recv_cq) {
                 ehea_error("create_cq failed (cq_recv)");
@@ -1129,7 +1125,7 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,
         }
 
         pr->send_cq = ehea_create_cq(adapter, pr_cfg->max_entries_scq,
-                                     pr->send_eq->fw_handle,
+                                     pr->eq->fw_handle,
                                      port->logical_port_id);
         if (!pr->send_cq) {
                 ehea_error("create_cq failed (cq_send)");
@@ -1194,11 +1190,20 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,
                 ret = -EIO;
                 goto out_free;
         }
-        tasklet_init(&pr->send_comp_task, ehea_send_irq_tasklet,
-                     (unsigned long)pr);
+
         atomic_set(&pr->swqe_avail, init_attr->act_nr_send_wqes - 1);
 
         kfree(init_attr);
+
+        pr->d_netdev = alloc_netdev(0, "", ether_setup);
+        if (!pr->d_netdev)
+                goto out_free;
+        pr->d_netdev->priv = pr;
+        pr->d_netdev->weight = 64;
+        pr->d_netdev->poll = ehea_poll;
+        set_bit(__LINK_STATE_START, &pr->d_netdev->state);
+        strcpy(pr->d_netdev->name, port->netdev->name);
+
         ret = 0;
         goto out;
 
@@ -1211,8 +1216,7 @@ out_free:
         ehea_destroy_qp(pr->qp);
         ehea_destroy_cq(pr->send_cq);
         ehea_destroy_cq(pr->recv_cq);
-        ehea_destroy_eq(pr->send_eq);
-        ehea_destroy_eq(pr->recv_eq);
+        ehea_destroy_eq(pr->eq);
 out:
         return ret;
 }
@@ -1221,13 +1225,14 @@ static int ehea_clean_portres(struct ehea_port *port, struct ehea_port_res *pr)
 {
         int ret, i;
 
+        free_netdev(pr->d_netdev);
+
         ret = ehea_destroy_qp(pr->qp);
 
         if (!ret) {
                 ehea_destroy_cq(pr->send_cq);
                 ehea_destroy_cq(pr->recv_cq);
-                ehea_destroy_eq(pr->send_eq);
-                ehea_destroy_eq(pr->recv_eq);
+                ehea_destroy_eq(pr->eq);
 
                 for (i = 0; i < pr->rq1_skba.len; i++)
                         if (pr->rq1_skba.arr[i])
@@ -1792,6 +1797,22 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
         dev_kfree_skb(skb);
 }
 
+static inline int ehea_hash_skb(struct sk_buff *skb, int num_qps)
+{
+        struct tcphdr *tcp;
+        u32 tmp;
+
+        if ((skb->protocol == htons(ETH_P_IP)) &&
+            (skb->nh.iph->protocol == IPPROTO_TCP)) {
+                tcp = (struct tcphdr*)(skb->nh.raw + (skb->nh.iph->ihl * 4));
+                tmp = (tcp->source + (tcp->dest << 16)) % 31;
+                tmp += skb->nh.iph->daddr % 31;
+                return tmp % num_qps;
+        }
+        else
+                return 0;
+}
+
 static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ehea_port *port = netdev_priv(dev);
@@ -1799,9 +1820,17 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned long flags;
         u32 lkey;
         int swqe_index;
-        struct ehea_port_res *pr = &port->port_res[0];
+        struct ehea_port_res *pr;
+
+        pr = &port->port_res[ehea_hash_skb(skb, port->num_tx_qps)];
 
-        spin_lock(&pr->xmit_lock);
+        if (!spin_trylock(&pr->xmit_lock))
+                return NETDEV_TX_BUSY;
+
+        if (pr->queue_stopped) {
+                spin_unlock(&pr->xmit_lock);
+                return NETDEV_TX_BUSY;
+        }
 
         swqe = ehea_get_swqe(pr->qp, &swqe_index);
         memset(swqe, 0, SWQE_HEADER_SIZE);
@@ -1824,6 +1853,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 swqe->wr_id =
                         EHEA_BMASK_SET(EHEA_WR_ID_TYPE, EHEA_SWQE2_TYPE)
                       | EHEA_BMASK_SET(EHEA_WR_ID_COUNT, pr->swqe_id_counter)
+                      | EHEA_BMASK_SET(EHEA_WR_ID_REFILL, 1)
                       | EHEA_BMASK_SET(EHEA_WR_ID_INDEX, pr->sq_skba.index);
                 pr->sq_skba.arr[pr->sq_skba.index] = skb;
 
@@ -1832,14 +1862,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 lkey = pr->send_mr.lkey;
                 ehea_xmit2(skb, dev, swqe, lkey);
-
-                if (pr->swqe_count >= (EHEA_SIG_IV_LONG - 1)) {
-                        swqe->wr_id |= EHEA_BMASK_SET(EHEA_WR_ID_REFILL,
-                                                      EHEA_SIG_IV_LONG);
-                        swqe->tx_control |= EHEA_SWQE_SIGNALLED_COMPLETION;
-                        pr->swqe_count = 0;
-                } else
-                        pr->swqe_count += 1;
+                swqe->tx_control |= EHEA_SWQE_SIGNALLED_COMPLETION;
         }
         pr->swqe_id_counter += 1;
 
@@ -1859,6 +1882,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (unlikely(atomic_read(&pr->swqe_avail) <= 1)) {
                 spin_lock_irqsave(&pr->netif_queue, flags);
                 if (unlikely(atomic_read(&pr->swqe_avail) <= 1)) {
+                        pr->p_stats.queue_stopped++;
                         netif_stop_queue(dev);
                         pr->queue_stopped = 1;
                 }
@@ -2060,7 +2084,7 @@ static int ehea_port_res_setup(struct ehea_port *port, int def_qps,
         }
 
         pr_cfg.max_entries_rcq = rq1_entries + rq2_entries + rq3_entries;
-        pr_cfg.max_entries_scq = sq_entries;
+        pr_cfg.max_entries_scq = sq_entries * 2;
         pr_cfg.max_entries_sq = sq_entries;
         pr_cfg.max_entries_rq1 = rq1_entries;
         pr_cfg.max_entries_rq2 = rq2_entries;
@@ -2109,6 +2133,28 @@ static int ehea_clean_all_portres(struct ehea_port *port)
         return ret;
 }
 
+static void ehea_remove_adapter_mr (struct ehea_adapter *adapter)
+{
+        int i;
+
+        for (i=0; i < EHEA_MAX_PORTS; i++)
+                if (adapter->port[i])
+                        return;
+
+        ehea_rem_mr(&adapter->mr);
+}
+
+static int ehea_add_adapter_mr (struct ehea_adapter *adapter)
+{
+        int i;
+
+        for (i=0; i < EHEA_MAX_PORTS; i++)
+                if (adapter->port[i])
+                        return 0;
+
+        return ehea_reg_kernel_mr(adapter, &adapter->mr);
+}
+
 static int ehea_up(struct net_device *dev)
 {
         int ret, i;
@@ -2208,8 +2254,10 @@ static int ehea_down(struct net_device *dev)
         ehea_drop_multicast_list(dev);
         ehea_free_interrupts(dev);
 
-        for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)
-                tasklet_kill(&port->port_res[i].send_comp_task);
+        for (i = 0; i < port->num_def_qps; i++)
+                while (test_bit(__LINK_STATE_RX_SCHED,
+                                &port->port_res[i].d_netdev->state))
+                        msleep(1);
 
         ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
         ret = ehea_clean_all_portres(port);
@@ -2276,8 +2324,6 @@ static void ehea_tx_watchdog(struct net_device *dev)
 int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
 {
         struct hcp_query_ehea *cb;
-        struct device_node *lhea_dn = NULL;
-        struct device_node *eth_dn = NULL;
         u64 hret;
         int ret;
 
@@ -2294,18 +2340,6 @@ int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
                 goto out_herr;
         }
 
-        /* Determine the number of available logical ports
-         * by counting the child nodes of the lhea OFDT entry
-         */
-        adapter->num_ports = 0;
-        lhea_dn = of_find_node_by_name(lhea_dn, "lhea");
-        do {
-                eth_dn = of_get_next_child(lhea_dn, eth_dn);
-                if (eth_dn)
-                        adapter->num_ports++;
-        } while ( eth_dn );
-        of_node_put(lhea_dn);
-
         adapter->max_mc_mac = cb->max_mc_mac - 1;
         ret = 0;
 
@@ -2315,79 +2349,188 @@ out:
         return ret;
 }
 
-static int ehea_setup_single_port(struct ehea_port *port,
-                                  struct device_node *dn)
+int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
 {
-        int ret;
-        u64 hret;
-        struct net_device *dev = port->netdev;
-        struct ehea_adapter *adapter = port->adapter;
         struct hcp_ehea_port_cb4 *cb4;
-        u32 *dn_log_port_id;
-        int jumbo = 0;
-
-        sema_init(&port->port_lock, 1);
-        port->state = EHEA_PORT_DOWN;
-        port->sig_comp_iv = sq_entries / 10;
-
-        if (!dn) {
-                ehea_error("bad device node: dn=%p", dn);
-                ret = -EINVAL;
-                goto out;
-        }
-
-        port->of_dev_node = dn;
-
-        /* Determine logical port id */
-        dn_log_port_id = (u32*)get_property(dn, "ibm,hea-port-no", NULL);
-
-        if (!dn_log_port_id) {
-                ehea_error("bad device node: dn_log_port_id=%p",
-                           dn_log_port_id);
-                ret = -EINVAL;
-                goto out;
-        }
-        port->logical_port_id = *dn_log_port_id;
-
-        port->mc_list = kzalloc(sizeof(struct ehea_mc_list), GFP_KERNEL);
-        if (!port->mc_list) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        INIT_LIST_HEAD(&port->mc_list->list);
+        u64 hret;
+        int ret = 0;
 
-        ret = ehea_sense_port_attr(port);
-        if (ret)
-                goto out;
+        *jumbo = 0;
 
-        /* Enable Jumbo frames */
+        /* (Try to) enable *jumbo frames */
         cb4 = kzalloc(PAGE_SIZE, GFP_KERNEL);
         if (!cb4) {
                 ehea_error("no mem for cb4");
+                ret = -ENOMEM;
+                goto out;
         } else {
-                hret = ehea_h_query_ehea_port(adapter->handle,
+                hret = ehea_h_query_ehea_port(port->adapter->handle,
                                               port->logical_port_id,
                                               H_PORT_CB4,
                                               H_PORT_CB4_JUMBO, cb4);
-
                 if (hret == H_SUCCESS) {
                         if (cb4->jumbo_frame)
-                                jumbo = 1;
+                                *jumbo = 1;
                         else {
                                 cb4->jumbo_frame = 1;
-                                hret = ehea_h_modify_ehea_port(adapter->handle,
+                                hret = ehea_h_modify_ehea_port(port->adapter->
+                                                               handle,
                                                                port->
-                                                                logical_port_id,
+                                                               logical_port_id,
                                                                H_PORT_CB4,
                                                                H_PORT_CB4_JUMBO,
                                                                cb4);
                                 if (hret == H_SUCCESS)
-                                        jumbo = 1;
+                                        *jumbo = 1;
                         }
-                }
+                } else
+                        ret = -EINVAL;
+
                 kfree(cb4);
         }
+out:
+        return ret;
+}
+
+static ssize_t ehea_show_port_id(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
+        return sprintf(buf, "0x%X", port->logical_port_id);
+}
+
+static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id,
+                   NULL);
+
+static void __devinit logical_port_release(struct device *dev)
+{
+        struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
+        of_node_put(port->ofdev.node);
+}
+
+static int ehea_driver_sysfs_add(struct device *dev,
+                                 struct device_driver *driver)
+{
+        int ret;
+
+        ret = sysfs_create_link(&driver->kobj, &dev->kobj,
+                                kobject_name(&dev->kobj));
+        if (ret == 0) {
+                ret = sysfs_create_link(&dev->kobj, &driver->kobj,
+                                        "driver");
+                if (ret)
+                        sysfs_remove_link(&driver->kobj,
+                                          kobject_name(&dev->kobj));
+        }
+        return ret;
+}
+
+static void ehea_driver_sysfs_remove(struct device *dev,
+                                     struct device_driver *driver)
+{
+        struct device_driver *drv = driver;
+
+        if (drv) {
+                sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
+                sysfs_remove_link(&dev->kobj, "driver");
+        }
+}
+
+static struct device *ehea_register_port(struct ehea_port *port,
+                                         struct device_node *dn)
+{
+        int ret;
+
+        port->ofdev.node = of_node_get(dn);
+        port->ofdev.dev.parent = &port->adapter->ebus_dev->ofdev.dev;
+        port->ofdev.dev.bus = &ibmebus_bus_type;
+
+        sprintf(port->ofdev.dev.bus_id, "port%d", port_name_cnt++);
+        port->ofdev.dev.release = logical_port_release;
+
+        ret = of_device_register(&port->ofdev);
+        if (ret) {
+                ehea_error("failed to register device. ret=%d", ret);
+                goto out;
+        }
+
+        ret = device_create_file(&port->ofdev.dev, &dev_attr_log_port_id);
+        if (ret) {
+                ehea_error("failed to register attributes, ret=%d", ret);
+                goto out_unreg_of_dev;
+        }
+
+        ret = ehea_driver_sysfs_add(&port->ofdev.dev, &ehea_driver.driver);
+        if (ret) {
+                ehea_error("failed to register sysfs driver link");
+                goto out_rem_dev_file;
+        }
+
+        return &port->ofdev.dev;
+
+out_rem_dev_file:
+        device_remove_file(&port->ofdev.dev, &dev_attr_log_port_id);
+out_unreg_of_dev:
+        of_device_unregister(&port->ofdev);
+out:
+        return NULL;
+}
+
+static void ehea_unregister_port(struct ehea_port *port)
+{
+        ehea_driver_sysfs_remove(&port->ofdev.dev, &ehea_driver.driver);
+        device_remove_file(&port->ofdev.dev, &dev_attr_log_port_id);
+        of_device_unregister(&port->ofdev);
+}
+
+struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
+                                         u32 logical_port_id,
+                                         struct device_node *dn)
+{
+        int ret;
+        struct net_device *dev;
+        struct ehea_port *port;
+        struct device *port_dev;
+        int jumbo;
+
+        /* allocate memory for the port structures */
+        dev = alloc_etherdev(sizeof(struct ehea_port));
+
+        if (!dev) {
+                ehea_error("no mem for net_device");
+                ret = -ENOMEM;
+                goto out_err;
+        }
+
+        port = netdev_priv(dev);
+
+        sema_init(&port->port_lock, 1);
+        port->state = EHEA_PORT_DOWN;
+        port->sig_comp_iv = sq_entries / 10;
+
+        port->adapter = adapter;
+        port->netdev = dev;
+        port->logical_port_id = logical_port_id;
+
+        port->msg_enable = netif_msg_init(msg_level, EHEA_MSG_DEFAULT);
+
+        port->mc_list = kzalloc(sizeof(struct ehea_mc_list), GFP_KERNEL);
+        if (!port->mc_list) {
+                ret = -ENOMEM;
+                goto out_free_ethdev;
+        }
+
+        INIT_LIST_HEAD(&port->mc_list->list);
+
+        ret = ehea_sense_port_attr(port);
+        if (ret)
+                goto out_free_mc_list;
+
+        port_dev = ehea_register_port(port, dn);
+        if (!port_dev)
+                goto out_free_mc_list;
+
+        SET_NETDEV_DEV(dev, port_dev);
 
         /* initialize net_device structure */
         SET_MODULE_OWNER(dev);
@@ -2420,84 +2563,225 @@ static int ehea_setup_single_port(struct ehea_port *port,
         ret = register_netdev(dev);
         if (ret) {
                 ehea_error("register_netdev failed. ret=%d", ret);
-                goto out_free;
+                goto out_unreg_port;
         }
 
+        ret = ehea_get_jumboframe_status(port, &jumbo);
+        if (ret)
+                ehea_error("failed determining jumbo frame status for %s",
+                           port->netdev->name);
+
         ehea_info("%s: Jumbo frames are %sabled", dev->name,
                   jumbo == 1 ? "en" : "dis");
 
-        port->netdev = dev;
-        ret = 0;
-        goto out;
+        return port;
 
-out_free:
+out_unreg_port:
+        ehea_unregister_port(port);
+
+out_free_mc_list:
         kfree(port->mc_list);
-out:
-        return ret;
+
+out_free_ethdev:
+        free_netdev(dev);
+
+out_err:
+        ehea_error("setting up logical port with id=%d failed, ret=%d",
+                   logical_port_id, ret);
+        return NULL;
+}
+
+static void ehea_shutdown_single_port(struct ehea_port *port)
+{
+        unregister_netdev(port->netdev);
+        ehea_unregister_port(port);
+        kfree(port->mc_list);
+        free_netdev(port->netdev);
 }
 
 static int ehea_setup_ports(struct ehea_adapter *adapter)
 {
-        int ret;
-        int port_setup_ok = 0;
+        struct device_node *lhea_dn;
+        struct device_node *eth_dn = NULL;
+
+        u32 *dn_log_port_id;
+        int i = 0;
+
+        lhea_dn = adapter->ebus_dev->ofdev.node;
+        while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
+
+                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                                                    NULL);
+                if (!dn_log_port_id) {
+                        ehea_error("bad device node: eth_dn name=%s",
+                                   eth_dn->full_name);
+                        continue;
+                }
+
+                if (ehea_add_adapter_mr(adapter)) {
+                        ehea_error("creating MR failed");
+                        of_node_put(eth_dn);
+                        return -EIO;
+                }
+
+                adapter->port[i] = ehea_setup_single_port(adapter,
+                                                          *dn_log_port_id,
+                                                          eth_dn);
+                if (adapter->port[i])
+                        ehea_info("%s -> logical port id #%d",
+                                  adapter->port[i]->netdev->name,
+                                  *dn_log_port_id);
+                else
+                        ehea_remove_adapter_mr(adapter);
+
+                i++;
+        };
+
+        return 0;
+}
+
+static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
+                                           u32 logical_port_id)
+{
+        struct device_node *lhea_dn;
+        struct device_node *eth_dn = NULL;
+        u32 *dn_log_port_id;
+
+        lhea_dn = adapter->ebus_dev->ofdev.node;
+        while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
+
+                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                                                    NULL);
+                if (dn_log_port_id)
+                        if (*dn_log_port_id == logical_port_id)
+                                return eth_dn;
+        };
+
+        return NULL;
+}
+
+static ssize_t ehea_probe_port(struct device *dev,
+                               struct device_attribute *attr,
+                               const char *buf, size_t count)
+{
+        struct ehea_adapter *adapter = dev->driver_data;
         struct ehea_port *port;
-        struct device_node *dn = NULL;
-        struct net_device *dev;
+        struct device_node *eth_dn = NULL;
         int i;
 
-        /* get port properties for all ports */
-        for (i = 0; i < adapter->num_ports; i++) {
+        u32 logical_port_id;
 
-                if (adapter->port[i])
-                        continue;       /* port already up and running */
+        sscanf(buf, "%X", &logical_port_id);
 
-                /* allocate memory for the port structures */
-                dev = alloc_etherdev(sizeof(struct ehea_port));
+        port = ehea_get_port(adapter, logical_port_id);
 
-                if (!dev) {
-                        ehea_error("no mem for net_device");
-                        break;
-                }
+        if (port) {
+                ehea_info("adding port with logical port id=%d failed. port "
+                          "already configured as %s.", logical_port_id,
+                          port->netdev->name);
+                return -EINVAL;
+        }
 
-                port = netdev_priv(dev);
-                port->adapter = adapter;
-                port->netdev = dev;
-                adapter->port[i] = port;
-                port->msg_enable = netif_msg_init(msg_level, EHEA_MSG_DEFAULT);
+        eth_dn = ehea_get_eth_dn(adapter, logical_port_id);
 
-                dn = of_find_node_by_name(dn, "ethernet");
-                ret = ehea_setup_single_port(port, dn);
-                if (ret) {
-                        /* Free mem for this port struct. The others will be
-                           processed on rollback */
-                        free_netdev(dev);
-                        adapter->port[i] = NULL;
-                        ehea_error("eHEA port %d setup failed, ret=%d", i, ret);
-                }
+        if (!eth_dn) {
+                ehea_info("no logical port with id %d found", logical_port_id);
+                return -EINVAL;
         }
 
-        of_node_put(dn);
+        if (ehea_add_adapter_mr(adapter)) {
+                ehea_error("creating MR failed");
+                return -EIO;
+        }
 
-        /* Check for succesfully set up ports */
-        for (i = 0; i < adapter->num_ports; i++)
-                if (adapter->port[i])
-                        port_setup_ok++;
+        port = ehea_setup_single_port(adapter, logical_port_id, eth_dn);
 
-        if (port_setup_ok)
-                ret = 0;        /* At least some ports are setup correctly */
-        else
-                ret = -EINVAL;
+        of_node_put(eth_dn);
+
+        if (port) {
+                for (i=0; i < EHEA_MAX_PORTS; i++)
+                        if (!adapter->port[i]) {
+                                adapter->port[i] = port;
+                                break;
+                        }
+
+                ehea_info("added %s (logical port id=%d)", port->netdev->name,
+                          logical_port_id);
+        } else {
+                ehea_remove_adapter_mr(adapter);
+                return -EIO;
+        }
+
+        return (ssize_t) count;
+}
+
+static ssize_t ehea_remove_port(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ehea_adapter *adapter = dev->driver_data;
+        struct ehea_port *port;
+        int i;
+        u32 logical_port_id;
+
+        sscanf(buf, "%X", &logical_port_id);
+
+        port = ehea_get_port(adapter, logical_port_id);
+
+        if (port) {
+                ehea_info("removed %s (logical port id=%d)", port->netdev->name,
+                          logical_port_id);
+
+                ehea_shutdown_single_port(port);
+
+                for (i=0; i < EHEA_MAX_PORTS; i++)
+                        if (adapter->port[i] == port) {
+                                adapter->port[i] = NULL;
+                                break;
+                        }
+        } else {
+                ehea_error("removing port with logical port id=%d failed. port "
+                           "not configured.", logical_port_id);
+                return -EINVAL;
+        }
+
+        ehea_remove_adapter_mr(adapter);
+
+        return (ssize_t) count;
+}
+
+static DEVICE_ATTR(probe_port, S_IWUSR, NULL, ehea_probe_port);
+static DEVICE_ATTR(remove_port, S_IWUSR, NULL, ehea_remove_port);
 
+int ehea_create_device_sysfs(struct ibmebus_dev *dev)
+{
+        int ret = device_create_file(&dev->ofdev.dev, &dev_attr_probe_port);
+        if (ret)
+                goto out;
+
+        ret = device_create_file(&dev->ofdev.dev, &dev_attr_remove_port);
+out:
         return ret;
 }
 
-static int __devinit ehea_probe(struct ibmebus_dev *dev,
-                                const struct of_device_id *id)
+void ehea_remove_device_sysfs(struct ibmebus_dev *dev)
+{
+        device_remove_file(&dev->ofdev.dev, &dev_attr_probe_port);
+        device_remove_file(&dev->ofdev.dev, &dev_attr_remove_port);
+}
+
+static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
+                                        const struct of_device_id *id)
 {
         struct ehea_adapter *adapter;
         u64 *adapter_handle;
         int ret;
 
+        if (!dev || !dev->ofdev.node) {
+                ehea_error("Invalid ibmebus device probed");
+                return -EINVAL;
+        }
+
         adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
         if (!adapter) {
                 ret = -ENOMEM;
@@ -2505,6 +2789,8 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
                 goto out;
         }
 
+        adapter->ebus_dev = dev;
+
         adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
                                             NULL);
         if (adapter_handle)
@@ -2521,26 +2807,21 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
 
         dev->ofdev.dev.driver_data = adapter;
 
-        ret = ehea_reg_mr_adapter(adapter);
-        if (ret) {
-                dev_err(&dev->ofdev.dev, "reg_mr_adapter failed\n");
-                goto out_free_ad;
-        }
 
         /* initialize adapter and ports */
         /* get adapter properties */
         ret = ehea_sense_adapter_attr(adapter);
         if (ret) {
                 dev_err(&dev->ofdev.dev, "sense_adapter_attr failed: %d", ret);
-                goto out_free_res;
+                goto out_free_ad;
         }
-        dev_info(&dev->ofdev.dev, "%d eHEA ports found\n", adapter->num_ports);
 
         adapter->neq = ehea_create_eq(adapter,
                                       EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1);
         if (!adapter->neq) {
+                ret = -EIO;
                 dev_err(&dev->ofdev.dev, "NEQ creation failed");
-                goto out_free_res;
+                goto out_free_ad;
         }
 
         tasklet_init(&adapter->neq_tasklet, ehea_neq_tasklet,
@@ -2555,18 +2836,27 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
         }
 
         adapter->ehea_wq = create_workqueue("ehea_wq");
-        if (!adapter->ehea_wq)
+        if (!adapter->ehea_wq) {
+                ret = -EIO;
                 goto out_free_irq;
+        }
+
+        ret = ehea_create_device_sysfs(dev);
+        if (ret)
+                goto out_kill_wq;
 
         ret = ehea_setup_ports(adapter);
         if (ret) {
                 dev_err(&dev->ofdev.dev, "setup_ports failed");
-                goto out_kill_wq;
+                goto out_rem_dev_sysfs;
         }
 
         ret = 0;
         goto out;
 
+out_rem_dev_sysfs:
+        ehea_remove_device_sysfs(dev);
+
 out_kill_wq:
         destroy_workqueue(adapter->ehea_wq);
 
@@ -2576,45 +2866,32 @@ out_free_irq:
 out_kill_eq:
         ehea_destroy_eq(adapter->neq);
 
-out_free_res:
-        ehea_h_free_resource(adapter->handle, adapter->mr.handle);
-
 out_free_ad:
         kfree(adapter);
 out:
         return ret;
 }
 
-static void ehea_shutdown_single_port(struct ehea_port *port)
-{
-        unregister_netdev(port->netdev);
-        kfree(port->mc_list);
-        free_netdev(port->netdev);
-}
-
 static int __devexit ehea_remove(struct ibmebus_dev *dev)
 {
         struct ehea_adapter *adapter = dev->ofdev.dev.driver_data;
-        u64 hret;
         int i;
 
-        for (i = 0; i < adapter->num_ports; i++)
+        for (i = 0; i < EHEA_MAX_PORTS; i++)
                 if (adapter->port[i]) {
                         ehea_shutdown_single_port(adapter->port[i]);
                         adapter->port[i] = NULL;
                 }
+
+        ehea_remove_device_sysfs(dev);
+
         destroy_workqueue(adapter->ehea_wq);
 
         ibmebus_free_irq(NULL, adapter->neq->attr.ist1, adapter);
         tasklet_kill(&adapter->neq_tasklet);
 
         ehea_destroy_eq(adapter->neq);
-
-        hret = ehea_h_free_resource(adapter->handle, adapter->mr.handle);
-        if (hret) {
-                dev_err(&dev->ofdev.dev, "free_resource_mr failed");
-                return -EIO;
-        }
+        ehea_remove_adapter_mr(adapter);
         kfree(adapter);
         return 0;
 }
@@ -2647,21 +2924,6 @@ static int check_module_parm(void)
         return ret;
 }
 
-static struct of_device_id ehea_device_table[] = {
-        {
-                .name = "lhea",
-                .compatible = "IBM,lhea",
-        },
-        {},
-};
-
-static struct ibmebus_driver ehea_driver = {
-        .name = "ehea",
-        .id_table = ehea_device_table,
-        .probe = ehea_probe,
-        .remove = ehea_remove,
-};
-
 int __init ehea_module_init(void)
 {
         int ret;
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ehea/ehea_phyp.c
index bc3c00547264..95c4a7f9cc88 100644
--- a/drivers/net/ehea/ehea_phyp.c
+++ b/drivers/net/ehea/ehea_phyp.c
@@ -478,12 +478,14 @@ u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle)
                                  0, 0, 0, 0, 0, 0);             /* R7-R12 */
 }
 
-u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle)
+u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle,
+                         u64 force_bit)
 {
         return ehea_plpar_hcall_norets(H_FREE_RESOURCE,
                                        adapter_handle,     /* R4 */
                                        res_handle,         /* R5 */
-                                       0, 0, 0, 0, 0);     /* R6-R10 */
+                                       force_bit,
+                                       0, 0, 0, 0);        /* R7-R10 */
 }
 
 u64 ehea_h_alloc_resource_mr(const u64 adapter_handle, const u64 vaddr,
diff --git a/drivers/net/ehea/ehea_phyp.h b/drivers/net/ehea/ehea_phyp.h
index 90acddb068a1..d17a45a7e717 100644
--- a/drivers/net/ehea/ehea_phyp.h
+++ b/drivers/net/ehea/ehea_phyp.h
@@ -414,7 +414,11 @@ u64 ehea_h_register_rpage(const u64 adapter_handle,
 
 u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle);
 
-u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle);
+#define FORCE_FREE 1
+#define NORMAL_FREE 0
+
+u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle,
+                         u64 force_bit);
 
 u64 ehea_h_alloc_resource_mr(const u64 adapter_handle, const u64 vaddr,
                              const u64 length, const u32 access_ctrl,
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index 96ff3b679996..f24a8862977d 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -197,7 +197,7 @@ out_kill_hwq:
         hw_queue_dtor(&cq->hw_queue);
 
 out_freeres:
-        ehea_h_free_resource(adapter->handle, cq->fw_handle);
+        ehea_h_free_resource(adapter->handle, cq->fw_handle, FORCE_FREE);
 
 out_freemem:
         kfree(cq);
@@ -206,25 +206,38 @@ out_nomem:
         return NULL;
 }
 
-int ehea_destroy_cq(struct ehea_cq *cq)
+u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)
 {
-        u64 adapter_handle, hret;
+        u64 hret;
+        u64 adapter_handle = cq->adapter->handle;
+
+        /* deregister all previous registered pages */
+        hret = ehea_h_free_resource(adapter_handle, cq->fw_handle, force);
+        if (hret != H_SUCCESS)
+                return hret;
+
+        hw_queue_dtor(&cq->hw_queue);
+        kfree(cq);
+
+        return hret;
+}
 
+int ehea_destroy_cq(struct ehea_cq *cq)
+{
+        u64 hret;
         if (!cq)
                 return 0;
 
-        adapter_handle = cq->adapter->handle;
+        if ((hret = ehea_destroy_cq_res(cq, NORMAL_FREE)) == H_R_STATE) {
+                ehea_error_data(cq->adapter, cq->fw_handle);
+                hret = ehea_destroy_cq_res(cq, FORCE_FREE);
+        }
 
-        /* deregister all previous registered pages */
-        hret = ehea_h_free_resource(adapter_handle, cq->fw_handle);
         if (hret != H_SUCCESS) {
                 ehea_error("destroy CQ failed");
                 return -EIO;
         }
 
-        hw_queue_dtor(&cq->hw_queue);
-        kfree(cq);
-
         return 0;
 }
 
@@ -297,7 +310,7 @@ out_kill_hwq:
         hw_queue_dtor(&eq->hw_queue);
 
 out_freeres:
-        ehea_h_free_resource(adapter->handle, eq->fw_handle);
+        ehea_h_free_resource(adapter->handle, eq->fw_handle, FORCE_FREE);
 
 out_freemem:
         kfree(eq);
@@ -316,27 +329,41 @@ struct ehea_eqe *ehea_poll_eq(struct ehea_eq *eq)
         return eqe;
 }
 
-int ehea_destroy_eq(struct ehea_eq *eq)
+u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)
 {
         u64 hret;
         unsigned long flags;
 
-        if (!eq)
-                return 0;
-
         spin_lock_irqsave(&eq->spinlock, flags);
 
-        hret = ehea_h_free_resource(eq->adapter->handle, eq->fw_handle);
+        hret = ehea_h_free_resource(eq->adapter->handle, eq->fw_handle, force);
         spin_unlock_irqrestore(&eq->spinlock, flags);
 
-        if (hret != H_SUCCESS) {
-                ehea_error("destroy_eq failed");
-                return -EIO;
-        }
+        if (hret != H_SUCCESS)
+                return hret;
 
         hw_queue_dtor(&eq->hw_queue);
         kfree(eq);
 
+        return hret;
+}
+
+int ehea_destroy_eq(struct ehea_eq *eq)
+{
+        u64 hret;
+        if (!eq)
+                return 0;
+
+        if ((hret = ehea_destroy_eq_res(eq, NORMAL_FREE)) == H_R_STATE) {
+                ehea_error_data(eq->adapter, eq->fw_handle);
+                hret = ehea_destroy_eq_res(eq, FORCE_FREE);
+        }
+
+        if (hret != H_SUCCESS) {
+                ehea_error("destroy EQ failed");
+                return -EIO;
+        }
+
         return 0;
 }
 
@@ -471,41 +498,56 @@ out_kill_hwsq:
 
 out_freeres:
         ehea_h_disable_and_get_hea(adapter->handle, qp->fw_handle);
-        ehea_h_free_resource(adapter->handle, qp->fw_handle);
+        ehea_h_free_resource(adapter->handle, qp->fw_handle, FORCE_FREE);
 
 out_freemem:
         kfree(qp);
         return NULL;
 }
 
-int ehea_destroy_qp(struct ehea_qp *qp)
+u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)
 {
-        u64 hret;
-        struct ehea_qp_init_attr *qp_attr = &qp->init_attr;
+        u64 hret;
+        struct ehea_qp_init_attr *qp_attr = &qp->init_attr;
 
-        if (!qp)
-                return 0;
 
-        ehea_h_disable_and_get_hea(qp->adapter->handle, qp->fw_handle);
-        hret = ehea_h_free_resource(qp->adapter->handle, qp->fw_handle);
-        if (hret != H_SUCCESS) {
-                ehea_error("destroy_qp failed");
-                return -EIO;
-        }
+        ehea_h_disable_and_get_hea(qp->adapter->handle, qp->fw_handle);
+        hret = ehea_h_free_resource(qp->adapter->handle, qp->fw_handle, force);
+        if (hret != H_SUCCESS)
+                return hret;
 
-        hw_queue_dtor(&qp->hw_squeue);
-        hw_queue_dtor(&qp->hw_rqueue1);
+        hw_queue_dtor(&qp->hw_squeue);
+        hw_queue_dtor(&qp->hw_rqueue1);
 
-        if (qp_attr->rq_count > 1)
-                hw_queue_dtor(&qp->hw_rqueue2);
-        if (qp_attr->rq_count > 2)
-                hw_queue_dtor(&qp->hw_rqueue3);
-        kfree(qp);
+        if (qp_attr->rq_count > 1)
+                hw_queue_dtor(&qp->hw_rqueue2);
+        if (qp_attr->rq_count > 2)
+                hw_queue_dtor(&qp->hw_rqueue3);
+        kfree(qp);
 
-        return 0;
+        return hret;
 }
 
-int ehea_reg_mr_adapter(struct ehea_adapter *adapter)
+int ehea_destroy_qp(struct ehea_qp *qp)
+{
+        u64 hret;
+        if (!qp)
+                return 0;
+
+        if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {
+                ehea_error_data(qp->adapter, qp->fw_handle);
+                hret = ehea_destroy_qp_res(qp, FORCE_FREE);
+        }
+
+        if (hret != H_SUCCESS) {
+                ehea_error("destroy QP failed");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)
 {
         int i, k, ret;
         u64 hret, pt_abs, start, end, nr_pages;
@@ -526,14 +568,14 @@ int ehea_reg_mr_adapter(struct ehea_adapter *adapter)
 
         hret = ehea_h_alloc_resource_mr(adapter->handle, start, end - start,
                                         acc_ctrl, adapter->pd,
-                                        &adapter->mr.handle, &adapter->mr.lkey);
+                                        &mr->handle, &mr->lkey);
         if (hret != H_SUCCESS) {
                 ehea_error("alloc_resource_mr failed");
                 ret = -EIO;
                 goto out;
         }
 
-        adapter->mr.vaddr = KERNELBASE;
+        mr->vaddr = KERNELBASE;
         k = 0;
 
         while (nr_pages > 0) {
@@ -545,7 +587,7 @@ int ehea_reg_mr_adapter(struct ehea_adapter *adapter)
                                                              EHEA_PAGESIZE)));
 
                         hret = ehea_h_register_rpage_mr(adapter->handle,
-                                                        adapter->mr.handle, 0,
+                                                        mr->handle, 0,
                                                         0, (u64)pt_abs,
                                                         num_pages);
                         nr_pages -= num_pages;
@@ -554,34 +596,68 @@ int ehea_reg_mr_adapter(struct ehea_adapter *adapter)
                                                           (k * EHEA_PAGESIZE)));
 
                         hret = ehea_h_register_rpage_mr(adapter->handle,
-                                                        adapter->mr.handle, 0,
+                                                        mr->handle, 0,
                                                         0, abs_adr,1);
                         nr_pages--;
                 }
 
                 if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED)) {
                         ehea_h_free_resource(adapter->handle,
-                                                adapter->mr.handle);
-                        ehea_error("register_rpage_mr failed: hret = %lX",
-                                   hret);
+                                             mr->handle, FORCE_FREE);
+                        ehea_error("register_rpage_mr failed");
                         ret = -EIO;
                         goto out;
                 }
         }
 
         if (hret != H_SUCCESS) {
-                ehea_h_free_resource(adapter->handle, adapter->mr.handle);
-                ehea_error("register_rpage failed for last page: hret = %lX",
-                           hret);
+                ehea_h_free_resource(adapter->handle, mr->handle,
+                                     FORCE_FREE);
+                ehea_error("register_rpage failed for last page");
                 ret = -EIO;
                 goto out;
         }
+
+        mr->adapter = adapter;
         ret = 0;
 out:
         kfree(pt);
         return ret;
 }
 
+int ehea_rem_mr(struct ehea_mr *mr)
+{
+        u64 hret;
+
+        if (!mr || !mr->adapter)
+                return -EINVAL;
+
+        hret = ehea_h_free_resource(mr->adapter->handle, mr->handle,
+                                    FORCE_FREE);
+        if (hret != H_SUCCESS) {
+                ehea_error("destroy MR failed");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+int ehea_gen_smr(struct ehea_adapter *adapter, struct ehea_mr *old_mr,
+                 struct ehea_mr *shared_mr)
+{
+        u64 hret;
+
+        hret = ehea_h_register_smr(adapter->handle, old_mr->handle,
+                                   old_mr->vaddr, EHEA_MR_ACC_CTRL,
+                                   adapter->pd, shared_mr);
+        if (hret != H_SUCCESS)
+                return -EIO;
+
+        shared_mr->adapter = adapter;
+
+        return 0;
+}
+
 void print_error_data(u64 *data)
 {
         int length;
@@ -597,6 +673,14 @@ void print_error_data(u64 *data)
                 ehea_error("QP (resource=%lX) state: AER=0x%lX, AERR=0x%lX, "
                            "port=%lX", resource, data[6], data[12], data[22]);
 
+        if (type == 0x4) /* Completion Queue */
+                ehea_error("CQ (resource=%lX) state: AER=0x%lX", resource,
+                           data[6]);
+
+        if (type == 0x3) /* Event Queue */
+                ehea_error("EQ (resource=%lX) state: AER=0x%lX", resource,
+                           data[6]);
+
         ehea_dump(data, length, "error data");
 }
 
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 1ff60983504d..c0eb3e03a102 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -142,6 +142,8 @@ struct ehea_rwqe {
 #define EHEA_CQE_STAT_ERR_MASK     0x721F
 #define EHEA_CQE_STAT_FAT_ERR_MASK 0x1F
 #define EHEA_CQE_STAT_ERR_TCP      0x4000
+#define EHEA_CQE_STAT_ERR_IP       0x2000
+#define EHEA_CQE_STAT_ERR_CRC      0x1000
 
 struct ehea_cqe {
         u64 wr_id;              /* work request ID from WQE */
@@ -320,6 +322,11 @@ static inline struct ehea_cqe *ehea_poll_rq1(struct ehea_qp *qp, int *wqe_index)
         return hw_qeit_get_valid(queue);
 }
 
+static inline void ehea_inc_cq(struct ehea_cq *cq)
+{
+        hw_qeit_inc(&cq->hw_queue);
+}
+
 static inline void ehea_inc_rq1(struct ehea_qp *qp)
 {
         hw_qeit_inc(&qp->hw_rqueue1);
@@ -327,7 +334,7 @@ static inline void ehea_inc_rq1(struct ehea_qp *qp)
 
 static inline struct ehea_cqe *ehea_poll_cq(struct ehea_cq *my_cq)
 {
-        return hw_qeit_get_inc_valid(&my_cq->hw_queue);
+        return hw_qeit_get_valid(&my_cq->hw_queue);
 }
 
 #define EHEA_CQ_REGISTER_ORIG 0
@@ -356,7 +363,12 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter * adapter, u32 pd,
 
 int ehea_destroy_qp(struct ehea_qp *qp);
 
-int ehea_reg_mr_adapter(struct ehea_adapter *adapter);
+int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr);
+
+int ehea_gen_smr(struct ehea_adapter *adapter, struct ehea_mr *old_mr,
+                 struct ehea_mr *shared_mr);
+
+int ehea_rem_mr(struct ehea_mr *mr);
 
 void ehea_error_data(struct ehea_adapter *adapter, u64 res_handle);
 
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index 30baf6ecfc63..17ac6975d70d 100644
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -415,11 +415,18 @@ static int ser12_open(struct net_device *dev)
 
         if (!dev || !bc)
                 return -ENXIO;
-        if (!dev->base_addr || dev->base_addr > 0x1000-SER12_EXTENT ||
-            dev->irq < 2 || dev->irq > 15)
+        if (!dev->base_addr || dev->base_addr > 0xffff-SER12_EXTENT ||
+            dev->irq < 2 || dev->irq > NR_IRQS) {
+                printk(KERN_INFO "baycom_ser_fdx: invalid portnumber (max %u) "
+                                "or irq (2 <= irq <= %d)\n",
+                                0xffff-SER12_EXTENT, NR_IRQS);
                 return -ENXIO;
-        if (bc->baud < 300 || bc->baud > 4800)
+        }
+        if (bc->baud < 300 || bc->baud > 4800) {
+                printk(KERN_INFO "baycom_ser_fdx: invalid baudrate "
+                                "(300...4800)\n");
                 return -EINVAL;
+        }
         if (!request_region(dev->base_addr, SER12_EXTENT, "baycom_ser_fdx")) {
                 printk(KERN_WARNING "BAYCOM_SER_FSX: I/O port 0x%04lx busy \n", 
                        dev->base_addr);
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 0573fcfcb2c4..3bec0f733f01 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -93,7 +93,7 @@ static void ibmveth_proc_unregister_driver(void);
 static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter);
 static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter);
 static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance);
-static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
+static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
 static struct kobj_type ktype_veth_pool;
 
 #ifdef CONFIG_PROC_FS
@@ -389,7 +389,7 @@ static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
         }
 }
 
-static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
+static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
 {
         ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
 
@@ -953,14 +953,16 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
         ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",
                                         dev->unit_address);
 
-        mac_addr_p = (unsigned char *) vio_get_attribute(dev, VETH_MAC_ADDR, 0);
+        mac_addr_p = (unsigned char *) vio_get_attribute(dev,
+                                                VETH_MAC_ADDR, NULL);
         if(!mac_addr_p) {
                 printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find VETH_MAC_ADDR "
                                 "attribute\n", __FILE__, __LINE__);
                 return 0;
         }
 
-        mcastFilterSize_p= (unsigned int *) vio_get_attribute(dev, VETH_MCAST_FILTER_SIZE, 0);
+        mcastFilterSize_p = (unsigned int *) vio_get_attribute(dev,
+                                                VETH_MCAST_FILTER_SIZE, NULL);
         if(!mcastFilterSize_p) {
                 printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find "
                                 "VETH_MCAST_FILTER_SIZE attribute\n",
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index cf30a1059ce0..c8e90861f869 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -111,9 +111,6 @@ struct ixgb_adapter;
 /* How many Rx Buffers do we bundle into one write to the hardware ? */
 #define IXGB_RX_BUFFER_WRITE    8       /* Must be power of 2 */
 
-/* only works for sizes that are powers of 2 */
-#define IXGB_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
-
 /* wrapper around a pointer to a socket buffer,
  * so a DMA handle can be stored along with the buffer */
 struct ixgb_buffer {
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index d6628bd9590a..afde84868bea 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -577,11 +577,11 @@ ixgb_set_ringparam(struct net_device *netdev,
 
         rxdr->count = max(ring->rx_pending,(uint32_t)MIN_RXD);
         rxdr->count = min(rxdr->count,(uint32_t)MAX_RXD);
-        IXGB_ROUNDUP(rxdr->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE); 
+        rxdr->count = ALIGN(rxdr->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
 
         txdr->count = max(ring->tx_pending,(uint32_t)MIN_TXD);
         txdr->count = min(txdr->count,(uint32_t)MAX_TXD);
-        IXGB_ROUNDUP(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE); 
+        txdr->count = ALIGN(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
 
         if(netif_running(adapter->netdev)) {
                 /* Try to get new resources before deleting old */
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index dfde80e54aef..6d2b059371f1 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -685,7 +685,7 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
         /* round up to nearest 4K */
 
         txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);
-        IXGB_ROUNDUP(txdr->size, 4096);
+        txdr->size = ALIGN(txdr->size, 4096);
 
         txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
         if(!txdr->desc) {
@@ -774,7 +774,7 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
         /* Round up to nearest 4K */
 
         rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc);
-        IXGB_ROUNDUP(rxdr->size, 4096);
+        rxdr->size = ALIGN(rxdr->size, 4096);
 
         rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
 
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
index b27442a121f2..5d5ddabf4360 100644
--- a/drivers/net/ixgb/ixgb_param.c
+++ b/drivers/net/ixgb/ixgb_param.c
@@ -245,8 +245,6 @@ ixgb_validate_option(int *value, struct ixgb_option *opt)
         return -1;
 }
 
-#define LIST_LEN(l) (sizeof(l) / sizeof(l[0]))
-
 /**
  * ixgb_check_options - Range Checking for Command Line Parameters
  * @adapter: board private structure
@@ -284,7 +282,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                 } else {
                         tx_ring->count = opt.def;
                 }
-                IXGB_ROUNDUP(tx_ring->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
+                tx_ring->count = ALIGN(tx_ring->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
         }
         { /* Receive Descriptor Count */
                 struct ixgb_option opt = {
@@ -303,7 +301,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                 } else {
                         rx_ring->count = opt.def;
                 }
-                IXGB_ROUNDUP(rx_ring->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
+                rx_ring->count = ALIGN(rx_ring->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
         }
         { /* Receive Checksum Offload Enable */
                 struct ixgb_option opt = {
@@ -335,7 +333,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                         .name = "Flow Control",
                         .err  = "reading default settings from EEPROM",
                         .def  = ixgb_fc_tx_pause,
-                        .arg  = { .l = { .nr = LIST_LEN(fc_list),
+                        .arg  = { .l = { .nr = ARRAY_SIZE(fc_list),
                                          .p = fc_list }}
                 };
 
diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index 2912a34f597b..92056051f269 100644
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -33,6 +33,13 @@
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 
+/**
+ * mii_ethtool_gset - get settings that are specified in @ecmd
+ * @mii: MII interface
+ * @ecmd: requested ethtool_cmd
+ *
+ * Returns 0 for success, negative on error.
+ */
 int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
 {
         struct net_device *dev = mii->dev;
@@ -114,6 +121,13 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
         return 0;
 }
 
+/**
+ * mii_ethtool_sset - set settings that are specified in @ecmd
+ * @mii: MII interface
+ * @ecmd: requested ethtool_cmd
+ *
+ * Returns 0 for success, negative on error.
+ */
 int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
 {
         struct net_device *dev = mii->dev;
@@ -207,6 +221,10 @@ int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
         return 0;
 }
 
+/**
+ * mii_check_gmii_support - check if the MII supports Gb interfaces
+ * @mii: the MII interface
+ */
 int mii_check_gmii_support(struct mii_if_info *mii)
 {
         int reg;
@@ -221,6 +239,12 @@ int mii_check_gmii_support(struct mii_if_info *mii)
         return 0;
 }
 
+/**
+ * mii_link_ok - is link status up/ok
+ * @mii: the MII interface
+ *
+ * Returns 1 if the MII reports link status up/ok, 0 otherwise.
+ */
 int mii_link_ok (struct mii_if_info *mii)
 {
         /* first, a dummy read, needed to latch some MII phys */
@@ -230,6 +254,12 @@ int mii_link_ok (struct mii_if_info *mii)
         return 0;
 }
 
+/**
+ * mii_nway_restart - restart NWay (autonegotiation) for this interface
+ * @mii: the MII interface
+ *
+ * Returns 0 on success, negative on error.
+ */
 int mii_nway_restart (struct mii_if_info *mii)
 {
         int bmcr;
@@ -247,6 +277,14 @@ int mii_nway_restart (struct mii_if_info *mii)
         return r;
 }
 
+/**
+ * mii_check_link - check MII link status
+ * @mii: MII interface
+ *
+ * If the link status changed (previous != current), call
+ * netif_carrier_on() if current link status is Up or call
+ * netif_carrier_off() if current link status is Down.
+ */
 void mii_check_link (struct mii_if_info *mii)
 {
         int cur_link = mii_link_ok(mii);
@@ -258,6 +296,15 @@ void mii_check_link (struct mii_if_info *mii)
                 netif_carrier_off(mii->dev);
 }
 
+/**
+ * mii_check_media - check the MII interface for a duplex change
+ * @mii: the MII interface
+ * @ok_to_print: OK to print link up/down messages
+ * @init_media: OK to save duplex mode in @mii
+ *
+ * Returns 1 if the duplex mode changed, 0 if not.
+ * If the media type is forced, always returns 0.
+ */
 unsigned int mii_check_media (struct mii_if_info *mii,
                               unsigned int ok_to_print,
                               unsigned int init_media)
@@ -326,6 +373,16 @@ unsigned int mii_check_media (struct mii_if_info *mii,
         return 0; /* duplex did not change */
 }
 
+/**
+ * generic_mii_ioctl - main MII ioctl interface
+ * @mii_if: the MII interface
+ * @mii_data: MII ioctl data structure
+ * @cmd: MII ioctl command
+ * @duplex_chg_out: pointer to @duplex_changed status if there was no
+ *      ioctl error
+ *
+ * Returns 0 on success, negative on error.
+ */
 int generic_mii_ioctl(struct mii_if_info *mii_if,
                       struct mii_ioctl_data *mii_data, int cmd,
                       unsigned int *duplex_chg_out)
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c
index 403f63afd201..638a279ec505 100644
--- a/drivers/net/mipsnet.c
+++ b/drivers/net/mipsnet.c
@@ -26,8 +26,6 @@ struct mipsnet_priv {
         struct net_device_stats stats;
 };
 
-static struct platform_device *mips_plat_dev;
-
 static char mipsnet_string[] = "mipsnet";
 
 /*
@@ -297,64 +295,17 @@ static struct device_driver mipsnet_driver = {
         .remove = __devexit_p(mipsnet_device_remove),
 };
 
-static void mipsnet_platform_release(struct device *device)
-{
-        struct platform_device *pldev;
-
-        /* free device */
-        pldev = to_platform_device(device);
-        kfree(pldev);
-}
-
 static int __init mipsnet_init_module(void)
 {
-        struct platform_device *pldev;
         int err;
 
         printk(KERN_INFO "MIPSNet Ethernet driver. Version: %s. "
                "(c)2005 MIPS Technologies, Inc.\n", MIPSNET_VERSION);
 
-        if (driver_register(&mipsnet_driver)) {
+        err = driver_register(&mipsnet_driver);
+        if (err)
                 printk(KERN_ERR "Driver registration failed\n");
-                err = -ENODEV;
-                goto out;
-        }
-
-        if (!(pldev = kmalloc (sizeof (*pldev), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto out_unregister_driver;
-        }
-
-        memset (pldev, 0, sizeof (*pldev));
-        pldev->name             = mipsnet_string;
-        pldev->id               = 0;
-        pldev->dev.release      = mipsnet_platform_release;
 
-        if (platform_device_register(pldev)) {
-                err = -ENODEV;
-                goto out_free_pldev;
-        }
-
-        if (!pldev->dev.driver) {
-                /*
-                 * The driver was not bound to this device, there was
-                 * no hardware at this address. Unregister it, as the
-                 * release fuction will take care of freeing the
-                 * allocated structure
-                 */
-                platform_device_unregister (pldev);
-        }
-
-        mips_plat_dev           = pldev;
-
-        return 0;
-
-out_free_pldev:
-        kfree(pldev);
-
-out_unregister_driver:
-        driver_unregister(&mipsnet_driver);
-out:
         return err;
 }
 
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index ab15ecd4b3d6..1799eee88db7 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -51,8 +51,8 @@
 #include "mv643xx_eth.h"
 
 /* Static function declarations */
-static void eth_port_uc_addr_get(struct net_device *dev,
-                                                unsigned char *MacAddr);
+static void eth_port_uc_addr_get(unsigned int port_num, unsigned char *p_addr);
+static void eth_port_uc_addr_set(unsigned int port_num, unsigned char *p_addr);
 static void eth_port_set_multicast_list(struct net_device *);
 static void mv643xx_eth_port_enable_tx(unsigned int port_num,
                                                 unsigned int queues);
@@ -1381,7 +1381,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         port_num = mp->port_num = pd->port_number;
 
         /* set default config values */
-        eth_port_uc_addr_get(dev, dev->dev_addr);
+        eth_port_uc_addr_get(port_num, dev->dev_addr);
         mp->rx_ring_size = MV643XX_ETH_PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
         mp->tx_ring_size = MV643XX_ETH_PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
 
@@ -1839,26 +1839,9 @@ static void eth_port_start(struct net_device *dev)
 }
 
 /*
- * eth_port_uc_addr_set - This function Set the port Unicast address.
- *
- * DESCRIPTION:
- *              This function Set the port Ethernet MAC address.
- *
- * INPUT:
- *      unsigned int    eth_port_num    Port number.
- *      char *          p_addr          Address to be set
- *
- * OUTPUT:
- *      Set MAC address low and high registers. also calls
- *      eth_port_set_filter_table_entry() to set the unicast
- *      table with the proper information.
- *
- * RETURN:
- *      N/A.
- *
+ * eth_port_uc_addr_set - Write a MAC address into the port's hw registers
  */
-static void eth_port_uc_addr_set(unsigned int eth_port_num,
-                                                        unsigned char *p_addr)
+static void eth_port_uc_addr_set(unsigned int port_num, unsigned char *p_addr)
 {
         unsigned int mac_h;
         unsigned int mac_l;
@@ -1868,40 +1851,24 @@ static void eth_port_uc_addr_set(unsigned int eth_port_num,
         mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
                                                         (p_addr[3] << 0);
 
-        mv_write(MV643XX_ETH_MAC_ADDR_LOW(eth_port_num), mac_l);
-        mv_write(MV643XX_ETH_MAC_ADDR_HIGH(eth_port_num), mac_h);
+        mv_write(MV643XX_ETH_MAC_ADDR_LOW(port_num), mac_l);
+        mv_write(MV643XX_ETH_MAC_ADDR_HIGH(port_num), mac_h);
 
-        /* Accept frames of this address */
-        table = MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE(eth_port_num);
+        /* Accept frames with this address */
+        table = MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE(port_num);
         eth_port_set_filter_table_entry(table, p_addr[5] & 0x0f);
 }
 
 /*
- * eth_port_uc_addr_get - This function retrieves the port Unicast address
- * (MAC address) from the ethernet hw registers.
- *
- * DESCRIPTION:
- *              This function retrieves the port Ethernet MAC address.
- *
- * INPUT:
- *      unsigned int    eth_port_num    Port number.
- *      char            *MacAddr        pointer where the MAC address is stored
- *
- * OUTPUT:
- *      Copy the MAC address to the location pointed to by MacAddr
- *
- * RETURN:
- *      N/A.
- *
+ * eth_port_uc_addr_get - Read the MAC address from the port's hw registers
  */
-static void eth_port_uc_addr_get(struct net_device *dev, unsigned char *p_addr)
+static void eth_port_uc_addr_get(unsigned int port_num, unsigned char *p_addr)
 {
-        struct mv643xx_private *mp = netdev_priv(dev);
         unsigned int mac_h;
         unsigned int mac_l;
 
-        mac_h = mv_read(MV643XX_ETH_MAC_ADDR_HIGH(mp->port_num));
-        mac_l = mv_read(MV643XX_ETH_MAC_ADDR_LOW(mp->port_num));
+        mac_h = mv_read(MV643XX_ETH_MAC_ADDR_HIGH(port_num));
+        mac_l = mv_read(MV643XX_ETH_MAC_ADDR_LOW(port_num));
 
         p_addr[0] = (mac_h >> 24) & 0xff;
         p_addr[1] = (mac_h >> 16) & 0xff;
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index 7d4e90cf49e8..82f8c0cbfb64 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -346,10 +346,6 @@ static void eth_port_init(struct mv643xx_private *mp);
 static void eth_port_reset(unsigned int eth_port_num);
 static void eth_port_start(struct net_device *dev);
 
-/* Port MAC address routines */
-static void eth_port_uc_addr_set(unsigned int eth_port_num,
-                                 unsigned char *p_addr);
-
 /* PHY and MIB routines */
 static void ethernet_phy_reset(unsigned int eth_port_num);
 
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index dd8ce35332fe..ad6688eab265 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -64,9 +64,9 @@
 #include "netxen_nic_hw.h"
 
 #define _NETXEN_NIC_LINUX_MAJOR 3
-#define _NETXEN_NIC_LINUX_MINOR 3
-#define _NETXEN_NIC_LINUX_SUBVERSION 3
-#define NETXEN_NIC_LINUX_VERSIONID  "3.3.3"
+#define _NETXEN_NIC_LINUX_MINOR 4
+#define _NETXEN_NIC_LINUX_SUBVERSION 2
+#define NETXEN_NIC_LINUX_VERSIONID  "3.4.2"
 
 #define NUM_FLASH_SECTORS (64)
 #define FLASH_SECTOR_SIZE (64 * 1024)
@@ -131,8 +131,8 @@ extern struct workqueue_struct *netxen_workq;
 #define FIRST_PAGE_GROUP_START  0
 #define FIRST_PAGE_GROUP_END    0x100000
 
-#define SECOND_PAGE_GROUP_START 0x4000000
-#define SECOND_PAGE_GROUP_END   0x66BC000
+#define SECOND_PAGE_GROUP_START 0x6000000
+#define SECOND_PAGE_GROUP_END   0x68BC000
 
 #define THIRD_PAGE_GROUP_START  0x70E4000
 #define THIRD_PAGE_GROUP_END    0x8000000
@@ -205,6 +205,8 @@ enum {
 
 #define MAX_CMD_DESCRIPTORS             1024
 #define MAX_RCV_DESCRIPTORS             16384
+#define MAX_CMD_DESCRIPTORS_HOST        (MAX_CMD_DESCRIPTORS / 4)
+#define MAX_RCV_DESCRIPTORS_1G          (MAX_RCV_DESCRIPTORS / 4)
 #define MAX_JUMBO_RCV_DESCRIPTORS       1024
 #define MAX_LRO_RCV_DESCRIPTORS         64
 #define MAX_RCVSTATUS_DESCRIPTORS       MAX_RCV_DESCRIPTORS
@@ -230,7 +232,9 @@ enum {
         (((index) + (count)) & ((length) - 1))
 
 #define MPORT_SINGLE_FUNCTION_MODE 0x1111
+#define MPORT_MULTI_FUNCTION_MODE 0x2222
 
+#include "netxen_nic_phan_reg.h"
 extern unsigned long long netxen_dma_mask;
 extern unsigned long last_schedule_time;
 
@@ -300,6 +304,8 @@ struct netxen_ring_ctx {
 
 #define netxen_set_cmd_desc_port(cmd_desc, var) \
         ((cmd_desc)->port_ctxid |= ((var) & 0x0F))
+#define netxen_set_cmd_desc_ctxid(cmd_desc, var)        \
+        ((cmd_desc)->port_ctxid |= ((var) & 0xF0))
 
 #define netxen_set_cmd_desc_flags(cmd_desc, val)        \
         ((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x7f), \
@@ -442,7 +448,7 @@ struct status_desc {
         /* Bit pattern: 0-6 lro_count indicates frag sequence,
            7 last_frag indicates last frag */
         u8 lro;
-} __attribute__ ((aligned(8)));
+} __attribute__ ((aligned(16)));
 
 enum {
         NETXEN_RCV_PEG_0 = 0,
@@ -703,10 +709,8 @@ extern char netxen_nic_driver_name[];
 #else
 #define DPRINTK(klevel, fmt, args...)   do { \
         printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\
-                (adapter != NULL && \
-                adapter->port[0] != NULL && \
-                adapter->port[0]->netdev != NULL) ? \
-                adapter->port[0]->netdev->name : NULL, \
+                (adapter != NULL && adapter->netdev != NULL) ? \
+                adapter->netdev->name : NULL, \
                 ## args); } while(0)
 #endif
 
@@ -722,6 +726,18 @@ struct netxen_skb_frag {
         u32 length;
 };
 
+#define _netxen_set_bits(config_word, start, bits, val) {\
+        unsigned long long __tmask = (((1ULL << (bits)) - 1) << (start));\
+        unsigned long long __tvalue = (val);    \
+        (config_word) &= ~__tmask;      \
+        (config_word) |= (((__tvalue) << (start)) & __tmask); \
+}
+        
+#define _netxen_clear_bits(config_word, start, bits) {\
+        unsigned long long __tmask = (((1ULL << (bits)) - 1) << (start));  \
+        (config_word) &= ~__tmask; \
+}               
+
 /*    Following defines are for the state of the buffers    */
 #define NETXEN_BUFFER_FREE      0
 #define NETXEN_BUFFER_BUSY      1
@@ -766,6 +782,8 @@ struct netxen_hardware_context {
         void __iomem *pci_base0;
         void __iomem *pci_base1;
         void __iomem *pci_base2;
+        unsigned long first_page_group_end;
+        unsigned long first_page_group_start;
         void __iomem *db_base;
         unsigned long db_len;
 
@@ -780,6 +798,7 @@ struct netxen_hardware_context {
         struct pci_dev *cmd_desc_pdev;
         dma_addr_t cmd_desc_phys_addr;
         struct netxen_adapter *adapter;
+        int pci_func;
 };
 
 #define RCV_RING_LRO    RCV_DESC_LRO
@@ -788,17 +807,27 @@ struct netxen_hardware_context {
 #define ETHERNET_FCS_SIZE               4
 
 struct netxen_adapter_stats {
-        u64 ints;
-        u64 hostints;
-        u64 otherints;
-        u64 process_rcv;
-        u64 process_xmit;
-        u64 noxmitdone;
-        u64 xmitcsummed;
-        u64 post_called;
-        u64 posted;
-        u64 lastposted;
-        u64 goodskbposts;
+        u64  rcvdbadskb;
+        u64  xmitcalled;
+        u64  xmitedframes;
+        u64  xmitfinished;
+        u64  badskblen;
+        u64  nocmddescriptor;
+        u64  polled;
+        u64  uphappy;
+        u64  updropped;
+        u64  uplcong;
+        u64  uphcong;
+        u64  upmcong;
+        u64  updunno;
+        u64  skbfreed;
+        u64  txdropped;
+        u64  txnullskb;
+        u64  csummed;
+        u64  no_rcv;
+        u64  rxbytes;
+        u64  txbytes;
+        u64  ints;
 };
 
 /*
@@ -846,13 +875,20 @@ struct netxen_dummy_dma {
 
 struct netxen_adapter {
         struct netxen_hardware_context ahw;
-        int port_count;         /* Number of configured ports  */
-        int active_ports;       /* Number of open ports */
-        struct netxen_port *port[NETXEN_MAX_PORTS];     /* ptr to each port  */
+        
+        struct netxen_adapter *master;
+        struct net_device *netdev;
+        struct pci_dev *pdev;
+        struct net_device_stats net_stats;
+        unsigned char mac_addr[ETH_ALEN];
+        int mtu;
+        int portnum;
+
         spinlock_t tx_lock;
         spinlock_t lock;
         struct work_struct watchdog_task;
         struct timer_list watchdog_timer;
+        struct work_struct  tx_timeout_task;
 
         u32 curr_window;
 
@@ -875,6 +911,15 @@ struct netxen_adapter {
         u32 temp;
 
         struct netxen_adapter_stats stats;
+        
+        u16 portno;
+        u16 link_speed;
+        u16 link_duplex;
+        u16 state;
+        u16 link_autoneg;
+        int rcsum;
+        int status;
+        spinlock_t stats_lock;
 
         struct netxen_cmd_buffer *cmd_buf_arr;  /* Command buffers for xmit */
 
@@ -891,65 +936,23 @@ struct netxen_adapter {
         struct netxen_ring_ctx *ctx_desc;
         struct pci_dev *ctx_desc_pdev;
         dma_addr_t ctx_desc_phys_addr;
-        int (*enable_phy_interrupts) (struct netxen_adapter *, int);
-        int (*disable_phy_interrupts) (struct netxen_adapter *, int);
+        int (*enable_phy_interrupts) (struct netxen_adapter *);
+        int (*disable_phy_interrupts) (struct netxen_adapter *);
         void (*handle_phy_intr) (struct netxen_adapter *);
-        int (*macaddr_set) (struct netxen_port *, netxen_ethernet_macaddr_t);
-        int (*set_mtu) (struct netxen_port *, int);
-        int (*set_promisc) (struct netxen_adapter *, int,
-                            netxen_niu_prom_mode_t);
-        int (*unset_promisc) (struct netxen_adapter *, int,
-                              netxen_niu_prom_mode_t);
-        int (*phy_read) (struct netxen_adapter *, long phy, long reg, u32 *);
-        int (*phy_write) (struct netxen_adapter *, long phy, long reg, u32 val);
+        int (*macaddr_set) (struct netxen_adapter *, netxen_ethernet_macaddr_t);
+        int (*set_mtu) (struct netxen_adapter *, int);
+        int (*set_promisc) (struct netxen_adapter *, netxen_niu_prom_mode_t);
+        int (*unset_promisc) (struct netxen_adapter *, netxen_niu_prom_mode_t);
+        int (*phy_read) (struct netxen_adapter *, long reg, u32 *);
+        int (*phy_write) (struct netxen_adapter *, long reg, u32 val);
         int (*init_port) (struct netxen_adapter *, int);
         void (*init_niu) (struct netxen_adapter *);
-        int (*stop_port) (struct netxen_adapter *, int);
+        int (*stop_port) (struct netxen_adapter *);
 };                              /* netxen_adapter structure */
 
 /* Max number of xmit producer threads that can run simultaneously */
 #define MAX_XMIT_PRODUCERS              16
 
-struct netxen_port_stats {
-        u64 rcvdbadskb;
-        u64 xmitcalled;
-        u64 xmitedframes;
-        u64 xmitfinished;
-        u64 badskblen;
-        u64 nocmddescriptor;
-        u64 polled;
-        u64 uphappy;
-        u64 updropped;
-        u64 uplcong;
-        u64 uphcong;
-        u64 upmcong;
-        u64 updunno;
-        u64 skbfreed;
-        u64 txdropped;
-        u64 txnullskb;
-        u64 csummed;
-        u64 no_rcv;
-        u64 rxbytes;
-        u64 txbytes;
-};
-
-struct netxen_port {
-        struct netxen_adapter *adapter;
-
-        u16 portnum;            /* GBE port number */
-        u16 link_speed;
-        u16 link_duplex;
-        u16 link_autoneg;
-
-        int flags;
-
-        struct net_device *netdev;
-        struct pci_dev *pdev;
-        struct net_device_stats net_stats;
-        struct netxen_port_stats stats;
-        struct work_struct tx_timeout_task;
-};
-
 #define PCI_OFFSET_FIRST_RANGE(adapter, off)    \
         ((adapter)->ahw.pci_base0 + (off))
 #define PCI_OFFSET_SECOND_RANGE(adapter, off)   \
@@ -987,32 +990,26 @@ static inline void __iomem *pci_base(struct netxen_adapter *adapter,
         return NULL;
 }
 
-int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter,
-                                          int port);
-int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter,
-                                         int port);
-int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter,
-                                           int port);
-int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter,
-                                          int port);
-int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter,
-                                         int port);
-int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter,
-                                        int port);
+int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter);
+int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter);
+int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter);
+int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter);
+int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter);
+int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter);
 void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter);
 void netxen_nic_gbe_handle_phy_intr(struct netxen_adapter *adapter);
 void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter, int port,
                                  long enable);
 void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter, int port,
                                   long enable);
-int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long phy, long reg,
+int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg,
                             __u32 * readval);
-int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long phy,
+int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter,
                              long reg, __u32 val);
 
 /* Functions available from netxen_nic_hw.c */
-int netxen_nic_set_mtu_xgb(struct netxen_port *port, int new_mtu);
-int netxen_nic_set_mtu_gb(struct netxen_port *port, int new_mtu);
+int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu);
+int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu);
 void netxen_nic_init_niu_gb(struct netxen_adapter *adapter);
 void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw);
 void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val);
@@ -1027,6 +1024,7 @@ int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off, void *data,
                            int len);
 void netxen_crb_writelit_adapter(struct netxen_adapter *adapter,
                                  unsigned long off, int data);
+int netxen_nic_erase_pxe(struct netxen_adapter *adapter);
 
 /* Functions from netxen_nic_init.c */
 void netxen_free_adapter_offload(struct netxen_adapter *adapter);
@@ -1051,11 +1049,8 @@ int netxen_do_rom_se(struct netxen_adapter *adapter, int addr);
 
 /* Functions from netxen_nic_isr.c */
 void netxen_nic_isr_other(struct netxen_adapter *adapter);
-void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 port,
-                                 u32 link);
-void netxen_handle_port_int(struct netxen_adapter *adapter, u32 port,
-                            u32 enable);
-void netxen_nic_stop_all_ports(struct netxen_adapter *adapter);
+void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 link);
+void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable);
 void netxen_initialize_adapter_sw(struct netxen_adapter *adapter);
 void netxen_initialize_adapter_hw(struct netxen_adapter *adapter);
 void *netxen_alloc(struct pci_dev *pdev, size_t sz, dma_addr_t * ptr,
@@ -1110,6 +1105,7 @@ static inline void netxen_nic_enable_int(struct netxen_adapter *adapter)
 
         if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
                 mask = 0xbff;
+                writel(0X0, NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
                 writel(mask, PCI_OFFSET_SECOND_RANGE(adapter,
                                                      ISR_INT_TARGET_MASK));
         }
@@ -1174,4 +1170,5 @@ extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,
 
 extern struct ethtool_ops netxen_nic_ethtool_ops;
 
+extern int physical_port[];     /* physical port # from virtual port.*/
 #endif                          /* __NETXEN_NIC_H_ */
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index ee1b5a24cbe7..16fabb377488 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -40,8 +40,8 @@
 #include <linux/ethtool.h>
 #include <linux/version.h>
 
-#include "netxen_nic_hw.h"
 #include "netxen_nic.h"
+#include "netxen_nic_hw.h"
 #include "netxen_nic_phan_reg.h"
 
 struct netxen_nic_stats {
@@ -50,8 +50,8 @@ struct netxen_nic_stats {
         int stat_offset;
 };
 
-#define NETXEN_NIC_STAT(m) sizeof(((struct netxen_port *)0)->m), \
-                        offsetof(struct netxen_port, m)
+#define NETXEN_NIC_STAT(m) sizeof(((struct netxen_adapter *)0)->m), \
+                        offsetof(struct netxen_adapter, m)
 
 #define NETXEN_NIC_PORT_WINDOW 0x10000
 #define NETXEN_NIC_INVALID_DATA 0xDEADBEEF
@@ -100,8 +100,7 @@ static int netxen_nic_get_eeprom_len(struct net_device *dev)
 static void
 netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         u32 fw_major = 0;
         u32 fw_minor = 0;
         u32 fw_build = 0;
@@ -115,7 +114,7 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
         fw_build = readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_SUB));
         sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);
 
-        strncpy(drvinfo->bus_info, pci_name(port->pdev), 32);
+        strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
         drvinfo->n_stats = NETXEN_NIC_STATS_LEN;
         drvinfo->testinfo_len = NETXEN_NIC_TEST_LEN;
         drvinfo->regdump_len = NETXEN_NIC_REGS_LEN;
@@ -125,8 +124,7 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
 static int
 netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         struct netxen_board_info *boardinfo = &adapter->ahw.boardcfg;
 
         /* read which mode */
@@ -146,8 +144,8 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 ecmd->port = PORT_TP;
 
                 if (netif_running(dev)) {
-                        ecmd->speed = port->link_speed;
-                        ecmd->duplex = port->link_duplex;
+                        ecmd->speed = adapter->link_speed;
+                        ecmd->duplex = adapter->link_duplex;
                 } else
                         return -EIO;    /* link absent */
         } else if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
@@ -165,7 +163,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         } else
                 return -EIO;
 
-        ecmd->phy_address = port->portnum;
+        ecmd->phy_address = adapter->portnum;
         ecmd->transceiver = XCVR_EXTERNAL;
 
         switch ((netxen_brdtype_t) boardinfo->board_type) {
@@ -179,7 +177,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 ecmd->port = PORT_TP;
                 ecmd->autoneg = (boardinfo->board_type ==
                                  NETXEN_BRDTYPE_P2_SB31_10G_CX4) ?
-                    (AUTONEG_DISABLE) : (port->link_autoneg);
+                    (AUTONEG_DISABLE) : (adapter->link_autoneg);
                 break;
         case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ:
         case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ:
@@ -206,23 +204,22 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 static int
 netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         __u32 status;
 
         /* read which mode */
         if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                 /* autonegotiation */
                 if (adapter->phy_write
-                    && adapter->phy_write(adapter, port->portnum,
+                    && adapter->phy_write(adapter,
                                           NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
                                           ecmd->autoneg) != 0)
                         return -EIO;
                 else
-                        port->link_autoneg = ecmd->autoneg;
+                        adapter->link_autoneg = ecmd->autoneg;
 
                 if (adapter->phy_read
-                    && adapter->phy_read(adapter, port->portnum,
+                    && adapter->phy_read(adapter,
                                          NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                          &status) != 0)
                         return -EIO;
@@ -245,13 +242,13 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 if (ecmd->duplex == DUPLEX_FULL)
                         netxen_set_phy_duplex(status);
                 if (adapter->phy_write
-                    && adapter->phy_write(adapter, port->portnum,
+                    && adapter->phy_write(adapter,
                                           NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                           *((int *)&status)) != 0)
                         return -EIO;
                 else {
-                        port->link_speed = ecmd->speed;
-                        port->link_duplex = ecmd->duplex;
+                        adapter->link_speed = ecmd->speed;
+                        adapter->link_duplex = ecmd->duplex;
                 }
         } else
                 return -EOPNOTSUPP;
@@ -360,15 +357,14 @@ static struct netxen_niu_regs niu_registers[] = {
 static void
 netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         __u32 mode, *regs_buff = p;
         void __iomem *addr;
         int i, window;
 
         memset(p, 0, NETXEN_NIC_REGS_LEN);
         regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |
-            (port->pdev)->device;
+            (adapter->pdev)->device;
         /* which mode */
         NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_MODE, &regs_buff[0]);
         mode = regs_buff[0];
@@ -383,7 +379,8 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
                 for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) {
                         /* GB: port specific registers */
                         if (mode == 0 && i >= 19)
-                                window = port->portnum * NETXEN_NIC_PORT_WINDOW;
+                                window = physical_port[adapter->portnum] *
+                                        NETXEN_NIC_PORT_WINDOW;
 
                         NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode].
                                                    reg[i - 3] + window,
@@ -395,15 +392,14 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
 
 static u32 netxen_nic_test_link(struct net_device *dev)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         __u32 status;
         int val;
 
         /* read which mode */
         if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                 if (adapter->phy_read
-                    && adapter->phy_read(adapter, port->portnum,
+                    && adapter->phy_read(adapter,
                                          NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                          &status) != 0)
                         return -EIO;
@@ -422,15 +418,15 @@ static int
 netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                       u8 * bytes)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         int offset;
         int ret;
 
         if (eeprom->len == 0)
                 return -EINVAL;
 
-        eeprom->magic = (port->pdev)->vendor | ((port->pdev)->device << 16);
+        eeprom->magic = (adapter->pdev)->vendor | 
+                        ((adapter->pdev)->device << 16);
         offset = eeprom->offset;
 
         ret = netxen_rom_fast_read_words(adapter, offset, bytes, 
@@ -445,8 +441,7 @@ static int
 netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                         u8 * bytes)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         int offset = eeprom->offset;
         static int flash_start;
         static int ready_to_flash;
@@ -516,8 +511,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
 static void
 netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         int i;
 
         ring->rx_pending = 0;
@@ -541,19 +535,45 @@ static void
 netxen_nic_get_pauseparam(struct net_device *dev,
                           struct ethtool_pauseparam *pause)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         __u32 val;
+        int port = physical_port[adapter->portnum];
 
         if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
+                if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
+                        return;
                 /* get flow control settings */
-                netxen_nic_read_w0(adapter,
-                                   NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),
-                                   &val);
+                netxen_nic_read_w0(adapter,NETXEN_NIU_GB_MAC_CONFIG_0(port),
+                                &val);
                 pause->rx_pause = netxen_gb_get_rx_flowctl(val);
-                pause->tx_pause = netxen_gb_get_tx_flowctl(val);
-                /* get autoneg settings */
-                pause->autoneg = port->link_autoneg;
+                netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, &val);
+                switch (port) {
+                        case 0:
+                                pause->tx_pause = !(netxen_gb_get_gb0_mask(val));
+                                break;
+                        case 1:
+                                pause->tx_pause = !(netxen_gb_get_gb1_mask(val));
+                                break;
+                        case 2:
+                                pause->tx_pause = !(netxen_gb_get_gb2_mask(val));
+                                break;
+                        case 3:
+                        default:
+                                pause->tx_pause = !(netxen_gb_get_gb3_mask(val));
+                                break;
+                }
+        } else if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
+                if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
+                        return;
+                pause->rx_pause = 1;
+                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, &val);
+                if (port == 0)
+                        pause->tx_pause = !(netxen_xg_get_xg0_mask(val));
+                else
+                        pause->tx_pause = !(netxen_xg_get_xg1_mask(val));
+        } else {
+                printk(KERN_ERR"%s: Unknown board type: %x\n", 
+                                netxen_nic_driver_name, adapter->ahw.board_type);
         }
 }
 
@@ -561,42 +581,76 @@ static int
 netxen_nic_set_pauseparam(struct net_device *dev,
                           struct ethtool_pauseparam *pause)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(dev);
         __u32 val;
-        unsigned int autoneg;
-
+        int port = physical_port[adapter->portnum];
         /* read mode */
         if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
+                if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
+                        return -EIO;
                 /* set flow control */
                 netxen_nic_read_w0(adapter,
-                                   NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),
-                                   (u32 *) & val);
-                if (pause->tx_pause)
-                        netxen_gb_tx_flowctl(val);
-                else
-                        netxen_gb_unset_tx_flowctl(val);
+                                        NETXEN_NIU_GB_MAC_CONFIG_0(port), &val);
+                
                 if (pause->rx_pause)
                         netxen_gb_rx_flowctl(val);
                 else
                         netxen_gb_unset_rx_flowctl(val);
 
-                netxen_nic_write_w0(adapter,
-                                    NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),
-                                    *&val);
+                netxen_nic_write_w0(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
+                                val);
                 /* set autoneg */
-                autoneg = pause->autoneg;
-                if (adapter->phy_write
-                    && adapter->phy_write(adapter, port->portnum,
-                                          NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                          autoneg) != 0)
+                netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, &val);
+                switch (port) {
+                        case 0:
+                                if (pause->tx_pause)
+                                        netxen_gb_unset_gb0_mask(val);
+                                else
+                                        netxen_gb_set_gb0_mask(val);
+                                break;
+                        case 1:
+                                if (pause->tx_pause)
+                                        netxen_gb_unset_gb1_mask(val);
+                                else
+                                        netxen_gb_set_gb1_mask(val);
+                                break;
+                        case 2:
+                                if (pause->tx_pause)
+                                        netxen_gb_unset_gb2_mask(val);
+                                else
+                                        netxen_gb_set_gb2_mask(val);
+                                break;
+                        case 3:
+                        default:
+                                if (pause->tx_pause)
+                                        netxen_gb_unset_gb3_mask(val);
+                                else
+                                        netxen_gb_set_gb3_mask(val);
+                                break;
+                }
+                netxen_nic_write_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, val);
+        } else if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
+                if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
                         return -EIO;
-                else {
-                        port->link_autoneg = pause->autoneg;
-                        return 0;
+                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, &val);
+                if (port == 0) {
+                        if (pause->tx_pause)
+                                netxen_xg_unset_xg0_mask(val);
+                        else
+                                netxen_xg_set_xg0_mask(val);
+                } else {
+                        if (pause->tx_pause)
+                                netxen_xg_unset_xg1_mask(val);
+                        else
+                                netxen_xg_set_xg1_mask(val);
                 }
-        } else
-                return -EOPNOTSUPP;
+                netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);                     
+        } else {
+                printk(KERN_ERR "%s: Unknown board type: %x\n",
+                                netxen_nic_driver_name, 
+                                adapter->ahw.board_type);
+        }
+        return 0;
 }
 
 static int netxen_nic_reg_test(struct net_device *dev)
@@ -627,23 +681,12 @@ static void
 netxen_nic_diag_test(struct net_device *dev, struct ethtool_test *eth_test,
                      u64 * data)
 {
-        if (eth_test->flags == ETH_TEST_FL_OFFLINE) {   /* offline tests */
-                /* link test */
-                if ((data[1] = (u64) netxen_nic_test_link(dev)))
-                        eth_test->flags |= ETH_TEST_FL_FAILED;
-
-                /* register tests */
-                if ((data[0] = netxen_nic_reg_test(dev)))
-                        eth_test->flags |= ETH_TEST_FL_FAILED;
-        } else {                /* online tests */
-                /* register tests */
-                if((data[0] = netxen_nic_reg_test(dev)))
-                        eth_test->flags |= ETH_TEST_FL_FAILED;
-
-                /* link test */
-                if ((data[1] = (u64) netxen_nic_test_link(dev)))
-                        eth_test->flags |= ETH_TEST_FL_FAILED;
-        }
+        memset(data, 0, sizeof(uint64_t) * NETXEN_NIC_TEST_LEN);
+        if ((data[0] = netxen_nic_reg_test(dev)))
+                eth_test->flags |= ETH_TEST_FL_FAILED;
+        /* link test */
+        if ((data[1] = (u64) netxen_nic_test_link(dev)))
+                eth_test->flags |= ETH_TEST_FL_FAILED;
 }
 
 static void
@@ -675,12 +718,13 @@ static void
 netxen_nic_get_ethtool_stats(struct net_device *dev,
                              struct ethtool_stats *stats, u64 * data)
 {
-        struct netxen_port *port = netdev_priv(dev);
+        struct netxen_adapter *adapter = netdev_priv(dev);
         int index;
 
         for (index = 0; index < NETXEN_NIC_STATS_LEN; index++) {
                 char *p =
-                    (char *)port + netxen_nic_gstrings_stats[index].stat_offset;
+                    (char *)adapter +
+                    netxen_nic_gstrings_stats[index].stat_offset;
                 data[index] =
                     (netxen_nic_gstrings_stats[index].sizeof_stat ==
                      sizeof(u64)) ? *(u64 *) p : *(u32 *) p;
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index fe8b675f9e72..608e37b349b4 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -467,6 +467,8 @@ enum {
 #define NETXEN_PCI_OCM1         (0x05100000UL)
 #define NETXEN_PCI_OCM1_MAX     (0x051fffffUL)
 #define NETXEN_PCI_CRBSPACE     (0x06000000UL)
+#define NETXEN_PCI_128MB_SIZE   (0x08000000UL)
+#define NETXEN_PCI_32MB_SIZE    (0x02000000UL)
 
 #define NETXEN_CRB_CAM  NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_CAM)
 
@@ -484,6 +486,7 @@ enum {
         /* 10 seconds before we give up */
 #define NETXEN_NIU_PHY_WAITMAX          50
 #define NETXEN_NIU_MAX_GBE_PORTS        4
+#define NETXEN_NIU_MAX_XG_PORTS         2
 
 #define NETXEN_NIU_MODE                 (NETXEN_CRB_NIU + 0x00000)
 
@@ -527,6 +530,7 @@ enum {
 #define NETXEN_NIU_XG_PAUSE_CTL         (NETXEN_CRB_NIU + 0x00098)
 #define NETXEN_NIU_XG_PAUSE_LEVEL       (NETXEN_CRB_NIU + 0x000dc)
 #define NETXEN_NIU_XG_SEL               (NETXEN_CRB_NIU + 0x00128)
+#define NETXEN_NIU_GB_PAUSE_CTL         (NETXEN_CRB_NIU + 0x0030c)
 
 #define NETXEN_NIU_FULL_LEVEL_XG        (NETXEN_CRB_NIU + 0x00450)
 
@@ -649,11 +653,19 @@ enum {
 #define PCIX_MS_WINDOW          (0x10204)
 #define PCIX_SN_WINDOW          (0x10208)
 #define PCIX_CRB_WINDOW         (0x10210)
+#define PCIX_CRB_WINDOW_F0      (0x10210)
+#define PCIX_CRB_WINDOW_F1      (0x10230)
+#define PCIX_CRB_WINDOW_F2      (0x10250)
+#define PCIX_CRB_WINDOW_F3      (0x10270)
 
 #define PCIX_TARGET_STATUS      (0x10118)
 #define PCIX_TARGET_MASK        (0x10128)
 
 #define PCIX_MSI_F0             (0x13000)
+#define PCIX_MSI_F1             (0x13004)
+#define PCIX_MSI_F2             (0x13008)
+#define PCIX_MSI_F3             (0x1300c)
+#define PCIX_MSI_F(i)           (0x13000+((i)*4))
 
 #define PCIX_PS_MEM_SPACE       (0x90000)
 
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 0fba8f190762..baff17a24d63 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -33,10 +33,225 @@
 
 #include "netxen_nic.h"
 #include "netxen_nic_hw.h"
+#define DEFINE_GLOBAL_RECV_CRB
 #include "netxen_nic_phan_reg.h"
 
+
 #include <net/ip.h>
 
+struct netxen_recv_crb recv_crb_registers[] = {
+        /*
+         * Instance 0.
+         */
+        {
+         /* rcv_desc_crb: */
+         {
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x100),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x104),
+           /* crb_gloablrcv_ring: */
+           NETXEN_NIC_REG(0x108),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x10c),
+
+           },
+          /* Jumbo frames */
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x110),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x114),
+           /* crb_gloablrcv_ring: */
+           NETXEN_NIC_REG(0x118),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x11c),
+           },
+          /* LRO */
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x120),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x124),
+           /* crb_gloablrcv_ring: */
+           NETXEN_NIC_REG(0x128),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x12c),
+           }
+          },
+         /* crb_rcvstatus_ring: */
+         NETXEN_NIC_REG(0x130),
+         /* crb_rcv_status_producer: */
+         NETXEN_NIC_REG(0x134),
+         /* crb_rcv_status_consumer: */
+         NETXEN_NIC_REG(0x138),
+         /* crb_rcvpeg_state: */
+         NETXEN_NIC_REG(0x13c),
+         /* crb_status_ring_size */
+         NETXEN_NIC_REG(0x140),
+
+         },
+        /*
+         * Instance 1,
+         */
+        {
+         /* rcv_desc_crb: */
+         {
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x144),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x148),
+           /* crb_globalrcv_ring: */
+           NETXEN_NIC_REG(0x14c),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x150),
+
+           },
+          /* Jumbo frames */
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x154),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x158),
+           /* crb_globalrcv_ring: */
+           NETXEN_NIC_REG(0x15c),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x160),
+           },
+          /* LRO */
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x164),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x168),
+           /* crb_globalrcv_ring: */
+           NETXEN_NIC_REG(0x16c),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x170),
+           }
+
+          },
+         /* crb_rcvstatus_ring: */
+         NETXEN_NIC_REG(0x174),
+         /* crb_rcv_status_producer: */
+         NETXEN_NIC_REG(0x178),
+         /* crb_rcv_status_consumer: */
+         NETXEN_NIC_REG(0x17c),
+         /* crb_rcvpeg_state: */
+         NETXEN_NIC_REG(0x180),
+         /* crb_status_ring_size */
+         NETXEN_NIC_REG(0x184),
+         },
+        /*
+         * Instance 2,
+         */
+        {
+          {
+            {
+            /* crb_rcv_producer_offset: */
+            NETXEN_NIC_REG(0x1d8),
+            /* crb_rcv_consumer_offset: */
+            NETXEN_NIC_REG(0x1dc),
+            /* crb_gloablrcv_ring: */
+            NETXEN_NIC_REG(0x1f0),
+            /* crb_rcv_ring_size */
+            NETXEN_NIC_REG(0x1f4),
+            },
+            /* Jumbo frames */
+            {
+            /* crb_rcv_producer_offset: */                  
+            NETXEN_NIC_REG(0x1f8),
+            /* crb_rcv_consumer_offset: */
+            NETXEN_NIC_REG(0x1fc),
+            /* crb_gloablrcv_ring: */
+            NETXEN_NIC_REG(0x200),
+            /* crb_rcv_ring_size */
+            NETXEN_NIC_REG(0x204),
+            },
+            /* LRO */
+            {
+            /* crb_rcv_producer_offset: */
+            NETXEN_NIC_REG(0x208),
+            /* crb_rcv_consumer_offset: */
+            NETXEN_NIC_REG(0x20c),
+            /* crb_gloablrcv_ring: */
+            NETXEN_NIC_REG(0x210),
+            /* crb_rcv_ring_size */
+            NETXEN_NIC_REG(0x214),
+            }
+          },
+          /* crb_rcvstatus_ring: */
+          NETXEN_NIC_REG(0x218),
+          /* crb_rcv_status_producer: */
+          NETXEN_NIC_REG(0x21c),
+          /* crb_rcv_status_consumer: */
+          NETXEN_NIC_REG(0x220),
+          /* crb_rcvpeg_state: */
+          NETXEN_NIC_REG(0x224),
+          /* crb_status_ring_size */
+          NETXEN_NIC_REG(0x228),
+        },
+        /*
+         * Instance 3,
+         */
+        {
+          {
+            {
+            /* crb_rcv_producer_offset: */
+            NETXEN_NIC_REG(0x22c),
+            /* crb_rcv_consumer_offset: */
+            NETXEN_NIC_REG(0x230),
+            /* crb_gloablrcv_ring: */
+            NETXEN_NIC_REG(0x234),
+            /* crb_rcv_ring_size */
+            NETXEN_NIC_REG(0x238),
+            },
+            /* Jumbo frames */
+            {
+            /* crb_rcv_producer_offset: */ 
+            NETXEN_NIC_REG(0x23c),
+            /* crb_rcv_consumer_offset: */
+            NETXEN_NIC_REG(0x240),
+            /* crb_gloablrcv_ring: */
+            NETXEN_NIC_REG(0x244),
+            /* crb_rcv_ring_size */
+            NETXEN_NIC_REG(0x248),
+            },
+            /* LRO */
+            {
+            /* crb_rcv_producer_offset: */
+            NETXEN_NIC_REG(0x24c),
+            /* crb_rcv_consumer_offset: */
+            NETXEN_NIC_REG(0x250),
+            /* crb_gloablrcv_ring: */
+            NETXEN_NIC_REG(0x254),
+            /* crb_rcv_ring_size */
+            NETXEN_NIC_REG(0x258),
+            }
+          },
+          /* crb_rcvstatus_ring: */
+          NETXEN_NIC_REG(0x25c),
+          /* crb_rcv_status_producer: */
+          NETXEN_NIC_REG(0x260),
+          /* crb_rcv_status_consumer: */
+          NETXEN_NIC_REG(0x264),
+          /* crb_rcvpeg_state: */
+          NETXEN_NIC_REG(0x268),
+          /* crb_status_ring_size */
+          NETXEN_NIC_REG(0x26c),
+        },
+};
+
+u64 ctx_addr_sig_regs[][3] = {
+        {NETXEN_NIC_REG(0x188), NETXEN_NIC_REG(0x18c), NETXEN_NIC_REG(0x1c0)},
+        {NETXEN_NIC_REG(0x190), NETXEN_NIC_REG(0x194), NETXEN_NIC_REG(0x1c4)},
+        {NETXEN_NIC_REG(0x198), NETXEN_NIC_REG(0x19c), NETXEN_NIC_REG(0x1c8)},
+        {NETXEN_NIC_REG(0x1a0), NETXEN_NIC_REG(0x1a4), NETXEN_NIC_REG(0x1cc)}
+};
+
+
 /*  PCI Windowing for DDR regions.  */
 
 #define ADDR_IN_RANGE(addr, low, high)  \
@@ -70,8 +285,7 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter);
 
 int netxen_nic_set_mac(struct net_device *netdev, void *p)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
         struct sockaddr *addr = p;
 
         if (netif_running(netdev))
@@ -84,7 +298,7 @@ int netxen_nic_set_mac(struct net_device *netdev, void *p)
         memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
 
         if (adapter->macaddr_set)
-                adapter->macaddr_set(port, addr->sa_data);
+                adapter->macaddr_set(adapter, addr->sa_data);
 
         return 0;
 }
@@ -94,56 +308,19 @@ int netxen_nic_set_mac(struct net_device *netdev, void *p)
  */
 void netxen_nic_set_multi(struct net_device *netdev)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
         struct dev_mc_list *mc_ptr;
-        __u32 netxen_mac_addr_cntl_data = 0;
 
         mc_ptr = netdev->mc_list;
         if (netdev->flags & IFF_PROMISC) {
                 if (adapter->set_promisc)
                         adapter->set_promisc(adapter,
-                                             port->portnum,
                                              NETXEN_NIU_PROMISC_MODE);
         } else {
-                if (adapter->unset_promisc &&
-                    adapter->ahw.boardcfg.board_type
-                    != NETXEN_BRDTYPE_P2_SB31_10G_IMEZ)
+                if (adapter->unset_promisc)
                         adapter->unset_promisc(adapter,
-                                               port->portnum,
                                                NETXEN_NIU_NON_PROMISC_MODE);
         }
-        if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
-                netxen_nic_mcr_set_mode_select(netxen_mac_addr_cntl_data, 0x03);
-                netxen_nic_mcr_set_id_pool0(netxen_mac_addr_cntl_data, 0x00);
-                netxen_nic_mcr_set_id_pool1(netxen_mac_addr_cntl_data, 0x00);
-                netxen_nic_mcr_set_id_pool2(netxen_mac_addr_cntl_data, 0x00);
-                netxen_nic_mcr_set_id_pool3(netxen_mac_addr_cntl_data, 0x00);
-                netxen_nic_mcr_set_enable_xtnd0(netxen_mac_addr_cntl_data);
-                netxen_nic_mcr_set_enable_xtnd1(netxen_mac_addr_cntl_data);
-                netxen_nic_mcr_set_enable_xtnd2(netxen_mac_addr_cntl_data);
-                netxen_nic_mcr_set_enable_xtnd3(netxen_mac_addr_cntl_data);
-        } else {
-                netxen_nic_mcr_set_mode_select(netxen_mac_addr_cntl_data, 0x00);
-                netxen_nic_mcr_set_id_pool0(netxen_mac_addr_cntl_data, 0x00);
-                netxen_nic_mcr_set_id_pool1(netxen_mac_addr_cntl_data, 0x01);
-                netxen_nic_mcr_set_id_pool2(netxen_mac_addr_cntl_data, 0x02);
-                netxen_nic_mcr_set_id_pool3(netxen_mac_addr_cntl_data, 0x03);
-        }
-        writel(netxen_mac_addr_cntl_data,
-               NETXEN_CRB_NORMALIZE(adapter, NETXEN_MAC_ADDR_CNTL_REG));
-        if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
-                writel(netxen_mac_addr_cntl_data,
-                       NETXEN_CRB_NORMALIZE(adapter,
-                                            NETXEN_MULTICAST_ADDR_HI_0));
-        } else {
-                writel(netxen_mac_addr_cntl_data,
-                       NETXEN_CRB_NORMALIZE(adapter,
-                                            NETXEN_MULTICAST_ADDR_HI_1));
-        }
-        netxen_mac_addr_cntl_data = 0;
-        writel(netxen_mac_addr_cntl_data,
-               NETXEN_CRB_NORMALIZE(adapter, NETXEN_NIU_GB_DROP_WRONGADDR));
 }
 
 /*
@@ -152,8 +329,7 @@ void netxen_nic_set_multi(struct net_device *netdev)
  */
 int netxen_nic_change_mtu(struct net_device *netdev, int mtu)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
         int eff_mtu = mtu + NETXEN_ENET_HEADER_SIZE + NETXEN_ETH_FCS_SIZE;
 
         if ((eff_mtu > NETXEN_MAX_MTU) || (eff_mtu < NETXEN_MIN_MTU)) {
@@ -163,7 +339,7 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu)
         }
 
         if (adapter->set_mtu)
-                adapter->set_mtu(port, mtu);
+                adapter->set_mtu(adapter, mtu);
         netdev->mtu = mtu;
 
         return 0;
@@ -180,9 +356,9 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
         void *addr;
         int loops = 0, err = 0;
         int ctx, ring;
-        u32 card_cmdring = 0;
         struct netxen_recv_context *recv_ctx;
         struct netxen_rcv_desc_ctx *rcv_desc;
+        int func_id = adapter->portnum;
 
         DPRINTK(INFO, "crb_base: %lx %x", NETXEN_PCI_CRBSPACE,
                 PCI_OFFSET_SECOND_RANGE(adapter, NETXEN_PCI_CRBSPACE));
@@ -191,11 +367,6 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
         DPRINTK(INFO, "cam RAM: %lx %x", NETXEN_CAM_RAM_BASE,
                 pci_base_offset(adapter, NETXEN_CAM_RAM_BASE));
 
-        /* Window 1 call */
-        card_cmdring = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_CMDRING));
-
-        DPRINTK(INFO, "Command Peg sends 0x%x for cmdring base\n",
-                card_cmdring);
 
         for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
                 DPRINTK(INFO, "Command Peg ready..waiting for rcv peg\n");
@@ -229,7 +400,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
                             (dma_addr_t *) & adapter->ctx_desc_phys_addr,
                             &adapter->ctx_desc_pdev);
 
-        printk("ctx_desc_phys_addr: 0x%llx\n",
+        printk(KERN_INFO "ctx_desc_phys_addr: 0x%llx\n",
                (unsigned long long) adapter->ctx_desc_phys_addr);
         if (addr == NULL) {
                 DPRINTK(ERR, "bad return from pci_alloc_consistent\n");
@@ -238,6 +409,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
         }
         memset(addr, 0, sizeof(struct netxen_ring_ctx));
         adapter->ctx_desc = (struct netxen_ring_ctx *)addr;
+        adapter->ctx_desc->ctx_id = cpu_to_le32(adapter->portnum);
         adapter->ctx_desc->cmd_consumer_offset =
             cpu_to_le64(adapter->ctx_desc_phys_addr +
                         sizeof(struct netxen_ring_ctx));
@@ -249,7 +421,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
                             adapter->max_tx_desc_count,
                             (dma_addr_t *) & hw->cmd_desc_phys_addr,
                             &adapter->ahw.cmd_desc_pdev);
-        printk("cmd_desc_phys_addr: 0x%llx\n",
+        printk(KERN_INFO "cmd_desc_phys_addr: 0x%llx\n",
                (unsigned long long) hw->cmd_desc_phys_addr);
 
         if (addr == NULL) {
@@ -308,11 +480,11 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
         /* Window = 1 */
 
         writel(lower32(adapter->ctx_desc_phys_addr),
-               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_ADDR_REG_LO));
+               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_ADDR_REG_LO(func_id)));
         writel(upper32(adapter->ctx_desc_phys_addr),
-               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_ADDR_REG_HI));
-        writel(NETXEN_CTX_SIGNATURE,
-               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_SIGNATURE_REG));
+               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_ADDR_REG_HI(func_id)));
+        writel(NETXEN_CTX_SIGNATURE | func_id,
+               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_SIGNATURE_REG(func_id)));
         return err;
 }
 
@@ -339,10 +511,6 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter)
                                     adapter->ahw.cmd_desc_phys_addr);
                 adapter->ahw.cmd_desc_head = NULL;
         }
-        /* Special handling: there are 2 ports on this board */
-        if (adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) {
-                adapter->ahw.max_ports = 2;
-        }
 
         for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
                 recv_ctx = &adapter->recv_ctx[ctx];
@@ -385,7 +553,6 @@ void netxen_tso_check(struct netxen_adapter *adapter,
                         return;
                 }
         }
-        adapter->stats.xmitcsummed++;
         desc->tcp_hdr_offset = skb_transport_offset(skb);
         desc->ip_hdr_offset = skb_network_offset(skb);
 }
@@ -475,7 +642,30 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw)
 
         if (adapter->curr_window == wndw)
                 return;
-
+        switch(adapter->ahw.pci_func) {
+                case 0:
+                        offset = PCI_OFFSET_SECOND_RANGE(adapter,
+                                        NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));
+                        break;
+                case 1:
+                        offset = PCI_OFFSET_SECOND_RANGE(adapter,
+                                        NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW_F1));
+                        break;
+                case 2:
+                        offset = PCI_OFFSET_SECOND_RANGE(adapter,
+                                        NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW_F2));
+                        break;
+                case 3:
+                        offset = PCI_OFFSET_SECOND_RANGE(adapter,
+                                        NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW_F3));
+                        break;
+                default:
+                        printk(KERN_INFO "Changing the window for PCI function"
+                                        "%d\n", adapter->ahw.pci_func);
+                        offset = PCI_OFFSET_SECOND_RANGE(adapter,
+                                        NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));
+                        break;
+        }
         /*
          * Move the CRB window.
          * We need to write to the "direct access" region of PCI
@@ -484,9 +674,6 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw)
          * register address is received by PCI. The direct region bypasses
          * the CRB bus.
          */
-        offset =
-            PCI_OFFSET_SECOND_RANGE(adapter,
-                                    NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));
 
         if (wndw & 0x1)
                 wndw = NETXEN_WINDOW_ONE;
@@ -504,7 +691,10 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw)
                 count++;
         }
 
-        adapter->curr_window = wndw;
+        if (wndw == NETXEN_WINDOW_ONE)
+                adapter->curr_window = 1;
+        else
+                adapter->curr_window = 0;
 }
 
 void netxen_load_firmware(struct netxen_adapter *adapter)
@@ -749,6 +939,17 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
         return addr;
 }
 
+int
+netxen_nic_erase_pxe(struct netxen_adapter *adapter)
+{
+        if (netxen_rom_fast_write(adapter, PXE_START, 0) == -1) {
+                printk(KERN_ERR "%s: erase pxe failed\n", 
+                        netxen_nic_driver_name);
+                return -1;
+        }
+        return 0;
+}
+
 int netxen_nic_get_board_info(struct netxen_adapter *adapter)
 {
         int rv = 0;
@@ -810,43 +1011,29 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
 
 /* NIU access sections */
 
-int netxen_nic_set_mtu_gb(struct netxen_port *port, int new_mtu)
+int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu)
 {
-        struct netxen_adapter *adapter = port->adapter;
         netxen_nic_write_w0(adapter,
-                            NETXEN_NIU_GB_MAX_FRAME_SIZE(port->portnum),
-                            new_mtu);
+                        NETXEN_NIU_GB_MAX_FRAME_SIZE(
+                                physical_port[adapter->portnum]), new_mtu);
         return 0;
 }
 
-int netxen_nic_set_mtu_xgb(struct netxen_port *port, int new_mtu)
+int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
 {
-        struct netxen_adapter *adapter = port->adapter;
         new_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE;
-        if (port->portnum == 0)
-            netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, new_mtu);
-        else if (port->portnum == 1)
-            netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE, new_mtu);
+        if (physical_port[adapter->portnum] == 0)
+                netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, 
+                                new_mtu);
+        else 
+                netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE,
+                                new_mtu);
         return 0;
 }
 
 void netxen_nic_init_niu_gb(struct netxen_adapter *adapter)
 {
-        int portno;
-        for (portno = 0; portno < NETXEN_NIU_MAX_GBE_PORTS; portno++)
-                netxen_niu_gbe_init_port(adapter, portno);
-}
-
-void netxen_nic_stop_all_ports(struct netxen_adapter *adapter)
-{
-        int port_nr;
-        struct netxen_port *port;
-
-        for (port_nr = 0; port_nr < adapter->ahw.max_ports; port_nr++) {
-                port = adapter->port[port_nr];
-                if (adapter->stop_port)
-                        adapter->stop_port(adapter, port->portnum);
-        }
+        netxen_niu_gbe_init_port(adapter, physical_port[adapter->portnum]);
 }
 
 void
@@ -865,9 +1052,8 @@ netxen_crb_writelit_adapter(struct netxen_adapter *adapter, unsigned long off,
         }
 }
 
-void netxen_nic_set_link_parameters(struct netxen_port *port)
+void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
 {
-        struct netxen_adapter *adapter = port->adapter;
         __u32 status;
         __u32 autoneg;
         __u32 mode;
@@ -876,47 +1062,47 @@ void netxen_nic_set_link_parameters(struct netxen_port *port)
         if (netxen_get_niu_enable_ge(mode)) {   /* Gb 10/100/1000 Mbps mode */
                 if (adapter->phy_read
                     && adapter->
-                    phy_read(adapter, port->portnum,
+                    phy_read(adapter,
                              NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                              &status) == 0) {
                         if (netxen_get_phy_link(status)) {
                                 switch (netxen_get_phy_speed(status)) {
                                 case 0:
-                                        port->link_speed = SPEED_10;
+                                        adapter->link_speed = SPEED_10;
                                         break;
                                 case 1:
-                                        port->link_speed = SPEED_100;
+                                        adapter->link_speed = SPEED_100;
                                         break;
                                 case 2:
-                                        port->link_speed = SPEED_1000;
+                                        adapter->link_speed = SPEED_1000;
                                         break;
                                 default:
-                                        port->link_speed = -1;
+                                        adapter->link_speed = -1;
                                         break;
                                 }
                                 switch (netxen_get_phy_duplex(status)) {
                                 case 0:
-                                        port->link_duplex = DUPLEX_HALF;
+                                        adapter->link_duplex = DUPLEX_HALF;
                                         break;
                                 case 1:
-                                        port->link_duplex = DUPLEX_FULL;
+                                        adapter->link_duplex = DUPLEX_FULL;
                                         break;
                                 default:
-                                        port->link_duplex = -1;
+                                        adapter->link_duplex = -1;
                                         break;
                                 }
                                 if (adapter->phy_read
                                     && adapter->
-                                    phy_read(adapter, port->portnum,
+                                    phy_read(adapter,
                                              NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
                                              &autoneg) != 0)
-                                        port->link_autoneg = autoneg;
+                                        adapter->link_autoneg = autoneg;
                         } else
                                 goto link_down;
                 } else {
                       link_down:
-                        port->link_speed = -1;
-                        port->link_duplex = -1;
+                        adapter->link_speed = -1;
+                        adapter->link_duplex = -1;
                 }
         }
 }
@@ -930,7 +1116,7 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
         char brd_name[NETXEN_MAX_SHORT_NAME];
         struct netxen_new_user_info user_info;
         int i, addr = USER_START;
-        u32 *ptr32;
+        __le32 *ptr32;
 
         struct netxen_board_info *board_info = &(adapter->ahw.boardcfg);
         if (board_info->magic != NETXEN_BDINFO_MAGIC) {
@@ -956,7 +1142,6 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
                                        netxen_nic_driver_name);
                                 return;
                         }
-                        *ptr32 = le32_to_cpu(*ptr32);
                         ptr32++;
                         addr += sizeof(u32);
                 }
diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/netxen/netxen_nic_hw.h
index ab1112eb1b0d..245bf13c7ba2 100644
--- a/drivers/net/netxen/netxen_nic_hw.h
+++ b/drivers/net/netxen/netxen_nic_hw.h
@@ -6,12 +6,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *                            
+ *
  * 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,
@@ -87,7 +87,7 @@ struct netxen_adapter;
         *(u32 *)Y = readl((void __iomem*) addr);
 
 struct netxen_port;
-void netxen_nic_set_link_parameters(struct netxen_port *port);
+void netxen_nic_set_link_parameters(struct netxen_adapter *adapter);
 void netxen_nic_flash_print(struct netxen_adapter *adapter);
 int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off,
                            void *data, int len);
@@ -220,6 +220,69 @@ typedef enum {
                 _netxen_crb_get_bit(config_word, 1)
 #define netxen_get_gb_mii_mgmt_notvalid(config_word)    \
                 _netxen_crb_get_bit(config_word, 2)
+/*
+ * NIU XG Pause Ctl Register
+ *
+ *      Bit 0       : xg0_mask => 1:disable tx pause frames
+ *      Bit 1       : xg0_request => 1:request single pause frame
+ *      Bit 2       : xg0_on_off => 1:request is pause on, 0:off
+ *      Bit 3       : xg1_mask => 1:disable tx pause frames
+ *      Bit 4       : xg1_request => 1:request single pause frame
+ *      Bit 5       : xg1_on_off => 1:request is pause on, 0:off
+ */
+
+#define netxen_xg_set_xg0_mask(config_word)    \
+        ((config_word) |= 1 << 0)
+#define netxen_xg_set_xg1_mask(config_word)    \
+        ((config_word) |= 1 << 3)
+                
+#define netxen_xg_get_xg0_mask(config_word)    \
+        _netxen_crb_get_bit((config_word), 0)
+#define netxen_xg_get_xg1_mask(config_word)    \
+        _netxen_crb_get_bit((config_word), 3)
+
+#define netxen_xg_unset_xg0_mask(config_word)  \
+        ((config_word) &= ~(1 << 0))
+#define netxen_xg_unset_xg1_mask(config_word)  \
+        ((config_word) &= ~(1 << 3))
+
+/*
+ * NIU XG Pause Ctl Register
+ *
+ *      Bit 0       : xg0_mask => 1:disable tx pause frames
+ *      Bit 1       : xg0_request => 1:request single pause frame
+ *      Bit 2       : xg0_on_off => 1:request is pause on, 0:off
+ *      Bit 3       : xg1_mask => 1:disable tx pause frames
+ *      Bit 4       : xg1_request => 1:request single pause frame
+ *      Bit 5       : xg1_on_off => 1:request is pause on, 0:off
+ */
+#define netxen_gb_set_gb0_mask(config_word)    \
+        ((config_word) |= 1 << 0)
+#define netxen_gb_set_gb1_mask(config_word)    \
+        ((config_word) |= 1 << 2)
+#define netxen_gb_set_gb2_mask(config_word)    \
+        ((config_word) |= 1 << 4)
+#define netxen_gb_set_gb3_mask(config_word)    \
+        ((config_word) |= 1 << 6)
+
+#define netxen_gb_get_gb0_mask(config_word)    \
+        _netxen_crb_get_bit((config_word), 0)
+#define netxen_gb_get_gb1_mask(config_word)    \
+        _netxen_crb_get_bit((config_word), 2)
+#define netxen_gb_get_gb2_mask(config_word)    \
+        _netxen_crb_get_bit((config_word), 4)
+#define netxen_gb_get_gb3_mask(config_word)    \
+        _netxen_crb_get_bit((config_word), 6)
+        
+#define netxen_gb_unset_gb0_mask(config_word)  \
+        ((config_word) &= ~(1 << 0))
+#define netxen_gb_unset_gb1_mask(config_word)  \
+        ((config_word) &= ~(1 << 2))
+#define netxen_gb_unset_gb2_mask(config_word)  \
+        ((config_word) &= ~(1 << 4))
+#define netxen_gb_unset_gb3_mask(config_word)  \
+        ((config_word) &= ~(1 << 6))
+
 
 /*
  * PHY-Specific MII control/status registers.
@@ -452,21 +515,21 @@ typedef enum {
                 ((config) |= (((val) & 0x0f) << 28))
 
 /* Set promiscuous mode for a GbE interface */
-int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, int port,
+int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, 
                                     netxen_niu_prom_mode_t mode);
 int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,
-                                       int port, netxen_niu_prom_mode_t mode);
+                                       netxen_niu_prom_mode_t mode);
 
 /* get/set the MAC address for a given MAC */
-int netxen_niu_macaddr_get(struct netxen_adapter *adapter, int port,
+int netxen_niu_macaddr_get(struct netxen_adapter *adapter,
                            netxen_ethernet_macaddr_t * addr);
-int netxen_niu_macaddr_set(struct netxen_port *port,
+int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
                            netxen_ethernet_macaddr_t addr);
 
 /* XG versons */
-int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, int port,
+int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter,
                               netxen_ethernet_macaddr_t * addr);
-int netxen_niu_xg_macaddr_set(struct netxen_port *port,
+int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter,
                               netxen_ethernet_macaddr_t addr);
 
 /* Generic enable for GbE ports. Will detect the speed of the link. */
@@ -475,8 +538,8 @@ int netxen_niu_gbe_init_port(struct netxen_adapter *adapter, int port);
 int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port);
 
 /* Disable a GbE interface */
-int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter, int port);
+int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter);
 
-int netxen_niu_disable_xg_port(struct netxen_adapter *adapter, int port);
+int netxen_niu_disable_xg_port(struct netxen_adapter *adapter);
 
 #endif                          /* __NETXEN_NIC_HW_H_ */
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 5cd40562da7c..cf0e96adfe44 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -139,7 +139,7 @@ int netxen_init_firmware(struct netxen_adapter *adapter)
                 return err;
         }
         /* Window 1 call */
-        writel(MPORT_SINGLE_FUNCTION_MODE,
+        writel(MPORT_MULTI_FUNCTION_MODE,
                NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE));
         writel(PHAN_INITIALIZE_ACK,
                NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
@@ -226,7 +226,6 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter)
                 adapter->unset_promisc = netxen_niu_set_promiscuous_mode;
                 adapter->phy_read = netxen_niu_gbe_phy_read;
                 adapter->phy_write = netxen_niu_gbe_phy_write;
-                adapter->init_port = netxen_niu_gbe_init_port;
                 adapter->init_niu = netxen_nic_init_niu_gb;
                 adapter->stop_port = netxen_niu_disable_gbe_port;
                 break;
@@ -277,8 +276,8 @@ u32 netxen_decode_crb_addr(u32 addr)
                 return (pci_base + offset);
 }
 
-static long rom_max_timeout = 10000;
-static long rom_lock_timeout = 1000000;
+static long rom_max_timeout = 100;
+static long rom_lock_timeout = 10000;
 static long rom_write_timeout = 700;
 
 static inline int rom_lock(struct netxen_adapter *adapter)
@@ -438,9 +437,9 @@ do_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
 
         for (addridx = addr; addridx < (addr + size); addridx += 4) {
                 ret = do_rom_fast_read(adapter, addridx, (int *)bytes);
-                *(int *)bytes = cpu_to_le32(*(int *)bytes);
                 if (ret != 0)
                         break;
+                *(int *)bytes = cpu_to_le32(*(int *)bytes);
                 bytes += 4;
         }
 
@@ -499,7 +498,6 @@ static inline int do_rom_fast_write_words(struct netxen_adapter *adapter,
                 int data;
 
                 data = le32_to_cpu((*(u32*)bytes));
-
                 ret = do_rom_fast_write(adapter, addridx, data);
                 if (ret < 0)
                         return ret;
@@ -953,7 +951,8 @@ void netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
 
         if (!pegtune_val) {
                 val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
-                while (val != PHAN_INITIALIZE_COMPLETE && loops < 200000) {
+                while (val != PHAN_INITIALIZE_COMPLETE && 
+                        val != PHAN_INITIALIZE_ACK && loops < 200000) {
                         udelay(100);
                         schedule();
                         val =
@@ -990,9 +989,7 @@ int netxen_nic_rx_has_work(struct netxen_adapter *adapter)
 
 static inline int netxen_nic_check_temp(struct netxen_adapter *adapter)
 {
-        int port_num;
-        struct netxen_port *port;
-        struct net_device *netdev;
+        struct net_device *netdev = adapter->netdev;
         uint32_t temp, temp_state, temp_val;
         int rv = 0;
 
@@ -1006,14 +1003,9 @@ static inline int netxen_nic_check_temp(struct netxen_adapter *adapter)
                        "%s: Device temperature %d degrees C exceeds"
                        " maximum allowed. Hardware has been shut down.\n",
                        netxen_nic_driver_name, temp_val);
-                for (port_num = 0; port_num < adapter->ahw.max_ports;
-                     port_num++) {
-                        port = adapter->port[port_num];
-                        netdev = port->netdev;
 
-                        netif_carrier_off(netdev);
-                        netif_stop_queue(netdev);
-                }
+                netif_carrier_off(netdev);
+                netif_stop_queue(netdev);
                 rv = 1;
         } else if (temp_state == NX_TEMP_WARN) {
                 if (adapter->temp == NX_TEMP_NORMAL) {
@@ -1037,29 +1029,23 @@ static inline int netxen_nic_check_temp(struct netxen_adapter *adapter)
 
 void netxen_watchdog_task(struct work_struct *work)
 {
-        int port_num;
-        struct netxen_port *port;
         struct net_device *netdev;
         struct netxen_adapter *adapter =
                 container_of(work, struct netxen_adapter, watchdog_task);
 
-        if (netxen_nic_check_temp(adapter))
+        if ((adapter->portnum  == 0) && netxen_nic_check_temp(adapter))
                 return;
 
-        for (port_num = 0; port_num < adapter->ahw.max_ports; port_num++) {
-                port = adapter->port[port_num];
-                netdev = port->netdev;
-
-                if ((netif_running(netdev)) && !netif_carrier_ok(netdev)) {
-                        printk(KERN_INFO "%s port %d, %s carrier is now ok\n",
-                               netxen_nic_driver_name, port_num, netdev->name);
-                        netif_carrier_on(netdev);
-                }
-
-                if (netif_queue_stopped(netdev))
-                        netif_wake_queue(netdev);
+        netdev = adapter->netdev;
+        if ((netif_running(netdev)) && !netif_carrier_ok(netdev)) {
+                printk(KERN_INFO "%s port %d, %s carrier is now ok\n",
+                       netxen_nic_driver_name, adapter->portnum, netdev->name);
+                netif_carrier_on(netdev);
         }
 
+        if (netif_queue_stopped(netdev))
+                netif_wake_queue(netdev);
+
         if (adapter->handle_phy_intr)
                 adapter->handle_phy_intr(adapter);
         mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
@@ -1074,9 +1060,8 @@ void
 netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
                    struct status_desc *desc)
 {
-        struct netxen_port *port = adapter->port[netxen_get_sts_port(desc)];
-        struct pci_dev *pdev = port->pdev;
-        struct net_device *netdev = port->netdev;
+        struct pci_dev *pdev = adapter->pdev;
+        struct net_device *netdev = adapter->netdev;
         int index = netxen_get_sts_refhandle(desc);
         struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctxid]);
         struct netxen_rx_buffer *buffer;
@@ -1126,7 +1111,7 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
         skb = (struct sk_buff *)buffer->skb;
 
         if (likely(netxen_get_sts_status(desc) == STATUS_CKSUM_OK)) {
-                port->stats.csummed++;
+                adapter->stats.csummed++;
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         }
         if (desc_ctx == RCV_DESC_LRO_CTXID) {
@@ -1146,27 +1131,27 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
          */
         switch (ret) {
         case NET_RX_SUCCESS:
-                port->stats.uphappy++;
+                adapter->stats.uphappy++;
                 break;
 
         case NET_RX_CN_LOW:
-                port->stats.uplcong++;
+                adapter->stats.uplcong++;
                 break;
 
         case NET_RX_CN_MOD:
-                port->stats.upmcong++;
+                adapter->stats.upmcong++;
                 break;
 
         case NET_RX_CN_HIGH:
-                port->stats.uphcong++;
+                adapter->stats.uphcong++;
                 break;
 
         case NET_RX_DROP:
-                port->stats.updropped++;
+                adapter->stats.updropped++;
                 break;
 
         default:
-                port->stats.updunno++;
+                adapter->stats.updunno++;
                 break;
         }
 
@@ -1178,14 +1163,13 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
         /*
          * We just consumed one buffer so post a buffer.
          */
-        adapter->stats.post_called++;
         buffer->skb = NULL;
         buffer->state = NETXEN_BUFFER_FREE;
         buffer->lro_current_frags = 0;
         buffer->lro_expected_frags = 0;
 
-        port->stats.no_rcv++;
-        port->stats.rxbytes += length;
+        adapter->stats.no_rcv++;
+        adapter->stats.rxbytes += length;
 }
 
 /* Process Receive status ring */
@@ -1226,7 +1210,6 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
 
         /* update the consumer index in phantom */
         if (count) {
-                adapter->stats.process_rcv++;
                 recv_ctx->status_rx_consumer = consumer;
                 recv_ctx->status_rx_producer = producer;
 
@@ -1249,13 +1232,10 @@ int netxen_process_cmd_ring(unsigned long data)
         int count1 = 0;
         int count2 = 0;
         struct netxen_cmd_buffer *buffer;
-        struct netxen_port *port;       /* port #1 */
-        struct netxen_port *nport;
         struct pci_dev *pdev;
         struct netxen_skb_frag *frag;
         u32 i;
         struct sk_buff *skb = NULL;
-        int p;
         int done;
 
         spin_lock(&adapter->tx_lock);
@@ -1276,7 +1256,6 @@ int netxen_process_cmd_ring(unsigned long data)
         }
 
         adapter->proc_cmd_buf_counter++;
-        adapter->stats.process_xmit++;
         /*
          * Not needed - does not seem to be used anywhere.
          * adapter->cmd_consumer = consumer;
@@ -1285,8 +1264,7 @@ int netxen_process_cmd_ring(unsigned long data)
 
         while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) {
                 buffer = &adapter->cmd_buf_arr[last_consumer];
-                port = adapter->port[buffer->port];
-                pdev = port->pdev;
+                pdev = adapter->pdev;
                 frag = &buffer->frag_array[0];
                 skb = buffer->skb;
                 if (skb && (cmpxchg(&buffer->skb, skb, 0) == skb)) {
@@ -1299,24 +1277,23 @@ int netxen_process_cmd_ring(unsigned long data)
                                                PCI_DMA_TODEVICE);
                         }
 
-                        port->stats.skbfreed++;
+                        adapter->stats.skbfreed++;
                         dev_kfree_skb_any(skb);
                         skb = NULL;
                 } else if (adapter->proc_cmd_buf_counter == 1) {
-                        port->stats.txnullskb++;
+                        adapter->stats.txnullskb++;
                 }
-                if (unlikely(netif_queue_stopped(port->netdev)
-                             && netif_carrier_ok(port->netdev))
-                    && ((jiffies - port->netdev->trans_start) >
-                        port->netdev->watchdog_timeo)) {
-                        SCHEDULE_WORK(&port->tx_timeout_task);
+                if (unlikely(netif_queue_stopped(adapter->netdev)
+                             && netif_carrier_ok(adapter->netdev))
+                    && ((jiffies - adapter->netdev->trans_start) >
+                        adapter->netdev->watchdog_timeo)) {
+                        SCHEDULE_WORK(&adapter->tx_timeout_task);
                 }
 
                 last_consumer = get_next_index(last_consumer,
                                                adapter->max_tx_desc_count);
                 count1++;
         }
-        adapter->stats.noxmitdone += count1;
 
         count2 = 0;
         spin_lock(&adapter->tx_lock);
@@ -1336,13 +1313,10 @@ int netxen_process_cmd_ring(unsigned long data)
                 }
         }
         if (count1 || count2) {
-                for (p = 0; p < adapter->ahw.max_ports; p++) {
-                        nport = adapter->port[p];
-                        if (netif_queue_stopped(nport->netdev)
-                            && (nport->flags & NETXEN_NETDEV_STATUS)) {
-                                netif_wake_queue(nport->netdev);
-                                nport->flags &= ~NETXEN_NETDEV_STATUS;
-                        }
+                if (netif_queue_stopped(adapter->netdev)
+                    && (adapter->flags & NETXEN_NETDEV_STATUS)) {
+                        netif_wake_queue(adapter->netdev);
+                        adapter->flags &= ~NETXEN_NETDEV_STATUS;
                 }
         }
         /*
@@ -1388,7 +1362,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
         netxen_ctx_msg msg = 0;
         dma_addr_t dma;
 
-        adapter->stats.post_called++;
         rcv_desc = &recv_ctx->rcv_desc[ringid];
 
         producer = rcv_desc->producer;
@@ -1441,8 +1414,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
         if (count) {
                 rcv_desc->begin_alloc = index;
                 rcv_desc->rcv_pending += count;
-                adapter->stats.lastposted = count;
-                adapter->stats.posted += count;
                 rcv_desc->producer = producer;
                 if (rcv_desc->rcv_free >= 32) {
                         rcv_desc->rcv_free = 0;
@@ -1450,7 +1421,8 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                         writel((producer - 1) &
                                (rcv_desc->max_rx_desc_count - 1),
                                NETXEN_CRB_NORMALIZE(adapter,
-                                                    recv_crb_registers[0].
+                                                    recv_crb_registers[
+                                                    adapter->portnum].
                                                     rcv_desc_crb[ringid].
                                                     crb_rcv_producer_offset));
                         /*
@@ -1463,7 +1435,7 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                                              ((producer -
                                                1) & (rcv_desc->
                                                      max_rx_desc_count - 1)));
-                        netxen_set_msg_ctxid(msg, 0);
+                        netxen_set_msg_ctxid(msg, adapter->portnum);
                         netxen_set_msg_opcode(msg, NETXEN_RCV_PRODUCER(ringid));
                         writel(msg,
                                DB_NORMALIZE(adapter,
@@ -1485,7 +1457,6 @@ void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ctx,
         int count = 0;
         int index = 0;
 
-        adapter->stats.post_called++;
         rcv_desc = &recv_ctx->rcv_desc[ringid];
 
         producer = rcv_desc->producer;
@@ -1532,8 +1503,6 @@ void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ctx,
         if (count) {
                 rcv_desc->begin_alloc = index;
                 rcv_desc->rcv_pending += count;
-                adapter->stats.lastposted = count;
-                adapter->stats.posted += count;
                 rcv_desc->producer = producer;
                 if (rcv_desc->rcv_free >= 32) {
                         rcv_desc->rcv_free = 0;
@@ -1541,7 +1510,8 @@ void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ctx,
                         writel((producer - 1) &
                                (rcv_desc->max_rx_desc_count - 1),
                                NETXEN_CRB_NORMALIZE(adapter,
-                                                    recv_crb_registers[0].
+                                                    recv_crb_registers[
+                                                    adapter->portnum].
                                                     rcv_desc_crb[ringid].
                                                     crb_rcv_producer_offset));
                         wmb();
@@ -1562,13 +1532,7 @@ int netxen_nic_tx_has_work(struct netxen_adapter *adapter)
 
 void netxen_nic_clear_stats(struct netxen_adapter *adapter)
 {
-        struct netxen_port *port;
-        int port_num;
-
         memset(&adapter->stats, 0, sizeof(adapter->stats));
-        for (port_num = 0; port_num < adapter->ahw.max_ports; port_num++) {
-                port = adapter->port[port_num];
-                memset(&port->stats, 0, sizeof(port->stats));
-        }
+        return;
 }
 
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c
index be366e48007c..b213b062eb56 100644
--- a/drivers/net/netxen/netxen_nic_isr.c
+++ b/drivers/net/netxen/netxen_nic_isr.c
@@ -6,12 +6,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *                            
+ *
  * 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,
@@ -40,35 +40,35 @@
  */
 struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct net_device_stats *stats = &port->net_stats;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
+        struct net_device_stats *stats = &adapter->net_stats;
 
         memset(stats, 0, sizeof(*stats));
 
         /* total packets received   */
-        stats->rx_packets = port->stats.no_rcv;
+        stats->rx_packets = adapter->stats.no_rcv;
         /* total packets transmitted    */
-        stats->tx_packets = port->stats.xmitedframes + port->stats.xmitfinished;
+        stats->tx_packets = adapter->stats.xmitedframes + 
+                adapter->stats.xmitfinished;
         /* total bytes received     */
-        stats->rx_bytes = port->stats.rxbytes;
+        stats->rx_bytes = adapter->stats.rxbytes;
         /* total bytes transmitted  */
-        stats->tx_bytes = port->stats.txbytes;
+        stats->tx_bytes = adapter->stats.txbytes;
         /* bad packets received     */
-        stats->rx_errors = port->stats.rcvdbadskb;
+        stats->rx_errors = adapter->stats.rcvdbadskb;
         /* packet transmit problems */
-        stats->tx_errors = port->stats.nocmddescriptor;
+        stats->tx_errors = adapter->stats.nocmddescriptor;
         /* no space in linux buffers    */
-        stats->rx_dropped = port->stats.updropped;
+        stats->rx_dropped = adapter->stats.updropped;
         /* no space available in linux  */
-        stats->tx_dropped = port->stats.txdropped;
+        stats->tx_dropped = adapter->stats.txdropped;
 
         return stats;
 }
 
-void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 portno,
-                                 u32 link)
+void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 link)
 {
-        struct net_device *netdev = (adapter->port[portno])->netdev;
+        struct net_device *netdev = adapter->netdev;
 
         if (link)
                 netif_carrier_on(netdev);
@@ -76,15 +76,13 @@ void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 portno,
                 netif_carrier_off(netdev);
 }
 
-void netxen_handle_port_int(struct netxen_adapter *adapter, u32 portno,
-                            u32 enable)
+void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable)
 {
         __u32 int_src;
-        struct netxen_port *port;
 
         /*  This should clear the interrupt source */
         if (adapter->phy_read)
-                adapter->phy_read(adapter, portno,
+                adapter->phy_read(adapter, 
                                   NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
                                   &int_src);
         if (int_src == 0) {
@@ -92,9 +90,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 portno,
                 return;
         }
         if (adapter->disable_phy_interrupts)
-                adapter->disable_phy_interrupts(adapter, portno);
-
-        port = adapter->port[portno];
+                adapter->disable_phy_interrupts(adapter);
 
         if (netxen_get_phy_int_jabber(int_src))
                 DPRINTK(INFO, "Jabber interrupt \n");
@@ -115,64 +111,57 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 portno,
                 DPRINTK(INFO, "SPEED CHANGED OR LINK STATUS CHANGED \n");
 
                 if (adapter->phy_read
-                    && adapter->phy_read(adapter, portno,
+                    && adapter->phy_read(adapter, 
                                          NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                          &status) == 0) {
                         if (netxen_get_phy_int_link_status_changed(int_src)) {
                                 if (netxen_get_phy_link(status)) {
-                                        netxen_niu_gbe_init_port(adapter,
-                                                                 portno);
-                                        printk("%s: %s Link UP\n",
+                                        printk(KERN_INFO "%s: %s Link UP\n",
                                                netxen_nic_driver_name,
-                                               port->netdev->name);
+                                               adapter->netdev->name);
 
                                 } else {
-                                        printk("%s: %s Link DOWN\n",
+                                        printk(KERN_INFO "%s: %s Link DOWN\n",
                                                netxen_nic_driver_name,
-                                               port->netdev->name);
+                                               adapter->netdev->name);
                                 }
-                                netxen_indicate_link_status(adapter, portno,
+                                netxen_indicate_link_status(adapter, 
                                                             netxen_get_phy_link
                                                             (status));
                         }
                 }
         }
         if (adapter->enable_phy_interrupts)
-                adapter->enable_phy_interrupts(adapter, portno);
+                adapter->enable_phy_interrupts(adapter);
 }
 
 void netxen_nic_isr_other(struct netxen_adapter *adapter)
 {
-        u32 portno;
+        int portno = adapter->portnum;
         u32 val, linkup, qg_linksup;
 
         /* verify the offset */
         val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE));
+        val = val >> physical_port[adapter->portnum];
         if (val == adapter->ahw.qg_linksup)
                 return;
 
         qg_linksup = adapter->ahw.qg_linksup;
         adapter->ahw.qg_linksup = val;
         DPRINTK(INFO, "link update 0x%08x\n", val);
-        for (portno = 0; portno < NETXEN_NIU_MAX_GBE_PORTS; portno++) {
-                linkup = val & 1;
-                if (linkup != (qg_linksup & 1)) {
-                        printk(KERN_INFO "%s: %s PORT %d link %s\n",
-                               adapter->port[portno]->netdev->name,
-                               netxen_nic_driver_name, portno,
-                               ((linkup == 0) ? "down" : "up"));
-                        netxen_indicate_link_status(adapter, portno, linkup);
-                        if (linkup)
-                                netxen_nic_set_link_parameters(adapter->
-                                                               port[portno]);
 
-                }
-                val = val >> 1;
-                qg_linksup = qg_linksup >> 1;
-        }
+        linkup = val & 1;
 
-        adapter->stats.otherints++;
+        if (linkup != (qg_linksup & 1)) {
+                printk(KERN_INFO "%s: %s PORT %d link %s\n",
+                       adapter->netdev->name,
+                       netxen_nic_driver_name, portno,
+                       ((linkup == 0) ? "down" : "up"));
+                netxen_indicate_link_status(adapter, linkup);
+                if (linkup)
+                        netxen_nic_set_link_parameters(adapter);
 
+        }
 }
 
 void netxen_nic_gbe_handle_phy_intr(struct netxen_adapter *adapter)
@@ -182,26 +171,28 @@ void netxen_nic_gbe_handle_phy_intr(struct netxen_adapter *adapter)
 
 void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter)
 {
-        struct net_device *netdev = adapter->port[0]->netdev;
-        u32 val;
+        struct net_device *netdev = adapter->netdev;
+        u32 val, val1;
 
         /* WINDOW = 1 */
         val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE));
+        val >>= (physical_port[adapter->portnum] * 8);
+        val1 = val & 0xff;
 
-        if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) {
+        if (adapter->ahw.xg_linkup == 1 && val1 != XG_LINK_UP) {
                 printk(KERN_INFO "%s: %s NIC Link is down\n",
                        netxen_nic_driver_name, netdev->name);
                 adapter->ahw.xg_linkup = 0;
                 /* read twice to clear sticky bits */
                 /* WINDOW = 0 */
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val);
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val);
+                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1);
+                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1);
 
                 if ((val & 0xffb) != 0xffb) {
                         printk(KERN_INFO "%s ISR: Sync/Align BAD: 0x%08x\n",
-                               netxen_nic_driver_name, val);
+                               netxen_nic_driver_name, val1);
                 }
-        } else if (adapter->ahw.xg_linkup == 0 && val == XG_LINK_UP) {
+        } else if (adapter->ahw.xg_linkup == 0 && val1 == XG_LINK_UP) {
                 printk(KERN_INFO "%s: %s NIC Link is up\n",
                        netxen_nic_driver_name, netdev->name);
                 adapter->ahw.xg_linkup = 1;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index ab25c225a07e..4e32bb678ea9 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -36,7 +36,6 @@
 #include "netxen_nic_hw.h"
 
 #include "netxen_nic.h"
-#define DEFINE_GLOBAL_RECV_CRB
 #include "netxen_nic_phan_reg.h"
 
 #include <linux/dma-mapping.h>
@@ -77,6 +76,8 @@ static void netxen_nic_poll_controller(struct net_device *netdev);
 #endif
 static irqreturn_t netxen_intr(int irq, void *data);
 
+int physical_port[] = {0, 1, 2, 3};
+
 /*  PCI Device ID Table  */
 static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
         {PCI_DEVICE(0x4040, 0x0001)},
@@ -94,6 +95,67 @@ MODULE_DEVICE_TABLE(pci, netxen_pci_tbl);
 struct workqueue_struct *netxen_workq;
 static void netxen_watchdog(unsigned long);
 
+static inline void netxen_nic_update_cmd_producer(struct netxen_adapter *adapter,
+                                                        uint32_t crb_producer)
+{
+        switch (adapter->portnum) {
+                case 0:
+                        writel(crb_producer, NETXEN_CRB_NORMALIZE
+                                        (adapter, CRB_CMD_PRODUCER_OFFSET));
+                        return;
+                case 1:
+                        writel(crb_producer, NETXEN_CRB_NORMALIZE
+                                        (adapter, CRB_CMD_PRODUCER_OFFSET_1));
+                        return;
+                case 2:
+                        writel(crb_producer, NETXEN_CRB_NORMALIZE
+                                        (adapter, CRB_CMD_PRODUCER_OFFSET_2));
+                        return;
+                case 3:
+                        writel(crb_producer, NETXEN_CRB_NORMALIZE
+                                        (adapter, CRB_CMD_PRODUCER_OFFSET_3));
+                        return;
+                default:
+                        printk(KERN_WARNING "We tried to update "
+                                        "CRB_CMD_PRODUCER_OFFSET for invalid "
+                                        "PCI function id %d\n",
+                                        adapter->portnum);
+                        return;
+        }
+}
+
+static inline void netxen_nic_update_cmd_consumer(struct netxen_adapter *adapter,
+                                                        u32 crb_consumer)
+{
+        switch (adapter->portnum) {
+                case 0:
+                        writel(crb_consumer, NETXEN_CRB_NORMALIZE
+                                (adapter, CRB_CMD_CONSUMER_OFFSET));
+                        return;
+                case 1:
+                        writel(crb_consumer, NETXEN_CRB_NORMALIZE
+                                (adapter, CRB_CMD_CONSUMER_OFFSET_1));
+                        return;
+                case 2:
+                        writel(crb_consumer, NETXEN_CRB_NORMALIZE
+                                (adapter, CRB_CMD_CONSUMER_OFFSET_2));
+                        return;
+                case 3:
+                        writel(crb_consumer, NETXEN_CRB_NORMALIZE
+                                (adapter, CRB_CMD_CONSUMER_OFFSET_3));
+                        return;
+                default:
+                        printk(KERN_WARNING "We tried to update "
+                                        "CRB_CMD_PRODUCER_OFFSET for invalid "
+                                        "PCI function id %d\n",
+                                        adapter->portnum);
+                        return;
+        }
+}
+
+#define ADAPTER_LIST_SIZE 12
+int netxen_cards_found;
+
 /*
  * netxen_nic_probe()
  *
@@ -111,26 +173,30 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         struct net_device *netdev = NULL;
         struct netxen_adapter *adapter = NULL;
-        struct netxen_port *port = NULL;
         void __iomem *mem_ptr0 = NULL;
         void __iomem *mem_ptr1 = NULL;
         void __iomem *mem_ptr2 = NULL;
+        unsigned long first_page_group_end;
+        unsigned long first_page_group_start;
+
 
         u8 __iomem *db_ptr = NULL;
         unsigned long mem_base, mem_len, db_base, db_len;
-        int pci_using_dac, i, err;
+        int pci_using_dac, i = 0, err;
         int ring;
         struct netxen_recv_context *recv_ctx = NULL;
         struct netxen_rcv_desc_ctx *rcv_desc = NULL;
         struct netxen_cmd_buffer *cmd_buf_arr = NULL;
         u64 mac_addr[FLASH_NUM_PORTS + 1];
         int valid_mac = 0;
+        u32 val;
+        int pci_func_id = PCI_FUNC(pdev->devfn);
 
         printk(KERN_INFO "%s \n", netxen_nic_driver_string);
-        /* In current scheme, we use only PCI function 0 */
-        if (PCI_FUNC(pdev->devfn) != 0) {
-                DPRINTK(ERR, "NetXen function %d will not be enabled.\n",
-                        PCI_FUNC(pdev->devfn));
+
+        if (pdev->class != 0x020000) {
+                printk(KERN_ERR"NetXen function %d, class %x will not"
+                                "be enabled.\n",pci_func_id, pdev->class);
                 return -ENODEV;
         }
         if ((err = pci_enable_device(pdev)))
@@ -157,18 +223,52 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 pci_using_dac = 0;
         }
 
+
+        netdev = alloc_etherdev(sizeof(struct netxen_adapter));
+        if(!netdev) {
+                printk(KERN_ERR"%s: Failed to allocate memory for the "
+                                "device block.Check system memory resource"
+                                " usage.\n", netxen_nic_driver_name);
+                goto err_out_free_res;
+        }
+
+        SET_MODULE_OWNER(netdev);
+        SET_NETDEV_DEV(netdev, &pdev->dev);
+
+        adapter = netdev->priv;
+        memset(adapter, 0 , sizeof(struct netxen_adapter));
+
+        adapter->ahw.pdev = pdev;
+        adapter->ahw.pci_func  = pci_func_id;
+        spin_lock_init(&adapter->tx_lock);
+        spin_lock_init(&adapter->lock);
+
         /* remap phys address */
         mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */
         mem_len = pci_resource_len(pdev, 0);
 
         /* 128 Meg of memory */
-        mem_ptr0 = ioremap(mem_base, FIRST_PAGE_GROUP_SIZE);
-        mem_ptr1 =
-            ioremap(mem_base + SECOND_PAGE_GROUP_START, SECOND_PAGE_GROUP_SIZE);
-        mem_ptr2 =
-            ioremap(mem_base + THIRD_PAGE_GROUP_START, THIRD_PAGE_GROUP_SIZE);
+        if (mem_len == NETXEN_PCI_128MB_SIZE) {
+                mem_ptr0 = ioremap(mem_base, FIRST_PAGE_GROUP_SIZE);
+                mem_ptr1 = ioremap(mem_base + SECOND_PAGE_GROUP_START,
+                                SECOND_PAGE_GROUP_SIZE);
+                mem_ptr2 = ioremap(mem_base + THIRD_PAGE_GROUP_START,
+                                THIRD_PAGE_GROUP_SIZE);
+                first_page_group_start = FIRST_PAGE_GROUP_START;
+                first_page_group_end   = FIRST_PAGE_GROUP_END;
+        } else if (mem_len == NETXEN_PCI_32MB_SIZE) {
+                mem_ptr1 = ioremap(mem_base, SECOND_PAGE_GROUP_SIZE);
+                mem_ptr2 = ioremap(mem_base + THIRD_PAGE_GROUP_START -
+                        SECOND_PAGE_GROUP_START, THIRD_PAGE_GROUP_SIZE);
+                first_page_group_start = 0;
+                first_page_group_end   = 0;
+        } else {
+                err = -EIO; 
+                goto err_out_free_netdev;
+        }
 
-        if ((mem_ptr0 == 0UL) || (mem_ptr1 == 0UL) || (mem_ptr2 == 0UL)) {
+        if (((mem_ptr0 == 0UL) && (mem_len == NETXEN_PCI_128MB_SIZE)) ||
+                        (mem_ptr1 == 0UL) || (mem_ptr2 == 0UL)) {
                 DPRINTK(ERR,
                         "Cannot remap adapter memory aborting.:"
                         "0 -> %p, 1 -> %p, 2 -> %p\n",
@@ -198,30 +298,87 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
         DPRINTK(INFO, "doorbell ioremaped at %p\n", db_ptr);
 
-/*
- *      Allocate a adapter structure which will manage all the initialization
- *      as well as the common resources for all ports...
- *      all the ports will have pointer to this adapter as well as Adapter
- *      will have pointers of all the ports structures.
- */
+        adapter->ahw.pci_base0 = mem_ptr0;
+        adapter->ahw.first_page_group_start = first_page_group_start;
+        adapter->ahw.first_page_group_end   = first_page_group_end;
+        adapter->ahw.pci_base1 = mem_ptr1;
+        adapter->ahw.pci_base2 = mem_ptr2;
+        adapter->ahw.db_base = db_ptr;
+        adapter->ahw.db_len = db_len;
 
-        /* One adapter structure for all 4 ports....   */
-        adapter = kzalloc(sizeof(struct netxen_adapter), GFP_KERNEL);
-        if (adapter == NULL) {
-                printk(KERN_ERR "%s: Could not allocate adapter memory:%d\n",
-                       netxen_nic_driver_name,
-                       (int)sizeof(struct netxen_adapter));
-                err = -ENOMEM;
-                goto err_out_dbunmap;
-        }
+        adapter->netdev  = netdev;
+        adapter->pdev    = pdev;
+        adapter->portnum = pci_func_id;
+
+        netdev->open               = netxen_nic_open;
+        netdev->stop               = netxen_nic_close;
+        netdev->hard_start_xmit    = netxen_nic_xmit_frame;
+        netdev->get_stats          = netxen_nic_get_stats;      
+        netdev->set_multicast_list = netxen_nic_set_multi;
+        netdev->set_mac_address    = netxen_nic_set_mac;
+        netdev->change_mtu         = netxen_nic_change_mtu;
+        netdev->tx_timeout         = netxen_tx_timeout;
+        netdev->watchdog_timeo     = HZ;
+
+        netxen_nic_change_mtu(netdev, netdev->mtu);
+
+        SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
+        netdev->poll = netxen_nic_poll;
+        netdev->weight = NETXEN_NETDEV_WEIGHT;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        netdev->poll_controller = netxen_nic_poll_controller;
+#endif
+        /* ScatterGather support */
+        netdev->features = NETIF_F_SG;
+        netdev->features |= NETIF_F_IP_CSUM;
+        netdev->features |= NETIF_F_TSO;
+
+        if (pci_using_dac)
+                netdev->features |= NETIF_F_HIGHDMA;
+
+        if (pci_enable_msi(pdev)) {
+                adapter->flags &= ~NETXEN_NIC_MSI_ENABLED;
+                printk(KERN_WARNING "%s: unable to allocate MSI interrupt"
+                       " error\n", netxen_nic_driver_name);
+        } else
+                adapter->flags |= NETXEN_NIC_MSI_ENABLED;
+
+        netdev->irq = pdev->irq;
+        INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task);
 
-        adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS;
-        adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS;
+        /*
+         * Set the CRB window to invalid. If any register in window 0 is
+         * accessed it should set the window to 0 and then reset it to 1.
+         */
+        adapter->curr_window = 255;
+
+        /* initialize the adapter */
+        netxen_initialize_adapter_hw(adapter);
+
+#ifdef CONFIG_PPC
+        if ((adapter->ahw.boardcfg.board_type ==
+                NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) &&
+                        (pci_func_id == 2))
+                    goto err_out_free_adapter;
+#endif /* CONFIG_PPC */
+
+        /*
+         *  Adapter in our case is quad port so initialize it before
+         *  initializing the ports
+         */
+
+        netxen_initialize_adapter_ops(adapter);
+
+        adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS_HOST;
+        if ((adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB35_4G) ||
+                        (adapter->ahw.boardcfg.board_type == 
+                         NETXEN_BRDTYPE_P2_SB31_2G)) 
+                adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS_1G;
+        else
+                adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS;
         adapter->max_jumbo_rx_desc_count = MAX_JUMBO_RCV_DESCRIPTORS;
         adapter->max_lro_rx_desc_count = MAX_LRO_RCV_DESCRIPTORS;
 
-        pci_set_drvdata(pdev, adapter);
-
         cmd_buf_arr = (struct netxen_cmd_buffer *)vmalloc(TX_RINGSIZE);
         if (cmd_buf_arr == NULL) {
                 printk(KERN_ERR
@@ -231,6 +388,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_free_adapter;
         }
         memset(cmd_buf_arr, 0, TX_RINGSIZE);
+        adapter->cmd_buf_arr = cmd_buf_arr;
 
         for (i = 0; i < MAX_RCV_CTX; ++i) {
                 recv_ctx = &adapter->recv_ctx[i];
@@ -278,33 +436,20 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         }
 
-        adapter->cmd_buf_arr = cmd_buf_arr;
-        adapter->ahw.pci_base0 = mem_ptr0;
-        adapter->ahw.pci_base1 = mem_ptr1;
-        adapter->ahw.pci_base2 = mem_ptr2;
-        adapter->ahw.db_base = db_ptr;
-        adapter->ahw.db_len = db_len;
-        spin_lock_init(&adapter->tx_lock);
-        spin_lock_init(&adapter->lock);
         netxen_initialize_adapter_sw(adapter);  /* initialize the buffers in adapter */
-#ifdef CONFIG_IA64
-        netxen_pinit_from_rom(adapter, 0);
-        udelay(500);
-        netxen_load_firmware(adapter);
-#endif
 
-        /*
-         * Set the CRB window to invalid. If any register in window 0 is
-         * accessed it should set the window to 0 and then reset it to 1.
-         */
-        adapter->curr_window = 255;
-        /*
-         *  Adapter in our case is quad port so initialize it before
-         *  initializing the ports
-         */
-        netxen_initialize_adapter_hw(adapter);  /* initialize the adapter */
+        /* Mezz cards have PCI function 0,2,3 enabled */
+        if ((adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ)
+                && (pci_func_id >= 2))
+                        adapter->portnum = pci_func_id - 2;
 
-        netxen_initialize_adapter_ops(adapter);
+#ifdef CONFIG_IA64
+        if(adapter->portnum == 0) {
+                netxen_pinit_from_rom(adapter, 0);
+                udelay(500);
+                netxen_load_firmware(adapter);
+        }
+#endif
 
         init_timer(&adapter->watchdog_timer);
         adapter->ahw.xg_linkup = 0;
@@ -315,12 +460,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->proc_cmd_buf_counter = 0;
         adapter->ahw.revision_id = nx_p2_id;
 
-        if (pci_enable_msi(pdev)) {
-                adapter->flags &= ~NETXEN_NIC_MSI_ENABLED;
-                printk(KERN_WARNING "%s: unable to allocate MSI interrupt"
-                       " error\n", netxen_nic_driver_name);
-        } else
-                adapter->flags |= NETXEN_NIC_MSI_ENABLED;
+        /* make sure Window == 1 */
+        netxen_nic_pci_change_crbwindow(adapter, 1);
+
+        netxen_nic_update_cmd_producer(adapter, 0);
+        netxen_nic_update_cmd_consumer(adapter, 0);
+        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_CMD_ADDR_LO));
 
         if (netxen_is_flash_supported(adapter) == 0 &&
             netxen_get_flash_mac_addr(adapter, mac_addr) == 0)
@@ -328,153 +473,118 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         else
                 valid_mac = 0;
 
-        /*
-         * Initialize all the CRB registers here.
-         */
-        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMD_PRODUCER_OFFSET));
-        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMD_CONSUMER_OFFSET));
-        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_CMD_ADDR_LO));
-
-        /* do this before waking up pegs so that we have valid dummy dma addr */
-        err = netxen_initialize_adapter_offload(adapter);
-        if (err) {
-                goto err_out_free_dev;
+        if (valid_mac) {
+                unsigned char *p = (unsigned char *)&mac_addr[adapter->portnum];
+                netdev->dev_addr[0] = *(p + 5);
+                netdev->dev_addr[1] = *(p + 4);
+                netdev->dev_addr[2] = *(p + 3);
+                netdev->dev_addr[3] = *(p + 2);
+                netdev->dev_addr[4] = *(p + 1);
+                netdev->dev_addr[5] = *(p + 0);
+
+                memcpy(netdev->perm_addr, netdev->dev_addr,
+                        netdev->addr_len);
+                if (!is_valid_ether_addr(netdev->perm_addr)) {
+                        printk(KERN_ERR "%s: Bad MAC address "
+                                "%02x:%02x:%02x:%02x:%02x:%02x.\n",
+                                netxen_nic_driver_name,
+                                netdev->dev_addr[0],
+                                netdev->dev_addr[1],
+                                netdev->dev_addr[2],
+                                netdev->dev_addr[3],
+                                netdev->dev_addr[4],
+                                netdev->dev_addr[5]);
+                } else {
+                        if (adapter->macaddr_set)
+                                adapter->macaddr_set(adapter,
+                                                        netdev->dev_addr);
+                }
         }
 
-        /* Unlock the HW, prompting the boot sequence */
-        writel(1,
-               NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
-
-        /* Handshake with the card before we register the devices. */
-        netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
-
-        /* initialize the all the ports */
-        adapter->active_ports = 0;
-
-        for (i = 0; i < adapter->ahw.max_ports; i++) {
-                netdev = alloc_etherdev(sizeof(struct netxen_port));
-                if (!netdev) {
-                        printk(KERN_ERR "%s: could not allocate netdev for port"
-                               " %d\n", netxen_nic_driver_name, i + 1);
+        if (adapter->portnum == 0) {
+                err = netxen_initialize_adapter_offload(adapter);
+                if (err) 
+                        goto err_out_free_rx_buffer;
+                val = readl(NETXEN_CRB_NORMALIZE(adapter, 
+                                        NETXEN_CAM_RAM(0x1fc)));
+                if (val == 0x55555555) {
+                    /* This is the first boot after power up */
+                    val = readl(NETXEN_CRB_NORMALIZE(adapter,
+                                        NETXEN_ROMUSB_GLB_SW_RESET));
+                    printk(KERN_INFO"NetXen: read 0x%08x for reset reg.\n",val);
+                    if (val != 0x80000f) {
+                        /* clear the register for future unloads/loads */
+                        writel(0, NETXEN_CRB_NORMALIZE(adapter,
+                                                NETXEN_CAM_RAM(0x1fc)));
+                        printk(KERN_ERR "ERROR in NetXen HW init sequence.\n");
+                        err = -ENODEV;
                         goto err_out_free_dev;
-                }
+                    }
 
-                SET_MODULE_OWNER(netdev);
-                SET_NETDEV_DEV(netdev, &pdev->dev);
-
-                port = netdev_priv(netdev);
-                port->netdev = netdev;
-                port->pdev = pdev;
-                port->adapter = adapter;
-                port->portnum = i;      /* Gigabit port number from 0-3 */
-
-                netdev->open = netxen_nic_open;
-                netdev->stop = netxen_nic_close;
-                netdev->hard_start_xmit = netxen_nic_xmit_frame;
-                netdev->get_stats = netxen_nic_get_stats;
-                netdev->set_multicast_list = netxen_nic_set_multi;
-                netdev->set_mac_address = netxen_nic_set_mac;
-                netdev->change_mtu = netxen_nic_change_mtu;
-                netdev->tx_timeout = netxen_tx_timeout;
-                netdev->watchdog_timeo = HZ;
-
-                netxen_nic_change_mtu(netdev, netdev->mtu);
-
-                SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
-                netdev->poll = netxen_nic_poll;
-                netdev->weight = NETXEN_NETDEV_WEIGHT;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-                netdev->poll_controller = netxen_nic_poll_controller;
-#endif
-                /* ScatterGather support */
-                netdev->features = NETIF_F_SG;
-                netdev->features |= NETIF_F_IP_CSUM;
-                netdev->features |= NETIF_F_TSO;
-
-                if (pci_using_dac)
-                        netdev->features |= NETIF_F_HIGHDMA;
-
-                if (valid_mac) {
-                        unsigned char *p = (unsigned char *)&mac_addr[i];
-                        netdev->dev_addr[0] = *(p + 5);
-                        netdev->dev_addr[1] = *(p + 4);
-                        netdev->dev_addr[2] = *(p + 3);
-                        netdev->dev_addr[3] = *(p + 2);
-                        netdev->dev_addr[4] = *(p + 1);
-                        netdev->dev_addr[5] = *(p + 0);
-
-                        memcpy(netdev->perm_addr, netdev->dev_addr,
-                               netdev->addr_len);
-                        if (!is_valid_ether_addr(netdev->perm_addr)) {
-                                printk(KERN_ERR "%s: Bad MAC address "
-                                       "%02x:%02x:%02x:%02x:%02x:%02x.\n",
-                                       netxen_nic_driver_name,
-                                       netdev->dev_addr[0],
-                                       netdev->dev_addr[1],
-                                       netdev->dev_addr[2],
-                                       netdev->dev_addr[3],
-                                       netdev->dev_addr[4],
-                                       netdev->dev_addr[5]);
-                        } else {
-                                if (adapter->macaddr_set)
-                                        adapter->macaddr_set(port,
-                                                             netdev->dev_addr);
-                        }
+                    /* clear the register for future unloads/loads */
+                    writel(0, NETXEN_CRB_NORMALIZE(adapter, 
+                                            NETXEN_CAM_RAM(0x1fc)));
                 }
-                INIT_WORK(&port->tx_timeout_task, netxen_tx_timeout_task);
-                netif_carrier_off(netdev);
-                netif_stop_queue(netdev);
+                printk(KERN_INFO "State: 0x%0x\n",
+                        readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)));
 
-                if ((err = register_netdev(netdev))) {
-                        printk(KERN_ERR "%s: register_netdev failed port #%d"
-                               " aborting\n", netxen_nic_driver_name, i + 1);
-                        err = -EIO;
-                        free_netdev(netdev);
-                        goto err_out_free_dev;
-                }
-                adapter->port_count++;
-                adapter->port[i] = port;
+                /*
+                 * Tell the hardware our version number.
+                 */
+                i = (_NETXEN_NIC_LINUX_MAJOR << 16) 
+                        | ((_NETXEN_NIC_LINUX_MINOR << 8))
+                        | (_NETXEN_NIC_LINUX_SUBVERSION);
+                writel(i, NETXEN_CRB_NORMALIZE(adapter, CRB_DRIVER_VERSION));
+
+                /* Unlock the HW, prompting the boot sequence */
+                writel(1,
+                        NETXEN_CRB_NORMALIZE(adapter,
+                                NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
+                /* Handshake with the card before we register the devices. */
+                netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
         }
-        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
-        netxen_pinit_from_rom(adapter, 0);
-        udelay(500);
-        netxen_load_firmware(adapter);
-        netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
+
         /*
-         * delay a while to ensure that the Pegs are up & running.
-         * Otherwise, we might see some flaky behaviour.
+         * See if the firmware gave us a virtual-physical port mapping.
          */
-        udelay(100);
+        i = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_V2P(adapter->portnum)));
+        if (i != 0x55555555)
+                physical_port[adapter->portnum] = i;
+
+        netif_carrier_off(netdev);
+        netif_stop_queue(netdev);
+
+        if ((err = register_netdev(netdev))) {
+                printk(KERN_ERR "%s: register_netdev failed port #%d"
+                               " aborting\n", netxen_nic_driver_name,
+                               adapter->portnum);
+                err = -EIO;
+                goto err_out_free_dev;
+        }
+
+        pci_set_drvdata(pdev, adapter);
 
         switch (adapter->ahw.board_type) {
-        case NETXEN_NIC_GBE:
-                printk("%s: QUAD GbE board initialized\n",
-                       netxen_nic_driver_name);
-                break;
+                case NETXEN_NIC_GBE:
+                        printk(KERN_INFO "%s: QUAD GbE board initialized\n",
+                               netxen_nic_driver_name);
+                        break;
 
-        case NETXEN_NIC_XGBE:
-                printk("%s: XGbE board initialized\n", netxen_nic_driver_name);
-                break;
+                case NETXEN_NIC_XGBE:
+                        printk(KERN_INFO "%s: XGbE board initialized\n", 
+                                        netxen_nic_driver_name);
+                        break;
         }
 
         adapter->driver_mismatch = 0;
 
         return 0;
 
-      err_out_free_dev:
-        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
-                pci_disable_msi(pdev);
-        for (i = 0; i < adapter->port_count; i++) {
-                port = adapter->port[i];
-                if ((port) && (port->netdev)) {
-                        unregister_netdev(port->netdev);
-                        free_netdev(port->netdev);
-                }
-        }
+err_out_free_dev:
+        if (adapter->portnum == 0)
+                netxen_free_adapter_offload(adapter);
 
-        netxen_free_adapter_offload(adapter);
-
-      err_out_free_rx_buffer:
+err_out_free_rx_buffer:
         for (i = 0; i < MAX_RCV_CTX; ++i) {
                 recv_ctx = &adapter->recv_ctx[i];
                 for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
@@ -487,15 +597,16 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
         vfree(cmd_buf_arr);
 
-      err_out_free_adapter:
+err_out_free_adapter:
+        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
+                pci_disable_msi(pdev);
+
         pci_set_drvdata(pdev, NULL);
-        kfree(adapter);
 
-      err_out_dbunmap:
         if (db_ptr)
                 iounmap(db_ptr);
 
-      err_out_iounmap:
+err_out_iounmap:
         if (mem_ptr0)
                 iounmap(mem_ptr0);
         if (mem_ptr1)
@@ -503,9 +614,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (mem_ptr2)
                 iounmap(mem_ptr2);
 
-      err_out_free_res:
+err_out_free_netdev:
+        free_netdev(netdev);
+
+err_out_free_res:
         pci_release_regions(pdev);
-      err_out_disable_pdev:
+
+err_out_disable_pdev:
         pci_disable_device(pdev);
         return err;
 }
@@ -513,7 +628,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 {
         struct netxen_adapter *adapter;
-        struct netxen_port *port;
+        struct net_device *netdev;
         struct netxen_rx_buffer *buffer;
         struct netxen_recv_context *recv_ctx;
         struct netxen_rcv_desc_ctx *rcv_desc;
@@ -524,38 +639,34 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
         if (adapter == NULL)
                 return;
 
+        netdev = adapter->netdev;
+
+        netxen_nic_disable_int(adapter);
         if (adapter->irq)
                 free_irq(adapter->irq, adapter);
-        netxen_nic_stop_all_ports(adapter);
-        /* leave the hw in the same state as reboot */
-        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
-        netxen_pinit_from_rom(adapter, 0);
-        udelay(500);
-        netxen_load_firmware(adapter);
-        netxen_free_adapter_offload(adapter);
-
-        mdelay(1000);           /* Delay for a while to drain the DMA engines */
-        for (i = 0; i < adapter->port_count; i++) {
-                port = adapter->port[i];
-                if ((port) && (port->netdev)) {
-                        unregister_netdev(port->netdev);
-                        free_netdev(port->netdev);
-                }
-        }
+        
+        if (adapter->stop_port)
+                adapter->stop_port(adapter);
 
         if ((adapter->flags & NETXEN_NIC_MSI_ENABLED))
                 pci_disable_msi(pdev);
-        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
-                netxen_free_hw_resources(adapter);
 
-        iounmap(adapter->ahw.db_base);
-        iounmap(adapter->ahw.pci_base0);
-        iounmap(adapter->ahw.pci_base1);
-        iounmap(adapter->ahw.pci_base2);
+        if (adapter->portnum == 0)
+                netxen_free_adapter_offload(adapter);
 
-        pci_release_regions(pdev);
-        pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
+        if (adapter->irq)
+                free_irq(adapter->irq, adapter);
+        if(adapter->portnum == 0) {
+                /* leave the hw in the same state as reboot */
+                writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
+                netxen_pinit_from_rom(adapter, 0);
+                udelay(500);
+                netxen_load_firmware(adapter);
+                netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
+        }
+
+        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
+                netxen_free_hw_resources(adapter);
 
         for (ctxid = 0; ctxid < MAX_RCV_CTX; ++ctxid) {
                 recv_ctx = &adapter->recv_ctx[ctxid];
@@ -575,8 +686,20 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 }
         }
 
+        unregister_netdev(netdev);
+
         vfree(adapter->cmd_buf_arr);
-        kfree(adapter);
+
+        iounmap(adapter->ahw.db_base);
+        iounmap(adapter->ahw.pci_base0);
+        iounmap(adapter->ahw.pci_base1);
+        iounmap(adapter->ahw.pci_base2);
+
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+        free_netdev(netdev);
 }
 
 /*
@@ -585,8 +708,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
  */
 static int netxen_nic_open(struct net_device *netdev)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = (struct netxen_adapter *)netdev->priv;
         int err = 0;
         int ctx, ring;
 
@@ -597,8 +719,6 @@ static int netxen_nic_open(struct net_device *netdev)
                         return -EIO;
                 }
                 netxen_nic_flash_print(adapter);
-                if (adapter->init_niu)
-                        adapter->init_niu(adapter);
 
                 /* setup all the resources for the Phantom... */
                 /* this include the descriptors for rcv, tx, and status */
@@ -609,21 +729,14 @@ static int netxen_nic_open(struct net_device *netdev)
                                err);
                         return err;
                 }
-                if (adapter->init_port
-                    && adapter->init_port(adapter, port->portnum) != 0) {
-                        printk(KERN_ERR "%s: Failed to initialize port %d\n",
-                               netxen_nic_driver_name, port->portnum);
-                        netxen_free_hw_resources(adapter);
-                        return -EIO;
-                }
                 for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
                         for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++)
                                 netxen_post_rx_buffers(adapter, ctx, ring);
                 }
                 adapter->irq = adapter->ahw.pdev->irq;
-                err = request_irq(adapter->ahw.pdev->irq, &netxen_intr,
-                                  IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                                  netdev->name, adapter);
+                err = request_irq(adapter->ahw.pdev->irq, netxen_intr,
+                                  SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name,
+                                  adapter);
                 if (err) {
                         printk(KERN_ERR "request_irq failed with: %d\n", err);
                         netxen_free_hw_resources(adapter);
@@ -632,23 +745,28 @@ static int netxen_nic_open(struct net_device *netdev)
 
                 adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
         }
-        adapter->active_ports++;
-        if (adapter->active_ports == 1) {
-                if (!adapter->driver_mismatch)
-                        mod_timer(&adapter->watchdog_timer, jiffies);
+        if (!adapter->driver_mismatch)
+                mod_timer(&adapter->watchdog_timer, jiffies);
 
-                netxen_nic_enable_int(adapter);
-        }
+        netxen_nic_enable_int(adapter);
 
         /* Done here again so that even if phantom sw overwrote it,
          * we set it */
         if (adapter->macaddr_set)
-                adapter->macaddr_set(port, netdev->dev_addr);
-        netxen_nic_set_link_parameters(port);
+                adapter->macaddr_set(adapter, netdev->dev_addr);
+        if (adapter->init_port
+            && adapter->init_port(adapter, adapter->portnum) != 0) {
+            del_timer_sync(&adapter->watchdog_timer);
+                printk(KERN_ERR "%s: Failed to initialize port %d\n",
+                                netxen_nic_driver_name, adapter->portnum);
+                return -EIO;
+        }
+
+        netxen_nic_set_link_parameters(adapter);
 
         netxen_nic_set_multi(netdev);
         if (adapter->set_mtu)
-                adapter->set_mtu(port, netdev->mtu);
+                adapter->set_mtu(adapter, netdev->mtu);
 
         if (!adapter->driver_mismatch)
                 netif_start_queue(netdev);
@@ -661,8 +779,7 @@ static int netxen_nic_open(struct net_device *netdev)
  */
 static int netxen_nic_close(struct net_device *netdev)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
         int i, j;
         struct netxen_cmd_buffer *cmd_buff;
         struct netxen_skb_frag *buffrag;
@@ -670,47 +787,39 @@ static int netxen_nic_close(struct net_device *netdev)
         netif_carrier_off(netdev);
         netif_stop_queue(netdev);
 
-        adapter->active_ports--;
-
-        if (!adapter->active_ports) {
-                netxen_nic_disable_int(adapter);
-                cmd_buff = adapter->cmd_buf_arr;
-                for (i = 0; i < adapter->max_tx_desc_count; i++) {
-                        buffrag = cmd_buff->frag_array;
+        cmd_buff = adapter->cmd_buf_arr;
+        for (i = 0; i < adapter->max_tx_desc_count; i++) {
+                buffrag = cmd_buff->frag_array;
+                if (buffrag->dma) {
+                        pci_unmap_single(adapter->pdev, buffrag->dma,
+                                         buffrag->length, PCI_DMA_TODEVICE);
+                        buffrag->dma = (u64) NULL;
+                }
+                for (j = 0; j < cmd_buff->frag_count; j++) {
+                        buffrag++;
                         if (buffrag->dma) {
-                                pci_unmap_single(port->pdev, buffrag->dma,
-                                                 buffrag->length,
-                                                 PCI_DMA_TODEVICE);
+                                pci_unmap_page(adapter->pdev, buffrag->dma,
+                                               buffrag->length, 
+                                               PCI_DMA_TODEVICE);
                                 buffrag->dma = (u64) NULL;
                         }
-                        for (j = 0; j < cmd_buff->frag_count; j++) {
-                                buffrag++;
-                                if (buffrag->dma) {
-                                        pci_unmap_page(port->pdev,
-                                                       buffrag->dma,
-                                                       buffrag->length,
-                                                       PCI_DMA_TODEVICE);
-                                        buffrag->dma = (u64) NULL;
-                                }
-                        }
-                        /* Free the skb we received in netxen_nic_xmit_frame */
-                        if (cmd_buff->skb) {
-                                dev_kfree_skb_any(cmd_buff->skb);
-                                cmd_buff->skb = NULL;
-                        }
-                        cmd_buff++;
                 }
-                FLUSH_SCHEDULED_WORK();
-                del_timer_sync(&adapter->watchdog_timer);
+                /* Free the skb we received in netxen_nic_xmit_frame */
+                if (cmd_buff->skb) {
+                        dev_kfree_skb_any(cmd_buff->skb);
+                        cmd_buff->skb = NULL;
+                }
+                cmd_buff++;
         }
+        FLUSH_SCHEDULED_WORK();
+        del_timer_sync(&adapter->watchdog_timer);
 
         return 0;
 }
 
 static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
         struct netxen_hardware_context *hw = &adapter->ahw;
         unsigned int first_seg_len = skb->len - skb->data_len;
         struct netxen_skb_frag *buffrag;
@@ -728,12 +837,12 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         u32 last_cmd_consumer = 0;
         int no_of_desc;
 
-        port->stats.xmitcalled++;
+        adapter->stats.xmitcalled++;
         frag_count = skb_shinfo(skb)->nr_frags + 1;
 
         if (unlikely(skb->len <= 0)) {
                 dev_kfree_skb_any(skb);
-                port->stats.badskblen++;
+                adapter->stats.badskblen++;
                 return NETDEV_TX_OK;
         }
 
@@ -742,7 +851,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                        "too large, can handle only %d frags\n",
                        netxen_nic_driver_name, netdev->name,
                        frag_count, MAX_BUFFERS_PER_CMD);
-                port->stats.txdropped++;
+                adapter->stats.txdropped++;
                 if ((++dropped_packet & 0xff) == 0xff)
                         printk("%s: %s droppped packets = %d\n",
                                netxen_nic_driver_name, netdev->name,
@@ -759,7 +868,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
          */
       retry_getting_window:
         spin_lock_bh(&adapter->tx_lock);
-        if (adapter->total_threads == MAX_XMIT_PRODUCERS) {
+        if (adapter->total_threads >= MAX_XMIT_PRODUCERS) {
                 spin_unlock_bh(&adapter->tx_lock);
                 /*
                  * Yield CPU
@@ -792,15 +901,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         if ((k + no_of_desc) >=
             ((last_cmd_consumer <= k) ? last_cmd_consumer + max_tx_desc_count :
              last_cmd_consumer)) {
-                port->stats.nocmddescriptor++;
-                DPRINTK(ERR, "No command descriptors available,"
-                        " producer = %d, consumer = %d count=%llu,"
-                        " dropping packet\n", producer,
-                        adapter->last_cmd_consumer,
-                        port->stats.nocmddescriptor);
-
                 netif_stop_queue(netdev);
-                port->flags |= NETXEN_NETDEV_STATUS;
+                adapter->flags |= NETXEN_NETDEV_STATUS;
                 spin_unlock_bh(&adapter->tx_lock);
                 return NETDEV_TX_BUSY;
         }
@@ -828,16 +930,17 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         pbuf->skb = skb;
         pbuf->cmd = TX_ETHER_PKT;
         pbuf->frag_count = frag_count;
-        pbuf->port = port->portnum;
+        pbuf->port = adapter->portnum;
         buffrag = &pbuf->frag_array[0];
-        buffrag->dma = pci_map_single(port->pdev, skb->data, first_seg_len,
+        buffrag->dma = pci_map_single(adapter->pdev, skb->data, first_seg_len,
                                       PCI_DMA_TODEVICE);
         buffrag->length = first_seg_len;
         netxen_set_cmd_desc_totallength(hwdesc, skb->len);
         netxen_set_cmd_desc_num_of_buff(hwdesc, frag_count);
         netxen_set_cmd_desc_opcode(hwdesc, TX_ETHER_PKT);
 
-        netxen_set_cmd_desc_port(hwdesc, port->portnum);
+        netxen_set_cmd_desc_port(hwdesc, adapter->portnum);
+        netxen_set_cmd_desc_ctxid(hwdesc, adapter->portnum);
         hwdesc->buffer1_length = cpu_to_le16(first_seg_len);
         hwdesc->addr_buffer1 = cpu_to_le64(buffrag->dma);
 
@@ -860,7 +963,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 offset = frag->page_offset;
 
                 temp_len = len;
-                temp_dma = pci_map_page(port->pdev, frag->page, offset,
+                temp_dma = pci_map_page(adapter->pdev, frag->page, offset,
                                         len, PCI_DMA_TODEVICE);
 
                 buffrag++;
@@ -927,21 +1030,29 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                         producer = get_next_index(producer, max_tx_desc_count);
                 }
         }
+
+        i = netxen_get_cmd_desc_totallength(&hw->cmd_desc_head[saved_producer]);
+
+        hw->cmd_desc_head[saved_producer].flags_opcode =
+                cpu_to_le16(hw->cmd_desc_head[saved_producer].flags_opcode);
+        hw->cmd_desc_head[saved_producer].num_of_buffers_total_length =
+          cpu_to_le32(hw->cmd_desc_head[saved_producer].
+                          num_of_buffers_total_length);
+
         spin_lock_bh(&adapter->tx_lock);
-        port->stats.txbytes +=
-            netxen_get_cmd_desc_totallength(&hw->cmd_desc_head[saved_producer]);
+        adapter->stats.txbytes += i;
+
         /* Code to update the adapter considering how many producer threads
            are currently working */
         if ((--adapter->num_threads) == 0) {
                 /* This is the last thread */
                 u32 crb_producer = adapter->cmd_producer;
-                writel(crb_producer,
-                       NETXEN_CRB_NORMALIZE(adapter, CRB_CMD_PRODUCER_OFFSET));
+                netxen_nic_update_cmd_producer(adapter, crb_producer);
                 wmb();
                 adapter->total_threads = 0;
         }
 
-        port->stats.xmitfinished++;
+        adapter->stats.xmitfinished++;
         spin_unlock_bh(&adapter->tx_lock);
 
         netdev->trans_start = jiffies;
@@ -961,27 +1072,26 @@ static void netxen_watchdog(unsigned long v)
 
 static void netxen_tx_timeout(struct net_device *netdev)
 {
-        struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev);
-
-        SCHEDULE_WORK(&port->tx_timeout_task);
+        struct netxen_adapter *adapter = (struct netxen_adapter *)
+                                                netdev_priv(netdev);
+        SCHEDULE_WORK(&adapter->tx_timeout_task);
 }
 
 static void netxen_tx_timeout_task(struct work_struct *work)
 {
-        struct netxen_port *port =
-                container_of(work, struct netxen_port, tx_timeout_task);
-        struct net_device *netdev = port->netdev;
+        struct netxen_adapter *adapter = 
+                container_of(work, struct netxen_adapter, tx_timeout_task);
         unsigned long flags;
 
         printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
-               netxen_nic_driver_name, netdev->name);
-
-        spin_lock_irqsave(&port->adapter->lock, flags);
-        netxen_nic_close(netdev);
-        netxen_nic_open(netdev);
-        spin_unlock_irqrestore(&port->adapter->lock, flags);
-        netdev->trans_start = jiffies;
-        netif_wake_queue(netdev);
+               netxen_nic_driver_name, adapter->netdev->name);
+
+        spin_lock_irqsave(&adapter->lock, flags);
+        netxen_nic_close(adapter->netdev);
+        netxen_nic_open(adapter->netdev);
+        spin_unlock_irqrestore(&adapter->lock, flags);
+        adapter->netdev->trans_start = jiffies;
+        netif_wake_queue(adapter->netdev);
 }
 
 static int
@@ -990,17 +1100,16 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
         u32 ret = 0;
 
         DPRINTK(INFO, "Entered handle ISR\n");
-
         adapter->stats.ints++;
 
         if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
                 int count = 0;
                 u32 mask;
-                mask = readl(pci_base_offset(adapter, ISR_INT_VECTOR));
-                if ((mask & 0x80) == 0) {
-                        /* not our interrupt */
+                u32 our_int = 0;
+                our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
+                /* not our interrupt */
+                if ((our_int & (0x80 << adapter->portnum)) == 0)
                         return ret;
-                }
                 netxen_nic_disable_int(adapter);
                 /* Window = 0 or 1 */
                 do {
@@ -1012,7 +1121,6 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
                         printk("Could not disable interrupt completely\n");
 
         }
-        adapter->stats.hostints++;
 
         if (netxen_nic_rx_has_work(adapter) || netxen_nic_tx_has_work(adapter)) {
                 if (netif_rx_schedule_prep(netdev)) {
@@ -1046,33 +1154,24 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
 irqreturn_t netxen_intr(int irq, void *data)
 {
         struct netxen_adapter *adapter;
-        struct netxen_port *port;
         struct net_device *netdev;
-        int i;
 
         if (unlikely(!irq)) {
                 return IRQ_NONE;        /* Not our interrupt */
         }
 
         adapter = (struct netxen_adapter *)data;
-        for (i = 0; i < adapter->ahw.max_ports; i++) {
-                port = adapter->port[i];
-                netdev = port->netdev;
-
-                /* process our status queue (for all 4 ports) */
-                if (netif_running(netdev)) {
-                        netxen_handle_int(adapter, netdev);
-                        break;
-                }
-        }
+        netdev  = adapter->netdev;
+        /* process our status queue (for all 4 ports) */
+        if (netif_running(netdev))
+                netxen_handle_int(adapter, netdev);
 
         return IRQ_HANDLED;
 }
 
 static int netxen_nic_poll(struct net_device *netdev, int *budget)
 {
-        struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
         int work_to_do = min(*budget, netdev->quota);
         int done = 1;
         int ctx;
@@ -1080,7 +1179,6 @@ static int netxen_nic_poll(struct net_device *netdev, int *budget)
         int work_done = 0;
 
         DPRINTK(INFO, "polling for %d descriptors\n", *budget);
-        port->stats.polled++;
 
         work_done = 0;
         for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
@@ -1124,8 +1222,7 @@ static int netxen_nic_poll(struct net_device *netdev, int *budget)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void netxen_nic_poll_controller(struct net_device *netdev)
 {
-        struct netxen_port *port = netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
         disable_irq(adapter->irq);
         netxen_intr(adapter->irq, adapter);
         enable_irq(adapter->irq);
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index d5d95074e569..cef90a78351e 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -88,12 +88,13 @@ static inline int phy_unlock(struct netxen_adapter *adapter)
  *        -1 on error
  *
  */
-int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long phy,
-                            long reg, __u32 * readval)
+int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg, 
+                                __u32 * readval)
 {
         long timeout = 0;
         long result = 0;
         long restore = 0;
+        long phy = physical_port[adapter->portnum];
         __u32 address;
         __u32 command;
         __u32 status;
@@ -183,12 +184,13 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long phy,
  *        -1 on error
  *
  */
-int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter,
-                             long phy, long reg, __u32 val)
+int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long reg, 
+                                __u32 val)
 {
         long timeout = 0;
         long result = 0;
         long restore = 0;
+        long phy = physical_port[adapter->portnum];
         __u32 address;
         __u32 command;
         __u32 status;
@@ -258,15 +260,13 @@ int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter,
         return result;
 }
 
-int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter,
-                                          int port)
+int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter)
 {
         netxen_crb_writelit_adapter(adapter, NETXEN_NIU_INT_MASK, 0x3f);
         return 0;
 }
 
-int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter,
-                                         int port)
+int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter)
 {
         int result = 0;
         __u32 enable = 0;
@@ -275,7 +275,7 @@ int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter,
         netxen_set_phy_int_speed_changed(enable);
 
         if (0 !=
-            netxen_niu_gbe_phy_write(adapter, port,
+            netxen_niu_gbe_phy_write(adapter, 
                                      NETXEN_NIU_GB_MII_MGMT_ADDR_INT_ENABLE,
                                      enable))
                 result = -EIO;
@@ -283,38 +283,34 @@ int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter,
         return result;
 }
 
-int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter,
-                                           int port)
+int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter)
 {
         netxen_crb_writelit_adapter(adapter, NETXEN_NIU_INT_MASK, 0x7f);
         return 0;
 }
 
-int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter,
-                                          int port)
+int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter)
 {
         int result = 0;
         if (0 !=
-            netxen_niu_gbe_phy_write(adapter, port,
+            netxen_niu_gbe_phy_write(adapter,
                                      NETXEN_NIU_GB_MII_MGMT_ADDR_INT_ENABLE, 0))
                 result = -EIO;
 
         return result;
 }
 
-int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter,
-                                         int port)
+int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter)
 {
         netxen_crb_writelit_adapter(adapter, NETXEN_NIU_ACTIVE_INT, -1);
         return 0;
 }
 
-int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter,
-                                        int port)
+int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter)
 {
         int result = 0;
         if (0 !=
-            netxen_niu_gbe_phy_write(adapter, port,
+            netxen_niu_gbe_phy_write(adapter, 
                                      NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
                                      -EIO))
                 result = -EIO;
@@ -355,9 +351,9 @@ void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter,
                                             0x5);
         }
 
-        if (netxen_niu_gbe_enable_phy_interrupts(adapter, port))
+        if (netxen_niu_gbe_enable_phy_interrupts(adapter))
                 printk(KERN_ERR PFX "ERROR enabling PHY interrupts\n");
-        if (netxen_niu_gbe_clear_phy_interrupts(adapter, port))
+        if (netxen_niu_gbe_clear_phy_interrupts(adapter))
                 printk(KERN_ERR PFX "ERROR clearing PHY interrupts\n");
 }
 
@@ -393,9 +389,9 @@ void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter,
                                             0x5);
         }
 
-        if (netxen_niu_gbe_enable_phy_interrupts(adapter, port))
+        if (netxen_niu_gbe_enable_phy_interrupts(adapter))
                 printk(KERN_ERR PFX "ERROR enabling PHY interrupts\n");
-        if (netxen_niu_gbe_clear_phy_interrupts(adapter, port))
+        if (netxen_niu_gbe_clear_phy_interrupts(adapter))
                 printk(KERN_ERR PFX "ERROR clearing PHY interrupts\n");
 }
 
@@ -404,11 +400,11 @@ int netxen_niu_gbe_init_port(struct netxen_adapter *adapter, int port)
         int result = 0;
         __u32 status;
         if (adapter->disable_phy_interrupts)
-                adapter->disable_phy_interrupts(adapter, port);
+                adapter->disable_phy_interrupts(adapter);
         mdelay(2);
 
         if (0 ==
-            netxen_niu_gbe_phy_read(adapter, port,
+            netxen_niu_gbe_phy_read(adapter,
                                     NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                     &status)) {
                 if (netxen_get_phy_link(status)) {
@@ -439,13 +435,13 @@ int netxen_niu_gbe_init_port(struct netxen_adapter *adapter, int port)
                                                     | NETXEN_GB_MAC_ENABLE_TX_RX
                                                     |
                                                     NETXEN_GB_MAC_PAUSED_FRMS);
-                        if (netxen_niu_gbe_clear_phy_interrupts(adapter, port))
+                        if (netxen_niu_gbe_clear_phy_interrupts(adapter))
                                 printk(KERN_ERR PFX
                                        "ERROR clearing PHY interrupts\n");
-                        if (netxen_niu_gbe_enable_phy_interrupts(adapter, port))
+                        if (netxen_niu_gbe_enable_phy_interrupts(adapter))
                                 printk(KERN_ERR PFX
                                        "ERROR enabling PHY interrupts\n");
-                        if (netxen_niu_gbe_clear_phy_interrupts(adapter, port))
+                        if (netxen_niu_gbe_clear_phy_interrupts(adapter))
                                 printk(KERN_ERR PFX
                                        "ERROR clearing PHY interrupts\n");
                         result = -1;
@@ -458,26 +454,18 @@ int netxen_niu_gbe_init_port(struct netxen_adapter *adapter, int port)
 
 int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
 {
-        u32 reg = 0, ret = 0;
+        u32 reg;
+        u32 portnum = physical_port[adapter->portnum];
 
-        if (adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) {
-                netxen_crb_writelit_adapter(adapter,
-                                            NETXEN_NIU_XG1_CONFIG_0, 0x5);
-                /* XXX hack for Mez cards: both ports in promisc mode */
-                netxen_nic_hw_read_wx(adapter,
-                                      NETXEN_NIU_XGE_CONFIG_1, &reg, 4);
-                reg = (reg | 0x2000UL);
-                netxen_crb_writelit_adapter(adapter,
-                                            NETXEN_NIU_XGE_CONFIG_1, reg);
-                reg = 0;
-                netxen_nic_hw_read_wx(adapter,
-                                      NETXEN_NIU_XG1_CONFIG_1, &reg, 4);
-                reg = (reg | 0x2000UL);
-                netxen_crb_writelit_adapter(adapter,
-                                            NETXEN_NIU_XG1_CONFIG_1, reg);
-        }
+        netxen_crb_writelit_adapter(adapter,
+                NETXEN_NIU_XGE_CONFIG_0+(0x10000*portnum), 0x5);
+        netxen_nic_hw_read_wx(adapter,
+                NETXEN_NIU_XGE_CONFIG_1+(0x10000*portnum), &reg, 4);
+        reg = (reg & ~0x2000UL);
+        netxen_crb_writelit_adapter(adapter,
+                NETXEN_NIU_XGE_CONFIG_1+(0x10000*portnum), reg);
 
-        return ret;
+        return 0;
 }
 
 /* 
@@ -498,7 +486,7 @@ int netxen_niu_gbe_handle_phy_interrupt(struct netxen_adapter *adapter,
          * The read of the PHY INT status will clear the pending
          * interrupt status
          */
-        if (netxen_niu_gbe_phy_read(adapter, port,
+        if (netxen_niu_gbe_phy_read(adapter,
                                     NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
                                     &int_src) != 0)
                 result = -EINVAL;
@@ -535,7 +523,7 @@ int netxen_niu_gbe_handle_phy_interrupt(struct netxen_adapter *adapter,
                         printk(KERN_INFO PFX
                                "speed_changed or link status changed");
                         if (netxen_niu_gbe_phy_read
-                            (adapter, port,
+                            (adapter,
                              NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                              &status) == 0) {
                                 if (netxen_get_phy_speed(status) == 2) {
@@ -581,10 +569,11 @@ int netxen_niu_gbe_handle_phy_interrupt(struct netxen_adapter *adapter,
  * Note that the passed-in value must already be in network byte order.
  */
 int netxen_niu_macaddr_get(struct netxen_adapter *adapter,
-                           int phy, netxen_ethernet_macaddr_t * addr)
+                           netxen_ethernet_macaddr_t * addr)
 {
         u32 stationhigh;
         u32 stationlow;
+        int phy = physical_port[adapter->portnum];
         u8 val[8];
 
         if (addr == NULL)
@@ -610,13 +599,12 @@ int netxen_niu_macaddr_get(struct netxen_adapter *adapter,
  * Set the station MAC address.
  * Note that the passed-in value must already be in network byte order.
  */
-int netxen_niu_macaddr_set(struct netxen_port *port,
+int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
                            netxen_ethernet_macaddr_t addr)
 {
         u8 temp[4];
         u32 val;
-        struct netxen_adapter *adapter = port->adapter;
-        int phy = port->portnum;
+        int phy = physical_port[adapter->portnum];
         unsigned char mac_addr[6];
         int i;
 
@@ -634,7 +622,7 @@ int netxen_niu_macaddr_set(struct netxen_port *port,
                     (adapter, NETXEN_NIU_GB_STATION_ADDR_0(phy), &val, 4))
                         return -2;
 
-                netxen_niu_macaddr_get(adapter, phy,
+                netxen_niu_macaddr_get(adapter, 
                                        (netxen_ethernet_macaddr_t *) mac_addr);
                 if (memcmp(mac_addr, addr, 6) == 0)
                         break;
@@ -642,7 +630,7 @@ int netxen_niu_macaddr_set(struct netxen_port *port,
 
         if (i == 10) {
                 printk(KERN_ERR "%s: cannot set Mac addr for %s\n",
-                       netxen_nic_driver_name, port->netdev->name);
+                       netxen_nic_driver_name, adapter->netdev->name);
                 printk(KERN_ERR "MAC address set: "
                        "%02x:%02x:%02x:%02x:%02x:%02x.\n",
                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
@@ -735,13 +723,13 @@ int netxen_niu_enable_gbe_port(struct netxen_adapter *adapter,
 }
 
 /* Disable a GbE interface */
-int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter, int port)
+int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter)
 {
         __u32 mac_cfg0;
+        u32 port = physical_port[adapter->portnum];
 
         if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
                 return -EINVAL;
-
         mac_cfg0 = 0;
         netxen_gb_soft_reset(mac_cfg0);
         if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
@@ -751,13 +739,13 @@ int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter, int port)
 }
 
 /* Disable an XG interface */
-int netxen_niu_disable_xg_port(struct netxen_adapter *adapter, int port)
+int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
 {
         __u32 mac_cfg;
+        u32 port = physical_port[adapter->portnum];
 
         if (port != 0)
                 return -EINVAL;
-
         mac_cfg = 0;
         netxen_xg_soft_reset(mac_cfg);
         if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_CONFIG_0,
@@ -767,10 +755,11 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter, int port)
 }
 
 /* Set promiscuous mode for a GbE interface */
-int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, int port,
+int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, 
                                     netxen_niu_prom_mode_t mode)
 {
         __u32 reg;
+        u32 port = physical_port[adapter->portnum];
 
         if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
                 return -EINVAL;
@@ -824,25 +813,50 @@ int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, int port,
  * Set the MAC address for an XG port
  * Note that the passed-in value must already be in network byte order.
  */
-int netxen_niu_xg_macaddr_set(struct netxen_port *port,
+int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter,
                               netxen_ethernet_macaddr_t addr)
 {
+        int phy = physical_port[adapter->portnum];
         u8 temp[4];
         u32 val;
-        struct netxen_adapter *adapter = port->adapter;
+
+        if ((phy < 0) || (phy > NETXEN_NIU_MAX_XG_PORTS))
+                return -EIO;
 
         temp[0] = temp[1] = 0;
-        memcpy(temp + 2, addr, 2);
-        val = le32_to_cpu(*(__le32 *)temp);
-        if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_STATION_ADDR_0_1,
-                                   &val, 4))
+        switch (phy) {
+        case 0:
+            memcpy(temp + 2, addr, 2);
+            val = le32_to_cpu(*(__le32 *)temp);
+            if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_STATION_ADDR_0_1,
+                                &val, 4))
                 return -EIO;
 
-        memcpy(&temp, ((u8 *) addr) + 2, sizeof(__le32));
-        val = le32_to_cpu(*(__le32 *)temp);
-        if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_STATION_ADDR_0_HI,
-                                   &val, 4))
+            memcpy(&temp, ((u8 *) addr) + 2, sizeof(__le32));
+            val = le32_to_cpu(*(__le32 *)temp);
+            if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_STATION_ADDR_0_HI,
+                                &val, 4))
+                return -EIO;
+            break;
+
+        case 1:
+            memcpy(temp + 2, addr, 2);
+            val = le32_to_cpu(*(__le32 *)temp);
+            if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XG1_STATION_ADDR_0_1,
+                                &val, 4))
+                return -EIO;
+
+            memcpy(&temp, ((u8 *) addr) + 2, sizeof(__le32));
+            val = le32_to_cpu(*(__le32 *)temp);
+            if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XG1_STATION_ADDR_0_HI,
+                                &val, 4))
                 return -EIO;
+            break;
+
+        default:
+            printk(KERN_ERR "Unknown port %d\n", phy);
+            break;
+        }
 
         return 0;
 }
@@ -851,9 +865,10 @@ int netxen_niu_xg_macaddr_set(struct netxen_port *port,
  * Return the current station MAC address.
  * Note that the passed-in value must already be in network byte order.
  */
-int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, int phy,
+int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter,
                               netxen_ethernet_macaddr_t * addr)
 {
+        int phy = physical_port[adapter->portnum];
         u32 stationhigh;
         u32 stationlow;
         u8 val[8];
@@ -878,21 +893,24 @@ int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, int phy,
 }
 
 int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,
-                                       int port, netxen_niu_prom_mode_t mode)
+                                       netxen_niu_prom_mode_t mode)
 {
         __u32 reg;
+        u32 port = physical_port[adapter->portnum];
 
-        if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
+        if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
                 return -EINVAL;
 
-        if (netxen_nic_hw_read_wx(adapter, NETXEN_NIU_XGE_CONFIG_1, &reg, 4))
-                return -EIO;
+        if (netxen_nic_hw_read_wx(adapter,
+                NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port), &reg, 4))
+                        return -EIO;
         if (mode == NETXEN_NIU_PROMISC_MODE)
                 reg = (reg | 0x2000UL);
         else
                 reg = (reg & ~0x2000UL);
 
-        netxen_crb_writelit_adapter(adapter, NETXEN_NIU_XGE_CONFIG_1, reg);
+        netxen_crb_writelit_adapter(adapter,
+                NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port), reg);
 
         return 0;
 }
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h
index 0c7c94328b7f..9457fc7249c8 100644
--- a/drivers/net/netxen/netxen_nic_phan_reg.h
+++ b/drivers/net/netxen/netxen_nic_phan_reg.h
@@ -100,8 +100,21 @@
 
 #define CRB_CMD_PRODUCER_OFFSET_1   NETXEN_NIC_REG(0x1ac)
 #define CRB_CMD_CONSUMER_OFFSET_1   NETXEN_NIC_REG(0x1b0)
+#define CRB_CMD_PRODUCER_OFFSET_2   NETXEN_NIC_REG(0x1b8)
+#define CRB_CMD_CONSUMER_OFFSET_2   NETXEN_NIC_REG(0x1bc)
+
+// 1c0 to 1cc used for signature reg
+#define CRB_CMD_PRODUCER_OFFSET_3   NETXEN_NIC_REG(0x1d0)
+#define CRB_CMD_CONSUMER_OFFSET_3   NETXEN_NIC_REG(0x1d4)
 #define CRB_TEMP_STATE              NETXEN_NIC_REG(0x1b4)
 
+#define CRB_V2P_0                   NETXEN_NIC_REG(0x290)
+#define CRB_V2P_1                   NETXEN_NIC_REG(0x294)
+#define CRB_V2P_2                   NETXEN_NIC_REG(0x298)
+#define CRB_V2P_3                   NETXEN_NIC_REG(0x29c)
+#define CRB_V2P(port)               (CRB_V2P_0+((port)*4))
+#define CRB_DRIVER_VERSION          NETXEN_NIC_REG(0x2a0)
+
 /* used for ethtool tests */
 #define CRB_SCRATCHPAD_TEST         NETXEN_NIC_REG(0x280)
 
@@ -139,128 +152,13 @@ struct netxen_recv_crb {
 };
 
 #if defined(DEFINE_GLOBAL_RECV_CRB)
-struct netxen_recv_crb recv_crb_registers[] = {
-        /*
-         * Instance 0.
-         */
-        {
-         /* rcv_desc_crb: */
-         {
-          {
-           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x100),
-           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x104),
-           /* crb_gloablrcv_ring: */
-           NETXEN_NIC_REG(0x108),
-           /* crb_rcv_ring_size */
-           NETXEN_NIC_REG(0x10c),
-
-           },
-          /* Jumbo frames */
-          {
-           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x110),
-           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x114),
-           /* crb_gloablrcv_ring: */
-           NETXEN_NIC_REG(0x118),
-           /* crb_rcv_ring_size */
-           NETXEN_NIC_REG(0x11c),
-           },
-          /* LRO */
-          {
-           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x120),
-           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x124),
-           /* crb_gloablrcv_ring: */
-           NETXEN_NIC_REG(0x128),
-           /* crb_rcv_ring_size */
-           NETXEN_NIC_REG(0x12c),
-           }
-          },
-         /* crb_rcvstatus_ring: */
-         NETXEN_NIC_REG(0x130),
-         /* crb_rcv_status_producer: */
-         NETXEN_NIC_REG(0x134),
-         /* crb_rcv_status_consumer: */
-         NETXEN_NIC_REG(0x138),
-         /* crb_rcvpeg_state: */
-         NETXEN_NIC_REG(0x13c),
-         /* crb_status_ring_size */
-         NETXEN_NIC_REG(0x140),
-
-         },
-        /*
-         * Instance 1,
-         */
-        {
-         /* rcv_desc_crb: */
-         {
-          {
-           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x144),
-           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x148),
-           /* crb_globalrcv_ring: */
-           NETXEN_NIC_REG(0x14c),
-           /* crb_rcv_ring_size */
-           NETXEN_NIC_REG(0x150),
-
-           },
-          /* Jumbo frames */
-          {
-           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x154),
-           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x158),
-           /* crb_globalrcv_ring: */
-           NETXEN_NIC_REG(0x15c),
-           /* crb_rcv_ring_size */
-           NETXEN_NIC_REG(0x160),
-           },
-          /* LRO */
-          {
-           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x164),
-           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x168),
-           /* crb_globalrcv_ring: */
-           NETXEN_NIC_REG(0x16c),
-           /* crb_rcv_ring_size */
-           NETXEN_NIC_REG(0x170),
-           }
-
-          },
-         /* crb_rcvstatus_ring: */
-         NETXEN_NIC_REG(0x174),
-         /* crb_rcv_status_producer: */
-         NETXEN_NIC_REG(0x178),
-         /* crb_rcv_status_consumer: */
-         NETXEN_NIC_REG(0x17c),
-         /* crb_rcvpeg_state: */
-         NETXEN_NIC_REG(0x180),
-         /* crb_status_ring_size */
-         NETXEN_NIC_REG(0x184),
-
-         },
-};
-
-u64 ctx_addr_sig_regs[][3] = {
-        {NETXEN_NIC_REG(0x188), NETXEN_NIC_REG(0x18c), NETXEN_NIC_REG(0x1c0)},
-        {NETXEN_NIC_REG(0x190), NETXEN_NIC_REG(0x194), NETXEN_NIC_REG(0x1c4)},
-        {NETXEN_NIC_REG(0x198), NETXEN_NIC_REG(0x19c), NETXEN_NIC_REG(0x1c8)},
-        {NETXEN_NIC_REG(0x1a0), NETXEN_NIC_REG(0x1a4), NETXEN_NIC_REG(0x1cc)}
-};
-
 #else
 extern struct netxen_recv_crb recv_crb_registers[];
 extern u64 ctx_addr_sig_regs[][3];
-#define CRB_CTX_ADDR_REG_LO            (ctx_addr_sig_regs[0][0])
-#define CRB_CTX_ADDR_REG_HI            (ctx_addr_sig_regs[0][2])
-#define CRB_CTX_SIGNATURE_REG       (ctx_addr_sig_regs[0][1])
 #endif                          /* DEFINE_GLOBAL_RECEIVE_CRB */
+#define CRB_CTX_ADDR_REG_LO(FUNC_ID)            (ctx_addr_sig_regs[FUNC_ID][0])
+#define CRB_CTX_ADDR_REG_HI(FUNC_ID)            (ctx_addr_sig_regs[FUNC_ID][2])
+#define CRB_CTX_SIGNATURE_REG(FUNC_ID)          (ctx_addr_sig_regs[FUNC_ID][1])
 
 /*
  * Temperature control.
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 0791360a6a66..9c171a7390e2 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -253,12 +253,12 @@ struct pcnet32_access {
  * so the structure should be allocated using pci_alloc_consistent().
  */
 struct pcnet32_private {
-        struct pcnet32_init_block init_block;
+        struct pcnet32_init_block *init_block;
         /* The Tx and Rx ring entries must be aligned on 16-byte boundaries in 32bit mode. */
         struct pcnet32_rx_head  *rx_ring;
         struct pcnet32_tx_head  *tx_ring;
-        dma_addr_t              dma_addr;/* DMA address of beginning of this
-                                   object, returned by pci_alloc_consistent */
+        dma_addr_t              init_dma_addr;/* DMA address of beginning of the init block,
+                                   returned by pci_alloc_consistent */
         struct pci_dev          *pci_dev;
         const char              *name;
         /* The saved address of a sent-in-place packet/buffer, for skfree(). */
@@ -653,7 +653,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
 
 static void pcnet32_purge_rx_ring(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int i;
 
         /* free all allocated skbuffs */
@@ -681,7 +681,7 @@ static void pcnet32_poll_controller(struct net_device *dev)
 
 static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long flags;
         int r = -EOPNOTSUPP;
 
@@ -696,7 +696,7 @@ static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
 static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long flags;
         int r = -EOPNOTSUPP;
 
@@ -711,7 +711,7 @@ static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static void pcnet32_get_drvinfo(struct net_device *dev,
                                 struct ethtool_drvinfo *info)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
 
         strcpy(info->driver, DRV_NAME);
         strcpy(info->version, DRV_VERSION);
@@ -723,7 +723,7 @@ static void pcnet32_get_drvinfo(struct net_device *dev,
 
 static u32 pcnet32_get_link(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long flags;
         int r;
 
@@ -743,19 +743,19 @@ static u32 pcnet32_get_link(struct net_device *dev)
 
 static u32 pcnet32_get_msglevel(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         return lp->msg_enable;
 }
 
 static void pcnet32_set_msglevel(struct net_device *dev, u32 value)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         lp->msg_enable = value;
 }
 
 static int pcnet32_nway_reset(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long flags;
         int r = -EOPNOTSUPP;
 
@@ -770,7 +770,7 @@ static int pcnet32_nway_reset(struct net_device *dev)
 static void pcnet32_get_ringparam(struct net_device *dev,
                                   struct ethtool_ringparam *ering)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
 
         ering->tx_max_pending = TX_MAX_RING_SIZE;
         ering->tx_pending = lp->tx_ring_size;
@@ -781,7 +781,7 @@ static void pcnet32_get_ringparam(struct net_device *dev,
 static int pcnet32_set_ringparam(struct net_device *dev,
                                  struct ethtool_ringparam *ering)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long flags;
         unsigned int size;
         ulong ioaddr = dev->base_addr;
@@ -847,7 +847,7 @@ static int pcnet32_self_test_count(struct net_device *dev)
 static void pcnet32_ethtool_test(struct net_device *dev,
                                  struct ethtool_test *test, u64 * data)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int rc;
 
         if (test->flags == ETH_TEST_FL_OFFLINE) {
@@ -868,7 +868,7 @@ static void pcnet32_ethtool_test(struct net_device *dev,
 
 static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         struct pcnet32_access *a = &lp->a;      /* access to registers */
         ulong ioaddr = dev->base_addr;  /* card base I/O address */
         struct sk_buff *skb;    /* sk buff */
@@ -1047,7 +1047,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
 
 static void pcnet32_led_blink_callback(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         struct pcnet32_access *a = &lp->a;
         ulong ioaddr = dev->base_addr;
         unsigned long flags;
@@ -1064,7 +1064,7 @@ static void pcnet32_led_blink_callback(struct net_device *dev)
 
 static int pcnet32_phys_id(struct net_device *dev, u32 data)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         struct pcnet32_access *a = &lp->a;
         ulong ioaddr = dev->base_addr;
         unsigned long flags;
@@ -1109,7 +1109,7 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
                 int can_sleep)
 {
         int csr5;
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         struct pcnet32_access *a = &lp->a;
         ulong ioaddr = dev->base_addr;
         int ticks;
@@ -1257,7 +1257,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
 
 static int pcnet32_rx(struct net_device *dev, int quota)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int entry = lp->cur_rx & lp->rx_mod_mask;
         struct pcnet32_rx_head *rxp = &lp->rx_ring[entry];
         int npackets = 0;
@@ -1282,7 +1282,7 @@ static int pcnet32_rx(struct net_device *dev, int quota)
 
 static int pcnet32_tx(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned int dirty_tx = lp->dirty_tx;
         int delta;
         int must_restart = 0;
@@ -1381,7 +1381,7 @@ static int pcnet32_tx(struct net_device *dev)
 #ifdef CONFIG_PCNET32_NAPI
 static int pcnet32_poll(struct net_device *dev, int *budget)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int quota = min(dev->quota, *budget);
         unsigned long ioaddr = dev->base_addr;
         unsigned long flags;
@@ -1428,7 +1428,7 @@ static int pcnet32_poll(struct net_device *dev, int *budget)
 #define PCNET32_MAX_PHYS        32
 static int pcnet32_get_regs_len(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int j = lp->phycount * PCNET32_REGS_PER_PHY;
 
         return ((PCNET32_NUM_REGS + j) * sizeof(u16));
@@ -1439,7 +1439,7 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 {
         int i, csr0;
         u16 *buff = ptr;
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         struct pcnet32_access *a = &lp->a;
         ulong ioaddr = dev->base_addr;
         unsigned long flags;
@@ -1592,7 +1592,6 @@ static int __devinit
 pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 {
         struct pcnet32_private *lp;
-        dma_addr_t lp_dma_addr;
         int i, media;
         int fdx, mii, fset, dxsuflo;
         int chip_version;
@@ -1714,7 +1713,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 dxsuflo = 1;
         }
 
-        dev = alloc_etherdev(0);
+        dev = alloc_etherdev(sizeof(*lp));
         if (!dev) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
                         printk(KERN_ERR PFX "Memory allocation failed.\n");
@@ -1805,25 +1804,22 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         }
 
         dev->base_addr = ioaddr;
+        lp = netdev_priv(dev);
         /* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */
-        if ((lp =
-             pci_alloc_consistent(pdev, sizeof(*lp), &lp_dma_addr)) == NULL) {
+        if ((lp->init_block =
+             pci_alloc_consistent(pdev, sizeof(*lp->init_block), &lp->init_dma_addr)) == NULL) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
                         printk(KERN_ERR PFX
                                "Consistent memory allocation failed.\n");
                 ret = -ENOMEM;
                 goto err_free_netdev;
         }
-
-        memset(lp, 0, sizeof(*lp));
-        lp->dma_addr = lp_dma_addr;
         lp->pci_dev = pdev;
 
         spin_lock_init(&lp->lock);
 
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
-        dev->priv = lp;
         lp->name = chipname;
         lp->shared_irq = shared;
         lp->tx_ring_size = TX_RING_SIZE;        /* default tx ring size */
@@ -1870,23 +1866,21 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
             && dev->dev_addr[2] == 0x75)
                 lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
 
-        lp->init_block.mode = le16_to_cpu(0x0003);      /* Disable Rx and Tx. */
-        lp->init_block.tlen_rlen =
+        lp->init_block->mode = le16_to_cpu(0x0003);     /* Disable Rx and Tx. */
+        lp->init_block->tlen_rlen =
             le16_to_cpu(lp->tx_len_bits | lp->rx_len_bits);
         for (i = 0; i < 6; i++)
-                lp->init_block.phys_addr[i] = dev->dev_addr[i];
-        lp->init_block.filter[0] = 0x00000000;
-        lp->init_block.filter[1] = 0x00000000;
-        lp->init_block.rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
-        lp->init_block.tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
+                lp->init_block->phys_addr[i] = dev->dev_addr[i];
+        lp->init_block->filter[0] = 0x00000000;
+        lp->init_block->filter[1] = 0x00000000;
+        lp->init_block->rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
+        lp->init_block->tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
 
         /* switch pcnet32 to 32bit mode */
         a->write_bcr(ioaddr, 20, 2);
 
-        a->write_csr(ioaddr, 1, (lp->dma_addr + offsetof(struct pcnet32_private,
-                                                         init_block)) & 0xffff);
-        a->write_csr(ioaddr, 2, (lp->dma_addr + offsetof(struct pcnet32_private,
-                                                         init_block)) >> 16);
+        a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
+        a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
 
         if (pdev) {             /* use the IRQ provided by PCI */
                 dev->irq = pdev->irq;
@@ -1992,7 +1986,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
       err_free_ring:
         pcnet32_free_ring(dev);
       err_free_consistent:
-        pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
+        pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), 
+                            lp->init_block, lp->init_dma_addr);
       err_free_netdev:
         free_netdev(dev);
       err_release_region:
@@ -2003,7 +1998,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 /* if any allocation fails, caller must also call pcnet32_free_ring */
 static int pcnet32_alloc_ring(struct net_device *dev, char *name)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
 
         lp->tx_ring = pci_alloc_consistent(lp->pci_dev,
                                            sizeof(struct pcnet32_tx_head) *
@@ -2070,7 +2065,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)
 
 static void pcnet32_free_ring(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
 
         kfree(lp->tx_skbuff);
         lp->tx_skbuff = NULL;
@@ -2103,7 +2098,7 @@ static void pcnet32_free_ring(struct net_device *dev)
 
 static int pcnet32_open(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         u16 val;
         int i;
@@ -2134,8 +2129,7 @@ static int pcnet32_open(struct net_device *dev)
                        "%s: pcnet32_open() irq %d tx/rx rings %#x/%#x init %#x.\n",
                        dev->name, dev->irq, (u32) (lp->tx_ring_dma_addr),
                        (u32) (lp->rx_ring_dma_addr),
-                       (u32) (lp->dma_addr +
-                              offsetof(struct pcnet32_private, init_block)));
+                       (u32) (lp->init_dma_addr));
 
         /* set/reset autoselect bit */
         val = lp->a.read_bcr(ioaddr, 2) & ~2;
@@ -2274,7 +2268,7 @@ static int pcnet32_open(struct net_device *dev)
         }
 #endif
 
-        lp->init_block.mode =
+        lp->init_block->mode =
             le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
         pcnet32_load_multicast(dev);
 
@@ -2284,12 +2278,8 @@ static int pcnet32_open(struct net_device *dev)
         }
 
         /* Re-initialize the PCNET32, and start it when done. */
-        lp->a.write_csr(ioaddr, 1, (lp->dma_addr +
-                                    offsetof(struct pcnet32_private,
-                                             init_block)) & 0xffff);
-        lp->a.write_csr(ioaddr, 2,
-                        (lp->dma_addr +
-                         offsetof(struct pcnet32_private, init_block)) >> 16);
+        lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
+        lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
 
         lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
         lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
@@ -2316,8 +2306,7 @@ static int pcnet32_open(struct net_device *dev)
                 printk(KERN_DEBUG
                        "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n",
                        dev->name, i,
-                       (u32) (lp->dma_addr +
-                              offsetof(struct pcnet32_private, init_block)),
+                       (u32) (lp->init_dma_addr),
                        lp->a.read_csr(ioaddr, CSR0));
 
         spin_unlock_irqrestore(&lp->lock, flags);
@@ -2355,7 +2344,7 @@ static int pcnet32_open(struct net_device *dev)
 
 static void pcnet32_purge_tx_ring(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int i;
 
         for (i = 0; i < lp->tx_ring_size; i++) {
@@ -2375,7 +2364,7 @@ static void pcnet32_purge_tx_ring(struct net_device *dev)
 /* Initialize the PCNET32 Rx and Tx rings. */
 static int pcnet32_init_ring(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int i;
 
         lp->tx_full = 0;
@@ -2417,12 +2406,12 @@ static int pcnet32_init_ring(struct net_device *dev)
                 lp->tx_dma_addr[i] = 0;
         }
 
-        lp->init_block.tlen_rlen =
+        lp->init_block->tlen_rlen =
             le16_to_cpu(lp->tx_len_bits | lp->rx_len_bits);
         for (i = 0; i < 6; i++)
-                lp->init_block.phys_addr[i] = dev->dev_addr[i];
-        lp->init_block.rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
-        lp->init_block.tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
+                lp->init_block->phys_addr[i] = dev->dev_addr[i];
+        lp->init_block->rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
+        lp->init_block->tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
         wmb();                  /* Make sure all changes are visible */
         return 0;
 }
@@ -2433,7 +2422,7 @@ static int pcnet32_init_ring(struct net_device *dev)
  */
 static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         int i;
 
@@ -2463,7 +2452,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
 
 static void pcnet32_tx_timeout(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr, flags;
 
         spin_lock_irqsave(&lp->lock, flags);
@@ -2504,7 +2493,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)
 
 static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         u16 status;
         int entry;
@@ -2569,7 +2558,7 @@ pcnet32_interrupt(int irq, void *dev_id)
         int boguscnt = max_interrupt_work;
 
         ioaddr = dev->base_addr;
-        lp = dev->priv;
+        lp = netdev_priv(dev);
 
         spin_lock(&lp->lock);
 
@@ -2651,7 +2640,7 @@ pcnet32_interrupt(int irq, void *dev_id)
 static int pcnet32_close(struct net_device *dev)
 {
         unsigned long ioaddr = dev->base_addr;
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long flags;
 
         del_timer_sync(&lp->watchdog_timer);
@@ -2692,7 +2681,7 @@ static int pcnet32_close(struct net_device *dev)
 
 static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         unsigned long flags;
 
@@ -2706,8 +2695,8 @@ static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
 /* taken from the sunlance driver, which it took from the depca driver */
 static void pcnet32_load_multicast(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
-        volatile struct pcnet32_init_block *ib = &lp->init_block;
+        struct pcnet32_private *lp = netdev_priv(dev);
+        volatile struct pcnet32_init_block *ib = lp->init_block;
         volatile u16 *mcast_table = (u16 *) & ib->filter;
         struct dev_mc_list *dmi = dev->mc_list;
         unsigned long ioaddr = dev->base_addr;
@@ -2756,7 +2745,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
 static void pcnet32_set_multicast_list(struct net_device *dev)
 {
         unsigned long ioaddr = dev->base_addr, flags;
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int csr15, suspended;
 
         spin_lock_irqsave(&lp->lock, flags);
@@ -2767,12 +2756,12 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
                 if (netif_msg_hw(lp))
                         printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
                                dev->name);
-                lp->init_block.mode =
+                lp->init_block->mode =
                     le16_to_cpu(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
                                 7);
                 lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
         } else {
-                lp->init_block.mode =
+                lp->init_block->mode =
                     le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
                 lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
                 pcnet32_load_multicast(dev);
@@ -2795,7 +2784,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
 /* This routine assumes that the lp->lock is held */
 static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         u16 val_out;
 
@@ -2811,7 +2800,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
 /* This routine assumes that the lp->lock is held */
 static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
 
         if (!lp->mii)
@@ -2823,7 +2812,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
 
 static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int rc;
         unsigned long flags;
 
@@ -2841,7 +2830,7 @@ static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 static int pcnet32_check_otherphy(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         struct mii_if_info mii = lp->mii_if;
         u16 bmcr;
         int i;
@@ -2888,7 +2877,7 @@ static int pcnet32_check_otherphy(struct net_device *dev)
 
 static void pcnet32_check_media(struct net_device *dev, int verbose)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         int curr_link;
         int prev_link = netif_carrier_ok(dev) ? 1 : 0;
         u32 bcr9;
@@ -2944,7 +2933,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
 
 static void pcnet32_watchdog(struct net_device *dev)
 {
-        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_private *lp = netdev_priv(dev);
         unsigned long flags;
 
         /* Print the link status if it has changed */
@@ -2960,12 +2949,13 @@ static void __devexit pcnet32_remove_one(struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
 
         if (dev) {
-                struct pcnet32_private *lp = dev->priv;
+                struct pcnet32_private *lp = netdev_priv(dev);
 
                 unregister_netdev(dev);
                 pcnet32_free_ring(dev);
                 release_region(dev->base_addr, PCNET32_TOTAL_SIZE);
-                pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
+                pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), 
+                                    lp->init_block, lp->init_dma_addr);
                 free_netdev(dev);
                 pci_disable_device(pdev);
                 pci_set_drvdata(pdev, NULL);
@@ -3040,12 +3030,13 @@ static void __exit pcnet32_cleanup_module(void)
         struct net_device *next_dev;
 
         while (pcnet32_dev) {
-                struct pcnet32_private *lp = pcnet32_dev->priv;
+                struct pcnet32_private *lp = netdev_priv(pcnet32_dev);
                 next_dev = lp->next;
                 unregister_netdev(pcnet32_dev);
                 pcnet32_free_ring(pcnet32_dev);
                 release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE);
-                pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
+                pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), 
+                                    lp->init_block, lp->init_dma_addr);
                 free_netdev(pcnet32_dev);
                 pcnet32_dev = next_dev;
         }
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index b31ce278bf35..fc4aee96cdfd 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -35,10 +35,14 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-/* mdiobus_register 
+/**
+ * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
+ * @bus: target mii_bus
  *
- * description: Called by a bus driver to bring up all the PHYs
- *   on a given bus, and attach them to the bus
+ * Description: Called by a bus driver to bring up all the PHYs
+ *   on a given bus, and attach them to the bus.
+ *
+ * Returns 0 on success or < 0 on error.
  */
 int mdiobus_register(struct mii_bus *bus)
 {
@@ -114,10 +118,13 @@ void mdiobus_unregister(struct mii_bus *bus)
 }
 EXPORT_SYMBOL(mdiobus_unregister);
 
-/* mdio_bus_match
+/**
+ * mdio_bus_match - determine if given PHY driver supports the given PHY device
+ * @dev: target PHY device
+ * @drv: given PHY driver
  *
- * description: Given a PHY device, and a PHY driver, return 1 if
- *   the driver supports the device.  Otherwise, return 0
+ * Description: Given a PHY device, and a PHY driver, return 1 if
+ *   the driver supports the device.  Otherwise, return 0.
  */
 static int mdio_bus_match(struct device *dev, struct device_driver *drv)
 {
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index c94a1fb3a4be..eed433d6056a 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -39,7 +39,9 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-/* Convenience function to print out the current phy status
+/**
+ * phy_print_status - Convenience function to print out the current phy status
+ * @phydev: the phy_device struct
  */
 void phy_print_status(struct phy_device *phydev)
 {
@@ -55,10 +57,15 @@ void phy_print_status(struct phy_device *phydev)
 EXPORT_SYMBOL(phy_print_status);
 
 
-/* Convenience functions for reading/writing a given PHY
- * register. They MUST NOT be called from interrupt context,
+/**
+ * phy_read - Convenience function for reading a given PHY register
+ * @phydev: the phy_device struct
+ * @regnum: register number to read
+ *
+ * NOTE: MUST NOT be called from interrupt context,
  * because the bus read/write functions may wait for an interrupt
- * to conclude the operation. */
+ * to conclude the operation.
+ */
 int phy_read(struct phy_device *phydev, u16 regnum)
 {
         int retval;
@@ -72,6 +79,16 @@ int phy_read(struct phy_device *phydev, u16 regnum)
 }
 EXPORT_SYMBOL(phy_read);
 
+/**
+ * phy_write - Convenience function for writing a given PHY register
+ * @phydev: the phy_device struct
+ * @regnum: register number to write
+ * @val: value to write to @regnum
+ *
+ * NOTE: MUST NOT be called from interrupt context,
+ * because the bus read/write functions may wait for an interrupt
+ * to conclude the operation.
+ */
 int phy_write(struct phy_device *phydev, u16 regnum, u16 val)
 {
         int err;
@@ -85,7 +102,15 @@ int phy_write(struct phy_device *phydev, u16 regnum, u16 val)
 }
 EXPORT_SYMBOL(phy_write);
 
-
+/**
+ * phy_clear_interrupt - Ack the phy device's interrupt
+ * @phydev: the phy_device struct
+ *
+ * If the @phydev driver has an ack_interrupt function, call it to
+ * ack and clear the phy device's interrupt.
+ *
+ * Returns 0 on success on < 0 on error.
+ */
 int phy_clear_interrupt(struct phy_device *phydev)
 {
         int err = 0;
@@ -96,7 +121,13 @@ int phy_clear_interrupt(struct phy_device *phydev)
         return err;
 }
 
-
+/**
+ * phy_config_interrupt - configure the PHY device for the requested interrupts
+ * @phydev: the phy_device struct
+ * @interrupts: interrupt flags to configure for this @phydev
+ *
+ * Returns 0 on success on < 0 on error.
+ */
 int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)
 {
         int err = 0;
@@ -109,9 +140,11 @@ int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)
 }
 
 
-/* phy_aneg_done
+/**
+ * phy_aneg_done - return auto-negotiation status
+ * @phydev: target phy_device struct
  *
- * description: Reads the status register and returns 0 either if
+ * Description: Reads the status register and returns 0 either if
  *   auto-negotiation is incomplete, or if there was an error.
  *   Returns BMSR_ANEGCOMPLETE if auto-negotiation is done.
  */
@@ -173,9 +206,12 @@ static const struct phy_setting settings[] = {
 
 #define MAX_NUM_SETTINGS (sizeof(settings)/sizeof(struct phy_setting))
 
-/* phy_find_setting
+/**
+ * phy_find_setting - find a PHY settings array entry that matches speed & duplex
+ * @speed: speed to match
+ * @duplex: duplex to match
  *
- * description: Searches the settings array for the setting which
+ * Description: Searches the settings array for the setting which
  *   matches the desired speed and duplex, and returns the index
  *   of that setting.  Returns the index of the last setting if
  *   none of the others match.
@@ -192,11 +228,12 @@ static inline int phy_find_setting(int speed, int duplex)
         return idx < MAX_NUM_SETTINGS ? idx : MAX_NUM_SETTINGS - 1;
 }
 
-/* phy_find_valid
- * idx: The first index in settings[] to search
- * features: A mask of the valid settings
+/**
+ * phy_find_valid - find a PHY setting that matches the requested features mask
+ * @idx: The first index in settings[] to search
+ * @features: A mask of the valid settings
  *
- * description: Returns the index of the first valid setting less
+ * Description: Returns the index of the first valid setting less
  *   than or equal to the one pointed to by idx, as determined by
  *   the mask in features.  Returns the index of the last setting
  *   if nothing else matches.
@@ -209,11 +246,13 @@ static inline int phy_find_valid(int idx, u32 features)
         return idx < MAX_NUM_SETTINGS ? idx : MAX_NUM_SETTINGS - 1;
 }
 
-/* phy_sanitize_settings
+/**
+ * phy_sanitize_settings - make sure the PHY is set to supported speed and duplex
+ * @phydev: the target phy_device struct
  *
- * description: Make sure the PHY is set to supported speeds and
+ * Description: Make sure the PHY is set to supported speeds and
  *   duplexes.  Drop down by one in this order:  1000/FULL,
- *   1000/HALF, 100/FULL, 100/HALF, 10/FULL, 10/HALF
+ *   1000/HALF, 100/FULL, 100/HALF, 10/FULL, 10/HALF.
  */
 void phy_sanitize_settings(struct phy_device *phydev)
 {
@@ -232,16 +271,17 @@ void phy_sanitize_settings(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_sanitize_settings);
 
-/* phy_ethtool_sset:
- * A generic ethtool sset function.  Handles all the details
+/**
+ * phy_ethtool_sset - generic ethtool sset function, handles all the details
+ * @phydev: target phy_device struct
+ * @cmd: ethtool_cmd
  *
  * A few notes about parameter checking:
  * - We don't set port or transceiver, so we don't care what they
  *   were set to.
  * - phy_start_aneg() will make sure forced settings are sane, and
  *   choose the next best ones from the ones selected, so we don't
- *   care if ethtool tries to give us bad values
- *
+ *   care if ethtool tries to give us bad values.
  */
 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)
 {
@@ -304,9 +344,15 @@ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd)
 }
 EXPORT_SYMBOL(phy_ethtool_gset);
 
-/* Note that this function is currently incompatible with the
+/**
+ * phy_mii_ioctl - generic PHY MII ioctl interface
+ * @phydev: the phy_device struct
+ * @mii_data: MII ioctl data
+ * @cmd: ioctl cmd to execute
+ *
+ * Note that this function is currently incompatible with the
  * PHYCONTROL layer.  It changes registers without regard to
- * current state.  Use at own risk
+ * current state.  Use at own risk.
  */
 int phy_mii_ioctl(struct phy_device *phydev,
                 struct mii_ioctl_data *mii_data, int cmd)
@@ -336,6 +382,12 @@ int phy_mii_ioctl(struct phy_device *phydev,
                                         phydev->duplex = DUPLEX_FULL;
                                 else
                                         phydev->duplex = DUPLEX_HALF;
+                                if ((!phydev->autoneg) &&
+                                                (val & BMCR_SPEED1000))
+                                        phydev->speed = SPEED_1000;
+                                else if ((!phydev->autoneg) &&
+                                                (val & BMCR_SPEED100))
+                                        phydev->speed = SPEED_100;
                                 break;
                         case MII_ADVERTISE:
                                 phydev->advertising = val;
@@ -358,13 +410,14 @@ int phy_mii_ioctl(struct phy_device *phydev,
         return 0;
 }
 
-/* phy_start_aneg
+/**
+ * phy_start_aneg - start auto-negotiation for this PHY device
+ * @phydev: the phy_device struct
  *
- * description: Sanitizes the settings (if we're not
- *   autonegotiating them), and then calls the driver's
- *   config_aneg function.  If the PHYCONTROL Layer is operating,
- *   we change the state to reflect the beginning of
- *   Auto-negotiation or forcing.
+ * Description: Sanitizes the settings (if we're not autonegotiating
+ *   them), and then calls the driver's config_aneg function.
+ *   If the PHYCONTROL Layer is operating, we change the state to
+ *   reflect the beginning of Auto-negotiation or forcing.
  */
 int phy_start_aneg(struct phy_device *phydev)
 {
@@ -400,15 +453,19 @@ EXPORT_SYMBOL(phy_start_aneg);
 static void phy_change(struct work_struct *work);
 static void phy_timer(unsigned long data);
 
-/* phy_start_machine:
+/**
+ * phy_start_machine - start PHY state machine tracking
+ * @phydev: the phy_device struct
+ * @handler: callback function for state change notifications
  *
- * description: The PHY infrastructure can run a state machine
+ * Description: The PHY infrastructure can run a state machine
  *   which tracks whether the PHY is starting up, negotiating,
  *   etc.  This function starts the timer which tracks the state
- *   of the PHY.  If you want to be notified when the state
- *   changes, pass in the callback, otherwise, pass NULL.  If you
+ *   of the PHY.  If you want to be notified when the state changes,
+ *   pass in the callback @handler, otherwise, pass NULL.  If you
  *   want to maintain your own state machine, do not call this
- *   function. */
+ *   function.
+ */
 void phy_start_machine(struct phy_device *phydev,
                 void (*handler)(struct net_device *))
 {
@@ -420,9 +477,11 @@ void phy_start_machine(struct phy_device *phydev,
         mod_timer(&phydev->phy_timer, jiffies + HZ);
 }
 
-/* phy_stop_machine
+/**
+ * phy_stop_machine - stop the PHY state machine tracking
+ * @phydev: target phy_device struct
  *
- * description: Stops the state machine timer, sets the state to UP
+ * Description: Stops the state machine timer, sets the state to UP
  *   (unless it wasn't up yet). This function must be called BEFORE
  *   phy_detach.
  */
@@ -438,12 +497,14 @@ void phy_stop_machine(struct phy_device *phydev)
         phydev->adjust_state = NULL;
 }
 
-/* phy_force_reduction
+/**
+ * phy_force_reduction - reduce PHY speed/duplex settings by one step
+ * @phydev: target phy_device struct
  *
- * description: Reduces the speed/duplex settings by
- *   one notch.  The order is so:
- *   1000/FULL, 1000/HALF, 100/FULL, 100/HALF,
- *   10/FULL, 10/HALF.  The function bottoms out at 10/HALF.
+ * Description: Reduces the speed/duplex settings by one notch,
+ *   in this order--
+ *   1000/FULL, 1000/HALF, 100/FULL, 100/HALF, 10/FULL, 10/HALF.
+ *   The function bottoms out at 10/HALF.
  */
 static void phy_force_reduction(struct phy_device *phydev)
 {
@@ -464,7 +525,9 @@ static void phy_force_reduction(struct phy_device *phydev)
 }
 
 
-/* phy_error:
+/**
+ * phy_error - enter HALTED state for this PHY device
+ * @phydev: target phy_device struct
  *
  * Moves the PHY to the HALTED state in response to a read
  * or write error, and tells the controller the link is down.
@@ -478,9 +541,12 @@ void phy_error(struct phy_device *phydev)
         spin_unlock(&phydev->lock);
 }
 
-/* phy_interrupt
+/**
+ * phy_interrupt - PHY interrupt handler
+ * @irq: interrupt line
+ * @phy_dat: phy_device pointer
  *
- * description: When a PHY interrupt occurs, the handler disables
+ * Description: When a PHY interrupt occurs, the handler disables
  * interrupts, and schedules a work task to clear the interrupt.
  */
 static irqreturn_t phy_interrupt(int irq, void *phy_dat)
@@ -501,7 +567,10 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat)
         return IRQ_HANDLED;
 }
 
-/* Enable the interrupts from the PHY side */
+/**
+ * phy_enable_interrupts - Enable the interrupts from the PHY side
+ * @phydev: target phy_device struct
+ */
 int phy_enable_interrupts(struct phy_device *phydev)
 {
         int err;
@@ -517,7 +586,10 @@ int phy_enable_interrupts(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_enable_interrupts);
 
-/* Disable the PHY interrupts from the PHY side */
+/**
+ * phy_disable_interrupts - Disable the PHY interrupts from the PHY side
+ * @phydev: target phy_device struct
+ */
 int phy_disable_interrupts(struct phy_device *phydev)
 {
         int err;
@@ -543,13 +615,15 @@ phy_err:
 }
 EXPORT_SYMBOL(phy_disable_interrupts);
 
-/* phy_start_interrupts
+/**
+ * phy_start_interrupts - request and enable interrupts for a PHY device
+ * @phydev: target phy_device struct
  *
- * description: Request the interrupt for the given PHY.  If
- *   this fails, then we set irq to PHY_POLL.
+ * Description: Request the interrupt for the given PHY.
+ *   If this fails, then we set irq to PHY_POLL.
  *   Otherwise, we enable the interrupts in the PHY.
- *   Returns 0 on success.
  *   This should only be called with a valid IRQ number.
+ *   Returns 0 on success or < 0 on error.
  */
 int phy_start_interrupts(struct phy_device *phydev)
 {
@@ -574,6 +648,10 @@ int phy_start_interrupts(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_start_interrupts);
 
+/**
+ * phy_stop_interrupts - disable interrupts from a PHY device
+ * @phydev: target phy_device struct
+ */
 int phy_stop_interrupts(struct phy_device *phydev)
 {
         int err;
@@ -596,7 +674,10 @@ int phy_stop_interrupts(struct phy_device *phydev)
 EXPORT_SYMBOL(phy_stop_interrupts);
 
 
-/* Scheduled by the phy_interrupt/timer to handle PHY changes */
+/**
+ * phy_change - Scheduled by the phy_interrupt/timer to handle PHY changes
+ * @work: work_struct that describes the work to be done
+ */
 static void phy_change(struct work_struct *work)
 {
         int err;
@@ -630,7 +711,10 @@ phy_err:
         phy_error(phydev);
 }
 
-/* Bring down the PHY link, and stop checking the status. */
+/**
+ * phy_stop - Bring down the PHY link, and stop checking the status
+ * @phydev: target phy_device struct
+ */
 void phy_stop(struct phy_device *phydev)
 {
         spin_lock(&phydev->lock);
@@ -659,9 +743,11 @@ out_unlock:
 }
 
 
-/* phy_start
+/**
+ * phy_start - start or restart a PHY device
+ * @phydev: target phy_device struct
  *
- * description: Indicates the attached device's readiness to
+ * Description: Indicates the attached device's readiness to
  *   handle PHY-related work.  Used during startup to start the
  *   PHY, and after a call to phy_stop() to resume operation.
  *   Also used to indicate the MDIO bus has cleared an error
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 8f01952c4850..a8b74cdab1ea 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -74,11 +74,13 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
 }
 EXPORT_SYMBOL(phy_device_create);
 
-/* get_phy_device
+/**
+ * get_phy_device - reads the specified PHY device and returns its @phy_device struct
+ * @bus: the target MII bus
+ * @addr: PHY address on the MII bus
  *
- * description: Reads the ID registers of the PHY at addr on the
- *   bus, then allocates and returns the phy_device to
- *   represent it.
+ * Description: Reads the ID registers of the PHY at @addr on the
+ *   @bus, then allocates and returns the phy_device to represent it.
  */
 struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
 {
@@ -112,23 +114,33 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
         return dev;
 }
 
-/* phy_prepare_link:
+/**
+ * phy_prepare_link - prepares the PHY layer to monitor link status
+ * @phydev: target phy_device struct
+ * @handler: callback function for link status change notifications
  *
- * description: Tells the PHY infrastructure to handle the
+ * Description: Tells the PHY infrastructure to handle the
  *   gory details on monitoring link status (whether through
  *   polling or an interrupt), and to call back to the
  *   connected device driver when the link status changes.
  *   If you want to monitor your own link state, don't call
- *   this function */
+ *   this function.
+ */
 void phy_prepare_link(struct phy_device *phydev,
                 void (*handler)(struct net_device *))
 {
         phydev->adjust_link = handler;
 }
 
-/* phy_connect:
+/**
+ * phy_connect - connect an ethernet device to a PHY device
+ * @dev: the network device to connect
+ * @phy_id: the PHY device to connect
+ * @handler: callback function for state change notifications
+ * @flags: PHY device's dev_flags
+ * @interface: PHY device's interface
  *
- * description: Convenience function for connecting ethernet
+ * Description: Convenience function for connecting ethernet
  *   devices to PHY devices.  The default behavior is for
  *   the PHY infrastructure to handle everything, and only notify
  *   the connected driver when the link status changes.  If you
@@ -158,6 +170,10 @@ struct phy_device * phy_connect(struct net_device *dev, const char *phy_id,
 }
 EXPORT_SYMBOL(phy_connect);
 
+/**
+ * phy_disconnect - disable interrupts, stop state machine, and detach a PHY device
+ * @phydev: target phy_device struct
+ */
 void phy_disconnect(struct phy_device *phydev)
 {
         if (phydev->irq > 0)
@@ -171,21 +187,25 @@ void phy_disconnect(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_disconnect);
 
-/* phy_attach:
+static int phy_compare_id(struct device *dev, void *data)
+{
+        return strcmp((char *)data, dev->bus_id) ? 0 : 1;
+}
+
+/**
+ * phy_attach - attach a network device to a particular PHY device
+ * @dev: network device to attach
+ * @phy_id: PHY device to attach
+ * @flags: PHY device's dev_flags
+ * @interface: PHY device's interface
  *
- *   description: Called by drivers to attach to a particular PHY
+ * Description: Called by drivers to attach to a particular PHY
  *     device. The phy_device is found, and properly hooked up
  *     to the phy_driver.  If no driver is attached, then the
  *     genphy_driver is used.  The phy_device is given a ptr to
  *     the attaching device, and given a callback for link status
- *     change.  The phy_device is returned to the attaching
- *     driver.
+ *     change.  The phy_device is returned to the attaching driver.
  */
-static int phy_compare_id(struct device *dev, void *data)
-{
-        return strcmp((char *)data, dev->bus_id) ? 0 : 1;
-}
-
 struct phy_device *phy_attach(struct net_device *dev,
                 const char *phy_id, u32 flags, phy_interface_t interface)
 {
@@ -246,6 +266,10 @@ struct phy_device *phy_attach(struct net_device *dev,
 }
 EXPORT_SYMBOL(phy_attach);
 
+/**
+ * phy_detach - detach a PHY device from its network device
+ * @phydev: target phy_device struct
+ */
 void phy_detach(struct phy_device *phydev)
 {
         phydev->attached_dev = NULL;
@@ -262,11 +286,13 @@ EXPORT_SYMBOL(phy_detach);
 
 /* Generic PHY support and helper functions */
 
-/* genphy_config_advert
+/**
+ * genphy_config_advert - sanitize and advertise auto-negotation parameters
+ * @phydev: target phy_device struct
  *
- * description: Writes MII_ADVERTISE with the appropriate values,
+ * Description: Writes MII_ADVERTISE with the appropriate values,
  *   after sanitizing the values to make sure we only advertise
- *   what is supported
+ *   what is supported.
  */
 int genphy_config_advert(struct phy_device *phydev)
 {
@@ -328,11 +354,14 @@ int genphy_config_advert(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(genphy_config_advert);
 
-/* genphy_setup_forced
+/**
+ * genphy_setup_forced - configures/forces speed/duplex from @phydev
+ * @phydev: target phy_device struct
  *
- * description: Configures MII_BMCR to force speed/duplex
+ * Description: Configures MII_BMCR to force speed/duplex
  *   to the values in phydev. Assumes that the values are valid.
- *   Please see phy_sanitize_settings() */
+ *   Please see phy_sanitize_settings().
+ */
 int genphy_setup_forced(struct phy_device *phydev)
 {
         int ctl = BMCR_RESET;
@@ -361,7 +390,10 @@ int genphy_setup_forced(struct phy_device *phydev)
 }
 
 
-/* Enable and Restart Autonegotiation */
+/**
+ * genphy_restart_aneg - Enable and Restart Autonegotiation
+ * @phydev: target phy_device struct
+ */
 int genphy_restart_aneg(struct phy_device *phydev)
 {
         int ctl;
@@ -382,11 +414,13 @@ int genphy_restart_aneg(struct phy_device *phydev)
 }
 
 
-/* genphy_config_aneg
+/**
+ * genphy_config_aneg - restart auto-negotiation or write BMCR
+ * @phydev: target phy_device struct
  *
- * description: If auto-negotiation is enabled, we configure the
+ * Description: If auto-negotiation is enabled, we configure the
  *   advertising, and then restart auto-negotiation.  If it is not
- *   enabled, then we write the BMCR
+ *   enabled, then we write the BMCR.
  */
 int genphy_config_aneg(struct phy_device *phydev)
 {
@@ -406,11 +440,13 @@ int genphy_config_aneg(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(genphy_config_aneg);
 
-/* genphy_update_link
+/**
+ * genphy_update_link - update link status in @phydev
+ * @phydev: target phy_device struct
  *
- * description: Update the value in phydev->link to reflect the
+ * Description: Update the value in phydev->link to reflect the
  *   current link value.  In order to do this, we need to read
- *   the status register twice, keeping the second value
+ *   the status register twice, keeping the second value.
  */
 int genphy_update_link(struct phy_device *phydev)
 {
@@ -437,9 +473,11 @@ int genphy_update_link(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(genphy_update_link);
 
-/* genphy_read_status
+/**
+ * genphy_read_status - check the link status and update current link state
+ * @phydev: target phy_device struct
  *
- * description: Check the link, then figure out the current state
+ * Description: Check the link, then figure out the current state
  *   by comparing what we advertise with what the link partner
  *   advertises.  Start by checking the gigabit possibilities,
  *   then move on to 10/100.
@@ -579,9 +617,11 @@ static int genphy_config_init(struct phy_device *phydev)
 }
 
 
-/* phy_probe
+/**
+ * phy_probe - probe and init a PHY device
+ * @dev: device to probe and init
  *
- * description: Take care of setting up the phy_device structure,
+ * Description: Take care of setting up the phy_device structure,
  *   set the state to READY (the driver's init function should
  *   set it to STARTING if needed).
  */
@@ -643,6 +683,10 @@ static int phy_remove(struct device *dev)
         return 0;
 }
 
+/**
+ * phy_driver_register - register a phy_driver with the PHY layer
+ * @new_driver: new phy_driver to register
+ */
 int phy_driver_register(struct phy_driver *new_driver)
 {
         int retval;
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 7b80fb7a9d9b..d8766c0e8255 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -39,7 +39,7 @@
 
 #define DRV_NAME        "qla3xxx"
 #define DRV_STRING      "QLogic ISP3XXX Network Driver"
-#define DRV_VERSION     "v2.03.00-k3"
+#define DRV_VERSION     "v2.03.00-k4"
 #define PFX             DRV_NAME " "
 
 static const char ql3xxx_driver_name[] = DRV_NAME;
@@ -72,6 +72,30 @@ static struct pci_device_id ql3xxx_pci_tbl[] __devinitdata = {
 MODULE_DEVICE_TABLE(pci, ql3xxx_pci_tbl);
 
 /*
+ *  These are the known PHY's which are used
+ */
+typedef enum {
+   PHY_TYPE_UNKNOWN   = 0,
+   PHY_VITESSE_VSC8211,
+   PHY_AGERE_ET1011C,
+   MAX_PHY_DEV_TYPES
+} PHY_DEVICE_et;
+
+typedef struct {
+        PHY_DEVICE_et phyDevice; 
+        u32             phyIdOUI;
+        u16             phyIdModel;
+        char            *name;
+} PHY_DEVICE_INFO_t;
+
+static const PHY_DEVICE_INFO_t PHY_DEVICES[] =
+        {{PHY_TYPE_UNKNOWN,    0x000000, 0x0, "PHY_TYPE_UNKNOWN"},
+         {PHY_VITESSE_VSC8211, 0x0003f1, 0xb, "PHY_VITESSE_VSC8211"},
+         {PHY_AGERE_ET1011C,   0x00a0bc, 0x1, "PHY_AGERE_ET1011C"},
+};
+
+
+/*
  * Caller must take hw_lock.
  */
 static int ql_sem_spinlock(struct ql3_adapter *qdev,
@@ -662,7 +686,7 @@ static u8 ql_mii_disable_scan_mode(struct ql3_adapter *qdev)
 }
 
 static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
-                               u16 regAddr, u16 value, u32 mac_index)
+                               u16 regAddr, u16 value, u32 phyAddr)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
@@ -680,7 +704,7 @@ static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
         }
 
         ql_write_page0_reg(qdev, &port_regs->macMIIMgmtAddrReg,
-                           PHYAddr[mac_index] | regAddr);
+                           phyAddr | regAddr);
 
         ql_write_page0_reg(qdev, &port_regs->macMIIMgmtDataReg, value);
 
@@ -701,7 +725,7 @@ static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
 }
 
 static int ql_mii_read_reg_ex(struct ql3_adapter *qdev, u16 regAddr,
-                              u16 * value, u32 mac_index)
+                              u16 * value, u32 phyAddr)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
@@ -720,7 +744,7 @@ static int ql_mii_read_reg_ex(struct ql3_adapter *qdev, u16 regAddr,
         }
 
         ql_write_page0_reg(qdev, &port_regs->macMIIMgmtAddrReg,
-                           PHYAddr[mac_index] | regAddr);
+                           phyAddr | regAddr);
 
         ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg,
                            (MAC_MII_CONTROL_RC << 16));
@@ -850,28 +874,31 @@ static void ql_petbi_start_neg(struct ql3_adapter *qdev)
 
 }
 
-static void ql_petbi_reset_ex(struct ql3_adapter *qdev, u32 mac_index)
+static void ql_petbi_reset_ex(struct ql3_adapter *qdev)
 {
         ql_mii_write_reg_ex(qdev, PETBI_CONTROL_REG, PETBI_CTRL_SOFT_RESET,
-                            mac_index);
+                            PHYAddr[qdev->mac_index]);
 }
 
-static void ql_petbi_start_neg_ex(struct ql3_adapter *qdev, u32 mac_index)
+static void ql_petbi_start_neg_ex(struct ql3_adapter *qdev)
 {
         u16 reg;
 
         /* Enable Auto-negotiation sense */
-        ql_mii_read_reg_ex(qdev, PETBI_TBI_CTRL, &reg, mac_index);
+        ql_mii_read_reg_ex(qdev, PETBI_TBI_CTRL, &reg, 
+                           PHYAddr[qdev->mac_index]);
         reg |= PETBI_TBI_AUTO_SENSE;
-        ql_mii_write_reg_ex(qdev, PETBI_TBI_CTRL, reg, mac_index);
+        ql_mii_write_reg_ex(qdev, PETBI_TBI_CTRL, reg, 
+                            PHYAddr[qdev->mac_index]);
 
         ql_mii_write_reg_ex(qdev, PETBI_NEG_ADVER,
-                            PETBI_NEG_PAUSE | PETBI_NEG_DUPLEX, mac_index);
+                            PETBI_NEG_PAUSE | PETBI_NEG_DUPLEX, 
+                            PHYAddr[qdev->mac_index]);
 
         ql_mii_write_reg_ex(qdev, PETBI_CONTROL_REG,
                             PETBI_CTRL_AUTO_NEG | PETBI_CTRL_RESTART_NEG |
                             PETBI_CTRL_FULL_DUPLEX | PETBI_CTRL_SPEED_1000,
-                            mac_index);
+                            PHYAddr[qdev->mac_index]);
 }
 
 static void ql_petbi_init(struct ql3_adapter *qdev)
@@ -880,10 +907,10 @@ static void ql_petbi_init(struct ql3_adapter *qdev)
         ql_petbi_start_neg(qdev);
 }
 
-static void ql_petbi_init_ex(struct ql3_adapter *qdev, u32 mac_index)
+static void ql_petbi_init_ex(struct ql3_adapter *qdev)
 {
-        ql_petbi_reset_ex(qdev, mac_index);
-        ql_petbi_start_neg_ex(qdev, mac_index);
+        ql_petbi_reset_ex(qdev);
+        ql_petbi_start_neg_ex(qdev);
 }
 
 static int ql_is_petbi_neg_pause(struct ql3_adapter *qdev)
@@ -896,33 +923,128 @@ static int ql_is_petbi_neg_pause(struct ql3_adapter *qdev)
         return (reg & PETBI_NEG_PAUSE_MASK) == PETBI_NEG_PAUSE;
 }
 
+static void phyAgereSpecificInit(struct ql3_adapter *qdev, u32 miiAddr)
+{
+        printk(KERN_INFO "%s: enabling Agere specific PHY\n", qdev->ndev->name);
+        /* power down device bit 11 = 1 */
+        ql_mii_write_reg_ex(qdev, 0x00, 0x1940, miiAddr);
+        /* enable diagnostic mode bit 2 = 1 */
+        ql_mii_write_reg_ex(qdev, 0x12, 0x840e, miiAddr);
+        /* 1000MB amplitude adjust (see Agere errata) */
+        ql_mii_write_reg_ex(qdev, 0x10, 0x8805, miiAddr);
+        /* 1000MB amplitude adjust (see Agere errata) */
+        ql_mii_write_reg_ex(qdev, 0x11, 0xf03e, miiAddr);
+        /* 100MB amplitude adjust (see Agere errata) */
+        ql_mii_write_reg_ex(qdev, 0x10, 0x8806, miiAddr);
+        /* 100MB amplitude adjust (see Agere errata) */
+        ql_mii_write_reg_ex(qdev, 0x11, 0x003e, miiAddr);
+        /* 10MB amplitude adjust (see Agere errata) */
+        ql_mii_write_reg_ex(qdev, 0x10, 0x8807, miiAddr);
+        /* 10MB amplitude adjust (see Agere errata) */
+        ql_mii_write_reg_ex(qdev, 0x11, 0x1f00, miiAddr);
+        /* point to hidden reg 0x2806 */
+        ql_mii_write_reg_ex(qdev, 0x10, 0x2806, miiAddr);
+        /* Write new PHYAD w/bit 5 set */
+        ql_mii_write_reg_ex(qdev, 0x11, 0x0020 | (PHYAddr[qdev->mac_index] >> 8), miiAddr);
+        /* 
+         * Disable diagnostic mode bit 2 = 0
+         * Power up device bit 11 = 0
+         * Link up (on) and activity (blink)
+         */
+        ql_mii_write_reg(qdev, 0x12, 0x840a);
+        ql_mii_write_reg(qdev, 0x00, 0x1140);
+        ql_mii_write_reg(qdev, 0x1c, 0xfaf0);
+}
+
+static PHY_DEVICE_et getPhyType (struct ql3_adapter *qdev, 
+                                 u16 phyIdReg0, u16 phyIdReg1)
+{
+        PHY_DEVICE_et result = PHY_TYPE_UNKNOWN;
+        u32   oui;     
+        u16   model;
+        int i;   
+
+        if (phyIdReg0 == 0xffff) {
+                return result;
+        }
+   
+        if (phyIdReg1 == 0xffff) {
+                return result;
+        }
+
+        /* oui is split between two registers */
+        oui = (phyIdReg0 << 6) | ((phyIdReg1 & PHY_OUI_1_MASK) >> 10);
+
+        model = (phyIdReg1 & PHY_MODEL_MASK) >> 4;
+
+        /* Scan table for this PHY */
+        for(i = 0; i < MAX_PHY_DEV_TYPES; i++) {
+                if ((oui == PHY_DEVICES[i].phyIdOUI) && (model == PHY_DEVICES[i].phyIdModel))
+                {
+                        result = PHY_DEVICES[i].phyDevice;
+
+                        printk(KERN_INFO "%s: Phy: %s\n",
+                                qdev->ndev->name, PHY_DEVICES[i].name);
+                        
+                        break;
+                }
+        }
+
+        return result;
+}
+
 static int ql_phy_get_speed(struct ql3_adapter *qdev)
 {
         u16 reg;
 
+        switch(qdev->phyType) {
+        case PHY_AGERE_ET1011C:
+        {
+                if (ql_mii_read_reg(qdev, 0x1A, &reg) < 0)
+                        return 0;
+
+                reg = (reg >> 8) & 3;
+                break;
+        }
+        default:
         if (ql_mii_read_reg(qdev, AUX_CONTROL_STATUS, &reg) < 0)
                 return 0;
 
         reg = (((reg & 0x18) >> 3) & 3);
+        }
 
-        if (reg == 2)
+        switch(reg) {
+                case 2:
                 return SPEED_1000;
-        else if (reg == 1)
+                case 1:
                 return SPEED_100;
-        else if (reg == 0)
+                case 0:
                 return SPEED_10;
-        else
+                default:
                 return -1;
+        }
 }
 
 static int ql_is_full_dup(struct ql3_adapter *qdev)
 {
         u16 reg;
 
-        if (ql_mii_read_reg(qdev, AUX_CONTROL_STATUS, &reg) < 0)
-                return 0;
-
-        return (reg & PHY_AUX_DUPLEX_STAT) != 0;
+        switch(qdev->phyType) {
+        case PHY_AGERE_ET1011C:
+        {
+                if (ql_mii_read_reg(qdev, 0x1A, &reg))
+                        return 0;
+                        
+                return ((reg & 0x0080) && (reg & 0x1000)) != 0;
+        }
+        case PHY_VITESSE_VSC8211:
+        default:
+        {
+                if (ql_mii_read_reg(qdev, AUX_CONTROL_STATUS, &reg) < 0)
+                        return 0;
+                return (reg & PHY_AUX_DUPLEX_STAT) != 0;
+        }
+        }
 }
 
 static int ql_is_phy_neg_pause(struct ql3_adapter *qdev)
@@ -935,6 +1057,73 @@ static int ql_is_phy_neg_pause(struct ql3_adapter *qdev)
         return (reg & PHY_NEG_PAUSE) != 0;
 }
 
+static int PHY_Setup(struct ql3_adapter *qdev)
+{
+        u16   reg1;
+        u16   reg2;
+        bool  agereAddrChangeNeeded = false;
+        u32 miiAddr = 0;
+        int err;
+
+        /*  Determine the PHY we are using by reading the ID's */
+        err = ql_mii_read_reg(qdev, PHY_ID_0_REG, &reg1);
+        if(err != 0) {
+                printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG\n",
+                       qdev->ndev->name);
+                return err;
+        }
+
+        err = ql_mii_read_reg(qdev, PHY_ID_1_REG, &reg2);
+        if(err != 0) {
+                printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG\n",
+                       qdev->ndev->name);
+                return err;
+        }
+
+        /*  Check if we have a Agere PHY */
+        if ((reg1 == 0xffff) || (reg2 == 0xffff)) {
+
+                /* Determine which MII address we should be using 
+                   determined by the index of the card */
+                if (qdev->mac_index == 0) {
+                        miiAddr = MII_AGERE_ADDR_1;
+                } else {
+                        miiAddr = MII_AGERE_ADDR_2;
+                }
+      
+                err =ql_mii_read_reg_ex(qdev, PHY_ID_0_REG, &reg1, miiAddr);
+                if(err != 0) {
+                        printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG after Agere detected\n",
+                               qdev->ndev->name);
+                        return err; 
+                }
+
+                err = ql_mii_read_reg_ex(qdev, PHY_ID_1_REG, &reg2, miiAddr);
+                if(err != 0) {
+                        printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG after Agere detected\n",
+                               qdev->ndev->name);
+                        return err;
+                }
+   
+                /*  We need to remember to initialize the Agere PHY */
+                agereAddrChangeNeeded = true; 
+        }
+
+        /*  Determine the particular PHY we have on board to apply
+            PHY specific initializations */
+        qdev->phyType = getPhyType(qdev, reg1, reg2);
+
+        if ((qdev->phyType == PHY_AGERE_ET1011C) && agereAddrChangeNeeded) {
+                /* need this here so address gets changed */
+                phyAgereSpecificInit(qdev, miiAddr);  
+        } else if (qdev->phyType == PHY_TYPE_UNKNOWN) {
+                printk(KERN_ERR "%s: PHY is unknown\n", qdev->ndev->name);
+                return -EIO;
+        }
+
+        return 0;
+}
+
 /*
  * Caller holds hw_lock.
  */
@@ -1205,15 +1394,14 @@ static int ql_link_down_detect_clear(struct ql3_adapter *qdev)
 /*
  * Caller holds hw_lock.
  */
-static int ql_this_adapter_controls_port(struct ql3_adapter *qdev,
-                                         u32 mac_index)
+static int ql_this_adapter_controls_port(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
         u32 bitToCheck = 0;
         u32 temp;
 
-        switch (mac_index) {
+        switch (qdev->mac_index) {
         case 0:
                 bitToCheck = PORT_STATUS_F1_ENABLED;
                 break;
@@ -1238,27 +1426,96 @@ static int ql_this_adapter_controls_port(struct ql3_adapter *qdev,
         }
 }
 
-static void ql_phy_reset_ex(struct ql3_adapter *qdev, u32 mac_index)
+static void ql_phy_reset_ex(struct ql3_adapter *qdev)
 {
-        ql_mii_write_reg_ex(qdev, CONTROL_REG, PHY_CTRL_SOFT_RESET, mac_index);
+        ql_mii_write_reg_ex(qdev, CONTROL_REG, PHY_CTRL_SOFT_RESET, 
+                            PHYAddr[qdev->mac_index]);
 }
 
-static void ql_phy_start_neg_ex(struct ql3_adapter *qdev, u32 mac_index)
+static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
 {
         u16 reg;
+        u16 portConfiguration;
+
+        if(qdev->phyType == PHY_AGERE_ET1011C) {
+                /* turn off external loopback */
+                ql_mii_write_reg(qdev, 0x13, 0x0000); 
+        }
+
+        if(qdev->mac_index == 0)
+                portConfiguration = qdev->nvram_data.macCfg_port0.portConfiguration;
+        else
+                portConfiguration = qdev->nvram_data.macCfg_port1.portConfiguration;
+
+        /*  Some HBA's in the field are set to 0 and they need to
+            be reinterpreted with a default value */
+        if(portConfiguration == 0)
+                portConfiguration = PORT_CONFIG_DEFAULT;
+
+        /* Set the 1000 advertisements */
+        ql_mii_read_reg_ex(qdev, PHY_GIG_CONTROL, &reg, 
+                           PHYAddr[qdev->mac_index]);
+        reg &= ~PHY_GIG_ALL_PARAMS;
+
+        if(portConfiguration & 
+           PORT_CONFIG_FULL_DUPLEX_ENABLED &
+           PORT_CONFIG_1000MB_SPEED) {
+                reg |= PHY_GIG_ADV_1000F;
+        }
+         
+        if(portConfiguration & 
+           PORT_CONFIG_HALF_DUPLEX_ENABLED &
+           PORT_CONFIG_1000MB_SPEED) {
+                reg |= PHY_GIG_ADV_1000H;
+        }
 
-        ql_mii_write_reg_ex(qdev, PHY_NEG_ADVER,
-                            PHY_NEG_PAUSE | PHY_NEG_ADV_SPEED | 1, mac_index);
+        ql_mii_write_reg_ex(qdev, PHY_GIG_CONTROL, reg, 
+                            PHYAddr[qdev->mac_index]);
 
-        ql_mii_read_reg_ex(qdev, CONTROL_REG, &reg, mac_index);
-        ql_mii_write_reg_ex(qdev, CONTROL_REG, reg | PHY_CTRL_RESTART_NEG,
-                            mac_index);
+        /* Set the 10/100 & pause negotiation advertisements */
+        ql_mii_read_reg_ex(qdev, PHY_NEG_ADVER, &reg,
+                           PHYAddr[qdev->mac_index]);
+        reg &= ~PHY_NEG_ALL_PARAMS;
+
+        if(portConfiguration & PORT_CONFIG_SYM_PAUSE_ENABLED)
+                reg |= PHY_NEG_ASY_PAUSE | PHY_NEG_SYM_PAUSE;
+
+        if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) {
+                if(portConfiguration & PORT_CONFIG_100MB_SPEED)
+                        reg |= PHY_NEG_ADV_100F;
+                
+                if(portConfiguration & PORT_CONFIG_10MB_SPEED)
+                        reg |= PHY_NEG_ADV_10F;
+        }
+
+        if(portConfiguration & PORT_CONFIG_HALF_DUPLEX_ENABLED) {
+                if(portConfiguration & PORT_CONFIG_100MB_SPEED)
+                        reg |= PHY_NEG_ADV_100H;
+                
+                if(portConfiguration & PORT_CONFIG_10MB_SPEED)
+                        reg |= PHY_NEG_ADV_10H;
+        }
+
+        if(portConfiguration &
+           PORT_CONFIG_1000MB_SPEED) {
+                reg |= 1;       
+        }
+
+        ql_mii_write_reg_ex(qdev, PHY_NEG_ADVER, reg, 
+                            PHYAddr[qdev->mac_index]);
+
+        ql_mii_read_reg_ex(qdev, CONTROL_REG, &reg, PHYAddr[qdev->mac_index]);
+        
+        ql_mii_write_reg_ex(qdev, CONTROL_REG, 
+                            reg | PHY_CTRL_RESTART_NEG | PHY_CTRL_AUTO_NEG,
+                            PHYAddr[qdev->mac_index]);
 }
 
-static void ql_phy_init_ex(struct ql3_adapter *qdev, u32 mac_index)
+static void ql_phy_init_ex(struct ql3_adapter *qdev)
 {
-        ql_phy_reset_ex(qdev, mac_index);
-        ql_phy_start_neg_ex(qdev, mac_index);
+        ql_phy_reset_ex(qdev);
+        PHY_Setup(qdev);
+        ql_phy_start_neg_ex(qdev);
 }
 
 /*
@@ -1295,14 +1552,17 @@ static int ql_port_start(struct ql3_adapter *qdev)
 {
         if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
                 (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
-                         2) << 7))
+                         2) << 7)) {
+                printk(KERN_ERR "%s: Could not get hw lock for GIO\n",
+                       qdev->ndev->name);
                 return -1;
+        }
 
         if (ql_is_fiber(qdev)) {
                 ql_petbi_init(qdev);
         } else {
                 /* Copper port */
-                ql_phy_init_ex(qdev, qdev->mac_index);
+                ql_phy_init_ex(qdev);
         }
 
         ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK);
@@ -1453,7 +1713,7 @@ static void ql_link_state_machine(struct ql3_adapter *qdev)
  */
 static void ql_get_phy_owner(struct ql3_adapter *qdev)
 {
-        if (ql_this_adapter_controls_port(qdev, qdev->mac_index))
+        if (ql_this_adapter_controls_port(qdev))
                 set_bit(QL_LINK_MASTER,&qdev->flags);
         else
                 clear_bit(QL_LINK_MASTER,&qdev->flags);
@@ -1467,11 +1727,11 @@ static void ql_init_scan_mode(struct ql3_adapter *qdev)
         ql_mii_enable_scan_mode(qdev);
 
         if (test_bit(QL_LINK_OPTICAL,&qdev->flags)) {
-                if (ql_this_adapter_controls_port(qdev, qdev->mac_index))
-                        ql_petbi_init_ex(qdev, qdev->mac_index);
+                if (ql_this_adapter_controls_port(qdev))
+                        ql_petbi_init_ex(qdev);
         } else {
-                if (ql_this_adapter_controls_port(qdev, qdev->mac_index))
-                        ql_phy_init_ex(qdev, qdev->mac_index);
+                if (ql_this_adapter_controls_port(qdev))
+                        ql_phy_init_ex(qdev);
         }
 }
 
@@ -1624,6 +1884,23 @@ static void ql_set_msglevel(struct net_device *ndev, u32 value)
         qdev->msg_enable = value;
 }
 
+static void ql_get_pauseparam(struct net_device *ndev,
+                              struct ethtool_pauseparam *pause)
+{
+        struct ql3_adapter *qdev = netdev_priv(ndev);
+        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+
+        u32 reg;
+        if(qdev->mac_index == 0)
+                reg = ql_read_page0_reg(qdev, &port_regs->mac0ConfigReg);
+        else
+                reg = ql_read_page0_reg(qdev, &port_regs->mac1ConfigReg);
+
+        pause->autoneg  = ql_get_auto_cfg_status(qdev);
+        pause->rx_pause = (reg & MAC_CONFIG_REG_RF) >> 2;
+        pause->tx_pause = (reg & MAC_CONFIG_REG_TF) >> 1;
+}
+
 static const struct ethtool_ops ql3xxx_ethtool_ops = {
         .get_settings = ql_get_settings,
         .get_drvinfo = ql_get_drvinfo,
@@ -1631,6 +1908,7 @@ static const struct ethtool_ops ql3xxx_ethtool_ops = {
         .get_link = ethtool_op_get_link,
         .get_msglevel = ql_get_msglevel,
         .set_msglevel = ql_set_msglevel,
+        .get_pauseparam = ql_get_pauseparam,
 };
 
 static int ql_populate_free_queue(struct ql3_adapter *qdev)
@@ -1815,14 +2093,14 @@ invalid_seg_count:
         atomic_inc(&qdev->tx_count);
 }
 
-void ql_get_sbuf(struct ql3_adapter *qdev)
+static void ql_get_sbuf(struct ql3_adapter *qdev)
 {
         if (++qdev->small_buf_index == NUM_SMALL_BUFFERS)
                 qdev->small_buf_index = 0;
         qdev->small_buf_release_cnt++;
 }
 
-struct ql_rcv_buf_cb *ql_get_lbuf(struct ql3_adapter *qdev)
+static struct ql_rcv_buf_cb *ql_get_lbuf(struct ql3_adapter *qdev)
 {
         struct ql_rcv_buf_cb *lrg_buf_cb = NULL;
         lrg_buf_cb = &qdev->lrg_buf[qdev->lrg_buf_index];
@@ -3074,6 +3352,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
                 goto out;
         }
 
+        PHY_Setup(qdev);
         ql_init_scan_mode(qdev);
         ql_get_phy_owner(qdev);
 
diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h
index 0203f88f0544..4a832c46c274 100755
--- a/drivers/net/qla3xxx.h
+++ b/drivers/net/qla3xxx.h
@@ -293,6 +293,16 @@ struct net_rsp_iocb {
 
 #define MII_SCAN_REGISTER 0x00000001
 
+#define PHY_ID_0_REG    2
+#define PHY_ID_1_REG    3
+
+#define PHY_OUI_1_MASK       0xfc00
+#define PHY_MODEL_MASK       0x03f0
+
+/*  Address for the Agere Phy */
+#define MII_AGERE_ADDR_1  0x00001000
+#define MII_AGERE_ADDR_2  0x00001100
+
 /* 32-bit ispControlStatus */
 enum {
         ISP_CONTROL_NP_MASK = 0x0003,
@@ -789,6 +799,7 @@ enum {
         PHY_CTRL_LOOPBACK = 0x4000,
 
         PETBI_CONTROL_REG = 0x00,
+        PETBI_CTRL_ALL_PARAMS = 0x7140,
         PETBI_CTRL_SOFT_RESET = 0x8000,
         PETBI_CTRL_AUTO_NEG = 0x1000,
         PETBI_CTRL_RESTART_NEG = 0x0200,
@@ -811,6 +822,23 @@ enum {
         PETBI_EXPANSION_REG = 0x06,
         PETBI_EXP_PAGE_RX = 0x0002,
 
+        PHY_GIG_CONTROL = 9,
+        PHY_GIG_ENABLE_MAN = 0x1000,  /* Enable Master/Slave Manual Config*/
+        PHY_GIG_SET_MASTER = 0x0800,  /* Set Master (slave if clear)*/
+        PHY_GIG_ALL_PARAMS = 0x0300,
+        PHY_GIG_ADV_1000F = 0x0200,
+        PHY_GIG_ADV_1000H = 0x0100,
+
+        PHY_NEG_ADVER = 4,
+        PHY_NEG_ALL_PARAMS = 0x0fe0,
+        PHY_NEG_ASY_PAUSE =  0x0800,
+        PHY_NEG_SYM_PAUSE =  0x0400,
+        PHY_NEG_ADV_SPEED =  0x01e0,
+        PHY_NEG_ADV_100F =   0x0100,
+        PHY_NEG_ADV_100H =   0x0080,
+        PHY_NEG_ADV_10F =    0x0040,
+        PHY_NEG_ADV_10H =    0x0020,
+
         PETBI_TBI_CTRL = 0x11,
         PETBI_TBI_RESET = 0x8000,
         PETBI_TBI_AUTO_SENSE = 0x0100,
@@ -826,8 +854,7 @@ enum {
         PHY_AUX_RESET_STICK = 0x0002,
         PHY_NEG_PAUSE = 0x0400,
         PHY_CTRL_SOFT_RESET = 0x8000,
-        PHY_NEG_ADVER = 4,
-        PHY_NEG_ADV_SPEED = 0x01e0,
+        PHY_CTRL_AUTO_NEG = 0x1000,
         PHY_CTRL_RESTART_NEG = 0x0200,
 };
 enum {
@@ -892,6 +919,7 @@ enum {EEPROM_SIZE = FM93C86A_SIZE_16,
         u16 pauseThreshold_mac;
         u16 resumeThreshold_mac;
         u16 portConfiguration;
+#define PORT_CONFIG_DEFAULT                 0xf700
 #define PORT_CONFIG_AUTO_NEG_ENABLED        0x8000
 #define PORT_CONFIG_SYM_PAUSE_ENABLED       0x4000
 #define PORT_CONFIG_FULL_DUPLEX_ENABLED     0x2000
@@ -1259,6 +1287,7 @@ struct ql3_adapter {
         struct delayed_work tx_timeout_work;
         u32 max_frame_size;
         u32 device_id;
+        u16 phyType;
 };
 
 #endif                          /* _QLA3XXX_H_ */
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 33fb7f3b7041..4cb710bbe729 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -1,6 +1,6 @@
 /************************************************************************
  * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2005 Neterion Inc.
+ * Copyright(c) 2002-2007 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 600d3ff347fc..290e1c1f30c6 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1,6 +1,6 @@
 /************************************************************************
  * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2005 Neterion Inc.
+ * Copyright(c) 2002-2007 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
@@ -84,7 +84,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
 
-#define DRV_VERSION "2.0.17.1"
+#define DRV_VERSION "2.0.22.1"
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -316,7 +316,7 @@ static void s2io_vlan_rx_register(struct net_device *dev,
 }
 
 /* A flag indicating whether 'RX_PA_CFG_STRIP_VLAN_TAG' bit is set or not */
-int vlan_strip_flag;
+static int vlan_strip_flag;
 
 /* Unregister the vlan */
 static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
@@ -394,7 +394,6 @@ static const u64 fix_mac[] = {
         END_SIGN
 };
 
-MODULE_AUTHOR("Raghavendra Koushik <raghavendra.koushik@neterion.com>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
@@ -516,7 +515,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                 mac_control->fifos[i].list_info = kmalloc(list_holder_size,
                                                           GFP_KERNEL);
                 if (!mac_control->fifos[i].list_info) {
-                        DBG_PRINT(ERR_DBG,
+                        DBG_PRINT(INFO_DBG,
                                   "Malloc failed for list_info\n");
                         return -ENOMEM;
                 }
@@ -542,9 +541,9 @@ static int init_shared_mem(struct s2io_nic *nic)
                         tmp_v = pci_alloc_consistent(nic->pdev,
                                                      PAGE_SIZE, &tmp_p);
                         if (!tmp_v) {
-                                DBG_PRINT(ERR_DBG,
+                                DBG_PRINT(INFO_DBG,
                                           "pci_alloc_consistent ");
-                                DBG_PRINT(ERR_DBG, "failed for TxDL\n");
+                                DBG_PRINT(INFO_DBG, "failed for TxDL\n");
                                 return -ENOMEM;
                         }
                         /* If we got a zero DMA address(can happen on
@@ -561,9 +560,9 @@ static int init_shared_mem(struct s2io_nic *nic)
                                 tmp_v = pci_alloc_consistent(nic->pdev,
                                                      PAGE_SIZE, &tmp_p);
                                 if (!tmp_v) {
-                                        DBG_PRINT(ERR_DBG,
+                                        DBG_PRINT(INFO_DBG,
                                           "pci_alloc_consistent ");
-                                        DBG_PRINT(ERR_DBG, "failed for TxDL\n");
+                                        DBG_PRINT(INFO_DBG, "failed for TxDL\n");
                                         return -ENOMEM;
                                 }
                         }
@@ -2187,7 +2186,7 @@ static int fill_rxd_3buf(struct s2io_nic *nic, struct RxD_t *rxdp, struct \
         /* skb_shinfo(skb)->frag_list will have L4 data payload */
         skb_shinfo(skb)->frag_list = dev_alloc_skb(dev->mtu + ALIGN_SIZE);
         if (skb_shinfo(skb)->frag_list == NULL) {
-                DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb failed\n ", dev->name);
+                DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb failed\n ", dev->name);
                 return -ENOMEM ;
         }
         frag_list = skb_shinfo(skb)->frag_list;
@@ -2242,6 +2241,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
         struct buffAdd *ba;
         unsigned long flags;
         struct RxD_t *first_rxdp = NULL;
+        u64 Buffer0_ptr = 0, Buffer1_ptr = 0;
 
         mac_control = &nic->mac_control;
         config = &nic->config;
@@ -2313,8 +2313,8 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                 /* allocate skb */
                 skb = dev_alloc_skb(size);
                 if(!skb) {
-                        DBG_PRINT(ERR_DBG, "%s: Out of ", dev->name);
-                        DBG_PRINT(ERR_DBG, "memory to allocate SKBs\n");
+                        DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
+                        DBG_PRINT(INFO_DBG, "memory to allocate SKBs\n");
                         if (first_rxdp) {
                                 wmb();
                                 first_rxdp->Control_1 |= RXD_OWN_XENA;
@@ -2342,7 +2342,14 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                          * payload
                          */
 
+                        /* save the buffer pointers to avoid frequent dma mapping */
+                        Buffer0_ptr = ((struct RxD3*)rxdp)->Buffer0_ptr;
+                        Buffer1_ptr = ((struct RxD3*)rxdp)->Buffer1_ptr;
                         memset(rxdp, 0, sizeof(struct RxD3));
+                        /* restore the buffer pointers for dma sync*/
+                        ((struct RxD3*)rxdp)->Buffer0_ptr = Buffer0_ptr;
+                        ((struct RxD3*)rxdp)->Buffer1_ptr = Buffer1_ptr;
+
                         ba = &mac_control->rings[ring_no].ba[block_no][off];
                         skb_reserve(skb, BUF0_LEN);
                         tmp = (u64)(unsigned long) skb->data;
@@ -2573,8 +2580,8 @@ static int s2io_poll(struct net_device *dev, int *budget)
 
         for (i = 0; i < config->rx_ring_num; i++) {
                 if (fill_rx_buffers(nic, i) == -ENOMEM) {
-                        DBG_PRINT(ERR_DBG, "%s:Out of memory", dev->name);
-                        DBG_PRINT(ERR_DBG, " in Rx Poll!!\n");
+                        DBG_PRINT(INFO_DBG, "%s:Out of memory", dev->name);
+                        DBG_PRINT(INFO_DBG, " in Rx Poll!!\n");
                         break;
                 }
         }
@@ -2590,8 +2597,8 @@ no_rx:
 
         for (i = 0; i < config->rx_ring_num; i++) {
                 if (fill_rx_buffers(nic, i) == -ENOMEM) {
-                        DBG_PRINT(ERR_DBG, "%s:Out of memory", dev->name);
-                        DBG_PRINT(ERR_DBG, " in Rx Poll!!\n");
+                        DBG_PRINT(INFO_DBG, "%s:Out of memory", dev->name);
+                        DBG_PRINT(INFO_DBG, " in Rx Poll!!\n");
                         break;
                 }
         }
@@ -2640,8 +2647,8 @@ static void s2io_netpoll(struct net_device *dev)
 
         for (i = 0; i < config->rx_ring_num; i++) {
                 if (fill_rx_buffers(nic, i) == -ENOMEM) {
-                        DBG_PRINT(ERR_DBG, "%s:Out of memory", dev->name);
-                        DBG_PRINT(ERR_DBG, " in Rx Netpoll!!\n");
+                        DBG_PRINT(INFO_DBG, "%s:Out of memory", dev->name);
+                        DBG_PRINT(INFO_DBG, " in Rx Netpoll!!\n");
                         break;
                 }
         }
@@ -3307,6 +3314,7 @@ static void s2io_reset(struct s2io_nic * sp)
         u16 subid, pci_cmd;
         int i;
         u16 val16;
+        unsigned long long reset_cnt = 0;
         DBG_PRINT(INIT_DBG,"%s - Resetting XFrame card %s\n",
                         __FUNCTION__, sp->dev->name);
 
@@ -3372,6 +3380,11 @@ new_way:
 
         /* Reset device statistics maintained by OS */
         memset(&sp->stats, 0, sizeof (struct net_device_stats));
+        /* save reset count */
+        reset_cnt = sp->mac_control.stats_info->sw_stat.soft_reset_cnt;
+        memset(sp->mac_control.stats_info, 0, sizeof(struct stat_block));
+        /* restore reset count */
+        sp->mac_control.stats_info->sw_stat.soft_reset_cnt = reset_cnt;
 
         /* SXE-002: Configure link and activity LED to turn it off */
         subid = sp->pdev->subsystem_device;
@@ -3659,7 +3672,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
         nic->entries = kmalloc(MAX_REQUESTED_MSI_X * sizeof(struct msix_entry),
                                GFP_KERNEL);
         if (nic->entries == NULL) {
-                DBG_PRINT(ERR_DBG, "%s: Memory allocation failed\n", __FUNCTION__);
+                DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", __FUNCTION__);
                 return -ENOMEM;
         }
         memset(nic->entries, 0, MAX_REQUESTED_MSI_X * sizeof(struct msix_entry));
@@ -3668,7 +3681,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
                 kmalloc(MAX_REQUESTED_MSI_X * sizeof(struct s2io_msix_entry),
                                    GFP_KERNEL);
         if (nic->s2io_entries == NULL) {
-                DBG_PRINT(ERR_DBG, "%s: Memory allocation failed\n", __FUNCTION__);
+                DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", __FUNCTION__);
                 kfree(nic->entries);
                 return -ENOMEM;
         }
@@ -4019,7 +4032,7 @@ static int s2io_chk_rx_buffers(struct s2io_nic *sp, int rng_n)
                         DBG_PRINT(INTR_DBG, "%s: Rx BD hit ", __FUNCTION__);
                         DBG_PRINT(INTR_DBG, "PANIC levels\n");
                         if ((ret = fill_rx_buffers(sp, rng_n)) == -ENOMEM) {
-                                DBG_PRINT(ERR_DBG, "Out of memory in %s",
+                                DBG_PRINT(INFO_DBG, "Out of memory in %s",
                                           __FUNCTION__);
                                 clear_bit(0, (&sp->tasklet_status));
                                 return -1;
@@ -4029,8 +4042,8 @@ static int s2io_chk_rx_buffers(struct s2io_nic *sp, int rng_n)
                         tasklet_schedule(&sp->task);
 
         } else if (fill_rx_buffers(sp, rng_n) == -ENOMEM) {
-                        DBG_PRINT(ERR_DBG, "%s:Out of memory", sp->dev->name);
-                        DBG_PRINT(ERR_DBG, " in Rx Intr!!\n");
+                        DBG_PRINT(INFO_DBG, "%s:Out of memory", sp->dev->name);
+                        DBG_PRINT(INFO_DBG, " in Rx Intr!!\n");
         }
         return 0;
 }
@@ -4279,9 +4292,7 @@ static void s2io_updt_stats(struct s2io_nic *sp)
                         if (cnt == 5)
                                 break; /* Updt failed */
                 } while(1);
-        } else {
-                memset(sp->mac_control.stats_info, 0, sizeof(struct stat_block));
-        }
+        } 
 }
 
 /**
@@ -5949,12 +5960,12 @@ static void s2io_tasklet(unsigned long dev_addr)
                 for (i = 0; i < config->rx_ring_num; i++) {
                         ret = fill_rx_buffers(sp, i);
                         if (ret == -ENOMEM) {
-                                DBG_PRINT(ERR_DBG, "%s: Out of ",
+                                DBG_PRINT(INFO_DBG, "%s: Out of ",
                                           dev->name);
                                 DBG_PRINT(ERR_DBG, "memory in tasklet\n");
                                 break;
                         } else if (ret == -EFILL) {
-                                DBG_PRINT(ERR_DBG,
+                                DBG_PRINT(INFO_DBG,
                                           "%s: Rx Ring %d is full\n",
                                           dev->name, i);
                                 break;
@@ -6065,8 +6076,8 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                 } else {
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
-                                DBG_PRINT(ERR_DBG, "%s: Out of ", dev->name);
-                                DBG_PRINT(ERR_DBG, "memory to allocate SKBs\n");
+                                DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
+                                DBG_PRINT(INFO_DBG, "memory to allocate SKBs\n");
                                 return -ENOMEM ;
                         }
                         /* storing the mapped addr in a temp variable
@@ -6088,7 +6099,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                 } else {
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
-                                DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb failed\n",
+                                DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb failed\n",
                                         dev->name);
                                 return -ENOMEM;
                         }
@@ -6115,7 +6126,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                 } else {
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
-                                DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb failed\n",
+                                DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb failed\n",
                                           dev->name);
                                 return -ENOMEM;
                         }
@@ -6616,7 +6627,6 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
 
         /* Updating statistics */
         rxdp->Host_Control = 0;
-        sp->rx_pkt_count++;
         sp->stats.rx_packets++;
         if (sp->rxd_mode == RXD_MODE_1) {
                 int len = RXD_GET_BUFFER0_SIZE_1(rxdp->Control_2);
@@ -7252,7 +7262,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto register_failed;
         }
         s2io_vpd_read(sp);
-        DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2005 Neterion Inc.\n");
+        DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2007 Neterion Inc.\n");
         DBG_PRINT(ERR_DBG, "%s: Neterion %s (rev %d)\n",dev->name,
                   sp->product_name, get_xena_rev_id(sp->pdev));
         DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name,
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 803137ca4b6c..a656d18b33df 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -1,6 +1,6 @@
 /************************************************************************
  * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2005 Neterion Inc.
+ * Copyright(c) 2002-2007 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
@@ -760,7 +760,6 @@ struct s2io_nic {
 #define MAX_SUPPORTED_MULTICASTS MAX_MAC_SUPPORTED
 
         struct mac_addr def_mac_addr[MAX_MAC_SUPPORTED];
-        struct mac_addr pre_mac_addr[MAX_MAC_SUPPORTED];
 
         struct net_device_stats stats;
         int high_dma_flag;
@@ -794,11 +793,6 @@ struct s2io_nic {
         u16 all_multi_pos;
         u16 promisc_flg;
 
-        u16 tx_pkt_count;
-        u16 rx_pkt_count;
-        u16 tx_err_count;
-        u16 rx_err_count;
-
         /*  Id timer, used to blink NIC to physically identify NIC. */
         struct timer_list id_timer;
 
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 0a3a379b634c..132e2148b21c 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -95,19 +95,28 @@ MODULE_PARM_DESC(full_duplex, "1-" __MODULE_STRING(MAX_UNITS));
 #endif
 
 #ifdef CONFIG_SBMAC_COALESCE
-static int int_pktcnt = 0;
-module_param(int_pktcnt, int, S_IRUGO);
-MODULE_PARM_DESC(int_pktcnt, "Packet count");
+static int int_pktcnt_tx = 255;
+module_param(int_pktcnt_tx, int, S_IRUGO);
+MODULE_PARM_DESC(int_pktcnt_tx, "TX packet count");
 
-static int int_timeout = 0;
-module_param(int_timeout, int, S_IRUGO);
-MODULE_PARM_DESC(int_timeout, "Timeout value");
+static int int_timeout_tx = 255;
+module_param(int_timeout_tx, int, S_IRUGO);
+MODULE_PARM_DESC(int_timeout_tx, "TX timeout value");
+
+static int int_pktcnt_rx = 64;
+module_param(int_pktcnt_rx, int, S_IRUGO);
+MODULE_PARM_DESC(int_pktcnt_rx, "RX packet count");
+
+static int int_timeout_rx = 64;
+module_param(int_timeout_rx, int, S_IRUGO);
+MODULE_PARM_DESC(int_timeout_rx, "RX timeout value");
 #endif
 
 #include <asm/sibyte/sb1250.h>
 #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
 #include <asm/sibyte/bcm1480_regs.h>
 #include <asm/sibyte/bcm1480_int.h>
+#define R_MAC_DMA_OODPKTLOST_RX R_MAC_DMA_OODPKTLOST
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 #include <asm/sibyte/sb1250_regs.h>
 #include <asm/sibyte/sb1250_int.h>
@@ -155,8 +164,8 @@ typedef enum { sbmac_state_uninit, sbmac_state_off, sbmac_state_on,
 
 #define NUMCACHEBLKS(x) (((x)+SMP_CACHE_BYTES-1)/SMP_CACHE_BYTES)
 
-#define SBMAC_MAX_TXDESCR       32
-#define SBMAC_MAX_RXDESCR       32
+#define SBMAC_MAX_TXDESCR       256
+#define SBMAC_MAX_RXDESCR       256
 
 #define ETHER_ALIGN     2
 #define ETHER_ADDR_LEN  6
@@ -185,10 +194,10 @@ typedef struct sbmacdma_s {
          * associated with it.
          */
 
-        struct sbmac_softc *sbdma_eth;          /* back pointer to associated MAC */
-        int              sbdma_channel; /* channel number */
+        struct sbmac_softc *sbdma_eth;      /* back pointer to associated MAC */
+        int              sbdma_channel;     /* channel number */
         int              sbdma_txdir;       /* direction (1=transmit) */
-        int              sbdma_maxdescr;        /* total # of descriptors in ring */
+        int              sbdma_maxdescr;    /* total # of descriptors in ring */
 #ifdef CONFIG_SBMAC_COALESCE
         int              sbdma_int_pktcnt;  /* # descriptors rx/tx before interrupt*/
         int              sbdma_int_timeout; /* # usec rx/tx interrupt */
@@ -197,13 +206,16 @@ typedef struct sbmacdma_s {
         volatile void __iomem *sbdma_config0;   /* DMA config register 0 */
         volatile void __iomem *sbdma_config1;   /* DMA config register 1 */
         volatile void __iomem *sbdma_dscrbase;  /* Descriptor base address */
-        volatile void __iomem *sbdma_dscrcnt;     /* Descriptor count register */
+        volatile void __iomem *sbdma_dscrcnt;   /* Descriptor count register */
         volatile void __iomem *sbdma_curdscr;   /* current descriptor address */
+        volatile void __iomem *sbdma_oodpktlost;/* pkt drop (rx only) */
+
 
         /*
          * This stuff is for maintenance of the ring
          */
 
+        sbdmadscr_t     *sbdma_dscrtable_unaligned;
         sbdmadscr_t     *sbdma_dscrtable;       /* base of descriptor table */
         sbdmadscr_t     *sbdma_dscrtable_end; /* end of descriptor table */
 
@@ -286,8 +298,8 @@ static int sbdma_add_rcvbuffer(sbmacdma_t *d,struct sk_buff *m);
 static int sbdma_add_txbuffer(sbmacdma_t *d,struct sk_buff *m);
 static void sbdma_emptyring(sbmacdma_t *d);
 static void sbdma_fillring(sbmacdma_t *d);
-static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d);
-static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d);
+static int sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d, int work_to_do, int poll);
+static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d, int poll);
 static int sbmac_initctx(struct sbmac_softc *s);
 static void sbmac_channel_start(struct sbmac_softc *s);
 static void sbmac_channel_stop(struct sbmac_softc *s);
@@ -308,6 +320,8 @@ static struct net_device_stats *sbmac_get_stats(struct net_device *dev);
 static void sbmac_set_rx_mode(struct net_device *dev);
 static int sbmac_mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static int sbmac_close(struct net_device *dev);
+static int sbmac_poll(struct net_device *poll_dev, int *budget);
+
 static int sbmac_mii_poll(struct sbmac_softc *s,int noisy);
 static int sbmac_mii_probe(struct net_device *dev);
 
@@ -679,6 +693,10 @@ static void sbdma_initctx(sbmacdma_t *d,
                           int txrx,
                           int maxdescr)
 {
+#ifdef CONFIG_SBMAC_COALESCE
+        int int_pktcnt, int_timeout;
+#endif
+
         /*
          * Save away interesting stuff in the structure
          */
@@ -728,6 +746,11 @@ static void sbdma_initctx(sbmacdma_t *d,
                 s->sbm_base + R_MAC_DMA_REGISTER(txrx,chan,R_MAC_DMA_DSCR_CNT);
         d->sbdma_curdscr =
                 s->sbm_base + R_MAC_DMA_REGISTER(txrx,chan,R_MAC_DMA_CUR_DSCRADDR);
+        if (d->sbdma_txdir)
+                d->sbdma_oodpktlost = NULL;
+        else
+                d->sbdma_oodpktlost =
+                        s->sbm_base + R_MAC_DMA_REGISTER(txrx,chan,R_MAC_DMA_OODPKTLOST_RX);
 
         /*
          * Allocate memory for the ring
@@ -735,6 +758,7 @@ static void sbdma_initctx(sbmacdma_t *d,
 
         d->sbdma_maxdescr = maxdescr;
 
+        d->sbdma_dscrtable_unaligned =
         d->sbdma_dscrtable = (sbdmadscr_t *)
                 kmalloc((d->sbdma_maxdescr+1)*sizeof(sbdmadscr_t), GFP_KERNEL);
 
@@ -765,12 +789,14 @@ static void sbdma_initctx(sbmacdma_t *d,
          * Setup Rx/Tx DMA coalescing defaults
          */
 
+        int_pktcnt = (txrx == DMA_TX) ? int_pktcnt_tx : int_pktcnt_rx;
         if ( int_pktcnt ) {
                 d->sbdma_int_pktcnt = int_pktcnt;
         } else {
                 d->sbdma_int_pktcnt = 1;
         }
 
+        int_timeout = (txrx == DMA_TX) ? int_timeout_tx : int_timeout_rx;
         if ( int_timeout ) {
                 d->sbdma_int_timeout = int_timeout;
         } else {
@@ -1125,32 +1151,63 @@ static void sbdma_fillring(sbmacdma_t *d)
         }
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void sbmac_netpoll(struct net_device *netdev)
+{
+        struct sbmac_softc *sc = netdev_priv(netdev);
+        int irq = sc->sbm_dev->irq;
+
+        __raw_writeq(0, sc->sbm_imr);
+
+        sbmac_intr(irq, netdev, NULL);
+
+#ifdef CONFIG_SBMAC_COALESCE
+        __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) |
+        ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0),
+        sc->sbm_imr);
+#else
+        __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) | 
+        (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr);
+#endif
+}
+#endif
 
 /**********************************************************************
- *  SBDMA_RX_PROCESS(sc,d)
+ *  SBDMA_RX_PROCESS(sc,d,work_to_do,poll)
  *
  *  Process "completed" receive buffers on the specified DMA channel.
- *  Note that this isn't really ideal for priority channels, since
- *  it processes all of the packets on a given channel before
- *  returning.
  *
  *  Input parameters:
- *         sc - softc structure
- *         d - DMA channel context
+ *            sc - softc structure
+ *             d - DMA channel context
+ *    work_to_do - no. of packets to process before enabling interrupt
+ *                 again (for NAPI)
+ *          poll - 1: using polling (for NAPI)
  *
  *  Return value:
  *         nothing
  ********************************************************************* */
 
-static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
+static int sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d,
+                             int work_to_do, int poll)
 {
         int curidx;
         int hwidx;
         sbdmadscr_t *dsc;
         struct sk_buff *sb;
         int len;
+        int work_done = 0;
+        int dropped = 0;
 
-        for (;;) {
+        prefetch(d);
+
+again:
+        /* Check if the HW dropped any frames */
+        sc->sbm_stats.rx_fifo_errors
+            += __raw_readq(sc->sbm_rxdma.sbdma_oodpktlost) & 0xffff;
+        __raw_writeq(0, sc->sbm_rxdma.sbdma_oodpktlost);
+
+        while (work_to_do-- > 0) {
                 /*
                  * figure out where we are (as an index) and where
                  * the hardware is (also as an index)
@@ -1162,7 +1219,12 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                  * (sbdma_remptr) and the physical address (sbdma_curdscr CSR)
                  */
 
-                curidx = d->sbdma_remptr - d->sbdma_dscrtable;
+                dsc = d->sbdma_remptr;
+                curidx = dsc - d->sbdma_dscrtable;
+
+                prefetch(dsc);
+                prefetch(&d->sbdma_ctxtable[curidx]);
+
                 hwidx = (int) (((__raw_readq(d->sbdma_curdscr) & M_DMA_CURDSCR_ADDR) -
                                 d->sbdma_dscrtable_phys) / sizeof(sbdmadscr_t));
 
@@ -1173,13 +1235,12 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                  */
 
                 if (curidx == hwidx)
-                        break;
+                        goto done;
 
                 /*
                  * Otherwise, get the packet's sk_buff ptr back
                  */
 
-                dsc = &(d->sbdma_dscrtable[curidx]);
                 sb = d->sbdma_ctxtable[curidx];
                 d->sbdma_ctxtable[curidx] = NULL;
 
@@ -1191,7 +1252,7 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                  * receive ring.
                  */
 
-                if (!(dsc->dscr_a & M_DMA_ETHRX_BAD)) {
+                if (likely (!(dsc->dscr_a & M_DMA_ETHRX_BAD))) {
 
                         /*
                          * Add a new buffer to replace the old one.  If we fail
@@ -1199,9 +1260,14 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                          * packet and put it right back on the receive ring.
                          */
 
-                        if (sbdma_add_rcvbuffer(d,NULL) == -ENOBUFS) {
-                                sc->sbm_stats.rx_dropped++;
+                        if (unlikely (sbdma_add_rcvbuffer(d,NULL) ==
+                                      -ENOBUFS)) {
+                                sc->sbm_stats.rx_dropped++;
                                 sbdma_add_rcvbuffer(d,sb); /* re-add old buffer */
+                                /* No point in continuing at the moment */
+                                printk(KERN_ERR "dropped packet (1)\n");
+                                d->sbdma_remptr = SBDMA_NEXTBUF(d,sbdma_remptr);
+                                goto done;
                         } else {
                                 /*
                                  * Set length into the packet
@@ -1213,8 +1279,6 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                                  * receive ring.  Pass the buffer to
                                  * the kernel
                                  */
-                                sc->sbm_stats.rx_bytes += len;
-                                sc->sbm_stats.rx_packets++;
                                 sb->protocol = eth_type_trans(sb,d->sbdma_eth->sbm_dev);
                                 /* Check hw IPv4/TCP checksum if supported */
                                 if (sc->rx_hw_checksum == ENABLE) {
@@ -1226,8 +1290,22 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                                                 sb->ip_summed = CHECKSUM_NONE;
                                         }
                                 }
-
-                                netif_rx(sb);
+                                prefetch(sb->data);
+                                prefetch((const void *)(((char *)sb->data)+32));
+                                if (poll)
+                                        dropped = netif_receive_skb(sb);
+                                else
+                                        dropped = netif_rx(sb);
+
+                                if (dropped == NET_RX_DROP) {
+                                        sc->sbm_stats.rx_dropped++;
+                                        d->sbdma_remptr = SBDMA_NEXTBUF(d,sbdma_remptr);
+                                        goto done;
+                                }
+                                else {
+                                        sc->sbm_stats.rx_bytes += len;
+                                        sc->sbm_stats.rx_packets++;
+                                }
                         }
                 } else {
                         /*
@@ -1244,12 +1322,16 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                  */
 
                 d->sbdma_remptr = SBDMA_NEXTBUF(d,sbdma_remptr);
-
+                work_done++;
         }
+        if (!poll) {
+                work_to_do = 32;
+                goto again; /* collect fifo drop statistics again */
+        }
+done:
+        return work_done;
 }
 
-
-
 /**********************************************************************
  *  SBDMA_TX_PROCESS(sc,d)
  *
@@ -1261,22 +1343,30 @@ static void sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d)
  *
  *  Input parameters:
  *      sc - softc structure
- *         d - DMA channel context
+ *       d - DMA channel context
+ *    poll - 1: using polling (for NAPI)
  *
  *  Return value:
  *         nothing
  ********************************************************************* */
 
-static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d)
+static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d, int poll)
 {
         int curidx;
         int hwidx;
         sbdmadscr_t *dsc;
         struct sk_buff *sb;
         unsigned long flags;
+        int packets_handled = 0;
 
         spin_lock_irqsave(&(sc->sbm_lock), flags);
 
+        if (d->sbdma_remptr == d->sbdma_addptr)
+          goto end_unlock;
+
+        hwidx = (int) (((__raw_readq(d->sbdma_curdscr) & M_DMA_CURDSCR_ADDR) -
+                        d->sbdma_dscrtable_phys) / sizeof(sbdmadscr_t));
+
         for (;;) {
                 /*
                  * figure out where we are (as an index) and where
@@ -1290,8 +1380,6 @@ static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d)
                  */
 
                 curidx = d->sbdma_remptr - d->sbdma_dscrtable;
-                hwidx = (int) (((__raw_readq(d->sbdma_curdscr) & M_DMA_CURDSCR_ADDR) -
-                                d->sbdma_dscrtable_phys) / sizeof(sbdmadscr_t));
 
                 /*
                  * If they're the same, that means we've processed all
@@ -1329,6 +1417,8 @@ static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d)
 
                 d->sbdma_remptr = SBDMA_NEXTBUF(d,sbdma_remptr);
 
+                packets_handled++;
+
         }
 
         /*
@@ -1337,8 +1427,10 @@ static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d)
          * watermark on the transmit queue.
          */
 
-        netif_wake_queue(d->sbdma_eth->sbm_dev);
+        if (packets_handled)
+                netif_wake_queue(d->sbdma_eth->sbm_dev);
 
+end_unlock:
         spin_unlock_irqrestore(&(sc->sbm_lock), flags);
 
 }
@@ -1412,9 +1504,9 @@ static int sbmac_initctx(struct sbmac_softc *s)
 
 static void sbdma_uninitctx(struct sbmacdma_s *d)
 {
-        if (d->sbdma_dscrtable) {
-                kfree(d->sbdma_dscrtable);
-                d->sbdma_dscrtable = NULL;
+        if (d->sbdma_dscrtable_unaligned) {
+                kfree(d->sbdma_dscrtable_unaligned);
+                d->sbdma_dscrtable_unaligned = d->sbdma_dscrtable = NULL;
         }
 
         if (d->sbdma_ctxtable) {
@@ -1612,15 +1704,9 @@ static void sbmac_channel_start(struct sbmac_softc *s)
 #endif
 
 #ifdef CONFIG_SBMAC_COALESCE
-        /*
-         * Accept any TX interrupt and EOP count/timer RX interrupts on ch 0
-         */
         __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) |
                        ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0), s->sbm_imr);
 #else
-        /*
-         * Accept any kind of interrupt on TX and RX DMA channel 0
-         */
         __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) |
                        (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), s->sbm_imr);
 #endif
@@ -2053,57 +2139,46 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance)
         uint64_t isr;
         int handled = 0;
 
-        for (;;) {
-
-                /*
-                 * Read the ISR (this clears the bits in the real
-                 * register, except for counter addr)
-                 */
+        /*
+         * Read the ISR (this clears the bits in the real
+         * register, except for counter addr)
+         */
 
-                isr = __raw_readq(sc->sbm_isr) & ~M_MAC_COUNTER_ADDR;
+        isr = __raw_readq(sc->sbm_isr) & ~M_MAC_COUNTER_ADDR;
 
-                if (isr == 0)
-                        break;
+        if (isr == 0)
+                return IRQ_RETVAL(0);
+        handled = 1;
 
-                handled = 1;
-
-                /*
-                 * Transmits on channel 0
-                 */
+        /*
+         * Transmits on channel 0
+         */
 
-                if (isr & (M_MAC_INT_CHANNEL << S_MAC_TX_CH0)) {
-                        sbdma_tx_process(sc,&(sc->sbm_txdma));
+        if (isr & (M_MAC_INT_CHANNEL << S_MAC_TX_CH0)) {
+                sbdma_tx_process(sc,&(sc->sbm_txdma), 0);
+#ifdef CONFIG_NETPOLL_TRAP
+                if (netpoll_trap()) {
+                        if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
+                                __netif_schedule(dev);
                 }
+#endif
+        }
 
-                /*
-                 * Receives on channel 0
-                 */
-
-                /*
-                 * It's important to test all the bits (or at least the
-                 * EOP_SEEN bit) when deciding to do the RX process
-                 * particularly when coalescing, to make sure we
-                 * take care of the following:
-                 *
-                 * If you have some packets waiting (have been received
-                 * but no interrupt) and get a TX interrupt before
-                 * the RX timer or counter expires, reading the ISR
-                 * above will clear the timer and counter, and you
-                 * won't get another interrupt until a packet shows
-                 * up to start the timer again.  Testing
-                 * EOP_SEEN here takes care of this case.
-                 * (EOP_SEEN is part of M_MAC_INT_CHANNEL << S_MAC_RX_CH0)
-                 */
-
-
-                if (isr & (M_MAC_INT_CHANNEL << S_MAC_RX_CH0)) {
-                        sbdma_rx_process(sc,&(sc->sbm_rxdma));
+        if (isr & (M_MAC_INT_CHANNEL << S_MAC_RX_CH0)) {
+                if (netif_rx_schedule_prep(dev)) {
+                        __raw_writeq(0, sc->sbm_imr);
+                        __netif_rx_schedule(dev);
+                        /* Depend on the exit from poll to reenable intr */
+                }
+                else {
+                        /* may leave some packets behind */
+                        sbdma_rx_process(sc,&(sc->sbm_rxdma),
+                                         SBMAC_MAX_RXDESCR * 2, 0);
                 }
         }
         return IRQ_RETVAL(handled);
 }
 
-
 /**********************************************************************
  *  SBMAC_START_TX(skb,dev)
  *
@@ -2233,8 +2308,6 @@ static void sbmac_setmulti(struct sbmac_softc *sc)
         }
 }
 
-
-
 #if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
 /**********************************************************************
  *  SBMAC_PARSE_XDIGIT(str)
@@ -2397,8 +2470,13 @@ static int sbmac_init(struct net_device *dev, int idx)
         dev->do_ioctl           = sbmac_mii_ioctl;
         dev->tx_timeout         = sbmac_tx_timeout;
         dev->watchdog_timeo     = TX_TIMEOUT;
+        dev->poll               = sbmac_poll;
+        dev->weight             = 16;
 
         dev->change_mtu         = sb1250_change_mtu;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = sbmac_netpoll;
+#endif
 
         /* This is needed for PASS2 for Rx H/W checksum feature */
         sbmac_set_iphdr_offset(sc);
@@ -2796,7 +2874,39 @@ static int sbmac_close(struct net_device *dev)
         return 0;
 }
 
+static int sbmac_poll(struct net_device *dev, int *budget)
+{
+        int work_to_do;
+        int work_done;
+        struct sbmac_softc *sc = netdev_priv(dev);
+
+        work_to_do = min(*budget, dev->quota);
+        work_done = sbdma_rx_process(sc, &(sc->sbm_rxdma), work_to_do, 1);
 
+        if (work_done > work_to_do)
+                printk(KERN_ERR "%s exceeded work_to_do budget=%d quota=%d work-done=%d\n",
+                       sc->sbm_dev->name, *budget, dev->quota, work_done);
+
+        sbdma_tx_process(sc, &(sc->sbm_txdma), 1);
+
+        *budget -= work_done;
+        dev->quota -= work_done;
+
+        if (work_done < work_to_do) {
+                netif_rx_complete(dev);
+
+#ifdef CONFIG_SBMAC_COALESCE
+                __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) |
+                             ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0),
+                             sc->sbm_imr);
+#else
+                __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) |
+                             (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr);
+#endif
+        }
+
+        return (work_done >= work_to_do);
+}
 
 #if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
 static void
@@ -2883,7 +2993,7 @@ sbmac_init_module(void)
 
                 /*
                  * The R_MAC_ETHERNET_ADDR register will be set to some nonzero
-                 * value for us by the firmware if we're going to use this MAC.
+                 * value for us by the firmware if we are going to use this MAC.
                  * If we find a zero, skip this MAC.
                  */
 
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index d8c9c5d66d4f..1fc77300b055 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -624,7 +624,7 @@ static inline void setup_rx_ring(struct sgiseeq_rx_desc *buf, int nbufs)
 
 #define ALIGNED(x)  ((((unsigned long)(x)) + 0xf) & ~(0xf))
 
-static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq)
+static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq, int has_eeprom)
 {
         struct sgiseeq_init_block *sr;
         struct sgiseeq_private *sp;
@@ -650,7 +650,9 @@ static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq)
 
 #define EADDR_NVOFS     250
         for (i = 0; i < 3; i++) {
-                unsigned short tmp = ip22_nvram_read(EADDR_NVOFS / 2 + i);
+                unsigned short tmp = has_eeprom ?
+                        ip22_eeprom_read(&hpcregs->eeprom, EADDR_NVOFS / 2+i) :
+                        ip22_nvram_read(EADDR_NVOFS / 2+i);
 
                 dev->dev_addr[2 * i]     = tmp >> 8;
                 dev->dev_addr[2 * i + 1] = tmp & 0xff;
@@ -683,6 +685,11 @@ static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq)
         sp->hregs->dconfig = HPC3_EDCFG_FIRQ | HPC3_EDCFG_FEOP |
                              HPC3_EDCFG_FRXDC | HPC3_EDCFG_PTO | 0x026;
 
+        /* Setup PIO and DMA transfer timing */
+        sp->hregs->pconfig = 0x161;
+        sp->hregs->dconfig = HPC3_EDCFG_FIRQ | HPC3_EDCFG_FEOP |
+                             HPC3_EDCFG_FRXDC | HPC3_EDCFG_PTO | 0x026;
+
         /* Reset the chip. */
         hpc3_eth_reset(sp->hregs);
 
@@ -729,8 +736,23 @@ err_out:
 
 static int __init sgiseeq_probe(void)
 {
+        unsigned int tmp, ret1, ret2 = 0;
+
         /* On board adapter on 1st HPC is always present */
-        return sgiseeq_init(hpc3c0, SGI_ENET_IRQ);
+        ret1 = sgiseeq_init(hpc3c0, SGI_ENET_IRQ, 0);
+        /* Let's see if second HPC is there */
+        if (!(ip22_is_fullhouse()) &&
+            get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]) == 0) {
+                sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 |
+                                 SGIMC_GIOPAR_EXP164 |
+                                 SGIMC_GIOPAR_HPC264;
+                hpc3c1->pbus_piocfg[0][0] = 0x3ffff;
+                /* interrupt/config register on Challenge S Mezz board */
+                hpc3c1->pbus_extregs[0][0] = 0x30;
+                ret2 = sgiseeq_init(hpc3c1, SGI_GIO_0_IRQ, 1);
+        }
+
+        return (ret1 & ret2) ? ret1 : 0;
 }
 
 static void __exit sgiseeq_exit(void)
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index e0a93005e6dc..bf218621db16 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -5123,7 +5123,12 @@ static int skge_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
-        pci_enable_device(pdev);
+        ret = pci_enable_device(pdev);
+        if (ret) {
+                printk(KERN_WARNING "sk98lin: unable to enable device %s "
+                                "in resume\n", dev->name);
+                goto err_out;
+        }
         pci_set_master(pdev);
         if (pAC->GIni.GIMacsFound == 2)
                 ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);
@@ -5131,10 +5136,8 @@ static int skge_resume(struct pci_dev *pdev)
                 ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED, "sk98lin", dev);
         if (ret) {
                 printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
-                pAC->AllocFlag &= ~SK_ALLOC_IRQ;
-                dev->irq = 0;
-                pci_disable_device(pdev);
-                return -EBUSY;
+                ret = -EBUSY;
+                goto err_out_disable_pdev;
         }
 
         netif_device_attach(dev);
@@ -5151,6 +5154,13 @@ static int skge_resume(struct pci_dev *pdev)
         }
 
         return 0;
+
+err_out_disable_pdev:
+        pci_disable_device(pdev);
+err_out:
+        pAC->AllocFlag &= ~SK_ALLOC_IRQ;
+        dev->irq = 0;
+        return ret;
 }
 #else
 #define skge_suspend NULL
diff --git a/drivers/net/skfp/h/lnkstat.h b/drivers/net/skfp/h/lnkstat.h
deleted file mode 100644
index c73dcd96a40f..000000000000
--- a/drivers/net/skfp/h/lnkstat.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- *
- *      (C)Copyright 1998,1999 SysKonnect,
- *      a business unit of Schneider & Koch & Co. Datensysteme GmbH.
- *
- *      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
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-
-/*
- * Definition of the Error Log Structure
- * This structure will be copied into the Error Log buffer
- * during the NDIS General Request ReadErrorLog by the MAC Driver
- */
-
-struct  s_error_log {
-
-        /*
-         * place holder for token ring adapter error log (zeros)
-         */
-        u_char  reserved_0 ;                    /* byte 0 inside Error Log */
-        u_char  reserved_1 ;                    /* byte 1 */
-        u_char  reserved_2 ;                    /* byte 2 */    
-        u_char  reserved_3 ;                    /* byte 3 */
-        u_char  reserved_4 ;                    /* byte 4 */
-        u_char  reserved_5 ;                    /* byte 5 */
-        u_char  reserved_6 ;                    /* byte 6 */
-        u_char  reserved_7 ;                    /* byte 7 */
-        u_char  reserved_8 ;                    /* byte 8 */
-        u_char  reserved_9 ;                    /* byte 9 */
-        u_char  reserved_10 ;                   /* byte 10 */
-        u_char  reserved_11 ;                   /* byte 11 */
-        u_char  reserved_12 ;                   /* byte 12 */
-        u_char  reserved_13 ;                   /* byte 13 */
-
-        /*
-         * FDDI link statistics 
-         */
-/*
- * smt error low
- */
-#define SMT_ERL_AEB     (1<<15)                 /* A elast. buffer */
-#define SMT_ERL_BLC     (1<<14)                 /* B link error condition */
-#define SMT_ERL_ALC     (1<<13)                 /* A link error condition */
-#define SMT_ERL_NCC     (1<<12)                 /* not copied condition */
-#define SMT_ERL_FEC     (1<<11)                 /* frame error condition */
-
-/*
- * smt event low
- */
-#define SMT_EVL_NCE     (1<<5)
-
-        u_short smt_error_low ;                 /* byte 14/15 */
-        u_short smt_error_high ;                /* byte 16/17 */
-        u_short smt_event_low ;                 /* byte 18/19 */
-        u_short smt_event_high ;                /* byte 20/21 */
-        u_short connection_policy_violation ;   /* byte 22/23 */
-        u_short port_event ;                    /* byte 24/25 */
-        u_short set_count_low ;                 /* byte 26/27 */
-        u_short set_count_high ;                /* byte 28/29 */
-        u_short aci_id_code ;                   /* byte 30/31 */
-        u_short purge_frame_counter ;           /* byte 32/33 */
-
-        /*
-         * CMT and RMT state machines
-         */
-        u_short ecm_state ;                     /* byte 34/35 */
-        u_short pcm_a_state ;                   /* byte 36/37 */
-        u_short pcm_b_state ;                   /* byte 38/39 */
-        u_short cfm_state ;                     /* byte 40/41 */
-        u_short rmt_state ;                     /* byte 42/43 */
-
-        u_short not_used[30] ;                  /* byte 44-103 */
-
-        u_short ucode_version_level ;           /* byte 104/105 */
-
-        u_short not_used_1 ;                    /* byte 106/107 */
-        u_short not_used_2 ;                    /* byte 108/109 */
-} ;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index f1a0e6c0fbdd..21afe108d3cb 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -42,7 +42,7 @@
 #include "skge.h"
 
 #define DRV_NAME                "skge"
-#define DRV_VERSION             "1.10"
+#define DRV_VERSION             "1.11"
 #define PFX                     DRV_NAME " "
 
 #define DEFAULT_TX_RING_SIZE    128
@@ -2621,6 +2621,7 @@ static int skge_down(struct net_device *dev)
 
 static inline int skge_avail(const struct skge_ring *ring)
 {
+        smp_mb();
         return ((ring->to_clean > ring->to_use) ? 0 : ring->count)
                 + (ring->to_clean - ring->to_use) - 1;
 }
@@ -2709,6 +2710,8 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                        dev->name, e - skge->tx_ring.start, skb->len);
 
         skge->tx_ring.to_use = e->next;
+        smp_wmb();
+
         if (skge_avail(&skge->tx_ring) <= TX_LOW_WATER) {
                 pr_debug("%s: transmit queue full\n", dev->name);
                 netif_stop_queue(dev);
@@ -2726,8 +2729,6 @@ static void skge_tx_free(struct skge_port *skge, struct skge_element *e,
 {
         struct pci_dev *pdev = skge->hw->pdev;
 
-        BUG_ON(!e->skb);
-
         /* skb header vs. fragment */
         if (control & BMU_STF)
                 pci_unmap_single(pdev, pci_unmap_addr(e, mapaddr),
@@ -2745,7 +2746,6 @@ static void skge_tx_free(struct skge_port *skge, struct skge_element *e,
 
                 dev_kfree_skb(e->skb);
         }
-        e->skb = NULL;
 }
 
 /* Free all buffers in transmit ring */
@@ -3017,21 +3017,29 @@ static void skge_tx_done(struct net_device *dev)
 
         skge_write8(skge->hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_IRQ_CL_F);
 
-        netif_tx_lock(dev);
         for (e = ring->to_clean; e != ring->to_use; e = e->next) {
-                struct skge_tx_desc *td = e->desc;
+                u32 control = ((const struct skge_tx_desc *) e->desc)->control;
 
-                if (td->control & BMU_OWN)
+                if (control & BMU_OWN)
                         break;
 
-                skge_tx_free(skge, e, td->control);
+                skge_tx_free(skge, e, control);
         }
         skge->tx_ring.to_clean = e;
 
-        if (skge_avail(&skge->tx_ring) > TX_LOW_WATER)
-                netif_wake_queue(dev);
+        /* Can run lockless until we need to synchronize to restart queue. */
+        smp_mb();
+
+        if (unlikely(netif_queue_stopped(dev) &&
+                     skge_avail(&skge->tx_ring) > TX_LOW_WATER)) {
+                netif_tx_lock(dev);
+                if (unlikely(netif_queue_stopped(dev) &&
+                             skge_avail(&skge->tx_ring) > TX_LOW_WATER)) {
+                        netif_wake_queue(dev);
 
-        netif_tx_unlock(dev);
+                }
+                netif_tx_unlock(dev);
+        }
 }
 
 static int skge_poll(struct net_device *dev, int *budget)
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 86467ae74d45..edd71468220c 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -232,7 +232,6 @@ enum {
         IS_R2_PAR_ERR   = 1<<0, /* Queue R2 Parity Error */
 
         IS_ERR_MSK      = IS_IRQ_MST_ERR | IS_IRQ_STAT
-                        | IS_NO_STAT_M1 | IS_NO_STAT_M2
                         | IS_RAM_RD_PAR | IS_RAM_WR_PAR
                         | IS_M1_PAR_ERR | IS_M2_PAR_ERR
                         | IS_R1_PAR_ERR | IS_R2_PAR_ERR,
@@ -2447,15 +2446,15 @@ enum pause_status {
 
 
 struct skge_port {
-        u32                  msg_enable;
         struct skge_hw       *hw;
         struct net_device    *netdev;
         int                  port;
+        u32                  msg_enable;
 
         struct skge_ring     tx_ring;
-        struct skge_ring     rx_ring;
 
-        struct net_device_stats net_stats;
+        struct skge_ring     rx_ring ____cacheline_aligned_in_smp;
+        unsigned int         rx_buf_size;
 
         struct timer_list    link_timer;
         enum pause_control   flow_control;
@@ -2471,7 +2470,8 @@ struct skge_port {
         void                 *mem;      /* PCI memory for rings */
         dma_addr_t           dma;
         unsigned long        mem_size;
-        unsigned int         rx_buf_size;
+
+        struct net_device_stats net_stats;
 };
 
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 8a2109a913b6..81f24847c963 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -499,7 +499,7 @@ static inline void	 smc911x_rcv(struct net_device *dev)
                 SMC_SET_RX_CFG(RX_CFG_RX_END_ALGN4_ | ((2<<8) & RX_CFG_RXDOFF_));
                 SMC_PULL_DATA(data, pkt_len+2+3);
 
-                DBG(SMC_DEBUG_PKTS, "%s: Received packet\n", dev->name,);
+                DBG(SMC_DEBUG_PKTS, "%s: Received packet\n", dev->name);
                 PRINT_PKT(data, ((pkt_len - 4) <= 64) ? pkt_len - 4 : 64);
                 dev->last_rx = jiffies;
                 skb->protocol = eth_type_trans(skb, dev);
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index d7741e23f8de..f1e2dfc795a2 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1,35 +1,34 @@
-/* tc35815.c: A TOSHIBA TC35815CF PCI 10/100Mbps ethernet driver for linux.
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *                ahennessy@mvista.com
+/*
+ * tc35815.c: A TOSHIBA TC35815CF PCI 10/100Mbps ethernet driver for linux.
  *
  * Based on skelton.c by Donald Becker.
- * Copyright (C) 2000-2001 Toshiba Corporation
  *
- * 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 the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
+ * This driver is a replacement of older and less maintained version.
+ * This is a header of the older version:
+ *      -----<snip>-----
+ *      Copyright 2001 MontaVista Software Inc.
+ *      Author: MontaVista Software, Inc.
+ *              ahennessy@mvista.com
+ *      Copyright (C) 2000-2001 Toshiba Corporation
+ *      static const char *version =
+ *              "tc35815.c:v0.00 26/07/2000 by Toshiba Corporation\n";
+ *      -----<snip>-----
  *
- * THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- * WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- * NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- * USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * 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.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * (C) Copyright TOSHIBA CORPORATION 2004-2005
+ * All Rights Reserved.
  */
 
-static const char *version =
-        "tc35815.c:v0.00 26/07/2000 by Toshiba Corporation\n";
+#ifdef TC35815_NAPI
+#define DRV_VERSION     "1.35-NAPI"
+#else
+#define DRV_VERSION     "1.35"
+#endif
+static const char *version = "tc35815.c:v" DRV_VERSION "\n";
+#define MODNAME                 "tc35815"
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -40,6 +39,7 @@ static const char *version =
 #include <linux/in.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
@@ -47,36 +47,47 @@ static const char *version =
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/proc_fs.h>
-#include <linux/spinlock.h>
-#include <linux/bitops.h>
-
-#include <asm/system.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
 #include <asm/io.h>
-#include <asm/dma.h>
 #include <asm/byteorder.h>
 
-/*
- * The name of the card. Is used for messages and in the requests for
- * io regions, irqs and dma channels
- */
-static const char* cardname = "TC35815CF";
-#define TC35815_PROC_ENTRY "net/tc35815"
-
-#define TC35815_MODULE_NAME "TC35815CF"
-#define TX_TIMEOUT (4*HZ)
-
 /* First, a few definitions that the brave might change. */
 
-/* use 0 for production, 1 for verification, >2 for debug */
-#ifndef TC35815_DEBUG
-#define TC35815_DEBUG 1
-#endif
-static unsigned int tc35815_debug = TC35815_DEBUG;
-
 #define GATHER_TXINT    /* On-Demand Tx Interrupt */
+#define WORKAROUND_LOSTCAR
+#define WORKAROUND_100HALF_PROMISC
+/* #define TC35815_USE_PACKEDBUFFER */
+
+typedef enum {
+        TC35815CF = 0,
+        TC35815_NWU,
+        TC35815_TX4939,
+} board_t;
+
+/* indexed by board_t, above */
+static const struct {
+        const char *name;
+} board_info[] __devinitdata = {
+        { "TOSHIBA TC35815CF 10/100BaseTX" },
+        { "TOSHIBA TC35815 with Wake on LAN" },
+        { "TOSHIBA TC35815/TX4939" },
+};
+
+static const struct pci_device_id tc35815_pci_tbl[] = {
+        {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815CF), .driver_data = TC35815CF },
+        {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_NWU), .driver_data = TC35815_NWU },
+        {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939), .driver_data = TC35815_TX4939 },
+        {0,}
+};
+MODULE_DEVICE_TABLE (pci, tc35815_pci_tbl);
 
-#define vtonocache(p)   KSEG1ADDR(virt_to_phys(p))
+/* see MODULE_PARM_DESC */
+static struct tc35815_options {
+        int speed;
+        int duplex;
+        int doforce;
+} options;
 
 /*
  * Registers
@@ -119,6 +130,11 @@ struct tc35815_regs {
  * Bit assignments
  */
 /* DMA_Ctl bit asign ------------------------------------------------------- */
+#define DMA_RxAlign            0x00c00000 /* 1:Reception Alignment           */
+#define DMA_RxAlign_1          0x00400000
+#define DMA_RxAlign_2          0x00800000
+#define DMA_RxAlign_3          0x00c00000
+#define DMA_M66EnStat          0x00080000 /* 1:66MHz Enable State            */
 #define DMA_IntMask            0x00040000 /* 1:Interupt mask                 */
 #define DMA_SWIntReq           0x00020000 /* 1:Software Interrupt request    */
 #define DMA_TxWakeUp           0x00010000 /* 1:Transmit Wake Up              */
@@ -269,42 +285,6 @@ struct tc35815_regs {
 #define MD_CA_Wr               0x00000400 /* 1:Write 0:Read                  */
 
 
-/* MII register offsets */
-#define MII_CONTROL             0x0000
-#define MII_STATUS              0x0001
-#define MII_PHY_ID0             0x0002
-#define MII_PHY_ID1             0x0003
-#define MII_ANAR                0x0004
-#define MII_ANLPAR              0x0005
-#define MII_ANER                0x0006
-/* MII Control register bit definitions. */
-#define MIICNTL_FDX             0x0100
-#define MIICNTL_RST_AUTO        0x0200
-#define MIICNTL_ISOLATE         0x0400
-#define MIICNTL_PWRDWN          0x0800
-#define MIICNTL_AUTO            0x1000
-#define MIICNTL_SPEED           0x2000
-#define MIICNTL_LPBK            0x4000
-#define MIICNTL_RESET           0x8000
-/* MII Status register bit significance. */
-#define MIISTAT_EXT             0x0001
-#define MIISTAT_JAB             0x0002
-#define MIISTAT_LINK            0x0004
-#define MIISTAT_CAN_AUTO        0x0008
-#define MIISTAT_FAULT           0x0010
-#define MIISTAT_AUTO_DONE       0x0020
-#define MIISTAT_CAN_T           0x0800
-#define MIISTAT_CAN_T_FDX       0x1000
-#define MIISTAT_CAN_TX          0x2000
-#define MIISTAT_CAN_TX_FDX      0x4000
-#define MIISTAT_CAN_T4          0x8000
-/* MII Auto-Negotiation Expansion/RemoteEnd Register Bits */
-#define MII_AN_TX_FDX           0x0100
-#define MII_AN_TX_HDX           0x0080
-#define MII_AN_10_FDX           0x0040
-#define MII_AN_10_HDX           0x0020
-
-
 /*
  * Descriptors
  */
@@ -352,32 +332,51 @@ struct BDesc {
 
 #ifdef NO_CHECK_CARRIER
 #define TX_CTL_CMD      (Tx_EnComp | Tx_EnTxPar | Tx_EnLateColl | \
-        Tx_EnExColl | Tx_EnLCarr | Tx_EnExDefer | Tx_EnUnder | \
-        Tx_En)  /* maybe  0x7d01 */
+        Tx_EnExColl | Tx_EnExDefer | Tx_EnUnder | \
+        Tx_En)  /* maybe  0x7b01 */
 #else
 #define TX_CTL_CMD      (Tx_EnComp | Tx_EnTxPar | Tx_EnLateColl | \
-        Tx_EnExColl | Tx_EnExDefer | Tx_EnUnder | \
-        Tx_En)  /* maybe  0x7f01 */
+        Tx_EnExColl | Tx_EnLCarr | Tx_EnExDefer | Tx_EnUnder | \
+        Tx_En)  /* maybe  0x7b01 */
 #endif
 #define RX_CTL_CMD      (Rx_EnGood | Rx_EnRxPar | Rx_EnLongErr | Rx_EnOver \
         | Rx_EnCRCErr | Rx_EnAlign | Rx_RxEn)   /* maybe 0x6f01 */
-
 #define INT_EN_CMD  (Int_NRAbtEn | \
-         Int_DParDEn | Int_DParErrEn | \
+        Int_DmParErrEn | Int_DParDEn | Int_DParErrEn | \
         Int_SSysErrEn  | Int_RMasAbtEn | Int_RTargAbtEn | \
         Int_STargAbtEn | \
         Int_BLExEn  | Int_FDAExEn) /* maybe 0xb7f*/
+#define DMA_CTL_CMD     DMA_BURST_SIZE
+#define HAVE_DMA_RXALIGN(lp)    likely((lp)->boardtype != TC35815CF)
 
 /* Tuning parameters */
 #define DMA_BURST_SIZE  32
 #define TX_THRESHOLD    1024
+#define TX_THRESHOLD_MAX 1536       /* used threshold with packet max byte for low pci transfer ability.*/
+#define TX_THRESHOLD_KEEP_LIMIT 10  /* setting threshold max value when overrun error occured this count. */
 
+/* 16 + RX_BUF_NUM * 8 + RX_FD_NUM * 16 + TX_FD_NUM * 32 <= PAGE_SIZE*FD_PAGE_NUM */
+#ifdef TC35815_USE_PACKEDBUFFER
 #define FD_PAGE_NUM 2
-#define FD_PAGE_ORDER 1
-/* 16 + RX_BUF_PAGES * 8 + RX_FD_NUM * 16 + TX_FD_NUM * 32 <= PAGE_SIZE*2 */
-#define RX_BUF_PAGES    8       /* >= 2 */
+#define RX_BUF_NUM      8       /* >= 2 */
 #define RX_FD_NUM       250     /* >= 32 */
 #define TX_FD_NUM       128
+#define RX_BUF_SIZE     PAGE_SIZE
+#else /* TC35815_USE_PACKEDBUFFER */
+#define FD_PAGE_NUM 4
+#define RX_BUF_NUM      128     /* < 256 */
+#define RX_FD_NUM       256     /* >= 32 */
+#define TX_FD_NUM       128
+#if RX_CTL_CMD & Rx_LongEn
+#define RX_BUF_SIZE     PAGE_SIZE
+#elif RX_CTL_CMD & Rx_StripCRC
+#define RX_BUF_SIZE     ALIGN(ETH_FRAME_LEN + 4 + 2, 32) /* +2: reserve */
+#else
+#define RX_BUF_SIZE     ALIGN(ETH_FRAME_LEN + 2, 32) /* +2: reserve */
+#endif
+#endif /* TC35815_USE_PACKEDBUFFER */
+#define RX_FD_RESERVE   (2 / 2) /* max 2 BD per RxFD */
+#define NAPI_WEIGHT     16
 
 struct TxFD {
         struct FDesc fd;
@@ -392,18 +391,27 @@ struct RxFD {
 
 struct FrFD {
         struct FDesc fd;
-        struct BDesc bd[RX_BUF_PAGES];
+        struct BDesc bd[RX_BUF_NUM];
 };
 
 
-extern unsigned long tc_readl(volatile __u32 *addr);
-extern void tc_writel(unsigned long data, volatile __u32 *addr);
+#define tc_readl(addr)  readl(addr)
+#define tc_writel(d, addr)      writel(d, addr)
+
+#define TC35815_TX_TIMEOUT  msecs_to_jiffies(400)
 
-dma_addr_t priv_dma_handle;
+/* Timer state engine. */
+enum tc35815_timer_state {
+        arbwait  = 0,   /* Waiting for auto negotiation to complete.          */
+        lupwait  = 1,   /* Auto-neg complete, awaiting link-up status.        */
+        ltrywait = 2,   /* Forcing try of all modes, from fastest to slowest. */
+        asleep   = 3,   /* Time inactive.                                     */
+        lcheck   = 4,   /* Check link status.                                 */
+};
 
 /* Information that need to be kept for each board. */
 struct tc35815_local {
-        struct net_device *next_module;
+        struct pci_dev *pci_dev;
 
         /* statistics */
         struct net_device_stats stats;
@@ -411,216 +419,372 @@ struct tc35815_local {
                 int max_tx_qlen;
                 int tx_ints;
                 int rx_ints;
+                int tx_underrun;
         } lstats;
 
-        int tbusy;
-        int option;
-#define TC35815_OPT_AUTO        0x00
-#define TC35815_OPT_10M 0x01
-#define TC35815_OPT_100M        0x02
-#define TC35815_OPT_FULLDUP     0x04
-        int linkspeed;  /* 10 or 100 */
+        /* Tx control lock.  This protects the transmit buffer ring
+         * state along with the "tx full" state of the driver.  This
+         * means all netif_queue flow control actions are protected
+         * by this lock as well.
+         */
+        spinlock_t lock;
+
+        int phy_addr;
         int fullduplex;
+        unsigned short saved_lpa;
+        struct timer_list timer;
+        enum tc35815_timer_state timer_state; /* State of auto-neg timer. */
+        unsigned int timer_ticks;       /* Number of clicks at each state  */
 
         /*
          * Transmitting: Batch Mode.
          *      1 BD in 1 TxFD.
-         * Receiving: Packing Mode.
+         * Receiving: Packing Mode. (TC35815_USE_PACKEDBUFFER)
          *      1 circular FD for Free Buffer List.
-         *      RX_BUG_PAGES BD in Free Buffer FD.
+         *      RX_BUF_NUM BD in Free Buffer FD.
          *      One Free Buffer BD has PAGE_SIZE data buffer.
+         * Or Non-Packing Mode.
+         *      1 circular FD for Free Buffer List.
+         *      RX_BUF_NUM BD in Free Buffer FD.
+         *      One Free Buffer BD has ETH_FRAME_LEN data buffer.
          */
-        struct pci_dev *pdev;
-        dma_addr_t fd_buf_dma_handle;
-        void * fd_buf;  /* for TxFD, TxFD, FrFD */
+        void * fd_buf;  /* for TxFD, RxFD, FrFD */
+        dma_addr_t fd_buf_dma;
         struct TxFD *tfd_base;
-        int tfd_start;
-        int tfd_end;
+        unsigned int tfd_start;
+        unsigned int tfd_end;
         struct RxFD *rfd_base;
         struct RxFD *rfd_limit;
         struct RxFD *rfd_cur;
         struct FrFD *fbl_ptr;
+#ifdef TC35815_USE_PACKEDBUFFER
         unsigned char fbl_curid;
-        dma_addr_t data_buf_dma_handle[RX_BUF_PAGES];
-        void * data_buf[RX_BUF_PAGES];          /* packing */
-        spinlock_t lock;
+        void * data_buf[RX_BUF_NUM];            /* packing */
+        dma_addr_t data_buf_dma[RX_BUF_NUM];
+        struct {
+                struct sk_buff *skb;
+                dma_addr_t skb_dma;
+        } tx_skbs[TX_FD_NUM];
+#else
+        unsigned int fbl_count;
+        struct {
+                struct sk_buff *skb;
+                dma_addr_t skb_dma;
+        } tx_skbs[TX_FD_NUM], rx_skbs[RX_BUF_NUM];
+#endif
+        struct mii_if_info mii;
+        unsigned short mii_id[2];
+        u32 msg_enable;
+        board_t boardtype;
 };
 
-/* Index to functions, as function prototypes. */
+static inline dma_addr_t fd_virt_to_bus(struct tc35815_local *lp, void *virt)
+{
+        return lp->fd_buf_dma + ((u8 *)virt - (u8 *)lp->fd_buf);
+}
+#ifdef DEBUG
+static inline void *fd_bus_to_virt(struct tc35815_local *lp, dma_addr_t bus)
+{
+        return (void *)((u8 *)lp->fd_buf + (bus - lp->fd_buf_dma));
+}
+#endif
+#ifdef TC35815_USE_PACKEDBUFFER
+static inline void *rxbuf_bus_to_virt(struct tc35815_local *lp, dma_addr_t bus)
+{
+        int i;
+        for (i = 0; i < RX_BUF_NUM; i++) {
+                if (bus >= lp->data_buf_dma[i] &&
+                    bus < lp->data_buf_dma[i] + PAGE_SIZE)
+                        return (void *)((u8 *)lp->data_buf[i] +
+                                        (bus - lp->data_buf_dma[i]));
+        }
+        return NULL;
+}
 
-static int __devinit tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr, unsigned int irq);
+#define TC35815_DMA_SYNC_ONDEMAND
+static void* alloc_rxbuf_page(struct pci_dev *hwdev, dma_addr_t *dma_handle)
+{
+#ifdef TC35815_DMA_SYNC_ONDEMAND
+        void *buf;
+        /* pci_map + pci_dma_sync will be more effective than
+         * pci_alloc_consistent on some archs. */
+        if ((buf = (void *)__get_free_page(GFP_ATOMIC)) == NULL)
+                return NULL;
+        *dma_handle = pci_map_single(hwdev, buf, PAGE_SIZE,
+                                     PCI_DMA_FROMDEVICE);
+        if (pci_dma_mapping_error(*dma_handle)) {
+                free_page((unsigned long)buf);
+                return NULL;
+        }
+        return buf;
+#else
+        return pci_alloc_consistent(hwdev, PAGE_SIZE, dma_handle);
+#endif
+}
+
+static void free_rxbuf_page(struct pci_dev *hwdev, void *buf, dma_addr_t dma_handle)
+{
+#ifdef TC35815_DMA_SYNC_ONDEMAND
+        pci_unmap_single(hwdev, dma_handle, PAGE_SIZE, PCI_DMA_FROMDEVICE);
+        free_page((unsigned long)buf);
+#else
+        pci_free_consistent(hwdev, PAGE_SIZE, buf, dma_handle);
+#endif
+}
+#else /* TC35815_USE_PACKEDBUFFER */
+static struct sk_buff *alloc_rxbuf_skb(struct net_device *dev,
+                                       struct pci_dev *hwdev,
+                                       dma_addr_t *dma_handle)
+{
+        struct sk_buff *skb;
+        skb = dev_alloc_skb(RX_BUF_SIZE);
+        if (!skb)
+                return NULL;
+        skb->dev = dev;
+        *dma_handle = pci_map_single(hwdev, skb->data, RX_BUF_SIZE,
+                                     PCI_DMA_FROMDEVICE);
+        if (pci_dma_mapping_error(*dma_handle)) {
+                dev_kfree_skb_any(skb);
+                return NULL;
+        }
+        skb_reserve(skb, 2);    /* make IP header 4byte aligned */
+        return skb;
+}
+
+static void free_rxbuf_skb(struct pci_dev *hwdev, struct sk_buff *skb, dma_addr_t dma_handle)
+{
+        pci_unmap_single(hwdev, dma_handle, RX_BUF_SIZE,
+                         PCI_DMA_FROMDEVICE);
+        dev_kfree_skb_any(skb);
+}
+#endif /* TC35815_USE_PACKEDBUFFER */
+
+/* Index to functions, as function prototypes. */
 
 static int      tc35815_open(struct net_device *dev);
 static int      tc35815_send_packet(struct sk_buff *skb, struct net_device *dev);
-static void     tc35815_tx_timeout(struct net_device *dev);
-static irqreturn_t tc35815_interrupt(int irq, void *dev_id);
+static irqreturn_t      tc35815_interrupt(int irq, void *dev_id);
+#ifdef TC35815_NAPI
+static int      tc35815_rx(struct net_device *dev, int limit);
+static int      tc35815_poll(struct net_device *dev, int *budget);
+#else
 static void     tc35815_rx(struct net_device *dev);
+#endif
 static void     tc35815_txdone(struct net_device *dev);
 static int      tc35815_close(struct net_device *dev);
 static struct   net_device_stats *tc35815_get_stats(struct net_device *dev);
 static void     tc35815_set_multicast_list(struct net_device *dev);
+static void     tc35815_tx_timeout(struct net_device *dev);
+static int      tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void     tc35815_poll_controller(struct net_device *dev);
+#endif
+static const struct ethtool_ops tc35815_ethtool_ops;
 
+/* Example routines you must write ;->. */
 static void     tc35815_chip_reset(struct net_device *dev);
 static void     tc35815_chip_init(struct net_device *dev);
+static void     tc35815_find_phy(struct net_device *dev);
 static void     tc35815_phy_chip_init(struct net_device *dev);
 
-/* A list of all installed tc35815 devices. */
-static struct net_device *root_tc35815_dev = NULL;
+#ifdef DEBUG
+static void     panic_queues(struct net_device *dev);
+#endif
 
-/*
- * PCI device identifiers for "new style" Linux PCI Device Drivers
- */
-static struct pci_device_id tc35815_pci_tbl[] = {
-    { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-    { 0, }
-};
+static void tc35815_timer(unsigned long data);
+static void tc35815_start_auto_negotiation(struct net_device *dev,
+                                           struct ethtool_cmd *ep);
+static int tc_mdio_read(struct net_device *dev, int phy_id, int location);
+static void tc_mdio_write(struct net_device *dev, int phy_id, int location,
+                          int val);
 
-MODULE_DEVICE_TABLE (pci, tc35815_pci_tbl);
+static void __devinit tc35815_init_dev_addr (struct net_device *dev)
+{
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        int i;
 
-int
-tc35815_probe(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
+        /* dev_addr will be overwritten on NETDEV_REGISTER event */
+        while (tc_readl(&tr->PROM_Ctl) & PROM_Busy)
+                ;
+        for (i = 0; i < 6; i += 2) {
+                unsigned short data;
+                tc_writel(PROM_Busy | PROM_Read | (i / 2 + 2), &tr->PROM_Ctl);
+                while (tc_readl(&tr->PROM_Ctl) & PROM_Busy)
+                        ;
+                data = tc_readl(&tr->PROM_Data);
+                dev->dev_addr[i] = data & 0xff;
+                dev->dev_addr[i+1] = data >> 8;
+        }
+}
+
+static int __devinit tc35815_init_one (struct pci_dev *pdev,
+                                       const struct pci_device_id *ent)
 {
-        int err = 0;
-        int ret;
-        unsigned long pci_memaddr;
-        unsigned int pci_irq_line;
+        void __iomem *ioaddr = NULL;
+        struct net_device *dev;
+        struct tc35815_local *lp;
+        int rc;
+        unsigned long mmio_start, mmio_end, mmio_flags, mmio_len;
+
+        static int printed_version;
+        if (!printed_version++) {
+                printk(version);
+                dev_printk(KERN_DEBUG, &pdev->dev,
+                           "speed:%d duplex:%d doforce:%d\n",
+                           options.speed, options.duplex, options.doforce);
+        }
 
-        printk(KERN_INFO "tc35815_probe: found device %#08x.%#08x\n", ent->vendor, ent->device);
+        if (!pdev->irq) {
+                dev_warn(&pdev->dev, "no IRQ assigned.\n");
+                return -ENODEV;
+        }
 
-        err = pci_enable_device(pdev);
-        if (err)
-                return err;
+        /* dev zeroed in alloc_etherdev */
+        dev = alloc_etherdev (sizeof (*lp));
+        if (dev == NULL) {
+                dev_err(&pdev->dev, "unable to alloc new ethernet\n");
+                return -ENOMEM;
+        }
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        lp = dev->priv;
+
+        /* enable device (incl. PCI PM wakeup), and bus-mastering */
+        rc = pci_enable_device (pdev);
+        if (rc)
+                goto err_out;
 
-        pci_memaddr = pci_resource_start (pdev, 1);
+        mmio_start = pci_resource_start (pdev, 1);
+        mmio_end = pci_resource_end (pdev, 1);
+        mmio_flags = pci_resource_flags (pdev, 1);
+        mmio_len = pci_resource_len (pdev, 1);
 
-        printk(KERN_INFO "    pci_memaddr=%#08lx  resource_flags=%#08lx\n", pci_memaddr, pci_resource_flags (pdev, 0));
+        /* set this immediately, we need to know before
+         * we talk to the chip directly */
 
-        if (!pci_memaddr) {
-                printk(KERN_WARNING "no PCI MEM resources, aborting\n");
-                ret = -ENODEV;
+        /* make sure PCI base addr 1 is MMIO */
+        if (!(mmio_flags & IORESOURCE_MEM)) {
+                dev_err(&pdev->dev, "region #1 not an MMIO resource, aborting\n");
+                rc = -ENODEV;
                 goto err_out;
         }
-        pci_irq_line = pdev->irq;
-        /* irq disabled. */
-        if (pci_irq_line == 0) {
-                printk(KERN_WARNING "no PCI irq, aborting\n");
-                ret = -ENODEV;
+
+        /* check for weird/broken PCI region reporting */
+        if ((mmio_len < sizeof(struct tc35815_regs))) {
+                dev_err(&pdev->dev, "Invalid PCI region size(s), aborting\n");
+                rc = -ENODEV;
                 goto err_out;
         }
 
-        ret =  tc35815_probe1(pdev, pci_memaddr, pci_irq_line);
-        if (ret)
+        rc = pci_request_regions (pdev, MODNAME);
+        if (rc)
                 goto err_out;
 
-        pci_set_master(pdev);
-
-        return 0;
+        pci_set_master (pdev);
 
-err_out:
-        pci_disable_device(pdev);
-        return ret;
-}
+        /* ioremap MMIO region */
+        ioaddr = ioremap (mmio_start, mmio_len);
+        if (ioaddr == NULL) {
+                dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
+                rc = -EIO;
+                goto err_out_free_res;
+        }
 
-static int __devinit tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr, unsigned int irq)
-{
-        static unsigned version_printed = 0;
-        int i, ret;
-        struct tc35815_local *lp;
-        struct tc35815_regs *tr;
-        struct net_device *dev;
+        /* Initialize the device structure. */
+        dev->open = tc35815_open;
+        dev->hard_start_xmit = tc35815_send_packet;
+        dev->stop = tc35815_close;
+        dev->get_stats = tc35815_get_stats;
+        dev->set_multicast_list = tc35815_set_multicast_list;
+        dev->do_ioctl = tc35815_ioctl;
+        dev->ethtool_ops = &tc35815_ethtool_ops;
+        dev->tx_timeout = tc35815_tx_timeout;
+        dev->watchdog_timeo = TC35815_TX_TIMEOUT;
+#ifdef TC35815_NAPI
+        dev->poll = tc35815_poll;
+        dev->weight = NAPI_WEIGHT;
+#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = tc35815_poll_controller;
+#endif
 
-        /* Allocate a new 'dev' if needed. */
-        dev = alloc_etherdev(sizeof(struct tc35815_local));
-        if (dev == NULL)
-                return -ENOMEM;
+        dev->irq = pdev->irq;
+        dev->base_addr = (unsigned long) ioaddr;
 
-        /*
-         * alloc_etherdev allocs and zeros dev->priv
-         */
+        /* dev->priv/lp zeroed and aligned in alloc_etherdev */
         lp = dev->priv;
+        spin_lock_init(&lp->lock);
+        lp->pci_dev = pdev;
+        lp->boardtype = ent->driver_data;
 
-        if (tc35815_debug  &&  version_printed++ == 0)
-                printk(KERN_DEBUG "%s", version);
-
-        /* Fill in the 'dev' fields. */
-        dev->irq = irq;
-        dev->base_addr = (unsigned long)ioremap(base_addr,
-                                                sizeof(struct tc35815_regs));
-        if (!dev->base_addr) {
-                ret = -ENOMEM;
-                goto err_out;
-        }
-        tr = (struct tc35815_regs*)dev->base_addr;
+        lp->msg_enable = NETIF_MSG_TX_ERR | NETIF_MSG_HW | NETIF_MSG_DRV | NETIF_MSG_LINK;
+        pci_set_drvdata(pdev, dev);
 
+        /* Soft reset the chip. */
         tc35815_chip_reset(dev);
 
-        /* Retrieve and print the ethernet address. */
-        while (tc_readl(&tr->PROM_Ctl) & PROM_Busy)
-                ;
-        for (i = 0; i < 6; i += 2) {
-                unsigned short data;
-                tc_writel(PROM_Busy | PROM_Read | (i / 2 + 2), &tr->PROM_Ctl);
-                while (tc_readl(&tr->PROM_Ctl) & PROM_Busy)
-                        ;
-                data = tc_readl(&tr->PROM_Data);
-                dev->dev_addr[i] = data & 0xff;
-                dev->dev_addr[i+1] = data >> 8;
-        }
+        /* Retrieve the ethernet address. */
+        tc35815_init_dev_addr(dev);
+
+        rc = register_netdev (dev);
+        if (rc)
+                goto err_out_unmap;
+
+        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+        printk(KERN_INFO "%s: %s at 0x%lx, "
+                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
+                "IRQ %d\n",
+                dev->name,
+                board_info[ent->driver_data].name,
+                dev->base_addr,
+                dev->dev_addr[0], dev->dev_addr[1],
+                dev->dev_addr[2], dev->dev_addr[3],
+                dev->dev_addr[4], dev->dev_addr[5],
+                dev->irq);
+
+        setup_timer(&lp->timer, tc35815_timer, (unsigned long) dev);
+        lp->mii.dev = dev;
+        lp->mii.mdio_read = tc_mdio_read;
+        lp->mii.mdio_write = tc_mdio_write;
+        lp->mii.phy_id_mask = 0x1f;
+        lp->mii.reg_num_mask = 0x1f;
+        tc35815_find_phy(dev);
+        lp->mii.phy_id = lp->phy_addr;
+        lp->mii.full_duplex = 0;
+        lp->mii.force_media = 0;
 
-        /* Initialize the device structure. */
-        lp->pdev = pdev;
-        lp->next_module = root_tc35815_dev;
-        root_tc35815_dev = dev;
+        return 0;
 
-        spin_lock_init(&lp->lock);
+err_out_unmap:
+        iounmap(ioaddr);
+err_out_free_res:
+        pci_release_regions (pdev);
+err_out:
+        free_netdev (dev);
+        return rc;
+}
 
-        if (dev->mem_start > 0) {
-                lp->option = dev->mem_start;
-                if ((lp->option & TC35815_OPT_10M) &&
-                    (lp->option & TC35815_OPT_100M)) {
-                        /* if both speed speficied, auto select. */
-                        lp->option &= ~(TC35815_OPT_10M | TC35815_OPT_100M);
-                }
-        }
-        //XXX fixme
-        lp->option |= TC35815_OPT_10M;
 
-        /* do auto negotiation */
-        tc35815_phy_chip_init(dev);
+static void __devexit tc35815_remove_one (struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata (pdev);
+        unsigned long mmio_addr;
 
-        dev->open               = tc35815_open;
-        dev->stop               = tc35815_close;
-        dev->tx_timeout         = tc35815_tx_timeout;
-        dev->watchdog_timeo     = TX_TIMEOUT;
-        dev->hard_start_xmit    = tc35815_send_packet;
-        dev->get_stats          = tc35815_get_stats;
-        dev->set_multicast_list = tc35815_set_multicast_list;
-        SET_MODULE_OWNER(dev);
-        SET_NETDEV_DEV(dev, &pdev->dev);
+        mmio_addr = dev->base_addr;
 
-        ret = register_netdev(dev);
-        if (ret)
-                goto err_out_iounmap;
+        unregister_netdev (dev);
 
-        printk(KERN_INFO "%s: %s found at %#x, irq %d, MAC",
-               dev->name, cardname, base_addr, irq);
-        for (i = 0; i < 6; i++)
-                printk(" %2.2x", dev->dev_addr[i]);
-        printk("\n");
-        printk(KERN_INFO "%s: linkspeed %dMbps, %s Duplex\n",
-               dev->name, lp->linkspeed, lp->fullduplex ? "Full" : "Half");
+        if (mmio_addr) {
+                iounmap ((void __iomem *)mmio_addr);
+                pci_release_regions (pdev);
+        }
 
-        return 0;
+        free_netdev (dev);
 
-err_out_iounmap:
-        iounmap((void *) dev->base_addr);
-err_out:
-        free_netdev(dev);
-        return ret;
+        pci_set_drvdata (pdev, NULL);
 }
 
-
 static int
 tc35815_init_queues(struct net_device *dev)
 {
@@ -629,44 +793,64 @@ tc35815_init_queues(struct net_device *dev)
         unsigned long fd_addr;
 
         if (!lp->fd_buf) {
-                if (sizeof(struct FDesc) +
-                    sizeof(struct BDesc) * RX_BUF_PAGES +
-                    sizeof(struct FDesc) * RX_FD_NUM +
-                    sizeof(struct TxFD) * TX_FD_NUM > PAGE_SIZE * FD_PAGE_NUM) {
-                        printk(KERN_WARNING "%s: Invalid Queue Size.\n", dev->name);
-                        return -ENOMEM;
-                }
+                BUG_ON(sizeof(struct FDesc) +
+                       sizeof(struct BDesc) * RX_BUF_NUM +
+                       sizeof(struct FDesc) * RX_FD_NUM +
+                       sizeof(struct TxFD) * TX_FD_NUM >
+                       PAGE_SIZE * FD_PAGE_NUM);
 
-                if ((lp->fd_buf = (void *)__get_free_pages(GFP_KERNEL, FD_PAGE_ORDER)) == 0)
+                if ((lp->fd_buf = pci_alloc_consistent(lp->pci_dev, PAGE_SIZE * FD_PAGE_NUM, &lp->fd_buf_dma)) == 0)
                         return -ENOMEM;
-                for (i = 0; i < RX_BUF_PAGES; i++) {
-                        if ((lp->data_buf[i] = (void *)get_zeroed_page(GFP_KERNEL)) == 0) {
+                for (i = 0; i < RX_BUF_NUM; i++) {
+#ifdef TC35815_USE_PACKEDBUFFER
+                        if ((lp->data_buf[i] = alloc_rxbuf_page(lp->pci_dev, &lp->data_buf_dma[i])) == NULL) {
                                 while (--i >= 0) {
-                                        free_page((unsigned long)lp->data_buf[i]);
-                                        lp->data_buf[i] = 0;
+                                        free_rxbuf_page(lp->pci_dev,
+                                                        lp->data_buf[i],
+                                                        lp->data_buf_dma[i]);
+                                        lp->data_buf[i] = NULL;
                                 }
-                                free_page((unsigned long)lp->fd_buf);
-                                lp->fd_buf = 0;
+                                pci_free_consistent(lp->pci_dev,
+                                                    PAGE_SIZE * FD_PAGE_NUM,
+                                                    lp->fd_buf,
+                                                    lp->fd_buf_dma);
+                                lp->fd_buf = NULL;
+                                return -ENOMEM;
+                        }
+#else
+                        lp->rx_skbs[i].skb =
+                                alloc_rxbuf_skb(dev, lp->pci_dev,
+                                                &lp->rx_skbs[i].skb_dma);
+                        if (!lp->rx_skbs[i].skb) {
+                                while (--i >= 0) {
+                                        free_rxbuf_skb(lp->pci_dev,
+                                                       lp->rx_skbs[i].skb,
+                                                       lp->rx_skbs[i].skb_dma);
+                                        lp->rx_skbs[i].skb = NULL;
+                                }
+                                pci_free_consistent(lp->pci_dev,
+                                                    PAGE_SIZE * FD_PAGE_NUM,
+                                                    lp->fd_buf,
+                                                    lp->fd_buf_dma);
+                                lp->fd_buf = NULL;
                                 return -ENOMEM;
                         }
-#ifdef __mips__
-                        dma_cache_wback_inv((unsigned long)lp->data_buf[i], PAGE_SIZE * FD_PAGE_NUM);
 #endif
                 }
-#ifdef __mips__
-                dma_cache_wback_inv((unsigned long)lp->fd_buf, PAGE_SIZE * FD_PAGE_NUM);
+                printk(KERN_DEBUG "%s: FD buf %p DataBuf",
+                       dev->name, lp->fd_buf);
+#ifdef TC35815_USE_PACKEDBUFFER
+                printk(" DataBuf");
+                for (i = 0; i < RX_BUF_NUM; i++)
+                        printk(" %p", lp->data_buf[i]);
 #endif
+                printk("\n");
         } else {
-                memset(lp->fd_buf, 0, PAGE_SIZE * FD_PAGE_NUM);
-#ifdef __mips__
-                dma_cache_wback_inv((unsigned long)lp->fd_buf, PAGE_SIZE * FD_PAGE_NUM);
-#endif
+                for (i = 0; i < FD_PAGE_NUM; i++) {
+                        clear_page((void *)((unsigned long)lp->fd_buf + i * PAGE_SIZE));
+                }
         }
-#ifdef __mips__
-        fd_addr = (unsigned long)vtonocache(lp->fd_buf);
-#else
         fd_addr = (unsigned long)lp->fd_buf;
-#endif
 
         /* Free Descriptors (for Receive) */
         lp->rfd_base = (struct RxFD *)fd_addr;
@@ -675,34 +859,66 @@ tc35815_init_queues(struct net_device *dev)
                 lp->rfd_base[i].fd.FDCtl = cpu_to_le32(FD_CownsFD);
         }
         lp->rfd_cur = lp->rfd_base;
-        lp->rfd_limit = (struct RxFD *)(fd_addr -
-                                        sizeof(struct FDesc) -
-                                        sizeof(struct BDesc) * 30);
+        lp->rfd_limit = (struct RxFD *)fd_addr - (RX_FD_RESERVE + 1);
 
         /* Transmit Descriptors */
         lp->tfd_base = (struct TxFD *)fd_addr;
         fd_addr += sizeof(struct TxFD) * TX_FD_NUM;
         for (i = 0; i < TX_FD_NUM; i++) {
-                lp->tfd_base[i].fd.FDNext = cpu_to_le32(virt_to_bus(&lp->tfd_base[i+1]));
-                lp->tfd_base[i].fd.FDSystem = cpu_to_le32(0);
+                lp->tfd_base[i].fd.FDNext = cpu_to_le32(fd_virt_to_bus(lp, &lp->tfd_base[i+1]));
+                lp->tfd_base[i].fd.FDSystem = cpu_to_le32(0xffffffff);
                 lp->tfd_base[i].fd.FDCtl = cpu_to_le32(0);
         }
-        lp->tfd_base[TX_FD_NUM-1].fd.FDNext = cpu_to_le32(virt_to_bus(&lp->tfd_base[0]));
+        lp->tfd_base[TX_FD_NUM-1].fd.FDNext = cpu_to_le32(fd_virt_to_bus(lp, &lp->tfd_base[0]));
         lp->tfd_start = 0;
         lp->tfd_end = 0;
 
         /* Buffer List (for Receive) */
         lp->fbl_ptr = (struct FrFD *)fd_addr;
-        lp->fbl_ptr->fd.FDNext = cpu_to_le32(virt_to_bus(lp->fbl_ptr));
-        lp->fbl_ptr->fd.FDCtl = cpu_to_le32(RX_BUF_PAGES | FD_CownsFD);
-        for (i = 0; i < RX_BUF_PAGES; i++) {
-                lp->fbl_ptr->bd[i].BuffData = cpu_to_le32(virt_to_bus(lp->data_buf[i]));
+        lp->fbl_ptr->fd.FDNext = cpu_to_le32(fd_virt_to_bus(lp, lp->fbl_ptr));
+        lp->fbl_ptr->fd.FDCtl = cpu_to_le32(RX_BUF_NUM | FD_CownsFD);
+#ifndef TC35815_USE_PACKEDBUFFER
+        /*
+         * move all allocated skbs to head of rx_skbs[] array.
+         * fbl_count mighe not be RX_BUF_NUM if alloc_rxbuf_skb() in
+         * tc35815_rx() had failed.
+         */
+        lp->fbl_count = 0;
+        for (i = 0; i < RX_BUF_NUM; i++) {
+                if (lp->rx_skbs[i].skb) {
+                        if (i != lp->fbl_count) {
+                                lp->rx_skbs[lp->fbl_count].skb =
+                                        lp->rx_skbs[i].skb;
+                                lp->rx_skbs[lp->fbl_count].skb_dma =
+                                        lp->rx_skbs[i].skb_dma;
+                        }
+                        lp->fbl_count++;
+                }
+        }
+#endif
+        for (i = 0; i < RX_BUF_NUM; i++) {
+#ifdef TC35815_USE_PACKEDBUFFER
+                lp->fbl_ptr->bd[i].BuffData = cpu_to_le32(lp->data_buf_dma[i]);
+#else
+                if (i >= lp->fbl_count) {
+                        lp->fbl_ptr->bd[i].BuffData = 0;
+                        lp->fbl_ptr->bd[i].BDCtl = 0;
+                        continue;
+                }
+                lp->fbl_ptr->bd[i].BuffData =
+                        cpu_to_le32(lp->rx_skbs[i].skb_dma);
+#endif
                 /* BDID is index of FrFD.bd[] */
                 lp->fbl_ptr->bd[i].BDCtl =
-                        cpu_to_le32(BD_CownsBD | (i << BD_RxBDID_SHIFT) | PAGE_SIZE);
+                        cpu_to_le32(BD_CownsBD | (i << BD_RxBDID_SHIFT) |
+                                    RX_BUF_SIZE);
         }
+#ifdef TC35815_USE_PACKEDBUFFER
         lp->fbl_curid = 0;
+#endif
 
+        printk(KERN_DEBUG "%s: TxFD %p RxFD %p FrFD %p\n",
+               dev->name, lp->tfd_base, lp->rfd_base, lp->fbl_ptr);
         return 0;
 }
 
@@ -713,11 +929,25 @@ tc35815_clear_queues(struct net_device *dev)
         int i;
 
         for (i = 0; i < TX_FD_NUM; i++) {
-                struct sk_buff *skb = (struct sk_buff *)
-                        le32_to_cpu(lp->tfd_base[i].fd.FDSystem);
-                if (skb)
+                u32 fdsystem = le32_to_cpu(lp->tfd_base[i].fd.FDSystem);
+                struct sk_buff *skb =
+                        fdsystem != 0xffffffff ?
+                        lp->tx_skbs[fdsystem].skb : NULL;
+#ifdef DEBUG
+                if (lp->tx_skbs[i].skb != skb) {
+                        printk("%s: tx_skbs mismatch(%d).\n", dev->name, i);
+                        panic_queues(dev);
+                }
+#else
+                BUG_ON(lp->tx_skbs[i].skb != skb);
+#endif
+                if (skb) {
+                        pci_unmap_single(lp->pci_dev, lp->tx_skbs[i].skb_dma, skb->len, PCI_DMA_TODEVICE);
+                        lp->tx_skbs[i].skb = NULL;
+                        lp->tx_skbs[i].skb_dma = 0;
                         dev_kfree_skb_any(skb);
-                lp->tfd_base[i].fd.FDSystem = cpu_to_le32(0);
+                }
+                lp->tfd_base[i].fd.FDSystem = cpu_to_le32(0xffffffff);
         }
 
         tc35815_init_queues(dev);
@@ -731,28 +961,53 @@ tc35815_free_queues(struct net_device *dev)
 
         if (lp->tfd_base) {
                 for (i = 0; i < TX_FD_NUM; i++) {
-                        struct sk_buff *skb = (struct sk_buff *)
-                                le32_to_cpu(lp->tfd_base[i].fd.FDSystem);
-                        if (skb)
-                                dev_kfree_skb_any(skb);
-                        lp->tfd_base[i].fd.FDSystem = cpu_to_le32(0);
+                        u32 fdsystem = le32_to_cpu(lp->tfd_base[i].fd.FDSystem);
+                        struct sk_buff *skb =
+                                fdsystem != 0xffffffff ?
+                                lp->tx_skbs[fdsystem].skb : NULL;
+#ifdef DEBUG
+                        if (lp->tx_skbs[i].skb != skb) {
+                                printk("%s: tx_skbs mismatch(%d).\n", dev->name, i);
+                                panic_queues(dev);
+                        }
+#else
+                        BUG_ON(lp->tx_skbs[i].skb != skb);
+#endif
+                        if (skb) {
+                                dev_kfree_skb(skb);
+                                pci_unmap_single(lp->pci_dev, lp->tx_skbs[i].skb_dma, skb->len, PCI_DMA_TODEVICE);
+                                lp->tx_skbs[i].skb = NULL;
+                                lp->tx_skbs[i].skb_dma = 0;
+                        }
+                        lp->tfd_base[i].fd.FDSystem = cpu_to_le32(0xffffffff);
                 }
         }
 
         lp->rfd_base = NULL;
-        lp->rfd_base = NULL;
         lp->rfd_limit = NULL;
         lp->rfd_cur = NULL;
         lp->fbl_ptr = NULL;
 
-        for (i = 0; i < RX_BUF_PAGES; i++) {
-                if (lp->data_buf[i])
-                        free_page((unsigned long)lp->data_buf[i]);
-                lp->data_buf[i] = 0;
+        for (i = 0; i < RX_BUF_NUM; i++) {
+#ifdef TC35815_USE_PACKEDBUFFER
+                if (lp->data_buf[i]) {
+                        free_rxbuf_page(lp->pci_dev,
+                                        lp->data_buf[i], lp->data_buf_dma[i]);
+                        lp->data_buf[i] = NULL;
+                }
+#else
+                if (lp->rx_skbs[i].skb) {
+                        free_rxbuf_skb(lp->pci_dev, lp->rx_skbs[i].skb,
+                                       lp->rx_skbs[i].skb_dma);
+                        lp->rx_skbs[i].skb = NULL;
+                }
+#endif
+        }
+        if (lp->fd_buf) {
+                pci_free_consistent(lp->pci_dev, PAGE_SIZE * FD_PAGE_NUM,
+                                    lp->fd_buf, lp->fd_buf_dma);
+                lp->fd_buf = NULL;
         }
-        if (lp->fd_buf)
-                __free_pages(lp->fd_buf, FD_PAGE_ORDER);
-        lp->fd_buf = NULL;
 }
 
 static void
@@ -792,6 +1047,7 @@ dump_rxfd(struct RxFD *fd)
         return bd_count;
 }
 
+#if defined(DEBUG) || defined(TC35815_USE_PACKEDBUFFER)
 static void
 dump_frfd(struct FrFD *fd)
 {
@@ -802,20 +1058,22 @@ dump_frfd(struct FrFD *fd)
                le32_to_cpu(fd->fd.FDStat),
                le32_to_cpu(fd->fd.FDCtl));
         printk("BD: ");
-        for (i = 0; i < RX_BUF_PAGES; i++)
+        for (i = 0; i < RX_BUF_NUM; i++)
                 printk(" %08x %08x",
                        le32_to_cpu(fd->bd[i].BuffData),
                        le32_to_cpu(fd->bd[i].BDCtl));
         printk("\n");
 }
+#endif
 
+#ifdef DEBUG
 static void
 panic_queues(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
         int i;
 
-        printk("TxFD base %p, start %d, end %d\n",
+        printk("TxFD base %p, start %u, end %u\n",
                lp->tfd_base, lp->tfd_start, lp->tfd_end);
         printk("RxFD base %p limit %p cur %p\n",
                lp->rfd_base, lp->rfd_limit, lp->rfd_cur);
@@ -829,31 +1087,13 @@ panic_queues(struct net_device *dev)
         dump_frfd(lp->fbl_ptr);
         panic("%s: Illegal queue state.", dev->name);
 }
-
-#if 0
-static void print_buf(char *add, int length)
-{
-        int i;
-        int len = length;
-
-        printk("print_buf(%08x)(%x)\n", (unsigned int) add,length);
-
-        if (len > 100)
-                len = 100;
-        for (i = 0; i < len; i++) {
-                printk(" %2.2X", (unsigned char) add[i]);
-                if (!(i % 16))
-                        printk("\n");
-        }
-        printk("\n");
-}
 #endif
 
 static void print_eth(char *add)
 {
         int i;
 
-        printk("print_eth(%08x)\n", (unsigned int) add);
+        printk("print_eth(%p)\n", add);
         for (i = 0; i < 6; i++)
                 printk(" %2.2X", (unsigned char) add[i + 6]);
         printk(" =>");
@@ -862,6 +1102,73 @@ static void print_eth(char *add)
         printk(" : %2.2X%2.2X\n", (unsigned char) add[12], (unsigned char) add[13]);
 }
 
+static int tc35815_tx_full(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        return ((lp->tfd_start + 1) % TX_FD_NUM == lp->tfd_end);
+}
+
+static void tc35815_restart(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        int pid = lp->phy_addr;
+        int do_phy_reset = 1;
+        del_timer(&lp->timer);          /* Kill if running      */
+
+        if (lp->mii_id[0] == 0x0016 && (lp->mii_id[1] & 0xfc00) == 0xf800) {
+                /* Resetting PHY cause problem on some chip... (SEEQ 80221) */
+                do_phy_reset = 0;
+        }
+        if (do_phy_reset) {
+                int timeout;
+                tc_mdio_write(dev, pid, MII_BMCR, BMCR_RESET);
+                timeout = 100;
+                while (--timeout) {
+                        if (!(tc_mdio_read(dev, pid, MII_BMCR) & BMCR_RESET))
+                                break;
+                        udelay(1);
+                }
+                if (!timeout)
+                        printk(KERN_ERR "%s: BMCR reset failed.\n", dev->name);
+        }
+
+        tc35815_chip_reset(dev);
+        tc35815_clear_queues(dev);
+        tc35815_chip_init(dev);
+        /* Reconfigure CAM again since tc35815_chip_init() initialize it. */
+        tc35815_set_multicast_list(dev);
+}
+
+static void tc35815_tx_timeout(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+
+        printk(KERN_WARNING "%s: transmit timed out, status %#x\n",
+               dev->name, tc_readl(&tr->Tx_Stat));
+
+        /* Try to restart the adaptor. */
+        spin_lock_irq(&lp->lock);
+        tc35815_restart(dev);
+        spin_unlock_irq(&lp->lock);
+
+        lp->stats.tx_errors++;
+
+        /* If we have space available to accept new transmit
+         * requests, wake up the queueing layer.  This would
+         * be the case if the chipset_init() call above just
+         * flushes out the tx queue and empties it.
+         *
+         * If instead, the tx queue is retained then the
+         * netif_wake_queue() call should be placed in the
+         * TX completion interrupt handler of the driver instead
+         * of here.
+         */
+        if (!tc35815_tx_full(dev))
+                netif_wake_queue(dev);
+}
+
 /*
  * Open/initialize the board. This is called (in the current kernel)
  * sometime after booting when the 'ifconfig' program is run.
@@ -874,16 +1181,16 @@ static int
 tc35815_open(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
+
         /*
          * This is used if the interrupt line can turned off (shared).
          * See 3c503.c for an example of selecting the IRQ at config-time.
          */
-
-        if (dev->irq == 0  ||
-            request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED, cardname, dev)) {
+        if (request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED, dev->name, dev)) {
                 return -EAGAIN;
         }
 
+        del_timer(&lp->timer);          /* Kill if running      */
         tc35815_chip_reset(dev);
 
         if (tc35815_init_queues(dev) != 0) {
@@ -892,138 +1199,119 @@ tc35815_open(struct net_device *dev)
         }
 
         /* Reset the hardware here. Don't forget to set the station address. */
+        spin_lock_irq(&lp->lock);
         tc35815_chip_init(dev);
+        spin_unlock_irq(&lp->lock);
 
-        lp->tbusy = 0;
+        /* We are now ready to accept transmit requeusts from
+         * the queueing layer of the networking.
+         */
         netif_start_queue(dev);
 
         return 0;
 }
 
-static void tc35815_tx_timeout(struct net_device *dev)
-{
-        struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs *tr = (struct tc35815_regs *)dev->base_addr;
-        unsigned long flags;
-
-        spin_lock_irqsave(&lp->lock, flags);
-        printk(KERN_WARNING "%s: transmit timed out, status %#lx\n",
-               dev->name, tc_readl(&tr->Tx_Stat));
-        /* Try to restart the adaptor. */
-        tc35815_chip_reset(dev);
-        tc35815_clear_queues(dev);
-        tc35815_chip_init(dev);
-        lp->tbusy=0;
-        spin_unlock_irqrestore(&lp->lock, flags);
-        dev->trans_start = jiffies;
-        netif_wake_queue(dev);
-}
-
+/* This will only be invoked if your driver is _not_ in XOFF state.
+ * What this means is that you need not check it, and that this
+ * invariant will hold if you make sure that the netif_*_queue()
+ * calls are done at the proper times.
+ */
 static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs *tr = (struct tc35815_regs *)dev->base_addr;
-
-        if (netif_queue_stopped(dev)) {
-                /*
-                 * If we get here, some higher level has decided we are broken.
-                 * There should really be a "kick me" function call instead.
-                 */
-                int tickssofar = jiffies - dev->trans_start;
-                if (tickssofar < 5)
-                        return 1;
-                printk(KERN_WARNING "%s: transmit timed out, status %#lx\n",
-                       dev->name, tc_readl(&tr->Tx_Stat));
-                /* Try to restart the adaptor. */
-                tc35815_chip_reset(dev);
-                tc35815_clear_queues(dev);
-                tc35815_chip_init(dev);
-                lp->tbusy=0;
-                dev->trans_start = jiffies;
-                netif_wake_queue(dev);
-        }
+        struct TxFD *txfd;
+        unsigned long flags;
 
-        /*
-         * Block a timer-based transmit from overlapping. This could better be
-         * done with atomic_swap(1, lp->tbusy), but set_bit() works as well.
+        /* If some error occurs while trying to transmit this
+         * packet, you should return '1' from this function.
+         * In such a case you _may not_ do anything to the
+         * SKB, it is still owned by the network queueing
+         * layer when an error is returned.  This means you
+         * may not modify any SKB fields, you may not free
+         * the SKB, etc.
          */
-        if (test_and_set_bit(0, (void*)&lp->tbusy) != 0) {
-                printk(KERN_WARNING "%s: Transmitter access conflict.\n", dev->name);
-                dev_kfree_skb_any(skb);
-        } else {
-                short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
-                unsigned char *buf = skb->data;
-                struct TxFD *txfd = &lp->tfd_base[lp->tfd_start];
-                unsigned long flags;
-                lp->stats.tx_bytes += skb->len;
 
+        /* This is the most common case for modern hardware.
+         * The spinlock protects this code from the TX complete
+         * hardware interrupt handler.  Queue flow control is
+         * thus managed under this lock as well.
+         */
+        spin_lock_irqsave(&lp->lock, flags);
 
-#ifdef __mips__
-                dma_cache_wback_inv((unsigned long)buf, length);
+        /* failsafe... (handle txdone now if half of FDs are used) */
+        if ((lp->tfd_start + TX_FD_NUM - lp->tfd_end) % TX_FD_NUM >
+            TX_FD_NUM / 2)
+                tc35815_txdone(dev);
+
+        if (netif_msg_pktdata(lp))
+                print_eth(skb->data);
+#ifdef DEBUG
+        if (lp->tx_skbs[lp->tfd_start].skb) {
+                printk("%s: tx_skbs conflict.\n", dev->name);
+                panic_queues(dev);
+        }
+#else
+        BUG_ON(lp->tx_skbs[lp->tfd_start].skb);
 #endif
-
-                spin_lock_irqsave(&lp->lock, flags);
-
-                /* failsafe... */
-                if (lp->tfd_start != lp->tfd_end)
-                        tc35815_txdone(dev);
-
-
-                txfd->bd.BuffData = cpu_to_le32(virt_to_bus(buf));
-
-                txfd->bd.BDCtl = cpu_to_le32(length);
-                txfd->fd.FDSystem = cpu_to_le32((__u32)skb);
-                txfd->fd.FDCtl = cpu_to_le32(FD_CownsFD | (1 << FD_BDCnt_SHIFT));
-
-                if (lp->tfd_start == lp->tfd_end) {
-                        /* Start DMA Transmitter. */
-                        txfd->fd.FDNext |= cpu_to_le32(FD_Next_EOL);
+        lp->tx_skbs[lp->tfd_start].skb = skb;
+        lp->tx_skbs[lp->tfd_start].skb_dma = pci_map_single(lp->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE);
+
+        /*add to ring */
+        txfd = &lp->tfd_base[lp->tfd_start];
+        txfd->bd.BuffData = cpu_to_le32(lp->tx_skbs[lp->tfd_start].skb_dma);
+        txfd->bd.BDCtl = cpu_to_le32(skb->len);
+        txfd->fd.FDSystem = cpu_to_le32(lp->tfd_start);
+        txfd->fd.FDCtl = cpu_to_le32(FD_CownsFD | (1 << FD_BDCnt_SHIFT));
+
+        if (lp->tfd_start == lp->tfd_end) {
+                struct tc35815_regs __iomem *tr =
+                        (struct tc35815_regs __iomem *)dev->base_addr;
+                /* Start DMA Transmitter. */
+                txfd->fd.FDNext |= cpu_to_le32(FD_Next_EOL);
 #ifdef GATHER_TXINT
-                        txfd->fd.FDCtl |= cpu_to_le32(FD_FrmOpt_IntTx);
+                txfd->fd.FDCtl |= cpu_to_le32(FD_FrmOpt_IntTx);
 #endif
-                        if (tc35815_debug > 2) {
-                                printk("%s: starting TxFD.\n", dev->name);
-                                dump_txfd(txfd);
-                                if (tc35815_debug > 3)
-                                        print_eth(buf);
-                        }
-                        tc_writel(virt_to_bus(txfd), &tr->TxFrmPtr);
-                } else {
-                        txfd->fd.FDNext &= cpu_to_le32(~FD_Next_EOL);
-                        if (tc35815_debug > 2) {
-                                printk("%s: queueing TxFD.\n", dev->name);
-                                dump_txfd(txfd);
-                                if (tc35815_debug > 3)
-                                        print_eth(buf);
-                        }
+                if (netif_msg_tx_queued(lp)) {
+                        printk("%s: starting TxFD.\n", dev->name);
+                        dump_txfd(txfd);
                 }
-                lp->tfd_start = (lp->tfd_start + 1) % TX_FD_NUM;
+                tc_writel(fd_virt_to_bus(lp, txfd), &tr->TxFrmPtr);
+        } else {
+                txfd->fd.FDNext &= cpu_to_le32(~FD_Next_EOL);
+                if (netif_msg_tx_queued(lp)) {
+                        printk("%s: queueing TxFD.\n", dev->name);
+                        dump_txfd(txfd);
+                }
+        }
+        lp->tfd_start = (lp->tfd_start + 1) % TX_FD_NUM;
 
-                dev->trans_start = jiffies;
+        dev->trans_start = jiffies;
 
-                if ((lp->tfd_start + 1) % TX_FD_NUM != lp->tfd_end) {
-                        /* we can send another packet */
-                        lp->tbusy = 0;
-                        netif_start_queue(dev);
-                } else {
-                        netif_stop_queue(dev);
-                        if (tc35815_debug > 1)
-                                printk(KERN_WARNING "%s: TxFD Exhausted.\n", dev->name);
-                }
-                spin_unlock_irqrestore(&lp->lock, flags);
+        /* If we just used up the very last entry in the
+         * TX ring on this device, tell the queueing
+         * layer to send no more.
+         */
+        if (tc35815_tx_full(dev)) {
+                if (netif_msg_tx_queued(lp))
+                        printk(KERN_WARNING "%s: TxFD Exhausted.\n", dev->name);
+                netif_stop_queue(dev);
         }
 
+        /* When the TX completion hw interrupt arrives, this
+         * is when the transmit statistics are updated.
+         */
+
+        spin_unlock_irqrestore(&lp->lock, flags);
         return 0;
 }
 
 #define FATAL_ERROR_INT \
         (Int_IntPCI | Int_DmParErr | Int_IntNRAbt)
-static void tc35815_fatal_error_interrupt(struct net_device *dev, int status)
+static void tc35815_fatal_error_interrupt(struct net_device *dev, u32 status)
 {
         static int count;
         printk(KERN_WARNING "%s: Fatal Error Intterrupt (%#x):",
                dev->name, status);
-
         if (status & Int_IntPCI)
                 printk(" IntPCI");
         if (status & Int_DmParErr)
@@ -1033,110 +1321,170 @@ static void tc35815_fatal_error_interrupt(struct net_device *dev, int status)
         printk("\n");
         if (count++ > 100)
                 panic("%s: Too many fatal errors.", dev->name);
-        printk(KERN_WARNING "%s: Resetting %s...\n", dev->name, cardname);
+        printk(KERN_WARNING "%s: Resetting ...\n", dev->name);
         /* Try to restart the adaptor. */
-        tc35815_chip_reset(dev);
-        tc35815_clear_queues(dev);
-        tc35815_chip_init(dev);
+        tc35815_restart(dev);
+}
+
+#ifdef TC35815_NAPI
+static int tc35815_do_interrupt(struct net_device *dev, u32 status, int limit)
+#else
+static int tc35815_do_interrupt(struct net_device *dev, u32 status)
+#endif
+{
+        struct tc35815_local *lp = dev->priv;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        int ret = -1;
+
+        /* Fatal errors... */
+        if (status & FATAL_ERROR_INT) {
+                tc35815_fatal_error_interrupt(dev, status);
+                return 0;
+        }
+        /* recoverable errors */
+        if (status & Int_IntFDAEx) {
+                /* disable FDAEx int. (until we make rooms...) */
+                tc_writel(tc_readl(&tr->Int_En) & ~Int_FDAExEn, &tr->Int_En);
+                printk(KERN_WARNING
+                       "%s: Free Descriptor Area Exhausted (%#x).\n",
+                       dev->name, status);
+                lp->stats.rx_dropped++;
+                ret = 0;
+        }
+        if (status & Int_IntBLEx) {
+                /* disable BLEx int. (until we make rooms...) */
+                tc_writel(tc_readl(&tr->Int_En) & ~Int_BLExEn, &tr->Int_En);
+                printk(KERN_WARNING
+                       "%s: Buffer List Exhausted (%#x).\n",
+                       dev->name, status);
+                lp->stats.rx_dropped++;
+                ret = 0;
+        }
+        if (status & Int_IntExBD) {
+                printk(KERN_WARNING
+                       "%s: Excessive Buffer Descriptiors (%#x).\n",
+                       dev->name, status);
+                lp->stats.rx_length_errors++;
+                ret = 0;
+        }
+
+        /* normal notification */
+        if (status & Int_IntMacRx) {
+                /* Got a packet(s). */
+#ifdef TC35815_NAPI
+                ret = tc35815_rx(dev, limit);
+#else
+                tc35815_rx(dev);
+                ret = 0;
+#endif
+                lp->lstats.rx_ints++;
+        }
+        if (status & Int_IntMacTx) {
+                /* Transmit complete. */
+                lp->lstats.tx_ints++;
+                tc35815_txdone(dev);
+                netif_wake_queue(dev);
+                ret = 0;
+        }
+        return ret;
 }
 
 /*
  * The typical workload of the driver:
- *   Handle the network interface interrupts.
+ * Handle the network interface interrupts.
  */
 static irqreturn_t tc35815_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
-        struct tc35815_regs *tr;
-        struct tc35815_local *lp;
-        int status, boguscount = 0;
-        int handled = 0;
-
-        if (dev == NULL) {
-                printk(KERN_WARNING "%s: irq %d for unknown device.\n", cardname, irq);
-                return IRQ_NONE;
-        }
-
-        tr = (struct tc35815_regs*)dev->base_addr;
-        lp = dev->priv;
-
-        do {
-                status = tc_readl(&tr->Int_Src);
-                if (status == 0)
-                        break;
-                handled = 1;
-                tc_writel(status, &tr->Int_Src);        /* write to clear */
-
-                /* Fatal errors... */
-                if (status & FATAL_ERROR_INT) {
-                        tc35815_fatal_error_interrupt(dev, status);
-                        break;
-                }
-                /* recoverable errors */
-                if (status & Int_IntFDAEx) {
-                        /* disable FDAEx int. (until we make rooms...) */
-                        tc_writel(tc_readl(&tr->Int_En) & ~Int_FDAExEn, &tr->Int_En);
-                        printk(KERN_WARNING
-                               "%s: Free Descriptor Area Exhausted (%#x).\n",
-                               dev->name, status);
-                        lp->stats.rx_dropped++;
-                }
-                if (status & Int_IntBLEx) {
-                        /* disable BLEx int. (until we make rooms...) */
-                        tc_writel(tc_readl(&tr->Int_En) & ~Int_BLExEn, &tr->Int_En);
-                        printk(KERN_WARNING
-                               "%s: Buffer List Exhausted (%#x).\n",
-                               dev->name, status);
-                        lp->stats.rx_dropped++;
-                }
-                if (status & Int_IntExBD) {
-                        printk(KERN_WARNING
-                               "%s: Excessive Buffer Descriptiors (%#x).\n",
-                               dev->name, status);
-                        lp->stats.rx_length_errors++;
-                }
-                /* normal notification */
-                if (status & Int_IntMacRx) {
-                        /* Got a packet(s). */
-                        lp->lstats.rx_ints++;
-                        tc35815_rx(dev);
-                }
-                if (status & Int_IntMacTx) {
-                        lp->lstats.tx_ints++;
-                        tc35815_txdone(dev);
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+#ifdef TC35815_NAPI
+        u32 dmactl = tc_readl(&tr->DMA_Ctl);
+
+        if (!(dmactl & DMA_IntMask)) {
+                /* disable interrupts */
+                tc_writel(dmactl | DMA_IntMask, &tr->DMA_Ctl);
+                if (netif_rx_schedule_prep(dev))
+                        __netif_rx_schedule(dev);
+                else {
+                        printk(KERN_ERR "%s: interrupt taken in poll\n",
+                               dev->name);
+                        BUG();
                 }
-        } while (++boguscount < 20) ;
+                (void)tc_readl(&tr->Int_Src);   /* flush */
+                return IRQ_HANDLED;
+        }
+        return IRQ_NONE;
+#else
+        struct tc35815_local *lp = dev->priv;
+        int handled;
+        u32 status;
+
+        spin_lock(&lp->lock);
+        status = tc_readl(&tr->Int_Src);
+        tc_writel(status, &tr->Int_Src);        /* write to clear */
+        handled = tc35815_do_interrupt(dev, status);
+        (void)tc_readl(&tr->Int_Src);   /* flush */
+        spin_unlock(&lp->lock);
+        return IRQ_RETVAL(handled >= 0);
+#endif /* TC35815_NAPI */
+}
 
-        return IRQ_RETVAL(handled);
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void tc35815_poll_controller(struct net_device *dev)
+{
+        disable_irq(dev->irq);
+        tc35815_interrupt(dev->irq, dev);
+        enable_irq(dev->irq);
 }
+#endif
 
 /* We have a good packet(s), get it/them out of the buffers. */
+#ifdef TC35815_NAPI
+static int
+tc35815_rx(struct net_device *dev, int limit)
+#else
 static void
 tc35815_rx(struct net_device *dev)
+#endif
 {
         struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
         unsigned int fdctl;
         int i;
         int buf_free_count = 0;
         int fd_free_count = 0;
+#ifdef TC35815_NAPI
+        int received = 0;
+#endif
 
         while (!((fdctl = le32_to_cpu(lp->rfd_cur->fd.FDCtl)) & FD_CownsFD)) {
                 int status = le32_to_cpu(lp->rfd_cur->fd.FDStat);
                 int pkt_len = fdctl & FD_FDLength_MASK;
-                struct RxFD *next_rfd;
                 int bd_count = (fdctl & FD_BDCnt_MASK) >> FD_BDCnt_SHIFT;
+#ifdef DEBUG
+                struct RxFD *next_rfd;
+#endif
+#if (RX_CTL_CMD & Rx_StripCRC) == 0
+                pkt_len -= 4;
+#endif
 
-                if (tc35815_debug > 2)
+                if (netif_msg_rx_status(lp))
                         dump_rxfd(lp->rfd_cur);
                 if (status & Rx_Good) {
-                        /* Malloc up new buffer. */
                         struct sk_buff *skb;
                         unsigned char *data;
-                        int cur_bd, offset;
-
-                        lp->stats.rx_bytes += pkt_len;
+                        int cur_bd;
+#ifdef TC35815_USE_PACKEDBUFFER
+                        int offset;
+#endif
 
+#ifdef TC35815_NAPI
+                        if (--limit < 0)
+                                break;
+#endif
+#ifdef TC35815_USE_PACKEDBUFFER
+                        BUG_ON(bd_count > 2);
                         skb = dev_alloc_skb(pkt_len + 2); /* +2: for reserve */
                         if (skb == NULL) {
                                 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n",
@@ -1154,25 +1502,69 @@ tc35815_rx(struct net_device *dev)
                         while (offset < pkt_len && cur_bd < bd_count) {
                                 int len = le32_to_cpu(lp->rfd_cur->bd[cur_bd].BDCtl) &
                                         BD_BuffLength_MASK;
-                                void *rxbuf =
-                                        bus_to_virt(le32_to_cpu(lp->rfd_cur->bd[cur_bd].BuffData));
-#ifdef __mips__
-                                dma_cache_inv((unsigned long)rxbuf, len);
+                                dma_addr_t dma = le32_to_cpu(lp->rfd_cur->bd[cur_bd].BuffData);
+                                void *rxbuf = rxbuf_bus_to_virt(lp, dma);
+                                if (offset + len > pkt_len)
+                                        len = pkt_len - offset;
+#ifdef TC35815_DMA_SYNC_ONDEMAND
+                                pci_dma_sync_single_for_cpu(lp->pci_dev,
+                                                            dma, len,
+                                                            PCI_DMA_FROMDEVICE);
 #endif
                                 memcpy(data + offset, rxbuf, len);
+#ifdef TC35815_DMA_SYNC_ONDEMAND
+                                pci_dma_sync_single_for_device(lp->pci_dev,
+                                                               dma, len,
+                                                               PCI_DMA_FROMDEVICE);
+#endif
                                 offset += len;
                                 cur_bd++;
                         }
-#if 0
-                        print_buf(data,pkt_len);
+#else /* TC35815_USE_PACKEDBUFFER */
+                        BUG_ON(bd_count > 1);
+                        cur_bd = (le32_to_cpu(lp->rfd_cur->bd[0].BDCtl)
+                                  & BD_RxBDID_MASK) >> BD_RxBDID_SHIFT;
+#ifdef DEBUG
+                        if (cur_bd >= RX_BUF_NUM) {
+                                printk("%s: invalid BDID.\n", dev->name);
+                                panic_queues(dev);
+                        }
+                        BUG_ON(lp->rx_skbs[cur_bd].skb_dma !=
+                               (le32_to_cpu(lp->rfd_cur->bd[0].BuffData) & ~3));
+                        if (!lp->rx_skbs[cur_bd].skb) {
+                                printk("%s: NULL skb.\n", dev->name);
+                                panic_queues(dev);
+                        }
+#else
+                        BUG_ON(cur_bd >= RX_BUF_NUM);
 #endif
-                        if (tc35815_debug > 3)
+                        skb = lp->rx_skbs[cur_bd].skb;
+                        prefetch(skb->data);
+                        lp->rx_skbs[cur_bd].skb = NULL;
+                        lp->fbl_count--;
+                        pci_unmap_single(lp->pci_dev,
+                                         lp->rx_skbs[cur_bd].skb_dma,
+                                         RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                        if (!HAVE_DMA_RXALIGN(lp))
+                                memmove(skb->data, skb->data - 2, pkt_len);
+                        data = skb_put(skb, pkt_len);
+#endif /* TC35815_USE_PACKEDBUFFER */
+                        if (netif_msg_pktdata(lp))
                                 print_eth(data);
                         skb->protocol = eth_type_trans(skb, dev);
+#ifdef TC35815_NAPI
+                        netif_receive_skb(skb);
+                        received++;
+#else
                         netif_rx(skb);
+#endif
+                        dev->last_rx = jiffies;
                         lp->stats.rx_packets++;
+                        lp->stats.rx_bytes += pkt_len;
                 } else {
                         lp->stats.rx_errors++;
+                        printk(KERN_DEBUG "%s: Rx error (status %x)\n",
+                               dev->name, status & Rx_Stat_Mask);
                         /* WORKAROUND: LongErr and CRCErr means Overflow. */
                         if ((status & Rx_LongErr) && (status & Rx_CRCErr)) {
                                 status &= ~(Rx_LongErr|Rx_CRCErr);
@@ -1189,63 +1581,150 @@ tc35815_rx(struct net_device *dev)
                         int bdctl = le32_to_cpu(lp->rfd_cur->bd[bd_count - 1].BDCtl);
                         unsigned char id =
                                 (bdctl & BD_RxBDID_MASK) >> BD_RxBDID_SHIFT;
-                        if (id >= RX_BUF_PAGES) {
+#ifdef DEBUG
+                        if (id >= RX_BUF_NUM) {
                                 printk("%s: invalid BDID.\n", dev->name);
                                 panic_queues(dev);
                         }
+#else
+                        BUG_ON(id >= RX_BUF_NUM);
+#endif
                         /* free old buffers */
-                        while (lp->fbl_curid != id) {
-                                bdctl = le32_to_cpu(lp->fbl_ptr->bd[lp->fbl_curid].BDCtl);
+#ifdef TC35815_USE_PACKEDBUFFER
+                        while (lp->fbl_curid != id)
+#else
+                        while (lp->fbl_count < RX_BUF_NUM)
+#endif
+                        {
+#ifdef TC35815_USE_PACKEDBUFFER
+                                unsigned char curid = lp->fbl_curid;
+#else
+                                unsigned char curid =
+                                        (id + 1 + lp->fbl_count) % RX_BUF_NUM;
+#endif
+                                struct BDesc *bd = &lp->fbl_ptr->bd[curid];
+#ifdef DEBUG
+                                bdctl = le32_to_cpu(bd->BDCtl);
                                 if (bdctl & BD_CownsBD) {
                                         printk("%s: Freeing invalid BD.\n",
                                                dev->name);
                                         panic_queues(dev);
                                 }
+#endif
                                 /* pass BD to controler */
+#ifndef TC35815_USE_PACKEDBUFFER
+                                if (!lp->rx_skbs[curid].skb) {
+                                        lp->rx_skbs[curid].skb =
+                                                alloc_rxbuf_skb(dev,
+                                                                lp->pci_dev,
+                                                                &lp->rx_skbs[curid].skb_dma);
+                                        if (!lp->rx_skbs[curid].skb)
+                                                break; /* try on next reception */
+                                        bd->BuffData = cpu_to_le32(lp->rx_skbs[curid].skb_dma);
+                                }
+#endif /* TC35815_USE_PACKEDBUFFER */
                                 /* Note: BDLength was modified by chip. */
-                                lp->fbl_ptr->bd[lp->fbl_curid].BDCtl =
-                                        cpu_to_le32(BD_CownsBD |
-                                                    (lp->fbl_curid << BD_RxBDID_SHIFT) |
-                                                    PAGE_SIZE);
-                                lp->fbl_curid =
-                                        (lp->fbl_curid + 1) % RX_BUF_PAGES;
-                                if (tc35815_debug > 2) {
+                                bd->BDCtl = cpu_to_le32(BD_CownsBD |
+                                                        (curid << BD_RxBDID_SHIFT) |
+                                                        RX_BUF_SIZE);
+#ifdef TC35815_USE_PACKEDBUFFER
+                                lp->fbl_curid = (curid + 1) % RX_BUF_NUM;
+                                if (netif_msg_rx_status(lp)) {
                                         printk("%s: Entering new FBD %d\n",
                                                dev->name, lp->fbl_curid);
                                         dump_frfd(lp->fbl_ptr);
                                 }
+#else
+                                lp->fbl_count++;
+#endif
                                 buf_free_count++;
                         }
                 }
 
                 /* put RxFD back to controller */
-                next_rfd = bus_to_virt(le32_to_cpu(lp->rfd_cur->fd.FDNext));
-#ifdef __mips__
-                next_rfd = (struct RxFD *)vtonocache(next_rfd);
-#endif
+#ifdef DEBUG
+                next_rfd = fd_bus_to_virt(lp,
+                                          le32_to_cpu(lp->rfd_cur->fd.FDNext));
                 if (next_rfd < lp->rfd_base || next_rfd > lp->rfd_limit) {
                         printk("%s: RxFD FDNext invalid.\n", dev->name);
                         panic_queues(dev);
                 }
+#endif
                 for (i = 0; i < (bd_count + 1) / 2 + 1; i++) {
                         /* pass FD to controler */
-                        lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead);       /* for debug */
+#ifdef DEBUG
+                        lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead);
+#else
+                        lp->rfd_cur->fd.FDNext = cpu_to_le32(FD_Next_EOL);
+#endif
                         lp->rfd_cur->fd.FDCtl = cpu_to_le32(FD_CownsFD);
                         lp->rfd_cur++;
                         fd_free_count++;
                 }
-
-                lp->rfd_cur = next_rfd;
+                if (lp->rfd_cur > lp->rfd_limit)
+                        lp->rfd_cur = lp->rfd_base;
+#ifdef DEBUG
+                if (lp->rfd_cur != next_rfd)
+                        printk("rfd_cur = %p, next_rfd %p\n",
+                               lp->rfd_cur, next_rfd);
+#endif
         }
 
         /* re-enable BL/FDA Exhaust interrupts. */
         if (fd_free_count) {
-                tc_writel(tc_readl(&tr->Int_En) | Int_FDAExEn, &tr->Int_En);
+                struct tc35815_regs __iomem *tr =
+                        (struct tc35815_regs __iomem *)dev->base_addr;
+                u32 en, en_old = tc_readl(&tr->Int_En);
+                en = en_old | Int_FDAExEn;
                 if (buf_free_count)
-                        tc_writel(tc_readl(&tr->Int_En) | Int_BLExEn, &tr->Int_En);
+                        en |= Int_BLExEn;
+                if (en != en_old)
+                        tc_writel(en, &tr->Int_En);
         }
+#ifdef TC35815_NAPI
+        return received;
+#endif
 }
 
+#ifdef TC35815_NAPI
+static int
+tc35815_poll(struct net_device *dev, int *budget)
+{
+        struct tc35815_local *lp = dev->priv;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        int limit = min(*budget, dev->quota);
+        int received = 0, handled;
+        u32 status;
+
+        spin_lock(&lp->lock);
+        status = tc_readl(&tr->Int_Src);
+        do {
+                tc_writel(status, &tr->Int_Src);        /* write to clear */
+
+                handled = tc35815_do_interrupt(dev, status, limit);
+                if (handled >= 0) {
+                        received += handled;
+                        limit -= handled;
+                        if (limit <= 0)
+                                break;
+                }
+                status = tc_readl(&tr->Int_Src);
+        } while (status);
+        spin_unlock(&lp->lock);
+
+        dev->quota -= received;
+        *budget -= received;
+        if (limit <= 0)
+                return 1;
+
+        netif_rx_complete(dev);
+        /* enable interrupts */
+        tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl);
+        return 0;
+}
+#endif
+
 #ifdef NO_CHECK_CARRIER
 #define TX_STA_ERR      (Tx_ExColl|Tx_Under|Tx_Defer|Tx_LateColl|Tx_TxPar|Tx_SQErr)
 #else
@@ -1264,9 +1743,17 @@ tc35815_check_tx_stat(struct net_device *dev, int status)
         if (status & Tx_TxColl_MASK)
                 lp->stats.collisions += status & Tx_TxColl_MASK;
 
+#ifndef NO_CHECK_CARRIER
+        /* TX4939 does not have NCarr */
+        if (lp->boardtype == TC35815_TX4939)
+                status &= ~Tx_NCarr;
+#ifdef WORKAROUND_LOSTCAR
         /* WORKAROUND: ignore LostCrS in full duplex operation */
-        if (lp->fullduplex)
+        if ((lp->timer_state != asleep && lp->timer_state != lcheck)
+            || lp->fullduplex)
                 status &= ~Tx_NCarr;
+#endif
+#endif
 
         if (!(status & TX_STA_ERR)) {
                 /* no error. */
@@ -1282,6 +1769,15 @@ tc35815_check_tx_stat(struct net_device *dev, int status)
         if (status & Tx_Under) {
                 lp->stats.tx_fifo_errors++;
                 msg = "Tx FIFO Underrun.";
+                if (lp->lstats.tx_underrun < TX_THRESHOLD_KEEP_LIMIT) {
+                        lp->lstats.tx_underrun++;
+                        if (lp->lstats.tx_underrun >= TX_THRESHOLD_KEEP_LIMIT) {
+                                struct tc35815_regs __iomem *tr =
+                                        (struct tc35815_regs __iomem *)dev->base_addr;
+                                tc_writel(TX_THRESHOLD_MAX, &tr->TxThrsh);
+                                msg = "Tx FIFO Underrun.Change Tx threshold to max.";
+                        }
+                }
         }
         if (status & Tx_Defer) {
                 lp->stats.tx_fifo_errors++;
@@ -1305,18 +1801,19 @@ tc35815_check_tx_stat(struct net_device *dev, int status)
                 lp->stats.tx_heartbeat_errors++;
                 msg = "Signal Quality Error.";
         }
-        if (msg)
+        if (msg && netif_msg_tx_err(lp))
                 printk(KERN_WARNING "%s: %s (%#x)\n", dev->name, msg, status);
 }
 
+/* This handles TX complete events posted by the device
+ * via interrupts.
+ */
 static void
 tc35815_txdone(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
         struct TxFD *txfd;
         unsigned int fdctl;
-        int num_done = 0;
 
         txfd = &lp->tfd_base[lp->tfd_end];
         while (lp->tfd_start != lp->tfd_end &&
@@ -1324,38 +1821,61 @@ tc35815_txdone(struct net_device *dev)
                 int status = le32_to_cpu(txfd->fd.FDStat);
                 struct sk_buff *skb;
                 unsigned long fdnext = le32_to_cpu(txfd->fd.FDNext);
+                u32 fdsystem = le32_to_cpu(txfd->fd.FDSystem);
 
-                if (tc35815_debug > 2) {
+                if (netif_msg_tx_done(lp)) {
                         printk("%s: complete TxFD.\n", dev->name);
                         dump_txfd(txfd);
                 }
                 tc35815_check_tx_stat(dev, status);
 
-                skb = (struct sk_buff *)le32_to_cpu(txfd->fd.FDSystem);
+                skb = fdsystem != 0xffffffff ?
+                        lp->tx_skbs[fdsystem].skb : NULL;
+#ifdef DEBUG
+                if (lp->tx_skbs[lp->tfd_end].skb != skb) {
+                        printk("%s: tx_skbs mismatch.\n", dev->name);
+                        panic_queues(dev);
+                }
+#else
+                BUG_ON(lp->tx_skbs[lp->tfd_end].skb != skb);
+#endif
                 if (skb) {
+                        lp->stats.tx_bytes += skb->len;
+                        pci_unmap_single(lp->pci_dev, lp->tx_skbs[lp->tfd_end].skb_dma, skb->len, PCI_DMA_TODEVICE);
+                        lp->tx_skbs[lp->tfd_end].skb = NULL;
+                        lp->tx_skbs[lp->tfd_end].skb_dma = 0;
+#ifdef TC35815_NAPI
                         dev_kfree_skb_any(skb);
+#else
+                        dev_kfree_skb_irq(skb);
+#endif
                 }
-                txfd->fd.FDSystem = cpu_to_le32(0);
+                txfd->fd.FDSystem = cpu_to_le32(0xffffffff);
 
-                num_done++;
                 lp->tfd_end = (lp->tfd_end + 1) % TX_FD_NUM;
                 txfd = &lp->tfd_base[lp->tfd_end];
-                if ((fdnext & ~FD_Next_EOL) != virt_to_bus(txfd)) {
+#ifdef DEBUG
+                if ((fdnext & ~FD_Next_EOL) != fd_virt_to_bus(lp, txfd)) {
                         printk("%s: TxFD FDNext invalid.\n", dev->name);
                         panic_queues(dev);
                 }
+#endif
                 if (fdnext & FD_Next_EOL) {
                         /* DMA Transmitter has been stopping... */
                         if (lp->tfd_end != lp->tfd_start) {
+                                struct tc35815_regs __iomem *tr =
+                                        (struct tc35815_regs __iomem *)dev->base_addr;
                                 int head = (lp->tfd_start + TX_FD_NUM - 1) % TX_FD_NUM;
                                 struct TxFD* txhead = &lp->tfd_base[head];
                                 int qlen = (lp->tfd_start + TX_FD_NUM
                                             - lp->tfd_end) % TX_FD_NUM;
 
+#ifdef DEBUG
                                 if (!(le32_to_cpu(txfd->fd.FDCtl) & FD_CownsFD)) {
                                         printk("%s: TxFD FDCtl invalid.\n", dev->name);
                                         panic_queues(dev);
                                 }
+#endif
                                 /* log max queue length */
                                 if (lp->lstats.max_tx_qlen < qlen)
                                         lp->lstats.max_tx_qlen = qlen;
@@ -1366,21 +1886,23 @@ tc35815_txdone(struct net_device *dev)
 #ifdef GATHER_TXINT
                                 txhead->fd.FDCtl |= cpu_to_le32(FD_FrmOpt_IntTx);
 #endif
-                                if (tc35815_debug > 2) {
+                                if (netif_msg_tx_queued(lp)) {
                                         printk("%s: start TxFD on queue.\n",
                                                dev->name);
                                         dump_txfd(txfd);
                                 }
-                                tc_writel(virt_to_bus(txfd), &tr->TxFrmPtr);
+                                tc_writel(fd_virt_to_bus(lp, txfd), &tr->TxFrmPtr);
                         }
                         break;
                 }
         }
 
-        if (num_done > 0 && lp->tbusy) {
-                lp->tbusy = 0;
-                netif_start_queue(dev);
-        }
+        /* If we had stopped the queue due to a "tx full"
+         * condition, and space has now been made available,
+         * wake up the queue.
+         */
+        if (netif_queue_stopped(dev) && ! tc35815_tx_full(dev))
+                netif_wake_queue(dev);
 }
 
 /* The inverse routine to tc35815_open(). */
@@ -1388,18 +1910,18 @@ static int
 tc35815_close(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
-
-        lp->tbusy = 1;
         netif_stop_queue(dev);
 
         /* Flush the Tx and disable Rx here. */
 
+        del_timer(&lp->timer);          /* Kill if running      */
         tc35815_chip_reset(dev);
         free_irq(dev->irq, dev);
 
         tc35815_free_queues(dev);
 
         return 0;
+
 }
 
 /*
@@ -1409,29 +1931,29 @@ tc35815_close(struct net_device *dev)
 static struct net_device_stats *tc35815_get_stats(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
-        unsigned long flags;
-
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
         if (netif_running(dev)) {
-                spin_lock_irqsave(&lp->lock, flags);
                 /* Update the statistics from the device registers. */
                 lp->stats.rx_missed_errors = tc_readl(&tr->Miss_Cnt);
-                spin_unlock_irqrestore(&lp->lock, flags);
         }
 
         return &lp->stats;
 }
 
-static void tc35815_set_cam_entry(struct tc35815_regs *tr, int index, unsigned char *addr)
+static void tc35815_set_cam_entry(struct net_device *dev, int index, unsigned char *addr)
 {
+        struct tc35815_local *lp = dev->priv;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
         int cam_index = index * 6;
-        unsigned long cam_data;
-        unsigned long saved_addr;
+        u32 cam_data;
+        u32 saved_addr;
         saved_addr = tc_readl(&tr->CAM_Adr);
 
-        if (tc35815_debug > 1) {
+        if (netif_msg_hw(lp)) {
                 int i;
-                printk(KERN_DEBUG "%s: CAM %d:", cardname, index);
+                printk(KERN_DEBUG "%s: CAM %d:", dev->name, index);
                 for (i = 0; i < 6; i++)
                         printk(" %02x", addr[i]);
                 printk("\n");
@@ -1458,14 +1980,6 @@ static void tc35815_set_cam_entry(struct tc35815_regs *tr, int index, unsigned c
                 tc_writel(cam_data, &tr->CAM_Data);
         }
 
-        if (tc35815_debug > 2) {
-                int i;
-                for (i = cam_index / 4; i < cam_index / 4 + 2; i++) {
-                        tc_writel(i * 4, &tr->CAM_Adr);
-                        printk("CAM 0x%x: %08lx",
-                               i * 4, tc_readl(&tr->CAM_Data));
-                }
-        }
         tc_writel(saved_addr, &tr->CAM_Adr);
 }
 
@@ -1480,10 +1994,19 @@ static void tc35815_set_cam_entry(struct tc35815_regs *tr, int index, unsigned c
 static void
 tc35815_set_multicast_list(struct net_device *dev)
 {
-        struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
 
         if (dev->flags&IFF_PROMISC)
         {
+#ifdef WORKAROUND_100HALF_PROMISC
+                /* With some (all?) 100MHalf HUB, controller will hang
+                 * if we enabled promiscuous mode before linkup... */
+                struct tc35815_local *lp = dev->priv;
+                int pid = lp->phy_addr;
+                if (!(tc_mdio_read(dev, pid, MII_BMSR) & BMSR_LSTATUS))
+                        return;
+#endif
                 /* Enable promiscuous mode */
                 tc_writel(CAM_CompEn | CAM_BroadAcc | CAM_GroupAcc | CAM_StationAcc, &tr->CAM_Ctl);
         }
@@ -1505,7 +2028,7 @@ tc35815_set_multicast_list(struct net_device *dev)
                         if (!cur_addr)
                                 break;
                         /* entry 0,1 is reserved. */
-                        tc35815_set_cam_entry(tr, i + 2, cur_addr->dmi_addr);
+                        tc35815_set_cam_entry(dev, i + 2, cur_addr->dmi_addr);
                         ena_bits |= CAM_Ena_Bit(i + 2);
                 }
                 tc_writel(ena_bits, &tr->CAM_Ena);
@@ -1517,122 +2040,753 @@ tc35815_set_multicast_list(struct net_device *dev)
         }
 }
 
-static unsigned long tc_phy_read(struct net_device *dev, struct tc35815_regs *tr, int phy, int phy_reg)
+static void tc35815_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
         struct tc35815_local *lp = dev->priv;
-        unsigned long data;
-        unsigned long flags;
+        strcpy(info->driver, MODNAME);
+        strcpy(info->version, DRV_VERSION);
+        strcpy(info->bus_info, pci_name(lp->pci_dev));
+}
 
-        spin_lock_irqsave(&lp->lock, flags);
+static int tc35815_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct tc35815_local *lp = dev->priv;
+        spin_lock_irq(&lp->lock);
+        mii_ethtool_gset(&lp->mii, cmd);
+        spin_unlock_irq(&lp->lock);
+        return 0;
+}
 
-        tc_writel(MD_CA_Busy | (phy << 5) | phy_reg, &tr->MD_CA);
+static int tc35815_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct tc35815_local *lp = dev->priv;
+        int rc;
+#if 1   /* use our negotiation method... */
+        /* Verify the settings we care about. */
+        if (cmd->autoneg != AUTONEG_ENABLE &&
+            cmd->autoneg != AUTONEG_DISABLE)
+                return -EINVAL;
+        if (cmd->autoneg == AUTONEG_DISABLE &&
+            ((cmd->speed != SPEED_100 &&
+              cmd->speed != SPEED_10) ||
+             (cmd->duplex != DUPLEX_HALF &&
+              cmd->duplex != DUPLEX_FULL)))
+                return -EINVAL;
+
+        /* Ok, do it to it. */
+        spin_lock_irq(&lp->lock);
+        del_timer(&lp->timer);
+        tc35815_start_auto_negotiation(dev, cmd);
+        spin_unlock_irq(&lp->lock);
+        rc = 0;
+#else
+        spin_lock_irq(&lp->lock);
+        rc = mii_ethtool_sset(&lp->mii, cmd);
+        spin_unlock_irq(&lp->lock);
+#endif
+        return rc;
+}
+
+static int tc35815_nway_reset(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        int rc;
+        spin_lock_irq(&lp->lock);
+        rc = mii_nway_restart(&lp->mii);
+        spin_unlock_irq(&lp->lock);
+        return rc;
+}
+
+static u32 tc35815_get_link(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        int rc;
+        spin_lock_irq(&lp->lock);
+        rc = mii_link_ok(&lp->mii);
+        spin_unlock_irq(&lp->lock);
+        return rc;
+}
+
+static u32 tc35815_get_msglevel(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        return lp->msg_enable;
+}
+
+static void tc35815_set_msglevel(struct net_device *dev, u32 datum)
+{
+        struct tc35815_local *lp = dev->priv;
+        lp->msg_enable = datum;
+}
+
+static int tc35815_get_stats_count(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        return sizeof(lp->lstats) / sizeof(int);
+}
+
+static void tc35815_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data)
+{
+        struct tc35815_local *lp = dev->priv;
+        data[0] = lp->lstats.max_tx_qlen;
+        data[1] = lp->lstats.tx_ints;
+        data[2] = lp->lstats.rx_ints;
+        data[3] = lp->lstats.tx_underrun;
+}
+
+static struct {
+        const char str[ETH_GSTRING_LEN];
+} ethtool_stats_keys[] = {
+        { "max_tx_qlen" },
+        { "tx_ints" },
+        { "rx_ints" },
+        { "tx_underrun" },
+};
+
+static void tc35815_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+{
+        memcpy(data, ethtool_stats_keys, sizeof(ethtool_stats_keys));
+}
+
+static const struct ethtool_ops tc35815_ethtool_ops = {
+        .get_drvinfo            = tc35815_get_drvinfo,
+        .get_settings           = tc35815_get_settings,
+        .set_settings           = tc35815_set_settings,
+        .nway_reset             = tc35815_nway_reset,
+        .get_link               = tc35815_get_link,
+        .get_msglevel           = tc35815_get_msglevel,
+        .set_msglevel           = tc35815_set_msglevel,
+        .get_strings            = tc35815_get_strings,
+        .get_stats_count        = tc35815_get_stats_count,
+        .get_ethtool_stats      = tc35815_get_ethtool_stats,
+        .get_perm_addr          = ethtool_op_get_perm_addr,
+};
+
+static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        struct tc35815_local *lp = dev->priv;
+        int rc;
+
+        if (!netif_running(dev))
+                return -EINVAL;
+
+        spin_lock_irq(&lp->lock);
+        rc = generic_mii_ioctl(&lp->mii, if_mii(rq), cmd, NULL);
+        spin_unlock_irq(&lp->lock);
+
+        return rc;
+}
+
+static int tc_mdio_read(struct net_device *dev, int phy_id, int location)
+{
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        u32 data;
+        tc_writel(MD_CA_Busy | (phy_id << 5) | location, &tr->MD_CA);
         while (tc_readl(&tr->MD_CA) & MD_CA_Busy)
                 ;
         data = tc_readl(&tr->MD_Data);
-        spin_unlock_irqrestore(&lp->lock, flags);
-        return data;
+        return data & 0xffff;
+}
+
+static void tc_mdio_write(struct net_device *dev, int phy_id, int location,
+                          int val)
+{
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        tc_writel(val, &tr->MD_Data);
+        tc_writel(MD_CA_Busy | MD_CA_Wr | (phy_id << 5) | location, &tr->MD_CA);
+        while (tc_readl(&tr->MD_CA) & MD_CA_Busy)
+                ;
 }
 
-static void tc_phy_write(struct net_device *dev, unsigned long d, struct tc35815_regs *tr, int phy, int phy_reg)
+/* Auto negotiation.  The scheme is very simple.  We have a timer routine
+ * that keeps watching the auto negotiation process as it progresses.
+ * The DP83840 is first told to start doing it's thing, we set up the time
+ * and place the timer state machine in it's initial state.
+ *
+ * Here the timer peeks at the DP83840 status registers at each click to see
+ * if the auto negotiation has completed, we assume here that the DP83840 PHY
+ * will time out at some point and just tell us what (didn't) happen.  For
+ * complete coverage we only allow so many of the ticks at this level to run,
+ * when this has expired we print a warning message and try another strategy.
+ * This "other" strategy is to force the interface into various speed/duplex
+ * configurations and we stop when we see a link-up condition before the
+ * maximum number of "peek" ticks have occurred.
+ *
+ * Once a valid link status has been detected we configure the BigMAC and
+ * the rest of the Happy Meal to speak the most efficient protocol we could
+ * get a clean link for.  The priority for link configurations, highest first
+ * is:
+ *                 100 Base-T Full Duplex
+ *                 100 Base-T Half Duplex
+ *                 10 Base-T Full Duplex
+ *                 10 Base-T Half Duplex
+ *
+ * We start a new timer now, after a successful auto negotiation status has
+ * been detected.  This timer just waits for the link-up bit to get set in
+ * the BMCR of the DP83840.  When this occurs we print a kernel log message
+ * describing the link type in use and the fact that it is up.
+ *
+ * If a fatal error of some sort is signalled and detected in the interrupt
+ * service routine, and the chip is reset, or the link is ifconfig'd down
+ * and then back up, this entire process repeats itself all over again.
+ */
+/* Note: Above comments are come from sunhme driver. */
+
+static int tc35815_try_next_permutation(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
-        unsigned long flags;
+        int pid = lp->phy_addr;
+        unsigned short bmcr;
 
-        spin_lock_irqsave(&lp->lock, flags);
+        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
 
-        tc_writel(d, &tr->MD_Data);
-        tc_writel(MD_CA_Busy | MD_CA_Wr | (phy << 5) | phy_reg, &tr->MD_CA);
-        while (tc_readl(&tr->MD_CA) & MD_CA_Busy)
-                ;
-        spin_unlock_irqrestore(&lp->lock, flags);
+        /* Downgrade from full to half duplex.  Only possible via ethtool.  */
+        if (bmcr & BMCR_FULLDPLX) {
+                bmcr &= ~BMCR_FULLDPLX;
+                printk(KERN_DEBUG "%s: try next permutation (BMCR %x)\n", dev->name, bmcr);
+                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
+                return 0;
+        }
+
+        /* Downgrade from 100 to 10. */
+        if (bmcr & BMCR_SPEED100) {
+                bmcr &= ~BMCR_SPEED100;
+                printk(KERN_DEBUG "%s: try next permutation (BMCR %x)\n", dev->name, bmcr);
+                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
+                return 0;
+        }
+
+        /* We've tried everything. */
+        return -1;
 }
 
-static void tc35815_phy_chip_init(struct net_device *dev)
+static void
+tc35815_display_link_mode(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
-        static int first = 1;
-        unsigned short ctl;
-
-        if (first) {
-                unsigned short id0, id1;
-                int count;
-                first = 0;
-
-                /* first data written to the PHY will be an ID number */
-                tc_phy_write(dev, 0, tr, 0, MII_CONTROL);       /* ID:0 */
-#if 0
-                tc_phy_write(dev, MIICNTL_RESET, tr, 0, MII_CONTROL);
-                printk(KERN_INFO "%s: Resetting PHY...", dev->name);
-                while (tc_phy_read(dev, tr, 0, MII_CONTROL) & MIICNTL_RESET)
-                        ;
-                printk("\n");
-                tc_phy_write(dev, MIICNTL_AUTO|MIICNTL_SPEED|MIICNTL_FDX, tr, 0,
-                             MII_CONTROL);
-#endif
-                id0 = tc_phy_read(dev, tr, 0, MII_PHY_ID0);
-                id1 = tc_phy_read(dev, tr, 0, MII_PHY_ID1);
-                printk(KERN_DEBUG "%s: PHY ID %04x %04x\n", dev->name,
-                       id0, id1);
-                if (lp->option & TC35815_OPT_10M) {
-                        lp->linkspeed = 10;
-                        lp->fullduplex = (lp->option & TC35815_OPT_FULLDUP) != 0;
-                } else if (lp->option & TC35815_OPT_100M) {
-                        lp->linkspeed = 100;
-                        lp->fullduplex = (lp->option & TC35815_OPT_FULLDUP) != 0;
+        int pid = lp->phy_addr;
+        unsigned short lpa, bmcr;
+        char *speed = "", *duplex = "";
+
+        lpa = tc_mdio_read(dev, pid, MII_LPA);
+        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+        if (options.speed ? (bmcr & BMCR_SPEED100) : (lpa & (LPA_100HALF | LPA_100FULL)))
+                speed = "100Mb/s";
+        else
+                speed = "10Mb/s";
+        if (options.duplex ? (bmcr & BMCR_FULLDPLX) : (lpa & (LPA_100FULL | LPA_10FULL)))
+                duplex = "Full Duplex";
+        else
+                duplex = "Half Duplex";
+
+        if (netif_msg_link(lp))
+                printk(KERN_INFO "%s: Link is up at %s, %s.\n",
+                       dev->name, speed, duplex);
+        printk(KERN_DEBUG "%s: MII BMCR %04x BMSR %04x LPA %04x\n",
+               dev->name,
+               bmcr, tc_mdio_read(dev, pid, MII_BMSR), lpa);
+}
+
+static void tc35815_display_forced_link_mode(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        int pid = lp->phy_addr;
+        unsigned short bmcr;
+        char *speed = "", *duplex = "";
+
+        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+        if (bmcr & BMCR_SPEED100)
+                speed = "100Mb/s";
+        else
+                speed = "10Mb/s";
+        if (bmcr & BMCR_FULLDPLX)
+                duplex = "Full Duplex.\n";
+        else
+                duplex = "Half Duplex.\n";
+
+        if (netif_msg_link(lp))
+                printk(KERN_INFO "%s: Link has been forced up at %s, %s",
+                       dev->name, speed, duplex);
+}
+
+static void tc35815_set_link_modes(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        int pid = lp->phy_addr;
+        unsigned short bmcr, lpa;
+        int speed;
+
+        if (lp->timer_state == arbwait) {
+                lpa = tc_mdio_read(dev, pid, MII_LPA);
+                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+                printk(KERN_DEBUG "%s: MII BMCR %04x BMSR %04x LPA %04x\n",
+                       dev->name,
+                       bmcr, tc_mdio_read(dev, pid, MII_BMSR), lpa);
+                if (!(lpa & (LPA_10HALF | LPA_10FULL |
+                             LPA_100HALF | LPA_100FULL))) {
+                        /* fall back to 10HALF */
+                        printk(KERN_INFO "%s: bad ability %04x - falling back to 10HD.\n",
+                               dev->name, lpa);
+                        lpa = LPA_10HALF;
+                }
+                if (options.duplex ? (bmcr & BMCR_FULLDPLX) : (lpa & (LPA_100FULL | LPA_10FULL)))
+                        lp->fullduplex = 1;
+                else
+                        lp->fullduplex = 0;
+                if (options.speed ? (bmcr & BMCR_SPEED100) : (lpa & (LPA_100HALF | LPA_100FULL)))
+                        speed = 100;
+                else
+                        speed = 10;
+        } else {
+                /* Forcing a link mode. */
+                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+                if (bmcr & BMCR_FULLDPLX)
+                        lp->fullduplex = 1;
+                else
+                        lp->fullduplex = 0;
+                if (bmcr & BMCR_SPEED100)
+                        speed = 100;
+                else
+                        speed = 10;
+        }
+
+        tc_writel(tc_readl(&tr->MAC_Ctl) | MAC_HaltReq, &tr->MAC_Ctl);
+        if (lp->fullduplex) {
+                tc_writel(tc_readl(&tr->MAC_Ctl) | MAC_FullDup, &tr->MAC_Ctl);
+        } else {
+                tc_writel(tc_readl(&tr->MAC_Ctl) & ~MAC_FullDup, &tr->MAC_Ctl);
+        }
+        tc_writel(tc_readl(&tr->MAC_Ctl) & ~MAC_HaltReq, &tr->MAC_Ctl);
+
+        /* TX4939 PCFG.SPEEDn bit will be changed on NETDEV_CHANGE event. */
+
+#ifndef NO_CHECK_CARRIER
+        /* TX4939 does not have EnLCarr */
+        if (lp->boardtype != TC35815_TX4939) {
+#ifdef WORKAROUND_LOSTCAR
+                /* WORKAROUND: enable LostCrS only if half duplex operation */
+                if (!lp->fullduplex && lp->boardtype != TC35815_TX4939)
+                        tc_writel(tc_readl(&tr->Tx_Ctl) | Tx_EnLCarr, &tr->Tx_Ctl);
+#endif
+        }
+#endif
+        lp->mii.full_duplex = lp->fullduplex;
+}
+
+static void tc35815_timer(unsigned long data)
+{
+        struct net_device *dev = (struct net_device *)data;
+        struct tc35815_local *lp = dev->priv;
+        int pid = lp->phy_addr;
+        unsigned short bmsr, bmcr, lpa;
+        int restart_timer = 0;
+
+        spin_lock_irq(&lp->lock);
+
+        lp->timer_ticks++;
+        switch (lp->timer_state) {
+        case arbwait:
+                /*
+                 * Only allow for 5 ticks, thats 10 seconds and much too
+                 * long to wait for arbitration to complete.
+                 */
+                /* TC35815 need more times... */
+                if (lp->timer_ticks >= 10) {
+                        /* Enter force mode. */
+                        if (!options.doforce) {
+                                printk(KERN_NOTICE "%s: Auto-Negotiation unsuccessful,"
+                                       " cable probblem?\n", dev->name);
+                                /* Try to restart the adaptor. */
+                                tc35815_restart(dev);
+                                goto out;
+                        }
+                        printk(KERN_NOTICE "%s: Auto-Negotiation unsuccessful,"
+                               " trying force link mode\n", dev->name);
+                        printk(KERN_DEBUG "%s: BMCR %x BMSR %x\n", dev->name,
+                               tc_mdio_read(dev, pid, MII_BMCR),
+                               tc_mdio_read(dev, pid, MII_BMSR));
+                        bmcr = BMCR_SPEED100;
+                        tc_mdio_write(dev, pid, MII_BMCR, bmcr);
+
+                        /*
+                         * OK, seems we need do disable the transceiver
+                         * for the first tick to make sure we get an
+                         * accurate link state at the second tick.
+                         */
+
+                        lp->timer_state = ltrywait;
+                        lp->timer_ticks = 0;
+                        restart_timer = 1;
                 } else {
-                        /* auto negotiation */
-                        unsigned long neg_result;
-                        tc_phy_write(dev, MIICNTL_AUTO | MIICNTL_RST_AUTO, tr, 0, MII_CONTROL);
-                        printk(KERN_INFO "%s: Auto Negotiation...", dev->name);
-                        count = 0;
-                        while (!(tc_phy_read(dev, tr, 0, MII_STATUS) & MIISTAT_AUTO_DONE)) {
-                                if (count++ > 5000) {
-                                        printk(" failed. Assume 10Mbps\n");
-                                        lp->linkspeed = 10;
-                                        lp->fullduplex = 0;
-                                        goto done;
+                        /* Anything interesting happen? */
+                        bmsr = tc_mdio_read(dev, pid, MII_BMSR);
+                        if (bmsr & BMSR_ANEGCOMPLETE) {
+                                /* Just what we've been waiting for... */
+                                tc35815_set_link_modes(dev);
+
+                                /*
+                                 * Success, at least so far, advance our state
+                                 * engine.
+                                 */
+                                lp->timer_state = lupwait;
+                                restart_timer = 1;
+                        } else {
+                                restart_timer = 1;
+                        }
+                }
+                break;
+
+        case lupwait:
+                /*
+                 * Auto negotiation was successful and we are awaiting a
+                 * link up status.  I have decided to let this timer run
+                 * forever until some sort of error is signalled, reporting
+                 * a message to the user at 10 second intervals.
+                 */
+                bmsr = tc_mdio_read(dev, pid, MII_BMSR);
+                if (bmsr & BMSR_LSTATUS) {
+                        /*
+                         * Wheee, it's up, display the link mode in use and put
+                         * the timer to sleep.
+                         */
+                        tc35815_display_link_mode(dev);
+                        netif_carrier_on(dev);
+#ifdef WORKAROUND_100HALF_PROMISC
+                        /* delayed promiscuous enabling */
+                        if (dev->flags & IFF_PROMISC)
+                                tc35815_set_multicast_list(dev);
+#endif
+#if 1
+                        lp->saved_lpa = tc_mdio_read(dev, pid, MII_LPA);
+                        lp->timer_state = lcheck;
+                        restart_timer = 1;
+#else
+                        lp->timer_state = asleep;
+                        restart_timer = 0;
+#endif
+                } else {
+                        if (lp->timer_ticks >= 10) {
+                                printk(KERN_NOTICE "%s: Auto negotiation successful, link still "
+                                       "not completely up.\n", dev->name);
+                                lp->timer_ticks = 0;
+                                restart_timer = 1;
+                        } else {
+                                restart_timer = 1;
+                        }
+                }
+                break;
+
+        case ltrywait:
+                /*
+                 * Making the timeout here too long can make it take
+                 * annoyingly long to attempt all of the link mode
+                 * permutations, but then again this is essentially
+                 * error recovery code for the most part.
+                 */
+                bmsr = tc_mdio_read(dev, pid, MII_BMSR);
+                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+                if (lp->timer_ticks == 1) {
+                        /*
+                         * Re-enable transceiver, we'll re-enable the
+                         * transceiver next tick, then check link state
+                         * on the following tick.
+                         */
+                        restart_timer = 1;
+                        break;
+                }
+                if (lp->timer_ticks == 2) {
+                        restart_timer = 1;
+                        break;
+                }
+                if (bmsr & BMSR_LSTATUS) {
+                        /* Force mode selection success. */
+                        tc35815_display_forced_link_mode(dev);
+                        netif_carrier_on(dev);
+                        tc35815_set_link_modes(dev);
+#ifdef WORKAROUND_100HALF_PROMISC
+                        /* delayed promiscuous enabling */
+                        if (dev->flags & IFF_PROMISC)
+                                tc35815_set_multicast_list(dev);
+#endif
+#if 1
+                        lp->saved_lpa = tc_mdio_read(dev, pid, MII_LPA);
+                        lp->timer_state = lcheck;
+                        restart_timer = 1;
+#else
+                        lp->timer_state = asleep;
+                        restart_timer = 0;
+#endif
+                } else {
+                        if (lp->timer_ticks >= 4) { /* 6 seconds or so... */
+                                int ret;
+
+                                ret = tc35815_try_next_permutation(dev);
+                                if (ret == -1) {
+                                        /*
+                                         * Aieee, tried them all, reset the
+                                         * chip and try all over again.
+                                         */
+                                        printk(KERN_NOTICE "%s: Link down, "
+                                               "cable problem?\n",
+                                               dev->name);
+
+                                        /* Try to restart the adaptor. */
+                                        tc35815_restart(dev);
+                                        goto out;
                                 }
-                                if (count % 512 == 0)
-                                        printk(".");
-                                mdelay(1);
+                                lp->timer_ticks = 0;
+                                restart_timer = 1;
+                        } else {
+                                restart_timer = 1;
+                        }
+                }
+                break;
+
+        case lcheck:
+                bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+                lpa = tc_mdio_read(dev, pid, MII_LPA);
+                if (bmcr & (BMCR_PDOWN | BMCR_ISOLATE | BMCR_RESET)) {
+                        printk(KERN_ERR "%s: PHY down? (BMCR %x)\n", dev->name,
+                               bmcr);
+                } else if ((lp->saved_lpa ^ lpa) &
+                           (LPA_100FULL|LPA_100HALF|LPA_10FULL|LPA_10HALF)) {
+                        printk(KERN_NOTICE "%s: link status changed"
+                               " (BMCR %x LPA %x->%x)\n", dev->name,
+                               bmcr, lp->saved_lpa, lpa);
+                } else {
+                        /* go on */
+                        restart_timer = 1;
+                        break;
+                }
+                /* Try to restart the adaptor. */
+                tc35815_restart(dev);
+                goto out;
+
+        case asleep:
+        default:
+                /* Can't happens.... */
+                printk(KERN_ERR "%s: Aieee, link timer is asleep but we got "
+                       "one anyways!\n", dev->name);
+                restart_timer = 0;
+                lp->timer_ticks = 0;
+                lp->timer_state = asleep; /* foo on you */
+                break;
+        }
+
+        if (restart_timer) {
+                lp->timer.expires = jiffies + msecs_to_jiffies(1200);
+                add_timer(&lp->timer);
+        }
+out:
+        spin_unlock_irq(&lp->lock);
+}
+
+static void tc35815_start_auto_negotiation(struct net_device *dev,
+                                           struct ethtool_cmd *ep)
+{
+        struct tc35815_local *lp = dev->priv;
+        int pid = lp->phy_addr;
+        unsigned short bmsr, bmcr, advertize;
+        int timeout;
+
+        netif_carrier_off(dev);
+        bmsr = tc_mdio_read(dev, pid, MII_BMSR);
+        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+        advertize = tc_mdio_read(dev, pid, MII_ADVERTISE);
+
+        if (ep == NULL || ep->autoneg == AUTONEG_ENABLE) {
+                if (options.speed || options.duplex) {
+                        /* Advertise only specified configuration. */
+                        advertize &= ~(ADVERTISE_10HALF |
+                                       ADVERTISE_10FULL |
+                                       ADVERTISE_100HALF |
+                                       ADVERTISE_100FULL);
+                        if (options.speed != 10) {
+                                if (options.duplex != 1)
+                                        advertize |= ADVERTISE_100FULL;
+                                if (options.duplex != 2)
+                                        advertize |= ADVERTISE_100HALF;
+                        }
+                        if (options.speed != 100) {
+                                if (options.duplex != 1)
+                                        advertize |= ADVERTISE_10FULL;
+                                if (options.duplex != 2)
+                                        advertize |= ADVERTISE_10HALF;
                         }
-                        printk(" done.\n");
-                        neg_result = tc_phy_read(dev, tr, 0, MII_ANLPAR);
-                        if (neg_result & (MII_AN_TX_FDX | MII_AN_TX_HDX))
-                                lp->linkspeed = 100;
+                        if (options.speed == 100)
+                                bmcr |= BMCR_SPEED100;
+                        else if (options.speed == 10)
+                                bmcr &= ~BMCR_SPEED100;
+                        if (options.duplex == 2)
+                                bmcr |= BMCR_FULLDPLX;
+                        else if (options.duplex == 1)
+                                bmcr &= ~BMCR_FULLDPLX;
+                } else {
+                        /* Advertise everything we can support. */
+                        if (bmsr & BMSR_10HALF)
+                                advertize |= ADVERTISE_10HALF;
                         else
-                                lp->linkspeed = 10;
-                        if (neg_result & (MII_AN_TX_FDX | MII_AN_10_FDX))
-                                lp->fullduplex = 1;
+                                advertize &= ~ADVERTISE_10HALF;
+                        if (bmsr & BMSR_10FULL)
+                                advertize |= ADVERTISE_10FULL;
                         else
-                                lp->fullduplex = 0;
-                done:
-                        ;
+                                advertize &= ~ADVERTISE_10FULL;
+                        if (bmsr & BMSR_100HALF)
+                                advertize |= ADVERTISE_100HALF;
+                        else
+                                advertize &= ~ADVERTISE_100HALF;
+                        if (bmsr & BMSR_100FULL)
+                                advertize |= ADVERTISE_100FULL;
+                        else
+                                advertize &= ~ADVERTISE_100FULL;
+                }
+
+                tc_mdio_write(dev, pid, MII_ADVERTISE, advertize);
+
+                /* Enable Auto-Negotiation, this is usually on already... */
+                bmcr |= BMCR_ANENABLE;
+                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
+
+                /* Restart it to make sure it is going. */
+                bmcr |= BMCR_ANRESTART;
+                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
+                printk(KERN_DEBUG "%s: ADVERTISE %x BMCR %x\n", dev->name, advertize, bmcr);
+
+                /* BMCR_ANRESTART self clears when the process has begun. */
+                timeout = 64;  /* More than enough. */
+                while (--timeout) {
+                        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+                        if (!(bmcr & BMCR_ANRESTART))
+                                break; /* got it. */
+                        udelay(10);
                 }
+                if (!timeout) {
+                        printk(KERN_ERR "%s: TC35815 would not start auto "
+                               "negotiation BMCR=0x%04x\n",
+                               dev->name, bmcr);
+                        printk(KERN_NOTICE "%s: Performing force link "
+                               "detection.\n", dev->name);
+                        goto force_link;
+                } else {
+                        printk(KERN_DEBUG "%s: auto negotiation started.\n", dev->name);
+                        lp->timer_state = arbwait;
+                }
+        } else {
+force_link:
+                /* Force the link up, trying first a particular mode.
+                 * Either we are here at the request of ethtool or
+                 * because the Happy Meal would not start to autoneg.
+                 */
+
+                /* Disable auto-negotiation in BMCR, enable the duplex and
+                 * speed setting, init the timer state machine, and fire it off.
+                 */
+                if (ep == NULL || ep->autoneg == AUTONEG_ENABLE) {
+                        bmcr = BMCR_SPEED100;
+                } else {
+                        if (ep->speed == SPEED_100)
+                                bmcr = BMCR_SPEED100;
+                        else
+                                bmcr = 0;
+                        if (ep->duplex == DUPLEX_FULL)
+                                bmcr |= BMCR_FULLDPLX;
+                }
+                tc_mdio_write(dev, pid, MII_BMCR, bmcr);
+
+                /* OK, seems we need do disable the transceiver for the first
+                 * tick to make sure we get an accurate link state at the
+                 * second tick.
+                 */
+                lp->timer_state = ltrywait;
         }
 
-        ctl = 0;
-        if (lp->linkspeed == 100)
-                ctl |= MIICNTL_SPEED;
-        if (lp->fullduplex)
-                ctl |= MIICNTL_FDX;
-        tc_phy_write(dev, ctl, tr, 0, MII_CONTROL);
+        del_timer(&lp->timer);
+        lp->timer_ticks = 0;
+        lp->timer.expires = jiffies + msecs_to_jiffies(1200);
+        add_timer(&lp->timer);
+}
 
-        if (lp->fullduplex) {
-                tc_writel(tc_readl(&tr->MAC_Ctl) | MAC_FullDup, &tr->MAC_Ctl);
+static void tc35815_find_phy(struct net_device *dev)
+{
+        struct tc35815_local *lp = dev->priv;
+        int pid = lp->phy_addr;
+        unsigned short id0;
+
+        /* find MII phy */
+        for (pid = 31; pid >= 0; pid--) {
+                id0 = tc_mdio_read(dev, pid, MII_BMSR);
+                if (id0 != 0xffff && id0 != 0x0000 &&
+                    (id0 & BMSR_RESV) != (0xffff & BMSR_RESV) /* paranoia? */
+                        ) {
+                        lp->phy_addr = pid;
+                        break;
+                }
         }
+        if (pid < 0) {
+                printk(KERN_ERR "%s: No MII Phy found.\n",
+                       dev->name);
+                lp->phy_addr = pid = 0;
+        }
+
+        lp->mii_id[0] = tc_mdio_read(dev, pid, MII_PHYSID1);
+        lp->mii_id[1] = tc_mdio_read(dev, pid, MII_PHYSID2);
+        if (netif_msg_hw(lp))
+                printk(KERN_INFO "%s: PHY(%02x) ID %04x %04x\n", dev->name,
+                       pid, lp->mii_id[0], lp->mii_id[1]);
 }
 
-static void tc35815_chip_reset(struct net_device *dev)
+static void tc35815_phy_chip_init(struct net_device *dev)
 {
-        struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
+        struct tc35815_local *lp = dev->priv;
+        int pid = lp->phy_addr;
+        unsigned short bmcr;
+        struct ethtool_cmd ecmd, *ep;
+
+        /* dis-isolate if needed. */
+        bmcr = tc_mdio_read(dev, pid, MII_BMCR);
+        if (bmcr & BMCR_ISOLATE) {
+                int count = 32;
+                printk(KERN_DEBUG "%s: unisolating...", dev->name);
+                tc_mdio_write(dev, pid, MII_BMCR, bmcr & ~BMCR_ISOLATE);
+                while (--count) {
+                        if (!(tc_mdio_read(dev, pid, MII_BMCR) & BMCR_ISOLATE))
+                                break;
+                        udelay(20);
+                }
+                printk(" %s.\n", count ? "done" : "failed");
+        }
+
+        if (options.speed && options.duplex) {
+                ecmd.autoneg = AUTONEG_DISABLE;
+                ecmd.speed = options.speed == 10 ? SPEED_10 : SPEED_100;
+                ecmd.duplex = options.duplex == 1 ? DUPLEX_HALF : DUPLEX_FULL;
+                ep = &ecmd;
+        } else {
+                ep = NULL;
+        }
+        tc35815_start_auto_negotiation(dev, ep);
+}
 
+static void tc35815_chip_reset(struct net_device *dev)
+{
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
+        int i;
         /* reset the controller */
         tc_writel(MAC_Reset, &tr->MAC_Ctl);
-        while (tc_readl(&tr->MAC_Ctl) & MAC_Reset)
-                ;
-
+        udelay(4); /* 3200ns */
+        i = 0;
+        while (tc_readl(&tr->MAC_Ctl) & MAC_Reset) {
+                if (i++ > 100) {
+                        printk(KERN_ERR "%s: MAC reset failed.\n", dev->name);
+                        break;
+                }
+                mdelay(1);
+        }
         tc_writel(0, &tr->MAC_Ctl);
 
         /* initialize registers to default value */
@@ -1650,90 +2804,142 @@ static void tc35815_chip_reset(struct net_device *dev)
         tc_writel(0, &tr->CAM_Ena);
         (void)tc_readl(&tr->Miss_Cnt);  /* Read to clear */
 
+        /* initialize internal SRAM */
+        tc_writel(DMA_TestMode, &tr->DMA_Ctl);
+        for (i = 0; i < 0x1000; i += 4) {
+                tc_writel(i, &tr->CAM_Adr);
+                tc_writel(0, &tr->CAM_Data);
+        }
+        tc_writel(0, &tr->DMA_Ctl);
 }
 
 static void tc35815_chip_init(struct net_device *dev)
 {
         struct tc35815_local *lp = dev->priv;
-        struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
-        unsigned long flags;
+        struct tc35815_regs __iomem *tr =
+                (struct tc35815_regs __iomem *)dev->base_addr;
         unsigned long txctl = TX_CTL_CMD;
 
         tc35815_phy_chip_init(dev);
 
         /* load station address to CAM */
-        tc35815_set_cam_entry(tr, CAM_ENTRY_SOURCE, dev->dev_addr);
+        tc35815_set_cam_entry(dev, CAM_ENTRY_SOURCE, dev->dev_addr);
 
         /* Enable CAM (broadcast and unicast) */
         tc_writel(CAM_Ena_Bit(CAM_ENTRY_SOURCE), &tr->CAM_Ena);
         tc_writel(CAM_CompEn | CAM_BroadAcc, &tr->CAM_Ctl);
 
-        spin_lock_irqsave(&lp->lock, flags);
-
-        tc_writel(DMA_BURST_SIZE, &tr->DMA_Ctl);
-
+        /* Use DMA_RxAlign_2 to make IP header 4-byte aligned. */
+        if (HAVE_DMA_RXALIGN(lp))
+                tc_writel(DMA_BURST_SIZE | DMA_RxAlign_2, &tr->DMA_Ctl);
+        else
+                tc_writel(DMA_BURST_SIZE, &tr->DMA_Ctl);
+#ifdef TC35815_USE_PACKEDBUFFER
         tc_writel(RxFrag_EnPack | ETH_ZLEN, &tr->RxFragSize);   /* Packing */
+#else
+        tc_writel(ETH_ZLEN, &tr->RxFragSize);
+#endif
         tc_writel(0, &tr->TxPollCtr);   /* Batch mode */
         tc_writel(TX_THRESHOLD, &tr->TxThrsh);
         tc_writel(INT_EN_CMD, &tr->Int_En);
 
         /* set queues */
-        tc_writel(virt_to_bus(lp->rfd_base), &tr->FDA_Bas);
+        tc_writel(fd_virt_to_bus(lp, lp->rfd_base), &tr->FDA_Bas);
         tc_writel((unsigned long)lp->rfd_limit - (unsigned long)lp->rfd_base,
                   &tr->FDA_Lim);
         /*
          * Activation method:
-         * First, enable eht MAC Transmitter and the DMA Receive circuits.
+         * First, enable the MAC Transmitter and the DMA Receive circuits.
          * Then enable the DMA Transmitter and the MAC Receive circuits.
          */
-        tc_writel(virt_to_bus(lp->fbl_ptr), &tr->BLFrmPtr);     /* start DMA receiver */
+        tc_writel(fd_virt_to_bus(lp, lp->fbl_ptr), &tr->BLFrmPtr);      /* start DMA receiver */
         tc_writel(RX_CTL_CMD, &tr->Rx_Ctl);     /* start MAC receiver */
+
         /* start MAC transmitter */
+#ifndef NO_CHECK_CARRIER
+        /* TX4939 does not have EnLCarr */
+        if (lp->boardtype == TC35815_TX4939)
+                txctl &= ~Tx_EnLCarr;
+#ifdef WORKAROUND_LOSTCAR
         /* WORKAROUND: ignore LostCrS in full duplex operation */
-        if (lp->fullduplex)
-                txctl = TX_CTL_CMD & ~Tx_EnLCarr;
+        if ((lp->timer_state != asleep && lp->timer_state != lcheck) ||
+            lp->fullduplex)
+                txctl &= ~Tx_EnLCarr;
+#endif
+#endif /* !NO_CHECK_CARRIER */
 #ifdef GATHER_TXINT
         txctl &= ~Tx_EnComp;    /* disable global tx completion int. */
 #endif
         tc_writel(txctl, &tr->Tx_Ctl);
-#if 0   /* No need to polling */
-        tc_writel(virt_to_bus(lp->tfd_base), &tr->TxFrmPtr);    /* start DMA transmitter */
-#endif
+}
+
+#ifdef CONFIG_PM
+static int tc35815_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct tc35815_local *lp = dev->priv;
+        unsigned long flags;
+
+        pci_save_state(pdev);
+        if (!netif_running(dev))
+                return 0;
+        netif_device_detach(dev);
+        spin_lock_irqsave(&lp->lock, flags);
+        del_timer(&lp->timer);          /* Kill if running      */
+        tc35815_chip_reset(dev);
         spin_unlock_irqrestore(&lp->lock, flags);
+        pci_set_power_state(pdev, PCI_D3hot);
+        return 0;
 }
 
-static struct pci_driver tc35815_driver = {
-        .name = TC35815_MODULE_NAME,
-        .probe = tc35815_probe,
-        .remove = NULL,
-        .id_table = tc35815_pci_tbl,
+static int tc35815_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct tc35815_local *lp = dev->priv;
+        unsigned long flags;
+
+        pci_restore_state(pdev);
+        if (!netif_running(dev))
+                return 0;
+        pci_set_power_state(pdev, PCI_D0);
+        spin_lock_irqsave(&lp->lock, flags);
+        tc35815_restart(dev);
+        spin_unlock_irqrestore(&lp->lock, flags);
+        netif_device_attach(dev);
+        return 0;
+}
+#endif /* CONFIG_PM */
+
+static struct pci_driver tc35815_pci_driver = {
+        .name           = MODNAME,
+        .id_table       = tc35815_pci_tbl,
+        .probe          = tc35815_init_one,
+        .remove         = __devexit_p(tc35815_remove_one),
+#ifdef CONFIG_PM
+        .suspend        = tc35815_suspend,
+        .resume         = tc35815_resume,
+#endif
 };
 
+module_param_named(speed, options.speed, int, 0);
+MODULE_PARM_DESC(speed, "0:auto, 10:10Mbps, 100:100Mbps");
+module_param_named(duplex, options.duplex, int, 0);
+MODULE_PARM_DESC(duplex, "0:auto, 1:half, 2:full");
+module_param_named(doforce, options.doforce, int, 0);
+MODULE_PARM_DESC(doforce, "try force link mode if auto-negotiation failed");
+
 static int __init tc35815_init_module(void)
 {
-        return pci_register_driver(&tc35815_driver);
+        return pci_register_driver(&tc35815_pci_driver);
 }
 
 static void __exit tc35815_cleanup_module(void)
 {
-        struct net_device *next_dev;
-
-        /*
-         * TODO: implement a tc35815_driver.remove hook, and
-         * move this code into that function.  Then, delete
-         * all root_tc35815_dev list handling code.
-         */
-        while (root_tc35815_dev) {
-                struct net_device *dev = root_tc35815_dev;
-                next_dev = ((struct tc35815_local *)dev->priv)->next_module;
-                iounmap((void *)(dev->base_addr));
-                unregister_netdev(dev);
-                free_netdev(dev);
-                root_tc35815_dev = next_dev;
-        }
-
-        pci_unregister_driver(&tc35815_driver);
+        pci_unregister_driver(&tc35815_pci_driver);
 }
 
 module_init(tc35815_init_module);
 module_exit(tc35815_cleanup_module);
+
+MODULE_DESCRIPTION("TOSHIBA TC35815 PCI 10M/100M Ethernet driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index b3a64ca98634..4ed67ff0e81e 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -55,9 +55,6 @@
 
     TODO
 
-    Implement pci_driver::suspend() and pci_driver::resume()
-    power management methods.
-
     Check on 64 bit boxes.
     Check and fix on big endian boxes.
 
@@ -125,6 +122,11 @@
 #define DM9801_NOISE_FLOOR 8
 #define DM9802_NOISE_FLOOR 5
 
+#define DMFE_WOL_LINKCHANGE     0x20000000
+#define DMFE_WOL_SAMPLEPACKET   0x10000000
+#define DMFE_WOL_MAGICPACKET    0x08000000
+
+
 #define DMFE_10MHF      0
 #define DMFE_100MHF     1
 #define DMFE_10MFD      4
@@ -251,6 +253,7 @@ struct dmfe_board_info {
         u8 wait_reset;                  /* Hardware failed, need to reset */
         u8 dm910x_chk_mode;             /* Operating mode check */
         u8 first_in_callback;           /* Flag to record state */
+        u8 wol_mode;                    /* user WOL settings */
         struct timer_list timer;
 
         /* System defined statistic counter */
@@ -431,6 +434,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         db->chip_id = ent->driver_data;
         db->ioaddr = pci_resource_start(pdev, 0);
         db->chip_revision = dev_rev;
+        db->wol_mode = 0;
 
         db->pdev = pdev;
 
@@ -1065,7 +1069,11 @@ static void dmfe_set_filter_mode(struct DEVICE * dev)
         spin_unlock_irqrestore(&db->lock, flags);
 }
 
-static void netdev_get_drvinfo(struct net_device *dev,
+/*
+ *      Ethtool interace
+ */
+
+static void dmfe_ethtool_get_drvinfo(struct net_device *dev,
                                struct ethtool_drvinfo *info)
 {
         struct dmfe_board_info *np = netdev_priv(dev);
@@ -1079,9 +1087,35 @@ static void netdev_get_drvinfo(struct net_device *dev,
                         dev->base_addr, dev->irq);
 }
 
+static int dmfe_ethtool_set_wol(struct net_device *dev,
+                                struct ethtool_wolinfo *wolinfo)
+{
+        struct dmfe_board_info *db = netdev_priv(dev);
+
+        if (wolinfo->wolopts & (WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |
+                                WAKE_ARP | WAKE_MAGICSECURE))
+                   return -EOPNOTSUPP;
+
+        db->wol_mode = wolinfo->wolopts;
+        return 0;
+}
+
+static void dmfe_ethtool_get_wol(struct net_device *dev,
+                                 struct ethtool_wolinfo *wolinfo)
+{
+        struct dmfe_board_info *db = netdev_priv(dev);
+
+        wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
+        wolinfo->wolopts = db->wol_mode;
+        return;
+}
+
+
 static const struct ethtool_ops netdev_ethtool_ops = {
-        .get_drvinfo            = netdev_get_drvinfo,
+        .get_drvinfo            = dmfe_ethtool_get_drvinfo,
         .get_link               = ethtool_op_get_link,
+        .set_wol                = dmfe_ethtool_set_wol,
+        .get_wol                = dmfe_ethtool_get_wol,
 };
 
 /*
@@ -2050,11 +2084,85 @@ static struct pci_device_id dmfe_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, dmfe_pci_tbl);
 
 
+#ifdef CONFIG_PM
+static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pci_dev);
+        struct dmfe_board_info *db = netdev_priv(dev);
+        u32 tmp;
+
+        /* Disable upper layer interface */
+        netif_device_detach(dev);
+
+        /* Disable Tx/Rx */
+        db->cr6_data &= ~(CR6_RXSC | CR6_TXSC);
+        update_cr6(db->cr6_data, dev->base_addr);
+
+        /* Disable Interrupt */
+        outl(0, dev->base_addr + DCR7);
+        outl(inl (dev->base_addr + DCR5), dev->base_addr + DCR5);
+
+        /* Fre RX buffers */
+        dmfe_free_rxbuffer(db);
+
+        /* Enable WOL */
+        pci_read_config_dword(pci_dev, 0x40, &tmp);
+        tmp &= ~(DMFE_WOL_LINKCHANGE|DMFE_WOL_MAGICPACKET);
+
+        if (db->wol_mode & WAKE_PHY)
+                tmp |= DMFE_WOL_LINKCHANGE;
+        if (db->wol_mode & WAKE_MAGIC)
+                tmp |= DMFE_WOL_MAGICPACKET;
+
+        pci_write_config_dword(pci_dev, 0x40, tmp);
+
+        pci_enable_wake(pci_dev, PCI_D3hot, 1);
+        pci_enable_wake(pci_dev, PCI_D3cold, 1);
+
+        /* Power down device*/
+        pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state));
+        pci_save_state(pci_dev);
+
+        return 0;
+}
+
+static int dmfe_resume(struct pci_dev *pci_dev)
+{
+        struct net_device *dev = pci_get_drvdata(pci_dev);
+        u32 tmp;
+
+        pci_restore_state(pci_dev);
+        pci_set_power_state(pci_dev, PCI_D0);
+
+        /* Re-initilize DM910X board */
+        dmfe_init_dm910x(dev);
+
+        /* Disable WOL */
+        pci_read_config_dword(pci_dev, 0x40, &tmp);
+
+        tmp &= ~(DMFE_WOL_LINKCHANGE | DMFE_WOL_MAGICPACKET);
+        pci_write_config_dword(pci_dev, 0x40, tmp);
+
+        pci_enable_wake(pci_dev, PCI_D3hot, 0);
+        pci_enable_wake(pci_dev, PCI_D3cold, 0);
+
+        /* Restart upper layer interface */
+        netif_device_attach(dev);
+
+        return 0;
+}
+#else
+#define dmfe_suspend NULL
+#define dmfe_resume NULL
+#endif
+
 static struct pci_driver dmfe_driver = {
         .name           = "dmfe",
         .id_table       = dmfe_pci_tbl,
         .probe          = dmfe_init_one,
         .remove         = __devexit_p(dmfe_remove_one),
+        .suspend        = dmfe_suspend,
+        .resume         = dmfe_resume
 };
 
 MODULE_AUTHOR("Sten Wang, sten_wang@davicom.com.tw");
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index e86df07769a1..9b08afbd1f65 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -673,7 +673,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                                 if (tp->link_change)
                                         (tp->link_change)(dev, csr5);
                         }
-                        if (csr5 & SytemError) {
+                        if (csr5 & SystemError) {
                                 int error = (csr5 >> 23) & 7;
                                 /* oops, we hit a PCI error.  The code produced corresponds
                                  * to the reason:
@@ -743,7 +743,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                           TxFIFOUnderflow |
                           TxJabber |
                           TPLnkFail |
-                          SytemError )) != 0);
+                          SystemError )) != 0);
 #else
         } while ((csr5 & (NormalIntr|AbnormalIntr)) != 0);
 
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index 20bd52b86993..b56256636543 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -44,8 +44,10 @@ static const unsigned char comet_miireg2offset[32] = {
 
 /* MII transceiver control section.
    Read and write the MII registers using software-generated serial
-   MDIO protocol.  See the MII specifications or DP83840A data sheet
-   for details. */
+   MDIO protocol.
+   See IEEE 802.3-2002.pdf (Section 2, Chapter "22.2.4 Management functions")
+   or DP83840A data sheet for more details.
+   */
 
 int tulip_mdio_read(struct net_device *dev, int phy_id, int location)
 {
@@ -261,24 +263,56 @@ void tulip_select_media(struct net_device *dev, int startup)
                                 u16 *reset_sequence = &((u16*)(p+3))[init_length];
                                 int reset_length = p[2 + init_length*2];
                                 misc_info = reset_sequence + reset_length;
-                                if (startup)
+                                if (startup) {
+                                        int timeout = 10;       /* max 1 ms */
                                         for (i = 0; i < reset_length; i++)
                                                 iowrite32(get_u16(&reset_sequence[i]) << 16, ioaddr + CSR15);
+
+                                        /* flush posted writes */
+                                        ioread32(ioaddr + CSR15);
+
+                                        /* Sect 3.10.3 in DP83840A.pdf (p39) */
+                                        udelay(500);
+
+                                        /* Section 4.2 in DP83840A.pdf (p43) */
+                                        /* and IEEE 802.3 "22.2.4.1.1 Reset" */
+                                        while (timeout-- &&
+                                                (tulip_mdio_read (dev, phy_num, MII_BMCR) & BMCR_RESET))
+                                                udelay(100);
+                                }
                                 for (i = 0; i < init_length; i++)
                                         iowrite32(get_u16(&init_sequence[i]) << 16, ioaddr + CSR15);
+
+                                ioread32(ioaddr + CSR15);       /* flush posted writes */
                         } else {
                                 u8 *init_sequence = p + 2;
                                 u8 *reset_sequence = p + 3 + init_length;
                                 int reset_length = p[2 + init_length];
                                 misc_info = (u16*)(reset_sequence + reset_length);
                                 if (startup) {
+                                        int timeout = 10;       /* max 1 ms */
                                         iowrite32(mtable->csr12dir | 0x100, ioaddr + CSR12);
                                         for (i = 0; i < reset_length; i++)
                                                 iowrite32(reset_sequence[i], ioaddr + CSR12);
+
+                                        /* flush posted writes */
+                                        ioread32(ioaddr + CSR12);
+
+                                        /* Sect 3.10.3 in DP83840A.pdf (p39) */
+                                        udelay(500);
+
+                                        /* Section 4.2 in DP83840A.pdf (p43) */
+                                        /* and IEEE 802.3 "22.2.4.1.1 Reset" */
+                                        while (timeout-- &&
+                                                (tulip_mdio_read (dev, phy_num, MII_BMCR) & BMCR_RESET))
+                                                udelay(100);
                                 }
                                 for (i = 0; i < init_length; i++)
                                         iowrite32(init_sequence[i], ioaddr + CSR12);
+
+                                ioread32(ioaddr + CSR12);       /* flush posted writes */
                         }
+
                         tmp_info = get_u16(&misc_info[1]);
                         if (tmp_info)
                                 tp->advertising[phy_num] = tmp_info | 1;
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 25f25da76917..c840d2e67b23 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -132,7 +132,7 @@ enum pci_cfg_driver_reg {
 /* The bits in the CSR5 status registers, mostly interrupt sources. */
 enum status_bits {
         TimerInt = 0x800,
-        SytemError = 0x2000,
+        SystemError = 0x2000,
         TPLnkFail = 0x1000,
         TPLnkPass = 0x10,
         NormalIntr = 0x10000,
@@ -482,8 +482,11 @@ static inline void tulip_stop_rxtx(struct tulip_private *tp)
                         udelay(10);
 
                 if (!i)
-                        printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n",
-                                        pci_name(tp->pdev));
+                        printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
+                                        " (CSR5 0x%x CSR6 0x%x)\n",
+                                        pci_name(tp->pdev),
+                                        ioread32(ioaddr + CSR5),
+                                        ioread32(ioaddr + CSR6));
         }
 }
 
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index e9bf526ec534..041af63f2811 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -17,11 +17,11 @@
 
 #define DRV_NAME        "tulip"
 #ifdef CONFIG_TULIP_NAPI
-#define DRV_VERSION    "1.1.14-NAPI" /* Keep at least for test */
+#define DRV_VERSION    "1.1.15-NAPI" /* Keep at least for test */
 #else
-#define DRV_VERSION     "1.1.14"
+#define DRV_VERSION     "1.1.15"
 #endif
-#define DRV_RELDATE     "May 11, 2002"
+#define DRV_RELDATE     "Feb 27, 2007"
 
 
 #include <linux/module.h>
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 5b71ac78bca2..fa440706fb4a 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1147,7 +1147,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
                 }
 
                 /* Abnormal error summary/uncommon events handlers. */
-                if (intr_status & (AbnormalIntr | TxFIFOUnderflow | SytemError |
+                if (intr_status & (AbnormalIntr | TxFIFOUnderflow | SystemError |
                                                    TimerInt | TxDied))
                         netdev_error(dev, intr_status);
 
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 639e1e6913bf..16b9acdabbe8 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -29,6 +29,7 @@
 #include <linux/fsl_devices.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/phy.h>
 #include <linux/workqueue.h>
 
 #include <asm/of_platform.h>
@@ -41,12 +42,13 @@
 #include <asm/ucc_fast.h>
 
 #include "ucc_geth.h"
-#include "ucc_geth_phy.h"
+#include "ucc_geth_mii.h"
 
 #undef DEBUG
 
-#define DRV_DESC "QE UCC Gigabit Ethernet Controller version:Sept 11, 2006"
+#define DRV_DESC "QE UCC Gigabit Ethernet Controller"
 #define DRV_NAME "ucc_geth"
+#define DRV_VERSION "1.1"
 
 #define ugeth_printk(level, format, arg...)  \
         printk(level format "\n", ## arg)
@@ -73,22 +75,13 @@ static struct ucc_geth_info ugeth_primary_info = {
                     .bd_mem_part = MEM_PART_SYSTEM,
                     .rtsm = UCC_FAST_SEND_IDLES_BETWEEN_FRAMES,
                     .max_rx_buf_length = 1536,
-/* FIXME: should be changed in run time for 1G and 100M */
-#ifdef CONFIG_UGETH_HAS_GIGA
-                    .urfs = UCC_GETH_URFS_GIGA_INIT,
-                    .urfet = UCC_GETH_URFET_GIGA_INIT,
-                    .urfset = UCC_GETH_URFSET_GIGA_INIT,
-                    .utfs = UCC_GETH_UTFS_GIGA_INIT,
-                    .utfet = UCC_GETH_UTFET_GIGA_INIT,
-                    .utftt = UCC_GETH_UTFTT_GIGA_INIT,
-#else
+                    /* adjusted at startup if max-speed 1000 */
                     .urfs = UCC_GETH_URFS_INIT,
                     .urfet = UCC_GETH_URFET_INIT,
                     .urfset = UCC_GETH_URFSET_INIT,
                     .utfs = UCC_GETH_UTFS_INIT,
                     .utfet = UCC_GETH_UTFET_INIT,
                     .utftt = UCC_GETH_UTFTT_INIT,
-#endif
                     .ufpt = 256,
                     .mode = UCC_FAST_PROTOCOL_MODE_ETHERNET,
                     .ttx_trx = UCC_FAST_GUMR_TRANSPARENT_TTX_TRX_NORMAL,
@@ -217,70 +210,6 @@ static struct list_head *dequeue(struct list_head *lh)
         }
 }
 
-static int get_interface_details(enum enet_interface enet_interface,
-                                 enum enet_speed *speed,
-                                 int *r10m,
-                                 int *rmm,
-                                 int *rpm,
-                                 int *tbi, int *limited_to_full_duplex)
-{
-        /* Analyze enet_interface according to Interface Mode
-        Configuration table */
-        switch (enet_interface) {
-        case ENET_10_MII:
-                *speed = ENET_SPEED_10BT;
-                break;
-        case ENET_10_RMII:
-                *speed = ENET_SPEED_10BT;
-                *r10m = 1;
-                *rmm = 1;
-                break;
-        case ENET_10_RGMII:
-                *speed = ENET_SPEED_10BT;
-                *rpm = 1;
-                *r10m = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_100_MII:
-                *speed = ENET_SPEED_100BT;
-                break;
-        case ENET_100_RMII:
-                *speed = ENET_SPEED_100BT;
-                *rmm = 1;
-                break;
-        case ENET_100_RGMII:
-                *speed = ENET_SPEED_100BT;
-                *rpm = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_GMII:
-                *speed = ENET_SPEED_1000BT;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_RGMII:
-                *speed = ENET_SPEED_1000BT;
-                *rpm = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_TBI:
-                *speed = ENET_SPEED_1000BT;
-                *tbi = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_RTBI:
-                *speed = ENET_SPEED_1000BT;
-                *rpm = 1;
-                *tbi = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        default:
-                return -EINVAL;
-                break;
-        }
-
-        return 0;
-}
-
 static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth, u8 *bd)
 {
         struct sk_buff *skb = NULL;
@@ -758,24 +687,6 @@ static void dump_regs(struct ucc_geth_private *ugeth)
         ugeth_info("hafdup     : addr - 0x%08x, val - 0x%08x",
                    (u32) & ugeth->ug_regs->hafdup,
                    in_be32(&ugeth->ug_regs->hafdup));
-        ugeth_info("miimcfg    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimcfg,
-                   in_be32(&ugeth->ug_regs->miimng.miimcfg));
-        ugeth_info("miimcom    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimcom,
-                   in_be32(&ugeth->ug_regs->miimng.miimcom));
-        ugeth_info("miimadd    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimadd,
-                   in_be32(&ugeth->ug_regs->miimng.miimadd));
-        ugeth_info("miimcon    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimcon,
-                   in_be32(&ugeth->ug_regs->miimng.miimcon));
-        ugeth_info("miimstat   : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimstat,
-                   in_be32(&ugeth->ug_regs->miimng.miimstat));
-        ugeth_info("miimmind   : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimind,
-                   in_be32(&ugeth->ug_regs->miimng.miimind));
         ugeth_info("ifctl      : addr - 0x%08x, val - 0x%08x",
                    (u32) & ugeth->ug_regs->ifctl,
                    in_be32(&ugeth->ug_regs->ifctl));
@@ -1425,27 +1336,6 @@ static int init_mac_station_addr_regs(u8 address_byte_0,
         return 0;
 }
 
-static int init_mac_duplex_mode(int full_duplex,
-                                int limited_to_full_duplex,
-                                volatile u32 *maccfg2_register)
-{
-        u32 value = 0;
-
-        /* some interfaces must work in full duplex mode */
-        if ((full_duplex == 0) && (limited_to_full_duplex == 1))
-                return -EINVAL;
-
-        value = in_be32(maccfg2_register);
-
-        if (full_duplex)
-                value |= MACCFG2_FDX;
-        else
-                value &= ~MACCFG2_FDX;
-
-        out_be32(maccfg2_register, value);
-        return 0;
-}
-
 static int init_check_frame_length_mode(int length_check,
                                         volatile u32 *maccfg2_register)
 {
@@ -1477,40 +1367,6 @@ static int init_preamble_length(u8 preamble_length,
         return 0;
 }
 
-static int init_mii_management_configuration(int reset_mgmt,
-                                             int preamble_supress,
-                                             volatile u32 *miimcfg_register,
-                                             volatile u32 *miimind_register)
-{
-        unsigned int timeout = PHY_INIT_TIMEOUT;
-        u32 value = 0;
-
-        value = in_be32(miimcfg_register);
-        if (reset_mgmt) {
-                value |= MIIMCFG_RESET_MANAGEMENT;
-                out_be32(miimcfg_register, value);
-        }
-
-        value = 0;
-
-        if (preamble_supress)
-                value |= MIIMCFG_NO_PREAMBLE;
-
-        value |= UCC_GETH_MIIMCFG_MNGMNT_CLC_DIV_INIT;
-        out_be32(miimcfg_register, value);
-
-        /* Wait until the bus is free */
-        while ((in_be32(miimind_register) & MIIMIND_BUSY) && timeout--)
-                cpu_relax();
-
-        if (timeout <= 0) {
-                ugeth_err("%s: The MII Bus is stuck!", __FUNCTION__);
-                return -ETIMEDOUT;
-        }
-
-        return 0;
-}
-
 static int init_rx_parameters(int reject_broadcast,
                               int receive_short_frames,
                               int promiscuous, volatile u32 *upsmr_register)
@@ -1570,10 +1426,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         struct ucc_geth_info *ug_info;
         struct ucc_geth *ug_regs;
         struct ucc_fast *uf_regs;
-        enum enet_speed speed;
-        int ret_val, rpm = 0, tbi = 0, r10m = 0, rmm =
-            0, limited_to_full_duplex = 0;
-        u32 upsmr, maccfg2, utbipar, tbiBaseAddress;
+        int ret_val;
+        u32 upsmr, maccfg2, tbiBaseAddress;
         u16 value;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -1582,24 +1436,13 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         ug_regs = ugeth->ug_regs;
         uf_regs = ugeth->uccf->uf_regs;
 
-        /* Analyze enet_interface according to Interface Mode Configuration
-        table */
-        ret_val =
-            get_interface_details(ug_info->enet_interface, &speed, &r10m, &rmm,
-                                  &rpm, &tbi, &limited_to_full_duplex);
-        if (ret_val != 0) {
-                ugeth_err
-                  ("%s: half duplex not supported in requested configuration.",
-                     __FUNCTION__);
-                return ret_val;
-        }
-
         /*                    Set MACCFG2                    */
         maccfg2 = in_be32(&ug_regs->maccfg2);
         maccfg2 &= ~MACCFG2_INTERFACE_MODE_MASK;
-        if ((speed == ENET_SPEED_10BT) || (speed == ENET_SPEED_100BT))
+        if ((ugeth->max_speed == SPEED_10) ||
+            (ugeth->max_speed == SPEED_100))
                 maccfg2 |= MACCFG2_INTERFACE_MODE_NIBBLE;
-        else if (speed == ENET_SPEED_1000BT)
+        else if (ugeth->max_speed == SPEED_1000)
                 maccfg2 |= MACCFG2_INTERFACE_MODE_BYTE;
         maccfg2 |= ug_info->padAndCrc;
         out_be32(&ug_regs->maccfg2, maccfg2);
@@ -1607,54 +1450,39 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         /*                    Set UPSMR                      */
         upsmr = in_be32(&uf_regs->upsmr);
         upsmr &= ~(UPSMR_RPM | UPSMR_R10M | UPSMR_TBIM | UPSMR_RMM);
-        if (rpm)
+        if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                 upsmr |= UPSMR_RPM;
-        if (r10m)
-                upsmr |= UPSMR_R10M;
-        if (tbi)
+                switch (ugeth->max_speed) {
+                case SPEED_10:
+                        upsmr |= UPSMR_R10M;
+                        /* FALLTHROUGH */
+                case SPEED_100:
+                        if (ugeth->phy_interface != PHY_INTERFACE_MODE_RTBI)
+                                upsmr |= UPSMR_RMM;
+                }
+        }
+        if ((ugeth->phy_interface == PHY_INTERFACE_MODE_TBI) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                 upsmr |= UPSMR_TBIM;
-        if (rmm)
-                upsmr |= UPSMR_RMM;
+        }
         out_be32(&uf_regs->upsmr, upsmr);
 
-        /*                    Set UTBIPAR                    */
-        utbipar = in_be32(&ug_regs->utbipar);
-        utbipar &= ~UTBIPAR_PHY_ADDRESS_MASK;
-        if (tbi)
-                utbipar |=
-                    (ug_info->phy_address +
-                     ugeth->ug_info->uf_info.
-                     ucc_num) << UTBIPAR_PHY_ADDRESS_SHIFT;
-        else
-                utbipar |=
-                    (0x10 +
-                     ugeth->ug_info->uf_info.
-                     ucc_num) << UTBIPAR_PHY_ADDRESS_SHIFT;
-        out_be32(&ug_regs->utbipar, utbipar);
-
         /* Disable autonegotiation in tbi mode, because by default it
         comes up in autonegotiation mode. */
         /* Note that this depends on proper setting in utbipar register. */
-        if (tbi) {
+        if ((ugeth->phy_interface == PHY_INTERFACE_MODE_TBI) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                 tbiBaseAddress = in_be32(&ug_regs->utbipar);
                 tbiBaseAddress &= UTBIPAR_PHY_ADDRESS_MASK;
                 tbiBaseAddress >>= UTBIPAR_PHY_ADDRESS_SHIFT;
-                value =
-                    ugeth->mii_info->mdio_read(ugeth->dev, (u8) tbiBaseAddress,
-                                               ENET_TBI_MII_CR);
+                value = ugeth->phydev->bus->read(ugeth->phydev->bus,
+                                (u8) tbiBaseAddress, ENET_TBI_MII_CR);
                 value &= ~0x1000;       /* Turn off autonegotiation */
-                ugeth->mii_info->mdio_write(ugeth->dev, (u8) tbiBaseAddress,
-                                            ENET_TBI_MII_CR, value);
-        }
-
-        ret_val = init_mac_duplex_mode(1,
-                                       limited_to_full_duplex,
-                                       &ug_regs->maccfg2);
-        if (ret_val != 0) {
-                ugeth_err
-                ("%s: half duplex not supported in requested configuration.",
-                     __FUNCTION__);
-                return ret_val;
+                ugeth->phydev->bus->write(ugeth->phydev->bus,
+                                (u8) tbiBaseAddress, ENET_TBI_MII_CR, value);
         }
 
         init_check_frame_length_mode(ug_info->lengthCheckRx, &ug_regs->maccfg2);
@@ -1676,76 +1504,88 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
  * function converts those variables into the appropriate
  * register values, and can bring down the device if needed.
  */
+
 static void adjust_link(struct net_device *dev)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
         struct ucc_geth *ug_regs;
-        u32 tempval;
-        struct ugeth_mii_info *mii_info = ugeth->mii_info;
+        struct ucc_fast *uf_regs;
+        struct phy_device *phydev = ugeth->phydev;
+        unsigned long flags;
+        int new_state = 0;
 
         ug_regs = ugeth->ug_regs;
+        uf_regs = ugeth->uccf->uf_regs;
 
-        if (mii_info->link) {
+        spin_lock_irqsave(&ugeth->lock, flags);
+
+        if (phydev->link) {
+                u32 tempval = in_be32(&ug_regs->maccfg2);
+                u32 upsmr = in_be32(&uf_regs->upsmr);
                 /* Now we make sure that we can be in full duplex mode.
                  * If not, we operate in half-duplex mode. */
-                if (mii_info->duplex != ugeth->oldduplex) {
-                        if (!(mii_info->duplex)) {
-                                tempval = in_be32(&ug_regs->maccfg2);
+                if (phydev->duplex != ugeth->oldduplex) {
+                        new_state = 1;
+                        if (!(phydev->duplex))
                                 tempval &= ~(MACCFG2_FDX);
-                                out_be32(&ug_regs->maccfg2, tempval);
-
-                                ugeth_info("%s: Half Duplex", dev->name);
-                        } else {
-                                tempval = in_be32(&ug_regs->maccfg2);
+                        else
                                 tempval |= MACCFG2_FDX;
-                                out_be32(&ug_regs->maccfg2, tempval);
-
-                                ugeth_info("%s: Full Duplex", dev->name);
-                        }
-
-                        ugeth->oldduplex = mii_info->duplex;
+                        ugeth->oldduplex = phydev->duplex;
                 }
 
-                if (mii_info->speed != ugeth->oldspeed) {
-                        switch (mii_info->speed) {
-                        case 1000:
-                                ugeth->ug_info->enet_interface = ENET_1000_RGMII;
+                if (phydev->speed != ugeth->oldspeed) {
+                        new_state = 1;
+                        switch (phydev->speed) {
+                        case SPEED_1000:
+                                tempval = ((tempval &
+                                            ~(MACCFG2_INTERFACE_MODE_MASK)) |
+                                            MACCFG2_INTERFACE_MODE_BYTE);
                                 break;
-                        case 100:
-                                ugeth->ug_info->enet_interface = ENET_100_RGMII;
-                                break;
-                        case 10:
-                                ugeth->ug_info->enet_interface = ENET_10_RGMII;
+                        case SPEED_100:
+                        case SPEED_10:
+                                tempval = ((tempval &
+                                            ~(MACCFG2_INTERFACE_MODE_MASK)) |
+                                            MACCFG2_INTERFACE_MODE_NIBBLE);
+                                /* if reduced mode, re-set UPSMR.R10M */
+                                if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
+                                        if (phydev->speed == SPEED_10)
+                                                upsmr |= UPSMR_R10M;
+                                        else
+                                                upsmr &= ~(UPSMR_R10M);
+                                }
                                 break;
                         default:
-                                ugeth_warn
-                                    ("%s: Ack!  Speed (%d) is not 10/100/1000!",
-                                     dev->name, mii_info->speed);
+                                if (netif_msg_link(ugeth))
+                                        ugeth_warn(
+                                                "%s: Ack!  Speed (%d) is not 10/100/1000!",
+                                                dev->name, phydev->speed);
                                 break;
                         }
-                        adjust_enet_interface(ugeth);
-
-                        ugeth_info("%s: Speed %dBT", dev->name,
-                                   mii_info->speed);
-
-                        ugeth->oldspeed = mii_info->speed;
+                        ugeth->oldspeed = phydev->speed;
                 }
 
+                out_be32(&ug_regs->maccfg2, tempval);
+                out_be32(&uf_regs->upsmr, upsmr);
+
                 if (!ugeth->oldlink) {
-                        ugeth_info("%s: Link is up", dev->name);
+                        new_state = 1;
                         ugeth->oldlink = 1;
-                        netif_carrier_on(dev);
                         netif_schedule(dev);
                 }
-        } else {
-                if (ugeth->oldlink) {
-                        ugeth_info("%s: Link is down", dev->name);
+        } else if (ugeth->oldlink) {
+                        new_state = 1;
                         ugeth->oldlink = 0;
                         ugeth->oldspeed = 0;
                         ugeth->oldduplex = -1;
-                        netif_carrier_off(dev);
-                }
         }
+
+        if (new_state && netif_msg_link(ugeth))
+                phy_print_status(phydev);
+
+        spin_unlock_irqrestore(&ugeth->lock, flags);
 }
 
 /* Configure the PHY for dev.
@@ -1753,102 +1593,40 @@ static void adjust_link(struct net_device *dev)
  */
 static int init_phy(struct net_device *dev)
 {
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-        struct phy_info *curphy;
-        struct ucc_mii_mng *mii_regs;
-        struct ugeth_mii_info *mii_info;
-        int err;
+        struct ucc_geth_private *priv = netdev_priv(dev);
+        struct phy_device *phydev;
+        char phy_id[BUS_ID_SIZE];
 
-        mii_regs = &ugeth->ug_regs->miimng;
+        priv->oldlink = 0;
+        priv->oldspeed = 0;
+        priv->oldduplex = -1;
 
-        ugeth->oldlink = 0;
-        ugeth->oldspeed = 0;
-        ugeth->oldduplex = -1;
+        snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, priv->ug_info->mdio_bus,
+                        priv->ug_info->phy_address);
 
-        mii_info = kmalloc(sizeof(struct ugeth_mii_info), GFP_KERNEL);
+        phydev = phy_connect(dev, phy_id, &adjust_link, 0, priv->phy_interface);
 
-        if (NULL == mii_info) {
-                ugeth_err("%s: Could not allocate mii_info", dev->name);
-                return -ENOMEM;
+        if (IS_ERR(phydev)) {
+                printk("%s: Could not attach to PHY\n", dev->name);
+                return PTR_ERR(phydev);
         }
 
-        mii_info->mii_regs = mii_regs;
-        mii_info->speed = SPEED_1000;
-        mii_info->duplex = DUPLEX_FULL;
-        mii_info->pause = 0;
-        mii_info->link = 0;
-
-        mii_info->advertising = (ADVERTISED_10baseT_Half |
+        phydev->supported &= (ADVERTISED_10baseT_Half |
                                  ADVERTISED_10baseT_Full |
                                  ADVERTISED_100baseT_Half |
-                                 ADVERTISED_100baseT_Full |
-                                 ADVERTISED_1000baseT_Full);
-        mii_info->autoneg = 1;
+                                 ADVERTISED_100baseT_Full);
 
-        mii_info->mii_id = ugeth->ug_info->phy_address;
+        if (priv->max_speed == SPEED_1000)
+                phydev->supported |= ADVERTISED_1000baseT_Full;
 
-        mii_info->dev = dev;
+        phydev->advertising = phydev->supported;
 
-        mii_info->mdio_read = &read_phy_reg;
-        mii_info->mdio_write = &write_phy_reg;
-
-        spin_lock_init(&mii_info->mdio_lock);
-
-        ugeth->mii_info = mii_info;
-
-        spin_lock_irq(&ugeth->lock);
-
-        /* Set this UCC to be the master of the MII managment */
-        ucc_set_qe_mux_mii_mng(ugeth->ug_info->uf_info.ucc_num);
-
-        if (init_mii_management_configuration(1,
-                                              ugeth->ug_info->
-                                              miiPreambleSupress,
-                                              &mii_regs->miimcfg,
-                                              &mii_regs->miimind)) {
-                ugeth_err("%s: The MII Bus is stuck!", dev->name);
-                err = -1;
-                goto bus_fail;
-        }
-
-        spin_unlock_irq(&ugeth->lock);
-
-        /* get info for this PHY */
-        curphy = get_phy_info(ugeth->mii_info);
-
-        if (curphy == NULL) {
-                ugeth_err("%s: No PHY found", dev->name);
-                err = -1;
-                goto no_phy;
-        }
-
-        mii_info->phyinfo = curphy;
-
-        /* Run the commands which initialize the PHY */
-        if (curphy->init) {
-                err = curphy->init(ugeth->mii_info);
-                if (err)
-                        goto phy_init_fail;
-        }
+        priv->phydev = phydev;
 
         return 0;
-
-      phy_init_fail:
-      no_phy:
-      bus_fail:
-        kfree(mii_info);
-
-        return err;
 }
 
-#ifdef CONFIG_UGETH_TX_ON_DEMOND
-static int ugeth_transmit_on_demand(struct ucc_geth_private *ugeth)
-{
-        struct ucc_fastransmit_on_demand(ugeth->uccf);
 
-        return 0;
-}
-#endif
 
 static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth)
 {
@@ -2356,6 +2134,8 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
         }
         for (i = 0; i < ugeth->ug_info->numQueuesTx; i++) {
                 bd = ugeth->p_tx_bd_ring[i];
+                if (!bd)
+                        continue;
                 for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) {
                         if (ugeth->tx_skbuff[i][j]) {
                                 dma_unmap_single(NULL,
@@ -2487,6 +2267,7 @@ static void ucc_geth_set_multi(struct net_device *dev)
 static void ucc_geth_stop(struct ucc_geth_private *ugeth)
 {
         struct ucc_geth *ug_regs = ugeth->ug_regs;
+        struct phy_device *phydev = ugeth->phydev;
         u32 tempval;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -2495,8 +2276,7 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth)
         ugeth_disable(ugeth, COMM_DIR_RX_AND_TX);
 
         /* Tell the kernel the link is down */
-        ugeth->mii_info->link = 0;
-        adjust_link(ugeth->dev);
+        phy_stop(phydev);
 
         /* Mask all interrupts */
         out_be32(ugeth->uccf->p_ucce, 0x00000000);
@@ -2509,50 +2289,24 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth)
         tempval &= ~(MACCFG1_ENABLE_RX | MACCFG1_ENABLE_TX);
         out_be32(&ug_regs->maccfg1, tempval);
 
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) {
-                /* Clear any pending interrupts */
-                mii_clear_phy_interrupt(ugeth->mii_info);
-
-                /* Disable PHY Interrupts */
-                mii_configure_phy_interrupt(ugeth->mii_info,
-                                            MII_INTERRUPT_DISABLED);
-        }
-
         free_irq(ugeth->ug_info->uf_info.irq, ugeth->dev);
 
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) {
-                free_irq(ugeth->ug_info->phy_interrupt, ugeth->dev);
-        } else {
-                del_timer_sync(&ugeth->phy_info_timer);
-        }
-
         ucc_geth_memclean(ugeth);
 }
 
-static int ucc_geth_startup(struct ucc_geth_private *ugeth)
+static int ucc_struct_init(struct ucc_geth_private *ugeth)
 {
-        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
-        struct ucc_geth_init_pram *p_init_enet_pram;
-        struct ucc_fast_private *uccf;
         struct ucc_geth_info *ug_info;
         struct ucc_fast_info *uf_info;
-        struct ucc_fast *uf_regs;
-        struct ucc_geth *ug_regs;
-        int ret_val = -EINVAL;
-        u32 remoder = UCC_GETH_REMODER_INIT;
-        u32 init_enet_pram_offset, cecr_subblock, command, maccfg1;
-        u32 ifstat, i, j, size, l2qt, l3qt, length;
-        u16 temoder = UCC_GETH_TEMODER_INIT;
-        u16 test;
-        u8 function_code = 0;
-        u8 *bd, *endOfRing;
-        u8 numThreadsRxNumerical, numThreadsTxNumerical;
-
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        int i;
 
         ug_info = ugeth->ug_info;
         uf_info = &ug_info->uf_info;
 
+        /* Create CQs for hash tables */
+        INIT_LIST_HEAD(&ugeth->group_hash_q);
+        INIT_LIST_HEAD(&ugeth->ind_hash_q);
+
         if (!((uf_info->bd_mem_part == MEM_PART_SYSTEM) ||
               (uf_info->bd_mem_part == MEM_PART_MURAM))) {
                 ugeth_err("%s: Bad memory partition value.", __FUNCTION__);
@@ -2647,12 +2401,42 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         for (i = 0; i < ug_info->numQueuesTx; i++)
                 uf_info->uccm_mask |= (UCCE_TXBF_SINGLE_MASK << i);
         /* Initialize the general fast UCC block. */
-        if (ucc_fast_init(uf_info, &uccf)) {
+        if (ucc_fast_init(uf_info, &ugeth->uccf)) {
                 ugeth_err("%s: Failed to init uccf.", __FUNCTION__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
-        ugeth->uccf = uccf;
+
+        ugeth->ug_regs = (struct ucc_geth *) ioremap(uf_info->regs, sizeof(struct ucc_geth));
+
+        return 0;
+}
+
+static int ucc_geth_startup(struct ucc_geth_private *ugeth)
+{
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
+        struct ucc_geth_init_pram *p_init_enet_pram;
+        struct ucc_fast_private *uccf;
+        struct ucc_geth_info *ug_info;
+        struct ucc_fast_info *uf_info;
+        struct ucc_fast *uf_regs;
+        struct ucc_geth *ug_regs;
+        int ret_val = -EINVAL;
+        u32 remoder = UCC_GETH_REMODER_INIT;
+        u32 init_enet_pram_offset, cecr_subblock, command, maccfg1;
+        u32 ifstat, i, j, size, l2qt, l3qt, length;
+        u16 temoder = UCC_GETH_TEMODER_INIT;
+        u16 test;
+        u8 function_code = 0;
+        u8 *bd, *endOfRing;
+        u8 numThreadsRxNumerical, numThreadsTxNumerical;
+
+        ugeth_vdbg("%s: IN", __FUNCTION__);
+        uccf = ugeth->uccf;
+        ug_info = ugeth->ug_info;
+        uf_info = &ug_info->uf_info;
+        uf_regs = uccf->uf_regs;
+        ug_regs = ugeth->ug_regs;
 
         switch (ug_info->numThreadsRx) {
         case UCC_GETH_NUM_OF_THREADS_1:
@@ -2711,10 +2495,6 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
             || (ug_info->vlanOperationNonTagged !=
                 UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP);
 
-        uf_regs = uccf->uf_regs;
-        ug_regs = (struct ucc_geth *) (uccf->uf_regs);
-        ugeth->ug_regs = ug_regs;
-
         init_default_reg_vals(&uf_regs->upsmr,
                               &ug_regs->maccfg1, &ug_regs->maccfg2);
 
@@ -3177,8 +2957,8 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         /* Size varies with number of Rx queues */
         ugeth->rx_irq_coalescing_tbl_offset =
             qe_muram_alloc(ug_info->numQueuesRx *
-                           sizeof(struct ucc_geth_rx_interrupt_coalescing_entry),
-                           UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
+                           sizeof(struct ucc_geth_rx_interrupt_coalescing_entry)
+                           + 4, UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for"
@@ -3359,13 +3139,6 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 for (j = 0; j < NUM_OF_PADDRS; j++)
                         ugeth_82xx_filtering_clear_addr_in_paddr(ugeth, (u8) j);
 
-                /* Create CQs for hash tables */
-                if (ug_info->maxGroupAddrInHash > 0) {
-                        INIT_LIST_HEAD(&ugeth->group_hash_q);
-                }
-                if (ug_info->maxIndAddrInHash > 0) {
-                        INIT_LIST_HEAD(&ugeth->ind_hash_q);
-                }
                 p_82xx_addr_filt =
                     (struct ucc_geth_82xx_address_filtering_pram *) ugeth->
                     p_rx_glbl_pram->addressfiltering;
@@ -3562,6 +3335,9 @@ static void ucc_geth_timeout(struct net_device *dev)
 static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
+#ifdef CONFIG_UGETH_TX_ON_DEMAND
+        struct ucc_fast_private *uccf;
+#endif
         u8 *bd;                 /* BD pointer */
         u32 bd_status;
         u8 txQ = 0;
@@ -3620,6 +3396,10 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 out_be16(ugeth->p_cpucount[txQ], ugeth->cpucount[txQ]);
         }
 
+#ifdef CONFIG_UGETH_TX_ON_DEMAND
+        uccf = ugeth->uccf;
+        out_be16(uccf->p_utodr, UCC_FAST_TOD);
+#endif
         spin_unlock_irq(&ugeth->lock);
 
         return 0;
@@ -3635,7 +3415,6 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
-        spin_lock(&ugeth->lock);
         /* collect received buffers */
         bd = ugeth->rxBd[rxQ];
 
@@ -3683,7 +3462,6 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
                 skb = get_new_skb(ugeth, bd);
                 if (!skb) {
                         ugeth_warn("%s: No Rx Data Buffer", __FUNCTION__);
-                        spin_unlock(&ugeth->lock);
                         ugeth->stats.rx_dropped++;
                         break;
                 }
@@ -3704,7 +3482,6 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
         }
 
         ugeth->rxBd[rxQ] = bd;
-        spin_unlock(&ugeth->lock);
         return howmany;
 }
 
@@ -3756,23 +3533,38 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
 static int ucc_geth_poll(struct net_device *dev, int *budget)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct ucc_geth_info *ug_info;
+        struct ucc_fast_private *uccf;
         int howmany;
-        int rx_work_limit = *budget;
-        u8 rxQ = 0;
+        u8 i;
+        int rx_work_limit;
+        register u32 uccm;
+
+        ug_info = ugeth->ug_info;
 
+        rx_work_limit = *budget;
         if (rx_work_limit > dev->quota)
                 rx_work_limit = dev->quota;
 
-        howmany = ucc_geth_rx(ugeth, rxQ, rx_work_limit);
+        howmany = 0;
+
+        for (i = 0; i < ug_info->numQueuesRx; i++) {
+                howmany += ucc_geth_rx(ugeth, i, rx_work_limit);
+        }
 
         dev->quota -= howmany;
         rx_work_limit -= howmany;
         *budget -= howmany;
 
-        if (rx_work_limit >= 0)
+        if (rx_work_limit > 0) {
                 netif_rx_complete(dev);
+                uccf = ugeth->uccf;
+                uccm = in_be32(uccf->p_uccm);
+                uccm |= UCCE_RX_EVENTS;
+                out_be32(uccf->p_uccm, uccm);
+        }
 
-        return (rx_work_limit < 0) ? 1 : 0;
+        return (rx_work_limit > 0) ? 0 : 1;
 }
 #endif                          /* CONFIG_UGETH_NAPI */
 
@@ -3782,10 +3574,13 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
         struct ucc_geth_private *ugeth = netdev_priv(dev);
         struct ucc_fast_private *uccf;
         struct ucc_geth_info *ug_info;
-        register u32 ucce = 0;
-        register u32 bit_mask = UCCE_RXBF_SINGLE_MASK;
-        register u32 tx_mask = UCCE_TXBF_SINGLE_MASK;
-        register u8 i;
+        register u32 ucce;
+        register u32 uccm;
+#ifndef CONFIG_UGETH_NAPI
+        register u32 rx_mask;
+#endif
+        register u32 tx_mask;
+        u8 i;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -3795,174 +3590,57 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
         uccf = ugeth->uccf;
         ug_info = ugeth->ug_info;
 
-        do {
-                ucce |= (u32) (in_be32(uccf->p_ucce) & in_be32(uccf->p_uccm));
-
-                /* clear event bits for next time */
-                /* Side effect here is to mask ucce variable
-                for future processing below. */
-                out_be32(uccf->p_ucce, ucce);   /* Clear with ones,
-                                                but only bits in UCCM */
-
-                /* We ignore Tx interrupts because Tx confirmation is
-                done inside Tx routine */
+        /* read and clear events */
+        ucce = (u32) in_be32(uccf->p_ucce);
+        uccm = (u32) in_be32(uccf->p_uccm);
+        ucce &= uccm;
+        out_be32(uccf->p_ucce, ucce);
 
+        /* check for receive events that require processing */
+        if (ucce & UCCE_RX_EVENTS) {
+#ifdef CONFIG_UGETH_NAPI
+                if (netif_rx_schedule_prep(dev)) {
+                uccm &= ~UCCE_RX_EVENTS;
+                        out_be32(uccf->p_uccm, uccm);
+                        __netif_rx_schedule(dev);
+                }
+#else
+                rx_mask = UCCE_RXBF_SINGLE_MASK;
                 for (i = 0; i < ug_info->numQueuesRx; i++) {
-                        if (ucce & bit_mask)
-                                ucc_geth_rx(ugeth, i,
-                                            (int)ugeth->ug_info->
-                                            bdRingLenRx[i]);
-                        ucce &= ~bit_mask;
-                        bit_mask <<= 1;
+                        if (ucce & rx_mask)
+                                ucc_geth_rx(ugeth, i, (int)ugeth->ug_info->bdRingLenRx[i]);
+                        ucce &= ~rx_mask;
+                        rx_mask <<= 1;
                 }
+#endif /* CONFIG_UGETH_NAPI */
+        }
 
+        /* Tx event processing */
+        if (ucce & UCCE_TX_EVENTS) {
+                spin_lock(&ugeth->lock);
+                tx_mask = UCCE_TXBF_SINGLE_MASK;
                 for (i = 0; i < ug_info->numQueuesTx; i++) {
                         if (ucce & tx_mask)
                                 ucc_geth_tx(dev, i);
                         ucce &= ~tx_mask;
                         tx_mask <<= 1;
                 }
+                spin_unlock(&ugeth->lock);
+        }
 
-                /* Exceptions */
+        /* Errors and other events */
+        if (ucce & UCCE_OTHER) {
                 if (ucce & UCCE_BSY) {
-                        ugeth_vdbg("Got BUSY irq!!!!");
                         ugeth->stats.rx_errors++;
-                        ucce &= ~UCCE_BSY;
                 }
-                if (ucce & UCCE_OTHER) {
-                        ugeth_vdbg("Got frame with error (ucce - 0x%08x)!!!!",
-                                   ucce);
-                        ugeth->stats.rx_errors++;
-                        ucce &= ~ucce;
+                if (ucce & UCCE_TXE) {
+                        ugeth->stats.tx_errors++;
                 }
         }
-        while (ucce);
-
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t phy_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = (struct net_device *)dev_id;
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-
-        ugeth_vdbg("%s: IN", __FUNCTION__);
-
-        /* Clear the interrupt */
-        mii_clear_phy_interrupt(ugeth->mii_info);
-
-        /* Disable PHY interrupts */
-        mii_configure_phy_interrupt(ugeth->mii_info, MII_INTERRUPT_DISABLED);
-
-        /* Schedule the phy change */
-        schedule_work(&ugeth->tq);
 
         return IRQ_HANDLED;
 }
 
-/* Scheduled by the phy_interrupt/timer to handle PHY changes */
-static void ugeth_phy_change(struct work_struct *work)
-{
-        struct ucc_geth_private *ugeth =
-                container_of(work, struct ucc_geth_private, tq);
-        struct net_device *dev = ugeth->dev;
-        struct ucc_geth *ug_regs;
-        int result = 0;
-
-        ugeth_vdbg("%s: IN", __FUNCTION__);
-
-        ug_regs = ugeth->ug_regs;
-
-        /* Delay to give the PHY a chance to change the
-         * register state */
-        msleep(1);
-
-        /* Update the link, speed, duplex */
-        result = ugeth->mii_info->phyinfo->read_status(ugeth->mii_info);
-
-        /* Adjust the known status as long as the link
-         * isn't still coming up */
-        if ((0 == result) || (ugeth->mii_info->link == 0))
-                adjust_link(dev);
-
-        /* Reenable interrupts, if needed */
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR)
-                mii_configure_phy_interrupt(ugeth->mii_info,
-                                            MII_INTERRUPT_ENABLED);
-}
-
-/* Called every so often on systems that don't interrupt
- * the core for PHY changes */
-static void ugeth_phy_timer(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-
-        schedule_work(&ugeth->tq);
-
-        mod_timer(&ugeth->phy_info_timer, jiffies + PHY_CHANGE_TIME * HZ);
-}
-
-/* Keep trying aneg for some time
- * If, after GFAR_AN_TIMEOUT seconds, it has not
- * finished, we switch to forced.
- * Either way, once the process has completed, we either
- * request the interrupt, or switch the timer over to
- * using ugeth_phy_timer to check status */
-static void ugeth_phy_startup_timer(unsigned long data)
-{
-        struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data;
-        struct ucc_geth_private *ugeth = netdev_priv(mii_info->dev);
-        static int secondary = UGETH_AN_TIMEOUT;
-        int result;
-
-        /* Configure the Auto-negotiation */
-        result = mii_info->phyinfo->config_aneg(mii_info);
-
-        /* If autonegotiation failed to start, and
-         * we haven't timed out, reset the timer, and return */
-        if (result && secondary--) {
-                mod_timer(&ugeth->phy_info_timer, jiffies + HZ);
-                return;
-        } else if (result) {
-                /* Couldn't start autonegotiation.
-                 * Try switching to forced */
-                mii_info->autoneg = 0;
-                result = mii_info->phyinfo->config_aneg(mii_info);
-
-                /* Forcing failed!  Give up */
-                if (result) {
-                        ugeth_err("%s: Forcing failed!", mii_info->dev->name);
-                        return;
-                }
-        }
-
-        /* Kill the timer so it can be restarted */
-        del_timer_sync(&ugeth->phy_info_timer);
-
-        /* Grab the PHY interrupt, if necessary/possible */
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) {
-                if (request_irq(ugeth->ug_info->phy_interrupt,
-                                phy_interrupt, IRQF_SHARED,
-                                "phy_interrupt", mii_info->dev) < 0) {
-                        ugeth_err("%s: Can't get IRQ %d (PHY)",
-                                  mii_info->dev->name,
-                                  ugeth->ug_info->phy_interrupt);
-                } else {
-                        mii_configure_phy_interrupt(ugeth->mii_info,
-                                                    MII_INTERRUPT_ENABLED);
-                        return;
-                }
-        }
-
-        /* Start the timer again, this time in order to
-         * handle a change in status */
-        init_timer(&ugeth->phy_info_timer);
-        ugeth->phy_info_timer.function = &ugeth_phy_timer;
-        ugeth->phy_info_timer.data = (unsigned long)mii_info->dev;
-        mod_timer(&ugeth->phy_info_timer, jiffies + PHY_CHANGE_TIME * HZ);
-}
-
 /* Called when something needs to use the ethernet device */
 /* Returns 0 for success. */
 static int ucc_geth_open(struct net_device *dev)
@@ -3979,6 +3657,12 @@ static int ucc_geth_open(struct net_device *dev)
                 return -EINVAL;
         }
 
+        err = ucc_struct_init(ugeth);
+        if (err) {
+                ugeth_err("%s: Cannot configure internal struct, aborting.", dev->name);
+                return err;
+        }
+
         err = ucc_geth_startup(ugeth);
         if (err) {
                 ugeth_err("%s: Cannot configure net device, aborting.",
@@ -4006,10 +3690,12 @@ static int ucc_geth_open(struct net_device *dev)
 
         err = init_phy(dev);
         if (err) {
-                ugeth_err("%s: Cannot initialzie PHY, aborting.", dev->name);
+                ugeth_err("%s: Cannot initialize PHY, aborting.", dev->name);
                 return err;
         }
-#ifndef CONFIG_UGETH_NAPI
+
+        phy_start(ugeth->phydev);
+
         err =
             request_irq(ugeth->ug_info->uf_info.irq, ucc_geth_irq_handler, 0,
                         "UCC Geth", dev);
@@ -4019,15 +3705,6 @@ static int ucc_geth_open(struct net_device *dev)
                 ucc_geth_stop(ugeth);
                 return err;
         }
-#endif                          /* CONFIG_UGETH_NAPI */
-
-        /* Set up the PHY change work queue */
-        INIT_WORK(&ugeth->tq, ugeth_phy_change);
-
-        init_timer(&ugeth->phy_info_timer);
-        ugeth->phy_info_timer.function = &ugeth_phy_startup_timer;
-        ugeth->phy_info_timer.data = (unsigned long)ugeth->mii_info;
-        mod_timer(&ugeth->phy_info_timer, jiffies + HZ);
 
         err = ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);
         if (err) {
@@ -4050,11 +3727,8 @@ static int ucc_geth_close(struct net_device *dev)
 
         ucc_geth_stop(ugeth);
 
-        /* Shutdown the PHY */
-        if (ugeth->mii_info->phyinfo->close)
-                ugeth->mii_info->phyinfo->close(ugeth->mii_info);
-
-        kfree(ugeth->mii_info);
+        phy_disconnect(ugeth->phydev);
+        ugeth->phydev = NULL;
 
         netif_stop_queue(dev);
 
@@ -4063,20 +3737,53 @@ static int ucc_geth_close(struct net_device *dev)
 
 const struct ethtool_ops ucc_geth_ethtool_ops = { };
 
+static phy_interface_t to_phy_interface(const char *interface_type)
+{
+        if (strcasecmp(interface_type, "mii") == 0)
+                return PHY_INTERFACE_MODE_MII;
+        if (strcasecmp(interface_type, "gmii") == 0)
+                return PHY_INTERFACE_MODE_GMII;
+        if (strcasecmp(interface_type, "tbi") == 0)
+                return PHY_INTERFACE_MODE_TBI;
+        if (strcasecmp(interface_type, "rmii") == 0)
+                return PHY_INTERFACE_MODE_RMII;
+        if (strcasecmp(interface_type, "rgmii") == 0)
+                return PHY_INTERFACE_MODE_RGMII;
+        if (strcasecmp(interface_type, "rgmii-id") == 0)
+                return PHY_INTERFACE_MODE_RGMII_ID;
+        if (strcasecmp(interface_type, "rtbi") == 0)
+                return PHY_INTERFACE_MODE_RTBI;
+
+        return PHY_INTERFACE_MODE_MII;
+}
+
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
         struct device *device = &ofdev->dev;
         struct device_node *np = ofdev->node;
+        struct device_node *mdio;
         struct net_device *dev = NULL;
         struct ucc_geth_private *ugeth = NULL;
         struct ucc_geth_info *ug_info;
         struct resource res;
         struct device_node *phy;
-        int err, ucc_num, phy_interface;
-        static int mii_mng_configured = 0;
+        int err, ucc_num, max_speed = 0;
         const phandle *ph;
         const unsigned int *prop;
         const void *mac_addr;
+        phy_interface_t phy_interface;
+        static const int enet_to_speed[] = {
+                SPEED_10, SPEED_10, SPEED_10,
+                SPEED_100, SPEED_100, SPEED_100,
+                SPEED_1000, SPEED_1000, SPEED_1000, SPEED_1000,
+        };
+        static const phy_interface_t enet_to_phy_interface[] = {
+                PHY_INTERFACE_MODE_MII, PHY_INTERFACE_MODE_RMII,
+                PHY_INTERFACE_MODE_RGMII, PHY_INTERFACE_MODE_MII,
+                PHY_INTERFACE_MODE_RMII, PHY_INTERFACE_MODE_RGMII,
+                PHY_INTERFACE_MODE_GMII, PHY_INTERFACE_MODE_RGMII,
+                PHY_INTERFACE_MODE_TBI, PHY_INTERFACE_MODE_RTBI,
+        };
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -4087,6 +3794,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 
         ug_info = &ugeth_info[ucc_num];
         ug_info->uf_info.ucc_num = ucc_num;
+
         prop = get_property(np, "rx-clock", NULL);
         ug_info->uf_info.rx_clock = *prop;
         prop = get_property(np, "tx-clock", NULL);
@@ -4104,13 +3812,72 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         if (phy == NULL)
                 return -ENODEV;
 
+        /* set the PHY address */
         prop = get_property(phy, "reg", NULL);
+        if (prop == NULL)
+                return -1;
         ug_info->phy_address = *prop;
-        prop = get_property(phy, "interface", NULL);
-        ug_info->enet_interface = *prop;
-        ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0);
-        ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)?
-                        0:FSL_UGETH_BRD_HAS_PHY_INTR;
+
+        /* get the phy interface type, or default to MII */
+        prop = get_property(np, "interface-type", NULL);
+        if (!prop) {
+                /* handle interface property present in old trees */
+                prop = get_property(phy, "interface", NULL);
+                if (prop != NULL)
+                        phy_interface = enet_to_phy_interface[*prop];
+                else
+                        phy_interface = PHY_INTERFACE_MODE_MII;
+        } else {
+                phy_interface = to_phy_interface((const char *)prop);
+        }
+
+        /* get speed, or derive from interface */
+        prop = get_property(np, "max-speed", NULL);
+        if (!prop) {
+                /* handle interface property present in old trees */
+                prop = get_property(phy, "interface", NULL);
+                if (prop != NULL)
+                        max_speed = enet_to_speed[*prop];
+        } else {
+                max_speed = *prop;
+        }
+        if (!max_speed) {
+                switch (phy_interface) {
+                case PHY_INTERFACE_MODE_GMII:
+                case PHY_INTERFACE_MODE_RGMII:
+                case PHY_INTERFACE_MODE_RGMII_ID:
+                case PHY_INTERFACE_MODE_TBI:
+                case PHY_INTERFACE_MODE_RTBI:
+                        max_speed = SPEED_1000;
+                        break;
+                default:
+                        max_speed = SPEED_100;
+                        break;
+                }
+        }
+
+        if (max_speed == SPEED_1000) {
+                ug_info->uf_info.urfs = UCC_GETH_URFS_GIGA_INIT;
+                ug_info->uf_info.urfet = UCC_GETH_URFET_GIGA_INIT;
+                ug_info->uf_info.urfset = UCC_GETH_URFSET_GIGA_INIT;
+                ug_info->uf_info.utfs = UCC_GETH_UTFS_GIGA_INIT;
+                ug_info->uf_info.utfet = UCC_GETH_UTFET_GIGA_INIT;
+                ug_info->uf_info.utftt = UCC_GETH_UTFTT_GIGA_INIT;
+        }
+
+        /* Set the bus id */
+        mdio = of_get_parent(phy);
+
+        if (mdio == NULL)
+                return -1;
+
+        err = of_address_to_resource(mdio, 0, &res);
+        of_node_put(mdio);
+
+        if (err)
+                return -1;
+
+        ug_info->mdio_bus = res.start;
 
         printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n",
                 ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs,
@@ -4122,43 +3889,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 return -ENODEV;
         }
 
-        /* FIXME: Work around for early chip rev.               */
-        /* There's a bug in initial chip rev(s) in the RGMII ac */
-        /* timing.                                              */
-        /* The following compensates by writing to the reserved */
-        /* QE Port Output Hold Registers (CPOH1?).              */
-        prop = get_property(phy, "interface", NULL);
-        phy_interface = *prop;
-        if ((phy_interface == ENET_1000_RGMII) ||
-                        (phy_interface == ENET_100_RGMII) ||
-                        (phy_interface == ENET_10_RGMII)) {
-                struct device_node *soc;
-                phys_addr_t immrbase = -1;
-                u32 *tmp_reg;
-                u32 tmp_val;
-
-                soc = of_find_node_by_type(NULL, "soc");
-                if (soc) {
-                        unsigned int size;
-                        const void *prop = get_property(soc, "reg", &size);
-                        immrbase = of_translate_address(soc, prop);
-                        of_node_put(soc);
-                };
-
-                tmp_reg = (u32 *) ioremap(immrbase + 0x14A8, 0x4);
-                tmp_val = in_be32(tmp_reg);
-                if (ucc_num == 1)
-                        out_be32(tmp_reg, tmp_val | 0x00003000);
-                else if (ucc_num == 2)
-                        out_be32(tmp_reg, tmp_val | 0x0c000000);
-                iounmap(tmp_reg);
-        }
-
-        if (!mii_mng_configured) {
-                ucc_set_qe_mux_mii_mng(ucc_num);
-                mii_mng_configured = 1;
-        }
-
         /* Create an ethernet device instance */
         dev = alloc_etherdev(sizeof(*ugeth));
 
@@ -4192,6 +3922,10 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         dev->set_multicast_list = ucc_geth_set_multi;
         dev->ethtool_ops = &ucc_geth_ethtool_ops;
 
+        ugeth->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
+        ugeth->phy_interface = phy_interface;
+        ugeth->max_speed = max_speed;
+
         err = register_netdev(dev);
         if (err) {
                 ugeth_err("%s: Cannot register net device, aborting.",
@@ -4200,13 +3934,13 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 return err;
         }
 
-        ugeth->ug_info = ug_info;
-        ugeth->dev = dev;
-
         mac_addr = of_get_mac_address(np);
         if (mac_addr)
                 memcpy(dev->dev_addr, mac_addr, 6);
 
+        ugeth->ug_info = ug_info;
+        ugeth->dev = dev;
+
         return 0;
 }
 
@@ -4242,19 +3976,30 @@ static struct of_platform_driver ucc_geth_driver = {
 
 static int __init ucc_geth_init(void)
 {
-        int i;
+        int i, ret;
+
+        ret = uec_mdio_init();
+
+        if (ret)
+                return ret;
 
         printk(KERN_INFO "ucc_geth: " DRV_DESC "\n");
         for (i = 0; i < 8; i++)
                 memcpy(&(ugeth_info[i]), &ugeth_primary_info,
                        sizeof(ugeth_primary_info));
 
-        return of_register_platform_driver(&ucc_geth_driver);
+        ret = of_register_platform_driver(&ucc_geth_driver);
+
+        if (ret)
+                uec_mdio_exit();
+
+        return ret;
 }
 
 static void __exit ucc_geth_exit(void)
 {
         of_unregister_platform_driver(&ucc_geth_driver);
+        uec_mdio_exit();
 }
 
 module_init(ucc_geth_init);
@@ -4262,4 +4007,5 @@ module_exit(ucc_geth_exit);
 
 MODULE_AUTHOR("Freescale Semiconductor, Inc");
 MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index a66561253593..a29e1c3ca4b7 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -28,6 +28,8 @@
 #include <asm/ucc.h>
 #include <asm/ucc_fast.h>
 
+#include "ucc_geth_mii.h"
+
 #define NUM_TX_QUEUES                   8
 #define NUM_RX_QUEUES                   8
 #define NUM_BDS_IN_PREFETCHED_BDS       4
@@ -36,15 +38,6 @@
 #define ENET_INIT_PARAM_MAX_ENTRIES_RX  9
 #define ENET_INIT_PARAM_MAX_ENTRIES_TX  8
 
-struct ucc_mii_mng {
-        u32 miimcfg;            /* MII management configuration reg */
-        u32 miimcom;            /* MII management command reg */
-        u32 miimadd;            /* MII management address reg */
-        u32 miimcon;            /* MII management control reg */
-        u32 miimstat;           /* MII management status reg */
-        u32 miimind;            /* MII management indication reg */
-} __attribute__ ((packed));
-
 struct ucc_geth {
         struct ucc_fast uccf;
 
@@ -53,7 +46,7 @@ struct ucc_geth {
         u32 ipgifg;             /* interframe gap reg.  */
         u32 hafdup;             /* half-duplex reg.  */
         u8 res1[0x10];
-        struct ucc_mii_mng miimng;      /* MII management structure */
+        u8 miimng[0x18];        /* MII management structure moved to _mii.h */
         u32 ifctl;              /* interface control reg */
         u32 ifstat;             /* interface statux reg */
         u32 macstnaddr1;        /* mac station address part 1 reg */
@@ -212,6 +205,9 @@ struct ucc_geth {
 #define UCCE_OTHER       (UCCE_SCAR | UCCE_GRA  | UCCE_CBPR | UCCE_BSY  |\
                         UCCE_RXC  | UCCE_TXC  | UCCE_TXE)
 
+#define UCCE_RX_EVENTS                                                  (UCCE_RXF | UCCE_BSY)
+#define UCCE_TX_EVENTS                                                  (UCCE_TXB | UCCE_TXE)
+
 /* UCC GETH UPSMR (Protocol Specific Mode Register) */
 #define UPSMR_ECM                               0x04000000      /* Enable CAM
                                                                    Miss or
@@ -381,66 +377,6 @@ struct ucc_geth {
 #define UCCS_MPD                                0x01    /* Magic Packet
                                                            Detected */
 
-/* UCC GETH MIIMCFG (MII Management Configuration Register) */
-#define MIIMCFG_RESET_MANAGEMENT                0x80000000      /* Reset
-                                                                   management */
-#define MIIMCFG_NO_PREAMBLE                     0x00000010      /* Preamble
-                                                                   suppress */
-#define MIIMCFG_CLOCK_DIVIDE_SHIFT              (31 - 31)       /* clock divide
-                                                                   << shift */
-#define MIIMCFG_CLOCK_DIVIDE_MAX                0xf     /* clock divide max val
-                                                         */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_2    0x00000000      /* divide by 2 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_4    0x00000001      /* divide by 4 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_6    0x00000002      /* divide by 6 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_8    0x00000003      /* divide by 8 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_10   0x00000004      /* divide by 10
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_14   0x00000005      /* divide by 14
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_16   0x00000008      /* divide by 16
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_20   0x00000006      /* divide by 20
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_28   0x00000007      /* divide by 28
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_32   0x00000009      /* divide by 32
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_48   0x0000000a      /* divide by 48
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_64   0x0000000b      /* divide by 64
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_80   0x0000000c      /* divide by 80
-                                                                 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112  0x0000000d      /* divide by
-                                                                   112 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_160  0x0000000e      /* divide by
-                                                                   160 */
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_224  0x0000000f      /* divide by
-                                                                   224 */
-
-/* UCC GETH MIIMCOM (MII Management Command Register) */
-#define MIIMCOM_SCAN_CYCLE                      0x00000002      /* Scan cycle */
-#define MIIMCOM_READ_CYCLE                      0x00000001      /* Read cycle */
-
-/* UCC GETH MIIMADD (MII Management Address Register) */
-#define MIIMADD_PHY_ADDRESS_SHIFT               (31 - 23)       /* PHY Address
-                                                                   << shift */
-#define MIIMADD_PHY_REGISTER_SHIFT              (31 - 31)       /* PHY Register
-                                                                   << shift */
-
-/* UCC GETH MIIMCON (MII Management Control Register) */
-#define MIIMCON_PHY_CONTROL_SHIFT               (31 - 31)       /* PHY Control
-                                                                   << shift */
-#define MIIMCON_PHY_STATUS_SHIFT                (31 - 31)       /* PHY Status
-                                                                   << shift */
-
-/* UCC GETH MIIMIND (MII Management Indicator Register) */
-#define MIIMIND_NOT_VALID                       0x00000004      /* Not valid */
-#define MIIMIND_SCAN                            0x00000002      /* Scan in
-                                                                   progress */
-#define MIIMIND_BUSY                            0x00000001
-
 /* UCC GETH IFSTAT (Interface Status Register) */
 #define IFSTAT_EXCESS_DEFER                     0x00000200      /* Excessive
                                                                    transmission
@@ -931,8 +867,7 @@ struct ucc_geth_hardware_statistics {
 #define UCC_GETH_SCHEDULER_ALIGNMENT            4       /* This is a guess */
 #define UCC_GETH_TX_STATISTICS_ALIGNMENT        4       /* This is a guess */
 #define UCC_GETH_RX_STATISTICS_ALIGNMENT        4       /* This is a guess */
-#define UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT      4       /* This is a
-                                                                   guess */
+#define UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT      64
 #define UCC_GETH_RX_BD_QUEUES_ALIGNMENT         8       /* This is a guess */
 #define UCC_GETH_RX_PREFETCHED_BDS_ALIGNMENT    128     /* This is a guess */
 #define UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT 4    /* This
@@ -1009,15 +944,6 @@ struct ucc_geth_hardware_statistics {
                                                                    register */
 #define UCC_GETH_MACCFG1_INIT                   0
 #define UCC_GETH_MACCFG2_INIT                   (MACCFG2_RESERVED_1)
-#define UCC_GETH_MIIMCFG_MNGMNT_CLC_DIV_INIT    \
-                                (MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112)
-
-/* Ethernet speed */
-enum enet_speed {
-        ENET_SPEED_10BT,        /* 10 Base T */
-        ENET_SPEED_100BT,       /* 100 Base T */
-        ENET_SPEED_1000BT       /* 1000 Base T */
-};
 
 /* Ethernet Address Type. */
 enum enet_addr_type {
@@ -1026,22 +952,6 @@ enum enet_addr_type {
         ENET_ADDR_TYPE_BROADCAST
 };
 
-/* TBI / MII Set Register */
-enum enet_tbi_mii_reg {
-        ENET_TBI_MII_CR = 0x00, /* Control (CR ) */
-        ENET_TBI_MII_SR = 0x01, /* Status (SR ) */
-        ENET_TBI_MII_ANA = 0x04,        /* AN advertisement (ANA ) */
-        ENET_TBI_MII_ANLPBPA = 0x05,    /* AN link partner base page ability
-                                           (ANLPBPA) */
-        ENET_TBI_MII_ANEX = 0x06,       /* AN expansion (ANEX ) */
-        ENET_TBI_MII_ANNPT = 0x07,      /* AN next page transmit (ANNPT ) */
-        ENET_TBI_MII_ANLPANP = 0x08,    /* AN link partner ability next page
-                                           (ANLPANP) */
-        ENET_TBI_MII_EXST = 0x0F,       /* Extended status (EXST ) */
-        ENET_TBI_MII_JD = 0x10, /* Jitter diagnostics (JD ) */
-        ENET_TBI_MII_TBICON = 0x11      /* TBI control (TBICON ) */
-};
-
 /* UCC GETH 82xx Ethernet Address Recognition Location */
 enum ucc_geth_enet_address_recognition_location {
         UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_STATION_ADDRESS,/* station
@@ -1239,8 +1149,7 @@ struct ucc_geth_info {
         u16 pausePeriod;
         u16 extensionField;
         u8 phy_address;
-        u32 board_flags;
-        u32 phy_interrupt;
+        u32 mdio_bus;
         u8 weightfactor[NUM_TX_QUEUES];
         u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES];
         u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX];
@@ -1249,7 +1158,6 @@ struct ucc_geth_info {
         u8 iphoffset[TX_IP_OFFSET_ENTRY_MAX];
         u16 bdRingLenTx[NUM_TX_QUEUES];
         u16 bdRingLenRx[NUM_RX_QUEUES];
-        enum enet_interface enet_interface;
         enum ucc_geth_num_of_station_addresses numStationAddresses;
         enum qe_fltr_largest_external_tbl_lookup_key_size
             largestexternallookupkeysize;
@@ -1326,9 +1234,11 @@ struct ucc_geth_private {
         /* index of the first skb which hasn't been transmitted yet. */
         u16 skb_dirtytx[NUM_TX_QUEUES];
 
-        struct work_struct tq;
-        struct timer_list phy_info_timer;
         struct ugeth_mii_info *mii_info;
+        struct phy_device *phydev;
+        phy_interface_t phy_interface;
+        int max_speed;
+        uint32_t msg_enable;
         int oldspeed;
         int oldduplex;
         int oldlink;
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
new file mode 100644
index 000000000000..73b5a538e8f4
--- /dev/null
+++ b/drivers/net/ucc_geth_mii.c
@@ -0,0 +1,279 @@
+/*
+ * drivers/net/ucc_geth_mii.c
+ *
+ * Gianfar Ethernet Driver -- MIIM bus implementation
+ * Provides Bus interface for MIIM regs
+ *
+ * Author: Li Yang
+ *
+ * Copyright (c) 2002-2004 Freescale Semiconductor, Inc.
+ *
+ * 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 the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <asm/ocp.h>
+#include <linux/crc32.h>
+#include <linux/mii.h>
+#include <linux/phy.h>
+#include <linux/fsl_devices.h>
+
+#include <asm/of_platform.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include <asm/ucc.h>
+
+#include "ucc_geth_mii.h"
+#include "ucc_geth.h"
+
+#define DEBUG
+#ifdef DEBUG
+#define vdbg(format, arg...) printk(KERN_DEBUG , format "\n" , ## arg)
+#else
+#define vdbg(format, arg...) do {} while(0)
+#endif
+
+#define DRV_DESC "QE UCC Ethernet Controller MII Bus"
+#define DRV_NAME "fsl-uec_mdio"
+
+/* Write value to the PHY for this device to the register at regnum, */
+/* waiting until the write is done before it returns.  All PHY */
+/* configuration has to be done through the master UEC MIIM regs */
+int uec_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value)
+{
+        struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv;
+
+        /* Setting up the MII Mangement Address Register */
+        out_be32(&regs->miimadd,
+                 (mii_id << MIIMADD_PHY_ADDRESS_SHIFT) | regnum);
+
+        /* Setting up the MII Mangement Control Register with the value */
+        out_be32(&regs->miimcon, value);
+
+        /* Wait till MII management write is complete */
+        while ((in_be32(&regs->miimind)) & MIIMIND_BUSY)
+                cpu_relax();
+
+        return 0;
+}
+
+/* Reads from register regnum in the PHY for device dev, */
+/* returning the value.  Clears miimcom first.  All PHY */
+/* configuration has to be done through the TSEC1 MIIM regs */
+int uec_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
+{
+        struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv;
+        u16 value;
+
+        /* Setting up the MII Mangement Address Register */
+        out_be32(&regs->miimadd,
+                 (mii_id << MIIMADD_PHY_ADDRESS_SHIFT) | regnum);
+
+        /* Clear miimcom, perform an MII management read cycle */
+        out_be32(&regs->miimcom, 0);
+        out_be32(&regs->miimcom, MIIMCOM_READ_CYCLE);
+
+        /* Wait till MII management write is complete */
+        while ((in_be32(&regs->miimind)) & (MIIMIND_BUSY | MIIMIND_NOT_VALID))
+                cpu_relax();
+
+        /* Read MII management status  */
+        value = in_be32(&regs->miimstat);
+
+        return value;
+}
+
+/* Reset the MIIM registers, and wait for the bus to free */
+int uec_mdio_reset(struct mii_bus *bus)
+{
+        struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv;
+        unsigned int timeout = PHY_INIT_TIMEOUT;
+
+        spin_lock_bh(&bus->mdio_lock);
+
+        /* Reset the management interface */
+        out_be32(&regs->miimcfg, MIIMCFG_RESET_MANAGEMENT);
+
+        /* Setup the MII Mgmt clock speed */
+        out_be32(&regs->miimcfg, MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112);
+
+        /* Wait until the bus is free */
+        while ((in_be32(&regs->miimind) & MIIMIND_BUSY) && timeout--)
+                cpu_relax();
+
+        spin_unlock_bh(&bus->mdio_lock);
+
+        if (timeout <= 0) {
+                printk(KERN_ERR "%s: The MII Bus is stuck!\n", bus->name);
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
+static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *match)
+{
+        struct device *device = &ofdev->dev;
+        struct device_node *np = ofdev->node, *tempnp = NULL;
+        struct device_node *child = NULL;
+        struct ucc_mii_mng __iomem *regs;
+        struct mii_bus *new_bus;
+        struct resource res;
+        int k, err = 0;
+
+        new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);
+
+        if (NULL == new_bus)
+                return -ENOMEM;
+
+        new_bus->name = "UCC Ethernet Controller MII Bus";
+        new_bus->read = &uec_mdio_read;
+        new_bus->write = &uec_mdio_write;
+        new_bus->reset = &uec_mdio_reset;
+
+        memset(&res, 0, sizeof(res));
+
+        err = of_address_to_resource(np, 0, &res);
+        if (err)
+                goto reg_map_fail;
+
+        new_bus->id = res.start;
+
+        new_bus->irq = kmalloc(32 * sizeof(int), GFP_KERNEL);
+
+        if (NULL == new_bus->irq) {
+                err = -ENOMEM;
+                goto reg_map_fail;
+        }
+
+        for (k = 0; k < 32; k++)
+                new_bus->irq[k] = PHY_POLL;
+
+        while ((child = of_get_next_child(np, child)) != NULL) {
+                int irq = irq_of_parse_and_map(child, 0);
+                if (irq != NO_IRQ) {
+                        const u32 *id = get_property(child, "reg", NULL);
+                        new_bus->irq[*id] = irq;
+                }
+        }
+
+        /* Set the base address */
+        regs = ioremap(res.start, sizeof(struct ucc_mii_mng));
+
+        if (NULL == regs) {
+                err = -ENOMEM;
+                goto ioremap_fail;
+        }
+
+        new_bus->priv = (void __force *)regs;
+
+        new_bus->dev = device;
+        dev_set_drvdata(device, new_bus);
+
+        /* Read MII management master from device tree */
+        while ((tempnp = of_find_compatible_node(tempnp, "network", "ucc_geth"))
+               != NULL) {
+                struct resource tempres;
+
+                err = of_address_to_resource(tempnp, 0, &tempres);
+                if (err)
+                        goto bus_register_fail;
+
+                /* if our mdio regs fall within this UCC regs range */
+                if ((res.start >= tempres.start) &&
+                    (res.end <= tempres.end)) {
+                        /* set this UCC to be the MII master */
+                        const u32 *id = get_property(tempnp, "device-id", NULL);
+                        if (id == NULL)
+                                goto bus_register_fail;
+
+                        ucc_set_qe_mux_mii_mng(*id - 1);
+
+                        /* assign the TBI an address which won't
+                         * conflict with the PHYs */
+                        out_be32(&regs->utbipar, UTBIPAR_INIT_TBIPA);
+                        break;
+                }
+        }
+
+        err = mdiobus_register(new_bus);
+        if (0 != err) {
+                printk(KERN_ERR "%s: Cannot register as MDIO bus\n",
+                       new_bus->name);
+                goto bus_register_fail;
+        }
+
+        return 0;
+
+bus_register_fail:
+        iounmap(regs);
+ioremap_fail:
+        kfree(new_bus->irq);
+reg_map_fail:
+        kfree(new_bus);
+
+        return err;
+}
+
+int uec_mdio_remove(struct of_device *ofdev)
+{
+        struct device *device = &ofdev->dev;
+        struct mii_bus *bus = dev_get_drvdata(device);
+
+        mdiobus_unregister(bus);
+
+        dev_set_drvdata(device, NULL);
+
+        iounmap((void __iomem *)bus->priv);
+        bus->priv = NULL;
+        kfree(bus);
+
+        return 0;
+}
+
+static struct of_device_id uec_mdio_match[] = {
+        {
+                .type = "mdio",
+                .compatible = "ucc_geth_phy",
+        },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, uec_mdio_match);
+
+static struct of_platform_driver uec_mdio_driver = {
+        .name   = DRV_NAME,
+        .probe  = uec_mdio_probe,
+        .remove = uec_mdio_remove,
+        .match_table    = uec_mdio_match,
+};
+
+int __init uec_mdio_init(void)
+{
+        return of_register_platform_driver(&uec_mdio_driver);
+}
+
+void __exit uec_mdio_exit(void)
+{
+        of_unregister_platform_driver(&uec_mdio_driver);
+}
diff --git a/drivers/net/ucc_geth_mii.h b/drivers/net/ucc_geth_mii.h
new file mode 100644
index 000000000000..98430fe0bfc6
--- /dev/null
+++ b/drivers/net/ucc_geth_mii.h
@@ -0,0 +1,100 @@
+/*
+ * drivers/net/ucc_geth_mii.h
+ *
+ * Gianfar Ethernet Driver -- MII Management Bus Implementation
+ * Driver for the MDIO bus controller in the Gianfar register space
+ *
+ * Author: Andy Fleming
+ * Maintainer: Kumar Gala
+ *
+ * Copyright (c) 2002-2004 Freescale Semiconductor, Inc.
+ *
+ * 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 the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#ifndef __UEC_MII_H
+#define __UEC_MII_H
+
+/* UCC GETH MIIMCFG (MII Management Configuration Register) */
+#define MIIMCFG_RESET_MANAGEMENT                0x80000000      /* Reset
+                                                                   management */
+#define MIIMCFG_NO_PREAMBLE                     0x00000010      /* Preamble
+                                                                   suppress */
+#define MIIMCFG_CLOCK_DIVIDE_SHIFT              (31 - 31)       /* clock divide
+                                                                   << shift */
+#define MIIMCFG_CLOCK_DIVIDE_MAX                0xf     /* max clock divide */
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_2    0x00000000
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_4    0x00000001
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_6    0x00000002
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_8    0x00000003
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_10   0x00000004
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_14   0x00000005
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_16   0x00000008
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_20   0x00000006
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_28   0x00000007
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_32   0x00000009
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_48   0x0000000a
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_64   0x0000000b
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_80   0x0000000c
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112  0x0000000d
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_160  0x0000000e
+#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_224  0x0000000f
+
+/* UCC GETH MIIMCOM (MII Management Command Register) */
+#define MIIMCOM_SCAN_CYCLE                      0x00000002      /* Scan cycle */
+#define MIIMCOM_READ_CYCLE                      0x00000001      /* Read cycle */
+
+/* UCC GETH MIIMADD (MII Management Address Register) */
+#define MIIMADD_PHY_ADDRESS_SHIFT               (31 - 23)       /* PHY Address
+                                                                   << shift */
+#define MIIMADD_PHY_REGISTER_SHIFT              (31 - 31)       /* PHY Register
+                                                                   << shift */
+
+/* UCC GETH MIIMCON (MII Management Control Register) */
+#define MIIMCON_PHY_CONTROL_SHIFT               (31 - 31)       /* PHY Control
+                                                                   << shift */
+#define MIIMCON_PHY_STATUS_SHIFT                (31 - 31)       /* PHY Status
+                                                                   << shift */
+
+/* UCC GETH MIIMIND (MII Management Indicator Register) */
+#define MIIMIND_NOT_VALID                       0x00000004      /* Not valid */
+#define MIIMIND_SCAN                            0x00000002      /* Scan in
+                                                                   progress */
+#define MIIMIND_BUSY                            0x00000001
+
+/* Initial TBI Physical Address */
+#define UTBIPAR_INIT_TBIPA                      0x1f
+
+struct ucc_mii_mng {
+        u32 miimcfg;            /* MII management configuration reg */
+        u32 miimcom;            /* MII management command reg */
+        u32 miimadd;            /* MII management address reg */
+        u32 miimcon;            /* MII management control reg */
+        u32 miimstat;           /* MII management status reg */
+        u32 miimind;            /* MII management indication reg */
+        u8 notcare[28];         /* Space holder */
+        u32 utbipar;            /* TBI phy address reg */
+} __attribute__ ((packed));
+
+/* TBI / MII Set Register */
+enum enet_tbi_mii_reg {
+        ENET_TBI_MII_CR = 0x00, /* Control */
+        ENET_TBI_MII_SR = 0x01, /* Status */
+        ENET_TBI_MII_ANA = 0x04,        /* AN advertisement */
+        ENET_TBI_MII_ANLPBPA = 0x05,    /* AN link partner base page ability */
+        ENET_TBI_MII_ANEX = 0x06,       /* AN expansion */
+        ENET_TBI_MII_ANNPT = 0x07,      /* AN next page transmit */
+        ENET_TBI_MII_ANLPANP = 0x08,    /* AN link partner ability next page */
+        ENET_TBI_MII_EXST = 0x0F,       /* Extended status */
+        ENET_TBI_MII_JD = 0x10, /* Jitter diagnostics */
+        ENET_TBI_MII_TBICON = 0x11      /* TBI control */
+};
+
+int uec_mdio_read(struct mii_bus *bus, int mii_id, int regnum);
+int uec_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
+int __init uec_mdio_init(void);
+void __exit uec_mdio_exit(void);
+#endif                          /* __UEC_MII_H */
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c
deleted file mode 100644
index 9373d895b9ec..000000000000
--- a/drivers/net/ucc_geth_phy.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
- *
- * Author: Shlomi Gridish <gridish@freescale.com>
- *
- * Description:
- * UCC GETH Driver -- PHY handling
- *
- * Changelog:
- * Jun 28, 2006 Li Yang <LeoLi@freescale.com>
- * - Rearrange code and style fixes
- *
- * 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 the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/crc32.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-
-#include "ucc_geth.h"
-#include "ucc_geth_phy.h"
-
-#define ugphy_printk(level, format, arg...)  \
-        printk(level format "\n", ## arg)
-
-#define ugphy_dbg(format, arg...)            \
-        ugphy_printk(KERN_DEBUG, format , ## arg)
-#define ugphy_err(format, arg...)            \
-        ugphy_printk(KERN_ERR, format , ## arg)
-#define ugphy_info(format, arg...)           \
-        ugphy_printk(KERN_INFO, format , ## arg)
-#define ugphy_warn(format, arg...)           \
-        ugphy_printk(KERN_WARNING, format , ## arg)
-
-#ifdef UGETH_VERBOSE_DEBUG
-#define ugphy_vdbg ugphy_dbg
-#else
-#define ugphy_vdbg(fmt, args...) do { } while (0)
-#endif                          /* UGETH_VERBOSE_DEBUG */
-
-static void config_genmii_advert(struct ugeth_mii_info *mii_info);
-static void genmii_setup_forced(struct ugeth_mii_info *mii_info);
-static void genmii_restart_aneg(struct ugeth_mii_info *mii_info);
-static int gbit_config_aneg(struct ugeth_mii_info *mii_info);
-static int genmii_config_aneg(struct ugeth_mii_info *mii_info);
-static int genmii_update_link(struct ugeth_mii_info *mii_info);
-static int genmii_read_status(struct ugeth_mii_info *mii_info);
-
-static u16 ucc_geth_phy_read(struct ugeth_mii_info *mii_info, u16 regnum)
-{
-        u16 retval;
-        unsigned long flags;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        spin_lock_irqsave(&mii_info->mdio_lock, flags);
-        retval = mii_info->mdio_read(mii_info->dev, mii_info->mii_id, regnum);
-        spin_unlock_irqrestore(&mii_info->mdio_lock, flags);
-
-        return retval;
-}
-
-static void ucc_geth_phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val)
-{
-        unsigned long flags;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        spin_lock_irqsave(&mii_info->mdio_lock, flags);
-        mii_info->mdio_write(mii_info->dev, mii_info->mii_id, regnum, val);
-        spin_unlock_irqrestore(&mii_info->mdio_lock, flags);
-}
-
-/* Write value to the PHY for this device to the register at regnum, */
-/* waiting until the write is done before it returns.  All PHY */
-/* configuration has to be done through the TSEC1 MIIM regs */
-void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value)
-{
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-        struct ucc_mii_mng *mii_regs;
-        enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum;
-        u32 tmp_reg;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        spin_lock_irq(&ugeth->lock);
-
-        mii_regs = ugeth->mii_info->mii_regs;
-
-        /* Set this UCC to be the master of the MII managment */
-        ucc_set_qe_mux_mii_mng(ugeth->ug_info->uf_info.ucc_num);
-
-        /* Stop the MII management read cycle */
-        out_be32(&mii_regs->miimcom, 0);
-        /* Setting up the MII Mangement Address Register */
-        tmp_reg = ((u32) mii_id << MIIMADD_PHY_ADDRESS_SHIFT) | mii_reg;
-        out_be32(&mii_regs->miimadd, tmp_reg);
-
-        /* Setting up the MII Mangement Control Register with the value */
-        out_be32(&mii_regs->miimcon, (u32) value);
-
-        /* Wait till MII management write is complete */
-        while ((in_be32(&mii_regs->miimind)) & MIIMIND_BUSY)
-                cpu_relax();
-
-        spin_unlock_irq(&ugeth->lock);
-
-        udelay(10000);
-}
-
-/* Reads from register regnum in the PHY for device dev, */
-/* returning the value.  Clears miimcom first.  All PHY */
-/* configuration has to be done through the TSEC1 MIIM regs */
-int read_phy_reg(struct net_device *dev, int mii_id, int regnum)
-{
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-        struct ucc_mii_mng *mii_regs;
-        enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum;
-        u32 tmp_reg;
-        u16 value;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        spin_lock_irq(&ugeth->lock);
-
-        mii_regs = ugeth->mii_info->mii_regs;
-
-        /* Setting up the MII Mangement Address Register */
-        tmp_reg = ((u32) mii_id << MIIMADD_PHY_ADDRESS_SHIFT) | mii_reg;
-        out_be32(&mii_regs->miimadd, tmp_reg);
-
-        /* Perform an MII management read cycle */
-        out_be32(&mii_regs->miimcom, MIIMCOM_READ_CYCLE);
-
-        /* Wait till MII management write is complete */
-        while ((in_be32(&mii_regs->miimind)) & MIIMIND_BUSY)
-                cpu_relax();
-
-        udelay(10000);
-
-        /* Read MII management status  */
-        value = (u16) in_be32(&mii_regs->miimstat);
-        out_be32(&mii_regs->miimcom, 0);
-        if (value == 0xffff)
-                ugphy_warn("read wrong value : mii_id %d,mii_reg %d, base %08x",
-                           mii_id, mii_reg, (u32) & (mii_regs->miimcfg));
-
-        spin_unlock_irq(&ugeth->lock);
-
-        return (value);
-}
-
-void mii_clear_phy_interrupt(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (mii_info->phyinfo->ack_interrupt)
-                mii_info->phyinfo->ack_interrupt(mii_info);
-}
-
-void mii_configure_phy_interrupt(struct ugeth_mii_info *mii_info,
-                                 u32 interrupts)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        mii_info->interrupts = interrupts;
-        if (mii_info->phyinfo->config_intr)
-                mii_info->phyinfo->config_intr(mii_info);
-}
-
-/* Writes MII_ADVERTISE with the appropriate values, after
- * sanitizing advertise to make sure only supported features
- * are advertised
- */
-static void config_genmii_advert(struct ugeth_mii_info *mii_info)
-{
-        u32 advertise;
-        u16 adv;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Only allow advertising what this PHY supports */
-        mii_info->advertising &= mii_info->phyinfo->features;
-        advertise = mii_info->advertising;
-
-        /* Setup standard advertisement */
-        adv = ucc_geth_phy_read(mii_info, MII_ADVERTISE);
-        adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
-        if (advertise & ADVERTISED_10baseT_Half)
-                adv |= ADVERTISE_10HALF;
-        if (advertise & ADVERTISED_10baseT_Full)
-                adv |= ADVERTISE_10FULL;
-        if (advertise & ADVERTISED_100baseT_Half)
-                adv |= ADVERTISE_100HALF;
-        if (advertise & ADVERTISED_100baseT_Full)
-                adv |= ADVERTISE_100FULL;
-        ucc_geth_phy_write(mii_info, MII_ADVERTISE, adv);
-}
-
-static void genmii_setup_forced(struct ugeth_mii_info *mii_info)
-{
-        u16 ctrl;
-        u32 features = mii_info->phyinfo->features;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        ctrl = ucc_geth_phy_read(mii_info, MII_BMCR);
-
-        ctrl &=
-            ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_SPEED1000 | BMCR_ANENABLE);
-        ctrl |= BMCR_RESET;
-
-        switch (mii_info->speed) {
-        case SPEED_1000:
-                if (features & (SUPPORTED_1000baseT_Half
-                                | SUPPORTED_1000baseT_Full)) {
-                        ctrl |= BMCR_SPEED1000;
-                        break;
-                }
-                mii_info->speed = SPEED_100;
-        case SPEED_100:
-                if (features & (SUPPORTED_100baseT_Half
-                                | SUPPORTED_100baseT_Full)) {
-                        ctrl |= BMCR_SPEED100;
-                        break;
-                }
-                mii_info->speed = SPEED_10;
-        case SPEED_10:
-                if (features & (SUPPORTED_10baseT_Half
-                                | SUPPORTED_10baseT_Full))
-                        break;
-        default:                /* Unsupported speed! */
-                ugphy_err("%s: Bad speed!", mii_info->dev->name);
-                break;
-        }
-
-        ucc_geth_phy_write(mii_info, MII_BMCR, ctrl);
-}
-
-/* Enable and Restart Autonegotiation */
-static void genmii_restart_aneg(struct ugeth_mii_info *mii_info)
-{
-        u16 ctl;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        ctl = ucc_geth_phy_read(mii_info, MII_BMCR);
-        ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);
-        ucc_geth_phy_write(mii_info, MII_BMCR, ctl);
-}
-
-static int gbit_config_aneg(struct ugeth_mii_info *mii_info)
-{
-        u16 adv;
-        u32 advertise;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (mii_info->autoneg) {
-                /* Configure the ADVERTISE register */
-                config_genmii_advert(mii_info);
-                advertise = mii_info->advertising;
-
-                adv = ucc_geth_phy_read(mii_info, MII_1000BASETCONTROL);
-                adv &= ~(MII_1000BASETCONTROL_FULLDUPLEXCAP |
-                         MII_1000BASETCONTROL_HALFDUPLEXCAP);
-                if (advertise & SUPPORTED_1000baseT_Half)
-                        adv |= MII_1000BASETCONTROL_HALFDUPLEXCAP;
-                if (advertise & SUPPORTED_1000baseT_Full)
-                        adv |= MII_1000BASETCONTROL_FULLDUPLEXCAP;
-                ucc_geth_phy_write(mii_info, MII_1000BASETCONTROL, adv);
-
-                /* Start/Restart aneg */
-                genmii_restart_aneg(mii_info);
-        } else
-                genmii_setup_forced(mii_info);
-
-        return 0;
-}
-
-static int genmii_config_aneg(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (mii_info->autoneg) {
-                config_genmii_advert(mii_info);
-                genmii_restart_aneg(mii_info);
-        } else
-                genmii_setup_forced(mii_info);
-
-        return 0;
-}
-
-static int genmii_update_link(struct ugeth_mii_info *mii_info)
-{
-        u16 status;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Do a fake read */
-        ucc_geth_phy_read(mii_info, MII_BMSR);
-
-        /* Read link and autonegotiation status */
-        status = ucc_geth_phy_read(mii_info, MII_BMSR);
-        if ((status & BMSR_LSTATUS) == 0)
-                mii_info->link = 0;
-        else
-                mii_info->link = 1;
-
-        /* If we are autonegotiating, and not done,
-         * return an error */
-        if (mii_info->autoneg && !(status & BMSR_ANEGCOMPLETE))
-                return -EAGAIN;
-
-        return 0;
-}
-
-static int genmii_read_status(struct ugeth_mii_info *mii_info)
-{
-        u16 status;
-        int err;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Update the link, but return if there
-         * was an error */
-        err = genmii_update_link(mii_info);
-        if (err)
-                return err;
-
-        if (mii_info->autoneg) {
-                status = ucc_geth_phy_read(mii_info, MII_LPA);
-
-                if (status & (LPA_10FULL | LPA_100FULL))
-                        mii_info->duplex = DUPLEX_FULL;
-                else
-                        mii_info->duplex = DUPLEX_HALF;
-                if (status & (LPA_100FULL | LPA_100HALF))
-                        mii_info->speed = SPEED_100;
-                else
-                        mii_info->speed = SPEED_10;
-                mii_info->pause = 0;
-        }
-        /* On non-aneg, we assume what we put in BMCR is the speed,
-         * though magic-aneg shouldn't prevent this case from occurring
-         */
-
-        return 0;
-}
-
-static int marvell_init(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        ucc_geth_phy_write(mii_info, 0x14, 0x0cd2);
-        ucc_geth_phy_write(mii_info, 0x1b,
-                (ucc_geth_phy_read(mii_info, 0x1b) & ~0x000f) | 0x000b);
-        ucc_geth_phy_write(mii_info, MII_BMCR,
-                  ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET);
-        msleep(4000);
-
-        return 0;
-}
-
-static int marvell_config_aneg(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* The Marvell PHY has an errata which requires
-         * that certain registers get written in order
-         * to restart autonegotiation */
-        ucc_geth_phy_write(mii_info, MII_BMCR, BMCR_RESET);
-
-        ucc_geth_phy_write(mii_info, 0x1d, 0x1f);
-        ucc_geth_phy_write(mii_info, 0x1e, 0x200c);
-        ucc_geth_phy_write(mii_info, 0x1d, 0x5);
-        ucc_geth_phy_write(mii_info, 0x1e, 0);
-        ucc_geth_phy_write(mii_info, 0x1e, 0x100);
-
-        gbit_config_aneg(mii_info);
-
-        return 0;
-}
-
-static int marvell_read_status(struct ugeth_mii_info *mii_info)
-{
-        u16 status;
-        int err;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Update the link, but return if there
-         * was an error */
-        err = genmii_update_link(mii_info);
-        if (err)
-                return err;
-
-        /* If the link is up, read the speed and duplex */
-        /* If we aren't autonegotiating, assume speeds
-         * are as set */
-        if (mii_info->autoneg && mii_info->link) {
-                int speed;
-                status = ucc_geth_phy_read(mii_info, MII_M1011_PHY_SPEC_STATUS);
-
-                /* Get the duplexity */
-                if (status & MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX)
-                        mii_info->duplex = DUPLEX_FULL;
-                else
-                        mii_info->duplex = DUPLEX_HALF;
-
-                /* Get the speed */
-                speed = status & MII_M1011_PHY_SPEC_STATUS_SPD_MASK;
-                switch (speed) {
-                case MII_M1011_PHY_SPEC_STATUS_1000:
-                        mii_info->speed = SPEED_1000;
-                        break;
-                case MII_M1011_PHY_SPEC_STATUS_100:
-                        mii_info->speed = SPEED_100;
-                        break;
-                default:
-                        mii_info->speed = SPEED_10;
-                        break;
-                }
-                mii_info->pause = 0;
-        }
-
-        return 0;
-}
-
-static int marvell_ack_interrupt(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Clear the interrupts by reading the reg */
-        ucc_geth_phy_read(mii_info, MII_M1011_IEVENT);
-
-        return 0;
-}
-
-static int marvell_config_intr(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-                ucc_geth_phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_INIT);
-        else
-                ucc_geth_phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_CLEAR);
-
-        return 0;
-}
-
-static int cis820x_init(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        ucc_geth_phy_write(mii_info, MII_CIS8201_AUX_CONSTAT,
-                  MII_CIS8201_AUXCONSTAT_INIT);
-        ucc_geth_phy_write(mii_info, MII_CIS8201_EXT_CON1, MII_CIS8201_EXTCON1_INIT);
-
-        return 0;
-}
-
-static int cis820x_read_status(struct ugeth_mii_info *mii_info)
-{
-        u16 status;
-        int err;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Update the link, but return if there
-         * was an error */
-        err = genmii_update_link(mii_info);
-        if (err)
-                return err;
-
-        /* If the link is up, read the speed and duplex */
-        /* If we aren't autonegotiating, assume speeds
-         * are as set */
-        if (mii_info->autoneg && mii_info->link) {
-                int speed;
-
-                status = ucc_geth_phy_read(mii_info, MII_CIS8201_AUX_CONSTAT);
-                if (status & MII_CIS8201_AUXCONSTAT_DUPLEX)
-                        mii_info->duplex = DUPLEX_FULL;
-                else
-                        mii_info->duplex = DUPLEX_HALF;
-
-                speed = status & MII_CIS8201_AUXCONSTAT_SPEED;
-
-                switch (speed) {
-                case MII_CIS8201_AUXCONSTAT_GBIT:
-                        mii_info->speed = SPEED_1000;
-                        break;
-                case MII_CIS8201_AUXCONSTAT_100:
-                        mii_info->speed = SPEED_100;
-                        break;
-                default:
-                        mii_info->speed = SPEED_10;
-                        break;
-                }
-        }
-
-        return 0;
-}
-
-static int cis820x_ack_interrupt(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        ucc_geth_phy_read(mii_info, MII_CIS8201_ISTAT);
-
-        return 0;
-}
-
-static int cis820x_config_intr(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-                ucc_geth_phy_write(mii_info, MII_CIS8201_IMASK, MII_CIS8201_IMASK_MASK);
-        else
-                ucc_geth_phy_write(mii_info, MII_CIS8201_IMASK, 0);
-
-        return 0;
-}
-
-#define DM9161_DELAY 10
-
-static int dm9161_read_status(struct ugeth_mii_info *mii_info)
-{
-        u16 status;
-        int err;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Update the link, but return if there
-         * was an error */
-        err = genmii_update_link(mii_info);
-        if (err)
-                return err;
-
-        /* If the link is up, read the speed and duplex */
-        /* If we aren't autonegotiating, assume speeds
-         * are as set */
-        if (mii_info->autoneg && mii_info->link) {
-                status = ucc_geth_phy_read(mii_info, MII_DM9161_SCSR);
-                if (status & (MII_DM9161_SCSR_100F | MII_DM9161_SCSR_100H))
-                        mii_info->speed = SPEED_100;
-                else
-                        mii_info->speed = SPEED_10;
-
-                if (status & (MII_DM9161_SCSR_100F | MII_DM9161_SCSR_10F))
-                        mii_info->duplex = DUPLEX_FULL;
-                else
-                        mii_info->duplex = DUPLEX_HALF;
-        }
-
-        return 0;
-}
-
-static int dm9161_config_aneg(struct ugeth_mii_info *mii_info)
-{
-        struct dm9161_private *priv = mii_info->priv;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (0 == priv->resetdone)
-                return -EAGAIN;
-
-        return 0;
-}
-
-static void dm9161_timer(unsigned long data)
-{
-        struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data;
-        struct dm9161_private *priv = mii_info->priv;
-        u16 status = ucc_geth_phy_read(mii_info, MII_BMSR);
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (status & BMSR_ANEGCOMPLETE) {
-                priv->resetdone = 1;
-        } else
-                mod_timer(&priv->timer, jiffies + DM9161_DELAY * HZ);
-}
-
-static int dm9161_init(struct ugeth_mii_info *mii_info)
-{
-        struct dm9161_private *priv;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Allocate the private data structure */
-        priv = kmalloc(sizeof(struct dm9161_private), GFP_KERNEL);
-
-        if (NULL == priv)
-                return -ENOMEM;
-
-        mii_info->priv = priv;
-
-        /* Reset is not done yet */
-        priv->resetdone = 0;
-
-        ucc_geth_phy_write(mii_info, MII_BMCR,
-                  ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET);
-
-        ucc_geth_phy_write(mii_info, MII_BMCR,
-                  ucc_geth_phy_read(mii_info, MII_BMCR) & ~BMCR_ISOLATE);
-
-        config_genmii_advert(mii_info);
-        /* Start/Restart aneg */
-        genmii_config_aneg(mii_info);
-
-        /* Start a timer for DM9161_DELAY seconds to wait
-         * for the PHY to be ready */
-        init_timer(&priv->timer);
-        priv->timer.function = &dm9161_timer;
-        priv->timer.data = (unsigned long)mii_info;
-        mod_timer(&priv->timer, jiffies + DM9161_DELAY * HZ);
-
-        return 0;
-}
-
-static void dm9161_close(struct ugeth_mii_info *mii_info)
-{
-        struct dm9161_private *priv = mii_info->priv;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        del_timer_sync(&priv->timer);
-        kfree(priv);
-}
-
-static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Clear the interrupts by reading the reg */
-        ucc_geth_phy_read(mii_info, MII_DM9161_INTR);
-
-
-        return 0;
-}
-
-static int dm9161_config_intr(struct ugeth_mii_info *mii_info)
-{
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-                ucc_geth_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_INIT);
-        else
-                ucc_geth_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_STOP);
-
-        return 0;
-}
-
-/* Cicada 820x */
-static struct phy_info phy_info_cis820x = {
-        .phy_id = 0x000fc440,
-        .name = "Cicada Cis8204",
-        .phy_id_mask = 0x000fffc0,
-        .features = MII_GBIT_FEATURES,
-        .init = &cis820x_init,
-        .config_aneg = &gbit_config_aneg,
-        .read_status = &cis820x_read_status,
-        .ack_interrupt = &cis820x_ack_interrupt,
-        .config_intr = &cis820x_config_intr,
-};
-
-static struct phy_info phy_info_dm9161 = {
-        .phy_id = 0x0181b880,
-        .phy_id_mask = 0x0ffffff0,
-        .name = "Davicom DM9161E",
-        .init = dm9161_init,
-        .config_aneg = dm9161_config_aneg,
-        .read_status = dm9161_read_status,
-        .close = dm9161_close,
-};
-
-static struct phy_info phy_info_dm9161a = {
-        .phy_id = 0x0181b8a0,
-        .phy_id_mask = 0x0ffffff0,
-        .name = "Davicom DM9161A",
-        .features = MII_BASIC_FEATURES,
-        .init = dm9161_init,
-        .config_aneg = dm9161_config_aneg,
-        .read_status = dm9161_read_status,
-        .ack_interrupt = dm9161_ack_interrupt,
-        .config_intr = dm9161_config_intr,
-        .close = dm9161_close,
-};
-
-static struct phy_info phy_info_marvell = {
-        .phy_id = 0x01410c00,
-        .phy_id_mask = 0xffffff00,
-        .name = "Marvell 88E11x1",
-        .features = MII_GBIT_FEATURES,
-        .init = &marvell_init,
-        .config_aneg = &marvell_config_aneg,
-        .read_status = &marvell_read_status,
-        .ack_interrupt = &marvell_ack_interrupt,
-        .config_intr = &marvell_config_intr,
-};
-
-static struct phy_info phy_info_genmii = {
-        .phy_id = 0x00000000,
-        .phy_id_mask = 0x00000000,
-        .name = "Generic MII",
-        .features = MII_BASIC_FEATURES,
-        .config_aneg = genmii_config_aneg,
-        .read_status = genmii_read_status,
-};
-
-static struct phy_info *phy_info[] = {
-        &phy_info_cis820x,
-        &phy_info_marvell,
-        &phy_info_dm9161,
-        &phy_info_dm9161a,
-        &phy_info_genmii,
-        NULL
-};
-
-/* Use the PHY ID registers to determine what type of PHY is attached
- * to device dev.  return a struct phy_info structure describing that PHY
- */
-struct phy_info *get_phy_info(struct ugeth_mii_info *mii_info)
-{
-        u16 phy_reg;
-        u32 phy_ID;
-        int i;
-        struct phy_info *theInfo = NULL;
-        struct net_device *dev = mii_info->dev;
-
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-
-        /* Grab the bits from PHYIR1, and put them in the upper half */
-        phy_reg = ucc_geth_phy_read(mii_info, MII_PHYSID1);
-        phy_ID = (phy_reg & 0xffff) << 16;
-
-        /* Grab the bits from PHYIR2, and put them in the lower half */
-        phy_reg = ucc_geth_phy_read(mii_info, MII_PHYSID2);
-        phy_ID |= (phy_reg & 0xffff);
-
-        /* loop through all the known PHY types, and find one that */
-        /* matches the ID we read from the PHY. */
-        for (i = 0; phy_info[i]; i++)
-                if (phy_info[i]->phy_id == (phy_ID & phy_info[i]->phy_id_mask)){
-                        theInfo = phy_info[i];
-                        break;
-                }
-
-        /* This shouldn't happen, as we have generic PHY support */
-        if (theInfo == NULL) {
-                ugphy_info("%s: PHY id %x is not supported!", dev->name,
-                           phy_ID);
-                return NULL;
-        } else {
-                ugphy_info("%s: PHY is %s (%x)", dev->name, theInfo->name,
-                           phy_ID);
-        }
-
-        return theInfo;
-}
diff --git a/drivers/net/ucc_geth_phy.h b/drivers/net/ucc_geth_phy.h
deleted file mode 100644
index f5740783670f..000000000000
--- a/drivers/net/ucc_geth_phy.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
- *
- * Author: Shlomi Gridish <gridish@freescale.com>
- *
- * Description:
- * UCC GETH Driver -- PHY handling
- *
- * Changelog:
- * Jun 28, 2006 Li Yang <LeoLi@freescale.com>
- * - Rearrange code and style fixes
- *
- * 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 the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-#ifndef __UCC_GETH_PHY_H__
-#define __UCC_GETH_PHY_H__
-
-#define MII_end ((u32)-2)
-#define MII_read ((u32)-1)
-
-#define MIIMIND_BUSY            0x00000001
-#define MIIMIND_NOTVALID        0x00000004
-
-#define UGETH_AN_TIMEOUT        2000
-
-/* 1000BT control (Marvell & BCM54xx at least) */
-#define MII_1000BASETCONTROL                  0x09
-#define MII_1000BASETCONTROL_FULLDUPLEXCAP    0x0200
-#define MII_1000BASETCONTROL_HALFDUPLEXCAP    0x0100
-
-/* Cicada Extended Control Register 1 */
-#define MII_CIS8201_EXT_CON1        0x17
-#define MII_CIS8201_EXTCON1_INIT    0x0000
-
-/* Cicada Interrupt Mask Register */
-#define MII_CIS8201_IMASK           0x19
-#define MII_CIS8201_IMASK_IEN       0x8000
-#define MII_CIS8201_IMASK_SPEED     0x4000
-#define MII_CIS8201_IMASK_LINK      0x2000
-#define MII_CIS8201_IMASK_DUPLEX    0x1000
-#define MII_CIS8201_IMASK_MASK      0xf000
-
-/* Cicada Interrupt Status Register */
-#define MII_CIS8201_ISTAT           0x1a
-#define MII_CIS8201_ISTAT_STATUS    0x8000
-#define MII_CIS8201_ISTAT_SPEED     0x4000
-#define MII_CIS8201_ISTAT_LINK      0x2000
-#define MII_CIS8201_ISTAT_DUPLEX    0x1000
-
-/* Cicada Auxiliary Control/Status Register */
-#define MII_CIS8201_AUX_CONSTAT        0x1c
-#define MII_CIS8201_AUXCONSTAT_INIT    0x0004
-#define MII_CIS8201_AUXCONSTAT_DUPLEX  0x0020
-#define MII_CIS8201_AUXCONSTAT_SPEED   0x0018
-#define MII_CIS8201_AUXCONSTAT_GBIT    0x0010
-#define MII_CIS8201_AUXCONSTAT_100     0x0008
-
-/* 88E1011 PHY Status Register */
-#define MII_M1011_PHY_SPEC_STATUS               0x11
-#define MII_M1011_PHY_SPEC_STATUS_1000          0x8000
-#define MII_M1011_PHY_SPEC_STATUS_100           0x4000
-#define MII_M1011_PHY_SPEC_STATUS_SPD_MASK      0xc000
-#define MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX    0x2000
-#define MII_M1011_PHY_SPEC_STATUS_RESOLVED      0x0800
-#define MII_M1011_PHY_SPEC_STATUS_LINK          0x0400
-
-#define MII_M1011_IEVENT                0x13
-#define MII_M1011_IEVENT_CLEAR          0x0000
-
-#define MII_M1011_IMASK                 0x12
-#define MII_M1011_IMASK_INIT            0x6400
-#define MII_M1011_IMASK_CLEAR           0x0000
-
-#define MII_DM9161_SCR                  0x10
-#define MII_DM9161_SCR_INIT             0x0610
-
-/* DM9161 Specified Configuration and Status Register */
-#define MII_DM9161_SCSR                 0x11
-#define MII_DM9161_SCSR_100F            0x8000
-#define MII_DM9161_SCSR_100H            0x4000
-#define MII_DM9161_SCSR_10F             0x2000
-#define MII_DM9161_SCSR_10H             0x1000
-
-/* DM9161 Interrupt Register */
-#define MII_DM9161_INTR                 0x15
-#define MII_DM9161_INTR_PEND            0x8000
-#define MII_DM9161_INTR_DPLX_MASK       0x0800
-#define MII_DM9161_INTR_SPD_MASK        0x0400
-#define MII_DM9161_INTR_LINK_MASK       0x0200
-#define MII_DM9161_INTR_MASK            0x0100
-#define MII_DM9161_INTR_DPLX_CHANGE     0x0010
-#define MII_DM9161_INTR_SPD_CHANGE      0x0008
-#define MII_DM9161_INTR_LINK_CHANGE     0x0004
-#define MII_DM9161_INTR_INIT            0x0000
-#define MII_DM9161_INTR_STOP    \
-(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \
- | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
-
-/* DM9161 10BT Configuration/Status */
-#define MII_DM9161_10BTCSR              0x12
-#define MII_DM9161_10BTCSR_INIT         0x7800
-
-#define MII_BASIC_FEATURES    (SUPPORTED_10baseT_Half | \
-                 SUPPORTED_10baseT_Full | \
-                 SUPPORTED_100baseT_Half | \
-                 SUPPORTED_100baseT_Full | \
-                 SUPPORTED_Autoneg | \
-                 SUPPORTED_TP | \
-                 SUPPORTED_MII)
-
-#define MII_GBIT_FEATURES    (MII_BASIC_FEATURES | \
-                 SUPPORTED_1000baseT_Half | \
-                 SUPPORTED_1000baseT_Full)
-
-#define MII_READ_COMMAND                0x00000001
-
-#define MII_INTERRUPT_DISABLED          0x0
-#define MII_INTERRUPT_ENABLED           0x1
-/* Taken from mii_if_info and sungem_phy.h */
-struct ugeth_mii_info {
-        /* Information about the PHY type */
-        /* And management functions */
-        struct phy_info *phyinfo;
-
-        struct ucc_mii_mng *mii_regs;
-
-        /* forced speed & duplex (no autoneg)
-         * partner speed & duplex & pause (autoneg)
-         */
-        int speed;
-        int duplex;
-        int pause;
-
-        /* The most recently read link state */
-        int link;
-
-        /* Enabled Interrupts */
-        u32 interrupts;
-
-        u32 advertising;
-        int autoneg;
-        int mii_id;
-
-        /* private data pointer */
-        /* For use by PHYs to maintain extra state */
-        void *priv;
-
-        /* Provided by host chip */
-        struct net_device *dev;
-
-        /* A lock to ensure that only one thing can read/write
-         * the MDIO bus at a time */
-        spinlock_t mdio_lock;
-
-        /* Provided by ethernet driver */
-        int (*mdio_read) (struct net_device * dev, int mii_id, int reg);
-        void (*mdio_write) (struct net_device * dev, int mii_id, int reg,
-                            int val);
-};
-
-/* struct phy_info: a structure which defines attributes for a PHY
- *
- * id will contain a number which represents the PHY.  During
- * startup, the driver will poll the PHY to find out what its
- * UID--as defined by registers 2 and 3--is.  The 32-bit result
- * gotten from the PHY will be ANDed with phy_id_mask to
- * discard any bits which may change based on revision numbers
- * unimportant to functionality
- *
- * There are 6 commands which take a ugeth_mii_info structure.
- * Each PHY must declare config_aneg, and read_status.
- */
-struct phy_info {
-        u32 phy_id;
-        char *name;
-        unsigned int phy_id_mask;
-        u32 features;
-
-        /* Called to initialize the PHY */
-        int (*init) (struct ugeth_mii_info * mii_info);
-
-        /* Called to suspend the PHY for power */
-        int (*suspend) (struct ugeth_mii_info * mii_info);
-
-        /* Reconfigures autonegotiation (or disables it) */
-        int (*config_aneg) (struct ugeth_mii_info * mii_info);
-
-        /* Determines the negotiated speed and duplex */
-        int (*read_status) (struct ugeth_mii_info * mii_info);
-
-        /* Clears any pending interrupts */
-        int (*ack_interrupt) (struct ugeth_mii_info * mii_info);
-
-        /* Enables or disables interrupts */
-        int (*config_intr) (struct ugeth_mii_info * mii_info);
-
-        /* Clears up any memory if needed */
-        void (*close) (struct ugeth_mii_info * mii_info);
-};
-
-struct phy_info *get_phy_info(struct ugeth_mii_info *mii_info);
-void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value);
-int read_phy_reg(struct net_device *dev, int mii_id, int regnum);
-void mii_clear_phy_interrupt(struct ugeth_mii_info *mii_info);
-void mii_configure_phy_interrupt(struct ugeth_mii_info *mii_info,
-                                 u32 interrupts);
-
-struct dm9161_private {
-        struct timer_list timer;
-        int resetdone;
-};
-
-#endif                          /* __UCC_GETH_PHY_H__ */
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index 00e0aaadabcc..9ec6cf2e510e 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -37,16 +37,16 @@
 struct hdlc_header {
         u8 address;
         u8 control;
-        u16 protocol;
+        __be16 protocol;
 }__attribute__ ((packed));
 
 
 struct cisco_packet {
-        u32 type;               /* code */
-        u32 par1;
-        u32 par2;
-        u16 rel;                /* reliability */
-        u32 time;
+        __be32 type;            /* code */
+        __be32 par1;
+        __be32 par2;
+        __be16 rel;             /* reliability */
+        __be32 time;
 }__attribute__ ((packed));
 #define CISCO_PACKET_LEN        18
 #define CISCO_BIG_PACKET_LEN    20
@@ -97,7 +97,7 @@ static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev,
 
 
 static void cisco_keepalive_send(struct net_device *dev, u32 type,
-                                 u32 par1, u32 par2)
+                                 __be32 par1, __be32 par2)
 {
         struct sk_buff *skb;
         struct cisco_packet *data;
@@ -115,9 +115,9 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
         data = (struct cisco_packet*)(skb->data + 4);
 
         data->type = htonl(type);
-        data->par1 = htonl(par1);
-        data->par2 = htonl(par2);
-        data->rel = 0xFFFF;
+        data->par1 = par1;
+        data->par2 = par2;
+        data->rel = __constant_htons(0xFFFF);
         /* we will need do_div here if 1000 % HZ != 0 */
         data->time = htonl((jiffies - INITIAL_JIFFIES) * (1000 / HZ));
 
@@ -193,7 +193,7 @@ static int cisco_rx(struct sk_buff *skb)
                 case CISCO_ADDR_REQ: /* Stolen from syncppp.c :-) */
                         in_dev = dev->ip_ptr;
                         addr = 0;
-                        mask = ~0; /* is the mask correct? */
+                        mask = __constant_htonl(~0); /* is the mask correct? */
 
                         if (in_dev != NULL) {
                                 struct in_ifaddr **ifap = &in_dev->ifa_list;
@@ -245,7 +245,7 @@ static int cisco_rx(struct sk_buff *skb)
         } /* switch(protocol) */
 
         printk(KERN_INFO "%s: Unsupported protocol %x\n", dev->name,
-               data->protocol);
+               ntohs(data->protocol));
         dev_kfree_skb_any(skb);
         return NET_RX_DROP;
 
@@ -270,8 +270,9 @@ static void cisco_timer(unsigned long arg)
                 netif_dormant_on(dev);
         }
 
-        cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ, ++state(hdlc)->txseq,
-                             state(hdlc)->rxseq);
+        cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ,
+                             htonl(++state(hdlc)->txseq),
+                             htonl(state(hdlc)->rxseq));
         state(hdlc)->request_sent = 1;
         state(hdlc)->timer.expires = jiffies +
                 state(hdlc)->settings.interval * HZ;
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index aeb2789adf26..15b6e07a4382 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -288,31 +288,31 @@ static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)
         struct sk_buff *skb = *skb_p;
 
         switch (skb->protocol) {
-        case __constant_ntohs(NLPID_CCITT_ANSI_LMI):
+        case __constant_htons(NLPID_CCITT_ANSI_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_CCITT_ANSI_LMI;
                 break;
 
-        case __constant_ntohs(NLPID_CISCO_LMI):
+        case __constant_htons(NLPID_CISCO_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_CISCO_LMI;
                 break;
 
-        case __constant_ntohs(ETH_P_IP):
+        case __constant_htons(ETH_P_IP):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_IP;
                 break;
 
-        case __constant_ntohs(ETH_P_IPV6):
+        case __constant_htons(ETH_P_IPV6):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_IPV6;
                 break;
 
-        case __constant_ntohs(ETH_P_802_3):
+        case __constant_htons(ETH_P_802_3):
                 head_len = 10;
                 if (skb_headroom(skb) < head_len) {
                         struct sk_buff *skb2 = skb_realloc_headroom(skb,
@@ -340,7 +340,7 @@ static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)
                 skb->data[5] = FR_PAD;
                 skb->data[6] = FR_PAD;
                 skb->data[7] = FR_PAD;
-                *(u16*)(skb->data + 8) = skb->protocol;
+                *(__be16*)(skb->data + 8) = skb->protocol;
         }
 
         dlci_to_q922(skb->data, dlci);
@@ -974,8 +974,8 @@ static int fr_rx(struct sk_buff *skb)
 
         } else if (skb->len > 10 && data[3] == FR_PAD &&
                    data[4] == NLPID_SNAP && data[5] == FR_PAD) {
-                u16 oui = ntohs(*(u16*)(data + 6));
-                u16 pid = ntohs(*(u16*)(data + 8));
+                u16 oui = ntohs(*(__be16*)(data + 6));
+                u16 pid = ntohs(*(__be16*)(data + 8));
                 skb_pull(skb, 10);
 
                 switch ((((u32)oui) << 16) | pid) {
@@ -1127,7 +1127,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
                 memcpy(dev->dev_addr, "\x00\x01", 2);
                 get_random_bytes(dev->dev_addr + 2, ETH_ALEN - 2);
         } else {
-                *(u16*)dev->dev_addr = htons(dlci);
+                *(__be16*)dev->dev_addr = htons(dlci);
                 dlci_to_q922(dev->broadcast, dlci);
         }
         dev->hard_start_xmit = pvc_xmit;
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 4426841b2be6..c4b3dc291a5a 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -265,6 +265,19 @@ config IPW2200_DEBUG
 
           If you are not sure, say N here.
 
+config LIBERTAS_USB
+        tristate "Marvell Libertas 8388 802.11a/b/g cards"
+        depends on NET_RADIO && USB
+        select FW_LOADER
+        ---help---
+          A driver for Marvell Libertas 8388 USB devices.
+
+config LIBERTAS_USB_DEBUG
+        bool "Enable full debugging output in the Libertas USB module."
+        depends on LIBERTAS_USB
+        ---help---
+          Debugging support.
+
 config AIRO
         tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
         depends on ISA_DMA_API && WLAN_80211 && (PCI || BROKEN)
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c613af17a159..d2124602263b 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 obj-$(CONFIG_PCMCIA_WL3501)     += wl3501_cs.o
 
 obj-$(CONFIG_USB_ZD1201)        += zd1201.o
+obj-$(CONFIG_LIBERTAS_USB)     += libertas/
diff --git a/drivers/net/wireless/README b/drivers/net/wireless/README
deleted file mode 100644
index 0c274bf6d45e..000000000000
--- a/drivers/net/wireless/README
+++ /dev/null
@@ -1,25 +0,0 @@
-        README
-        ------
-
-        This directory is mostly for Wireless LAN drivers, in their
-various incarnations (ISA, PCI, Pcmcia...).
-        This separate directory is needed because a lot of driver work
-on different bus (typically PCI + Pcmcia) and share 95% of the
-code. This allow the code and the config options to be in one single
-place instead of scattered all over the driver tree, which is never
-100% satisfactory.
-
-        Note : if you want more info on the topic of Wireless LANs,
-you are kindly invited to have a look at the Wireless Howto :
-                http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-        Some Wireless LAN drivers, like orinoco_cs, require the use of
-Wireless Tools to be configured :
-                http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-
-        Special notes for distribution maintainers :
-        1) wvlan_cs will be discontinued soon in favor of orinoco_cs
-        2) Please add Wireless Tools support in your scripts
-
-        Have fun...
-
-        Jean
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 7fe0a61091a6..f21bbafcb728 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1145,6 +1145,7 @@ static void airo_networks_free(struct airo_info *ai);
 struct airo_info {
         struct net_device_stats stats;
         struct net_device             *dev;
+        struct list_head              dev_list;
         /* Note, we can have MAX_FIDS outstanding.  FIDs are 16-bits, so we
            use the high bit to mark whether it is in use. */
 #define MAX_FIDS 6
@@ -2360,6 +2361,21 @@ static int airo_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+static LIST_HEAD(airo_devices);
+
+static void add_airo_dev(struct airo_info *ai)
+{
+        /* Upper layers already keep track of PCI devices,
+         * so we only need to remember our non-PCI cards. */
+        if (!ai->pci)
+                list_add_tail(&ai->dev_list, &airo_devices);
+}
+
+static void del_airo_dev(struct airo_info *ai)
+{
+        if (!ai->pci)
+                list_del(&ai->dev_list);
+}
 
 static int airo_close(struct net_device *dev) {
         struct airo_info *ai = dev->priv;
@@ -2381,8 +2397,6 @@ static int airo_close(struct net_device *dev) {
         return 0;
 }
 
-static void del_airo_dev( struct net_device *dev );
-
 void stop_airo_card( struct net_device *dev, int freeres )
 {
         struct airo_info *ai = dev->priv;
@@ -2434,14 +2448,12 @@ void stop_airo_card( struct net_device *dev, int freeres )
                 }
         }
         crypto_free_cipher(ai->tfm);
-        del_airo_dev( dev );
+        del_airo_dev(ai);
         free_netdev( dev );
 }
 
 EXPORT_SYMBOL(stop_airo_card);
 
-static int add_airo_dev( struct net_device *dev );
-
 static int wll_header_parse(struct sk_buff *skb, unsigned char *haddr)
 {
         memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN);
@@ -2740,8 +2752,6 @@ static int airo_networks_allocate(struct airo_info *ai)
 
 static void airo_networks_free(struct airo_info *ai)
 {
-        if (!ai->networks)
-                return;
         kfree(ai->networks);
         ai->networks = NULL;
 }
@@ -2816,12 +2826,10 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
         if (IS_ERR(ai->airo_thread_task))
                 goto err_out_free;
         ai->tfm = NULL;
-        rc = add_airo_dev( dev );
-        if (rc)
-                goto err_out_thr;
+        add_airo_dev(ai);
 
         if (airo_networks_allocate (ai))
-                goto err_out_unlink;
+                goto err_out_thr;
         airo_networks_initialize (ai);
 
         /* The Airo-specific entries in the device structure. */
@@ -2937,9 +2945,8 @@ err_out_irq:
         free_irq(dev->irq, dev);
 err_out_nets:
         airo_networks_free(ai);
-err_out_unlink:
-        del_airo_dev(dev);
 err_out_thr:
+        del_airo_dev(ai);
         set_bit(JOB_DIE, &ai->jobs);
         kthread_stop(ai->airo_thread_task);
 err_out_free:
@@ -5535,11 +5542,6 @@ static int proc_close( struct inode *inode, struct file *file )
         return 0;
 }
 
-static struct net_device_list {
-        struct net_device *dev;
-        struct net_device_list *next;
-} *airo_devices;
-
 /* Since the card doesn't automatically switch to the right WEP mode,
    we will make it do it.  If the card isn't associated, every secs we
    will switch WEP modes to see if that will help.  If the card is
@@ -5582,26 +5584,6 @@ static void timer_func( struct net_device *dev ) {
         apriv->expires = RUN_AT(HZ*3);
 }
 
-static int add_airo_dev( struct net_device *dev ) {
-        struct net_device_list *node = kmalloc( sizeof( *node ), GFP_KERNEL );
-        if ( !node )
-                return -ENOMEM;
-
-        node->dev = dev;
-        node->next = airo_devices;
-        airo_devices = node;
-
-        return 0;
-}
-
-static void del_airo_dev( struct net_device *dev ) {
-        struct net_device_list **p = &airo_devices;
-        while( *p && ( (*p)->dev != dev ) )
-                p = &(*p)->next;
-        if ( *p && (*p)->dev == dev )
-                *p = (*p)->next;
-}
-
 #ifdef CONFIG_PCI
 static int __devinit airo_pci_probe(struct pci_dev *pdev,
                                     const struct pci_device_id *pent)
@@ -5625,6 +5607,10 @@ static int __devinit airo_pci_probe(struct pci_dev *pdev,
 
 static void __devexit airo_pci_remove(struct pci_dev *pdev)
 {
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        airo_print_info(dev->name, "Unregistering...");
+        stop_airo_card(dev, 1);
 }
 
 static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)
@@ -5750,9 +5736,11 @@ static int __init airo_init_module( void )
 
 static void __exit airo_cleanup_module( void )
 {
-        while( airo_devices ) {
-                airo_print_info(airo_devices->dev->name, "Unregistering...\n");
-                stop_airo_card( airo_devices->dev, 1 );
+        struct airo_info *ai;
+        while(!list_empty(&airo_devices)) {
+                ai = list_entry(airo_devices.next, struct airo_info, dev_list);
+                airo_print_info(ai->dev->name, "Unregistering...");
+                stop_airo_card(ai->dev, 1);
         }
 #ifdef CONFIG_PCI
         pci_unregister_driver(&airo_driver);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 95ff175d8f33..f8483c179e4c 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -277,11 +277,14 @@
 #define BCM43xx_SBTMSTATELOW_REJECT             0x02
 #define BCM43xx_SBTMSTATELOW_CLOCK              0x10000
 #define BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK   0x20000
+#define BCM43xx_SBTMSTATELOW_G_MODE_ENABLE      0x20000000
 
 /* sbtmstatehigh state flags */
 #define BCM43xx_SBTMSTATEHIGH_SERROR            0x00000001
 #define BCM43xx_SBTMSTATEHIGH_BUSY              0x00000004
 #define BCM43xx_SBTMSTATEHIGH_TIMEOUT           0x00000020
+#define BCM43xx_SBTMSTATEHIGH_G_PHY_AVAIL       0x00010000
+#define BCM43xx_SBTMSTATEHIGH_A_PHY_AVAIL       0x00020000
 #define BCM43xx_SBTMSTATEHIGH_COREFLAGS         0x1FFF0000
 #define BCM43xx_SBTMSTATEHIGH_DMA64BIT          0x10000000
 #define BCM43xx_SBTMSTATEHIGH_GATEDCLK          0x20000000
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
index c947025d655f..d2df6a0100a1 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
@@ -32,7 +32,7 @@
 #include <linux/netdevice.h>
 #include <linux/pci.h>
 #include <linux/string.h>
-#include <linux/utsrelease.h>
+#include <linux/utsname.h>
 
 
 static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
@@ -40,7 +40,7 @@ static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *
         struct bcm43xx_private *bcm = bcm43xx_priv(dev);
 
         strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-        strncpy(info->version, UTS_RELEASE, sizeof(info->version));
+        strncpy(info->version, utsname()->release, sizeof(info->version));
         strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
 }
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index a38e7eec0e62..5e96bca6730a 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -1407,7 +1407,7 @@ void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy)
                                 & ~(BCM43xx_SBF_MAC_ENABLED | 0x00000002));
         } else {
                 if (connect_phy)
-                        flags |= 0x20000000;
+                        flags |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                 bcm43xx_phy_connect(bcm, connect_phy);
                 bcm43xx_core_enable(bcm, flags);
                 bcm43xx_write16(bcm, 0x03E6, 0x0000);
@@ -3604,7 +3604,7 @@ int bcm43xx_select_wireless_core(struct bcm43xx_private *bcm,
                 u32 sbtmstatelow;
 
                 sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-                sbtmstatelow |= 0x20000000;
+                sbtmstatelow |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                 bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
         }
         err = wireless_core_up(bcm, 1);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index 72529a440f15..b37f1e348700 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -168,16 +168,16 @@ int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int connect)
 
         flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
         if (connect) {
-                if (!(flags & 0x00010000))
+                if (!(flags & BCM43xx_SBTMSTATEHIGH_G_PHY_AVAIL))
                         return -ENODEV;
                 flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-                flags |= (0x800 << 18);
+                flags |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                 bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
         } else {
-                if (!(flags & 0x00020000))
+                if (!(flags & BCM43xx_SBTMSTATEHIGH_A_PHY_AVAIL))
                         return -ENODEV;
                 flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-                flags &= ~(0x800 << 18);
+                flags &= ~BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                 bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
         }
 out:
@@ -300,16 +300,20 @@ static void bcm43xx_phy_agcsetup(struct bcm43xx_private *bcm)
 
         if (phy->rev > 2) {
                 bcm43xx_phy_write(bcm, 0x0422, 0x287A);
-                bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420) & 0x0FFF) | 0x3000); 
+                bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420)
+                                  & 0x0FFF) | 0x3000);
         }
                 
-        bcm43xx_phy_write(bcm, 0x04A8, (bcm43xx_phy_read(bcm, 0x04A8) & 0x8080) | 0x7874);
+        bcm43xx_phy_write(bcm, 0x04A8, (bcm43xx_phy_read(bcm, 0x04A8) & 0x8080)
+                                        | 0x7874);
         bcm43xx_phy_write(bcm, 0x048E, 0x1C00);
 
         if (phy->rev == 1) {
-                bcm43xx_phy_write(bcm, 0x04AB, (bcm43xx_phy_read(bcm, 0x04AB) & 0xF0FF) | 0x0600);
+                bcm43xx_phy_write(bcm, 0x04AB, (bcm43xx_phy_read(bcm, 0x04AB)
+                                  & 0xF0FF) | 0x0600);
                 bcm43xx_phy_write(bcm, 0x048B, 0x005E);
-                bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C) & 0xFF00) | 0x001E);
+                bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C)
+                                  & 0xFF00) | 0x001E);
                 bcm43xx_phy_write(bcm, 0x048D, 0x0002);
         }
 
@@ -335,7 +339,8 @@ static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm)
         if (phy->rev == 1) {
                 bcm43xx_phy_write(bcm, 0x0406, 0x4F19);
                 bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                  (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0xFC3F) | 0x0340);
+                                  (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
+                                  & 0xFC3F) | 0x0340);
                 bcm43xx_phy_write(bcm, 0x042C, 0x005A);
                 bcm43xx_phy_write(bcm, 0x0427, 0x001A);
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.h b/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
index 1f321ef42be8..73118364b552 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
@@ -48,6 +48,10 @@ void bcm43xx_raw_phy_unlock(struct bcm43xx_private *bcm);
                 local_irq_restore(flags);       \
         } while (0)
 
+/* Card uses the loopback gain stuff */
+#define has_loopback_gain(phy) \
+        (((phy)->rev > 1) || ((phy)->connected))
+
 u16 bcm43xx_phy_read(struct bcm43xx_private *bcm, u16 offset);
 void bcm43xx_phy_write(struct bcm43xx_private *bcm, u16 offset, u16 val);
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index 4025dd0089d2..6a109f4a1b71 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -1343,11 +1343,110 @@ u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)
         return ret;
 }
 
+#define LPD(L, P, D)    (((L) << 2) | ((P) << 1) | ((D) << 0))
+static u16 bcm43xx_get_812_value(struct bcm43xx_private *bcm, u8 lpd)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 loop_or = 0;
+        u16 adj_loopback_gain = phy->loopback_gain[0];
+        u8 loop;
+        u16 extern_lna_control;
+
+        if (!phy->connected)
+                return 0;
+        if (!has_loopback_gain(phy)) {
+                if (phy->rev < 7 || !(bcm->sprom.boardflags
+                    & BCM43xx_BFL_EXTLNA)) {
+                        switch (lpd) {
+                        case LPD(0, 1, 1):
+                                return 0x0FB2;
+                        case LPD(0, 0, 1):
+                                return 0x00B2;
+                        case LPD(1, 0, 1):
+                                return 0x30B2;
+                        case LPD(1, 0, 0):
+                                return 0x30B3;
+                        default:
+                                assert(0);
+                        }
+                } else {
+                        switch (lpd) {
+                        case LPD(0, 1, 1):
+                                return 0x8FB2;
+                        case LPD(0, 0, 1):
+                                return 0x80B2;
+                        case LPD(1, 0, 1):
+                                return 0x20B2;
+                        case LPD(1, 0, 0):
+                                return 0x20B3;
+                        default:
+                                assert(0);
+                        }
+                }
+        } else {
+                if (radio->revision == 8)
+                        adj_loopback_gain += 0x003E;
+                else
+                        adj_loopback_gain += 0x0026;
+                if (adj_loopback_gain >= 0x46) {
+                        adj_loopback_gain -= 0x46;
+                        extern_lna_control = 0x3000;
+                } else if (adj_loopback_gain >= 0x3A) {
+                        adj_loopback_gain -= 0x3A;
+                        extern_lna_control = 0x2000;
+                } else if (adj_loopback_gain >= 0x2E) {
+                        adj_loopback_gain -= 0x2E;
+                        extern_lna_control = 0x1000;
+                } else {
+                        adj_loopback_gain -= 0x10;
+                        extern_lna_control = 0x0000;
+                }
+                for (loop = 0; loop < 16; loop++) {
+                        u16 tmp = adj_loopback_gain - 6 * loop;
+                        if (tmp < 6)
+                                break;
+                }
+
+                loop_or = (loop << 8) | extern_lna_control;
+                if (phy->rev >= 7 && bcm->sprom.boardflags
+                    & BCM43xx_BFL_EXTLNA) {
+                        if (extern_lna_control)
+                                loop_or |= 0x8000;
+                        switch (lpd) {
+                        case LPD(0, 1, 1):
+                                return 0x8F92;
+                        case LPD(0, 0, 1):
+                                return (0x8092 | loop_or);
+                        case LPD(1, 0, 1):
+                                return (0x2092 | loop_or);
+                        case LPD(1, 0, 0):
+                                return (0x2093 | loop_or);
+                        default:
+                                assert(0);
+                        }
+                } else {
+                        switch (lpd) {
+                        case LPD(0, 1, 1):
+                                return 0x0F92;
+                        case LPD(0, 0, 1):
+                        case LPD(1, 0, 1):
+                                return (0x0092 | loop_or);
+                        case LPD(1, 0, 0):
+                                return (0x0093 | loop_or);
+                        default:
+                                assert(0);
+                        }
+                }
+        }
+        return 0;
+}
+
 u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
 {
         struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
         struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-        u16 backup[19] = { 0 };
+        u16 backup[21] = { 0 };
         u16 ret;
         u16 i, j;
         u32 tmp1 = 0, tmp2 = 0;
@@ -1373,19 +1472,36 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
                         backup[8] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS);
                         backup[9] = bcm43xx_phy_read(bcm, 0x0802);
                         bcm43xx_phy_write(bcm, 0x0814,
-                                          (bcm43xx_phy_read(bcm, 0x0814) | 0x0003));
+                                          (bcm43xx_phy_read(bcm, 0x0814)
+                                          | 0x0003));
                         bcm43xx_phy_write(bcm, 0x0815,
-                                          (bcm43xx_phy_read(bcm, 0x0815) & 0xFFFC));    
+                                          (bcm43xx_phy_read(bcm, 0x0815)
+                                          & 0xFFFC));
                         bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
-                                          (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0x7FFF));
+                                          (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
+                                          & 0x7FFF));
                         bcm43xx_phy_write(bcm, 0x0802,
                                           (bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC));
-                        bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
-                        bcm43xx_phy_write(bcm, 0x0812, 0x0FB2);
+                        if (phy->rev > 1) { /* loopback gain enabled */
+                                backup[19] = bcm43xx_phy_read(bcm, 0x080F);
+                                backup[20] = bcm43xx_phy_read(bcm, 0x0810);
+                                if (phy->rev >= 3)
+                                        bcm43xx_phy_write(bcm, 0x080F, 0xC020);
+                                else
+                                        bcm43xx_phy_write(bcm, 0x080F, 0x8020);
+                                bcm43xx_phy_write(bcm, 0x0810, 0x0000);
+                        }
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          bcm43xx_get_812_value(bcm, LPD(0, 1, 1)));
+                        if (phy->rev < 7 || !(bcm->sprom.boardflags
+                            & BCM43xx_BFL_EXTLNA))
+                                bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
+                        else
+                                bcm43xx_phy_write(bcm, 0x0811, 0x09B3);
                 }
-                bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
-                                (bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_RADIO) | 0x8000));
         }
+        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
+                        (bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_RADIO) | 0x8000));
         backup[10] = bcm43xx_phy_read(bcm, 0x0035);
         bcm43xx_phy_write(bcm, 0x0035,
                           (bcm43xx_phy_read(bcm, 0x0035) & 0xFF7F));
@@ -1397,10 +1513,12 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
                 bcm43xx_write16(bcm, 0x03E6, 0x0122);
         } else {
                 if (phy->analog >= 2)
-                        bcm43xx_phy_write(bcm, 0x0003, (bcm43xx_phy_read(bcm, 0x0003)
-                                        & 0xFFBF) | 0x0040);
+                        bcm43xx_phy_write(bcm, 0x0003,
+                                          (bcm43xx_phy_read(bcm, 0x0003)
+                                          & 0xFFBF) | 0x0040);
                 bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
-                                (bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT) | 0x2000));
+                                (bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
+                                | 0x2000));
         }
 
         ret = bcm43xx_radio_calibrationvalue(bcm);
@@ -1408,16 +1526,25 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
         if (phy->type == BCM43xx_PHYTYPE_B)
                 bcm43xx_radio_write16(bcm, 0x0078, 0x0026);
 
+        if (phy->connected)
+                bcm43xx_phy_write(bcm, 0x0812,
+                                  bcm43xx_get_812_value(bcm, LPD(0, 1, 1)));
         bcm43xx_phy_write(bcm, 0x0015, 0xBFAF);
         bcm43xx_phy_write(bcm, 0x002B, 0x1403);
         if (phy->connected)
-                bcm43xx_phy_write(bcm, 0x0812, 0x00B2);
+                bcm43xx_phy_write(bcm, 0x0812,
+                                  bcm43xx_get_812_value(bcm, LPD(0, 0, 1)));
         bcm43xx_phy_write(bcm, 0x0015, 0xBFA0);
         bcm43xx_radio_write16(bcm, 0x0051,
                               (bcm43xx_radio_read16(bcm, 0x0051) | 0x0004));
-        bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
-        bcm43xx_radio_write16(bcm, 0x0043,
-                              (bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0) | 0x0009);
+        if (radio->revision == 8)
+                bcm43xx_radio_write16(bcm, 0x0043, 0x001F);
+        else {
+                bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
+                bcm43xx_radio_write16(bcm, 0x0043,
+                                      (bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0)
+                                      | 0x0009);
+        }
         bcm43xx_phy_write(bcm, 0x0058, 0x0000);
 
         for (i = 0; i < 16; i++) {
@@ -1425,21 +1552,25 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
                 bcm43xx_phy_write(bcm, 0x0059, 0xC810);
                 bcm43xx_phy_write(bcm, 0x0058, 0x000D);
                 if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
                 bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
                 udelay(10);
                 if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
                 bcm43xx_phy_write(bcm, 0x0015, 0xEFB0);
                 udelay(10);
                 if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 0)));
                 bcm43xx_phy_write(bcm, 0x0015, 0xFFF0);
-                udelay(10);
+                udelay(20);
                 tmp1 += bcm43xx_phy_read(bcm, 0x002D);
                 bcm43xx_phy_write(bcm, 0x0058, 0x0000);
                 if (phy->connected)
-                        bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
                 bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
         }
 
@@ -1457,21 +1588,29 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
                         bcm43xx_phy_write(bcm, 0x0059, 0xC810);
                         bcm43xx_phy_write(bcm, 0x0058, 0x000D);
                         if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                                bcm43xx_phy_write(bcm, 0x0812,
+                                                  bcm43xx_get_812_value(bcm,
+                                                  LPD(1, 0, 1)));
                         bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
                         udelay(10);
                         if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                                bcm43xx_phy_write(bcm, 0x0812,
+                                                  bcm43xx_get_812_value(bcm,
+                                                  LPD(1, 0, 1)));
                         bcm43xx_phy_write(bcm, 0x0015, 0xEFB0);
                         udelay(10);
                         if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812, 0x30B3); /* 0x30B3 is not a typo */
+                                bcm43xx_phy_write(bcm, 0x0812,
+                                                  bcm43xx_get_812_value(bcm,
+                                                  LPD(1, 0, 0)));
                         bcm43xx_phy_write(bcm, 0x0015, 0xFFF0);
                         udelay(10);
                         tmp2 += bcm43xx_phy_read(bcm, 0x002D);
                         bcm43xx_phy_write(bcm, 0x0058, 0x0000);
                         if (phy->connected)
-                                bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                                bcm43xx_phy_write(bcm, 0x0812,
+                                                  bcm43xx_get_812_value(bcm,
+                                                  LPD(1, 0, 1)));
                         bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
                 }
                 tmp2++;
@@ -1497,15 +1636,20 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
                 bcm43xx_phy_write(bcm, 0x0030, backup[2]);
                 bcm43xx_write16(bcm, 0x03EC, backup[3]);
         } else {
-                bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
-                                (bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_RADIO) & 0x7FFF));
                 if (phy->connected) {
+                        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
+                                        (bcm43xx_read16(bcm,
+                                        BCM43xx_MMIO_PHY_RADIO) & 0x7FFF));
                         bcm43xx_phy_write(bcm, 0x0811, backup[4]);
                         bcm43xx_phy_write(bcm, 0x0812, backup[5]);
                         bcm43xx_phy_write(bcm, 0x0814, backup[6]);
                         bcm43xx_phy_write(bcm, 0x0815, backup[7]);
                         bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, backup[8]);
                         bcm43xx_phy_write(bcm, 0x0802, backup[9]);
+                        if (phy->rev > 1) {
+                                bcm43xx_phy_write(bcm, 0x080F, backup[19]);
+                                bcm43xx_phy_write(bcm, 0x0810, backup[20]);
+                        }
                 }
         }
         if (i >= 15)
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 4ca8a27b8c55..5b3abd54d0e5 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -1,8 +1,8 @@
 /*
  * Intersil Prism2 driver with Host AP (software access point) support
  * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
- * <jkmaline@cc.hut.fi>
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
  *
  * This file is to be included into hostap.c when S/W AP functionality is
  * compiled.
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index 01624005d808..b31e6a05f23c 100644
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -368,9 +368,9 @@ enum {
 
 #define PRISM2_HOSTAPD_MAX_BUF_SIZE 1024
 #define PRISM2_HOSTAPD_RID_HDR_LEN \
-((int) (&((struct prism2_hostapd_param *) 0)->u.rid.data))
+offsetof(struct prism2_hostapd_param, u.rid.data)
 #define PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \
-((int) (&((struct prism2_hostapd_param *) 0)->u.generic_elem.data))
+offsetof(struct prism2_hostapd_param, u.generic_elem.data)
 
 /* Maximum length for algorithm names (-1 for nul termination) used in ioctl()
  */
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 8d8f4b9b8b07..ee1532b62e42 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -22,7 +22,7 @@
 #include "hostap_wlan.h"
 
 
-static char *version = PRISM2_VERSION " (Jouni Malinen <jkmaline@cc.hut.fi>)";
+static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
 static dev_info_t dev_info = "hostap_cs";
 
 MODULE_AUTHOR("Jouni Malinen");
@@ -838,6 +838,8 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
         PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
         PCMCIA_DEVICE_MANF_CARD(0x0126, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0xd601, 0x0005, "ADLINK 345 CF",
+                                         0x2d858104),
         PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL",
                                          0x74c5e40d),
         PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil",
@@ -848,6 +850,11 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
                 "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
                 "Eval-RevA",
                 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
+        /* D-Link DWL-650 Rev. P1; manfid 0x000b, 0x7110 */
+        PCMCIA_DEVICE_PROD_ID1234(
+                "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10",
+                "A3",
+                0x1a424a1c, 0x6ea57632, 0xdd97a26b, 0x56b21f52),
         PCMCIA_DEVICE_PROD_ID123(
                 "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
                 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index fb01fb95a9f0..959887b70ca7 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -3,8 +3,8 @@
  * Intersil Prism2/2.5/3.
  *
  * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
- * <jkmaline@cc.hut.fi>
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.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
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 1f9edd91565d..4743426cf6ad 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -3,8 +3,8 @@
  * 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-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.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
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index c4f6020baa9e..db4899ed4bb1 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -20,7 +20,7 @@
 #include "hostap_wlan.h"
 
 
-static char *version = PRISM2_VERSION " (Jouni Malinen <jkmaline@cc.hut.fi>)";
+static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
 static char *dev_info = "hostap_pci";
 
 
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index e235e0647897..f0fd5ecdb24d 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -23,7 +23,7 @@
 #include "hostap_wlan.h"
 
 
-static char *version = PRISM2_VERSION " (Jouni Malinen <jkmaline@cc.hut.fi>)";
+static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
 static char *dev_info = "hostap_plx";
 
 
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 9137a4dd02eb..d51daf87450f 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -28,8 +28,8 @@
 
   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>
+    <j@w1.fi>
+  Copyright (c) 2002-2003, Jouni Malinen <j@w1.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
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 4839a45098cb..7cb2052a55a5 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1847,6 +1847,52 @@ static ssize_t store_net_stats(struct device *d, struct device_attribute *attr,
 static DEVICE_ATTR(net_stats, S_IWUSR | S_IRUGO,
                    show_net_stats, store_net_stats);
 
+static ssize_t show_channels(struct device *d,
+                             struct device_attribute *attr,
+                             char *buf)
+{
+        struct ipw_priv *priv = dev_get_drvdata(d);
+        const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);
+        int len = 0, i;
+
+        len = sprintf(&buf[len],
+                      "Displaying %d channels in 2.4Ghz band "
+                      "(802.11bg):\n", geo->bg_channels);
+
+        for (i = 0; i < geo->bg_channels; i++) {
+                len += sprintf(&buf[len], "%d: BSS%s%s, %s, Band %s.\n",
+                               geo->bg[i].channel,
+                               geo->bg[i].flags & IEEE80211_CH_RADAR_DETECT ?
+                               " (radar spectrum)" : "",
+                               ((geo->bg[i].flags & IEEE80211_CH_NO_IBSS) ||
+                                (geo->bg[i].flags & IEEE80211_CH_RADAR_DETECT))
+                               ? "" : ", IBSS",
+                               geo->bg[i].flags & IEEE80211_CH_PASSIVE_ONLY ?
+                               "passive only" : "active/passive",
+                               geo->bg[i].flags & IEEE80211_CH_B_ONLY ?
+                               "B" : "B/G");
+        }
+
+        len += sprintf(&buf[len],
+                       "Displaying %d channels in 5.2Ghz band "
+                       "(802.11a):\n", geo->a_channels);
+        for (i = 0; i < geo->a_channels; i++) {
+                len += sprintf(&buf[len], "%d: BSS%s%s, %s.\n",
+                               geo->a[i].channel,
+                               geo->a[i].flags & IEEE80211_CH_RADAR_DETECT ?
+                               " (radar spectrum)" : "",
+                               ((geo->a[i].flags & IEEE80211_CH_NO_IBSS) ||
+                                (geo->a[i].flags & IEEE80211_CH_RADAR_DETECT))
+                               ? "" : ", IBSS",
+                               geo->a[i].flags & IEEE80211_CH_PASSIVE_ONLY ?
+                               "passive only" : "active/passive");
+        }
+
+        return len;
+}
+
+static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);
+
 static void notify_wx_assoc_event(struct ipw_priv *priv)
 {
         union iwreq_data wrqu;
@@ -11383,6 +11429,7 @@ static struct attribute *ipw_sysfs_entries[] = {
         &dev_attr_led.attr,
         &dev_attr_speed_scan.attr,
         &dev_attr_net_stats.attr,
+        &dev_attr_channels.attr,
 #ifdef CONFIG_IPW2200_PROMISCUOUS
         &dev_attr_rtap_iface.attr,
         &dev_attr_rtap_filter.attr,
diff --git a/drivers/net/wireless/libertas/11d.c b/drivers/net/wireless/libertas/11d.c
new file mode 100644
index 000000000000..e0ecc4d483bb
--- /dev/null
+++ b/drivers/net/wireless/libertas/11d.c
@@ -0,0 +1,754 @@
+/**
+  * This file contains functions for 802.11D.
+  */
+#include <linux/ctype.h>
+#include <linux/kernel.h>
+#include <linux/wireless.h>
+
+#include "host.h"
+#include "decl.h"
+#include "11d.h"
+#include "dev.h"
+#include "wext.h"
+
+#define TX_PWR_DEFAULT  10
+
+static struct region_code_mapping region_code_mapping[] = {
+        {"US ", 0x10},          /* US FCC      */
+        {"CA ", 0x10},          /* IC Canada   */
+        {"SG ", 0x10},          /* Singapore   */
+        {"EU ", 0x30},          /* ETSI        */
+        {"AU ", 0x30},          /* Australia   */
+        {"KR ", 0x30},          /* Republic Of Korea */
+        {"ES ", 0x31},          /* Spain       */
+        {"FR ", 0x32},          /* France      */
+        {"JP ", 0x40},          /* Japan       */
+};
+
+/* Following 2 structure defines the supported channels */
+static struct chan_freq_power channel_freq_power_UN_BG[] = {
+        {1, 2412, TX_PWR_DEFAULT},
+        {2, 2417, TX_PWR_DEFAULT},
+        {3, 2422, TX_PWR_DEFAULT},
+        {4, 2427, TX_PWR_DEFAULT},
+        {5, 2432, TX_PWR_DEFAULT},
+        {6, 2437, TX_PWR_DEFAULT},
+        {7, 2442, TX_PWR_DEFAULT},
+        {8, 2447, TX_PWR_DEFAULT},
+        {9, 2452, TX_PWR_DEFAULT},
+        {10, 2457, TX_PWR_DEFAULT},
+        {11, 2462, TX_PWR_DEFAULT},
+        {12, 2467, TX_PWR_DEFAULT},
+        {13, 2472, TX_PWR_DEFAULT},
+        {14, 2484, TX_PWR_DEFAULT}
+};
+
+static u8 wlan_region_2_code(u8 * region)
+{
+        u8 i;
+        u8 size = sizeof(region_code_mapping)/
+                  sizeof(struct region_code_mapping);
+
+        for (i = 0; region[i] && i < COUNTRY_CODE_LEN; i++)
+                region[i] = toupper(region[i]);
+
+        for (i = 0; i < size; i++) {
+                if (!memcmp(region, region_code_mapping[i].region,
+                            COUNTRY_CODE_LEN))
+                        return (region_code_mapping[i].code);
+        }
+
+        /* default is US */
+        return (region_code_mapping[0].code);
+}
+
+static u8 *wlan_code_2_region(u8 code)
+{
+        u8 i;
+        u8 size = sizeof(region_code_mapping)
+                  / sizeof(struct region_code_mapping);
+        for (i = 0; i < size; i++) {
+                if (region_code_mapping[i].code == code)
+                        return (region_code_mapping[i].region);
+        }
+        /* default is US */
+        return (region_code_mapping[0].region);
+}
+
+/**
+ *  @brief This function finds the nrchan-th chan after the firstchan
+ *  @param band       band
+ *  @param firstchan  first channel number
+ *  @param nrchan   number of channels
+ *  @return           the nrchan-th chan number
+*/
+static u8 wlan_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 * chan)
+/*find the nrchan-th chan after the firstchan*/
+{
+        u8 i;
+        struct chan_freq_power *cfp;
+        u8 cfp_no;
+
+        cfp = channel_freq_power_UN_BG;
+        cfp_no = sizeof(channel_freq_power_UN_BG) /
+            sizeof(struct chan_freq_power);
+
+        for (i = 0; i < cfp_no; i++) {
+                if ((cfp + i)->channel == firstchan) {
+                        lbs_pr_debug(1, "firstchan found\n");
+                        break;
+                }
+        }
+
+        if (i < cfp_no) {
+                /*if beyond the boundary */
+                if (i + nrchan < cfp_no) {
+                        *chan = (cfp + i + nrchan)->channel;
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+/**
+ *  @brief This function Checks if chan txpwr is learned from AP/IBSS
+ *  @param chan                 chan number
+ *  @param parsed_region_chan   pointer to parsed_region_chan_11d
+ *  @return                     TRUE; FALSE
+*/
+static u8 wlan_channel_known_11d(u8 chan,
+                          struct parsed_region_chan_11d * parsed_region_chan)
+{
+        struct chan_power_11d *chanpwr = parsed_region_chan->chanpwr;
+        u8 nr_chan = parsed_region_chan->nr_chan;
+        u8 i = 0;
+
+        lbs_dbg_hex("11D:parsed_region_chan:", (char *)chanpwr,
+                sizeof(struct chan_power_11d) * nr_chan);
+
+        for (i = 0; i < nr_chan; i++) {
+                if (chan == chanpwr[i].chan) {
+                        lbs_pr_debug(1, "11D: Found Chan:%d\n", chan);
+                        return 1;
+                }
+        }
+
+        lbs_pr_debug(1, "11D: Not Find Chan:%d\n", chan);
+        return 0;
+}
+
+u32 libertas_chan_2_freq(u8 chan, u8 band)
+{
+        struct chan_freq_power *cf;
+        u16 cnt;
+        u16 i;
+        u32 freq = 0;
+
+        cf = channel_freq_power_UN_BG;
+        cnt =
+            sizeof(channel_freq_power_UN_BG) /
+            sizeof(struct chan_freq_power);
+
+        for (i = 0; i < cnt; i++) {
+                if (chan == cf[i].channel)
+                        freq = cf[i].freq;
+        }
+
+        return freq;
+}
+
+static int generate_domain_info_11d(struct parsed_region_chan_11d
+                                  *parsed_region_chan,
+                                  struct wlan_802_11d_domain_reg * domaininfo)
+{
+        u8 nr_subband = 0;
+
+        u8 nr_chan = parsed_region_chan->nr_chan;
+        u8 nr_parsedchan = 0;
+
+        u8 firstchan = 0, nextchan = 0, maxpwr = 0;
+
+        u8 i, flag = 0;
+
+        memcpy(domaininfo->countrycode, parsed_region_chan->countrycode,
+               COUNTRY_CODE_LEN);
+
+        lbs_pr_debug(1, "11D:nrchan=%d\n", nr_chan);
+        lbs_dbg_hex("11D:parsed_region_chan:", (char *)parsed_region_chan,
+                sizeof(struct parsed_region_chan_11d));
+
+        for (i = 0; i < nr_chan; i++) {
+                if (!flag) {
+                        flag = 1;
+                        nextchan = firstchan =
+                            parsed_region_chan->chanpwr[i].chan;
+                        maxpwr = parsed_region_chan->chanpwr[i].pwr;
+                        nr_parsedchan = 1;
+                        continue;
+                }
+
+                if (parsed_region_chan->chanpwr[i].chan == nextchan + 1 &&
+                    parsed_region_chan->chanpwr[i].pwr == maxpwr) {
+                        nextchan++;
+                        nr_parsedchan++;
+                } else {
+                        domaininfo->subband[nr_subband].firstchan = firstchan;
+                        domaininfo->subband[nr_subband].nrchan =
+                            nr_parsedchan;
+                        domaininfo->subband[nr_subband].maxtxpwr = maxpwr;
+                        nr_subband++;
+                        nextchan = firstchan =
+                            parsed_region_chan->chanpwr[i].chan;
+                        maxpwr = parsed_region_chan->chanpwr[i].pwr;
+                }
+        }
+
+        if (flag) {
+                domaininfo->subband[nr_subband].firstchan = firstchan;
+                domaininfo->subband[nr_subband].nrchan = nr_parsedchan;
+                domaininfo->subband[nr_subband].maxtxpwr = maxpwr;
+                nr_subband++;
+        }
+        domaininfo->nr_subband = nr_subband;
+
+        lbs_pr_debug(1, "nr_subband=%x\n", domaininfo->nr_subband);
+        lbs_dbg_hex("11D:domaininfo:", (char *)domaininfo,
+                COUNTRY_CODE_LEN + 1 +
+                sizeof(struct ieeetypes_subbandset) * nr_subband);
+        return 0;
+}
+
+/**
+ *  @brief This function generates parsed_region_chan from Domain Info learned from AP/IBSS
+ *  @param region_chan          pointer to struct region_channel
+ *  @param *parsed_region_chan  pointer to parsed_region_chan_11d
+ *  @return                     N/A
+*/
+static void wlan_generate_parsed_region_chan_11d(struct region_channel * region_chan,
+                                          struct parsed_region_chan_11d *
+                                          parsed_region_chan)
+{
+        u8 i;
+        struct chan_freq_power *cfp;
+
+        if (region_chan == NULL) {
+                lbs_pr_debug(1, "11D: region_chan is NULL\n");
+                return;
+        }
+
+        cfp = region_chan->CFP;
+        if (cfp == NULL) {
+                lbs_pr_debug(1, "11D: cfp equal NULL \n");
+                return;
+        }
+
+        parsed_region_chan->band = region_chan->band;
+        parsed_region_chan->region = region_chan->region;
+        memcpy(parsed_region_chan->countrycode,
+               wlan_code_2_region(region_chan->region), COUNTRY_CODE_LEN);
+
+        lbs_pr_debug(1, "11D: region[0x%x] band[%d]\n", parsed_region_chan->region,
+               parsed_region_chan->band);
+
+        for (i = 0; i < region_chan->nrcfp; i++, cfp++) {
+                parsed_region_chan->chanpwr[i].chan = cfp->channel;
+                parsed_region_chan->chanpwr[i].pwr = cfp->maxtxpower;
+                lbs_pr_debug(1, "11D: Chan[%d] Pwr[%d]\n",
+                       parsed_region_chan->chanpwr[i].chan,
+                       parsed_region_chan->chanpwr[i].pwr);
+        }
+        parsed_region_chan->nr_chan = region_chan->nrcfp;
+
+        lbs_pr_debug(1, "11D: nrchan[%d]\n", parsed_region_chan->nr_chan);
+
+        return;
+}
+
+/**
+ *  @brief generate parsed_region_chan from Domain Info learned from AP/IBSS
+ *  @param region               region ID
+ *  @param band                 band
+ *  @param chan                 chan
+ *  @return                     TRUE;FALSE
+*/
+static u8 wlan_region_chan_supported_11d(u8 region, u8 band, u8 chan)
+{
+        struct chan_freq_power *cfp;
+        int cfp_no;
+        u8 idx;
+
+        ENTER();
+
+        cfp = libertas_get_region_cfp_table(region, band, &cfp_no);
+        if (cfp == NULL)
+                return 0;
+
+        for (idx = 0; idx < cfp_no; idx++) {
+                if (chan == (cfp + idx)->channel) {
+                        /* If Mrvl Chip Supported? */
+                        if ((cfp + idx)->unsupported) {
+                                return 0;
+                        } else {
+                                return 1;
+                        }
+                }
+        }
+
+        /*chan is not in the region table */
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function checks if chan txpwr is learned from AP/IBSS
+ *  @param chan                 chan number
+ *  @param parsed_region_chan   pointer to parsed_region_chan_11d
+ *  @return                     0
+*/
+static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
+                                 countryinfo,
+                                 u8 band,
+                                 struct parsed_region_chan_11d *
+                                 parsed_region_chan)
+{
+        u8 nr_subband, nrchan;
+        u8 lastchan, firstchan;
+        u8 region;
+        u8 curchan = 0;
+
+        u8 idx = 0;             /*chan index in parsed_region_chan */
+
+        u8 j, i;
+
+        ENTER();
+
+        /*validation Rules:
+           1. valid region Code
+           2. First Chan increment
+           3. channel range no overlap
+           4. channel is valid?
+           5. channel is supported by region?
+           6. Others
+         */
+
+        lbs_dbg_hex("CountryInfo:", (u8 *) countryinfo, 30);
+
+        if ((*(countryinfo->countrycode)) == 0
+            || (countryinfo->len <= COUNTRY_CODE_LEN)) {
+                /* No region Info or Wrong region info: treat as No 11D info */
+                LEAVE();
+                return 0;
+        }
+
+        /*Step1: check region_code */
+        parsed_region_chan->region = region =
+            wlan_region_2_code(countryinfo->countrycode);
+
+        lbs_pr_debug(1, "regioncode=%x\n", (u8) parsed_region_chan->region);
+        lbs_dbg_hex("CountryCode:", (char *)countryinfo->countrycode,
+                COUNTRY_CODE_LEN);
+
+        parsed_region_chan->band = band;
+
+        memcpy(parsed_region_chan->countrycode, countryinfo->countrycode,
+               COUNTRY_CODE_LEN);
+
+        nr_subband = (countryinfo->len - COUNTRY_CODE_LEN) /
+            sizeof(struct ieeetypes_subbandset);
+
+        for (j = 0, lastchan = 0; j < nr_subband; j++) {
+
+                if (countryinfo->subband[j].firstchan <= lastchan) {
+                        /*Step2&3. Check First Chan Num increment and no overlap */
+                        lbs_pr_debug(1, "11D: Chan[%d>%d] Overlap\n",
+                               countryinfo->subband[j].firstchan, lastchan);
+                        continue;
+                }
+
+                firstchan = countryinfo->subband[j].firstchan;
+                nrchan = countryinfo->subband[j].nrchan;
+
+                for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) {
+                        /*step4: channel is supported? */
+
+                        if (!wlan_get_chan_11d(band, firstchan, i, &curchan)) {
+                                /* Chan is not found in UN table */
+                                lbs_pr_debug(1, "chan is not supported: %d \n", i);
+                                break;
+                        }
+
+                        lastchan = curchan;
+
+                        if (wlan_region_chan_supported_11d
+                            (region, band, curchan)) {
+                                /*step5: Check if curchan is supported by mrvl in region */
+                                parsed_region_chan->chanpwr[idx].chan = curchan;
+                                parsed_region_chan->chanpwr[idx].pwr =
+                                    countryinfo->subband[j].maxtxpwr;
+                                idx++;
+                        } else {
+                                /*not supported and ignore the chan */
+                                lbs_pr_debug(1,
+                                       "11D:i[%d] chan[%d] unsupported in region[%x] band[%d]\n",
+                                       i, curchan, region, band);
+                        }
+                }
+
+                /*Step6: Add other checking if any */
+
+        }
+
+        parsed_region_chan->nr_chan = idx;
+
+        lbs_pr_debug(1, "nrchan=%x\n", parsed_region_chan->nr_chan);
+        lbs_dbg_hex("11D:parsed_region_chan:", (u8 *) parsed_region_chan,
+                2 + COUNTRY_CODE_LEN + sizeof(struct parsed_region_chan_11d) * idx);
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function calculates the scan type for channels
+ *  @param chan                 chan number
+ *  @param parsed_region_chan   pointer to parsed_region_chan_11d
+ *  @return                     PASSIVE if chan is unknown; ACTIVE if chan is known
+*/
+u8 libertas_get_scan_type_11d(u8 chan,
+                          struct parsed_region_chan_11d * parsed_region_chan)
+{
+        u8 scan_type = cmd_scan_type_passive;
+
+        ENTER();
+
+        if (wlan_channel_known_11d(chan, parsed_region_chan)) {
+                lbs_pr_debug(1, "11D: Found and do Active Scan\n");
+                scan_type = cmd_scan_type_active;
+        } else {
+                lbs_pr_debug(1, "11D: Not Find and do Passive Scan\n");
+        }
+
+        LEAVE();
+        return scan_type;
+
+}
+
+void libertas_init_11d(wlan_private * priv)
+{
+        priv->adapter->enable11d = 0;
+        memset(&(priv->adapter->parsed_region_chan), 0,
+               sizeof(struct parsed_region_chan_11d));
+        return;
+}
+
+static int wlan_enable_11d(wlan_private * priv, u8 flag)
+{
+        int ret;
+
+        priv->adapter->enable11d = flag;
+
+        /* send cmd to FW to enable/disable 11D function in FW */
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_snmp_mib,
+                                    cmd_act_set,
+                                    cmd_option_waitforrsp,
+                                    OID_802_11D_ENABLE,
+                                    &priv->adapter->enable11d);
+        if (ret)
+                lbs_pr_debug(1, "11D: Fail to enable 11D \n");
+
+        return 0;
+}
+
+/**
+ *  @brief This function sets DOMAIN INFO to FW
+ *  @param priv       pointer to wlan_private
+ *  @return           0; -1
+*/
+static int set_domain_info_11d(wlan_private * priv)
+{
+        int ret;
+
+        if (!priv->adapter->enable11d) {
+                lbs_pr_debug(1, "11D: dnld domain Info with 11d disabled\n");
+                return 0;
+        }
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11d_domain_info,
+                                    cmd_act_set,
+                                    cmd_option_waitforrsp, 0, NULL);
+        if (ret)
+                lbs_pr_debug(1, "11D: Fail to dnld domain Info\n");
+
+        return ret;
+}
+
+/**
+ *  @brief This function setups scan channels
+ *  @param priv       pointer to wlan_private
+ *  @param band       band
+ *  @return           0
+*/
+int libertas_set_universaltable(wlan_private * priv, u8 band)
+{
+        wlan_adapter *adapter = priv->adapter;
+        u16 size = sizeof(struct chan_freq_power);
+        u16 i = 0;
+
+        memset(adapter->universal_channel, 0,
+               sizeof(adapter->universal_channel));
+
+        adapter->universal_channel[i].nrcfp =
+            sizeof(channel_freq_power_UN_BG) / size;
+        lbs_pr_debug(1, "11D: BG-band nrcfp=%d\n",
+               adapter->universal_channel[i].nrcfp);
+
+        adapter->universal_channel[i].CFP = channel_freq_power_UN_BG;
+        adapter->universal_channel[i].valid = 1;
+        adapter->universal_channel[i].region = UNIVERSAL_REGION_CODE;
+        adapter->universal_channel[i].band = band;
+        i++;
+
+        return 0;
+}
+
+/**
+ *  @brief This function implements command CMD_802_11D_DOMAIN_INFO
+ *  @param priv       pointer to wlan_private
+ *  @param cmd        pointer to cmd buffer
+ *  @param cmdno      cmd ID
+ *  @param cmdOption  cmd action
+ *  @return           0
+*/
+int libertas_cmd_802_11d_domain_info(wlan_private * priv,
+                                 struct cmd_ds_command *cmd, u16 cmdno,
+                                 u16 cmdoption)
+{
+        struct cmd_ds_802_11d_domain_info *pdomaininfo =
+            &cmd->params.domaininfo;
+        struct mrvlietypes_domainparamset *domain = &pdomaininfo->domain;
+        wlan_adapter *adapter = priv->adapter;
+        u8 nr_subband = adapter->domainreg.nr_subband;
+
+        ENTER();
+
+        lbs_pr_debug(1, "nr_subband=%x\n", nr_subband);
+
+        cmd->command = cpu_to_le16(cmdno);
+        pdomaininfo->action = cpu_to_le16(cmdoption);
+        if (cmdoption == cmd_act_get) {
+                cmd->size =
+                    cpu_to_le16(sizeof(pdomaininfo->action) + S_DS_GEN);
+                lbs_dbg_hex("11D: 802_11D_DOMAIN_INFO:", (u8 *) cmd,
+                        (int)(cmd->size));
+                LEAVE();
+                return 0;
+        }
+
+        domain->header.type = cpu_to_le16(TLV_TYPE_DOMAIN);
+        memcpy(domain->countrycode, adapter->domainreg.countrycode,
+               sizeof(domain->countrycode));
+
+        domain->header.len =
+            cpu_to_le16(nr_subband * sizeof(struct ieeetypes_subbandset) +
+                             sizeof(domain->countrycode));
+
+        if (nr_subband) {
+                memcpy(domain->subband, adapter->domainreg.subband,
+                       nr_subband * sizeof(struct ieeetypes_subbandset));
+
+                cmd->size = cpu_to_le16(sizeof(pdomaininfo->action) +
+                                             domain->header.len +
+                                             sizeof(struct mrvlietypesheader) +
+                                             S_DS_GEN);
+        } else {
+                cmd->size =
+                    cpu_to_le16(sizeof(pdomaininfo->action) + S_DS_GEN);
+        }
+
+        lbs_dbg_hex("11D:802_11D_DOMAIN_INFO:", (u8 *) cmd, (int)(cmd->size));
+
+        LEAVE();
+
+        return 0;
+}
+
+/**
+ *  @brief This function implements private cmd: enable/disable 11D
+ *  @param priv    pointer to wlan_private
+ *  @param wrq     pointer to user data
+ *  @return        0 or -1
+ */
+int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq)
+{
+        int data = 0;
+        int *val;
+
+        ENTER();
+        data = SUBCMD_DATA(wrq);
+
+        lbs_pr_debug(1, "enable 11D: %s\n",
+               (data == 1) ? "enable" : "Disable");
+
+        wlan_enable_11d(priv, data);
+        val = (int *)wrq->u.name;
+        *val = priv->adapter->enable11d;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function parses countryinfo from AP and download country info to FW
+ *  @param priv    pointer to wlan_private
+ *  @param resp    pointer to command response buffer
+ *  @return        0; -1
+ */
+int libertas_ret_802_11d_domain_info(wlan_private * priv,
+                                 struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11d_domain_info
+        *domaininfo = &resp->params.domaininforesp;
+        struct mrvlietypes_domainparamset *domain = &domaininfo->domain;
+        u16 action = le16_to_cpu(domaininfo->action);
+        s16 ret = 0;
+        u8 nr_subband = 0;
+
+        ENTER();
+
+        lbs_dbg_hex("11D DOMAIN Info Rsp Data:", (u8 *) resp,
+                (int)le16_to_cpu(resp->size));
+
+        nr_subband = (domain->header.len - 3) / sizeof(struct ieeetypes_subbandset);
+        /* countrycode 3 bytes */
+
+        lbs_pr_debug(1, "11D Domain Info Resp: nr_subband=%d\n", nr_subband);
+
+        if (nr_subband > MRVDRV_MAX_SUBBAND_802_11D) {
+                lbs_pr_debug(1, "Invalid Numrer of Subband returned!!\n");
+                return -1;
+        }
+
+        switch (action) {
+        case cmd_act_set:       /*Proc Set action */
+                break;
+
+        case cmd_act_get:
+                break;
+        default:
+                lbs_pr_debug(1, "Invalid action:%d\n", domaininfo->action);
+                ret = -1;
+                break;
+        }
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief This function parses countryinfo from AP and download country info to FW
+ *  @param priv    pointer to wlan_private
+ *  @return        0; -1
+ */
+int libertas_parse_dnld_countryinfo_11d(wlan_private * priv)
+{
+        int ret;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+        if (priv->adapter->enable11d) {
+                memset(&adapter->parsed_region_chan, 0,
+                       sizeof(struct parsed_region_chan_11d));
+                ret = parse_domain_info_11d(&adapter->pattemptedbssdesc->
+                                               countryinfo, 0,
+                                               &adapter->parsed_region_chan);
+
+                if (ret == -1) {
+                        lbs_pr_debug(1, "11D: Err Parse domain_info from AP..\n");
+                        LEAVE();
+                        return ret;
+                }
+
+                memset(&adapter->domainreg, 0,
+                       sizeof(struct wlan_802_11d_domain_reg));
+                generate_domain_info_11d(&adapter->parsed_region_chan,
+                                      &adapter->domainreg);
+
+                ret = set_domain_info_11d(priv);
+
+                if (ret) {
+                        lbs_pr_debug(1, "11D: Err set domainInfo to FW\n");
+                        LEAVE();
+                        return ret;
+                }
+        }
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function generates 11D info from user specified regioncode and download to FW
+ *  @param priv    pointer to wlan_private
+ *  @return        0; -1
+ */
+int libertas_create_dnld_countryinfo_11d(wlan_private * priv)
+{
+        int ret;
+        wlan_adapter *adapter = priv->adapter;
+        struct region_channel *region_chan;
+        u8 j;
+
+        ENTER();
+        lbs_pr_debug(1, "11D:curbssparams.band[%d]\n", adapter->curbssparams.band);
+
+        if (priv->adapter->enable11d) {
+                /* update parsed_region_chan_11; dnld domaininf to FW */
+
+                for (j = 0; j < sizeof(adapter->region_channel) /
+                     sizeof(adapter->region_channel[0]); j++) {
+                        region_chan = &adapter->region_channel[j];
+
+                        lbs_pr_debug(1, "11D:[%d] region_chan->band[%d]\n", j,
+                               region_chan->band);
+
+                        if (!region_chan || !region_chan->valid
+                            || !region_chan->CFP)
+                                continue;
+                        if (region_chan->band != adapter->curbssparams.band)
+                                continue;
+                        break;
+                }
+
+                if (j >= sizeof(adapter->region_channel) /
+                    sizeof(adapter->region_channel[0])) {
+                        lbs_pr_debug(1, "11D:region_chan not found. band[%d]\n",
+                               adapter->curbssparams.band);
+                        LEAVE();
+                        return -1;
+                }
+
+                memset(&adapter->parsed_region_chan, 0,
+                       sizeof(struct parsed_region_chan_11d));
+                wlan_generate_parsed_region_chan_11d(region_chan,
+                                                     &adapter->
+                                                     parsed_region_chan);
+
+                memset(&adapter->domainreg, 0,
+                       sizeof(struct wlan_802_11d_domain_reg));
+                generate_domain_info_11d(&adapter->parsed_region_chan,
+                                         &adapter->domainreg);
+
+                ret = set_domain_info_11d(priv);
+
+                if (ret) {
+                        lbs_pr_debug(1, "11D: Err set domainInfo to FW\n");
+                        LEAVE();
+                        return ret;
+                }
+
+        }
+
+        LEAVE();
+        return 0;
+}
diff --git a/drivers/net/wireless/libertas/11d.h b/drivers/net/wireless/libertas/11d.h
new file mode 100644
index 000000000000..db2ebea9f231
--- /dev/null
+++ b/drivers/net/wireless/libertas/11d.h
@@ -0,0 +1,105 @@
+/**
+  * This header file contains data structures and
+  * function declarations of 802.11d
+  */
+#ifndef _WLAN_11D_
+#define _WLAN_11D_
+
+#include "types.h"
+#include "defs.h"
+
+#define UNIVERSAL_REGION_CODE                   0xff
+
+/** (Beaconsize(256)-5(IEId,len,contrystr(3))/3(FirstChan,NoOfChan,MaxPwr)
+ */
+#define MRVDRV_MAX_SUBBAND_802_11D              83
+
+#define COUNTRY_CODE_LEN                        3
+#define MAX_NO_OF_CHAN                          40
+
+struct cmd_ds_command;
+
+/** Data structure for Country IE*/
+struct ieeetypes_subbandset {
+        u8 firstchan;
+        u8 nrchan;
+        u8 maxtxpwr;
+} __attribute__ ((packed));
+
+struct ieeetypes_countryinfoset {
+        u8 element_id;
+        u8 len;
+        u8 countrycode[COUNTRY_CODE_LEN];
+        struct ieeetypes_subbandset subband[1];
+};
+
+struct ieeetypes_countryinfofullset {
+        u8 element_id;
+        u8 len;
+        u8 countrycode[COUNTRY_CODE_LEN];
+        struct ieeetypes_subbandset subband[MRVDRV_MAX_SUBBAND_802_11D];
+} __attribute__ ((packed));
+
+struct mrvlietypes_domainparamset {
+        struct mrvlietypesheader header;
+        u8 countrycode[COUNTRY_CODE_LEN];
+        struct ieeetypes_subbandset subband[1];
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11d_domain_info {
+        u16 action;
+        struct mrvlietypes_domainparamset domain;
+} __attribute__ ((packed));
+
+/** domain regulatory information */
+struct wlan_802_11d_domain_reg {
+        /** country Code*/
+        u8 countrycode[COUNTRY_CODE_LEN];
+        /** No. of subband*/
+        u8 nr_subband;
+        struct ieeetypes_subbandset subband[MRVDRV_MAX_SUBBAND_802_11D];
+};
+
+struct chan_power_11d {
+        u8 chan;
+        u8 pwr;
+} __attribute__ ((packed));
+
+struct parsed_region_chan_11d {
+        u8 band;
+        u8 region;
+        s8 countrycode[COUNTRY_CODE_LEN];
+        struct chan_power_11d chanpwr[MAX_NO_OF_CHAN];
+        u8 nr_chan;
+} __attribute__ ((packed));
+
+struct region_code_mapping {
+        u8 region[COUNTRY_CODE_LEN];
+        u8 code;
+};
+
+u8 libertas_get_scan_type_11d(u8 chan,
+                          struct parsed_region_chan_11d *parsed_region_chan);
+
+u32 libertas_chan_2_freq(u8 chan, u8 band);
+
+enum state_11d libertas_get_state_11d(wlan_private * priv);
+
+void libertas_init_11d(wlan_private * priv);
+
+int libertas_set_universaltable(wlan_private * priv, u8 band);
+
+int libertas_cmd_802_11d_domain_info(wlan_private * priv,
+                                 struct cmd_ds_command *cmd, u16 cmdno,
+                                 u16 cmdOption);
+
+int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq);
+
+int libertas_ret_802_11d_domain_info(wlan_private * priv,
+                                 struct cmd_ds_command *resp);
+
+int libertas_parse_dnld_countryinfo_11d(wlan_private * priv);
+
+int libertas_create_dnld_countryinfo_11d(wlan_private * priv);
+
+#endif                          /* _WLAN_11D_ */
diff --git a/drivers/net/wireless/libertas/LICENSE b/drivers/net/wireless/libertas/LICENSE
new file mode 100644
index 000000000000..8862742213b9
--- /dev/null
+++ b/drivers/net/wireless/libertas/LICENSE
@@ -0,0 +1,16 @@
+  Copyright (c) 2003-2006, Marvell International Ltd.
+  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.
+
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
new file mode 100644
index 000000000000..19c935071d8e
--- /dev/null
+++ b/drivers/net/wireless/libertas/Makefile
@@ -0,0 +1,21 @@
+# EXTRA_CFLAGS += -Wpacked
+
+usb8xxx-objs := main.o fw.o wext.o \
+                rx.o tx.o cmd.o           \
+                cmdresp.o scan.o          \
+                join.o 11d.o              \
+                ioctl.o debugfs.o         \
+                ethtool.o assoc.o
+
+ifeq ($(CONFIG_LIBERTAS_USB_DEBUG), y)
+EXTRA_CFLAGS += -DDEBUG -DPROC_DEBUG
+endif
+
+
+# This is needed to support the newer boot2 bootloader (v >= 3104)
+EXTRA_CFLAGS += -DSUPPORT_BOOT_COMMAND
+usb8xxx-objs += if_bootcmd.o
+usb8xxx-objs += if_usb.o
+
+obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o
+
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
new file mode 100644
index 000000000000..688da4c784b1
--- /dev/null
+++ b/drivers/net/wireless/libertas/README
@@ -0,0 +1,1044 @@
+================================================================================
+                        README for USB8388
+
+ (c) Copyright © 2003-2006, Marvell International Ltd.
+ All Rights Reserved
+
+ This software file (the "File") is distributed by Marvell International
+ Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ (the "License").  You may use, redistribute and/or modify this File in
+ accordance with the terms and conditions of the License, a copy of which
+ is available along with the File in the license.txt file or by writing to
+ the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+ THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ this warranty disclaimer.
+================================================================================
+
+=====================
+DRIVER LOADING
+=====================
+
+        o. Copy the firmware image (e.g. usb8388.bin) to /lib/firmware/
+
+        o. Load driver by using the following command:
+
+                insmod usb8388.ko [fw_name=usb8388.bin]
+
+=====================
+IWPRIV COMMAND
+=====================
+
+NAME
+        This manual describes the usage of private commands used in Marvell WLAN
+        Linux Driver. All the commands available in Wlanconfig will not be available
+        in the iwpriv.
+
+SYNOPSIS
+        iwpriv <ethX> <command> [sub-command] ...
+
+        iwpriv ethX version
+        iwpriv ethX scantype [sub-command]
+        iwpriv ethX getSNR <n>
+        iwpriv ethX getNF <n>
+        iwpriv ethX getRSSI <n>
+        iwpriv ethX setrxant <n>
+        iwpriv ethX getrxant
+        iwpriv ethX settxant <n>
+        iwpriv ethX gettxant
+        iwpriv ethX authalgs <n>
+        iwpriv ethX pre-TBTT <n>
+        iwpriv ethX 8021xauthalgs <n>
+        iwpriv ethX encryptionmode <n>
+        iwpriv ethX setregioncode <n>
+        iwpriv ethX getregioncode
+        iwpriv ethX setbcnavg <n>
+        iwpriv ethX getbcnavg
+        iwpriv ethX setdataavg <n>
+        iwpriv ethX setlisteninter <n>
+        iwpriv ethX getlisteninter
+        iwpriv ethX setmultipledtim <n>
+        iwpriv ethX getmultipledtim
+        iwpriv ethX atimwindow <n>
+        iwpriv ethX deauth
+        iwpriv ethX adhocstop
+        iwpriv ethX radioon
+        iwpriv ethX radiooff
+        iwpriv ethX reasso-on
+        iwpriv ethX reasso-off
+        iwpriv ethX scanmode  [sub-command]
+        iwpriv ethX setwpaie <n>
+        iwpriv ethX wlanidle-off
+        iwpriv ethX wlanidle-on
+        iwpriv ethX getcis
+        iwpriv ethX getlog
+        iwpriv ethX getadhocstatus
+        iwpriv ethX adhocgrate <n>
+
+Version 4 Command:
+        iwpriv ethX inactvityto <n>
+        iwpriv ethX sleeppd <n>
+        iwpriv ethX enable11d <n>
+        iwpriv ethX tpccfg <n>
+        iwpriv ethX powercfg <n>
+        iwpriv ethX setafc <n>
+        iwpriv ethX getafc
+
+Version 5 Command:
+        iwpriv ethX ledgpio <n>
+        iwpriv ethX scanprobes <n>
+        iwpriv ethX lolisteninter <n>
+        iwpriv ethX rateadapt <n> <m>
+        iwpriv ethX txcontrol <n>
+        iwpriv ethX psnullinterval <n>
+        iwpriv ethX prescan <n>
+        iwpriv ethX getrxinfo
+        iwpriv ethX gettxrate
+        iwpriv ethX beaconinterval
+
+BT Commands:
+        The blinding table (BT) contains a list of mac addresses that should be
+        ignored by the firmware.  It is primarily used for debugging and
+        testing networks.  It can be edited and inspected with the following
+        commands:
+
+        iwpriv ethX bt_reset
+        iwpriv ethX bt_add <mac_address>
+        iwpriv ethX bt_del <mac_address>
+        iwpriv ethX bt_list <id>
+
+FWT Commands:
+        The forwarding table (FWT) is a feature used to manage mesh network
+        routing in the firmware.  The FWT is essentially a routing table that
+        associates a destination mac address (da) with a next hop receiver
+        address (ra).  The FWT can be inspected and edited with the following
+        iwpriv commands, which are described in greater detail below.
+        Eventually, the table will be automatically maintained by a custom
+        routing protocol.
+
+        NOTE: FWT commands replace the previous DFT commands.  What were the DFT
+        commands?, you might ask.  They were an earlier API to the firmware that
+        implemented a simple MAC-layer forwarding mechanism.  In the unlikely
+        event that you were using these commands, you must migrate to the new
+        FWT commands which can be used to achieve the same functionality.
+
+        iwpriv ethX fwt_add [parameters]
+        iwpriv ethX fwt_del [parameters]
+        iwpriv ethX fwt_lookup [parameters]
+        iwpriv ethX fwt_list [parameters]
+        iwpriv ethX fwt_list_route [parameters]
+        iwpriv ethX fwt_list_neigh [parameters]
+        iwpriv ethX fwt_reset [parameters]
+        iwpriv ethX fwt_cleanup
+        iwpriv ethX fwt_time
+
+MESH Commands:
+
+        The MESH commands are used to configure various features of the mesh
+        routing protocol.  The following commands are supported:
+
+        iwpriv ethX mesh_get_ttl
+        iwpriv ethX mesh_set_ttl ttl
+
+DESCRIPTION
+        Those commands are used to send additional commands to the Marvell WLAN
+        card via the Linux device driver.
+
+        The ethX parameter specifies the network device that is to be used to
+                perform this command on. it could be eth0, eth1 etc.
+
+version
+        This is used to get the current version of the driver and the firmware.
+
+scantype
+        This command is used to set the scan type to be used by the driver in
+        the scan command. This setting will not be used while performing a scan
+        for a specific SSID, as it is always done with scan type being active.
+
+        where the sub-commands are: -
+                        active  -- to set the scan type to active
+                        passive -- to set the scan type to passive
+                        get     -- to get the scan type set in the driver
+
+getSNR
+        This command gets the average and non average value of Signal to Noise
+        Ratio of Beacon and Data.
+
+        where value is:-
+                        0       -- Beacon non-average.
+                        1       -- Beacon average.
+                        2       -- Data non-average.
+                        3       -- Data average.
+
+        If no value is given, all four values are returned in the order mentioned
+        above.
+
+        Note: This command is available only when STA is connected.
+
+getRSSI
+        This command gets the average and non average value os Receive Signal
+        Strength of Beacon and Data.
+
+        where value is:-
+                        0       -- Beacon non-average.
+                        1       -- Beacon average.
+                        2       -- Data non-average.
+                        3       -- Data average.
+
+        Note: This command is available only when STA is connected.
+
+getNF
+        This command gets the average and non average value of Noise Floor of
+        Beacon and Data.
+
+        where value is:-
+                        0       -- Beacon non-average.
+                        1       -- Beacon average.
+                        2       -- Data non-average.
+                        3       -- Data average.
+
+        Note: This command is available only when STA is connected.
+
+setrxant
+        This command is used to set the mode for Rx antenna.
+
+        The options that can be sent are:-
+                        1       -- Antenna 1.
+                        2       -- Antenna 2.
+                        0xFFFF  -- Diversity.
+
+        Usage:
+                iwpriv ethX setrxant 0x01: select Antenna 1.
+
+getrxant
+        This command is used to get the mode for Rx antenna.
+
+
+settxant
+        This command is used to set the mode for Tx antenna.
+                The options that can be sent are:-
+                        1       -- Antenna 1.
+                        2       -- Antenna 2.
+                        0xFFFF  -- Diversity.
+        Usage:
+                iwpriv ethX settxant 0x01: select Antenna 1.
+
+gettxant
+        This command is used to get the mode for Tx antenna.
+
+authalgs
+        This command is used by the WPA supplicant to set the authentication
+        algorithms in the station.
+
+8021xauthalgs
+        This command is used by the WPA supplicant to set the 8021.x authentication algorithm type
+        station.
+
+        where values can be:-
+                        1       -- None
+                        2       -- LEAP
+                        4       -- TLS
+                        8       -- TTLs
+                        16      -- MD5
+
+
+encryptionmode
+        This command is used by the WPA supplicant to set the encryption algorithm.
+
+        where values can be:-
+                        0       -- NONE
+                        1       -- WEP40
+                        2       -- TKIP
+                        3       -- CCMP
+                        4       -- WEP104
+
+pre-TBTT
+        This command is used to set pre-TBTT time period where value is in microseconds.
+
+setregioncode
+        This command is used to set the region code in the station.
+        where value is 'region code' for various regions like
+        USA FCC, Canada IC, Spain, France, Europe ETSI, Japan ...
+
+        Usage:
+                iwpriv ethX setregioncode 0x10: set region code to USA (0x10).
+
+getregioncode
+        This command is used to get the region code information set in the
+        station.
+
+setbcnavg
+        Set the weighting factor for calculating RSSI.
+
+getbcnavg
+        Get weighting factor for calculating RSSI.
+
+setdataavg
+        Set the weighting factor for calculating SNR.
+
+setlisteninter
+        This command is used to set the listen interval in the
+        station.
+
+        where the value ranges between 1 - 255
+
+getlisteninter
+        This command is used to get the listen interval value set in the
+        station.
+
+setmultipledtim
+        This command is used to set the multiple dtim value in the
+        station.
+                where the value is 1,2,3,4,5,0xfffe
+                0xfffe means the firmware will use listen interval in association
+                command for waking up
+
+getmultipledtim
+        This command is used to get the multiple dtim value set in the station.
+
+atimwindow
+        This command is used to set the atim value in the
+        station.
+
+        where the value ranges between 0 - 50
+
+deauth
+        This command is used to send the de-authentication to the AP with which
+        the station is associated. This command is valid only when
+        station is in Infrastructure mode.
+
+        Note: This command is available only when STA is connected.
+
+adhocstop
+        This command is used to stop beacon transmission from the station and
+        go into idle state in ad-hoc mode.
+
+        Note: This command is available only when STA is connected.
+
+radioon
+        This command is used to turn on the RF antenna.
+
+radiooff
+        This command is sued to turn off the RF antenna.
+
+scanmode
+        This command is used to set the station to scan for either IBSS
+        networks or BSS networks or both BSS and IBSS networks. This
+        command can be used with sub commands,
+
+        where the value for
+                        bss     -- Scan All the BSS networks.
+                        ibss    -- Scan All the IBSS networks.
+                        any     -- Scan both BSS and IBSS networks.
+
+
+
+setwpaie
+        This command is used by WPA supplicant to send the WPA-IE to the driver.
+
+wlanidle-off
+        This command is used to get into idle state.
+
+        Note: This command is available only when STA is connected.
+
+wlanidle-on
+        This command is used to get off the idle state.
+
+        Note: This command is available only when STA is connected.
+
+
+getlog
+        This command is used to get the 802.11 statistics available in the
+                station.
+
+        Note: This command is available only when STA is connected.
+
+getadhocstatus
+        This command is used to get the ad-hoc Network Status.
+
+        The various status codes are:
+                AdhocStarted
+                AdhocJoined
+                AdhocIdle
+                InfraMode
+                AutoUnknownMode
+
+        Note: This command is available only when STA is connected.
+
+adhocgrate
+        This command is used to enable(1) g_rate, Disable(0) g_rate
+        and request(2) the status which g_rate is disabled/enabled,
+        for Ad-hoc creator.
+
+        where value is:-
+                0       -- Disabled
+                1       -- Enabled
+                2       -- Get
+
+ledgpio
+        This command is used to set/get LEDs.
+
+        iwpriv ethX ledgpio <LEDs>
+                will set the corresponding LED for the GPIO Line.
+
+        iwpriv ethX ledgpio
+                will give u which LEDs are Enabled.
+
+        Usage:
+                iwpriv eth1 ledgpio 1 0 2 1 3 4
+                        will enable
+                        LED 1 -> GPIO 0
+                        LED 2 -> GPIO 1
+                        LED 3 -> GPIO 4
+
+                iwpriv eth1 ledgpio
+                        shows LED information in the format as mentioned above.
+
+        Note: LED0 is invalid
+        Note: Maximum Number of LEDs are 16.
+
+inactivityto
+        This command is used by the host to set/get the inactivity timeout value,
+        which specifies when WLAN device is put to sleep.
+
+        Usage:
+                iwpriv ethX inactivityto [<timeout>]
+
+        where the parameter are:
+                timeout: timeout value in milliseconds.
+
+        Example:
+                iwpriv eth1 inactivityto
+                        "get the timeout value"
+
+                iwpriv eth1 inactivityto X
+                        "set timeout value to X ms"
+
+
+sleeppd
+        This command is used to configure the sleep period of the WLAN device.
+
+        Usage:
+                iwpriv ethX sleeppd [<sleep period>]
+
+        where the parameter are:
+                Period: sleep period in milliseconds. Range 10~60.
+
+        Example:
+                iwpriv eth1 sleeppd 10
+                        "set period as 10 ms"
+                iwpriv eth1 sleeppd
+                        "get the sleep period configuration"
+
+enable11d
+        This command is used to control 11d
+        where value is:-
+                1       -- Enabled
+                0       -- Disabled
+                2       -- Get
+
+
+
+
+tpccfg
+        Enables or disables automatic transmit power control.
+
+        The first parameter turns this feature on (1) or off (0).  When turning
+        on, the user must also supply four more parameters in the following
+        order:
+                -UseSNR (Use SNR (in addition to PER) for TPC algorithm),
+                -P0 (P0 power level for TPC),
+                -P1 (P1 power level for TPC),
+                -P2 (P2 power level for TPC).
+
+        Usage:
+                iwpriv ethX tpccfg: Get current configuration
+                iwpriv ethX tpccfg 0: disable auto TPC
+                iwpriv ethX tpccfg 0x01 0x00 0x05 0x0a 0x0d: enable auto TPC; do not use SNR;
+                                                             P0=0x05; P1=0x0a; P2=0x0d;
+                iwpriv ethX tpccfg 0x01 0x01 0x05 0x0a 0x0d: enable auto TPC; use SNR;
+                                                             P0=0x05; P1=0x0a; P2=0x0d.
+
+powercfg
+        Enables or disables power adaptation.
+
+        The first parameter turns this feature on (1) or off (0).  When turning
+        on, the user must also supply three more parameters in the following
+        order:
+                -P0 (P0 power level for Power Adaptation),
+                -P1 (P1 power level for Power Adaptation),
+                -P2 (P2 power level for Power Adaptation).
+
+        Usage:
+                iwpriv ethX powercfg: Get current configuration
+                iwpriv ethX powercfg 0: disable power adaptation
+                iwpriv ethX powercfg 1 0x0d 0x0f 0x12: enable power adaptation;
+                                                       P0=0x0d; P1=0x0f; P2=0x12.
+
+getafc
+        This command returns automatic frequency control parameters.  It returns
+        three integers:
+                -P0: automatic is on (1), or off (0),
+                -P1: current timing offset in PPM (part per million), and
+                -P2: current frequency offset in PPM.
+
+setafc
+        Set automatic frequency control options.
+
+        The first parameter turns automatic on (1) or off (0).
+        The user must supply two more parameters in either case, in the following
+  order:
+
+  When auto is on:
+
+                -P0 (automatic adjustment frequency threshold in PPM),
+                -P1 (automatic adjustment period in beacon period),
+
+  When auto is off:
+
+                -P0 (manual adjustment timing offset in PPM), and
+                -P1 (manual adjustment frequency offset in PPM).
+
+        Usage:
+                iwpriv ethX setafc 0 10 10: manual adjustment, both timing and frequcncy
+    offset are 10 PPM.
+
+                iwpriv ethX setafc 1 10 10 enable afc, automatic adjustment,
+    frequency threshold 10 PPM, for every 10 beacon periods.
+
+
+
+scanprobes
+        This command sets number of probe requests per channel.
+
+        Usage:
+                iwpriv ethX scanprobes 3 (set scan probes to 3)
+                iwpriv ethX scanprobes   (get scan probes)
+
+lolisteninter
+        This command sets the value of listen interval.
+
+        Usage:
+        iwpriv ethX lolisteninter 234 (set the lolisteninter to 234)
+        iwpriv ethX lolisteninter     (get the lolisteninter value)
+
+rateadapt
+        This command sets the data rates bitmap.
+        Where <n>
+                0: Disable auto rate adapt
+                1: Enable auto rate adapt
+
+              <m>
+                 data rate bitmap
+                        Bit     Data rate
+                        0       1 Mbps
+                        1       2 Mbps
+                        2       5.5 Mbps
+                        3       11 Mbps
+                        4       Reserved
+                        5       6 Mbps
+                        6       9 Mbps
+                        7       12 Mbps
+                        8       18 Mbps
+                        9       24 Mbps
+                        10      36 Mbps
+                        11      48 Mbps
+                        12      54 Mbps
+                        12-15   Reserved
+
+        Usage:
+        iwpriv ethX rateadapt
+                        read the currect data rate setting
+        iwpriv ethX rateadapt 1 0x07
+                        enable auto data rate adapt and
+                        data rates are 1Mbps, 2Mbsp and 5.5Mbps
+
+
+txcontrol
+        This command is used to set the Tx rate, ack policy, and retry limit on a per packet basis.
+
+        Where value <n> is:
+            if bit[4] == 1:
+                bit[3:0]        -- 0   1   2   3   4   5   6   7   8   9   10   11   12   13-16
+                Data Rate(Mbps) -- 1   2   5.5 11  Rsv 6   9   12  18  24  36   48   54   Rsv
+
+            bit[12:8]
+                if bit[12] == 1, bit[11:8] specifies the Tx retry limit.
+
+            bit[14:13] specifies per packet ack policy:
+                bit[14:13]
+                     1  0       use immediate ack policy for this packet
+                     1  1       use no ack policy for this packet
+                     0  x       use the per-packet ack policy setting
+
+        Usage:
+        iwpriv ethX txcontrol 0x7513
+                        Use no-ack policy, 5 retires for Tx, 11Mbps rate
+
+
+
+psnullinterval
+        This command is used to set/request NULL package interval for Power Save
+        under infrastructure mode.
+
+        where value is:-
+                -1      -- Disabled
+                n>0     -- Set interval as n (seconds)
+
+prescan
+        This command is used to enable (1)/disable(0) auto prescan before assoicate to the ap
+
+        where value is:-
+                0       -- Disabled
+                1       -- Enabled
+                2       -- Get
+
+getrxinfo
+        This command gets non average value of Signal to Noise Ratio of Data and rate index.
+
+        The following table shows RateIndex and Rate
+
+                     RateIndex  Data rate
+                        0       1 Mbps
+                        1       2 Mbps
+                        2       5.5 Mbps
+                        3       11 Mbps
+                        4       Reserved
+                        5       6 Mbps
+                        6       9 Mbps
+                        7       12 Mbps
+                        8       18 Mbps
+                        9       24 Mbps
+                        10      36 Mbps
+                        11      48 Mbps
+                        12      54 Mbps
+                        13-15   Reserved
+
+gettxrate
+        This command gets current Tx rate index of the first packet associated with Rate Adaptation.
+
+        The following table shows RateIndex and Rate
+
+                     RateIndex  Data rate
+                        0       1 Mbps
+                        1       2 Mbps
+                        2       5.5 Mbps
+                        3       11 Mbps
+                        4       Reserved
+                        5       6 Mbps
+                        6       9 Mbps
+                        7       12 Mbps
+                        8       18 Mbps
+                        9       24 Mbps
+                        10      36 Mbps
+                        11      48 Mbps
+                        12      54 Mbps
+                        13-15   Reserved
+
+bcninterval
+        This command is used to sets beacon interval in adhoc mode when an argument is given, and gets current adhoc
+        beacon interval when no argument is given. The valid beacon interval is between 20 - 1000,
+        default beacon interval is 100.
+
+        Usage:
+                iwpriv ethX bcninterval 100  (set adhoc beacon interval to 100)
+                iwpriv ethX bcninterval      (get adhoc beacon interval)
+
+fwt_add
+        This command is used to insert an entry into the FWT table. The list of
+        parameters must follow the following structure:
+
+        iwpriv ethX fwt_add da ra [metric dir ssn dsn hopcount ttl expiration sleepmode snr]
+
+        The parameters between brackets are optional, but they must appear in
+        the order specified.  For example, if you want to specify the metric,
+        you must also specify the dir, ssn, and dsn but you need not specify the
+        hopcount, expiration, sleepmode, or snr.  Any unspecified parameters
+        will be assigned the defaults specified below.
+
+        The different parameters are:-
+                da              -- DA MAC address in the form 00:11:22:33:44:55
+                ra              -- RA MAC address in the form 00:11:22:33:44:55
+                metric          -- route metric (cost: smaller-metric routes are
+                                   preferred, default is 0)
+                dir             -- direction (1 for direct, 0 for reverse,
+                                   default is 1)
+                ssn             -- Source Sequence Number (time at the RA for
+                                   reverse routes.  Default is 0)
+                dsn             -- Destination Sequence Number (time at the DA
+                                   for direct routes.  Default is 0)
+                hopcount        -- hop count (currently unused, default is 0)
+                ttl             -- TTL (Only used in reverse entries)
+                expiration      -- entry expiration (in ticks, where a tick is
+                                   1024us, or ~ 1ms. Use 0 for an indefinite
+                                   entry, default is 0)
+                sleepmode       -- RA's sleep mode (currently unused, default is
+                                   0)
+                snr             -- SNR in the link to RA (currently unused,
+                                   default is 0)
+
+        The command does not return anything.
+
+fwt_del
+        This command is used to remove an entry to the FWT table. The list of
+        parameters must follow the following structure:
+
+                iwpriv ethX fwt_del da ra [dir]
+
+        where the different parameters are:-
+                da              -- DA MAC address (in the form "00:11:22:33:44:55")
+                ra              -- RA MAC address (in the form "00:11:22:33:44:55")
+                dir             -- direction (1 for direct, 0 for reverse,
+                                   default is 1)
+
+        The command does not return anything.
+
+fwt_lookup
+        This command is used to get the best route in the FWT table to a given
+        host. The only parameter is the MAC address of the host that is being
+        looked for.
+
+                iwpriv ethX fwt_lookup da
+
+        where:-
+                da              -- DA MAC address (in the form "00:11:22:33:44:55")
+
+        The command returns an output string identical to the one returned by
+        fwt_list described below.
+
+
+fwt_list
+        This command is used to list a route from the FWT table. The only
+        parameter is the index into the table. If you want to list all the
+        routes in a table, start with index=0, and keep listing until you get a
+        "(null)" string.  Note that the indicies may change as the fwt is
+        updated.  It is expected that most users will not use fwt_list directly,
+        but that a utility similar to the traditional route command will be used
+        to invoke fwt_list over and over.
+
+                iwpriv ethX fwt_list index
+
+        The output is a string of the following form:
+
+                da ra metric dir ssn dsn hopcount ttl expiration sleepmode snr
+
+        where the different fields are:-
+                da              -- DA MAC address (in the form "00:11:22:33:44:55")
+                ra              -- RA MAC address (in the form "00:11:22:33:44:55")
+                metric          -- route metric (cost: smaller-metric routes are preferred)
+                dir             -- direction (1 for direct, 0 for reverse)
+                ssn             -- Source Sequence Number (time at the RA for reverse routes)
+                dsn             -- Destination Sequence Number (time at the DA for direct routes)
+                hopcount        -- hop count (currently unused)
+                ttl             -- TTL (only used in reverse entries)
+                expiration      -- entry expiration (in ticks, where a tick is 1024us, or ~ 1ms. Use 0 for an indefinite entry)
+                sleepmode       -- RA's sleep mode (currently unused)
+                snr             -- SNR in the link to RA (currently unused)
+
+fwt_list_route
+        This command is used to list a route from the FWT table. The only
+        parameter is the route ID. If you want to list all the routes in a
+        table, start with rid=0, and keep incrementing rid until you get a
+        "(null)" string. This function is similar to fwt_list. The only
+        difference is the output format.  Also note that this command is meant
+        for debugging.  It is expected that users will use fwt_lookup and
+        fwt_list.  One important reason for this is that the route id may change
+        as the route table is altered.
+
+                iwpriv ethX fwt_list_route rid
+
+        The output is a string of the following form:
+
+                da metric dir nid ssn dsn hopcount ttl expiration
+
+        where the different fields are:-
+                da              -- DA MAC address (in the form "00:11:22:33:44:55")
+                metric          -- route metric (cost: smaller-metric routes are preferred)
+                dir             -- direction (1 for direct, 0 for reverse)
+                nid             -- Next-hop (neighbor) host ID (nid)
+                ssn             -- Source Sequence Number (time at the RA for reverse routes)
+                dsn             -- Destination Sequence Number (time at the DA for direct routes)
+                hopcount        -- hop count (currently unused)
+                ttl             -- TTL count (only used in reverse entries)
+                expiration      -- entry expiration (in ticks, where a tick is 1024us, or ~ 1ms. Use 0 for an indefinite entry)
+
+fwt_list_neigh
+        This command is used to list a neighbor from the FWT table. The only
+        parameter is the neighbor ID. If you want to list all the neighbors in a
+        table, start with nid=0, and keep incrementing nid until you get a
+        "(null)" string.  Note that the nid from a fwt_list_route command can be
+        used as an input to this command.  Also note that this command is meant
+        mostly for debugging.  It is expected that users will use fwt_lookup.
+        One important reason for this is that the neighbor id may change as the
+        neighbor table is altered.
+
+                iwpriv ethX fwt_list_neigh nid
+
+        The output is a string of the following form:
+
+                ra sleepmode snr references
+
+        where the different fields are:-
+                ra              -- RA MAC address (in the form "00:11:22:33:44:55")
+                sleepmode       -- RA's sleep mode (currently unused)
+                snr             -- SNR in the link to RA (currently unused)
+                references      -- RA's reference counter
+
+fwt_reset
+        This command is used to reset the FWT table, getting rid of all the
+        entries. There are no input parameters.
+
+                iwpriv ethX fwt_reset
+
+        The command does not return anything.
+
+fwt_cleanup
+        This command is used to perform user-based garbage recollection. The
+        FWT table is checked, and all the entries that are expired or invalid
+        are cleaned. Note that this is exported to the driver for debugging
+        purposes, as garbage collection is also fired by the firmware when in
+        space problems. There are no input parameters.
+
+                iwpriv ethX fwt_cleanup
+
+        The command does returns the number of invalid/expired routes deleted.
+
+fwt_time
+        This command returns a card's internal time representation.  It is this
+        time that is used to represent the expiration times of FWT entries.  The
+        number is not consistent from card to card; it is simply a timer count.
+        The fwt_time command is used to inspect the timer so that expiration
+        times reported by fwt_list can be properly interpreted.
+
+                iwpriv ethX fwt_time
+
+mesh_get_ttl
+
+        The mesh ttl is the number of hops a mesh packet can traverse before it
+        is dropped.  This parameter is used to prevent infinite loops in the
+        mesh network.  The value returned by this function is the ttl assigned
+        to all mesh packets.  Currently there is no way to control the ttl on a
+        per packet or per socket basis.
+
+        iwpriv ethX mesh_get_ttl
+
+mesh_set_ttl ttl
+
+        Set the ttl.  The argument must be between 0 and 255.
+
+        iwpriv ethX mesh_set_ttl <ttl>
+
+=========================
+ETHTOOL
+=========================
+
+
+Use the -i option to retrieve version information from the driver.
+
+# ethtool -i eth0
+driver: libertas
+version: COMM-USB8388-318.p4
+firmware-version: 5.110.7
+bus-info:
+
+Use the -e option to read the EEPROM contents of the card.
+
+        Usage:
+        ethtool -e ethX [raw on|off] [offset N] [length N]
+
+       -e     retrieves and prints an EEPROM dump for the  specified  ethernet
+              device.   When raw is enabled, then it dumps the raw EEPROM data
+              to stdout. The length and offset parameters allow  dumping  cer-
+              tain portions of the EEPROM.  Default is to dump the entire EEP-
+              ROM.
+
+# ethtool -e eth0 offset 0 length 16
+Offset          Values
+------          ------
+0x0000          38 33 30 58 00 00 34 f4 00 00 10 00 00 c4 17 00
+
+========================
+DEBUGFS COMMANDS
+========================
+
+those commands are used via debugfs interface
+
+===========
+rdmac
+rdbbp
+rdrf
+        These commands are used to read the MAC, BBP and RF registers from the
+        card.  These commands take one parameter that specifies the offset
+        location that is to be read.  This parameter must be specified in
+        hexadecimal (its possible to preceed preceding the number with a "0x").
+
+        Path: /debugfs/libertas_wireless/ethX/registers/
+
+        Usage:
+                echo "0xa123" > rdmac ; cat rdmac
+                echo "0xa123" > rdbbp ; cat rdbbp
+                echo "0xa123" > rdrf ; cat rdrf
+wrmac
+wrbbp
+wrrf
+        These commands are used to write the MAC, BBP and RF registers in the
+        card.  These commands take two parameters that specify the offset
+        location and the value that is to be written. This parameters must
+        be specified in hexadecimal (its possible to preceed the number
+        with a "0x").
+
+        Usage:
+                echo "0xa123 0xaa" > wrmac
+                echo "0xa123 0xaa" > wrbbp
+                echo "0xa123 0xaa" > wrrf
+
+sleepparams
+        This command is used to set the sleepclock configurations
+
+        Path: /debugfs/libertas_wireless/ethX/
+
+        Usage:
+                cat sleepparams: reads the current sleepclock configuration
+
+                echo "p1 p2 p3 p4 p5 p6" > sleepparams: writes the sleepclock configuration.
+
+                where:
+                        p1 is Sleep clock error in ppm (0-65535)
+                        p2 is Wakeup offset in usec (0-65535)
+                        p3 is Clock stabilization time in usec (0-65535)
+                        p4 is Control periodic calibration (0-2)
+                        p5 is Control the use of external sleep clock (0-2)
+                        p6 is reserved for debug (0-65535)
+
+subscribed_events
+
+        The subscribed_events directory contains the interface for the
+        subscribed events API.
+
+        Path: /debugfs/libertas_wireless/ethX/subscribed_events/
+
+        Each event is represented by a filename. Each filename consists of the
+        following three fields:
+        Value Frequency Subscribed
+
+        To read the current values for a given event, do:
+                cat event
+        To set the current values, do:
+                echo "60 2 1" > event
+
+        Frequency field specifies the reporting frequency for this event.
+        If it is set to 0, then the event is reported only once, and then
+        automatically unsubscribed. If it is set to 1, then the event is
+        reported every time it occurs. If it is set to N, then the event is
+        reported every Nth time it occurs.
+
+        beacon_missed
+        Value field specifies the number of consecutive missing beacons which
+        triggers the LINK_LOSS event. This event is generated only once after
+        which the firmware resets its state. At initialization, the LINK_LOSS
+        event is subscribed by default. The default value of MissedBeacons is
+        60.
+
+        failure_count
+        Value field specifies the consecutive failure count threshold which
+        triggers the generation of the MAX_FAIL event. Once this event is
+        generated, the consecutive failure count is reset to 0.
+        At initialization, the MAX_FAIL event is NOT subscribed by
+        default.
+
+        high_rssi
+        This event is generated when the average received RSSI in beacons goes
+        above a threshold, specified by Value.
+
+        low_rssi
+        This event is generated when the average received RSSI in beacons goes
+        below a threshold, specified by Value.
+
+        high_snr
+        This event is generated when the average received SNR in beacons goes
+        above a threshold, specified by Value.
+
+        low_snr
+        This event is generated when the average received SNR in beacons goes
+        below a threshold, specified by Value.
+
+extscan
+        This command is used to do a specific scan.
+
+        Path: /debugfs/libertas_wireless/ethX/
+
+        Usage: echo "SSID" > extscan
+
+        Example:
+                echo "LINKSYS-AP" > extscan
+
+        To see the results of use getscantable command.
+
+getscantable
+
+        Display the current contents of the driver scan table (ie. get the
+        scan results).
+
+        Path: /debugfs/libertas_wireless/ethX/
+
+        Usage:
+                cat getscantable
+
+setuserscan
+        Initiate a customized scan and retrieve the results
+
+
+        Path: /debugfs/libertas_wireless/ethX/
+
+    Usage:
+       echo "[ARGS]" > setuserscan
+
+         where [ARGS]:
+
+      chan=[chan#][band][mode] where band is [a,b,g] and mode is
+                               blank for active or 'p' for passive
+      bssid=xx:xx:xx:xx:xx:xx  specify a BSSID filter for the scan
+      ssid="[SSID]"            specify a SSID filter for the scan
+      keep=[0 or 1]            keep the previous scan results (1), discard (0)
+      dur=[scan time]          time to scan for each channel in milliseconds
+      probes=[#]               number of probe requests to send on each chan
+      type=[1,2,3]             BSS type: 1 (Infra), 2(Adhoc), 3(Any)
+
+    Any combination of the above arguments can be supplied on the command line.
+      If the chan token is absent, a full channel scan will be completed by
+      the driver.  If the dur or probes tokens are absent, the driver default
+      setting will be used.  The bssid and ssid fields, if blank,
+      will produce an unfiltered scan. The type field will default to 3 (Any)
+      and the keep field will default to 0 (Discard).
+
+    Examples:
+    1) Perform an active scan on channels 1, 6, and 11 in the 'g' band:
+            echo "chan=1g,6g,11g" > setuserscan
+
+    2) Perform a passive scan on channel 11 for 20 ms:
+            echo "chan=11gp dur=20" > setuserscan
+
+    3) Perform an active scan on channels 1, 6, and 11; and a passive scan on
+       channel 36 in the 'a' band:
+
+            echo "chan=1g,6g,11g,36ap" > setuserscan
+
+    4) Perform an active scan on channel 6 and 36 for a specific SSID:
+            echo "chan=6g,36a ssid="TestAP"" > setuserscan
+
+    5) Scan all available channels (B/G, A bands) for a specific BSSID, keep
+       the current scan table intact, update existing or append new scan data:
+            echo "bssid=00:50:43:20:12:82 keep=1" > setuserscan
+
+    6) Scan channel 6, for all infrastructure networks, sending two probe
+       requests.  Keep the previous scan table intact. Update any duplicate
+       BSSID/SSID matches with the new scan data:
+            echo "chan=6g type=1 probes=2 keep=1" > setuserscan
+
+    All entries in the scan table (not just the new scan data when keep=1)
+    will be displayed upon completion by use of the getscantable ioctl.
+
+==============================================================================
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
new file mode 100644
index 000000000000..b55c7f57aca8
--- /dev/null
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -0,0 +1,588 @@
+/* Copyright (C) 2006, Red Hat, Inc. */
+
+#include <linux/bitops.h>
+#include <net/ieee80211.h>
+
+#include "assoc.h"
+#include "join.h"
+#include "decl.h"
+#include "hostcmd.h"
+#include "host.h"
+
+
+static const u8 bssid_any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+static int assoc_helper_essid(wlan_private *priv,
+                              struct assoc_request * assoc_req)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        int i;
+
+        ENTER();
+
+        lbs_pr_debug(1, "New SSID requested: %s\n", assoc_req->ssid.ssid);
+        if (assoc_req->mode == wlan802_11infrastructure) {
+                if (adapter->prescan) {
+                        libertas_send_specific_SSID_scan(priv, &assoc_req->ssid, 1);
+                }
+
+                i = libertas_find_SSID_in_list(adapter, &assoc_req->ssid,
+                                NULL, wlan802_11infrastructure);
+                if (i >= 0) {
+                        lbs_pr_debug(1,
+                               "SSID found in scan list ... associating...\n");
+
+                        ret = wlan_associate(priv, &adapter->scantable[i]);
+                        if (ret == 0) {
+                                memcpy(&assoc_req->bssid,
+                                       &adapter->scantable[i].macaddress,
+                                       ETH_ALEN);
+                        }
+                } else {
+                        lbs_pr_debug(1, "SSID '%s' not found; cannot associate\n",
+                                assoc_req->ssid.ssid);
+                }
+        } else if (assoc_req->mode == wlan802_11ibss) {
+                /* Scan for the network, do not save previous results.  Stale
+                 *   scan data will cause us to join a non-existant adhoc network
+                 */
+                libertas_send_specific_SSID_scan(priv, &assoc_req->ssid, 0);
+
+                /* Search for the requested SSID in the scan table */
+                i = libertas_find_SSID_in_list(adapter, &assoc_req->ssid, NULL,
+                                wlan802_11ibss);
+                if (i >= 0) {
+                        lbs_pr_debug(1, "SSID found at %d in List, so join\n", ret);
+                        libertas_join_adhoc_network(priv, &adapter->scantable[i]);
+                } else {
+                        /* else send START command */
+                        lbs_pr_debug(1, "SSID not found in list, so creating adhoc"
+                                " with SSID '%s'\n", assoc_req->ssid.ssid);
+                        libertas_start_adhoc_network(priv, &assoc_req->ssid);
+                }
+                memcpy(&assoc_req->bssid, &adapter->current_addr, ETH_ALEN);
+        }
+
+        LEAVE();
+        return ret;
+}
+
+
+static int assoc_helper_bssid(wlan_private *priv,
+                              struct assoc_request * assoc_req)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int i, ret = 0;
+
+        ENTER();
+
+        lbs_pr_debug(1, "ASSOC: WAP: BSSID = " MAC_FMT "\n",
+                MAC_ARG(assoc_req->bssid));
+
+        /* Search for index position in list for requested MAC */
+        i = libertas_find_BSSID_in_list(adapter, assoc_req->bssid,
+                            assoc_req->mode);
+        if (i < 0) {
+                lbs_pr_debug(1, "ASSOC: WAP: BSSID " MAC_FMT " not found, "
+                        "cannot associate.\n", MAC_ARG(assoc_req->bssid));
+                goto out;
+        }
+
+        if (assoc_req->mode == wlan802_11infrastructure) {
+                ret = wlan_associate(priv, &adapter->scantable[i]);
+                lbs_pr_debug(1, "ASSOC: return from wlan_associate(bssd) was %d\n", ret);
+        } else if (assoc_req->mode == wlan802_11ibss) {
+                libertas_join_adhoc_network(priv, &adapter->scantable[i]);
+        }
+        memcpy(&assoc_req->ssid, &adapter->scantable[i].ssid,
+                sizeof(struct WLAN_802_11_SSID));
+
+out:
+        LEAVE();
+        return ret;
+}
+
+
+static int assoc_helper_associate(wlan_private *priv,
+                                  struct assoc_request * assoc_req)
+{
+        int ret = 0, done = 0;
+
+        /* If we're given and 'any' BSSID, try associating based on SSID */
+
+        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
+                if (memcmp(bssid_any, assoc_req->bssid, ETH_ALEN)
+                    && memcmp(bssid_off, assoc_req->bssid, ETH_ALEN)) {
+                        ret = assoc_helper_bssid(priv, assoc_req);
+                        done = 1;
+                        if (ret) {
+                                lbs_pr_debug(1, "ASSOC: bssid: ret = %d\n", ret);
+                        }
+                }
+        }
+
+        if (!done && test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
+                ret = assoc_helper_essid(priv, assoc_req);
+                if (ret) {
+                        lbs_pr_debug(1, "ASSOC: bssid: ret = %d\n", ret);
+                }
+        }
+
+        return ret;
+}
+
+
+static int assoc_helper_mode(wlan_private *priv,
+                             struct assoc_request * assoc_req)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        ENTER();
+
+        if (assoc_req->mode == adapter->inframode) {
+                LEAVE();
+                return 0;
+        }
+
+        if (assoc_req->mode == wlan802_11infrastructure) {
+                if (adapter->psstate != PS_STATE_FULL_POWER)
+                        libertas_ps_wakeup(priv, cmd_option_waitforrsp);
+                adapter->psmode = wlan802_11powermodecam;
+        }
+
+        adapter->inframode = assoc_req->mode;
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_snmp_mib,
+                                    0, cmd_option_waitforrsp,
+                                    OID_802_11_INFRASTRUCTURE_MODE,
+                                    (void *) assoc_req->mode);
+
+        LEAVE();
+        return ret;
+}
+
+
+static int assoc_helper_wep_keys(wlan_private *priv,
+                                 struct assoc_request * assoc_req)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int i;
+        int ret = 0;
+
+        ENTER();
+
+        /* Set or remove WEP keys */
+        if (   assoc_req->wep_keys[0].len
+            || assoc_req->wep_keys[1].len
+            || assoc_req->wep_keys[2].len
+            || assoc_req->wep_keys[3].len) {
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_set_wep,
+                                            cmd_act_add,
+                                            cmd_option_waitforrsp,
+                                            0, assoc_req);
+        } else {
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_set_wep,
+                                            cmd_act_remove,
+                                            cmd_option_waitforrsp,
+                                            0, NULL);
+        }
+
+        if (ret)
+                goto out;
+
+        /* enable/disable the MAC's WEP packet filter */
+        if (assoc_req->secinfo.WEPstatus == wlan802_11WEPenabled)
+                adapter->currentpacketfilter |= cmd_act_mac_wep_enable;
+        else
+                adapter->currentpacketfilter &= ~cmd_act_mac_wep_enable;
+        ret = libertas_set_mac_packet_filter(priv);
+        if (ret)
+                goto out;
+
+        mutex_lock(&adapter->lock);
+
+        /* Copy WEP keys into adapter wep key fields */
+        for (i = 0; i < 4; i++) {
+                memcpy(&adapter->wep_keys[i], &assoc_req->wep_keys[i],
+                        sizeof(struct WLAN_802_11_KEY));
+        }
+        adapter->wep_tx_keyidx = assoc_req->wep_tx_keyidx;
+
+        mutex_unlock(&adapter->lock);
+
+out:
+        LEAVE();
+        return ret;
+}
+
+static int assoc_helper_secinfo(wlan_private *priv,
+                                struct assoc_request * assoc_req)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        ENTER();
+
+        memcpy(&adapter->secinfo, &assoc_req->secinfo,
+                sizeof(struct wlan_802_11_security));
+
+        ret = libertas_set_mac_packet_filter(priv);
+
+        LEAVE();
+        return ret;
+}
+
+
+static int assoc_helper_wpa_keys(wlan_private *priv,
+                                 struct assoc_request * assoc_req)
+{
+        int ret = 0;
+
+        ENTER();
+
+        /* enable/Disable RSN */
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_enable_rsn,
+                                    cmd_act_set,
+                                    cmd_option_waitforrsp,
+                                    0, assoc_req);
+        if (ret)
+                goto out;
+
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_key_material,
+                                    cmd_act_set,
+                                    cmd_option_waitforrsp,
+                                    0, assoc_req);
+
+out:
+        LEAVE();
+        return ret;
+}
+
+
+static int assoc_helper_wpa_ie(wlan_private *priv,
+                               struct assoc_request * assoc_req)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        ENTER();
+
+        if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
+                memcpy(&adapter->wpa_ie, &assoc_req->wpa_ie, assoc_req->wpa_ie_len);
+                adapter->wpa_ie_len = assoc_req->wpa_ie_len;
+        } else {
+                memset(&adapter->wpa_ie, 0, MAX_WPA_IE_LEN);
+                adapter->wpa_ie_len = 0;
+        }
+
+        LEAVE();
+        return ret;
+}
+
+
+static int should_deauth_infrastructure(wlan_adapter *adapter,
+                                        struct assoc_request * assoc_req)
+{
+        if (adapter->connect_status != libertas_connected)
+                return 0;
+
+        if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
+                lbs_pr_debug(1, "Deauthenticating due to new SSID in "
+                        " configuration request.\n");
+                return 1;
+        }
+
+        if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
+                if (adapter->secinfo.authmode !=
+                    assoc_req->secinfo.authmode) {
+                        lbs_pr_debug(1, "Deauthenticating due to updated security "
+                                "info in configuration request.\n");
+                        return 1;
+                }
+        }
+
+        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
+                lbs_pr_debug(1, "Deauthenticating due to new BSSID in "
+                        " configuration request.\n");
+                return 1;
+        }
+
+        /* FIXME: deal with 'auto' mode somehow */
+        if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
+                if (assoc_req->mode != wlan802_11infrastructure)
+                        return 1;
+        }
+
+        return 0;
+}
+
+
+static int should_stop_adhoc(wlan_adapter *adapter,
+                             struct assoc_request * assoc_req)
+{
+        if (adapter->connect_status != libertas_connected)
+                return 0;
+
+        if (adapter->curbssparams.ssid.ssidlength != assoc_req->ssid.ssidlength)
+                return 1;
+        if (memcmp(adapter->curbssparams.ssid.ssid, assoc_req->ssid.ssid,
+                        sizeof(struct WLAN_802_11_SSID)))
+                return 1;
+
+        /* FIXME: deal with 'auto' mode somehow */
+        if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
+                if (assoc_req->mode != wlan802_11ibss)
+                        return 1;
+        }
+
+        return 0;
+}
+
+
+void wlan_association_worker(struct work_struct *work)
+{
+        wlan_private *priv = container_of(work, wlan_private, assoc_work.work);
+        wlan_adapter *adapter = priv->adapter;
+        struct assoc_request * assoc_req = NULL;
+        int ret = 0;
+        int find_any_ssid = 0;
+
+        ENTER();
+
+        mutex_lock(&adapter->lock);
+        assoc_req = adapter->assoc_req;
+        adapter->assoc_req = NULL;
+        mutex_unlock(&adapter->lock);
+
+        if (!assoc_req) {
+                LEAVE();
+                return;
+        }
+
+        lbs_pr_debug(1, "ASSOC: starting new association request: flags = 0x%lX\n",
+                assoc_req->flags);
+
+        /* If 'any' SSID was specified, find an SSID to associate with */
+        if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)
+            && !assoc_req->ssid.ssidlength)
+                find_any_ssid = 1;
+
+        /* But don't use 'any' SSID if there's a valid locked BSSID to use */
+        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
+                if (memcmp(&assoc_req->bssid, bssid_any, ETH_ALEN)
+                    && memcmp(&assoc_req->bssid, bssid_off, ETH_ALEN))
+                        find_any_ssid = 0;
+        }
+
+        if (find_any_ssid) {
+                enum WLAN_802_11_NETWORK_INFRASTRUCTURE new_mode;
+
+                ret = libertas_find_best_network_SSID(priv, &assoc_req->ssid,
+                                assoc_req->mode, &new_mode);
+                if (ret) {
+                        lbs_pr_debug(1, "Could not find best network\n");
+                        ret = -ENETUNREACH;
+                        goto out;
+                }
+
+                /* Ensure we switch to the mode of the AP */
+                if (assoc_req->mode == wlan802_11autounknown) {
+                        set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
+                        assoc_req->mode = new_mode;
+                }
+        }
+
+        /*
+         * Check if the attributes being changing require deauthentication
+         * from the currently associated infrastructure access point.
+         */
+        if (adapter->inframode == wlan802_11infrastructure) {
+                if (should_deauth_infrastructure(adapter, assoc_req)) {
+                        ret = libertas_send_deauthentication(priv);
+                        if (ret) {
+                                lbs_pr_debug(1, "Deauthentication due to new "
+                                        "configuration request failed: %d\n",
+                                        ret);
+                        }
+                }
+        } else if (adapter->inframode == wlan802_11ibss) {
+                if (should_stop_adhoc(adapter, assoc_req)) {
+                        ret = libertas_stop_adhoc_network(priv);
+                        if (ret) {
+                                lbs_pr_debug(1, "Teardown of AdHoc network due to "
+                                        "new configuration request failed: %d\n",
+                                        ret);
+                        }
+
+                }
+        }
+
+        /* Send the various configuration bits to the firmware */
+        if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
+                ret = assoc_helper_mode(priv, assoc_req);
+                if (ret) {
+lbs_pr_debug(1, "ASSOC(:%d) mode: ret = %d\n", __LINE__, ret);
+                        goto out;
+                }
+        }
+
+        if (   test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags)
+            || test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags)) {
+                ret = assoc_helper_wep_keys(priv, assoc_req);
+                if (ret) {
+lbs_pr_debug(1, "ASSOC(:%d) wep_keys: ret = %d\n", __LINE__, ret);
+                        goto out;
+                }
+        }
+
+        if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
+                ret = assoc_helper_secinfo(priv, assoc_req);
+                if (ret) {
+lbs_pr_debug(1, "ASSOC(:%d) secinfo: ret = %d\n", __LINE__, ret);
+                        goto out;
+                }
+        }
+
+        if (test_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags)) {
+                ret = assoc_helper_wpa_ie(priv, assoc_req);
+                if (ret) {
+lbs_pr_debug(1, "ASSOC(:%d) wpa_ie: ret = %d\n", __LINE__, ret);
+                        goto out;
+                }
+        }
+
+        if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)
+            || test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
+                ret = assoc_helper_wpa_keys(priv, assoc_req);
+                if (ret) {
+lbs_pr_debug(1, "ASSOC(:%d) wpa_keys: ret = %d\n", __LINE__, ret);
+                        goto out;
+                }
+        }
+
+        /* SSID/BSSID should be the _last_ config option set, because they
+         * trigger the association attempt.
+         */
+        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)
+            || test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
+                int success = 1;
+
+                ret = assoc_helper_associate(priv, assoc_req);
+                if (ret) {
+                        lbs_pr_debug(1, "ASSOC: association attempt unsuccessful: %d\n",
+                                ret);
+                        success = 0;
+                }
+
+                if (adapter->connect_status != libertas_connected) {
+                        lbs_pr_debug(1, "ASSOC: assoication attempt unsuccessful, "
+                                "not connected.\n");
+                        success = 0;
+                }
+
+                if (success) {
+                        lbs_pr_debug(1, "ASSOC: association attempt successful. "
+                                "Associated to '%s' (" MAC_FMT ")\n",
+                                assoc_req->ssid.ssid, MAC_ARG(assoc_req->bssid));
+                        libertas_prepare_and_send_command(priv,
+                                cmd_802_11_rssi,
+                                0, cmd_option_waitforrsp, 0, NULL);
+
+                        libertas_prepare_and_send_command(priv,
+                                cmd_802_11_get_log,
+                                0, cmd_option_waitforrsp, 0, NULL);
+                } else {
+
+                        ret = -1;
+                }
+        }
+
+out:
+        if (ret) {
+                lbs_pr_debug(1, "ASSOC: reconfiguration attempt unsuccessful: %d\n",
+                        ret);
+        }
+        kfree(assoc_req);
+        LEAVE();
+}
+
+
+/*
+ * Caller MUST hold any necessary locks
+ */
+struct assoc_request * wlan_get_association_request(wlan_adapter *adapter)
+{
+        struct assoc_request * assoc_req;
+
+        if (!adapter->assoc_req) {
+                adapter->assoc_req = kzalloc(sizeof(struct assoc_request), GFP_KERNEL);
+                if (!adapter->assoc_req) {
+                        lbs_pr_info("Not enough memory to allocate association"
+                                " request!\n");
+                        return NULL;
+                }
+        }
+
+        /* Copy current configuration attributes to the association request,
+         * but don't overwrite any that are already set.
+         */
+        assoc_req = adapter->assoc_req;
+        if (!test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
+                memcpy(&assoc_req->ssid, adapter->curbssparams.ssid.ssid,
+                        adapter->curbssparams.ssid.ssidlength);
+        }
+
+        if (!test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags))
+                assoc_req->channel = adapter->curbssparams.channel;
+
+        if (!test_bit(ASSOC_FLAG_MODE, &assoc_req->flags))
+                assoc_req->mode = adapter->inframode;
+
+        if (!test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
+                memcpy(&assoc_req->bssid, adapter->curbssparams.bssid,
+                        ETH_ALEN);
+        }
+
+        if (!test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags)) {
+                int i;
+                for (i = 0; i < 4; i++) {
+                        memcpy(&assoc_req->wep_keys[i], &adapter->wep_keys[i],
+                                sizeof(struct WLAN_802_11_KEY));
+                }
+        }
+
+        if (!test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags))
+                assoc_req->wep_tx_keyidx = adapter->wep_tx_keyidx;
+
+        if (!test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
+                memcpy(&assoc_req->wpa_mcast_key, &adapter->wpa_mcast_key,
+                        sizeof(struct WLAN_802_11_KEY));
+        }
+
+        if (!test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
+                memcpy(&assoc_req->wpa_unicast_key, &adapter->wpa_unicast_key,
+                        sizeof(struct WLAN_802_11_KEY));
+        }
+
+        if (!test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
+                memcpy(&assoc_req->secinfo, &adapter->secinfo,
+                        sizeof(struct wlan_802_11_security));
+        }
+
+        if (!test_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags)) {
+                memcpy(&assoc_req->wpa_ie, &adapter->wpa_ie,
+                        MAX_WPA_IE_LEN);
+                assoc_req->wpa_ie_len = adapter->wpa_ie_len;
+        }
+
+        return assoc_req;
+}
+
+
diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h
new file mode 100644
index 000000000000..2ffd82d99b34
--- /dev/null
+++ b/drivers/net/wireless/libertas/assoc.h
@@ -0,0 +1,30 @@
+/* Copyright (C) 2006, Red Hat, Inc. */
+
+#ifndef _WLAN_ASSOC_H_
+#define _WLAN_ASSOC_H_
+
+#include "dev.h"
+
+void wlan_association_worker(struct work_struct *work);
+
+struct assoc_request * wlan_get_association_request(wlan_adapter *adapter);
+
+#define ASSOC_DELAY (HZ / 2)
+static inline void wlan_postpone_association_work(wlan_private *priv)
+{
+        if (priv->adapter->surpriseremoved)
+                return;
+        cancel_delayed_work(&priv->assoc_work);
+        queue_delayed_work(priv->assoc_thread, &priv->assoc_work, ASSOC_DELAY);
+}
+
+static inline void wlan_cancel_association_work(wlan_private *priv)
+{
+        cancel_delayed_work(&priv->assoc_work);
+        if (priv->adapter->assoc_req) {
+                kfree(priv->adapter->assoc_req);
+                priv->adapter->assoc_req = NULL;
+        }
+}
+
+#endif /* _WLAN_ASSOC_H */
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
new file mode 100644
index 000000000000..bfdac58b5c06
--- /dev/null
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -0,0 +1,1958 @@
+/**
+  * This file contains the handling of command.
+  * It prepares command and sends it to firmware when it is ready.
+  */
+
+#include <net/iw_handler.h>
+#include "host.h"
+#include "hostcmd.h"
+#include "sbi.h"
+#include "decl.h"
+#include "defs.h"
+#include "dev.h"
+#include "join.h"
+#include "wext.h"
+
+static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode);
+
+static u16 commands_allowed_in_ps[] = {
+        cmd_802_11_rssi,
+};
+
+/**
+ *  @brief This function checks if the commans is allowed
+ *  in PS mode not.
+ *
+ *  @param command the command ID
+ *  @return        TRUE or FALSE
+ */
+static u8 is_command_allowed_in_ps(u16 command)
+{
+        int count = sizeof(commands_allowed_in_ps)
+            / sizeof(commands_allowed_in_ps[0]);
+        int i;
+
+        for (i = 0; i < count; i++) {
+                if (command == cpu_to_le16(commands_allowed_in_ps[i]))
+                        return 1;
+        }
+
+        return 0;
+}
+
+static int wlan_cmd_hw_spec(wlan_private * priv, struct cmd_ds_command *cmd)
+{
+        struct cmd_ds_get_hw_spec *hwspec = &cmd->params.hwspec;
+
+        ENTER();
+
+        cmd->command = cpu_to_le16(cmd_get_hw_spec);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_get_hw_spec) + S_DS_GEN);
+        memcpy(hwspec->permanentaddr, priv->adapter->current_addr, ETH_ALEN);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
+                                   struct cmd_ds_command *cmd,
+                                   u16 cmd_action)
+{
+        struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
+        u16 action = cmd_action;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        cmd->command = cpu_to_le16(cmd_802_11_ps_mode);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_ps_mode) +
+                             S_DS_GEN);
+        psm->action = cpu_to_le16(cmd_action);
+        psm->multipledtim = 0;
+        switch (action) {
+        case cmd_subcmd_enter_ps:
+                lbs_pr_debug(1, "PS command:" "SubCode- Enter PS\n");
+                lbs_pr_debug(1, "locallisteninterval = %d\n",
+                       adapter->locallisteninterval);
+
+                psm->locallisteninterval =
+                    cpu_to_le16(adapter->locallisteninterval);
+                psm->nullpktinterval =
+                    cpu_to_le16(adapter->nullpktinterval);
+                psm->multipledtim =
+                    cpu_to_le16(priv->adapter->multipledtim);
+                break;
+
+        case cmd_subcmd_exit_ps:
+                lbs_pr_debug(1, "PS command:" "SubCode- Exit PS\n");
+                break;
+
+        case cmd_subcmd_sleep_confirmed:
+                lbs_pr_debug(1, "PS command: SubCode- sleep confirm\n");
+                break;
+
+        default:
+                break;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_inactivity_timeout(wlan_private * priv,
+                                              struct cmd_ds_command *cmd,
+                                              u16 cmd_action, void *pdata_buf)
+{
+        u16 *timeout = pdata_buf;
+
+        cmd->command = cpu_to_le16(cmd_802_11_inactivity_timeout);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_inactivity_timeout)
+                             + S_DS_GEN);
+
+        cmd->params.inactivity_timeout.action = cpu_to_le16(cmd_action);
+
+        if (cmd_action)
+                cmd->params.inactivity_timeout.timeout =
+                    cpu_to_le16(*timeout);
+        else
+                cmd->params.inactivity_timeout.timeout = 0;
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_sleep_params(wlan_private * priv,
+                                        struct cmd_ds_command *cmd,
+                                        u16 cmd_action)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_sleep_params *sp = &cmd->params.sleep_params;
+
+        ENTER();
+
+        cmd->size =
+            cpu_to_le16((sizeof(struct cmd_ds_802_11_sleep_params)) +
+                             S_DS_GEN);
+        cmd->command = cpu_to_le16(cmd_802_11_sleep_params);
+
+        if (cmd_action == cmd_act_get) {
+                memset(&adapter->sp, 0, sizeof(struct sleep_params));
+                memset(sp, 0, sizeof(struct cmd_ds_802_11_sleep_params));
+                sp->action = cpu_to_le16(cmd_action);
+        } else if (cmd_action == cmd_act_set) {
+                sp->action = cpu_to_le16(cmd_action);
+                sp->error = cpu_to_le16(adapter->sp.sp_error);
+                sp->offset = cpu_to_le16(adapter->sp.sp_offset);
+                sp->stabletime = cpu_to_le16(adapter->sp.sp_stabletime);
+                sp->calcontrol = (u8) adapter->sp.sp_calcontrol;
+                sp->externalsleepclk = (u8) adapter->sp.sp_extsleepclk;
+                sp->reserved = cpu_to_le16(adapter->sp.sp_reserved);
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_set_wep(wlan_private * priv,
+                                   struct cmd_ds_command *cmd,
+                                   u32 cmd_act,
+                                   void * pdata_buf)
+{
+        struct cmd_ds_802_11_set_wep *wep = &cmd->params.wep;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct assoc_request * assoc_req = pdata_buf;
+
+        ENTER();
+
+        cmd->command = cpu_to_le16(cmd_802_11_set_wep);
+        cmd->size = cpu_to_le16((sizeof(struct cmd_ds_802_11_set_wep))
+                                     + S_DS_GEN);
+
+        if (cmd_act == cmd_act_add) {
+                int i;
+
+                if (!assoc_req) {
+                        lbs_pr_debug(1, "Invalid association request!");
+                        ret = -1;
+                        goto done;
+                }
+
+                wep->action = cpu_to_le16(cmd_act_add);
+
+                /* default tx key index */
+                wep->keyindex = cpu_to_le16((u16)
+                                                 (assoc_req->wep_tx_keyidx &
+                                                 (u32)cmd_WEP_KEY_INDEX_MASK));
+
+                lbs_pr_debug(1, "Tx key Index: %u\n", wep->keyindex);
+
+                /* Copy key types and material to host command structure */
+                for (i = 0; i < 4; i++) {
+                        struct WLAN_802_11_KEY * pkey = &assoc_req->wep_keys[i];
+
+                        switch (pkey->len) {
+                        case KEY_LEN_WEP_40:
+                                wep->keytype[i] = cmd_type_wep_40_bit;
+                                memmove(&wep->keymaterial[i], pkey->key,
+                                        pkey->len);
+                                break;
+                        case KEY_LEN_WEP_104:
+                                wep->keytype[i] = cmd_type_wep_104_bit;
+                                memmove(&wep->keymaterial[i], pkey->key,
+                                        pkey->len);
+                                break;
+                        case 0:
+                                break;
+                        default:
+                                lbs_pr_debug(1, "Invalid WEP key %d length of %d\n",
+                                       i, pkey->len);
+                                ret = -1;
+                                goto done;
+                                break;
+                        }
+                }
+        } else if (cmd_act == cmd_act_remove) {
+                /* ACT_REMOVE clears _all_ WEP keys */
+                wep->action = cpu_to_le16(cmd_act_remove);
+
+                /* default tx key index */
+                wep->keyindex = cpu_to_le16((u16)
+                                                 (adapter->wep_tx_keyidx &
+                                                 (u32)cmd_WEP_KEY_INDEX_MASK));
+        }
+
+        ret = 0;
+
+done:
+        LEAVE();
+        return ret;
+}
+
+static int wlan_cmd_802_11_enable_rsn(wlan_private * priv,
+                                      struct cmd_ds_command *cmd,
+                                      u16 cmd_action)
+{
+        struct cmd_ds_802_11_enable_rsn *penableRSN = &cmd->params.enbrsn;
+        wlan_adapter *adapter = priv->adapter;
+
+        cmd->command = cpu_to_le16(cmd_802_11_enable_rsn);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_enable_rsn) +
+                             S_DS_GEN);
+        penableRSN->action = cpu_to_le16(cmd_action);
+        if (adapter->secinfo.WPAenabled || adapter->secinfo.WPA2enabled) {
+                penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
+        } else {
+                penableRSN->enable = cpu_to_le16(cmd_disable_rsn);
+        }
+
+        return 0;
+}
+
+
+static void set_one_wpa_key(struct MrvlIEtype_keyParamSet * pkeyparamset,
+                            struct WLAN_802_11_KEY * pkey)
+{
+        pkeyparamset->keytypeid = cpu_to_le16(pkey->type);
+
+        if (pkey->flags & KEY_INFO_WPA_ENABLED) {
+                pkeyparamset->keyinfo = cpu_to_le16(KEY_INFO_WPA_ENABLED);
+        } else {
+                pkeyparamset->keyinfo = cpu_to_le16(!KEY_INFO_WPA_ENABLED);
+        }
+
+        if (pkey->flags & KEY_INFO_WPA_UNICAST) {
+                pkeyparamset->keyinfo |= cpu_to_le16(KEY_INFO_WPA_UNICAST);
+        } else if (pkey->flags & KEY_INFO_WPA_MCAST) {
+                pkeyparamset->keyinfo |= cpu_to_le16(KEY_INFO_WPA_MCAST);
+        }
+
+        pkeyparamset->type = cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
+        pkeyparamset->keylen = cpu_to_le16(pkey->len);
+        memcpy(pkeyparamset->key, pkey->key, pkey->len);
+        pkeyparamset->length = cpu_to_le16(  sizeof(pkeyparamset->keytypeid)
+                                                + sizeof(pkeyparamset->keyinfo)
+                                                + sizeof(pkeyparamset->keylen)
+                                                + sizeof(pkeyparamset->key));
+}
+
+static int wlan_cmd_802_11_key_material(wlan_private * priv,
+                                        struct cmd_ds_command *cmd,
+                                        u16 cmd_action,
+                                        u32 cmd_oid, void *pdata_buf)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_key_material *pkeymaterial =
+            &cmd->params.keymaterial;
+        int ret = 0;
+        int index = 0;
+
+        ENTER();
+
+        cmd->command = cpu_to_le16(cmd_802_11_key_material);
+        pkeymaterial->action = cpu_to_le16(cmd_action);
+
+        if (cmd_action == cmd_act_get) {
+                cmd->size = cpu_to_le16(  S_DS_GEN
+                                             + sizeof (pkeymaterial->action));
+                ret = 0;
+                goto done;
+        }
+
+        memset(&pkeymaterial->keyParamSet, 0, sizeof(pkeymaterial->keyParamSet));
+
+        if (adapter->wpa_unicast_key.len) {
+                set_one_wpa_key(&pkeymaterial->keyParamSet[index],
+                                &adapter->wpa_unicast_key);
+                index++;
+        }
+
+        if (adapter->wpa_mcast_key.len) {
+                set_one_wpa_key(&pkeymaterial->keyParamSet[index],
+                                &adapter->wpa_mcast_key);
+                index++;
+        }
+
+        cmd->size = cpu_to_le16(  S_DS_GEN
+                                     + sizeof (pkeymaterial->action)
+                                     + index * sizeof(struct MrvlIEtype_keyParamSet));
+
+        ret = 0;
+
+done:
+        LEAVE();
+        return ret;
+}
+
+static int wlan_cmd_802_11_reset(wlan_private * priv,
+                                 struct cmd_ds_command *cmd, int cmd_action)
+{
+        struct cmd_ds_802_11_reset *reset = &cmd->params.reset;
+
+        cmd->command = cpu_to_le16(cmd_802_11_reset);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_reset) + S_DS_GEN);
+        reset->action = cpu_to_le16(cmd_action);
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_get_log(wlan_private * priv,
+                                   struct cmd_ds_command *cmd)
+{
+        cmd->command = cpu_to_le16(cmd_802_11_get_log);
+        cmd->size =
+                cpu_to_le16(sizeof(struct cmd_ds_802_11_get_log) + S_DS_GEN);
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_get_stat(wlan_private * priv,
+                                    struct cmd_ds_command *cmd)
+{
+        cmd->command = cpu_to_le16(cmd_802_11_get_stat);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_get_stat) +
+                             S_DS_GEN);
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
+                                    struct cmd_ds_command *cmd,
+                                    int cmd_action,
+                                    int cmd_oid, void *pdata_buf)
+{
+        struct cmd_ds_802_11_snmp_mib *pSNMPMIB = &cmd->params.smib;
+        wlan_adapter *adapter = priv->adapter;
+        u8 ucTemp;
+
+        ENTER();
+
+        lbs_pr_debug(1, "SNMP_CMD: cmd_oid = 0x%x\n", cmd_oid);
+
+        cmd->command = cpu_to_le16(cmd_802_11_snmp_mib);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_snmp_mib) +
+                             S_DS_GEN);
+
+        switch (cmd_oid) {
+        case OID_802_11_INFRASTRUCTURE_MODE:
+        {
+                enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode =
+                        (enum WLAN_802_11_NETWORK_INFRASTRUCTURE) pdata_buf;
+                pSNMPMIB->querytype = cpu_to_le16(cmd_act_set);
+                pSNMPMIB->oid = cpu_to_le16((u16) desired_bsstype_i);
+                pSNMPMIB->bufsize = sizeof(u8);
+                if (mode == wlan802_11infrastructure)
+                        ucTemp = SNMP_MIB_VALUE_INFRA;
+                else
+                        ucTemp = SNMP_MIB_VALUE_ADHOC;
+
+                memmove(pSNMPMIB->value, &ucTemp, sizeof(u8));
+
+                break;
+        }
+
+        case OID_802_11D_ENABLE:
+                {
+                        u32 ulTemp;
+
+                        pSNMPMIB->oid = cpu_to_le16((u16) dot11d_i);
+
+                        if (cmd_action == cmd_act_set) {
+                                pSNMPMIB->querytype = cmd_act_set;
+                                pSNMPMIB->bufsize = sizeof(u16);
+                                ulTemp = *(u32 *)pdata_buf;
+                                *((unsigned short *)(pSNMPMIB->value)) =
+                                    cpu_to_le16((u16) ulTemp);
+                        }
+                        break;
+                }
+
+        case OID_802_11_FRAGMENTATION_THRESHOLD:
+                {
+                        u32 ulTemp;
+
+                        pSNMPMIB->oid = cpu_to_le16((u16) fragthresh_i);
+
+                        if (cmd_action == cmd_act_get) {
+                                pSNMPMIB->querytype =
+                                    cpu_to_le16(cmd_act_get);
+                        } else if (cmd_action == cmd_act_set) {
+                                pSNMPMIB->querytype =
+                                    cpu_to_le16(cmd_act_set);
+                                pSNMPMIB->bufsize =
+                                    cpu_to_le16(sizeof(u16));
+                                ulTemp = *((u32 *) pdata_buf);
+                                *((unsigned short *)(pSNMPMIB->value)) =
+                                    cpu_to_le16((u16) ulTemp);
+
+                        }
+
+                        break;
+                }
+
+        case OID_802_11_RTS_THRESHOLD:
+                {
+
+                        u32 ulTemp;
+                        pSNMPMIB->oid = le16_to_cpu((u16) rtsthresh_i);
+
+                        if (cmd_action == cmd_act_get) {
+                                pSNMPMIB->querytype =
+                                    cpu_to_le16(cmd_act_get);
+                        } else if (cmd_action == cmd_act_set) {
+                                pSNMPMIB->querytype =
+                                    cpu_to_le16(cmd_act_set);
+                                pSNMPMIB->bufsize =
+                                    cpu_to_le16(sizeof(u16));
+                                ulTemp = *((u32 *)
+                                           pdata_buf);
+                                *(unsigned short *)(pSNMPMIB->value) =
+                                    cpu_to_le16((u16) ulTemp);
+
+                        }
+                        break;
+                }
+        case OID_802_11_TX_RETRYCOUNT:
+                pSNMPMIB->oid = cpu_to_le16((u16) short_retrylim_i);
+
+                if (cmd_action == cmd_act_get) {
+                        pSNMPMIB->querytype =
+                            cpu_to_le16(cmd_act_get);
+                } else if (cmd_action == cmd_act_set) {
+                        pSNMPMIB->querytype =
+                            cpu_to_le16(cmd_act_set);
+                        pSNMPMIB->bufsize = cpu_to_le16(sizeof(u16));
+                        *((unsigned short *)(pSNMPMIB->value)) =
+                            cpu_to_le16((u16) adapter->txretrycount);
+                }
+
+                break;
+        default:
+                break;
+        }
+
+        lbs_pr_debug(1,
+               "SNMP_CMD: command=0x%x, size=0x%x, seqnum=0x%x, result=0x%x\n",
+               cmd->command, cmd->size, cmd->seqnum, cmd->result);
+
+        lbs_pr_debug(1,
+               "SNMP_CMD: action=0x%x, oid=0x%x, oidsize=0x%x, value=0x%x\n",
+               pSNMPMIB->querytype, pSNMPMIB->oid, pSNMPMIB->bufsize,
+               *(u16 *) pSNMPMIB->value);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_radio_control(wlan_private * priv,
+                                         struct cmd_ds_command *cmd,
+                                         int cmd_action)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_radio_control *pradiocontrol =
+            &cmd->params.radio;
+
+        ENTER();
+
+        cmd->size =
+            cpu_to_le16((sizeof(struct cmd_ds_802_11_radio_control)) +
+                             S_DS_GEN);
+        cmd->command = cpu_to_le16(cmd_802_11_radio_control);
+
+        pradiocontrol->action = cpu_to_le16(cmd_action);
+
+        switch (adapter->preamble) {
+        case cmd_type_short_preamble:
+                pradiocontrol->control = cpu_to_le16(SET_SHORT_PREAMBLE);
+                break;
+
+        case cmd_type_long_preamble:
+                pradiocontrol->control = cpu_to_le16(SET_LONG_PREAMBLE);
+                break;
+
+        case cmd_type_auto_preamble:
+        default:
+                pradiocontrol->control = cpu_to_le16(SET_AUTO_PREAMBLE);
+                break;
+        }
+
+        if (adapter->radioon)
+                pradiocontrol->control |= cpu_to_le16(TURN_ON_RF);
+        else
+                pradiocontrol->control &= cpu_to_le16(~TURN_ON_RF);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_rf_tx_power(wlan_private * priv,
+                                       struct cmd_ds_command *cmd,
+                                       u16 cmd_action, void *pdata_buf)
+{
+
+        struct cmd_ds_802_11_rf_tx_power *prtp = &cmd->params.txp;
+
+        ENTER();
+
+        cmd->size =
+            cpu_to_le16((sizeof(struct cmd_ds_802_11_rf_tx_power)) +
+                             S_DS_GEN);
+        cmd->command = cpu_to_le16(cmd_802_11_rf_tx_power);
+        prtp->action = cmd_action;
+
+        lbs_pr_debug(1, "RF_TX_POWER_CMD: size:%d cmd:0x%x Act:%d\n", cmd->size,
+               cmd->command, prtp->action);
+
+        switch (cmd_action) {
+        case cmd_act_tx_power_opt_get:
+                prtp->action = cpu_to_le16(cmd_act_get);
+                prtp->currentlevel = 0;
+                break;
+
+        case cmd_act_tx_power_opt_set_high:
+                prtp->action = cpu_to_le16(cmd_act_set);
+                prtp->currentlevel =
+                    cpu_to_le16(cmd_act_tx_power_index_high);
+                break;
+
+        case cmd_act_tx_power_opt_set_mid:
+                prtp->action = cpu_to_le16(cmd_act_set);
+                prtp->currentlevel =
+                    cpu_to_le16(cmd_act_tx_power_index_mid);
+                break;
+
+        case cmd_act_tx_power_opt_set_low:
+                prtp->action = cpu_to_le16(cmd_act_set);
+                prtp->currentlevel = cpu_to_le16(*((u16 *) pdata_buf));
+                break;
+        }
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_rf_antenna(wlan_private * priv,
+                                      struct cmd_ds_command *cmd,
+                                      u16 cmd_action, void *pdata_buf)
+{
+        struct cmd_ds_802_11_rf_antenna *rant = &cmd->params.rant;
+
+        cmd->command = cpu_to_le16(cmd_802_11_rf_antenna);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_rf_antenna) +
+                             S_DS_GEN);
+
+        rant->action = cpu_to_le16(cmd_action);
+        if ((cmd_action == cmd_act_set_rx) ||
+            (cmd_action == cmd_act_set_tx)) {
+                rant->antennamode =
+                    cpu_to_le16((u16) (*(u32 *) pdata_buf));
+        }
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_rate_adapt_rateset(wlan_private * priv,
+                                              struct cmd_ds_command *cmd,
+                                              u16 cmd_action)
+{
+        struct cmd_ds_802_11_rate_adapt_rateset
+        *rateadapt = &cmd->params.rateset;
+        wlan_adapter *adapter = priv->adapter;
+
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_rate_adapt_rateset)
+                             + S_DS_GEN);
+        cmd->command = cpu_to_le16(cmd_802_11_rate_adapt_rateset);
+
+        ENTER();
+
+        rateadapt->action = cmd_action;
+        rateadapt->enablehwauto = adapter->enablehwauto;
+        rateadapt->bitmap = adapter->ratebitmap;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_data_rate(wlan_private * priv,
+                                     struct cmd_ds_command *cmd,
+                                     u16 cmd_action)
+{
+        struct cmd_ds_802_11_data_rate *pdatarate = &cmd->params.drate;
+        wlan_adapter *adapter = priv->adapter;
+        u16 action = cmd_action;
+
+        ENTER();
+
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_data_rate) +
+                             S_DS_GEN);
+
+        cmd->command = cpu_to_le16(cmd_802_11_data_rate);
+
+        memset(pdatarate, 0, sizeof(struct cmd_ds_802_11_data_rate));
+
+        pdatarate->action = cpu_to_le16(cmd_action);
+
+        if (action == cmd_act_set_tx_fix_rate) {
+                pdatarate->datarate[0] = libertas_data_rate_to_index(adapter->datarate);
+                lbs_pr_debug(1, "Setting FW for fixed rate 0x%02X\n",
+                       adapter->datarate);
+        } else if (action == cmd_act_set_tx_auto) {
+                lbs_pr_debug(1, "Setting FW for AUTO rate\n");
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_mac_multicast_adr(wlan_private * priv,
+                                      struct cmd_ds_command *cmd,
+                                      u16 cmd_action)
+{
+        struct cmd_ds_mac_multicast_adr *pMCastAdr = &cmd->params.madr;
+        wlan_adapter *adapter = priv->adapter;
+
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_mac_multicast_adr) +
+                             S_DS_GEN);
+        cmd->command = cpu_to_le16(cmd_mac_multicast_adr);
+
+        pMCastAdr->action = cpu_to_le16(cmd_action);
+        pMCastAdr->nr_of_adrs =
+            cpu_to_le16((u16) adapter->nr_of_multicastmacaddr);
+        memcpy(pMCastAdr->maclist, adapter->multicastlist,
+               adapter->nr_of_multicastmacaddr * ETH_ALEN);
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_rf_channel(wlan_private * priv,
+                                      struct cmd_ds_command *cmd,
+                                      int option, void *pdata_buf)
+{
+        struct cmd_ds_802_11_rf_channel *rfchan = &cmd->params.rfchannel;
+
+        cmd->command = cpu_to_le16(cmd_802_11_rf_channel);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_rf_channel)
+                                     + S_DS_GEN);
+
+        if (option == cmd_opt_802_11_rf_channel_set) {
+                rfchan->currentchannel = cpu_to_le16(*((u16 *) pdata_buf));
+        }
+
+        rfchan->action = cpu_to_le16(option);
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_rssi(wlan_private * priv,
+                                struct cmd_ds_command *cmd)
+{
+        wlan_adapter *adapter = priv->adapter;
+
+        cmd->command = cpu_to_le16(cmd_802_11_rssi);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_rssi) + S_DS_GEN);
+        cmd->params.rssi.N = priv->adapter->bcn_avg_factor;
+
+        /* reset Beacon SNR/NF/RSSI values */
+        adapter->SNR[TYPE_BEACON][TYPE_NOAVG] = 0;
+        adapter->SNR[TYPE_BEACON][TYPE_AVG] = 0;
+        adapter->NF[TYPE_BEACON][TYPE_NOAVG] = 0;
+        adapter->NF[TYPE_BEACON][TYPE_AVG] = 0;
+        adapter->RSSI[TYPE_BEACON][TYPE_NOAVG] = 0;
+        adapter->RSSI[TYPE_BEACON][TYPE_AVG] = 0;
+
+        return 0;
+}
+
+static int wlan_cmd_reg_access(wlan_private * priv,
+                               struct cmd_ds_command *cmdptr,
+                               u8 cmd_action, void *pdata_buf)
+{
+        struct wlan_offset_value *offval;
+
+        ENTER();
+
+        offval = (struct wlan_offset_value *)pdata_buf;
+
+        switch (cmdptr->command) {
+        case cmd_mac_reg_access:
+                {
+                        struct cmd_ds_mac_reg_access *macreg;
+
+                        cmdptr->size =
+                            cpu_to_le16(sizeof
+                                             (struct cmd_ds_mac_reg_access)
+                                             + S_DS_GEN);
+                        macreg =
+                            (struct cmd_ds_mac_reg_access *)&cmdptr->params.
+                            macreg;
+
+                        macreg->action = cpu_to_le16(cmd_action);
+                        macreg->offset = cpu_to_le16((u16) offval->offset);
+                        macreg->value = cpu_to_le32(offval->value);
+
+                        break;
+                }
+
+        case cmd_bbp_reg_access:
+                {
+                        struct cmd_ds_bbp_reg_access *bbpreg;
+
+                        cmdptr->size =
+                            cpu_to_le16(sizeof
+                                             (struct cmd_ds_bbp_reg_access)
+                                             + S_DS_GEN);
+                        bbpreg =
+                            (struct cmd_ds_bbp_reg_access *)&cmdptr->params.
+                            bbpreg;
+
+                        bbpreg->action = cpu_to_le16(cmd_action);
+                        bbpreg->offset = cpu_to_le16((u16) offval->offset);
+                        bbpreg->value = (u8) offval->value;
+
+                        break;
+                }
+
+        case cmd_rf_reg_access:
+                {
+                        struct cmd_ds_rf_reg_access *rfreg;
+
+                        cmdptr->size =
+                            cpu_to_le16(sizeof
+                                             (struct cmd_ds_rf_reg_access) +
+                                             S_DS_GEN);
+                        rfreg =
+                            (struct cmd_ds_rf_reg_access *)&cmdptr->params.
+                            rfreg;
+
+                        rfreg->action = cpu_to_le16(cmd_action);
+                        rfreg->offset = cpu_to_le16((u16) offval->offset);
+                        rfreg->value = (u8) offval->value;
+
+                        break;
+                }
+
+        default:
+                break;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_cmd_802_11_mac_address(wlan_private * priv,
+                                       struct cmd_ds_command *cmd,
+                                       u16 cmd_action)
+{
+        wlan_adapter *adapter = priv->adapter;
+
+        cmd->command = cpu_to_le16(cmd_802_11_mac_address);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_mac_address) +
+                             S_DS_GEN);
+        cmd->result = 0;
+
+        cmd->params.macadd.action = cpu_to_le16(cmd_action);
+
+        if (cmd_action == cmd_act_set) {
+                memcpy(cmd->params.macadd.macadd,
+                       adapter->current_addr, ETH_ALEN);
+                lbs_dbg_hex("SET_CMD: MAC ADDRESS-", adapter->current_addr, 6);
+        }
+
+        return 0;
+}
+
+static int wlan_cmd_802_11_eeprom_access(wlan_private * priv,
+                                         struct cmd_ds_command *cmd,
+                                         int cmd_action, void *pdata_buf)
+{
+        struct wlan_ioctl_regrdwr *ea = pdata_buf;
+
+        ENTER();
+
+        cmd->command = cpu_to_le16(cmd_802_11_eeprom_access);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) +
+                             S_DS_GEN);
+        cmd->result = 0;
+
+        cmd->params.rdeeprom.action = cpu_to_le16(ea->action);
+        cmd->params.rdeeprom.offset = cpu_to_le16(ea->offset);
+        cmd->params.rdeeprom.bytecount = cpu_to_le16(ea->NOB);
+        cmd->params.rdeeprom.value = 0;
+
+        return 0;
+}
+
+static int wlan_cmd_bt_access(wlan_private * priv,
+                               struct cmd_ds_command *cmd,
+                               u16 cmd_action, void *pdata_buf)
+{
+        struct cmd_ds_bt_access *bt_access = &cmd->params.bt;
+        lbs_pr_debug(1, "BT CMD(%d)\n", cmd_action);
+
+        cmd->command = cpu_to_le16(cmd_bt_access);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_bt_access)
+                                     + S_DS_GEN);
+        cmd->result = 0;
+        bt_access->action = cpu_to_le16(cmd_action);
+
+        switch (cmd_action) {
+        case cmd_act_bt_access_add:
+                memcpy(bt_access->addr1, pdata_buf, 2 * ETH_ALEN);
+                lbs_dbg_hex("BT_ADD: blinded mac address-", bt_access->addr1, 6);
+                break;
+        case cmd_act_bt_access_del:
+                memcpy(bt_access->addr1, pdata_buf, 1 * ETH_ALEN);
+                lbs_dbg_hex("BT_DEL: blinded mac address-", bt_access->addr1, 6);
+                break;
+        case cmd_act_bt_access_list:
+                bt_access->id = cpu_to_le32(*(u32 *) pdata_buf);
+                break;
+        case cmd_act_bt_access_reset:
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
+
+static int wlan_cmd_fwt_access(wlan_private * priv,
+                               struct cmd_ds_command *cmd,
+                               u16 cmd_action, void *pdata_buf)
+{
+        struct cmd_ds_fwt_access *fwt_access = &cmd->params.fwt;
+        lbs_pr_debug(1, "FWT CMD(%d)\n", cmd_action);
+
+        cmd->command = cpu_to_le16(cmd_fwt_access);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_fwt_access)
+                                     + S_DS_GEN);
+        cmd->result = 0;
+
+        if (pdata_buf)
+                memcpy(fwt_access, pdata_buf, sizeof(*fwt_access));
+        else
+                memset(fwt_access, 0, sizeof(*fwt_access));
+
+        fwt_access->action = cpu_to_le16(cmd_action);
+
+        return 0;
+}
+
+static int wlan_cmd_mesh_access(wlan_private * priv,
+                                struct cmd_ds_command *cmd,
+                                u16 cmd_action, void *pdata_buf)
+{
+        struct cmd_ds_mesh_access *mesh_access = &cmd->params.mesh;
+        lbs_pr_debug(1, "FWT CMD(%d)\n", cmd_action);
+
+        cmd->command = cpu_to_le16(cmd_mesh_access);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mesh_access)
+                                     + S_DS_GEN);
+        cmd->result = 0;
+
+        if (pdata_buf)
+                memcpy(mesh_access, pdata_buf, sizeof(*mesh_access));
+        else
+                memset(mesh_access, 0, sizeof(*mesh_access));
+
+        mesh_access->action = cpu_to_le16(cmd_action);
+
+        return 0;
+}
+
+void libertas_queue_cmd(wlan_adapter * adapter, struct cmd_ctrl_node *cmdnode, u8 addtail)
+{
+        unsigned long flags;
+        struct cmd_ds_command *cmdptr;
+
+        ENTER();
+
+        if (!cmdnode) {
+                lbs_pr_debug(1, "QUEUE_CMD: cmdnode is NULL\n");
+                goto done;
+        }
+
+        cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr;
+        if (!cmdptr) {
+                lbs_pr_debug(1, "QUEUE_CMD: cmdptr is NULL\n");
+                goto done;
+        }
+
+        /* Exit_PS command needs to be queued in the header always. */
+        if (cmdptr->command == cmd_802_11_ps_mode) {
+                struct cmd_ds_802_11_ps_mode *psm = &cmdptr->params.psmode;
+                if (psm->action == cmd_subcmd_exit_ps) {
+                        if (adapter->psstate != PS_STATE_FULL_POWER)
+                                addtail = 0;
+                }
+        }
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+
+        if (addtail)
+                list_add_tail((struct list_head *)cmdnode,
+                              &adapter->cmdpendingq);
+        else
+                list_add((struct list_head *)cmdnode, &adapter->cmdpendingq);
+
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+        lbs_pr_debug(1, "QUEUE_CMD: Inserted node=0x%x, cmd=0x%x in cmdpendingq\n",
+               (u32) cmdnode,
+               ((struct cmd_ds_gen*)cmdnode->bufvirtualaddr)->command);
+
+done:
+        LEAVE();
+        return;
+}
+
+/*
+ * TODO: Fix the issue when DownloadcommandToStation is being called the
+ * second time when the command timesout. All the cmdptr->xxx are in little
+ * endian and therefore all the comparissions will fail.
+ * For now - we are not performing the endian conversion the second time - but
+ * for PS and DEEP_SLEEP we need to worry
+ */
+static int DownloadcommandToStation(wlan_private * priv,
+                                    struct cmd_ctrl_node *cmdnode)
+{
+        unsigned long flags;
+        struct cmd_ds_command *cmdptr;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        u16 cmdsize;
+        u16 command;
+
+        ENTER();
+
+        if (!adapter || !cmdnode) {
+                lbs_pr_debug(1, "DNLD_CMD: adapter = %#x, cmdnode = %#x\n",
+                       (int)adapter, (int)cmdnode);
+                if (cmdnode) {
+                        spin_lock_irqsave(&adapter->driver_lock, flags);
+                        __libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                }
+                ret = -1;
+                goto done;
+        }
+
+        cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr;
+
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+        if (!cmdptr || !cmdptr->size) {
+                lbs_pr_debug(1, "DNLD_CMD: cmdptr is Null or cmd size is Zero, "
+                       "Not sending\n");
+                __libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                ret = -1;
+                goto done;
+        }
+
+        adapter->cur_cmd = cmdnode;
+        adapter->cur_cmd_retcode = 0;
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+        lbs_pr_debug(1, "DNLD_CMD:: Before download, size of cmd = %d\n",
+               cmdptr->size);
+
+        cmdsize = cmdptr->size;
+
+        command = cpu_to_le16(cmdptr->command);
+
+        cmdnode->cmdwaitqwoken = 0;
+        cmdsize = cpu_to_le16(cmdsize);
+
+        ret = libertas_sbi_host_to_card(priv, MVMS_CMD, (u8 *) cmdptr, cmdsize);
+
+        if (ret != 0) {
+                lbs_pr_debug(1, "DNLD_CMD: Host to Card failed\n");
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                __libertas_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
+                adapter->cur_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                ret = -1;
+                goto done;
+        }
+
+        lbs_pr_debug(1, "DNLD_CMD: Sent command 0x%x @ %lu\n", command, jiffies);
+        lbs_dbg_hex("DNLD_CMD: command", cmdnode->bufvirtualaddr, cmdsize);
+
+        /* Setup the timer after transmit command */
+        if (command == cmd_802_11_scan
+            || command == cmd_802_11_authenticate
+            || command == cmd_802_11_associate)
+                mod_timer(&adapter->command_timer, jiffies + (10*HZ));
+        else
+                mod_timer(&adapter->command_timer, jiffies + (5*HZ));
+
+        ret = 0;
+
+      done:
+        LEAVE();
+        return ret;
+}
+
+static int wlan_cmd_mac_control(wlan_private * priv,
+                                struct cmd_ds_command *cmd)
+{
+        struct cmd_ds_mac_control *mac = &cmd->params.macctrl;
+
+        ENTER();
+
+        cmd->command = cpu_to_le16(cmd_mac_control);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_mac_control) + S_DS_GEN);
+        mac->action = cpu_to_le16(priv->adapter->currentpacketfilter);
+
+        lbs_pr_debug(1, "wlan_cmd_mac_control(): action=0x%X size=%d\n",
+               mac->action, cmd->size);
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  This function inserts command node to cmdfreeq
+ *  after cleans it. Requires adapter->driver_lock held.
+ */
+void __libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node *ptempcmd)
+{
+        wlan_adapter *adapter = priv->adapter;
+
+        if (!ptempcmd)
+                goto done;
+
+        cleanup_cmdnode(ptempcmd);
+        list_add_tail((struct list_head *)ptempcmd, &adapter->cmdfreeq);
+done:
+        return;
+}
+
+void libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node *ptempcmd)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->adapter->driver_lock, flags);
+        __libertas_cleanup_and_insert_cmd(priv, ptempcmd);
+        spin_unlock_irqrestore(&priv->adapter->driver_lock, flags);
+}
+
+int libertas_set_radio_control(wlan_private * priv)
+{
+        int ret = 0;
+
+        ENTER();
+
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_radio_control,
+                                    cmd_act_set,
+                                    cmd_option_waitforrsp, 0, NULL);
+
+        lbs_pr_debug(1, "RADIO_SET: on or off: 0x%X, preamble = 0x%X\n",
+               priv->adapter->radioon, priv->adapter->preamble);
+
+        LEAVE();
+        return ret;
+}
+
+int libertas_set_mac_packet_filter(wlan_private * priv)
+{
+        int ret = 0;
+
+        ENTER();
+
+        lbs_pr_debug(1, "libertas_set_mac_packet_filter value = %x\n",
+               priv->adapter->currentpacketfilter);
+
+        /* Send MAC control command to station */
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_mac_control, 0, 0, 0, NULL);
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief This function prepare the command before send to firmware.
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param cmd_no       command number
+ *  @param cmd_action   command action: GET or SET
+ *  @param wait_option  wait option: wait response or not
+ *  @param cmd_oid      cmd oid: treated as sub command
+ *  @param pdata_buf    A pointer to informaion buffer
+ *  @return             0 or -1
+ */
+int libertas_prepare_and_send_command(wlan_private * priv,
+                          u16 cmd_no,
+                          u16 cmd_action,
+                          u16 wait_option, u32 cmd_oid, void *pdata_buf)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *cmdnode;
+        struct cmd_ds_command *cmdptr;
+        unsigned long flags;
+
+        ENTER();
+
+        if (!adapter) {
+                lbs_pr_debug(1, "PREP_CMD: adapter is Null\n");
+                ret = -1;
+                goto done;
+        }
+
+        if (adapter->surpriseremoved) {
+                lbs_pr_debug(1, "PREP_CMD: Card is Removed\n");
+                ret = -1;
+                goto done;
+        }
+
+        cmdnode = libertas_get_free_cmd_ctrl_node(priv);
+
+        if (cmdnode == NULL) {
+                lbs_pr_debug(1, "PREP_CMD: No free cmdnode\n");
+
+                /* Wake up main thread to execute next command */
+                wake_up_interruptible(&priv->mainthread.waitq);
+                ret = -1;
+                goto done;
+        }
+
+        libertas_set_cmd_ctrl_node(priv, cmdnode, cmd_oid, wait_option, pdata_buf);
+
+        cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr;
+
+        lbs_pr_debug(1, "PREP_CMD: Val of cmd ptr =0x%x, command=0x%X\n",
+               (u32) cmdptr, cmd_no);
+
+        if (!cmdptr) {
+                lbs_pr_debug(1, "PREP_CMD: bufvirtualaddr of cmdnode is NULL\n");
+                libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                ret = -1;
+                goto done;
+        }
+
+        /* Set sequence number, command and INT option */
+        adapter->seqnum++;
+        cmdptr->seqnum = cpu_to_le16(adapter->seqnum);
+
+        cmdptr->command = cmd_no;
+        cmdptr->result = 0;
+
+        switch (cmd_no) {
+        case cmd_get_hw_spec:
+                ret = wlan_cmd_hw_spec(priv, cmdptr);
+                break;
+        case cmd_802_11_ps_mode:
+                ret = wlan_cmd_802_11_ps_mode(priv, cmdptr, cmd_action);
+                break;
+
+        case cmd_802_11_scan:
+                ret = libertas_cmd_80211_scan(priv, cmdptr, pdata_buf);
+                break;
+
+        case cmd_mac_control:
+                ret = wlan_cmd_mac_control(priv, cmdptr);
+                break;
+
+        case cmd_802_11_associate:
+        case cmd_802_11_reassociate:
+                ret = libertas_cmd_80211_associate(priv, cmdptr, pdata_buf);
+                break;
+
+        case cmd_802_11_deauthenticate:
+                ret = libertas_cmd_80211_deauthenticate(priv, cmdptr);
+                break;
+
+        case cmd_802_11_set_wep:
+                ret = wlan_cmd_802_11_set_wep(priv, cmdptr, cmd_action, pdata_buf);
+                break;
+
+        case cmd_802_11_ad_hoc_start:
+                ret = libertas_cmd_80211_ad_hoc_start(priv, cmdptr, pdata_buf);
+                break;
+        case cmd_code_dnld:
+                break;
+
+        case cmd_802_11_reset:
+                ret = wlan_cmd_802_11_reset(priv, cmdptr, cmd_action);
+                break;
+
+        case cmd_802_11_get_log:
+                ret = wlan_cmd_802_11_get_log(priv, cmdptr);
+                break;
+
+        case cmd_802_11_authenticate:
+                ret = libertas_cmd_80211_authenticate(priv, cmdptr, pdata_buf);
+                break;
+
+        case cmd_802_11_get_stat:
+                ret = wlan_cmd_802_11_get_stat(priv, cmdptr);
+                break;
+
+        case cmd_802_11_snmp_mib:
+                ret = wlan_cmd_802_11_snmp_mib(priv, cmdptr,
+                                               cmd_action, cmd_oid, pdata_buf);
+                break;
+
+        case cmd_mac_reg_access:
+        case cmd_bbp_reg_access:
+        case cmd_rf_reg_access:
+                ret = wlan_cmd_reg_access(priv, cmdptr, cmd_action, pdata_buf);
+                break;
+
+        case cmd_802_11_rf_channel:
+                ret = wlan_cmd_802_11_rf_channel(priv, cmdptr,
+                                                 cmd_action, pdata_buf);
+                break;
+
+        case cmd_802_11_rf_tx_power:
+                ret = wlan_cmd_802_11_rf_tx_power(priv, cmdptr,
+                                                  cmd_action, pdata_buf);
+                break;
+
+        case cmd_802_11_radio_control:
+                ret = wlan_cmd_802_11_radio_control(priv, cmdptr, cmd_action);
+                break;
+
+        case cmd_802_11_rf_antenna:
+                ret = wlan_cmd_802_11_rf_antenna(priv, cmdptr,
+                                                 cmd_action, pdata_buf);
+                break;
+
+        case cmd_802_11_data_rate:
+                ret = wlan_cmd_802_11_data_rate(priv, cmdptr, cmd_action);
+                break;
+        case cmd_802_11_rate_adapt_rateset:
+                ret = wlan_cmd_802_11_rate_adapt_rateset(priv,
+                                                         cmdptr, cmd_action);
+                break;
+
+        case cmd_mac_multicast_adr:
+                ret = wlan_cmd_mac_multicast_adr(priv, cmdptr, cmd_action);
+                break;
+
+        case cmd_802_11_ad_hoc_join:
+                ret = libertas_cmd_80211_ad_hoc_join(priv, cmdptr, pdata_buf);
+                break;
+
+        case cmd_802_11_rssi:
+                ret = wlan_cmd_802_11_rssi(priv, cmdptr);
+                break;
+
+        case cmd_802_11_ad_hoc_stop:
+                ret = libertas_cmd_80211_ad_hoc_stop(priv, cmdptr);
+                break;
+
+        case cmd_802_11_enable_rsn:
+                ret = wlan_cmd_802_11_enable_rsn(priv, cmdptr, cmd_action);
+                break;
+
+        case cmd_802_11_key_material:
+                ret = wlan_cmd_802_11_key_material(priv, cmdptr,
+                                                   cmd_action, cmd_oid,
+                                                   pdata_buf);
+                break;
+
+        case cmd_802_11_pairwise_tsc:
+                break;
+        case cmd_802_11_group_tsc:
+                break;
+
+        case cmd_802_11_mac_address:
+                ret = wlan_cmd_802_11_mac_address(priv, cmdptr, cmd_action);
+                break;
+
+        case cmd_802_11_eeprom_access:
+                ret = wlan_cmd_802_11_eeprom_access(priv, cmdptr,
+                                                    cmd_action, pdata_buf);
+                break;
+
+        case cmd_802_11_set_afc:
+        case cmd_802_11_get_afc:
+
+                cmdptr->command = cpu_to_le16(cmd_no);
+                cmdptr->size =
+                    cpu_to_le16(sizeof(struct cmd_ds_802_11_afc) +
+                                     S_DS_GEN);
+
+                memmove(&cmdptr->params.afc,
+                        pdata_buf, sizeof(struct cmd_ds_802_11_afc));
+
+                ret = 0;
+                goto done;
+
+        case cmd_802_11d_domain_info:
+                ret = libertas_cmd_802_11d_domain_info(priv, cmdptr,
+                                                   cmd_no, cmd_action);
+                break;
+
+        case cmd_802_11_sleep_params:
+                ret = wlan_cmd_802_11_sleep_params(priv, cmdptr, cmd_action);
+                break;
+        case cmd_802_11_inactivity_timeout:
+                ret = wlan_cmd_802_11_inactivity_timeout(priv, cmdptr,
+                                                         cmd_action, pdata_buf);
+                libertas_set_cmd_ctrl_node(priv, cmdnode, 0, 0, pdata_buf);
+                break;
+
+        case cmd_802_11_tpc_cfg:
+                cmdptr->command = cpu_to_le16(cmd_802_11_tpc_cfg);
+                cmdptr->size =
+                    cpu_to_le16(sizeof(struct cmd_ds_802_11_tpc_cfg) +
+                                     S_DS_GEN);
+
+                memmove(&cmdptr->params.tpccfg,
+                        pdata_buf, sizeof(struct cmd_ds_802_11_tpc_cfg));
+
+                ret = 0;
+                break;
+        case cmd_802_11_led_gpio_ctrl:
+                {
+                        struct mrvlietypes_ledgpio *gpio =
+                            (struct mrvlietypes_ledgpio*)
+                            cmdptr->params.ledgpio.data;
+
+                        memmove(&cmdptr->params.ledgpio,
+                                pdata_buf,
+                                sizeof(struct cmd_ds_802_11_led_ctrl));
+
+                        cmdptr->command =
+                            cpu_to_le16(cmd_802_11_led_gpio_ctrl);
+
+#define ACTION_NUMLED_TLVTYPE_LEN_FIELDS_LEN 8
+                        cmdptr->size =
+                            cpu_to_le16(gpio->header.len + S_DS_GEN +
+                                             ACTION_NUMLED_TLVTYPE_LEN_FIELDS_LEN);
+                        gpio->header.len = cpu_to_le16(gpio->header.len);
+
+                        ret = 0;
+                        break;
+                }
+        case cmd_802_11_pwr_cfg:
+                cmdptr->command = cpu_to_le16(cmd_802_11_pwr_cfg);
+                cmdptr->size =
+                    cpu_to_le16(sizeof(struct cmd_ds_802_11_pwr_cfg) +
+                                     S_DS_GEN);
+                memmove(&cmdptr->params.pwrcfg, pdata_buf,
+                        sizeof(struct cmd_ds_802_11_pwr_cfg));
+
+                ret = 0;
+                break;
+        case cmd_bt_access:
+                ret = wlan_cmd_bt_access(priv, cmdptr, cmd_action, pdata_buf);
+                break;
+
+        case cmd_fwt_access:
+                ret = wlan_cmd_fwt_access(priv, cmdptr, cmd_action, pdata_buf);
+                break;
+
+        case cmd_mesh_access:
+                ret = wlan_cmd_mesh_access(priv, cmdptr, cmd_action, pdata_buf);
+                break;
+
+        case cmd_get_tsf:
+                cmdptr->command = cpu_to_le16(cmd_get_tsf);
+                cmdptr->size =
+                    cpu_to_le16(sizeof(struct cmd_ds_get_tsf)
+                                     + S_DS_GEN);
+                ret = 0;
+                break;
+        case cmd_802_11_tx_rate_query:
+                cmdptr->command =
+                    cpu_to_le16(cmd_802_11_tx_rate_query);
+                cmdptr->size =
+                    cpu_to_le16(sizeof(struct cmd_tx_rate_query) +
+                                     S_DS_GEN);
+                adapter->txrate = 0;
+                ret = 0;
+                break;
+        default:
+                lbs_pr_debug(1, "PREP_CMD: unknown command- %#x\n", cmd_no);
+                ret = -1;
+                break;
+        }
+
+        /* return error, since the command preparation failed */
+        if (ret != 0) {
+                lbs_pr_debug(1, "PREP_CMD: command preparation failed\n");
+                libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                ret = -1;
+                goto done;
+        }
+
+        cmdnode->cmdwaitqwoken = 0;
+
+        libertas_queue_cmd(adapter, cmdnode, 1);
+        adapter->nr_cmd_pending++;
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        if (wait_option & cmd_option_waitforrsp) {
+                lbs_pr_debug(1, "PREP_CMD: Wait for CMD response\n");
+                might_sleep();
+                wait_event_interruptible(cmdnode->cmdwait_q,
+                                         cmdnode->cmdwaitqwoken);
+        }
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+        if (adapter->cur_cmd_retcode) {
+                lbs_pr_debug(1, "PREP_CMD: command failed with return code=%d\n",
+                       adapter->cur_cmd_retcode);
+                adapter->cur_cmd_retcode = 0;
+                ret = -1;
+        }
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+done:
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief This function allocates the command buffer and link
+ *  it to command free queue.
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @return             0 or -1
+ */
+int libertas_allocate_cmd_buffer(wlan_private * priv)
+{
+        int ret = 0;
+        u32 ulbufsize;
+        u32 i;
+        struct cmd_ctrl_node *tempcmd_array;
+        u8 *ptempvirtualaddr;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        /* Allocate and initialize cmdCtrlNode */
+        ulbufsize = sizeof(struct cmd_ctrl_node) * MRVDRV_NUM_OF_CMD_BUFFER;
+
+        if (!(tempcmd_array = kmalloc(ulbufsize, GFP_KERNEL))) {
+                lbs_pr_debug(1,
+                       "ALLOC_CMD_BUF: failed to allocate tempcmd_array\n");
+                ret = -1;
+                goto done;
+        }
+
+        adapter->cmd_array = tempcmd_array;
+        memset(adapter->cmd_array, 0, ulbufsize);
+
+        /* Allocate and initialize command buffers */
+        ulbufsize = MRVDRV_SIZE_OF_CMD_BUFFER;
+        for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) {
+                if (!(ptempvirtualaddr = kmalloc(ulbufsize, GFP_KERNEL))) {
+                        lbs_pr_debug(1,
+                               "ALLOC_CMD_BUF: ptempvirtualaddr: out of memory\n");
+                        ret = -1;
+                        goto done;
+                }
+
+                memset(ptempvirtualaddr, 0, ulbufsize);
+
+                /* Update command buffer virtual */
+                tempcmd_array[i].bufvirtualaddr = ptempvirtualaddr;
+        }
+
+        for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) {
+                init_waitqueue_head(&tempcmd_array[i].cmdwait_q);
+                libertas_cleanup_and_insert_cmd(priv, &tempcmd_array[i]);
+        }
+
+        ret = 0;
+      done:
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief This function frees the command buffer.
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @return             0 or -1
+ */
+int libertas_free_cmd_buffer(wlan_private * priv)
+{
+        u32 ulbufsize;
+        unsigned int i;
+        struct cmd_ctrl_node *tempcmd_array;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        /* need to check if cmd array is allocated or not */
+        if (adapter->cmd_array == NULL) {
+                lbs_pr_debug(1, "FREE_CMD_BUF: cmd_array is Null\n");
+                goto done;
+        }
+
+        tempcmd_array = adapter->cmd_array;
+
+        /* Release shared memory buffers */
+        ulbufsize = MRVDRV_SIZE_OF_CMD_BUFFER;
+        for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) {
+                if (tempcmd_array[i].bufvirtualaddr) {
+                        lbs_pr_debug(1, "Free all the array\n");
+                        kfree(tempcmd_array[i].bufvirtualaddr);
+                        tempcmd_array[i].bufvirtualaddr = NULL;
+                }
+        }
+
+        /* Release cmd_ctrl_node */
+        if (adapter->cmd_array) {
+                lbs_pr_debug(1, "Free cmd_array\n");
+                kfree(adapter->cmd_array);
+                adapter->cmd_array = NULL;
+        }
+
+done:
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function gets a free command node if available in
+ *  command free queue.
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @return cmd_ctrl_node A pointer to cmd_ctrl_node structure or NULL
+ */
+struct cmd_ctrl_node *libertas_get_free_cmd_ctrl_node(wlan_private * priv)
+{
+        struct cmd_ctrl_node *tempnode;
+        wlan_adapter *adapter = priv->adapter;
+        unsigned long flags;
+
+        if (!adapter)
+                return NULL;
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+
+        if (!list_empty(&adapter->cmdfreeq)) {
+                tempnode = (struct cmd_ctrl_node *)adapter->cmdfreeq.next;
+                list_del((struct list_head *)tempnode);
+        } else {
+                lbs_pr_debug(1, "GET_CMD_NODE: cmd_ctrl_node is not available\n");
+                tempnode = NULL;
+        }
+
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+        if (tempnode) {
+                lbs_pr_debug(3, "GET_CMD_NODE: cmdCtrlNode available\n");
+                lbs_pr_debug(3, "GET_CMD_NODE: cmdCtrlNode Address = %p\n",
+                       tempnode);
+                cleanup_cmdnode(tempnode);
+        }
+
+        return tempnode;
+}
+
+/**
+ *  @brief This function cleans command node.
+ *
+ *  @param ptempnode    A pointer to cmdCtrlNode structure
+ *  @return             n/a
+ */
+static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode)
+{
+        if (!ptempnode)
+                return;
+        ptempnode->cmdwaitqwoken = 1;
+        wake_up_interruptible(&ptempnode->cmdwait_q);
+        ptempnode->status = 0;
+        ptempnode->cmd_oid = (u32) 0;
+        ptempnode->wait_option = 0;
+        ptempnode->pdata_buf = NULL;
+
+        if (ptempnode->bufvirtualaddr != NULL)
+                memset(ptempnode->bufvirtualaddr, 0, MRVDRV_SIZE_OF_CMD_BUFFER);
+        return;
+}
+
+/**
+ *  @brief This function initializes the command node.
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param ptempnode    A pointer to cmd_ctrl_node structure
+ *  @param cmd_oid      cmd oid: treated as sub command
+ *  @param wait_option  wait option: wait response or not
+ *  @param pdata_buf    A pointer to informaion buffer
+ *  @return             0 or -1
+ */
+void libertas_set_cmd_ctrl_node(wlan_private * priv,
+                    struct cmd_ctrl_node *ptempnode,
+                    u32 cmd_oid, u16 wait_option, void *pdata_buf)
+{
+        ENTER();
+
+        if (!ptempnode)
+                return;
+
+        ptempnode->cmd_oid = cmd_oid;
+        ptempnode->wait_option = wait_option;
+        ptempnode->pdata_buf = pdata_buf;
+
+        LEAVE();
+}
+
+/**
+ *  @brief This function executes next command in command
+ *  pending queue. It will put fimware back to PS mode
+ *  if applicable.
+ *
+ *  @param priv     A pointer to wlan_private structure
+ *  @return        0 or -1
+ */
+int libertas_execute_next_command(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *cmdnode = NULL;
+        struct cmd_ds_command *cmdptr;
+        unsigned long flags;
+        int ret = 0;
+
+        lbs_pr_debug(1, "libertas_execute_next_command\n");
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+
+        if (adapter->cur_cmd) {
+                lbs_pr_alert( "EXEC_NEXT_CMD: there is command in processing!\n");
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                ret = -1;
+                goto done;
+        }
+
+        if (!list_empty(&adapter->cmdpendingq)) {
+                cmdnode = (struct cmd_ctrl_node *)
+                    adapter->cmdpendingq.next;
+        }
+
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+        if (cmdnode) {
+                lbs_pr_debug(1,
+                       "EXEC_NEXT_CMD: Got next command from cmdpendingq\n");
+                cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr;
+
+                if (is_command_allowed_in_ps(cmdptr->command)) {
+                        if ((adapter->psstate == PS_STATE_SLEEP)
+                            || (adapter->psstate == PS_STATE_PRE_SLEEP)
+                            ) {
+                                lbs_pr_debug(1,
+                                       "EXEC_NEXT_CMD: Cannot send cmd 0x%x in psstate %d\n",
+                                       cmdptr->command, adapter->psstate);
+                                ret = -1;
+                                goto done;
+                        }
+                        lbs_pr_debug(1, "EXEC_NEXT_CMD: OK to send command "
+                               "0x%x in psstate %d\n",
+                               cmdptr->command, adapter->psstate);
+                } else if (adapter->psstate != PS_STATE_FULL_POWER) {
+                        /*
+                         * 1. Non-PS command:
+                         * Queue it. set needtowakeup to TRUE if current state
+                         * is SLEEP, otherwise call libertas_ps_wakeup to send Exit_PS.
+                         * 2. PS command but not Exit_PS:
+                         * Ignore it.
+                         * 3. PS command Exit_PS:
+                         * Set needtowakeup to TRUE if current state is SLEEP,
+                         * otherwise send this command down to firmware
+                         * immediately.
+                         */
+                        if (cmdptr->command !=
+                            cpu_to_le16(cmd_802_11_ps_mode)) {
+                                /*  Prepare to send Exit PS,
+                                 *  this non PS command will be sent later */
+                                if ((adapter->psstate == PS_STATE_SLEEP)
+                                    || (adapter->psstate == PS_STATE_PRE_SLEEP)
+                                    ) {
+                                        /* w/ new scheme, it will not reach here.
+                                           since it is blocked in main_thread. */
+                                        adapter->needtowakeup = 1;
+                                } else
+                                        libertas_ps_wakeup(priv, 0);
+
+                                ret = 0;
+                                goto done;
+                        } else {
+                                /*
+                                 * PS command. Ignore it if it is not Exit_PS.
+                                 * otherwise send it down immediately.
+                                 */
+                                struct cmd_ds_802_11_ps_mode *psm =
+                                    &cmdptr->params.psmode;
+
+                                lbs_pr_debug(1,
+                                       "EXEC_NEXT_CMD: PS cmd- action=0x%x\n",
+                                       psm->action);
+                                if (psm->action !=
+                                    cpu_to_le16(cmd_subcmd_exit_ps)) {
+                                        lbs_pr_debug(1,
+                                               "EXEC_NEXT_CMD: Ignore Enter PS cmd\n");
+                                        list_del((struct list_head *)cmdnode);
+                                        libertas_cleanup_and_insert_cmd(priv, cmdnode);
+
+                                        ret = 0;
+                                        goto done;
+                                }
+
+                                if ((adapter->psstate == PS_STATE_SLEEP)
+                                    || (adapter->psstate == PS_STATE_PRE_SLEEP)
+                                    ) {
+                                        lbs_pr_debug(1,
+                                               "EXEC_NEXT_CMD: Ignore ExitPS cmd in sleep\n");
+                                        list_del((struct list_head *)cmdnode);
+                                        libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                                        adapter->needtowakeup = 1;
+
+                                        ret = 0;
+                                        goto done;
+                                }
+
+                                lbs_pr_debug(1,
+                                       "EXEC_NEXT_CMD: Sending Exit_PS down...\n");
+                        }
+                }
+                list_del((struct list_head *)cmdnode);
+                lbs_pr_debug(1, "EXEC_NEXT_CMD: Sending 0x%04X command\n",
+                       cmdptr->command);
+                DownloadcommandToStation(priv, cmdnode);
+        } else {
+                /*
+                 * check if in power save mode, if yes, put the device back
+                 * to PS mode
+                 */
+                if ((adapter->psmode != wlan802_11powermodecam) &&
+                    (adapter->psstate == PS_STATE_FULL_POWER) &&
+                    (adapter->connect_status == libertas_connected)) {
+                        if (adapter->secinfo.WPAenabled
+                            || adapter->secinfo.WPA2enabled) {
+                                /* check for valid WPA group keys */
+                                if (adapter->wpa_mcast_key.len
+                                    || adapter->wpa_unicast_key.len) {
+                                        lbs_pr_debug(1,
+                                               "EXEC_NEXT_CMD: WPA enabled and GTK_SET"
+                                               " go back to PS_SLEEP");
+                                        libertas_ps_sleep(priv, 0);
+                                }
+                        } else {
+                                lbs_pr_debug(1,
+                                       "EXEC_NEXT_CMD: command PendQ is empty,"
+                                       " go back to PS_SLEEP");
+                                libertas_ps_sleep(priv, 0);
+                        }
+                }
+        }
+
+        ret = 0;
+done:
+        return ret;
+}
+
+void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str)
+{
+        union iwreq_data iwrq;
+        u8 buf[50];
+
+        ENTER();
+
+        memset(&iwrq, 0, sizeof(union iwreq_data));
+        memset(buf, 0, sizeof(buf));
+
+        snprintf(buf, sizeof(buf) - 1, "%s", str);
+
+        iwrq.data.length = strlen(buf) + 1 + IW_EV_LCP_LEN;
+
+        /* Send Event to upper layer */
+        lbs_pr_debug(1, "Event Indication string = %s\n",
+               (char *)buf);
+        lbs_pr_debug(1, "Event Indication String length = %d\n", iwrq.data.length);
+
+        lbs_pr_debug(1, "Sending wireless event IWEVCUSTOM for %s\n", str);
+        wireless_send_event(priv->wlan_dev.netdev, IWEVCUSTOM, &iwrq, buf);
+
+        LEAVE();
+        return;
+}
+
+static int sendconfirmsleep(wlan_private * priv, u8 * cmdptr, u16 size)
+{
+        unsigned long flags;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        ENTER();
+
+        lbs_pr_debug(1, "SEND_SLEEPC_CMD: Before download, size of cmd = %d\n",
+               size);
+
+        lbs_dbg_hex("SEND_SLEEPC_CMD: Sleep confirm command", cmdptr, size);
+
+        ret = libertas_sbi_host_to_card(priv, MVMS_CMD, cmdptr, size);
+        priv->wlan_dev.dnld_sent = DNLD_RES_RECEIVED;
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+        if (adapter->intcounter || adapter->currenttxskb)
+                lbs_pr_debug(1, "SEND_SLEEPC_CMD: intcounter=%d currenttxskb=%p\n",
+                       adapter->intcounter, adapter->currenttxskb);
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+        if (ret) {
+                lbs_pr_alert(
+                       "SEND_SLEEPC_CMD: Host to Card failed for Confirm Sleep\n");
+        } else {
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                if (!adapter->intcounter) {
+                        adapter->psstate = PS_STATE_SLEEP;
+                } else {
+                        lbs_pr_debug(1, "SEND_SLEEPC_CMD: After sent,IntC=%d\n",
+                               adapter->intcounter);
+                }
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+                lbs_pr_debug(1, "SEND_SLEEPC_CMD: Sent Confirm Sleep command\n");
+                lbs_pr_debug(1, "+");
+        }
+
+        LEAVE();
+        return ret;
+}
+
+void libertas_ps_sleep(wlan_private * priv, int wait_option)
+{
+
+        ENTER();
+
+        /*
+         * PS is currently supported only in Infrastructure mode
+         * Remove this check if it is to be supported in IBSS mode also
+         */
+
+        libertas_prepare_and_send_command(priv, cmd_802_11_ps_mode,
+                              cmd_subcmd_enter_ps, wait_option, 0, NULL);
+
+        LEAVE();
+        return;
+}
+
+/**
+ *  @brief This function sends Eixt_PS command to firmware.
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param wait_option  wait response or not
+ *  @return             n/a
+ */
+void libertas_ps_wakeup(wlan_private * priv, int wait_option)
+{
+        enum WLAN_802_11_POWER_MODE Localpsmode;
+
+        ENTER();
+
+        Localpsmode = wlan802_11powermodecam;
+
+        lbs_pr_debug(1, "Exit_PS: Localpsmode = %d\n", Localpsmode);
+
+        libertas_prepare_and_send_command(priv, cmd_802_11_ps_mode,
+                              cmd_subcmd_exit_ps,
+                              wait_option, 0, &Localpsmode);
+
+        LEAVE();
+        return;
+}
+
+/**
+ *  @brief This function checks condition and prepares to
+ *  send sleep confirm command to firmware if ok.
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param psmode       Power Saving mode
+ *  @return             n/a
+ */
+void libertas_ps_confirm_sleep(wlan_private * priv, u16 psmode)
+{
+        unsigned long flags =0;
+        wlan_adapter *adapter = priv->adapter;
+        u8 allowed = 1;
+
+        ENTER();
+
+        if (priv->wlan_dev.dnld_sent) {
+                allowed = 0;
+                lbs_pr_debug(1, "D");
+        }
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+        if (adapter->cur_cmd) {
+                allowed = 0;
+                lbs_pr_debug(1, "C");
+        }
+        if (adapter->intcounter > 0) {
+                allowed = 0;
+                lbs_pr_debug(1, "I%d", adapter->intcounter);
+        }
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+        if (allowed) {
+                lbs_pr_debug(1, "Sending libertas_ps_confirm_sleep\n");
+                sendconfirmsleep(priv, (u8 *) & adapter->libertas_ps_confirm_sleep,
+                                 sizeof(struct PS_CMD_ConfirmSleep));
+        } else {
+                lbs_pr_debug(1, "Sleep Confirm has been delayed\n");
+        }
+
+        LEAVE();
+}
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
new file mode 100644
index 000000000000..cdb012c7e9cf
--- /dev/null
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -0,0 +1,1031 @@
+/**
+  * This file contains the handling of command
+  * responses as well as events generated by firmware.
+  */
+#include <linux/delay.h>
+#include <linux/if_arp.h>
+#include <linux/netdevice.h>
+
+#include <net/iw_handler.h>
+
+#include "host.h"
+#include "sbi.h"
+#include "decl.h"
+#include "defs.h"
+#include "dev.h"
+#include "join.h"
+#include "wext.h"
+
+/**
+ *  @brief This function handles disconnect event. it
+ *  reports disconnect to upper layer, clean tx/rx packets,
+ *  reset link state etc.
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @return        n/a
+ */
+void libertas_mac_event_disconnected(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        union iwreq_data wrqu;
+
+        if (adapter->connect_status != libertas_connected)
+                return;
+
+        lbs_pr_debug(1, "Handles disconnect event.\n");
+
+        memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+
+        /*
+         * Cisco AP sends EAP failure and de-auth in less than 0.5 ms.
+         * It causes problem in the Supplicant
+         */
+
+        msleep_interruptible(1000);
+        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);
+
+        /* Free Tx and Rx packets */
+        kfree_skb(priv->adapter->currenttxskb);
+        priv->adapter->currenttxskb = NULL;
+
+        /* report disconnect to upper layer */
+        netif_stop_queue(priv->wlan_dev.netdev);
+        netif_carrier_off(priv->wlan_dev.netdev);
+
+        /* reset SNR/NF/RSSI values */
+        memset(adapter->SNR, 0x00, sizeof(adapter->SNR));
+        memset(adapter->NF, 0x00, sizeof(adapter->NF));
+        memset(adapter->RSSI, 0x00, sizeof(adapter->RSSI));
+        memset(adapter->rawSNR, 0x00, sizeof(adapter->rawSNR));
+        memset(adapter->rawNF, 0x00, sizeof(adapter->rawNF));
+        adapter->nextSNRNF = 0;
+        adapter->numSNRNF = 0;
+        adapter->rxpd_rate = 0;
+        lbs_pr_debug(1, "Current SSID=%s, ssid length=%u\n",
+               adapter->curbssparams.ssid.ssid,
+               adapter->curbssparams.ssid.ssidlength);
+        lbs_pr_debug(1, "Previous SSID=%s, ssid length=%u\n",
+               adapter->previousssid.ssid, adapter->previousssid.ssidlength);
+
+        /* reset internal flags */
+        adapter->secinfo.WPAenabled = 0;
+        adapter->secinfo.WPA2enabled = 0;
+        adapter->wpa_ie_len = 0;
+        adapter->secinfo.auth1xalg = WLAN_1X_AUTH_ALG_NONE;
+        adapter->secinfo.Encryptionmode = CIPHER_NONE;
+
+        adapter->connect_status = libertas_disconnected;
+
+        /*
+         * memorize the previous SSID and BSSID
+         * it could be used for re-assoc
+         */
+        memcpy(&adapter->previousssid,
+               &adapter->curbssparams.ssid, sizeof(struct WLAN_802_11_SSID));
+        memcpy(adapter->previousbssid,
+               adapter->curbssparams.bssid, ETH_ALEN);
+
+        /* need to erase the current SSID and BSSID info */
+        adapter->pattemptedbssdesc = NULL;
+        memset(&adapter->curbssparams, 0, sizeof(adapter->curbssparams));
+
+        if (adapter->psstate != PS_STATE_FULL_POWER) {
+                /* make firmware to exit PS mode */
+                lbs_pr_debug(1, "Disconnected, so exit PS mode.\n");
+                libertas_ps_wakeup(priv, 0);
+        }
+}
+
+/**
+ *  @brief This function handles MIC failure event.
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @para  event   the event id
+ *  @return        n/a
+ */
+static void handle_mic_failureevent(wlan_private * priv, u32 event)
+{
+        char buf[50];
+
+        memset(buf, 0, sizeof(buf));
+
+        sprintf(buf, "%s", "MLME-MICHAELMICFAILURE.indication ");
+
+        if (event == MACREG_INT_CODE_MIC_ERR_UNICAST) {
+                strcat(buf, "unicast ");
+        } else {
+                strcat(buf, "multicast ");
+        }
+
+        libertas_send_iwevcustom_event(priv, buf);
+}
+
+static int wlan_ret_reg_access(wlan_private * priv,
+                               u16 type, struct cmd_ds_command *resp)
+{
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        switch (type) {
+        case cmd_ret_mac_reg_access:
+                {
+                        struct cmd_ds_mac_reg_access *reg;
+
+                        reg =
+                            (struct cmd_ds_mac_reg_access *)&resp->params.
+                            macreg;
+
+                        adapter->offsetvalue.offset = reg->offset;
+                        adapter->offsetvalue.value = reg->value;
+                        break;
+                }
+
+        case cmd_ret_bbp_reg_access:
+                {
+                        struct cmd_ds_bbp_reg_access *reg;
+                        reg =
+                            (struct cmd_ds_bbp_reg_access *)&resp->params.
+                            bbpreg;
+
+                        adapter->offsetvalue.offset = reg->offset;
+                        adapter->offsetvalue.value = reg->value;
+                        break;
+                }
+
+        case cmd_ret_rf_reg_access:
+                {
+                        struct cmd_ds_rf_reg_access *reg;
+                        reg =
+                            (struct cmd_ds_rf_reg_access *)&resp->params.
+                            rfreg;
+
+                        adapter->offsetvalue.offset = reg->offset;
+                        adapter->offsetvalue.value = reg->value;
+                        break;
+                }
+
+        default:
+                LEAVE();
+                return -1;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_get_hw_spec(wlan_private * priv,
+                                struct cmd_ds_command *resp)
+{
+        u32 i;
+        struct cmd_ds_get_hw_spec *hwspec = &resp->params.hwspec;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        ENTER();
+
+        adapter->fwcapinfo = le32_to_cpu(hwspec->fwcapinfo);
+
+        adapter->fwreleasenumber = hwspec->fwreleasenumber;
+
+        lbs_pr_debug(1, "GET_HW_SPEC: FWReleaseVersion- 0x%X\n",
+               adapter->fwreleasenumber);
+        lbs_pr_debug(1, "GET_HW_SPEC: Permanent addr- %2x:%2x:%2x:%2x:%2x:%2x\n",
+               hwspec->permanentaddr[0], hwspec->permanentaddr[1],
+               hwspec->permanentaddr[2], hwspec->permanentaddr[3],
+               hwspec->permanentaddr[4], hwspec->permanentaddr[5]);
+        lbs_pr_debug(1, "GET_HW_SPEC: hwifversion=0x%X  version=0x%X\n",
+               hwspec->hwifversion, hwspec->version);
+
+        adapter->regioncode = le16_to_cpu(hwspec->regioncode);
+
+        for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
+                /* use the region code to search for the index */
+                if (adapter->regioncode == libertas_region_code_to_index[i]) {
+                        adapter->regiontableindex = (u16) i;
+                        break;
+                }
+        }
+
+        /* if it's unidentified region code, use the default (USA) */
+        if (i >= MRVDRV_MAX_REGION_CODE) {
+                adapter->regioncode = 0x10;
+                adapter->regiontableindex = 0;
+                lbs_pr_info(
+                       "unidentified region code, use the default (USA)\n");
+        }
+
+        if (adapter->current_addr[0] == 0xff) {
+                memmove(adapter->current_addr, hwspec->permanentaddr,
+                        ETH_ALEN);
+        }
+
+        memcpy(priv->wlan_dev.netdev->dev_addr, adapter->current_addr, ETH_ALEN);
+        memcpy(priv->mesh_dev->dev_addr, adapter->current_addr, ETH_ALEN);
+
+        if (libertas_set_regiontable(priv, adapter->regioncode, 0)) {
+                ret = -1;
+                goto done;
+        }
+
+        if (libertas_set_universaltable(priv, 0)) {
+                ret = -1;
+                goto done;
+        }
+
+      done:
+        LEAVE();
+        return ret;
+}
+
+static int wlan_ret_802_11_sleep_params(wlan_private * priv,
+                                        struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_sleep_params *sp = &resp->params.sleep_params;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        lbs_pr_debug(1, "error=%x offset=%x stabletime=%x calcontrol=%x\n"
+               " extsleepclk=%x\n", sp->error, sp->offset,
+               sp->stabletime, sp->calcontrol, sp->externalsleepclk);
+        adapter->sp.sp_error = le16_to_cpu(sp->error);
+        adapter->sp.sp_offset = le16_to_cpu(sp->offset);
+        adapter->sp.sp_stabletime = le16_to_cpu(sp->stabletime);
+        adapter->sp.sp_calcontrol = le16_to_cpu(sp->calcontrol);
+        adapter->sp.sp_extsleepclk = le16_to_cpu(sp->externalsleepclk);
+        adapter->sp.sp_reserved = le16_to_cpu(sp->reserved);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_802_11_stat(wlan_private * priv,
+                                struct cmd_ds_command *resp)
+{
+/*      currently adapter->wlan802_11Stat is unused
+
+        struct cmd_ds_802_11_get_stat *p11Stat = &resp->params.gstat;
+        wlan_adapter *adapter = priv->adapter;
+
+        // TODO Convert it to Big endian befor copy
+        memcpy(&adapter->wlan802_11Stat,
+               p11Stat, sizeof(struct cmd_ds_802_11_get_stat));
+*/
+        return 0;
+}
+
+static int wlan_ret_802_11_snmp_mib(wlan_private * priv,
+                                    struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_snmp_mib *smib = &resp->params.smib;
+        u16 oid = le16_to_cpu(smib->oid);
+        u16 querytype = le16_to_cpu(smib->querytype);
+
+        ENTER();
+
+        lbs_pr_debug(1, "SNMP_RESP: value of the oid = %x, querytype=%x\n", oid,
+               querytype);
+        lbs_pr_debug(1, "SNMP_RESP: Buf size  = %x\n",
+               le16_to_cpu(smib->bufsize));
+
+        if (querytype == cmd_act_get) {
+                switch (oid) {
+                case fragthresh_i:
+                        priv->adapter->fragthsd =
+                            le16_to_cpu(*
+                                             ((unsigned short *)(smib->value)));
+                        lbs_pr_debug(1, "SNMP_RESP: fragthsd =%u\n",
+                               priv->adapter->fragthsd);
+                        break;
+                case rtsthresh_i:
+                        priv->adapter->rtsthsd =
+                            le16_to_cpu(*
+                                             ((unsigned short *)(smib->value)));
+                        lbs_pr_debug(1, "SNMP_RESP: rtsthsd =%u\n",
+                               priv->adapter->rtsthsd);
+                        break;
+                case short_retrylim_i:
+                        priv->adapter->txretrycount =
+                            le16_to_cpu(*
+                                             ((unsigned short *)(smib->value)));
+                        lbs_pr_debug(1, "SNMP_RESP: txretrycount =%u\n",
+                               priv->adapter->rtsthsd);
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_802_11_key_material(wlan_private * priv,
+                                        struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_key_material *pkeymaterial =
+            &resp->params.keymaterial;
+        wlan_adapter *adapter = priv->adapter;
+        u16 action = le16_to_cpu(pkeymaterial->action);
+
+        ENTER();
+
+        /* Copy the returned key to driver private data */
+        if (action == cmd_act_get) {
+                u8 * buf_ptr = (u8 *) &pkeymaterial->keyParamSet;
+                u8 * resp_end = (u8 *) (resp + le16_to_cpu(resp->size));
+
+                while (buf_ptr < resp_end) {
+                        struct MrvlIEtype_keyParamSet * pkeyparamset =
+                            (struct MrvlIEtype_keyParamSet *) buf_ptr;
+                        struct WLAN_802_11_KEY * pkey;
+                        u16 key_info = le16_to_cpu(pkeyparamset->keyinfo);
+                        u16 param_set_len = le16_to_cpu(pkeyparamset->length);
+                        u8 * end;
+                        u16 key_len = le16_to_cpu(pkeyparamset->keylen);
+
+                        end = (u8 *) pkeyparamset + sizeof (pkeyparamset->type)
+                                                  + sizeof (pkeyparamset->length)
+                                                  + param_set_len;
+                        /* Make sure we don't access past the end of the IEs */
+                        if (end > resp_end)
+                                break;
+
+                        if (key_info & KEY_INFO_WPA_UNICAST)
+                                pkey = &adapter->wpa_unicast_key;
+                        else if (key_info & KEY_INFO_WPA_MCAST)
+                                pkey = &adapter->wpa_mcast_key;
+                        else
+                                break;
+
+                        /* Copy returned key into driver */
+                        memset(pkey, 0, sizeof(struct WLAN_802_11_KEY));
+                        if (key_len > sizeof(pkey->key))
+                                break;
+                        pkey->type = le16_to_cpu(pkeyparamset->keytypeid);
+                        pkey->flags = le16_to_cpu(pkeyparamset->keyinfo);
+                        pkey->len = le16_to_cpu(pkeyparamset->keylen);
+                        memcpy(pkey->key, pkeyparamset->key, pkey->len);
+
+                        buf_ptr = end + 1;
+                }
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_802_11_mac_address(wlan_private * priv,
+                                       struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_mac_address *macadd = &resp->params.macadd;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        memcpy(adapter->current_addr, macadd->macadd, ETH_ALEN);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_802_11_rf_tx_power(wlan_private * priv,
+                                       struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_rf_tx_power *rtp = &resp->params.txp;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        adapter->txpowerlevel = le16_to_cpu(rtp->currentlevel);
+
+        lbs_pr_debug(1, "Current TxPower Level = %d\n", adapter->txpowerlevel);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_802_11_rf_antenna(wlan_private * priv,
+                                      struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_rf_antenna *pAntenna = &resp->params.rant;
+        wlan_adapter *adapter = priv->adapter;
+        u16 action = le16_to_cpu(pAntenna->action);
+
+        if (action == cmd_act_get_rx)
+                adapter->rxantennamode =
+                    le16_to_cpu(pAntenna->antennamode);
+
+        if (action == cmd_act_get_tx)
+                adapter->txantennamode =
+                    le16_to_cpu(pAntenna->antennamode);
+
+        lbs_pr_debug(1, "RF_ANT_RESP: action = 0x%x, mode = 0x%04x\n",
+               action, le16_to_cpu(pAntenna->antennamode));
+
+        return 0;
+}
+
+static int wlan_ret_802_11_rate_adapt_rateset(wlan_private * priv,
+                                              struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_rate_adapt_rateset *rates =
+            &resp->params.rateset;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if (rates->action == cmd_act_get) {
+                adapter->enablehwauto = rates->enablehwauto;
+                adapter->ratebitmap = rates->bitmap;
+        }
+
+        LEAVE();
+
+        return 0;
+}
+
+static int wlan_ret_802_11_data_rate(wlan_private * priv,
+                                     struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_data_rate *pdatarate = &resp->params.drate;
+        wlan_adapter *adapter = priv->adapter;
+        u8 dot11datarate;
+
+        ENTER();
+
+        lbs_dbg_hex("DATA_RATE_RESP: data_rate- ",
+                (u8 *) pdatarate, sizeof(struct cmd_ds_802_11_data_rate));
+
+        dot11datarate = pdatarate->datarate[0];
+        if (pdatarate->action == cmd_act_get_tx_rate) {
+                memcpy(adapter->libertas_supported_rates, pdatarate->datarate,
+                       sizeof(adapter->libertas_supported_rates));
+        }
+        adapter->datarate = libertas_index_to_data_rate(dot11datarate);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_802_11_rf_channel(wlan_private * priv,
+                                      struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_rf_channel *rfchannel =
+            &resp->params.rfchannel;
+        wlan_adapter *adapter = priv->adapter;
+        u16 action = le16_to_cpu(rfchannel->action);
+        u16 newchannel = le16_to_cpu(rfchannel->currentchannel);
+
+        ENTER();
+
+        if (action == cmd_opt_802_11_rf_channel_get
+            && adapter->curbssparams.channel != newchannel) {
+                lbs_pr_debug(1, "channel Switch: %d to %d\n",
+                       adapter->curbssparams.channel, newchannel);
+
+                /* Update the channel again */
+                adapter->curbssparams.channel = newchannel;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_ret_802_11_rssi(wlan_private * priv,
+                                struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_rssi_rsp *rssirsp = &resp->params.rssirsp;
+        wlan_adapter *adapter = priv->adapter;
+
+        /* store the non average value */
+        adapter->SNR[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->SNR);
+        adapter->NF[TYPE_BEACON][TYPE_NOAVG] =
+            le16_to_cpu(rssirsp->noisefloor);
+
+        adapter->SNR[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgSNR);
+        adapter->NF[TYPE_BEACON][TYPE_AVG] =
+            le16_to_cpu(rssirsp->avgnoisefloor);
+
+        adapter->RSSI[TYPE_BEACON][TYPE_NOAVG] =
+            CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_NOAVG],
+                     adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
+
+        adapter->RSSI[TYPE_BEACON][TYPE_AVG] =
+            CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_AVG] / AVG_SCALE,
+                     adapter->NF[TYPE_BEACON][TYPE_AVG] / AVG_SCALE);
+
+        lbs_pr_debug(1, "Beacon RSSI value = 0x%x\n",
+               adapter->RSSI[TYPE_BEACON][TYPE_AVG]);
+
+        return 0;
+}
+
+static int wlan_ret_802_11_eeprom_access(wlan_private * priv,
+                                  struct cmd_ds_command *resp)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct wlan_ioctl_regrdwr *pbuf;
+        pbuf = (struct wlan_ioctl_regrdwr *) adapter->prdeeprom;
+
+        lbs_pr_debug(1, "eeprom read len=%x\n",
+               le16_to_cpu(resp->params.rdeeprom.bytecount));
+        if (pbuf->NOB < le16_to_cpu(resp->params.rdeeprom.bytecount)) {
+                pbuf->NOB = 0;
+                lbs_pr_debug(1, "eeprom read return length is too big\n");
+                return -1;
+        }
+        pbuf->NOB = le16_to_cpu(resp->params.rdeeprom.bytecount);
+        if (pbuf->NOB > 0) {
+
+                memcpy(&pbuf->value, (u8 *) & resp->params.rdeeprom.value,
+                       le16_to_cpu(resp->params.rdeeprom.bytecount));
+                lbs_dbg_hex("adapter", (char *)&pbuf->value,
+                        le16_to_cpu(resp->params.rdeeprom.bytecount));
+        }
+        return 0;
+}
+
+static int wlan_ret_get_log(wlan_private * priv,
+                            struct cmd_ds_command *resp)
+{
+        struct cmd_ds_802_11_get_log *logmessage =
+            (struct cmd_ds_802_11_get_log *)&resp->params.glog;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        /* TODO Convert it to Big Endian before copy */
+        memcpy(&adapter->logmsg, logmessage,
+               sizeof(struct cmd_ds_802_11_get_log));
+
+        LEAVE();
+        return 0;
+}
+
+static inline int handle_cmd_response(u16 respcmd,
+                                      struct cmd_ds_command *resp,
+                                      wlan_private *priv)
+{
+        int ret = 0;
+        unsigned long flags;
+        wlan_adapter *adapter = priv->adapter;
+
+        switch (respcmd) {
+        case cmd_ret_mac_reg_access:
+        case cmd_ret_bbp_reg_access:
+        case cmd_ret_rf_reg_access:
+                ret = wlan_ret_reg_access(priv, respcmd, resp);
+                break;
+
+        case cmd_ret_hw_spec_info:
+                ret = wlan_ret_get_hw_spec(priv, resp);
+                break;
+
+        case cmd_ret_802_11_scan:
+                ret = libertas_ret_80211_scan(priv, resp);
+                break;
+
+        case cmd_ret_802_11_get_log:
+                ret = wlan_ret_get_log(priv, resp);
+                break;
+
+        case cmd_ret_802_11_associate:
+        case cmd_ret_802_11_reassociate:
+                ret = libertas_ret_80211_associate(priv, resp);
+                break;
+
+        case cmd_ret_802_11_disassociate:
+        case cmd_ret_802_11_deauthenticate:
+                ret = libertas_ret_80211_disassociate(priv, resp);
+                break;
+
+        case cmd_ret_802_11_ad_hoc_start:
+        case cmd_ret_802_11_ad_hoc_join:
+                ret = libertas_ret_80211_ad_hoc_start(priv, resp);
+                break;
+
+        case cmd_ret_802_11_stat:
+                ret = wlan_ret_802_11_stat(priv, resp);
+                break;
+
+        case cmd_ret_802_11_snmp_mib:
+                ret = wlan_ret_802_11_snmp_mib(priv, resp);
+                break;
+
+        case cmd_ret_802_11_rf_tx_power:
+                ret = wlan_ret_802_11_rf_tx_power(priv, resp);
+                break;
+
+        case cmd_ret_802_11_set_afc:
+        case cmd_ret_802_11_get_afc:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                memmove(adapter->cur_cmd->pdata_buf,
+                        &resp->params.afc,
+                        sizeof(struct cmd_ds_802_11_afc));
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+                break;
+        case cmd_ret_802_11_rf_antenna:
+                ret = wlan_ret_802_11_rf_antenna(priv, resp);
+                break;
+
+        case cmd_ret_mac_multicast_adr:
+        case cmd_ret_mac_control:
+        case cmd_ret_802_11_set_wep:
+        case cmd_ret_802_11_reset:
+        case cmd_ret_802_11_authenticate:
+        case cmd_ret_802_11_radio_control:
+        case cmd_ret_802_11_beacon_stop:
+        case cmd_ret_802_11_enable_rsn:
+                break;
+
+        case cmd_ret_802_11_data_rate:
+                ret = wlan_ret_802_11_data_rate(priv, resp);
+                break;
+        case cmd_ret_802_11_rate_adapt_rateset:
+                ret = wlan_ret_802_11_rate_adapt_rateset(priv, resp);
+                break;
+        case cmd_ret_802_11_rf_channel:
+                ret = wlan_ret_802_11_rf_channel(priv, resp);
+                break;
+
+        case cmd_ret_802_11_rssi:
+                ret = wlan_ret_802_11_rssi(priv, resp);
+                break;
+
+        case cmd_ret_802_11_mac_address:
+                ret = wlan_ret_802_11_mac_address(priv, resp);
+                break;
+
+        case cmd_ret_802_11_ad_hoc_stop:
+                ret = libertas_ret_80211_ad_hoc_stop(priv, resp);
+                break;
+
+        case cmd_ret_802_11_key_material:
+                lbs_pr_debug(1, "CMD_RESP: KEY_MATERIAL command response\n");
+                ret = wlan_ret_802_11_key_material(priv, resp);
+                break;
+
+        case cmd_ret_802_11_eeprom_access:
+                ret = wlan_ret_802_11_eeprom_access(priv, resp);
+                break;
+
+        case cmd_ret_802_11d_domain_info:
+                ret = libertas_ret_802_11d_domain_info(priv, resp);
+                break;
+
+        case cmd_ret_802_11_sleep_params:
+                ret = wlan_ret_802_11_sleep_params(priv, resp);
+                break;
+        case cmd_ret_802_11_inactivity_timeout:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                *((u16 *) adapter->cur_cmd->pdata_buf) =
+                    le16_to_cpu(resp->params.inactivity_timeout.timeout);
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                break;
+
+        case cmd_ret_802_11_tpc_cfg:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                memmove(adapter->cur_cmd->pdata_buf,
+                        &resp->params.tpccfg,
+                        sizeof(struct cmd_ds_802_11_tpc_cfg));
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                break;
+        case cmd_ret_802_11_led_gpio_ctrl:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                memmove(adapter->cur_cmd->pdata_buf,
+                        &resp->params.ledgpio,
+                        sizeof(struct cmd_ds_802_11_led_ctrl));
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                break;
+        case cmd_ret_802_11_pwr_cfg:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                memmove(adapter->cur_cmd->pdata_buf,
+                        &resp->params.pwrcfg,
+                        sizeof(struct cmd_ds_802_11_pwr_cfg));
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+                break;
+
+        case cmd_ret_get_tsf:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                memcpy(priv->adapter->cur_cmd->pdata_buf,
+                       &resp->params.gettsf.tsfvalue, sizeof(u64));
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                break;
+        case cmd_ret_bt_access:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                if (adapter->cur_cmd->pdata_buf)
+                        memcpy(adapter->cur_cmd->pdata_buf,
+                               &resp->params.bt.addr1, 2 * ETH_ALEN);
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                break;
+        case cmd_ret_fwt_access:
+                spin_lock_irqsave(&adapter->driver_lock, flags);
+                if (adapter->cur_cmd->pdata_buf)
+                        memcpy(adapter->cur_cmd->pdata_buf,
+                               &resp->params.fwt,
+                                sizeof(resp->params.fwt));
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                break;
+        case cmd_ret_mesh_access:
+                if (adapter->cur_cmd->pdata_buf)
+                        memcpy(adapter->cur_cmd->pdata_buf,
+                               &resp->params.mesh,
+                               sizeof(resp->params.mesh));
+                break;
+        case cmd_rte_802_11_tx_rate_query:
+                priv->adapter->txrate = resp->params.txrate.txrate;
+                break;
+        default:
+                lbs_pr_debug(1, "CMD_RESP: Unknown command response %#x\n",
+                       resp->command);
+                break;
+        }
+        return ret;
+}
+
+int libertas_process_rx_command(wlan_private * priv)
+{
+        u16 respcmd;
+        struct cmd_ds_command *resp;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        ulong flags;
+        u16 result;
+
+        ENTER();
+
+        lbs_pr_debug(1, "CMD_RESP: @ %lu\n", jiffies);
+
+        /* Now we got response from FW, cancel the command timer */
+        del_timer(&adapter->command_timer);
+
+        mutex_lock(&adapter->lock);
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+
+        if (!adapter->cur_cmd) {
+                lbs_pr_debug(1, "CMD_RESP: NULL cur_cmd=%p\n", adapter->cur_cmd);
+                ret = -1;
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                goto done;
+        }
+        resp = (struct cmd_ds_command *)(adapter->cur_cmd->bufvirtualaddr);
+
+        lbs_dbg_hex("CMD_RESP:", adapter->cur_cmd->bufvirtualaddr,
+                priv->wlan_dev.upld_len);
+
+        respcmd = le16_to_cpu(resp->command);
+
+        result = le16_to_cpu(resp->result);
+
+        lbs_pr_debug(1, "CMD_RESP: %x result: %d length: %d\n", respcmd,
+               result, priv->wlan_dev.upld_len);
+
+        if (!(respcmd & 0x8000)) {
+                lbs_pr_debug(1, "Invalid response to command!");
+                adapter->cur_cmd_retcode = -1;
+                __libertas_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
+                adapter->nr_cmd_pending--;
+                adapter->cur_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                ret = -1;
+                goto done;
+        }
+
+        /* Store the response code to cur_cmd_retcode. */
+        adapter->cur_cmd_retcode = le16_to_cpu(resp->result);
+
+        if (respcmd == cmd_ret_802_11_ps_mode) {
+                struct cmd_ds_802_11_ps_mode *psmode;
+
+                psmode = &resp->params.psmode;
+                lbs_pr_debug(1,
+                       "CMD_RESP: PS_MODE cmd reply result=%#x action=0x%X\n",
+                       resp->result, psmode->action);
+                psmode->action = cpu_to_le16(psmode->action);
+
+                if (result) {
+                        lbs_pr_debug(1, "CMD_RESP: PS command failed- %#x \n",
+                               resp->result);
+                        if (adapter->inframode == wlan802_11ibss) {
+                                /*
+                                 * We should not re-try enter-ps command in
+                                 * ad-hoc mode. It takes place in
+                                 * libertas_execute_next_command().
+                                 */
+                                if (psmode->action == cmd_subcmd_enter_ps)
+                                        adapter->psmode =
+                                            wlan802_11powermodecam;
+                        }
+                } else if (psmode->action == cmd_subcmd_enter_ps) {
+                        adapter->needtowakeup = 0;
+                        adapter->psstate = PS_STATE_AWAKE;
+
+                        lbs_pr_debug(1, "CMD_RESP: Enter_PS command response\n");
+                        if (adapter->connect_status != libertas_connected) {
+                                /*
+                                 * When Deauth Event received before Enter_PS command
+                                 * response, We need to wake up the firmware.
+                                 */
+                                lbs_pr_debug(1,
+                                       "Disconnected, Going to invoke libertas_ps_wakeup\n");
+
+                                mutex_unlock(&adapter->lock);
+                                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+                                libertas_ps_wakeup(priv, 0);
+                                mutex_lock(&adapter->lock);
+                                spin_lock_irqsave(&adapter->driver_lock, flags);
+                        }
+                } else if (psmode->action == cmd_subcmd_exit_ps) {
+                        adapter->needtowakeup = 0;
+                        adapter->psstate = PS_STATE_FULL_POWER;
+                        lbs_pr_debug(1, "CMD_RESP: Exit_PS command response\n");
+                } else {
+                        lbs_pr_debug(1, "CMD_RESP: PS- action=0x%X\n",
+                               psmode->action);
+                }
+
+                __libertas_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
+                adapter->nr_cmd_pending--;
+                adapter->cur_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+                ret = 0;
+                goto done;
+        }
+
+        if (adapter->cur_cmd->cmdflags & CMD_F_HOSTCMD) {
+                /* Copy the response back to response buffer */
+                memcpy(adapter->cur_cmd->pdata_buf, resp, resp->size);
+
+                adapter->cur_cmd->cmdflags &= ~CMD_F_HOSTCMD;
+        }
+
+        /* If the command is not successful, cleanup and return failure */
+        if ((result != 0 || !(respcmd & 0x8000))) {
+                lbs_pr_debug(1, "CMD_RESP: command reply %#x result=%#x\n",
+                       resp->command, resp->result);
+                /*
+                 * Handling errors here
+                 */
+                switch (respcmd) {
+                case cmd_ret_hw_spec_info:
+                case cmd_ret_802_11_reset:
+                        lbs_pr_debug(1, "CMD_RESP: Reset command failed\n");
+                        break;
+
+                }
+
+                __libertas_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
+                adapter->nr_cmd_pending--;
+                adapter->cur_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+                ret = -1;
+                goto done;
+        }
+
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+        ret = handle_cmd_response(respcmd, resp, priv);
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+        if (adapter->cur_cmd) {
+                /* Clean up and Put current command back to cmdfreeq */
+                __libertas_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
+                adapter->nr_cmd_pending--;
+                WARN_ON(adapter->nr_cmd_pending > 128);
+                adapter->cur_cmd = NULL;
+        }
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+done:
+        mutex_unlock(&adapter->lock);
+        LEAVE();
+        return ret;
+}
+
+int libertas_process_event(wlan_private * priv)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+        u32 eventcause;
+
+        spin_lock_irq(&adapter->driver_lock);
+        eventcause = adapter->eventcause;
+        spin_unlock_irq(&adapter->driver_lock);
+
+        ENTER();
+
+        lbs_pr_debug(1, "EVENT Cause %x\n", eventcause);
+
+        switch (eventcause >> SBI_EVENT_CAUSE_SHIFT) {
+        case MACREG_INT_CODE_LINK_SENSED:
+                lbs_pr_debug(1, "EVENT: MACREG_INT_CODE_LINK_SENSED\n");
+                break;
+
+        case MACREG_INT_CODE_DEAUTHENTICATED:
+                lbs_pr_debug(1, "EVENT: Deauthenticated\n");
+                libertas_mac_event_disconnected(priv);
+                break;
+
+        case MACREG_INT_CODE_DISASSOCIATED:
+                lbs_pr_debug(1, "EVENT: Disassociated\n");
+                libertas_mac_event_disconnected(priv);
+                break;
+
+        case MACREG_INT_CODE_LINK_LOSE_NO_SCAN:
+                lbs_pr_debug(1, "EVENT: Link lost\n");
+                libertas_mac_event_disconnected(priv);
+                break;
+
+        case MACREG_INT_CODE_PS_SLEEP:
+                lbs_pr_debug(1, "EVENT: SLEEP\n");
+                lbs_pr_debug(1, "_");
+
+                /* handle unexpected PS SLEEP event */
+                if (adapter->psstate == PS_STATE_FULL_POWER) {
+                        lbs_pr_debug(1,
+                               "EVENT: In FULL POWER mode - ignore PS SLEEP\n");
+                        break;
+                }
+                adapter->psstate = PS_STATE_PRE_SLEEP;
+
+                libertas_ps_confirm_sleep(priv, (u16) adapter->psmode);
+
+                break;
+
+        case MACREG_INT_CODE_PS_AWAKE:
+                lbs_pr_debug(1, "EVENT: AWAKE \n");
+                lbs_pr_debug(1, "|");
+
+                /* handle unexpected PS AWAKE event */
+                if (adapter->psstate == PS_STATE_FULL_POWER) {
+                        lbs_pr_debug(1,
+                               "EVENT: In FULL POWER mode - ignore PS AWAKE\n");
+                        break;
+                }
+
+                adapter->psstate = PS_STATE_AWAKE;
+
+                if (adapter->needtowakeup) {
+                        /*
+                         * wait for the command processing to finish
+                         * before resuming sending
+                         * adapter->needtowakeup will be set to FALSE
+                         * in libertas_ps_wakeup()
+                         */
+                        lbs_pr_debug(1, "Waking up...\n");
+                        libertas_ps_wakeup(priv, 0);
+                }
+                break;
+
+        case MACREG_INT_CODE_MIC_ERR_UNICAST:
+                lbs_pr_debug(1, "EVENT: UNICAST MIC ERROR\n");
+                handle_mic_failureevent(priv, MACREG_INT_CODE_MIC_ERR_UNICAST);
+                break;
+
+        case MACREG_INT_CODE_MIC_ERR_MULTICAST:
+                lbs_pr_debug(1, "EVENT: MULTICAST MIC ERROR\n");
+                handle_mic_failureevent(priv, MACREG_INT_CODE_MIC_ERR_MULTICAST);
+                break;
+        case MACREG_INT_CODE_MIB_CHANGED:
+        case MACREG_INT_CODE_INIT_DONE:
+                break;
+
+        case MACREG_INT_CODE_ADHOC_BCN_LOST:
+                lbs_pr_debug(1, "EVENT: HWAC - ADHOC BCN LOST\n");
+                break;
+
+        case MACREG_INT_CODE_RSSI_LOW:
+                lbs_pr_alert( "EVENT: RSSI_LOW\n");
+                break;
+        case MACREG_INT_CODE_SNR_LOW:
+                lbs_pr_alert( "EVENT: SNR_LOW\n");
+                break;
+        case MACREG_INT_CODE_MAX_FAIL:
+                lbs_pr_alert( "EVENT: MAX_FAIL\n");
+                break;
+        case MACREG_INT_CODE_RSSI_HIGH:
+                lbs_pr_alert( "EVENT: RSSI_HIGH\n");
+                break;
+        case MACREG_INT_CODE_SNR_HIGH:
+                lbs_pr_alert( "EVENT: SNR_HIGH\n");
+                break;
+
+        default:
+                lbs_pr_alert( "EVENT: unknown event id: %#x\n",
+                       eventcause >> SBI_EVENT_CAUSE_SHIFT);
+                break;
+        }
+
+        spin_lock_irq(&adapter->driver_lock);
+        adapter->eventcause = 0;
+        spin_unlock_irq(&adapter->driver_lock);
+        LEAVE();
+        return ret;
+}
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
new file mode 100644
index 000000000000..51dfd202f558
--- /dev/null
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -0,0 +1,1935 @@
+#include <linux/module.h>
+#include <linux/dcache.h>
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <net/iw_handler.h>
+#include "dev.h"
+#include "decl.h"
+#include "host.h"
+
+static struct dentry *libertas_dir = NULL;
+static char *szStates[] = {
+        "Connected",
+        "Disconnected"
+};
+
+void libertas_debug_init(wlan_private * priv, struct net_device *dev);
+
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static ssize_t write_file_dummy(struct file *file, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        return -EINVAL;
+}
+
+static const size_t len = PAGE_SIZE;
+
+static ssize_t libertas_dev_info(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        size_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+        ssize_t res;
+
+        pos += snprintf(buf+pos, len-pos, "state = %s\n",
+                                szStates[priv->adapter->connect_status]);
+        pos += snprintf(buf+pos, len-pos, "region_code = %02x\n",
+                                (u32) priv->adapter->regioncode);
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+
+        free_page(addr);
+        return res;
+}
+
+
+static ssize_t libertas_getscantable(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        size_t pos = 0;
+        int numscansdone = 0, res;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        pos += snprintf(buf+pos, len-pos,
+                        "---------------------------------------");
+        pos += snprintf(buf+pos, len-pos,
+                        "---------------------------------------\n");
+        pos += snprintf(buf+pos, len-pos,
+                "# | ch  | ss  |       bssid       |   cap    |    TSF   | Qual | SSID \n");
+        pos += snprintf(buf+pos, len-pos,
+                "---------------------------------------");
+        pos += snprintf(buf+pos, len-pos,
+                "---------------------------------------\n");
+
+        while (numscansdone < priv->adapter->numinscantable) {
+                struct bss_descriptor *pbssinfo;
+                u16 cap;
+
+                pbssinfo = &priv->adapter->scantable[numscansdone];
+                memcpy(&cap, &pbssinfo->cap, sizeof(cap));
+                pos += snprintf(buf+pos, len-pos,
+                        "%02u| %03d | %03ld | %02x:%02x:%02x:%02x:%02x:%02x |",
+                        numscansdone, pbssinfo->channel, pbssinfo->rssi,
+                        pbssinfo->macaddress[0], pbssinfo->macaddress[1],
+                        pbssinfo->macaddress[2], pbssinfo->macaddress[3],
+                        pbssinfo->macaddress[4], pbssinfo->macaddress[5]);
+                pos += snprintf(buf+pos, len-pos, " %04x-", cap);
+                pos += snprintf(buf+pos, len-pos, "%c%c%c |",
+                                pbssinfo->cap.ibss ? 'A' : 'I',
+                                pbssinfo->cap.privacy ? 'P' : ' ',
+                                pbssinfo->cap.spectrummgmt ? 'S' : ' ');
+                pos += snprintf(buf+pos, len-pos, " %08llx |", pbssinfo->networktsf);
+                pos += snprintf(buf+pos, len-pos, " %d |",
+                        SCAN_RSSI(priv->adapter->scantable[numscansdone].rssi));
+
+                pos += snprintf(buf+pos, len-pos, " %s\n", pbssinfo->ssid.ssid);
+
+                numscansdone++;
+        }
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_sleepparams_write(struct file *file,
+                                const char __user *user_buf, size_t count,
+                                loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        ssize_t buf_size, res;
+        int p1, p2, p3, p4, p5, p6;
+        struct sleep_params sp;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, user_buf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%d %d %d %d %d %d", &p1, &p2, &p3, &p4, &p5, &p6);
+        if (res != 6) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        sp.sp_error = p1;
+        sp.sp_offset = p2;
+        sp.sp_stabletime = p3;
+        sp.sp_calcontrol = p4;
+        sp.sp_extsleepclk = p5;
+        sp.sp_reserved = p6;
+
+        memcpy(&priv->adapter->sp, &sp, sizeof(struct sleep_params));
+
+        res = libertas_prepare_and_send_command(priv,
+                                cmd_802_11_sleep_params,
+                                cmd_act_set,
+                                cmd_option_waitforrsp, 0, NULL);
+
+        if (!res)
+                res = count;
+        else
+                res = -EINVAL;
+
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_sleepparams_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        ssize_t res;
+        size_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        res = libertas_prepare_and_send_command(priv,
+                                cmd_802_11_sleep_params,
+                                cmd_act_get,
+                                cmd_option_waitforrsp, 0, NULL);
+        if (res) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        pos += snprintf(buf, len, "%d %d %d %d %d %d\n", adapter->sp.sp_error,
+                        adapter->sp.sp_offset, adapter->sp.sp_stabletime,
+                        adapter->sp.sp_calcontrol, adapter->sp.sp_extsleepclk,
+                        adapter->sp.sp_reserved);
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_extscan(struct file *file, const char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        struct WLAN_802_11_SSID extscan_ssid;
+        union iwreq_data wrqu;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        memcpy(&extscan_ssid.ssid, buf, strlen(buf)-1);
+        extscan_ssid.ssidlength = strlen(buf)-1;
+
+        libertas_send_specific_SSID_scan(priv, &extscan_ssid, 1);
+
+        memset(&wrqu, 0, sizeof(union iwreq_data));
+        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWSCAN, &wrqu, NULL);
+
+out_unlock:
+        free_page(addr);
+        return count;
+}
+
+static int libertas_parse_chan(char *buf, size_t count,
+                        struct wlan_ioctl_user_scan_cfg *scan_cfg, int dur)
+{
+        char *start, *end, *hold, *str;
+        int i = 0;
+
+        start = strstr(buf, "chan=");
+        if (!start)
+                return -EINVAL;
+        start += 5;
+        end = strstr(start, " ");
+        if (!end)
+                end = buf + count;
+        hold = kzalloc((end - start)+1, GFP_KERNEL);
+        if (!hold)
+                return -ENOMEM;
+        strncpy(hold, start, end - start);
+        hold[(end-start)+1] = '\0';
+        while(hold && (str = strsep(&hold, ","))) {
+                int chan;
+                char band, passive = 0;
+                sscanf(str, "%d%c%c", &chan, &band, &passive);
+                scan_cfg->chanlist[i].channumber = chan;
+                scan_cfg->chanlist[i].scantype = passive ? 1 : 0;
+                if (band == 'b' || band == 'g')
+                        scan_cfg->chanlist[i].radiotype = 0;
+                else if (band == 'a')
+                        scan_cfg->chanlist[i].radiotype = 1;
+
+                scan_cfg->chanlist[i].scantime = dur;
+                i++;
+        }
+
+        kfree(hold);
+        return i;
+}
+
+static void libertas_parse_bssid(char *buf, size_t count,
+                        struct wlan_ioctl_user_scan_cfg *scan_cfg)
+{
+        char *hold;
+        unsigned int mac[ETH_ALEN];
+        int i;
+
+        hold = strstr(buf, "bssid=");
+        if (!hold)
+                return;
+        hold += 6;
+        sscanf(hold, "%2x:%2x:%2x:%2x:%2x:%2x", mac, mac+1, mac+2, mac+3,
+                        mac+4, mac+5);
+        for(i=0;i<ETH_ALEN;i++)
+                scan_cfg->specificBSSID[i] = mac[i];
+}
+
+static void libertas_parse_ssid(char *buf, size_t count,
+                        struct wlan_ioctl_user_scan_cfg *scan_cfg)
+{
+        char *hold, *end;
+        ssize_t size;
+
+        hold = strstr(buf, "ssid=");
+        if (!hold)
+                return;
+        hold += 5;
+        end = strstr(hold, " ");
+        if (!end)
+                end = buf + count - 1;
+
+        size = min(IW_ESSID_MAX_SIZE, end - hold);
+        strncpy(scan_cfg->specificSSID, hold, size);
+
+        return;
+}
+
+static void libertas_parse_keep(char *buf, size_t count,
+                        struct wlan_ioctl_user_scan_cfg *scan_cfg)
+{
+        char *hold;
+        int val;
+
+        hold = strstr(buf, "keep=");
+        if (!hold)
+                return;
+        hold += 5;
+        sscanf(hold, "%d", &val);
+
+        if (val != 0)
+                val = 1;
+
+        scan_cfg->keeppreviousscan = val;
+        return;
+}
+
+static int libertas_parse_dur(char *buf, size_t count,
+                        struct wlan_ioctl_user_scan_cfg *scan_cfg)
+{
+        char *hold;
+        int val;
+
+        hold = strstr(buf, "dur=");
+        if (!hold)
+                return 0;
+        hold += 4;
+        sscanf(hold, "%d", &val);
+
+        return val;
+}
+
+static void libertas_parse_probes(char *buf, size_t count,
+                        struct wlan_ioctl_user_scan_cfg *scan_cfg)
+{
+        char *hold;
+        int val;
+
+        hold = strstr(buf, "probes=");
+        if (!hold)
+                return;
+        hold += 7;
+        sscanf(hold, "%d", &val);
+
+        scan_cfg->numprobes = val;
+
+        return;
+}
+
+static void libertas_parse_type(char *buf, size_t count,
+                        struct wlan_ioctl_user_scan_cfg *scan_cfg)
+{
+        char *hold;
+        int val;
+
+        hold = strstr(buf, "type=");
+        if (!hold)
+                return;
+        hold += 5;
+        sscanf(hold, "%d", &val);
+
+        /* type=1,2 or 3 */
+        if (val < 1 || val > 3)
+                return;
+
+        scan_cfg->bsstype = val;
+
+        return;
+}
+
+static ssize_t libertas_setuserscan(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        struct wlan_ioctl_user_scan_cfg *scan_cfg;
+        union iwreq_data wrqu;
+        int dur;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        scan_cfg = kzalloc(sizeof(struct wlan_ioctl_user_scan_cfg), GFP_KERNEL);
+        if (!scan_cfg)
+                return -ENOMEM;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        scan_cfg->bsstype = WLAN_SCAN_BSS_TYPE_ANY;
+
+        dur = libertas_parse_dur(buf, count, scan_cfg);
+        libertas_parse_chan(buf, count, scan_cfg, dur);
+        libertas_parse_bssid(buf, count, scan_cfg);
+        libertas_parse_ssid(buf, count, scan_cfg);
+        libertas_parse_keep(buf, count, scan_cfg);
+        libertas_parse_probes(buf, count, scan_cfg);
+        libertas_parse_type(buf, count, scan_cfg);
+
+        wlan_scan_networks(priv, scan_cfg);
+        wait_event_interruptible(priv->adapter->cmd_pending,
+                                 !priv->adapter->nr_cmd_pending);
+
+        memset(&wrqu, 0x00, sizeof(union iwreq_data));
+        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWSCAN, &wrqu, NULL);
+
+out_unlock:
+        free_page(addr);
+        kfree(scan_cfg);
+        return count;
+}
+
+static int libertas_event_initcmd(wlan_private *priv, void **response_buf,
+                        struct cmd_ctrl_node **cmdnode,
+                        struct cmd_ds_command **cmd)
+{
+        u16 wait_option = cmd_option_waitforrsp;
+
+        if (!(*cmdnode = libertas_get_free_cmd_ctrl_node(priv))) {
+                lbs_pr_debug(1, "failed libertas_get_free_cmd_ctrl_node\n");
+                return -ENOMEM;
+        }
+        if (!(*response_buf = kmalloc(3000, GFP_KERNEL))) {
+                lbs_pr_debug(1, "failed to allocate response buffer!\n");
+                return -ENOMEM;
+        }
+        libertas_set_cmd_ctrl_node(priv, *cmdnode, 0, wait_option, NULL);
+        init_waitqueue_head(&(*cmdnode)->cmdwait_q);
+        (*cmdnode)->pdata_buf = *response_buf;
+        (*cmdnode)->cmdflags |= CMD_F_HOSTCMD;
+        (*cmdnode)->cmdwaitqwoken = 0;
+        *cmd = (struct cmd_ds_command *)(*cmdnode)->bufvirtualaddr;
+        (*cmd)->command = cmd_802_11_subscribe_event;
+        (*cmd)->seqnum = ++priv->adapter->seqnum;
+        (*cmd)->result = 0;
+        return 0;
+}
+
+static ssize_t libertas_lowrssi_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        void *response_buf;
+        int res, cmd_len;
+        ssize_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0) {
+                free_page(addr);
+                return res;
+        }
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_get;
+        pcmdptr->size =
+        cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
+        while (cmd_len < pcmdptr->size) {
+                struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
+                switch(header->type) {
+                struct mrvlietypes_rssithreshold  *Lowrssi;
+                case TLV_TYPE_RSSI_LOW:
+                Lowrssi = (struct mrvlietypes_rssithreshold *)(response_buf + cmd_len);
+                pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                Lowrssi->rssivalue,
+                                Lowrssi->rssifreq,
+                                (event->events & 0x0001)?1:0);
+                default:
+                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
+                        break;
+                }
+        }
+
+        kfree(response_buf);
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+        return res;
+}
+
+static u16 libertas_get_events_bitmap(wlan_private *priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        void *response_buf;
+        int res;
+        u16 event_bitmap;
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0)
+                return res;
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_get;
+        pcmdptr->size =
+        cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                return 0;
+        }
+
+        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
+        event_bitmap = event->events;
+        kfree(response_buf);
+        return event_bitmap;
+}
+
+static ssize_t libertas_lowrssi_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        ssize_t res, buf_size;
+        int value, freq, subscribed, cmd_len;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        struct mrvlietypes_rssithreshold *rssi_threshold;
+        void *response_buf;
+        u16 event_bitmap;
+        u8 *ptr;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%d %d %d", &value, &freq, &subscribed);
+        if (res != 3) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        event_bitmap = libertas_get_events_bitmap(priv);
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0)
+                goto out_unlock;
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_set;
+        pcmdptr->size = cpu_to_le16(S_DS_GEN +
+                sizeof(struct cmd_ds_802_11_subscribe_event) +
+                sizeof(struct mrvlietypes_rssithreshold));
+
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        ptr = (u8*) pcmdptr+cmd_len;
+        rssi_threshold = (struct mrvlietypes_rssithreshold *)(ptr);
+        rssi_threshold->header.type = cpu_to_le16(0x0104);
+        rssi_threshold->header.len = 2;
+        rssi_threshold->rssivalue = cpu_to_le16(value);
+        rssi_threshold->rssifreq = cpu_to_le16(freq);
+        event_bitmap |= subscribed ? 0x0001 : 0x0;
+        event->events = event_bitmap;
+
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_lowsnr_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        void *response_buf;
+        int res, cmd_len;
+        ssize_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0) {
+                free_page(addr);
+                return res;
+        }
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_get;
+        pcmdptr->size =
+        cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
+        while (cmd_len < pcmdptr->size) {
+                struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
+                switch(header->type) {
+                struct mrvlietypes_snrthreshold *LowSnr;
+                case TLV_TYPE_SNR_LOW:
+                LowSnr = (struct mrvlietypes_snrthreshold *)(response_buf + cmd_len);
+                pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                LowSnr->snrvalue,
+                                LowSnr->snrfreq,
+                                (event->events & 0x0002)?1:0);
+                default:
+                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
+                        break;
+                }
+        }
+
+        kfree(response_buf);
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_lowsnr_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        ssize_t res, buf_size;
+        int value, freq, subscribed, cmd_len;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        struct mrvlietypes_snrthreshold *snr_threshold;
+        void *response_buf;
+        u16 event_bitmap;
+        u8 *ptr;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%d %d %d", &value, &freq, &subscribed);
+        if (res != 3) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        event_bitmap = libertas_get_events_bitmap(priv);
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0)
+                goto out_unlock;
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_set;
+        pcmdptr->size = cpu_to_le16(S_DS_GEN +
+                sizeof(struct cmd_ds_802_11_subscribe_event) +
+                sizeof(struct mrvlietypes_snrthreshold));
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        ptr = (u8*) pcmdptr+cmd_len;
+        snr_threshold = (struct mrvlietypes_snrthreshold *)(ptr);
+        snr_threshold->header.type = cpu_to_le16(TLV_TYPE_SNR_LOW);
+        snr_threshold->header.len = 2;
+        snr_threshold->snrvalue = cpu_to_le16(value);
+        snr_threshold->snrfreq = cpu_to_le16(freq);
+        event_bitmap |= subscribed ? 0x0002 : 0x0;
+        event->events = event_bitmap;
+
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        res = count;
+
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_failcount_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        void *response_buf;
+        int res, cmd_len;
+        ssize_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0) {
+                free_page(addr);
+                return res;
+        }
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_get;
+        pcmdptr->size =
+        cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
+        while (cmd_len < pcmdptr->size) {
+                struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
+                switch(header->type) {
+                struct mrvlietypes_failurecount *failcount;
+                case TLV_TYPE_FAILCOUNT:
+                failcount = (struct mrvlietypes_failurecount *)(response_buf + cmd_len);
+                pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                failcount->failvalue,
+                                failcount->Failfreq,
+                                (event->events & 0x0004)?1:0);
+                default:
+                        cmd_len += sizeof(struct mrvlietypes_failurecount);
+                        break;
+                }
+        }
+
+        kfree(response_buf);
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_failcount_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        ssize_t res, buf_size;
+        int value, freq, subscribed, cmd_len;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        struct mrvlietypes_failurecount *failcount;
+        void *response_buf;
+        u16 event_bitmap;
+        u8 *ptr;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%d %d %d", &value, &freq, &subscribed);
+        if (res != 3) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        event_bitmap = libertas_get_events_bitmap(priv);
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0)
+                goto out_unlock;
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_set;
+        pcmdptr->size = cpu_to_le16(S_DS_GEN +
+                sizeof(struct cmd_ds_802_11_subscribe_event) +
+                sizeof(struct mrvlietypes_failurecount));
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        ptr = (u8*) pcmdptr+cmd_len;
+        failcount = (struct mrvlietypes_failurecount *)(ptr);
+        failcount->header.type = cpu_to_le16(TLV_TYPE_FAILCOUNT);
+        failcount->header.len = 2;
+        failcount->failvalue = cpu_to_le16(value);
+        failcount->Failfreq = cpu_to_le16(freq);
+        event_bitmap |= subscribed ? 0x0004 : 0x0;
+        event->events = event_bitmap;
+
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = (struct cmd_ds_command *)response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_bcnmiss_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        void *response_buf;
+        int res, cmd_len;
+        ssize_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0) {
+                free_page(addr);
+                return res;
+        }
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_get;
+        pcmdptr->size =
+        cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                free_page(addr);
+                kfree(response_buf);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                free_page(addr);
+                kfree(response_buf);
+                return 0;
+        }
+
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
+        while (cmd_len < pcmdptr->size) {
+                struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
+                switch(header->type) {
+                struct mrvlietypes_beaconsmissed *bcnmiss;
+                case TLV_TYPE_BCNMISS:
+                bcnmiss = (struct mrvlietypes_beaconsmissed *)(response_buf + cmd_len);
+                pos += snprintf(buf+pos, len-pos, "%d N/A %d\n",
+                                bcnmiss->beaconmissed,
+                                (event->events & 0x0008)?1:0);
+                default:
+                        cmd_len += sizeof(struct mrvlietypes_beaconsmissed);
+                        break;
+                }
+        }
+
+        kfree(response_buf);
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_bcnmiss_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        ssize_t res, buf_size;
+        int value, freq, subscribed, cmd_len;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        struct mrvlietypes_beaconsmissed *bcnmiss;
+        void *response_buf;
+        u16 event_bitmap;
+        u8 *ptr;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%d %d %d", &value, &freq, &subscribed);
+        if (res != 3) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        event_bitmap = libertas_get_events_bitmap(priv);
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0)
+                goto out_unlock;
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_set;
+        pcmdptr->size = cpu_to_le16(S_DS_GEN +
+                sizeof(struct cmd_ds_802_11_subscribe_event) +
+                sizeof(struct mrvlietypes_beaconsmissed));
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        ptr = (u8*) pcmdptr+cmd_len;
+        bcnmiss = (struct mrvlietypes_beaconsmissed *)(ptr);
+        bcnmiss->header.type = cpu_to_le16(TLV_TYPE_BCNMISS);
+        bcnmiss->header.len = 2;
+        bcnmiss->beaconmissed = cpu_to_le16(value);
+        event_bitmap |= subscribed ? 0x0008 : 0x0;
+        event->events = event_bitmap;
+
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                free_page(addr);
+                kfree(response_buf);
+                return 0;
+        }
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_highrssi_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        void *response_buf;
+        int res, cmd_len;
+        ssize_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0) {
+                free_page(addr);
+                return res;
+        }
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_get;
+        pcmdptr->size =
+        cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
+        while (cmd_len < pcmdptr->size) {
+                struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
+                switch(header->type) {
+                struct mrvlietypes_rssithreshold  *Highrssi;
+                case TLV_TYPE_RSSI_HIGH:
+                Highrssi = (struct mrvlietypes_rssithreshold *)(response_buf + cmd_len);
+                pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                Highrssi->rssivalue,
+                                Highrssi->rssifreq,
+                                (event->events & 0x0010)?1:0);
+                default:
+                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
+                        break;
+                }
+        }
+
+        kfree(response_buf);
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_highrssi_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        ssize_t res, buf_size;
+        int value, freq, subscribed, cmd_len;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        struct mrvlietypes_rssithreshold *rssi_threshold;
+        void *response_buf;
+        u16 event_bitmap;
+        u8 *ptr;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%d %d %d", &value, &freq, &subscribed);
+        if (res != 3) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        event_bitmap = libertas_get_events_bitmap(priv);
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0)
+                goto out_unlock;
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_set;
+        pcmdptr->size = cpu_to_le16(S_DS_GEN +
+                sizeof(struct cmd_ds_802_11_subscribe_event) +
+                sizeof(struct mrvlietypes_rssithreshold));
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        ptr = (u8*) pcmdptr+cmd_len;
+        rssi_threshold = (struct mrvlietypes_rssithreshold *)(ptr);
+        rssi_threshold->header.type = cpu_to_le16(TLV_TYPE_RSSI_HIGH);
+        rssi_threshold->header.len = 2;
+        rssi_threshold->rssivalue = cpu_to_le16(value);
+        rssi_threshold->rssifreq = cpu_to_le16(freq);
+        event_bitmap |= subscribed ? 0x0010 : 0x0;
+        event->events = event_bitmap;
+
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                return 0;
+        }
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_highsnr_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        void *response_buf;
+        int res, cmd_len;
+        ssize_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0) {
+                free_page(addr);
+                return res;
+        }
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_get;
+        pcmdptr->size =
+        cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
+        while (cmd_len < pcmdptr->size) {
+                struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
+                switch(header->type) {
+                struct mrvlietypes_snrthreshold *HighSnr;
+                case TLV_TYPE_SNR_HIGH:
+                HighSnr = (struct mrvlietypes_snrthreshold *)(response_buf + cmd_len);
+                pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                HighSnr->snrvalue,
+                                HighSnr->snrfreq,
+                                (event->events & 0x0020)?1:0);
+                default:
+                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
+                        break;
+                }
+        }
+
+        kfree(response_buf);
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_highsnr_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        ssize_t res, buf_size;
+        int value, freq, subscribed, cmd_len;
+        struct cmd_ctrl_node *pcmdnode;
+        struct cmd_ds_command *pcmdptr;
+        struct cmd_ds_802_11_subscribe_event *event;
+        struct mrvlietypes_snrthreshold *snr_threshold;
+        void *response_buf;
+        u16 event_bitmap;
+        u8 *ptr;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%d %d %d", &value, &freq, &subscribed);
+        if (res != 3) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        event_bitmap = libertas_get_events_bitmap(priv);
+
+        res = libertas_event_initcmd(priv, &response_buf, &pcmdnode, &pcmdptr);
+        if (res < 0)
+                goto out_unlock;
+
+        event = &pcmdptr->params.subscribe_event;
+        event->action = cmd_act_set;
+        pcmdptr->size = cpu_to_le16(S_DS_GEN +
+                sizeof(struct cmd_ds_802_11_subscribe_event) +
+                sizeof(struct mrvlietypes_snrthreshold));
+        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
+        ptr = (u8*) pcmdptr+cmd_len;
+        snr_threshold = (struct mrvlietypes_snrthreshold *)(ptr);
+        snr_threshold->header.type = cpu_to_le16(TLV_TYPE_SNR_HIGH);
+        snr_threshold->header.len = 2;
+        snr_threshold->snrvalue = cpu_to_le16(value);
+        snr_threshold->snrfreq = cpu_to_le16(freq);
+        event_bitmap |= subscribed ? 0x0020 : 0x0;
+        event->events = event_bitmap;
+
+        libertas_queue_cmd(adapter, pcmdnode, 1);
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        /* Sleep until response is generated by FW */
+        wait_event_interruptible(pcmdnode->cmdwait_q,
+                                pcmdnode->cmdwaitqwoken);
+
+        pcmdptr = response_buf;
+
+        if (pcmdptr->result) {
+                lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
+                        pcmdptr->result);
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+                lbs_pr_err("command response incorrect!\n");
+                kfree(response_buf);
+                free_page(addr);
+                return 0;
+        }
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_rdmac_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct wlan_offset_value offval;
+        ssize_t pos = 0;
+        int ret;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        offval.offset = priv->mac_offset;
+        offval.value = 0;
+
+        ret = libertas_prepare_and_send_command(priv,
+                                cmd_mac_reg_access, 0,
+                                cmd_option_waitforrsp, 0, &offval);
+        mdelay(10);
+        pos += snprintf(buf+pos, len-pos, "MAC[0x%x] = 0x%08x\n",
+                                priv->mac_offset, adapter->offsetvalue.value);
+
+        ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+        return ret;
+}
+
+static ssize_t libertas_rdmac_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        priv->mac_offset = simple_strtoul((char *)buf, NULL, 16);
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_wrmac_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        u32 offset, value;
+        struct wlan_offset_value offval;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%x %x", &offset, &value);
+        if (res != 2) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        offval.offset = offset;
+        offval.value = value;
+        res = libertas_prepare_and_send_command(priv,
+                                cmd_mac_reg_access, 1,
+                                cmd_option_waitforrsp, 0, &offval);
+        mdelay(10);
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_rdbbp_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct wlan_offset_value offval;
+        ssize_t pos = 0;
+        int ret;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        offval.offset = priv->bbp_offset;
+        offval.value = 0;
+
+        ret = libertas_prepare_and_send_command(priv,
+                                cmd_bbp_reg_access, 0,
+                                cmd_option_waitforrsp, 0, &offval);
+        mdelay(10);
+        pos += snprintf(buf+pos, len-pos, "BBP[0x%x] = 0x%08x\n",
+                                priv->bbp_offset, adapter->offsetvalue.value);
+
+        ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+
+        return ret;
+}
+
+static ssize_t libertas_rdbbp_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        priv->bbp_offset = simple_strtoul((char *)buf, NULL, 16);
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_wrbbp_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        u32 offset, value;
+        struct wlan_offset_value offval;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%x %x", &offset, &value);
+        if (res != 2) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        offval.offset = offset;
+        offval.value = value;
+        res = libertas_prepare_and_send_command(priv,
+                                cmd_bbp_reg_access, 1,
+                                cmd_option_waitforrsp, 0, &offval);
+        mdelay(10);
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_rdrf_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        wlan_adapter *adapter = priv->adapter;
+        struct wlan_offset_value offval;
+        ssize_t pos = 0;
+        int ret;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        offval.offset = priv->rf_offset;
+        offval.value = 0;
+
+        ret = libertas_prepare_and_send_command(priv,
+                                cmd_rf_reg_access, 0,
+                                cmd_option_waitforrsp, 0, &offval);
+        mdelay(10);
+        pos += snprintf(buf+pos, len-pos, "RF[0x%x] = 0x%08x\n",
+                                priv->rf_offset, adapter->offsetvalue.value);
+
+        ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        free_page(addr);
+
+        return ret;
+}
+
+static ssize_t libertas_rdrf_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        priv->rf_offset = simple_strtoul((char *)buf, NULL, 16);
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+static ssize_t libertas_wrrf_write(struct file *file,
+                                    const char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+
+        wlan_private *priv = file->private_data;
+        ssize_t res, buf_size;
+        u32 offset, value;
+        struct wlan_offset_value offval;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, userbuf, buf_size)) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        res = sscanf(buf, "%x %x", &offset, &value);
+        if (res != 2) {
+                res = -EFAULT;
+                goto out_unlock;
+        }
+
+        offval.offset = offset;
+        offval.value = value;
+        res = libertas_prepare_and_send_command(priv,
+                                cmd_rf_reg_access, 1,
+                                cmd_option_waitforrsp, 0, &offval);
+        mdelay(10);
+
+        res = count;
+out_unlock:
+        free_page(addr);
+        return res;
+}
+
+#define FOPS(fread, fwrite) { \
+        .owner = THIS_MODULE, \
+        .open = open_file_generic, \
+        .read = (fread), \
+        .write = (fwrite), \
+}
+
+struct libertas_debugfs_files {
+        char *name;
+        int perm;
+        struct file_operations fops;
+};
+
+struct libertas_debugfs_files debugfs_files[] = {
+        { "info", 0444, FOPS(libertas_dev_info, write_file_dummy), },
+        { "getscantable", 0444, FOPS(libertas_getscantable,
+                                        write_file_dummy), },
+        { "sleepparams", 0644, FOPS(libertas_sleepparams_read,
+                                libertas_sleepparams_write), },
+        { "extscan", 0600, FOPS(NULL, libertas_extscan), },
+        { "setuserscan", 0600, FOPS(NULL, libertas_setuserscan), },
+};
+
+struct libertas_debugfs_files debugfs_events_files[] = {
+        {"low_rssi", 0644, FOPS(libertas_lowrssi_read,
+                                libertas_lowrssi_write), },
+        {"low_snr", 0644, FOPS(libertas_lowsnr_read,
+                                libertas_lowsnr_write), },
+        {"failure_count", 0644, FOPS(libertas_failcount_read,
+                                libertas_failcount_write), },
+        {"beacon_missed", 0644, FOPS(libertas_bcnmiss_read,
+                                libertas_bcnmiss_write), },
+        {"high_rssi", 0644, FOPS(libertas_highrssi_read,
+                                libertas_highrssi_write), },
+        {"high_snr", 0644, FOPS(libertas_highsnr_read,
+                                libertas_highsnr_write), },
+};
+
+struct libertas_debugfs_files debugfs_regs_files[] = {
+        {"rdmac", 0644, FOPS(libertas_rdmac_read, libertas_rdmac_write), },
+        {"wrmac", 0600, FOPS(NULL, libertas_wrmac_write), },
+        {"rdbbp", 0644, FOPS(libertas_rdbbp_read, libertas_rdbbp_write), },
+        {"wrbbp", 0600, FOPS(NULL, libertas_wrbbp_write), },
+        {"rdrf", 0644, FOPS(libertas_rdrf_read, libertas_rdrf_write), },
+        {"wrrf", 0600, FOPS(NULL, libertas_wrrf_write), },
+};
+
+void libertas_debugfs_init(void)
+{
+        if (!libertas_dir)
+                libertas_dir = debugfs_create_dir("libertas_wireless", NULL);
+
+        return;
+}
+
+void libertas_debugfs_remove(void)
+{
+        if (libertas_dir)
+                 debugfs_remove(libertas_dir);
+        return;
+}
+
+void libertas_debugfs_init_one(wlan_private *priv, struct net_device *dev)
+{
+        int i;
+        struct libertas_debugfs_files *files;
+        if (!libertas_dir)
+                goto exit;
+
+        priv->debugfs_dir = debugfs_create_dir(dev->name, libertas_dir);
+        if (!priv->debugfs_dir)
+                goto exit;
+
+        for (i=0; i<ARRAY_SIZE(debugfs_files); i++) {
+                files = &debugfs_files[i];
+                priv->debugfs_files[i] = debugfs_create_file(files->name,
+                                                             files->perm,
+                                                             priv->debugfs_dir,
+                                                             priv,
+                                                             &files->fops);
+        }
+
+        priv->events_dir = debugfs_create_dir("subscribed_events", priv->debugfs_dir);
+        if (!priv->events_dir)
+                goto exit;
+
+        for (i=0; i<ARRAY_SIZE(debugfs_events_files); i++) {
+                files = &debugfs_events_files[i];
+                priv->debugfs_events_files[i] = debugfs_create_file(files->name,
+                                                             files->perm,
+                                                             priv->events_dir,
+                                                             priv,
+                                                             &files->fops);
+        }
+
+        priv->regs_dir = debugfs_create_dir("registers", priv->debugfs_dir);
+        if (!priv->regs_dir)
+                goto exit;
+
+        for (i=0; i<ARRAY_SIZE(debugfs_regs_files); i++) {
+                files = &debugfs_regs_files[i];
+                priv->debugfs_regs_files[i] = debugfs_create_file(files->name,
+                                                             files->perm,
+                                                             priv->regs_dir,
+                                                             priv,
+                                                             &files->fops);
+        }
+
+#ifdef PROC_DEBUG
+        libertas_debug_init(priv, dev);
+#endif
+exit:
+        return;
+}
+
+void libertas_debugfs_remove_one(wlan_private *priv)
+{
+        int i;
+
+        for(i=0; i<ARRAY_SIZE(debugfs_regs_files); i++)
+                debugfs_remove(priv->debugfs_regs_files[i]);
+
+        debugfs_remove(priv->regs_dir);
+
+        for(i=0; i<ARRAY_SIZE(debugfs_files); i++)
+                debugfs_remove(priv->debugfs_events_files[i]);
+
+        debugfs_remove(priv->events_dir);
+#ifdef PROC_DEBUG
+        debugfs_remove(priv->debugfs_debug);
+#endif
+        for(i=0; i<ARRAY_SIZE(debugfs_files); i++)
+                debugfs_remove(priv->debugfs_files[i]);
+}
+
+/* debug entry */
+
+#define item_size(n)    (FIELD_SIZEOF(wlan_adapter, n))
+#define item_addr(n)    (offsetof(wlan_adapter, n))
+
+struct debug_data {
+        char name[32];
+        u32 size;
+        u32 addr;
+};
+
+/* To debug any member of wlan_adapter, simply add one line here.
+ */
+static struct debug_data items[] = {
+        {"intcounter", item_size(intcounter), item_addr(intcounter)},
+        {"psmode", item_size(psmode), item_addr(psmode)},
+        {"psstate", item_size(psstate), item_addr(psstate)},
+};
+
+static int num_of_items = ARRAY_SIZE(items);
+
+/**
+ *  @brief proc read function
+ *
+ *  @param page    pointer to buffer
+ *  @param s       read data starting position
+ *  @param off     offset
+ *  @param cnt     counter
+ *  @param eof     end of file flag
+ *  @param data    data to output
+ *  @return        number of output data
+ */
+static ssize_t wlan_debugfs_read(struct file *file, char __user *userbuf,
+                        size_t count, loff_t *ppos)
+{
+        int val = 0;
+        size_t pos = 0;
+        ssize_t res;
+        char *p;
+        int i;
+        struct debug_data *d;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+
+        p = buf;
+
+        d = (struct debug_data *)file->private_data;
+
+        for (i = 0; i < num_of_items; i++) {
+                if (d[i].size == 1)
+                        val = *((u8 *) d[i].addr);
+                else if (d[i].size == 2)
+                        val = *((u16 *) d[i].addr);
+                else if (d[i].size == 4)
+                        val = *((u32 *) d[i].addr);
+
+                pos += sprintf(p + pos, "%s=%d\n", d[i].name, val);
+        }
+
+        res = simple_read_from_buffer(userbuf, count, ppos, p, pos);
+
+        free_page(addr);
+        return res;
+}
+
+/**
+ *  @brief proc write function
+ *
+ *  @param f       file pointer
+ *  @param buf     pointer to data buffer
+ *  @param cnt     data number to write
+ *  @param data    data to write
+ *  @return        number of data
+ */
+static int wlan_debugfs_write(struct file *f, const char __user *buf,
+                            size_t cnt, loff_t *ppos)
+{
+        int r, i;
+        char *pdata;
+        char *p;
+        char *p0;
+        char *p1;
+        char *p2;
+        struct debug_data *d = (struct debug_data *)f->private_data;
+
+        pdata = (char *)kmalloc(cnt, GFP_KERNEL);
+        if (pdata == NULL)
+                return 0;
+
+        if (copy_from_user(pdata, buf, cnt)) {
+                lbs_pr_debug(1, "Copy from user failed\n");
+                kfree(pdata);
+                return 0;
+        }
+
+        p0 = pdata;
+        for (i = 0; i < num_of_items; i++) {
+                do {
+                        p = strstr(p0, d[i].name);
+                        if (p == NULL)
+                                break;
+                        p1 = strchr(p, '\n');
+                        if (p1 == NULL)
+                                break;
+                        p0 = p1++;
+                        p2 = strchr(p, '=');
+                        if (!p2)
+                                break;
+                        p2++;
+                        r = simple_strtoul(p2, NULL, 0);
+                        if (d[i].size == 1)
+                                *((u8 *) d[i].addr) = (u8) r;
+                        else if (d[i].size == 2)
+                                *((u16 *) d[i].addr) = (u16) r;
+                        else if (d[i].size == 4)
+                                *((u32 *) d[i].addr) = (u32) r;
+                        break;
+                } while (1);
+        }
+        kfree(pdata);
+
+        return cnt;
+}
+
+static struct file_operations libertas_debug_fops = {
+        .owner = THIS_MODULE,
+        .open = open_file_generic,
+        .write = wlan_debugfs_write,
+        .read = wlan_debugfs_read,
+};
+
+/**
+ *  @brief create debug proc file
+ *
+ *  @param priv    pointer wlan_private
+ *  @param dev     pointer net_device
+ *  @return        N/A
+ */
+void libertas_debug_init(wlan_private * priv, struct net_device *dev)
+{
+        int i;
+
+        if (!priv->debugfs_dir)
+                return;
+
+        for (i = 0; i < num_of_items; i++)
+                items[i].addr += (u32) priv->adapter;
+
+        priv->debugfs_debug = debugfs_create_file("debug", 0644,
+                                                  priv->debugfs_dir, &items[0],
+                                                  &libertas_debug_fops);
+}
+
+/**
+ *  @brief remove proc file
+ *
+ *  @param priv    pointer wlan_private
+ *  @return        N/A
+ */
+void libertas_debug_remove(wlan_private * priv)
+{
+        debugfs_remove(priv->debugfs_debug);
+}
diff --git a/drivers/net/wireless/libertas/debugfs.h b/drivers/net/wireless/libertas/debugfs.h
new file mode 100644
index 000000000000..880a11b95d26
--- /dev/null
+++ b/drivers/net/wireless/libertas/debugfs.h
@@ -0,0 +1,6 @@
+void libertas_debugfs_init(void);
+void libertas_debugfs_remove(void);
+
+void libertas_debugfs_init_one(wlan_private *priv, struct net_device *dev);
+void libertas_debugfs_remove_one(wlan_private *priv);
+
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
new file mode 100644
index 000000000000..606bdd002be7
--- /dev/null
+++ b/drivers/net/wireless/libertas/decl.h
@@ -0,0 +1,83 @@
+/**
+  *  This file contains declaration referring to
+  *  functions defined in other source files
+  */
+
+#ifndef _WLAN_DECL_H_
+#define _WLAN_DECL_H_
+
+#include "defs.h"
+
+/** Function Prototype Declaration */
+struct wlan_private;
+struct sk_buff;
+struct net_device;
+
+extern char *libertas_fw_name;
+
+void libertas_free_adapter(wlan_private * priv);
+int libertas_set_mac_packet_filter(wlan_private * priv);
+
+int libertas_send_null_packet(wlan_private * priv, u8 pwr_mgmt);
+void libertas_send_tx_feedback(wlan_private * priv);
+u8 libertas_check_last_packet_indication(wlan_private * priv);
+
+int libertas_free_cmd_buffer(wlan_private * priv);
+struct cmd_ctrl_node;
+struct cmd_ctrl_node *libertas_get_free_cmd_ctrl_node(wlan_private * priv);
+
+void libertas_set_cmd_ctrl_node(wlan_private * priv,
+                    struct cmd_ctrl_node *ptempnode,
+                    u32 cmd_oid, u16 wait_option, void *pdata_buf);
+
+int libertas_prepare_and_send_command(wlan_private * priv,
+                          u16 cmd_no,
+                          u16 cmd_action,
+                          u16 wait_option, u32 cmd_oid, void *pdata_buf);
+
+void libertas_queue_cmd(wlan_adapter * adapter, struct cmd_ctrl_node *cmdnode, u8 addtail);
+
+int libertas_allocate_cmd_buffer(wlan_private * priv);
+int libertas_execute_next_command(wlan_private * priv);
+int libertas_process_event(wlan_private * priv);
+void libertas_interrupt(struct net_device *);
+int libertas_set_radio_control(wlan_private * priv);
+u32 libertas_index_to_data_rate(u8 index);
+u8 libertas_data_rate_to_index(u32 rate);
+void libertas_get_fwversion(wlan_adapter * adapter, char *fwversion, int maxlen);
+
+int libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb);
+
+/** The proc fs interface */
+int libertas_process_rx_command(wlan_private * priv);
+int libertas_process_tx(wlan_private * priv, struct sk_buff *skb);
+void libertas_cleanup_and_insert_cmd(wlan_private * priv,
+                                        struct cmd_ctrl_node *ptempcmd);
+void __libertas_cleanup_and_insert_cmd(wlan_private * priv,
+                                        struct cmd_ctrl_node *ptempcmd);
+
+int libertas_set_regiontable(wlan_private * priv, u8 region, u8 band);
+
+int libertas_process_rxed_packet(wlan_private * priv, struct sk_buff *);
+
+void libertas_ps_sleep(wlan_private * priv, int wait_option);
+void libertas_ps_confirm_sleep(wlan_private * priv, u16 psmode);
+void libertas_ps_wakeup(wlan_private * priv, int wait_option);
+
+void libertas_tx_runqueue(wlan_private *priv);
+
+extern struct chan_freq_power *libertas_find_cfp_by_band_and_channel(
+                                wlan_adapter * adapter, u8 band, u16 channel);
+
+extern void libertas_mac_event_disconnected(wlan_private * priv);
+
+void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str);
+
+int reset_device(wlan_private *priv);
+/* main.c */
+extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band,
+                                                             int *cfp_no);
+wlan_private *wlan_add_card(void *card);
+int wlan_remove_card(void *card);
+
+#endif                          /* _WLAN_DECL_H_ */
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
new file mode 100644
index 000000000000..fb1478c1b87d
--- /dev/null
+++ b/drivers/net/wireless/libertas/defs.h
@@ -0,0 +1,369 @@
+/**
+  * This header file contains global constant/enum definitions,
+  * global variable declaration.
+  */
+#ifndef _WLAN_DEFS_H_
+#define _WLAN_DEFS_H_
+
+#include <linux/spinlock.h>
+
+extern unsigned int libertas_debug;
+
+#define DRV_NAME                "usb8xxx"
+
+#define lbs_pr_info(format, args...) \
+        printk(KERN_INFO DRV_NAME": " format, ## args)
+#define lbs_pr_err(format, args...) \
+        printk(KERN_ERR DRV_NAME": " format, ## args)
+#define lbs_pr_alert(format, args...) \
+        printk(KERN_ALERT DRV_NAME": " format, ## args)
+
+#ifdef DEBUG
+#define lbs_pr_debug(level, format, args...) \
+        do { if (libertas_debug >= level) \
+        printk(KERN_INFO DRV_NAME": " format, ##args); } while (0)
+#define lbs_dev_dbg(level, device, format, args...) \
+        lbs_pr_debug(level, "%s: " format, \
+        (device)->bus_id , ## args)
+
+static inline void lbs_dbg_hex(char *prompt, u8 * buf, int len)
+{
+        int i = 0;
+
+        if (!libertas_debug)
+                return;
+
+        printk(KERN_DEBUG "%s: ", prompt);
+        for (i = 1; i <= len; i++) {
+                printk(KERN_DEBUG "%02x ", (u8) * buf);
+                buf++;
+        }
+        printk("\n");
+}
+#else
+#define lbs_pr_debug(level, format, args...)            do {} while (0)
+#define lbs_dev_dbg(level, device, format, args...)     do {} while (0)
+#define lbs_dbg_hex(x,y,z)                              do {} while (0)
+#endif
+
+#define ENTER()                 lbs_pr_debug(1, "Enter: %s, %s:%i\n", \
+                                        __FUNCTION__, __FILE__, __LINE__)
+#define LEAVE()                 lbs_pr_debug(1, "Leave: %s, %s:%i\n", \
+                                        __FUNCTION__, __FILE__, __LINE__)
+
+/** Buffer Constants */
+
+/*      The size of SQ memory PPA, DPA are 8 DWORDs, that keep the physical
+*       addresses of TxPD buffers. Station has only 8 TxPD available, Whereas
+*       driver has more local TxPDs. Each TxPD on the host memory is associated
+*       with a Tx control node. The driver maintains 8 RxPD descriptors for
+*       station firmware to store Rx packet information.
+*
+*       Current version of MAC has a 32x6 multicast address buffer.
+*
+*       802.11b can have up to  14 channels, the driver keeps the
+*       BSSID(MAC address) of each APs or Ad hoc stations it has sensed.
+*/
+
+#define MRVDRV_MAX_MULTICAST_LIST_SIZE  32
+#define MRVDRV_NUM_OF_CMD_BUFFER        10
+#define MRVDRV_SIZE_OF_CMD_BUFFER       (2 * 1024)
+#define MRVDRV_MAX_CHANNEL_SIZE         14
+#define MRVDRV_MAX_BSSID_LIST           64
+#define MRVDRV_ASSOCIATION_TIME_OUT     255
+#define MRVDRV_SNAP_HEADER_LEN          8
+
+#define WLAN_UPLD_SIZE                  2312
+#define DEV_NAME_LEN                    32
+
+/** Misc constants */
+/* This section defines 802.11 specific contants */
+
+#define MRVDRV_MAX_BSS_DESCRIPTS                16
+#define MRVDRV_MAX_REGION_CODE                  6
+
+#define MRVDRV_IGNORE_MULTIPLE_DTIM             0xfffe
+#define MRVDRV_MIN_MULTIPLE_DTIM                1
+#define MRVDRV_MAX_MULTIPLE_DTIM                5
+#define MRVDRV_DEFAULT_MULTIPLE_DTIM            1
+
+#define MRVDRV_DEFAULT_LISTEN_INTERVAL          10
+
+#define MRVDRV_CHANNELS_PER_SCAN                4
+#define MRVDRV_MAX_CHANNELS_PER_SCAN            14
+
+#define MRVDRV_DEBUG_RX_PATH            0x00000001
+#define MRVDRV_DEBUG_TX_PATH            0x00000002
+
+#define MRVDRV_MIN_BEACON_INTERVAL              20
+#define MRVDRV_MAX_BEACON_INTERVAL              1000
+#define MRVDRV_BEACON_INTERVAL                  100
+
+/** TxPD status */
+
+/*      Station firmware use TxPD status field to report final Tx transmit
+*       result, Bit masks are used to present combined situations.
+*/
+
+#define MRVDRV_TxPD_POWER_MGMT_NULL_PACKET 0x01
+#define MRVDRV_TxPD_POWER_MGMT_LAST_PACKET 0x08
+
+/** Tx mesh flag */
+/* Currently we are using normal WDS flag as mesh flag.
+ * TODO: change to proper mesh flag when MAC understands it.
+ */
+#define TxPD_CONTROL_WDS_FRAME (1<<17)
+#define TxPD_MESH_FRAME TxPD_CONTROL_WDS_FRAME
+
+/** RxPD status */
+
+#define MRVDRV_RXPD_STATUS_OK                0x0001
+
+/** RxPD status - Received packet types */
+/** Rx mesh flag */
+/* Currently we are using normal WDS flag as mesh flag.
+ * TODO: change to proper mesh flag when MAC understands it.
+ */
+#define RxPD_CONTROL_WDS_FRAME (0x40)
+#define RxPD_MESH_FRAME RxPD_CONTROL_WDS_FRAME
+
+/** RSSI-related defines */
+/*      RSSI constants are used to implement 802.11 RSSI threshold
+*       indication. if the Rx packet signal got too weak for 5 consecutive
+*       times, miniport driver (driver) will report this event to wrapper
+*/
+
+#define MRVDRV_NF_DEFAULT_SCAN_VALUE            (-96)
+
+/** RTS/FRAG related defines */
+#define MRVDRV_RTS_MIN_VALUE            0
+#define MRVDRV_RTS_MAX_VALUE            2347
+#define MRVDRV_FRAG_MIN_VALUE           256
+#define MRVDRV_FRAG_MAX_VALUE           2346
+
+/* This is for firmware specific length */
+#define EXTRA_LEN       36
+
+#define MRVDRV_ETH_TX_PACKET_BUFFER_SIZE \
+        (ETH_FRAME_LEN + sizeof(struct txpd) + EXTRA_LEN)
+
+#define MRVDRV_ETH_RX_PACKET_BUFFER_SIZE \
+        (ETH_FRAME_LEN + sizeof(struct rxpd) \
+         + MRVDRV_SNAP_HEADER_LEN + EXTRA_LEN)
+
+#define CMD_F_HOSTCMD           (1 << 0)
+#define FW_CAPINFO_WPA          (1 << 0)
+
+/** WPA key LENGTH*/
+#define MRVL_MAX_KEY_WPA_KEY_LENGTH     32
+
+#define KEY_LEN_WPA_AES                 16
+#define KEY_LEN_WPA_TKIP                32
+#define KEY_LEN_WEP_104                 13
+#define KEY_LEN_WEP_40                  5
+
+#define RF_ANTENNA_1            0x1
+#define RF_ANTENNA_2            0x2
+#define RF_ANTENNA_AUTO         0xFFFF
+
+#define BAND_B                  (0x01)
+#define BAND_G                  (0x02)
+#define ALL_802_11_BANDS        (BAND_B | BAND_G)
+
+/** MACRO DEFINITIONS */
+#define CAL_NF(NF)                      ((s32)(-(s32)(NF)))
+#define CAL_RSSI(SNR, NF)               ((s32)((s32)(SNR) + CAL_NF(NF)))
+#define SCAN_RSSI(RSSI)                 (0x100 - ((u8)(RSSI)))
+
+#define DEFAULT_BCN_AVG_FACTOR          8
+#define DEFAULT_DATA_AVG_FACTOR         8
+#define AVG_SCALE                       100
+#define CAL_AVG_SNR_NF(AVG, SNRNF, N)         \
+                        (((AVG) == 0) ? ((u16)(SNRNF) * AVG_SCALE) : \
+                        ((((int)(AVG) * (N -1)) + ((u16)(SNRNF) * \
+                        AVG_SCALE))  / N))
+
+#define B_SUPPORTED_RATES               8
+#define G_SUPPORTED_RATES               14
+
+#define WLAN_SUPPORTED_RATES            14
+
+#define MAX_LEDS                        8
+
+#define IS_MESH_FRAME(x) (x->cb[6])
+#define SET_MESH_FRAME(x) (x->cb[6]=1)
+#define UNSET_MESH_FRAME(x) (x->cb[6]=0)
+
+/** Global Variable Declaration */
+typedef struct _wlan_private wlan_private;
+typedef struct _wlan_adapter wlan_adapter;
+extern const char libertas_driver_version[];
+extern u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE];
+
+extern u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES];
+
+extern u8 libertas_supported_rates[G_SUPPORTED_RATES];
+
+extern u8 libertas_adhoc_rates_g[G_SUPPORTED_RATES];
+
+extern u8 libertas_adhoc_rates_b[4];
+
+/** ENUM definition*/
+/** SNRNF_TYPE */
+enum SNRNF_TYPE {
+        TYPE_BEACON = 0,
+        TYPE_RXPD,
+        MAX_TYPE_B
+};
+
+/** SNRNF_DATA*/
+enum SNRNF_DATA {
+        TYPE_NOAVG = 0,
+        TYPE_AVG,
+        MAX_TYPE_AVG
+};
+
+/** WLAN_802_11_AUTH_ALG*/
+enum WLAN_802_11_AUTH_ALG {
+        AUTH_ALG_OPEN_SYSTEM = 1,
+        AUTH_ALG_SHARED_KEY = 2,
+        AUTH_ALG_NETWORK_EAP = 8,
+};
+
+/** WLAN_802_1X_AUTH_ALG */
+enum WLAN_802_1X_AUTH_ALG {
+        WLAN_1X_AUTH_ALG_NONE = 1,
+        WLAN_1X_AUTH_ALG_LEAP = 2,
+        WLAN_1X_AUTH_ALG_TLS = 4,
+        WLAN_1X_AUTH_ALG_TTLS = 8,
+        WLAN_1X_AUTH_ALG_MD5 = 16,
+};
+
+/** WLAN_802_11_ENCRYPTION_MODE */
+enum WLAN_802_11_ENCRYPTION_MODE {
+        CIPHER_NONE,
+        CIPHER_WEP40,
+        CIPHER_TKIP,
+        CIPHER_CCMP,
+        CIPHER_WEP104,
+};
+
+/** WLAN_802_11_POWER_MODE */
+enum WLAN_802_11_POWER_MODE {
+        wlan802_11powermodecam,
+        wlan802_11powermodemax_psp,
+        wlan802_11Powermodefast_psp,
+        /*not a real mode, defined as an upper bound */
+        wlan802_11powemodemax
+};
+
+/** PS_STATE */
+enum PS_STATE {
+        PS_STATE_FULL_POWER,
+        PS_STATE_AWAKE,
+        PS_STATE_PRE_SLEEP,
+        PS_STATE_SLEEP
+};
+
+/** DNLD_STATE */
+enum DNLD_STATE {
+        DNLD_RES_RECEIVED,
+        DNLD_DATA_SENT,
+        DNLD_CMD_SENT
+};
+
+/** WLAN_MEDIA_STATE */
+enum WLAN_MEDIA_STATE {
+        libertas_connected,
+        libertas_disconnected
+};
+
+/** WLAN_802_11_PRIVACY_FILTER */
+enum WLAN_802_11_PRIVACY_FILTER {
+        wlan802_11privfilteracceptall,
+        wlan802_11privfilter8021xWEP
+};
+
+/** mv_ms_type */
+enum mv_ms_type {
+        MVMS_DAT = 0,
+        MVMS_CMD = 1,
+        MVMS_TXDONE = 2,
+        MVMS_EVENT
+};
+
+/** WLAN_802_11_NETWORK_INFRASTRUCTURE */
+enum WLAN_802_11_NETWORK_INFRASTRUCTURE {
+        wlan802_11ibss,
+        wlan802_11infrastructure,
+        wlan802_11autounknown,
+        /*defined as upper bound */
+        wlan802_11infrastructuremax
+};
+
+/** WLAN_802_11_AUTHENTICATION_MODE */
+enum WLAN_802_11_AUTHENTICATION_MODE {
+        wlan802_11authmodeopen = 0x00,
+        wlan802_11authmodeshared = 0x01,
+        wlan802_11authmodenetworkEAP = 0x80,
+};
+
+/** WLAN_802_11_WEP_STATUS */
+enum WLAN_802_11_WEP_STATUS {
+        wlan802_11WEPenabled,
+        wlan802_11WEPdisabled,
+};
+
+/** SNMP_MIB_INDEX_e */
+enum SNMP_MIB_INDEX_e {
+        desired_bsstype_i = 0,
+        op_rateset_i,
+        bcnperiod_i,
+        dtimperiod_i,
+        assocrsp_timeout_i,
+        rtsthresh_i,
+        short_retrylim_i,
+        long_retrylim_i,
+        fragthresh_i,
+        dot11d_i,
+        dot11h_i,
+        manufid_i,
+        prodID_i,
+        manuf_oui_i,
+        manuf_name_i,
+        manuf_prodname_i,
+        manuf_prodver_i,
+};
+
+/** KEY_TYPE_ID */
+enum KEY_TYPE_ID {
+        KEY_TYPE_ID_WEP = 0,
+        KEY_TYPE_ID_TKIP,
+        KEY_TYPE_ID_AES
+};
+
+/** KEY_INFO_WPA (applies to both TKIP and AES/CCMP) */
+enum KEY_INFO_WPA {
+        KEY_INFO_WPA_MCAST = 0x01,
+        KEY_INFO_WPA_UNICAST = 0x02,
+        KEY_INFO_WPA_ENABLED = 0x04
+};
+
+/** SNMP_MIB_VALUE_e */
+enum SNMP_MIB_VALUE_e {
+        SNMP_MIB_VALUE_INFRA = 1,
+        SNMP_MIB_VALUE_ADHOC
+};
+
+/* Default values for fwt commands. */
+#define FWT_DEFAULT_METRIC 0
+#define FWT_DEFAULT_DIR 1
+#define FWT_DEFAULT_SSN 0xffffffff
+#define FWT_DEFAULT_DSN 0
+#define FWT_DEFAULT_HOPCOUNT 0
+#define FWT_DEFAULT_TTL 0
+#define FWT_DEFAULT_EXPIRATION 0
+#define FWT_DEFAULT_SLEEPMODE 0
+#define FWT_DEFAULT_SNR 0
+
+#endif                          /* _WLAN_DEFS_H_ */
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
new file mode 100644
index 000000000000..b1f876f9693b
--- /dev/null
+++ b/drivers/net/wireless/libertas/dev.h
@@ -0,0 +1,403 @@
+/**
+  * This file contains definitions and data structures specific
+  * to Marvell 802.11 NIC. It contains the Device Information
+  * structure wlan_adapter.
+  */
+#ifndef _WLAN_DEV_H_
+#define _WLAN_DEV_H_
+
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <linux/ethtool.h>
+#include <linux/debugfs.h>
+
+#include "defs.h"
+#include "scan.h"
+#include "thread.h"
+
+extern struct ethtool_ops libertas_ethtool_ops;
+
+#define MAX_BSSID_PER_CHANNEL           16
+
+#define NR_TX_QUEUE                     3
+
+/* For the extended Scan */
+#define MAX_EXTENDED_SCAN_BSSID_LIST    MAX_BSSID_PER_CHANNEL * \
+                                                MRVDRV_MAX_CHANNEL_SIZE + 1
+
+#define MAX_REGION_CHANNEL_NUM  2
+
+/** Chan-freq-TxPower mapping table*/
+struct chan_freq_power {
+        /** channel Number              */
+        u16 channel;
+        /** frequency of this channel   */
+        u32 freq;
+        /** Max allowed Tx power level  */
+        u16 maxtxpower;
+        /** TRUE:channel unsupported;  FLASE:supported*/
+        u8 unsupported;
+};
+
+/** region-band mapping table*/
+struct region_channel {
+        /** TRUE if this entry is valid              */
+        u8 valid;
+        /** region code for US, Japan ...            */
+        u8 region;
+        /** band B/G/A, used for BAND_CONFIG cmd             */
+        u8 band;
+        /** Actual No. of elements in the array below */
+        u8 nrcfp;
+        /** chan-freq-txpower mapping table*/
+        struct chan_freq_power *CFP;
+};
+
+struct wlan_802_11_security {
+        u8 WPAenabled;
+        u8 WPA2enabled;
+        enum WLAN_802_11_WEP_STATUS WEPstatus;
+        enum WLAN_802_11_AUTHENTICATION_MODE authmode;
+        enum WLAN_802_1X_AUTH_ALG auth1xalg;
+        enum WLAN_802_11_ENCRYPTION_MODE Encryptionmode;
+};
+
+/** Current Basic Service Set State Structure */
+struct current_bss_params {
+        struct bss_descriptor bssdescriptor;
+        /** bssid */
+        u8 bssid[ETH_ALEN];
+        /** ssid */
+        struct WLAN_802_11_SSID ssid;
+
+        /** band */
+        u8 band;
+        /** channel */
+        u8 channel;
+        /** number of rates supported */
+        int numofrates;
+        /** supported rates*/
+        u8 datarates[WLAN_SUPPORTED_RATES];
+};
+
+/** sleep_params */
+struct sleep_params {
+        u16 sp_error;
+        u16 sp_offset;
+        u16 sp_stabletime;
+        u8 sp_calcontrol;
+        u8 sp_extsleepclk;
+        u16 sp_reserved;
+};
+
+/** Data structure for the Marvell WLAN device */
+typedef struct _wlan_dev {
+        /** device name */
+        char name[DEV_NAME_LEN];
+        /** card pointer */
+        void *card;
+        /** IO port */
+        u32 ioport;
+        /** Upload received */
+        u32 upld_rcv;
+        /** Upload type */
+        u32 upld_typ;
+        /** Upload length */
+        u32 upld_len;
+        /** netdev pointer */
+        struct net_device *netdev;
+        /* Upload buffer */
+        u8 upld_buf[WLAN_UPLD_SIZE];
+        /* Download sent:
+           bit0 1/0=data_sent/data_tx_done,
+           bit1 1/0=cmd_sent/cmd_tx_done,
+           all other bits reserved 0 */
+        u8 dnld_sent;
+} wlan_dev_t, *pwlan_dev_t;
+
+/* Mesh statistics */
+struct wlan_mesh_stats {
+        u32     fwd_bcast_cnt;          /* Fwd: Broadcast counter */
+        u32     fwd_unicast_cnt;        /* Fwd: Unicast counter */
+        u32     fwd_drop_ttl;           /* Fwd: TTL zero */
+        u32     fwd_drop_rbt;           /* Fwd: Recently Broadcasted */
+        u32     fwd_drop_noroute;       /* Fwd: No route to Destination */
+        u32     fwd_drop_nobuf;         /* Fwd: Run out of internal buffers */
+        u32     drop_blind;             /* Rx:  Dropped by blinding table */
+};
+
+/** Private structure for the MV device */
+struct _wlan_private {
+        int open;
+        int mesh_open;
+        int infra_open;
+
+        wlan_adapter *adapter;
+        wlan_dev_t wlan_dev;
+
+        struct net_device_stats stats;
+        struct net_device *mesh_dev ; /* Virtual device */
+
+        struct iw_statistics wstats;
+        struct wlan_mesh_stats mstats;
+        struct dentry *debugfs_dir;
+        struct dentry *debugfs_debug;
+        struct dentry *debugfs_files[6];
+
+        struct dentry *events_dir;
+        struct dentry *debugfs_events_files[6];
+
+        struct dentry *regs_dir;
+        struct dentry *debugfs_regs_files[6];
+
+        u32 mac_offset;
+        u32 bbp_offset;
+        u32 rf_offset;
+
+        const struct firmware *firmware;
+        struct device *hotplug_device;
+
+        /** thread to service interrupts */
+        struct wlan_thread mainthread;
+
+        struct delayed_work assoc_work;
+        struct workqueue_struct *assoc_thread;
+};
+
+/** Association request
+ *
+ * Encapsulates all the options that describe a specific assocation request
+ * or configuration of the wireless card's radio, mode, and security settings.
+ */
+struct assoc_request {
+#define ASSOC_FLAG_SSID                 1
+#define ASSOC_FLAG_CHANNEL              2
+#define ASSOC_FLAG_MODE                 3
+#define ASSOC_FLAG_BSSID                4
+#define ASSOC_FLAG_WEP_KEYS             5
+#define ASSOC_FLAG_WEP_TX_KEYIDX        6
+#define ASSOC_FLAG_WPA_MCAST_KEY        7
+#define ASSOC_FLAG_WPA_UCAST_KEY        8
+#define ASSOC_FLAG_SECINFO              9
+#define ASSOC_FLAG_WPA_IE               10
+        unsigned long flags;
+
+        struct WLAN_802_11_SSID ssid;
+        u8 channel;
+        enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode;
+        u8 bssid[ETH_ALEN];
+
+        /** WEP keys */
+        struct WLAN_802_11_KEY wep_keys[4];
+        u16 wep_tx_keyidx;
+
+        /** WPA keys */
+        struct WLAN_802_11_KEY wpa_mcast_key;
+        struct WLAN_802_11_KEY wpa_unicast_key;
+
+        struct wlan_802_11_security secinfo;
+
+        /** WPA Information Elements*/
+#define MAX_WPA_IE_LEN 64
+        u8 wpa_ie[MAX_WPA_IE_LEN];
+        u8 wpa_ie_len;
+};
+
+/** Wlan adapter data structure*/
+struct _wlan_adapter {
+        /** STATUS variables */
+        u32 fwreleasenumber;
+        u32 fwcapinfo;
+        /* protected with big lock */
+
+        struct mutex lock;
+
+        u8 tmptxbuf[WLAN_UPLD_SIZE];
+        /* protected by hard_start_xmit serialization */
+
+        /** command-related variables */
+        u16 seqnum;
+        /* protected by big lock */
+
+        struct cmd_ctrl_node *cmd_array;
+        /** Current command */
+        struct cmd_ctrl_node *cur_cmd;
+        int cur_cmd_retcode;
+        /** command Queues */
+        /** Free command buffers */
+        struct list_head cmdfreeq;
+        /** Pending command buffers */
+        struct list_head cmdpendingq;
+
+        wait_queue_head_t cmd_pending;
+        u8 nr_cmd_pending;
+        /* command related variables protected by adapter->driver_lock */
+
+        /** Async and Sync Event variables */
+        u32 intcounter;
+        u32 eventcause;
+        u8 nodename[16];        /* nickname */
+
+        /** spin locks */
+        spinlock_t driver_lock;
+
+        /** Timers */
+        struct timer_list command_timer;
+
+        /* TX queue used in PS mode */
+        spinlock_t txqueue_lock;
+        struct sk_buff *tx_queue_ps[NR_TX_QUEUE];
+        unsigned int tx_queue_idx;
+
+        u8 hisregcpy;
+
+        /** current ssid/bssid related parameters*/
+        struct current_bss_params curbssparams;
+
+        enum WLAN_802_11_NETWORK_INFRASTRUCTURE inframode;
+
+        struct bss_descriptor *pattemptedbssdesc;
+
+        struct WLAN_802_11_SSID previousssid;
+        u8 previousbssid[ETH_ALEN];
+
+        struct bss_descriptor *scantable;
+        u32 numinscantable;
+
+        u8 scantype;
+        u32 scanmode;
+
+        u16 beaconperiod;
+        u8 adhoccreate;
+
+        /** capability Info used in Association, start, join */
+        struct ieeetypes_capinfo capinfo;
+
+        /** MAC address information */
+        u8 current_addr[ETH_ALEN];
+        u8 multicastlist[MRVDRV_MAX_MULTICAST_LIST_SIZE][ETH_ALEN];
+        u32 nr_of_multicastmacaddr;
+
+        /** 802.11 statistics */
+//      struct cmd_DS_802_11_GET_STAT wlan802_11Stat;
+
+        u16 enablehwauto;
+        u16 ratebitmap;
+        /** control G rates */
+        u8 adhoc_grate_enabled;
+
+        u32 txantenna;
+        u32 rxantenna;
+
+        u8 adhocchannel;
+        u32 fragthsd;
+        u32 rtsthsd;
+
+        u32 datarate;
+        u8 is_datarate_auto;
+
+        u16 listeninterval;
+        u16 prescan;
+        u8 txretrycount;
+
+        /** Tx-related variables (for single packet tx) */
+        struct sk_buff *currenttxskb;
+        u16 TxLockFlag;
+
+        /** NIC Operation characteristics */
+        u16 currentpacketfilter;
+        u32 connect_status;
+        u16 regioncode;
+        u16 regiontableindex;
+        u16 txpowerlevel;
+
+        /** POWER MANAGEMENT AND PnP SUPPORT */
+        u8 surpriseremoved;
+        u16 atimwindow;
+
+        u16 psmode;             /* Wlan802_11PowermodeCAM=disable
+                                   Wlan802_11PowermodeMAX_PSP=enable */
+        u16 multipledtim;
+        u32 psstate;
+        u8 needtowakeup;
+
+        struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep;
+        u16 locallisteninterval;
+        u16 nullpktinterval;
+
+        struct assoc_request * assoc_req;
+
+        /** Encryption parameter */
+        struct wlan_802_11_security secinfo;
+
+        /** WEP keys */
+        struct WLAN_802_11_KEY wep_keys[4];
+        u16 wep_tx_keyidx;
+
+        /** WPA keys */
+        struct WLAN_802_11_KEY wpa_mcast_key;
+        struct WLAN_802_11_KEY wpa_unicast_key;
+
+        /** WPA Information Elements*/
+#define MAX_WPA_IE_LEN 64
+        u8 wpa_ie[MAX_WPA_IE_LEN];
+        u8 wpa_ie_len;
+
+        u16 rxantennamode;
+        u16 txantennamode;
+
+        /** Requested Signal Strength*/
+        u16 bcn_avg_factor;
+        u16 data_avg_factor;
+        u16 SNR[MAX_TYPE_B][MAX_TYPE_AVG];
+        u16 NF[MAX_TYPE_B][MAX_TYPE_AVG];
+        u8 RSSI[MAX_TYPE_B][MAX_TYPE_AVG];
+        u8 rawSNR[DEFAULT_DATA_AVG_FACTOR];
+        u8 rawNF[DEFAULT_DATA_AVG_FACTOR];
+        u16 nextSNRNF;
+        u16 numSNRNF;
+        u16 rxpd_rate;
+
+        u8 radioon;
+        u32 preamble;
+
+        /** Multi bands Parameter*/
+        u8 libertas_supported_rates[G_SUPPORTED_RATES];
+
+        /** Blue Tooth Co-existence Arbitration */
+
+        /** sleep_params */
+        struct sleep_params sp;
+
+        /** RF calibration data */
+
+#define MAX_REGION_CHANNEL_NUM  2
+        /** region channel data */
+        struct region_channel region_channel[MAX_REGION_CHANNEL_NUM];
+
+        struct region_channel universal_channel[MAX_REGION_CHANNEL_NUM];
+
+        /** 11D and Domain Regulatory Data */
+        struct wlan_802_11d_domain_reg domainreg;
+        struct parsed_region_chan_11d parsed_region_chan;
+
+        /** FSM variable for 11d support */
+        u32 enable11d;
+
+        /**     MISCELLANEOUS */
+        u8 *prdeeprom;
+        struct wlan_offset_value offsetvalue;
+
+        struct cmd_ds_802_11_get_log logmsg;
+        u16 scanprobes;
+
+        u32 pkttxctrl;
+
+        u16 txrate;
+        u32 linkmode;
+        u32 radiomode;
+        u32 debugmode;
+        u8 fw_ready;
+};
+
+#endif                          /* _WLAN_DEV_H_ */
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
new file mode 100644
index 000000000000..0064de542963
--- /dev/null
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -0,0 +1,184 @@
+
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/delay.h>
+
+#include "host.h"
+#include "sbi.h"
+#include "decl.h"
+#include "defs.h"
+#include "dev.h"
+#include "join.h"
+#include "wext.h"
+static const char * mesh_stat_strings[]= {
+                        "drop_duplicate_bcast",
+                        "drop_ttl_zero",
+                        "drop_no_fwd_route",
+                        "drop_no_buffers",
+                        "fwded_unicast_cnt",
+                        "fwded_bcast_cnt",
+                        "drop_blind_table"
+};
+
+static void libertas_ethtool_get_drvinfo(struct net_device *dev,
+                                         struct ethtool_drvinfo *info)
+{
+        wlan_private *priv = (wlan_private *) dev->priv;
+        char fwver[32];
+
+        libertas_get_fwversion(priv->adapter, fwver, sizeof(fwver) - 1);
+
+        strcpy(info->driver, "libertas");
+        strcpy(info->version, libertas_driver_version);
+        strcpy(info->fw_version, fwver);
+}
+
+/* All 8388 parts have 16KiB EEPROM size at the time of writing.
+ * In case that changes this needs fixing.
+ */
+#define LIBERTAS_EEPROM_LEN 16384
+
+static int libertas_ethtool_get_eeprom_len(struct net_device *dev)
+{
+        return LIBERTAS_EEPROM_LEN;
+}
+
+static int libertas_ethtool_get_eeprom(struct net_device *dev,
+                                  struct ethtool_eeprom *eeprom, u8 * bytes)
+{
+        wlan_private *priv = (wlan_private *) dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct wlan_ioctl_regrdwr regctrl;
+        char *ptr;
+        int ret;
+
+        regctrl.action = 0;
+        regctrl.offset = eeprom->offset;
+        regctrl.NOB = eeprom->len;
+
+        if (eeprom->offset + eeprom->len > LIBERTAS_EEPROM_LEN)
+                return -EINVAL;
+
+//      mutex_lock(&priv->mutex);
+
+        adapter->prdeeprom =
+                    (char *)kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
+        if (!adapter->prdeeprom)
+                return -ENOMEM;
+        memcpy(adapter->prdeeprom, &regctrl, sizeof(regctrl));
+
+        /* +14 is for action, offset, and NOB in
+         * response */
+        lbs_pr_debug(1, "action:%d offset: %x NOB: %02x\n",
+               regctrl.action, regctrl.offset, regctrl.NOB);
+
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_eeprom_access,
+                                    regctrl.action,
+                                    cmd_option_waitforrsp, 0,
+                                    &regctrl);
+
+        if (ret) {
+                if (adapter->prdeeprom)
+                        kfree(adapter->prdeeprom);
+                LEAVE();
+                        return ret;
+        }
+
+        mdelay(10);
+
+        ptr = (char *)adapter->prdeeprom;
+
+        /* skip the command header, but include the "value" u32 variable */
+        ptr = ptr + sizeof(struct wlan_ioctl_regrdwr) - 4;
+
+        /*
+         * Return the result back to the user
+         */
+        memcpy(bytes, ptr, eeprom->len);
+
+        if (adapter->prdeeprom)
+                kfree(adapter->prdeeprom);
+//      mutex_unlock(&priv->mutex);
+
+        return 0;
+}
+
+static void libertas_ethtool_get_stats(struct net_device * dev,
+                                struct ethtool_stats * stats, u64 * data)
+{
+        wlan_private *priv = dev->priv;
+
+        ENTER();
+
+        stats->cmd = ETHTOOL_GSTATS;
+        BUG_ON(stats->n_stats != MESH_STATS_NUM);
+
+        data[0] = priv->mstats.fwd_drop_rbt;
+        data[1] = priv->mstats.fwd_drop_ttl;
+        data[2] = priv->mstats.fwd_drop_noroute;
+        data[3] = priv->mstats.fwd_drop_nobuf;
+        data[4] = priv->mstats.fwd_unicast_cnt;
+        data[5] = priv->mstats.fwd_bcast_cnt;
+        data[6] = priv->mstats.drop_blind;
+
+        LEAVE();
+}
+
+static int libertas_ethtool_get_stats_count(struct net_device * dev)
+{
+        int ret;
+        wlan_private *priv = dev->priv;
+        struct cmd_ds_mesh_access mesh_access;
+
+        ENTER();
+        /* Get Mesh Statistics */
+        ret = libertas_prepare_and_send_command(priv,
+                        cmd_mesh_access, cmd_act_mesh_get_stats,
+                        cmd_option_waitforrsp, 0, &mesh_access);
+
+        if (ret) {
+                LEAVE();
+                return 0;
+        }
+
+        priv->mstats.fwd_drop_rbt = mesh_access.data[0];
+        priv->mstats.fwd_drop_ttl = mesh_access.data[1];
+        priv->mstats.fwd_drop_noroute = mesh_access.data[2];
+        priv->mstats.fwd_drop_nobuf = mesh_access.data[3];
+        priv->mstats.fwd_unicast_cnt = mesh_access.data[4];
+        priv->mstats.fwd_bcast_cnt = mesh_access.data[5];
+        priv->mstats.drop_blind = mesh_access.data[6];
+
+        LEAVE();
+        return MESH_STATS_NUM;
+}
+
+static void libertas_ethtool_get_strings (struct net_device * dev,
+                                          u32 stringset,
+                                          u8 * s)
+{
+        int i;
+
+        ENTER();
+        switch (stringset) {
+        case ETH_SS_STATS:
+                for (i=0; i < MESH_STATS_NUM; i++) {
+                        memcpy(s + i * ETH_GSTRING_LEN,
+                                        mesh_stat_strings[i],
+                                        ETH_GSTRING_LEN);
+                }
+                break;
+        }
+        LEAVE();
+}
+
+struct ethtool_ops libertas_ethtool_ops = {
+        .get_drvinfo = libertas_ethtool_get_drvinfo,
+        .get_eeprom =  libertas_ethtool_get_eeprom,
+        .get_eeprom_len = libertas_ethtool_get_eeprom_len,
+        .get_stats_count = libertas_ethtool_get_stats_count,
+        .get_ethtool_stats = libertas_ethtool_get_stats,
+        .get_strings = libertas_ethtool_get_strings,
+};
+
diff --git a/drivers/net/wireless/libertas/fw.c b/drivers/net/wireless/libertas/fw.c
new file mode 100644
index 000000000000..b194a4570791
--- /dev/null
+++ b/drivers/net/wireless/libertas/fw.c
@@ -0,0 +1,361 @@
+/**
+  * This file contains the initialization for FW and HW
+  */
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+#include <linux/vmalloc.h>
+#include <linux/firmware.h>
+#include <linux/version.h>
+
+#include "host.h"
+#include "sbi.h"
+#include "defs.h"
+#include "decl.h"
+#include "dev.h"
+#include "fw.h"
+#include "wext.h"
+#include "if_usb.h"
+
+char *libertas_fw_name = NULL;
+module_param_named(fw_name, libertas_fw_name, charp, 0644);
+
+unsigned int libertas_debug = 0;
+module_param(libertas_debug, int, 0);
+
+/**
+ *  @brief This function checks the validity of Boot2/FW image.
+ *
+ *  @param data              pointer to image
+ *         len               image length
+ *  @return     0 or -1
+ */
+static int check_fwfile_format(u8 *data, u32 totlen)
+{
+        u8  bincmd, exit;
+        u32 blksize, offset, len;
+        int ret;
+
+        ret = 1;
+        exit = len = 0;
+
+        do {
+                bincmd = *data;
+                blksize = *(u32*)(data + offsetof(struct fwheader, datalength));
+                switch (bincmd) {
+                case FW_HAS_DATA_TO_RECV:
+                        offset = sizeof(struct fwheader) + blksize;
+                        data += offset;
+                        len += offset;
+                        if (len >= totlen)
+                                exit = 1;
+                        break;
+                case FW_HAS_LAST_BLOCK:
+                        exit = 1;
+                        ret = 0;
+                        break;
+                default:
+                        exit = 1;
+                        break;
+                }
+        } while (!exit);
+
+        if (ret)
+                lbs_pr_err("bin file format check FAIL...\n");
+        else
+                lbs_pr_debug(1, "bin file format check PASS...\n");
+
+        return ret;
+}
+
+/**
+ *  @brief This function downloads firmware image, gets
+ *  HW spec from firmware and set basic parameters to
+ *  firmware.
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @return        0 or -1
+ */
+static int wlan_setup_station_hw(wlan_private * priv)
+{
+        int ret = -1;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if ((ret = request_firmware(&priv->firmware, libertas_fw_name,
+                                    priv->hotplug_device)) < 0) {
+                lbs_pr_err("request_firmware() failed, error code = %#x\n",
+                       ret);
+                lbs_pr_err("%s not found in /lib/firmware\n", libertas_fw_name);
+                goto done;
+        }
+
+        if(check_fwfile_format(priv->firmware->data, priv->firmware->size)) {
+                release_firmware(priv->firmware);
+                goto done;
+        }
+
+        ret = libertas_sbi_prog_firmware(priv);
+
+        release_firmware(priv->firmware);
+
+        if (ret) {
+                lbs_pr_debug(1, "Bootloader in invalid state!\n");
+                ret = -1;
+                goto done;
+        }
+
+        /*
+         * Read MAC address from HW
+         */
+        memset(adapter->current_addr, 0xff, ETH_ALEN);
+
+        ret = libertas_prepare_and_send_command(priv, cmd_get_hw_spec,
+                                    0, cmd_option_waitforrsp, 0, NULL);
+
+        if (ret) {
+                ret = -1;
+                goto done;
+        }
+
+        libertas_set_mac_packet_filter(priv);
+
+        /* Get the supported Data rates */
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_data_rate,
+                                    cmd_act_get_tx_rate,
+                                    cmd_option_waitforrsp, 0, NULL);
+
+        if (ret) {
+                ret = -1;
+                goto done;
+        }
+
+        ret = 0;
+done:
+        LEAVE();
+
+        return (ret);
+}
+
+static int wlan_allocate_adapter(wlan_private * priv)
+{
+        u32 ulbufsize;
+        wlan_adapter *adapter = priv->adapter;
+
+        struct bss_descriptor *ptempscantable;
+
+        /* Allocate buffer to store the BSSID list */
+        ulbufsize = sizeof(struct bss_descriptor) * MRVDRV_MAX_BSSID_LIST;
+        if (!(ptempscantable = kmalloc(ulbufsize, GFP_KERNEL))) {
+                libertas_free_adapter(priv);
+                return -1;
+        }
+
+        adapter->scantable = ptempscantable;
+        memset(adapter->scantable, 0, ulbufsize);
+
+        /* Allocate the command buffers */
+        libertas_allocate_cmd_buffer(priv);
+
+        memset(&adapter->libertas_ps_confirm_sleep, 0, sizeof(struct PS_CMD_ConfirmSleep));
+        adapter->libertas_ps_confirm_sleep.seqnum = cpu_to_le16(++adapter->seqnum);
+        adapter->libertas_ps_confirm_sleep.command =
+            cpu_to_le16(cmd_802_11_ps_mode);
+        adapter->libertas_ps_confirm_sleep.size =
+            cpu_to_le16(sizeof(struct PS_CMD_ConfirmSleep));
+        adapter->libertas_ps_confirm_sleep.result = 0;
+        adapter->libertas_ps_confirm_sleep.action =
+            cpu_to_le16(cmd_subcmd_sleep_confirmed);
+
+        return 0;
+}
+
+static void wlan_init_adapter(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int i;
+
+        adapter->scanprobes = 0;
+
+        adapter->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR;
+        adapter->data_avg_factor = DEFAULT_DATA_AVG_FACTOR;
+
+        /* ATIM params */
+        adapter->atimwindow = 0;
+
+        adapter->connect_status = libertas_disconnected;
+        memset(adapter->current_addr, 0xff, ETH_ALEN);
+
+        /* scan type */
+        adapter->scantype = cmd_scan_type_active;
+
+        /* scan mode */
+        adapter->scanmode = cmd_bss_type_any;
+
+        /* 802.11 specific */
+        adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;
+        for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);
+             i++)
+                memset(&adapter->wep_keys[i], 0, sizeof(struct WLAN_802_11_KEY));
+        adapter->wep_tx_keyidx = 0;
+        adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;
+        adapter->secinfo.authmode = wlan802_11authmodeopen;
+        adapter->secinfo.auth1xalg = WLAN_1X_AUTH_ALG_NONE;
+        adapter->secinfo.Encryptionmode = CIPHER_NONE;
+        adapter->inframode = wlan802_11infrastructure;
+
+        adapter->assoc_req = NULL;
+
+        adapter->numinscantable = 0;
+        adapter->pattemptedbssdesc = NULL;
+        mutex_init(&adapter->lock);
+
+        adapter->prescan = 1;
+
+        memset(&adapter->curbssparams, 0, sizeof(adapter->curbssparams));
+
+        /* PnP and power profile */
+        adapter->surpriseremoved = 0;
+
+        adapter->currentpacketfilter =
+            cmd_act_mac_rx_on | cmd_act_mac_tx_on;
+
+        adapter->radioon = RADIO_ON;
+        adapter->txantenna = RF_ANTENNA_2;
+        adapter->rxantenna = RF_ANTENNA_AUTO;
+
+        adapter->is_datarate_auto = 1;
+        adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;
+
+        // set default value of capinfo.
+#define SHORT_PREAMBLE_ALLOWED          1
+        memset(&adapter->capinfo, 0, sizeof(adapter->capinfo));
+        adapter->capinfo.shortpreamble = SHORT_PREAMBLE_ALLOWED;
+
+        adapter->adhocchannel = DEFAULT_AD_HOC_CHANNEL;
+
+        adapter->psmode = wlan802_11powermodecam;
+        adapter->multipledtim = MRVDRV_DEFAULT_MULTIPLE_DTIM;
+
+        adapter->listeninterval = MRVDRV_DEFAULT_LISTEN_INTERVAL;
+
+        adapter->psstate = PS_STATE_FULL_POWER;
+        adapter->needtowakeup = 0;
+        adapter->locallisteninterval = 0;       /* default value in firmware will be used */
+
+        adapter->datarate = 0;  // Initially indicate the rate as auto
+
+        adapter->adhoc_grate_enabled = 0;
+
+        adapter->intcounter = 0;
+
+        adapter->currenttxskb = NULL;
+        adapter->pkttxctrl = 0;
+
+        memset(&adapter->tx_queue_ps, 0, NR_TX_QUEUE*sizeof(struct sk_buff*));
+        adapter->tx_queue_idx = 0;
+        spin_lock_init(&adapter->txqueue_lock);
+
+        return;
+}
+
+static void command_timer_fn(unsigned long data);
+
+int libertas_init_fw(wlan_private * priv)
+{
+        int ret = -1;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        /* Allocate adapter structure */
+        if ((ret = wlan_allocate_adapter(priv)) != 0)
+                goto done;
+
+        /* init adapter structure */
+        wlan_init_adapter(priv);
+
+        /* init timer etc. */
+        setup_timer(&adapter->command_timer, command_timer_fn,
+                        (unsigned long)priv);
+
+        /* download fimrware etc. */
+        if ((ret = wlan_setup_station_hw(priv)) != 0) {
+                del_timer_sync(&adapter->command_timer);
+                goto done;
+        }
+
+        /* init 802.11d */
+        libertas_init_11d(priv);
+
+        ret = 0;
+done:
+        LEAVE();
+        return ret;
+}
+
+void libertas_free_adapter(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+
+        if (!adapter) {
+                lbs_pr_debug(1, "Why double free adapter?:)\n");
+                return;
+        }
+
+        lbs_pr_debug(1, "Free command buffer\n");
+        libertas_free_cmd_buffer(priv);
+
+        lbs_pr_debug(1, "Free commandTimer\n");
+        del_timer(&adapter->command_timer);
+
+        lbs_pr_debug(1, "Free scantable\n");
+        if (adapter->scantable) {
+                kfree(adapter->scantable);
+                adapter->scantable = NULL;
+        }
+
+        lbs_pr_debug(1, "Free adapter\n");
+
+        /* Free the adapter object itself */
+        kfree(adapter);
+        priv->adapter = NULL;
+}
+
+/**
+ *  This function handles the timeout of command sending.
+ *  It will re-send the same command again.
+ */
+static void command_timer_fn(unsigned long data)
+{
+        wlan_private *priv = (wlan_private *)data;
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *ptempnode;
+        struct cmd_ds_command *cmd;
+        unsigned long flags;
+
+        ptempnode = adapter->cur_cmd;
+        cmd = (struct cmd_ds_command *)ptempnode->bufvirtualaddr;
+
+        lbs_pr_info("command_timer_fn fired (%x)\n", cmd->command);
+
+        if (!adapter->fw_ready)
+                return;
+
+        if (ptempnode == NULL) {
+                lbs_pr_debug(1, "PTempnode Empty\n");
+                return;
+        }
+
+        spin_lock_irqsave(&adapter->driver_lock, flags);
+        adapter->cur_cmd = NULL;
+        spin_unlock_irqrestore(&adapter->driver_lock, flags);
+
+        lbs_pr_debug(1, "Re-sending same command as it timeout...!\n");
+        libertas_queue_cmd(adapter, ptempnode, 0);
+
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        return;
+}
diff --git a/drivers/net/wireless/libertas/fw.h b/drivers/net/wireless/libertas/fw.h
new file mode 100644
index 000000000000..1f9ae267a9e0
--- /dev/null
+++ b/drivers/net/wireless/libertas/fw.h
@@ -0,0 +1,13 @@
+/**
+  * This header file contains FW interface related definitions.
+  */
+#ifndef _WLAN_FW_H_
+#define _WLAN_FW_H_
+
+#ifndef DEV_NAME_LEN
+#define DEV_NAME_LEN            32
+#endif
+
+int libertas_init_fw(wlan_private * priv);
+
+#endif                          /* _WLAN_FW_H_ */
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
new file mode 100644
index 000000000000..c0faaecaf5be
--- /dev/null
+++ b/drivers/net/wireless/libertas/host.h
@@ -0,0 +1,338 @@
+/**
+  * This file contains definitions of WLAN commands.
+  */
+
+#ifndef _HOST_H_
+#define _HOST_H_
+
+/** PUBLIC DEFINITIONS */
+#define DEFAULT_AD_HOC_CHANNEL       6
+#define DEFAULT_AD_HOC_CHANNEL_A    36
+
+/** IEEE 802.11 oids */
+#define OID_802_11_SSID                       0x00008002
+#define OID_802_11_INFRASTRUCTURE_MODE        0x00008008
+#define OID_802_11_FRAGMENTATION_THRESHOLD    0x00008009
+#define OID_802_11_RTS_THRESHOLD              0x0000800A
+#define OID_802_11_TX_ANTENNA_SELECTED        0x0000800D
+#define OID_802_11_SUPPORTED_RATES            0x0000800E
+#define OID_802_11_STATISTICS                 0x00008012
+#define OID_802_11_TX_RETRYCOUNT              0x0000801D
+#define OID_802_11D_ENABLE                    0x00008020
+
+#define cmd_option_waitforrsp             0x0002
+
+/** Host command ID */
+#define cmd_code_dnld                 0x0002
+#define cmd_get_hw_spec               0x0003
+#define cmd_eeprom_update             0x0004
+#define cmd_802_11_reset              0x0005
+#define cmd_802_11_scan               0x0006
+#define cmd_802_11_get_log            0x000b
+#define cmd_mac_multicast_adr         0x0010
+#define cmd_802_11_authenticate       0x0011
+#define cmd_802_11_eeprom_access      0x0059
+#define cmd_802_11_associate          0x0050
+#define cmd_802_11_set_wep            0x0013
+#define cmd_802_11_get_stat           0x0014
+#define cmd_802_3_get_stat            0x0015
+#define cmd_802_11_snmp_mib           0x0016
+#define cmd_mac_reg_map               0x0017
+#define cmd_bbp_reg_map               0x0018
+#define cmd_mac_reg_access            0x0019
+#define cmd_bbp_reg_access            0x001a
+#define cmd_rf_reg_access             0x001b
+#define cmd_802_11_radio_control      0x001c
+#define cmd_802_11_rf_channel         0x001d
+#define cmd_802_11_rf_tx_power        0x001e
+#define cmd_802_11_rssi               0x001f
+#define cmd_802_11_rf_antenna         0x0020
+
+#define cmd_802_11_ps_mode            0x0021
+
+#define cmd_802_11_data_rate          0x0022
+#define cmd_rf_reg_map                0x0023
+#define cmd_802_11_deauthenticate     0x0024
+#define cmd_802_11_reassociate        0x0025
+#define cmd_802_11_disassociate       0x0026
+#define cmd_mac_control               0x0028
+#define cmd_802_11_ad_hoc_start       0x002b
+#define cmd_802_11_ad_hoc_join        0x002c
+
+#define cmd_802_11_query_tkip_reply_cntrs  0x002e
+#define cmd_802_11_enable_rsn              0x002f
+#define cmd_802_11_pairwise_tsc       0x0036
+#define cmd_802_11_group_tsc          0x0037
+#define cmd_802_11_key_material       0x005e
+
+#define cmd_802_11_set_afc            0x003c
+#define cmd_802_11_get_afc            0x003d
+
+#define cmd_802_11_ad_hoc_stop        0x0040
+
+#define cmd_802_11_beacon_stop        0x0049
+
+#define cmd_802_11_mac_address        0x004D
+#define cmd_802_11_eeprom_access      0x0059
+
+#define cmd_802_11_band_config        0x0058
+
+#define cmd_802_11d_domain_info       0x005b
+
+#define cmd_802_11_sleep_params          0x0066
+
+#define cmd_802_11_inactivity_timeout    0x0067
+
+#define cmd_802_11_tpc_cfg               0x0072
+#define cmd_802_11_pwr_cfg               0x0073
+
+#define cmd_802_11_led_gpio_ctrl         0x004e
+
+#define cmd_802_11_subscribe_event       0x0075
+
+#define cmd_802_11_rate_adapt_rateset    0x0076
+
+#define cmd_802_11_tx_rate_query        0x007f
+
+#define cmd_get_tsf                      0x0080
+
+#define cmd_bt_access                 0x0087
+#define cmd_ret_bt_access                 0x8087
+
+#define cmd_fwt_access                0x0088
+#define cmd_ret_fwt_access                0x8088
+
+#define cmd_mesh_access               0x0090
+#define cmd_ret_mesh_access               0x8090
+
+/* For the IEEE Power Save */
+#define cmd_subcmd_enter_ps               0x0030
+#define cmd_subcmd_exit_ps                0x0031
+#define cmd_subcmd_sleep_confirmed        0x0034
+#define cmd_subcmd_full_powerdown         0x0035
+#define cmd_subcmd_full_powerup           0x0036
+
+/* command RET code, MSB is set to 1 */
+#define cmd_ret_hw_spec_info              0x8003
+#define cmd_ret_eeprom_update             0x8004
+#define cmd_ret_802_11_reset              0x8005
+#define cmd_ret_802_11_scan               0x8006
+#define cmd_ret_802_11_get_log            0x800b
+#define cmd_ret_mac_control               0x8028
+#define cmd_ret_mac_multicast_adr         0x8010
+#define cmd_ret_802_11_authenticate       0x8011
+#define cmd_ret_802_11_deauthenticate     0x8024
+#define cmd_ret_802_11_associate          0x8012
+#define cmd_ret_802_11_reassociate        0x8025
+#define cmd_ret_802_11_disassociate       0x8026
+#define cmd_ret_802_11_set_wep            0x8013
+#define cmd_ret_802_11_stat               0x8014
+#define cmd_ret_802_3_stat                0x8015
+#define cmd_ret_802_11_snmp_mib           0x8016
+#define cmd_ret_mac_reg_map               0x8017
+#define cmd_ret_bbp_reg_map               0x8018
+#define cmd_ret_rf_reg_map                0x8023
+#define cmd_ret_mac_reg_access            0x8019
+#define cmd_ret_bbp_reg_access            0x801a
+#define cmd_ret_rf_reg_access             0x801b
+#define cmd_ret_802_11_radio_control      0x801c
+#define cmd_ret_802_11_rf_channel         0x801d
+#define cmd_ret_802_11_rssi               0x801f
+#define cmd_ret_802_11_rf_tx_power        0x801e
+#define cmd_ret_802_11_rf_antenna         0x8020
+#define cmd_ret_802_11_ps_mode            0x8021
+#define cmd_ret_802_11_data_rate          0x8022
+
+#define cmd_ret_802_11_ad_hoc_start       0x802B
+#define cmd_ret_802_11_ad_hoc_join        0x802C
+
+#define cmd_ret_802_11_query_tkip_reply_cntrs  0x802e
+#define cmd_ret_802_11_enable_rsn              0x802f
+#define cmd_ret_802_11_pairwise_tsc       0x8036
+#define cmd_ret_802_11_group_tsc          0x8037
+#define cmd_ret_802_11_key_material       0x805e
+
+#define cmd_enable_rsn                    0x0001
+#define cmd_disable_rsn                   0x0000
+
+#define cmd_act_set                       0x0001
+#define cmd_act_get                       0x0000
+
+#define cmd_act_get_AES                   (cmd_act_get + 2)
+#define cmd_act_set_AES                   (cmd_act_set + 2)
+#define cmd_act_remove_aes                (cmd_act_set + 3)
+
+#define cmd_ret_802_11_set_afc            0x803c
+#define cmd_ret_802_11_get_afc            0x803d
+
+#define cmd_ret_802_11_ad_hoc_stop        0x8040
+
+#define cmd_ret_802_11_beacon_stop        0x8049
+
+#define cmd_ret_802_11_mac_address        0x804D
+#define cmd_ret_802_11_eeprom_access      0x8059
+
+#define cmd_ret_802_11_band_config        0x8058
+
+#define cmd_ret_802_11_sleep_params          0x8066
+
+#define cmd_ret_802_11_inactivity_timeout    0x8067
+
+#define cmd_ret_802_11d_domain_info      (0x8000 |                  \
+                                              cmd_802_11d_domain_info)
+
+#define cmd_ret_802_11_tpc_cfg        (cmd_802_11_tpc_cfg | 0x8000)
+#define cmd_ret_802_11_pwr_cfg        (cmd_802_11_pwr_cfg | 0x8000)
+
+#define cmd_ret_802_11_led_gpio_ctrl     0x804e
+
+#define cmd_ret_802_11_subscribe_event  (cmd_802_11_subscribe_event | 0x8000)
+
+#define cmd_ret_802_11_rate_adapt_rateset       (cmd_802_11_rate_adapt_rateset | 0x8000)
+
+#define cmd_rte_802_11_tx_rate_query    (cmd_802_11_tx_rate_query | 0x8000)
+
+#define cmd_ret_get_tsf             0x8080
+
+/* Define action or option for cmd_802_11_set_wep */
+#define cmd_act_add                         0x0002
+#define cmd_act_remove                      0x0004
+#define cmd_act_use_default                 0x0008
+
+#define cmd_type_wep_40_bit                 0x0001
+#define cmd_type_wep_104_bit                0x0002
+
+#define cmd_NUM_OF_WEP_KEYS                 4
+
+#define cmd_WEP_KEY_INDEX_MASK              0x3fff
+
+/* Define action or option for cmd_802_11_reset */
+#define cmd_act_halt                        0x0003
+
+/* Define action or option for cmd_802_11_scan */
+#define cmd_bss_type_bss                    0x0001
+#define cmd_bss_type_ibss                   0x0002
+#define cmd_bss_type_any                    0x0003
+
+/* Define action or option for cmd_802_11_scan */
+#define cmd_scan_type_active                0x0000
+#define cmd_scan_type_passive               0x0001
+
+#define cmd_scan_radio_type_bg          0
+
+#define cmd_scan_probe_delay_time           0
+
+/* Define action or option for cmd_mac_control */
+#define cmd_act_mac_rx_on                   0x0001
+#define cmd_act_mac_tx_on                   0x0002
+#define cmd_act_mac_loopback_on             0x0004
+#define cmd_act_mac_wep_enable              0x0008
+#define cmd_act_mac_int_enable              0x0010
+#define cmd_act_mac_multicast_enable        0x0020
+#define cmd_act_mac_broadcast_enable        0x0040
+#define cmd_act_mac_promiscuous_enable      0x0080
+#define cmd_act_mac_all_multicast_enable    0x0100
+#define cmd_act_mac_strict_protection_enable  0x0400
+
+/* Define action or option for cmd_802_11_radio_control */
+#define cmd_type_auto_preamble              0x0001
+#define cmd_type_short_preamble             0x0002
+#define cmd_type_long_preamble              0x0003
+
+#define TURN_ON_RF                              0x01
+#define RADIO_ON                                0x01
+#define RADIO_OFF                               0x00
+
+#define SET_AUTO_PREAMBLE                       0x05
+#define SET_SHORT_PREAMBLE                      0x03
+#define SET_LONG_PREAMBLE                       0x01
+
+/* Define action or option for CMD_802_11_RF_CHANNEL */
+#define cmd_opt_802_11_rf_channel_get       0x00
+#define cmd_opt_802_11_rf_channel_set       0x01
+
+/* Define action or option for cmd_802_11_rf_tx_power */
+#define cmd_act_tx_power_opt_get            0x0000
+#define cmd_act_tx_power_opt_set_high       0x8007
+#define cmd_act_tx_power_opt_set_mid        0x8004
+#define cmd_act_tx_power_opt_set_low        0x8000
+
+#define cmd_act_tx_power_index_high         0x0007
+#define cmd_act_tx_power_index_mid          0x0004
+#define cmd_act_tx_power_index_low          0x0000
+
+/* Define action or option for cmd_802_11_data_rate */
+#define cmd_act_set_tx_auto                 0x0000
+#define cmd_act_set_tx_fix_rate             0x0001
+#define cmd_act_get_tx_rate                 0x0002
+
+#define cmd_act_set_rx                      0x0001
+#define cmd_act_set_tx                      0x0002
+#define cmd_act_set_both                    0x0003
+#define cmd_act_get_rx                      0x0004
+#define cmd_act_get_tx                      0x0008
+#define cmd_act_get_both                    0x000c
+
+/* Define action or option for cmd_802_11_ps_mode */
+#define cmd_type_cam                        0x0000
+#define cmd_type_max_psp                    0x0001
+#define cmd_type_fast_psp                   0x0002
+
+/* Define action or option for cmd_bt_access */
+enum cmd_bt_access_opts {
+        /* The bt commands start at 5 instead of 1 because the old dft commands
+         * are mapped to 1-4.  These old commands are no longer maintained and
+         * should not be called.
+         */
+        cmd_act_bt_access_add = 5,
+        cmd_act_bt_access_del,
+        cmd_act_bt_access_list,
+        cmd_act_bt_access_reset
+};
+
+/* Define action or option for cmd_fwt_access */
+enum cmd_fwt_access_opts {
+        cmd_act_fwt_access_add = 1,
+        cmd_act_fwt_access_del,
+        cmd_act_fwt_access_lookup,
+        cmd_act_fwt_access_list,
+        cmd_act_fwt_access_list_route,
+        cmd_act_fwt_access_list_neighbor,
+        cmd_act_fwt_access_reset,
+        cmd_act_fwt_access_cleanup,
+        cmd_act_fwt_access_time,
+};
+
+/* Define action or option for cmd_mesh_access */
+enum cmd_mesh_access_opts {
+        cmd_act_mesh_get_ttl = 1,
+        cmd_act_mesh_set_ttl,
+        cmd_act_mesh_get_stats,
+        cmd_act_mesh_get_mpp,
+        cmd_act_mesh_set_mpp,
+};
+
+/** Card Event definition */
+#define MACREG_INT_CODE_TX_PPA_FREE             0x00000000
+#define MACREG_INT_CODE_TX_DMA_DONE             0x00000001
+#define MACREG_INT_CODE_LINK_LOSE_W_SCAN        0x00000002
+#define MACREG_INT_CODE_LINK_LOSE_NO_SCAN       0x00000003
+#define MACREG_INT_CODE_LINK_SENSED             0x00000004
+#define MACREG_INT_CODE_CMD_FINISHED            0x00000005
+#define MACREG_INT_CODE_MIB_CHANGED             0x00000006
+#define MACREG_INT_CODE_INIT_DONE               0x00000007
+#define MACREG_INT_CODE_DEAUTHENTICATED         0x00000008
+#define MACREG_INT_CODE_DISASSOCIATED           0x00000009
+#define MACREG_INT_CODE_PS_AWAKE                0x0000000a
+#define MACREG_INT_CODE_PS_SLEEP                0x0000000b
+#define MACREG_INT_CODE_MIC_ERR_MULTICAST       0x0000000d
+#define MACREG_INT_CODE_MIC_ERR_UNICAST         0x0000000e
+#define MACREG_INT_CODE_WM_AWAKE                0x0000000f
+#define MACREG_INT_CODE_ADHOC_BCN_LOST          0x00000011
+#define MACREG_INT_CODE_RSSI_LOW                0x00000019
+#define MACREG_INT_CODE_SNR_LOW                 0x0000001a
+#define MACREG_INT_CODE_MAX_FAIL                0x0000001b
+#define MACREG_INT_CODE_RSSI_HIGH               0x0000001c
+#define MACREG_INT_CODE_SNR_HIGH                0x0000001d
+
+#endif                          /* _HOST_H_ */
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
new file mode 100644
index 000000000000..f239e5d2435b
--- /dev/null
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -0,0 +1,693 @@
+/*
+ * This file contains the function prototypes, data structure
+ * and defines for all the host/station commands
+ */
+#ifndef __HOSTCMD__H
+#define __HOSTCMD__H
+
+#include <linux/wireless.h>
+#include "11d.h"
+#include "types.h"
+
+/* 802.11-related definitions */
+
+/* TxPD descriptor */
+struct txpd {
+        /* Current Tx packet status */
+        u32 tx_status;
+        /* Tx control */
+        u32 tx_control;
+        u32 tx_packet_location;
+        /* Tx packet length */
+        u16 tx_packet_length;
+        /* First 2 byte of destination MAC address */
+        u8 tx_dest_addr_high[2];
+        /* Last 4 byte of destination MAC address */
+        u8 tx_dest_addr_low[4];
+        /* Pkt Priority */
+        u8 priority;
+        /* Pkt Trasnit Power control */
+        u8 powermgmt;
+        /* Amount of time the packet has been queued in the driver (units = 2ms) */
+        u8 pktdelay_2ms;
+        /* reserved */
+        u8 reserved1;
+};
+
+/* RxPD Descriptor */
+struct rxpd {
+        /* Current Rx packet status */
+        u16 status;
+
+        /* SNR */
+        u8 snr;
+
+        /* Tx control */
+        u8 rx_control;
+
+        /* Pkt length */
+        u16 pkt_len;
+
+        /* Noise Floor */
+        u8 nf;
+
+        /* Rx Packet Rate */
+        u8 rx_rate;
+
+        /* Pkt addr */
+        u32 pkt_ptr;
+
+        /* Next Rx RxPD addr */
+        u32 next_rxpd_ptr;
+
+        /* Pkt Priority */
+        u8 priority;
+        u8 reserved[3];
+};
+
+struct cmd_ctrl_node {
+        /* CMD link list */
+        struct list_head list;
+        u32 status;
+        /* CMD ID */
+        u32 cmd_oid;
+        /*CMD wait option: wait for finish or no wait */
+        u16 wait_option;
+        /* command parameter */
+        void *pdata_buf;
+        /*command data */
+        u8 *bufvirtualaddr;
+        u16 cmdflags;
+        /* wait queue */
+        u16 cmdwaitqwoken;
+        wait_queue_head_t cmdwait_q;
+};
+
+/* WLAN_802_11_KEY
+ *
+ * Generic structure to hold all key types.  key type (WEP40, WEP104, TKIP, AES)
+ * is determined from the keylength field.
+ */
+struct WLAN_802_11_KEY {
+        u32 len;
+        u32 flags;  /* KEY_INFO_* from wlan_defs.h */
+        u8 key[MRVL_MAX_KEY_WPA_KEY_LENGTH];
+        u16 type; /* KEY_TYPE_* from wlan_defs.h */
+};
+
+struct IE_WPA {
+        u8 elementid;
+        u8 len;
+        u8 oui[4];
+        u16 version;
+};
+
+struct WLAN_802_11_SSID {
+        /* SSID length */
+        u32 ssidlength;
+
+        /* SSID information field */
+        u8 ssid[IW_ESSID_MAX_SIZE];
+};
+
+struct WPA_SUPPLICANT {
+        u8 wpa_ie[256];
+        u8 wpa_ie_len;
+};
+
+/* wlan_offset_value */
+struct wlan_offset_value {
+        u32 offset;
+        u32 value;
+};
+
+struct WLAN_802_11_FIXED_IEs {
+        u8 timestamp[8];
+        u16 beaconinterval;
+        u16 capabilities;
+};
+
+struct WLAN_802_11_VARIABLE_IEs {
+        u8 elementid;
+        u8 length;
+        u8 data[1];
+};
+
+/* Define general data structure */
+/* cmd_DS_GEN */
+struct cmd_ds_gen {
+        u16 command;
+        u16 size;
+        u16 seqnum;
+        u16 result;
+};
+
+#define S_DS_GEN sizeof(struct cmd_ds_gen)
+/*
+ * Define data structure for cmd_get_hw_spec
+ * This structure defines the response for the GET_HW_SPEC command
+ */
+struct cmd_ds_get_hw_spec {
+        /* HW Interface version number */
+        u16 hwifversion;
+        /* HW version number */
+        u16 version;
+        /* Max number of TxPD FW can handle */
+        u16 nr_txpd;
+        /* Max no of Multicast address */
+        u16 nr_mcast_adr;
+        /* MAC address */
+        u8 permanentaddr[6];
+
+        /* region Code */
+        u16 regioncode;
+
+        /* Number of antenna used */
+        u16 nr_antenna;
+
+        /* FW release number, example 0x1234=1.2.3.4 */
+        u32 fwreleasenumber;
+
+        /* Base Address of TxPD queue */
+        u32 wcb_base;
+        /* Read Pointer of RxPd queue */
+        u32 rxpd_rdptr;
+
+        /* Write Pointer of RxPd queue */
+        u32 rxpd_wrptr;
+
+        /*FW/HW capability */
+        u32 fwcapinfo;
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_reset {
+        u16 action;
+};
+
+struct cmd_ds_802_11_subscribe_event {
+        u16 action;
+        u16 events;
+};
+
+/*
+ * This scan handle Country Information IE(802.11d compliant)
+ * Define data structure for cmd_802_11_scan
+ */
+struct cmd_ds_802_11_scan {
+        u8 bsstype;
+        u8 BSSID[ETH_ALEN];
+        u8 tlvbuffer[1];
+#if 0
+        mrvlietypes_ssidparamset_t ssidParamSet;
+        mrvlietypes_chanlistparamset_t ChanListParamSet;
+        mrvlietypes_ratesparamset_t OpRateSet;
+#endif
+};
+
+struct cmd_ds_802_11_scan_rsp {
+        u16 bssdescriptsize;
+        u8 nr_sets;
+        u8 bssdesc_and_tlvbuffer[1];
+};
+
+struct cmd_ds_802_11_get_log {
+        u32 mcasttxframe;
+        u32 failed;
+        u32 retry;
+        u32 multiretry;
+        u32 framedup;
+        u32 rtssuccess;
+        u32 rtsfailure;
+        u32 ackfailure;
+        u32 rxfrag;
+        u32 mcastrxframe;
+        u32 fcserror;
+        u32 txframe;
+        u32 wepundecryptable;
+};
+
+struct cmd_ds_mac_control {
+        u16 action;
+        u16 reserved;
+};
+
+struct cmd_ds_mac_multicast_adr {
+        u16 action;
+        u16 nr_of_adrs;
+        u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];
+};
+
+struct cmd_ds_802_11_authenticate {
+        u8 macaddr[ETH_ALEN];
+        u8 authtype;
+        u8 reserved[10];
+};
+
+struct cmd_ds_802_11_deauthenticate {
+        u8 macaddr[6];
+        u16 reasoncode;
+};
+
+struct cmd_ds_802_11_associate {
+        u8 peerstaaddr[6];
+        struct ieeetypes_capinfo capinfo;
+        u16 listeninterval;
+        u16 bcnperiod;
+        u8 dtimperiod;
+
+#if 0
+        mrvlietypes_ssidparamset_t ssidParamSet;
+        mrvlietypes_phyparamset_t phyparamset;
+        mrvlietypes_ssparamset_t ssparamset;
+        mrvlietypes_ratesparamset_t ratesParamSet;
+#endif
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_disassociate {
+        u8 destmacaddr[6];
+        u16 reasoncode;
+};
+
+struct cmd_ds_802_11_associate_rsp {
+        struct ieeetypes_assocrsp assocRsp;
+};
+
+struct cmd_ds_802_11_ad_hoc_result {
+        u8 PAD[3];
+        u8 BSSID[ETH_ALEN];
+};
+
+struct cmd_ds_802_11_set_wep {
+        /* ACT_ADD, ACT_REMOVE or ACT_ENABLE */
+        u16 action;
+
+        /* key Index selected for Tx */
+        u16 keyindex;
+
+        /* 40, 128bit or TXWEP */
+        u8 keytype[4];
+        u8 keymaterial[4][16];
+};
+
+struct cmd_ds_802_3_get_stat {
+        u32 xmitok;
+        u32 rcvok;
+        u32 xmiterror;
+        u32 rcverror;
+        u32 rcvnobuffer;
+        u32 rcvcrcerror;
+};
+
+struct cmd_ds_802_11_get_stat {
+        u32 txfragmentcnt;
+        u32 mcasttxframecnt;
+        u32 failedcnt;
+        u32 retrycnt;
+        u32 Multipleretrycnt;
+        u32 rtssuccesscnt;
+        u32 rtsfailurecnt;
+        u32 ackfailurecnt;
+        u32 frameduplicatecnt;
+        u32 rxfragmentcnt;
+        u32 mcastrxframecnt;
+        u32 fcserrorcnt;
+        u32 bcasttxframecnt;
+        u32 bcastrxframecnt;
+        u32 txbeacon;
+        u32 rxbeacon;
+        u32 wepundecryptable;
+};
+
+struct cmd_ds_802_11_snmp_mib {
+        u16 querytype;
+        u16 oid;
+        u16 bufsize;
+        u8 value[128];
+};
+
+struct cmd_ds_mac_reg_map {
+        u16 buffersize;
+        u8 regmap[128];
+        u16 reserved;
+};
+
+struct cmd_ds_bbp_reg_map {
+        u16 buffersize;
+        u8 regmap[128];
+        u16 reserved;
+};
+
+struct cmd_ds_rf_reg_map {
+        u16 buffersize;
+        u8 regmap[64];
+        u16 reserved;
+};
+
+struct cmd_ds_mac_reg_access {
+        u16 action;
+        u16 offset;
+        u32 value;
+};
+
+struct cmd_ds_bbp_reg_access {
+        u16 action;
+        u16 offset;
+        u8 value;
+        u8 reserved[3];
+};
+
+struct cmd_ds_rf_reg_access {
+        u16 action;
+        u16 offset;
+        u8 value;
+        u8 reserved[3];
+};
+
+struct cmd_ds_802_11_radio_control {
+        u16 action;
+        u16 control;
+};
+
+struct cmd_ds_802_11_sleep_params {
+        /* ACT_GET/ACT_SET */
+        u16 action;
+
+        /* Sleep clock error in ppm */
+        u16 error;
+
+        /* Wakeup offset in usec */
+        u16 offset;
+
+        /* Clock stabilization time in usec */
+        u16 stabletime;
+
+        /* control periodic calibration */
+        u8 calcontrol;
+
+        /* control the use of external sleep clock */
+        u8 externalsleepclk;
+
+        /* reserved field, should be set to zero */
+        u16 reserved;
+};
+
+struct cmd_ds_802_11_inactivity_timeout {
+        /* ACT_GET/ACT_SET */
+        u16 action;
+
+        /* Inactivity timeout in msec */
+        u16 timeout;
+};
+
+struct cmd_ds_802_11_rf_channel {
+        u16 action;
+        u16 currentchannel;
+        u16 rftype;
+        u16 reserved;
+        u8 channellist[32];
+};
+
+struct cmd_ds_802_11_rssi {
+        /* weighting factor */
+        u16 N;
+
+        u16 reserved_0;
+        u16 reserved_1;
+        u16 reserved_2;
+};
+
+struct cmd_ds_802_11_rssi_rsp {
+        u16 SNR;
+        u16 noisefloor;
+        u16 avgSNR;
+        u16 avgnoisefloor;
+};
+
+struct cmd_ds_802_11_mac_address {
+        u16 action;
+        u8 macadd[ETH_ALEN];
+};
+
+struct cmd_ds_802_11_rf_tx_power {
+        u16 action;
+        u16 currentlevel;
+};
+
+struct cmd_ds_802_11_rf_antenna {
+        u16 action;
+
+        /* Number of antennas or 0xffff(diversity) */
+        u16 antennamode;
+
+};
+
+struct cmd_ds_802_11_ps_mode {
+        u16 action;
+        u16 nullpktinterval;
+        u16 multipledtim;
+        u16 reserved;
+        u16 locallisteninterval;
+};
+
+struct PS_CMD_ConfirmSleep {
+        u16 command;
+        u16 size;
+        u16 seqnum;
+        u16 result;
+
+        u16 action;
+        u16 reserved1;
+        u16 multipledtim;
+        u16 reserved;
+        u16 locallisteninterval;
+};
+
+struct cmd_ds_802_11_data_rate {
+        u16 action;
+        u16 reserverd;
+        u8 datarate[G_SUPPORTED_RATES];
+};
+
+struct cmd_ds_802_11_rate_adapt_rateset {
+        u16 action;
+        u16 enablehwauto;
+        u16 bitmap;
+};
+
+struct cmd_ds_802_11_ad_hoc_start {
+        u8 SSID[IW_ESSID_MAX_SIZE];
+        u8 bsstype;
+        u16 beaconperiod;
+        u8 dtimperiod;
+        union IEEEtypes_ssparamset ssparamset;
+        union ieeetypes_phyparamset phyparamset;
+        u16 probedelay;
+        struct ieeetypes_capinfo cap;
+        u8 datarate[G_SUPPORTED_RATES];
+        u8 tlv_memory_size_pad[100];
+} __attribute__ ((packed));
+
+struct adhoc_bssdesc {
+        u8 BSSID[6];
+        u8 SSID[32];
+        u8 bsstype;
+        u16 beaconperiod;
+        u8 dtimperiod;
+        u8 timestamp[8];
+        u8 localtime[8];
+        union ieeetypes_phyparamset phyparamset;
+        union IEEEtypes_ssparamset ssparamset;
+        struct ieeetypes_capinfo cap;
+        u8 datarates[G_SUPPORTED_RATES];
+
+        /* DO NOT ADD ANY FIELDS TO THIS STRUCTURE. It is used below in the
+         * Adhoc join command and will cause a binary layout mismatch with
+         * the firmware
+         */
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_ad_hoc_join {
+        struct adhoc_bssdesc bssdescriptor;
+        u16 failtimeout;
+        u16 probedelay;
+
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_enable_rsn {
+        u16 action;
+        u16 enable;
+};
+
+struct MrvlIEtype_keyParamSet {
+        /* type ID */
+        u16 type;
+
+        /* length of Payload */
+        u16 length;
+
+        /* type of key: WEP=0, TKIP=1, AES=2 */
+        u16 keytypeid;
+
+        /* key control Info specific to a keytypeid */
+        u16 keyinfo;
+
+        /* length of key */
+        u16 keylen;
+
+        /* key material of size keylen */
+        u8 key[32];
+};
+
+struct cmd_ds_802_11_key_material {
+        u16 action;
+        struct MrvlIEtype_keyParamSet keyParamSet[2];
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_eeprom_access {
+        u16 action;
+
+        /* multiple 4 */
+        u16 offset;
+        u16 bytecount;
+        u8 value;
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_tpc_cfg {
+        u16 action;
+        u8 enable;
+        s8 P0;
+        s8 P1;
+        s8 P2;
+        u8 usesnr;
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_led_ctrl {
+        u16 action;
+        u16 numled;
+        u8 data[256];
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_pwr_cfg {
+        u16 action;
+        u8 enable;
+        s8 PA_P0;
+        s8 PA_P1;
+        s8 PA_P2;
+} __attribute__ ((packed));
+
+struct cmd_ds_802_11_afc {
+        u16 afc_auto;
+        union {
+                struct {
+                        u16 threshold;
+                        u16 period;
+                };
+                struct {
+                        s16 timing_offset;
+                        s16 carrier_offset;
+                };
+        };
+} __attribute__ ((packed));
+
+struct cmd_tx_rate_query {
+        u16 txrate;
+} __attribute__ ((packed));
+
+struct cmd_ds_get_tsf {
+        __le64 tsfvalue;
+} __attribute__ ((packed));
+
+struct cmd_ds_bt_access {
+        u16 action;
+        u32 id;
+        u8 addr1[ETH_ALEN];
+        u8 addr2[ETH_ALEN];
+} __attribute__ ((packed));
+
+struct cmd_ds_fwt_access {
+        u16 action;
+        u32 id;
+        u8 da[ETH_ALEN];
+        u8 dir;
+        u8 ra[ETH_ALEN];
+        u32 ssn;
+        u32 dsn;
+        u32 metric;
+        u8 hopcount;
+        u8 ttl;
+        u32 expiration;
+        u8 sleepmode;
+        u32 snr;
+        u32 references;
+} __attribute__ ((packed));
+
+#define MESH_STATS_NUM 7
+struct cmd_ds_mesh_access {
+        u16 action;
+        u32 data[MESH_STATS_NUM + 1];   /* last position reserved */
+} __attribute__ ((packed));
+
+struct cmd_ds_command {
+        /* command header */
+        u16 command;
+        u16 size;
+        u16 seqnum;
+        u16 result;
+
+        /* command Body */
+        union {
+                struct cmd_ds_get_hw_spec hwspec;
+                struct cmd_ds_802_11_ps_mode psmode;
+                struct cmd_ds_802_11_scan scan;
+                struct cmd_ds_802_11_scan_rsp scanresp;
+                struct cmd_ds_mac_control macctrl;
+                struct cmd_ds_802_11_associate associate;
+                struct cmd_ds_802_11_deauthenticate deauth;
+                struct cmd_ds_802_11_set_wep wep;
+                struct cmd_ds_802_11_ad_hoc_start ads;
+                struct cmd_ds_802_11_reset reset;
+                struct cmd_ds_802_11_ad_hoc_result result;
+                struct cmd_ds_802_11_get_log glog;
+                struct cmd_ds_802_11_authenticate auth;
+                struct cmd_ds_802_11_get_stat gstat;
+                struct cmd_ds_802_3_get_stat gstat_8023;
+                struct cmd_ds_802_11_snmp_mib smib;
+                struct cmd_ds_802_11_rf_tx_power txp;
+                struct cmd_ds_802_11_rf_antenna rant;
+                struct cmd_ds_802_11_data_rate drate;
+                struct cmd_ds_802_11_rate_adapt_rateset rateset;
+                struct cmd_ds_mac_multicast_adr madr;
+                struct cmd_ds_802_11_ad_hoc_join adj;
+                struct cmd_ds_802_11_radio_control radio;
+                struct cmd_ds_802_11_rf_channel rfchannel;
+                struct cmd_ds_802_11_rssi rssi;
+                struct cmd_ds_802_11_rssi_rsp rssirsp;
+                struct cmd_ds_802_11_disassociate dassociate;
+                struct cmd_ds_802_11_mac_address macadd;
+                struct cmd_ds_802_11_enable_rsn enbrsn;
+                struct cmd_ds_802_11_key_material keymaterial;
+                struct cmd_ds_mac_reg_access macreg;
+                struct cmd_ds_bbp_reg_access bbpreg;
+                struct cmd_ds_rf_reg_access rfreg;
+                struct cmd_ds_802_11_eeprom_access rdeeprom;
+
+                struct cmd_ds_802_11d_domain_info domaininfo;
+                struct cmd_ds_802_11d_domain_info domaininforesp;
+
+                struct cmd_ds_802_11_sleep_params sleep_params;
+                struct cmd_ds_802_11_inactivity_timeout inactivity_timeout;
+                struct cmd_ds_802_11_tpc_cfg tpccfg;
+                struct cmd_ds_802_11_pwr_cfg pwrcfg;
+                struct cmd_ds_802_11_afc afc;
+                struct cmd_ds_802_11_led_ctrl ledgpio;
+
+                struct cmd_tx_rate_query txrate;
+                struct cmd_ds_bt_access bt;
+                struct cmd_ds_fwt_access fwt;
+                struct cmd_ds_mesh_access mesh;
+                struct cmd_ds_get_tsf gettsf;
+                struct cmd_ds_802_11_subscribe_event subscribe_event;
+        } params;
+} __attribute__ ((packed));
+
+#endif
diff --git a/drivers/net/wireless/libertas/if_bootcmd.c b/drivers/net/wireless/libertas/if_bootcmd.c
new file mode 100644
index 000000000000..567000c3e87b
--- /dev/null
+++ b/drivers/net/wireless/libertas/if_bootcmd.c
@@ -0,0 +1,38 @@
+/**
+  * This file contains functions used in USB Boot command
+  * and Boot2/FW update
+  */
+
+#include <linux/delay.h>
+#include <linux/firmware.h>
+#include <linux/netdevice.h>
+#include <linux/usb.h>
+
+#include "defs.h"
+#include "dev.h"
+#include "if_usb.h"
+
+/**
+ *  @brief This function issues Boot command to the Boot2 code
+ *  @param ivalue   1:Boot from FW by USB-Download
+ *                  2:Boot from FW in EEPROM
+ *  @return             0
+ */
+int if_usb_issue_boot_command(wlan_private *priv, int ivalue)
+{
+        struct usb_card_rec     *cardp = priv->wlan_dev.card;
+        struct bootcmdstr       sbootcmd;
+        int i;
+
+        /* Prepare command */
+        sbootcmd.u32magicnumber = BOOT_CMD_MAGIC_NUMBER;
+        sbootcmd.u8cmd_tag = ivalue;
+        for (i=0; i<11; i++)
+                sbootcmd.au8dumy[i]=0x00;
+        memcpy(cardp->bulk_out_buffer, &sbootcmd, sizeof(struct bootcmdstr));
+
+        /* Issue command */
+        usb_tx_block(priv, cardp->bulk_out_buffer, sizeof(struct bootcmdstr));
+
+        return 0;
+}
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
new file mode 100644
index 000000000000..695fb6a66ffe
--- /dev/null
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -0,0 +1,952 @@
+/**
+  * This file contains functions used in USB interface module.
+  */
+#include <linux/delay.h>
+#include <linux/firmware.h>
+#include <linux/netdevice.h>
+#include <linux/usb.h>
+
+#include "host.h"
+#include "sbi.h"
+#include "decl.h"
+#include "defs.h"
+#include "dev.h"
+#include "if_usb.h"
+
+#define MESSAGE_HEADER_LEN      4
+
+static const char usbdriver_name[] = "usb8xxx";
+
+static struct usb_device_id if_usb_table[] = {
+        /* Enter the device signature inside */
+        {
+                USB_DEVICE(USB8388_VID_1, USB8388_PID_1),
+        },
+        {
+                USB_DEVICE(USB8388_VID_2, USB8388_PID_2),
+        },
+        {}      /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, if_usb_table);
+
+static void if_usb_receive(struct urb *urb);
+static void if_usb_receive_fwload(struct urb *urb);
+
+/**
+ *  @brief  call back function to handle the status of the URB
+ *  @param urb          pointer to urb structure
+ *  @return             N/A
+ */
+static void if_usb_write_bulk_callback(struct urb *urb)
+{
+        wlan_private *priv = (wlan_private *) (urb->context);
+        wlan_adapter *adapter = priv->adapter;
+        struct net_device *dev = priv->wlan_dev.netdev;
+
+        /* handle the transmission complete validations */
+
+        if (urb->status != 0) {
+                /* print the failure status number for debug */
+                lbs_pr_info("URB in failure status\n");
+        } else {
+                lbs_dev_dbg(2, &urb->dev->dev, "URB status is successfull\n");
+                lbs_dev_dbg(2, &urb->dev->dev, "Actual length transmitted %d\n",
+                       urb->actual_length);
+                priv->wlan_dev.dnld_sent = DNLD_RES_RECEIVED;
+                /* Wake main thread if commands are pending */
+                if (!adapter->cur_cmd)
+                        wake_up_interruptible(&priv->mainthread.waitq);
+                if ((adapter->connect_status == libertas_connected))
+                        netif_wake_queue(dev);
+        }
+
+        return;
+}
+
+/**
+ *  @brief  free tx/rx urb, skb and rx buffer
+ *  @param cardp        pointer usb_card_rec
+ *  @return             N/A
+ */
+void if_usb_free(struct usb_card_rec *cardp)
+{
+        ENTER();
+
+        /* Unlink tx & rx urb */
+        usb_kill_urb(cardp->tx_urb);
+        usb_kill_urb(cardp->rx_urb);
+
+        usb_free_urb(cardp->tx_urb);
+        cardp->tx_urb = NULL;
+
+        usb_free_urb(cardp->rx_urb);
+        cardp->rx_urb = NULL;
+
+        kfree(cardp->bulk_out_buffer);
+        cardp->bulk_out_buffer = NULL;
+
+        LEAVE();
+        return;
+}
+
+/**
+ *  @brief sets the configuration values
+ *  @param ifnum        interface number
+ *  @param id           pointer to usb_device_id
+ *  @return             0 on success, error code on failure
+ */
+static int if_usb_probe(struct usb_interface *intf,
+                        const struct usb_device_id *id)
+{
+        struct usb_device *udev;
+        struct usb_host_interface *iface_desc;
+        struct usb_endpoint_descriptor *endpoint;
+        wlan_private *pwlanpriv;
+        struct usb_card_rec *usb_cardp;
+        int i;
+
+        udev = interface_to_usbdev(intf);
+
+        usb_cardp = kzalloc(sizeof(struct usb_card_rec), GFP_KERNEL);
+        if (!usb_cardp) {
+                lbs_pr_err("Out of memory allocating private data.\n");
+                goto error;
+        }
+
+        usb_cardp->udev = udev;
+        iface_desc = intf->cur_altsetting;
+
+        lbs_dev_dbg(1, &udev->dev, "bcdUSB = 0x%X bDeviceClass = 0x%X"
+               " bDeviceSubClass = 0x%X, bDeviceProtocol = 0x%X\n",
+               udev->descriptor.bcdUSB,
+               udev->descriptor.bDeviceClass,
+               udev->descriptor.bDeviceSubClass,
+               udev->descriptor.bDeviceProtocol);
+
+        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
+                endpoint = &iface_desc->endpoint[i].desc;
+                if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+                    && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                        USB_ENDPOINT_XFER_BULK)) {
+                        /* we found a bulk in endpoint */
+                        lbs_dev_dbg(1, &udev->dev, "Bulk in size is %d\n",
+                               endpoint->wMaxPacketSize);
+                        if (!
+                            (usb_cardp->rx_urb =
+                             usb_alloc_urb(0, GFP_KERNEL))) {
+                                lbs_dev_dbg(1, &udev->dev,
+                                       "Rx URB allocation failed\n");
+                                goto dealloc;
+                        }
+                        usb_cardp->rx_urb_recall = 0;
+
+                        usb_cardp->bulk_in_size =
+                            endpoint->wMaxPacketSize;
+                        usb_cardp->bulk_in_endpointAddr =
+                            (endpoint->
+                             bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
+                        lbs_dev_dbg(1, &udev->dev, "in_endpoint = %d\n",
+                               endpoint->bEndpointAddress);
+                }
+
+                if (((endpoint->
+                      bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
+                     USB_DIR_OUT)
+                    && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                        USB_ENDPOINT_XFER_BULK)) {
+                        /* We found bulk out endpoint */
+                        if (!
+                            (usb_cardp->tx_urb =
+                             usb_alloc_urb(0, GFP_KERNEL))) {
+                                lbs_dev_dbg(1,&udev->dev,
+                                       "Tx URB allocation failed\n");
+                                goto dealloc;
+                        }
+
+                        usb_cardp->bulk_out_size =
+                            endpoint->wMaxPacketSize;
+                        lbs_dev_dbg(1, &udev->dev,
+                                    "Bulk out size is %d\n",
+                                    endpoint->wMaxPacketSize);
+                        usb_cardp->bulk_out_endpointAddr =
+                            endpoint->bEndpointAddress;
+                        lbs_dev_dbg(1, &udev->dev, "out_endpoint = %d\n",
+                                    endpoint->bEndpointAddress);
+                        usb_cardp->bulk_out_buffer =
+                            kmalloc(MRVDRV_ETH_TX_PACKET_BUFFER_SIZE,
+                                    GFP_KERNEL);
+
+                        if (!usb_cardp->bulk_out_buffer) {
+                                lbs_dev_dbg(1, &udev->dev,
+                                       "Could not allocate buffer\n");
+                                goto dealloc;
+                        }
+                }
+        }
+
+
+        /* At this point wlan_add_card() will be called.  Don't worry
+         * about keeping pwlanpriv around since it will be set on our
+         * usb device data in -> add() -> libertas_sbi_register_dev().
+         */
+        if (!(pwlanpriv = wlan_add_card(usb_cardp)))
+                goto dealloc;
+
+        usb_get_dev(udev);
+        usb_set_intfdata(intf, usb_cardp);
+
+        /*
+         * return card structure, which can be got back in the
+         * diconnect function as the ptr
+         * argument.
+         */
+        return 0;
+
+dealloc:
+        if_usb_free(usb_cardp);
+
+error:
+        return -ENOMEM;
+}
+
+/**
+ *  @brief free resource and cleanup
+ *  @param udev         pointer to usb_device
+ *  @param ptr          pointer to usb_cardp
+ *  @return             N/A
+ */
+static void if_usb_disconnect(struct usb_interface *intf)
+{
+        struct usb_card_rec *cardp = usb_get_intfdata(intf);
+        wlan_private *priv = (wlan_private *) cardp->priv;
+        wlan_adapter *adapter = NULL;
+
+        adapter = priv->adapter;
+
+        /*
+         * Update Surprise removed to TRUE
+         */
+        adapter->surpriseremoved = 1;
+
+        /* card is removed and we can call wlan_remove_card */
+        lbs_dev_dbg(1, &cardp->udev->dev, "call remove card\n");
+        wlan_remove_card(cardp);
+
+        /* Unlink and free urb */
+        if_usb_free(cardp);
+
+        usb_set_intfdata(intf, NULL);
+        usb_put_dev(interface_to_usbdev(intf));
+
+        return;
+}
+
+/**
+ *  @brief  This function download FW
+ *  @param priv         pointer to wlan_private
+ *  @return             0
+ */
+static int if_prog_firmware(wlan_private * priv)
+{
+        struct usb_card_rec *cardp = priv->wlan_dev.card;
+        struct FWData *fwdata;
+        struct fwheader *fwheader;
+        u8 *firmware = priv->firmware->data;
+
+        fwdata = kmalloc(sizeof(struct FWData), GFP_ATOMIC);
+
+        if (!fwdata)
+                return -1;
+
+        fwheader = &fwdata->fwheader;
+
+        if (!cardp->CRC_OK) {
+                cardp->totalbytes = cardp->fwlastblksent;
+                cardp->fwseqnum = cardp->lastseqnum - 1;
+        }
+
+        lbs_dev_dbg(2, &cardp->udev->dev, "totalbytes = %d\n",
+                    cardp->totalbytes);
+
+        memcpy(fwheader, &firmware[cardp->totalbytes],
+               sizeof(struct fwheader));
+
+        cardp->fwlastblksent = cardp->totalbytes;
+        cardp->totalbytes += sizeof(struct fwheader);
+
+        lbs_dev_dbg(2, &cardp->udev->dev,"Copy Data\n");
+        memcpy(fwdata->data, &firmware[cardp->totalbytes],
+               fwdata->fwheader.datalength);
+
+        lbs_dev_dbg(2, &cardp->udev->dev,
+                    "Data length = %d\n", fwdata->fwheader.datalength);
+
+        cardp->fwseqnum = cardp->fwseqnum + 1;
+
+        fwdata->seqnum = cardp->fwseqnum;
+        cardp->lastseqnum = fwdata->seqnum;
+        cardp->totalbytes += fwdata->fwheader.datalength;
+
+        if (fwheader->dnldcmd == FW_HAS_DATA_TO_RECV) {
+                lbs_dev_dbg(2, &cardp->udev->dev, "There is data to follow\n");
+                lbs_dev_dbg(2, &cardp->udev->dev,
+                            "seqnum = %d totalbytes = %d\n", cardp->fwseqnum,
+                            cardp->totalbytes);
+                memcpy(cardp->bulk_out_buffer, fwheader, FW_DATA_XMIT_SIZE);
+                usb_tx_block(priv, cardp->bulk_out_buffer, FW_DATA_XMIT_SIZE);
+
+        } else if (fwdata->fwheader.dnldcmd == FW_HAS_LAST_BLOCK) {
+                lbs_dev_dbg(2, &cardp->udev->dev,
+                            "Host has finished FW downloading\n");
+                lbs_dev_dbg(2, &cardp->udev->dev,
+                            "Donwloading FW JUMP BLOCK\n");
+                memcpy(cardp->bulk_out_buffer, fwheader, FW_DATA_XMIT_SIZE);
+                usb_tx_block(priv, cardp->bulk_out_buffer, FW_DATA_XMIT_SIZE);
+                cardp->fwfinalblk = 1;
+        }
+
+        lbs_dev_dbg(2, &cardp->udev->dev,
+                    "The firmware download is done size is %d\n",
+                    cardp->totalbytes);
+
+        kfree(fwdata);
+
+        return 0;
+}
+
+static int libertas_do_reset(wlan_private *priv)
+{
+        int ret;
+        struct usb_card_rec *cardp = priv->wlan_dev.card;
+
+        ret = usb_reset_device(cardp->udev);
+        if (!ret) {
+                msleep(10);
+                reset_device(priv);
+                msleep(10);
+        }
+        return ret;
+}
+
+/**
+ *  @brief This function transfer the data to the device.
+ *  @param priv         pointer to wlan_private
+ *  @param payload      pointer to payload data
+ *  @param nb           data length
+ *  @return             0 or -1
+ */
+int usb_tx_block(wlan_private * priv, u8 * payload, u16 nb)
+{
+        /* pointer to card structure */
+        struct usb_card_rec *cardp = priv->wlan_dev.card;
+        int ret = -1;
+
+        /* check if device is removed */
+        if (priv->adapter->surpriseremoved) {
+                lbs_dev_dbg(1, &cardp->udev->dev, "Device removed\n");
+                goto tx_ret;
+        }
+
+        usb_fill_bulk_urb(cardp->tx_urb, cardp->udev,
+                          usb_sndbulkpipe(cardp->udev,
+                                          cardp->bulk_out_endpointAddr),
+                          payload, nb, if_usb_write_bulk_callback, priv);
+
+        cardp->tx_urb->transfer_flags |= URB_ZERO_PACKET;
+
+        if ((ret = usb_submit_urb(cardp->tx_urb, GFP_ATOMIC))) {
+                /*  transfer failed */
+                lbs_dev_dbg(1, &cardp->udev->dev, "usb_submit_urb failed\n");
+                ret = -1;
+        } else {
+                lbs_dev_dbg(2, &cardp->udev->dev, "usb_submit_urb success\n");
+                ret = 0;
+        }
+
+tx_ret:
+        return ret;
+}
+
+static int __if_usb_submit_rx_urb(wlan_private * priv,
+                                  void (*callbackfn)
+                                  (struct urb *urb))
+{
+        struct usb_card_rec *cardp = priv->wlan_dev.card;
+        struct sk_buff *skb;
+        struct read_cb_info *rinfo = &cardp->rinfo;
+        int ret = -1;
+
+        if (!(skb = dev_alloc_skb(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE))) {
+                lbs_pr_err("No free skb\n");
+                goto rx_ret;
+        }
+
+        rinfo->skb = skb;
+
+        /* Fill the receive configuration URB and initialise the Rx call back */
+        usb_fill_bulk_urb(cardp->rx_urb, cardp->udev,
+                          usb_rcvbulkpipe(cardp->udev,
+                                          cardp->bulk_in_endpointAddr),
+                          skb->tail + IPFIELD_ALIGN_OFFSET,
+                          MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn,
+                          rinfo);
+
+        cardp->rx_urb->transfer_flags |= URB_ZERO_PACKET;
+
+        lbs_dev_dbg(2, &cardp->udev->dev, "Pointer for rx_urb %p\n", cardp->rx_urb);
+        if ((ret = usb_submit_urb(cardp->rx_urb, GFP_ATOMIC))) {
+                /* handle failure conditions */
+                lbs_dev_dbg(1, &cardp->udev->dev, "Submit Rx URB failed\n");
+                ret = -1;
+        } else {
+                lbs_dev_dbg(2, &cardp->udev->dev, "Submit Rx URB success\n");
+                ret = 0;
+        }
+
+rx_ret:
+        return ret;
+}
+
+static inline int if_usb_submit_rx_urb_fwload(wlan_private * priv)
+{
+        return __if_usb_submit_rx_urb(priv, &if_usb_receive_fwload);
+}
+
+static inline int if_usb_submit_rx_urb(wlan_private * priv)
+{
+        return __if_usb_submit_rx_urb(priv, &if_usb_receive);
+}
+
+static void if_usb_receive_fwload(struct urb *urb)
+{
+        struct read_cb_info *rinfo = (struct read_cb_info *)urb->context;
+        wlan_private *priv = rinfo->priv;
+        struct sk_buff *skb = rinfo->skb;
+        struct usb_card_rec *cardp = (struct usb_card_rec *)priv->wlan_dev.card;
+        struct fwsyncheader *syncfwheader;
+        struct bootcmdrespStr bootcmdresp;
+
+        if (urb->status) {
+                lbs_dev_dbg(1, &cardp->udev->dev,
+                            "URB status is failed during fw load\n");
+                kfree_skb(skb);
+                return;
+        }
+
+        if (cardp->bootcmdresp == 0) {
+                memcpy (&bootcmdresp, skb->data + IPFIELD_ALIGN_OFFSET,
+                        sizeof(bootcmdresp));
+                if (cardp->udev->descriptor.bcdDevice < 0x3106) {
+                        kfree_skb(skb);
+                        if_usb_submit_rx_urb_fwload(priv);
+                        cardp->bootcmdresp = 1;
+                        lbs_dev_dbg(1, &cardp->udev->dev,
+                                    "Received valid boot command response\n");
+                        return;
+                }
+                if (bootcmdresp.u32magicnumber != BOOT_CMD_MAGIC_NUMBER) {
+                        lbs_pr_info(
+                                "boot cmd response wrong magic number (0x%x)\n",
+                                bootcmdresp.u32magicnumber);
+                } else if (bootcmdresp.u8cmd_tag != BOOT_CMD_FW_BY_USB) {
+                        lbs_pr_info(
+                                "boot cmd response cmd_tag error (%d)\n",
+                                bootcmdresp.u8cmd_tag);
+                } else if (bootcmdresp.u8result != BOOT_CMD_RESP_OK) {
+                        lbs_pr_info(
+                                "boot cmd response result error (%d)\n",
+                                bootcmdresp.u8result);
+                } else {
+                        cardp->bootcmdresp = 1;
+                        lbs_dev_dbg(1, &cardp->udev->dev,
+                                    "Received valid boot command response\n");
+                }
+                kfree_skb(skb);
+                if_usb_submit_rx_urb_fwload(priv);
+                return;
+        }
+
+        syncfwheader = kmalloc(sizeof(struct fwsyncheader), GFP_ATOMIC);
+        if (!syncfwheader) {
+                lbs_dev_dbg(1, &cardp->udev->dev, "Failure to allocate syncfwheader\n");
+                kfree_skb(skb);
+                return;
+        }
+
+        memcpy(syncfwheader, skb->data + IPFIELD_ALIGN_OFFSET,
+                        sizeof(struct fwsyncheader));
+
+        if (!syncfwheader->cmd) {
+                lbs_dev_dbg(2, &cardp->udev->dev,
+                            "FW received Blk with correct CRC\n");
+                lbs_dev_dbg(2, &cardp->udev->dev,
+                            "FW received Blk seqnum = %d\n",
+                       syncfwheader->seqnum);
+                cardp->CRC_OK = 1;
+        } else {
+                lbs_dev_dbg(1, &cardp->udev->dev,
+                            "FW received Blk with CRC error\n");
+                cardp->CRC_OK = 0;
+        }
+
+        kfree_skb(skb);
+
+        if (cardp->fwfinalblk) {
+                cardp->fwdnldover = 1;
+                goto exit;
+        }
+
+        if_prog_firmware(priv);
+
+        if_usb_submit_rx_urb_fwload(priv);
+exit:
+        kfree(syncfwheader);
+
+        return;
+
+}
+
+#define MRVDRV_MIN_PKT_LEN      30
+
+static inline void process_cmdtypedata(int recvlength, struct sk_buff *skb,
+                                       struct usb_card_rec *cardp,
+                                       wlan_private *priv)
+{
+        if (recvlength > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE +
+            MESSAGE_HEADER_LEN || recvlength < MRVDRV_MIN_PKT_LEN) {
+                lbs_dev_dbg(1, &cardp->udev->dev,
+                            "Packet length is Invalid\n");
+                kfree_skb(skb);
+                return;
+        }
+
+        skb_reserve(skb, IPFIELD_ALIGN_OFFSET);
+        skb_put(skb, recvlength);
+        skb_pull(skb, MESSAGE_HEADER_LEN);
+        libertas_process_rxed_packet(priv, skb);
+        priv->wlan_dev.upld_len = (recvlength - MESSAGE_HEADER_LEN);
+}
+
+static inline void process_cmdrequest(int recvlength, u8 *recvbuff,
+                                      struct sk_buff *skb,
+                                      struct usb_card_rec *cardp,
+                                      wlan_private *priv)
+{
+        u8 *cmdbuf;
+        if (recvlength > MRVDRV_SIZE_OF_CMD_BUFFER) {
+                lbs_dev_dbg(1, &cardp->udev->dev,
+                            "The receive buffer is too large\n");
+                kfree_skb(skb);
+                return;
+        }
+
+        if (!in_interrupt())
+                BUG();
+
+        spin_lock(&priv->adapter->driver_lock);
+        /* take care of cur_cmd = NULL case by reading the
+         * data to clear the interrupt */
+        if (!priv->adapter->cur_cmd) {
+                cmdbuf = priv->wlan_dev.upld_buf;
+                priv->adapter->hisregcpy &= ~his_cmdupldrdy;
+        } else
+                cmdbuf = priv->adapter->cur_cmd->bufvirtualaddr;
+
+        cardp->usb_int_cause |= his_cmdupldrdy;
+        priv->wlan_dev.upld_len = (recvlength - MESSAGE_HEADER_LEN);
+        memcpy(cmdbuf, recvbuff + MESSAGE_HEADER_LEN,
+               priv->wlan_dev.upld_len);
+
+        kfree_skb(skb);
+        libertas_interrupt(priv->wlan_dev.netdev);
+        spin_unlock(&priv->adapter->driver_lock);
+
+        lbs_dev_dbg(1, &cardp->udev->dev,
+                    "Wake up main thread to handle cmd response\n");
+
+        return;
+}
+
+/**
+ *  @brief This function reads of the packet into the upload buff,
+ *  wake up the main thread and initialise the Rx callack.
+ *
+ *  @param urb          pointer to struct urb
+ *  @return             N/A
+ */
+static void if_usb_receive(struct urb *urb)
+{
+        struct read_cb_info *rinfo = (struct read_cb_info *)urb->context;
+        wlan_private *priv = rinfo->priv;
+        struct sk_buff *skb = rinfo->skb;
+        struct usb_card_rec *cardp = (struct usb_card_rec *)priv->wlan_dev.card;
+
+        int recvlength = urb->actual_length;
+        u8 *recvbuff = NULL;
+        u32 recvtype;
+
+        ENTER();
+
+        if (recvlength) {
+                if (urb->status) {
+                        lbs_dev_dbg(1, &cardp->udev->dev,
+                                    "URB status is failed\n");
+                        kfree_skb(skb);
+                        goto setup_for_next;
+                }
+
+                recvbuff = skb->data + IPFIELD_ALIGN_OFFSET;
+                memcpy(&recvtype, recvbuff, sizeof(u32));
+                lbs_dev_dbg(1, &cardp->udev->dev,
+                            "Recv length = 0x%x\n", recvlength);
+                lbs_dev_dbg(1, &cardp->udev->dev,
+                            "Receive type = 0x%X\n", recvtype);
+                recvtype = le32_to_cpu(recvtype);
+                lbs_dev_dbg(1, &cardp->udev->dev,
+                            "Receive type after = 0x%X\n", recvtype);
+        } else if (urb->status)
+                goto rx_exit;
+
+
+        switch (recvtype) {
+        case CMD_TYPE_DATA:
+                process_cmdtypedata(recvlength, skb, cardp, priv);
+                break;
+
+        case CMD_TYPE_REQUEST:
+                process_cmdrequest(recvlength, recvbuff, skb, cardp, priv);
+                break;
+
+        case CMD_TYPE_INDICATION:
+                /* Event cause handling */
+                spin_lock(&priv->adapter->driver_lock);
+                cardp->usb_event_cause = *(u32 *) (recvbuff + MESSAGE_HEADER_LEN);
+                lbs_dev_dbg(1, &cardp->udev->dev,"**EVENT** 0x%X\n",
+                            cardp->usb_event_cause);
+                if (cardp->usb_event_cause & 0xffff0000) {
+                        libertas_send_tx_feedback(priv);
+                        break;
+                }
+                cardp->usb_event_cause = le32_to_cpu(cardp->usb_event_cause) << 3;
+                cardp->usb_int_cause |= his_cardevent;
+                kfree_skb(skb);
+                libertas_interrupt(priv->wlan_dev.netdev);
+                spin_unlock(&priv->adapter->driver_lock);
+                goto rx_exit;
+        default:
+                kfree_skb(skb);
+                break;
+        }
+
+setup_for_next:
+        if_usb_submit_rx_urb(priv);
+rx_exit:
+        LEAVE();
+        return;
+}
+
+/**
+ *  @brief This function downloads data to FW
+ *  @param priv         pointer to wlan_private structure
+ *  @param type         type of data
+ *  @param buf          pointer to data buffer
+ *  @param len          number of bytes
+ *  @return             0 or -1
+ */
+int libertas_sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb)
+{
+        int ret = -1;
+        u32 tmp;
+        struct usb_card_rec *cardp = (struct usb_card_rec *)priv->wlan_dev.card;
+
+        lbs_dev_dbg(1, &cardp->udev->dev,"*** type = %u\n", type);
+        lbs_dev_dbg(1, &cardp->udev->dev,"size after = %d\n", nb);
+
+        if (type == MVMS_CMD) {
+                tmp = cpu_to_le32(CMD_TYPE_REQUEST);
+                priv->wlan_dev.dnld_sent = DNLD_CMD_SENT;
+                memcpy(cardp->bulk_out_buffer, (u8 *) & tmp,
+                       MESSAGE_HEADER_LEN);
+
+        } else {
+                tmp = cpu_to_le32(CMD_TYPE_DATA);
+                priv->wlan_dev.dnld_sent = DNLD_DATA_SENT;
+                memcpy(cardp->bulk_out_buffer, (u8 *) & tmp,
+                       MESSAGE_HEADER_LEN);
+        }
+
+        memcpy((cardp->bulk_out_buffer + MESSAGE_HEADER_LEN), payload, nb);
+
+        ret =
+            usb_tx_block(priv, cardp->bulk_out_buffer, nb + MESSAGE_HEADER_LEN);
+
+        return ret;
+}
+
+/* called with adapter->driver_lock held */
+int libertas_sbi_get_int_status(wlan_private * priv, u8 * ireg)
+{
+        struct usb_card_rec *cardp = priv->wlan_dev.card;
+
+        *ireg = cardp->usb_int_cause;
+        cardp->usb_int_cause = 0;
+
+        lbs_dev_dbg(1, &cardp->udev->dev,"Int cause is 0x%X\n", *ireg);
+
+        return 0;
+}
+
+int libertas_sbi_read_event_cause(wlan_private * priv)
+{
+        struct usb_card_rec *cardp = priv->wlan_dev.card;
+        priv->adapter->eventcause = cardp->usb_event_cause;
+        /* Re-submit rx urb here to avoid event lost issue */
+        if_usb_submit_rx_urb(priv);
+        return 0;
+}
+
+int reset_device(wlan_private *priv)
+{
+        int ret;
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_reset,
+                                    cmd_act_halt, 0, 0, NULL);
+        msleep_interruptible(10);
+
+        return ret;
+}
+
+int libertas_sbi_unregister_dev(wlan_private * priv)
+{
+        int ret = 0;
+
+        /* Need to send a Reset command to device before USB resources freed
+         * and wlan_remove_card() called, then device can handle FW download
+         * again.
+         */
+        if (priv)
+                reset_device(priv);
+
+        return ret;
+}
+
+
+/**
+ *  @brief  This function register usb device and initialize parameter
+ *  @param              priv pointer to wlan_private
+ *  @return             0 or -1
+ */
+int libertas_sbi_register_dev(wlan_private * priv)
+{
+
+        struct usb_card_rec *cardp = (struct usb_card_rec *)priv->wlan_dev.card;
+        ENTER();
+
+        cardp->priv = priv;
+        cardp->eth_dev = priv->wlan_dev.netdev;
+        priv->hotplug_device = &(cardp->udev->dev);
+
+        SET_NETDEV_DEV(cardp->eth_dev, &(cardp->udev->dev));
+
+        lbs_dev_dbg(1, &cardp->udev->dev, "udev pointer is at %p\n",
+                    cardp->udev);
+
+        LEAVE();
+        return 0;
+}
+
+
+
+int libertas_sbi_prog_firmware(wlan_private * priv)
+{
+        struct usb_card_rec *cardp = priv->wlan_dev.card;
+        int i = 0;
+        static int reset_count = 10;
+
+        ENTER();
+
+        cardp->rinfo.priv = priv;
+
+restart:
+        if (if_usb_submit_rx_urb_fwload(priv) < 0) {
+                lbs_dev_dbg(1, &cardp->udev->dev, "URB submission is failed\n");
+                LEAVE();
+                return -1;
+        }
+
+#ifdef SUPPORT_BOOT_COMMAND
+        cardp->bootcmdresp = 0;
+        do {
+                int j = 0;
+                i++;
+                /* Issue Boot command = 1, Boot from Download-FW */
+                if_usb_issue_boot_command(priv, BOOT_CMD_FW_BY_USB);
+                /* wait for command response */
+                do {
+                        j++;
+                        msleep_interruptible(100);
+                } while (cardp->bootcmdresp == 0 && j < 10);
+        } while (cardp->bootcmdresp == 0 && i < 5);
+
+        if (cardp->bootcmdresp == 0) {
+                if (--reset_count >= 0) {
+                        libertas_do_reset(priv);
+                        goto restart;
+                }
+                return -1;
+        }
+#endif
+
+        i = 0;
+        priv->adapter->fw_ready = 0;
+
+        cardp->totalbytes = 0;
+        cardp->fwlastblksent = 0;
+        cardp->CRC_OK = 1;
+        cardp->fwdnldover = 0;
+        cardp->fwseqnum = -1;
+        cardp->totalbytes = 0;
+        cardp->fwfinalblk = 0;
+
+        if_prog_firmware(priv);
+
+        do {
+                lbs_dev_dbg(1, &cardp->udev->dev,"Wlan sched timeout\n");
+                i++;
+                msleep_interruptible(100);
+                if (priv->adapter->surpriseremoved || i >= 20)
+                        break;
+        } while (!cardp->fwdnldover);
+
+        if (!cardp->fwdnldover) {
+                lbs_pr_info("failed to load fw, resetting device!\n");
+                if (--reset_count >= 0) {
+                        libertas_do_reset(priv);
+                        goto restart;
+                }
+
+                lbs_pr_info("FW download failure, time = %d ms\n", i * 100);
+                LEAVE();
+                return -1;
+        }
+
+        if_usb_submit_rx_urb(priv);
+
+        /* Delay 200 ms to waiting for the FW ready */
+        msleep_interruptible(200);
+
+        priv->adapter->fw_ready = 1;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief Given a usb_card_rec return its wlan_private
+ *  @param card         pointer to a usb_card_rec
+ *  @return             pointer to wlan_private
+ */
+wlan_private *libertas_sbi_get_priv(void *card)
+{
+        struct usb_card_rec *cardp = card;
+        return cardp->priv;
+}
+
+#ifdef ENABLE_PM
+int libertas_sbi_suspend(wlan_private * priv)
+{
+        return 0;
+}
+
+int libertas_sbi_resume(wlan_private * priv)
+{
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_PM
+static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct usb_card_rec *cardp = usb_get_intfdata(intf);
+        wlan_private *priv = cardp->priv;
+
+        ENTER();
+
+        if (priv->adapter->psstate != PS_STATE_FULL_POWER)
+                return -1;
+
+        netif_device_detach(cardp->eth_dev);
+
+        /* Unlink tx & rx urb */
+        usb_kill_urb(cardp->tx_urb);
+        usb_kill_urb(cardp->rx_urb);
+
+        cardp->rx_urb_recall = 1;
+
+        LEAVE();
+        return 0;
+}
+
+static int if_usb_resume(struct usb_interface *intf)
+{
+        struct usb_card_rec *cardp = usb_get_intfdata(intf);
+
+        ENTER();
+
+        cardp->rx_urb_recall = 0;
+
+        if_usb_submit_rx_urb(cardp->priv);
+
+        netif_device_attach(cardp->eth_dev);
+
+        LEAVE();
+        return 0;
+}
+#else
+#define if_usb_suspend NULL
+#define if_usb_resume NULL
+#endif
+
+static struct usb_driver if_usb_driver = {
+        /* driver name */
+        .name = usbdriver_name,
+        /* probe function name */
+        .probe = if_usb_probe,
+        /* disconnect function  name */
+        .disconnect = if_usb_disconnect,
+        /* device signature table */
+        .id_table = if_usb_table,
+        .suspend = if_usb_suspend,
+        .resume = if_usb_resume,
+};
+
+/**
+ *  @brief This function registers driver.
+ *  @param add          pointer to add_card callback function
+ *  @param remove       pointer to remove card callback function
+ *  @param arg          pointer to call back function parameter
+ *  @return             dummy success variable
+ */
+int libertas_sbi_register(void)
+{
+        /*
+         * API registers the Marvell USB driver
+         * to the USB system
+         */
+        usb_register(&if_usb_driver);
+
+        /* Return success to wlan layer */
+        return 0;
+}
+
+/**
+ *  @brief This function removes usb driver.
+ *  @return             N/A
+ */
+void libertas_sbi_unregister(void)
+{
+        /* API unregisters the driver from USB subsystem */
+        usb_deregister(&if_usb_driver);
+        return;
+}
diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
new file mode 100644
index 000000000000..785116720bc6
--- /dev/null
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -0,0 +1,109 @@
+/**
+  * This file contains definition for USB interface.
+  */
+#define CMD_TYPE_REQUEST                0xF00DFACE
+#define CMD_TYPE_DATA                   0xBEADC0DE
+#define CMD_TYPE_INDICATION             0xBEEFFACE
+
+#define IPFIELD_ALIGN_OFFSET    2
+
+#define USB8388_VID_1   0x1286
+#define USB8388_PID_1   0x2001
+#define USB8388_VID_2   0x05a3
+#define USB8388_PID_2   0x8388
+
+#ifdef SUPPORT_BOOT_COMMAND
+#define BOOT_CMD_FW_BY_USB     0x01
+#define BOOT_CMD_FW_IN_EEPROM  0x02
+#define BOOT_CMD_UPDATE_BOOT2  0x03
+#define BOOT_CMD_UPDATE_FW     0x04
+#define BOOT_CMD_MAGIC_NUMBER  0x4C56524D   /* M=>0x4D,R=>0x52,V=>0x56,L=>0x4C */
+
+struct bootcmdstr
+{
+        u32 u32magicnumber;
+        u8  u8cmd_tag;
+        u8  au8dumy[11];
+};
+
+#define BOOT_CMD_RESP_OK     0x0001
+#define BOOT_CMD_RESP_FAIL   0x0000
+
+struct bootcmdrespStr
+{
+        u32 u32magicnumber;
+        u8  u8cmd_tag;
+        u8  u8result;
+        u8  au8dumy[2];
+};
+#endif /* SUPPORT_BOOT_COMMAND */
+
+/* read callback private data */
+struct read_cb_info {
+        wlan_private *priv;
+        struct sk_buff *skb;
+};
+
+/** USB card description structure*/
+struct usb_card_rec {
+        struct net_device *eth_dev;
+        struct usb_device *udev;
+        struct urb *rx_urb, *tx_urb;
+        void *priv;
+        struct read_cb_info rinfo;
+
+        int bulk_in_size;
+        u8 bulk_in_endpointAddr;
+
+        u8 *bulk_out_buffer;
+        int bulk_out_size;
+        u8 bulk_out_endpointAddr;
+
+        u8 CRC_OK;
+        u32 fwseqnum;
+        u32 lastseqnum;
+        u32 totalbytes;
+        u32 fwlastblksent;
+        u8 fwdnldover;
+        u8 fwfinalblk;
+
+        u32 usb_event_cause;
+        u8 usb_int_cause;
+
+        u8 rx_urb_recall;
+
+        u8 bootcmdresp;
+};
+
+/** fwheader */
+struct fwheader {
+        u32 dnldcmd;
+        u32 baseaddr;
+        u32 datalength;
+        u32 CRC;
+};
+
+#define FW_MAX_DATA_BLK_SIZE    600
+/** FWData */
+struct FWData {
+        struct fwheader fwheader;
+        u32 seqnum;
+        u8 data[FW_MAX_DATA_BLK_SIZE];
+};
+
+/** fwsyncheader */
+struct fwsyncheader {
+        u32 cmd;
+        u32 seqnum;
+};
+
+#define FW_HAS_DATA_TO_RECV             0x00000001
+#define FW_HAS_LAST_BLOCK               0x00000004
+
+#define FW_DATA_XMIT_SIZE \
+        sizeof(struct fwheader) + fwdata->fwheader.datalength + sizeof(u32)
+
+int usb_tx_block(wlan_private *priv, u8 *payload, u16 nb);
+void if_usb_free(struct usb_card_rec *cardp);
+int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
+
diff --git a/drivers/net/wireless/libertas/ioctl.c b/drivers/net/wireless/libertas/ioctl.c
new file mode 100644
index 000000000000..82b39642423a
--- /dev/null
+++ b/drivers/net/wireless/libertas/ioctl.c
@@ -0,0 +1,2500 @@
+/**
+  * This file contains ioctl functions
+  */
+
+#include <linux/ctype.h>
+#include <linux/delay.h>
+#include <linux/if.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+
+#include <net/iw_handler.h>
+#include <net/ieee80211.h>
+
+#include "host.h"
+#include "radiotap.h"
+#include "decl.h"
+#include "defs.h"
+#include "dev.h"
+#include "join.h"
+#include "wext.h"
+
+#define MAX_SCAN_CELL_SIZE      (IW_EV_ADDR_LEN + \
+                                IW_ESSID_MAX_SIZE + \
+                                IW_EV_UINT_LEN + IW_EV_FREQ_LEN + \
+                                IW_EV_QUAL_LEN + IW_ESSID_MAX_SIZE + \
+                                IW_EV_PARAM_LEN + 40)   /* 40 for WPAIE */
+
+#define WAIT_FOR_SCAN_RRESULT_MAX_TIME (10 * HZ)
+
+static int setrxantenna(wlan_private * priv, int mode)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+
+        if (mode != RF_ANTENNA_1 && mode != RF_ANTENNA_2
+            && mode != RF_ANTENNA_AUTO) {
+                return -EINVAL;
+        }
+
+        adapter->rxantennamode = mode;
+
+        lbs_pr_debug(1, "SET RX Antenna mode to 0x%04x\n", adapter->rxantennamode);
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
+                                    cmd_act_set_rx,
+                                    cmd_option_waitforrsp, 0,
+                                    &adapter->rxantennamode);
+        return ret;
+}
+
+static int settxantenna(wlan_private * priv, int mode)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+
+        if ((mode != RF_ANTENNA_1) && (mode != RF_ANTENNA_2)
+            && (mode != RF_ANTENNA_AUTO)) {
+                return -EINVAL;
+        }
+
+        adapter->txantennamode = mode;
+
+        lbs_pr_debug(1, "SET TX Antenna mode to 0x%04x\n", adapter->txantennamode);
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
+                                    cmd_act_set_tx,
+                                    cmd_option_waitforrsp, 0,
+                                    &adapter->txantennamode);
+
+        return ret;
+}
+
+static int getrxantenna(wlan_private * priv, char *buf)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+
+        // clear it, so we will know if the value
+        // returned below is correct or not.
+        adapter->rxantennamode = 0;
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
+                                    cmd_act_get_rx,
+                                    cmd_option_waitforrsp, 0, NULL);
+
+        if (ret) {
+                LEAVE();
+                return ret;
+        }
+
+        lbs_pr_debug(1, "Get Rx Antenna mode:0x%04x\n", adapter->rxantennamode);
+
+        return sprintf(buf, "0x%04x", adapter->rxantennamode) + 1;
+}
+
+static int gettxantenna(wlan_private * priv, char *buf)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+
+        // clear it, so we will know if the value
+        // returned below is correct or not.
+        adapter->txantennamode = 0;
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
+                                    cmd_act_get_tx,
+                                    cmd_option_waitforrsp, 0, NULL);
+
+        if (ret) {
+                LEAVE();
+                return ret;
+        }
+
+        lbs_pr_debug(1, "Get Tx Antenna mode:0x%04x\n", adapter->txantennamode);
+
+        return sprintf(buf, "0x%04x", adapter->txantennamode) + 1;
+}
+
+static int wlan_set_region(wlan_private * priv, u16 region_code)
+{
+        int i;
+
+        for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
+                // use the region code to search for the index
+                if (region_code == libertas_region_code_to_index[i]) {
+                        priv->adapter->regiontableindex = (u16) i;
+                        priv->adapter->regioncode = region_code;
+                        break;
+                }
+        }
+
+        // if it's unidentified region code
+        if (i >= MRVDRV_MAX_REGION_CODE) {
+                lbs_pr_debug(1, "region Code not identified\n");
+                LEAVE();
+                return -1;
+        }
+
+        if (libertas_set_regiontable(priv, priv->adapter->regioncode, 0)) {
+                LEAVE();
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/**
+ *  @brief Get/Set Firmware wakeup method
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param wrq          A pointer to user data
+ *  @return             0--success, otherwise fail
+ */
+static int wlan_txcontrol(wlan_private * priv, struct iwreq *wrq)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int data;
+        ENTER();
+
+        if ((int)wrq->u.data.length == 0) {
+                if (copy_to_user
+                    (wrq->u.data.pointer, &adapter->pkttxctrl, sizeof(u32))) {
+                        lbs_pr_alert("copy_to_user failed!\n");
+                        return -EFAULT;
+                }
+        } else {
+                if ((int)wrq->u.data.length > 1) {
+                        lbs_pr_alert("ioctl too many args!\n");
+                        return -EFAULT;
+                }
+                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
+                        lbs_pr_alert("Copy from user failed\n");
+                        return -EFAULT;
+                }
+
+                adapter->pkttxctrl = (u32) data;
+        }
+
+        wrq->u.data.length = 1;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief Get/Set NULL Package generation interval
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param wrq          A pointer to user data
+ *  @return             0--success, otherwise fail
+ */
+static int wlan_null_pkt_interval(wlan_private * priv, struct iwreq *wrq)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int data;
+        ENTER();
+
+        if ((int)wrq->u.data.length == 0) {
+                data = adapter->nullpktinterval;
+
+                if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) {
+                        lbs_pr_alert( "copy_to_user failed!\n");
+                        return -EFAULT;
+                }
+        } else {
+                if ((int)wrq->u.data.length > 1) {
+                        lbs_pr_alert( "ioctl too many args!\n");
+                        return -EFAULT;
+                }
+                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
+                        lbs_pr_debug(1, "Copy from user failed\n");
+                        return -EFAULT;
+                }
+
+                adapter->nullpktinterval = data;
+        }
+
+        wrq->u.data.length = 1;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_rxinfo(wlan_private * priv, struct iwreq *wrq)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int data[2];
+        ENTER();
+        data[0] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
+        data[1] = adapter->rxpd_rate;
+        if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 2)) {
+                lbs_pr_debug(1, "Copy to user failed\n");
+                return -EFAULT;
+        }
+        wrq->u.data.length = 2;
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_snr(wlan_private * priv, struct iwreq *wrq)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+        int data[4];
+
+        ENTER();
+        memset(data, 0, sizeof(data));
+        if (wrq->u.data.length) {
+                if (copy_from_user(data, wrq->u.data.pointer,
+                     min_t(size_t, wrq->u.data.length, 4) * sizeof(int)))
+                        return -EFAULT;
+        }
+        if ((wrq->u.data.length == 0) || (data[0] == 0) || (data[0] == 1)) {
+                if (adapter->connect_status == libertas_connected) {
+                        ret = libertas_prepare_and_send_command(priv,
+                                                    cmd_802_11_rssi,
+                                                    0,
+                                                    cmd_option_waitforrsp,
+                                                    0, NULL);
+
+                        if (ret) {
+                                LEAVE();
+                                return ret;
+                        }
+                }
+        }
+
+        if (wrq->u.data.length == 0) {
+                data[0] = adapter->SNR[TYPE_BEACON][TYPE_NOAVG];
+                data[1] = adapter->SNR[TYPE_BEACON][TYPE_AVG];
+                data[2] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
+                data[3] = adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
+                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 4))
+                        return -EFAULT;
+                wrq->u.data.length = 4;
+        } else if (data[0] == 0) {
+                data[0] = adapter->SNR[TYPE_BEACON][TYPE_NOAVG];
+                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
+                        return -EFAULT;
+                wrq->u.data.length = 1;
+        } else if (data[0] == 1) {
+                data[0] = adapter->SNR[TYPE_BEACON][TYPE_AVG];
+                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
+                        return -EFAULT;
+                wrq->u.data.length = 1;
+        } else if (data[0] == 2) {
+                data[0] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
+                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
+                        return -EFAULT;
+                wrq->u.data.length = 1;
+        } else if (data[0] == 3) {
+                data[0] = adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
+                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
+                        return -EFAULT;
+                wrq->u.data.length = 1;
+        } else
+                return -ENOTSUPP;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_beacon_interval(wlan_private * priv, struct iwreq *wrq)
+{
+        int data;
+        wlan_adapter *adapter = priv->adapter;
+
+        if (wrq->u.data.length > 0) {
+                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int)))
+                        return -EFAULT;
+
+                lbs_pr_debug(1, "WLAN SET BEACON INTERVAL: %d\n", data);
+                if ((data > MRVDRV_MAX_BEACON_INTERVAL)
+                    || (data < MRVDRV_MIN_BEACON_INTERVAL))
+                        return -ENOTSUPP;
+                adapter->beaconperiod = data;
+        }
+        data = adapter->beaconperiod;
+        if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int)))
+                return -EFAULT;
+
+        wrq->u.data.length = 1;
+
+        return 0;
+}
+
+static int wlan_get_rssi(wlan_private * priv, struct iwreq *wrq)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+        int temp;
+        int data = 0;
+        int *val;
+
+        ENTER();
+        data = SUBCMD_DATA(wrq);
+        if ((data == 0) || (data == 1)) {
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_rssi,
+                                            0, cmd_option_waitforrsp,
+                                            0, NULL);
+                if (ret) {
+                        LEAVE();
+                        return ret;
+                }
+        }
+
+        switch (data) {
+        case 0:
+
+                temp = CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_NOAVG],
+                                adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
+                break;
+        case 1:
+                temp = CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_AVG],
+                                adapter->NF[TYPE_BEACON][TYPE_AVG]);
+                break;
+        case 2:
+                temp = CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_NOAVG],
+                                adapter->NF[TYPE_RXPD][TYPE_NOAVG]);
+                break;
+        case 3:
+                temp = CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
+                                adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
+                break;
+        default:
+                return -ENOTSUPP;
+        }
+        val = (int *)wrq->u.name;
+        *val = temp;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_nf(wlan_private * priv, struct iwreq *wrq)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+        int temp;
+        int data = 0;
+        int *val;
+
+        data = SUBCMD_DATA(wrq);
+        if ((data == 0) || (data == 1)) {
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_rssi,
+                                            0, cmd_option_waitforrsp,
+                                            0, NULL);
+
+                if (ret) {
+                        LEAVE();
+                        return ret;
+                }
+        }
+
+        switch (data) {
+        case 0:
+                temp = adapter->NF[TYPE_BEACON][TYPE_NOAVG];
+                break;
+        case 1:
+                temp = adapter->NF[TYPE_BEACON][TYPE_AVG];
+                break;
+        case 2:
+                temp = adapter->NF[TYPE_RXPD][TYPE_NOAVG];
+                break;
+        case 3:
+                temp = adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
+                break;
+        default:
+                return -ENOTSUPP;
+        }
+
+        temp = CAL_NF(temp);
+
+        lbs_pr_debug(1, "%s: temp = %d\n", __FUNCTION__, temp);
+        val = (int *)wrq->u.name;
+        *val = temp;
+        return 0;
+}
+
+static int wlan_get_txrate_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int *pdata;
+        struct iwreq *wrq = (struct iwreq *)req;
+        int ret = 0;
+        adapter->txrate = 0;
+        lbs_pr_debug(1, "wlan_get_txrate_ioctl\n");
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_tx_rate_query,
+                                    cmd_act_get, cmd_option_waitforrsp,
+                                    0, NULL);
+        if (ret)
+                return ret;
+
+        pdata = (int *)wrq->u.name;
+        *pdata = (int)adapter->txrate;
+        return 0;
+}
+
+static int wlan_get_adhoc_status_ioctl(wlan_private * priv, struct iwreq *wrq)
+{
+        char status[64];
+        wlan_adapter *adapter = priv->adapter;
+
+        memset(status, 0, sizeof(status));
+
+        switch (adapter->inframode) {
+        case wlan802_11ibss:
+                if (adapter->connect_status == libertas_connected) {
+                        if (adapter->adhoccreate)
+                                memcpy(&status, "AdhocStarted", sizeof(status));
+                        else
+                                memcpy(&status, "AdhocJoined", sizeof(status));
+                } else {
+                        memcpy(&status, "AdhocIdle", sizeof(status));
+                }
+                break;
+        case wlan802_11infrastructure:
+                memcpy(&status, "Inframode", sizeof(status));
+                break;
+        default:
+                memcpy(&status, "AutoUnknownmode", sizeof(status));
+                break;
+        }
+
+        lbs_pr_debug(1, "status = %s\n", status);
+        wrq->u.data.length = strlen(status) + 1;
+
+        if (wrq->u.data.pointer) {
+                if (copy_to_user(wrq->u.data.pointer,
+                                 &status, wrq->u.data.length))
+                        return -EFAULT;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief Set/Get WPA IE
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param req                  A pointer to ifreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_setwpaie_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        ENTER();
+
+        if (wrq->u.data.length) {
+                if (wrq->u.data.length > sizeof(adapter->wpa_ie)) {
+                        lbs_pr_debug(1, "failed to copy WPA IE, too big \n");
+                        return -EFAULT;
+                }
+                if (copy_from_user(adapter->wpa_ie, wrq->u.data.pointer,
+                                   wrq->u.data.length)) {
+                        lbs_pr_debug(1, "failed to copy WPA IE \n");
+                        return -EFAULT;
+                }
+                adapter->wpa_ie_len = wrq->u.data.length;
+                lbs_pr_debug(1, "Set wpa_ie_len=%d IE=%#x\n", adapter->wpa_ie_len,
+                       adapter->wpa_ie[0]);
+                lbs_dbg_hex("wpa_ie", adapter->wpa_ie, adapter->wpa_ie_len);
+                if (adapter->wpa_ie[0] == WPA_IE)
+                        adapter->secinfo.WPAenabled = 1;
+                else if (adapter->wpa_ie[0] == WPA2_IE)
+                        adapter->secinfo.WPA2enabled = 1;
+                else {
+                        adapter->secinfo.WPAenabled = 0;
+                        adapter->secinfo.WPA2enabled = 0;
+                }
+        } else {
+                memset(adapter->wpa_ie, 0, sizeof(adapter->wpa_ie));
+                adapter->wpa_ie_len = wrq->u.data.length;
+                lbs_pr_debug(1, "Reset wpa_ie_len=%d IE=%#x\n",
+                       adapter->wpa_ie_len, adapter->wpa_ie[0]);
+                adapter->secinfo.WPAenabled = 0;
+                adapter->secinfo.WPA2enabled = 0;
+        }
+
+        // enable/disable RSN in firmware if WPA is enabled/disabled
+        // depending on variable adapter->secinfo.WPAenabled is set or not
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_enable_rsn,
+                                    cmd_act_set, cmd_option_waitforrsp,
+                                    0, NULL);
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Set Auto prescan
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param wrq                  A pointer to iwreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_subcmd_setprescan_ioctl(wlan_private * priv, struct iwreq *wrq)
+{
+        int data;
+        wlan_adapter *adapter = priv->adapter;
+        int *val;
+
+        data = SUBCMD_DATA(wrq);
+        lbs_pr_debug(1, "WLAN_SUBCMD_SET_PRESCAN %d\n", data);
+        adapter->prescan = data;
+
+        val = (int *)wrq->u.name;
+        *val = data;
+        return 0;
+}
+
+static int wlan_set_multiple_dtim_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        u32 mdtim;
+        int idata;
+        int ret = -EINVAL;
+
+        ENTER();
+
+        idata = SUBCMD_DATA(wrq);
+        mdtim = (u32) idata;
+        if (((mdtim >= MRVDRV_MIN_MULTIPLE_DTIM)
+             && (mdtim <= MRVDRV_MAX_MULTIPLE_DTIM))
+            || (mdtim == MRVDRV_IGNORE_MULTIPLE_DTIM)) {
+                priv->adapter->multipledtim = mdtim;
+                ret = 0;
+        }
+        if (ret)
+                lbs_pr_debug(1, "Invalid parameter, multipledtim not changed.\n");
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Set authentication mode
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param req                  A pointer to ifreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_setauthalg_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int alg;
+        struct iwreq *wrq = (struct iwreq *)req;
+        wlan_adapter *adapter = priv->adapter;
+
+        if (wrq->u.data.flags == 0) {
+                //from iwpriv subcmd
+                alg = SUBCMD_DATA(wrq);
+        } else {
+                //from wpa_supplicant subcmd
+                if (copy_from_user(&alg, wrq->u.data.pointer, sizeof(alg))) {
+                        lbs_pr_debug(1, "Copy from user failed\n");
+                        return -EFAULT;
+                }
+        }
+
+        lbs_pr_debug(1, "auth alg is %#x\n", alg);
+
+        switch (alg) {
+        case AUTH_ALG_SHARED_KEY:
+                adapter->secinfo.authmode = wlan802_11authmodeshared;
+                break;
+        case AUTH_ALG_NETWORK_EAP:
+                adapter->secinfo.authmode =
+                    wlan802_11authmodenetworkEAP;
+                break;
+        case AUTH_ALG_OPEN_SYSTEM:
+        default:
+                adapter->secinfo.authmode = wlan802_11authmodeopen;
+                break;
+        }
+        return 0;
+}
+
+/**
+ *  @brief Set 802.1x authentication mode
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param req                  A pointer to ifreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_set8021xauthalg_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int alg;
+        struct iwreq *wrq = (struct iwreq *)req;
+
+        if (wrq->u.data.flags == 0) {
+                //from iwpriv subcmd
+                alg = SUBCMD_DATA(wrq);
+        } else {
+                //from wpa_supplicant subcmd
+                if (copy_from_user(&alg, wrq->u.data.pointer, sizeof(int))) {
+                        lbs_pr_debug(1, "Copy from user failed\n");
+                        return -EFAULT;
+                }
+        }
+        lbs_pr_debug(1, "802.1x auth alg is %#x\n", alg);
+        priv->adapter->secinfo.auth1xalg = alg;
+        return 0;
+}
+
+static int wlan_setencryptionmode_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int mode;
+        struct iwreq *wrq = (struct iwreq *)req;
+
+        ENTER();
+
+        if (wrq->u.data.flags == 0) {
+                //from iwpriv subcmd
+                mode = SUBCMD_DATA(wrq);
+        } else {
+                //from wpa_supplicant subcmd
+                if (copy_from_user(&mode, wrq->u.data.pointer, sizeof(int))) {
+                        lbs_pr_debug(1, "Copy from user failed\n");
+                        return -EFAULT;
+                }
+        }
+        lbs_pr_debug(1, "encryption mode is %#x\n", mode);
+        priv->adapter->secinfo.Encryptionmode = mode;
+
+        LEAVE();
+        return 0;
+}
+
+static void adjust_mtu(wlan_private * priv)
+{
+        int mtu_increment = 0;
+
+        if (priv->adapter->linkmode == WLAN_LINKMODE_802_11)
+                mtu_increment += sizeof(struct ieee80211_hdr_4addr);
+
+        if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP)
+                mtu_increment += max(sizeof(struct tx_radiotap_hdr),
+                                     sizeof(struct rx_radiotap_hdr));
+        priv->wlan_dev.netdev->mtu = ETH_FRAME_LEN
+            - sizeof(struct ethhdr)
+            + mtu_increment;
+}
+
+/**
+ *  @brief Set Link-Layer Layer mode
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param req                  A pointer to ifreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_set_linkmode_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int mode;
+
+        mode = (int)((struct ifreq *)((u8 *) req + 4))->ifr_data;
+
+        switch (mode) {
+        case WLAN_LINKMODE_802_3:
+                priv->adapter->linkmode = mode;
+                break;
+        case WLAN_LINKMODE_802_11:
+                priv->adapter->linkmode = mode;
+                break;
+        default:
+                lbs_pr_info("usb8388-5: invalid link-layer mode (%#x)\n",
+                       mode);
+                return -EINVAL;
+                break;
+        }
+        lbs_pr_debug(1, "usb8388-5: link-layer mode is %#x\n", mode);
+
+        adjust_mtu(priv);
+
+        return 0;
+}
+
+/**
+ *  @brief Set Radio header mode
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param req                  A pointer to ifreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_set_radiomode_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int mode;
+
+        mode = (int)((struct ifreq *)((u8 *) req + 4))->ifr_data;
+
+        switch (mode) {
+        case WLAN_RADIOMODE_NONE:
+                priv->adapter->radiomode = mode;
+                break;
+        case WLAN_RADIOMODE_RADIOTAP:
+                priv->adapter->radiomode = mode;
+                break;
+        default:
+                lbs_pr_debug(1, "usb8388-5: invalid radio header mode (%#x)\n",
+                       mode);
+                return -EINVAL;
+        }
+        lbs_pr_debug(1, "usb8388-5: radio-header mode is %#x\n", mode);
+
+        adjust_mtu(priv);
+        return 0;
+}
+
+/**
+ *  @brief Set Debug header mode
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param req                  A pointer to ifreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_set_debugmode_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        priv->adapter->debugmode = (int)((struct ifreq *)
+                                         ((u8 *) req + 4))->ifr_data;
+        return 0;
+}
+
+static int wlan_subcmd_getrxantenna_ioctl(wlan_private * priv,
+                                          struct ifreq *req)
+{
+        int len;
+        char buf[8];
+        struct iwreq *wrq = (struct iwreq *)req;
+
+        lbs_pr_debug(1, "WLAN_SUBCMD_GETRXANTENNA\n");
+        len = getrxantenna(priv, buf);
+
+        wrq->u.data.length = len;
+        if (wrq->u.data.pointer) {
+                if (copy_to_user(wrq->u.data.pointer, &buf, len)) {
+                        lbs_pr_debug(1, "CopyToUser failed\n");
+                        return -EFAULT;
+                }
+        }
+
+        return 0;
+}
+
+static int wlan_subcmd_gettxantenna_ioctl(wlan_private * priv,
+                                          struct ifreq *req)
+{
+        int len;
+        char buf[8];
+        struct iwreq *wrq = (struct iwreq *)req;
+
+        lbs_pr_debug(1, "WLAN_SUBCMD_GETTXANTENNA\n");
+        len = gettxantenna(priv, buf);
+
+        wrq->u.data.length = len;
+        if (wrq->u.data.pointer) {
+                if (copy_to_user(wrq->u.data.pointer, &buf, len)) {
+                        lbs_pr_debug(1, "CopyToUser failed\n");
+                        return -EFAULT;
+                }
+        }
+        return 0;
+}
+
+/**
+ *  @brief Get the MAC TSF value from the firmware
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param wrq          A pointer to iwreq structure containing buffer
+ *                      space to store a TSF value retrieved from the firmware
+ *
+ *  @return             0 if successful; IOCTL error code otherwise
+ */
+static int wlan_get_tsf_ioctl(wlan_private * priv, struct iwreq *wrq)
+{
+        u64 tsfval;
+        int ret;
+
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_get_tsf,
+                                    0, cmd_option_waitforrsp, 0, &tsfval);
+
+        lbs_pr_debug(1, "IOCTL: Get TSF = 0x%016llx\n", tsfval);
+
+        if (ret != 0) {
+                lbs_pr_debug(1, "IOCTL: Get TSF; command exec failed\n");
+                ret = -EFAULT;
+        } else {
+                if (copy_to_user(wrq->u.data.pointer,
+                                 &tsfval,
+                                 min_t(size_t, wrq->u.data.length,
+                                     sizeof(tsfval))) != 0) {
+
+                        lbs_pr_debug(1, "IOCTL: Get TSF; Copy to user failed\n");
+                        ret = -EFAULT;
+                } else {
+                        ret = 0;
+                }
+        }
+        return ret;
+}
+
+/**
+ *  @brief Get/Set adapt rate
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param wrq                  A pointer to iwreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_adapt_rateset(wlan_private * priv, struct iwreq *wrq)
+{
+        int ret;
+        wlan_adapter *adapter = priv->adapter;
+        int data[2];
+
+        memset(data, 0, sizeof(data));
+        if (!wrq->u.data.length) {
+                lbs_pr_debug(1, "Get ADAPT RATE SET\n");
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_rate_adapt_rateset,
+                                            cmd_act_get,
+                                            cmd_option_waitforrsp, 0, NULL);
+                data[0] = adapter->enablehwauto;
+                data[1] = adapter->ratebitmap;
+                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 2)) {
+                        lbs_pr_debug(1, "Copy to user failed\n");
+                        return -EFAULT;
+                }
+#define GET_TWO_INT     2
+                wrq->u.data.length = GET_TWO_INT;
+        } else {
+                lbs_pr_debug(1, "Set ADAPT RATE SET\n");
+                if (wrq->u.data.length > 2)
+                        return -EINVAL;
+                if (copy_from_user
+                    (data, wrq->u.data.pointer,
+                     sizeof(int) * wrq->u.data.length)) {
+                        lbs_pr_debug(1, "Copy from user failed\n");
+                        return -EFAULT;
+                }
+
+                adapter->enablehwauto = data[0];
+                adapter->ratebitmap = data[1];
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_rate_adapt_rateset,
+                                            cmd_act_set,
+                                            cmd_option_waitforrsp, 0, NULL);
+        }
+        return ret;
+}
+
+/**
+ *  @brief Get/Set inactivity timeout
+ *  @param priv                 A pointer to wlan_private structure
+ *  @param wrq                  A pointer to iwreq structure
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_inactivity_timeout(wlan_private * priv, struct iwreq *wrq)
+{
+        int ret;
+        int data = 0;
+        u16 timeout = 0;
+
+        ENTER();
+        if (wrq->u.data.length > 1)
+                return -ENOTSUPP;
+
+        if (wrq->u.data.length == 0) {
+                /* Get */
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_inactivity_timeout,
+                                            cmd_act_get,
+                                            cmd_option_waitforrsp, 0,
+                                            &timeout);
+                data = timeout;
+                if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) {
+                        lbs_pr_debug(1, "Copy to user failed\n");
+                        return -EFAULT;
+                }
+        } else {
+                /* Set */
+                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
+                        lbs_pr_debug(1, "Copy from user failed\n");
+                        return -EFAULT;
+                }
+
+                timeout = data;
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_inactivity_timeout,
+                                            cmd_act_set,
+                                            cmd_option_waitforrsp, 0,
+                                            &timeout);
+        }
+
+        wrq->u.data.length = 1;
+
+        LEAVE();
+        return ret;
+}
+
+static int wlan_do_getlog_ioctl(wlan_private * priv, struct iwreq *wrq)
+{
+        int ret;
+        char buf[GETLOG_BUFSIZE - 1];
+        wlan_adapter *adapter = priv->adapter;
+
+        lbs_pr_debug(1, " GET STATS\n");
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_get_log,
+                                    0, cmd_option_waitforrsp, 0, NULL);
+
+        if (ret) {
+                return ret;
+        }
+
+        if (wrq->u.data.pointer) {
+                sprintf(buf, "\n  mcasttxframe %u failed %u retry %u "
+                        "multiretry %u framedup %u "
+                        "rtssuccess %u rtsfailure %u ackfailure %u\n"
+                        "rxfrag %u mcastrxframe %u fcserror %u "
+                        "txframe %u wepundecryptable %u ",
+                        adapter->logmsg.mcasttxframe,
+                        adapter->logmsg.failed,
+                        adapter->logmsg.retry,
+                        adapter->logmsg.multiretry,
+                        adapter->logmsg.framedup,
+                        adapter->logmsg.rtssuccess,
+                        adapter->logmsg.rtsfailure,
+                        adapter->logmsg.ackfailure,
+                        adapter->logmsg.rxfrag,
+                        adapter->logmsg.mcastrxframe,
+                        adapter->logmsg.fcserror,
+                        adapter->logmsg.txframe,
+                        adapter->logmsg.wepundecryptable);
+                wrq->u.data.length = strlen(buf) + 1;
+                if (copy_to_user(wrq->u.data.pointer, buf, wrq->u.data.length)) {
+                        lbs_pr_debug(1, "Copy to user failed\n");
+                        return -EFAULT;
+                }
+        }
+
+        return 0;
+}
+
+static int wlan_scan_type_ioctl(wlan_private * priv, struct iwreq *wrq)
+{
+        u8 buf[12];
+        u8 *option[] = { "active", "passive", "get", };
+        int i, max_options = (sizeof(option) / sizeof(option[0]));
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+
+        if (priv->adapter->enable11d) {
+                lbs_pr_debug(1, "11D: Cannot set scantype when 11D enabled\n");
+                return -EFAULT;
+        }
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(buf, wrq->u.data.pointer, min_t(size_t, sizeof(buf),
+                                                         wrq->u.data.length)))
+                return -EFAULT;
+
+        lbs_pr_debug(1, "Scan type Option = %s\n", buf);
+
+        buf[sizeof(buf) - 1] = '\0';
+
+        for (i = 0; i < max_options; i++) {
+                if (!strcmp(buf, option[i]))
+                        break;
+        }
+
+        switch (i) {
+        case 0:
+                adapter->scantype = cmd_scan_type_active;
+                break;
+        case 1:
+                adapter->scantype = cmd_scan_type_passive;
+                break;
+        case 2:
+                wrq->u.data.length = strlen(option[adapter->scantype]) + 1;
+
+                if (copy_to_user(wrq->u.data.pointer,
+                                 option[adapter->scantype],
+                                 wrq->u.data.length)) {
+                        lbs_pr_debug(1, "Copy to user failed\n");
+                        ret = -EFAULT;
+                }
+
+                break;
+        default:
+                lbs_pr_debug(1, "Invalid Scan type Ioctl Option\n");
+                ret = -EINVAL;
+                break;
+        }
+
+        return ret;
+}
+
+static int wlan_scan_mode_ioctl(wlan_private * priv, struct iwreq *wrq)
+{
+        wlan_adapter *adapter = priv->adapter;
+        u8 buf[12];
+        u8 *option[] = { "bss", "ibss", "any", "get" };
+        int i, max_options = (sizeof(option) / sizeof(option[0]));
+        int ret = 0;
+
+        ENTER();
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(buf, wrq->u.data.pointer, min_t(size_t, sizeof(buf),
+                                                         wrq->u.data.length))) {
+                lbs_pr_debug(1, "Copy from user failed\n");
+                return -EFAULT;
+        }
+
+        lbs_pr_debug(1, "Scan mode Option = %s\n", buf);
+
+        buf[sizeof(buf) - 1] = '\0';
+
+        for (i = 0; i < max_options; i++) {
+                if (!strcmp(buf, option[i]))
+                        break;
+        }
+
+        switch (i) {
+
+        case 0:
+                adapter->scanmode = cmd_bss_type_bss;
+                break;
+        case 1:
+                adapter->scanmode = cmd_bss_type_ibss;
+                break;
+        case 2:
+                adapter->scanmode = cmd_bss_type_any;
+                break;
+        case 3:
+
+                wrq->u.data.length = strlen(option[adapter->scanmode - 1]) + 1;
+
+                lbs_pr_debug(1, "Get Scan mode Option = %s\n",
+                       option[adapter->scanmode - 1]);
+
+                lbs_pr_debug(1, "Scan mode length %d\n", wrq->u.data.length);
+
+                if (copy_to_user(wrq->u.data.pointer,
+                                 option[adapter->scanmode - 1],
+                                 wrq->u.data.length)) {
+                        lbs_pr_debug(1, "Copy to user failed\n");
+                        ret = -EFAULT;
+                }
+                lbs_pr_debug(1, "GET Scan type Option after copy = %s\n",
+                       (char *)wrq->u.data.pointer);
+
+                break;
+
+        default:
+                lbs_pr_debug(1, "Invalid Scan mode Ioctl Option\n");
+                ret = -EINVAL;
+                break;
+        }
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Get/Set Adhoc G Rate
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param wrq          A pointer to user data
+ *  @return             0--success, otherwise fail
+ */
+static int wlan_do_set_grate_ioctl(wlan_private * priv, struct iwreq *wrq)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int data, data1;
+        int *val;
+
+        ENTER();
+
+        data1 = SUBCMD_DATA(wrq);
+        switch (data1) {
+        case 0:
+                adapter->adhoc_grate_enabled = 0;
+                break;
+        case 1:
+                adapter->adhoc_grate_enabled = 1;
+                break;
+        case 2:
+                break;
+        default:
+                return -EINVAL;
+        }
+        data = adapter->adhoc_grate_enabled;
+        val = (int *)wrq->u.name;
+        *val = data;
+        LEAVE();
+        return 0;
+}
+
+static inline int hex2int(char c)
+{
+        if (c >= '0' && c <= '9')
+                return (c - '0');
+        if (c >= 'a' && c <= 'f')
+                return (c - 'a' + 10);
+        if (c >= 'A' && c <= 'F')
+                return (c - 'A' + 10);
+        return -1;
+}
+
+/* Convert a string representation of a MAC address ("xx:xx:xx:xx:xx:xx")
+   into binary format (6 bytes).
+
+   This function expects that each byte is represented with 2 characters
+   (e.g., 11:2:11:11:11:11 is invalid)
+
+ */
+static char *eth_str2addr(char *ethstr, u8 * addr)
+{
+        int i, val, val2;
+        char *pos = ethstr;
+
+        /* get rid of initial blanks */
+        while (*pos == ' ' || *pos == '\t')
+                ++pos;
+
+        for (i = 0; i < 6; i++) {
+                val = hex2int(*pos++);
+                if (val < 0)
+                        return NULL;
+                val2 = hex2int(*pos++);
+                if (val2 < 0)
+                        return NULL;
+                addr[i] = (val * 16 + val2) & 0xff;
+
+                if (i < 5 && *pos++ != ':')
+                        return NULL;
+        }
+        return pos;
+}
+
+/* this writes xx:xx:xx:xx:xx:xx into ethstr
+   (ethstr must have space for 18 chars) */
+static int eth_addr2str(u8 * addr, char *ethstr)
+{
+        int i;
+        char *pos = ethstr;
+
+        for (i = 0; i < 6; i++) {
+                sprintf(pos, "%02x", addr[i] & 0xff);
+                pos += 2;
+                if (i < 5)
+                        *pos++ = ':';
+        }
+        return 17;
+}
+
+/**
+ *  @brief          Add an entry to the BT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_bt_add_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char ethaddrs_str[18];
+        char *pos;
+        u8 ethaddr[ETH_ALEN];
+
+        ENTER();
+        if (copy_from_user(ethaddrs_str, wrq->u.data.pointer,
+                           sizeof(ethaddrs_str)))
+                return -EFAULT;
+
+        if ((pos = eth_str2addr(ethaddrs_str, ethaddr)) == NULL) {
+                lbs_pr_info("BT_ADD: Invalid MAC address\n");
+                return -EINVAL;
+        }
+
+        lbs_pr_debug(1, "BT: adding %s\n", ethaddrs_str);
+        LEAVE();
+        return (libertas_prepare_and_send_command(priv, cmd_bt_access,
+                                      cmd_act_bt_access_add,
+                                      cmd_option_waitforrsp, 0, ethaddr));
+}
+
+/**
+ *  @brief          Delete an entry from the BT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_bt_del_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char ethaddrs_str[18];
+        u8 ethaddr[ETH_ALEN];
+        char *pos;
+
+        ENTER();
+        if (copy_from_user(ethaddrs_str, wrq->u.data.pointer,
+                           sizeof(ethaddrs_str)))
+                return -EFAULT;
+
+        if ((pos = eth_str2addr(ethaddrs_str, ethaddr)) == NULL) {
+                lbs_pr_info("Invalid MAC address\n");
+                return -EINVAL;
+        }
+
+        lbs_pr_debug(1, "BT: deleting %s\n", ethaddrs_str);
+
+        return (libertas_prepare_and_send_command(priv,
+                                      cmd_bt_access,
+                                      cmd_act_bt_access_del,
+                                      cmd_option_waitforrsp, 0, ethaddr));
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          Reset all entries from the BT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_bt_reset_ioctl(wlan_private * priv)
+{
+        ENTER();
+
+        lbs_pr_alert( "BT: resetting\n");
+
+        return (libertas_prepare_and_send_command(priv,
+                                      cmd_bt_access,
+                                      cmd_act_bt_access_reset,
+                                      cmd_option_waitforrsp, 0, NULL));
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          List an entry from the BT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_bt_list_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int pos;
+        char *addr1;
+        struct iwreq *wrq = (struct iwreq *)req;
+        /* used to pass id and store the bt entry returned by the FW */
+        union {
+                int id;
+                char addr1addr2[2 * ETH_ALEN];
+        } param;
+        static char outstr[64];
+        char *pbuf = outstr;
+        int ret;
+
+        ENTER();
+
+        if (copy_from_user(outstr, wrq->u.data.pointer, sizeof(outstr))) {
+                lbs_pr_debug(1, "Copy from user failed\n");
+                return -1;
+        }
+        param.id = simple_strtoul(outstr, NULL, 10);
+        pos = sprintf(pbuf, "%d: ", param.id);
+        pbuf += pos;
+
+        ret = libertas_prepare_and_send_command(priv, cmd_bt_access,
+                                    cmd_act_bt_access_list,
+                                    cmd_option_waitforrsp, 0,
+                                    (char *)&param);
+
+        if (ret == 0) {
+                addr1 = param.addr1addr2;
+
+                pos = sprintf(pbuf, "ignoring traffic from ");
+                pbuf += pos;
+                pos = eth_addr2str(addr1, pbuf);
+                pbuf += pos;
+        } else {
+                sprintf(pbuf, "(null)");
+                pbuf += pos;
+        }
+
+        wrq->u.data.length = strlen(outstr);
+        if (copy_to_user(wrq->u.data.pointer, (char *)outstr,
+                         wrq->u.data.length)) {
+                lbs_pr_debug(1, "BT_LIST: Copy to user failed!\n");
+                return -EFAULT;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          Find the next parameter in an input string
+ *  @param ptr      A pointer to the input parameter string
+ *  @return         A pointer to the next parameter, or 0 if no parameters left.
+ */
+static char * next_param(char * ptr)
+{
+        if (!ptr) return NULL;
+        while (*ptr == ' ' || *ptr == '\t') ++ptr;
+        return (*ptr == '\0') ? NULL : ptr;
+}
+
+/**
+ *  @brief          Add an entry to the FWT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_add_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char in_str[128];
+        static struct cmd_ds_fwt_access fwt_access;
+        char *ptr;
+
+        ENTER();
+        if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
+                return -EFAULT;
+
+        if ((ptr = eth_str2addr(in_str, fwt_access.da)) == NULL) {
+                lbs_pr_alert( "FWT_ADD: Invalid MAC address 1\n");
+                return -EINVAL;
+        }
+
+        if ((ptr = eth_str2addr(ptr, fwt_access.ra)) == NULL) {
+                lbs_pr_alert( "FWT_ADD: Invalid MAC address 2\n");
+                return -EINVAL;
+        }
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.metric =
+                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+        else
+                fwt_access.metric = FWT_DEFAULT_METRIC;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.dir = (u8)simple_strtoul(ptr, &ptr, 10);
+        else
+                fwt_access.dir = FWT_DEFAULT_DIR;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.ssn =
+                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+        else
+                fwt_access.ssn = FWT_DEFAULT_SSN;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.dsn =
+                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+        else
+                fwt_access.dsn = FWT_DEFAULT_DSN;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.hopcount = simple_strtoul(ptr, &ptr, 10);
+        else
+                fwt_access.hopcount = FWT_DEFAULT_HOPCOUNT;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.ttl = simple_strtoul(ptr, &ptr, 10);
+        else
+                fwt_access.ttl = FWT_DEFAULT_TTL;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.expiration =
+                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+        else
+                fwt_access.expiration = FWT_DEFAULT_EXPIRATION;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.sleepmode = (u8)simple_strtoul(ptr, &ptr, 10);
+        else
+                fwt_access.sleepmode = FWT_DEFAULT_SLEEPMODE;
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.snr =
+                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+        else
+                fwt_access.snr = FWT_DEFAULT_SNR;
+
+#ifdef DEBUG
+        {
+                char ethaddr1_str[18], ethaddr2_str[18];
+                eth_addr2str(fwt_access.da, ethaddr1_str);
+                eth_addr2str(fwt_access.ra, ethaddr2_str);
+                lbs_pr_debug(1, "FWT_ADD: adding (da:%s,%i,ra:%s)\n", ethaddr1_str,
+                       fwt_access.dir, ethaddr2_str);
+                lbs_pr_debug(1, "FWT_ADD: ssn:%u dsn:%u met:%u hop:%u ttl:%u exp:%u slp:%u snr:%u\n",
+                       fwt_access.ssn, fwt_access.dsn, fwt_access.metric,
+                       fwt_access.hopcount, fwt_access.ttl, fwt_access.expiration,
+                       fwt_access.sleepmode, fwt_access.snr);
+        }
+#endif
+
+        LEAVE();
+        return (libertas_prepare_and_send_command(priv, cmd_fwt_access,
+                                                  cmd_act_fwt_access_add,
+                                                  cmd_option_waitforrsp, 0,
+                                                  (void *)&fwt_access));
+}
+
+/**
+ *  @brief          Delete an entry from the FWT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_del_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char in_str[64];
+        static struct cmd_ds_fwt_access fwt_access;
+        char *ptr;
+
+        ENTER();
+        if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
+                return -EFAULT;
+
+        if ((ptr = eth_str2addr(in_str, fwt_access.da)) == NULL) {
+                lbs_pr_alert( "FWT_DEL: Invalid MAC address 1\n");
+                return -EINVAL;
+        }
+
+        if ((ptr = eth_str2addr(ptr, fwt_access.ra)) == NULL) {
+                lbs_pr_alert( "FWT_DEL: Invalid MAC address 2\n");
+                return -EINVAL;
+        }
+
+        if ((ptr = next_param(ptr)))
+                fwt_access.dir = (u8)simple_strtoul(ptr, &ptr, 10);
+        else
+                fwt_access.dir = FWT_DEFAULT_DIR;
+
+#ifdef DEBUG
+        {
+                char ethaddr1_str[18], ethaddr2_str[18];
+                lbs_pr_debug(1, "FWT_DEL: line is %s\n", in_str);
+                eth_addr2str(fwt_access.da, ethaddr1_str);
+                eth_addr2str(fwt_access.ra, ethaddr2_str);
+                lbs_pr_debug(1, "FWT_DEL: removing (da:%s,ra:%s,dir:%d)\n", ethaddr1_str,
+                       ethaddr2_str, fwt_access.dir);
+        }
+#endif
+
+        LEAVE();
+        return (libertas_prepare_and_send_command(priv,
+                                                  cmd_fwt_access,
+                                                  cmd_act_fwt_access_del,
+                                                  cmd_option_waitforrsp, 0,
+                                                  (void *)&fwt_access));
+}
+
+
+/**
+ *  @brief             Print route parameters
+ *  @param fwt_access  struct cmd_ds_fwt_access with route info
+ *  @param buf         destination buffer for route info
+ */
+static void print_route(struct cmd_ds_fwt_access fwt_access, char *buf)
+{
+        buf += sprintf(buf, " ");
+        buf += eth_addr2str(fwt_access.da, buf);
+        buf += sprintf(buf, " ");
+        buf += eth_addr2str(fwt_access.ra, buf);
+        buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.metric));
+        buf += sprintf(buf, " %u", fwt_access.dir);
+        buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.ssn));
+        buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.dsn));
+        buf += sprintf(buf, " %u", fwt_access.hopcount);
+        buf += sprintf(buf, " %u", fwt_access.ttl);
+        buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.expiration));
+        buf += sprintf(buf, " %u", fwt_access.sleepmode);
+        buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.snr));
+}
+
+/**
+ *  @brief          Lookup an entry in the FWT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_lookup_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char in_str[64];
+        char *ptr;
+        static struct cmd_ds_fwt_access fwt_access;
+        static char out_str[128];
+        int ret;
+
+        ENTER();
+        if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
+                return -EFAULT;
+
+        if ((ptr = eth_str2addr(in_str, fwt_access.da)) == NULL) {
+                lbs_pr_alert( "FWT_LOOKUP: Invalid MAC address\n");
+                return -EINVAL;
+        }
+
+#ifdef DEBUG
+        {
+                char ethaddr1_str[18];
+                lbs_pr_debug(1, "FWT_LOOKUP: line is %s\n", in_str);
+                eth_addr2str(fwt_access.da, ethaddr1_str);
+                lbs_pr_debug(1, "FWT_LOOKUP: looking for (da:%s)\n", ethaddr1_str);
+        }
+#endif
+
+        ret = libertas_prepare_and_send_command(priv,
+                                                cmd_fwt_access,
+                                                cmd_act_fwt_access_lookup,
+                                                cmd_option_waitforrsp, 0,
+                                                (void *)&fwt_access);
+
+        if (ret == 0)
+                print_route(fwt_access, out_str);
+        else
+                sprintf(out_str, "(null)");
+
+        wrq->u.data.length = strlen(out_str);
+        if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
+                         wrq->u.data.length)) {
+                lbs_pr_debug(1, "FWT_LOOKUP: Copy to user failed!\n");
+                return -EFAULT;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          Reset all entries from the FWT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_reset_ioctl(wlan_private * priv)
+{
+        lbs_pr_debug(1, "FWT: resetting\n");
+
+        return (libertas_prepare_and_send_command(priv,
+                                      cmd_fwt_access,
+                                      cmd_act_fwt_access_reset,
+                                      cmd_option_waitforrsp, 0, NULL));
+}
+
+/**
+ *  @brief          List an entry from the FWT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_list_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char in_str[8];
+        static struct cmd_ds_fwt_access fwt_access;
+        char *ptr = in_str;
+        static char out_str[128];
+        char *pbuf = out_str;
+        int ret;
+
+        ENTER();
+        if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
+                return -EFAULT;
+
+        fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+
+#ifdef DEBUG
+        {
+                lbs_pr_debug(1, "FWT_LIST: line is %s\n", in_str);
+                lbs_pr_debug(1, "FWT_LIST: listing id:%i\n", le32_to_cpu(fwt_access.id));
+        }
+#endif
+
+        ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
+                                    cmd_act_fwt_access_list,
+                                    cmd_option_waitforrsp, 0, (void *)&fwt_access);
+
+        if (ret == 0)
+                print_route(fwt_access, pbuf);
+        else
+                pbuf += sprintf(pbuf, " (null)");
+
+        wrq->u.data.length = strlen(out_str);
+        if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
+                         wrq->u.data.length)) {
+                lbs_pr_debug(1, "FWT_LIST: Copy to user failed!\n");
+                return -EFAULT;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          List an entry from the FRT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_list_route_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char in_str[64];
+        static struct cmd_ds_fwt_access fwt_access;
+        char *ptr = in_str;
+        static char out_str[128];
+        char *pbuf = out_str;
+        int ret;
+
+        ENTER();
+        if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
+                return -EFAULT;
+
+        fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+
+#ifdef DEBUG
+        {
+                lbs_pr_debug(1, "FWT_LIST_ROUTE: line is %s\n", in_str);
+                lbs_pr_debug(1, "FWT_LIST_ROUTE: listing id:%i\n", le32_to_cpu(fwt_access.id));
+        }
+#endif
+
+        ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
+                                    cmd_act_fwt_access_list_route,
+                                    cmd_option_waitforrsp, 0, (void *)&fwt_access);
+
+        if (ret == 0) {
+                pbuf += sprintf(pbuf, " ");
+                pbuf += eth_addr2str(fwt_access.da, pbuf);
+                pbuf += sprintf(pbuf, " %u", le32_to_cpu(fwt_access.metric));
+                pbuf += sprintf(pbuf, " %u", fwt_access.dir);
+                /* note that the firmware returns the nid in the id field */
+                pbuf += sprintf(pbuf, " %u", le32_to_cpu(fwt_access.id));
+                pbuf += sprintf(pbuf, " %u", le32_to_cpu(fwt_access.ssn));
+                pbuf += sprintf(pbuf, " %u", le32_to_cpu(fwt_access.dsn));
+                pbuf += sprintf(pbuf, "  hop %u", fwt_access.hopcount);
+                pbuf += sprintf(pbuf, "  ttl %u", fwt_access.ttl);
+                pbuf += sprintf(pbuf, " %u", le32_to_cpu(fwt_access.expiration));
+        } else
+                pbuf += sprintf(pbuf, " (null)");
+
+        wrq->u.data.length = strlen(out_str);
+        if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
+                         wrq->u.data.length)) {
+                lbs_pr_debug(1, "FWT_LIST_ROUTE: Copy to user failed!\n");
+                return -EFAULT;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          List an entry from the FNT table
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_list_neighbor_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct iwreq *wrq = (struct iwreq *)req;
+        char in_str[8];
+        static struct cmd_ds_fwt_access fwt_access;
+        char *ptr = in_str;
+        static char out_str[128];
+        char *pbuf = out_str;
+        int ret;
+
+        ENTER();
+        if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
+                return -EFAULT;
+
+        memset(&fwt_access, 0, sizeof(fwt_access));
+        fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
+
+#ifdef DEBUG
+        {
+                lbs_pr_debug(1, "FWT_LIST_NEIGHBOR: line is %s\n", in_str);
+                lbs_pr_debug(1, "FWT_LIST_NEIGHBOR: listing id:%i\n", le32_to_cpu(fwt_access.id));
+        }
+#endif
+
+        ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
+                                    cmd_act_fwt_access_list_neighbor,
+                                    cmd_option_waitforrsp, 0,
+                                    (void *)&fwt_access);
+
+        if (ret == 0) {
+                pbuf += sprintf(pbuf, " ra ");
+                pbuf += eth_addr2str(fwt_access.ra, pbuf);
+                pbuf += sprintf(pbuf, "  slp %u", fwt_access.sleepmode);
+                pbuf += sprintf(pbuf, "  snr %u", le32_to_cpu(fwt_access.snr));
+                pbuf += sprintf(pbuf, "  ref %u", le32_to_cpu(fwt_access.references));
+        } else
+                pbuf += sprintf(pbuf, " (null)");
+
+        wrq->u.data.length = strlen(out_str);
+        if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
+                         wrq->u.data.length)) {
+                lbs_pr_debug(1, "FWT_LIST_NEIGHBOR: Copy to user failed!\n");
+                return -EFAULT;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          Cleans up the route (FRT) and neighbor (FNT) tables
+ *                  (Garbage Collection)
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        static struct cmd_ds_fwt_access fwt_access;
+        int ret;
+
+        ENTER();
+
+        lbs_pr_debug(1, "FWT: cleaning up\n");
+
+        memset(&fwt_access, 0, sizeof(fwt_access));
+
+        ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
+                                    cmd_act_fwt_access_cleanup,
+                                    cmd_option_waitforrsp, 0,
+                                    (void *)&fwt_access);
+
+        if (ret == 0)
+                req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
+        else
+                return -EFAULT;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          Gets firmware internal time (debug purposes)
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        static struct cmd_ds_fwt_access fwt_access;
+        int ret;
+
+        ENTER();
+
+        lbs_pr_debug(1, "FWT: getting time\n");
+
+        memset(&fwt_access, 0, sizeof(fwt_access));
+
+        ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
+                                    cmd_act_fwt_access_time,
+                                    cmd_option_waitforrsp, 0,
+                                    (void *)&fwt_access);
+
+        if (ret == 0)
+                req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
+        else
+                return -EFAULT;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          Gets mesh ttl from firmware
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        struct cmd_ds_mesh_access mesh_access;
+        int ret;
+
+        ENTER();
+
+        memset(&mesh_access, 0, sizeof(mesh_access));
+
+        ret = libertas_prepare_and_send_command(priv, cmd_mesh_access,
+                                    cmd_act_mesh_get_ttl,
+                                    cmd_option_waitforrsp, 0,
+                                    (void *)&mesh_access);
+
+        if (ret == 0) {
+                req->ifr_data = (char *)(le32_to_cpu(mesh_access.data[0]));
+        }
+        else
+                return -EFAULT;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief          Gets mesh ttl from firmware
+ *  @param priv     A pointer to wlan_private structure
+ *  @param ttl      New ttl value
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_mesh_set_ttl_ioctl(wlan_private * priv, int ttl)
+{
+        struct cmd_ds_mesh_access mesh_access;
+        int ret;
+
+        ENTER();
+
+        if( (ttl > 0xff) || (ttl < 0) )
+                return -EINVAL;
+
+        memset(&mesh_access, 0, sizeof(mesh_access));
+        mesh_access.data[0] = ttl;
+
+        ret = libertas_prepare_and_send_command(priv, cmd_mesh_access,
+                                                cmd_act_mesh_set_ttl,
+                                                cmd_option_waitforrsp, 0,
+                                                (void *)&mesh_access);
+
+        if (ret != 0)
+                ret = -EFAULT;
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief ioctl function - entry point
+ *
+ *  @param dev          A pointer to net_device structure
+ *  @param req          A pointer to ifreq structure
+ *  @param cmd          command
+ *  @return             0--success, otherwise fail
+ */
+int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
+{
+        int subcmd = 0;
+        int idata = 0;
+        int *pdata;
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct iwreq *wrq = (struct iwreq *)req;
+
+        ENTER();
+
+        lbs_pr_debug(1, "libertas_do_ioctl: ioctl cmd = 0x%x\n", cmd);
+        switch (cmd) {
+        case WLANSCAN_TYPE:
+                lbs_pr_debug(1, "Scan type Ioctl\n");
+                ret = wlan_scan_type_ioctl(priv, wrq);
+                break;
+
+        case WLAN_SETNONE_GETNONE:      /* set WPA mode on/off ioctl #20 */
+                switch (wrq->u.data.flags) {
+                case WLANDEAUTH:
+                        lbs_pr_debug(1, "Deauth\n");
+                        libertas_send_deauth(priv);
+                        break;
+
+                case WLANADHOCSTOP:
+                        lbs_pr_debug(1, "Adhoc stop\n");
+                        ret = libertas_do_adhocstop_ioctl(priv);
+                        break;
+
+                case WLANRADIOON:
+                        wlan_radio_ioctl(priv, 1);
+                        break;
+
+                case WLANRADIOOFF:
+                        wlan_radio_ioctl(priv, 0);
+                        break;
+                case WLANWLANIDLEON:
+                        libertas_idle_on(priv);
+                        break;
+                case WLANWLANIDLEOFF:
+                        libertas_idle_off(priv);
+                        break;
+                case WLAN_SUBCMD_BT_RESET:      /* bt_reset */
+                        wlan_bt_reset_ioctl(priv);
+                        break;
+                case WLAN_SUBCMD_FWT_RESET:     /* fwt_reset */
+                        wlan_fwt_reset_ioctl(priv);
+                        break;
+                }               /* End of switch */
+                break;
+
+        case WLANSETWPAIE:
+                ret = wlan_setwpaie_ioctl(priv, req);
+                break;
+        case WLAN_SETINT_GETINT:
+                /* The first 4 bytes of req->ifr_data is sub-ioctl number
+                 * after 4 bytes sits the payload.
+                 */
+                subcmd = (int)req->ifr_data;    //from iwpriv subcmd
+                switch (subcmd) {
+                case WLANNF:
+                        ret = wlan_get_nf(priv, wrq);
+                        break;
+                case WLANRSSI:
+                        ret = wlan_get_rssi(priv, wrq);
+                        break;
+                case WLANENABLE11D:
+                        ret = libertas_cmd_enable_11d(priv, wrq);
+                        break;
+                case WLANADHOCGRATE:
+                        ret = wlan_do_set_grate_ioctl(priv, wrq);
+                        break;
+                case WLAN_SUBCMD_SET_PRESCAN:
+                        ret = wlan_subcmd_setprescan_ioctl(priv, wrq);
+                        break;
+                }
+                break;
+
+        case WLAN_SETONEINT_GETONEINT:
+                switch (wrq->u.data.flags) {
+                case WLAN_BEACON_INTERVAL:
+                        ret = wlan_beacon_interval(priv, wrq);
+                        break;
+
+                case WLAN_LISTENINTRVL:
+                        if (!wrq->u.data.length) {
+                                int data;
+                                lbs_pr_debug(1, "Get locallisteninterval value\n");
+#define GET_ONE_INT     1
+                                data = adapter->locallisteninterval;
+                                if (copy_to_user(wrq->u.data.pointer,
+                                                 &data, sizeof(int))) {
+                                        lbs_pr_debug(1, "Copy to user failed\n");
+                                        return -EFAULT;
+                                }
+
+                                wrq->u.data.length = GET_ONE_INT;
+                        } else {
+                                int data;
+                                if (copy_from_user
+                                    (&data, wrq->u.data.pointer, sizeof(int))) {
+                                        lbs_pr_debug(1, "Copy from user failed\n");
+                                        return -EFAULT;
+                                }
+
+                                lbs_pr_debug(1, "Set locallisteninterval = %d\n",
+                                       data);
+#define MAX_U16_VAL     65535
+                                if (data > MAX_U16_VAL) {
+                                        lbs_pr_debug(1, "Exceeds U16 value\n");
+                                        return -EINVAL;
+                                }
+                                adapter->locallisteninterval = data;
+                        }
+                        break;
+                case WLAN_TXCONTROL:
+                        ret = wlan_txcontrol(priv, wrq);        //adds for txcontrol ioctl
+                        break;
+
+                case WLAN_NULLPKTINTERVAL:
+                        ret = wlan_null_pkt_interval(priv, wrq);
+                        break;
+
+                default:
+                        ret = -EOPNOTSUPP;
+                        break;
+                }
+                break;
+
+        case WLAN_SETONEINT_GETNONE:
+                /* The first 4 bytes of req->ifr_data is sub-ioctl number
+                 * after 4 bytes sits the payload.
+                 */
+                subcmd = wrq->u.data.flags;     //from wpa_supplicant subcmd
+
+                if (!subcmd)
+                        subcmd = (int)req->ifr_data;    //from iwpriv subcmd
+
+                switch (subcmd) {
+                case WLAN_SUBCMD_SETRXANTENNA:  /* SETRXANTENNA */
+                        idata = SUBCMD_DATA(wrq);
+                        ret = setrxantenna(priv, idata);
+                        break;
+                case WLAN_SUBCMD_SETTXANTENNA:  /* SETTXANTENNA */
+                        idata = SUBCMD_DATA(wrq);
+                        ret = settxantenna(priv, idata);
+                        break;
+                case WLAN_SET_ATIM_WINDOW:
+                        adapter->atimwindow = SUBCMD_DATA(wrq);
+                        adapter->atimwindow = min_t(__u16, adapter->atimwindow, 50);
+                        break;
+                case WLANSETBCNAVG:
+                        adapter->bcn_avg_factor = SUBCMD_DATA(wrq);
+                        if (adapter->bcn_avg_factor == 0)
+                                adapter->bcn_avg_factor =
+                                    DEFAULT_BCN_AVG_FACTOR;
+                        if (adapter->bcn_avg_factor > DEFAULT_BCN_AVG_FACTOR)
+                                adapter->bcn_avg_factor =
+                                    DEFAULT_BCN_AVG_FACTOR;
+                        break;
+                case WLANSETDATAAVG:
+                        adapter->data_avg_factor = SUBCMD_DATA(wrq);
+                        if (adapter->data_avg_factor == 0)
+                                adapter->data_avg_factor =
+                                    DEFAULT_DATA_AVG_FACTOR;
+                        if (adapter->data_avg_factor > DEFAULT_DATA_AVG_FACTOR)
+                                adapter->data_avg_factor =
+                                    DEFAULT_DATA_AVG_FACTOR;
+                        break;
+                case WLANSETREGION:
+                        idata = SUBCMD_DATA(wrq);
+                        ret = wlan_set_region(priv, (u16) idata);
+                        break;
+
+                case WLAN_SET_LISTEN_INTERVAL:
+                        idata = SUBCMD_DATA(wrq);
+                        adapter->listeninterval = (u16) idata;
+                        break;
+
+                case WLAN_SET_MULTIPLE_DTIM:
+                        ret = wlan_set_multiple_dtim_ioctl(priv, req);
+                        break;
+
+                case WLANSETAUTHALG:
+                        ret = wlan_setauthalg_ioctl(priv, req);
+                        break;
+
+                case WLANSET8021XAUTHALG:
+                        ret = wlan_set8021xauthalg_ioctl(priv, req);
+                        break;
+
+                case WLANSETENCRYPTIONMODE:
+                        ret = wlan_setencryptionmode_ioctl(priv, req);
+                        break;
+
+                case WLAN_SET_LINKMODE:
+                        ret = wlan_set_linkmode_ioctl(priv, req);
+                        break;
+
+                case WLAN_SET_RADIOMODE:
+                        ret = wlan_set_radiomode_ioctl(priv, req);
+                        break;
+
+                case WLAN_SET_DEBUGMODE:
+                        ret = wlan_set_debugmode_ioctl(priv, req);
+                        break;
+
+                case WLAN_SUBCMD_MESH_SET_TTL:
+                        idata = SUBCMD_DATA(wrq);
+                        ret = wlan_mesh_set_ttl_ioctl(priv, idata);
+                        break;
+
+                default:
+                        ret = -EOPNOTSUPP;
+                        break;
+                }
+
+                break;
+
+        case WLAN_SETNONE_GETTWELVE_CHAR:       /* Get Antenna settings */
+                /*
+                 * We've not used IW_PRIV_TYPE_FIXED so sub-ioctl number is
+                 * in flags of iwreq structure, otherwise it will be in
+                 * mode member of iwreq structure.
+                 */
+                switch ((int)wrq->u.data.flags) {
+                case WLAN_SUBCMD_GETRXANTENNA:  /* Get Rx Antenna */
+                        ret = wlan_subcmd_getrxantenna_ioctl(priv, req);
+                        break;
+
+                case WLAN_SUBCMD_GETTXANTENNA:  /* Get Tx Antenna */
+                        ret = wlan_subcmd_gettxantenna_ioctl(priv, req);
+                        break;
+
+                case WLAN_GET_TSF:
+                        ret = wlan_get_tsf_ioctl(priv, wrq);
+                        break;
+                }
+                break;
+
+        case WLAN_SET128CHAR_GET128CHAR:
+                switch ((int)wrq->u.data.flags) {
+
+                case WLANSCAN_MODE:
+                        lbs_pr_debug(1, "Scan mode Ioctl\n");
+                        ret = wlan_scan_mode_ioctl(priv, wrq);
+                        break;
+
+                case WLAN_GET_ADHOC_STATUS:
+                        ret = wlan_get_adhoc_status_ioctl(priv, wrq);
+                        break;
+                case WLAN_SUBCMD_BT_ADD:
+                        ret = wlan_bt_add_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_BT_DEL:
+                        ret = wlan_bt_del_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_BT_LIST:
+                        ret = wlan_bt_list_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_FWT_ADD:
+                        ret = wlan_fwt_add_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_FWT_DEL:
+                        ret = wlan_fwt_del_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_FWT_LOOKUP:
+                        ret = wlan_fwt_lookup_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_FWT_LIST_NEIGHBOR:
+                        ret = wlan_fwt_list_neighbor_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_FWT_LIST:
+                        ret = wlan_fwt_list_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_FWT_LIST_ROUTE:
+                        ret = wlan_fwt_list_route_ioctl(priv, req);
+                        break;
+                }
+                break;
+
+        case WLAN_SETNONE_GETONEINT:
+                switch ((int)req->ifr_data) {
+                case WLANGETBCNAVG:
+                        pdata = (int *)wrq->u.name;
+                        *pdata = (int)adapter->bcn_avg_factor;
+                        break;
+
+                case WLANGETREGION:
+                        pdata = (int *)wrq->u.name;
+                        *pdata = (int)adapter->regioncode;
+                        break;
+
+                case WLAN_GET_LISTEN_INTERVAL:
+                        pdata = (int *)wrq->u.name;
+                        *pdata = (int)adapter->listeninterval;
+                        break;
+
+                case WLAN_GET_LINKMODE:
+                        req->ifr_data = (char *)((u32) adapter->linkmode);
+                        break;
+
+                case WLAN_GET_RADIOMODE:
+                        req->ifr_data = (char *)((u32) adapter->radiomode);
+                        break;
+
+                case WLAN_GET_DEBUGMODE:
+                        req->ifr_data = (char *)((u32) adapter->debugmode);
+                        break;
+
+                case WLAN_GET_MULTIPLE_DTIM:
+                        pdata = (int *)wrq->u.name;
+                        *pdata = (int)adapter->multipledtim;
+                        break;
+                case WLAN_GET_TX_RATE:
+                        ret = wlan_get_txrate_ioctl(priv, req);
+                        break;
+                case WLAN_SUBCMD_FWT_CLEANUP:   /* fwt_cleanup */
+                        ret = wlan_fwt_cleanup_ioctl(priv, req);
+                        break;
+
+                case WLAN_SUBCMD_FWT_TIME:      /* fwt_time */
+                        ret = wlan_fwt_time_ioctl(priv, req);
+                        break;
+
+                case WLAN_SUBCMD_MESH_GET_TTL:
+                        ret = wlan_mesh_get_ttl_ioctl(priv, req);
+                        break;
+
+                default:
+                        ret = -EOPNOTSUPP;
+
+                }
+
+                break;
+
+        case WLANGETLOG:
+                ret = wlan_do_getlog_ioctl(priv, wrq);
+                break;
+
+        case WLAN_SET_GET_SIXTEEN_INT:
+                switch ((int)wrq->u.data.flags) {
+                case WLAN_TPCCFG:
+                        {
+                                int data[5];
+                                struct cmd_ds_802_11_tpc_cfg cfg;
+                                memset(&cfg, 0, sizeof(cfg));
+                                if ((wrq->u.data.length > 1)
+                                    && (wrq->u.data.length != 5))
+                                        return -1;
+
+                                if (wrq->u.data.length == 0) {
+                                        cfg.action =
+                                            cpu_to_le16
+                                            (cmd_act_get);
+                                } else {
+                                        if (copy_from_user
+                                            (data, wrq->u.data.pointer,
+                                             sizeof(int) * 5)) {
+                                                lbs_pr_debug(1,
+                                                       "Copy from user failed\n");
+                                                return -EFAULT;
+                                        }
+
+                                        cfg.action =
+                                            cpu_to_le16
+                                            (cmd_act_set);
+                                        cfg.enable = data[0];
+                                        cfg.usesnr = data[1];
+                                        cfg.P0 = data[2];
+                                        cfg.P1 = data[3];
+                                        cfg.P2 = data[4];
+                                }
+
+                                ret =
+                                    libertas_prepare_and_send_command(priv,
+                                                          cmd_802_11_tpc_cfg,
+                                                          0,
+                                                          cmd_option_waitforrsp,
+                                                          0, (void *)&cfg);
+
+                                data[0] = cfg.enable;
+                                data[1] = cfg.usesnr;
+                                data[2] = cfg.P0;
+                                data[3] = cfg.P1;
+                                data[4] = cfg.P2;
+                                if (copy_to_user
+                                    (wrq->u.data.pointer, data,
+                                     sizeof(int) * 5)) {
+                                        lbs_pr_debug(1, "Copy to user failed\n");
+                                        return -EFAULT;
+                                }
+
+                                wrq->u.data.length = 5;
+                        }
+                        break;
+
+                case WLAN_POWERCFG:
+                        {
+                                int data[4];
+                                struct cmd_ds_802_11_pwr_cfg cfg;
+                                memset(&cfg, 0, sizeof(cfg));
+                                if ((wrq->u.data.length > 1)
+                                    && (wrq->u.data.length != 4))
+                                        return -1;
+                                if (wrq->u.data.length == 0) {
+                                        cfg.action =
+                                            cpu_to_le16
+                                            (cmd_act_get);
+                                } else {
+                                        if (copy_from_user
+                                            (data, wrq->u.data.pointer,
+                                             sizeof(int) * 4)) {
+                                                lbs_pr_debug(1,
+                                                       "Copy from user failed\n");
+                                                return -EFAULT;
+                                        }
+
+                                        cfg.action =
+                                            cpu_to_le16
+                                            (cmd_act_set);
+                                        cfg.enable = data[0];
+                                        cfg.PA_P0 = data[1];
+                                        cfg.PA_P1 = data[2];
+                                        cfg.PA_P2 = data[3];
+                                }
+                                ret =
+                                    libertas_prepare_and_send_command(priv,
+                                                          cmd_802_11_pwr_cfg,
+                                                          0,
+                                                          cmd_option_waitforrsp,
+                                                          0, (void *)&cfg);
+                                data[0] = cfg.enable;
+                                data[1] = cfg.PA_P0;
+                                data[2] = cfg.PA_P1;
+                                data[3] = cfg.PA_P2;
+                                if (copy_to_user
+                                    (wrq->u.data.pointer, data,
+                                     sizeof(int) * 4)) {
+                                        lbs_pr_debug(1, "Copy to user failed\n");
+                                        return -EFAULT;
+                                }
+
+                                wrq->u.data.length = 4;
+                        }
+                        break;
+                case WLAN_AUTO_FREQ_SET:
+                        {
+                                int data[3];
+                                struct cmd_ds_802_11_afc afc;
+                                memset(&afc, 0, sizeof(afc));
+                                if (wrq->u.data.length != 3)
+                                        return -1;
+                                if (copy_from_user
+                                    (data, wrq->u.data.pointer,
+                                     sizeof(int) * 3)) {
+                                        lbs_pr_debug(1, "Copy from user failed\n");
+                                        return -EFAULT;
+                                }
+                                afc.afc_auto = data[0];
+
+                                if (afc.afc_auto != 0) {
+                                        afc.threshold = data[1];
+                                        afc.period = data[2];
+                                } else {
+                                        afc.timing_offset = data[1];
+                                        afc.carrier_offset = data[2];
+                                }
+                                ret =
+                                    libertas_prepare_and_send_command(priv,
+                                                          cmd_802_11_set_afc,
+                                                          0,
+                                                          cmd_option_waitforrsp,
+                                                          0, (void *)&afc);
+                        }
+                        break;
+                case WLAN_AUTO_FREQ_GET:
+                        {
+                                int data[3];
+                                struct cmd_ds_802_11_afc afc;
+                                memset(&afc, 0, sizeof(afc));
+                                ret =
+                                    libertas_prepare_and_send_command(priv,
+                                                          cmd_802_11_get_afc,
+                                                          0,
+                                                          cmd_option_waitforrsp,
+                                                          0, (void *)&afc);
+                                data[0] = afc.afc_auto;
+                                data[1] = afc.timing_offset;
+                                data[2] = afc.carrier_offset;
+                                if (copy_to_user
+                                    (wrq->u.data.pointer, data,
+                                     sizeof(int) * 3)) {
+                                        lbs_pr_debug(1, "Copy to user failed\n");
+                                        return -EFAULT;
+                                }
+
+                                wrq->u.data.length = 3;
+                        }
+                        break;
+                case WLAN_SCANPROBES:
+                        {
+                                int data;
+                                if (wrq->u.data.length > 0) {
+                                        if (copy_from_user
+                                            (&data, wrq->u.data.pointer,
+                                             sizeof(int))) {
+                                                lbs_pr_debug(1,
+                                                       "Copy from user failed\n");
+                                                return -EFAULT;
+                                        }
+
+                                        adapter->scanprobes = data;
+                                } else {
+                                        data = adapter->scanprobes;
+                                        if (copy_to_user
+                                            (wrq->u.data.pointer, &data,
+                                             sizeof(int))) {
+                                                lbs_pr_debug(1,
+                                                       "Copy to user failed\n");
+                                                return -EFAULT;
+                                        }
+                                }
+                                wrq->u.data.length = 1;
+                        }
+                        break;
+                case WLAN_LED_GPIO_CTRL:
+                        {
+                                int i;
+                                int data[16];
+
+                                struct cmd_ds_802_11_led_ctrl ctrl;
+                                struct mrvlietypes_ledgpio *gpio =
+                                    (struct mrvlietypes_ledgpio *) ctrl.data;
+
+                                memset(&ctrl, 0, sizeof(ctrl));
+                                if (wrq->u.data.length > MAX_LEDS * 2)
+                                        return -ENOTSUPP;
+                                if ((wrq->u.data.length % 2) != 0)
+                                        return -ENOTSUPP;
+                                if (wrq->u.data.length == 0) {
+                                        ctrl.action =
+                                            cpu_to_le16
+                                            (cmd_act_get);
+                                } else {
+                                        if (copy_from_user
+                                            (data, wrq->u.data.pointer,
+                                             sizeof(int) *
+                                             wrq->u.data.length)) {
+                                                lbs_pr_debug(1,
+                                                       "Copy from user failed\n");
+                                                return -EFAULT;
+                                        }
+
+                                        ctrl.action =
+                                            cpu_to_le16
+                                            (cmd_act_set);
+                                        ctrl.numled = cpu_to_le16(0);
+                                        gpio->header.type =
+                                            cpu_to_le16(TLV_TYPE_LED_GPIO);
+                                        gpio->header.len = wrq->u.data.length;
+                                        for (i = 0; i < wrq->u.data.length;
+                                             i += 2) {
+                                                gpio->ledpin[i / 2].led =
+                                                    data[i];
+                                                gpio->ledpin[i / 2].pin =
+                                                    data[i + 1];
+                                        }
+                                }
+                                ret =
+                                    libertas_prepare_and_send_command(priv,
+                                                          cmd_802_11_led_gpio_ctrl,
+                                                          0,
+                                                          cmd_option_waitforrsp,
+                                                          0, (void *)&ctrl);
+                                for (i = 0; i < gpio->header.len; i += 2) {
+                                        data[i] = gpio->ledpin[i / 2].led;
+                                        data[i + 1] = gpio->ledpin[i / 2].pin;
+                                }
+                                if (copy_to_user(wrq->u.data.pointer, data,
+                                                 sizeof(int) *
+                                                 gpio->header.len)) {
+                                        lbs_pr_debug(1, "Copy to user failed\n");
+                                        return -EFAULT;
+                                }
+
+                                wrq->u.data.length = gpio->header.len;
+                        }
+                        break;
+                case WLAN_ADAPT_RATESET:
+                        ret = wlan_adapt_rateset(priv, wrq);
+                        break;
+                case WLAN_INACTIVITY_TIMEOUT:
+                        ret = wlan_inactivity_timeout(priv, wrq);
+                        break;
+                case WLANSNR:
+                        ret = wlan_get_snr(priv, wrq);
+                        break;
+                case WLAN_GET_RXINFO:
+                        ret = wlan_get_rxinfo(priv, wrq);
+                }
+                break;
+
+        default:
+                ret = -EINVAL;
+                break;
+        }
+        LEAVE();
+        return ret;
+}
+
+
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
new file mode 100644
index 000000000000..11682cbe752b
--- /dev/null
+++ b/drivers/net/wireless/libertas/join.c
@@ -0,0 +1,1055 @@
+/**
+  *  Functions implementing wlan infrastructure and adhoc join routines,
+  *  IOCTL handlers as well as command preperation and response routines
+  *  for sending adhoc start, adhoc join, and association commands
+  *  to the firmware.
+  */
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+
+#include <net/iw_handler.h>
+
+#include "host.h"
+#include "decl.h"
+#include "join.h"
+#include "dev.h"
+
+/**
+ *  @brief This function finds out the common rates between rate1 and rate2.
+ *
+ * It will fill common rates in rate1 as output if found.
+ *
+ * NOTE: Setting the MSB of the basic rates need to be taken
+ *   care, either before or after calling this function
+ *
+ *  @param adapter     A pointer to wlan_adapter structure
+ *  @param rate1       the buffer which keeps input and output
+ *  @param rate1_size  the size of rate1 buffer
+ *  @param rate2       the buffer which keeps rate2
+ *  @param rate2_size  the size of rate2 buffer.
+ *
+ *  @return            0 or -1
+ */
+static int get_common_rates(wlan_adapter * adapter, u8 * rate1,
+                            int rate1_size, u8 * rate2, int rate2_size)
+{
+        u8 *ptr = rate1;
+        int ret = 0;
+        u8 tmp[30];
+        int i;
+
+        memset(&tmp, 0, sizeof(tmp));
+        memcpy(&tmp, rate1, min_t(size_t, rate1_size, sizeof(tmp)));
+        memset(rate1, 0, rate1_size);
+
+        /* Mask the top bit of the original values */
+        for (i = 0; tmp[i] && i < sizeof(tmp); i++)
+                tmp[i] &= 0x7F;
+
+        for (i = 0; rate2[i] && i < rate2_size; i++) {
+                /* Check for Card Rate in tmp, excluding the top bit */
+                if (strchr(tmp, rate2[i] & 0x7F)) {
+                        /* values match, so copy the Card Rate to rate1 */
+                        *rate1++ = rate2[i];
+                }
+        }
+
+        lbs_dbg_hex("rate1 (AP) rates:", tmp, sizeof(tmp));
+        lbs_dbg_hex("rate2 (Card) rates:", rate2, rate2_size);
+        lbs_dbg_hex("Common rates:", ptr, rate1_size);
+        lbs_pr_debug(1, "Tx datarate is set to 0x%X\n", adapter->datarate);
+
+        if (!adapter->is_datarate_auto) {
+                while (*ptr) {
+                        if ((*ptr & 0x7f) == adapter->datarate) {
+                                ret = 0;
+                                goto done;
+                        }
+                        ptr++;
+                }
+                lbs_pr_alert( "Previously set fixed data rate %#x isn't "
+                       "compatible with the network.\n", adapter->datarate);
+
+                ret = -1;
+                goto done;
+        }
+
+        ret = 0;
+done:
+        return ret;
+}
+
+int libertas_send_deauth(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        if (adapter->inframode == wlan802_11infrastructure &&
+            adapter->connect_status == libertas_connected)
+                ret = libertas_send_deauthentication(priv);
+        else
+                ret = -ENOTSUPP;
+
+        return ret;
+}
+
+int libertas_do_adhocstop_ioctl(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        if (adapter->inframode == wlan802_11ibss &&
+            adapter->connect_status == libertas_connected)
+                ret = libertas_stop_adhoc_network(priv);
+        else
+                ret = -ENOTSUPP;
+
+        return ret;
+}
+
+/**
+ *  @brief Associate to a specific BSS discovered in a scan
+ *
+ *  @param priv      A pointer to wlan_private structure
+ *  @param pbssdesc  Pointer to the BSS descriptor to associate with.
+ *
+ *  @return          0-success, otherwise fail
+ */
+int wlan_associate(wlan_private * priv, struct bss_descriptor * pbssdesc)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret;
+
+        ENTER();
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_authenticate,
+                                    0, cmd_option_waitforrsp,
+                                    0, pbssdesc->macaddress);
+
+        if (ret) {
+                LEAVE();
+                return ret;
+        }
+
+        /* set preamble to firmware */
+        if (adapter->capinfo.shortpreamble && pbssdesc->cap.shortpreamble)
+                adapter->preamble = cmd_type_short_preamble;
+        else
+                adapter->preamble = cmd_type_long_preamble;
+
+        libertas_set_radio_control(priv);
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_associate,
+                                    0, cmd_option_waitforrsp, 0, pbssdesc);
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Start an Adhoc Network
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param adhocssid    The ssid of the Adhoc Network
+ *  @return             0--success, -1--fail
+ */
+int libertas_start_adhoc_network(wlan_private * priv, struct WLAN_802_11_SSID *adhocssid)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        adapter->adhoccreate = 1;
+
+        if (!adapter->capinfo.shortpreamble) {
+                lbs_pr_debug(1, "AdhocStart: Long preamble\n");
+                adapter->preamble = cmd_type_long_preamble;
+        } else {
+                lbs_pr_debug(1, "AdhocStart: Short preamble\n");
+                adapter->preamble = cmd_type_short_preamble;
+        }
+
+        libertas_set_radio_control(priv);
+
+        lbs_pr_debug(1, "Adhoc channel = %d\n", adapter->adhocchannel);
+        lbs_pr_debug(1, "curbssparams.channel = %d\n",
+               adapter->curbssparams.channel);
+        lbs_pr_debug(1, "curbssparams.band = %d\n", adapter->curbssparams.band);
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_ad_hoc_start,
+                                    0, cmd_option_waitforrsp, 0, adhocssid);
+
+        return ret;
+}
+
+/**
+ *  @brief Join an adhoc network found in a previous scan
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param pbssdesc     Pointer to a BSS descriptor found in a previous scan
+ *                      to attempt to join
+ *
+ *  @return             0--success, -1--fail
+ */
+int libertas_join_adhoc_network(wlan_private * priv, struct bss_descriptor * pbssdesc)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        lbs_pr_debug(1, "libertas_join_adhoc_network: CurBss.ssid =%s\n",
+               adapter->curbssparams.ssid.ssid);
+        lbs_pr_debug(1, "libertas_join_adhoc_network: CurBss.ssid_len =%u\n",
+               adapter->curbssparams.ssid.ssidlength);
+        lbs_pr_debug(1, "libertas_join_adhoc_network: ssid =%s\n", pbssdesc->ssid.ssid);
+        lbs_pr_debug(1, "libertas_join_adhoc_network: ssid len =%u\n",
+               pbssdesc->ssid.ssidlength);
+
+        /* check if the requested SSID is already joined */
+        if (adapter->curbssparams.ssid.ssidlength
+            && !libertas_SSID_cmp(&pbssdesc->ssid, &adapter->curbssparams.ssid)
+            && (adapter->curbssparams.bssdescriptor.inframode ==
+                wlan802_11ibss)) {
+
+        lbs_pr_debug(1,
+                       "ADHOC_J_CMD: New ad-hoc SSID is the same as current, "
+                       "not attempting to re-join");
+
+                return -1;
+        }
+
+        /*Use shortpreamble only when both creator and card supports
+           short preamble */
+        if (!pbssdesc->cap.shortpreamble || !adapter->capinfo.shortpreamble) {
+                lbs_pr_debug(1, "AdhocJoin: Long preamble\n");
+                adapter->preamble = cmd_type_long_preamble;
+        } else {
+                lbs_pr_debug(1, "AdhocJoin: Short preamble\n");
+                adapter->preamble = cmd_type_short_preamble;
+        }
+
+        libertas_set_radio_control(priv);
+
+        lbs_pr_debug(1, "curbssparams.channel = %d\n",
+               adapter->curbssparams.channel);
+        lbs_pr_debug(1, "curbssparams.band = %c\n", adapter->curbssparams.band);
+
+        adapter->adhoccreate = 0;
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_ad_hoc_join,
+                                    0, cmd_option_waitforrsp,
+                                    OID_802_11_SSID, pbssdesc);
+
+        return ret;
+}
+
+int libertas_stop_adhoc_network(wlan_private * priv)
+{
+        return libertas_prepare_and_send_command(priv, cmd_802_11_ad_hoc_stop,
+                                     0, cmd_option_waitforrsp, 0, NULL);
+}
+
+/**
+ *  @brief Send Deauthentication Request
+ *
+ *  @param priv      A pointer to wlan_private structure
+ *  @return          0--success, -1--fail
+ */
+int libertas_send_deauthentication(wlan_private * priv)
+{
+        return libertas_prepare_and_send_command(priv, cmd_802_11_deauthenticate,
+                                     0, cmd_option_waitforrsp, 0, NULL);
+}
+
+/**
+ *  @brief Set Idle Off
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @return             0 --success, otherwise fail
+ */
+int libertas_idle_off(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        const u8 zeromac[] = { 0, 0, 0, 0, 0, 0 };
+        int i;
+
+        ENTER();
+
+        if (adapter->connect_status == libertas_disconnected) {
+                if (adapter->inframode == wlan802_11infrastructure) {
+                        if (memcmp(adapter->previousbssid, zeromac,
+                                   sizeof(zeromac)) != 0) {
+
+                                lbs_pr_debug(1, "Previous SSID = %s\n",
+                                       adapter->previousssid.ssid);
+                                lbs_pr_debug(1, "Previous BSSID = "
+                                       "%02x:%02x:%02x:%02x:%02x:%02x:\n",
+                                       adapter->previousbssid[0],
+                                       adapter->previousbssid[1],
+                                       adapter->previousbssid[2],
+                                       adapter->previousbssid[3],
+                                       adapter->previousbssid[4],
+                                       adapter->previousbssid[5]);
+
+                                i = libertas_find_SSID_in_list(adapter,
+                                                   &adapter->previousssid,
+                                                   adapter->previousbssid,
+                                                   adapter->inframode);
+
+                                if (i < 0) {
+                                        libertas_send_specific_BSSID_scan(priv,
+                                                              adapter->
+                                                              previousbssid,
+                                                              1);
+                                        i = libertas_find_SSID_in_list(adapter,
+                                                           &adapter->
+                                                           previousssid,
+                                                           adapter->
+                                                           previousbssid,
+                                                           adapter->
+                                                           inframode);
+                                }
+
+                                if (i < 0) {
+                                        /* If the BSSID could not be found, try just the SSID */
+                                        i = libertas_find_SSID_in_list(adapter,
+                                                           &adapter->
+                                                           previousssid, NULL,
+                                                           adapter->
+                                                           inframode);
+                                }
+
+                                if (i < 0) {
+                                        libertas_send_specific_SSID_scan(priv,
+                                                             &adapter->
+                                                             previousssid,
+                                                             1);
+                                        i = libertas_find_SSID_in_list(adapter,
+                                                           &adapter->
+                                                           previousssid, NULL,
+                                                           adapter->
+                                                           inframode);
+                                }
+
+                                if (i >= 0) {
+                                        ret =
+                                            wlan_associate(priv,
+                                                           &adapter->
+                                                           scantable[i]);
+                                }
+                        }
+                } else if (adapter->inframode == wlan802_11ibss) {
+                        ret = libertas_prepare_and_send_command(priv,
+                                                    cmd_802_11_ad_hoc_start,
+                                                    0,
+                                                    cmd_option_waitforrsp,
+                                                    0, &adapter->previousssid);
+                }
+        }
+        /* else it is connected */
+
+        lbs_pr_debug(1, "\nwlanidle is off");
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Set Idle On
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @return             0 --success, otherwise fail
+ */
+int libertas_idle_on(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        if (adapter->connect_status == libertas_connected) {
+                if (adapter->inframode == wlan802_11infrastructure) {
+                        lbs_pr_debug(1, "Previous SSID = %s\n",
+                               adapter->previousssid.ssid);
+                        memmove(&adapter->previousssid,
+                                &adapter->curbssparams.ssid,
+                                sizeof(struct WLAN_802_11_SSID));
+                        libertas_send_deauth(priv);
+
+                } else if (adapter->inframode == wlan802_11ibss) {
+                        ret = libertas_stop_adhoc_network(priv);
+                }
+
+        }
+
+        lbs_pr_debug(1, "\nwlanidle is on");
+
+        return ret;
+}
+
+/**
+ *  @brief This function prepares command of authenticate.
+ *
+ *  @param priv      A pointer to wlan_private structure
+ *  @param cmd       A pointer to cmd_ds_command structure
+ *  @param pdata_buf Void cast of pointer to a BSSID to authenticate with
+ *
+ *  @return         0 or -1
+ */
+int libertas_cmd_80211_authenticate(wlan_private * priv,
+                                 struct cmd_ds_command *cmd,
+                                 void *pdata_buf)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_authenticate *pauthenticate =
+            &cmd->params.auth;
+        u8 *bssid = pdata_buf;
+
+        cmd->command = cpu_to_le16(cmd_802_11_authenticate);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_authenticate)
+                             + S_DS_GEN);
+
+        pauthenticate->authtype = adapter->secinfo.authmode;
+        memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
+
+        lbs_pr_debug(1, "AUTH_CMD: Bssid is : %x:%x:%x:%x:%x:%x\n",
+               bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
+
+        return 0;
+}
+
+int libertas_cmd_80211_deauthenticate(wlan_private * priv,
+                                   struct cmd_ds_command *cmd)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_deauthenticate *dauth = &cmd->params.deauth;
+
+        ENTER();
+
+        cmd->command = cpu_to_le16(cmd_802_11_deauthenticate);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_deauthenticate) +
+                             S_DS_GEN);
+
+        /* set AP MAC address */
+        memmove(dauth->macaddr, adapter->curbssparams.bssid,
+                ETH_ALEN);
+
+        /* Reason code 3 = Station is leaving */
+#define REASON_CODE_STA_LEAVING 3
+        dauth->reasoncode = cpu_to_le16(REASON_CODE_STA_LEAVING);
+
+        LEAVE();
+        return 0;
+}
+
+int libertas_cmd_80211_associate(wlan_private * priv,
+                              struct cmd_ds_command *cmd, void *pdata_buf)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_associate *passo = &cmd->params.associate;
+        int ret = 0;
+        struct bss_descriptor *pbssdesc;
+        u8 *card_rates;
+        u8 *pos;
+        int card_rates_size;
+        u16 tmpcap;
+        struct mrvlietypes_ssidparamset *ssid;
+        struct mrvlietypes_phyparamset *phy;
+        struct mrvlietypes_ssparamset *ss;
+        struct mrvlietypes_ratesparamset *rates;
+        struct mrvlietypes_rsnparamset *rsn;
+
+        ENTER();
+
+        pbssdesc = pdata_buf;
+        pos = (u8 *) passo;
+
+        if (!adapter) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->command = cpu_to_le16(cmd_802_11_associate);
+
+        /* Save so we know which BSS Desc to use in the response handler */
+        adapter->pattemptedbssdesc = pbssdesc;
+
+        memcpy(passo->peerstaaddr,
+               pbssdesc->macaddress, sizeof(passo->peerstaaddr));
+        pos += sizeof(passo->peerstaaddr);
+
+        /* set the listen interval */
+        passo->listeninterval = adapter->listeninterval;
+
+        pos += sizeof(passo->capinfo);
+        pos += sizeof(passo->listeninterval);
+        pos += sizeof(passo->bcnperiod);
+        pos += sizeof(passo->dtimperiod);
+
+        ssid = (struct mrvlietypes_ssidparamset *) pos;
+        ssid->header.type = cpu_to_le16(TLV_TYPE_SSID);
+        ssid->header.len = pbssdesc->ssid.ssidlength;
+        memcpy(ssid->ssid, pbssdesc->ssid.ssid, ssid->header.len);
+        pos += sizeof(ssid->header) + ssid->header.len;
+        ssid->header.len = cpu_to_le16(ssid->header.len);
+
+        phy = (struct mrvlietypes_phyparamset *) pos;
+        phy->header.type = cpu_to_le16(TLV_TYPE_PHY_DS);
+        phy->header.len = sizeof(phy->fh_ds.dsparamset);
+        memcpy(&phy->fh_ds.dsparamset,
+               &pbssdesc->phyparamset.dsparamset.currentchan,
+               sizeof(phy->fh_ds.dsparamset));
+        pos += sizeof(phy->header) + phy->header.len;
+        phy->header.len = cpu_to_le16(phy->header.len);
+
+        ss = (struct mrvlietypes_ssparamset *) pos;
+        ss->header.type = cpu_to_le16(TLV_TYPE_CF);
+        ss->header.len = sizeof(ss->cf_ibss.cfparamset);
+        pos += sizeof(ss->header) + ss->header.len;
+        ss->header.len = cpu_to_le16(ss->header.len);
+
+        rates = (struct mrvlietypes_ratesparamset *) pos;
+        rates->header.type = cpu_to_le16(TLV_TYPE_RATES);
+
+        memcpy(&rates->rates, &pbssdesc->libertas_supported_rates, WLAN_SUPPORTED_RATES);
+
+        card_rates = libertas_supported_rates;
+        card_rates_size = sizeof(libertas_supported_rates);
+
+        if (get_common_rates(adapter, rates->rates, WLAN_SUPPORTED_RATES,
+                             card_rates, card_rates_size)) {
+                ret = -1;
+                goto done;
+        }
+
+        rates->header.len = min_t(size_t, strlen(rates->rates), WLAN_SUPPORTED_RATES);
+        adapter->curbssparams.numofrates = rates->header.len;
+
+        pos += sizeof(rates->header) + rates->header.len;
+        rates->header.len = cpu_to_le16(rates->header.len);
+
+        if (adapter->secinfo.WPAenabled || adapter->secinfo.WPA2enabled) {
+                rsn = (struct mrvlietypes_rsnparamset *) pos;
+                rsn->header.type = (u16) adapter->wpa_ie[0];    /* WPA_IE or WPA2_IE */
+                rsn->header.type = cpu_to_le16(rsn->header.type);
+                rsn->header.len = (u16) adapter->wpa_ie[1];
+                memcpy(rsn->rsnie, &adapter->wpa_ie[2], rsn->header.len);
+                lbs_dbg_hex("ASSOC_CMD: RSN IE", (u8 *) rsn,
+                        sizeof(rsn->header) + rsn->header.len);
+                pos += sizeof(rsn->header) + rsn->header.len;
+                rsn->header.len = cpu_to_le16(rsn->header.len);
+        }
+
+        /* update curbssparams */
+        adapter->curbssparams.channel =
+            (pbssdesc->phyparamset.dsparamset.currentchan);
+
+        /* Copy the infra. association rates into Current BSS state structure */
+        memcpy(&adapter->curbssparams.datarates, &rates->rates,
+               min_t(size_t, sizeof(adapter->curbssparams.datarates), rates->header.len));
+
+        lbs_pr_debug(1, "ASSOC_CMD: rates->header.len = %d\n", rates->header.len);
+
+        /* set IBSS field */
+        if (pbssdesc->inframode == wlan802_11infrastructure) {
+#define CAPINFO_ESS_MODE 1
+                passo->capinfo.ess = CAPINFO_ESS_MODE;
+        }
+
+        if (libertas_parse_dnld_countryinfo_11d(priv)) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->size = cpu_to_le16((u16) (pos - (u8 *) passo) + S_DS_GEN);
+
+        /* set the capability info at last */
+        memcpy(&tmpcap, &pbssdesc->cap, sizeof(passo->capinfo));
+        tmpcap &= CAPINFO_MASK;
+        lbs_pr_debug(1, "ASSOC_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",
+               tmpcap, CAPINFO_MASK);
+        tmpcap = cpu_to_le16(tmpcap);
+        memcpy(&passo->capinfo, &tmpcap, sizeof(passo->capinfo));
+
+      done:
+        LEAVE();
+        return ret;
+}
+
+int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
+                                 struct cmd_ds_command *cmd, void *pssid)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_ad_hoc_start *adhs = &cmd->params.ads;
+        int ret = 0;
+        int cmdappendsize = 0;
+        int i;
+        u16 tmpcap;
+        struct bss_descriptor *pbssdesc;
+        struct WLAN_802_11_SSID *ssid = pssid;
+
+        ENTER();
+
+        if (!adapter) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->command = cpu_to_le16(cmd_802_11_ad_hoc_start);
+
+        pbssdesc = &adapter->curbssparams.bssdescriptor;
+        adapter->pattemptedbssdesc = pbssdesc;
+
+        /*
+         * Fill in the parameters for 2 data structures:
+         *   1. cmd_ds_802_11_ad_hoc_start command
+         *   2. adapter->scantable[i]
+         *
+         * Driver will fill up SSID, bsstype,IBSS param, Physical Param,
+         *   probe delay, and cap info.
+         *
+         * Firmware will fill up beacon period, DTIM, Basic rates
+         *   and operational rates.
+         */
+
+        memset(adhs->SSID, 0, IW_ESSID_MAX_SIZE);
+
+        memcpy(adhs->SSID, ssid->ssid, ssid->ssidlength);
+
+        lbs_pr_debug(1, "ADHOC_S_CMD: SSID = %s\n", adhs->SSID);
+
+        memset(pbssdesc->ssid.ssid, 0, IW_ESSID_MAX_SIZE);
+        memcpy(pbssdesc->ssid.ssid, ssid->ssid, ssid->ssidlength);
+
+        pbssdesc->ssid.ssidlength = ssid->ssidlength;
+
+        /* set the BSS type */
+        adhs->bsstype = cmd_bss_type_ibss;
+        pbssdesc->inframode = wlan802_11ibss;
+        adhs->beaconperiod = adapter->beaconperiod;
+
+        /* set Physical param set */
+#define DS_PARA_IE_ID   3
+#define DS_PARA_IE_LEN  1
+
+        adhs->phyparamset.dsparamset.elementid = DS_PARA_IE_ID;
+        adhs->phyparamset.dsparamset.len = DS_PARA_IE_LEN;
+
+        WARN_ON(!adapter->adhocchannel);
+
+        lbs_pr_debug(1, "ADHOC_S_CMD: Creating ADHOC on channel %d\n",
+               adapter->adhocchannel);
+
+        adapter->curbssparams.channel = adapter->adhocchannel;
+
+        pbssdesc->channel = adapter->adhocchannel;
+        adhs->phyparamset.dsparamset.currentchan = adapter->adhocchannel;
+
+        memcpy(&pbssdesc->phyparamset,
+               &adhs->phyparamset, sizeof(union ieeetypes_phyparamset));
+
+        /* set IBSS param set */
+#define IBSS_PARA_IE_ID   6
+#define IBSS_PARA_IE_LEN  2
+
+        adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
+        adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
+        adhs->ssparamset.ibssparamset.atimwindow = adapter->atimwindow;
+        memcpy(&pbssdesc->ssparamset,
+               &adhs->ssparamset, sizeof(union IEEEtypes_ssparamset));
+
+        /* set capability info */
+        adhs->cap.ess = 0;
+        adhs->cap.ibss = 1;
+        pbssdesc->cap.ibss = 1;
+
+        /* probedelay */
+        adhs->probedelay = cpu_to_le16(cmd_scan_probe_delay_time);
+
+        /* set up privacy in adapter->scantable[i] */
+        if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) {
+
+#define AD_HOC_CAP_PRIVACY_ON 1
+                lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus set, privacy to WEP\n");
+                pbssdesc->privacy = wlan802_11privfilter8021xWEP;
+                adhs->cap.privacy = AD_HOC_CAP_PRIVACY_ON;
+        } else {
+                lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus NOT set, Setting "
+                       "privacy to ACCEPT ALL\n");
+                pbssdesc->privacy = wlan802_11privfilteracceptall;
+        }
+
+        memset(adhs->datarate, 0, sizeof(adhs->datarate));
+
+        if (adapter->adhoc_grate_enabled) {
+                memcpy(adhs->datarate, libertas_adhoc_rates_g,
+                       min(sizeof(adhs->datarate), sizeof(libertas_adhoc_rates_g)));
+        } else {
+                memcpy(adhs->datarate, libertas_adhoc_rates_b,
+                       min(sizeof(adhs->datarate), sizeof(libertas_adhoc_rates_b)));
+        }
+
+        /* Find the last non zero */
+        for (i = 0; i < sizeof(adhs->datarate) && adhs->datarate[i]; i++) ;
+
+        adapter->curbssparams.numofrates = i;
+
+        /* Copy the ad-hoc creating rates into Current BSS state structure */
+        memcpy(&adapter->curbssparams.datarates,
+               &adhs->datarate, adapter->curbssparams.numofrates);
+
+        lbs_pr_debug(1, "ADHOC_S_CMD: rates=%02x %02x %02x %02x \n",
+               adhs->datarate[0], adhs->datarate[1],
+               adhs->datarate[2], adhs->datarate[3]);
+
+        lbs_pr_debug(1, "ADHOC_S_CMD: AD HOC Start command is ready\n");
+
+        if (libertas_create_dnld_countryinfo_11d(priv)) {
+                lbs_pr_debug(1, "ADHOC_S_CMD: dnld_countryinfo_11d failed\n");
+                ret = -1;
+                goto done;
+        }
+
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_start)
+                             + S_DS_GEN + cmdappendsize);
+
+        memcpy(&tmpcap, &adhs->cap, sizeof(u16));
+        tmpcap = cpu_to_le16(tmpcap);
+        memcpy(&adhs->cap, &tmpcap, sizeof(u16));
+
+        ret = 0;
+done:
+        LEAVE();
+        return ret;
+}
+
+int libertas_cmd_80211_ad_hoc_stop(wlan_private * priv,
+                                struct cmd_ds_command *cmd)
+{
+        cmd->command = cpu_to_le16(cmd_802_11_ad_hoc_stop);
+        cmd->size = cpu_to_le16(S_DS_GEN);
+
+        return 0;
+}
+
+int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
+                                struct cmd_ds_command *cmd, void *pdata_buf)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_ad_hoc_join *padhocjoin = &cmd->params.adj;
+        struct bss_descriptor *pbssdesc = pdata_buf;
+        int cmdappendsize = 0;
+        int ret = 0;
+        u8 *card_rates;
+        int card_rates_size;
+        u16 tmpcap;
+        int i;
+
+        ENTER();
+
+        adapter->pattemptedbssdesc = pbssdesc;
+
+        cmd->command = cpu_to_le16(cmd_802_11_ad_hoc_join);
+
+        padhocjoin->bssdescriptor.bsstype = cmd_bss_type_ibss;
+
+        padhocjoin->bssdescriptor.beaconperiod = pbssdesc->beaconperiod;
+
+        memcpy(&padhocjoin->bssdescriptor.BSSID,
+               &pbssdesc->macaddress, ETH_ALEN);
+
+        memcpy(&padhocjoin->bssdescriptor.SSID,
+               &pbssdesc->ssid.ssid, pbssdesc->ssid.ssidlength);
+
+        memcpy(&padhocjoin->bssdescriptor.phyparamset,
+               &pbssdesc->phyparamset, sizeof(union ieeetypes_phyparamset));
+
+        memcpy(&padhocjoin->bssdescriptor.ssparamset,
+               &pbssdesc->ssparamset, sizeof(union IEEEtypes_ssparamset));
+
+        memcpy(&tmpcap, &pbssdesc->cap, sizeof(struct ieeetypes_capinfo));
+        tmpcap &= CAPINFO_MASK;
+
+        lbs_pr_debug(1, "ADHOC_J_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",
+               tmpcap, CAPINFO_MASK);
+        memcpy(&padhocjoin->bssdescriptor.cap, &tmpcap,
+               sizeof(struct ieeetypes_capinfo));
+
+        /* information on BSSID descriptor passed to FW */
+    lbs_pr_debug(1,
+               "ADHOC_J_CMD: BSSID = %2x-%2x-%2x-%2x-%2x-%2x, SSID = %s\n",
+               padhocjoin->bssdescriptor.BSSID[0],
+               padhocjoin->bssdescriptor.BSSID[1],
+               padhocjoin->bssdescriptor.BSSID[2],
+               padhocjoin->bssdescriptor.BSSID[3],
+               padhocjoin->bssdescriptor.BSSID[4],
+               padhocjoin->bssdescriptor.BSSID[5],
+               padhocjoin->bssdescriptor.SSID);
+
+        lbs_pr_debug(1, "ADHOC_J_CMD: Data Rate = %x\n",
+               (u32) padhocjoin->bssdescriptor.datarates);
+
+        /* failtimeout */
+        padhocjoin->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
+
+        /* probedelay */
+        padhocjoin->probedelay =
+            cpu_to_le16(cmd_scan_probe_delay_time);
+
+        /* Copy Data rates from the rates recorded in scan response */
+        memset(padhocjoin->bssdescriptor.datarates, 0,
+               sizeof(padhocjoin->bssdescriptor.datarates));
+        memcpy(padhocjoin->bssdescriptor.datarates, pbssdesc->datarates,
+               min(sizeof(padhocjoin->bssdescriptor.datarates),
+                   sizeof(pbssdesc->datarates)));
+
+        card_rates = libertas_supported_rates;
+        card_rates_size = sizeof(libertas_supported_rates);
+
+        adapter->curbssparams.channel = pbssdesc->channel;
+
+        if (get_common_rates(adapter, padhocjoin->bssdescriptor.datarates,
+                             sizeof(padhocjoin->bssdescriptor.datarates),
+                             card_rates, card_rates_size)) {
+                lbs_pr_debug(1, "ADHOC_J_CMD: get_common_rates returns error.\n");
+                ret = -1;
+                goto done;
+        }
+
+        /* Find the last non zero */
+        for (i = 0; i < sizeof(padhocjoin->bssdescriptor.datarates)
+             && padhocjoin->bssdescriptor.datarates[i]; i++) ;
+
+        adapter->curbssparams.numofrates = i;
+
+        /*
+         * Copy the adhoc joining rates to Current BSS State structure
+         */
+        memcpy(adapter->curbssparams.datarates,
+               padhocjoin->bssdescriptor.datarates,
+               adapter->curbssparams.numofrates);
+
+        padhocjoin->bssdescriptor.ssparamset.ibssparamset.atimwindow =
+            cpu_to_le16(pbssdesc->atimwindow);
+
+        if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) {
+                padhocjoin->bssdescriptor.cap.privacy = AD_HOC_CAP_PRIVACY_ON;
+        }
+
+        if (adapter->psmode == wlan802_11powermodemax_psp) {
+                /* wake up first */
+                enum WLAN_802_11_POWER_MODE Localpsmode;
+
+                Localpsmode = wlan802_11powermodecam;
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_ps_mode,
+                                            cmd_act_set,
+                                            0, 0, &Localpsmode);
+
+                if (ret) {
+                        ret = -1;
+                        goto done;
+                }
+        }
+
+        if (libertas_parse_dnld_countryinfo_11d(priv)) {
+                ret = -1;
+                goto done;
+        }
+
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_join)
+                             + S_DS_GEN + cmdappendsize);
+
+        memcpy(&tmpcap, &padhocjoin->bssdescriptor.cap,
+               sizeof(struct ieeetypes_capinfo));
+        tmpcap = cpu_to_le16(tmpcap);
+
+        memcpy(&padhocjoin->bssdescriptor.cap,
+               &tmpcap, sizeof(struct ieeetypes_capinfo));
+
+      done:
+        LEAVE();
+        return ret;
+}
+
+int libertas_ret_80211_associate(wlan_private * priv,
+                              struct cmd_ds_command *resp)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        union iwreq_data wrqu;
+        struct ieeetypes_assocrsp *passocrsp;
+        struct bss_descriptor *pbssdesc;
+
+        ENTER();
+
+        passocrsp = (struct ieeetypes_assocrsp *) & resp->params;
+
+        if (passocrsp->statuscode) {
+
+                libertas_mac_event_disconnected(priv);
+
+        lbs_pr_debug(1,
+                       "ASSOC_RESP: Association failed, status code = %d\n",
+                       passocrsp->statuscode);
+
+                ret = -1;
+                goto done;
+        }
+
+        lbs_dbg_hex("ASSOC_RESP:", (void *)&resp->params,
+                le16_to_cpu(resp->size) - S_DS_GEN);
+
+        /* Send a Media Connected event, according to the Spec */
+        adapter->connect_status = libertas_connected;
+
+        /* Set the attempted BSSID Index to current */
+        pbssdesc = adapter->pattemptedbssdesc;
+
+        lbs_pr_debug(1, "ASSOC_RESP: %s\n", pbssdesc->ssid.ssid);
+
+        /* Set the new SSID to current SSID */
+        memcpy(&adapter->curbssparams.ssid,
+               &pbssdesc->ssid, sizeof(struct WLAN_802_11_SSID));
+
+        /* Set the new BSSID (AP's MAC address) to current BSSID */
+        memcpy(adapter->curbssparams.bssid,
+               pbssdesc->macaddress, ETH_ALEN);
+
+        /* Make a copy of current BSSID descriptor */
+        memcpy(&adapter->curbssparams.bssdescriptor,
+               pbssdesc, sizeof(struct bss_descriptor));
+
+        lbs_pr_debug(1, "ASSOC_RESP: currentpacketfilter is %x\n",
+               adapter->currentpacketfilter);
+
+        adapter->SNR[TYPE_RXPD][TYPE_AVG] = 0;
+        adapter->NF[TYPE_RXPD][TYPE_AVG] = 0;
+
+        memset(adapter->rawSNR, 0x00, sizeof(adapter->rawSNR));
+        memset(adapter->rawNF, 0x00, sizeof(adapter->rawNF));
+        adapter->nextSNRNF = 0;
+        adapter->numSNRNF = 0;
+
+        netif_carrier_on(priv->wlan_dev.netdev);
+        netif_wake_queue(priv->wlan_dev.netdev);
+
+        lbs_pr_debug(1, "ASSOC_RESP: Associated \n");
+
+        memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);
+
+      done:
+        LEAVE();
+        return ret;
+}
+
+int libertas_ret_80211_disassociate(wlan_private * priv,
+                                 struct cmd_ds_command *resp)
+{
+        ENTER();
+
+        libertas_mac_event_disconnected(priv);
+
+        LEAVE();
+        return 0;
+}
+
+int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
+                                 struct cmd_ds_command *resp)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        u16 command = le16_to_cpu(resp->command);
+        u16 result = le16_to_cpu(resp->result);
+        struct cmd_ds_802_11_ad_hoc_result *padhocresult;
+        union iwreq_data wrqu;
+        struct bss_descriptor *pbssdesc;
+
+        ENTER();
+
+        padhocresult = &resp->params.result;
+
+        lbs_pr_debug(1, "ADHOC_S_RESP: size = %d\n", le16_to_cpu(resp->size));
+        lbs_pr_debug(1, "ADHOC_S_RESP: command = %x\n", command);
+        lbs_pr_debug(1, "ADHOC_S_RESP: result = %x\n", result);
+
+        pbssdesc = adapter->pattemptedbssdesc;
+
+        /*
+         * Join result code 0 --> SUCCESS
+         */
+        if (result) {
+                lbs_pr_debug(1, "ADHOC_RESP failed\n");
+                if (adapter->connect_status == libertas_connected) {
+                        libertas_mac_event_disconnected(priv);
+                }
+
+                memset(&adapter->curbssparams.bssdescriptor,
+                       0x00, sizeof(adapter->curbssparams.bssdescriptor));
+
+                LEAVE();
+                return -1;
+        }
+
+        /*
+         * Now the join cmd should be successful
+         * If BSSID has changed use SSID to compare instead of BSSID
+         */
+        lbs_pr_debug(1, "ADHOC_J_RESP  %s\n", pbssdesc->ssid.ssid);
+
+        /* Send a Media Connected event, according to the Spec */
+        adapter->connect_status = libertas_connected;
+
+        if (command == cmd_ret_802_11_ad_hoc_start) {
+                /* Update the created network descriptor with the new BSSID */
+                memcpy(pbssdesc->macaddress,
+                       padhocresult->BSSID, ETH_ALEN);
+        } else {
+
+                /* Make a copy of current BSSID descriptor, only needed for join since
+                 *   the current descriptor is already being used for adhoc start
+                 */
+                memmove(&adapter->curbssparams.bssdescriptor,
+                        pbssdesc, sizeof(struct bss_descriptor));
+        }
+
+        /* Set the BSSID from the joined/started descriptor */
+        memcpy(&adapter->curbssparams.bssid,
+               pbssdesc->macaddress, ETH_ALEN);
+
+        /* Set the new SSID to current SSID */
+        memcpy(&adapter->curbssparams.ssid,
+               &pbssdesc->ssid, sizeof(struct WLAN_802_11_SSID));
+
+        netif_carrier_on(priv->wlan_dev.netdev);
+        netif_wake_queue(priv->wlan_dev.netdev);
+
+        memset(&wrqu, 0, sizeof(wrqu));
+        memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);
+
+        lbs_pr_debug(1, "ADHOC_RESP: - Joined/Started Ad Hoc\n");
+        lbs_pr_debug(1, "ADHOC_RESP: channel = %d\n", adapter->adhocchannel);
+        lbs_pr_debug(1, "ADHOC_RESP: BSSID = %02x:%02x:%02x:%02x:%02x:%02x\n",
+               padhocresult->BSSID[0], padhocresult->BSSID[1],
+               padhocresult->BSSID[2], padhocresult->BSSID[3],
+               padhocresult->BSSID[4], padhocresult->BSSID[5]);
+
+        LEAVE();
+        return ret;
+}
+
+int libertas_ret_80211_ad_hoc_stop(wlan_private * priv,
+                                struct cmd_ds_command *resp)
+{
+        ENTER();
+
+        libertas_mac_event_disconnected(priv);
+
+        LEAVE();
+        return 0;
+}
diff --git a/drivers/net/wireless/libertas/join.h b/drivers/net/wireless/libertas/join.h
new file mode 100644
index 000000000000..8efa2455af9a
--- /dev/null
+++ b/drivers/net/wireless/libertas/join.h
@@ -0,0 +1,64 @@
+/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vi: set expandtab shiftwidth=4 tabstop=4 textwidth=78: */
+
+/**
+  * Interface for the wlan infrastructure and adhoc join routines
+  *
+  * Driver interface functions and type declarations for the join module
+  *   implemented in wlan_join.c.  Process all start/join requests for
+  *   both adhoc and infrastructure networks
+  */
+#ifndef _WLAN_JOIN_H
+#define _WLAN_JOIN_H
+
+#include "defs.h"
+
+struct cmd_ds_command;
+extern int libertas_cmd_80211_authenticate(wlan_private * priv,
+                                        struct cmd_ds_command *cmd,
+                                        void *pdata_buf);
+extern int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
+                                       struct cmd_ds_command *cmd,
+                                       void *pdata_buf);
+extern int libertas_cmd_80211_ad_hoc_stop(wlan_private * priv,
+                                       struct cmd_ds_command *cmd);
+extern int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
+                                        struct cmd_ds_command *cmd,
+                                        void *pssid);
+extern int libertas_cmd_80211_deauthenticate(wlan_private * priv,
+                                          struct cmd_ds_command *cmd);
+extern int libertas_cmd_80211_associate(wlan_private * priv,
+                                     struct cmd_ds_command *cmd,
+                                     void *pdata_buf);
+
+extern int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
+                                        struct cmd_ds_command *resp);
+extern int libertas_ret_80211_ad_hoc_stop(wlan_private * priv,
+                                       struct cmd_ds_command *resp);
+extern int libertas_ret_80211_disassociate(wlan_private * priv,
+                                        struct cmd_ds_command *resp);
+extern int libertas_ret_80211_associate(wlan_private * priv,
+                                     struct cmd_ds_command *resp);
+
+extern int libertas_idle_on(wlan_private * priv);
+extern int libertas_idle_off(wlan_private * priv);
+
+extern int libertas_do_adhocstop_ioctl(wlan_private * priv);
+extern int libertas_reassociation_thread(void *data);
+
+struct WLAN_802_11_SSID;
+struct bss_descriptor;
+
+extern int libertas_start_adhoc_network(wlan_private * priv,
+                             struct WLAN_802_11_SSID *adhocssid);
+extern int libertas_join_adhoc_network(wlan_private * priv, struct bss_descriptor *pbssdesc);
+extern int libertas_stop_adhoc_network(wlan_private * priv);
+
+extern int libertas_send_deauthentication(wlan_private * priv);
+extern int libertas_send_deauth(wlan_private * priv);
+
+extern int libertas_do_adhocstop_ioctl(wlan_private * priv);
+
+int wlan_associate(wlan_private * priv, struct bss_descriptor * pbssdesc);
+
+#endif
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
new file mode 100644
index 000000000000..dcbf102a057e
--- /dev/null
+++ b/drivers/net/wireless/libertas/main.c
@@ -0,0 +1,1258 @@
+/**
+  * This file contains the major functions in WLAN
+  * driver. It includes init, exit, open, close and main
+  * thread etc..
+  */
+
+#include <linux/delay.h>
+#include <linux/freezer.h>
+#include <linux/etherdevice.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+
+#include <net/iw_handler.h>
+
+#include "host.h"
+#include "sbi.h"
+#include "decl.h"
+#include "dev.h"
+#include "fw.h"
+#include "wext.h"
+#include "debugfs.h"
+#include "assoc.h"
+
+#ifdef ENABLE_PM
+static struct pm_dev *wlan_pm_dev = NULL;
+#endif
+
+#define WLAN_TX_PWR_DEFAULT             20      /*100mW */
+#define WLAN_TX_PWR_US_DEFAULT          20      /*100mW */
+#define WLAN_TX_PWR_JP_DEFAULT          16      /*50mW */
+#define WLAN_TX_PWR_FR_DEFAULT          20      /*100mW */
+#define WLAN_TX_PWR_EMEA_DEFAULT        20      /*100mW */
+
+/* Format { channel, frequency (MHz), maxtxpower } */
+/* band: 'B/G', region: USA FCC/Canada IC */
+static struct chan_freq_power channel_freq_power_US_BG[] = {
+        {1, 2412, WLAN_TX_PWR_US_DEFAULT},
+        {2, 2417, WLAN_TX_PWR_US_DEFAULT},
+        {3, 2422, WLAN_TX_PWR_US_DEFAULT},
+        {4, 2427, WLAN_TX_PWR_US_DEFAULT},
+        {5, 2432, WLAN_TX_PWR_US_DEFAULT},
+        {6, 2437, WLAN_TX_PWR_US_DEFAULT},
+        {7, 2442, WLAN_TX_PWR_US_DEFAULT},
+        {8, 2447, WLAN_TX_PWR_US_DEFAULT},
+        {9, 2452, WLAN_TX_PWR_US_DEFAULT},
+        {10, 2457, WLAN_TX_PWR_US_DEFAULT},
+        {11, 2462, WLAN_TX_PWR_US_DEFAULT}
+};
+
+/* band: 'B/G', region: Europe ETSI */
+static struct chan_freq_power channel_freq_power_EU_BG[] = {
+        {1, 2412, WLAN_TX_PWR_EMEA_DEFAULT},
+        {2, 2417, WLAN_TX_PWR_EMEA_DEFAULT},
+        {3, 2422, WLAN_TX_PWR_EMEA_DEFAULT},
+        {4, 2427, WLAN_TX_PWR_EMEA_DEFAULT},
+        {5, 2432, WLAN_TX_PWR_EMEA_DEFAULT},
+        {6, 2437, WLAN_TX_PWR_EMEA_DEFAULT},
+        {7, 2442, WLAN_TX_PWR_EMEA_DEFAULT},
+        {8, 2447, WLAN_TX_PWR_EMEA_DEFAULT},
+        {9, 2452, WLAN_TX_PWR_EMEA_DEFAULT},
+        {10, 2457, WLAN_TX_PWR_EMEA_DEFAULT},
+        {11, 2462, WLAN_TX_PWR_EMEA_DEFAULT},
+        {12, 2467, WLAN_TX_PWR_EMEA_DEFAULT},
+        {13, 2472, WLAN_TX_PWR_EMEA_DEFAULT}
+};
+
+/* band: 'B/G', region: Spain */
+static struct chan_freq_power channel_freq_power_SPN_BG[] = {
+        {10, 2457, WLAN_TX_PWR_DEFAULT},
+        {11, 2462, WLAN_TX_PWR_DEFAULT}
+};
+
+/* band: 'B/G', region: France */
+static struct chan_freq_power channel_freq_power_FR_BG[] = {
+        {10, 2457, WLAN_TX_PWR_FR_DEFAULT},
+        {11, 2462, WLAN_TX_PWR_FR_DEFAULT},
+        {12, 2467, WLAN_TX_PWR_FR_DEFAULT},
+        {13, 2472, WLAN_TX_PWR_FR_DEFAULT}
+};
+
+/* band: 'B/G', region: Japan */
+static struct chan_freq_power channel_freq_power_JPN_BG[] = {
+        {1, 2412, WLAN_TX_PWR_JP_DEFAULT},
+        {2, 2417, WLAN_TX_PWR_JP_DEFAULT},
+        {3, 2422, WLAN_TX_PWR_JP_DEFAULT},
+        {4, 2427, WLAN_TX_PWR_JP_DEFAULT},
+        {5, 2432, WLAN_TX_PWR_JP_DEFAULT},
+        {6, 2437, WLAN_TX_PWR_JP_DEFAULT},
+        {7, 2442, WLAN_TX_PWR_JP_DEFAULT},
+        {8, 2447, WLAN_TX_PWR_JP_DEFAULT},
+        {9, 2452, WLAN_TX_PWR_JP_DEFAULT},
+        {10, 2457, WLAN_TX_PWR_JP_DEFAULT},
+        {11, 2462, WLAN_TX_PWR_JP_DEFAULT},
+        {12, 2467, WLAN_TX_PWR_JP_DEFAULT},
+        {13, 2472, WLAN_TX_PWR_JP_DEFAULT},
+        {14, 2484, WLAN_TX_PWR_JP_DEFAULT}
+};
+
+/**
+ * the structure for channel, frequency and power
+ */
+struct region_cfp_table {
+        u8 region;
+        struct chan_freq_power *cfp_BG;
+        int cfp_no_BG;
+};
+
+/**
+ * the structure for the mapping between region and CFP
+ */
+static struct region_cfp_table region_cfp_table[] = {
+        {0x10,                  /*US FCC */
+         channel_freq_power_US_BG,
+         sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+         }
+        ,
+        {0x20,                  /*CANADA IC */
+         channel_freq_power_US_BG,
+         sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+         }
+        ,
+        {0x30, /*EU*/ channel_freq_power_EU_BG,
+         sizeof(channel_freq_power_EU_BG) / sizeof(struct chan_freq_power),
+         }
+        ,
+        {0x31, /*SPAIN*/ channel_freq_power_SPN_BG,
+         sizeof(channel_freq_power_SPN_BG) / sizeof(struct chan_freq_power),
+         }
+        ,
+        {0x32, /*FRANCE*/ channel_freq_power_FR_BG,
+         sizeof(channel_freq_power_FR_BG) / sizeof(struct chan_freq_power),
+         }
+        ,
+        {0x40, /*JAPAN*/ channel_freq_power_JPN_BG,
+         sizeof(channel_freq_power_JPN_BG) / sizeof(struct chan_freq_power),
+         }
+        ,
+/*Add new region here */
+};
+
+/**
+ * the rates supported by the card
+ */
+u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES] =
+    { 0x02, 0x04, 0x0B, 0x16, 0x00, 0x0C, 0x12,
+        0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x00
+};
+
+/**
+ * the rates supported
+ */
+u8 libertas_supported_rates[G_SUPPORTED_RATES] =
+    { 0x82, 0x84, 0x8b, 0x96, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c,
+0 };
+
+/**
+ * the rates supported for ad-hoc G mode
+ */
+u8 libertas_adhoc_rates_g[G_SUPPORTED_RATES] =
+    { 0x82, 0x84, 0x8b, 0x96, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c,
+0 };
+
+/**
+ * the rates supported for ad-hoc B mode
+ */
+u8 libertas_adhoc_rates_b[4] = { 0x82, 0x84, 0x8b, 0x96 };
+
+/**
+ * the global variable of a pointer to wlan_private
+ * structure variable
+ */
+static wlan_private *wlanpriv = NULL;
+
+#define MAX_DEVS 5
+static struct net_device *libertas_devs[MAX_DEVS];
+static int libertas_found = 0;
+
+/**
+ * the table to keep region code
+ */
+u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE] =
+    { 0x10, 0x20, 0x30, 0x31, 0x32, 0x40 };
+
+static u8 *default_fw_name = "usb8388.bin";
+
+/**
+ * Attributes exported through sysfs
+ */
+
+/**
+ * @brief Get function for sysfs attribute libertas_mpp
+ */
+static ssize_t libertas_mpp_get(struct device * dev,
+                struct device_attribute *attr, char * buf) {
+        struct cmd_ds_mesh_access mesh_access;
+
+        memset(&mesh_access, 0, sizeof(mesh_access));
+        libertas_prepare_and_send_command(to_net_dev(dev)->priv,
+                        cmd_mesh_access,
+                        cmd_act_mesh_get_mpp,
+                        cmd_option_waitforrsp, 0, (void *)&mesh_access);
+
+        return snprintf(buf, 3, "%d\n", mesh_access.data[0]);
+}
+
+/**
+ * @brief Set function for sysfs attribute libertas_mpp
+ */
+static ssize_t libertas_mpp_set(struct device * dev,
+                struct device_attribute *attr, const char * buf, size_t count) {
+        struct cmd_ds_mesh_access mesh_access;
+
+
+        memset(&mesh_access, 0, sizeof(mesh_access));
+        sscanf(buf, "%d", &(mesh_access.data[0]));
+        libertas_prepare_and_send_command((to_net_dev(dev))->priv,
+                        cmd_mesh_access,
+                        cmd_act_mesh_set_mpp,
+                        cmd_option_waitforrsp, 0, (void *)&mesh_access);
+        return strlen(buf);
+}
+
+/**
+ * libertas_mpp attribute to be exported per mshX interface
+ * through sysfs (/sys/class/net/mshX/libertas-mpp)
+ */
+static DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get,
+                libertas_mpp_set );
+
+/**
+ *  @brief Check if the device can be open and wait if necessary.
+ *
+ *  @param dev     A pointer to net_device structure
+ *  @return        0
+ *
+ * For USB adapter, on some systems the device open handler will be
+ * called before FW ready. Use the following flag check and wait
+ * function to work around the issue.
+ *
+ */
+static int pre_open_check(struct net_device *dev) {
+        wlan_private *priv = (wlan_private *) dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int i = 0;
+
+        while (!adapter->fw_ready && i < 20) {
+                i++;
+                msleep_interruptible(100);
+        }
+        if (!adapter->fw_ready) {
+                lbs_pr_info("FW not ready, pre_open_check() return failure\n");
+                LEAVE();
+                return -1;
+        }
+
+        return 0;
+}
+
+/**
+ *  @brief This function opens the device
+ *
+ *  @param dev     A pointer to net_device structure
+ *  @return        0
+ */
+static int wlan_dev_open(struct net_device *dev)
+{
+        wlan_private *priv = (wlan_private *) dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+
+        priv->open = 1;
+
+        if (adapter->connect_status == libertas_connected) {
+                netif_carrier_on(priv->wlan_dev.netdev);
+        } else
+                netif_carrier_off(priv->wlan_dev.netdev);
+
+        LEAVE();
+        return 0;
+}
+/**
+ *  @brief This function opens the mshX interface
+ *
+ *  @param dev     A pointer to net_device structure
+ *  @return        0
+ */
+static int mesh_open(struct net_device *dev)
+{
+        wlan_private *priv = (wlan_private *) dev->priv ;
+
+        if(pre_open_check(dev) == -1)
+                return -1;
+        priv->mesh_open = 1 ;
+        netif_start_queue(priv->mesh_dev);
+        if (priv->infra_open == 0)
+                return wlan_dev_open(priv->wlan_dev.netdev) ;
+        return 0;
+}
+
+/**
+ *  @brief This function opens the ethX interface
+ *
+ *  @param dev     A pointer to net_device structure
+ *  @return        0
+ */
+static int wlan_open(struct net_device *dev)
+{
+        wlan_private *priv = (wlan_private *) dev->priv ;
+
+        if(pre_open_check(dev) == -1)
+                return -1;
+        priv->infra_open = 1 ;
+        netif_wake_queue(priv->wlan_dev.netdev);
+        if (priv->open == 0)
+                return wlan_dev_open(priv->wlan_dev.netdev) ;
+        return 0;
+}
+
+static int wlan_dev_close(struct net_device *dev)
+{
+        wlan_private *priv = dev->priv;
+
+        ENTER();
+
+        netif_carrier_off(priv->wlan_dev.netdev);
+        priv->open = 0;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function closes the mshX interface
+ *
+ *  @param dev     A pointer to net_device structure
+ *  @return        0
+ */
+static int mesh_close(struct net_device *dev)
+{
+        wlan_private *priv = (wlan_private *) (dev->priv);
+
+        priv->mesh_open = 0;
+        netif_stop_queue(priv->mesh_dev);
+        if (priv->infra_open == 0)
+                return wlan_dev_close( ((wlan_private *) dev->priv)->wlan_dev.netdev) ;
+        else
+                return 0;
+}
+
+/**
+ *  @brief This function closes the ethX interface
+ *
+ *  @param dev     A pointer to net_device structure
+ *  @return        0
+ */
+static int wlan_close(struct net_device *dev) {
+        wlan_private *priv = (wlan_private *) dev->priv;
+
+        netif_stop_queue(priv->wlan_dev.netdev);
+        priv->infra_open = 0;
+        if (priv->mesh_open == 0)
+                return wlan_dev_close( ((wlan_private *) dev->priv)->wlan_dev.netdev) ;
+        else
+                return 0;
+}
+
+
+#ifdef ENABLE_PM
+
+/**
+ *  @brief This function is a callback function. it is called by
+ *  kernel to enter or exit power saving mode.
+ *
+ *  @param pmdev   A pointer to pm_dev
+ *  @param pmreq   pm_request_t
+ *  @param pmdata  A pointer to pmdata
+ *  @return        0 or -1
+ */
+static int wlan_pm_callback(struct pm_dev *pmdev, pm_request_t pmreq,
+                            void *pmdata)
+{
+        wlan_private *priv = wlanpriv;
+        wlan_adapter *adapter = priv->adapter;
+        struct net_device *dev = priv->wlan_dev.netdev;
+
+        lbs_pr_debug(1, "WPRM_PM_CALLBACK: pmreq = %d.\n", pmreq);
+
+        switch (pmreq) {
+        case PM_SUSPEND:
+                lbs_pr_debug(1, "WPRM_PM_CALLBACK: enter PM_SUSPEND.\n");
+
+                /* in associated mode */
+                if (adapter->connect_status == libertas_connected) {
+                        if ((adapter->psstate != PS_STATE_SLEEP)
+                            ) {
+                                lbs_pr_debug(1,
+                                       "wlan_pm_callback: can't enter sleep mode\n");
+                                return -1;
+                        } else {
+
+                                /*
+                                 * Detach the network interface
+                                 * if the network is running
+                                 */
+                                if (netif_running(dev)) {
+                                        netif_device_detach(dev);
+                                        lbs_pr_debug(1,
+                                               "netif_device_detach().\n");
+                                }
+                                libertas_sbi_suspend(priv);
+                        }
+                        break;
+                }
+
+                /* in non associated mode */
+
+                /*
+                 * Detach the network interface
+                 * if the network is running
+                 */
+                if (netif_running(dev))
+                        netif_device_detach(dev);
+
+                /*
+                 * Storing and restoring of the regs be taken care
+                 * at the driver rest will be done at wlan driver
+                 * this makes driver independent of the card
+                 */
+
+                libertas_sbi_suspend(priv);
+
+                break;
+
+        case PM_RESUME:
+                /* in associated mode */
+                if (adapter->connect_status == libertas_connected) {
+                        {
+                                /*
+                                 * Bring the inteface up first
+                                 * This case should not happen still ...
+                                 */
+                                libertas_sbi_resume(priv);
+
+                                /*
+                                 * Attach the network interface
+                                 * if the network is running
+                                 */
+                                if (netif_running(dev)) {
+                                        netif_device_attach(dev);
+                                        lbs_pr_debug(1,
+                                               "after netif_device_attach().\n");
+                                }
+                                lbs_pr_debug(1,
+                                       "After netif attach, in associated mode.\n");
+                        }
+                        break;
+                }
+
+                /* in non associated mode */
+
+                /*
+                 * Bring the inteface up first
+                 * This case should not happen still ...
+                 */
+
+                libertas_sbi_resume(priv);
+
+                if (netif_running(dev))
+                        netif_device_attach(dev);
+
+                lbs_pr_debug(1, "after netif attach, in NON associated mode.\n");
+                break;
+        }
+
+        return 0;
+}
+#endif                          /* ENABLE_PM */
+
+static int wlan_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+
+        ENTER();
+
+        if (priv->wlan_dev.dnld_sent || priv->adapter->TxLockFlag) {
+                priv->stats.tx_dropped++;
+                goto done;
+        }
+
+        netif_stop_queue(priv->wlan_dev.netdev);
+
+        if (libertas_process_tx(priv, skb) == 0)
+                dev->trans_start = jiffies;
+done:
+        LEAVE();
+        return ret;
+}
+
+/**
+ * @brief Mark mesh packets and handover them to wlan_hard_start_xmit
+ *
+ */
+static int mesh_pre_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        wlan_private *priv = dev->priv;
+        ENTER();
+        SET_MESH_FRAME(skb);
+        LEAVE();
+
+        return wlan_hard_start_xmit(skb, priv->wlan_dev.netdev);
+}
+
+/**
+ * @brief Mark non-mesh packets and handover them to wlan_hard_start_xmit
+ *
+ */
+static int wlan_pre_start_xmit(struct sk_buff *skb, struct net_device *dev) {
+        ENTER();
+        UNSET_MESH_FRAME(skb);
+        LEAVE();
+        return wlan_hard_start_xmit(skb, dev);
+}
+
+static void wlan_tx_timeout(struct net_device *dev)
+{
+        wlan_private *priv = (wlan_private *) dev->priv;
+
+        ENTER();
+
+        lbs_pr_err("tx watch dog timeout!\n");
+
+        priv->wlan_dev.dnld_sent = DNLD_RES_RECEIVED;
+        dev->trans_start = jiffies;
+
+        if (priv->adapter->currenttxskb) {
+                if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) {
+                        /* If we are here, we have not received feedback from
+                           the previous packet.  Assume TX_FAIL and move on. */
+                        priv->adapter->eventcause = 0x01000000;
+                        libertas_send_tx_feedback(priv);
+                } else
+                        wake_up_interruptible(&priv->mainthread.waitq);
+        } else if (priv->adapter->connect_status == libertas_connected)
+                netif_wake_queue(priv->wlan_dev.netdev);
+
+        LEAVE();
+}
+
+/**
+ *  @brief This function returns the network statistics
+ *
+ *  @param dev     A pointer to wlan_private structure
+ *  @return        A pointer to net_device_stats structure
+ */
+static struct net_device_stats *wlan_get_stats(struct net_device *dev)
+{
+        wlan_private *priv = (wlan_private *) dev->priv;
+
+        return &priv->stats;
+}
+
+static int wlan_set_mac_address(struct net_device *dev, void *addr)
+{
+        int ret = 0;
+        wlan_private *priv = (wlan_private *) dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct sockaddr *phwaddr = addr;
+
+        ENTER();
+
+        memset(adapter->current_addr, 0, ETH_ALEN);
+
+        /* dev->dev_addr is 8 bytes */
+        lbs_dbg_hex("dev->dev_addr:", dev->dev_addr, ETH_ALEN);
+
+        lbs_dbg_hex("addr:", phwaddr->sa_data, ETH_ALEN);
+        memcpy(adapter->current_addr, phwaddr->sa_data, ETH_ALEN);
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_mac_address,
+                                    cmd_act_set,
+                                    cmd_option_waitforrsp, 0, NULL);
+
+        if (ret) {
+                lbs_pr_debug(1, "set mac address failed.\n");
+                ret = -1;
+                goto done;
+        }
+
+        lbs_dbg_hex("adapter->macaddr:", adapter->current_addr, ETH_ALEN);
+        memcpy(dev->dev_addr, adapter->current_addr, ETH_ALEN);
+        memcpy(((wlan_private *) dev->priv)->mesh_dev->dev_addr, adapter->current_addr, ETH_ALEN);
+
+done:
+        LEAVE();
+        return ret;
+}
+
+static int wlan_copy_multicast_address(wlan_adapter * adapter,
+                                     struct net_device *dev)
+{
+        int i = 0;
+        struct dev_mc_list *mcptr = dev->mc_list;
+
+        for (i = 0; i < dev->mc_count; i++) {
+                memcpy(&adapter->multicastlist[i], mcptr->dmi_addr, ETH_ALEN);
+                mcptr = mcptr->next;
+        }
+
+        return i;
+
+}
+
+static void wlan_set_multicast_list(struct net_device *dev)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int oldpacketfilter;
+
+        ENTER();
+
+        oldpacketfilter = adapter->currentpacketfilter;
+
+        if (dev->flags & IFF_PROMISC) {
+                lbs_pr_debug(1, "enable Promiscuous mode\n");
+                adapter->currentpacketfilter |=
+                    cmd_act_mac_promiscuous_enable;
+                adapter->currentpacketfilter &=
+                    ~(cmd_act_mac_all_multicast_enable |
+                      cmd_act_mac_multicast_enable);
+        } else {
+                /* Multicast */
+                adapter->currentpacketfilter &=
+                    ~cmd_act_mac_promiscuous_enable;
+
+                if (dev->flags & IFF_ALLMULTI || dev->mc_count >
+                    MRVDRV_MAX_MULTICAST_LIST_SIZE) {
+                        lbs_pr_debug(1, "Enabling All Multicast!\n");
+                        adapter->currentpacketfilter |=
+                            cmd_act_mac_all_multicast_enable;
+                        adapter->currentpacketfilter &=
+                            ~cmd_act_mac_multicast_enable;
+                } else {
+                        adapter->currentpacketfilter &=
+                            ~cmd_act_mac_all_multicast_enable;
+
+                        if (!dev->mc_count) {
+                                lbs_pr_debug(1, "No multicast addresses - "
+                                       "disabling multicast!\n");
+                                adapter->currentpacketfilter &=
+                                    ~cmd_act_mac_multicast_enable;
+                        } else {
+                                int i;
+
+                                adapter->currentpacketfilter |=
+                                    cmd_act_mac_multicast_enable;
+
+                                adapter->nr_of_multicastmacaddr =
+                                    wlan_copy_multicast_address(adapter, dev);
+
+                                lbs_pr_debug(1, "Multicast addresses: %d\n",
+                                       dev->mc_count);
+
+                                for (i = 0; i < dev->mc_count; i++) {
+                                        lbs_pr_debug(1, "Multicast address %d:"
+                                               "%x %x %x %x %x %x\n", i,
+                                               adapter->multicastlist[i][0],
+                                               adapter->multicastlist[i][1],
+                                               adapter->multicastlist[i][2],
+                                               adapter->multicastlist[i][3],
+                                               adapter->multicastlist[i][4],
+                                               adapter->multicastlist[i][5]);
+                                }
+                                /* set multicast addresses to firmware */
+                                libertas_prepare_and_send_command(priv,
+                                                      cmd_mac_multicast_adr,
+                                                      cmd_act_set, 0, 0,
+                                                      NULL);
+                        }
+                }
+        }
+
+        if (adapter->currentpacketfilter != oldpacketfilter) {
+                libertas_set_mac_packet_filter(priv);
+        }
+
+        LEAVE();
+}
+
+/**
+ *  @brief This function hanldes the major job in WLAN driver.
+ *  it handles the event generated by firmware, rx data received
+ *  from firmware and tx data sent from kernel.
+ *
+ *  @param data    A pointer to wlan_thread structure
+ *  @return        0
+ */
+static int wlan_service_main_thread(void *data)
+{
+        struct wlan_thread *thread = data;
+        wlan_private *priv = thread->priv;
+        wlan_adapter *adapter = priv->adapter;
+        wait_queue_t wait;
+        u8 ireg = 0;
+
+        ENTER();
+
+        wlan_activate_thread(thread);
+
+        init_waitqueue_entry(&wait, current);
+
+        for (;;) {
+                lbs_pr_debug(1, "main-thread 111: intcounter=%d "
+                       "currenttxskb=%p dnld_sent=%d\n",
+                       adapter->intcounter,
+                       adapter->currenttxskb, priv->wlan_dev.dnld_sent);
+
+                add_wait_queue(&thread->waitq, &wait);
+                set_current_state(TASK_INTERRUPTIBLE);
+                spin_lock_irq(&adapter->driver_lock);
+                if ((adapter->psstate == PS_STATE_SLEEP) ||
+                    (!adapter->intcounter
+                     && (priv->wlan_dev.dnld_sent || adapter->cur_cmd ||
+                         list_empty(&adapter->cmdpendingq)))) {
+                        lbs_pr_debug(1,
+                               "main-thread sleeping... Conn=%d IntC=%d PS_mode=%d PS_State=%d\n",
+                               adapter->connect_status, adapter->intcounter,
+                               adapter->psmode, adapter->psstate);
+                        spin_unlock_irq(&adapter->driver_lock);
+                        schedule();
+                } else
+                        spin_unlock_irq(&adapter->driver_lock);
+
+
+                lbs_pr_debug(1,
+                       "main-thread 222 (waking up): intcounter=%d currenttxskb=%p "
+                       "dnld_sent=%d\n", adapter->intcounter,
+                       adapter->currenttxskb, priv->wlan_dev.dnld_sent);
+
+                set_current_state(TASK_RUNNING);
+                remove_wait_queue(&thread->waitq, &wait);
+                try_to_freeze();
+
+                lbs_pr_debug(1, "main-thread 333: intcounter=%d currenttxskb=%p "
+                       "dnld_sent=%d\n",
+                       adapter->intcounter,
+                       adapter->currenttxskb, priv->wlan_dev.dnld_sent);
+
+                if (kthread_should_stop()
+                    || adapter->surpriseremoved) {
+                        lbs_pr_debug(1,
+                               "main-thread: break from main thread: surpriseremoved=0x%x\n",
+                               adapter->surpriseremoved);
+                        break;
+                }
+
+
+                spin_lock_irq(&adapter->driver_lock);
+                if (adapter->intcounter) {
+                        u8 int_status;
+                        adapter->intcounter = 0;
+                        int_status = libertas_sbi_get_int_status(priv, &ireg);
+
+                        if (int_status) {
+                                lbs_pr_debug(1,
+                                       "main-thread: reading HOST_INT_STATUS_REG failed\n");
+                                spin_unlock_irq(&adapter->driver_lock);
+                                continue;
+                        }
+                        adapter->hisregcpy |= ireg;
+                }
+
+                lbs_pr_debug(1, "main-thread 444: intcounter=%d currenttxskb=%p "
+                       "dnld_sent=%d\n",
+                       adapter->intcounter,
+                       adapter->currenttxskb, priv->wlan_dev.dnld_sent);
+
+                /* command response? */
+                if (adapter->hisregcpy & his_cmdupldrdy) {
+                        lbs_pr_debug(1, "main-thread: cmd response ready.\n");
+
+                        adapter->hisregcpy &= ~his_cmdupldrdy;
+                        spin_unlock_irq(&adapter->driver_lock);
+                        libertas_process_rx_command(priv);
+                        spin_lock_irq(&adapter->driver_lock);
+                }
+
+                /* Any Card Event */
+                if (adapter->hisregcpy & his_cardevent) {
+                        lbs_pr_debug(1, "main-thread: Card Event Activity.\n");
+
+                        adapter->hisregcpy &= ~his_cardevent;
+
+                        if (libertas_sbi_read_event_cause(priv)) {
+                                lbs_pr_alert(
+                                       "main-thread: libertas_sbi_read_event_cause failed.\n");
+                                spin_unlock_irq(&adapter->driver_lock);
+                                continue;
+                        }
+                        spin_unlock_irq(&adapter->driver_lock);
+                        libertas_process_event(priv);
+                } else
+                        spin_unlock_irq(&adapter->driver_lock);
+
+                /* Check if we need to confirm Sleep Request received previously */
+                if (adapter->psstate == PS_STATE_PRE_SLEEP) {
+                        if (!priv->wlan_dev.dnld_sent && !adapter->cur_cmd) {
+                                if (adapter->connect_status ==
+                                    libertas_connected) {
+                                        lbs_pr_debug(1,
+                                               "main_thread: PRE_SLEEP--intcounter=%d currenttxskb=%p "
+                                               "dnld_sent=%d cur_cmd=%p, confirm now\n",
+                                               adapter->intcounter,
+                                               adapter->currenttxskb,
+                                               priv->wlan_dev.dnld_sent,
+                                               adapter->cur_cmd);
+
+                                        libertas_ps_confirm_sleep(priv,
+                                                       (u16) adapter->psmode);
+                                } else {
+                                        /* workaround for firmware sending
+                                         * deauth/linkloss event immediately
+                                         * after sleep request, remove this
+                                         * after firmware fixes it
+                                         */
+                                        adapter->psstate = PS_STATE_AWAKE;
+                                        lbs_pr_alert(
+                                               "main-thread: ignore PS_SleepConfirm in non-connected state\n");
+                                }
+                        }
+                }
+
+                /* The PS state is changed during processing of Sleep Request
+                 * event above
+                 */
+                if ((priv->adapter->psstate == PS_STATE_SLEEP) ||
+                    (priv->adapter->psstate == PS_STATE_PRE_SLEEP))
+                        continue;
+
+                /* Execute the next command */
+                if (!priv->wlan_dev.dnld_sent && !priv->adapter->cur_cmd)
+                        libertas_execute_next_command(priv);
+
+                /* Wake-up command waiters which can't sleep in
+                 * libertas_prepare_and_send_command
+                 */
+                if (!adapter->nr_cmd_pending)
+                        wake_up_all(&adapter->cmd_pending);
+
+                libertas_tx_runqueue(priv);
+        }
+
+        del_timer(&adapter->command_timer);
+        adapter->nr_cmd_pending = 0;
+        wake_up_all(&adapter->cmd_pending);
+        wlan_deactivate_thread(thread);
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ * @brief This function adds the card. it will probe the
+ * card, allocate the wlan_priv and initialize the device.
+ *
+ *  @param card    A pointer to card
+ *  @return        A pointer to wlan_private structure
+ */
+wlan_private *wlan_add_card(void *card)
+{
+        struct net_device *dev = NULL;
+        struct net_device *mesh_dev = NULL;
+        wlan_private *priv = NULL;
+
+        ENTER();
+
+        /* Allocate an Ethernet device and register it */
+        if (!(dev = alloc_etherdev(sizeof(wlan_private)))) {
+                lbs_pr_alert( "Init ethernet device failed!\n");
+                return NULL;
+        }
+
+        priv = dev->priv;
+
+        /* allocate buffer for wlan_adapter */
+        if (!(priv->adapter = kmalloc(sizeof(wlan_adapter), GFP_KERNEL))) {
+                lbs_pr_alert( "Allocate buffer for wlan_adapter failed!\n");
+                goto err_kmalloc;
+        }
+
+        /* Allocate a virtual mesh device */
+        if (!(mesh_dev = alloc_netdev(0, "msh%d", ether_setup))) {
+                lbs_pr_debug(1, "Init ethernet device failed!\n");
+                return NULL;
+        }
+
+        /* Both intervaces share the priv structure */
+        mesh_dev->priv = priv;
+
+        /* init wlan_adapter */
+        memset(priv->adapter, 0, sizeof(wlan_adapter));
+
+        priv->wlan_dev.netdev = dev;
+        priv->wlan_dev.card = card;
+        priv->mesh_open = 0;
+        priv->infra_open = 0;
+        priv->mesh_dev = mesh_dev;
+        wlanpriv = priv;
+
+        SET_MODULE_OWNER(dev);
+        SET_MODULE_OWNER(mesh_dev);
+
+        /* Setup the OS Interface to our functions */
+        dev->open = wlan_open;
+        dev->hard_start_xmit = wlan_pre_start_xmit;
+        dev->stop = wlan_close;
+        dev->do_ioctl = libertas_do_ioctl;
+        dev->set_mac_address = wlan_set_mac_address;
+        mesh_dev->open = mesh_open;
+        mesh_dev->hard_start_xmit = mesh_pre_start_xmit;
+        mesh_dev->stop = mesh_close;
+        mesh_dev->do_ioctl = libertas_do_ioctl;
+        memcpy(mesh_dev->dev_addr, wlanpriv->wlan_dev.netdev->dev_addr,
+                        sizeof(wlanpriv->wlan_dev.netdev->dev_addr));
+
+#define WLAN_WATCHDOG_TIMEOUT   (5 * HZ)
+
+        dev->tx_timeout = wlan_tx_timeout;
+        dev->get_stats = wlan_get_stats;
+        dev->watchdog_timeo = WLAN_WATCHDOG_TIMEOUT;
+        dev->ethtool_ops = &libertas_ethtool_ops;
+        mesh_dev->get_stats = wlan_get_stats;
+        mesh_dev->ethtool_ops = &libertas_ethtool_ops;
+
+#ifdef  WIRELESS_EXT
+        dev->wireless_handlers = (struct iw_handler_def *)&libertas_handler_def;
+        mesh_dev->wireless_handlers = (struct iw_handler_def *)&libertas_handler_def;
+#endif
+#define NETIF_F_DYNALLOC 16
+        dev->features |= NETIF_F_DYNALLOC;
+        dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
+        dev->set_multicast_list = wlan_set_multicast_list;
+
+        INIT_LIST_HEAD(&priv->adapter->cmdfreeq);
+        INIT_LIST_HEAD(&priv->adapter->cmdpendingq);
+
+        spin_lock_init(&priv->adapter->driver_lock);
+        init_waitqueue_head(&priv->adapter->cmd_pending);
+        priv->adapter->nr_cmd_pending = 0;
+
+        lbs_pr_debug(1, "Starting kthread...\n");
+        priv->mainthread.priv = priv;
+        wlan_create_thread(wlan_service_main_thread,
+                           &priv->mainthread, "wlan_main_service");
+
+        priv->assoc_thread =
+                create_singlethread_workqueue("libertas_assoc");
+        INIT_DELAYED_WORK(&priv->assoc_work, wlan_association_worker);
+
+        /*
+         * Register the device. Fillup the private data structure with
+         * relevant information from the card and request for the required
+         * IRQ.
+         */
+        if (libertas_sbi_register_dev(priv) < 0) {
+                lbs_pr_info("failed to register wlan device!\n");
+                goto err_registerdev;
+        }
+
+        /* init FW and HW */
+        if (libertas_init_fw(priv)) {
+                lbs_pr_debug(1, "Firmware Init failed\n");
+                goto err_registerdev;
+        }
+
+        if (register_netdev(dev)) {
+                lbs_pr_err("Cannot register network device!\n");
+                goto err_init_fw;
+        }
+
+        /* Register virtual mesh interface */
+        if (register_netdev(mesh_dev)) {
+                lbs_pr_info("Cannot register mesh virtual interface!\n");
+                goto err_init_fw;
+        }
+
+        lbs_pr_info("%s: Marvell Wlan 802.11 adapter ", dev->name);
+
+        libertas_debugfs_init_one(priv, dev);
+
+        if (libertas_found == MAX_DEVS)
+                goto err_init_fw;
+        libertas_devs[libertas_found] = dev;
+        libertas_found++;
+#ifdef ENABLE_PM
+        if (!(wlan_pm_dev = pm_register(PM_UNKNOWN_DEV, 0, wlan_pm_callback)))
+                lbs_pr_alert( "failed to register PM callback\n");
+#endif
+        if (device_create_file(&(mesh_dev->dev), &dev_attr_libertas_mpp))
+                goto err_create_file;
+
+        LEAVE();
+        return priv;
+
+err_create_file:
+        device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
+err_init_fw:
+        libertas_sbi_unregister_dev(priv);
+err_registerdev:
+        destroy_workqueue(priv->assoc_thread);
+        /* Stop the thread servicing the interrupts */
+        wake_up_interruptible(&priv->mainthread.waitq);
+        wlan_terminate_thread(&priv->mainthread);
+        kfree(priv->adapter);
+err_kmalloc:
+        free_netdev(dev);
+        free_netdev(mesh_dev);
+        wlanpriv = NULL;
+
+        LEAVE();
+        return NULL;
+}
+
+static void wake_pending_cmdnodes(wlan_private *priv)
+{
+        struct cmd_ctrl_node *cmdnode;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->adapter->driver_lock, flags);
+        list_for_each_entry(cmdnode, &priv->adapter->cmdpendingq, list) {
+                cmdnode->cmdwaitqwoken = 1;
+                wake_up_interruptible(&cmdnode->cmdwait_q);
+        }
+        spin_unlock_irqrestore(&priv->adapter->driver_lock, flags);
+}
+
+
+int wlan_remove_card(void *card)
+{
+        wlan_private *priv = libertas_sbi_get_priv(card);
+        wlan_adapter *adapter;
+        struct net_device *dev;
+        struct net_device *mesh_dev;
+        union iwreq_data wrqu;
+        int i;
+
+        ENTER();
+
+        if (!priv) {
+                LEAVE();
+                return 0;
+        }
+
+        adapter = priv->adapter;
+
+        if (!adapter) {
+                LEAVE();
+                return 0;
+        }
+
+        dev = priv->wlan_dev.netdev;
+        mesh_dev = priv->mesh_dev;
+
+        netif_stop_queue(mesh_dev);
+        netif_stop_queue(priv->wlan_dev.netdev);
+        netif_carrier_off(priv->wlan_dev.netdev);
+
+        wake_pending_cmdnodes(priv);
+
+        device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
+        unregister_netdev(mesh_dev);
+        unregister_netdev(dev);
+
+        cancel_delayed_work(&priv->assoc_work);
+        destroy_workqueue(priv->assoc_thread);
+
+        if (adapter->psmode == wlan802_11powermodemax_psp) {
+                adapter->psmode = wlan802_11powermodecam;
+                libertas_ps_wakeup(priv, cmd_option_waitforrsp);
+        }
+
+        memset(wrqu.ap_addr.sa_data, 0xaa, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);
+
+#ifdef ENABLE_PM
+        pm_unregister(wlan_pm_dev);
+#endif
+
+        adapter->surpriseremoved = 1;
+
+        /* Stop the thread servicing the interrupts */
+        wlan_terminate_thread(&priv->mainthread);
+
+        libertas_debugfs_remove_one(priv);
+
+        lbs_pr_debug(1, "Free adapter\n");
+        libertas_free_adapter(priv);
+
+        for (i = 0; i<libertas_found; i++) {
+                if (libertas_devs[i]==priv->wlan_dev.netdev) {
+                        libertas_devs[i] = libertas_devs[--libertas_found];
+                        libertas_devs[libertas_found] = NULL ;
+                        break ;
+                }
+        }
+
+        lbs_pr_debug(1, "Unregister finish\n");
+
+        priv->wlan_dev.netdev = NULL;
+        priv->mesh_dev = NULL ;
+        free_netdev(mesh_dev);
+        free_netdev(dev);
+        wlanpriv = NULL;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function finds the CFP in
+ *  region_cfp_table based on region and band parameter.
+ *
+ *  @param region  The region code
+ *  @param band    The band
+ *  @param cfp_no  A pointer to CFP number
+ *  @return        A pointer to CFP
+ */
+struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *cfp_no)
+{
+        int i, end;
+
+        ENTER();
+
+        end = sizeof(region_cfp_table)/sizeof(struct region_cfp_table);
+
+        for (i = 0; i < end ; i++) {
+                lbs_pr_debug(1, "region_cfp_table[i].region=%d\n",
+                        region_cfp_table[i].region);
+                if (region_cfp_table[i].region == region) {
+                        *cfp_no = region_cfp_table[i].cfp_no_BG;
+                        LEAVE();
+                        return region_cfp_table[i].cfp_BG;
+                }
+        }
+
+        LEAVE();
+        return NULL;
+}
+
+int libertas_set_regiontable(wlan_private * priv, u8 region, u8 band)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int i = 0;
+
+        struct chan_freq_power *cfp;
+        int cfp_no;
+
+        ENTER();
+
+        memset(adapter->region_channel, 0, sizeof(adapter->region_channel));
+
+        {
+                cfp = libertas_get_region_cfp_table(region, band, &cfp_no);
+                if (cfp != NULL) {
+                        adapter->region_channel[i].nrcfp = cfp_no;
+                        adapter->region_channel[i].CFP = cfp;
+                } else {
+                        lbs_pr_debug(1, "wrong region code %#x in band B-G\n",
+                               region);
+                        return -1;
+                }
+                adapter->region_channel[i].valid = 1;
+                adapter->region_channel[i].region = region;
+                adapter->region_channel[i].band = band;
+                i++;
+        }
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function handles the interrupt. it will change PS
+ *  state if applicable. it will wake up main_thread to handle
+ *  the interrupt event as well.
+ *
+ *  @param dev     A pointer to net_device structure
+ *  @return        n/a
+ */
+void libertas_interrupt(struct net_device *dev)
+{
+        wlan_private *priv = dev->priv;
+
+        ENTER();
+
+        lbs_pr_debug(1, "libertas_interrupt: intcounter=%d\n",
+               priv->adapter->intcounter);
+
+        priv->adapter->intcounter++;
+
+        if (priv->adapter->psstate == PS_STATE_SLEEP) {
+                priv->adapter->psstate = PS_STATE_AWAKE;
+                netif_wake_queue(dev);
+        }
+
+        wake_up_interruptible(&priv->mainthread.waitq);
+
+        LEAVE();
+}
+
+static int wlan_init_module(void)
+{
+        int ret = 0;
+
+        ENTER();
+
+        if (libertas_fw_name == NULL) {
+                libertas_fw_name = default_fw_name;
+        }
+
+        libertas_debugfs_init();
+
+        if (libertas_sbi_register()) {
+                ret = -1;
+                libertas_debugfs_remove();
+                goto done;
+        }
+
+done:
+        LEAVE();
+        return ret;
+}
+
+static void wlan_cleanup_module(void)
+{
+        int i;
+
+        ENTER();
+
+        for (i = 0; i<libertas_found; i++) {
+                wlan_private *priv = libertas_devs[i]->priv;
+                reset_device(priv);
+        }
+
+        libertas_sbi_unregister();
+        libertas_debugfs_remove();
+
+        LEAVE();
+}
+
+module_init(wlan_init_module);
+module_exit(wlan_cleanup_module);
+
+MODULE_DESCRIPTION("M-WLAN Driver");
+MODULE_AUTHOR("Marvell International Ltd.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/libertas/radiotap.h
new file mode 100644
index 000000000000..5d118f40cfbc
--- /dev/null
+++ b/drivers/net/wireless/libertas/radiotap.h
@@ -0,0 +1,57 @@
+#include <net/ieee80211_radiotap.h>
+
+struct tx_radiotap_hdr {
+        struct ieee80211_radiotap_header hdr;
+        u8 rate;
+        u8 txpower;
+        u8 rts_retries;
+        u8 data_retries;
+#if 0
+        u8 pad[IEEE80211_RADIOTAP_HDRLEN - 12];
+#endif
+} __attribute__ ((packed));
+
+#define TX_RADIOTAP_PRESENT (                           \
+        (1 << IEEE80211_RADIOTAP_RATE) |                \
+        (1 << IEEE80211_RADIOTAP_DBM_TX_POWER) |        \
+        (1 << IEEE80211_RADIOTAP_RTS_RETRIES) |         \
+        (1 << IEEE80211_RADIOTAP_DATA_RETRIES)  |       \
+        0)
+
+#define IEEE80211_FC_VERSION_MASK    0x0003
+#define IEEE80211_FC_TYPE_MASK       0x000c
+#define IEEE80211_FC_TYPE_MGT        0x0000
+#define IEEE80211_FC_TYPE_CTL        0x0004
+#define IEEE80211_FC_TYPE_DATA       0x0008
+#define IEEE80211_FC_SUBTYPE_MASK    0x00f0
+#define IEEE80211_FC_TOFROMDS_MASK   0x0300
+#define IEEE80211_FC_TODS_MASK       0x0100
+#define IEEE80211_FC_FROMDS_MASK     0x0200
+#define IEEE80211_FC_NODS            0x0000
+#define IEEE80211_FC_TODS            0x0100
+#define IEEE80211_FC_FROMDS          0x0200
+#define IEEE80211_FC_DSTODS          0x0300
+
+struct rx_radiotap_hdr {
+        struct ieee80211_radiotap_header hdr;
+        u8 flags;
+        u8 rate;
+        u16 chan_freq;
+        u16 chan_flags;
+        u8 antenna;
+        u8 antsignal;
+        u16 rx_flags;
+#if 0
+        u8 pad[IEEE80211_RADIOTAP_HDRLEN - 18];
+#endif
+} __attribute__ ((packed));
+
+#define RX_RADIOTAP_PRESENT (                   \
+        (1 << IEEE80211_RADIOTAP_FLAGS) |       \
+        (1 << IEEE80211_RADIOTAP_RATE) |        \
+        (1 << IEEE80211_RADIOTAP_CHANNEL) |     \
+        (1 << IEEE80211_RADIOTAP_ANTENNA) |     \
+        (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) |\
+        (1 << IEEE80211_RADIOTAP_RX_FLAGS) |    \
+        0)
+
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
new file mode 100644
index 000000000000..7e3f78f092dc
--- /dev/null
+++ b/drivers/net/wireless/libertas/rx.c
@@ -0,0 +1,459 @@
+/**
+  * This file contains the handling of RX in wlan driver.
+  */
+#include <linux/etherdevice.h>
+#include <linux/types.h>
+
+#include "hostcmd.h"
+#include "radiotap.h"
+#include "decl.h"
+#include "dev.h"
+#include "wext.h"
+
+struct eth803hdr {
+        u8 dest_addr[6];
+        u8 src_addr[6];
+        u16 h803_len;
+} __attribute__ ((packed));
+
+struct rfc1042hdr {
+        u8 llc_dsap;
+        u8 llc_ssap;
+        u8 llc_ctrl;
+        u8 snap_oui[3];
+        u16 snap_type;
+} __attribute__ ((packed));
+
+struct rxpackethdr {
+        struct rxpd rx_pd;
+        struct eth803hdr eth803_hdr;
+        struct rfc1042hdr rfc1042_hdr;
+} __attribute__ ((packed));
+
+struct rx80211packethdr {
+        struct rxpd rx_pd;
+        void *eth80211_hdr;
+} __attribute__ ((packed));
+
+static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb);
+
+/**
+ *  @brief This function computes the avgSNR .
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @return        avgSNR
+ */
+static u8 wlan_getavgsnr(wlan_private * priv)
+{
+        u8 i;
+        u16 temp = 0;
+        wlan_adapter *adapter = priv->adapter;
+        if (adapter->numSNRNF == 0)
+                return 0;
+        for (i = 0; i < adapter->numSNRNF; i++)
+                temp += adapter->rawSNR[i];
+        return (u8) (temp / adapter->numSNRNF);
+
+}
+
+/**
+ *  @brief This function computes the AvgNF
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @return        AvgNF
+ */
+static u8 wlan_getavgnf(wlan_private * priv)
+{
+        u8 i;
+        u16 temp = 0;
+        wlan_adapter *adapter = priv->adapter;
+        if (adapter->numSNRNF == 0)
+                return 0;
+        for (i = 0; i < adapter->numSNRNF; i++)
+                temp += adapter->rawNF[i];
+        return (u8) (temp / adapter->numSNRNF);
+
+}
+
+/**
+ *  @brief This function save the raw SNR/NF to our internel buffer
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @param prxpd   A pointer to rxpd structure of received packet
+ *  @return        n/a
+ */
+static void wlan_save_rawSNRNF(wlan_private * priv, struct rxpd *p_rx_pd)
+{
+        wlan_adapter *adapter = priv->adapter;
+        if (adapter->numSNRNF < adapter->data_avg_factor)
+                adapter->numSNRNF++;
+        adapter->rawSNR[adapter->nextSNRNF] = p_rx_pd->snr;
+        adapter->rawNF[adapter->nextSNRNF] = p_rx_pd->nf;
+        adapter->nextSNRNF++;
+        if (adapter->nextSNRNF >= adapter->data_avg_factor)
+                adapter->nextSNRNF = 0;
+        return;
+}
+
+/**
+ *  @brief This function computes the RSSI in received packet.
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @param prxpd   A pointer to rxpd structure of received packet
+ *  @return        n/a
+ */
+static void wlan_compute_rssi(wlan_private * priv, struct rxpd *p_rx_pd)
+{
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        lbs_pr_debug(1, "rxpd: SNR = %d, NF = %d\n", p_rx_pd->snr, p_rx_pd->nf);
+        lbs_pr_debug(1, "Before computing SNR: SNR- avg = %d, NF-avg = %d\n",
+               adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
+               adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
+
+        adapter->SNR[TYPE_RXPD][TYPE_NOAVG] = p_rx_pd->snr;
+        adapter->NF[TYPE_RXPD][TYPE_NOAVG] = p_rx_pd->nf;
+        wlan_save_rawSNRNF(priv, p_rx_pd);
+
+        adapter->rxpd_rate = p_rx_pd->rx_rate;
+
+        adapter->SNR[TYPE_RXPD][TYPE_AVG] = wlan_getavgsnr(priv) * AVG_SCALE;
+        adapter->NF[TYPE_RXPD][TYPE_AVG] = wlan_getavgnf(priv) * AVG_SCALE;
+        lbs_pr_debug(1, "After computing SNR: SNR-avg = %d, NF-avg = %d\n",
+               adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
+               adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
+
+        adapter->RSSI[TYPE_RXPD][TYPE_NOAVG] =
+            CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_NOAVG],
+                     adapter->NF[TYPE_RXPD][TYPE_NOAVG]);
+
+        adapter->RSSI[TYPE_RXPD][TYPE_AVG] =
+            CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
+                     adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
+
+        LEAVE();
+}
+
+int libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)
+{
+        lbs_pr_debug(1, "skb->data=%p\n", skb->data);
+
+        if(IS_MESH_FRAME(skb))
+                skb->dev = priv->mesh_dev;
+        else
+                skb->dev = priv->wlan_dev.netdev;
+        skb->protocol = eth_type_trans(skb, priv->wlan_dev.netdev);
+        skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+        netif_rx(skb);
+
+        return 0;
+}
+
+/**
+ *  @brief This function processes received packet and forwards it
+ *  to kernel/upper layer
+ *
+ *  @param priv    A pointer to wlan_private
+ *  @param skb     A pointer to skb which includes the received packet
+ *  @return        0 or -1
+ */
+int libertas_process_rxed_packet(wlan_private * priv, struct sk_buff *skb)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        struct rxpackethdr *p_rx_pkt;
+        struct rxpd *p_rx_pd;
+
+        int hdrchop;
+        struct ethhdr *p_ethhdr;
+
+        const u8 rfc1042_eth_hdr[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+
+        ENTER();
+
+        if (priv->adapter->debugmode & MRVDRV_DEBUG_RX_PATH)
+                lbs_dbg_hex("RX packet: ", skb->data,
+                         min_t(unsigned int, skb->len, 100));
+
+        if (priv->adapter->linkmode == WLAN_LINKMODE_802_11)
+                return process_rxed_802_11_packet(priv, skb);
+
+        p_rx_pkt = (struct rxpackethdr *) skb->data;
+        p_rx_pd = &p_rx_pkt->rx_pd;
+        if (p_rx_pd->rx_control & RxPD_MESH_FRAME)
+                SET_MESH_FRAME(skb);
+        else
+                UNSET_MESH_FRAME(skb);
+
+        lbs_dbg_hex("RX Data: Before chop rxpd", skb->data,
+                 min_t(unsigned int, skb->len, 100));
+
+        if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) {
+                lbs_pr_debug(1, "RX error: FRAME RECEIVED WITH BAD LENGTH\n");
+                priv->stats.rx_length_errors++;
+                ret = 0;
+                goto done;
+        }
+
+        /*
+         * Check rxpd status and update 802.3 stat,
+         */
+        if (!(p_rx_pd->status & MRVDRV_RXPD_STATUS_OK)) {
+                lbs_pr_debug(1, "RX error: frame received with bad status\n");
+                lbs_pr_alert("rxpd Not OK\n");
+                priv->stats.rx_errors++;
+                ret = 0;
+                goto done;
+        }
+
+        lbs_pr_debug(1, "RX Data: skb->len - sizeof(RxPd) = %d - %d = %d\n",
+               skb->len, sizeof(struct rxpd), skb->len - sizeof(struct rxpd));
+
+        lbs_dbg_hex("RX Data: Dest", p_rx_pkt->eth803_hdr.dest_addr,
+                sizeof(p_rx_pkt->eth803_hdr.dest_addr));
+        lbs_dbg_hex("RX Data: Src", p_rx_pkt->eth803_hdr.src_addr,
+                sizeof(p_rx_pkt->eth803_hdr.src_addr));
+
+        if (memcmp(&p_rx_pkt->rfc1042_hdr,
+                   rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr)) == 0) {
+                /*
+                 *  Replace the 803 header and rfc1042 header (llc/snap) with an
+                 *    EthernetII header, keep the src/dst and snap_type (ethertype)
+                 *
+                 *  The firmware only passes up SNAP frames converting
+                 *    all RX Data from 802.11 to 802.2/LLC/SNAP frames.
+                 *
+                 *  To create the Ethernet II, just move the src, dst address right
+                 *    before the snap_type.
+                 */
+                p_ethhdr = (struct ethhdr *)
+                    ((u8 *) & p_rx_pkt->eth803_hdr
+                     + sizeof(p_rx_pkt->eth803_hdr) + sizeof(p_rx_pkt->rfc1042_hdr)
+                     - sizeof(p_rx_pkt->eth803_hdr.dest_addr)
+                     - sizeof(p_rx_pkt->eth803_hdr.src_addr)
+                     - sizeof(p_rx_pkt->rfc1042_hdr.snap_type));
+
+                memcpy(p_ethhdr->h_source, p_rx_pkt->eth803_hdr.src_addr,
+                       sizeof(p_ethhdr->h_source));
+                memcpy(p_ethhdr->h_dest, p_rx_pkt->eth803_hdr.dest_addr,
+                       sizeof(p_ethhdr->h_dest));
+
+                /* Chop off the rxpd + the excess memory from the 802.2/llc/snap header
+                 *   that was removed
+                 */
+                hdrchop = (u8 *) p_ethhdr - (u8 *) p_rx_pkt;
+        } else {
+                lbs_dbg_hex("RX Data: LLC/SNAP",
+                        (u8 *) & p_rx_pkt->rfc1042_hdr,
+                        sizeof(p_rx_pkt->rfc1042_hdr));
+
+                /* Chop off the rxpd */
+                hdrchop = (u8 *) & p_rx_pkt->eth803_hdr - (u8 *) p_rx_pkt;
+        }
+
+        /* Chop off the leading header bytes so the skb points to the start of
+         *   either the reconstructed EthII frame or the 802.2/llc/snap frame
+         */
+        skb_pull(skb, hdrchop);
+
+        /* Take the data rate from the rxpd structure
+         * only if the rate is auto
+         */
+        if (adapter->is_datarate_auto)
+                adapter->datarate = libertas_index_to_data_rate(p_rx_pd->rx_rate);
+
+        wlan_compute_rssi(priv, p_rx_pd);
+
+        lbs_pr_debug(1, "RX Data: size of actual packet = %d\n", skb->len);
+        if (libertas_upload_rx_packet(priv, skb)) {
+                lbs_pr_debug(1, "RX error: libertas_upload_rx_packet"
+                       " returns failure\n");
+                ret = -1;
+                goto done;
+        }
+        priv->stats.rx_bytes += skb->len;
+        priv->stats.rx_packets++;
+
+        ret = 0;
+done:
+        LEAVE();
+
+        return ret;
+}
+
+/**
+ *  @brief This function converts Tx/Rx rates from the Marvell WLAN format
+ *  (see Table 2 in Section 3.1) to IEEE80211_RADIOTAP_RATE units (500 Kb/s)
+ *
+ *  @param rate    Input rate
+ *  @return        Output Rate (0 if invalid)
+ */
+static u8 convert_mv_rate_to_radiotap(u8 rate)
+{
+        switch (rate) {
+        case 0:         /*   1 Mbps */
+                return 2;
+        case 1:         /*   2 Mbps */
+                return 4;
+        case 2:         /* 5.5 Mbps */
+                return 11;
+        case 3:         /*  11 Mbps */
+                return 22;
+        case 4:         /*   6 Mbps */
+                return 12;
+        case 5:         /*   9 Mbps */
+                return 18;
+        case 6:         /*  12 Mbps */
+                return 24;
+        case 7:         /*  18 Mbps */
+                return 36;
+        case 8:         /*  24 Mbps */
+                return 48;
+        case 9:         /*  36 Mbps */
+                return 72;
+        case 10:                /*  48 Mbps */
+                return 96;
+        case 11:                /*  54 Mbps */
+                return 108;
+        }
+        lbs_pr_alert( "Invalid Marvell WLAN rate (%i)\n", rate);
+        return 0;
+}
+
+/**
+ *  @brief This function processes a received 802.11 packet and forwards it
+ *  to kernel/upper layer
+ *
+ *  @param priv    A pointer to wlan_private
+ *  @param skb     A pointer to skb which includes the received packet
+ *  @return        0 or -1
+ */
+static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        struct rx80211packethdr *p_rx_pkt;
+        struct rxpd *prxpd;
+        struct rx_radiotap_hdr radiotap_hdr;
+        struct rx_radiotap_hdr *pradiotap_hdr;
+
+        ENTER();
+
+        p_rx_pkt = (struct rx80211packethdr *) skb->data;
+        prxpd = &p_rx_pkt->rx_pd;
+
+        // lbs_dbg_hex("RX Data: Before chop rxpd", skb->data, min(skb->len, 100));
+
+        if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) {
+                lbs_pr_debug(1, "RX error: FRAME RECEIVED WITH BAD LENGTH\n");
+                priv->stats.rx_length_errors++;
+                ret = 0;
+                goto done;
+        }
+
+        /*
+         * Check rxpd status and update 802.3 stat,
+         */
+        if (!(prxpd->status & MRVDRV_RXPD_STATUS_OK)) {
+                //lbs_pr_debug(1, "RX error: frame received with bad status\n");
+                priv->stats.rx_errors++;
+        }
+
+        lbs_pr_debug(1, "RX Data: skb->len - sizeof(RxPd) = %d - %d = %d\n",
+               skb->len, sizeof(struct rxpd), skb->len - sizeof(struct rxpd));
+
+        /* create the exported radio header */
+        switch (priv->adapter->radiomode) {
+        case WLAN_RADIOMODE_NONE:
+                /* no radio header */
+                /* chop the rxpd */
+                skb_pull(skb, sizeof(struct rxpd));
+                break;
+
+        case WLAN_RADIOMODE_RADIOTAP:
+                /* radiotap header */
+                radiotap_hdr.hdr.it_version = 0;
+                /* XXX must check this value for pad */
+                radiotap_hdr.hdr.it_pad = 0;
+                radiotap_hdr.hdr.it_len = sizeof(struct rx_radiotap_hdr);
+                radiotap_hdr.hdr.it_present = RX_RADIOTAP_PRESENT;
+                /* unknown values */
+                radiotap_hdr.flags = 0;
+                radiotap_hdr.chan_freq = 0;
+                radiotap_hdr.chan_flags = 0;
+                radiotap_hdr.antenna = 0;
+                /* known values */
+                radiotap_hdr.rate = convert_mv_rate_to_radiotap(prxpd->rx_rate);
+                /* XXX must check no carryout */
+                radiotap_hdr.antsignal = prxpd->snr + prxpd->nf;
+                radiotap_hdr.rx_flags = 0;
+                if (!(prxpd->status & MRVDRV_RXPD_STATUS_OK))
+                        radiotap_hdr.rx_flags |= IEEE80211_RADIOTAP_F_RX_BADFCS;
+                //memset(radiotap_hdr.pad, 0x11, IEEE80211_RADIOTAP_HDRLEN - 18);
+
+                // lbs_dbg_hex1("RX radiomode packet BEF: ", skb->data, min(skb->len, 100));
+
+                /* chop the rxpd */
+                skb_pull(skb, sizeof(struct rxpd));
+
+                /* add space for the new radio header */
+                if ((skb_headroom(skb) < sizeof(struct rx_radiotap_hdr)) &&
+                    pskb_expand_head(skb, sizeof(struct rx_radiotap_hdr), 0,
+                                     GFP_ATOMIC)) {
+                        lbs_pr_alert( "%s: couldn't pskb_expand_head\n",
+                               __func__);
+                }
+
+                pradiotap_hdr =
+                    (struct rx_radiotap_hdr *)skb_push(skb,
+                                                     sizeof(struct
+                                                            rx_radiotap_hdr));
+                memcpy(pradiotap_hdr, &radiotap_hdr,
+                       sizeof(struct rx_radiotap_hdr));
+                //lbs_dbg_hex1("RX radiomode packet AFT: ", skb->data, min(skb->len, 100));
+                break;
+
+        default:
+                /* unknown header */
+                lbs_pr_alert( "Unknown radiomode (%i)\n",
+                       priv->adapter->radiomode);
+                /* don't export any header */
+                /* chop the rxpd */
+                skb_pull(skb, sizeof(struct rxpd));
+                break;
+        }
+
+        /* Take the data rate from the rxpd structure
+         * only if the rate is auto
+         */
+        if (adapter->is_datarate_auto) {
+                adapter->datarate = libertas_index_to_data_rate(prxpd->rx_rate);
+        }
+
+        wlan_compute_rssi(priv, prxpd);
+
+        lbs_pr_debug(1, "RX Data: size of actual packet = %d\n", skb->len);
+
+        if (libertas_upload_rx_packet(priv, skb)) {
+                lbs_pr_debug(1, "RX error: libertas_upload_rx_packet "
+                        "returns failure\n");
+                ret = -1;
+                goto done;
+        }
+
+        priv->stats.rx_bytes += skb->len;
+        priv->stats.rx_packets++;
+
+        ret = 0;
+done:
+        LEAVE();
+
+        skb->protocol = __constant_htons(0x0019);       /* ETH_P_80211_RAW */
+
+        return (ret);
+}
diff --git a/drivers/net/wireless/libertas/sbi.h b/drivers/net/wireless/libertas/sbi.h
new file mode 100644
index 000000000000..59d3a59ccef0
--- /dev/null
+++ b/drivers/net/wireless/libertas/sbi.h
@@ -0,0 +1,40 @@
+/**
+  * This file contains IF layer definitions.
+  */
+
+#ifndef _SBI_H_
+#define _SBI_H_
+
+#include <linux/interrupt.h>
+
+#include "defs.h"
+
+/** INT status Bit Definition*/
+#define his_cmddnldrdy                  0x01
+#define his_cardevent                   0x02
+#define his_cmdupldrdy                  0x04
+
+#ifndef DEV_NAME_LEN
+#define DEV_NAME_LEN                    32
+#endif
+
+#define SBI_EVENT_CAUSE_SHIFT           3
+
+/* Probe and Check if the card is present*/
+int libertas_sbi_register_dev(wlan_private * priv);
+int libertas_sbi_unregister_dev(wlan_private *);
+int libertas_sbi_get_int_status(wlan_private * priv, u8 *);
+int libertas_sbi_register(void);
+void libertas_sbi_unregister(void);
+int libertas_sbi_prog_firmware(wlan_private *);
+
+int libertas_sbi_read_event_cause(wlan_private *);
+int libertas_sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb);
+wlan_private *libertas_sbi_get_priv(void *card);
+
+#ifdef ENABLE_PM
+int libertas_sbi_suspend(wlan_private *);
+int libertas_sbi_resume(wlan_private *);
+#endif
+
+#endif                          /* _SBI_H */
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
new file mode 100644
index 000000000000..e18706238951
--- /dev/null
+++ b/drivers/net/wireless/libertas/scan.c
@@ -0,0 +1,2044 @@
+/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vi: set expandtab shiftwidth=4 tabstop=4 textwidth=78: */
+
+/**
+  * Functions implementing wlan scan IOCTL and firmware command APIs
+  *
+  * IOCTL handlers as well as command preperation and response routines
+  *  for sending scan commands to the firmware.
+  */
+#include <linux/ctype.h>
+#include <linux/if.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+
+#include <net/ieee80211.h>
+#include <net/iw_handler.h>
+
+#include "host.h"
+#include "decl.h"
+#include "dev.h"
+#include "scan.h"
+
+//! Approximate amount of data needed to pass a scan result back to iwlist
+#define MAX_SCAN_CELL_SIZE  (IW_EV_ADDR_LEN             \
+                             + IW_ESSID_MAX_SIZE        \
+                             + IW_EV_UINT_LEN           \
+                             + IW_EV_FREQ_LEN           \
+                             + IW_EV_QUAL_LEN           \
+                             + IW_ESSID_MAX_SIZE        \
+                             + IW_EV_PARAM_LEN          \
+                             + 40)      /* 40 for WPAIE */
+
+//! Memory needed to store a max sized channel List TLV for a firmware scan
+#define CHAN_TLV_MAX_SIZE  (sizeof(struct mrvlietypesheader)    \
+                            + (MRVDRV_MAX_CHANNELS_PER_SCAN     \
+                               * sizeof(struct chanscanparamset)))
+
+//! Memory needed to store a max number/size SSID TLV for a firmware scan
+#define SSID_TLV_MAX_SIZE  (1 * sizeof(struct mrvlietypes_ssidparamset))
+
+//! Maximum memory needed for a wlan_scan_cmd_config with all TLVs at max
+#define MAX_SCAN_CFG_ALLOC (sizeof(struct wlan_scan_cmd_config)  \
+                            + sizeof(struct mrvlietypes_numprobes)   \
+                            + CHAN_TLV_MAX_SIZE                 \
+                            + SSID_TLV_MAX_SIZE)
+
+//! The maximum number of channels the firmware can scan per command
+#define MRVDRV_MAX_CHANNELS_PER_SCAN   14
+
+/**
+ * @brief Number of channels to scan per firmware scan command issuance.
+ *
+ *  Number restricted to prevent hitting the limit on the amount of scan data
+ *  returned in a single firmware scan command.
+ */
+#define MRVDRV_CHANNELS_PER_SCAN_CMD   4
+
+//! Scan time specified in the channel TLV for each channel for passive scans
+#define MRVDRV_PASSIVE_SCAN_CHAN_TIME  100
+
+//! Scan time specified in the channel TLV for each channel for active scans
+#define MRVDRV_ACTIVE_SCAN_CHAN_TIME   100
+
+//! Macro to enable/disable SSID checking before storing a scan table
+#ifdef DISCARD_BAD_SSID
+#define CHECK_SSID_IS_VALID(x) ssid_valid(&bssidEntry.ssid)
+#else
+#define CHECK_SSID_IS_VALID(x) 1
+#endif
+
+/**
+ *  @brief Check if a scanned network compatible with the driver settings
+ *
+ *   WEP     WPA     WPA2    ad-hoc  encrypt                      Network
+ * enabled enabled  enabled   AES     mode   privacy  WPA  WPA2  Compatible
+ *    0       0        0       0      NONE      0      0    0   yes No security
+ *    1       0        0       0      NONE      1      0    0   yes Static WEP
+ *    0       1        0       0       x        1x     1    x   yes WPA
+ *    0       0        1       0       x        1x     x    1   yes WPA2
+ *    0       0        0       1      NONE      1      0    0   yes Ad-hoc AES
+ *    0       0        0       0     !=NONE     1      0    0   yes Dynamic WEP
+ *
+ *
+ *  @param adapter A pointer to wlan_adapter
+ *  @param index   Index in scantable to check against current driver settings
+ *  @param mode    Network mode: Infrastructure or IBSS
+ *
+ *  @return        Index in scantable, or error code if negative
+ */
+static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
+{
+        ENTER();
+
+        if (adapter->scantable[index].inframode == mode) {
+                if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+                    && !adapter->secinfo.WPAenabled
+                    && !adapter->secinfo.WPA2enabled
+                    && adapter->scantable[index].wpa_supplicant.wpa_ie[0] !=
+                    WPA_IE
+                    && adapter->scantable[index].wpa2_supplicant.wpa_ie[0] !=
+                    WPA2_IE && adapter->secinfo.Encryptionmode == CIPHER_NONE
+                    && !adapter->scantable[index].privacy) {
+                        /* no security */
+                        LEAVE();
+                        return index;
+                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled
+                           && !adapter->secinfo.WPAenabled
+                           && !adapter->secinfo.WPA2enabled
+                           && adapter->scantable[index].privacy) {
+                        /* static WEP enabled */
+                        LEAVE();
+                        return index;
+                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+                           && adapter->secinfo.WPAenabled
+                           && !adapter->secinfo.WPA2enabled
+                           && (adapter->scantable[index].wpa_supplicant.
+                               wpa_ie[0]
+                               == WPA_IE)
+                           /* privacy bit may NOT be set in some APs like LinkSys WRT54G
+                              && adapter->scantable[index].privacy */
+                    ) {
+                        /* WPA enabled */
+            lbs_pr_debug(1,
+                               "is_network_compatible() WPA: index=%d wpa_ie=%#x "
+                               "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x "
+                               "privacy=%#x\n", index,
+                               adapter->scantable[index].wpa_supplicant.
+                               wpa_ie[0],
+                               adapter->scantable[index].wpa2_supplicant.
+                               wpa_ie[0],
+                               (adapter->secinfo.WEPstatus ==
+                                wlan802_11WEPenabled) ? "e" : "d",
+                               (adapter->secinfo.WPAenabled) ? "e" : "d",
+                               (adapter->secinfo.WPA2enabled) ? "e" : "d",
+                               adapter->secinfo.Encryptionmode,
+                               adapter->scantable[index].privacy);
+                        LEAVE();
+                        return index;
+                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+                           && !adapter->secinfo.WPAenabled
+                           && adapter->secinfo.WPA2enabled
+                           && (adapter->scantable[index].wpa2_supplicant.
+                               wpa_ie[0]
+                               == WPA2_IE)
+                           /* privacy bit may NOT be set in some APs like LinkSys WRT54G
+                              && adapter->scantable[index].privacy */
+                    ) {
+                        /* WPA2 enabled */
+            lbs_pr_debug(1,
+                               "is_network_compatible() WPA2: index=%d wpa_ie=%#x "
+                               "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x "
+                               "privacy=%#x\n", index,
+                               adapter->scantable[index].wpa_supplicant.
+                               wpa_ie[0],
+                               adapter->scantable[index].wpa2_supplicant.
+                               wpa_ie[0],
+                               (adapter->secinfo.WEPstatus ==
+                                wlan802_11WEPenabled) ? "e" : "d",
+                               (adapter->secinfo.WPAenabled) ? "e" : "d",
+                               (adapter->secinfo.WPA2enabled) ? "e" : "d",
+                               adapter->secinfo.Encryptionmode,
+                               adapter->scantable[index].privacy);
+                        LEAVE();
+                        return index;
+                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+                           && !adapter->secinfo.WPAenabled
+                           && !adapter->secinfo.WPA2enabled
+                           && (adapter->scantable[index].wpa_supplicant.
+                               wpa_ie[0]
+                               != WPA_IE)
+                           && (adapter->scantable[index].wpa2_supplicant.
+                               wpa_ie[0]
+                               != WPA2_IE)
+                           && adapter->secinfo.Encryptionmode != CIPHER_NONE
+                           && adapter->scantable[index].privacy) {
+                        /* dynamic WEP enabled */
+            lbs_pr_debug(1,
+                               "is_network_compatible() dynamic WEP: index=%d "
+                               "wpa_ie=%#x wpa2_ie=%#x Encmode=%#x privacy=%#x\n",
+                               index,
+                               adapter->scantable[index].wpa_supplicant.
+                               wpa_ie[0],
+                               adapter->scantable[index].wpa2_supplicant.
+                               wpa_ie[0], adapter->secinfo.Encryptionmode,
+                               adapter->scantable[index].privacy);
+                        LEAVE();
+                        return index;
+                }
+
+                /* security doesn't match */
+        lbs_pr_debug(1,
+                       "is_network_compatible() FAILED: index=%d wpa_ie=%#x "
+                       "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x privacy=%#x\n",
+                       index,
+                       adapter->scantable[index].wpa_supplicant.wpa_ie[0],
+                       adapter->scantable[index].wpa2_supplicant.wpa_ie[0],
+                       (adapter->secinfo.WEPstatus ==
+                        wlan802_11WEPenabled) ? "e" : "d",
+                       (adapter->secinfo.WPAenabled) ? "e" : "d",
+                       (adapter->secinfo.WPA2enabled) ? "e" : "d",
+                       adapter->secinfo.Encryptionmode,
+                       adapter->scantable[index].privacy);
+                LEAVE();
+                return -ECONNREFUSED;
+        }
+
+        /* mode doesn't match */
+        LEAVE();
+        return -ENETUNREACH;
+}
+
+/**
+ *  @brief This function validates a SSID as being able to be printed
+ *
+ *  @param pssid   SSID structure to validate
+ *
+ *  @return        TRUE or FALSE
+ */
+static u8 ssid_valid(struct WLAN_802_11_SSID *pssid)
+{
+        int ssididx;
+
+        for (ssididx = 0; ssididx < pssid->ssidlength; ssididx++) {
+                if (!isprint(pssid->ssid[ssididx])) {
+                        return 0;
+                }
+        }
+
+        return 1;
+}
+
+/**
+ *  @brief Post process the scan table after a new scan command has completed
+ *
+ *  Inspect each entry of the scan table and try to find an entry that
+ *    matches our current associated/joined network from the scan.  If
+ *    one is found, update the stored copy of the bssdescriptor for our
+ *    current network.
+ *
+ *  Debug dump the current scan table contents if compiled accordingly.
+ *
+ *  @param priv   A pointer to wlan_private structure
+ *
+ *  @return       void
+ */
+static void wlan_scan_process_results(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int foundcurrent;
+        int i;
+
+        foundcurrent = 0;
+
+        if (adapter->connect_status == libertas_connected) {
+                /* try to find the current BSSID in the new scan list */
+                for (i = 0; i < adapter->numinscantable; i++) {
+                        if (!libertas_SSID_cmp(&adapter->scantable[i].ssid,
+                                     &adapter->curbssparams.ssid) &&
+                            !memcmp(adapter->curbssparams.bssid,
+                                    adapter->scantable[i].macaddress,
+                                    ETH_ALEN)) {
+                                foundcurrent = 1;
+                        }
+                }
+
+                if (foundcurrent) {
+                        /* Make a copy of current BSSID descriptor */
+                        memcpy(&adapter->curbssparams.bssdescriptor,
+                               &adapter->scantable[i],
+                               sizeof(adapter->curbssparams.bssdescriptor));
+                }
+        }
+
+        for (i = 0; i < adapter->numinscantable; i++) {
+                lbs_pr_debug(1, "Scan:(%02d) %02x:%02x:%02x:%02x:%02x:%02x, "
+                       "RSSI[%03d], SSID[%s]\n",
+                       i,
+                       adapter->scantable[i].macaddress[0],
+                       adapter->scantable[i].macaddress[1],
+                       adapter->scantable[i].macaddress[2],
+                       adapter->scantable[i].macaddress[3],
+                       adapter->scantable[i].macaddress[4],
+                       adapter->scantable[i].macaddress[5],
+                       (s32) adapter->scantable[i].rssi,
+                       adapter->scantable[i].ssid.ssid);
+        }
+}
+
+/**
+ *  @brief Create a channel list for the driver to scan based on region info
+ *
+ *  Use the driver region/band information to construct a comprehensive list
+ *    of channels to scan.  This routine is used for any scan that is not
+ *    provided a specific channel list to scan.
+ *
+ *  @param priv          A pointer to wlan_private structure
+ *  @param scanchanlist  Output parameter: resulting channel list to scan
+ *  @param filteredscan  Flag indicating whether or not a BSSID or SSID filter
+ *                       is being sent in the command to firmware.  Used to
+ *                       increase the number of channels sent in a scan
+ *                       command and to disable the firmware channel scan
+ *                       filter.
+ *
+ *  @return              void
+ */
+static void wlan_scan_create_channel_list(wlan_private * priv,
+                                          struct chanscanparamset * scanchanlist,
+                                          u8 filteredscan)
+{
+
+        wlan_adapter *adapter = priv->adapter;
+        struct region_channel *scanregion;
+        struct chan_freq_power *cfp;
+        int rgnidx;
+        int chanidx;
+        int nextchan;
+        u8 scantype;
+
+        chanidx = 0;
+
+        /* Set the default scan type to the user specified type, will later
+         *   be changed to passive on a per channel basis if restricted by
+         *   regulatory requirements (11d or 11h)
+         */
+        scantype = adapter->scantype;
+
+        for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); rgnidx++) {
+                if (priv->adapter->enable11d &&
+                    adapter->connect_status != libertas_connected) {
+                        /* Scan all the supported chan for the first scan */
+                        if (!adapter->universal_channel[rgnidx].valid)
+                                continue;
+                        scanregion = &adapter->universal_channel[rgnidx];
+
+                        /* clear the parsed_region_chan for the first scan */
+                        memset(&adapter->parsed_region_chan, 0x00,
+                               sizeof(adapter->parsed_region_chan));
+                } else {
+                        if (!adapter->region_channel[rgnidx].valid)
+                                continue;
+                        scanregion = &adapter->region_channel[rgnidx];
+                }
+
+                for (nextchan = 0;
+                     nextchan < scanregion->nrcfp; nextchan++, chanidx++) {
+
+                        cfp = scanregion->CFP + nextchan;
+
+                        if (priv->adapter->enable11d) {
+                                scantype =
+                                    libertas_get_scan_type_11d(cfp->channel,
+                                                           &adapter->
+                                                           parsed_region_chan);
+                        }
+
+                        switch (scanregion->band) {
+                        case BAND_B:
+                        case BAND_G:
+                        default:
+                                scanchanlist[chanidx].radiotype =
+                                    cmd_scan_radio_type_bg;
+                                break;
+                        }
+
+                        if (scantype == cmd_scan_type_passive) {
+                                scanchanlist[chanidx].maxscantime =
+                                    cpu_to_le16
+                                    (MRVDRV_PASSIVE_SCAN_CHAN_TIME);
+                                scanchanlist[chanidx].chanscanmode.passivescan =
+                                    1;
+                        } else {
+                                scanchanlist[chanidx].maxscantime =
+                                    cpu_to_le16
+                                    (MRVDRV_ACTIVE_SCAN_CHAN_TIME);
+                                scanchanlist[chanidx].chanscanmode.passivescan =
+                                    0;
+                        }
+
+                        scanchanlist[chanidx].channumber = cfp->channel;
+
+                        if (filteredscan) {
+                                scanchanlist[chanidx].chanscanmode.
+                                    disablechanfilt = 1;
+                        }
+                }
+        }
+}
+
+/**
+ *  @brief Construct a wlan_scan_cmd_config structure to use in issue scan cmds
+ *
+ *  Application layer or other functions can invoke wlan_scan_networks
+ *    with a scan configuration supplied in a wlan_ioctl_user_scan_cfg struct.
+ *    This structure is used as the basis of one or many wlan_scan_cmd_config
+ *    commands that are sent to the command processing module and sent to
+ *    firmware.
+ *
+ *  Create a wlan_scan_cmd_config based on the following user supplied
+ *    parameters (if present):
+ *             - SSID filter
+ *             - BSSID filter
+ *             - Number of Probes to be sent
+ *             - channel list
+ *
+ *  If the SSID or BSSID filter is not present, disable/clear the filter.
+ *  If the number of probes is not set, use the adapter default setting
+ *  Qualify the channel
+ *
+ *  @param priv             A pointer to wlan_private structure
+ *  @param puserscanin      NULL or pointer to scan configuration parameters
+ *  @param ppchantlvout     Output parameter: Pointer to the start of the
+ *                          channel TLV portion of the output scan config
+ *  @param pscanchanlist    Output parameter: Pointer to the resulting channel
+ *                          list to scan
+ *  @param pmaxchanperscan  Output parameter: Number of channels to scan for
+ *                          each issuance of the firmware scan command
+ *  @param pfilteredscan    Output parameter: Flag indicating whether or not
+ *                          a BSSID or SSID filter is being sent in the
+ *                          command to firmware.  Used to increase the number
+ *                          of channels sent in a scan command and to
+ *                          disable the firmware channel scan filter.
+ *  @param pscancurrentonly Output parameter: Flag indicating whether or not
+ *                          we are only scanning our current active channel
+ *
+ *  @return                 resulting scan configuration
+ */
+static struct wlan_scan_cmd_config *
+wlan_scan_setup_scan_config(wlan_private * priv,
+                            const struct wlan_ioctl_user_scan_cfg * puserscanin,
+                            struct mrvlietypes_chanlistparamset ** ppchantlvout,
+                            struct chanscanparamset * pscanchanlist,
+                            int *pmaxchanperscan,
+                            u8 * pfilteredscan,
+                            u8 * pscancurrentonly)
+{
+        wlan_adapter *adapter = priv->adapter;
+        const u8 zeromac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
+        struct mrvlietypes_numprobes *pnumprobestlv;
+        struct mrvlietypes_ssidparamset *pssidtlv;
+        struct wlan_scan_cmd_config * pscancfgout = NULL;
+        u8 *ptlvpos;
+        u16 numprobes;
+        u16 ssidlen;
+        int chanidx;
+        int scantype;
+        int scandur;
+        int channel;
+        int radiotype;
+
+        pscancfgout = kzalloc(MAX_SCAN_CFG_ALLOC, GFP_KERNEL);
+        if (pscancfgout == NULL)
+                goto out;
+
+        /* The tlvbufferlen is calculated for each scan command.  The TLVs added
+         *   in this routine will be preserved since the routine that sends
+         *   the command will append channelTLVs at *ppchantlvout.  The difference
+         *   between the *ppchantlvout and the tlvbuffer start will be used
+         *   to calculate the size of anything we add in this routine.
+         */
+        pscancfgout->tlvbufferlen = 0;
+
+        /* Running tlv pointer.  Assigned to ppchantlvout at end of function
+         *  so later routines know where channels can be added to the command buf
+         */
+        ptlvpos = pscancfgout->tlvbuffer;
+
+        /*
+         * Set the initial scan paramters for progressive scanning.  If a specific
+         *   BSSID or SSID is used, the number of channels in the scan command
+         *   will be increased to the absolute maximum
+         */
+        *pmaxchanperscan = MRVDRV_CHANNELS_PER_SCAN_CMD;
+
+        /* Initialize the scan as un-filtered by firmware, set to TRUE below if
+         *   a SSID or BSSID filter is sent in the command
+         */
+        *pfilteredscan = 0;
+
+        /* Initialize the scan as not being only on the current channel.  If
+         *   the channel list is customized, only contains one channel, and
+         *   is the active channel, this is set true and data flow is not halted.
+         */
+        *pscancurrentonly = 0;
+
+        if (puserscanin) {
+
+                /* Set the bss type scan filter, use adapter setting if unset */
+                pscancfgout->bsstype =
+                    (puserscanin->bsstype ? puserscanin->bsstype : adapter->
+                     scanmode);
+
+                /* Set the number of probes to send, use adapter setting if unset */
+                numprobes = (puserscanin->numprobes ? puserscanin->numprobes :
+                             adapter->scanprobes);
+
+                /*
+                 * Set the BSSID filter to the incoming configuration,
+                 *   if non-zero.  If not set, it will remain disabled (all zeros).
+                 */
+                memcpy(pscancfgout->specificBSSID,
+                       puserscanin->specificBSSID,
+                       sizeof(pscancfgout->specificBSSID));
+
+                ssidlen = strlen(puserscanin->specificSSID);
+
+                if (ssidlen) {
+                        pssidtlv =
+                            (struct mrvlietypes_ssidparamset *) pscancfgout->
+                            tlvbuffer;
+                        pssidtlv->header.type = cpu_to_le16(TLV_TYPE_SSID);
+                        pssidtlv->header.len = cpu_to_le16(ssidlen);
+                        memcpy(pssidtlv->ssid, puserscanin->specificSSID,
+                               ssidlen);
+                        ptlvpos += sizeof(pssidtlv->header) + ssidlen;
+                }
+
+                /*
+                 *  The default number of channels sent in the command is low to
+                 *    ensure the response buffer from the firmware does not truncate
+                 *    scan results.  That is not an issue with an SSID or BSSID
+                 *    filter applied to the scan results in the firmware.
+                 */
+                if (ssidlen || (memcmp(pscancfgout->specificBSSID,
+                                       &zeromac, sizeof(zeromac)) != 0)) {
+                        *pmaxchanperscan = MRVDRV_MAX_CHANNELS_PER_SCAN;
+                        *pfilteredscan = 1;
+                }
+        } else {
+                pscancfgout->bsstype = adapter->scanmode;
+                numprobes = adapter->scanprobes;
+        }
+
+        /* If the input config or adapter has the number of Probes set, add tlv */
+        if (numprobes) {
+                pnumprobestlv = (struct mrvlietypes_numprobes *) ptlvpos;
+                pnumprobestlv->header.type =
+                    cpu_to_le16(TLV_TYPE_NUMPROBES);
+                pnumprobestlv->header.len = sizeof(pnumprobestlv->numprobes);
+                pnumprobestlv->numprobes = cpu_to_le16(numprobes);
+
+                ptlvpos +=
+                    sizeof(pnumprobestlv->header) + pnumprobestlv->header.len;
+
+                pnumprobestlv->header.len =
+                    cpu_to_le16(pnumprobestlv->header.len);
+        }
+
+        /*
+         * Set the output for the channel TLV to the address in the tlv buffer
+         *   past any TLVs that were added in this fuction (SSID, numprobes).
+         *   channel TLVs will be added past this for each scan command, preserving
+         *   the TLVs that were previously added.
+         */
+        *ppchantlvout = (struct mrvlietypes_chanlistparamset *) ptlvpos;
+
+        if (puserscanin && puserscanin->chanlist[0].channumber) {
+
+                lbs_pr_debug(1, "Scan: Using supplied channel list\n");
+
+                for (chanidx = 0;
+                     chanidx < WLAN_IOCTL_USER_SCAN_CHAN_MAX
+                     && puserscanin->chanlist[chanidx].channumber; chanidx++) {
+
+                        channel = puserscanin->chanlist[chanidx].channumber;
+                        (pscanchanlist + chanidx)->channumber = channel;
+
+                        radiotype = puserscanin->chanlist[chanidx].radiotype;
+                        (pscanchanlist + chanidx)->radiotype = radiotype;
+
+                        scantype = puserscanin->chanlist[chanidx].scantype;
+
+                        if (scantype == cmd_scan_type_passive) {
+                                (pscanchanlist +
+                                 chanidx)->chanscanmode.passivescan = 1;
+                        } else {
+                                (pscanchanlist +
+                                 chanidx)->chanscanmode.passivescan = 0;
+                        }
+
+                        if (puserscanin->chanlist[chanidx].scantime) {
+                                scandur =
+                                    puserscanin->chanlist[chanidx].scantime;
+                        } else {
+                                if (scantype == cmd_scan_type_passive) {
+                                        scandur = MRVDRV_PASSIVE_SCAN_CHAN_TIME;
+                                } else {
+                                        scandur = MRVDRV_ACTIVE_SCAN_CHAN_TIME;
+                                }
+                        }
+
+                        (pscanchanlist + chanidx)->minscantime =
+                            cpu_to_le16(scandur);
+                        (pscanchanlist + chanidx)->maxscantime =
+                            cpu_to_le16(scandur);
+                }
+
+                /* Check if we are only scanning the current channel */
+                if ((chanidx == 1) && (puserscanin->chanlist[0].channumber
+                                       ==
+                                       priv->adapter->curbssparams.channel)) {
+                        *pscancurrentonly = 1;
+                        lbs_pr_debug(1, "Scan: Scanning current channel only");
+                }
+
+        } else {
+                lbs_pr_debug(1, "Scan: Creating full region channel list\n");
+                wlan_scan_create_channel_list(priv, pscanchanlist,
+                                              *pfilteredscan);
+        }
+
+out:
+        return pscancfgout;
+}
+
+/**
+ *  @brief Construct and send multiple scan config commands to the firmware
+ *
+ *  Previous routines have created a wlan_scan_cmd_config with any requested
+ *   TLVs.  This function splits the channel TLV into maxchanperscan lists
+ *   and sends the portion of the channel TLV along with the other TLVs
+ *   to the wlan_cmd routines for execution in the firmware.
+ *
+ *  @param priv            A pointer to wlan_private structure
+ *  @param maxchanperscan  Maximum number channels to be included in each
+ *                         scan command sent to firmware
+ *  @param filteredscan    Flag indicating whether or not a BSSID or SSID
+ *                         filter is being used for the firmware command
+ *                         scan command sent to firmware
+ *  @param pscancfgout     Scan configuration used for this scan.
+ *  @param pchantlvout     Pointer in the pscancfgout where the channel TLV
+ *                         should start.  This is past any other TLVs that
+ *                         must be sent down in each firmware command.
+ *  @param pscanchanlist   List of channels to scan in maxchanperscan segments
+ *
+ *  @return                0 or error return otherwise
+ */
+static int wlan_scan_channel_list(wlan_private * priv,
+                                  int maxchanperscan,
+                                  u8 filteredscan,
+                                  struct wlan_scan_cmd_config * pscancfgout,
+                                  struct mrvlietypes_chanlistparamset * pchantlvout,
+                                  struct chanscanparamset * pscanchanlist)
+{
+        struct chanscanparamset *ptmpchan;
+        struct chanscanparamset *pstartchan;
+        u8 scanband;
+        int doneearly;
+        int tlvidx;
+        int ret = 0;
+
+        ENTER();
+
+        if (pscancfgout == 0 || pchantlvout == 0 || pscanchanlist == 0) {
+                lbs_pr_debug(1, "Scan: Null detect: %p, %p, %p\n",
+                       pscancfgout, pchantlvout, pscanchanlist);
+                return -1;
+        }
+
+        pchantlvout->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
+
+        /* Set the temp channel struct pointer to the start of the desired list */
+        ptmpchan = pscanchanlist;
+
+        /* Loop through the desired channel list, sending a new firmware scan
+         *   commands for each maxchanperscan channels (or for 1,6,11 individually
+         *   if configured accordingly)
+         */
+        while (ptmpchan->channumber) {
+
+                tlvidx = 0;
+                pchantlvout->header.len = 0;
+                scanband = ptmpchan->radiotype;
+                pstartchan = ptmpchan;
+                doneearly = 0;
+
+                /* Construct the channel TLV for the scan command.  Continue to
+                 *  insert channel TLVs until:
+                 *    - the tlvidx hits the maximum configured per scan command
+                 *    - the next channel to insert is 0 (end of desired channel list)
+                 *    - doneearly is set (controlling individual scanning of 1,6,11)
+                 */
+                while (tlvidx < maxchanperscan && ptmpchan->channumber
+                       && !doneearly) {
+
+            lbs_pr_debug(1,
+                    "Scan: Chan(%3d), Radio(%d), mode(%d,%d), Dur(%d)\n",
+                ptmpchan->channumber, ptmpchan->radiotype,
+                ptmpchan->chanscanmode.passivescan,
+                ptmpchan->chanscanmode.disablechanfilt,
+                ptmpchan->maxscantime);
+
+                        /* Copy the current channel TLV to the command being prepared */
+                        memcpy(pchantlvout->chanscanparam + tlvidx,
+                               ptmpchan, sizeof(pchantlvout->chanscanparam));
+
+                        /* Increment the TLV header length by the size appended */
+                        pchantlvout->header.len +=
+                            sizeof(pchantlvout->chanscanparam);
+
+                        /*
+                         *  The tlv buffer length is set to the number of bytes of the
+                         *    between the channel tlv pointer and the start of the
+                         *    tlv buffer.  This compensates for any TLVs that were appended
+                         *    before the channel list.
+                         */
+                        pscancfgout->tlvbufferlen = ((u8 *) pchantlvout
+                                                     - pscancfgout->tlvbuffer);
+
+                        /*  Add the size of the channel tlv header and the data length */
+                        pscancfgout->tlvbufferlen +=
+                            (sizeof(pchantlvout->header)
+                             + pchantlvout->header.len);
+
+                        /* Increment the index to the channel tlv we are constructing */
+                        tlvidx++;
+
+                        doneearly = 0;
+
+                        /* Stop the loop if the *current* channel is in the 1,6,11 set
+                         *   and we are not filtering on a BSSID or SSID.
+                         */
+                        if (!filteredscan && (ptmpchan->channumber == 1
+                                              || ptmpchan->channumber == 6
+                                              || ptmpchan->channumber == 11)) {
+                                doneearly = 1;
+                        }
+
+                        /* Increment the tmp pointer to the next channel to be scanned */
+                        ptmpchan++;
+
+                        /* Stop the loop if the *next* channel is in the 1,6,11 set.
+                         *  This will cause it to be the only channel scanned on the next
+                         *  interation
+                         */
+                        if (!filteredscan && (ptmpchan->channumber == 1
+                                              || ptmpchan->channumber == 6
+                                              || ptmpchan->channumber == 11)) {
+                                doneearly = 1;
+                        }
+                }
+
+                /* Send the scan command to the firmware with the specified cfg */
+                ret = libertas_prepare_and_send_command(priv, cmd_802_11_scan, 0,
+                                            0, 0, pscancfgout);
+        }
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Internal function used to start a scan based on an input config
+ *
+ *  Use the input user scan configuration information when provided in
+ *    order to send the appropriate scan commands to firmware to populate or
+ *    update the internal driver scan table
+ *
+ *  @param priv          A pointer to wlan_private structure
+ *  @param puserscanin   Pointer to the input configuration for the requested
+ *                       scan.
+ *
+ *  @return              0 or < 0 if error
+ */
+int wlan_scan_networks(wlan_private * priv,
+                              const struct wlan_ioctl_user_scan_cfg * puserscanin)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct mrvlietypes_chanlistparamset *pchantlvout;
+        struct chanscanparamset * scan_chan_list = NULL;
+        struct wlan_scan_cmd_config * scan_cfg = NULL;
+        u8 keeppreviousscan;
+        u8 filteredscan;
+        u8 scancurrentchanonly;
+        int maxchanperscan;
+        int ret;
+
+        ENTER();
+
+        scan_chan_list = kzalloc(sizeof(struct chanscanparamset) *
+                                WLAN_IOCTL_USER_SCAN_CHAN_MAX, GFP_KERNEL);
+        if (scan_chan_list == NULL) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        scan_cfg = wlan_scan_setup_scan_config(priv,
+                                               puserscanin,
+                                               &pchantlvout,
+                                               scan_chan_list,
+                                               &maxchanperscan,
+                                               &filteredscan,
+                                               &scancurrentchanonly);
+        if (scan_cfg == NULL) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        keeppreviousscan = 0;
+
+        if (puserscanin) {
+                keeppreviousscan = puserscanin->keeppreviousscan;
+        }
+
+        if (!keeppreviousscan) {
+                memset(adapter->scantable, 0x00,
+                       sizeof(struct bss_descriptor) * MRVDRV_MAX_BSSID_LIST);
+                adapter->numinscantable = 0;
+        }
+
+        /* Keep the data path active if we are only scanning our current channel */
+        if (!scancurrentchanonly) {
+                netif_stop_queue(priv->wlan_dev.netdev);
+                netif_carrier_off(priv->wlan_dev.netdev);
+        }
+
+        ret = wlan_scan_channel_list(priv,
+                                     maxchanperscan,
+                                     filteredscan,
+                                     scan_cfg,
+                                     pchantlvout,
+                                     scan_chan_list);
+
+        /*  Process the resulting scan table:
+         *    - Remove any bad ssids
+         *    - Update our current BSS information from scan data
+         */
+        wlan_scan_process_results(priv);
+
+        if (priv->adapter->connect_status == libertas_connected) {
+                netif_carrier_on(priv->wlan_dev.netdev);
+                netif_wake_queue(priv->wlan_dev.netdev);
+        }
+
+out:
+        if (scan_cfg)
+                kfree(scan_cfg);
+
+        if (scan_chan_list)
+                kfree(scan_chan_list);
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Inspect the scan response buffer for pointers to expected TLVs
+ *
+ *  TLVs can be included at the end of the scan response BSS information.
+ *    Parse the data in the buffer for pointers to TLVs that can potentially
+ *    be passed back in the response
+ *
+ *  @param ptlv        Pointer to the start of the TLV buffer to parse
+ *  @param tlvbufsize  size of the TLV buffer
+ *  @param ptsftlv     Output parameter: Pointer to the TSF TLV if found
+ *
+ *  @return            void
+ */
+static
+void wlan_ret_802_11_scan_get_tlv_ptrs(struct mrvlietypes_data * ptlv,
+                                       int tlvbufsize,
+                                       struct mrvlietypes_tsftimestamp ** ptsftlv)
+{
+        struct mrvlietypes_data *pcurrenttlv;
+        int tlvbufleft;
+        u16 tlvtype;
+        u16 tlvlen;
+
+        pcurrenttlv = ptlv;
+        tlvbufleft = tlvbufsize;
+        *ptsftlv = NULL;
+
+        lbs_pr_debug(1, "SCAN_RESP: tlvbufsize = %d\n", tlvbufsize);
+        lbs_dbg_hex("SCAN_RESP: TLV Buf", (u8 *) ptlv, tlvbufsize);
+
+        while (tlvbufleft >= sizeof(struct mrvlietypesheader)) {
+                tlvtype = le16_to_cpu(pcurrenttlv->header.type);
+                tlvlen = le16_to_cpu(pcurrenttlv->header.len);
+
+                switch (tlvtype) {
+                case TLV_TYPE_TSFTIMESTAMP:
+                        *ptsftlv = (struct mrvlietypes_tsftimestamp *) pcurrenttlv;
+                        break;
+
+                default:
+                        lbs_pr_debug(1, "SCAN_RESP: Unhandled TLV = %d\n",
+                               tlvtype);
+                        /* Give up, this seems corrupted */
+                        return;
+                }               /* switch */
+
+                tlvbufleft -= (sizeof(ptlv->header) + tlvlen);
+                pcurrenttlv =
+                    (struct mrvlietypes_data *) (pcurrenttlv->Data + tlvlen);
+        }                       /* while */
+}
+
+/**
+ *  @brief Interpret a BSS scan response returned from the firmware
+ *
+ *  Parse the various fixed fields and IEs passed back for a a BSS probe
+ *   response or beacon from the scan command.  Record information as needed
+ *   in the scan table struct bss_descriptor for that entry.
+ *
+ *  @param pBSSIDEntry  Output parameter: Pointer to the BSS Entry
+ *
+ *  @return             0 or -1
+ */
+static int InterpretBSSDescriptionWithIE(struct bss_descriptor * pBSSEntry,
+                                         u8 ** pbeaconinfo, int *bytesleft)
+{
+        enum ieeetypes_elementid elemID;
+        struct ieeetypes_fhparamset *pFH;
+        struct ieeetypes_dsparamset *pDS;
+        struct ieeetypes_cfparamset *pCF;
+        struct ieeetypes_ibssparamset *pibss;
+        struct ieeetypes_capinfo *pcap;
+        struct WLAN_802_11_FIXED_IEs fixedie;
+        u8 *pcurrentptr;
+        u8 *pRate;
+        u8 elemlen;
+        u8 bytestocopy;
+        u8 ratesize;
+        u16 beaconsize;
+        u8 founddatarateie;
+        int bytesleftforcurrentbeacon;
+
+        struct WPA_SUPPLICANT *pwpa_supplicant;
+        struct WPA_SUPPLICANT *pwpa2_supplicant;
+        struct IE_WPA *pIe;
+        const u8 oui01[4] = { 0x00, 0x50, 0xf2, 0x01 };
+
+        struct ieeetypes_countryinfoset *pcountryinfo;
+
+        ENTER();
+
+        founddatarateie = 0;
+        ratesize = 0;
+        beaconsize = 0;
+
+        if (*bytesleft >= sizeof(beaconsize)) {
+                /* Extract & convert beacon size from the command buffer */
+                memcpy(&beaconsize, *pbeaconinfo, sizeof(beaconsize));
+                beaconsize = le16_to_cpu(beaconsize);
+                *bytesleft -= sizeof(beaconsize);
+                *pbeaconinfo += sizeof(beaconsize);
+        }
+
+        if (beaconsize == 0 || beaconsize > *bytesleft) {
+
+                *pbeaconinfo += *bytesleft;
+                *bytesleft = 0;
+
+                return -1;
+        }
+
+        /* Initialize the current working beacon pointer for this BSS iteration */
+        pcurrentptr = *pbeaconinfo;
+
+        /* Advance the return beacon pointer past the current beacon */
+        *pbeaconinfo += beaconsize;
+        *bytesleft -= beaconsize;
+
+        bytesleftforcurrentbeacon = beaconsize;
+
+        pwpa_supplicant = &pBSSEntry->wpa_supplicant;
+        pwpa2_supplicant = &pBSSEntry->wpa2_supplicant;
+
+        memcpy(pBSSEntry->macaddress, pcurrentptr, ETH_ALEN);
+        lbs_pr_debug(1, "InterpretIE: AP MAC Addr-%x:%x:%x:%x:%x:%x\n",
+               pBSSEntry->macaddress[0], pBSSEntry->macaddress[1],
+               pBSSEntry->macaddress[2], pBSSEntry->macaddress[3],
+               pBSSEntry->macaddress[4], pBSSEntry->macaddress[5]);
+
+        pcurrentptr += ETH_ALEN;
+        bytesleftforcurrentbeacon -= ETH_ALEN;
+
+        if (bytesleftforcurrentbeacon < 12) {
+                lbs_pr_debug(1, "InterpretIE: Not enough bytes left\n");
+                return -1;
+        }
+
+        /*
+         * next 4 fields are RSSI, time stamp, beacon interval,
+         *   and capability information
+         */
+
+        /* RSSI is 1 byte long */
+        pBSSEntry->rssi = le32_to_cpu((long)(*pcurrentptr));
+        lbs_pr_debug(1, "InterpretIE: RSSI=%02X\n", *pcurrentptr);
+        pcurrentptr += 1;
+        bytesleftforcurrentbeacon -= 1;
+
+        /* time stamp is 8 bytes long */
+        memcpy(fixedie.timestamp, pcurrentptr, 8);
+        memcpy(pBSSEntry->timestamp, pcurrentptr, 8);
+        pcurrentptr += 8;
+        bytesleftforcurrentbeacon -= 8;
+
+        /* beacon interval is 2 bytes long */
+        memcpy(&fixedie.beaconinterval, pcurrentptr, 2);
+        pBSSEntry->beaconperiod = le16_to_cpu(fixedie.beaconinterval);
+        pcurrentptr += 2;
+        bytesleftforcurrentbeacon -= 2;
+
+        /* capability information is 2 bytes long */
+        memcpy(&fixedie.capabilities, pcurrentptr, 2);
+        lbs_pr_debug(1, "InterpretIE: fixedie.capabilities=0x%X\n",
+               fixedie.capabilities);
+        fixedie.capabilities = le16_to_cpu(fixedie.capabilities);
+        pcap = (struct ieeetypes_capinfo *) & fixedie.capabilities;
+        memcpy(&pBSSEntry->cap, pcap, sizeof(struct ieeetypes_capinfo));
+        pcurrentptr += 2;
+        bytesleftforcurrentbeacon -= 2;
+
+        /* rest of the current buffer are IE's */
+        lbs_pr_debug(1, "InterpretIE: IElength for this AP = %d\n",
+               bytesleftforcurrentbeacon);
+
+        lbs_dbg_hex("InterpretIE: IE info", (u8 *) pcurrentptr,
+                bytesleftforcurrentbeacon);
+
+        if (pcap->privacy) {
+                lbs_pr_debug(1, "InterpretIE: AP WEP enabled\n");
+                pBSSEntry->privacy = wlan802_11privfilter8021xWEP;
+        } else {
+                pBSSEntry->privacy = wlan802_11privfilteracceptall;
+        }
+
+        if (pcap->ibss == 1) {
+                pBSSEntry->inframode = wlan802_11ibss;
+        } else {
+                pBSSEntry->inframode = wlan802_11infrastructure;
+        }
+
+        /* process variable IE */
+        while (bytesleftforcurrentbeacon >= 2) {
+                elemID = (enum ieeetypes_elementid) (*((u8 *) pcurrentptr));
+                elemlen = *((u8 *) pcurrentptr + 1);
+
+                if (bytesleftforcurrentbeacon < elemlen) {
+                        lbs_pr_debug(1, "InterpretIE: error in processing IE, "
+                               "bytes left < IE length\n");
+                        bytesleftforcurrentbeacon = 0;
+                        continue;
+                }
+
+                switch (elemID) {
+
+                case SSID:
+                        pBSSEntry->ssid.ssidlength = elemlen;
+                        memcpy(pBSSEntry->ssid.ssid, (pcurrentptr + 2),
+                               elemlen);
+                        lbs_pr_debug(1, "ssid: %32s", pBSSEntry->ssid.ssid);
+                        break;
+
+                case SUPPORTED_RATES:
+                        memcpy(pBSSEntry->datarates, (pcurrentptr + 2),
+                               elemlen);
+                        memmove(pBSSEntry->libertas_supported_rates, (pcurrentptr + 2),
+                                elemlen);
+                        ratesize = elemlen;
+                        founddatarateie = 1;
+                        break;
+
+                case EXTRA_IE:
+                        lbs_pr_debug(1, "InterpretIE: EXTRA_IE Found!\n");
+                        pBSSEntry->extra_ie = 1;
+                        break;
+
+                case FH_PARAM_SET:
+                        pFH = (struct ieeetypes_fhparamset *) pcurrentptr;
+                        memmove(&pBSSEntry->phyparamset.fhparamset, pFH,
+                                sizeof(struct ieeetypes_fhparamset));
+                        pBSSEntry->phyparamset.fhparamset.dwelltime
+                            =
+                            le16_to_cpu(pBSSEntry->phyparamset.fhparamset.
+                                             dwelltime);
+                        break;
+
+                case DS_PARAM_SET:
+                        pDS = (struct ieeetypes_dsparamset *) pcurrentptr;
+
+                        pBSSEntry->channel = pDS->currentchan;
+
+                        memcpy(&pBSSEntry->phyparamset.dsparamset, pDS,
+                               sizeof(struct ieeetypes_dsparamset));
+                        break;
+
+                case CF_PARAM_SET:
+                        pCF = (struct ieeetypes_cfparamset *) pcurrentptr;
+
+                        memcpy(&pBSSEntry->ssparamset.cfparamset, pCF,
+                               sizeof(struct ieeetypes_cfparamset));
+                        break;
+
+                case IBSS_PARAM_SET:
+                        pibss = (struct ieeetypes_ibssparamset *) pcurrentptr;
+                        pBSSEntry->atimwindow =
+                            le32_to_cpu(pibss->atimwindow);
+
+                        memmove(&pBSSEntry->ssparamset.ibssparamset, pibss,
+                                sizeof(struct ieeetypes_ibssparamset));
+
+                        pBSSEntry->ssparamset.ibssparamset.atimwindow
+                            =
+                            le16_to_cpu(pBSSEntry->ssparamset.ibssparamset.
+                                             atimwindow);
+                        break;
+
+                        /* Handle Country Info IE */
+                case COUNTRY_INFO:
+                        pcountryinfo =
+                            (struct ieeetypes_countryinfoset *) pcurrentptr;
+
+                        if (pcountryinfo->len <
+                            sizeof(pcountryinfo->countrycode)
+                            || pcountryinfo->len > 254) {
+                                lbs_pr_debug(1, "InterpretIE: 11D- Err "
+                                       "CountryInfo len =%d min=%d max=254\n",
+                                       pcountryinfo->len,
+                                       sizeof(pcountryinfo->countrycode));
+                                LEAVE();
+                                return -1;
+                        }
+
+                        memcpy(&pBSSEntry->countryinfo,
+                               pcountryinfo, pcountryinfo->len + 2);
+                        lbs_dbg_hex("InterpretIE: 11D- CountryInfo:",
+                                (u8 *) pcountryinfo,
+                                (u32) (pcountryinfo->len + 2));
+                        break;
+
+                case EXTENDED_SUPPORTED_RATES:
+                        /*
+                         * only process extended supported rate
+                         * if data rate is already found.
+                         * data rate IE should come before
+                         * extended supported rate IE
+                         */
+                        if (founddatarateie) {
+                                if ((elemlen + ratesize) > WLAN_SUPPORTED_RATES) {
+                                        bytestocopy =
+                                            (WLAN_SUPPORTED_RATES - ratesize);
+                                } else {
+                                        bytestocopy = elemlen;
+                                }
+
+                                pRate = (u8 *) pBSSEntry->datarates;
+                                pRate += ratesize;
+                                memmove(pRate, (pcurrentptr + 2), bytestocopy);
+
+                                pRate = (u8 *) pBSSEntry->libertas_supported_rates;
+
+                                pRate += ratesize;
+                                memmove(pRate, (pcurrentptr + 2), bytestocopy);
+                        }
+                        break;
+
+                case VENDOR_SPECIFIC_221:
+#define IE_ID_LEN_FIELDS_BYTES 2
+                        pIe = (struct IE_WPA *)pcurrentptr;
+
+                        if (!memcmp(pIe->oui, oui01, sizeof(oui01))) {
+                                pwpa_supplicant->wpa_ie_len
+                                    = min_t(size_t, elemlen + IE_ID_LEN_FIELDS_BYTES,
+                                          sizeof(pwpa_supplicant->wpa_ie));
+                                memcpy(pwpa_supplicant->wpa_ie,
+                                       pcurrentptr,
+                                       pwpa_supplicant->wpa_ie_len);
+                                lbs_dbg_hex("InterpretIE: Resp WPA_IE",
+                                        pwpa_supplicant->wpa_ie, elemlen);
+                        }
+                        break;
+                case WPA2_IE:
+                        pIe = (struct IE_WPA *)pcurrentptr;
+                        pwpa2_supplicant->wpa_ie_len
+                            = min_t(size_t, elemlen + IE_ID_LEN_FIELDS_BYTES,
+                                  sizeof(pwpa2_supplicant->wpa_ie));
+                        memcpy(pwpa2_supplicant->wpa_ie,
+                               pcurrentptr, pwpa2_supplicant->wpa_ie_len);
+
+                        lbs_dbg_hex("InterpretIE: Resp WPA2_IE",
+                                pwpa2_supplicant->wpa_ie, elemlen);
+                        break;
+                case TIM:
+                        break;
+
+                case CHALLENGE_TEXT:
+                        break;
+                }
+
+                pcurrentptr += elemlen + 2;
+
+                /* need to account for IE ID and IE len */
+                bytesleftforcurrentbeacon -= (elemlen + 2);
+
+        }                       /* while (bytesleftforcurrentbeacon > 2) */
+
+        return 0;
+}
+
+/**
+ *  @brief Compare two SSIDs
+ *
+ *  @param ssid1    A pointer to ssid to compare
+ *  @param ssid2    A pointer to ssid to compare
+ *
+ *  @return         0--ssid is same, otherwise is different
+ */
+int libertas_SSID_cmp(struct WLAN_802_11_SSID *ssid1, struct WLAN_802_11_SSID *ssid2)
+{
+        if (!ssid1 || !ssid2)
+                return -1;
+
+        if (ssid1->ssidlength != ssid2->ssidlength)
+                return -1;
+
+        return memcmp(ssid1->ssid, ssid2->ssid, ssid1->ssidlength);
+}
+
+/**
+ *  @brief This function finds a specific compatible BSSID in the scan list
+ *
+ *  @param adapter  A pointer to wlan_adapter
+ *  @param bssid    BSSID to find in the scan list
+ *  @param mode     Network mode: Infrastructure or IBSS
+ *
+ *  @return         index in BSSID list, or error return code (< 0)
+ */
+int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, int mode)
+{
+        int ret = -ENETUNREACH;
+        int i;
+
+        if (!bssid)
+                return -EFAULT;
+
+        lbs_pr_debug(1, "FindBSSID: Num of BSSIDs = %d\n",
+               adapter->numinscantable);
+
+        /* Look through the scan table for a compatible match. The ret return
+         *   variable will be equal to the index in the scan table (greater
+         *   than zero) if the network is compatible.  The loop will continue
+         *   past a matched bssid that is not compatible in case there is an
+         *   AP with multiple SSIDs assigned to the same BSSID
+         */
+        for (i = 0; ret < 0 && i < adapter->numinscantable; i++) {
+                if (!memcmp(adapter->scantable[i].macaddress, bssid, ETH_ALEN)) {
+                        switch (mode) {
+                        case wlan802_11infrastructure:
+                        case wlan802_11ibss:
+                                ret = is_network_compatible(adapter, i, mode);
+                                break;
+                        default:
+                                ret = i;
+                                break;
+                        }
+                }
+        }
+
+        return ret;
+}
+
+/**
+ *  @brief This function finds ssid in ssid list.
+ *
+ *  @param adapter  A pointer to wlan_adapter
+ *  @param ssid     SSID to find in the list
+ *  @param bssid    BSSID to qualify the SSID selection (if provided)
+ *  @param mode     Network mode: Infrastructure or IBSS
+ *
+ *  @return         index in BSSID list
+ */
+int libertas_find_SSID_in_list(wlan_adapter * adapter,
+                   struct WLAN_802_11_SSID *ssid, u8 * bssid, int mode)
+{
+        int net = -ENETUNREACH;
+        u8 bestrssi = 0;
+        int i;
+        int j;
+
+        lbs_pr_debug(1, "Num of Entries in Table = %d\n", adapter->numinscantable);
+
+        for (i = 0; i < adapter->numinscantable; i++) {
+                if (!libertas_SSID_cmp(&adapter->scantable[i].ssid, ssid) &&
+                    (!bssid ||
+                     !memcmp(adapter->scantable[i].
+                             macaddress, bssid, ETH_ALEN))) {
+                        switch (mode) {
+                        case wlan802_11infrastructure:
+                        case wlan802_11ibss:
+                                j = is_network_compatible(adapter, i, mode);
+
+                                if (j >= 0) {
+                                        if (bssid) {
+                                                return i;
+                                        }
+
+                                        if (SCAN_RSSI
+                                            (adapter->scantable[i].rssi)
+                                            > bestrssi) {
+                                                bestrssi =
+                                                    SCAN_RSSI(adapter->
+                                                              scantable[i].
+                                                              rssi);
+                                                net = i;
+                                        }
+                                } else {
+                                        if (net == -ENETUNREACH) {
+                                                net = j;
+                                        }
+                                }
+                                break;
+                        case wlan802_11autounknown:
+                        default:
+                                if (SCAN_RSSI(adapter->scantable[i].rssi)
+                                    > bestrssi) {
+                                        bestrssi =
+                                            SCAN_RSSI(adapter->scantable[i].
+                                                      rssi);
+                                        net = i;
+                                }
+                                break;
+                        }
+                }
+        }
+
+        return net;
+}
+
+/**
+ *  @brief This function finds the best SSID in the Scan List
+ *
+ *  Search the scan table for the best SSID that also matches the current
+ *   adapter network preference (infrastructure or adhoc)
+ *
+ *  @param adapter  A pointer to wlan_adapter
+ *
+ *  @return         index in BSSID list
+ */
+int libertas_find_best_SSID_in_list(wlan_adapter * adapter,
+                                    enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode)
+{
+        int bestnet = -ENETUNREACH;
+        u8 bestrssi = 0;
+        int i;
+
+        ENTER();
+
+        lbs_pr_debug(1, "Num of BSSIDs = %d\n", adapter->numinscantable);
+
+        for (i = 0; i < adapter->numinscantable; i++) {
+                switch (mode) {
+                case wlan802_11infrastructure:
+                case wlan802_11ibss:
+                        if (is_network_compatible(adapter, i, mode) >= 0) {
+                                if (SCAN_RSSI(adapter->scantable[i].rssi) >
+                                    bestrssi) {
+                                        bestrssi =
+                                            SCAN_RSSI(adapter->scantable[i].
+                                                      rssi);
+                                        bestnet = i;
+                                }
+                        }
+                        break;
+                case wlan802_11autounknown:
+                default:
+                        if (SCAN_RSSI(adapter->scantable[i].rssi) > bestrssi) {
+                                bestrssi =
+                                    SCAN_RSSI(adapter->scantable[i].rssi);
+                                bestnet = i;
+                        }
+                        break;
+                }
+        }
+
+        LEAVE();
+        return bestnet;
+}
+
+/**
+ *  @brief Find the AP with specific ssid in the scan list
+ *
+ *  @param priv         A pointer to wlan_private structure
+ *  @param pSSID        A pointer to AP's ssid
+ *
+ *  @return             0--success, otherwise--fail
+ */
+int libertas_find_best_network_SSID(wlan_private * priv,
+                                    struct WLAN_802_11_SSID *pSSID,
+                                    enum WLAN_802_11_NETWORK_INFRASTRUCTURE preferred_mode,
+                                    enum WLAN_802_11_NETWORK_INFRASTRUCTURE *out_mode)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct bss_descriptor *preqbssid;
+        int i;
+
+        ENTER();
+
+        memset(pSSID, 0, sizeof(struct WLAN_802_11_SSID));
+
+        wlan_scan_networks(priv, NULL);
+        if (adapter->surpriseremoved)
+                return -1;
+        wait_event_interruptible(adapter->cmd_pending, !adapter->nr_cmd_pending);
+
+        i = libertas_find_best_SSID_in_list(adapter, preferred_mode);
+        if (i < 0) {
+                ret = -1;
+                goto out;
+        }
+
+        preqbssid = &adapter->scantable[i];
+        memcpy(pSSID, &preqbssid->ssid,
+               sizeof(struct WLAN_802_11_SSID));
+        *out_mode = preqbssid->inframode;
+
+        if (!pSSID->ssidlength) {
+                ret = -1;
+        }
+
+out:
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Scan Network
+ *
+ *  @param dev          A pointer to net_device structure
+ *  @param info         A pointer to iw_request_info structure
+ *  @param vwrq         A pointer to iw_param structure
+ *  @param extra        A pointer to extra data buf
+ *
+ *  @return             0 --success, otherwise fail
+ */
+int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
+                  struct iw_param *vwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        union iwreq_data wrqu;
+
+        ENTER();
+
+        if (!wlan_scan_networks(priv, NULL)) {
+                memset(&wrqu, 0, sizeof(union iwreq_data));
+                wireless_send_event(priv->wlan_dev.netdev, SIOCGIWSCAN, &wrqu,
+                                    NULL);
+        }
+
+        if (adapter->surpriseremoved)
+                return -1;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief Send a scan command for all available channels filtered on a spec
+ *
+ *  @param priv             A pointer to wlan_private structure
+ *  @param prequestedssid   A pointer to AP's ssid
+ *  @param keeppreviousscan Flag used to save/clear scan table before scan
+ *
+ *  @return                0-success, otherwise fail
+ */
+int libertas_send_specific_SSID_scan(wlan_private * priv,
+                         struct WLAN_802_11_SSID *prequestedssid,
+                         u8 keeppreviousscan)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct wlan_ioctl_user_scan_cfg scancfg;
+
+        ENTER();
+
+        if (prequestedssid == NULL) {
+                return -1;
+        }
+
+        memset(&scancfg, 0x00, sizeof(scancfg));
+
+        memcpy(scancfg.specificSSID, prequestedssid->ssid,
+               prequestedssid->ssidlength);
+        scancfg.keeppreviousscan = keeppreviousscan;
+
+        wlan_scan_networks(priv, &scancfg);
+        if (adapter->surpriseremoved)
+                return -1;
+        wait_event_interruptible(adapter->cmd_pending, !adapter->nr_cmd_pending);
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief scan an AP with specific BSSID
+ *
+ *  @param priv             A pointer to wlan_private structure
+ *  @param bssid            A pointer to AP's bssid
+ *  @param keeppreviousscan Flag used to save/clear scan table before scan
+ *
+ *  @return          0-success, otherwise fail
+ */
+int libertas_send_specific_BSSID_scan(wlan_private * priv, u8 * bssid, u8 keeppreviousscan)
+{
+        struct wlan_ioctl_user_scan_cfg scancfg;
+
+        ENTER();
+
+        if (bssid == NULL) {
+                return -1;
+        }
+
+        memset(&scancfg, 0x00, sizeof(scancfg));
+        memcpy(scancfg.specificBSSID, bssid, sizeof(scancfg.specificBSSID));
+        scancfg.keeppreviousscan = keeppreviousscan;
+
+        wlan_scan_networks(priv, &scancfg);
+        if (priv->adapter->surpriseremoved)
+                return -1;
+        wait_event_interruptible(priv->adapter->cmd_pending,
+                !priv->adapter->nr_cmd_pending);
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief  Retrieve the scan table entries via wireless tools IOCTL call
+ *
+ *  @param dev          A pointer to net_device structure
+ *  @param info         A pointer to iw_request_info structure
+ *  @param dwrq         A pointer to iw_point structure
+ *  @param extra        A pointer to extra data buf
+ *
+ *  @return             0 --success, otherwise fail
+ */
+int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
+                  struct iw_point *dwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        char *current_ev = extra;
+        char *end_buf = extra + IW_SCAN_MAX_DATA;
+        struct chan_freq_power *cfp;
+        struct bss_descriptor *pscantable;
+        char *current_val;      /* For rates */
+        struct iw_event iwe;    /* Temporary buffer */
+        int i;
+        int j;
+        int rate;
+#define PERFECT_RSSI ((u8)50)
+#define WORST_RSSI   ((u8)0)
+#define RSSI_DIFF    ((u8)(PERFECT_RSSI - WORST_RSSI))
+        u8 rssi;
+
+        u8 buf[16 + 256 * 2];
+        u8 *ptr;
+
+        ENTER();
+
+        /*
+         * if there's either commands in the queue or one being
+         * processed return -EAGAIN for iwlist to retry later.
+         */
+    if (adapter->nr_cmd_pending)
+                return -EAGAIN;
+
+        if (adapter->connect_status == libertas_connected)
+                lbs_pr_debug(1, "Current ssid: %32s\n",
+                       adapter->curbssparams.ssid.ssid);
+
+        lbs_pr_debug(1, "Scan: Get: numinscantable = %d\n",
+               adapter->numinscantable);
+
+        /* The old API using SIOCGIWAPLIST had a hard limit of IW_MAX_AP.
+         * The new API using SIOCGIWSCAN is only limited by buffer size
+         * WE-14 -> WE-16 the buffer is limited to IW_SCAN_MAX_DATA bytes
+         * which is 4096.
+         */
+        for (i = 0; i < adapter->numinscantable; i++) {
+                if ((current_ev + MAX_SCAN_CELL_SIZE) >= end_buf) {
+                        lbs_pr_debug(1, "i=%d break out: current_ev=%p end_buf=%p "
+                               "MAX_SCAN_CELL_SIZE=%d\n",
+                               i, current_ev, end_buf, MAX_SCAN_CELL_SIZE);
+                        break;
+                }
+
+                pscantable = &adapter->scantable[i];
+
+                lbs_pr_debug(1, "i=%d  ssid: %32s\n", i, pscantable->ssid.ssid);
+
+                cfp =
+                    libertas_find_cfp_by_band_and_channel(adapter, 0,
+                                                 pscantable->channel);
+                if (!cfp) {
+                        lbs_pr_debug(1, "Invalid channel number %d\n",
+                               pscantable->channel);
+                        continue;
+                }
+
+                if (!ssid_valid(&adapter->scantable[i].ssid)) {
+                        continue;
+                }
+
+                /* 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,
+                       &adapter->scantable[i].macaddress, ETH_ALEN);
+
+                iwe.len = IW_EV_ADDR_LEN;
+                current_ev =
+                    iwe_stream_add_event(current_ev, end_buf, &iwe, iwe.len);
+
+                //Add the ESSID
+                iwe.u.data.length = adapter->scantable[i].ssid.ssidlength;
+
+                if (iwe.u.data.length > 32) {
+                        iwe.u.data.length = 32;
+                }
+
+                iwe.cmd = SIOCGIWESSID;
+                iwe.u.data.flags = 1;
+                iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  adapter->scantable[i].ssid.
+                                                  ssid);
+
+                //Add mode
+                iwe.cmd = SIOCGIWMODE;
+                iwe.u.mode = adapter->scantable[i].inframode + 1;
+                iwe.len = IW_EV_UINT_LEN;
+                current_ev =
+                    iwe_stream_add_event(current_ev, end_buf, &iwe, iwe.len);
+
+                //frequency
+                iwe.cmd = SIOCGIWFREQ;
+                iwe.u.freq.m = (long)cfp->freq * 100000;
+                iwe.u.freq.e = 1;
+                iwe.len = IW_EV_FREQ_LEN;
+                current_ev =
+                    iwe_stream_add_event(current_ev, end_buf, &iwe, iwe.len);
+
+                /* Add quality statistics */
+                iwe.cmd = IWEVQUAL;
+                iwe.u.qual.updated = IW_QUAL_ALL_UPDATED;
+                iwe.u.qual.level = SCAN_RSSI(adapter->scantable[i].rssi);
+
+                rssi = iwe.u.qual.level - MRVDRV_NF_DEFAULT_SCAN_VALUE;
+                iwe.u.qual.qual =
+                    (100 * RSSI_DIFF * RSSI_DIFF - (PERFECT_RSSI - rssi) *
+                     (15 * (RSSI_DIFF) + 62 * (PERFECT_RSSI - rssi))) /
+                    (RSSI_DIFF * RSSI_DIFF);
+                if (iwe.u.qual.qual > 100)
+                        iwe.u.qual.qual = 100;
+                else if (iwe.u.qual.qual < 1)
+                        iwe.u.qual.qual = 0;
+
+                if (adapter->NF[TYPE_BEACON][TYPE_NOAVG] == 0) {
+                        iwe.u.qual.noise = MRVDRV_NF_DEFAULT_SCAN_VALUE;
+                } else {
+                        iwe.u.qual.noise =
+                            CAL_NF(adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
+                }
+                if ((adapter->inframode == wlan802_11ibss) &&
+                    !libertas_SSID_cmp(&adapter->curbssparams.ssid,
+                             &adapter->scantable[i].ssid)
+                    && adapter->adhoccreate) {
+                        ret = libertas_prepare_and_send_command(priv,
+                                                    cmd_802_11_rssi,
+                                                    0,
+                                                    cmd_option_waitforrsp,
+                                                    0, NULL);
+
+                        if (!ret) {
+                                iwe.u.qual.level =
+                                    CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_AVG] /
+                                             AVG_SCALE,
+                                             adapter->NF[TYPE_RXPD][TYPE_AVG] /
+                                             AVG_SCALE);
+                        }
+                }
+                iwe.len = IW_EV_QUAL_LEN;
+                current_ev =
+                    iwe_stream_add_event(current_ev, end_buf, &iwe, iwe.len);
+
+                /* Add encryption capability */
+                iwe.cmd = SIOCGIWENCODE;
+                if (adapter->scantable[i].privacy) {
+                        iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+                } else {
+                        iwe.u.data.flags = IW_ENCODE_DISABLED;
+                }
+                iwe.u.data.length = 0;
+                iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  adapter->scantable->ssid.
+                                                  ssid);
+
+                current_val = current_ev + IW_EV_LCP_LEN;
+
+                iwe.cmd = SIOCGIWRATE;
+
+                iwe.u.bitrate.fixed = 0;
+                iwe.u.bitrate.disabled = 0;
+                iwe.u.bitrate.value = 0;
+
+                /* Bit rate given in 500 kb/s units (+ 0x80) */
+                for (j = 0; j < sizeof(adapter->scantable[i].libertas_supported_rates);
+                     j++) {
+                        if (adapter->scantable[i].libertas_supported_rates[j] == 0) {
+                                break;
+                        }
+                        rate =
+                            (adapter->scantable[i].libertas_supported_rates[j] & 0x7F) *
+                            500000;
+                        if (rate > iwe.u.bitrate.value) {
+                                iwe.u.bitrate.value = rate;
+                        }
+
+                        iwe.u.bitrate.value =
+                            (adapter->scantable[i].libertas_supported_rates[j]
+                             & 0x7f) * 500000;
+                        iwe.len = IW_EV_PARAM_LEN;
+                        current_ev =
+                            iwe_stream_add_value(current_ev, current_val,
+                                                 end_buf, &iwe, iwe.len);
+
+                }
+                if ((adapter->scantable[i].inframode == wlan802_11ibss)
+                    && !libertas_SSID_cmp(&adapter->curbssparams.ssid,
+                                &adapter->scantable[i].ssid)
+                    && adapter->adhoccreate) {
+                        iwe.u.bitrate.value = 22 * 500000;
+                }
+                iwe.len = IW_EV_PARAM_LEN;
+                current_ev =
+                    iwe_stream_add_value(current_ev, current_val, end_buf, &iwe,
+                                         iwe.len);
+
+                /* Add new value to event */
+                current_val = current_ev + IW_EV_LCP_LEN;
+
+                if (adapter->scantable[i].wpa2_supplicant.wpa_ie[0] == WPA2_IE) {
+                        memset(&iwe, 0, sizeof(iwe));
+                        memset(buf, 0, sizeof(buf));
+                        memcpy(buf, adapter->scantable[i].
+                                                wpa2_supplicant.wpa_ie,
+                                        adapter->scantable[i].wpa2_supplicant.
+                                                wpa_ie_len);
+                        iwe.cmd = IWEVGENIE;
+                        iwe.u.data.length = adapter->scantable[i].
+                                        wpa2_supplicant.wpa_ie_len;
+                        iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+                        current_ev = iwe_stream_add_point(current_ev, end_buf,
+                                        &iwe, buf);
+                }
+                if (adapter->scantable[i].wpa_supplicant.wpa_ie[0] == WPA_IE) {
+                        memset(&iwe, 0, sizeof(iwe));
+                        memset(buf, 0, sizeof(buf));
+                        memcpy(buf, adapter->scantable[i].
+                                                wpa_supplicant.wpa_ie,
+                                        adapter->scantable[i].wpa_supplicant.
+                                                wpa_ie_len);
+                        iwe.cmd = IWEVGENIE;
+                        iwe.u.data.length = adapter->scantable[i].
+                                        wpa_supplicant.wpa_ie_len;
+                        iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+                        current_ev = iwe_stream_add_point(current_ev, end_buf,
+                                        &iwe, buf);
+                }
+
+
+                if (adapter->scantable[i].extra_ie != 0) {
+                        memset(&iwe, 0, sizeof(iwe));
+                        memset(buf, 0, sizeof(buf));
+                        ptr = buf;
+                        ptr += sprintf(ptr, "extra_ie");
+                        iwe.u.data.length = strlen(buf);
+
+                        lbs_pr_debug(1, "iwe.u.data.length %d\n",
+                               iwe.u.data.length);
+                        lbs_pr_debug(1, "BUF: %s \n", buf);
+
+                        iwe.cmd = IWEVCUSTOM;
+                        iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+                        current_ev =
+                            iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                 buf);
+                }
+
+                current_val = current_ev + IW_EV_LCP_LEN;
+
+                /*
+                 * Check if we added any event
+                 */
+                if ((current_val - current_ev) > IW_EV_LCP_LEN)
+                        current_ev = current_val;
+        }
+
+        dwrq->length = (current_ev - extra);
+        dwrq->flags = 0;
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief Prepare a scan command to be sent to the firmware
+ *
+ *  Use the wlan_scan_cmd_config sent to the command processing module in
+ *   the libertas_prepare_and_send_command to configure a cmd_ds_802_11_scan command
+ *   struct to send to firmware.
+ *
+ *  The fixed fields specifying the BSS type and BSSID filters as well as a
+ *   variable number/length of TLVs are sent in the command to firmware.
+ *
+ *  @param priv       A pointer to wlan_private structure
+ *  @param cmd        A pointer to cmd_ds_command structure to be sent to
+ *                    firmware with the cmd_DS_801_11_SCAN structure
+ *  @param pdata_buf  Void pointer cast of a wlan_scan_cmd_config struct used
+ *                    to set the fields/TLVs for the command sent to firmware
+ *
+ *  @return           0 or -1
+ *
+ *  @sa wlan_scan_create_channel_list
+ */
+int libertas_cmd_80211_scan(wlan_private * priv,
+                         struct cmd_ds_command *cmd, void *pdata_buf)
+{
+        struct cmd_ds_802_11_scan *pscan = &cmd->params.scan;
+        struct wlan_scan_cmd_config *pscancfg;
+
+        ENTER();
+
+        pscancfg = pdata_buf;
+
+        /* Set fixed field variables in scan command */
+        pscan->bsstype = pscancfg->bsstype;
+        memcpy(pscan->BSSID, pscancfg->specificBSSID, sizeof(pscan->BSSID));
+        memcpy(pscan->tlvbuffer, pscancfg->tlvbuffer, pscancfg->tlvbufferlen);
+
+        cmd->command = cpu_to_le16(cmd_802_11_scan);
+
+        /* size is equal to the sizeof(fixed portions) + the TLV len + header */
+        cmd->size = cpu_to_le16(sizeof(pscan->bsstype)
+                                     + sizeof(pscan->BSSID)
+                                     + pscancfg->tlvbufferlen + S_DS_GEN);
+
+        lbs_pr_debug(1, "SCAN_CMD: command=%x, size=%x, seqnum=%x\n",
+               cmd->command, cmd->size, cmd->seqnum);
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief This function handles the command response of scan
+ *
+ *   The response buffer for the scan command has the following
+ *      memory layout:
+ *
+ *     .-----------------------------------------------------------.
+ *     |  header (4 * sizeof(u16)):  Standard command response hdr |
+ *     .-----------------------------------------------------------.
+ *     |  bufsize (u16) : sizeof the BSS Description data          |
+ *     .-----------------------------------------------------------.
+ *     |  NumOfSet (u8) : Number of BSS Descs returned             |
+ *     .-----------------------------------------------------------.
+ *     |  BSSDescription data (variable, size given in bufsize)    |
+ *     .-----------------------------------------------------------.
+ *     |  TLV data (variable, size calculated using header->size,  |
+ *     |            bufsize and sizeof the fixed fields above)     |
+ *     .-----------------------------------------------------------.
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @param resp    A pointer to cmd_ds_command
+ *
+ *  @return        0 or -1
+ */
+int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct cmd_ds_802_11_scan_rsp *pscan;
+        struct bss_descriptor newbssentry;
+        struct mrvlietypes_data *ptlv;
+        struct mrvlietypes_tsftimestamp *ptsftlv;
+        u8 *pbssinfo;
+        u16 scanrespsize;
+        int bytesleft;
+        int numintable;
+        int bssIdx;
+        int idx;
+        int tlvbufsize;
+        u64 tsfval;
+
+        ENTER();
+
+        pscan = &resp->params.scanresp;
+
+        if (pscan->nr_sets > MRVDRV_MAX_BSSID_LIST) {
+        lbs_pr_debug(1,
+                       "SCAN_RESP: Invalid number of AP returned (%d)!!\n",
+                       pscan->nr_sets);
+                LEAVE();
+                return -1;
+        }
+
+        bytesleft = le16_to_cpu(pscan->bssdescriptsize);
+        lbs_pr_debug(1, "SCAN_RESP: bssdescriptsize %d\n", bytesleft);
+
+        scanrespsize = le16_to_cpu(resp->size);
+        lbs_pr_debug(1, "SCAN_RESP: returned %d AP before parsing\n",
+               pscan->nr_sets);
+
+        numintable = adapter->numinscantable;
+        pbssinfo = pscan->bssdesc_and_tlvbuffer;
+
+        /* The size of the TLV buffer is equal to the entire command response
+         *   size (scanrespsize) minus the fixed fields (sizeof()'s), the
+         *   BSS Descriptions (bssdescriptsize as bytesLef) and the command
+         *   response header (S_DS_GEN)
+         */
+        tlvbufsize = scanrespsize - (bytesleft + sizeof(pscan->bssdescriptsize)
+                                     + sizeof(pscan->nr_sets)
+                                     + S_DS_GEN);
+
+        ptlv = (struct mrvlietypes_data *) (pscan->bssdesc_and_tlvbuffer + bytesleft);
+
+        /* Search the TLV buffer space in the scan response for any valid TLVs */
+        wlan_ret_802_11_scan_get_tlv_ptrs(ptlv, tlvbufsize, &ptsftlv);
+
+        /*
+         *  Process each scan response returned (pscan->nr_sets).  Save
+         *    the information in the newbssentry and then insert into the
+         *    driver scan table either as an update to an existing entry
+         *    or as an addition at the end of the table
+         */
+        for (idx = 0; idx < pscan->nr_sets && bytesleft; idx++) {
+                /* Zero out the newbssentry we are about to store info in */
+                memset(&newbssentry, 0x00, sizeof(newbssentry));
+
+                /* Process the data fields and IEs returned for this BSS */
+                if ((InterpretBSSDescriptionWithIE(&newbssentry,
+                                                   &pbssinfo,
+                                                   &bytesleft) ==
+                     0)
+                    && CHECK_SSID_IS_VALID(&newbssentry.ssid)) {
+
+            lbs_pr_debug(1,
+                               "SCAN_RESP: BSSID = %02x:%02x:%02x:%02x:%02x:%02x\n",
+                               newbssentry.macaddress[0],
+                               newbssentry.macaddress[1],
+                               newbssentry.macaddress[2],
+                               newbssentry.macaddress[3],
+                               newbssentry.macaddress[4],
+                               newbssentry.macaddress[5]);
+
+                        /*
+                         * Search the scan table for the same bssid
+                         */
+                        for (bssIdx = 0; bssIdx < numintable; bssIdx++) {
+                                if (memcmp(newbssentry.macaddress,
+                                           adapter->scantable[bssIdx].
+                                           macaddress,
+                                           sizeof(newbssentry.macaddress)) ==
+                                    0) {
+                                        /*
+                                         * If the SSID matches as well, it is a duplicate of
+                                         *   this entry.  Keep the bssIdx set to this
+                                         *   entry so we replace the old contents in the table
+                                         */
+                                        if ((newbssentry.ssid.ssidlength ==
+                                             adapter->scantable[bssIdx].ssid.
+                                             ssidlength)
+                                            &&
+                                            (memcmp
+                                             (newbssentry.ssid.ssid,
+                                              adapter->scantable[bssIdx].ssid.
+                                              ssid,
+                                              newbssentry.ssid.ssidlength) ==
+                                             0)) {
+                        lbs_pr_debug(1,
+                                                       "SCAN_RESP: Duplicate of index: %d\n",
+                                                       bssIdx);
+                                                break;
+                                        }
+                                }
+                        }
+                        /*
+                         * If the bssIdx is equal to the number of entries in the table,
+                         *   the new entry was not a duplicate; append it to the scan
+                         *   table
+                         */
+                        if (bssIdx == numintable) {
+                                /* Range check the bssIdx, keep it limited to the last entry */
+                                if (bssIdx == MRVDRV_MAX_BSSID_LIST) {
+                                        bssIdx--;
+                                } else {
+                                        numintable++;
+                                }
+                        }
+
+                        /*
+                         * If the TSF TLV was appended to the scan results, save the
+                         *   this entries TSF value in the networktsf field.  The
+                         *   networktsf is the firmware's TSF value at the time the
+                         *   beacon or probe response was received.
+                         */
+                        if (ptsftlv) {
+                                memcpy(&tsfval, &ptsftlv->tsftable[idx],
+                                       sizeof(tsfval));
+                                tsfval = le64_to_cpu(tsfval);
+
+                                memcpy(&newbssentry.networktsf,
+                                       &tsfval, sizeof(newbssentry.networktsf));
+                        }
+
+                        /* Copy the locally created newbssentry to the scan table */
+                        memcpy(&adapter->scantable[bssIdx],
+                               &newbssentry,
+                               sizeof(adapter->scantable[bssIdx]));
+
+                } else {
+
+                        /* error parsing/interpreting the scan response, skipped */
+                        lbs_pr_debug(1, "SCAN_RESP: "
+                               "InterpretBSSDescriptionWithIE returned ERROR\n");
+                }
+        }
+
+        lbs_pr_debug(1, "SCAN_RESP: Scanned %2d APs, %d valid, %d total\n",
+               pscan->nr_sets, numintable - adapter->numinscantable,
+               numintable);
+
+        /* Update the total number of BSSIDs in the scan table */
+        adapter->numinscantable = numintable;
+
+        LEAVE();
+        return 0;
+}
diff --git a/drivers/net/wireless/libertas/scan.h b/drivers/net/wireless/libertas/scan.h
new file mode 100644
index 000000000000..d93aa7fa44fd
--- /dev/null
+++ b/drivers/net/wireless/libertas/scan.h
@@ -0,0 +1,216 @@
+/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vi: set expandtab shiftwidth=4 tabstop=4 textwidth=78: */
+
+/**
+  * Interface for the wlan network scan routines
+  *
+  * Driver interface functions and type declarations for the scan module
+  *   implemented in wlan_scan.c.
+  */
+#ifndef _WLAN_SCAN_H
+#define _WLAN_SCAN_H
+
+#include "hostcmd.h"
+
+/**
+ *  @brief Maximum number of channels that can be sent in a setuserscan ioctl
+ *
+ *  @sa wlan_ioctl_user_scan_cfg
+ */
+#define WLAN_IOCTL_USER_SCAN_CHAN_MAX  50
+
+//! Infrastructure BSS scan type in wlan_scan_cmd_config
+#define WLAN_SCAN_BSS_TYPE_BSS         1
+
+//! Adhoc BSS scan type in wlan_scan_cmd_config
+#define WLAN_SCAN_BSS_TYPE_IBSS        2
+
+//! Adhoc or Infrastructure BSS scan type in wlan_scan_cmd_config, no filter
+#define WLAN_SCAN_BSS_TYPE_ANY         3
+
+/**
+ * @brief Structure used internally in the wlan driver to configure a scan.
+ *
+ * Sent to the command processing module to configure the firmware
+ *   scan command prepared by libertas_cmd_80211_scan.
+ *
+ * @sa wlan_scan_networks
+ *
+ */
+struct wlan_scan_cmd_config {
+    /**
+     *  @brief BSS type to be sent in the firmware command
+     *
+     *  Field can be used to restrict the types of networks returned in the
+     *    scan.  valid settings are:
+     *
+     *   - WLAN_SCAN_BSS_TYPE_BSS  (infrastructure)
+     *   - WLAN_SCAN_BSS_TYPE_IBSS (adhoc)
+     *   - WLAN_SCAN_BSS_TYPE_ANY  (unrestricted, adhoc and infrastructure)
+     */
+        u8 bsstype;
+
+    /**
+     *  @brief Specific BSSID used to filter scan results in the firmware
+     */
+        u8 specificBSSID[ETH_ALEN];
+
+    /**
+     *  @brief length of TLVs sent in command starting at tlvBuffer
+     */
+        int tlvbufferlen;
+
+    /**
+     *  @brief SSID TLV(s) and ChanList TLVs to be sent in the firmware command
+     *
+     *  @sa TLV_TYPE_CHANLIST, mrvlietypes_chanlistparamset_t
+     *  @sa TLV_TYPE_SSID, mrvlietypes_ssidparamset_t
+     */
+        u8 tlvbuffer[1];        //!< SSID TLV(s) and ChanList TLVs are stored here
+};
+
+/**
+ *  @brief IOCTL channel sub-structure sent in wlan_ioctl_user_scan_cfg
+ *
+ *  Multiple instances of this structure are included in the IOCTL command
+ *   to configure a instance of a scan on the specific channel.
+ */
+struct wlan_ioctl_user_scan_chan {
+        u8 channumber;          //!< channel Number to scan
+        u8 radiotype;           //!< Radio type: 'B/G' band = 0, 'A' band = 1
+        u8 scantype;            //!< Scan type: Active = 0, Passive = 1
+        u16 scantime;           //!< Scan duration in milliseconds; if 0 default used
+};
+
+/**
+ *  @brief IOCTL input structure to configure an immediate scan cmd to firmware
+ *
+ *  Used in the setuserscan (WLAN_SET_USER_SCAN) private ioctl.  Specifies
+ *   a number of parameters to be used in general for the scan as well
+ *   as a channel list (wlan_ioctl_user_scan_chan) for each scan period
+ *   desired.
+ *
+ *  @sa libertas_set_user_scan_ioctl
+ */
+struct wlan_ioctl_user_scan_cfg {
+
+    /**
+     *  @brief Flag set to keep the previous scan table intact
+     *
+     *  If set, the scan results will accumulate, replacing any previous
+     *   matched entries for a BSS with the new scan data
+     */
+        u8 keeppreviousscan;    //!< Do not erase the existing scan results
+
+    /**
+     *  @brief BSS type to be sent in the firmware command
+     *
+     *  Field can be used to restrict the types of networks returned in the
+     *    scan.  valid settings are:
+     *
+     *   - WLAN_SCAN_BSS_TYPE_BSS  (infrastructure)
+     *   - WLAN_SCAN_BSS_TYPE_IBSS (adhoc)
+     *   - WLAN_SCAN_BSS_TYPE_ANY  (unrestricted, adhoc and infrastructure)
+     */
+        u8 bsstype;
+
+    /**
+     *  @brief Configure the number of probe requests for active chan scans
+     */
+        u8 numprobes;
+
+    /**
+     *  @brief BSSID filter sent in the firmware command to limit the results
+     */
+        u8 specificBSSID[ETH_ALEN];
+
+    /**
+     *  @brief SSID filter sent in the firmware command to limit the results
+     */
+        char specificSSID[IW_ESSID_MAX_SIZE + 1];
+
+    /**
+     *  @brief Variable number (fixed maximum) of channels to scan up
+     */
+        struct wlan_ioctl_user_scan_chan chanlist[WLAN_IOCTL_USER_SCAN_CHAN_MAX];
+};
+
+/**
+ *  @brief Structure used to store information for each beacon/probe response
+ */
+struct bss_descriptor {
+        u8 macaddress[ETH_ALEN];
+
+        struct WLAN_802_11_SSID ssid;
+
+        /* WEP encryption requirement */
+        u32 privacy;
+
+        /* receive signal strength in dBm */
+        long rssi;
+
+        u32 channel;
+
+        u16 beaconperiod;
+
+        u32 atimwindow;
+
+        enum WLAN_802_11_NETWORK_INFRASTRUCTURE inframode;
+        u8 libertas_supported_rates[WLAN_SUPPORTED_RATES];
+
+        int extra_ie;
+
+        u8 timestamp[8];        //!< TSF value included in the beacon/probe response
+        union ieeetypes_phyparamset phyparamset;
+        union IEEEtypes_ssparamset ssparamset;
+        struct ieeetypes_capinfo cap;
+        u8 datarates[WLAN_SUPPORTED_RATES];
+
+        __le64 networktsf;              //!< TSF timestamp from the current firmware TSF
+
+        struct ieeetypes_countryinfofullset countryinfo;
+
+        struct WPA_SUPPLICANT wpa_supplicant;
+        struct WPA_SUPPLICANT wpa2_supplicant;
+
+};
+
+extern int libertas_SSID_cmp(struct WLAN_802_11_SSID *ssid1,
+                   struct WLAN_802_11_SSID *ssid2);
+extern int libertas_find_SSID_in_list(wlan_adapter * adapter, struct WLAN_802_11_SSID *ssid,
+                          u8 * bssid, int mode);
+int libertas_find_best_SSID_in_list(wlan_adapter * adapter, enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode);
+extern int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, int mode);
+
+int libertas_find_best_network_SSID(wlan_private * priv,
+                        struct WLAN_802_11_SSID *pSSID,
+                        enum WLAN_802_11_NETWORK_INFRASTRUCTURE preferred_mode,
+                        enum WLAN_802_11_NETWORK_INFRASTRUCTURE *out_mode);
+
+extern int libertas_send_specific_SSID_scan(wlan_private * priv,
+                                struct WLAN_802_11_SSID *prequestedssid,
+                                u8 keeppreviousscan);
+extern int libertas_send_specific_BSSID_scan(wlan_private * priv,
+                                 u8 * bssid, u8 keeppreviousscan);
+
+extern int libertas_cmd_80211_scan(wlan_private * priv,
+                                struct cmd_ds_command *cmd,
+                                void *pdata_buf);
+
+extern int libertas_ret_80211_scan(wlan_private * priv,
+                                struct cmd_ds_command *resp);
+
+int wlan_scan_networks(wlan_private * priv,
+                const struct wlan_ioctl_user_scan_cfg * puserscanin);
+
+struct ifreq;
+
+struct iw_point;
+struct iw_param;
+struct iw_request_info;
+extern int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
+                         struct iw_point *dwrq, char *extra);
+extern int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
+                         struct iw_param *vwrq, char *extra);
+
+#endif                          /* _WLAN_SCAN_H */
diff --git a/drivers/net/wireless/libertas/thread.h b/drivers/net/wireless/libertas/thread.h
new file mode 100644
index 000000000000..207b8a6cc33d
--- /dev/null
+++ b/drivers/net/wireless/libertas/thread.h
@@ -0,0 +1,52 @@
+#ifndef __WLAN_THREAD_H_
+#define __WLAN_THREAD_H_
+
+#include        <linux/kthread.h>
+
+struct wlan_thread {
+        struct task_struct *task;
+        wait_queue_head_t waitq;
+        pid_t pid;
+        void *priv;
+};
+
+static inline void wlan_activate_thread(struct wlan_thread * thr)
+{
+        /** Record the thread pid */
+        thr->pid = current->pid;
+
+        /** Initialize the wait queue */
+        init_waitqueue_head(&thr->waitq);
+}
+
+static inline void wlan_deactivate_thread(struct wlan_thread * thr)
+{
+        ENTER();
+
+        thr->pid = 0;
+
+        LEAVE();
+}
+
+static inline void wlan_create_thread(int (*wlanfunc) (void *),
+                                      struct wlan_thread * thr, char *name)
+{
+        thr->task = kthread_run(wlanfunc, thr, "%s", name);
+}
+
+static inline int wlan_terminate_thread(struct wlan_thread * thr)
+{
+        ENTER();
+
+        /* Check if the thread is active or not */
+        if (!thr->pid) {
+                printk(KERN_ERR "Thread does not exist\n");
+                return -1;
+        }
+        kthread_stop(thr->task);
+
+        LEAVE();
+        return 0;
+}
+
+#endif
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
new file mode 100644
index 000000000000..82d06223043e
--- /dev/null
+++ b/drivers/net/wireless/libertas/tx.c
@@ -0,0 +1,285 @@
+/**
+  * This file contains the handling of TX in wlan driver.
+  */
+#include <linux/netdevice.h>
+
+#include "hostcmd.h"
+#include "radiotap.h"
+#include "sbi.h"
+#include "decl.h"
+#include "defs.h"
+#include "dev.h"
+#include "wext.h"
+
+/**
+ *  @brief This function converts Tx/Rx rates from IEEE80211_RADIOTAP_RATE
+ *  units (500 Kb/s) into Marvell WLAN format (see Table 8 in Section 3.2.1)
+ *
+ *  @param rate    Input rate
+ *  @return      Output Rate (0 if invalid)
+ */
+static u32 convert_radiotap_rate_to_mv(u8 rate)
+{
+        switch (rate) {
+        case 2:         /*   1 Mbps */
+                return 0 | (1 << 4);
+        case 4:         /*   2 Mbps */
+                return 1 | (1 << 4);
+        case 11:                /* 5.5 Mbps */
+                return 2 | (1 << 4);
+        case 22:                /*  11 Mbps */
+                return 3 | (1 << 4);
+        case 12:                /*   6 Mbps */
+                return 4 | (1 << 4);
+        case 18:                /*   9 Mbps */
+                return 5 | (1 << 4);
+        case 24:                /*  12 Mbps */
+                return 6 | (1 << 4);
+        case 36:                /*  18 Mbps */
+                return 7 | (1 << 4);
+        case 48:                /*  24 Mbps */
+                return 8 | (1 << 4);
+        case 72:                /*  36 Mbps */
+                return 9 | (1 << 4);
+        case 96:                /*  48 Mbps */
+                return 10 | (1 << 4);
+        case 108:               /*  54 Mbps */
+                return 11 | (1 << 4);
+        }
+        return 0;
+}
+
+/**
+ *  @brief This function processes a single packet and sends
+ *  to IF layer
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @param skb     A pointer to skb which includes TX packet
+ *  @return        0 or -1
+ */
+static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct txpd localtxpd;
+        struct txpd *plocaltxpd = &localtxpd;
+        u8 *p802x_hdr;
+        struct tx_radiotap_hdr *pradiotap_hdr;
+        u32 new_rate;
+        u8 *ptr = priv->adapter->tmptxbuf;
+
+        ENTER();
+
+        if (priv->adapter->surpriseremoved)
+                return -1;
+
+        if ((priv->adapter->debugmode & MRVDRV_DEBUG_TX_PATH) != 0)
+                lbs_dbg_hex("TX packet: ", skb->data,
+                         min_t(unsigned int, skb->len, 100));
+
+        if (!skb->len || (skb->len > MRVDRV_ETH_TX_PACKET_BUFFER_SIZE)) {
+                lbs_pr_debug(1, "Tx error: Bad skb length %d : %d\n",
+                       skb->len, MRVDRV_ETH_TX_PACKET_BUFFER_SIZE);
+                ret = -1;
+                goto done;
+        }
+
+        memset(plocaltxpd, 0, sizeof(struct txpd));
+
+        plocaltxpd->tx_packet_length = skb->len;
+
+        /* offset of actual data */
+        plocaltxpd->tx_packet_location = sizeof(struct txpd);
+
+        /* TxCtrl set by user or default */
+        plocaltxpd->tx_control = adapter->pkttxctrl;
+
+        p802x_hdr = skb->data;
+        if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) {
+
+                /* locate radiotap header */
+                pradiotap_hdr = (struct tx_radiotap_hdr *)skb->data;
+
+                /* set txpd fields from the radiotap header */
+                new_rate = convert_radiotap_rate_to_mv(pradiotap_hdr->rate);
+                if (new_rate != 0) {
+                        /* erase tx_control[4:0] */
+                        plocaltxpd->tx_control &= ~0x1f;
+                        /* write new tx_control[4:0] */
+                        plocaltxpd->tx_control |= new_rate;
+                }
+
+                /* skip the radiotap header */
+                p802x_hdr += sizeof(struct tx_radiotap_hdr);
+                plocaltxpd->tx_packet_length -= sizeof(struct tx_radiotap_hdr);
+
+        }
+        /* copy destination address from 802.3 or 802.11 header */
+        if (priv->adapter->linkmode == WLAN_LINKMODE_802_11)
+                memcpy(plocaltxpd->tx_dest_addr_high, p802x_hdr + 4, ETH_ALEN);
+        else
+                memcpy(plocaltxpd->tx_dest_addr_high, p802x_hdr, ETH_ALEN);
+
+        lbs_dbg_hex("txpd", (u8 *) plocaltxpd, sizeof(struct txpd));
+
+        if (IS_MESH_FRAME(skb)) {
+                plocaltxpd->tx_control |= TxPD_MESH_FRAME;
+        }
+
+        memcpy(ptr, plocaltxpd, sizeof(struct txpd));
+
+        ptr += sizeof(struct txpd);
+
+        lbs_dbg_hex("Tx Data", (u8 *) p802x_hdr, plocaltxpd->tx_packet_length);
+        memcpy(ptr, p802x_hdr, plocaltxpd->tx_packet_length);
+        ret = libertas_sbi_host_to_card(priv, MVMS_DAT,
+                               priv->adapter->tmptxbuf,
+                               plocaltxpd->tx_packet_length +
+                               sizeof(struct txpd));
+
+        if (ret) {
+                lbs_pr_debug(1, "Tx error: libertas_sbi_host_to_card failed: 0x%X\n", ret);
+                goto done;
+        }
+
+        lbs_pr_debug(1, "SendSinglePacket succeeds\n");
+
+      done:
+        if (!ret) {
+                priv->stats.tx_packets++;
+                priv->stats.tx_bytes += skb->len;
+        } else {
+                priv->stats.tx_dropped++;
+                priv->stats.tx_errors++;
+        }
+
+        if (!ret && priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) {
+                /* Keep the skb to echo it back once Tx feedback is
+                   received from FW */
+                skb_orphan(skb);
+                /* stop processing outgoing pkts */
+                netif_stop_queue(priv->wlan_dev.netdev);
+                /* freeze any packets already in our queues */
+                priv->adapter->TxLockFlag = 1;
+        } else {
+                dev_kfree_skb_any(skb);
+                priv->adapter->currenttxskb = NULL;
+        }
+
+        LEAVE();
+        return ret;
+}
+
+
+void libertas_tx_runqueue(wlan_private *priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        int i;
+
+        spin_lock(&adapter->txqueue_lock);
+        for (i = 0; i < adapter->tx_queue_idx; i++) {
+                struct sk_buff *skb = adapter->tx_queue_ps[i];
+                spin_unlock(&adapter->txqueue_lock);
+                SendSinglePacket(priv, skb);
+                spin_lock(&adapter->txqueue_lock);
+        }
+        adapter->tx_queue_idx = 0;
+        spin_unlock(&adapter->txqueue_lock);
+}
+
+static void wlan_tx_queue(wlan_private *priv, struct sk_buff *skb)
+{
+        wlan_adapter *adapter = priv->adapter;
+
+        spin_lock(&adapter->txqueue_lock);
+
+        WARN_ON(priv->adapter->tx_queue_idx >= NR_TX_QUEUE);
+        adapter->tx_queue_ps[adapter->tx_queue_idx++] = skb;
+        if (adapter->tx_queue_idx == NR_TX_QUEUE)
+                netif_stop_queue(priv->wlan_dev.netdev);
+        else
+                netif_start_queue(priv->wlan_dev.netdev);
+
+        spin_unlock(&adapter->txqueue_lock);
+}
+
+/**
+ *  @brief This function checks the conditions and sends packet to IF
+ *  layer if everything is ok.
+ *
+ *  @param priv    A pointer to wlan_private structure
+ *  @return        n/a
+ */
+int libertas_process_tx(wlan_private * priv, struct sk_buff *skb)
+{
+        int ret = -1;
+
+        ENTER();
+
+        lbs_dbg_hex("TX Data", skb->data, min_t(unsigned int, skb->len, 100));
+
+        if (priv->wlan_dev.dnld_sent) {
+                lbs_pr_alert( "TX error: dnld_sent = %d, not sending\n",
+                       priv->wlan_dev.dnld_sent);
+                goto done;
+        }
+
+        if ((priv->adapter->psstate == PS_STATE_SLEEP) ||
+            (priv->adapter->psstate == PS_STATE_PRE_SLEEP)) {
+                wlan_tx_queue(priv, skb);
+                return ret;
+        }
+
+        priv->adapter->currenttxskb = skb;
+
+        ret = SendSinglePacket(priv, skb);
+done:
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief This function sends to the host the last transmitted packet,
+ *  filling the radiotap headers with transmission information.
+ *
+ *  @param priv     A pointer to wlan_private structure
+ *  @param status   A 32 bit value containing transmission status.
+ *
+ *  @returns void
+ */
+void libertas_send_tx_feedback(wlan_private * priv)
+{
+        wlan_adapter *adapter = priv->adapter;
+        struct tx_radiotap_hdr *radiotap_hdr;
+        u32 status = adapter->eventcause;
+        int txfail;
+        int try_count;
+
+        if (adapter->radiomode != WLAN_RADIOMODE_RADIOTAP ||
+            adapter->currenttxskb == NULL)
+                return;
+
+        radiotap_hdr = (struct tx_radiotap_hdr *)adapter->currenttxskb->data;
+
+        if ((adapter->debugmode & MRVDRV_DEBUG_TX_PATH) != 0)
+                lbs_dbg_hex("TX feedback: ", (u8 *) radiotap_hdr,
+                        min_t(unsigned int, adapter->currenttxskb->len, 100));
+
+        txfail = (status >> 24);
+
+#if 0
+        /* The version of roofnet that we've tested does not use this yet
+         * But it may be used in the future.
+         */
+        if (txfail)
+                radiotap_hdr->flags &= IEEE80211_RADIOTAP_F_TX_FAIL;
+#endif
+        try_count = (status >> 16) & 0xff;
+        radiotap_hdr->data_retries = (try_count) ?
+            (1 + adapter->txretrycount - try_count) : 0;
+        libertas_upload_rx_packet(priv, adapter->currenttxskb);
+        adapter->currenttxskb = NULL;
+        priv->adapter->TxLockFlag = 0;
+        if (priv->adapter->connect_status == libertas_connected)
+                netif_wake_queue(priv->wlan_dev.netdev);
+}
diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/libertas/types.h
new file mode 100644
index 000000000000..09d62f8b1a16
--- /dev/null
+++ b/drivers/net/wireless/libertas/types.h
@@ -0,0 +1,289 @@
+/**
+  * This header file contains definition for global types
+  */
+#ifndef _WLAN_TYPES_
+#define _WLAN_TYPES_
+
+#include <linux/if_ether.h>
+
+/** IEEE type definitions  */
+enum ieeetypes_elementid {
+        SSID = 0,
+        SUPPORTED_RATES,
+        FH_PARAM_SET,
+        DS_PARAM_SET,
+        CF_PARAM_SET,
+        TIM,
+        IBSS_PARAM_SET,
+        COUNTRY_INFO = 7,
+
+        CHALLENGE_TEXT = 16,
+
+        EXTENDED_SUPPORTED_RATES = 50,
+
+        VENDOR_SPECIFIC_221 = 221,
+
+        WPA_IE = 221,
+        WPA2_IE = 48,
+
+        EXTRA_IE = 133,
+} __attribute__ ((packed));
+
+#define CAPINFO_MASK    (~(0xda00))
+
+struct ieeetypes_capinfo {
+        u8 ess:1;
+        u8 ibss:1;
+        u8 cfpollable:1;
+        u8 cfpollrqst:1;
+        u8 privacy:1;
+        u8 shortpreamble:1;
+        u8 pbcc:1;
+        u8 chanagility:1;
+        u8 spectrummgmt:1;
+        u8 rsrvd3:1;
+        u8 shortslottime:1;
+        u8 apsd:1;
+        u8 rsvrd2:1;
+        u8 dsssofdm:1;
+        u8 rsrvd1:2;
+} __attribute__ ((packed));
+
+struct ieeetypes_cfparamset {
+        u8 elementid;
+        u8 len;
+        u8 cfpcnt;
+        u8 cfpperiod;
+        u16 cfpmaxduration;
+        u16 cfpdurationremaining;
+} __attribute__ ((packed));
+
+
+struct ieeetypes_ibssparamset {
+        u8 elementid;
+        u8 len;
+        u16 atimwindow;
+} __attribute__ ((packed));
+
+union IEEEtypes_ssparamset {
+        struct ieeetypes_cfparamset cfparamset;
+        struct ieeetypes_ibssparamset ibssparamset;
+} __attribute__ ((packed));
+
+struct ieeetypes_fhparamset {
+        u8 elementid;
+        u8 len;
+        u16 dwelltime;
+        u8 hopset;
+        u8 hoppattern;
+        u8 hopindex;
+} __attribute__ ((packed));
+
+struct ieeetypes_dsparamset {
+        u8 elementid;
+        u8 len;
+        u8 currentchan;
+} __attribute__ ((packed));
+
+union ieeetypes_phyparamset {
+        struct ieeetypes_fhparamset fhparamset;
+        struct ieeetypes_dsparamset dsparamset;
+} __attribute__ ((packed));
+
+struct ieeetypes_assocrsp {
+        struct ieeetypes_capinfo capability;
+        u16 statuscode;
+        u16 aid;
+        u8 iebuffer[1];
+} __attribute__ ((packed));
+
+/** TLV  type ID definition */
+#define PROPRIETARY_TLV_BASE_ID         0x0100
+
+/* Terminating TLV type */
+#define MRVL_TERMINATE_TLV_ID           0xffff
+
+#define TLV_TYPE_SSID                           0x0000
+#define TLV_TYPE_RATES                          0x0001
+#define TLV_TYPE_PHY_FH                         0x0002
+#define TLV_TYPE_PHY_DS                         0x0003
+#define TLV_TYPE_CF                                 0x0004
+#define TLV_TYPE_IBSS                           0x0006
+
+#define TLV_TYPE_DOMAIN                         0x0007
+
+#define TLV_TYPE_POWER_CAPABILITY       0x0021
+
+#define TLV_TYPE_KEY_MATERIAL       (PROPRIETARY_TLV_BASE_ID + 0)
+#define TLV_TYPE_CHANLIST           (PROPRIETARY_TLV_BASE_ID + 1)
+#define TLV_TYPE_NUMPROBES          (PROPRIETARY_TLV_BASE_ID + 2)
+#define TLV_TYPE_RSSI_LOW           (PROPRIETARY_TLV_BASE_ID + 4)
+#define TLV_TYPE_SNR_LOW            (PROPRIETARY_TLV_BASE_ID + 5)
+#define TLV_TYPE_FAILCOUNT          (PROPRIETARY_TLV_BASE_ID + 6)
+#define TLV_TYPE_BCNMISS            (PROPRIETARY_TLV_BASE_ID + 7)
+#define TLV_TYPE_LED_GPIO           (PROPRIETARY_TLV_BASE_ID + 8)
+#define TLV_TYPE_LEDBEHAVIOR        (PROPRIETARY_TLV_BASE_ID + 9)
+#define TLV_TYPE_PASSTHROUGH        (PROPRIETARY_TLV_BASE_ID + 10)
+#define TLV_TYPE_REASSOCAP          (PROPRIETARY_TLV_BASE_ID + 11)
+#define TLV_TYPE_POWER_TBL_2_4GHZ   (PROPRIETARY_TLV_BASE_ID + 12)
+#define TLV_TYPE_POWER_TBL_5GHZ     (PROPRIETARY_TLV_BASE_ID + 13)
+#define TLV_TYPE_BCASTPROBE         (PROPRIETARY_TLV_BASE_ID + 14)
+#define TLV_TYPE_NUMSSID_PROBE      (PROPRIETARY_TLV_BASE_ID + 15)
+#define TLV_TYPE_WMMQSTATUS         (PROPRIETARY_TLV_BASE_ID + 16)
+#define TLV_TYPE_CRYPTO_DATA        (PROPRIETARY_TLV_BASE_ID + 17)
+#define TLV_TYPE_WILDCARDSSID       (PROPRIETARY_TLV_BASE_ID + 18)
+#define TLV_TYPE_TSFTIMESTAMP       (PROPRIETARY_TLV_BASE_ID + 19)
+#define TLV_TYPE_RSSI_HIGH          (PROPRIETARY_TLV_BASE_ID + 22)
+#define TLV_TYPE_SNR_HIGH           (PROPRIETARY_TLV_BASE_ID + 23)
+
+/** TLV related data structures*/
+struct mrvlietypesheader {
+        u16 type;
+        u16 len;
+} __attribute__ ((packed));
+
+struct mrvlietypes_data {
+        struct mrvlietypesheader header;
+        u8 Data[1];
+} __attribute__ ((packed));
+
+struct mrvlietypes_ratesparamset {
+        struct mrvlietypesheader header;
+        u8 rates[1];
+} __attribute__ ((packed));
+
+struct mrvlietypes_ssidparamset {
+        struct mrvlietypesheader header;
+        u8 ssid[1];
+} __attribute__ ((packed));
+
+struct mrvlietypes_wildcardssidparamset {
+        struct mrvlietypesheader header;
+        u8 MaxSsidlength;
+        u8 ssid[1];
+} __attribute__ ((packed));
+
+struct chanscanmode {
+        u8 passivescan:1;
+        u8 disablechanfilt:1;
+        u8 reserved_2_7:6;
+} __attribute__ ((packed));
+
+struct chanscanparamset {
+        u8 radiotype;
+        u8 channumber;
+        struct chanscanmode chanscanmode;
+        u16 minscantime;
+        u16 maxscantime;
+} __attribute__ ((packed));
+
+struct mrvlietypes_chanlistparamset {
+        struct mrvlietypesheader header;
+        struct chanscanparamset chanscanparam[1];
+} __attribute__ ((packed));
+
+struct cfparamset {
+        u8 cfpcnt;
+        u8 cfpperiod;
+        u16 cfpmaxduration;
+        u16 cfpdurationremaining;
+} __attribute__ ((packed));
+
+struct ibssparamset {
+        u16 atimwindow;
+} __attribute__ ((packed));
+
+struct mrvlietypes_ssparamset {
+        struct mrvlietypesheader header;
+        union {
+                struct cfparamset cfparamset[1];
+                struct ibssparamset ibssparamset[1];
+        } cf_ibss;
+} __attribute__ ((packed));
+
+struct fhparamset {
+        u16 dwelltime;
+        u8 hopset;
+        u8 hoppattern;
+        u8 hopindex;
+} __attribute__ ((packed));
+
+struct dsparamset {
+        u8 currentchan;
+} __attribute__ ((packed));
+
+struct mrvlietypes_phyparamset {
+        struct mrvlietypesheader header;
+        union {
+                struct fhparamset fhparamset[1];
+                struct dsparamset dsparamset[1];
+        } fh_ds;
+} __attribute__ ((packed));
+
+struct mrvlietypes_rsnparamset {
+        struct mrvlietypesheader header;
+        u8 rsnie[1];
+} __attribute__ ((packed));
+
+struct mrvlietypes_tsftimestamp {
+        struct mrvlietypesheader header;
+        __le64 tsftable[1];
+} __attribute__ ((packed));
+
+/**  Local Power capability */
+struct mrvlietypes_powercapability {
+        struct mrvlietypesheader header;
+        s8 minpower;
+        s8 maxpower;
+} __attribute__ ((packed));
+
+struct mrvlietypes_rssithreshold {
+        struct mrvlietypesheader header;
+        u8 rssivalue;
+        u8 rssifreq;
+} __attribute__ ((packed));
+
+struct mrvlietypes_snrthreshold {
+        struct mrvlietypesheader header;
+        u8 snrvalue;
+        u8 snrfreq;
+} __attribute__ ((packed));
+
+struct mrvlietypes_failurecount {
+        struct mrvlietypesheader header;
+        u8 failvalue;
+        u8 Failfreq;
+} __attribute__ ((packed));
+
+struct mrvlietypes_beaconsmissed {
+        struct mrvlietypesheader header;
+        u8 beaconmissed;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct mrvlietypes_numprobes {
+        struct mrvlietypesheader header;
+        u16 numprobes;
+} __attribute__ ((packed));
+
+struct mrvlietypes_bcastprobe {
+        struct mrvlietypesheader header;
+        u16 bcastprobe;
+} __attribute__ ((packed));
+
+struct mrvlietypes_numssidprobe {
+        struct mrvlietypesheader header;
+        u16 numssidprobe;
+} __attribute__ ((packed));
+
+struct led_pin {
+        u8 led;
+        u8 pin;
+} __attribute__ ((packed));
+
+struct mrvlietypes_ledgpio {
+        struct mrvlietypesheader header;
+        struct led_pin ledpin[1];
+} __attribute__ ((packed));
+
+#endif                          /* _WLAN_TYPES_ */
diff --git a/drivers/net/wireless/libertas/version.h b/drivers/net/wireless/libertas/version.h
new file mode 100644
index 000000000000..e86f65ae79b8
--- /dev/null
+++ b/drivers/net/wireless/libertas/version.h
@@ -0,0 +1,8 @@
+#define DRIVER_RELEASE_VERSION "320.p0"
+const char libertas_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION
+#ifdef  DEBUG
+    "-dbg"
+#endif
+    "";
+
+
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
new file mode 100644
index 000000000000..4a52336bc0f6
--- /dev/null
+++ b/drivers/net/wireless/libertas/wext.c
@@ -0,0 +1,2769 @@
+/**
+  * This file contains ioctl functions
+  */
+#include <linux/ctype.h>
+#include <linux/delay.h>
+#include <linux/if.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+#include <linux/bitops.h>
+
+#include <net/ieee80211.h>
+#include <net/iw_handler.h>
+
+#include "host.h"
+#include "radiotap.h"
+#include "decl.h"
+#include "defs.h"
+#include "dev.h"
+#include "join.h"
+#include "version.h"
+#include "wext.h"
+#include "assoc.h"
+
+
+/**
+ *  @brief Convert mw value to dbm value
+ *
+ *  @param mw      the value of mw
+ *  @return        the value of dbm
+ */
+static int mw_to_dbm(int mw)
+{
+        if (mw < 2)
+                return 0;
+        else if (mw < 3)
+                return 3;
+        else if (mw < 4)
+                return 5;
+        else if (mw < 6)
+                return 7;
+        else if (mw < 7)
+                return 8;
+        else if (mw < 8)
+                return 9;
+        else if (mw < 10)
+                return 10;
+        else if (mw < 13)
+                return 11;
+        else if (mw < 16)
+                return 12;
+        else if (mw < 20)
+                return 13;
+        else if (mw < 25)
+                return 14;
+        else if (mw < 32)
+                return 15;
+        else if (mw < 40)
+                return 16;
+        else if (mw < 50)
+                return 17;
+        else if (mw < 63)
+                return 18;
+        else if (mw < 79)
+                return 19;
+        else if (mw < 100)
+                return 20;
+        else
+                return 21;
+}
+
+/**
+ *  @brief Find the channel frequency power info with specific channel
+ *
+ *  @param adapter      A pointer to wlan_adapter structure
+ *  @param band         it can be BAND_A, BAND_G or BAND_B
+ *  @param channel      the channel for looking
+ *  @return             A pointer to struct chan_freq_power structure or NULL if not find.
+ */
+struct chan_freq_power *libertas_find_cfp_by_band_and_channel(wlan_adapter * adapter,
+                                                 u8 band, u16 channel)
+{
+        struct chan_freq_power *cfp = NULL;
+        struct region_channel *rc;
+        int count = sizeof(adapter->region_channel) /
+            sizeof(adapter->region_channel[0]);
+        int i, j;
+
+        for (j = 0; !cfp && (j < count); j++) {
+                rc = &adapter->region_channel[j];
+
+                if (adapter->enable11d)
+                        rc = &adapter->universal_channel[j];
+                if (!rc->valid || !rc->CFP)
+                        continue;
+                if (rc->band != band)
+                        continue;
+                for (i = 0; i < rc->nrcfp; i++) {
+                        if (rc->CFP[i].channel == channel) {
+                                cfp = &rc->CFP[i];
+                                break;
+                        }
+                }
+        }
+
+        if (!cfp && channel)
+                lbs_pr_debug(1, "libertas_find_cfp_by_band_and_channel(): cannot find "
+                       "cfp by band %d & channel %d\n", band, channel);
+
+        return cfp;
+}
+
+/**
+ *  @brief Find the channel frequency power info with specific frequency
+ *
+ *  @param adapter      A pointer to wlan_adapter structure
+ *  @param band         it can be BAND_A, BAND_G or BAND_B
+ *  @param freq         the frequency for looking
+ *  @return             A pointer to struct chan_freq_power structure or NULL if not find.
+ */
+static struct chan_freq_power *find_cfp_by_band_and_freq(wlan_adapter * adapter,
+                                                     u8 band, u32 freq)
+{
+        struct chan_freq_power *cfp = NULL;
+        struct region_channel *rc;
+        int count = sizeof(adapter->region_channel) /
+            sizeof(adapter->region_channel[0]);
+        int i, j;
+
+        for (j = 0; !cfp && (j < count); j++) {
+                rc = &adapter->region_channel[j];
+
+                if (adapter->enable11d)
+                        rc = &adapter->universal_channel[j];
+                if (!rc->valid || !rc->CFP)
+                        continue;
+                if (rc->band != band)
+                        continue;
+                for (i = 0; i < rc->nrcfp; i++) {
+                        if (rc->CFP[i].freq == freq) {
+                                cfp = &rc->CFP[i];
+                                break;
+                        }
+                }
+        }
+
+        if (!cfp && freq)
+                lbs_pr_debug(1, "find_cfp_by_band_and_freql(): cannot find cfp by "
+                       "band %d & freq %d\n", band, freq);
+
+        return cfp;
+}
+
+static int updatecurrentchannel(wlan_private * priv)
+{
+        int ret;
+
+        /*
+         ** the channel in f/w could be out of sync, get the current channel
+         */
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_channel,
+                                    cmd_opt_802_11_rf_channel_get,
+                                    cmd_option_waitforrsp, 0, NULL);
+
+        lbs_pr_debug(1, "Current channel = %d\n",
+               priv->adapter->curbssparams.channel);
+
+        return ret;
+}
+
+static int setcurrentchannel(wlan_private * priv, int channel)
+{
+        lbs_pr_debug(1, "Set channel = %d\n", channel);
+
+        /*
+         **  Current channel is not set to adhocchannel requested, set channel
+         */
+        return (libertas_prepare_and_send_command(priv, cmd_802_11_rf_channel,
+                                      cmd_opt_802_11_rf_channel_set,
+                                      cmd_option_waitforrsp, 0, &channel));
+}
+
+static int changeadhocchannel(wlan_private * priv, int channel)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+
+        adapter->adhocchannel = channel;
+
+        updatecurrentchannel(priv);
+
+        if (adapter->curbssparams.channel == adapter->adhocchannel) {
+                /* adhocchannel is set to the current channel already */
+                LEAVE();
+                return 0;
+        }
+
+        lbs_pr_debug(1, "Updating channel from %d to %d\n",
+               adapter->curbssparams.channel, adapter->adhocchannel);
+
+        setcurrentchannel(priv, adapter->adhocchannel);
+
+        updatecurrentchannel(priv);
+
+        if (adapter->curbssparams.channel != adapter->adhocchannel) {
+                lbs_pr_debug(1, "failed to updated channel to %d, channel = %d\n",
+                       adapter->adhocchannel, adapter->curbssparams.channel);
+                LEAVE();
+                return -1;
+        }
+
+        if (adapter->connect_status == libertas_connected) {
+                int i;
+                struct WLAN_802_11_SSID curadhocssid;
+
+                lbs_pr_debug(1, "channel Changed while in an IBSS\n");
+
+                /* Copy the current ssid */
+                memcpy(&curadhocssid, &adapter->curbssparams.ssid,
+                       sizeof(struct WLAN_802_11_SSID));
+
+                /* Exit Adhoc mode */
+                lbs_pr_debug(1, "In changeadhocchannel(): Sending Adhoc Stop\n");
+                ret = libertas_stop_adhoc_network(priv);
+
+                if (ret) {
+                        LEAVE();
+                        return ret;
+                }
+                /* Scan for the network, do not save previous results.  Stale
+                 *   scan data will cause us to join a non-existant adhoc network
+                 */
+                libertas_send_specific_SSID_scan(priv, &curadhocssid, 0);
+
+                // find out the BSSID that matches the current SSID
+                i = libertas_find_SSID_in_list(adapter, &curadhocssid, NULL,
+                                   wlan802_11ibss);
+
+                if (i >= 0) {
+                        lbs_pr_debug(1, "SSID found at %d in List,"
+                               "so join\n", i);
+                        libertas_join_adhoc_network(priv, &adapter->scantable[i]);
+                } else {
+                        // else send START command
+                        lbs_pr_debug(1, "SSID not found in list, "
+                               "so creating adhoc with ssid = %s\n",
+                               curadhocssid.ssid);
+                        libertas_start_adhoc_network(priv, &curadhocssid);
+                }               // end of else (START command)
+        }
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief Set Radio On/OFF
+ *
+ *  @param priv                 A pointer to wlan_private structure
+ *  @option                     Radio Option
+ *  @return                     0 --success, otherwise fail
+ */
+int wlan_radio_ioctl(wlan_private * priv, u8 option)
+{
+        int ret = 0;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if (adapter->radioon != option) {
+                lbs_pr_debug(1, "Switching %s the Radio\n", option ? "On" : "Off");
+                adapter->radioon = option;
+
+                ret = libertas_prepare_and_send_command(priv,
+                                            cmd_802_11_radio_control,
+                                            cmd_act_set,
+                                            cmd_option_waitforrsp, 0, NULL);
+        }
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Copy rates
+ *
+ *  @param dest                 A pointer to Dest Buf
+ *  @param src                  A pointer to Src Buf
+ *  @param len                  The len of Src Buf
+ *  @return                     Number of rates copyed
+ */
+static inline int copyrates(u8 * dest, int pos, u8 * src, int len)
+{
+        int i;
+
+        for (i = 0; i < len && src[i]; i++, pos++) {
+                if (pos >= sizeof(u8) * WLAN_SUPPORTED_RATES)
+                        break;
+                dest[pos] = src[i];
+        }
+
+        return pos;
+}
+
+/**
+ *  @brief Get active data rates
+ *
+ *  @param adapter              A pointer to wlan_adapter structure
+ *  @param rate                 The buf to return the active rates
+ *  @return                     The number of rates
+ */
+static int get_active_data_rates(wlan_adapter * adapter,
+                                 u8* rates)
+{
+        int k = 0;
+
+        ENTER();
+
+        if (adapter->connect_status != libertas_connected) {
+                if (adapter->inframode == wlan802_11infrastructure) {
+                        //Infra. mode
+                        lbs_pr_debug(1, "Infra\n");
+                        k = copyrates(rates, k, libertas_supported_rates,
+                                      sizeof(libertas_supported_rates));
+                } else {
+                        //ad-hoc mode
+                        lbs_pr_debug(1, "Adhoc G\n");
+                        k = copyrates(rates, k, libertas_adhoc_rates_g,
+                                      sizeof(libertas_adhoc_rates_g));
+                }
+        } else {
+                k = copyrates(rates, 0, adapter->curbssparams.datarates,
+                              adapter->curbssparams.numofrates);
+        }
+
+        LEAVE();
+
+        return k;
+}
+
+static int wlan_get_name(struct net_device *dev, struct iw_request_info *info,
+                         char *cwrq, char *extra)
+{
+        const char *cp;
+        char comm[6] = { "COMM-" };
+        char mrvl[6] = { "MRVL-" };
+        int cnt;
+
+        ENTER();
+
+        strcpy(cwrq, mrvl);
+
+        cp = strstr(libertas_driver_version, comm);
+        if (cp == libertas_driver_version)      //skip leading "COMM-"
+                cp = libertas_driver_version + strlen(comm);
+        else
+                cp = libertas_driver_version;
+
+        cnt = strlen(mrvl);
+        cwrq += cnt;
+        while (cnt < 16 && (*cp != '-')) {
+                *cwrq++ = toupper(*cp++);
+                cnt++;
+        }
+        *cwrq = '\0';
+
+        LEAVE();
+
+        return 0;
+}
+
+static int wlan_get_freq(struct net_device *dev, struct iw_request_info *info,
+                         struct iw_freq *fwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct chan_freq_power *cfp;
+
+        ENTER();
+
+        cfp = libertas_find_cfp_by_band_and_channel(adapter, 0,
+                                           adapter->curbssparams.channel);
+
+        if (!cfp) {
+                if (adapter->curbssparams.channel)
+                        lbs_pr_debug(1, "Invalid channel=%d\n",
+                               adapter->curbssparams.channel);
+                return -EINVAL;
+        }
+
+        fwrq->m = (long)cfp->freq * 100000;
+        fwrq->e = 1;
+
+        lbs_pr_debug(1, "freq=%u\n", fwrq->m);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_wap(struct net_device *dev, struct iw_request_info *info,
+                        struct sockaddr *awrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if (adapter->connect_status == libertas_connected) {
+                memcpy(awrq->sa_data, adapter->curbssparams.bssid, ETH_ALEN);
+        } else {
+                memset(awrq->sa_data, 0, ETH_ALEN);
+        }
+        awrq->sa_family = ARPHRD_ETHER;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_set_nick(struct net_device *dev, struct iw_request_info *info,
+                         struct iw_point *dwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        /*
+         * Check the size of the string
+         */
+
+        if (dwrq->length > 16) {
+                return -E2BIG;
+        }
+
+        mutex_lock(&adapter->lock);
+        memset(adapter->nodename, 0, sizeof(adapter->nodename));
+        memcpy(adapter->nodename, extra, dwrq->length);
+        mutex_unlock(&adapter->lock);
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_nick(struct net_device *dev, struct iw_request_info *info,
+                         struct iw_point *dwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        /*
+         * Get the Nick Name saved
+         */
+
+        mutex_lock(&adapter->lock);
+        strncpy(extra, adapter->nodename, 16);
+        mutex_unlock(&adapter->lock);
+
+        extra[16] = '\0';
+
+        /*
+         * If none, we may want to get the one that was set
+         */
+
+        /*
+         * Push it out !
+         */
+        dwrq->length = strlen(extra) + 1;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_set_rts(struct net_device *dev, struct iw_request_info *info,
+                        struct iw_param *vwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int rthr = vwrq->value;
+
+        ENTER();
+
+        if (vwrq->disabled) {
+                adapter->rtsthsd = rthr = MRVDRV_RTS_MAX_VALUE;
+        } else {
+                if (rthr < MRVDRV_RTS_MIN_VALUE || rthr > MRVDRV_RTS_MAX_VALUE)
+                        return -EINVAL;
+                adapter->rtsthsd = rthr;
+        }
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
+                                    cmd_act_set, cmd_option_waitforrsp,
+                                    OID_802_11_RTS_THRESHOLD, &rthr);
+
+        LEAVE();
+        return ret;
+}
+
+static int wlan_get_rts(struct net_device *dev, struct iw_request_info *info,
+                        struct iw_param *vwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        adapter->rtsthsd = 0;
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
+                                    cmd_act_get, cmd_option_waitforrsp,
+                                    OID_802_11_RTS_THRESHOLD, NULL);
+        if (ret) {
+                LEAVE();
+                return ret;
+        }
+
+        vwrq->value = adapter->rtsthsd;
+        vwrq->disabled = ((vwrq->value < MRVDRV_RTS_MIN_VALUE)
+                          || (vwrq->value > MRVDRV_RTS_MAX_VALUE));
+        vwrq->fixed = 1;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_set_frag(struct net_device *dev, struct iw_request_info *info,
+                         struct iw_param *vwrq, char *extra)
+{
+        int ret = 0;
+        int fthr = vwrq->value;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if (vwrq->disabled) {
+                adapter->fragthsd = fthr = MRVDRV_FRAG_MAX_VALUE;
+        } else {
+                if (fthr < MRVDRV_FRAG_MIN_VALUE
+                    || fthr > MRVDRV_FRAG_MAX_VALUE)
+                        return -EINVAL;
+                adapter->fragthsd = fthr;
+        }
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
+                                    cmd_act_set, cmd_option_waitforrsp,
+                                    OID_802_11_FRAGMENTATION_THRESHOLD, &fthr);
+        LEAVE();
+        return ret;
+}
+
+static int wlan_get_frag(struct net_device *dev, struct iw_request_info *info,
+                         struct iw_param *vwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        adapter->fragthsd = 0;
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_snmp_mib,
+                                    cmd_act_get, cmd_option_waitforrsp,
+                                    OID_802_11_FRAGMENTATION_THRESHOLD, NULL);
+        if (ret) {
+                LEAVE();
+                return ret;
+        }
+
+        vwrq->value = adapter->fragthsd;
+        vwrq->disabled = ((vwrq->value < MRVDRV_FRAG_MIN_VALUE)
+                          || (vwrq->value > MRVDRV_FRAG_MAX_VALUE));
+        vwrq->fixed = 1;
+
+        LEAVE();
+        return ret;
+}
+
+static int wlan_get_mode(struct net_device *dev,
+                         struct iw_request_info *info, u32 * uwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        switch (adapter->inframode) {
+        case wlan802_11ibss:
+                *uwrq = IW_MODE_ADHOC;
+                break;
+
+        case wlan802_11infrastructure:
+                *uwrq = IW_MODE_INFRA;
+                break;
+
+        default:
+        case wlan802_11autounknown:
+                *uwrq = IW_MODE_AUTO;
+                break;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_txpow(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_param *vwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_rf_tx_power,
+                                    cmd_act_tx_power_opt_get,
+                                    cmd_option_waitforrsp, 0, NULL);
+
+        if (ret) {
+                LEAVE();
+                return ret;
+        }
+
+        lbs_pr_debug(1, "TXPOWER GET %d dbm.\n", adapter->txpowerlevel);
+        vwrq->value = adapter->txpowerlevel;
+        vwrq->fixed = 1;
+        if (adapter->radioon) {
+                vwrq->disabled = 0;
+                vwrq->flags = IW_TXPOW_DBM;
+        } else {
+                vwrq->disabled = 1;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_set_retry(struct net_device *dev, struct iw_request_info *info,
+                          struct iw_param *vwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if (vwrq->flags == IW_RETRY_LIMIT) {
+                /* The MAC has a 4-bit Total_Tx_Count register
+                   Total_Tx_Count = 1 + Tx_Retry_Count */
+#define TX_RETRY_MIN 0
+#define TX_RETRY_MAX 14
+                if (vwrq->value < TX_RETRY_MIN || vwrq->value > TX_RETRY_MAX)
+                        return -EINVAL;
+
+                /* Adding 1 to convert retry count to try count */
+                adapter->txretrycount = vwrq->value + 1;
+
+                ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
+                                            cmd_act_set,
+                                            cmd_option_waitforrsp,
+                                            OID_802_11_TX_RETRYCOUNT, NULL);
+
+                if (ret) {
+                        LEAVE();
+                        return ret;
+                }
+        } else {
+                return -EOPNOTSUPP;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_retry(struct net_device *dev, struct iw_request_info *info,
+                          struct iw_param *vwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        ENTER();
+        adapter->txretrycount = 0;
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_snmp_mib,
+                                    cmd_act_get, cmd_option_waitforrsp,
+                                    OID_802_11_TX_RETRYCOUNT, NULL);
+        if (ret) {
+                LEAVE();
+                return ret;
+        }
+        vwrq->disabled = 0;
+        if (!vwrq->flags) {
+                vwrq->flags = IW_RETRY_LIMIT;
+                /* Subtract 1 to convert try count to retry count */
+                vwrq->value = adapter->txretrycount - 1;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static inline void sort_channels(struct iw_freq *freq, int num)
+{
+        int i, j;
+        struct iw_freq temp;
+
+        for (i = 0; i < num; i++)
+                for (j = i + 1; j < num; j++)
+                        if (freq[i].i > freq[j].i) {
+                                temp.i = freq[i].i;
+                                temp.m = freq[i].m;
+
+                                freq[i].i = freq[j].i;
+                                freq[i].m = freq[j].m;
+
+                                freq[j].i = temp.i;
+                                freq[j].m = temp.m;
+                        }
+}
+
+/* data rate listing
+        MULTI_BANDS:
+                abg             a       b       b/g
+   Infra        G(12)           A(8)    B(4)    G(12)
+   Adhoc        A+B(12)         A(8)    B(4)    B(4)
+
+        non-MULTI_BANDS:
+                                        b       b/g
+   Infra                                B(4)    G(12)
+   Adhoc                                B(4)    B(4)
+ */
+/**
+ *  @brief Get Range Info
+ *
+ *  @param dev                  A pointer to net_device structure
+ *  @param info                 A pointer to iw_request_info structure
+ *  @param vwrq                 A pointer to iw_param structure
+ *  @param extra                A pointer to extra data buf
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_get_range(struct net_device *dev, struct iw_request_info *info,
+                          struct iw_point *dwrq, char *extra)
+{
+        int i, j;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct iw_range *range = (struct iw_range *)extra;
+        struct chan_freq_power *cfp;
+        u8 rates[WLAN_SUPPORTED_RATES];
+
+        u8 flag = 0;
+
+        ENTER();
+
+        dwrq->length = sizeof(struct iw_range);
+        memset(range, 0, sizeof(struct iw_range));
+
+        range->min_nwid = 0;
+        range->max_nwid = 0;
+
+        memset(rates, 0, sizeof(rates));
+        range->num_bitrates = get_active_data_rates(adapter, rates);
+
+        for (i = 0; i < min_t(__u8, range->num_bitrates, IW_MAX_BITRATES) && rates[i];
+             i++) {
+                range->bitrate[i] = (rates[i] & 0x7f) * 500000;
+        }
+        range->num_bitrates = i;
+        lbs_pr_debug(1, "IW_MAX_BITRATES=%d num_bitrates=%d\n", IW_MAX_BITRATES,
+               range->num_bitrates);
+
+        range->num_frequency = 0;
+        if (priv->adapter->enable11d &&
+            adapter->connect_status == libertas_connected) {
+                u8 chan_no;
+                u8 band;
+
+                struct parsed_region_chan_11d *parsed_region_chan =
+                    &adapter->parsed_region_chan;
+
+                if (parsed_region_chan == NULL) {
+                        lbs_pr_debug(1, "11D:parsed_region_chan is NULL\n");
+                        LEAVE();
+                        return 0;
+                }
+                band = parsed_region_chan->band;
+                lbs_pr_debug(1, "band=%d NoOfChan=%d\n", band,
+                       parsed_region_chan->nr_chan);
+
+                for (i = 0; (range->num_frequency < IW_MAX_FREQUENCIES)
+                     && (i < parsed_region_chan->nr_chan); i++) {
+                        chan_no = parsed_region_chan->chanpwr[i].chan;
+                        lbs_pr_debug(1, "chan_no=%d\n", chan_no);
+                        range->freq[range->num_frequency].i = (long)chan_no;
+                        range->freq[range->num_frequency].m =
+                            (long)libertas_chan_2_freq(chan_no, band) * 100000;
+                        range->freq[range->num_frequency].e = 1;
+                        range->num_frequency++;
+                }
+                flag = 1;
+        }
+        if (!flag) {
+                for (j = 0; (range->num_frequency < IW_MAX_FREQUENCIES)
+                     && (j < sizeof(adapter->region_channel)
+                         / sizeof(adapter->region_channel[0])); j++) {
+                        cfp = adapter->region_channel[j].CFP;
+                        for (i = 0; (range->num_frequency < IW_MAX_FREQUENCIES)
+                             && adapter->region_channel[j].valid
+                             && cfp
+                             && (i < adapter->region_channel[j].nrcfp); i++) {
+                                range->freq[range->num_frequency].i =
+                                    (long)cfp->channel;
+                                range->freq[range->num_frequency].m =
+                                    (long)cfp->freq * 100000;
+                                range->freq[range->num_frequency].e = 1;
+                                cfp++;
+                                range->num_frequency++;
+                        }
+                }
+        }
+
+        lbs_pr_debug(1, "IW_MAX_FREQUENCIES=%d num_frequency=%d\n",
+               IW_MAX_FREQUENCIES, range->num_frequency);
+
+        range->num_channels = range->num_frequency;
+
+        sort_channels(&range->freq[0], range->num_frequency);
+
+        /*
+         * Set an indication of the max TCP throughput in bit/s that we can
+         * expect using this interface
+         */
+        if (i > 2)
+                range->throughput = 5000 * 1000;
+        else
+                range->throughput = 1500 * 1000;
+
+        range->min_rts = MRVDRV_RTS_MIN_VALUE;
+        range->max_rts = MRVDRV_RTS_MAX_VALUE;
+        range->min_frag = MRVDRV_FRAG_MIN_VALUE;
+        range->max_frag = MRVDRV_FRAG_MAX_VALUE;
+
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13;
+        range->num_encoding_sizes = 2;
+        range->max_encoding_tokens = 4;
+
+        range->min_pmp = 1000000;
+        range->max_pmp = 120000000;
+        range->min_pmt = 1000;
+        range->max_pmt = 1000000;
+        range->pmp_flags = IW_POWER_PERIOD;
+        range->pmt_flags = IW_POWER_TIMEOUT;
+        range->pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_ALL_R;
+
+        /*
+         * Minimum version we recommend
+         */
+        range->we_version_source = 15;
+
+        /*
+         * Version we are compiled with
+         */
+        range->we_version_compiled = WIRELESS_EXT;
+
+        range->retry_capa = IW_RETRY_LIMIT;
+        range->retry_flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
+
+        range->min_retry = TX_RETRY_MIN;
+        range->max_retry = TX_RETRY_MAX;
+
+        /*
+         * Set the qual, level and noise range values
+         */
+        range->max_qual.qual = 100;
+        range->max_qual.level = 0;
+        range->max_qual.noise = 0;
+        range->max_qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
+
+        range->avg_qual.qual = 70;
+        /* TODO: Find real 'good' to 'bad' threshold value for RSSI */
+        range->avg_qual.level = 0;
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
+
+        range->sensitivity = 0;
+
+        /*
+         * Setup the supported power level ranges
+         */
+        memset(range->txpower, 0, sizeof(range->txpower));
+        range->txpower[0] = 5;
+        range->txpower[1] = 7;
+        range->txpower[2] = 9;
+        range->txpower[3] = 11;
+        range->txpower[4] = 13;
+        range->txpower[5] = 15;
+        range->txpower[6] = 17;
+        range->txpower[7] = 19;
+
+        range->num_txpower = 8;
+        range->txpower_capa = IW_TXPOW_DBM;
+        range->txpower_capa |= IW_TXPOW_RANGE;
+
+        range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
+                                IW_EVENT_CAPA_MASK(SIOCGIWAP) |
+                                IW_EVENT_CAPA_MASK(SIOCGIWSCAN));
+        range->event_capa[1] = IW_EVENT_CAPA_K_1;
+
+        if (adapter->fwcapinfo & FW_CAPINFO_WPA) {
+                range->enc_capa =   IW_ENC_CAPA_WPA
+                                  | IW_ENC_CAPA_WPA2
+                                  | IW_ENC_CAPA_CIPHER_TKIP
+                                  | IW_ENC_CAPA_CIPHER_CCMP;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_set_power(struct net_device *dev, struct iw_request_info *info,
+                          struct iw_param *vwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        /* PS is currently supported only in Infrastructure mode
+         * Remove this check if it is to be supported in IBSS mode also
+         */
+
+        if (vwrq->disabled) {
+                adapter->psmode = wlan802_11powermodecam;
+                if (adapter->psstate != PS_STATE_FULL_POWER) {
+                        libertas_ps_wakeup(priv, cmd_option_waitforrsp);
+                }
+
+                return 0;
+        }
+
+        if ((vwrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
+                lbs_pr_debug(1,
+                       "Setting power timeout command is not supported\n");
+                return -EINVAL;
+        } else if ((vwrq->flags & IW_POWER_TYPE) == IW_POWER_PERIOD) {
+                lbs_pr_debug(1, "Setting power period command is not supported\n");
+                return -EINVAL;
+        }
+
+        if (adapter->psmode != wlan802_11powermodecam) {
+                return 0;
+        }
+
+        adapter->psmode = wlan802_11powermodemax_psp;
+
+        if (adapter->connect_status == libertas_connected) {
+                libertas_ps_sleep(priv, cmd_option_waitforrsp);
+        }
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_get_power(struct net_device *dev, struct iw_request_info *info,
+                          struct iw_param *vwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int mode;
+
+        ENTER();
+
+        mode = adapter->psmode;
+
+        if ((vwrq->disabled = (mode == wlan802_11powermodecam))
+            || adapter->connect_status == libertas_disconnected) {
+                LEAVE();
+                return 0;
+        }
+
+        vwrq->value = 0;
+
+        LEAVE();
+        return 0;
+}
+
+/*
+ * iwpriv settable callbacks
+ */
+
+static const iw_handler wlan_private_handler[] = {
+        NULL,                   /* SIOCIWFIRSTPRIV */
+};
+
+static const struct iw_priv_args wlan_private_args[] = {
+        /*
+         * { cmd, set_args, get_args, name }
+         */
+        {
+         WLANSCAN_TYPE,
+         IW_PRIV_TYPE_CHAR | 8,
+         IW_PRIV_TYPE_CHAR | 8,
+         "scantype"},
+
+        {
+         WLAN_SETINT_GETINT,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         ""},
+        {
+         WLANNF,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "getNF"},
+        {
+         WLANRSSI,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "getRSSI"},
+        {
+         WLANENABLE11D,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "enable11d"},
+        {
+         WLANADHOCGRATE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "adhocgrate"},
+
+        {
+         WLAN_SUBCMD_SET_PRESCAN,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "prescan"},
+        {
+         WLAN_SETONEINT_GETONEINT,
+         IW_PRIV_TYPE_INT | 1,
+         IW_PRIV_TYPE_INT | 1,
+         ""},
+        {
+         WLAN_BEACON_INTERVAL,
+         IW_PRIV_TYPE_INT | 1,
+         IW_PRIV_TYPE_INT | 1,
+         "bcninterval"},
+        {
+         WLAN_LISTENINTRVL,
+         IW_PRIV_TYPE_INT | 1,
+         IW_PRIV_TYPE_INT | 1,
+         "lolisteninter"},
+        {
+         WLAN_TXCONTROL,
+         IW_PRIV_TYPE_INT | 1,
+         IW_PRIV_TYPE_INT | 1,
+         "txcontrol"},
+        {
+         WLAN_NULLPKTINTERVAL,
+         IW_PRIV_TYPE_INT | 1,
+         IW_PRIV_TYPE_INT | 1,
+         "psnullinterval"},
+        /* Using iwpriv sub-command feature */
+        {
+         WLAN_SETONEINT_GETNONE,        /* IOCTL: 24 */
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         ""},
+
+        {
+         WLAN_SUBCMD_SETRXANTENNA,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "setrxant"},
+        {
+         WLAN_SUBCMD_SETTXANTENNA,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "settxant"},
+        {
+         WLANSETAUTHALG,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "authalgs",
+         },
+        {
+         WLANSET8021XAUTHALG,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "8021xauthalgs",
+         },
+        {
+         WLANSETENCRYPTIONMODE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "encryptionmode",
+         },
+        {
+         WLANSETREGION,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "setregioncode"},
+        {
+         WLAN_SET_LISTEN_INTERVAL,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "setlisteninter"},
+        {
+         WLAN_SET_MULTIPLE_DTIM,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "setmultipledtim"},
+        {
+         WLAN_SET_ATIM_WINDOW,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "atimwindow"},
+        {
+         WLANSETBCNAVG,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "setbcnavg"},
+        {
+         WLANSETDATAAVG,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "setdataavg"},
+        {
+         WLAN_SET_LINKMODE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "linkmode"},
+        {
+         WLAN_SET_RADIOMODE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "radiomode"},
+        {
+         WLAN_SET_DEBUGMODE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "debugmode"},
+        {
+         WLAN_SUBCMD_MESH_SET_TTL,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         IW_PRIV_TYPE_NONE,
+         "mesh_set_ttl"},
+        {
+         WLAN_SETNONE_GETONEINT,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         ""},
+        {
+         WLANGETREGION,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "getregioncode"},
+        {
+         WLAN_GET_LISTEN_INTERVAL,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "getlisteninter"},
+        {
+         WLAN_GET_MULTIPLE_DTIM,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "getmultipledtim"},
+        {
+         WLAN_GET_TX_RATE,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "gettxrate"},
+        {
+         WLANGETBCNAVG,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "getbcnavg"},
+        {
+         WLAN_GET_LINKMODE,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "get_linkmode"},
+        {
+         WLAN_GET_RADIOMODE,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "get_radiomode"},
+        {
+         WLAN_GET_DEBUGMODE,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "get_debugmode"},
+        {
+         WLAN_SUBCMD_FWT_CLEANUP,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "fwt_cleanup"},
+        {
+         WLAN_SUBCMD_FWT_TIME,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "fwt_time"},
+        {
+         WLAN_SUBCMD_MESH_GET_TTL,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "mesh_get_ttl"},
+        {
+         WLAN_SETNONE_GETTWELVE_CHAR,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_CHAR | 12,
+         ""},
+        {
+         WLAN_SUBCMD_GETRXANTENNA,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_CHAR | 12,
+         "getrxant"},
+        {
+         WLAN_SUBCMD_GETTXANTENNA,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_CHAR | 12,
+         "gettxant"},
+        {
+         WLAN_GET_TSF,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_CHAR | 12,
+         "gettsf"},
+        {
+         WLAN_SETNONE_GETNONE,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         ""},
+        {
+         WLANDEAUTH,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "deauth"},
+        {
+         WLANADHOCSTOP,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "adhocstop"},
+        {
+         WLANRADIOON,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "radioon"},
+        {
+         WLANRADIOOFF,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "radiooff"},
+        {
+         WLANWLANIDLEON,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "wlanidle-on"},
+        {
+         WLANWLANIDLEOFF,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "wlanidle-off"},
+        {
+         WLAN_SUBCMD_FWT_RESET,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "fwt_reset"},
+        {
+         WLAN_SUBCMD_BT_RESET,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_NONE,
+         "bt_reset"},
+        {
+         WLAN_SET128CHAR_GET128CHAR,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         ""},
+        /* BT Management */
+        {
+         WLAN_SUBCMD_BT_ADD,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "bt_add"},
+        {
+         WLAN_SUBCMD_BT_DEL,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "bt_del"},
+        {
+         WLAN_SUBCMD_BT_LIST,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "bt_list"},
+        /* FWT Management */
+        {
+         WLAN_SUBCMD_FWT_ADD,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "fwt_add"},
+        {
+         WLAN_SUBCMD_FWT_DEL,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "fwt_del"},
+        {
+         WLAN_SUBCMD_FWT_LOOKUP,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "fwt_lookup"},
+        {
+         WLAN_SUBCMD_FWT_LIST_NEIGHBOR,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "fwt_list_neigh"},
+        {
+         WLAN_SUBCMD_FWT_LIST,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "fwt_list"},
+        {
+         WLAN_SUBCMD_FWT_LIST_ROUTE,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "fwt_list_route"},
+        {
+         WLANSCAN_MODE,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "scanmode"},
+        {
+         WLAN_GET_ADHOC_STATUS,
+         IW_PRIV_TYPE_CHAR | 128,
+         IW_PRIV_TYPE_CHAR | 128,
+         "getadhocstatus"},
+        {
+         WLAN_SETNONE_GETWORDCHAR,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_CHAR | 128,
+         ""},
+        {
+         WLANSETWPAIE,
+         IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 24,
+         IW_PRIV_TYPE_NONE,
+         "setwpaie"},
+        {
+         WLANGETLOG,
+         IW_PRIV_TYPE_NONE,
+         IW_PRIV_TYPE_CHAR | GETLOG_BUFSIZE,
+         "getlog"},
+        {
+         WLAN_SET_GET_SIXTEEN_INT,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         ""},
+        {
+         WLAN_TPCCFG,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "tpccfg"},
+        {
+         WLAN_POWERCFG,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "powercfg"},
+        {
+         WLAN_AUTO_FREQ_SET,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "setafc"},
+        {
+         WLAN_AUTO_FREQ_GET,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "getafc"},
+        {
+         WLAN_SCANPROBES,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "scanprobes"},
+        {
+         WLAN_LED_GPIO_CTRL,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "ledgpio"},
+        {
+         WLAN_ADAPT_RATESET,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "rateadapt"},
+        {
+         WLAN_INACTIVITY_TIMEOUT,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "inactivityto"},
+        {
+         WLANSNR,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "getSNR"},
+        {
+         WLAN_GET_RATE,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "getrate"},
+        {
+         WLAN_GET_RXINFO,
+         IW_PRIV_TYPE_INT | 16,
+         IW_PRIV_TYPE_INT | 16,
+         "getrxinfo"},
+};
+
+static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
+{
+        enum {
+                POOR = 30,
+                FAIR = 60,
+                GOOD = 80,
+                VERY_GOOD = 90,
+                EXCELLENT = 95,
+                PERFECT = 100
+        };
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        u32 rssi_qual;
+        u32 tx_qual;
+        u32 quality = 0;
+        int stats_valid = 0;
+        u8 rssi;
+        u32 tx_retries;
+
+        ENTER();
+
+        priv->wstats.status = adapter->inframode;
+
+        /* If we're not associated, all quality values are meaningless */
+        if (adapter->connect_status != libertas_connected)
+                goto out;
+
+        /* Quality by RSSI */
+        priv->wstats.qual.level =
+            CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_NOAVG],
+             adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
+
+        if (adapter->NF[TYPE_BEACON][TYPE_NOAVG] == 0) {
+                priv->wstats.qual.noise = MRVDRV_NF_DEFAULT_SCAN_VALUE;
+        } else {
+                priv->wstats.qual.noise =
+                    CAL_NF(adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
+        }
+
+        lbs_pr_debug(1, "Signal Level = %#x\n", priv->wstats.qual.level);
+        lbs_pr_debug(1, "Noise = %#x\n", priv->wstats.qual.noise);
+
+        rssi = priv->wstats.qual.level - priv->wstats.qual.noise;
+        if (rssi < 15)
+                rssi_qual = rssi * POOR / 10;
+        else if (rssi < 20)
+                rssi_qual = (rssi - 15) * (FAIR - POOR) / 5 + POOR;
+        else if (rssi < 30)
+                rssi_qual = (rssi - 20) * (GOOD - FAIR) / 5 + FAIR;
+        else if (rssi < 40)
+                rssi_qual = (rssi - 30) * (VERY_GOOD - GOOD) /
+                    10 + GOOD;
+        else
+                rssi_qual = (rssi - 40) * (PERFECT - VERY_GOOD) /
+                    10 + VERY_GOOD;
+        quality = rssi_qual;
+
+        /* Quality by TX errors */
+        priv->wstats.discard.retries = priv->stats.tx_errors;
+
+        tx_retries = adapter->logmsg.retry;
+
+        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;
+        quality = min(quality, tx_qual);
+
+        priv->wstats.discard.code = adapter->logmsg.wepundecryptable;
+        priv->wstats.discard.fragment = adapter->logmsg.fcserror;
+        priv->wstats.discard.retries = tx_retries;
+        priv->wstats.discard.misc = adapter->logmsg.ackfailure;
+
+        /* Calculate quality */
+        priv->wstats.qual.qual = max(quality, (u32)100);
+        priv->wstats.qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
+        stats_valid = 1;
+
+        /* update stats asynchronously for future calls */
+        libertas_prepare_and_send_command(priv, cmd_802_11_rssi, 0,
+                                        0, 0, NULL);
+        libertas_prepare_and_send_command(priv, cmd_802_11_get_log, 0,
+                                        0, 0, NULL);
+out:
+        if (!stats_valid) {
+                priv->wstats.miss.beacon = 0;
+                priv->wstats.discard.retries = 0;
+                priv->wstats.qual.qual = 0;
+                priv->wstats.qual.level = 0;
+                priv->wstats.qual.noise = 0;
+                priv->wstats.qual.updated = IW_QUAL_ALL_UPDATED;
+                priv->wstats.qual.updated |= IW_QUAL_NOISE_INVALID |
+                    IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+        }
+
+        LEAVE ();
+        return &priv->wstats;
+
+
+}
+
+static int wlan_set_freq(struct net_device *dev, struct iw_request_info *info,
+                  struct iw_freq *fwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int rc = -EINPROGRESS;  /* Call commit handler */
+        struct chan_freq_power *cfp;
+
+        ENTER();
+
+        /*
+         * If setting by frequency, convert to a channel
+         */
+        if (fwrq->e == 1) {
+
+                long f = fwrq->m / 100000;
+                int c = 0;
+
+                cfp = find_cfp_by_band_and_freq(adapter, 0, f);
+                if (!cfp) {
+                        lbs_pr_debug(1, "Invalid freq=%ld\n", f);
+                        return -EINVAL;
+                }
+
+                c = (int)cfp->channel;
+
+                if (c < 0)
+                        return -EINVAL;
+
+                fwrq->e = 0;
+                fwrq->m = c;
+        }
+
+        /*
+         * Setting by channel number
+         */
+        if (fwrq->m > 1000 || fwrq->e > 0) {
+                rc = -EOPNOTSUPP;
+        } else {
+                int channel = fwrq->m;
+
+                cfp = libertas_find_cfp_by_band_and_channel(adapter, 0, channel);
+                if (!cfp) {
+                        rc = -EINVAL;
+                } else {
+                        if (adapter->inframode == wlan802_11ibss) {
+                                rc = changeadhocchannel(priv, channel);
+                                /*  If station is WEP enabled, send the
+                                 *  command to set WEP in firmware
+                                 */
+                                if (adapter->secinfo.WEPstatus ==
+                                    wlan802_11WEPenabled) {
+                                        lbs_pr_debug(1, "set_freq: WEP enabled\n");
+                                        ret = libertas_prepare_and_send_command(priv,
+                                                                    cmd_802_11_set_wep,
+                                                                    cmd_act_add,
+                                                                    cmd_option_waitforrsp,
+                                                                    0,
+                                                                    NULL);
+
+                                        if (ret) {
+                                                LEAVE();
+                                                return ret;
+                                        }
+
+                                        adapter->currentpacketfilter |=
+                                            cmd_act_mac_wep_enable;
+
+                                        libertas_set_mac_packet_filter(priv);
+                                }
+                        } else {
+                                rc = -EOPNOTSUPP;
+                        }
+                }
+        }
+
+        LEAVE();
+        return rc;
+}
+
+/**
+ *  @brief use index to get the data rate
+ *
+ *  @param index                The index of data rate
+ *  @return                     data rate or 0
+ */
+u32 libertas_index_to_data_rate(u8 index)
+{
+        if (index >= sizeof(libertas_wlan_data_rates))
+                index = 0;
+
+        return libertas_wlan_data_rates[index];
+}
+
+/**
+ *  @brief use rate to get the index
+ *
+ *  @param rate                 data rate
+ *  @return                     index or 0
+ */
+u8 libertas_data_rate_to_index(u32 rate)
+{
+        u8 *ptr;
+
+        if (rate)
+                if ((ptr = memchr(libertas_wlan_data_rates, (u8) rate,
+                                  sizeof(libertas_wlan_data_rates))))
+                        return (ptr - libertas_wlan_data_rates);
+
+        return 0;
+}
+
+static int wlan_set_rate(struct net_device *dev, struct iw_request_info *info,
+                  struct iw_param *vwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        u32 data_rate;
+        u16 action;
+        int ret = 0;
+        u8 rates[WLAN_SUPPORTED_RATES];
+        u8 *rate;
+
+        ENTER();
+
+        lbs_pr_debug(1, "Vwrq->value = %d\n", vwrq->value);
+
+        if (vwrq->value == -1) {
+                action = cmd_act_set_tx_auto;   // Auto
+                adapter->is_datarate_auto = 1;
+                adapter->datarate = 0;
+        } else {
+                if (vwrq->value % 100000) {
+                        return -EINVAL;
+                }
+
+                data_rate = vwrq->value / 500000;
+
+                memset(rates, 0, sizeof(rates));
+                get_active_data_rates(adapter, rates);
+                rate = rates;
+                while (*rate) {
+                        lbs_pr_debug(1, "Rate=0x%X  Wanted=0x%X\n", *rate,
+                               data_rate);
+                        if ((*rate & 0x7f) == (data_rate & 0x7f))
+                                break;
+                        rate++;
+                }
+                if (!*rate) {
+                        lbs_pr_alert( "The fixed data rate 0x%X is out "
+                               "of range.\n", data_rate);
+                        return -EINVAL;
+                }
+
+                adapter->datarate = data_rate;
+                action = cmd_act_set_tx_fix_rate;
+                adapter->is_datarate_auto = 0;
+        }
+
+        ret = libertas_prepare_and_send_command(priv, cmd_802_11_data_rate,
+                                    action, cmd_option_waitforrsp, 0, NULL);
+
+        LEAVE();
+        return ret;
+}
+
+static int wlan_get_rate(struct net_device *dev, struct iw_request_info *info,
+                  struct iw_param *vwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if (adapter->is_datarate_auto) {
+                vwrq->fixed = 0;
+        } else {
+                vwrq->fixed = 1;
+        }
+
+        vwrq->value = adapter->datarate * 500000;
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_set_mode(struct net_device *dev,
+                  struct iw_request_info *info, u32 * uwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct assoc_request * assoc_req;
+        enum WLAN_802_11_NETWORK_INFRASTRUCTURE new_mode;
+
+        ENTER();
+
+        switch (*uwrq) {
+        case IW_MODE_ADHOC:
+                lbs_pr_debug(1, "Wanted mode is ad-hoc: current datarate=%#x\n",
+                       adapter->datarate);
+                new_mode = wlan802_11ibss;
+                adapter->adhocchannel = DEFAULT_AD_HOC_CHANNEL;
+                break;
+
+        case IW_MODE_INFRA:
+                lbs_pr_debug(1, "Wanted mode is Infrastructure\n");
+                new_mode = wlan802_11infrastructure;
+                break;
+
+        case IW_MODE_AUTO:
+                lbs_pr_debug(1, "Wanted mode is Auto\n");
+                new_mode = wlan802_11autounknown;
+                break;
+
+        default:
+                lbs_pr_debug(1, "Wanted mode is Unknown: 0x%x\n", *uwrq);
+                return -EINVAL;
+        }
+
+        mutex_lock(&adapter->lock);
+        assoc_req = wlan_get_association_request(adapter);
+        if (!assoc_req) {
+                ret = -ENOMEM;
+        } else {
+                assoc_req->mode = new_mode;
+        }
+
+        if (ret == 0) {
+                set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
+                wlan_postpone_association_work(priv);
+        } else {
+                wlan_cancel_association_work(priv);
+        }
+        mutex_unlock(&adapter->lock);
+
+        LEAVE();
+        return ret;
+}
+
+
+/**
+ *  @brief Get Encryption key
+ *
+ *  @param dev                  A pointer to net_device structure
+ *  @param info                 A pointer to iw_request_info structure
+ *  @param vwrq                 A pointer to iw_param structure
+ *  @param extra                A pointer to extra data buf
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_get_encode(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *dwrq, u8 * extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
+
+        ENTER();
+
+        lbs_pr_debug(1, "flags=0x%x index=%d length=%d wep_tx_keyidx=%d\n",
+               dwrq->flags, index, dwrq->length, adapter->wep_tx_keyidx);
+
+        dwrq->flags = 0;
+
+        /* Authentication method */
+        switch (adapter->secinfo.authmode) {
+        case wlan802_11authmodeopen:
+                dwrq->flags = IW_ENCODE_OPEN;
+                break;
+
+        case wlan802_11authmodeshared:
+        case wlan802_11authmodenetworkEAP:
+                dwrq->flags = IW_ENCODE_RESTRICTED;
+                break;
+        default:
+                dwrq->flags = IW_ENCODE_DISABLED | IW_ENCODE_OPEN;
+                break;
+        }
+
+        if ((adapter->secinfo.WEPstatus == wlan802_11WEPenabled)
+            || adapter->secinfo.WPAenabled || adapter->secinfo.WPA2enabled) {
+                dwrq->flags &= ~IW_ENCODE_DISABLED;
+        } else {
+                dwrq->flags |= IW_ENCODE_DISABLED;
+        }
+
+        memset(extra, 0, 16);
+
+        mutex_lock(&adapter->lock);
+
+        /* Default to returning current transmit key */
+        if (index < 0)
+                index = adapter->wep_tx_keyidx;
+
+        if ((adapter->wep_keys[index].len) &&
+            (adapter->secinfo.WEPstatus == wlan802_11WEPenabled)) {
+                memcpy(extra, adapter->wep_keys[index].key,
+                       adapter->wep_keys[index].len);
+                dwrq->length = adapter->wep_keys[index].len;
+
+                dwrq->flags |= (index + 1);
+                /* Return WEP enabled */
+                dwrq->flags &= ~IW_ENCODE_DISABLED;
+        } else if ((adapter->secinfo.WPAenabled)
+                   || (adapter->secinfo.WPA2enabled)) {
+                /* return WPA enabled */
+                dwrq->flags &= ~IW_ENCODE_DISABLED;
+        } else {
+                dwrq->flags |= IW_ENCODE_DISABLED;
+        }
+
+        mutex_unlock(&adapter->lock);
+
+        dwrq->flags |= IW_ENCODE_NOKEY;
+
+        lbs_pr_debug(1, "key:%02x:%02x:%02x:%02x:%02x:%02x keylen=%d\n",
+               extra[0], extra[1], extra[2],
+               extra[3], extra[4], extra[5], dwrq->length);
+
+        lbs_pr_debug(1, "Return flags=0x%x\n", dwrq->flags);
+
+        LEAVE();
+        return 0;
+}
+
+/**
+ *  @brief Set Encryption key (internal)
+ *
+ *  @param priv                 A pointer to private card structure
+ *  @param key_material         A pointer to key material
+ *  @param key_length           length of key material
+ *  @param index                key index to set
+ *  @param set_tx_key           Force set TX key (1 = yes, 0 = no)
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_set_wep_key(struct assoc_request *assoc_req,
+                            const char *key_material,
+                            u16 key_length,
+                            u16 index,
+                            int set_tx_key)
+{
+        struct WLAN_802_11_KEY *pkey;
+
+        ENTER();
+
+        /* Paranoid validation of key index */
+        if (index > 3) {
+                LEAVE();
+                return -EINVAL;
+        }
+
+        /* validate max key length */
+        if (key_length > KEY_LEN_WEP_104) {
+                LEAVE();
+                return -EINVAL;
+        }
+
+        pkey = &assoc_req->wep_keys[index];
+
+        if (key_length > 0) {
+                memset(pkey, 0, sizeof(struct WLAN_802_11_KEY));
+                pkey->type = KEY_TYPE_ID_WEP;
+
+                /* Standardize the key length */
+                pkey->len = (key_length > KEY_LEN_WEP_40) ?
+                                KEY_LEN_WEP_104 : KEY_LEN_WEP_40;
+                memcpy(pkey->key, key_material, key_length);
+        }
+
+        if (set_tx_key) {
+                /* Ensure the chosen key is valid */
+                if (!pkey->len) {
+                        lbs_pr_debug(1, "key not set, so cannot enable it\n");
+                        LEAVE();
+                        return -EINVAL;
+                }
+                assoc_req->wep_tx_keyidx = index;
+        }
+
+        assoc_req->secinfo.WEPstatus = wlan802_11WEPenabled;
+
+        LEAVE();
+        return 0;
+}
+
+static int validate_key_index(u16 def_index, u16 raw_index,
+                              u16 *out_index, u16 *is_default)
+{
+        if (!out_index || !is_default)
+                return -EINVAL;
+
+        /* Verify index if present, otherwise use default TX key index */
+        if (raw_index > 0) {
+                if (raw_index > 4)
+                        return -EINVAL;
+                *out_index = raw_index - 1;
+        } else {
+                *out_index = def_index;
+                *is_default = 1;
+        }
+        return 0;
+}
+
+static void disable_wep(struct assoc_request *assoc_req)
+{
+        int i;
+
+        /* Set Open System auth mode */
+        assoc_req->secinfo.authmode = wlan802_11authmodeopen;
+
+        /* Clear WEP keys and mark WEP as disabled */
+        assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
+        for (i = 0; i < 4; i++)
+                assoc_req->wep_keys[i].len = 0;
+
+        set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
+        set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
+}
+
+/**
+ *  @brief Set Encryption key
+ *
+ *  @param dev                  A pointer to net_device structure
+ *  @param info                 A pointer to iw_request_info structure
+ *  @param vwrq                 A pointer to iw_param structure
+ *  @param extra                A pointer to extra data buf
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_set_encode(struct net_device *dev,
+                    struct iw_request_info *info,
+                    struct iw_point *dwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct assoc_request * assoc_req;
+        u16 is_default = 0, index = 0, set_tx_key = 0;
+
+        ENTER();
+
+        mutex_lock(&adapter->lock);
+        assoc_req = wlan_get_association_request(adapter);
+        if (!assoc_req) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        if (dwrq->flags & IW_ENCODE_DISABLED) {
+                disable_wep (assoc_req);
+                goto out;
+        }
+
+        ret = validate_key_index(assoc_req->wep_tx_keyidx,
+                                 (dwrq->flags & IW_ENCODE_INDEX),
+                                 &index, &is_default);
+        if (ret) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /* If WEP isn't enabled, or if there is no key data but a valid
+         * index, set the TX key.
+         */
+        if ((assoc_req->secinfo.WEPstatus != wlan802_11WEPenabled)
+            || (dwrq->length == 0 && !is_default))
+                set_tx_key = 1;
+
+        ret = wlan_set_wep_key(assoc_req, extra, dwrq->length, index, set_tx_key);
+        if (ret)
+                goto out;
+
+        if (dwrq->length)
+                set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
+        if (set_tx_key)
+                set_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags);
+
+        if (dwrq->flags & IW_ENCODE_RESTRICTED) {
+                assoc_req->secinfo.authmode = wlan802_11authmodeshared;
+        } else if (dwrq->flags & IW_ENCODE_OPEN) {
+                assoc_req->secinfo.authmode = wlan802_11authmodeopen;
+        }
+
+out:
+        if (ret == 0) {
+                set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
+                wlan_postpone_association_work(priv);
+        } else {
+                wlan_cancel_association_work(priv);
+        }
+        mutex_unlock(&adapter->lock);
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Get Extended Encryption key (WPA/802.1x and WEP)
+ *
+ *  @param dev                  A pointer to net_device structure
+ *  @param info                 A pointer to iw_request_info structure
+ *  @param vwrq                 A pointer to iw_param structure
+ *  @param extra                A pointer to extra data buf
+ *  @return                     0 on success, otherwise failure
+ */
+static int wlan_get_encodeext(struct net_device *dev,
+                              struct iw_request_info *info,
+                              struct iw_point *dwrq,
+                              char *extra)
+{
+        int ret = -EINVAL;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
+        int index, max_key_len;
+
+        ENTER();
+
+        max_key_len = dwrq->length - sizeof(*ext);
+        if (max_key_len < 0)
+                goto out;
+
+        index = dwrq->flags & IW_ENCODE_INDEX;
+        if (index) {
+                if (index < 1 || index > 4)
+                        goto out;
+                index--;
+        } else {
+                index = adapter->wep_tx_keyidx;
+        }
+
+        if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY &&
+            ext->alg != IW_ENCODE_ALG_WEP) {
+                if (index != 0 || adapter->inframode != wlan802_11infrastructure)
+                        goto out;
+        }
+
+        dwrq->flags = index + 1;
+        memset(ext, 0, sizeof(*ext));
+
+        if ((adapter->secinfo.WEPstatus == wlan802_11WEPdisabled)
+            && !adapter->secinfo.WPAenabled && !adapter->secinfo.WPA2enabled) {
+                ext->alg = IW_ENCODE_ALG_NONE;
+                ext->key_len = 0;
+                dwrq->flags |= IW_ENCODE_DISABLED;
+        } else {
+                u8 *key = NULL;
+
+                if ((adapter->secinfo.WEPstatus == wlan802_11WEPenabled)
+                    && !adapter->secinfo.WPAenabled
+                    && !adapter->secinfo.WPA2enabled) {
+                        ext->alg = IW_ENCODE_ALG_WEP;
+                        ext->key_len = adapter->wep_keys[index].len;
+                        key = &adapter->wep_keys[index].key[0];
+                } else if ((adapter->secinfo.WEPstatus == wlan802_11WEPdisabled) &&
+                           (adapter->secinfo.WPAenabled ||
+                            adapter->secinfo.WPA2enabled)) {
+                        /* WPA */
+                        ext->alg = IW_ENCODE_ALG_TKIP;
+                        ext->key_len = 0;
+                } else {
+                        goto out;
+                }
+
+                if (ext->key_len > max_key_len) {
+                        ret = -E2BIG;
+                        goto out;
+                }
+
+                if (ext->key_len)
+                        memcpy(ext->key, key, ext->key_len);
+                else
+                        dwrq->flags |= IW_ENCODE_NOKEY;
+                dwrq->flags |= IW_ENCODE_ENABLED;
+        }
+        ret = 0;
+
+out:
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Set Encryption key Extended (WPA/802.1x and WEP)
+ *
+ *  @param dev                  A pointer to net_device structure
+ *  @param info                 A pointer to iw_request_info structure
+ *  @param vwrq                 A pointer to iw_param structure
+ *  @param extra                A pointer to extra data buf
+ *  @return                     0 --success, otherwise fail
+ */
+static int wlan_set_encodeext(struct net_device *dev,
+                              struct iw_request_info *info,
+                              struct iw_point *dwrq,
+                              char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
+        int alg = ext->alg;
+        struct assoc_request * assoc_req;
+
+        ENTER();
+
+        mutex_lock(&adapter->lock);
+        assoc_req = wlan_get_association_request(adapter);
+        if (!assoc_req) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        if ((alg == IW_ENCODE_ALG_NONE) || (dwrq->flags & IW_ENCODE_DISABLED)) {
+                disable_wep (assoc_req);
+        } else if (alg == IW_ENCODE_ALG_WEP) {
+                u16 is_default = 0, index, set_tx_key = 0;
+
+                ret = validate_key_index(assoc_req->wep_tx_keyidx,
+                                         (dwrq->flags & IW_ENCODE_INDEX),
+                                         &index, &is_default);
+                if (ret)
+                        goto out;
+
+                /* If WEP isn't enabled, or if there is no key data but a valid
+                 * index, or if the set-TX-key flag was passed, set the TX key.
+                 */
+                if ((assoc_req->secinfo.WEPstatus != wlan802_11WEPenabled)
+                    || (dwrq->length == 0 && !is_default)
+                    || (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY))
+                        set_tx_key = 1;
+
+                /* Copy key to driver */
+                ret = wlan_set_wep_key (assoc_req, ext->key, ext->key_len, index,
+                                        set_tx_key);
+                if (ret)
+                        goto out;
+
+                if (dwrq->flags & IW_ENCODE_RESTRICTED) {
+                        assoc_req->secinfo.authmode =
+                            wlan802_11authmodeshared;
+                } else if (dwrq->flags & IW_ENCODE_OPEN) {
+                        assoc_req->secinfo.authmode =
+                            wlan802_11authmodeopen;
+                }
+
+                /* Mark the various WEP bits as modified */
+                set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
+                if (dwrq->length)
+                        set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
+                if (set_tx_key)
+                        set_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags);
+
+        } else if ((alg == IW_ENCODE_ALG_TKIP) || (alg == IW_ENCODE_ALG_CCMP)) {
+                struct WLAN_802_11_KEY * pkey;
+
+                /* validate key length */
+                if (((alg == IW_ENCODE_ALG_TKIP)
+                        && (ext->key_len != KEY_LEN_WPA_TKIP))
+                    || ((alg == IW_ENCODE_ALG_CCMP)
+                        && (ext->key_len != KEY_LEN_WPA_AES))) {
+                                lbs_pr_debug(1, "Invalid size %d for key of alg"
+                                       "type %d.\n",
+                                       ext->key_len,
+                                       alg);
+                                ret = -EINVAL;
+                                goto out;
+                }
+
+                if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY)
+                        pkey = &assoc_req->wpa_mcast_key;
+                else
+                        pkey = &assoc_req->wpa_unicast_key;
+
+                memset(pkey, 0, sizeof (struct WLAN_802_11_KEY));
+                memcpy(pkey->key, ext->key, ext->key_len);
+                pkey->len = ext->key_len;
+                pkey->flags = KEY_INFO_WPA_ENABLED;
+
+                if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
+                        pkey->flags |= KEY_INFO_WPA_MCAST;
+                        set_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
+                } else {
+                        pkey->flags |= KEY_INFO_WPA_UNICAST;
+                        set_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
+                }
+
+                if (alg == IW_ENCODE_ALG_TKIP)
+                        pkey->type = KEY_TYPE_ID_TKIP;
+                else if (alg == IW_ENCODE_ALG_CCMP)
+                        pkey->type = KEY_TYPE_ID_AES;
+
+                /* If WPA isn't enabled yet, do that now */
+                if (   assoc_req->secinfo.WPAenabled == 0
+                    && assoc_req->secinfo.WPA2enabled == 0) {
+                        assoc_req->secinfo.WPAenabled = 1;
+                        assoc_req->secinfo.WPA2enabled = 1;
+                        set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
+                }
+
+                disable_wep (assoc_req);
+        }
+
+out:
+        if (ret == 0) {
+                wlan_postpone_association_work(priv);
+        } else {
+                wlan_cancel_association_work(priv);
+        }
+        mutex_unlock(&adapter->lock);
+
+        LEAVE();
+        return ret;
+}
+
+
+static int wlan_set_genie(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_point *dwrq,
+                          char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct assoc_request * assoc_req;
+
+        ENTER();
+
+        mutex_lock(&adapter->lock);
+        assoc_req = wlan_get_association_request(adapter);
+        if (!assoc_req) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        if (dwrq->length > MAX_WPA_IE_LEN ||
+            (dwrq->length && extra == NULL)) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (dwrq->length) {
+                memcpy(&assoc_req->wpa_ie[0], extra, dwrq->length);
+                assoc_req->wpa_ie_len = dwrq->length;
+        } else {
+                memset(&assoc_req->wpa_ie[0], 0, sizeof(adapter->wpa_ie));
+                assoc_req->wpa_ie_len = 0;
+        }
+
+out:
+        if (ret == 0) {
+                set_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags);
+                wlan_postpone_association_work(priv);
+        } else {
+                wlan_cancel_association_work(priv);
+        }
+        mutex_unlock(&adapter->lock);
+
+        LEAVE();
+        return ret;
+}
+
+static int wlan_get_genie(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_point *dwrq,
+                          char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        if (adapter->wpa_ie_len == 0) {
+                dwrq->length = 0;
+                LEAVE();
+                return 0;
+        }
+
+        if (dwrq->length < adapter->wpa_ie_len) {
+                LEAVE();
+                return -E2BIG;
+        }
+
+        dwrq->length = adapter->wpa_ie_len;
+        memcpy(extra, &adapter->wpa_ie[0], adapter->wpa_ie_len);
+
+        LEAVE();
+        return 0;
+}
+
+
+static int wlan_set_auth(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_param *dwrq,
+                         char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct assoc_request * assoc_req;
+        int ret = 0;
+        int updated = 0;
+
+        ENTER();
+
+        mutex_lock(&adapter->lock);
+        assoc_req = wlan_get_association_request(adapter);
+        if (!assoc_req) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        switch (dwrq->flags & IW_AUTH_INDEX) {
+        case IW_AUTH_TKIP_COUNTERMEASURES:
+        case IW_AUTH_CIPHER_PAIRWISE:
+        case IW_AUTH_CIPHER_GROUP:
+        case IW_AUTH_KEY_MGMT:
+                /*
+                 * libertas does not use these parameters
+                 */
+                break;
+
+        case IW_AUTH_WPA_VERSION:
+                if (dwrq->value & IW_AUTH_WPA_VERSION_DISABLED) {
+                        assoc_req->secinfo.WPAenabled = 0;
+                        assoc_req->secinfo.WPA2enabled = 0;
+                }
+                if (dwrq->value & IW_AUTH_WPA_VERSION_WPA) {
+                        assoc_req->secinfo.WPAenabled = 1;
+                        assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
+                        assoc_req->secinfo.authmode =
+                            wlan802_11authmodeopen;
+                }
+                if (dwrq->value & IW_AUTH_WPA_VERSION_WPA2) {
+                        assoc_req->secinfo.WPA2enabled = 1;
+                        assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
+                        assoc_req->secinfo.authmode =
+                            wlan802_11authmodeopen;
+                }
+                updated = 1;
+                break;
+
+        case IW_AUTH_DROP_UNENCRYPTED:
+                if (dwrq->value) {
+                        adapter->currentpacketfilter |=
+                            cmd_act_mac_strict_protection_enable;
+                } else {
+                        adapter->currentpacketfilter &=
+                            ~cmd_act_mac_strict_protection_enable;
+                }
+                updated = 1;
+                break;
+
+        case IW_AUTH_80211_AUTH_ALG:
+                if (dwrq->value & IW_AUTH_ALG_SHARED_KEY) {
+                        assoc_req->secinfo.authmode =
+                            wlan802_11authmodeshared;
+                } else if (dwrq->value & IW_AUTH_ALG_OPEN_SYSTEM) {
+                        assoc_req->secinfo.authmode =
+                            wlan802_11authmodeopen;
+                } else if (dwrq->value & IW_AUTH_ALG_LEAP) {
+                        assoc_req->secinfo.authmode =
+                            wlan802_11authmodenetworkEAP;
+                } else {
+                        ret = -EINVAL;
+                }
+                updated = 1;
+                break;
+
+        case IW_AUTH_WPA_ENABLED:
+                if (dwrq->value) {
+                        if (!assoc_req->secinfo.WPAenabled &&
+                            !assoc_req->secinfo.WPA2enabled) {
+                                assoc_req->secinfo.WPAenabled = 1;
+                                assoc_req->secinfo.WPA2enabled = 1;
+                                assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
+                                assoc_req->secinfo.authmode =
+                                    wlan802_11authmodeopen;
+                        }
+                } else {
+                        assoc_req->secinfo.WPAenabled = 0;
+                        assoc_req->secinfo.WPA2enabled = 0;
+                }
+                updated = 1;
+                break;
+
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+out:
+        if (ret == 0) {
+                if (updated)
+                        set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
+                wlan_postpone_association_work(priv);
+        } else if (ret != -EOPNOTSUPP) {
+                wlan_cancel_association_work(priv);
+        }
+        mutex_unlock(&adapter->lock);
+
+        LEAVE();
+        return ret;
+}
+
+static int wlan_get_auth(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_param *dwrq,
+                         char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+
+        switch (dwrq->flags & IW_AUTH_INDEX) {
+        case IW_AUTH_WPA_VERSION:
+                dwrq->value = 0;
+                if (adapter->secinfo.WPAenabled)
+                        dwrq->value |= IW_AUTH_WPA_VERSION_WPA;
+                if (adapter->secinfo.WPA2enabled)
+                        dwrq->value |= IW_AUTH_WPA_VERSION_WPA2;
+                if (!dwrq->value)
+                        dwrq->value |= IW_AUTH_WPA_VERSION_DISABLED;
+                break;
+
+        case IW_AUTH_DROP_UNENCRYPTED:
+                dwrq->value = 0;
+                if (adapter->currentpacketfilter &
+                    cmd_act_mac_strict_protection_enable)
+                        dwrq->value = 1;
+                break;
+
+        case IW_AUTH_80211_AUTH_ALG:
+                switch (adapter->secinfo.authmode) {
+                case wlan802_11authmodeshared:
+                        dwrq->value = IW_AUTH_ALG_SHARED_KEY;
+                        break;
+                case wlan802_11authmodeopen:
+                        dwrq->value = IW_AUTH_ALG_OPEN_SYSTEM;
+                        break;
+                case wlan802_11authmodenetworkEAP:
+                        dwrq->value = IW_AUTH_ALG_LEAP;
+                        break;
+                default:
+                        break;
+                }
+                break;
+
+        case IW_AUTH_WPA_ENABLED:
+                if (adapter->secinfo.WPAenabled && adapter->secinfo.WPA2enabled)
+                        dwrq->value = 1;
+                break;
+
+        default:
+                LEAVE();
+                return -EOPNOTSUPP;
+        }
+
+        LEAVE();
+        return 0;
+}
+
+
+static int wlan_set_txpow(struct net_device *dev, struct iw_request_info *info,
+                   struct iw_param *vwrq, char *extra)
+{
+        int ret = 0;
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        u16 dbm;
+
+        ENTER();
+
+        if (vwrq->disabled) {
+                wlan_radio_ioctl(priv, RADIO_OFF);
+                return 0;
+        }
+
+        adapter->preamble = cmd_type_auto_preamble;
+
+        wlan_radio_ioctl(priv, RADIO_ON);
+
+        if ((vwrq->flags & IW_TXPOW_TYPE) == IW_TXPOW_MWATT) {
+                dbm = (u16) mw_to_dbm(vwrq->value);
+        } else
+                dbm = (u16) vwrq->value;
+
+        /* auto tx power control */
+
+        if (vwrq->fixed == 0)
+                dbm = 0xffff;
+
+        lbs_pr_debug(1, "<1>TXPOWER SET %d dbm.\n", dbm);
+
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_rf_tx_power,
+                                    cmd_act_tx_power_opt_set_low,
+                                    cmd_option_waitforrsp, 0, (void *)&dbm);
+
+        LEAVE();
+        return ret;
+}
+
+static int wlan_get_essid(struct net_device *dev, struct iw_request_info *info,
+                   struct iw_point *dwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+
+        ENTER();
+        /*
+         * Note : if dwrq->flags != 0, we should get the relevant SSID from
+         * the SSID list...
+         */
+
+        /*
+         * Get the current SSID
+         */
+        if (adapter->connect_status == libertas_connected) {
+                memcpy(extra, adapter->curbssparams.ssid.ssid,
+                       adapter->curbssparams.ssid.ssidlength);
+                extra[adapter->curbssparams.ssid.ssidlength] = '\0';
+        } else {
+                memset(extra, 0, 32);
+                extra[adapter->curbssparams.ssid.ssidlength] = '\0';
+        }
+        /*
+         * If none, we may want to get the one that was set
+         */
+
+        /* To make the driver backward compatible with WPA supplicant v0.2.4 */
+        if (dwrq->length == 32) /* check with WPA supplicant buffer size */
+                dwrq->length = min_t(size_t, adapter->curbssparams.ssid.ssidlength,
+                                   IW_ESSID_MAX_SIZE);
+        else
+                dwrq->length = adapter->curbssparams.ssid.ssidlength + 1;
+
+        dwrq->flags = 1;        /* active */
+
+        LEAVE();
+        return 0;
+}
+
+static int wlan_set_essid(struct net_device *dev, struct iw_request_info *info,
+                   struct iw_point *dwrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct WLAN_802_11_SSID ssid;
+        struct assoc_request * assoc_req;
+        int ssid_len = dwrq->length;
+
+        ENTER();
+
+        /*
+         * WE-20 and earlier NULL pad the end of the SSID and increment
+         * SSID length so it can be used like a string.  WE-21 and later don't,
+         * but some userspace tools aren't able to cope with the change.
+         */
+        if ((ssid_len > 0) && (extra[ssid_len - 1] == '\0'))
+                ssid_len--;
+
+        /* Check the size of the string */
+        if (ssid_len > IW_ESSID_MAX_SIZE) {
+                ret = -E2BIG;
+                goto out;
+        }
+
+        memset(&ssid, 0, sizeof(struct WLAN_802_11_SSID));
+
+        if (!dwrq->flags || !ssid_len) {
+                /* "any" SSID requested; leave SSID blank */
+        } else {
+                /* Specific SSID requested */
+                memcpy(&ssid.ssid, extra, ssid_len);
+                ssid.ssidlength = ssid_len;
+        }
+
+        lbs_pr_debug(1, "Requested new SSID = %s\n",
+               (ssid.ssidlength > 0) ? (char *)ssid.ssid : "any");
+
+out:
+        mutex_lock(&adapter->lock);
+        if (ret == 0) {
+                /* Get or create the current association request */
+                assoc_req = wlan_get_association_request(adapter);
+                if (!assoc_req) {
+                        ret = -ENOMEM;
+                } else {
+                        /* Copy the SSID to the association request */
+                        memcpy(&assoc_req->ssid, &ssid, sizeof(struct WLAN_802_11_SSID));
+                        set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
+                        wlan_postpone_association_work(priv);
+                }
+        }
+
+        /* Cancel the association request if there was an error */
+        if (ret != 0) {
+                wlan_cancel_association_work(priv);
+        }
+
+        mutex_unlock(&adapter->lock);
+
+        LEAVE();
+        return ret;
+}
+
+/**
+ *  @brief Connect to the AP or Ad-hoc Network with specific bssid
+ *
+ *  @param dev          A pointer to net_device structure
+ *  @param info         A pointer to iw_request_info structure
+ *  @param awrq         A pointer to iw_param structure
+ *  @param extra        A pointer to extra data buf
+ *  @return             0 --success, otherwise fail
+ */
+static int wlan_set_wap(struct net_device *dev, struct iw_request_info *info,
+                 struct sockaddr *awrq, char *extra)
+{
+        wlan_private *priv = dev->priv;
+        wlan_adapter *adapter = priv->adapter;
+        struct assoc_request * assoc_req;
+        int ret = 0;
+
+        ENTER();
+
+        if (awrq->sa_family != ARPHRD_ETHER)
+                return -EINVAL;
+
+        lbs_pr_debug(1, "ASSOC: WAP: sa_data: " MAC_FMT "\n", MAC_ARG(awrq->sa_data));
+
+        mutex_lock(&adapter->lock);
+
+        /* Get or create the current association request */
+        assoc_req = wlan_get_association_request(adapter);
+        if (!assoc_req) {
+                wlan_cancel_association_work(priv);
+                ret = -ENOMEM;
+        } else {
+                /* Copy the BSSID to the association request */
+                memcpy(&assoc_req->bssid, awrq->sa_data, ETH_ALEN);
+                set_bit(ASSOC_FLAG_BSSID, &assoc_req->flags);
+                wlan_postpone_association_work(priv);
+        }
+
+        mutex_unlock(&adapter->lock);
+
+        return ret;
+}
+
+void libertas_get_fwversion(wlan_adapter * adapter, char *fwversion, int maxlen)
+{
+        union {
+                u32 l;
+                u8 c[4];
+        } ver;
+        char fwver[32];
+
+        mutex_lock(&adapter->lock);
+        ver.l = adapter->fwreleasenumber;
+        mutex_unlock(&adapter->lock);
+
+        if (ver.c[3] == 0)
+                sprintf(fwver, "%u.%u.%u", ver.c[2], ver.c[1], ver.c[0]);
+        else
+                sprintf(fwver, "%u.%u.%u.p%u",
+                        ver.c[2], ver.c[1], ver.c[0], ver.c[3]);
+
+        snprintf(fwversion, maxlen, fwver);
+}
+
+
+/*
+ * iwconfig settable callbacks
+ */
+static const iw_handler wlan_handler[] = {
+        (iw_handler) NULL,      /* SIOCSIWCOMMIT */
+        (iw_handler) wlan_get_name,     /* SIOCGIWNAME */
+        (iw_handler) NULL,      /* SIOCSIWNWID */
+        (iw_handler) NULL,      /* SIOCGIWNWID */
+        (iw_handler) wlan_set_freq,     /* SIOCSIWFREQ */
+        (iw_handler) wlan_get_freq,     /* SIOCGIWFREQ */
+        (iw_handler) wlan_set_mode,     /* SIOCSIWMODE */
+        (iw_handler) wlan_get_mode,     /* SIOCGIWMODE */
+        (iw_handler) NULL,      /* SIOCSIWSENS */
+        (iw_handler) NULL,      /* SIOCGIWSENS */
+        (iw_handler) NULL,      /* SIOCSIWRANGE */
+        (iw_handler) wlan_get_range,    /* SIOCGIWRANGE */
+        (iw_handler) NULL,      /* SIOCSIWPRIV */
+        (iw_handler) NULL,      /* SIOCGIWPRIV */
+        (iw_handler) NULL,      /* SIOCSIWSTATS */
+        (iw_handler) NULL,      /* SIOCGIWSTATS */
+        iw_handler_set_spy,     /* SIOCSIWSPY */
+        iw_handler_get_spy,     /* SIOCGIWSPY */
+        iw_handler_set_thrspy,  /* SIOCSIWTHRSPY */
+        iw_handler_get_thrspy,  /* SIOCGIWTHRSPY */
+        (iw_handler) wlan_set_wap,      /* SIOCSIWAP */
+        (iw_handler) wlan_get_wap,      /* SIOCGIWAP */
+        (iw_handler) NULL,      /* SIOCSIWMLME */
+        (iw_handler) NULL,      /* SIOCGIWAPLIST - deprecated */
+        (iw_handler) libertas_set_scan, /* SIOCSIWSCAN */
+        (iw_handler) libertas_get_scan, /* SIOCGIWSCAN */
+        (iw_handler) wlan_set_essid,    /* SIOCSIWESSID */
+        (iw_handler) wlan_get_essid,    /* SIOCGIWESSID */
+        (iw_handler) wlan_set_nick,     /* SIOCSIWNICKN */
+        (iw_handler) wlan_get_nick,     /* SIOCGIWNICKN */
+        (iw_handler) NULL,      /* -- hole -- */
+        (iw_handler) NULL,      /* -- hole -- */
+        (iw_handler) wlan_set_rate,     /* SIOCSIWRATE */
+        (iw_handler) wlan_get_rate,     /* SIOCGIWRATE */
+        (iw_handler) wlan_set_rts,      /* SIOCSIWRTS */
+        (iw_handler) wlan_get_rts,      /* SIOCGIWRTS */
+        (iw_handler) wlan_set_frag,     /* SIOCSIWFRAG */
+        (iw_handler) wlan_get_frag,     /* SIOCGIWFRAG */
+        (iw_handler) wlan_set_txpow,    /* SIOCSIWTXPOW */
+        (iw_handler) wlan_get_txpow,    /* SIOCGIWTXPOW */
+        (iw_handler) wlan_set_retry,    /* SIOCSIWRETRY */
+        (iw_handler) wlan_get_retry,    /* SIOCGIWRETRY */
+        (iw_handler) wlan_set_encode,   /* SIOCSIWENCODE */
+        (iw_handler) wlan_get_encode,   /* SIOCGIWENCODE */
+        (iw_handler) wlan_set_power,    /* SIOCSIWPOWER */
+        (iw_handler) wlan_get_power,    /* SIOCGIWPOWER */
+        (iw_handler) NULL,      /* -- hole -- */
+        (iw_handler) NULL,      /* -- hole -- */
+        (iw_handler) wlan_set_genie,    /* SIOCSIWGENIE */
+        (iw_handler) wlan_get_genie,    /* SIOCGIWGENIE */
+        (iw_handler) wlan_set_auth,     /* SIOCSIWAUTH */
+        (iw_handler) wlan_get_auth,     /* SIOCGIWAUTH */
+        (iw_handler) wlan_set_encodeext,/* SIOCSIWENCODEEXT */
+        (iw_handler) wlan_get_encodeext,/* SIOCGIWENCODEEXT */
+        (iw_handler) NULL,              /* SIOCSIWPMKSA */
+};
+
+struct iw_handler_def libertas_handler_def = {
+        .num_standard   = sizeof(wlan_handler) / sizeof(iw_handler),
+        .num_private    = sizeof(wlan_private_handler) / sizeof(iw_handler),
+        .num_private_args = sizeof(wlan_private_args) /
+                sizeof(struct iw_priv_args),
+        .standard       = (iw_handler *) wlan_handler,
+        .private        = (iw_handler *) wlan_private_handler,
+        .private_args   = (struct iw_priv_args *)wlan_private_args,
+        .get_wireless_stats = wlan_get_wireless_stats,
+};
diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
new file mode 100644
index 000000000000..39f367c38d90
--- /dev/null
+++ b/drivers/net/wireless/libertas/wext.h
@@ -0,0 +1,147 @@
+/**
+  * This file contains definition for IOCTL call.
+  */
+#ifndef _WLAN_WEXT_H_
+#define _WLAN_WEXT_H_
+
+#define SUBCMD_OFFSET                   4
+#define SUBCMD_DATA(x)                  *((int *)(x->u.name + SUBCMD_OFFSET))
+
+/** PRIVATE CMD ID */
+#define WLANIOCTL                       SIOCIWFIRSTPRIV
+
+#define WLANSETWPAIE                    (WLANIOCTL + 0)
+
+#define WLAN_SETINT_GETINT              (WLANIOCTL + 7)
+#define WLANNF                                  1
+#define WLANRSSI                                2
+#define WLANENABLE11D                           5
+#define WLANADHOCGRATE                          6
+#define WLAN_SUBCMD_SET_PRESCAN                 11
+
+#define WLAN_SETNONE_GETNONE            (WLANIOCTL + 8)
+#define WLANDEAUTH                              1
+#define WLANRADIOON                             2
+#define WLANRADIOOFF                            3
+#define WLANREMOVEADHOCAES                      4
+#define WLANADHOCSTOP                           5
+#define WLANCIPHERTEST                          6
+#define WLANCRYPTOTEST                          7
+
+#define WLANWLANIDLEON                          10
+#define WLANWLANIDLEOFF                         11
+#define WLAN_SUBCMD_BT_RESET                    13
+#define WLAN_SUBCMD_FWT_RESET                   14
+
+#define WLANGETLOG                      (WLANIOCTL + 9)
+#define GETLOG_BUFSIZE  300
+
+#define WLANSCAN_TYPE                   (WLANIOCTL + 11)
+
+#define WLAN_SETNONE_GETONEINT          (WLANIOCTL + 15)
+#define WLANGETREGION                           1
+#define WLAN_GET_LISTEN_INTERVAL                2
+#define WLAN_GET_MULTIPLE_DTIM                  3
+#define WLAN_GET_TX_RATE                        4
+#define WLANGETBCNAVG                           5
+
+#define WLAN_GET_LINKMODE                       6
+#define WLAN_GET_RADIOMODE                      7
+#define WLAN_GET_DEBUGMODE                      8
+#define WLAN_SUBCMD_FWT_CLEANUP                 15
+#define WLAN_SUBCMD_FWT_TIME                    16
+#define WLAN_SUBCMD_MESH_GET_TTL                17
+
+#define WLANREGCFRDWR                   (WLANIOCTL + 18)
+
+#define WLAN_SETNONE_GETTWELVE_CHAR (WLANIOCTL + 19)
+#define WLAN_SUBCMD_GETRXANTENNA    1
+#define WLAN_SUBCMD_GETTXANTENNA    2
+#define WLAN_GET_TSF                3
+
+#define WLAN_SETNONE_GETWORDCHAR        (WLANIOCTL + 21)
+#define WLANGETADHOCAES                         1
+
+#define WLAN_SETONEINT_GETONEINT        (WLANIOCTL + 23)
+#define WLAN_BEACON_INTERVAL                    1
+#define WLAN_LISTENINTRVL                       4
+
+#define WLAN_TXCONTROL                          6
+#define WLAN_NULLPKTINTERVAL                    7
+
+#define WLAN_SETONEINT_GETNONE          (WLANIOCTL + 24)
+#define WLAN_SUBCMD_SETRXANTENNA                1
+#define WLAN_SUBCMD_SETTXANTENNA                2
+#define WLANSETAUTHALG                          5
+#define WLANSET8021XAUTHALG                     6
+#define WLANSETENCRYPTIONMODE                   7
+#define WLANSETREGION                           8
+#define WLAN_SET_LISTEN_INTERVAL                9
+
+#define WLAN_SET_MULTIPLE_DTIM                  10
+#define WLAN_SET_ATIM_WINDOW                    11
+#define WLANSETBCNAVG                           13
+#define WLANSETDATAAVG                          14
+#define WLAN_SET_LINKMODE                       15
+#define WLAN_SET_RADIOMODE                      16
+#define WLAN_SET_DEBUGMODE                      17
+#define WLAN_SUBCMD_MESH_SET_TTL                18
+
+#define WLAN_SET128CHAR_GET128CHAR      (WLANIOCTL + 25)
+#define WLANSCAN_MODE                           6
+
+#define WLAN_GET_ADHOC_STATUS                   9
+
+#define WLAN_SUBCMD_BT_ADD                      18
+#define WLAN_SUBCMD_BT_DEL                      19
+#define WLAN_SUBCMD_BT_LIST                     20
+#define WLAN_SUBCMD_FWT_ADD                             21
+#define WLAN_SUBCMD_FWT_DEL             22
+#define WLAN_SUBCMD_FWT_LOOKUP          23
+#define WLAN_SUBCMD_FWT_LIST_NEIGHBOR                   24
+#define WLAN_SUBCMD_FWT_LIST                    25
+#define WLAN_SUBCMD_FWT_LIST_ROUTE                      26
+
+#define WLAN_SET_GET_SIXTEEN_INT       (WLANIOCTL + 29)
+#define WLAN_TPCCFG                             1
+#define WLAN_POWERCFG                           2
+
+#define WLAN_AUTO_FREQ_SET                      3
+#define WLAN_AUTO_FREQ_GET                      4
+#define WLAN_LED_GPIO_CTRL                      5
+#define WLAN_SCANPROBES                         6
+#define WLAN_ADAPT_RATESET                      8
+#define WLAN_INACTIVITY_TIMEOUT                 9
+#define WLANSNR                                 10
+#define WLAN_GET_RATE                           11
+#define WLAN_GET_RXINFO                         12
+
+#define WLANCMD52RDWR                   (WLANIOCTL + 30)
+#define WLANCMD53RDWR                   (WLANIOCTL + 31)
+#define CMD53BUFLEN                             32
+
+#define REG_MAC                                 0x19
+#define REG_BBP                                 0x1a
+#define REG_RF                                  0x1b
+#define REG_EEPROM                              0x59
+#define WLAN_LINKMODE_802_3                     0
+#define WLAN_LINKMODE_802_11                    2
+#define WLAN_RADIOMODE_NONE                     0
+#define WLAN_RADIOMODE_RADIOTAP                 2
+
+/** wlan_ioctl_regrdwr */
+struct wlan_ioctl_regrdwr {
+        /** Which register to access */
+        u16 whichreg;
+        /** Read or Write */
+        u16 action;
+        u32 offset;
+        u16 NOB;
+        u32 value;
+};
+
+extern struct iw_handler_def libertas_handler_def;
+int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int i);
+int wlan_radio_ioctl(wlan_private * priv, u8 option);
+
+#endif                          /* _WLAN_WEXT_H_ */
diff --git a/drivers/net/wireless/todo.txt b/drivers/net/wireless/todo.txt
deleted file mode 100644
index 32234018de72..000000000000
--- a/drivers/net/wireless/todo.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-        Wireless Todo
-        -------------
-
-1) Bring other kernel Wireless LAN drivers here
-        Completed
-
-2) Bring new Wireless LAN driver not yet in the kernel there
-        See my web page for details
-        In particular : HostAP
-
-3) Misc
-        o Mark wavelan, wavelan_cs, netwave_cs drivers as obsolete
-        o Maybe arlan.c, ray_cs.c and strip.c also deserve to be obsolete
-
-        Jean II
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 87ee3ee020fe..95b4a2a26707 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -67,11 +67,12 @@ static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
         i += scnprint_mac_oui(chip->e2p_mac, buffer+i, size-i);
         i += scnprintf(buffer+i, size-i, " ");
         i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
-        i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c", chip->pa_type,
+        i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c%c", chip->pa_type,
                 chip->patch_cck_gain ? 'g' : '-',
                 chip->patch_cr157 ? '7' : '-',
                 chip->patch_6m_band_edge ? '6' : '-',
-                chip->new_phy_layout ? 'N' : '-');
+                chip->new_phy_layout ? 'N' : '-',
+                chip->al2230s_bit ? 'S' : '-');
         return i;
 }
 
@@ -114,7 +115,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr
         /* Allocate a single memory block for values and addresses. */
         count16 = 2*count;
         a16 = (zd_addr_t *) kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
-                                   GFP_NOFS);
+                                   GFP_KERNEL);
         if (!a16) {
                 dev_dbg_f(zd_chip_dev(chip),
                           "error ENOMEM in allocation of a16\n");
@@ -163,7 +164,7 @@ int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
 
         /* Allocate a single memory block for values and addresses. */
         count16 = 2*count;
-        ioreqs16 = kmalloc(count16 * sizeof(struct zd_ioreq16), GFP_NOFS);
+        ioreqs16 = kmalloc(count16 * sizeof(struct zd_ioreq16), GFP_KERNEL);
         if (!ioreqs16) {
                 r = -ENOMEM;
                 dev_dbg_f(zd_chip_dev(chip),
@@ -614,16 +615,24 @@ static int patch_cr157(struct zd_chip *chip)
  * Vendor driver says: for FCC regulation, enabled per HWFeature 6M band edge
  * bit (for AL2230, AL2230S)
  */
-static int patch_6m_band_edge(struct zd_chip *chip, int channel)
+static int patch_6m_band_edge(struct zd_chip *chip, u8 channel)
+{
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        if (!chip->patch_6m_band_edge)
+                return 0;
+
+        return zd_rf_patch_6m_band_edge(&chip->rf, channel);
+}
+
+/* Generic implementation of 6M band edge patching, used by most RFs via
+ * zd_rf_generic_patch_6m() */
+int zd_chip_generic_patch_6m_band(struct zd_chip *chip, int channel)
 {
         struct zd_ioreq16 ioreqs[] = {
                 { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
                 { CR47,  0x1e },
         };
 
-        if (!chip->patch_6m_band_edge || !chip->rf.patch_6m_band_edge)
-                return 0;
-
         /* FIXME: Channel 11 is not the edge for all regulatory domains. */
         if (channel == 1 || channel == 11)
                 ioreqs[0].value = 0x12;
@@ -683,17 +692,17 @@ static int zd1211_hw_reset_phy(struct zd_chip *chip)
                 { CR111, 0x27 }, { CR112, 0x27 }, { CR113, 0x27 },
                 { CR114, 0x27 }, { CR115, 0x26 }, { CR116, 0x24 },
                 { CR117, 0xfc }, { CR118, 0xfa }, { CR120, 0x4f },
-                { CR123, 0x27 }, { CR125, 0xaa }, { CR127, 0x03 },
-                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
-                { CR131, 0x0C }, { CR136, 0xdf }, { CR137, 0x40 },
-                { CR138, 0xa0 }, { CR139, 0xb0 }, { CR140, 0x99 },
-                { CR141, 0x82 }, { CR142, 0x54 }, { CR143, 0x1c },
-                { CR144, 0x6c }, { CR147, 0x07 }, { CR148, 0x4c },
-                { CR149, 0x50 }, { CR150, 0x0e }, { CR151, 0x18 },
-                { CR160, 0xfe }, { CR161, 0xee }, { CR162, 0xaa },
-                { CR163, 0xfa }, { CR164, 0xfa }, { CR165, 0xea },
-                { CR166, 0xbe }, { CR167, 0xbe }, { CR168, 0x6a },
-                { CR169, 0xba }, { CR170, 0xba }, { CR171, 0xba },
+                { CR125, 0xaa }, { CR127, 0x03 }, { CR128, 0x14 },
+                { CR129, 0x12 }, { CR130, 0x10 }, { CR131, 0x0C },
+                { CR136, 0xdf }, { CR137, 0x40 }, { CR138, 0xa0 },
+                { CR139, 0xb0 }, { CR140, 0x99 }, { CR141, 0x82 },
+                { CR142, 0x54 }, { CR143, 0x1c }, { CR144, 0x6c },
+                { CR147, 0x07 }, { CR148, 0x4c }, { CR149, 0x50 },
+                { CR150, 0x0e }, { CR151, 0x18 }, { CR160, 0xfe },
+                { CR161, 0xee }, { CR162, 0xaa }, { CR163, 0xfa },
+                { CR164, 0xfa }, { CR165, 0xea }, { CR166, 0xbe },
+                { CR167, 0xbe }, { CR168, 0x6a }, { CR169, 0xba },
+                { CR170, 0xba }, { CR171, 0xba },
                 /* Note: CR204 must lead the CR203 */
                 { CR204, 0x7d },
                 { },
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index e57ed75d9425..ce0a5f6da0d2 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -833,6 +833,7 @@ int zd_chip_enable_rx(struct zd_chip *chip);
 void zd_chip_disable_rx(struct zd_chip *chip);
 int zd_chip_enable_hwint(struct zd_chip *chip);
 int zd_chip_disable_hwint(struct zd_chip *chip);
+int zd_chip_generic_patch_6m_band(struct zd_chip *chip, int channel);
 
 int zd_chip_set_rts_cts_rate_locked(struct zd_chip *chip,
         u8 rts_rate, int preamble);
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 4c5f78eac349..6753d240c168 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -156,17 +156,8 @@ void zd_mac_clear(struct zd_mac *mac)
 static int reset_mode(struct zd_mac *mac)
 {
         struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
-        struct zd_ioreq32 ioreqs[] = {
-                { CR_RX_FILTER, STA_RX_FILTER },
-                { CR_SNIFFER_ON, 0U },
-        };
-
-        if (ieee->iw_mode == IW_MODE_MONITOR) {
-                ioreqs[0].value = 0xffffffff;
-                ioreqs[1].value = 0x1;
-        }
-
-        return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
+        u32 filter = (ieee->iw_mode == IW_MODE_MONITOR) ? ~0 : STA_RX_FILTER;
+        return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
 }
 
 int zd_mac_open(struct net_device *netdev)
@@ -974,14 +965,14 @@ static int is_data_packet_for_us(struct ieee80211_device *ieee,
         switch (ieee->iw_mode) {
         case IW_MODE_ADHOC:
                 if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != 0 ||
-                    memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) != 0)
+                    compare_ether_addr(hdr->addr3, ieee->bssid) != 0)
                         return 0;
                 break;
         case IW_MODE_AUTO:
         case IW_MODE_INFRA:
                 if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) !=
                     IEEE80211_FCTL_FROMDS ||
-                    memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) != 0)
+                    compare_ether_addr(hdr->addr2, ieee->bssid) != 0)
                         return 0;
                 break;
         default:
@@ -989,9 +980,9 @@ static int is_data_packet_for_us(struct ieee80211_device *ieee,
                 return 0;
         }
 
-        return memcmp(hdr->addr1, netdev->dev_addr, ETH_ALEN) == 0 ||
+        return compare_ether_addr(hdr->addr1, netdev->dev_addr) == 0 ||
                (is_multicast_ether_addr(hdr->addr1) &&
-                memcmp(hdr->addr3, netdev->dev_addr, ETH_ALEN) != 0) ||
+                compare_ether_addr(hdr->addr3, netdev->dev_addr) != 0) ||
                (netdev->flags & IFF_PROMISC);
 }
 
@@ -1047,7 +1038,7 @@ static void update_qual_rssi(struct zd_mac *mac,
         hdr = (struct ieee80211_hdr_3addr *)buffer;
         if (length < offsetof(struct ieee80211_hdr_3addr, addr3))
                 return;
-        if (memcmp(hdr->addr2, zd_mac_to_ieee80211(mac)->bssid, ETH_ALEN) != 0)
+        if (compare_ether_addr(hdr->addr2, zd_mac_to_ieee80211(mac)->bssid) != 0)
                 return;
 
         spin_lock_irqsave(&mac->lock, flags);
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
index f50cff3db916..549c23bcd6cc 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -23,7 +23,7 @@
 #include "zd_ieee80211.h"
 #include "zd_chip.h"
 
-static const char *rfs[] = {
+static const char * const rfs[] = {
         [0]             = "unknown RF0",
         [1]             = "unknown RF1",
         [UW2451_RF]     = "UW2451_RF",
@@ -34,7 +34,7 @@ static const char *rfs[] = {
         [AL2210_RF]     = "AL2210_RF",
         [MAXIM_NEW_RF]  = "MAXIM_NEW_RF",
         [UW2453_RF]     = "UW2453_RF",
-        [AL2230S_RF]    = "AL2230S_RF",
+        [UNKNOWN_A_RF]  = "UNKNOWN_A_RF",
         [RALINK_RF]     = "RALINK_RF",
         [INTERSIL_RF]   = "INTERSIL_RF",
         [RF2959_RF]     = "RF2959_RF",
@@ -154,3 +154,17 @@ int zd_switch_radio_off(struct zd_rf *rf)
                 r = t;
         return r;
 }
+
+int zd_rf_patch_6m_band_edge(struct zd_rf *rf, u8 channel)
+{
+        if (!rf->patch_6m_band_edge)
+                return 0;
+
+        return rf->patch_6m_band_edge(rf, channel);
+}
+
+int zd_rf_generic_patch_6m(struct zd_rf *rf, u8 channel)
+{
+        return zd_chip_generic_patch_6m_band(zd_rf_to_chip(rf), channel);
+}
+
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zd1211rw/zd_rf.h
index a57732eb69e1..aa9cc105ce60 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.h
+++ b/drivers/net/wireless/zd1211rw/zd_rf.h
@@ -26,7 +26,7 @@
 #define AL2210_RF                       0x7
 #define MAXIM_NEW_RF                    0x8
 #define UW2453_RF                       0x9
-#define AL2230S_RF                      0xa
+#define UNKNOWN_A_RF                    0xa
 #define RALINK_RF                       0xb
 #define INTERSIL_RF                     0xc
 #define RF2959_RF                       0xd
@@ -47,17 +47,13 @@ struct zd_rf {
         u8 type;
 
         u8 channel;
-        /*
-         * Whether this RF should patch the 6M band edge
-         * (assuming E2P_POD agrees)
-         */
-        u8 patch_6m_band_edge:1;
 
         /* RF-specific functions */
         int (*init_hw)(struct zd_rf *rf);
         int (*set_channel)(struct zd_rf *rf, u8 channel);
         int (*switch_radio_on)(struct zd_rf *rf);
         int (*switch_radio_off)(struct zd_rf *rf);
+        int (*patch_6m_band_edge)(struct zd_rf *rf, u8 channel);
 };
 
 const char *zd_rf_name(u8 type);
@@ -72,6 +68,9 @@ int zd_rf_set_channel(struct zd_rf *rf, u8 channel);
 int zd_switch_radio_on(struct zd_rf *rf);
 int zd_switch_radio_off(struct zd_rf *rf);
 
+int zd_rf_patch_6m_band_edge(struct zd_rf *rf, u8 channel);
+int zd_rf_generic_patch_6m(struct zd_rf *rf, u8 channel);
+
 /* Functions for individual RF chips */
 
 int zd_rf_init_rf2959(struct zd_rf *rf);
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
index 5235a7827ac5..511392acfedf 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
@@ -59,6 +59,18 @@ static const struct zd_ioreq16 zd1211b_ioreqs_shared_1[] = {
         { CR240, 0x57 }, { CR9,   0xe0 },
 };
 
+static const struct zd_ioreq16 ioreqs_init_al2230s[] = {
+        { CR47,   0x1e }, /* MARK_002 */
+        { CR106,  0x22 },
+        { CR107,  0x2a }, /* MARK_002 */
+        { CR109,  0x13 }, /* MARK_002 */
+        { CR118,  0xf8 }, /* MARK_002 */
+        { CR119,  0x12 }, { CR122,  0xe0 },
+        { CR128,  0x10 }, /* MARK_001 from 0xe->0x10 */
+        { CR129,  0x0e }, /* MARK_001 from 0xd->0x0e */
+        { CR130,  0x10 }, /* MARK_001 from 0xb->0x0d */
+};
+
 static int zd1211b_al2230_finalize_rf(struct zd_chip *chip)
 {
         int r;
@@ -90,7 +102,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
         int r;
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
-        static const struct zd_ioreq16 ioreqs[] = {
+        static const struct zd_ioreq16 ioreqs_init[] = {
                 { CR15,   0x20 }, { CR23,   0x40 }, { CR24,  0x20 },
                 { CR26,   0x11 }, { CR28,   0x3e }, { CR29,  0x00 },
                 { CR44,   0x33 }, { CR106,  0x2a }, { CR107, 0x1a },
@@ -117,10 +129,9 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
                 { CR119,  0x10 }, { CR120,  0x4f }, { CR121, 0x77 },
                 { CR122,  0xe0 }, { CR137,  0x88 }, { CR252, 0xff },
                 { CR253,  0xff },
+        };
 
-                /* These following happen separately in the vendor driver */
-                { },
-
+        static const struct zd_ioreq16 ioreqs_pll[] = {
                 /* shdnb(PLL_ON)=0 */
                 { CR251,  0x2f },
                 /* shdnb(PLL_ON)=1 */
@@ -128,7 +139,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
                 { CR138,  0x28 }, { CR203,  0x06 },
         };
 
-        static const u32 rv[] = {
+        static const u32 rv1[] = {
                 /* Channel 1 */
                 0x03f790,
                 0x033331,
@@ -137,6 +148,9 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
                 0x0b3331,
                 0x03b812,
                 0x00fff3,
+        };
+
+        static const u32 rv2[] = {
                 0x000da4,
                 0x0f4dc5, /* fix freq shift, 0x04edc5 */
                 0x0805b6,
@@ -148,8 +162,9 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
                 0x0bdffc,
                 0x00000d,
                 0x00500f,
+        };
 
-                /* These writes happen separately in the vendor driver */
+        static const u32 rv3[] = {
                 0x00d00f,
                 0x004c0f,
                 0x00540f,
@@ -157,11 +172,38 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
                 0x00500f,
         };
 
-        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        r = zd_iowrite16a_locked(chip, ioreqs_init, ARRAY_SIZE(ioreqs_init));
         if (r)
                 return r;
 
-        r = zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);
+        if (chip->al2230s_bit) {
+                r = zd_iowrite16a_locked(chip, ioreqs_init_al2230s,
+                        ARRAY_SIZE(ioreqs_init_al2230s));
+                if (r)
+                        return r;
+        }
+
+        r = zd_rfwritev_locked(chip, rv1, ARRAY_SIZE(rv1), RF_RV_BITS);
+        if (r)
+                return r;
+
+        /* improve band edge for AL2230S */
+        if (chip->al2230s_bit)
+                r = zd_rfwrite_locked(chip, 0x000824, RF_RV_BITS);
+        else
+                r = zd_rfwrite_locked(chip, 0x0005a4, RF_RV_BITS);
+        if (r)
+                return r;
+
+        r = zd_rfwritev_locked(chip, rv2, ARRAY_SIZE(rv2), RF_RV_BITS);
+        if (r)
+                return r;
+
+        r = zd_iowrite16a_locked(chip, ioreqs_pll, ARRAY_SIZE(ioreqs_pll));
+        if (r)
+                return r;
+
+        r = zd_rfwritev_locked(chip, rv3, ARRAY_SIZE(rv3), RF_RV_BITS);
         if (r)
                 return r;
 
@@ -227,7 +269,9 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
                 0x481dc0,
                 0xcfff00,
                 0x25a000,
+        };
 
+        static const u32 rv2[] = {
                 /* To improve AL2230 yield, improve phase noise, 4713 */
                 0x25a000,
                 0xa3b2f0,
@@ -250,7 +294,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
                 { CR251, 0x7f }, /* shdnb(PLL_ON)=1 */
         };
 
-        static const u32 rv2[] = {
+        static const u32 rv3[] = {
                 /* To improve AL2230 yield, 4713 */
                 0xf01b00,
                 0xf01e00,
@@ -269,18 +313,37 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
         r = zd_iowrite16a_locked(chip, ioreqs1, ARRAY_SIZE(ioreqs1));
         if (r)
                 return r;
+
+        if (chip->al2230s_bit) {
+                r = zd_iowrite16a_locked(chip, ioreqs_init_al2230s,
+                        ARRAY_SIZE(ioreqs_init_al2230s));
+                if (r)
+                        return r;
+        }
+
         r = zd_rfwritev_cr_locked(chip, zd1211b_al2230_table[0], 3);
         if (r)
                 return r;
         r = zd_rfwritev_cr_locked(chip, rv1, ARRAY_SIZE(rv1));
         if (r)
                 return r;
-        r = zd_iowrite16a_locked(chip, ioreqs2, ARRAY_SIZE(ioreqs2));
+
+        if (chip->al2230s_bit)
+                r = zd_rfwrite_locked(chip, 0x241000, RF_RV_BITS);
+        else
+                r = zd_rfwrite_locked(chip, 0x25a000, RF_RV_BITS);
         if (r)
                 return r;
+
         r = zd_rfwritev_cr_locked(chip, rv2, ARRAY_SIZE(rv2));
         if (r)
                 return r;
+        r = zd_iowrite16a_locked(chip, ioreqs2, ARRAY_SIZE(ioreqs2));
+        if (r)
+                return r;
+        r = zd_rfwritev_cr_locked(chip, rv3, ARRAY_SIZE(rv3));
+        if (r)
+                return r;
         r = zd_iowrite16a_locked(chip, ioreqs3, ARRAY_SIZE(ioreqs3));
         if (r)
                 return r;
@@ -358,12 +421,6 @@ int zd_rf_init_al2230(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
-        if (chip->al2230s_bit) {
-                dev_err(zd_chip_dev(chip), "AL2230S devices are not yet "
-                        "supported by this driver.\n");
-                return -ENODEV;
-        }
-
         rf->switch_radio_off = al2230_switch_radio_off;
         if (chip->is_zd1211b) {
                 rf->init_hw = zd1211b_al2230_init_hw;
@@ -374,6 +431,6 @@ int zd_rf_init_al2230(struct zd_rf *rf)
                 rf->set_channel = zd1211_al2230_set_channel;
                 rf->switch_radio_on = zd1211_al2230_switch_radio_on;
         }
-        rf->patch_6m_band_edge = 1;
+        rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
         return 0;
 }
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
index a289f95187ec..5e5e9ddc6a74 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
@@ -51,9 +51,52 @@ static const u32 std_rv[] = {
         0xd8c010,
 };
 
-static int al7230b_init_hw(struct zd_rf *rf)
+static const u32 rv_init1[] = {
+        0x3c9000,
+        0xbfffff,
+        0x700000,
+        0xf15d58,
+};
+
+static const u32 rv_init2[] = {
+        0xf15d59,
+        0xf15d5c,
+        0xf15d58,
+};
+
+static const struct zd_ioreq16 ioreqs_sw[] = {
+        { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
+        { CR38,  0x38 }, { CR136, 0xdf },
+};
+
+static int zd1211b_al7230b_finalize(struct zd_chip *chip)
 {
-        int i, r;
+        int r;
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR80,  0x30 }, { CR81,  0x30 }, { CR79,  0x58 },
+                { CR12,  0xf0 }, { CR77,  0x1b }, { CR78,  0x58 },
+                { CR203, 0x04 },
+                { },
+                { CR240, 0x80 },
+        };
+
+        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r)
+                return r;
+
+        if (chip->new_phy_layout) {
+                /* antenna selection? */
+                r = zd_iowrite16_locked(chip, 0xe5, CR9);
+                if (r)
+                        return r;
+        }
+
+        return zd_iowrite16_locked(chip, 0x04, CR203);
+}
+
+static int zd1211_al7230b_init_hw(struct zd_rf *rf)
+{
+        int r;
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
         /* All of these writes are identical to AL2230 unless otherwise
@@ -117,39 +160,136 @@ static int al7230b_init_hw(struct zd_rf *rf)
         };
 
         static const struct zd_ioreq16 ioreqs_2[] = {
-                /* PLL_ON */
-                { CR251, 0x3f },
+                { CR251, 0x3f }, /* PLL_ON */
                 { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
-                { CR38, 0x38 }, { CR136, 0xdf },
+                { CR38,  0x38 }, { CR136, 0xdf },
         };
 
         r = zd_iowrite16a_locked(chip, ioreqs_1, ARRAY_SIZE(ioreqs_1));
         if (r)
                 return r;
 
-        r = zd_rfwrite_cr_locked(chip, 0x09ec04);
+        r = zd_rfwritev_cr_locked(chip, chan_rv[0], ARRAY_SIZE(chan_rv[0]));
         if (r)
                 return r;
-        r = zd_rfwrite_cr_locked(chip, 0x8cccc8);
+
+        r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
         if (r)
                 return r;
 
-        for (i = 0; i < ARRAY_SIZE(std_rv); i++) {
-                r = zd_rfwrite_cr_locked(chip, std_rv[i]);
-                if (r)
-                        return r;
-        }
+        r = zd_rfwritev_cr_locked(chip, rv_init1, ARRAY_SIZE(rv_init1));
+        if (r)
+                return r;
 
-        r = zd_rfwrite_cr_locked(chip, 0x3c9000);
+        r = zd_iowrite16a_locked(chip, ioreqs_2, ARRAY_SIZE(ioreqs_2));
         if (r)
                 return r;
-        r = zd_rfwrite_cr_locked(chip, 0xbfffff);
+
+        r = zd_rfwritev_cr_locked(chip, rv_init2, ARRAY_SIZE(rv_init2));
         if (r)
                 return r;
-        r = zd_rfwrite_cr_locked(chip, 0x700000);
+
+        r = zd_iowrite16_locked(chip, 0x06, CR203);
         if (r)
                 return r;
-        r = zd_rfwrite_cr_locked(chip, 0xf15d58);
+        r = zd_iowrite16_locked(chip, 0x80, CR240);
+        if (r)
+                return r;
+
+        return 0;
+}
+
+static int zd1211b_al7230b_init_hw(struct zd_rf *rf)
+{
+        int r;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+
+        static const struct zd_ioreq16 ioreqs_1[] = {
+                { CR240, 0x57 }, { CR9,   0x9 },
+                { },
+                { CR10,  0x8b }, { CR15,  0x20 },
+                { CR17,  0x2B }, /* for newest (3rd cut) AL2230 */
+                { CR20,  0x10 }, /* 4N25->Stone Request */
+                { CR23,  0x40 }, { CR24,  0x20 }, { CR26,  0x93 },
+                { CR28,  0x3e }, { CR29,  0x00 },
+                { CR33,  0x28 }, /* 5613 */
+                { CR34,  0x30 },
+                { CR35,  0x3e }, /* for newest (3rd cut) AL2230 */
+                { CR41,  0x24 }, { CR44,  0x32 },
+                { CR46,  0x99 }, /* for newest (3rd cut) AL2230 */
+                { CR47,  0x1e },
+
+                /* ZD1215 5610 */
+                { CR48,  0x00 }, { CR49,  0x00 }, { CR51,  0x01 },
+                { CR52,  0x80 }, { CR53,  0x7e }, { CR65,  0x00 },
+                { CR66,  0x00 }, { CR67,  0x00 }, { CR68,  0x00 },
+                { CR69,  0x28 },
+
+                { CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },
+                { CR87,  0x0A }, { CR89,  0x04 },
+                { CR90,  0x58 }, /* 5112 */
+                { CR91,  0x00 }, /* 5613 */
+                { CR92,  0x0a },
+                { CR98,  0x8d }, /* 4804, for 1212 new algorithm */
+                { CR99,  0x00 }, { CR100, 0x02 }, { CR101, 0x13 },
+                { CR102, 0x27 },
+                { CR106, 0x20 }, /* change to 0x24 for AL7230B */
+                { CR109, 0x13 }, /* 4804, for 1212 new algorithm */
+                { CR112, 0x1f },
+        };
+
+        static const struct zd_ioreq16 ioreqs_new_phy[] = {
+                { CR107, 0x28 },
+                { CR110, 0x1f }, /* 5127, 0x13->0x1f */
+                { CR111, 0x1f }, /* 0x13 to 0x1f for AL7230B */
+                { CR116, 0x2a }, { CR118, 0xfa }, { CR119, 0x12 },
+                { CR121, 0x6c }, /* 5613 */
+        };
+
+        static const struct zd_ioreq16 ioreqs_old_phy[] = {
+                { CR107, 0x24 },
+                { CR110, 0x13 }, /* 5127, 0x13->0x1f */
+                { CR111, 0x13 }, /* 0x13 to 0x1f for AL7230B */
+                { CR116, 0x24 }, { CR118, 0xfc }, { CR119, 0x11 },
+                { CR121, 0x6a }, /* 5613 */
+        };
+
+        static const struct zd_ioreq16 ioreqs_2[] = {
+                { CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x24 },
+                { CR117, 0xfa }, { CR120, 0x4f },
+                { CR122, 0xfc }, /* E0->FCh at 4901 */
+                { CR123, 0x57 }, /* 5613 */
+                { CR125, 0xad }, /* 4804, for 1212 new algorithm */
+                { CR126, 0x6c }, /* 5613 */
+                { CR127, 0x03 }, /* 4804, for 1212 new algorithm */
+                { CR130, 0x10 },
+                { CR131, 0x00 }, /* 5112 */
+                { CR137, 0x50 }, /* 5613 */
+                { CR138, 0xa8 }, /* 5112 */
+                { CR144, 0xac }, /* 5613 */
+                { CR148, 0x40 }, /* 5112 */
+                { CR149, 0x40 }, /* 4O07, 50->40 */
+                { CR150, 0x1a }, /* 5112, 0C->1A */
+                { CR252, 0x34 }, { CR253, 0x34 },
+                { CR251, 0x2f }, /* PLL_OFF */
+        };
+
+        static const struct zd_ioreq16 ioreqs_3[] = {
+                { CR251, 0x7f }, /* PLL_ON */
+                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
+                { CR38,  0x38 }, { CR136, 0xdf },
+        };
+
+        r = zd_iowrite16a_locked(chip, ioreqs_1, ARRAY_SIZE(ioreqs_1));
+        if (r)
+                return r;
+
+        if (chip->new_phy_layout)
+                r = zd_iowrite16a_locked(chip, ioreqs_new_phy,
+                        ARRAY_SIZE(ioreqs_new_phy));
+        else
+                r = zd_iowrite16a_locked(chip, ioreqs_old_phy,
+                        ARRAY_SIZE(ioreqs_old_phy));
         if (r)
                 return r;
 
@@ -157,38 +297,36 @@ static int al7230b_init_hw(struct zd_rf *rf)
         if (r)
                 return r;
 
-        r = zd_rfwrite_cr_locked(chip, 0xf15d59);
+        r = zd_rfwritev_cr_locked(chip, chan_rv[0], ARRAY_SIZE(chan_rv[0]));
         if (r)
                 return r;
-        r = zd_rfwrite_cr_locked(chip, 0xf15d5c);
+
+        r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
         if (r)
                 return r;
-        r = zd_rfwrite_cr_locked(chip, 0xf15d58);
+
+        r = zd_rfwritev_cr_locked(chip, rv_init1, ARRAY_SIZE(rv_init1));
         if (r)
                 return r;
 
-        r = zd_iowrite16_locked(chip, 0x06, CR203);
+        r = zd_iowrite16a_locked(chip, ioreqs_3, ARRAY_SIZE(ioreqs_3));
         if (r)
                 return r;
-        r = zd_iowrite16_locked(chip, 0x80, CR240);
+
+        r = zd_rfwritev_cr_locked(chip, rv_init2, ARRAY_SIZE(rv_init2));
         if (r)
                 return r;
 
-        return 0;
+        return zd1211b_al7230b_finalize(chip);
 }
 
-static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
+static int zd1211_al7230b_set_channel(struct zd_rf *rf, u8 channel)
 {
-        int i, r;
+        int r;
         const u32 *rv = chan_rv[channel-1];
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
-        struct zd_ioreq16 ioreqs_1[] = {
-                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
-                { CR38,  0x38 }, { CR136, 0xdf },
-        };
-
-        struct zd_ioreq16 ioreqs_2[] = {
+        static const struct zd_ioreq16 ioreqs[] = {
                 /* PLL_ON */
                 { CR251, 0x3f },
                 { CR203, 0x06 }, { CR240, 0x08 },
@@ -203,11 +341,9 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
         if (r)
                 return r;
 
-        for (i = 0; i < ARRAY_SIZE(std_rv); i++) {
-                r = zd_rfwrite_cr_locked(chip, std_rv[i]);
-                if (r)
-                        return r;
-        }
+        r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
+        if (r)
+                return r;
 
         r = zd_rfwrite_cr_locked(chip, 0x3c9000);
         if (r)
@@ -216,24 +352,69 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
         if (r)
                 return r;
 
-        r = zd_iowrite16a_locked(chip, ioreqs_1, ARRAY_SIZE(ioreqs_1));
+        r = zd_iowrite16a_locked(chip, ioreqs_sw, ARRAY_SIZE(ioreqs_sw));
         if (r)
                 return r;
 
-        for (i = 0; i < 2; i++) {
-                r = zd_rfwrite_cr_locked(chip, rv[i]);
-                if (r)
-                        return r;
-        }
+        r = zd_rfwritev_cr_locked(chip, rv, 2);
+        if (r)
+                return r;
 
         r = zd_rfwrite_cr_locked(chip, 0x3c9000);
         if (r)
                 return r;
 
-        return zd_iowrite16a_locked(chip, ioreqs_2, ARRAY_SIZE(ioreqs_2));
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
 }
 
-static int al7230b_switch_radio_on(struct zd_rf *rf)
+static int zd1211b_al7230b_set_channel(struct zd_rf *rf, u8 channel)
+{
+        int r;
+        const u32 *rv = chan_rv[channel-1];
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+
+        r = zd_iowrite16_locked(chip, 0x57, CR240);
+        if (r)
+                return r;
+        r = zd_iowrite16_locked(chip, 0xe4, CR9);
+        if (r)
+                return r;
+
+        /* PLL_OFF */
+        r = zd_iowrite16_locked(chip, 0x2f, CR251);
+        if (r)
+                return r;
+        r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
+        if (r)
+                return r;
+
+        r = zd_rfwrite_cr_locked(chip, 0x3c9000);
+        if (r)
+                return r;
+        r = zd_rfwrite_cr_locked(chip, 0xf15d58);
+        if (r)
+                return r;
+
+        r = zd_iowrite16a_locked(chip, ioreqs_sw, ARRAY_SIZE(ioreqs_sw));
+        if (r)
+                return r;
+
+        r = zd_rfwritev_cr_locked(chip, rv, 2);
+        if (r)
+                return r;
+
+        r = zd_rfwrite_cr_locked(chip, 0x3c9000);
+        if (r)
+                return r;
+
+        r = zd_iowrite16_locked(chip, 0x7f, CR251);
+        if (r)
+                return r;
+
+        return zd1211b_al7230b_finalize(chip);
+}
+
+static int zd1211_al7230b_switch_radio_on(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
         static const struct zd_ioreq16 ioreqs[] = {
@@ -244,6 +425,17 @@ static int al7230b_switch_radio_on(struct zd_rf *rf)
         return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
 }
 
+static int zd1211b_al7230b_switch_radio_on(struct zd_rf *rf)
+{
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR11,  0x00 },
+                { CR251, 0x7f },
+        };
+
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+
 static int al7230b_switch_radio_off(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -255,20 +447,45 @@ static int al7230b_switch_radio_off(struct zd_rf *rf)
         return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
 }
 
+/* ZD1211B+AL7230B 6m band edge patching differs slightly from other
+ * configurations */
+static int zd1211b_al7230b_patch_6m(struct zd_rf *rf, u8 channel)
+{
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        struct zd_ioreq16 ioreqs[] = {
+                { CR128, 0x14 }, { CR129, 0x12 },
+        };
+
+        /* FIXME: Channel 11 is not the edge for all regulatory domains. */
+        if (channel == 1) {
+                ioreqs[0].value = 0x0e;
+                ioreqs[1].value = 0x10;
+        } else if (channel == 11) {
+                ioreqs[0].value = 0x10;
+                ioreqs[1].value = 0x10;
+        }
+
+        dev_dbg_f(zd_chip_dev(chip), "patching for channel %d\n", channel);
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+
 int zd_rf_init_al7230b(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
         if (chip->is_zd1211b) {
-                dev_err(zd_chip_dev(chip), "AL7230B is currently not "
-                        "supported for ZD1211B devices\n");
-                return -ENODEV;
+                rf->init_hw = zd1211b_al7230b_init_hw;
+                rf->switch_radio_on = zd1211b_al7230b_switch_radio_on;
+                rf->set_channel = zd1211b_al7230b_set_channel;
+                rf->patch_6m_band_edge = zd1211b_al7230b_patch_6m;
+        } else {
+                rf->init_hw = zd1211_al7230b_init_hw;
+                rf->switch_radio_on = zd1211_al7230b_switch_radio_on;
+                rf->set_channel = zd1211_al7230b_set_channel;
+                rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
         }
 
-        rf->init_hw = al7230b_init_hw;
-        rf->set_channel = al7230b_set_channel;
-        rf->switch_radio_on = al7230b_switch_radio_on;
         rf->switch_radio_off = al7230b_switch_radio_off;
-        rf->patch_6m_band_edge = 1;
+
         return 0;
 }
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
index 58247271cc24..2d736bdf707c 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@ -21,7 +21,7 @@
 #include "zd_usb.h"
 #include "zd_chip.h"
 
-static u32 rf2959_table[][2] = {
+static const u32 rf2959_table[][2] = {
         RF_CHANNEL( 1) = { 0x181979, 0x1e6666 },
         RF_CHANNEL( 2) = { 0x181989, 0x1e6666 },
         RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },
@@ -228,7 +228,7 @@ static int rf2959_init_hw(struct zd_rf *rf)
 static int rf2959_set_channel(struct zd_rf *rf, u8 channel)
 {
         int i, r;
-        u32 *rv = rf2959_table[channel-1];
+        const u32 *rv = rf2959_table[channel-1];
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
         for (i = 0; i < 2; i++) {
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index edaaad2f648b..e04cffc8adf3 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -52,6 +52,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
         /* ZD1211B */
         { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
@@ -62,7 +63,10 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0586, 0x340f), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0b05, 0x171b), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0baf, 0x0121), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
         /* "Driverless" devices that need ejecting */
         { USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER },
         {}
@@ -413,7 +417,7 @@ int zd_usb_enable_int(struct zd_usb *usb)
 
         dev_dbg_f(zd_usb_dev(usb), "\n");
 
-        urb = usb_alloc_urb(0, GFP_NOFS);
+        urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!urb) {
                 r = -ENOMEM;
                 goto out;
@@ -431,7 +435,7 @@ int zd_usb_enable_int(struct zd_usb *usb)
 
         /* TODO: make it a DMA buffer */
         r = -ENOMEM;
-        transfer_buffer = kmalloc(USB_MAX_EP_INT_BUFFER, GFP_NOFS);
+        transfer_buffer = kmalloc(USB_MAX_EP_INT_BUFFER, GFP_KERNEL);
         if (!transfer_buffer) {
                 dev_dbg_f(zd_usb_dev(usb),
                         "couldn't allocate transfer_buffer\n");
@@ -445,7 +449,7 @@ int zd_usb_enable_int(struct zd_usb *usb)
                          intr->interval);
 
         dev_dbg_f(zd_usb_dev(usb), "submit urb %p\n", intr->urb);
-        r = usb_submit_urb(urb, GFP_NOFS);
+        r = usb_submit_urb(urb, GFP_KERNEL);
         if (r) {
                 dev_dbg_f(zd_usb_dev(usb),
                          "Couldn't submit urb. Error number %d\n", r);
@@ -594,10 +598,10 @@ static struct urb *alloc_urb(struct zd_usb *usb)
         struct urb *urb;
         void *buffer;
 
-        urb = usb_alloc_urb(0, GFP_NOFS);
+        urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!urb)
                 return NULL;
-        buffer = usb_buffer_alloc(udev, USB_MAX_RX_SIZE, GFP_NOFS,
+        buffer = usb_buffer_alloc(udev, USB_MAX_RX_SIZE, GFP_KERNEL,
                                   &urb->transfer_dma);
         if (!buffer) {
                 usb_free_urb(urb);
@@ -630,7 +634,7 @@ int zd_usb_enable_rx(struct zd_usb *usb)
         dev_dbg_f(zd_usb_dev(usb), "\n");
 
         r = -ENOMEM;
-        urbs = kcalloc(URBS_COUNT, sizeof(struct urb *), GFP_NOFS);
+        urbs = kcalloc(URBS_COUNT, sizeof(struct urb *), GFP_KERNEL);
         if (!urbs)
                 goto error;
         for (i = 0; i < URBS_COUNT; i++) {
@@ -651,7 +655,7 @@ int zd_usb_enable_rx(struct zd_usb *usb)
         spin_unlock_irq(&rx->lock);
 
         for (i = 0; i < URBS_COUNT; i++) {
-                r = usb_submit_urb(urbs[i], GFP_NOFS);
+                r = usb_submit_urb(urbs[i], GFP_KERNEL);
                 if (r)
                         goto error_submit;
         }
@@ -1157,7 +1161,7 @@ int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,
         }
 
         req_len = sizeof(struct usb_req_read_regs) + count * sizeof(__le16);
-        req = kmalloc(req_len, GFP_NOFS);
+        req = kmalloc(req_len, GFP_KERNEL);
         if (!req)
                 return -ENOMEM;
         req->id = cpu_to_le16(USB_REQ_READ_REGS);
@@ -1220,7 +1224,7 @@ int zd_usb_iowrite16v(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,
 
         req_len = sizeof(struct usb_req_write_regs) +
                   count * sizeof(struct reg_data);
-        req = kmalloc(req_len, GFP_NOFS);
+        req = kmalloc(req_len, GFP_KERNEL);
         if (!req)
                 return -ENOMEM;
 
@@ -1300,7 +1304,7 @@ int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits)
         bit_value_template &= ~(RF_IF_LE|RF_CLK|RF_DATA);
 
         req_len = sizeof(struct usb_req_rfwrite) + bits * sizeof(__le16);
-        req = kmalloc(req_len, GFP_NOFS);
+        req = kmalloc(req_len, GFP_KERNEL);
         if (!req)
                 return -ENOMEM;
 
diff --git a/include/asm-powerpc/ucc_fast.h b/include/asm-powerpc/ucc_fast.h
index 39d1c90fd2ca..f529f70b1d82 100644
--- a/include/asm-powerpc/ucc_fast.h
+++ b/include/asm-powerpc/ucc_fast.h
@@ -159,6 +159,9 @@ struct ucc_fast_private {
         struct ucc_fast *uf_regs;       /* a pointer to memory map of UCC regs. */
         u32 *p_ucce;            /* a pointer to the event register in memory. */
         u32 *p_uccm;            /* a pointer to the mask register in memory. */
+#ifdef CONFIG_UGETH_TX_ON_DEMAND
+        u16 *p_utodr;           /* pointer to the transmit on demand register */
+#endif
         int enabled_tx;         /* Whether channel is enabled for Tx (ENT) */
         int enabled_rx;         /* Whether channel is enabled for Rx (ENR) */
         int stopped_tx;         /* Whether channel has been stopped for Tx
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index abb64c437f6f..73710d617775 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -120,44 +120,5 @@ struct fsl_spi_platform_data {
         u32     sysclk;
 };
 
-/* Ethernet interface (phy management and speed)
-*/
-enum enet_interface {
-        ENET_10_MII,            /* 10 Base T,   MII interface */
-        ENET_10_RMII,           /* 10 Base T,  RMII interface */
-        ENET_10_RGMII,          /* 10 Base T, RGMII interface */
-        ENET_100_MII,           /* 100 Base T,   MII interface */
-        ENET_100_RMII,          /* 100 Base T,  RMII interface */
-        ENET_100_RGMII,         /* 100 Base T, RGMII interface */
-        ENET_1000_GMII,         /* 1000 Base T,  GMII interface */
-        ENET_1000_RGMII,        /* 1000 Base T, RGMII interface */
-        ENET_1000_TBI,          /* 1000 Base T,   TBI interface */
-        ENET_1000_RTBI          /* 1000 Base T,  RTBI interface */
-};
-
-struct ucc_geth_platform_data {
-        /* device specific information */
-        u32                     device_flags;
-        u32                     phy_reg_addr;
-
-        /* board specific information */
-        u32                     board_flags;
-        u8                      rx_clock;
-        u8                      tx_clock;
-        u32                     phy_id;
-        enum enet_interface     phy_interface;
-        u32                     phy_interrupt;
-        u8                      mac_addr[6];
-};
-
-/* Flags related to UCC Gigabit Ethernet device features */
-#define FSL_UGETH_DEV_HAS_GIGABIT               0x00000001
-#define FSL_UGETH_DEV_HAS_COALESCE              0x00000002
-#define FSL_UGETH_DEV_HAS_RMON                  0x00000004
-
-/* Flags in ucc_geth_platform_data */
-#define FSL_UGETH_BRD_HAS_PHY_INTR              0x00000001
-                                /* if not set use a timer */
-
 #endif /* _FSL_DEVICE_H_ */
 #endif /* __KERNEL__ */
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index 0fe562af9c8c..db390c511ada 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -43,8 +43,7 @@ struct hdlc_proto {
         void (*stop)(struct net_device *dev); /* if open & !DCD */
         void (*detach)(struct net_device *dev);
         int (*ioctl)(struct net_device *dev, struct ifreq *ifr);
-        unsigned short (*type_trans)(struct sk_buff *skb,
-                                     struct net_device *dev);
+        __be16 (*type_trans)(struct sk_buff *skb, struct net_device *dev);
         struct module *module;
         struct hdlc_proto *next; /* next protocol in the list */
 };
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 5f21b0f68b42..1b0ddbb8a804 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1458,6 +1458,8 @@
 
 #define PCI_VENDOR_ID_TOSHIBA_2         0x102f
 #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030
+#define PCI_DEVICE_ID_TOSHIBA_TC35815_NWU       0x0031
+#define PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939    0x0032
 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE      0x0105
 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC     0x0108
 #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
diff --git a/include/linux/phy.h b/include/linux/phy.h
index edd4c88ca7d8..2a659789f9ca 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -55,6 +55,7 @@ typedef enum {
         PHY_INTERFACE_MODE_TBI,
         PHY_INTERFACE_MODE_RMII,
         PHY_INTERFACE_MODE_RGMII,
+        PHY_INTERFACE_MODE_RGMII_ID,
         PHY_INTERFACE_MODE_RTBI
 } phy_interface_t;
 
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 48759b2f57d7..0987aa7a6cf5 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -186,7 +186,7 @@
  *      - Wireless Event capability in struct iw_range
  *      - Add support for relative TxPower (yick !)
  *
- * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
+ * V17 to V18 (From Jouni Malinen <j@w1.fi>)
  * ----------
  *      - Add support for WPA/WPA2
  *      - Add extended encoding configuration (SIOCSIWENCODEEXT and
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index e02d85f56e60..d56b2923d61a 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -6,8 +6,8 @@
  * 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>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
  *
  * Adaption to a generic IEEE 802.11 stack by James Ketrenos
  * <jketreno@linux.intel.com>
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
index eb476414fd72..b3d65e0bedd3 100644
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -3,8 +3,8 @@
  * 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>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
  *
  * Adaption to a generic IEEE 802.11 stack by James Ketrenos
  * <jketreno@linux.intel.com>
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 429b73892a5f..a0c2b41a24d7 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -66,7 +66,9 @@
  */
 #define IEEE80211_RADIOTAP_HDRLEN       64
 
-/* The radio capture header precedes the 802.11 header. */
+/* The radio capture header precedes the 802.11 header.
+ * All data in the header is little endian on all platforms.
+ */
 struct ieee80211_radiotap_header {
         u8 it_version;          /* Version 0. Only increases
                                  * for drastic changes,
@@ -74,12 +76,12 @@ struct ieee80211_radiotap_header {
                                  * new fields does not count.
                                  */
         u8 it_pad;
-        u16 it_len;             /* length of the whole
+        __le16 it_len;          /* length of the whole
                                  * header in bytes, including
                                  * it_version, it_pad,
                                  * it_len, and data fields.
                                  */
-        u32 it_present;         /* A bitmap telling which
+        __le32 it_present;      /* A bitmap telling which
                                  * fields are present. Set bit 31
                                  * (0x80000000) to extend the
                                  * bitmap by another 32 bits.
@@ -88,89 +90,102 @@ struct ieee80211_radiotap_header {
                                  */
 };
 
-/* Name                                 Data type       Units
- * ----                                 ---------       -----
+/* Name                                 Data type    Units
+ * ----                                 ---------    -----
  *
- * IEEE80211_RADIOTAP_TSFT              u64       microseconds
+ * IEEE80211_RADIOTAP_TSFT              __le64       microseconds
  *
  *      Value in microseconds of the MAC's 64-bit 802.11 Time
  *      Synchronization Function timer when the first bit of the
  *      MPDU arrived at the MAC. For received frames, only.
  *
- * IEEE80211_RADIOTAP_CHANNEL           2 x u16   MHz, bitmap
+ * IEEE80211_RADIOTAP_CHANNEL           2 x __le16   MHz, bitmap
  *
  *      Tx/Rx frequency in MHz, followed by flags (see below).
  *
- * IEEE80211_RADIOTAP_FHSS              u16       see below
+ * IEEE80211_RADIOTAP_FHSS              __le16       see below
  *
  *      For frequency-hopping radios, the hop set (first byte)
  *      and pattern (second byte).
  *
- * IEEE80211_RADIOTAP_RATE              u8        500kb/s
+ * IEEE80211_RADIOTAP_RATE              u8           500kb/s
  *
  *      Tx/Rx data rate
  *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF signal power at the antenna, decibel difference from
  *      one milliwatt.
  *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
  *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8           decibel (dB)
  *
  *      RF signal power at the antenna, decibel difference from an
  *      arbitrary, fixed reference.
  *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTNOISE       u8           decibel (dB)
  *
  *      RF noise power at the antenna, decibel difference from an
  *      arbitrary, fixed reference point.
  *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      u16       unitless
+ * IEEE80211_RADIOTAP_LOCK_QUALITY      __le16       unitless
  *
  *      Quality of Barker code lock. Unitless. Monotonically
  *      nondecreasing with "better" lock strength. Called "Signal
  *      Quality" in datasheets.  (Is there a standard way to measure
  *      this?)
  *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    u16       unitless
+ * IEEE80211_RADIOTAP_TX_ATTENUATION    __le16       unitless
  *
  *      Transmit power expressed as unitless distance from max
  *      power set at factory calibration.  0 is max power.
  *      Monotonically nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u16       decibels (dB)
+ * IEEE80211_RADIOTAP_DB_TX_ATTENUATION __le16       decibels (dB)
  *
  *      Transmit power expressed as decibel distance from max power
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at
  *      the antenna port.
  *
- * IEEE80211_RADIOTAP_FLAGS             u8        bitmap
+ * IEEE80211_RADIOTAP_FLAGS             u8           bitmap
  *
  *      Properties of transmitted and received frames. See flags
  *      defined below.
  *
- * IEEE80211_RADIOTAP_ANTENNA           u8        antenna index
+ * IEEE80211_RADIOTAP_ANTENNA           u8           antenna index
  *
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  *
- * IEEE80211_RADIOTAP_FCS               u32       data
+ * IEEE80211_RADIOTAP_RX_FLAGS          __le16       bitmap
+ *
+ *     Properties of received frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_TX_FLAGS          __le16       bitmap
+ *
+ *     Properties of transmitted frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_RTS_RETRIES       u8           data
+ *
+ *     Number of rts retries a transmitted frame used.
+ *
+ * IEEE80211_RADIOTAP_DATA_RETRIES      u8           data
+ *
+ *     Number of unicast retries a transmitted frame used.
  *
- *      FCS from frame in network byte order.
  */
 enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_TSFT = 0,
@@ -187,7 +202,11 @@ enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_ANTENNA = 11,
         IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
         IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-        IEEE80211_RADIOTAP_EXT = 31,
+        IEEE80211_RADIOTAP_RX_FLAGS = 14,
+        IEEE80211_RADIOTAP_TX_FLAGS = 15,
+        IEEE80211_RADIOTAP_RTS_RETRIES = 16,
+        IEEE80211_RADIOTAP_DATA_RETRIES = 17,
+        IEEE80211_RADIOTAP_EXT = 31
 };
 
 /* Channel flags. */
@@ -219,6 +238,14 @@ enum ieee80211_radiotap_type {
                                                  * 802.11 header and payload
                                                  * (to 32-bit boundary)
                                                  */
+/* For IEEE80211_RADIOTAP_RX_FLAGS */
+#define IEEE80211_RADIOTAP_F_RX_BADFCS  0x0001  /* frame failed crc check */
+
+/* For IEEE80211_RADIOTAP_TX_FLAGS */
+#define IEEE80211_RADIOTAP_F_TX_FAIL    0x0001  /* failed due to excessive
+                                                 * retries */
+#define IEEE80211_RADIOTAP_F_TX_CTS     0x0002  /* used cts 'protection' */
+#define IEEE80211_RADIOTAP_F_TX_RTS     0x0004  /* used rts/cts handshake */
 
 /* Ugly macro to convert literal channel numbers into their mhz equivalents
  * There are certianly some conditions that will break this (like feeding it '30')
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
index 5ed0a98b2d76..df5592c9339f 100644
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -1,7 +1,7 @@
 /*
  * Host AP crypto routines
  *
- * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
  * Portions Copyright (C) 2004, Intel Corporation <jketreno@linux.intel.com>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 35aa3426c3fa..b016b4104de6 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -1,7 +1,7 @@
 /*
  * Host AP crypt: host-based CCMP encryption implementation for Host AP driver
  *
- * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2004, Jouni Malinen <j@w1.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
@@ -338,7 +338,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (ccmp_replay_check(pn, key->rx_pn)) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: replay detected: STA=" MAC_FMT
+                        IEEE80211_DEBUG_DROP("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),
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index fc1f99a59732..5a48d8e0aec1 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -1,7 +1,7 @@
 /*
  * Host AP crypt: host-based TKIP encryption implementation for Host AP driver
  *
- * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2004, Jouni Malinen <j@w1.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
@@ -465,7 +465,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: replay detected: STA=" MAC_FMT
+                        IEEE80211_DEBUG_DROP("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);
@@ -507,7 +507,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                         tkey->rx_phase1_done = 0;
                 }
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: ICV error detected: STA="
+                        IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA="
                                MAC_FMT "\n", MAC_ARG(hdr->addr2));
                 }
                 tkey->dot11RSNAStatsTKIPICVErrors++;
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index 4eb35079e434..8d182459344e 100644
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -1,7 +1,7 @@
 /*
  * Host AP crypt: host-based WEP encryption implementation for Host AP driver
  *
- * Copyright (c) 2002-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2004, Jouni Malinen <j@w1.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
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index b1c6d1f717d9..7ec6610841ba 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -5,8 +5,8 @@
   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>
+  <j@w1.fi>
+  Copyright (c) 2002-2003, Jouni Malinen <j@w1.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
@@ -229,6 +229,7 @@ void free_ieee80211(struct net_device *dev)
 
 static int debug = 0;
 u32 ieee80211_debug_level = 0;
+EXPORT_SYMBOL_GPL(ieee80211_debug_level);
 static struct proc_dir_entry *ieee80211_proc = NULL;
 
 static int show_debug_level(char *page, char **start, off_t offset,
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 6ae036b1920f..f2de2e48b021 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -3,8 +3,8 @@
  * 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>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
  * Copyright (c) 2004-2005, Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 40d7a55fe03e..cee5e13bc427 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -5,8 +5,8 @@
   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>
+  <j@w1.fi>
+  Copyright (c) 2002-2003, Jouni Malinen <j@w1.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