Merge ../linus

111 files changed, 18070 insertions, 27334 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 70f63891b19c..274b0138d442 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -788,7 +788,7 @@ struct vortex_private {
         int options;                                            /* User-settable misc. driver options. */
         unsigned int media_override:4,          /* Passed-in media type. */
                 default_media:4,                                /* Read from the EEPROM/Wn3_Config. */
-                full_duplex:1, force_fd:1, autoselect:1,
+                full_duplex:1, autoselect:1,
                 bus_master:1,                                   /* Vortex can only do a fragment bus-m. */
                 full_bus_master_tx:1, full_bus_master_rx:2, /* Boomerang  */
                 flow_ctrl:1,                                    /* Use 802.3x flow control (PAUSE only) */
@@ -1633,12 +1633,6 @@ vortex_set_duplex(struct net_device *dev)
                         ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ?
                                         0x100 : 0),
                         ioaddr + Wn3_MAC_Ctrl);
-
-        issue_and_wait(dev, TxReset);
-        /*
-         * Don't reset the PHY - that upsets autonegotiation during DHCP operations.
-         */
-        issue_and_wait(dev, RxReset|0x04);
 }
 
 static void vortex_check_media(struct net_device *dev, unsigned int init)
@@ -1663,7 +1657,7 @@ vortex_up(struct net_device *dev)
         struct vortex_private *vp = netdev_priv(dev);
         void __iomem *ioaddr = vp->ioaddr;
         unsigned int config;
-        int i;
+        int i, mii_reg1, mii_reg5;
 
         if (VORTEX_PCI(vp)) {
                 pci_set_power_state(VORTEX_PCI(vp), PCI_D0);    /* Go active */
@@ -1723,14 +1717,23 @@ vortex_up(struct net_device *dev)
                 printk(KERN_DEBUG "vortex_up(): writing 0x%x to InternalConfig\n", config);
         iowrite32(config, ioaddr + Wn3_Config);
 
-        netif_carrier_off(dev);
         if (dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
                 EL3WINDOW(4);
+                mii_reg1 = mdio_read(dev, vp->phys[0], MII_BMSR);
+                mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);
+                vp->partner_flow_ctrl = ((mii_reg5 & 0x0400) != 0);
+
                 vortex_check_media(dev, 1);
         }
         else
                 vortex_set_duplex(dev);
 
+        issue_and_wait(dev, TxReset);
+        /*
+         * Don't reset the PHY - that upsets autonegotiation during DHCP operations.
+         */
+        issue_and_wait(dev, RxReset|0x04);
+
 
         iowrite16(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
 
@@ -2083,16 +2086,14 @@ vortex_error(struct net_device *dev, int status)
                 }
                 if (tx_status & 0x14)  vp->stats.tx_fifo_errors++;
                 if (tx_status & 0x38)  vp->stats.tx_aborted_errors++;
+                if (tx_status & 0x08)  vp->xstats.tx_max_collisions++;
                 iowrite8(0, ioaddr + TxStatus);
                 if (tx_status & 0x30) {                 /* txJabber or txUnderrun */
                         do_tx_reset = 1;
-                } else if (tx_status & 0x08) {  /* maxCollisions */
-                        vp->xstats.tx_max_collisions++;
-                        if (vp->drv_flags & MAX_COLLISION_RESET) {
-                                do_tx_reset = 1;
-                                reset_mask = 0x0108;            /* Reset interface logic, but not download logic */
-                        }
-                } else {                                                /* Merely re-enable the transmitter. */
+                } else if ((tx_status & 0x08) && (vp->drv_flags & MAX_COLLISION_RESET))  {      /* maxCollisions */
+                        do_tx_reset = 1;
+                        reset_mask = 0x0108;            /* Reset interface logic, but not download logic */
+                } else {                                /* Merely re-enable the transmitter. */
                         iowrite16(TxEnable, ioaddr + EL3_CMD);
                 }
         }
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index ce99845d8266..066e22b01a94 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -539,8 +539,7 @@ rx_status_loop:
                 unsigned buflen;
 
                 skb = cp->rx_skb[rx_tail].skb;
-                if (!skb)
-                        BUG();
+                BUG_ON(!skb);
 
                 desc = &cp->rx_ring[rx_tail];
                 status = le32_to_cpu(desc->opts1);
@@ -723,8 +722,7 @@ static void cp_tx (struct cp_private *cp)
                         break;
 
                 skb = cp->tx_skb[tx_tail].skb;
-                if (!skb)
-                        BUG();
+                BUG_ON(!skb);
 
                 pci_unmap_single(cp->pdev, cp->tx_skb[tx_tail].mapping,
                                  cp->tx_skb[tx_tail].len, PCI_DMA_TODEVICE);
@@ -1550,8 +1548,7 @@ static void cp_get_ethtool_stats (struct net_device *dev,
         tmp_stats[i++] = le16_to_cpu(nic_stats->tx_abort);
         tmp_stats[i++] = le16_to_cpu(nic_stats->tx_underrun);
         tmp_stats[i++] = cp->cp_stats.rx_frags;
-        if (i != CP_NUM_STATS)
-                BUG();
+        BUG_ON(i != CP_NUM_STATS);
 
         pci_free_consistent(cp->pdev, sizeof(*nic_stats), nic_stats, dma);
 }
@@ -1856,8 +1853,7 @@ static void cp_remove_one (struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
         struct cp_private *cp = netdev_priv(dev);
 
-        if (!dev)
-                BUG();
+        BUG_ON(!dev);
         unregister_netdev(dev);
         iounmap(cp->regs);
         if (cp->wol_enabled) pci_set_power_state (pdev, PCI_D0);
diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 599b68d8c45f..51e39dcd0603 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -134,7 +134,7 @@ struct ei_device {
 #define inb_p(_p)       inb(_p)
 #define outb_p(_v,_p)   outb(_v,_p)
 
-#elif defined(CONFIG_NET_CBUS) || defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
+#elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
 #define EI_SHIFT(x)     (ei_local->reg_offset[x])
 #else
 #define EI_SHIFT(x)     (x)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e20b849a22e8..bdaaad8f2123 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2313,13 +2313,11 @@ config S2IO_NAPI
 
 endmenu
 
-if !UML
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
 source "drivers/net/pcmcia/Kconfig"
-endif
 
 source "drivers/net/wan/Kconfig"
 
diff --git a/drivers/net/acenic_firmware.h b/drivers/net/acenic_firmware.h
index 6d625d595622..d7882dd783c8 100644
--- a/drivers/net/acenic_firmware.h
+++ b/drivers/net/acenic_firmware.h
@@ -4397,7 +4397,7 @@ static u32 tigonFwText[(MAX_TEXT_LEN/4) + 1] __devinitdata = {
 0x3c010001, 0x220821, 0xac317e30, 0x8fbf0024, 
 0x8fb40020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 
 0x8fb00010, 0x3e00008, 0x27bd0028, 0x0 };
-static u32 tigonFwRodata[(MAX_RODATA_LEN/4) + 1] __initdata = {
+static u32 tigonFwRodata[(MAX_RODATA_LEN/4) + 1] __devinitdata = {
 0x24486561, 0x6465723a, 0x202f7072, 
 0x6f6a6563, 0x74732f72, 0x63732f73, 0x772f6765, 
 0x2f2e2f6e, 0x69632f66, 0x772f636f, 0x6d6d6f6e, 
@@ -4571,7 +4571,7 @@ static u32 tigonFwRodata[(MAX_RODATA_LEN/4) + 1] __initdata = {
 0x0, 0x14c38, 0x14c38, 0x14b80, 
 0x14bc4, 0x14c38, 0x14c38, 0x0, 
 0x0, 0x0 };
-static u32 tigonFwData[(MAX_DATA_LEN/4) + 1] __initdata = {
+static u32 tigonFwData[(MAX_DATA_LEN/4) + 1] __devinitdata = {
 0x416c7465, 
 0x6f6e2041, 0x63654e49, 0x43205600, 0x416c7465, 
 0x6f6e2041, 0x63654e49, 0x43205600, 0x42424242, 
@@ -4612,7 +4612,7 @@ static u32 tigonFwData[(MAX_DATA_LEN/4) + 1] __initdata = {
 #define tigon2FwSbssLen 0xcc
 #define tigon2FwBssAddr 0x00016f50
 #define tigon2FwBssLen 0x20c0
-static u32 tigon2FwText[(MAX_TEXT_LEN/4) + 1] __initdata = {
+static u32 tigon2FwText[(MAX_TEXT_LEN/4) + 1] __devinitdata = {
 0x0, 
 0x10000003, 0x0, 0xd, 0xd, 
 0x3c1d0001, 0x8fbd6d20, 0x3a0f021, 0x3c100000, 
@@ -9154,7 +9154,7 @@ static u32 tigon2FwText[(MAX_TEXT_LEN/4) + 1] __initdata = {
 0x24020001, 0x8f430328, 0x1021, 0x24630001, 
 0x3e00008, 0xaf430328, 0x3e00008, 0x0, 
 0x0, 0x0, 0x0, 0x0 };
-static u32 tigon2FwRodata[(MAX_RODATA_LEN/4) + 1] __initdata = {
+static u32 tigon2FwRodata[(MAX_RODATA_LEN/4) + 1] __devinitdata = {
 0x24486561, 0x6465723a, 0x202f7072, 
 0x6f6a6563, 0x74732f72, 0x63732f73, 0x772f6765, 
 0x2f2e2f6e, 0x69632f66, 0x77322f63, 0x6f6d6d6f, 
@@ -9425,7 +9425,7 @@ static u32 tigon2FwRodata[(MAX_RODATA_LEN/4) + 1] __initdata = {
 0x14ed8, 0x14b8c, 0x14bd8, 0x14c24, 
 0x14ed8, 0x7365746d, 0x61636163, 0x74000000, 
 0x0, 0x0 };
-static u32 tigon2FwData[(MAX_DATA_LEN/4) + 1] __initdata = {
+static u32 tigon2FwData[(MAX_DATA_LEN/4) + 1] __devinitdata = {
 0x1, 
 0x1, 0x1, 0xc001fc, 0x3ffc, 
 0xc00000, 0x416c7465, 0x6f6e2041, 0x63654e49, 
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 64e2caf3083d..fabc0607b0f1 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -765,8 +765,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
         BUGMSG(D_DURING, "in arcnet_interrupt\n");
         
         lp = dev->priv;
-        if (!lp)
-                BUG();
+        BUG_ON(!lp);
                 
         spin_lock(&lp->lock);
 
diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index 43150b2bd13f..0d45553ff75c 100644
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -125,11 +125,11 @@ static void __init com90xx_probe(void)
         if (!io && !irq && !shmem && !*device && com90xx_skip_probe)
                 return;
 
-        shmems = kzalloc(((0x10000-0xa0000) / 0x800) * sizeof(unsigned long),
+        shmems = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(unsigned long),
                          GFP_KERNEL);
         if (!shmems)
                 return;
-        iomem = kzalloc(((0x10000-0xa0000) / 0x800) * sizeof(void __iomem *),
+        iomem = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(void __iomem *),
                          GFP_KERNEL);
         if (!iomem) {
                 kfree(shmems);
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index c3267e4e1bb0..3d306681919e 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2,6 +2,7 @@
  *
  * Copyright (C) 2002 David S. Miller (davem@redhat.com)
  * Fixed by Pekka Pietikainen (pp@ee.oulu.fi)
+ * Copyright (C) 2006 Broadcom Corporation.
  *
  * Distribute under GPL.
  */
@@ -28,8 +29,8 @@
 
 #define DRV_MODULE_NAME         "b44"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "0.97"
-#define DRV_MODULE_RELDATE      "Nov 30, 2005"
+#define DRV_MODULE_VERSION      "1.00"
+#define DRV_MODULE_RELDATE      "Apr 7, 2006"
 
 #define B44_DEF_MSG_ENABLE        \
         (NETIF_MSG_DRV          | \
@@ -136,7 +137,7 @@ static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
         return readl(bp->regs + reg);
 }
 
-static inline void bw32(const struct b44 *bp, 
+static inline void bw32(const struct b44 *bp,
                         unsigned long reg, unsigned long val)
 {
         writel(val, bp->regs + reg);
@@ -286,13 +287,13 @@ static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
         val |= ((u32) data[4]) <<  8;
         val |= ((u32) data[5]) <<  0;
         bw32(bp, B44_CAM_DATA_LO, val);
-        val = (CAM_DATA_HI_VALID | 
+        val = (CAM_DATA_HI_VALID |
                (((u32) data[0]) << 8) |
                (((u32) data[1]) << 0));
         bw32(bp, B44_CAM_DATA_HI, val);
         bw32(bp, B44_CAM_CTRL, (CAM_CTRL_WRITE |
                             (index << CAM_CTRL_INDEX_SHIFT)));
-        b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);  
+        b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);
 }
 
 static inline void __b44_disable_ints(struct b44 *bp)
@@ -410,25 +411,18 @@ static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
 
 static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
 {
-        u32 pause_enab = bp->flags & (B44_FLAG_TX_PAUSE |
-                                      B44_FLAG_RX_PAUSE);
+        u32 pause_enab = 0;
 
-        if (local & ADVERTISE_PAUSE_CAP) {
-                if (local & ADVERTISE_PAUSE_ASYM) {
-                        if (remote & LPA_PAUSE_CAP)
-                                pause_enab |= (B44_FLAG_TX_PAUSE |
-                                               B44_FLAG_RX_PAUSE);
-                        else if (remote & LPA_PAUSE_ASYM)
-                                pause_enab |= B44_FLAG_RX_PAUSE;
-                } else {
-                        if (remote & LPA_PAUSE_CAP)
-                                pause_enab |= (B44_FLAG_TX_PAUSE |
-                                               B44_FLAG_RX_PAUSE);
-                }
-        } else if (local & ADVERTISE_PAUSE_ASYM) {
-                if ((remote & LPA_PAUSE_CAP) &&
-                    (remote & LPA_PAUSE_ASYM))
-                        pause_enab |= B44_FLAG_TX_PAUSE;
+        /* The driver supports only rx pause by default because
+           the b44 mac tx pause mechanism generates excessive
+           pause frames.
+           Use ethtool to turn on b44 tx pause if necessary.
+         */
+        if ((local & ADVERTISE_PAUSE_CAP) &&
+            (local & ADVERTISE_PAUSE_ASYM)){
+                if ((remote & LPA_PAUSE_ASYM) &&
+                    !(remote & LPA_PAUSE_CAP))
+                        pause_enab |= B44_FLAG_RX_PAUSE;
         }
 
         __b44_set_flow_ctrl(bp, pause_enab);
@@ -608,8 +602,7 @@ static void b44_tx(struct b44 *bp)
                 struct ring_info *rp = &bp->tx_buffers[cons];
                 struct sk_buff *skb = rp->skb;
 
-                if (unlikely(skb == NULL))
-                        BUG();
+                BUG_ON(skb == NULL);
 
                 pci_unmap_single(bp->pdev,
                                  pci_unmap_addr(rp, mapping),
@@ -1064,7 +1057,7 @@ static int b44_change_mtu(struct net_device *dev, int new_mtu)
         spin_unlock_irq(&bp->lock);
 
         b44_enable_ints(bp);
-        
+
         return 0;
 }
 
@@ -1339,6 +1332,9 @@ static int b44_set_mac_addr(struct net_device *dev, void *p)
         if (netif_running(dev))
                 return -EBUSY;
 
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
         spin_lock_irq(&bp->lock);
@@ -1379,7 +1375,7 @@ static void b44_init_hw(struct b44 *bp)
         bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
 
         bw32(bp, B44_DMARX_PTR, bp->rx_pending);
-        bp->rx_prod = bp->rx_pending;   
+        bp->rx_prod = bp->rx_pending;
 
         bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
 
@@ -1551,9 +1547,9 @@ static void __b44_set_rx_mode(struct net_device *dev)
                         val |= RXCONFIG_ALLMULTI;
                 else
                         i = __b44_load_mcast(bp, dev);
-                
+
                 for (; i < 64; i++) {
-                        __b44_cam_write(bp, zero, i);                   
+                        __b44_cam_write(bp, zero, i);
                 }
                 bw32(bp, B44_RXCONFIG, val);
                 val = br32(bp, B44_CAM_CTRL);
@@ -1735,7 +1731,7 @@ static int b44_set_ringparam(struct net_device *dev,
         spin_unlock_irq(&bp->lock);
 
         b44_enable_ints(bp);
-        
+
         return 0;
 }
 
@@ -1780,7 +1776,7 @@ static int b44_set_pauseparam(struct net_device *dev,
         spin_unlock_irq(&bp->lock);
 
         b44_enable_ints(bp);
-        
+
         return 0;
 }
 
@@ -1876,6 +1872,12 @@ static int __devinit b44_get_invariants(struct b44 *bp)
         bp->dev->dev_addr[3] = eeprom[80];
         bp->dev->dev_addr[4] = eeprom[83];
         bp->dev->dev_addr[5] = eeprom[82];
+
+        if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
+                printk(KERN_ERR PFX "Invalid MAC address found in EEPROM\n");
+                return -EINVAL;
+        }
+
         memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len);
 
         bp->phy_addr = eeprom[90] & 0x1f;
@@ -1890,7 +1892,7 @@ static int __devinit b44_get_invariants(struct b44 *bp)
         bp->core_unit = ssb_core_unit(bp);
         bp->dma_offset = SB_PCI_DMA;
 
-        /* XXX - really required? 
+        /* XXX - really required?
            bp->flags |= B44_FLAG_BUGGY_TXPTR;
          */
 out:
@@ -1938,7 +1940,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
                        "aborting.\n");
                 goto err_out_free_res;
         }
-        
+
         err = pci_set_consistent_dma_mask(pdev, (u64) B44_DMA_MASK);
         if (err) {
                 printk(KERN_ERR PFX "No usable DMA configuration, "
@@ -2033,6 +2035,11 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
 
         pci_save_state(bp->pdev);
 
+        /* Chip reset provides power to the b44 MAC & PCI cores, which
+         * is necessary for MAC register access.
+         */
+        b44_chip_reset(bp);
+
         printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
         for (i = 0; i < 6; i++)
                 printk("%2.2x%c", dev->dev_addr[i],
@@ -2078,10 +2085,10 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
 
         del_timer_sync(&bp->timer);
 
-        spin_lock_irq(&bp->lock); 
+        spin_lock_irq(&bp->lock);
 
         b44_halt(bp);
-        netif_carrier_off(bp->dev); 
+        netif_carrier_off(bp->dev);
         netif_device_detach(bp->dev);
         b44_free_rings(bp);
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 2671da20a496..5ca99e26660a 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -63,7 +63,7 @@
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT  (5*HZ)
 
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
         "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index f3f5825469d6..6a407070c2e8 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2294,6 +2294,34 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
         port->sm_vars |= AD_PORT_BEGIN;
 }
 
+/*
+ * set link state for bonding master: if we have an active partnered
+ * aggregator, we're up, if not, we're down.  Presumes that we cannot
+ * have an active aggregator if there are no slaves with link up.
+ *
+ * Called by bond_set_carrier(). Return zero if carrier state does not
+ * change, nonzero if it does.
+ */
+int bond_3ad_set_carrier(struct bonding *bond)
+{
+        struct aggregator *agg;
+
+        agg = __get_active_agg(&(SLAVE_AD_INFO(bond->first_slave).aggregator));
+        if (agg && MAC_ADDRESS_COMPARE(&agg->partner_system, &null_mac_addr)) {
+                if (!netif_carrier_ok(bond->dev)) {
+                        netif_carrier_on(bond->dev);
+                        return 1;
+                }
+                return 0;
+        }
+
+        if (netif_carrier_ok(bond->dev)) {
+                netif_carrier_off(bond->dev);
+                return 1;
+        }
+        return 0;
+}
+
 /**
  * bond_3ad_get_active_agg_info - get information of the active aggregator
  * @bond: bonding struct to work on
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 5ee2cef5b037..6ad5ad6e65d5 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -283,5 +283,6 @@ void bond_3ad_handle_link_change(struct slave *slave, char link);
 int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);
 int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev);
+int bond_3ad_set_carrier(struct bonding *bond);
 #endif //__BOND_3AD_H__
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f13a539dc169..55d236726d11 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -559,6 +559,42 @@ out:
 /*------------------------------- Link status -------------------------------*/
 
 /*
+ * Set the carrier state for the master according to the state of its
+ * slaves.  If any slaves are up, the master is up.  In 802.3ad mode,
+ * do special 802.3ad magic.
+ *
+ * Returns zero if carrier state does not change, nonzero if it does.
+ */
+static int bond_set_carrier(struct bonding *bond)
+{
+        struct slave *slave;
+        int i;
+
+        if (bond->slave_cnt == 0)
+                goto down;
+
+        if (bond->params.mode == BOND_MODE_8023AD)
+                return bond_3ad_set_carrier(bond);
+
+        bond_for_each_slave(bond, slave, i) {
+                if (slave->link == BOND_LINK_UP) {
+                        if (!netif_carrier_ok(bond->dev)) {
+                                netif_carrier_on(bond->dev);
+                                return 1;
+                        }
+                        return 0;
+                }
+        }
+
+down:
+        if (netif_carrier_ok(bond->dev)) {
+                netif_carrier_off(bond->dev);
+                return 1;
+        }
+        return 0;
+}
+
+/*
  * Get link speed and duplex from the slave's base driver
  * using ethtool. If for some reason the call fails or the
  * values are invalid, fake speed and duplex to 100/Full
@@ -1074,10 +1110,24 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 void bond_select_active_slave(struct bonding *bond)
 {
         struct slave *best_slave;
+        int rv;
 
         best_slave = bond_find_best_slave(bond);
         if (best_slave != bond->curr_active_slave) {
                 bond_change_active_slave(bond, best_slave);
+                rv = bond_set_carrier(bond);
+                if (!rv)
+                        return;
+
+                if (netif_carrier_ok(bond->dev)) {
+                        printk(KERN_INFO DRV_NAME
+                               ": %s: first active interface up!\n",
+                               bond->dev->name);
+                } else {
+                        printk(KERN_INFO DRV_NAME ": %s: "
+                               "now running without any active interface !\n",
+                               bond->dev->name);
+                }
         }
 }
 
@@ -1458,10 +1508,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 if (((!bond->curr_active_slave) ||
                      (bond->curr_active_slave->dev->priv_flags & IFF_SLAVE_INACTIVE)) &&
                     (new_slave->link != BOND_LINK_DOWN)) {
-                        dprintk("This is the first active slave\n");
                         /* first slave or no active slave yet, and this link
                            is OK, so make this interface the active one */
                         bond_change_active_slave(bond, new_slave);
+                        printk(KERN_INFO DRV_NAME
+                               ": %s: first active interface up!\n",
+                               bond->dev->name);
+                        netif_carrier_on(bond->dev);
+
                 } else {
                         dprintk("This is just a backup slave\n");
                         bond_set_slave_inactive_flags(new_slave);
@@ -1517,6 +1571,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 break;
         } /* switch(bond_mode) */
 
+        bond_set_carrier(bond);
+
         write_unlock_bh(&bond->lock);
 
         res = bond_create_slave_symlinks(bond_dev, slave_dev);
@@ -1656,18 +1712,12 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 bond_alb_deinit_slave(bond, slave);
         }
 
-        if (oldcurrent == slave) {
+        if (oldcurrent == slave)
                 bond_select_active_slave(bond);
 
-                if (!bond->curr_active_slave) {
-                        printk(KERN_INFO DRV_NAME
-                               ": %s: now running without any active "
-                               "interface !\n",
-                               bond_dev->name);
-                }
-        }
-
         if (bond->slave_cnt == 0) {
+                bond_set_carrier(bond);
+
                 /* if the last slave was removed, zero the mac address
                  * of the master so it will be set by the application
                  * to the mac address of the first slave
@@ -1751,6 +1801,8 @@ static int bond_release_all(struct net_device *bond_dev)
 
         write_lock_bh(&bond->lock);
 
+        netif_carrier_off(bond_dev);
+
         if (bond->slave_cnt == 0) {
                 goto out;
         }
@@ -2187,15 +2239,9 @@ void bond_mii_monitor(struct net_device *bond_dev)
 
                 bond_select_active_slave(bond);
 
-                if (oldcurrent && !bond->curr_active_slave) {
-                        printk(KERN_INFO DRV_NAME
-                               ": %s: now running without any active "
-                               "interface !\n",
-                               bond_dev->name);
-                }
-
                 write_unlock(&bond->curr_slave_lock);
-        }
+        } else
+                bond_set_carrier(bond);
 
 re_arm:
         if (bond->params.miimon) {
@@ -2499,13 +2545,6 @@ void bond_loadbalance_arp_mon(struct net_device *bond_dev)
 
                 bond_select_active_slave(bond);
 
-                if (oldcurrent && !bond->curr_active_slave) {
-                        printk(KERN_INFO DRV_NAME
-                               ": %s: now running without any active "
-                               "interface !\n",
-                               bond_dev->name);
-                }
-
                 write_unlock(&bond->curr_slave_lock);
         }
 
@@ -2579,12 +2618,15 @@ void bond_activebackup_arp_mon(struct net_device *bond_dev)
                                         bond->current_arp_slave = NULL;
                                 }
 
+                                bond_set_carrier(bond);
+
                                 if (slave == bond->curr_active_slave) {
                                         printk(KERN_INFO DRV_NAME
                                                ": %s: %s is up and now the "
                                                "active interface\n",
                                                bond_dev->name,
                                                slave->dev->name);
+                                        netif_carrier_on(bond->dev);
                                 } else {
                                         printk(KERN_INFO DRV_NAME
                                                ": %s: backup interface %s is "
@@ -2844,7 +2886,8 @@ static void bond_info_show_master(struct seq_file *seq)
                            (curr) ? curr->dev->name : "None");
         }
 
-        seq_printf(seq, "MII Status: %s\n", (curr) ? "up" : "down");
+        seq_printf(seq, "MII Status: %s\n", netif_carrier_ok(bond->dev) ?
+                   "up" : "down");
         seq_printf(seq, "MII Polling Interval (ms): %d\n", bond->params.miimon);
         seq_printf(seq, "Up Delay (ms): %d\n",
                    bond->params.updelay * bond->params.miimon);
@@ -4531,6 +4574,8 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
         if (newbond)
                 *newbond = bond_dev->priv;
 
+        netif_carrier_off(bond_dev);
+
         rtnl_unlock(); /* allows sysfs registration of net device */
         res = bond_create_sysfs_entry(bond_dev->priv);
         goto done;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index ce9dc9b4e2dc..0bdfe2c71453 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -22,8 +22,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.0.2"
-#define DRV_RELDATE     "February 21, 2006"
+#define DRV_VERSION     "3.0.3"
+#define DRV_RELDATE     "March 23, 2006"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
diff --git a/drivers/net/chelsio/Makefile b/drivers/net/chelsio/Makefile
index 91e927827c43..54c78d94f48b 100644
--- a/drivers/net/chelsio/Makefile
+++ b/drivers/net/chelsio/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_CHELSIO_T1) += cxgb.o
 
-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/chelsio $(DEBUG_FLAGS)
+EXTRA_CFLAGS += -Idrivers/net/chelsio $(DEBUG_FLAGS)
 
 
 cxgb-objs := cxgb2.o espi.o pm3393.o sge.o subr.o mv88x201x.o
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 30ff8ea1a402..4391bf4bf573 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1093,8 +1093,7 @@ static int process_responses(struct adapter *adapter, int budget)
                 if (likely(e->DataValid)) {
                         struct freelQ *fl = &sge->freelQ[e->FreelistQid];
 
-                        if (unlikely(!e->Sop || !e->Eop))
-                                BUG();
+                        BUG_ON(!e->Sop || !e->Eop);
                         if (unlikely(e->Offload))
                                 unexpected_offload(adapter, fl);
                         else
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 49cd096a3c3d..add8dc4aa7b0 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3308,8 +3308,7 @@ e1000_clean(struct net_device *poll_dev, int *budget)
 
         while (poll_dev != &adapter->polling_netdev[i]) {
                 i++;
-                if (unlikely(i == adapter->num_rx_queues))
-                        BUG();
+                BUG_ON(i == adapter->num_rx_queues);
         }
 
         if (likely(adapter->num_tx_queues == 1)) {
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index aa1569182fd6..815436c6170f 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -203,8 +203,7 @@ static int eql_open(struct net_device *dev)
         printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
                "your slave devices.\n", dev->name);
 
-        if (!list_empty(&eql->queue.all_slaves))
-                BUG();
+        BUG_ON(!list_empty(&eql->queue.all_slaves));
 
         eql->min_slaves = 1;
         eql->max_slaves = EQL_DEFAULT_MAX_SLAVES; /* 4 usually... */
diff --git a/drivers/net/hydra.h b/drivers/net/hydra.h
deleted file mode 100644
index 37414146258d..000000000000
--- a/drivers/net/hydra.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*      $Linux: hydra.h,v 1.0 1994/10/26 02:03:47 cgd Exp $     */
-
-/*
- * Copyright (c) 1994 Timo Rossi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by  Timo Rossi
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-/*
- * The Hydra Systems card uses the National Semiconductor
- * 8390 NIC (Network Interface Controller) chip, located
- * at card base address + 0xffe1. NIC registers are accessible
- * only at odd byte addresses, so the register offsets must
- * be multiplied by two.
- *
- * Card address PROM is located at card base + 0xffc0 (even byte addresses)
- *
- * RAM starts at the card base address, and is 16K or 64K.
- * The current Amiga NetBSD hydra driver is hardwired for 16K.
- * It seems that the RAM should be accessed as words or longwords only.
- *
- */
-
-/* adapted for Linux by Topi Kanerva 03/29/95
-   with original author's permission          */
-
-#define HYDRA_NIC_BASE 0xffe1
-
-/* Page0 registers */
-
-#define NIC_CR     0       /* Command register   */
-#define NIC_PSTART (1*2)   /* Page start (write) */
-#define NIC_PSTOP  (2*2)   /* Page stop (write)  */
-#define NIC_BNDRY  (3*2)   /* Boundary pointer   */
-#define NIC_TSR    (4*2)   /* Transmit status (read) */
-#define NIC_TPSR   (4*2)   /* Transmit page start (write) */
-#define NIC_NCR    (5*2)   /* Number of collisions, read  */
-#define NIC_TBCR0  (5*2)   /* Transmit byte count low (write)  */
-#define NIC_FIFO   (6*2)   /* FIFO reg. (read)   */
-#define NIC_TBCR1  (6*2)   /* Transmit byte count high (write) */
-#define NIC_ISR    (7*2)   /* Interrupt status register */
-#define NIC_RBCR0  (0xa*2) /* Remote byte count low (write)  */
-#define NIC_RBCR1  (0xb*2) /* Remote byte count high (write) */
-#define NIC_RSR    (0xc*2) /* Receive status (read)  */
-#define NIC_RCR    (0xc*2) /* Receive config (write) */
-#define NIC_CNTR0  (0xd*2) /* Frame alignment error count (read) */
-#define NIC_TCR    (0xd*2) /* Transmit config (write)  */
-#define NIC_CNTR1  (0xe*2) /* CRC error counter (read) */
-#define NIC_DCR    (0xe*2) /* Data config (write) */
-#define NIC_CNTR2  (0xf*2) /* missed packet counter (read) */
-#define NIC_IMR    (0xf*2) /* Interrupt mask reg. (write)  */
-
-/* Page1 registers */
-
-#define NIC_PAR0   (1*2)   /* Physical address */
-#define NIC_PAR1   (2*2)
-#define NIC_PAR2   (3*2)
-#define NIC_PAR3   (4*2)
-#define NIC_PAR4   (5*2)
-#define NIC_PAR5   (6*2)
-#define NIC_CURR   (7*2)   /* Current RX ring-buffer page */
-#define NIC_MAR0   (8*2)   /* Multicast address */
-#define NIC_MAR1   (9*2)
-#define NIC_MAR2   (0xa*2)
-#define NIC_MAR3   (0xb*2)
-#define NIC_MAR4   (0xc*2)
-#define NIC_MAR5   (0xd*2)
-#define NIC_MAR6   (0xe*2)
-#define NIC_MAR7   (0xf*2)
-
-/* Command register definitions */
-
-#define CR_STOP   0x01 /* Stop -- software reset command */
-#define CR_START  0x02 /* Start */
-#define CR_TXP   0x04 /* Transmit packet */
-
-#define CR_RD0    0x08 /* Remote DMA cmd */
-#define CR_RD1    0x10
-#define CR_RD2    0x20
-
-#define CR_NODMA  CR_RD2
-
-#define CR_PS0    0x40 /* Page select */
-#define CR_PS1    0x80
-
-#define CR_PAGE0  0
-#define CR_PAGE1  CR_PS0
-#define CR_PAGE2  CR_PS1
-
-/* Interrupt status reg. definitions */
-
-#define ISR_PRX   0x01 /* Packet received without errors */
-#define ISR_PTX   0x02 /* Packet transmitted without errors */
-#define ISR_RXE   0x04 /* Receive error  */
-#define ISR_TXE   0x08 /* Transmit error */
-#define ISR_OVW   0x10 /* Ring buffer overrun */
-#define ISR_CNT   0x20 /* Counter overflow    */
-#define ISR_RDC   0x40 /* Remote DMA compile */
-#define ISR_RST   0x80 /* Reset status      */
-
-/* Data config reg. definitions */
-
-#define DCR_WTS   0x01 /* Word transfer select  */
-#define DCR_BOS   0x02 /* Byte order select     */
-#define DCR_LAS   0x04 /* Long address select   */
-#define DCR_LS    0x08 /* Loopback select       */
-#define DCR_AR    0x10 /* Auto-init remote      */
-#define DCR_FT0   0x20 /* FIFO threshold select */
-#define DCR_FT1   0x40
-
-/* Transmit config reg. definitions */
-
-#define TCR_CRC  0x01 /* Inhibit CRC */
-#define TCR_LB0  0x02 /* Loopback control */
-#define TCR_LB1  0x04
-#define TCR_ATD  0x08 /* Auto transmit disable */
-#define TCR_OFST 0x10 /* Collision offset enable */
-
-/* Transmit status reg. definitions */
-
-#define TSR_PTX  0x01 /* Packet transmitted */
-#define TSR_COL  0x04 /* Transmit collided */
-#define TSR_ABT  0x08 /* Transmit aborted */
-#define TSR_CRS  0x10 /* Carrier sense lost */
-#define TSR_FU   0x20 /* FIFO underrun */
-#define TSR_CDH  0x40 /* CD Heartbeat */
-#define TSR_OWC  0x80 /* Out of Window Collision */
-
-/* Receiver config register definitions */
-
-#define RCR_SEP  0x01 /* Save errored packets */
-#define RCR_AR   0x02 /* Accept runt packets */
-#define RCR_AB   0x04 /* Accept broadcast */
-#define RCR_AM   0x08 /* Accept multicast */
-#define RCR_PRO  0x10 /* Promiscuous mode */
-#define RCR_MON  0x20 /* Monitor mode */
-
-/* Receiver status register definitions */
-
-#define RSR_PRX  0x01 /* Packet received without error */
-#define RSR_CRC  0x02 /* CRC error */
-#define RSR_FAE  0x04 /* Frame alignment error */
-#define RSR_FO   0x08 /* FIFO overrun */
-#define RSR_MPA  0x10 /* Missed packet */
-#define RSR_PHY  0x20 /* Physical address */
-#define RSR_DIS  0x40 /* Received disabled */
-#define RSR_DFR  0x80 /* Deferring (jabber) */
-
-/* Hydra System card address PROM offset */
-
-#define HYDRA_ADDRPROM 0xffc0
-
-
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index ceb98fd398af..52d01027d9e7 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -235,7 +235,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
 
                 lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);
                     
-                if(lpar_rc != H_Success) {
+                if(lpar_rc != H_SUCCESS) {
                         pool->free_map[free_index] = index;
                         pool->skbuff[index] = NULL;
                         pool->consumer_index--;
@@ -373,7 +373,7 @@ static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
 
         lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);
                     
-        if(lpar_rc != H_Success) {
+        if(lpar_rc != H_SUCCESS) {
                 ibmveth_debug_printk("h_add_logical_lan_buffer failed during recycle rc=%ld", lpar_rc);
                 ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
         }
@@ -511,7 +511,7 @@ static int ibmveth_open(struct net_device *netdev)
                                          adapter->filter_list_dma,
                                          mac_address);
 
-        if(lpar_rc != H_Success) {
+        if(lpar_rc != H_SUCCESS) {
                 ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc);
                 ibmveth_error_printk("buffer TCE:0x%lx filter TCE:0x%lx rxq desc:0x%lx MAC:0x%lx\n",
                                      adapter->buffer_list_dma,
@@ -527,7 +527,7 @@ static int ibmveth_open(struct net_device *netdev)
                 ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc);
                 do {
                         rc = h_free_logical_lan(adapter->vdev->unit_address);
-                } while (H_isLongBusy(rc) || (rc == H_Busy));
+                } while (H_IS_LONG_BUSY(rc) || (rc == H_BUSY));
 
                 ibmveth_cleanup(adapter);
                 return rc;
@@ -556,9 +556,9 @@ static int ibmveth_close(struct net_device *netdev)
 
         do {
                 lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
-        } while (H_isLongBusy(lpar_rc) || (lpar_rc == H_Busy));
+        } while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY));
 
-        if(lpar_rc != H_Success)
+        if(lpar_rc != H_SUCCESS)
         {
                 ibmveth_error_printk("h_free_logical_lan failed with %lx, continuing with close\n",
                                      lpar_rc);
@@ -693,9 +693,9 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                                              desc[4].desc,
                                              desc[5].desc,
                                              correlator);
-        } while ((lpar_rc == H_Busy) && (retry_count--));
+        } while ((lpar_rc == H_BUSY) && (retry_count--));
     
-        if(lpar_rc != H_Success && lpar_rc != H_Dropped) {
+        if(lpar_rc != H_SUCCESS && lpar_rc != H_DROPPED) {
                 int i;
                 ibmveth_error_printk("tx: h_send_logical_lan failed with rc=%ld\n", lpar_rc);
                 for(i = 0; i < 6; i++) {
@@ -786,14 +786,14 @@ static int ibmveth_poll(struct net_device *netdev, int *budget)
         /* we think we are done - reenable interrupts, then check once more to make sure we are done */
         lpar_rc = h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_ENABLE);
 
-        ibmveth_assert(lpar_rc == H_Success);
+        ibmveth_assert(lpar_rc == H_SUCCESS);
 
         netif_rx_complete(netdev);
 
         if(ibmveth_rxq_pending_buffer(adapter) && netif_rx_reschedule(netdev, frames_processed))
         {
                 lpar_rc = h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE);
-                ibmveth_assert(lpar_rc == H_Success);
+                ibmveth_assert(lpar_rc == H_SUCCESS);
                 more_work = 1;
                 goto restart_poll;
         }
@@ -813,7 +813,7 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs
 
         if(netif_rx_schedule_prep(netdev)) {
                 lpar_rc = h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE);
-                ibmveth_assert(lpar_rc == H_Success);
+                ibmveth_assert(lpar_rc == H_SUCCESS);
                 __netif_rx_schedule(netdev);
         }
         return IRQ_HANDLED;
@@ -835,7 +835,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
                                            IbmVethMcastEnableRecv |
                                            IbmVethMcastDisableFiltering,
                                            0);
-                if(lpar_rc != H_Success) {
+                if(lpar_rc != H_SUCCESS) {
                         ibmveth_error_printk("h_multicast_ctrl rc=%ld when entering promisc mode\n", lpar_rc);
                 }
         } else {
@@ -847,7 +847,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
                                            IbmVethMcastDisableFiltering |
                                            IbmVethMcastClearFilterTable,
                                            0);
-                if(lpar_rc != H_Success) {
+                if(lpar_rc != H_SUCCESS) {
                         ibmveth_error_printk("h_multicast_ctrl rc=%ld when attempting to clear filter table\n", lpar_rc);
                 }
                 /* add the addresses to the filter table */
@@ -858,7 +858,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
                         lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
                                                    IbmVethMcastAddFilter,
                                                    mcast_addr);
-                        if(lpar_rc != H_Success) {
+                        if(lpar_rc != H_SUCCESS) {
                                 ibmveth_error_printk("h_multicast_ctrl rc=%ld when adding an entry to the filter table\n", lpar_rc);
                         }
                 }
@@ -867,7 +867,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
                 lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
                                            IbmVethMcastEnableFiltering,
                                            0);
-                if(lpar_rc != H_Success) {
+                if(lpar_rc != H_SUCCESS) {
                         ibmveth_error_printk("h_multicast_ctrl rc=%ld when enabling filtering\n", lpar_rc);
                 }
         }
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 6e2ec56cde0b..96bdb73c2283 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * Filename:      irda-usb.c
- * Version:       0.9b
+ * Version:       0.10
  * Description:   IrDA-USB Driver
  * Status:        Experimental 
  * Author:        Dag Brattli <dag@brattli.net>
@@ -9,6 +9,9 @@
  *      Copyright (C) 2000, Roman Weissgaerber <weissg@vienna.at>
  *      Copyright (C) 2001, Dag Brattli <dag@brattli.net>
  *      Copyright (C) 2001, Jean Tourrilhes <jt@hpl.hp.com>
+ *      Copyright (C) 2004, SigmaTel, Inc. <irquality@sigmatel.com>
+ *      Copyright (C) 2005, Milan Beno <beno@pobox.sk>
+ *      Copyright (C) 2006, Nick Fedchik <nick@fedchik.org.ua>
  *          
  *      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
@@ -61,6 +64,7 @@
 #include <linux/slab.h>
 #include <linux/rtnetlink.h>
 #include <linux/usb.h>
+#include <linux/firmware.h>
 
 #include "irda-usb.h"
 
@@ -78,8 +82,12 @@ static struct usb_device_id dongles[] = {
         { USB_DEVICE(0x50f, 0x180), .driver_info = IUC_SPEED_BUG | IUC_NO_WINDOW },
         /* Extended Systems, Inc.,  XTNDAccess IrDA USB (ESI-9685) */
         { USB_DEVICE(0x8e9, 0x100), .driver_info = IUC_SPEED_BUG | IUC_NO_WINDOW },
+        /* SigmaTel STIR4210/4220/4116 USB IrDA (VFIR) Bridge */
+        { USB_DEVICE(0x66f, 0x4210), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },
+        { USB_DEVICE(0x66f, 0x4220), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },
+        { USB_DEVICE(0x66f, 0x4116), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },
         { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
+          USB_DEVICE_ID_MATCH_INT_SUBCLASS,
           .bInterfaceClass = USB_CLASS_APP_SPEC,
           .bInterfaceSubClass = USB_CLASS_IRDA,
           .driver_info = IUC_DEFAULT, },
@@ -99,6 +107,7 @@ MODULE_DEVICE_TABLE(usb, dongles);
 
 /*------------------------------------------------------------------*/
 
+static void irda_usb_init_qos(struct irda_usb_cb *self) ;
 static struct irda_class_desc *irda_usb_find_class_desc(struct usb_interface *intf);
 static void irda_usb_disconnect(struct usb_interface *intf);
 static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self);
@@ -141,7 +150,24 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
                                   __u8 *header,
                                   int   force)
 {
-        /* Set the negotiated link speed */
+        /* Here we check if we have an STIR421x chip,
+         * and if either speed or xbofs (or both) needs
+         * to be changed.
+         */
+        if (self->capability & IUC_STIR_4210 &&
+            ((self->new_speed != -1) || (self->new_xbofs != -1))) {
+
+                /* With STIR421x, speed and xBOFs must be set at the same
+                 * time, even if only one of them changes.
+                 */
+                if (self->new_speed == -1)
+                        self->new_speed = self->speed ;
+
+                if (self->new_xbofs == -1)
+                        self->new_xbofs = self->xbofs ;
+        }
+
+        /* Set the link speed */
         if (self->new_speed != -1) {
                 /* Hum... Ugly hack :-(
                  * Some device are not compliant with the spec and change
@@ -191,7 +217,11 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
                         *header = SPEED_4000000;
                         self->new_xbofs = 0;
                         break;
-                }
+                case 16000000:
+                        *header = SPEED_16000000;
+                        self->new_xbofs = 0;
+                        break;
+                }
         } else
                 /* No change */
                 *header = 0;
@@ -235,6 +265,32 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
         }
 }
 
+/*
+*   calculate turnaround time for SigmaTel header
+*/
+static __u8 get_turnaround_time(struct sk_buff *skb)
+{
+        int turnaround_time = irda_get_mtt(skb);
+
+        if ( turnaround_time == 0 )
+                return 0;
+        else if ( turnaround_time <= 10 )
+                return 1;
+        else if ( turnaround_time <= 50 )
+                return 2;
+        else if ( turnaround_time <= 100 )
+                return 3;
+        else if ( turnaround_time <= 500 )
+                return 4;
+        else if ( turnaround_time <= 1000 )
+                return 5;
+        else if ( turnaround_time <= 5000 )
+                return 6;
+        else
+                return 7;
+}
+
+
 /*------------------------------------------------------------------*/
 /*
  * Send a command to change the speed of the dongle
@@ -262,12 +318,18 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
         /* Set the new speed and xbofs in this fake frame */
         irda_usb_build_header(self, frame, 1);
 
+        if ( self->capability & IUC_STIR_4210 ) {
+                if (frame[0] == 0) return ; // do nothing if no change
+                frame[1] = 0; // other parameters don't change here
+                frame[2] = 0;
+        }
+
         /* Submit the 0 length IrDA frame to trigger new speed settings */
         usb_fill_bulk_urb(urb, self->usbdev,
                       usb_sndbulkpipe(self->usbdev, self->bulk_out_ep),
                       frame, IRDA_USB_SPEED_MTU,
                       speed_bulk_callback, self);
-        urb->transfer_buffer_length = USB_IRDA_HEADER;
+        urb->transfer_buffer_length = self->header_length;
         urb->transfer_flags = 0;
 
         /* Irq disabled -> GFP_ATOMIC */
@@ -383,16 +445,35 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
          * allocation will be done lower in skb_push().
          * Also, we don't use directly skb_cow(), because it require
          * headroom >= 16, which force unnecessary copies - Jean II */
-        if (skb_headroom(skb) < USB_IRDA_HEADER) {
+        if (skb_headroom(skb) < self->header_length) {
                 IRDA_DEBUG(0, "%s(), Insuficient skb headroom.\n", __FUNCTION__);
-                if (skb_cow(skb, USB_IRDA_HEADER)) {
+                if (skb_cow(skb, self->header_length)) {
                         IRDA_WARNING("%s(), failed skb_cow() !!!\n", __FUNCTION__);
                         goto drop;
                 }
         }
 
         /* Change setting for next frame */
-        irda_usb_build_header(self, skb_push(skb, USB_IRDA_HEADER), 0);
+
+        if ( self->capability & IUC_STIR_4210 ) {
+                __u8 turnaround_time;
+                __u8* frame;
+                turnaround_time = get_turnaround_time( skb );
+                frame= skb_push(skb, self->header_length);
+                irda_usb_build_header(self, frame, 0);
+                frame[2] = turnaround_time;
+                if ((skb->len != 0) &&
+                    ((skb->len % 128) == 0) &&
+                    ((skb->len % 512) != 0)) {
+                        /* add extra byte for special SigmaTel feature */
+                        frame[1] = 1;
+                        skb_put(skb, 1);
+                } else {
+                        frame[1] = 0;
+                }
+        } else {
+                irda_usb_build_header(self, skb_push(skb, self->header_length), 0);
+        }
 
         /* FIXME: Make macro out of this one */
         ((struct irda_skb_cb *)skb->cb)->context = self;
@@ -795,7 +876,7 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
         }
         
         /* Check for empty frames */
-        if (urb->actual_length <= USB_IRDA_HEADER) {
+        if (urb->actual_length <= self->header_length) {
                 IRDA_WARNING("%s(), empty frame!\n", __FUNCTION__);
                 goto done;
         }
@@ -816,7 +897,11 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
         docopy = (urb->actual_length < IRDA_RX_COPY_THRESHOLD);
 
         /* Allocate a new skb */
-        newskb = dev_alloc_skb(docopy ? urb->actual_length : IRDA_SKB_MAX_MTU);
+        if ( self->capability & IUC_STIR_4210 )
+                newskb = dev_alloc_skb(docopy ? urb->actual_length : IRDA_SKB_MAX_MTU + USB_IRDA_SIGMATEL_HEADER);
+        else
+                newskb = dev_alloc_skb(docopy ? urb->actual_length : IRDA_SKB_MAX_MTU);
+
         if (!newskb)  {
                 self->stats.rx_dropped++;
                 /* We could deliver the current skb, but this would stall
@@ -845,7 +930,7 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
 
         /* Set proper length on skb & remove USB-IrDA header */
         skb_put(dataskb, urb->actual_length);
-        skb_pull(dataskb, USB_IRDA_HEADER);
+        skb_pull(dataskb, self->header_length);
 
         /* Ask the networking layer to queue the packet for the IrDA stack */
         dataskb->dev = self->netdev;
@@ -937,6 +1022,191 @@ static int irda_usb_is_receiving(struct irda_usb_cb *self)
         return 0; /* For now */
 }
 
+
+#define STIR421X_PATCH_PRODUCT_VERSION_STR       "Product Version: "
+#define STIR421X_PATCH_COMPONENT_VERSION_STR     "Component Version: "
+#define STIR421X_PATCH_DATA_TAG_STR              "STMP"
+#define STIR421X_PATCH_FILE_VERSION_MAX_OFFSET   512     /* version info is before here */
+#define STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET     512     /* patch image starts before here */
+#define STIR421X_PATCH_FILE_END_OF_HEADER_TAG    0x1A    /* marks end of patch file header (PC DOS text file EOF character) */
+
+/*
+ * Known firmware patches for STIR421x dongles
+ */
+static char * stir421x_patches[] = {
+        "42101001.sb",
+        "42101002.sb",
+};
+
+static int stir421x_get_patch_version(unsigned char * patch, const unsigned long patch_len)
+{
+        unsigned int version_offset;
+        unsigned long version_major, version_minor, version_build;
+        unsigned char * version_start;
+        int version_found = 0;
+
+        for (version_offset = 0;
+             version_offset < STIR421X_PATCH_FILE_END_OF_HEADER_TAG;
+             version_offset++) {
+                if (!memcmp(patch + version_offset,
+                            STIR421X_PATCH_PRODUCT_VERSION_STR,
+                            sizeof(STIR421X_PATCH_PRODUCT_VERSION_STR) - 1)) {
+                                    version_found = 1;
+                                    version_start = patch +
+                                            version_offset +
+                                            sizeof(STIR421X_PATCH_PRODUCT_VERSION_STR) - 1;
+                                    break;
+                }
+        }
+
+        /* We couldn't find a product version on this patch */
+        if (!version_found)
+                return -EINVAL;
+
+        /* Let's check if the product version is dotted */
+        if (version_start[3] != '.' ||
+            version_start[7] != '.')
+                return -EINVAL;
+
+        version_major = simple_strtoul(version_start, NULL, 10);
+        version_minor = simple_strtoul(version_start + 4, NULL, 10);
+        version_build = simple_strtoul(version_start + 8, NULL, 10);
+
+        IRDA_DEBUG(2, "%s(), Major: %ld Minor: %ld Build: %ld\n",
+                   __FUNCTION__,
+                   version_major, version_minor, version_build);
+
+        return (((version_major) << 12) +
+                ((version_minor) << 8) +
+                ((version_build / 10) << 4) +
+                (version_build % 10));
+
+}
+
+
+static int stir421x_upload_patch (struct irda_usb_cb *self,
+                                  unsigned char * patch,
+                                  const unsigned int patch_len)
+{
+    int retval = 0;
+    int actual_len;
+    unsigned int i = 0, download_amount = 0;
+    unsigned char * patch_chunk;
+
+    IRDA_DEBUG (2, "%s(), Uploading STIR421x Patch\n", __FUNCTION__);
+
+    patch_chunk = kzalloc(STIR421X_MAX_PATCH_DOWNLOAD_SIZE, GFP_KERNEL);
+    if (patch_chunk == NULL)
+            return -ENOMEM;
+
+    /* break up patch into 1023-byte sections */
+    for (i = 0; retval >= 0 && i < patch_len; i += download_amount) {
+            download_amount = patch_len - i;
+            if (download_amount > STIR421X_MAX_PATCH_DOWNLOAD_SIZE)
+                    download_amount = STIR421X_MAX_PATCH_DOWNLOAD_SIZE;
+
+            /* download the patch section */
+            memcpy(patch_chunk, patch + i, download_amount);
+
+            retval = usb_bulk_msg (self->usbdev,
+                                   usb_sndbulkpipe (self->usbdev,
+                                                    self->bulk_out_ep),
+                                   patch_chunk, download_amount,
+                                   &actual_len, msecs_to_jiffies (500));
+            IRDA_DEBUG (2, "%s(), Sent %u bytes\n", __FUNCTION__,
+                        actual_len);
+            if (retval == 0)
+                    mdelay(10);
+    }
+
+    kfree(patch_chunk);
+
+    if (i != patch_len) {
+            IRDA_ERROR ("%s(), Pushed %d bytes (!= patch_len (%d))\n",
+                       __FUNCTION__, i, patch_len);
+            retval = -EIO;
+    }
+
+    if (retval < 0)
+            /* todo - mark device as not ready */
+            IRDA_ERROR ("%s(), STIR421x patch upload failed (%d)\n",
+                        __FUNCTION__, retval);
+
+    return retval;
+}
+
+
+static int stir421x_patch_device(struct irda_usb_cb *self)
+{
+        unsigned int i, patch_found = 0, data_found = 0, data_offset;
+        int patch_version, ret = 0;
+        const struct firmware *fw_entry;
+
+        for (i = 0; i < ARRAY_SIZE(stir421x_patches); i++) {
+                if(request_firmware(&fw_entry, stir421x_patches[i], &self->usbdev->dev) != 0) {
+                        IRDA_ERROR( "%s(), Patch %s is not available\n", __FUNCTION__, stir421x_patches[i]);
+                        continue;
+                }
+
+                /* We found a patch from userspace */
+                patch_version = stir421x_get_patch_version (fw_entry->data, fw_entry->size);
+
+                if (patch_version < 0) {
+                        /* Couldn't fetch a version, let's move on to the next file */
+                        IRDA_ERROR("%s(), version parsing failed\n", __FUNCTION__);
+                        ret = patch_version;
+                        release_firmware(fw_entry);
+                        continue;
+                }
+
+                if (patch_version != self->usbdev->descriptor.bcdDevice) {
+                        /* Patch version and device don't match */
+                        IRDA_ERROR ("%s(), wrong patch version (%d <-> %d)\n",
+                                    __FUNCTION__,
+                                    patch_version, self->usbdev->descriptor.bcdDevice);
+                        ret = -EINVAL;
+                        release_firmware(fw_entry);
+                        continue;
+                }
+
+                /* If we're here, we've found a correct patch */
+                patch_found = 1;
+                break;
+
+        }
+
+        /* We couldn't find a valid firmware, let's leave */
+        if (!patch_found)
+                return ret;
+
+        /* The actual image starts after the "STMP" keyword */
+        for (data_offset = 0; data_offset < STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET; data_offset++) {
+                if (!memcmp(fw_entry->data + data_offset,
+                            STIR421X_PATCH_DATA_TAG_STR,
+                            sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET))) {
+                        IRDA_DEBUG(2, "%s(), found patch data for STIR421x at offset %d\n",
+                                   __FUNCTION__, data_offset);
+                        data_found = 1;
+                        break;
+                }
+        }
+
+        /* We couldn't find "STMP" from the header */
+        if (!data_found)
+                return -EINVAL;
+
+        /* Let's upload the patch to the target */
+        ret = stir421x_upload_patch(self,
+                                    &fw_entry->data[data_offset + sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET)],
+                                    fw_entry->size - (data_offset + sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET)));
+
+        release_firmware(fw_entry);
+
+        return ret;
+
+}
+
+
 /********************** IRDA DEVICE CALLBACKS **********************/
 /*
  * Main calls from the IrDA/Network subsystem.
@@ -972,6 +1242,11 @@ static int irda_usb_net_open(struct net_device *netdev)
                 return -1;
         }
 
+        if(self->needspatch) {
+                IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ;
+                return -EIO ;
+        }
+
         /* Initialise default speed and xbofs value
          * (IrLAP will change that soon) */
         self->speed = -1;
@@ -1050,7 +1325,7 @@ static int irda_usb_net_close(struct net_device *netdev)
         del_timer(&self->rx_defer_timer);
 
         /* Deallocate all the Rx path buffers (URBs and skb) */
-        for (i = 0; i < IU_MAX_RX_URBS; i++) {
+        for (i = 0; i < self->max_rx_urb; i++) {
                 struct urb *urb = self->rx_urb[i];
                 struct sk_buff *skb = (struct sk_buff *) urb->context;
                 /* Cancel the receive command */
@@ -1426,8 +1701,22 @@ static int irda_usb_probe(struct usb_interface *intf,
         spin_lock_init(&self->lock);
         init_timer(&self->rx_defer_timer);
 
+        self->capability = id->driver_info;
+        self->needspatch = ((self->capability & IUC_STIR_4210) != 0) ;
+
         /* Create all of the needed urbs */
-        for (i = 0; i < IU_MAX_RX_URBS; i++) {
+        if (self->capability & IUC_STIR_4210) {
+                self->max_rx_urb = IU_SIGMATEL_MAX_RX_URBS;
+                self->header_length = USB_IRDA_SIGMATEL_HEADER;
+        } else {
+                self->max_rx_urb = IU_MAX_RX_URBS;
+                self->header_length = USB_IRDA_HEADER;
+        }
+
+        self->rx_urb = kzalloc(self->max_rx_urb * sizeof(struct urb *),
+                                GFP_KERNEL);
+
+        for (i = 0; i < self->max_rx_urb; i++) {
                 self->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
                 if (!self->rx_urb[i]) {
                         goto err_out_1;
@@ -1479,17 +1768,28 @@ static int irda_usb_probe(struct usb_interface *intf,
                 goto err_out_3;
         }
 
+        self->usbdev = dev;
+
         /* Find IrDA class descriptor */
         irda_desc = irda_usb_find_class_desc(intf);
         ret = -ENODEV;
         if (irda_desc == NULL)
                 goto err_out_3;
 
+        if (self->needspatch) {
+                ret = usb_control_msg (self->usbdev, usb_sndctrlpipe (self->usbdev, 0),
+                                       0x02, 0x40, 0, 0, 0, 0, msecs_to_jiffies(500));
+                if (ret < 0) {
+                        IRDA_DEBUG (0, "usb_control_msg failed %d\n", ret);
+                        goto err_out_3;
+                } else {
+                        mdelay(10);
+                }
+        }
+
         self->irda_desc =  irda_desc;
         self->present = 1;
         self->netopen = 0;
-        self->capability = id->driver_info;
-        self->usbdev = dev;
         self->usbintf = intf;
 
         /* Allocate the buffer for speed changes */
@@ -1508,8 +1808,32 @@ static int irda_usb_probe(struct usb_interface *intf,
 
         IRDA_MESSAGE("IrDA: Registered device %s\n", net->name);
         usb_set_intfdata(intf, self);
+
+        if (self->needspatch) {
+                /* Now we fetch and upload the firmware patch */
+                ret = stir421x_patch_device(self);
+                self->needspatch = (ret < 0);
+                if (ret < 0) {
+                        printk("patch_device failed\n");
+                        goto err_out_5;
+                }
+
+                /* replace IrDA class descriptor with what patched device is now reporting */
+                irda_desc = irda_usb_find_class_desc (self->usbintf);
+                if (irda_desc == NULL) {
+                        ret = -ENODEV;
+                        goto err_out_5;
+                }
+                if (self->irda_desc)
+                        kfree (self->irda_desc);
+                self->irda_desc = irda_desc;
+                irda_usb_init_qos(self);
+        }
+
         return 0;
 
+err_out_5:
+        unregister_netdev(self->netdev);
 err_out_4:
         kfree(self->speed_buff);
 err_out_3:
@@ -1518,7 +1842,7 @@ err_out_3:
 err_out_2:
         usb_free_urb(self->tx_urb);
 err_out_1:
-        for (i = 0; i < IU_MAX_RX_URBS; i++) {
+        for (i = 0; i < self->max_rx_urb; i++) {
                 if (self->rx_urb[i])
                         usb_free_urb(self->rx_urb[i]);
         }
@@ -1571,7 +1895,7 @@ static void irda_usb_disconnect(struct usb_interface *intf)
                 /*netif_device_detach(self->netdev);*/
                 netif_stop_queue(self->netdev);
                 /* Stop all the receive URBs. Must be synchronous. */
-                for (i = 0; i < IU_MAX_RX_URBS; i++)
+                for (i = 0; i < self->max_rx_urb; i++)
                         usb_kill_urb(self->rx_urb[i]);
                 /* Cancel Tx and speed URB.
                  * Make sure it's synchronous to avoid races. */
@@ -1586,8 +1910,9 @@ static void irda_usb_disconnect(struct usb_interface *intf)
         self->usbintf = NULL;
 
         /* Clean up our urbs */
-        for (i = 0; i < IU_MAX_RX_URBS; i++)
+        for (i = 0; i < self->max_rx_urb; i++)
                 usb_free_urb(self->rx_urb[i]);
+        kfree(self->rx_urb);
         /* Clean up Tx and speed URB */
         usb_free_urb(self->tx_urb);
         usb_free_urb(self->speed_urb);
@@ -1648,6 +1973,6 @@ module_exit(usb_irda_cleanup);
  */
 module_param(qos_mtt_bits, int, 0);
 MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time");
-MODULE_AUTHOR("Roman Weissgaerber <weissg@vienna.at>, Dag Brattli <dag@brattli.net> and Jean Tourrilhes <jt@hpl.hp.com>");
-MODULE_DESCRIPTION("IrDA-USB Dongle Driver"); 
+MODULE_AUTHOR("Roman Weissgaerber <weissg@vienna.at>, Dag Brattli <dag@brattli.net>, Jean Tourrilhes <jt@hpl.hp.com> and Nick Fedchik <nick@fedchik.org.ua>");
+MODULE_DESCRIPTION("IrDA-USB Dongle Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h
index 4026af42dd47..d833db52cebf 100644
--- a/drivers/net/irda/irda-usb.h
+++ b/drivers/net/irda/irda-usb.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * Filename:      irda-usb.h
- * Version:       0.9b
+ * Version:       0.10
  * Description:   IrDA-USB Driver
  * Status:        Experimental 
  * Author:        Dag Brattli <dag@brattli.net>
@@ -9,6 +9,9 @@
  *      Copyright (C) 2001, Roman Weissgaerber <weissg@vienna.at>
  *      Copyright (C) 2000, Dag Brattli <dag@brattli.net>
  *      Copyright (C) 2001, Jean Tourrilhes <jt@hpl.hp.com>
+ *      Copyright (C) 2004, SigmaTel, Inc. <irquality@sigmatel.com>
+ *      Copyright (C) 2005, Milan Beno <beno@pobox.sk>
+ *      Copyright (C) 2006, Nick FEdchik <nick@fedchik.org.ua>
  *          
  *      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
@@ -31,6 +34,9 @@
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>      /* struct irlap_cb */
 
+#define PATCH_FILE_SIZE_MAX     65536
+#define PATCH_FILE_SIZE_MIN     80
+
 #define RX_COPY_THRESHOLD 200
 #define IRDA_USB_MAX_MTU 2051
 #define IRDA_USB_SPEED_MTU 64           /* Weird, but work like this */
@@ -79,15 +85,16 @@
 /* Inbound header */
 #define MEDIA_BUSY    0x80
 
-#define SPEED_2400    0x01
-#define SPEED_9600    0x02
-#define SPEED_19200   0x03
-#define SPEED_38400   0x04
-#define SPEED_57600   0x05
-#define SPEED_115200  0x06
-#define SPEED_576000  0x07
-#define SPEED_1152000 0x08
-#define SPEED_4000000 0x09
+#define SPEED_2400     0x01
+#define SPEED_9600     0x02
+#define SPEED_19200    0x03
+#define SPEED_38400    0x04
+#define SPEED_57600    0x05
+#define SPEED_115200   0x06
+#define SPEED_576000   0x07
+#define SPEED_1152000  0x08
+#define SPEED_4000000  0x09
+#define SPEED_16000000 0x0a
 
 /* Basic capabilities */
 #define IUC_DEFAULT     0x00    /* Basic device compliant with 1.0 spec */
@@ -100,11 +107,14 @@
 #define IUC_SMALL_PKT   0x10    /* Device doesn't behave with big Rx packets */
 #define IUC_MAX_WINDOW  0x20    /* Device underestimate the Rx window */
 #define IUC_MAX_XBOFS   0x40    /* Device need more xbofs than advertised */
+#define IUC_STIR_4210   0x80    /* SigmaTel 4210/4220/4116 VFIR */
 
 /* USB class definitions */
-#define USB_IRDA_HEADER   0x01
-#define USB_CLASS_IRDA    0x02 /* USB_CLASS_APP_SPEC subclass */ 
-#define USB_DT_IRDA       0x21
+#define USB_IRDA_HEADER            0x01
+#define USB_CLASS_IRDA             0x02 /* USB_CLASS_APP_SPEC subclass */
+#define USB_DT_IRDA                0x21
+#define USB_IRDA_SIGMATEL_HEADER   0x03
+#define IU_SIGMATEL_MAX_RX_URBS    (IU_MAX_ACTIVE_RX_URBS + USB_IRDA_SIGMATEL_HEADER)
 
 struct irda_class_desc {
         __u8  bLength;
@@ -123,6 +133,7 @@ struct irda_class_desc {
  * (6.2.5, USB-IrDA class spec 1.0) */
 
 #define IU_REQ_GET_CLASS_DESC   0x06
+#define STIR421X_MAX_PATCH_DOWNLOAD_SIZE 1023
 
 struct irda_usb_cb {
         struct irda_class_desc *irda_desc;
@@ -136,7 +147,8 @@ struct irda_usb_cb {
         __u16 bulk_out_mtu;             /* Max Tx packet size in bytes */
         __u8  bulk_int_ep;              /* Interrupt Endpoint assignments */
 
-        struct urb *rx_urb[IU_MAX_RX_URBS];     /* URBs used to receive data frames */
+        __u8  max_rx_urb;
+        struct urb **rx_urb;            /* URBs used to receive data frames */
         struct urb *idle_rx_urb;        /* Pointer to idle URB in Rx path */
         struct urb *tx_urb;             /* URB used to send data frames */
         struct urb *speed_urb;          /* URB used to send speed commands */
@@ -157,6 +169,9 @@ struct irda_usb_cb {
         __u32 speed;                    /* Current speed */
         __s32 new_speed;                /* speed we need to set */
 
+        __u8 header_length;             /* USB-IrDA frame header size */
+        int needspatch;                 /* device needs firmware patch */
+
         struct timer_list rx_defer_timer;       /* Wait for Rx error to clear */
 };
 
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 63d38fbbd04e..f530686bd09f 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -695,8 +695,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
                 /*
                  * We must not be transmitting...
                  */
-                if (si->txskb)
-                        BUG();
+                BUG_ON(si->txskb);
 
                 netif_stop_queue(dev);
 
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index ec94ecdb103d..58f76cefbc83 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -11,6 +11,7 @@
  *     Copyright (c) 2002      Daniele Peri
  *     All Rights Reserved.
  *     Copyright (c) 2002      Jean Tourrilhes
+ *     Copyright (c) 2006      Linus Walleij
  *
  *
  * Based on smc-ircc.c:
@@ -61,6 +62,9 @@
 
 #include <linux/spinlock.h>
 #include <linux/pm.h>
+#ifdef CONFIG_PCI
+#include <linux/pci.h>
+#endif
 
 #include <net/irda/wrapper.h>
 #include <net/irda/irda.h>
@@ -100,6 +104,22 @@ MODULE_PARM_DESC(ircc_transceiver, "Transceiver type");
 
 /* Types */
 
+#ifdef CONFIG_PCI
+struct smsc_ircc_subsystem_configuration {
+        unsigned short vendor; /* PCI vendor ID */
+        unsigned short device; /* PCI vendor ID */
+        unsigned short subvendor; /* PCI subsystem vendor ID */
+        unsigned short subdevice; /* PCI sybsystem device ID */
+        unsigned short sir_io; /* I/O port for SIR */
+        unsigned short fir_io; /* I/O port for FIR */
+        unsigned char  fir_irq; /* FIR IRQ */
+        unsigned char  fir_dma; /* FIR DMA */
+        unsigned short cfg_base; /* I/O port for chip configuration */
+        int (*preconfigure)(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf); /* Preconfig function */
+        const char *name;       /* name shown as info */
+};
+#endif
+
 struct smsc_transceiver {
         char *name;
         void (*set_for_speed)(int fir_base, u32 speed);
@@ -202,6 +222,18 @@ static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned shor
 static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
 static int __init smsc_superio_fdc(unsigned short cfg_base);
 static int __init smsc_superio_lpc(unsigned short cfg_base);
+#ifdef CONFIG_PCI
+static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuration *conf);
+static int __init preconfigure_through_82801(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
+static void __init preconfigure_ali_port(struct pci_dev *dev,
+                                         unsigned short port);
+static int __init preconfigure_through_ali(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
+static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
+                                                    unsigned short ircc_fir,
+                                                    unsigned short ircc_sir,
+                                                    unsigned char ircc_dma,
+                                                    unsigned char ircc_irq);
+#endif
 
 /* Transceivers specific functions */
 
@@ -353,6 +385,13 @@ static int __init smsc_ircc_init(void)
                 return ret;
         }
 
+#ifdef CONFIG_PCI
+        if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) {
+                /* Ignore errors from preconfiguration */
+                IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
+        }
+#endif
+
         dev_count = 0;
 
         if (ircc_fir > 0 && ircc_sir > 0) {
@@ -2285,6 +2324,490 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
         return ret;
 }
 
+/*
+ * Look for some specific subsystem setups that need
+ * pre-configuration not properly done by the BIOS (especially laptops)
+ * This code is based in part on smcinit.c, tosh1800-smcinit.c
+ * and tosh2450-smcinit.c. The table lists the device entries
+ * for ISA bridges with an LPC (Low Pin Count) controller which
+ * handles the communication with the SMSC device. After the LPC
+ * controller is initialized through PCI, the SMSC device is initialized
+ * through a dedicated port in the ISA port-mapped I/O area, this latter
+ * area is used to configure the SMSC device with default
+ * SIR and FIR I/O ports, DMA and IRQ. Different vendors have
+ * used different sets of parameters and different control port
+ * addresses making a subsystem device table necessary.
+ */
+#ifdef CONFIG_PCI
+#define PCIID_VENDOR_INTEL 0x8086
+#define PCIID_VENDOR_ALI 0x10b9
+static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitdata = {
+        {
+                .vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */
+                .device = 0x24cc,
+                .subvendor = 0x103c,
+                .subdevice = 0x088c,
+                /* Quite certain these are the same for nc8000 as for nc6000 */
+                .sir_io = 0x02f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x05,
+                .fir_dma = 0x03,
+                .cfg_base = 0x004e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "HP nc8000",
+        },
+        {
+                .vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */
+                .device = 0x24cc,
+                .subvendor = 0x103c,
+                .subdevice = 0x0890,
+                .sir_io = 0x02f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x05,
+                .fir_dma = 0x03,
+                .cfg_base = 0x004e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "HP nc6000",
+        },
+        {
+                /* Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge */
+                .vendor = PCIID_VENDOR_INTEL,
+                .device = 0x24c0,
+                .subvendor = 0x1179,
+                .subdevice = 0xffff, /* 0xffff is "any" */
+                .sir_io = 0x03f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x07,
+                .fir_dma = 0x01,
+                .cfg_base = 0x002e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "Toshiba laptop with Intel 82801DB/DBL LPC bridge",
+        },
+        {
+                .vendor = PCIID_VENDOR_INTEL, /* Intel 82801CAM ISA bridge */
+                .device = 0x248c,
+                .subvendor = 0x1179,
+                .subdevice = 0xffff, /* 0xffff is "any" */
+                .sir_io = 0x03f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x03,
+                .fir_dma = 0x03,
+                .cfg_base = 0x002e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "Toshiba laptop with Intel 82801CAM ISA bridge",
+        },
+        {
+                /* 82801DBM (ICH4-M) LPC Interface Bridge */
+                .vendor = PCIID_VENDOR_INTEL,
+                .device = 0x24cc,
+                .subvendor = 0x1179,
+                .subdevice = 0xffff, /* 0xffff is "any" */
+                .sir_io = 0x03f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x03,
+                .fir_dma = 0x03,
+                .cfg_base = 0x002e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "Toshiba laptop with Intel 8281DBM LPC bridge",
+        },
+        {
+                /* ALi M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] */
+                .vendor = PCIID_VENDOR_ALI,
+                .device = 0x1533,
+                .subvendor = 0x1179,
+                .subdevice = 0xffff, /* 0xffff is "any" */
+                .sir_io = 0x02e8,
+                .fir_io = 0x02f8,
+                .fir_irq = 0x07,
+                .fir_dma = 0x03,
+                .cfg_base = 0x002e,
+                .preconfigure = preconfigure_through_ali,
+                .name = "Toshiba laptop with ALi ISA bridge",
+        },
+        { } // Terminator
+};
+
+
+/*
+ * This sets up the basic SMSC parameters
+ * (FIR port, SIR port, FIR DMA, FIR IRQ)
+ * through the chip configuration port.
+ */
+static int __init preconfigure_smsc_chip(struct
+                                         smsc_ircc_subsystem_configuration
+                                         *conf)
+{
+        unsigned short iobase = conf->cfg_base;
+        unsigned char tmpbyte;
+
+        outb(LPC47N227_CFGACCESSKEY, iobase); // enter configuration state
+        outb(SMSCSIOFLAT_DEVICEID_REG, iobase); // set for device ID
+        tmpbyte = inb(iobase +1); // Read device ID
+        IRDA_DEBUG(0,
+                   "Detected Chip id: 0x%02x, setting up registers...\n",
+                   tmpbyte);
+
+        /* Disable UART1 and set up SIR I/O port */
+        outb(0x24, iobase);  // select CR24 - UART1 base addr
+        outb(0x00, iobase + 1); // disable UART1
+        outb(SMSCSIOFLAT_UART2BASEADDR_REG, iobase);  // select CR25 - UART2 base addr
+        outb( (conf->sir_io >> 2), iobase + 1); // bits 2-9 of 0x3f8
+        tmpbyte = inb(iobase + 1);
+        if (tmpbyte != (conf->sir_io >> 2) ) {
+                IRDA_WARNING("ERROR: could not configure SIR ioport.\n");
+                IRDA_WARNING("Try to supply ircc_cfg argument.\n");
+                return -ENXIO;
+        }
+
+        /* Set up FIR IRQ channel for UART2 */
+        outb(SMSCSIOFLAT_UARTIRQSELECT_REG, iobase); // select CR28 - UART1,2 IRQ select
+        tmpbyte = inb(iobase + 1);
+        tmpbyte &= SMSCSIOFLAT_UART1IRQSELECT_MASK; // Do not touch the UART1 portion
+        tmpbyte |= (conf->fir_irq & SMSCSIOFLAT_UART2IRQSELECT_MASK);
+        outb(tmpbyte, iobase + 1);
+        tmpbyte = inb(iobase + 1) & SMSCSIOFLAT_UART2IRQSELECT_MASK;
+        if (tmpbyte != conf->fir_irq) {
+                IRDA_WARNING("ERROR: could not configure FIR IRQ channel.\n");
+                return -ENXIO;
+        }
+
+        /* Set up FIR I/O port */
+        outb(SMSCSIOFLAT_FIRBASEADDR_REG, iobase);  // CR2B - SCE (FIR) base addr
+        outb((conf->fir_io >> 3), iobase + 1);
+        tmpbyte = inb(iobase + 1);
+        if (tmpbyte != (conf->fir_io >> 3) ) {
+                IRDA_WARNING("ERROR: could not configure FIR I/O port.\n");
+                return -ENXIO;
+        }
+
+        /* Set up FIR DMA channel */
+        outb(SMSCSIOFLAT_FIRDMASELECT_REG, iobase);  // CR2C - SCE (FIR) DMA select
+        outb((conf->fir_dma & LPC47N227_FIRDMASELECT_MASK), iobase + 1); // DMA
+        tmpbyte = inb(iobase + 1) & LPC47N227_FIRDMASELECT_MASK;
+        if (tmpbyte != (conf->fir_dma & LPC47N227_FIRDMASELECT_MASK)) {
+                IRDA_WARNING("ERROR: could not configure FIR DMA channel.\n");
+                return -ENXIO;
+        }
+
+        outb(SMSCSIOFLAT_UARTMODE0C_REG, iobase);  // CR0C - UART mode
+        tmpbyte = inb(iobase + 1);
+        tmpbyte &= ~SMSCSIOFLAT_UART2MODE_MASK |
+                SMSCSIOFLAT_UART2MODE_VAL_IRDA;
+        outb(tmpbyte, iobase + 1); // enable IrDA (HPSIR) mode, high speed
+
+        outb(LPC47N227_APMBOOTDRIVE_REG, iobase);  // CR07 - Auto Pwr Mgt/boot drive sel
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | LPC47N227_UART2AUTOPWRDOWN_MASK, iobase + 1); // enable UART2 autopower down
+
+        /* This one was not part of tosh1800 */
+        outb(0x0a, iobase);  // CR0a - ecp fifo / ir mux
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | 0x40, iobase + 1); // send active device to ir port
+
+        outb(LPC47N227_UART12POWER_REG, iobase);  // CR02 - UART 1,2 power
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | LPC47N227_UART2POWERDOWN_MASK, iobase + 1); // UART2 power up mode, UART1 power down
+
+        outb(LPC47N227_FDCPOWERVALIDCONF_REG, iobase);  // CR00 - FDC Power/valid config cycle
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | LPC47N227_VALID_MASK, iobase + 1); // valid config cycle done
+
+        outb(LPC47N227_CFGEXITKEY, iobase);  // Exit configuration
+
+        return 0;
+}
+
+/* 82801CAM generic registers */
+#define VID 0x00
+#define DID 0x02
+#define PIRQ_A_D_ROUT 0x60
+#define SIRQ_CNTL 0x64
+#define PIRQ_E_H_ROUT 0x68
+#define PCI_DMA_C 0x90
+/* LPC-specific registers */
+#define COM_DEC 0xe0
+#define GEN1_DEC 0xe4
+#define LPC_EN 0xe6
+#define GEN2_DEC 0xec
+/*
+ * Sets up the I/O range using the 82801CAM ISA bridge, 82801DBM LPC bridge
+ * or Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge.
+ * They all work the same way!
+ */
+static int __init preconfigure_through_82801(struct pci_dev *dev,
+                                             struct
+                                             smsc_ircc_subsystem_configuration
+                                             *conf)
+{
+        unsigned short tmpword;
+        unsigned char tmpbyte;
+
+        IRDA_MESSAGE("Setting up Intel 82801 controller and SMSC device\n");
+        /*
+         * Select the range for the COMA COM port (SIR)
+         * Register COM_DEC:
+         * Bit 7: reserved
+         * Bit 6-4, COMB decode range
+         * Bit 3: reserved
+         * Bit 2-0, COMA decode range
+         *
+         * Decode ranges:
+         *   000 = 0x3f8-0x3ff (COM1)
+         *   001 = 0x2f8-0x2ff (COM2)
+         *   010 = 0x220-0x227
+         *   011 = 0x228-0x22f
+         *   100 = 0x238-0x23f
+         *   101 = 0x2e8-0x2ef (COM4)
+         *   110 = 0x338-0x33f
+         *   111 = 0x3e8-0x3ef (COM3)
+         */
+        pci_read_config_byte(dev, COM_DEC, &tmpbyte);
+        tmpbyte &= 0xf8; /* mask COMA bits */
+        switch(conf->sir_io) {
+        case 0x3f8:
+                tmpbyte |= 0x00;
+                break;
+        case 0x2f8:
+                tmpbyte |= 0x01;
+                break;
+        case 0x220:
+                tmpbyte |= 0x02;
+                break;
+        case 0x228:
+                tmpbyte |= 0x03;
+                break;
+        case 0x238:
+                tmpbyte |= 0x04;
+                break;
+        case 0x2e8:
+                tmpbyte |= 0x05;
+                break;
+        case 0x338:
+                tmpbyte |= 0x06;
+                break;
+        case 0x3e8:
+                tmpbyte |= 0x07;
+                break;
+        default:
+                tmpbyte |= 0x01; /* COM2 default */
+        }
+        IRDA_DEBUG(1, "COM_DEC (write): 0x%02x\n", tmpbyte);
+        pci_write_config_byte(dev, COM_DEC, tmpbyte);
+
+        /* Enable Low Pin Count interface */
+        pci_read_config_word(dev, LPC_EN, &tmpword);
+        /* These seem to be set up at all times,
+         * just make sure it is properly set.
+         */
+        switch(conf->cfg_base) {
+        case 0x04e:
+                tmpword |= 0x2000;
+                break;
+        case 0x02e:
+                tmpword |= 0x1000;
+                break;
+        case 0x062:
+                tmpword |= 0x0800;
+                break;
+        case 0x060:
+                tmpword |= 0x0400;
+                break;
+        default:
+                IRDA_WARNING("Uncommon I/O base address: 0x%04x\n",
+                             conf->cfg_base);
+                break;
+        }
+        tmpword &= 0xfffd; /* disable LPC COMB */
+        tmpword |= 0x0001; /* set bit 0 : enable LPC COMA addr range (GEN2) */
+        IRDA_DEBUG(1, "LPC_EN (write): 0x%04x\n", tmpword);
+        pci_write_config_word(dev, LPC_EN, tmpword);
+
+        /*
+         * Configure LPC DMA channel
+         * PCI_DMA_C bits:
+         * Bit 15-14: DMA channel 7 select
+         * Bit 13-12: DMA channel 6 select
+         * Bit 11-10: DMA channel 5 select
+         * Bit 9-8:   Reserved
+         * Bit 7-6:   DMA channel 3 select
+         * Bit 5-4:   DMA channel 2 select
+         * Bit 3-2:   DMA channel 1 select
+         * Bit 1-0:   DMA channel 0 select
+         *  00 = Reserved value
+         *  01 = PC/PCI DMA
+         *  10 = Reserved value
+         *  11 = LPC I/F DMA
+         */
+        pci_read_config_word(dev, PCI_DMA_C, &tmpword);
+        switch(conf->fir_dma) {
+        case 0x07:
+                tmpword |= 0xc000;
+                break;
+        case 0x06:
+                tmpword |= 0x3000;
+                break;
+        case 0x05:
+                tmpword |= 0x0c00;
+                break;
+        case 0x03:
+                tmpword |= 0x00c0;
+                break;
+        case 0x02:
+                tmpword |= 0x0030;
+                break;
+        case 0x01:
+                tmpword |= 0x000c;
+                break;
+        case 0x00:
+                tmpword |= 0x0003;
+                break;
+        default:
+                break; /* do not change settings */
+        }
+        IRDA_DEBUG(1, "PCI_DMA_C (write): 0x%04x\n", tmpword);
+        pci_write_config_word(dev, PCI_DMA_C, tmpword);
+
+        /*
+         * GEN2_DEC bits:
+         * Bit 15-4: Generic I/O range
+         * Bit 3-1: reserved (read as 0)
+         * Bit 0: enable GEN2 range on LPC I/F
+         */
+        tmpword = conf->fir_io & 0xfff8;
+        tmpword |= 0x0001;
+        IRDA_DEBUG(1, "GEN2_DEC (write): 0x%04x\n", tmpword);
+        pci_write_config_word(dev, GEN2_DEC, tmpword);
+
+        /* Pre-configure chip */
+        return preconfigure_smsc_chip(conf);
+}
+
+/*
+ * Pre-configure a certain port on the ALi 1533 bridge.
+ * This is based on reverse-engineering since ALi does not
+ * provide any data sheet for the 1533 chip.
+ */
+static void __init preconfigure_ali_port(struct pci_dev *dev,
+                                         unsigned short port)
+{
+        unsigned char reg;
+        /* These bits obviously control the different ports */
+        unsigned char mask;
+        unsigned char tmpbyte;
+
+        switch(port) {
+        case 0x0130:
+        case 0x0178:
+                reg = 0xb0;
+                mask = 0x80;
+                break;
+        case 0x03f8:
+                reg = 0xb4;
+                mask = 0x80;
+                break;
+        case 0x02f8:
+                reg = 0xb4;
+                mask = 0x30;
+                break;
+        case 0x02e8:
+                reg = 0xb4;
+                mask = 0x08;
+                break;
+        default:
+                IRDA_ERROR("Failed to configure unsupported port on ALi 1533 bridge: 0x%04x\n", port);
+                return;
+        }
+
+        pci_read_config_byte(dev, reg, &tmpbyte);
+        /* Turn on the right bits */
+        tmpbyte |= mask;
+        pci_write_config_byte(dev, reg, tmpbyte);
+        IRDA_MESSAGE("Activated ALi 1533 ISA bridge port 0x%04x.\n", port);
+        return;
+}
+
+static int __init preconfigure_through_ali(struct pci_dev *dev,
+                                           struct
+                                           smsc_ircc_subsystem_configuration
+                                           *conf)
+{
+        /* Configure the two ports on the ALi 1533 */
+        preconfigure_ali_port(dev, conf->sir_io);
+        preconfigure_ali_port(dev, conf->fir_io);
+
+        /* Pre-configure chip */
+        return preconfigure_smsc_chip(conf);
+}
+
+static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
+                                                    unsigned short ircc_fir,
+                                                    unsigned short ircc_sir,
+                                                    unsigned char ircc_dma,
+                                                    unsigned char ircc_irq)
+{
+        struct pci_dev *dev = NULL;
+        unsigned short ss_vendor = 0x0000;
+        unsigned short ss_device = 0x0000;
+        int ret = 0;
+
+        dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);
+
+        while (dev != NULL) {
+                struct smsc_ircc_subsystem_configuration *conf;
+
+                /*
+                 * Cache the subsystem vendor/device:
+                 * some manufacturers fail to set this for all components,
+                 * so we save it in case there is just 0x0000 0x0000 on the
+                 * device we want to check.
+                 */
+                if (dev->subsystem_vendor != 0x0000U) {
+                        ss_vendor = dev->subsystem_vendor;
+                        ss_device = dev->subsystem_device;
+                }
+                conf = subsystem_configurations;
+                for( ; conf->subvendor; conf++) {
+                        if(conf->vendor == dev->vendor &&
+                           conf->device == dev->device &&
+                           conf->subvendor == ss_vendor &&
+                           /* Sometimes these are cached values */
+                           (conf->subdevice == ss_device ||
+                            conf->subdevice == 0xffff)) {
+                                struct smsc_ircc_subsystem_configuration
+                                        tmpconf;
+
+                                memcpy(&tmpconf, conf,
+                                       sizeof(struct smsc_ircc_subsystem_configuration));
+
+                                /*
+                                 * Override the default values with anything
+                                 * passed in as parameter
+                                 */
+                                if (ircc_cfg != 0)
+                                        tmpconf.cfg_base = ircc_cfg;
+                                if (ircc_fir != 0)
+                                        tmpconf.fir_io = ircc_fir;
+                                if (ircc_sir != 0)
+                                        tmpconf.sir_io = ircc_sir;
+                                if (ircc_dma != 0xff)
+                                        tmpconf.fir_dma = ircc_dma;
+                                if (ircc_irq != 0xff)
+                                        tmpconf.fir_irq = ircc_irq;
+
+                                IRDA_MESSAGE("Detected unconfigured %s SMSC IrDA chip, pre-configuring device.\n", conf->name);
+                                if (conf->preconfigure)
+                                        ret = conf->preconfigure(dev, &tmpconf);
+                                else
+                                        ret = -ENODEV;
+                        }
+                }
+                dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);
+        }
+
+        return ret;
+}
+#endif // CONFIG_PCI
+
 /************************************************
  *
  * Transceivers specific functions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index f9f77e4f5965..cfd67d812f0d 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -357,18 +357,20 @@ ixgb_probe(struct pci_dev *pdev,
         if((err = pci_enable_device(pdev)))
                 return err;
 
-        if(!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
+        if(!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
+           !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
                 pci_using_dac = 1;
         } else {
-                if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
+                if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) ||
+                   (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {
                         IXGB_ERR("No usable DMA configuration, aborting\n");
-                        return err;
+                        goto err_dma_mask;
                 }
                 pci_using_dac = 0;
         }
 
         if((err = pci_request_regions(pdev, ixgb_driver_name)))
-                return err;
+                goto err_request_regions;
 
         pci_set_master(pdev);
 
@@ -502,6 +504,9 @@ err_ioremap:
         free_netdev(netdev);
 err_alloc_etherdev:
         pci_release_regions(pdev);
+err_request_regions:
+err_dma_mask:
+        pci_disable_device(pdev);
         return err;
 }
 
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index 77f104a005f3..fbc2d21020f4 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -299,10 +299,7 @@ int ixpdev_init(int __nds_count, struct net_device **__nds,
         int i;
         int err;
 
-        if (RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192) {
-                static void __too_many_rx_or_tx_buffers(void);
-                __too_many_rx_or_tx_buffers();
-        }
+        BUILD_BUG_ON(RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192);
 
         printk(KERN_INFO "IXP2000 MSF ethernet driver %s\n", DRV_MODULE_VERSION);
 
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 9f2661355a4a..ea62a3e7d586 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -281,10 +281,16 @@ static void mv643xx_eth_tx_timeout_task(struct net_device *dev)
 {
         struct mv643xx_private *mp = netdev_priv(dev);
 
-        netif_device_detach(dev);
+        if (!netif_running(dev))
+                return;
+
+        netif_stop_queue(dev);
+
         eth_port_reset(mp->port_num);
         eth_port_start(dev);
-        netif_device_attach(dev);
+
+        if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
+                netif_wake_queue(dev);
 }
 
 /**
@@ -552,9 +558,9 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id,
 #else
         if (eth_int_cause & ETH_INT_CAUSE_RX)
                 mv643xx_eth_receive_queue(dev, INT_MAX);
+#endif
         if (eth_int_cause_ext & ETH_INT_CAUSE_TX)
                 mv643xx_eth_free_completed_tx_descs(dev);
-#endif
 
         /*
          * If no real interrupt occured, exit.
@@ -1186,7 +1192,12 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         BUG_ON(netif_queue_stopped(dev));
         BUG_ON(skb == NULL);
-        BUG_ON(mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB);
+
+        if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
+                printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
+                netif_stop_queue(dev);
+                return 1;
+        }
 
         if (has_tiny_unaligned_frags(skb)) {
                 if ((skb_linearize(skb, GFP_ATOMIC) != 0)) {
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 8d4999837b65..90627756d6fa 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -226,7 +226,7 @@ static int full_duplex[MAX_UNITS];
                                  NATSEMI_PG1_NREGS)
 #define NATSEMI_REGS_VER        1 /* v1 added RFDR registers */
 #define NATSEMI_REGS_SIZE       (NATSEMI_NREGS * sizeof(u32))
-#define NATSEMI_EEPROM_SIZE     24 /* 12 16-bit values */
+#define NATSEMI_DEF_EEPROM_SIZE 24 /* 12 16-bit values */
 
 /* Buffer sizes:
  * The nic writes 32-bit values, even if the upper bytes of
@@ -238,7 +238,7 @@ static int full_duplex[MAX_UNITS];
 #define NATSEMI_RX_LIMIT        2046    /* maximum supported by hardware */
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
   KERN_INFO DRV_NAME " dp8381x driver, version "
       DRV_VERSION ", " DRV_RELDATE "\n"
   KERN_INFO "  originally by Donald Becker <becker@scyld.com>\n"
@@ -714,6 +714,8 @@ struct netdev_private {
         unsigned int iosize;
         spinlock_t lock;
         u32 msg_enable;
+        /* EEPROM data */
+        int eeprom_size;
 };
 
 static void move_int_phy(struct net_device *dev, int addr);
@@ -890,6 +892,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         np->msg_enable = (debug >= 0) ? (1<<debug)-1 : NATSEMI_DEF_MSG;
         np->hands_off = 0;
         np->intr_status = 0;
+        np->eeprom_size = NATSEMI_DEF_EEPROM_SIZE;
 
         /* Initial port:
          * - If the nic was configured to use an external phy and if find_mii
@@ -2582,7 +2585,8 @@ static int get_regs_len(struct net_device *dev)
 
 static int get_eeprom_len(struct net_device *dev)
 {
-        return NATSEMI_EEPROM_SIZE;
+        struct netdev_private *np = netdev_priv(dev);
+        return np->eeprom_size;
 }
 
 static int get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
@@ -2669,15 +2673,20 @@ static u32 get_link(struct net_device *dev)
 static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, u8 *data)
 {
         struct netdev_private *np = netdev_priv(dev);
-        u8 eebuf[NATSEMI_EEPROM_SIZE];
+        u8 *eebuf;
         int res;
 
+        eebuf = kmalloc(np->eeprom_size, GFP_KERNEL);
+        if (!eebuf)
+                return -ENOMEM;
+
         eeprom->magic = PCI_VENDOR_ID_NS | (PCI_DEVICE_ID_NS_83815<<16);
         spin_lock_irq(&np->lock);
         res = netdev_get_eeprom(dev, eebuf);
         spin_unlock_irq(&np->lock);
         if (!res)
                 memcpy(data, eebuf+eeprom->offset, eeprom->len);
+        kfree(eebuf);
         return res;
 }
 
@@ -3033,9 +3042,10 @@ static int netdev_get_eeprom(struct net_device *dev, u8 *buf)
         int i;
         u16 *ebuf = (u16 *)buf;
         void __iomem * ioaddr = ns_ioaddr(dev);
+        struct netdev_private *np = netdev_priv(dev);
 
         /* eeprom_read reads 16 bits, and indexes by 16 bits */
-        for (i = 0; i < NATSEMI_EEPROM_SIZE/2; i++) {
+        for (i = 0; i < np->eeprom_size/2; i++) {
                 ebuf[i] = eeprom_read(ioaddr, i);
                 /* The EEPROM itself stores data bit-swapped, but eeprom_read
                  * reads it back "sanely". So we swap it back here in order to
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index d11821dd86ed..ced9fdb8335c 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -645,9 +645,7 @@ static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
 
-        if (!dev)
-                BUG();
-
+        BUG_ON(!dev);
         unregister_netdev(dev);
         release_region(dev->base_addr, NE_IO_EXTENT);
         free_netdev(dev);
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index edd1b5306b16..66e74f740261 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -87,6 +87,7 @@ static void write_msg(struct console *con, const char *msg, unsigned int len)
 }
 
 static struct console netconsole = {
+        .name = "netcon",
         .flags = CON_ENABLED | CON_PRINTBUFFER,
         .write = write_msg
 };
@@ -94,7 +95,7 @@ static struct console netconsole = {
 static int option_setup(char *opt)
 {
         configured = !netpoll_parse_options(&np, opt);
-        return 0;
+        return 1;
 }
 
 __setup("netconsole=", option_setup);
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 8e9b1a537dee..706aed7d717f 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -568,8 +568,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
 #endif
 
         sg = dev->rx_info.descs + (next_empty * DESC_SIZE);
-        if (unlikely(NULL != dev->rx_info.skbs[next_empty]))
-                BUG();
+        BUG_ON(NULL != dev->rx_info.skbs[next_empty]);
         dev->rx_info.skbs[next_empty] = skb;
 
         dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC;
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index ce90becb8bdf..fab93360f017 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -204,7 +204,7 @@ enum Window4 {		/* Window 4: Xcvr/media bits. */
 #define MEDIA_TP        0x00C0  /* Enable link beat and jabber for 10baseT. */
 
 struct el3_private {
-        dev_link_t link;
+        struct pcmcia_device    *p_dev;
         dev_node_t node;
         struct net_device_stats stats;
         u16 advertising, partner;               /* NWay media advertisement */
@@ -225,8 +225,8 @@ static char mii_preamble_required = 0;
 
 /* Index of functions. */
 
-static void tc574_config(dev_link_t *link);
-static void tc574_release(dev_link_t *link);
+static int tc574_config(struct pcmcia_device *link);
+static void tc574_release(struct pcmcia_device *link);
 
 static void mdio_sync(kio_addr_t ioaddr, int bits);
 static int mdio_read(kio_addr_t ioaddr, int phy_id, int location);
@@ -256,10 +256,9 @@ static void tc574_detach(struct pcmcia_device *p_dev);
         with Card Services.
 */
 
-static int tc574_attach(struct pcmcia_device *p_dev)
+static int tc574_probe(struct pcmcia_device *link)
 {
         struct el3_private *lp;
-        dev_link_t *link;
         struct net_device *dev;
 
         DEBUG(0, "3c574_attach()\n");
@@ -269,8 +268,8 @@ static int tc574_attach(struct pcmcia_device *p_dev)
         if (!dev)
                 return -ENOMEM;
         lp = netdev_priv(dev);
-        link = &lp->link;
         link->priv = dev;
+        lp->p_dev = link;
 
         spin_lock_init(&lp->window_lock);
         link->io.NumPorts1 = 32;
@@ -280,7 +279,6 @@ static int tc574_attach(struct pcmcia_device *p_dev)
         link->irq.Handler = &el3_interrupt;
         link->irq.Instance = dev;
         link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.Vcc = 50;
         link->conf.IntType = INT_MEMORY_AND_IO;
         link->conf.ConfigIndex = 1;
         link->conf.Present = PRESENT_OPTION;
@@ -298,13 +296,7 @@ static int tc574_attach(struct pcmcia_device *p_dev)
         dev->watchdog_timeo = TX_TIMEOUT;
 #endif
 
-        link->handle = p_dev;
-        p_dev->instance = link;
-
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        tc574_config(link);
-
-        return 0;
+        return tc574_config(link);
 } /* tc574_attach */
 
 /*
@@ -316,18 +308,16 @@ static int tc574_attach(struct pcmcia_device *p_dev)
 
 */
 
-static void tc574_detach(struct pcmcia_device *p_dev)
+static void tc574_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
         DEBUG(0, "3c574_detach(0x%p)\n", link);
 
-        if (link->dev)
+        if (link->dev_node)
                 unregister_netdev(dev);
 
-        if (link->state & DEV_CONFIG)
-                tc574_release(link);
+        tc574_release(link);
 
         free_netdev(dev);
 } /* tc574_detach */
@@ -343,9 +333,8 @@ static void tc574_detach(struct pcmcia_device *p_dev)
 
 static const char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
 
-static void tc574_config(dev_link_t *link)
+static int tc574_config(struct pcmcia_device *link)
 {
-        client_handle_t handle = link->handle;
         struct net_device *dev = link->priv;
         struct el3_private *lp = netdev_priv(dev);
         tuple_t tuple;
@@ -363,30 +352,27 @@ static void tc574_config(dev_link_t *link)
 
         tuple.Attributes = 0;
         tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         tuple.TupleData = (cisdata_t *)buf;
         tuple.TupleDataMax = 64;
         tuple.TupleOffset = 0;
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present = parse.config.rmask[0];
 
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-
         link->io.IOAddrLines = 16;
         for (i = j = 0; j < 0x400; j += 0x20) {
                 link->io.BasePort1 = j ^ 0x300;
-                i = pcmcia_request_io(link->handle, &link->io);
+                i = pcmcia_request_io(link, &link->io);
                 if (i == CS_SUCCESS) break;
         }
         if (i != CS_SUCCESS) {
-                cs_error(link->handle, RequestIO, i);
+                cs_error(link, RequestIO, i);
                 goto failed;
         }
-        CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
         dev->irq = link->irq.AssignedIRQ;
         dev->base_addr = link->io.BasePort1;
@@ -397,8 +383,8 @@ static void tc574_config(dev_link_t *link)
            the hardware address.  The future products may include a modem chip
            and put the address in the CIS. */
         tuple.DesiredTuple = 0x88;
-        if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) {
-                pcmcia_get_tuple_data(handle, &tuple);
+        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+                pcmcia_get_tuple_data(link, &tuple);
                 for (i = 0; i < 3; i++)
                         phys_addr[i] = htons(buf[i]);
         } else {
@@ -412,9 +398,9 @@ static void tc574_config(dev_link_t *link)
                 }
         }
         tuple.DesiredTuple = CISTPL_VERS_1;
-        if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS &&
-                pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS &&
-                pcmcia_parse_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS &&
+                pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS &&
+                pcmcia_parse_tuple(link, &tuple, &parse) == CS_SUCCESS) {
                 cardname = parse.version_1.str + parse.version_1.ofs[1];
         } else
                 cardname = "3Com 3c574";
@@ -473,13 +459,12 @@ static void tc574_config(dev_link_t *link)
                 }
         }
 
-        link->state &= ~DEV_CONFIG_PENDING;
-        link->dev = &lp->node;
-        SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+        link->dev_node = &lp->node;
+        SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
         if (register_netdev(dev) != 0) {
                 printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n");
-                link->dev = NULL;
+                link->dev_node = NULL;
                 goto failed;
         }
 
@@ -493,13 +478,13 @@ static void tc574_config(dev_link_t *link)
                    8 << config.u.ram_size, ram_split[config.u.ram_split],
                    config.u.autoselect ? "autoselect " : "");
 
-        return;
+        return 0;
 
 cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 failed:
         tc574_release(link);
-        return;
+        return -ENODEV;
 
 } /* tc574_config */
 
@@ -509,44 +494,28 @@ failed:
         still open, this will be postponed until it is closed.
 */
 
-static void tc574_release(dev_link_t *link)
+static void tc574_release(struct pcmcia_device *link)
 {
-        DEBUG(0, "3c574_release(0x%p)\n", link);
-
-        pcmcia_release_configuration(link->handle);
-        pcmcia_release_io(link->handle, &link->io);
-        pcmcia_release_irq(link->handle, &link->irq);
-
-        link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
 }
 
-static int tc574_suspend(struct pcmcia_device *p_dev)
+static int tc574_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int tc574_resume(struct pcmcia_device *p_dev)
+static int tc574_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        tc574_reset(dev);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                tc574_reset(dev);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -757,9 +726,9 @@ static void tc574_reset(struct net_device *dev)
 static int el3_open(struct net_device *dev)
 {
         struct el3_private *lp = netdev_priv(dev);
-        dev_link_t *link = &lp->link;
+        struct pcmcia_device *link = lp->p_dev;
 
-        if (!DEV_OK(link))
+        if (!pcmcia_dev_present(link))
                 return -ENODEV;
         
         link->open++;
@@ -1203,11 +1172,11 @@ static int el3_close(struct net_device *dev)
 {
         kio_addr_t ioaddr = dev->base_addr;
         struct el3_private *lp = netdev_priv(dev);
-        dev_link_t *link = &lp->link;
+        struct pcmcia_device *link = lp->p_dev;
 
         DEBUG(2, "%s: shutting down ethercard.\n", dev->name);
         
-        if (DEV_OK(link)) {
+        if (pcmcia_dev_present(link)) {
                 unsigned long flags;
 
                 /* Turn off statistics ASAP.  We update lp->stats below. */
@@ -1246,7 +1215,7 @@ static struct pcmcia_driver tc574_driver = {
         .drv            = {
                 .name   = "3c574_cs",
         },
-        .probe          = tc574_attach,
+        .probe          = tc574_probe,
         .remove         = tc574_detach,
         .id_table       = tc574_ids,
         .suspend        = tc574_suspend,
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 3dba50849da7..875a0fe251e7 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -105,7 +105,7 @@ enum RxFilter {
 #define TX_TIMEOUT      ((400*HZ)/1000)
 
 struct el3_private {
-    dev_link_t          link;
+        struct pcmcia_device    *p_dev;
     dev_node_t          node;
     struct net_device_stats stats;
     /* For transceiver monitoring */
@@ -142,8 +142,8 @@ DRV_NAME ".c " DRV_VERSION " 2001/10/13 00:08:50 (David Hinds)";
 
 /*====================================================================*/
 
-static void tc589_config(dev_link_t *link);
-static void tc589_release(dev_link_t *link);
+static int tc589_config(struct pcmcia_device *link);
+static void tc589_release(struct pcmcia_device *link);
 
 static u16 read_eeprom(kio_addr_t ioaddr, int index);
 static void tc589_reset(struct net_device *dev);
@@ -170,10 +170,9 @@ static void tc589_detach(struct pcmcia_device *p_dev);
 
 ======================================================================*/
 
-static int tc589_attach(struct pcmcia_device *p_dev)
+static int tc589_probe(struct pcmcia_device *link)
 {
     struct el3_private *lp;
-    dev_link_t *link;
     struct net_device *dev;
 
     DEBUG(0, "3c589_attach()\n");
@@ -183,8 +182,8 @@ static int tc589_attach(struct pcmcia_device *p_dev)
     if (!dev)
          return -ENOMEM;
     lp = netdev_priv(dev);
-    link = &lp->link;
     link->priv = dev;
+    lp->p_dev = link;
 
     spin_lock_init(&lp->lock);
     link->io.NumPorts1 = 16;
@@ -194,7 +193,6 @@ static int tc589_attach(struct pcmcia_device *p_dev)
     link->irq.Handler = &el3_interrupt;
     link->irq.Instance = dev;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
     link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 1;
     link->conf.Present = PRESENT_OPTION;
@@ -213,13 +211,7 @@ static int tc589_attach(struct pcmcia_device *p_dev)
 #endif
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    tc589_config(link);
-
-    return 0;
+    return tc589_config(link);
 } /* tc589_attach */
 
 /*======================================================================
@@ -231,18 +223,16 @@ static int tc589_attach(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static void tc589_detach(struct pcmcia_device *p_dev)
+static void tc589_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct net_device *dev = link->priv;
 
     DEBUG(0, "3c589_detach(0x%p)\n", link);
 
-    if (link->dev)
+    if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        tc589_release(link);
+    tc589_release(link);
 
     free_netdev(dev);
 } /* tc589_detach */
@@ -258,9 +248,8 @@ static void tc589_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void tc589_config(dev_link_t *link)
+static int tc589_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     struct el3_private *lp = netdev_priv(dev);
     tuple_t tuple;
@@ -275,43 +264,40 @@ static void tc589_config(dev_link_t *link)
     phys_addr = (u16 *)dev->dev_addr;
     tuple.Attributes = 0;
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     tuple.TupleData = (cisdata_t *)buf;
     tuple.TupleDataMax = sizeof(buf);
     tuple.TupleOffset = 0;
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
     link->conf.Present = parse.config.rmask[0];
     
     /* Is this a 3c562? */
     tuple.DesiredTuple = CISTPL_MANFID;
     tuple.Attributes = TUPLE_RETURN_COMMON;
-    if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) &&
-        (pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS)) {
+    if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
+        (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) {
         if (le16_to_cpu(buf[0]) != MANFID_3COM)
             printk(KERN_INFO "3c589_cs: hmmm, is this really a "
                    "3Com card??\n");
         multi = (le16_to_cpu(buf[1]) == PRODID_3COM_3C562);
     }
-    
-    /* Configure card */
-    link->state |= DEV_CONFIG;
 
     /* For the 3c562, the base address must be xx00-xx7f */
     link->io.IOAddrLines = 16;
     for (i = j = 0; j < 0x400; j += 0x10) {
         if (multi && (j & 0x80)) continue;
         link->io.BasePort1 = j ^ 0x300;
-        i = pcmcia_request_io(link->handle, &link->io);
+        i = pcmcia_request_io(link, &link->io);
         if (i == CS_SUCCESS) break;
     }
     if (i != CS_SUCCESS) {
-        cs_error(link->handle, RequestIO, i);
+        cs_error(link, RequestIO, i);
         goto failed;
     }
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
         
     dev->irq = link->irq.AssignedIRQ;
     dev->base_addr = link->io.BasePort1;
@@ -321,8 +307,8 @@ static void tc589_config(dev_link_t *link)
     /* The 3c589 has an extra EEPROM for configuration info, including
        the hardware address.  The 3c562 puts the address in the CIS. */
     tuple.DesiredTuple = 0x88;
-    if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) {
-        pcmcia_get_tuple_data(handle, &tuple);
+    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+        pcmcia_get_tuple_data(link, &tuple);
         for (i = 0; i < 3; i++)
             phys_addr[i] = htons(buf[i]);
     } else {
@@ -346,13 +332,12 @@ static void tc589_config(dev_link_t *link)
     else
         printk(KERN_ERR "3c589_cs: invalid if_port requested\n");
     
-    link->dev = &lp->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &lp->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
         printk(KERN_ERR "3c589_cs: register_netdev() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto failed;
     }
 
@@ -366,14 +351,13 @@ static void tc589_config(dev_link_t *link)
     printk(KERN_INFO "  %dK FIFO split %s Rx:Tx, %s xcvr\n",
            (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3],
            if_names[dev->if_port]);
-    return;
+    return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     tc589_release(link);
-    return;
-    
+    return -ENODEV;
 } /* tc589_config */
 
 /*======================================================================
@@ -384,44 +368,28 @@ failed:
     
 ======================================================================*/
 
-static void tc589_release(dev_link_t *link)
+static void tc589_release(struct pcmcia_device *link)
 {
-    DEBUG(0, "3c589_release(0x%p)\n", link);
-    
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-    
-    link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
 }
 
-static int tc589_suspend(struct pcmcia_device *p_dev)
+static int tc589_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int tc589_resume(struct pcmcia_device *p_dev)
+static int tc589_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        tc589_reset(dev);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                tc589_reset(dev);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -587,9 +555,9 @@ static int el3_config(struct net_device *dev, struct ifmap *map)
 static int el3_open(struct net_device *dev)
 {
     struct el3_private *lp = netdev_priv(dev);
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
     
-    if (!DEV_OK(link))
+    if (!pcmcia_dev_present(link))
         return -ENODEV;
 
     link->open++;
@@ -848,9 +816,9 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
 {
     struct el3_private *lp = netdev_priv(dev);
     unsigned long flags;
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
 
-    if (DEV_OK(link)) {
+    if (pcmcia_dev_present(link)) {
         spin_lock_irqsave(&lp->lock, flags);
         update_stats(dev);
         spin_unlock_irqrestore(&lp->lock, flags);
@@ -950,11 +918,11 @@ static int el3_rx(struct net_device *dev)
 static void set_multicast_list(struct net_device *dev)
 {
     struct el3_private *lp = netdev_priv(dev);
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
     kio_addr_t ioaddr = dev->base_addr;
     u16 opts = SetRxFilter | RxStation | RxBroadcast;
 
-    if (!(DEV_OK(link))) return;
+    if (!pcmcia_dev_present(link)) return;
     if (dev->flags & IFF_PROMISC)
         opts |= RxMulticast | RxProm;
     else if (dev->mc_count || (dev->flags & IFF_ALLMULTI))
@@ -965,12 +933,12 @@ static void set_multicast_list(struct net_device *dev)
 static int el3_close(struct net_device *dev)
 {
     struct el3_private *lp = netdev_priv(dev);
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
     kio_addr_t ioaddr = dev->base_addr;
     
     DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
 
-    if (DEV_OK(link)) {
+    if (pcmcia_dev_present(link)) {
         /* Turn off statistics ASAP.  We update lp->stats below. */
         outw(StatsDisable, ioaddr + EL3_CMD);
         
@@ -1020,7 +988,7 @@ static struct pcmcia_driver tc589_driver = {
         .drv            = {
                 .name   = "3c589_cs",
         },
-        .probe          = tc589_attach,
+        .probe          = tc589_probe,
         .remove         = tc589_detach,
         .id_table       = tc589_ids,
         .suspend        = tc589_suspend,
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index aa5581369399..448a09488529 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
+#include <linux/crc32.h>
 #include "../8390.h"
 
 #include <pcmcia/cs_types.h>
@@ -85,8 +86,8 @@ static char *version =
 
 /*====================================================================*/
 
-static void axnet_config(dev_link_t *link);
-static void axnet_release(dev_link_t *link);
+static int axnet_config(struct pcmcia_device *link);
+static void axnet_release(struct pcmcia_device *link);
 static int axnet_open(struct net_device *dev);
 static int axnet_close(struct net_device *dev);
 static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -116,7 +117,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 /*====================================================================*/
 
 typedef struct axnet_dev_t {
-    dev_link_t          link;
+        struct pcmcia_device    *p_dev;
     dev_node_t          node;
     caddr_t             base;
     struct timer_list   watchdog;
@@ -141,10 +142,9 @@ static inline axnet_dev_t *PRIV(struct net_device *dev)
 
 ======================================================================*/
 
-static int axnet_attach(struct pcmcia_device *p_dev)
+static int axnet_probe(struct pcmcia_device *link)
 {
     axnet_dev_t *info;
-    dev_link_t *link;
     struct net_device *dev;
 
     DEBUG(0, "axnet_attach()\n");
@@ -156,7 +156,7 @@ static int axnet_attach(struct pcmcia_device *p_dev)
         return -ENOMEM;
 
     info = PRIV(dev);
-    link = &info->link;
+    info->p_dev = link;
     link->priv = dev;
     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
@@ -168,13 +168,7 @@ static int axnet_attach(struct pcmcia_device *p_dev)
     dev->do_ioctl = &axnet_ioctl;
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    axnet_config(link);
-
-    return 0;
+    return axnet_config(link);
 } /* axnet_attach */
 
 /*======================================================================
@@ -186,18 +180,16 @@ static int axnet_attach(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static void axnet_detach(struct pcmcia_device *p_dev)
+static void axnet_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct net_device *dev = link->priv;
 
     DEBUG(0, "axnet_detach(0x%p)\n", link);
 
-    if (link->dev)
+    if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        axnet_release(link);
+    axnet_release(link);
 
     free_netdev(dev);
 } /* axnet_detach */
@@ -208,7 +200,7 @@ static void axnet_detach(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static int get_prom(dev_link_t *link)
+static int get_prom(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     kio_addr_t ioaddr = dev->base_addr;
@@ -262,7 +254,7 @@ static int get_prom(dev_link_t *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static int try_io_port(dev_link_t *link)
+static int try_io_port(struct pcmcia_device *link)
 {
     int j, ret;
     if (link->io.NumPorts1 == 32) {
@@ -283,25 +275,23 @@ static int try_io_port(dev_link_t *link)
         for (j = 0; j < 0x400; j += 0x20) {
             link->io.BasePort1 = j ^ 0x300;
             link->io.BasePort2 = (j ^ 0x300) + 0x10;
-            ret = pcmcia_request_io(link->handle, &link->io);
+            ret = pcmcia_request_io(link, &link->io);
             if (ret == CS_SUCCESS) return ret;
         }
         return ret;
     } else {
-        return pcmcia_request_io(link->handle, &link->io);
+        return pcmcia_request_io(link, &link->io);
     }
 }
 
-static void axnet_config(dev_link_t *link)
+static int axnet_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     axnet_dev_t *info = PRIV(dev);
     tuple_t tuple;
     cisparse_t parse;
     int i, j, last_ret, last_fn;
     u_short buf[64];
-    config_info_t conf;
 
     DEBUG(0, "axnet_config(0x%p)\n", link);
 
@@ -310,29 +300,22 @@ static void axnet_config(dev_link_t *link)
     tuple.TupleDataMax = sizeof(buf);
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
     /* don't trust the CIS on this; Linksys got it wrong */
     link->conf.Present = 0x63;
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
-    /* Look up current Vcc */
-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
-    link->conf.Vcc = conf.Vcc;
-
     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
     tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     while (last_ret == CS_SUCCESS) {
         cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
         cistpl_io_t *io = &(parse.cftable_entry.io);
         
-        if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                pcmcia_parse_tuple(handle, &tuple, &parse) != 0 ||
+        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
                 cfg->index == 0 || cfg->io.nwin == 0)
             goto next_entry;
         
@@ -354,21 +337,21 @@ static void axnet_config(dev_link_t *link)
             if (last_ret == CS_SUCCESS) break;
         }
     next_entry:
-        last_ret = pcmcia_get_next_tuple(handle, &tuple);
+        last_ret = pcmcia_get_next_tuple(link, &tuple);
     }
     if (last_ret != CS_SUCCESS) {
-        cs_error(handle, RequestIO, last_ret);
+        cs_error(link, RequestIO, last_ret);
         goto failed;
     }
 
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     
     if (link->io.NumPorts2 == 8) {
         link->conf.Attributes |= CONF_ENABLE_SPKR;
         link->conf.Status = CCSR_AUDIO_ENA;
     }
     
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
     dev->irq = link->irq.AssignedIRQ;
     dev->base_addr = link->io.BasePort1;
 
@@ -405,7 +388,7 @@ static void axnet_config(dev_link_t *link)
        Bit 2 of CCSR is active low. */ 
     if (i == 32) {
         conf_reg_t reg = { 0, CS_WRITE, CISREG_CCSR, 0x04 };
-        pcmcia_access_configuration_register(link->handle, &reg);
+        pcmcia_access_configuration_register(link, &reg);
         for (i = 0; i < 32; i++) {
             j = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 1);
             if ((j != 0) && (j != 0xffff)) break;
@@ -413,13 +396,12 @@ static void axnet_config(dev_link_t *link)
     }
 
     info->phy_id = (i < 32) ? i : -1;
-    link->dev = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &info->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
         printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto failed;
     }
 
@@ -435,14 +417,13 @@ static void axnet_config(dev_link_t *link)
     } else {
         printk(KERN_NOTICE "  No MII transceivers found!\n");
     }
-    return;
+    return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     axnet_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
-    return;
+    return -ENODEV;
 } /* axnet_config */
 
 /*======================================================================
@@ -453,45 +434,29 @@ failed:
 
 ======================================================================*/
 
-static void axnet_release(dev_link_t *link)
+static void axnet_release(struct pcmcia_device *link)
 {
-    DEBUG(0, "axnet_release(0x%p)\n", link);
-
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-
-    link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
 }
 
-static int axnet_suspend(struct pcmcia_device *p_dev)
+static int axnet_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int axnet_resume(struct pcmcia_device *p_dev)
+static int axnet_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        axnet_reset_8390(dev);
-                        AX88190_init(dev, 1);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                axnet_reset_8390(dev);
+                AX88190_init(dev, 1);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -561,11 +526,11 @@ static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value)
 static int axnet_open(struct net_device *dev)
 {
     axnet_dev_t *info = PRIV(dev);
-    dev_link_t *link = &info->link;
+    struct pcmcia_device *link = info->p_dev;
     
     DEBUG(2, "axnet_open('%s')\n", dev->name);
 
-    if (!DEV_OK(link))
+    if (!pcmcia_dev_present(link))
         return -ENODEV;
 
     link->open++;
@@ -587,7 +552,7 @@ static int axnet_open(struct net_device *dev)
 static int axnet_close(struct net_device *dev)
 {
     axnet_dev_t *info = PRIV(dev);
-    dev_link_t *link = &info->link;
+    struct pcmcia_device *link = info->p_dev;
 
     DEBUG(2, "axnet_close('%s')\n", dev->name);
 
@@ -832,7 +797,7 @@ static struct pcmcia_driver axnet_cs_driver = {
         .drv            = {
                 .name   = "axnet_cs",
         },
-        .probe          = axnet_attach,
+        .probe          = axnet_probe,
         .remove         = axnet_detach,
         .id_table       = axnet_ids,
         .suspend        = axnet_suspend,
@@ -1595,7 +1560,7 @@ static void ei_receive(struct net_device *dev)
 
 static void ei_rx_overrun(struct net_device *dev)
 {
-        axnet_dev_t *info = (axnet_dev_t *)dev;
+        axnet_dev_t *info = PRIV(dev);
         long e8390_base = dev->base_addr;
         unsigned char was_txing, must_resend = 0;
         struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
@@ -1682,17 +1647,67 @@ static struct net_device_stats *get_stats(struct net_device *dev)
         return &ei_local->stat;
 }
 
+/*
+ * Form the 64 bit 8390 multicast table from the linked list of addresses
+ * associated with this dev structure.
+ */
+ 
+static inline void make_mc_bits(u8 *bits, struct net_device *dev)
+{
+        struct dev_mc_list *dmi;
+        u32 crc;
+
+        for (dmi=dev->mc_list; dmi; dmi=dmi->next) {
+                
+                crc = ether_crc(ETH_ALEN, dmi->dmi_addr);
+                /* 
+                 * The 8390 uses the 6 most significant bits of the
+                 * CRC to index the multicast table.
+                 */
+                bits[crc>>29] |= (1<<((crc>>26)&7));
+        }
+}
+
 /**
  * do_set_multicast_list - set/clear multicast filter
  * @dev: net device for which multicast filter is adjusted
  *
- *      Set or clear the multicast filter for this adaptor. May be called
- *      from a BH in 2.1.x. Must be called with lock held. 
+ *      Set or clear the multicast filter for this adaptor.
+ *      Must be called with lock held. 
  */
  
 static void do_set_multicast_list(struct net_device *dev)
 {
         long e8390_base = dev->base_addr;
+        int i;
+        struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev);
+
+        if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) {
+                memset(ei_local->mcfilter, 0, 8);
+                if (dev->mc_list)
+                        make_mc_bits(ei_local->mcfilter, dev);
+        } else {
+                /* set to accept-all */
+                memset(ei_local->mcfilter, 0xFF, 8);
+        }
+
+        /* 
+         * DP8390 manuals don't specify any magic sequence for altering
+         * the multicast regs on an already running card. To be safe, we
+         * ensure multicast mode is off prior to loading up the new hash
+         * table. If this proves to be not enough, we can always resort
+         * to stopping the NIC, loading the table and then restarting.
+         */
+         
+        if (netif_running(dev))
+                outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR);
+
+        outb_p(E8390_NODMA + E8390_PAGE1, e8390_base + E8390_CMD);
+        for(i = 0; i < 8; i++) 
+        {
+                outb_p(ei_local->mcfilter[i], e8390_base + EN1_MULT_SHIFT(i));
+        }
+        outb_p(E8390_NODMA + E8390_PAGE0, e8390_base + E8390_CMD);
 
         if(dev->flags&IFF_PROMISC)
                 outb_p(E8390_RXCONFIG | 0x58, e8390_base + EN0_RXCR);
@@ -1794,12 +1809,6 @@ static void AX88190_init(struct net_device *dev, int startp)
                 if(inb_p(e8390_base + EN1_PHYS_SHIFT(i))!=dev->dev_addr[i])
                         printk(KERN_ERR "Hw. address read/write mismap %d\n",i);
         }
-        /*
-         * Initialize the multicast list to accept-all.  If we enable multicast
-         * the higher levels can do the filtering.
-         */
-        for (i = 0; i < 8; i++)
-                outb_p(0xff, e8390_base + EN1_MULT + i);
 
         outb_p(ei_local->rx_start_page, e8390_base + EN1_CURPAG);
         outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD);
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index 2827a48ea37c..441de824ab6b 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -118,8 +118,8 @@ MODULE_LICENSE("GPL");
 
 /*====================================================================*/
 
-static void com20020_config(dev_link_t *link);
-static void com20020_release(dev_link_t *link);
+static int com20020_config(struct pcmcia_device *link);
+static void com20020_release(struct pcmcia_device *link);
 
 static void com20020_detach(struct pcmcia_device *p_dev);
 
@@ -138,9 +138,8 @@ typedef struct com20020_dev_t {
 
 ======================================================================*/
 
-static int com20020_attach(struct pcmcia_device *p_dev)
+static int com20020_probe(struct pcmcia_device *p_dev)
 {
-    dev_link_t *link;
     com20020_dev_t *info;
     struct net_device *dev;
     struct arcnet_local *lp;
@@ -148,10 +147,6 @@ static int com20020_attach(struct pcmcia_device *p_dev)
     DEBUG(0, "com20020_attach()\n");
 
     /* Create new network device */
-    link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-    if (!link)
-        return -ENOMEM;
-
     info = kmalloc(sizeof(struct com20020_dev_t), GFP_KERNEL);
     if (!info)
         goto fail_alloc_info;
@@ -161,7 +156,6 @@ static int com20020_attach(struct pcmcia_device *p_dev)
         goto fail_alloc_dev;
 
     memset(info, 0, sizeof(struct com20020_dev_t));
-    memset(link, 0, sizeof(struct dev_link_t));
     lp = dev->priv;
     lp->timeout = timeout;
     lp->backplane = backplane;
@@ -172,28 +166,23 @@ static int com20020_attach(struct pcmcia_device *p_dev)
     /* fill in our module parameters as defaults */
     dev->dev_addr[0] = node;
 
-    link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-    link->io.NumPorts1 = 16;
-    link->io.IOAddrLines = 16;
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
-    link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-    link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
-    link->conf.IntType = INT_MEMORY_AND_IO;
-    link->conf.Present = PRESENT_OPTION;
-
-    link->irq.Instance = info->dev = dev;
-    link->priv = info;
+    p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+    p_dev->io.NumPorts1 = 16;
+    p_dev->io.IOAddrLines = 16;
+    p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+    p_dev->conf.Attributes = CONF_ENABLE_IRQ;
+    p_dev->conf.IntType = INT_MEMORY_AND_IO;
+    p_dev->conf.Present = PRESENT_OPTION;
 
-    link->state |= DEV_PRESENT;
-    com20020_config(link);
+    p_dev->irq.Instance = info->dev = dev;
+    p_dev->priv = info;
 
-    return 0;
+    return com20020_config(p_dev);
 
 fail_alloc_dev:
     kfree(info);
 fail_alloc_info:
-    kfree(link);
     return -ENOMEM;
 } /* com20020_attach */
 
@@ -206,9 +195,8 @@ fail_alloc_info:
 
 ======================================================================*/
 
-static void com20020_detach(struct pcmcia_device *p_dev)
+static void com20020_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct com20020_dev_t *info = link->priv;
     struct net_device *dev = info->dev;
 
@@ -216,7 +204,7 @@ static void com20020_detach(struct pcmcia_device *p_dev)
 
     DEBUG(0, "com20020_detach(0x%p)\n", link);
 
-    if (link->dev) {
+    if (link->dev_node) {
         DEBUG(1,"unregister...\n");
 
         unregister_netdev(dev);
@@ -229,8 +217,7 @@ static void com20020_detach(struct pcmcia_device *p_dev)
             free_irq(dev->irq, dev);
     }
 
-    if (link->state & DEV_CONFIG)
-        com20020_release(link);
+    com20020_release(link);
 
     /* Unlink device structure, free bits */
     DEBUG(1,"unlinking...\n");
@@ -245,8 +232,6 @@ static void com20020_detach(struct pcmcia_device *p_dev)
         DEBUG(1,"kfree2...\n");
         kfree(info);
     }
-    DEBUG(1,"kfree3...\n");
-    kfree(link);
 
 } /* com20020_detach */
 
@@ -261,10 +246,9 @@ static void com20020_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void com20020_config(dev_link_t *link)
+static int com20020_config(struct pcmcia_device *link)
 {
     struct arcnet_local *lp;
-    client_handle_t handle;
     tuple_t tuple;
     cisparse_t parse;
     com20020_dev_t *info;
@@ -273,7 +257,6 @@ static void com20020_config(dev_link_t *link)
     u_char buf[64];
     int ioaddr;
 
-    handle = link->handle;
     info = link->priv;
     dev = info->dev;
 
@@ -286,14 +269,11 @@ static void com20020_config(dev_link_t *link)
     tuple.TupleDataMax = 64;
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
     i = !CS_SUCCESS;
     if (!link->io.BasePort1)
@@ -301,13 +281,13 @@ static void com20020_config(dev_link_t *link)
         for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
         {
             link->io.BasePort1 = ioaddr;
-            i = pcmcia_request_io(link->handle, &link->io);
+            i = pcmcia_request_io(link, &link->io);
             if (i == CS_SUCCESS)
                 break;
         }
     }
     else
-        i = pcmcia_request_io(link->handle, &link->io);
+        i = pcmcia_request_io(link, &link->io);
     
     if (i != CS_SUCCESS)
     {
@@ -321,7 +301,7 @@ static void com20020_config(dev_link_t *link)
     DEBUG(1,"arcnet: request IRQ %d (%Xh/%Xh)\n",
            link->irq.AssignedIRQ,
            link->irq.IRQInfo1, link->irq.IRQInfo2);
-    i = pcmcia_request_irq(link->handle, &link->irq);
+    i = pcmcia_request_irq(link, &link->irq);
     if (i != CS_SUCCESS)
     {
         DEBUG(1,"arcnet: requestIRQ failed totally!\n");
@@ -330,7 +310,7 @@ static void com20020_config(dev_link_t *link)
 
     dev->irq = link->irq.AssignedIRQ;
 
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
     if (com20020_check(dev))
     {
@@ -342,15 +322,14 @@ static void com20020_config(dev_link_t *link)
     lp->card_name = "PCMCIA COM20020";
     lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */
 
-    link->dev = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &info->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     i = com20020_found(dev, 0); /* calls register_netdev */
     
     if (i != 0) {
         DEBUG(1,KERN_NOTICE "com20020_cs: com20020_found() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto failed;
     }
 
@@ -358,13 +337,14 @@ static void com20020_config(dev_link_t *link)
 
     DEBUG(1,KERN_INFO "%s: port %#3lx, irq %d\n",
            dev->name, dev->base_addr, dev->irq);
-    return;
+    return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     DEBUG(1,"com20020_config failed...\n");
     com20020_release(link);
+    return -ENODEV;
 } /* com20020_config */
 
 /*======================================================================
@@ -375,52 +355,33 @@ failed:
 
 ======================================================================*/
 
-static void com20020_release(dev_link_t *link)
+static void com20020_release(struct pcmcia_device *link)
 {
-
-    DEBUG(1,"release...\n");
-
-    DEBUG(0, "com20020_release(0x%p)\n", link);
-
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-
-    link->state &= ~(DEV_CONFIG | DEV_RELEASE_PENDING);
+        DEBUG(0, "com20020_release(0x%p)\n", link);
+        pcmcia_disable_device(link);
 }
 
-static int com20020_suspend(struct pcmcia_device *p_dev)
+static int com20020_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         com20020_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open) {
-                        netif_device_detach(dev);
-                }
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int com20020_resume(struct pcmcia_device *p_dev)
+static int com20020_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         com20020_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        int ioaddr = dev->base_addr;
-                        struct arcnet_local *lp = dev->priv;
-                        ARCRESET;
-                }
-        }
+        if (link->open) {
+                int ioaddr = dev->base_addr;
+                struct arcnet_local *lp = dev->priv;
+                ARCRESET;
+        }
 
         return 0;
 }
@@ -436,7 +397,7 @@ static struct pcmcia_driver com20020_cs_driver = {
         .drv            = {
                 .name   = "com20020_cs",
         },
-        .probe          = com20020_attach,
+        .probe          = com20020_probe,
         .remove         = com20020_detach,
         .id_table       = com20020_ids,
         .suspend        = com20020_suspend,
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index b7ac14ba8877..09b11761cdfa 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -84,10 +84,10 @@ static char *version = DRV_NAME ".c " DRV_VERSION " 2002/03/23";
 /*
     PCMCIA event handlers
  */
-static void fmvj18x_config(dev_link_t *link);
-static int fmvj18x_get_hwinfo(dev_link_t *link, u_char *node_id);
-static int fmvj18x_setup_mfc(dev_link_t *link);
-static void fmvj18x_release(dev_link_t *link);
+static int fmvj18x_config(struct pcmcia_device *link);
+static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id);
+static int fmvj18x_setup_mfc(struct pcmcia_device *link);
+static void fmvj18x_release(struct pcmcia_device *link);
 static void fmvj18x_detach(struct pcmcia_device *p_dev);
 
 /*
@@ -116,7 +116,7 @@ typedef enum { MBH10302, MBH10304, TDK, CONTEC, LA501, UNGERMANN,
     driver specific data structure
 */
 typedef struct local_info_t {
-    dev_link_t link;
+        struct pcmcia_device    *p_dev;
     dev_node_t node;
     struct net_device_stats stats;
     long open_time;
@@ -228,10 +228,9 @@ typedef struct local_info_t {
 #define BANK_1U              0x24 /* bank 1 (CONFIG_1) */
 #define BANK_2U              0x28 /* bank 2 (CONFIG_1) */
 
-static int fmvj18x_attach(struct pcmcia_device *p_dev)
+static int fmvj18x_probe(struct pcmcia_device *link)
 {
     local_info_t *lp;
-    dev_link_t *link;
     struct net_device *dev;
 
     DEBUG(0, "fmvj18x_attach()\n");
@@ -241,8 +240,8 @@ static int fmvj18x_attach(struct pcmcia_device *p_dev)
     if (!dev)
         return -ENOMEM;
     lp = netdev_priv(dev);
-    link = &lp->link;
     link->priv = dev;
+    lp->p_dev = link;
 
     /* The io structure describes IO port mapping */
     link->io.NumPorts1 = 32;
@@ -257,7 +256,6 @@ static int fmvj18x_attach(struct pcmcia_device *p_dev)
 
     /* General socket configuration */
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
     link->conf.IntType = INT_MEMORY_AND_IO;
 
     /* The FMVJ18x specific entries in the device structure. */
@@ -274,29 +272,21 @@ static int fmvj18x_attach(struct pcmcia_device *p_dev)
 #endif
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    fmvj18x_config(link);
-
-    return 0;
+    return fmvj18x_config(link);
 } /* fmvj18x_attach */
 
 /*====================================================================*/
 
-static void fmvj18x_detach(struct pcmcia_device *p_dev)
+static void fmvj18x_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct net_device *dev = link->priv;
 
     DEBUG(0, "fmvj18x_detach(0x%p)\n", link);
 
-    if (link->dev)
+    if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        fmvj18x_release(link);
+    fmvj18x_release(link);
 
     free_netdev(dev);
 } /* fmvj18x_detach */
@@ -306,7 +296,7 @@ static void fmvj18x_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static int mfc_try_io_port(dev_link_t *link)
+static int mfc_try_io_port(struct pcmcia_device *link)
 {
     int i, ret;
     static const kio_addr_t serial_base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
@@ -318,13 +308,13 @@ static int mfc_try_io_port(dev_link_t *link)
             link->io.NumPorts2 = 0;
             printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n");
         }
-        ret = pcmcia_request_io(link->handle, &link->io);
+        ret = pcmcia_request_io(link, &link->io);
         if (ret == CS_SUCCESS) return ret;
     }
     return ret;
 }
 
-static int ungermann_try_io_port(dev_link_t *link)
+static int ungermann_try_io_port(struct pcmcia_device *link)
 {
     int ret;
     kio_addr_t ioaddr;
@@ -334,7 +324,7 @@ static int ungermann_try_io_port(dev_link_t *link)
     */
     for (ioaddr = 0x300; ioaddr < 0x3e0; ioaddr += 0x20) {
         link->io.BasePort1 = ioaddr;
-        ret = pcmcia_request_io(link->handle, &link->io);
+        ret = pcmcia_request_io(link, &link->io);
         if (ret == CS_SUCCESS) {
             /* calculate ConfigIndex value */
             link->conf.ConfigIndex = 
@@ -345,9 +335,8 @@ static int ungermann_try_io_port(dev_link_t *link)
     return ret; /* RequestIO failed */
 }
 
-static void fmvj18x_config(dev_link_t *link)
+static int fmvj18x_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     local_info_t *lp = netdev_priv(dev);
     tuple_t tuple;
@@ -366,42 +355,34 @@ static void fmvj18x_config(dev_link_t *link)
        registers.
     */
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     tuple.TupleData = (u_char *)buf;
     tuple.TupleDataMax = 64;
     tuple.TupleOffset = 0;
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
-    
-    /* Configure card */
-    link->state |= DEV_CONFIG;
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
 
     link->conf.ConfigBase = parse.config.base; 
     link->conf.Present = parse.config.rmask[0];
 
     tuple.DesiredTuple = CISTPL_FUNCE;
     tuple.TupleOffset = 0;
-    if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
         /* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigIndex = parse.cftable_entry.index;
         tuple.DesiredTuple = CISTPL_MANFID;
-        if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS)
-            CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS)
+            CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
         else
             buf[0] = 0xffff;
         switch (le16_to_cpu(buf[0])) {
         case MANFID_TDK:
             cardtype = TDK;
-            if (le16_to_cpu(buf[1]) == PRODID_TDK_CF010) {
-                cs_status_t status;
-                pcmcia_get_status(handle, &status);
-                if (status.CardState & CS_EVENT_3VCARD)
-                    link->conf.Vcc = 33; /* inserted in 3.3V slot */
-            } else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410
+            if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410
                         || le16_to_cpu(buf[1]) == PRODID_TDK_NP9610
                         || le16_to_cpu(buf[1]) == PRODID_TDK_MN3200) {
                 /* MultiFunction Card */
@@ -429,8 +410,8 @@ static void fmvj18x_config(dev_link_t *link)
     } else {
         /* old type card */
         tuple.DesiredTuple = CISTPL_MANFID;
-        if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS)
-            CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS)
+            CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
         else
             buf[0] = 0xffff;
         switch (le16_to_cpu(buf[0])) {
@@ -461,10 +442,10 @@ static void fmvj18x_config(dev_link_t *link)
         ret = ungermann_try_io_port(link);
         if (ret != CS_SUCCESS) goto cs_failed;
     } else { 
-        CS_CHECK(RequestIO, pcmcia_request_io(link->handle, &link->io));
+        CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
     }
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
     dev->irq = link->irq.AssignedIRQ;
     dev->base_addr = link->io.BasePort1;
 
@@ -493,17 +474,17 @@ static void fmvj18x_config(dev_link_t *link)
     case CONTEC:
         tuple.DesiredTuple = CISTPL_FUNCE;
         tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         tuple.TupleOffset = 0;
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
         if (cardtype == MBH10304) {
             /* MBH10304's CIS_FUNCE is corrupted */
             node_id = &(tuple.TupleData[5]);
             card_name = "FMV-J182";
         } else {
             while (tuple.TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID ) {
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
-                CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+                CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
             }
             node_id = &(tuple.TupleData[2]);
             if( cardtype == TDK ) {
@@ -545,13 +526,12 @@ static void fmvj18x_config(dev_link_t *link)
     }
 
     lp->cardtype = cardtype;
-    link->dev = &lp->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &lp->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
         printk(KERN_NOTICE "fmvj18x_cs: register_netdev() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto failed;
     }
 
@@ -564,19 +544,18 @@ static void fmvj18x_config(dev_link_t *link)
     for (i = 0; i < 6; i++)
         printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
 
-    return;
+    return 0;
     
 cs_failed:
     /* All Card Services errors end up here */
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     fmvj18x_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
-
+    return -ENODEV;
 } /* fmvj18x_config */
 /*====================================================================*/
 
-static int fmvj18x_get_hwinfo(dev_link_t *link, u_char *node_id)
+static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
 {
     win_req_t req;
     memreq_t mem;
@@ -587,9 +566,9 @@ static int fmvj18x_get_hwinfo(dev_link_t *link, u_char *node_id)
     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
-    i = pcmcia_request_window(&link->handle, &req, &link->win);
+    i = pcmcia_request_window(&link, &req, &link->win);
     if (i != CS_SUCCESS) {
-        cs_error(link->handle, RequestWindow, i);
+        cs_error(link, RequestWindow, i);
         return -1;
     }
 
@@ -623,13 +602,13 @@ static int fmvj18x_get_hwinfo(dev_link_t *link, u_char *node_id)
     iounmap(base);
     j = pcmcia_release_window(link->win);
     if (j != CS_SUCCESS)
-        cs_error(link->handle, ReleaseWindow, j);
+        cs_error(link, ReleaseWindow, j);
     return (i != 0x200) ? 0 : -1;
 
 } /* fmvj18x_get_hwinfo */
 /*====================================================================*/
 
-static int fmvj18x_setup_mfc(dev_link_t *link)
+static int fmvj18x_setup_mfc(struct pcmcia_device *link)
 {
     win_req_t req;
     memreq_t mem;
@@ -642,9 +621,9 @@ static int fmvj18x_setup_mfc(dev_link_t *link)
     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
-    i = pcmcia_request_window(&link->handle, &req, &link->win);
+    i = pcmcia_request_window(&link, &req, &link->win);
     if (i != CS_SUCCESS) {
-        cs_error(link->handle, RequestWindow, i);
+        cs_error(link, RequestWindow, i);
         return -1;
     }
 
@@ -666,54 +645,35 @@ static int fmvj18x_setup_mfc(dev_link_t *link)
     iounmap(base);
     j = pcmcia_release_window(link->win);
     if (j != CS_SUCCESS)
-        cs_error(link->handle, ReleaseWindow, j);
+        cs_error(link, ReleaseWindow, j);
     return 0;
 
 }
 /*====================================================================*/
 
-static void fmvj18x_release(dev_link_t *link)
+static void fmvj18x_release(struct pcmcia_device *link)
 {
-
-    DEBUG(0, "fmvj18x_release(0x%p)\n", link);
-
-    /* Don't bother checking to see if these succeed or not */
-    pcmcia_release_window(link->win);
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-    
-    link->state &= ~DEV_CONFIG;
+        DEBUG(0, "fmvj18x_release(0x%p)\n", link);
+        pcmcia_disable_device(link);
 }
 
-static int fmvj18x_suspend(struct pcmcia_device *p_dev)
+static int fmvj18x_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
-
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int fmvj18x_resume(struct pcmcia_device *p_dev)
+static int fmvj18x_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        fjn_reset(dev);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                fjn_reset(dev);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -751,7 +711,7 @@ static struct pcmcia_driver fmvj18x_cs_driver = {
         .drv            = {
                 .name   = "fmvj18x_cs",
         },
-        .probe          = fmvj18x_attach,
+        .probe          = fmvj18x_probe,
         .remove         = fmvj18x_detach,
         .id_table       = fmvj18x_ids,
         .suspend        = fmvj18x_suspend,
@@ -1148,11 +1108,11 @@ static int fjn_config(struct net_device *dev, struct ifmap *map){
 static int fjn_open(struct net_device *dev)
 {
     struct local_info_t *lp = netdev_priv(dev);
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
 
     DEBUG(4, "fjn_open('%s').\n", dev->name);
 
-    if (!DEV_OK(link))
+    if (!pcmcia_dev_present(link))
         return -ENODEV;
     
     link->open++;
@@ -1173,7 +1133,7 @@ static int fjn_open(struct net_device *dev)
 static int fjn_close(struct net_device *dev)
 {
     struct local_info_t *lp = netdev_priv(dev);
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
     kio_addr_t ioaddr = dev->base_addr;
 
     DEBUG(4, "fjn_close('%s').\n", dev->name);
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index b9c7e39576f5..b8fe70b85641 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -105,15 +105,15 @@ MODULE_LICENSE("GPL");
 
 /*====================================================================*/
 
-static void ibmtr_config(dev_link_t *link);
+static int ibmtr_config(struct pcmcia_device *link);
 static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase);
-static void ibmtr_release(dev_link_t *link);
+static void ibmtr_release(struct pcmcia_device *link);
 static void ibmtr_detach(struct pcmcia_device *p_dev);
 
 /*====================================================================*/
 
 typedef struct ibmtr_dev_t {
-    dev_link_t          link;
+        struct pcmcia_device    *p_dev;
     struct net_device   *dev;
     dev_node_t          node;
     window_handle_t     sram_win_handle;
@@ -138,12 +138,11 @@ static struct ethtool_ops netdev_ethtool_ops = {
 
 ======================================================================*/
 
-static int ibmtr_attach(struct pcmcia_device *p_dev)
+static int ibmtr_attach(struct pcmcia_device *link)
 {
     ibmtr_dev_t *info;
-    dev_link_t *link;
     struct net_device *dev;
-    
+
     DEBUG(0, "ibmtr_attach()\n");
 
     /* Create new token-ring device */
@@ -156,7 +155,7 @@ static int ibmtr_attach(struct pcmcia_device *p_dev)
         return -ENOMEM;
     }
 
-    link = &info->link;
+    info->p_dev = link;
     link->priv = info;
     info->ti = netdev_priv(dev);
 
@@ -167,21 +166,14 @@ static int ibmtr_attach(struct pcmcia_device *p_dev)
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->irq.Handler = &tok_interrupt;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
     link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.Present = PRESENT_OPTION;
 
     link->irq.Instance = info->dev = dev;
-    
-    SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
-
-    link->handle = p_dev;
-    p_dev->instance = link;
 
-    link->state |= DEV_PRESENT;
-    ibmtr_config(link);
+    SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    return 0;
+    return ibmtr_config(link);
 } /* ibmtr_attach */
 
 /*======================================================================
@@ -193,23 +185,22 @@ static int ibmtr_attach(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static void ibmtr_detach(struct pcmcia_device *p_dev)
+static void ibmtr_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct ibmtr_dev_t *info = link->priv;
     struct net_device *dev = info->dev;
 
     DEBUG(0, "ibmtr_detach(0x%p)\n", link);
 
-    if (link->dev)
+    if (link->dev_node)
         unregister_netdev(dev);
 
     {
         struct tok_info *ti = netdev_priv(dev);
         del_timer_sync(&(ti->tr_timer));
     }
-    if (link->state & DEV_CONFIG)
-        ibmtr_release(link);
+
+    ibmtr_release(link);
 
     free_netdev(dev);
     kfree(info);
@@ -226,9 +217,8 @@ static void ibmtr_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void ibmtr_config(dev_link_t *link)
+static int ibmtr_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     ibmtr_dev_t *info = link->priv;
     struct net_device *dev = info->dev;
     struct tok_info *ti = netdev_priv(dev);
@@ -246,29 +236,25 @@ static void ibmtr_config(dev_link_t *link)
     tuple.TupleDataMax = 64;
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
-
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     link->conf.ConfigIndex = 0x61;
 
     /* Determine if this is PRIMARY or ALTERNATE. */
 
     /* Try PRIMARY card at 0xA20-0xA23 */
     link->io.BasePort1 = 0xA20;
-    i = pcmcia_request_io(link->handle, &link->io);
+    i = pcmcia_request_io(link, &link->io);
     if (i != CS_SUCCESS) {
         /* Couldn't get 0xA20-0xA23.  Try ALTERNATE at 0xA24-0xA27. */
         link->io.BasePort1 = 0xA24;
-        CS_CHECK(RequestIO, pcmcia_request_io(link->handle, &link->io));
+        CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
     }
     dev->base_addr = link->io.BasePort1;
 
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     dev->irq = link->irq.AssignedIRQ;
     ti->irq = link->irq.AssignedIRQ;
     ti->global_int_enable=GLOBAL_INT_ENABLE+((dev->irq==9) ? 2 : dev->irq);
@@ -279,7 +265,7 @@ static void ibmtr_config(dev_link_t *link)
     req.Base = 0; 
     req.Size = 0x2000;
     req.AccessSpeed = 250;
-    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+    CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win));
 
     mem.CardOffset = mmiobase;
     mem.Page = 0;
@@ -292,7 +278,7 @@ static void ibmtr_config(dev_link_t *link)
     req.Base = 0;
     req.Size = sramsize * 1024;
     req.AccessSpeed = 250;
-    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &info->sram_win_handle));
+    CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &info->sram_win_handle));
 
     mem.CardOffset = srambase;
     mem.Page = 0;
@@ -302,21 +288,20 @@ static void ibmtr_config(dev_link_t *link)
     ti->sram_virt = ioremap(req.Base, req.Size);
     ti->sram_phys = req.Base;
 
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
     /*  Set up the Token-Ring Controller Configuration Register and
         turn on the card.  Check the "Local Area Network Credit Card
         Adapters Technical Reference"  SC30-3585 for this info.  */
     ibmtr_hw_setup(dev, mmiobase);
 
-    link->dev = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &info->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     i = ibmtr_probe_card(dev);
     if (i != 0) {
         printk(KERN_NOTICE "ibmtr_cs: register_netdev() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto failed;
     }
 
@@ -330,12 +315,13 @@ static void ibmtr_config(dev_link_t *link)
     for (i = 0; i < TR_ALEN; i++)
         printk("%02X", dev->dev_addr[i]);
     printk("\n");
-    return;
+    return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     ibmtr_release(link);
+    return -ENODEV;
 } /* ibmtr_config */
 
 /*======================================================================
@@ -346,56 +332,41 @@ failed:
 
 ======================================================================*/
 
-static void ibmtr_release(dev_link_t *link)
+static void ibmtr_release(struct pcmcia_device *link)
 {
-    ibmtr_dev_t *info = link->priv;
-    struct net_device *dev = info->dev;
-
-    DEBUG(0, "ibmtr_release(0x%p)\n", link);
+        ibmtr_dev_t *info = link->priv;
+        struct net_device *dev = info->dev;
 
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-    if (link->win) {
-        struct tok_info *ti = netdev_priv(dev);
-        iounmap(ti->mmio);
-        pcmcia_release_window(link->win);
-        pcmcia_release_window(info->sram_win_handle);
-    }
+        DEBUG(0, "ibmtr_release(0x%p)\n", link);
 
-    link->state &= ~DEV_CONFIG;
+        if (link->win) {
+                struct tok_info *ti = netdev_priv(dev);
+                iounmap(ti->mmio);
+                pcmcia_release_window(info->sram_win_handle);
+        }
+        pcmcia_disable_device(link);
 }
 
-static int ibmtr_suspend(struct pcmcia_device *p_dev)
+static int ibmtr_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         ibmtr_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int ibmtr_resume(struct pcmcia_device *p_dev)
+static int ibmtr_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         ibmtr_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        ibmtr_probe(dev);       /* really? */
-                        netif_device_attach(dev);
-                }
-        }
+        if (link->open) {
+                ibmtr_probe(dev);       /* really? */
+                netif_device_attach(dev);
+        }
 
         return 0;
 }
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 787176c57fd9..4260c2128f47 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -362,7 +362,7 @@ typedef struct _mace_statistics {
 } mace_statistics;
 
 typedef struct _mace_private {
-    dev_link_t link;
+        struct pcmcia_device    *p_dev;
     dev_node_t node;
     struct net_device_stats linux_stats; /* Linux statistics counters */
     mace_statistics mace_stats; /* MACE chip statistics counters */
@@ -417,8 +417,8 @@ INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
 Function Prototypes
 ---------------------------------------------------------------------------- */
 
-static void nmclan_config(dev_link_t *link);
-static void nmclan_release(dev_link_t *link);
+static int nmclan_config(struct pcmcia_device *link);
+static void nmclan_release(struct pcmcia_device *link);
 
 static void nmclan_reset(struct net_device *dev);
 static int mace_config(struct net_device *dev, struct ifmap *map);
@@ -443,10 +443,9 @@ nmclan_attach
         Services.
 ---------------------------------------------------------------------------- */
 
-static int nmclan_attach(struct pcmcia_device *p_dev)
+static int nmclan_probe(struct pcmcia_device *link)
 {
     mace_private *lp;
-    dev_link_t *link;
     struct net_device *dev;
 
     DEBUG(0, "nmclan_attach()\n");
@@ -457,7 +456,7 @@ static int nmclan_attach(struct pcmcia_device *p_dev)
     if (!dev)
             return -ENOMEM;
     lp = netdev_priv(dev);
-    link = &lp->link;
+    lp->p_dev = link;
     link->priv = dev;
     
     spin_lock_init(&lp->bank_lock);
@@ -469,7 +468,6 @@ static int nmclan_attach(struct pcmcia_device *p_dev)
     link->irq.Handler = &mace_interrupt;
     link->irq.Instance = dev;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
     link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 1;
     link->conf.Present = PRESENT_OPTION;
@@ -489,13 +487,7 @@ static int nmclan_attach(struct pcmcia_device *p_dev)
     dev->watchdog_timeo = TX_TIMEOUT;
 #endif
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    nmclan_config(link);
-
-    return 0;
+    return nmclan_config(link);
 } /* nmclan_attach */
 
 /* ----------------------------------------------------------------------------
@@ -506,18 +498,16 @@ nmclan_detach
         when the device is released.
 ---------------------------------------------------------------------------- */
 
-static void nmclan_detach(struct pcmcia_device *p_dev)
+static void nmclan_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct net_device *dev = link->priv;
 
     DEBUG(0, "nmclan_detach(0x%p)\n", link);
 
-    if (link->dev)
+    if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        nmclan_release(link);
+    nmclan_release(link);
 
     free_netdev(dev);
 } /* nmclan_detach */
@@ -661,9 +651,8 @@ nmclan_config
 #define CS_CHECK(fn, ret) \
   do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void nmclan_config(dev_link_t *link)
+static int nmclan_config(struct pcmcia_device *link)
 {
-  client_handle_t handle = link->handle;
   struct net_device *dev = link->priv;
   mace_private *lp = netdev_priv(dev);
   tuple_t tuple;
@@ -679,17 +668,14 @@ static void nmclan_config(dev_link_t *link)
   tuple.TupleDataMax = 64;
   tuple.TupleOffset = 0;
   tuple.DesiredTuple = CISTPL_CONFIG;
-  CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-  CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-  CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+  CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+  CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+  CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
   link->conf.ConfigBase = parse.config.base;
 
-  /* Configure card */
-  link->state |= DEV_CONFIG;
-
-  CS_CHECK(RequestIO, pcmcia_request_io(handle, &link->io));
-  CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
-  CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+  CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
+  CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+  CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
   dev->irq = link->irq.AssignedIRQ;
   dev->base_addr = link->io.BasePort1;
 
@@ -700,8 +686,8 @@ static void nmclan_config(dev_link_t *link)
   tuple.TupleData = buf;
   tuple.TupleDataMax = 64;
   tuple.TupleOffset = 0;
-  CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-  CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+  CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+  CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
   memcpy(dev->dev_addr, tuple.TupleData, ETHER_ADDR_LEN);
 
   /* Verify configuration by reading the MACE ID. */
@@ -716,8 +702,7 @@ static void nmclan_config(dev_link_t *link)
     } else {
       printk(KERN_NOTICE "nmclan_cs: mace id not found: %x %x should"
              " be 0x40 0x?9\n", sig[0], sig[1]);
-      link->state &= ~DEV_CONFIG_PENDING;
-      return;
+      return -ENODEV;
     }
   }
 
@@ -730,14 +715,13 @@ static void nmclan_config(dev_link_t *link)
   else
     printk(KERN_NOTICE "nmclan_cs: invalid if_port requested\n");
 
-  link->dev = &lp->node;
-  link->state &= ~DEV_CONFIG_PENDING;
-  SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+  link->dev_node = &lp->node;
+  SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
   i = register_netdev(dev);
   if (i != 0) {
     printk(KERN_NOTICE "nmclan_cs: register_netdev() failed\n");
-    link->dev = NULL;
+    link->dev_node = NULL;
     goto failed;
   }
 
@@ -747,14 +731,13 @@ static void nmclan_config(dev_link_t *link)
          dev->name, dev->base_addr, dev->irq, if_names[dev->if_port]);
   for (i = 0; i < 6; i++)
       printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
-  return;
+  return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 failed:
-    nmclan_release(link);
-    return;
-
+        nmclan_release(link);
+        return -ENODEV;
 } /* nmclan_config */
 
 /* ----------------------------------------------------------------------------
@@ -763,46 +746,29 @@ nmclan_release
         net device, and release the PCMCIA configuration.  If the device
         is still open, this will be postponed until it is closed.
 ---------------------------------------------------------------------------- */
-static void nmclan_release(dev_link_t *link)
+static void nmclan_release(struct pcmcia_device *link)
 {
-
-  DEBUG(0, "nmclan_release(0x%p)\n", link);
-
-  pcmcia_release_configuration(link->handle);
-  pcmcia_release_io(link->handle, &link->io);
-  pcmcia_release_irq(link->handle, &link->irq);
-
-  link->state &= ~DEV_CONFIG;
+        DEBUG(0, "nmclan_release(0x%p)\n", link);
+        pcmcia_disable_device(link);
 }
 
-static int nmclan_suspend(struct pcmcia_device *p_dev)
+static int nmclan_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
-
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int nmclan_resume(struct pcmcia_device *p_dev)
+static int nmclan_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        nmclan_reset(dev);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                nmclan_reset(dev);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -818,7 +784,7 @@ static void nmclan_reset(struct net_device *dev)
   mace_private *lp = netdev_priv(dev);
 
 #if RESET_XILINX
-  dev_link_t *link = &lp->link;
+  struct pcmcia_device *link = &lp->link;
   conf_reg_t reg;
   u_long OrigCorValue; 
 
@@ -827,7 +793,7 @@ static void nmclan_reset(struct net_device *dev)
   reg.Action = CS_READ;
   reg.Offset = CISREG_COR;
   reg.Value = 0;
-  pcmcia_access_configuration_register(link->handle, &reg);
+  pcmcia_access_configuration_register(link, &reg);
   OrigCorValue = reg.Value;
 
   /* Reset Xilinx */
@@ -836,12 +802,12 @@ static void nmclan_reset(struct net_device *dev)
   DEBUG(1, "nmclan_reset: OrigCorValue=0x%lX, resetting...\n",
         OrigCorValue);
   reg.Value = COR_SOFT_RESET;
-  pcmcia_access_configuration_register(link->handle, &reg);
+  pcmcia_access_configuration_register(link, &reg);
   /* Need to wait for 20 ms for PCMCIA to finish reset. */
 
   /* Restore original COR configuration index */
   reg.Value = COR_LEVEL_REQ | (OrigCorValue & COR_CONFIG_MASK);
-  pcmcia_access_configuration_register(link->handle, &reg);
+  pcmcia_access_configuration_register(link, &reg);
   /* Xilinx is now completely reset along with the MACE chip. */
   lp->tx_free_frames=AM2150_MAX_TX_FRAMES;
 
@@ -885,9 +851,9 @@ static int mace_open(struct net_device *dev)
 {
   kio_addr_t ioaddr = dev->base_addr;
   mace_private *lp = netdev_priv(dev);
-  dev_link_t *link = &lp->link;
+  struct pcmcia_device *link = lp->p_dev;
 
-  if (!DEV_OK(link))
+  if (!pcmcia_dev_present(link))
     return -ENODEV;
 
   link->open++;
@@ -908,7 +874,7 @@ static int mace_close(struct net_device *dev)
 {
   kio_addr_t ioaddr = dev->base_addr;
   mace_private *lp = netdev_priv(dev);
-  dev_link_t *link = &lp->link;
+  struct pcmcia_device *link = lp->p_dev;
 
   DEBUG(2, "%s: shutting down ethercard.\n", dev->name);
 
@@ -963,12 +929,12 @@ mace_start_xmit
 static void mace_tx_timeout(struct net_device *dev)
 {
   mace_private *lp = netdev_priv(dev);
-  dev_link_t *link = &lp->link;
+  struct pcmcia_device *link = lp->p_dev;
 
   printk(KERN_NOTICE "%s: transmit timed out -- ", dev->name);
 #if RESET_ON_TIMEOUT
   printk("resetting card\n");
-  pcmcia_reset_card(link->handle, NULL);
+  pcmcia_reset_card(link, NULL);
 #else /* #if RESET_ON_TIMEOUT */
   printk("NOT resetting card\n");
 #endif /* #if RESET_ON_TIMEOUT */
@@ -1635,7 +1601,7 @@ static struct pcmcia_driver nmclan_cs_driver = {
         .drv            = {
                 .name   = "nmclan_cs",
         },
-        .probe          = nmclan_attach,
+        .probe          = nmclan_probe,
         .remove         = nmclan_detach,
         .id_table       = nmclan_ids,
         .suspend        = nmclan_suspend,
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index b46e5f703efa..506e777c5f06 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -103,8 +103,8 @@ module_param_array(hw_addr, int, NULL, 0);
 /*====================================================================*/
 
 static void mii_phy_probe(struct net_device *dev);
-static void pcnet_config(dev_link_t *link);
-static void pcnet_release(dev_link_t *link);
+static int pcnet_config(struct pcmcia_device *link);
+static void pcnet_release(struct pcmcia_device *link);
 static int pcnet_open(struct net_device *dev);
 static int pcnet_close(struct net_device *dev);
 static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -113,9 +113,9 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs);
 static void ei_watchdog(u_long arg);
 static void pcnet_reset_8390(struct net_device *dev);
 static int set_config(struct net_device *dev, struct ifmap *map);
-static int setup_shmem_window(dev_link_t *link, int start_pg,
+static int setup_shmem_window(struct pcmcia_device *link, int start_pg,
                               int stop_pg, int cm_offset);
-static int setup_dma_config(dev_link_t *link, int start_pg,
+static int setup_dma_config(struct pcmcia_device *link, int start_pg,
                             int stop_pg);
 
 static void pcnet_detach(struct pcmcia_device *p_dev);
@@ -214,7 +214,7 @@ static hw_info_t dl10019_info = { 0, 0, 0, 0, IS_DL10019|HAS_MII };
 static hw_info_t dl10022_info = { 0, 0, 0, 0, IS_DL10022|HAS_MII };
 
 typedef struct pcnet_dev_t {
-    dev_link_t          link;
+        struct pcmcia_device    *p_dev;
     dev_node_t          node;
     u_int               flags;
     void                __iomem *base;
@@ -240,10 +240,9 @@ static inline pcnet_dev_t *PRIV(struct net_device *dev)
 
 ======================================================================*/
 
-static int pcnet_probe(struct pcmcia_device *p_dev)
+static int pcnet_probe(struct pcmcia_device *link)
 {
     pcnet_dev_t *info;
-    dev_link_t *link;
     struct net_device *dev;
 
     DEBUG(0, "pcnet_attach()\n");
@@ -252,7 +251,7 @@ static int pcnet_probe(struct pcmcia_device *p_dev)
     dev = __alloc_ei_netdev(sizeof(pcnet_dev_t));
     if (!dev) return -ENOMEM;
     info = PRIV(dev);
-    link = &info->link;
+    info->p_dev = link;
     link->priv = dev;
 
     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
@@ -265,13 +264,7 @@ static int pcnet_probe(struct pcmcia_device *p_dev)
     dev->stop = &pcnet_close;
     dev->set_config = &set_config;
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    pcnet_config(link);
-
-    return 0;
+    return pcnet_config(link);
 } /* pcnet_attach */
 
 /*======================================================================
@@ -283,18 +276,16 @@ static int pcnet_probe(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static void pcnet_detach(struct pcmcia_device *p_dev)
+static void pcnet_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
         DEBUG(0, "pcnet_detach(0x%p)\n", link);
 
-        if (link->dev)
+        if (link->dev_node)
                 unregister_netdev(dev);
 
-        if (link->state & DEV_CONFIG)
-                pcnet_release(link);
+        pcnet_release(link);
 
         free_netdev(dev);
 } /* pcnet_detach */
@@ -306,7 +297,7 @@ static void pcnet_detach(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static hw_info_t *get_hwinfo(dev_link_t *link)
+static hw_info_t *get_hwinfo(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     win_req_t req;
@@ -318,9 +309,9 @@ static hw_info_t *get_hwinfo(dev_link_t *link)
     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
-    i = pcmcia_request_window(&link->handle, &req, &link->win);
+    i = pcmcia_request_window(&link, &req, &link->win);
     if (i != CS_SUCCESS) {
-        cs_error(link->handle, RequestWindow, i);
+        cs_error(link, RequestWindow, i);
         return NULL;
     }
 
@@ -343,7 +334,7 @@ static hw_info_t *get_hwinfo(dev_link_t *link)
     iounmap(virt);
     j = pcmcia_release_window(link->win);
     if (j != CS_SUCCESS)
-        cs_error(link->handle, ReleaseWindow, j);
+        cs_error(link, ReleaseWindow, j);
     return (i < NR_INFO) ? hw_info+i : NULL;
 } /* get_hwinfo */
 
@@ -355,7 +346,7 @@ static hw_info_t *get_hwinfo(dev_link_t *link)
 
 ======================================================================*/
 
-static hw_info_t *get_prom(dev_link_t *link)
+static hw_info_t *get_prom(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     kio_addr_t ioaddr = dev->base_addr;
@@ -409,7 +400,7 @@ static hw_info_t *get_prom(dev_link_t *link)
 
 ======================================================================*/
 
-static hw_info_t *get_dl10019(dev_link_t *link)
+static hw_info_t *get_dl10019(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     int i;
@@ -431,7 +422,7 @@ static hw_info_t *get_dl10019(dev_link_t *link)
 
 ======================================================================*/
 
-static hw_info_t *get_ax88190(dev_link_t *link)
+static hw_info_t *get_ax88190(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     kio_addr_t ioaddr = dev->base_addr;
@@ -464,7 +455,7 @@ static hw_info_t *get_ax88190(dev_link_t *link)
 
 ======================================================================*/
 
-static hw_info_t *get_hwired(dev_link_t *link)
+static hw_info_t *get_hwired(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     int i;
@@ -491,7 +482,7 @@ static hw_info_t *get_hwired(dev_link_t *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static int try_io_port(dev_link_t *link)
+static int try_io_port(struct pcmcia_device *link)
 {
     int j, ret;
     if (link->io.NumPorts1 == 32) {
@@ -512,18 +503,17 @@ static int try_io_port(dev_link_t *link)
         for (j = 0; j < 0x400; j += 0x20) {
             link->io.BasePort1 = j ^ 0x300;
             link->io.BasePort2 = (j ^ 0x300) + 0x10;
-            ret = pcmcia_request_io(link->handle, &link->io);
+            ret = pcmcia_request_io(link, &link->io);
             if (ret == CS_SUCCESS) return ret;
         }
         return ret;
     } else {
-        return pcmcia_request_io(link->handle, &link->io);
+        return pcmcia_request_io(link, &link->io);
     }
 }
 
-static void pcnet_config(dev_link_t *link)
+static int pcnet_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     pcnet_dev_t *info = PRIV(dev);
     tuple_t tuple;
@@ -531,7 +521,6 @@ static void pcnet_config(dev_link_t *link)
     int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
     int manfid = 0, prodid = 0, has_shmem = 0;
     u_short buf[64];
-    config_info_t conf;
     hw_info_t *hw_info;
 
     DEBUG(0, "pcnet_config(0x%p)\n", link);
@@ -541,36 +530,29 @@ static void pcnet_config(dev_link_t *link)
     tuple.TupleDataMax = sizeof(buf);
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
     link->conf.Present = parse.config.rmask[0];
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
-    /* Look up current Vcc */
-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
-    link->conf.Vcc = conf.Vcc;
-
     tuple.DesiredTuple = CISTPL_MANFID;
     tuple.Attributes = TUPLE_RETURN_COMMON;
-    if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) &&
-        (pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS)) {
+    if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
+        (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) {
         manfid = le16_to_cpu(buf[0]);
         prodid = le16_to_cpu(buf[1]);
     }
     
     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
     tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     while (last_ret == CS_SUCCESS) {
         cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
         cistpl_io_t *io = &(parse.cftable_entry.io);
         
-        if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                        pcmcia_parse_tuple(handle, &tuple, &parse) != 0 ||
+        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                        pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
                         cfg->index == 0 || cfg->io.nwin == 0)
                 goto next_entry;
         
@@ -594,14 +576,14 @@ static void pcnet_config(dev_link_t *link)
             if (last_ret == CS_SUCCESS) break;
         }
     next_entry:
-        last_ret = pcmcia_get_next_tuple(handle, &tuple);
+        last_ret = pcmcia_get_next_tuple(link, &tuple);
     }
     if (last_ret != CS_SUCCESS) {
-        cs_error(handle, RequestIO, last_ret);
+        cs_error(link, RequestIO, last_ret);
         goto failed;
     }
 
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     
     if (link->io.NumPorts2 == 8) {
         link->conf.Attributes |= CONF_ENABLE_SPKR;
@@ -611,7 +593,7 @@ static void pcnet_config(dev_link_t *link)
         (prodid == PRODID_IBM_HOME_AND_AWAY))
         link->conf.ConfigIndex |= 0x10;
     
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
     dev->irq = link->irq.AssignedIRQ;
     dev->base_addr = link->io.BasePort1;
     if (info->flags & HAS_MISC_REG) {
@@ -679,9 +661,8 @@ static void pcnet_config(dev_link_t *link)
             info->eth_phy = 0;
     }
 
-    link->dev = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &info->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
     dev->poll_controller = ei_poll;
@@ -689,7 +670,7 @@ static void pcnet_config(dev_link_t *link)
 
     if (register_netdev(dev) != 0) {
         printk(KERN_NOTICE "pcnet_cs: register_netdev() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto failed;
     }
 
@@ -712,14 +693,13 @@ static void pcnet_config(dev_link_t *link)
     printk(" hw_addr ");
     for (i = 0; i < 6; i++)
         printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
-    return;
+    return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     pcnet_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
-    return;
+    return -ENODEV;
 } /* pcnet_config */
 
 /*======================================================================
@@ -730,21 +710,16 @@ failed:
 
 ======================================================================*/
 
-static void pcnet_release(dev_link_t *link)
+static void pcnet_release(struct pcmcia_device *link)
 {
-    pcnet_dev_t *info = PRIV(link->priv);
+        pcnet_dev_t *info = PRIV(link->priv);
 
-    DEBUG(0, "pcnet_release(0x%p)\n", link);
+        DEBUG(0, "pcnet_release(0x%p)\n", link);
 
-    if (info->flags & USE_SHMEM) {
-        iounmap(info->base);
-        pcmcia_release_window(link->win);
-    }
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
+        if (info->flags & USE_SHMEM)
+                iounmap(info->base);
 
-    link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
 }
 
 /*======================================================================
@@ -756,34 +731,24 @@ static void pcnet_release(dev_link_t *link)
 
 ======================================================================*/
 
-static int pcnet_suspend(struct pcmcia_device *p_dev)
+static int pcnet_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int pcnet_resume(struct pcmcia_device *p_dev)
+static int pcnet_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        pcnet_reset_8390(dev);
-                        NS8390_init(dev, 1);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                pcnet_reset_8390(dev);
+                NS8390_init(dev, 1);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -1023,11 +988,11 @@ static void mii_phy_probe(struct net_device *dev)
 static int pcnet_open(struct net_device *dev)
 {
     pcnet_dev_t *info = PRIV(dev);
-    dev_link_t *link = &info->link;
-    
+    struct pcmcia_device *link = info->p_dev;
+
     DEBUG(2, "pcnet_open('%s')\n", dev->name);
 
-    if (!DEV_OK(link))
+    if (!pcmcia_dev_present(link))
         return -ENODEV;
 
     link->open++;
@@ -1051,7 +1016,7 @@ static int pcnet_open(struct net_device *dev)
 static int pcnet_close(struct net_device *dev)
 {
     pcnet_dev_t *info = PRIV(dev);
-    dev_link_t *link = &info->link;
+    struct pcmcia_device *link = info->p_dev;
 
     DEBUG(2, "pcnet_close('%s')\n", dev->name);
 
@@ -1429,7 +1394,7 @@ static void dma_block_output(struct net_device *dev, int count,
 
 /*====================================================================*/
 
-static int setup_dma_config(dev_link_t *link, int start_pg,
+static int setup_dma_config(struct pcmcia_device *link, int start_pg,
                             int stop_pg)
 {
     struct net_device *dev = link->priv;
@@ -1532,7 +1497,7 @@ static void shmem_block_output(struct net_device *dev, int count,
 
 /*====================================================================*/
 
-static int setup_shmem_window(dev_link_t *link, int start_pg,
+static int setup_shmem_window(struct pcmcia_device *link, int start_pg,
                               int stop_pg, int cm_offset)
 {
     struct net_device *dev = link->priv;
@@ -1554,7 +1519,7 @@ static int setup_shmem_window(dev_link_t *link, int start_pg,
     req.Attributes |= WIN_USE_WAIT;
     req.Base = 0; req.Size = window_size;
     req.AccessSpeed = mem_speed;
-    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+    CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win));
 
     mem.CardOffset = (start_pg << 8) + cm_offset;
     offset = mem.CardOffset % window_size;
@@ -1595,7 +1560,7 @@ static int setup_shmem_window(dev_link_t *link, int start_pg,
     return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     return 1;
 }
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 8839c4faafd6..e74bf5014ef6 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -49,6 +49,7 @@
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ciscode.h>
 #include <pcmcia/ds.h>
+#include <pcmcia/ss.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
@@ -103,7 +104,7 @@ static const char *version =
 #define MEMORY_WAIT_TIME        8
 
 struct smc_private {
-    dev_link_t                  link;
+        struct pcmcia_device    *p_dev;
     spinlock_t                  lock;
     u_short                     manfid;
     u_short                     cardid;
@@ -278,8 +279,8 @@ enum RxCfg { RxAllMulti = 0x0004, RxPromisc = 0x0002,
 /*====================================================================*/
 
 static void smc91c92_detach(struct pcmcia_device *p_dev);
-static void smc91c92_config(dev_link_t *link);
-static void smc91c92_release(dev_link_t *link);
+static int smc91c92_config(struct pcmcia_device *link);
+static void smc91c92_release(struct pcmcia_device *link);
 
 static int smc_open(struct net_device *dev);
 static int smc_close(struct net_device *dev);
@@ -308,10 +309,9 @@ static struct ethtool_ops ethtool_ops;
 
 ======================================================================*/
 
-static int smc91c92_attach(struct pcmcia_device *p_dev)
+static int smc91c92_probe(struct pcmcia_device *link)
 {
     struct smc_private *smc;
-    dev_link_t *link;
     struct net_device *dev;
 
     DEBUG(0, "smc91c92_attach()\n");
@@ -321,7 +321,7 @@ static int smc91c92_attach(struct pcmcia_device *p_dev)
     if (!dev)
         return -ENOMEM;
     smc = netdev_priv(dev);
-    link = &smc->link;
+    smc->p_dev = link;
     link->priv = dev;
 
     spin_lock_init(&smc->lock);
@@ -333,7 +333,6 @@ static int smc91c92_attach(struct pcmcia_device *p_dev)
     link->irq.Handler = &smc_interrupt;
     link->irq.Instance = dev;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
     link->conf.IntType = INT_MEMORY_AND_IO;
 
     /* The SMC91c92-specific entries in the device structure. */
@@ -357,13 +356,7 @@ static int smc91c92_attach(struct pcmcia_device *p_dev)
     smc->mii_if.phy_id_mask = 0x1f;
     smc->mii_if.reg_num_mask = 0x1f;
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    smc91c92_config(link);
-
-    return 0;
+    return smc91c92_config(link);
 } /* smc91c92_attach */
 
 /*======================================================================
@@ -375,18 +368,16 @@ static int smc91c92_attach(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static void smc91c92_detach(struct pcmcia_device *p_dev)
+static void smc91c92_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct net_device *dev = link->priv;
 
     DEBUG(0, "smc91c92_detach(0x%p)\n", link);
 
-    if (link->dev)
+    if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        smc91c92_release(link);
+    smc91c92_release(link);
 
     free_netdev(dev);
 } /* smc91c92_detach */
@@ -414,7 +405,7 @@ static int cvt_ascii_address(struct net_device *dev, char *s)
 
 /*====================================================================*/
 
-static int first_tuple(client_handle_t handle, tuple_t *tuple,
+static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
                 cisparse_t *parse)
 {
         int i;
@@ -425,7 +416,7 @@ static int first_tuple(client_handle_t handle, tuple_t *tuple,
         return pcmcia_parse_tuple(handle, tuple, parse);
 }
 
-static int next_tuple(client_handle_t handle, tuple_t *tuple,
+static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
                 cisparse_t *parse)
 {
         int i;
@@ -447,7 +438,7 @@ static int next_tuple(client_handle_t handle, tuple_t *tuple,
 
 ======================================================================*/
 
-static int mhz_3288_power(dev_link_t *link)
+static int mhz_3288_power(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     struct smc_private *smc = netdev_priv(dev);
@@ -469,7 +460,7 @@ static int mhz_3288_power(dev_link_t *link)
     return 0;
 }
 
-static int mhz_mfc_config(dev_link_t *link)
+static int mhz_mfc_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     struct smc_private *smc = netdev_priv(dev);
@@ -504,7 +495,7 @@ static int mhz_mfc_config(dev_link_t *link)
     tuple->TupleDataMax = 255;
     tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
 
-    i = first_tuple(link->handle, tuple, parse);
+    i = first_tuple(link, tuple, parse);
     /* The Megahertz combo cards have modem-like CIS entries, so
        we have to explicitly try a bunch of port combinations. */
     while (i == CS_SUCCESS) {
@@ -513,11 +504,11 @@ static int mhz_mfc_config(dev_link_t *link)
         for (k = 0; k < 0x400; k += 0x10) {
             if (k & 0x80) continue;
             link->io.BasePort1 = k ^ 0x300;
-            i = pcmcia_request_io(link->handle, &link->io);
+            i = pcmcia_request_io(link, &link->io);
             if (i == CS_SUCCESS) break;
         }
         if (i == CS_SUCCESS) break;
-        i = next_tuple(link->handle, tuple, parse);
+        i = next_tuple(link, tuple, parse);
     }
     if (i != CS_SUCCESS)
         goto free_cfg_mem;
@@ -527,7 +518,7 @@ static int mhz_mfc_config(dev_link_t *link)
     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
     req.Base = req.Size = 0;
     req.AccessSpeed = 0;
-    i = pcmcia_request_window(&link->handle, &req, &link->win);
+    i = pcmcia_request_window(&link, &req, &link->win);
     if (i != CS_SUCCESS)
         goto free_cfg_mem;
     smc->base = ioremap(req.Base, req.Size);
@@ -546,9 +537,8 @@ free_cfg_mem:
     return i;
 }
 
-static int mhz_setup(dev_link_t *link)
+static int mhz_setup(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     struct smc_cfg_mem *cfg_mem;
     tuple_t *tuple;
@@ -571,13 +561,13 @@ static int mhz_setup(dev_link_t *link)
     /* Read the station address from the CIS.  It is stored as the last
        (fourth) string in the Version 1 Version/ID tuple. */
     tuple->DesiredTuple = CISTPL_VERS_1;
-    if (first_tuple(handle, tuple, parse) != CS_SUCCESS) {
+    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {
         rc = -1;
         goto free_cfg_mem;
     }
     /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */
-    if (next_tuple(handle, tuple, parse) != CS_SUCCESS)
-        first_tuple(handle, tuple, parse);
+    if (next_tuple(link, tuple, parse) != CS_SUCCESS)
+        first_tuple(link, tuple, parse);
     if (parse->version_1.ns > 3) {
         station_addr = parse->version_1.str + parse->version_1.ofs[3];
         if (cvt_ascii_address(dev, station_addr) == 0) {
@@ -588,11 +578,11 @@ static int mhz_setup(dev_link_t *link)
 
     /* Another possibility: for the EM3288, in a special tuple */
     tuple->DesiredTuple = 0x81;
-    if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, tuple) != CS_SUCCESS) {
         rc = -1;
         goto free_cfg_mem;
     }
-    if (pcmcia_get_tuple_data(handle, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_tuple_data(link, tuple) != CS_SUCCESS) {
         rc = -1;
         goto free_cfg_mem;
     }
@@ -616,7 +606,7 @@ free_cfg_mem:
 
 ======================================================================*/
 
-static void mot_config(dev_link_t *link)
+static void mot_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     struct smc_private *smc = netdev_priv(dev);
@@ -637,7 +627,7 @@ static void mot_config(dev_link_t *link)
     mdelay(100);
 }
 
-static int mot_setup(dev_link_t *link)
+static int mot_setup(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     kio_addr_t ioaddr = dev->base_addr;
@@ -671,7 +661,7 @@ static int mot_setup(dev_link_t *link)
 
 /*====================================================================*/
 
-static int smc_config(dev_link_t *link)
+static int smc_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     struct smc_cfg_mem *cfg_mem;
@@ -696,16 +686,16 @@ static int smc_config(dev_link_t *link)
     tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
 
     link->io.NumPorts1 = 16;
-    i = first_tuple(link->handle, tuple, parse);
+    i = first_tuple(link, tuple, parse);
     while (i != CS_NO_MORE_ITEMS) {
         if (i == CS_SUCCESS) {
             link->conf.ConfigIndex = cf->index;
             link->io.BasePort1 = cf->io.win[0].base;
             link->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
-            i = pcmcia_request_io(link->handle, &link->io);
+            i = pcmcia_request_io(link, &link->io);
             if (i == CS_SUCCESS) break;
         }
-        i = next_tuple(link->handle, tuple, parse);
+        i = next_tuple(link, tuple, parse);
     }
     if (i == CS_SUCCESS)
         dev->base_addr = link->io.BasePort1;
@@ -714,9 +704,8 @@ static int smc_config(dev_link_t *link)
     return i;
 }
 
-static int smc_setup(dev_link_t *link)
+static int smc_setup(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     struct smc_cfg_mem *cfg_mem;
     tuple_t *tuple;
@@ -739,11 +728,11 @@ static int smc_setup(dev_link_t *link)
 
     /* Check for a LAN function extension tuple */
     tuple->DesiredTuple = CISTPL_FUNCE;
-    i = first_tuple(handle, tuple, parse);
+    i = first_tuple(link, tuple, parse);
     while (i == CS_SUCCESS) {
         if (parse->funce.type == CISTPL_FUNCE_LAN_NODE_ID)
             break;
-        i = next_tuple(handle, tuple, parse);
+        i = next_tuple(link, tuple, parse);
     }
     if (i == CS_SUCCESS) {
         node_id = (cistpl_lan_node_id_t *)parse->funce.data;
@@ -756,7 +745,7 @@ static int smc_setup(dev_link_t *link)
     }
     /* Try the third string in the Version 1 Version/ID tuple. */
     tuple->DesiredTuple = CISTPL_VERS_1;
-    if (first_tuple(handle, tuple, parse) != CS_SUCCESS) {
+    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {
         rc = -1;
         goto free_cfg_mem;
     }
@@ -774,7 +763,7 @@ free_cfg_mem:
 
 /*====================================================================*/
 
-static int osi_config(dev_link_t *link)
+static int osi_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     static const kio_addr_t com[4] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
@@ -794,22 +783,21 @@ static int osi_config(dev_link_t *link)
 
     for (i = j = 0; j < 4; j++) {
         link->io.BasePort2 = com[j];
-        i = pcmcia_request_io(link->handle, &link->io);
+        i = pcmcia_request_io(link, &link->io);
         if (i == CS_SUCCESS) break;
     }
     if (i != CS_SUCCESS) {
         /* Fallback: turn off hard decode */
         link->conf.ConfigIndex = 0x03;
         link->io.NumPorts2 = 0;
-        i = pcmcia_request_io(link->handle, &link->io);
+        i = pcmcia_request_io(link, &link->io);
     }
     dev->base_addr = link->io.BasePort1 + 0x10;
     return i;
 }
 
-static int osi_setup(dev_link_t *link, u_short manfid, u_short cardid)
+static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     struct smc_cfg_mem *cfg_mem;
     tuple_t *tuple;
@@ -830,12 +818,12 @@ static int osi_setup(dev_link_t *link, u_short manfid, u_short cardid)
 
     /* Read the station address from tuple 0x90, subtuple 0x04 */
     tuple->DesiredTuple = 0x90;
-    i = pcmcia_get_first_tuple(handle, tuple);
+    i = pcmcia_get_first_tuple(link, tuple);
     while (i == CS_SUCCESS) {
-        i = pcmcia_get_tuple_data(handle, tuple);
+        i = pcmcia_get_tuple_data(link, tuple);
         if ((i != CS_SUCCESS) || (buf[0] == 0x04))
             break;
-        i = pcmcia_get_next_tuple(handle, tuple);
+        i = pcmcia_get_next_tuple(link, tuple);
     }
     if (i != CS_SUCCESS) {
         rc = -1;
@@ -868,57 +856,47 @@ free_cfg_mem:
    return rc;
 }
 
-static int smc91c92_suspend(struct pcmcia_device *p_dev)
+static int smc91c92_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int smc91c92_resume(struct pcmcia_device *p_dev)
+static int smc91c92_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
         struct smc_private *smc = netdev_priv(dev);
         int i;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if ((smc->manfid == MANFID_MEGAHERTZ) &&
-                    (smc->cardid == PRODID_MEGAHERTZ_EM3288))
-                        mhz_3288_power(link);
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (smc->manfid == MANFID_MOTOROLA)
-                        mot_config(link);
-                if ((smc->manfid == MANFID_OSITECH) &&
-                    (smc->cardid != PRODID_OSITECH_SEVEN)) {
-                        /* Power up the card and enable interrupts */
-                        set_bits(0x0300, dev->base_addr-0x10+OSITECH_AUI_PWR);
-                        set_bits(0x0300, dev->base_addr-0x10+OSITECH_RESET_ISR);
-                }
-                if (((smc->manfid == MANFID_OSITECH) &&
-                     (smc->cardid == PRODID_OSITECH_SEVEN)) ||
-                    ((smc->manfid == MANFID_PSION) &&
-                     (smc->cardid == PRODID_PSION_NET100))) {
-                        /* Download the Seven of Diamonds firmware */
-                        for (i = 0; i < sizeof(__Xilinx7OD); i++) {
-                                outb(__Xilinx7OD[i], link->io.BasePort1+2);
-                                udelay(50);
-                        }
-                }
-                if (link->open) {
-                        smc_reset(dev);
-                        netif_device_attach(dev);
+        if ((smc->manfid == MANFID_MEGAHERTZ) &&
+            (smc->cardid == PRODID_MEGAHERTZ_EM3288))
+                mhz_3288_power(link);
+        if (smc->manfid == MANFID_MOTOROLA)
+                mot_config(link);
+        if ((smc->manfid == MANFID_OSITECH) &&
+            (smc->cardid != PRODID_OSITECH_SEVEN)) {
+                /* Power up the card and enable interrupts */
+                set_bits(0x0300, dev->base_addr-0x10+OSITECH_AUI_PWR);
+                set_bits(0x0300, dev->base_addr-0x10+OSITECH_RESET_ISR);
+        }
+        if (((smc->manfid == MANFID_OSITECH) &&
+             (smc->cardid == PRODID_OSITECH_SEVEN)) ||
+            ((smc->manfid == MANFID_PSION) &&
+             (smc->cardid == PRODID_PSION_NET100))) {
+                /* Download the Seven of Diamonds firmware */
+                for (i = 0; i < sizeof(__Xilinx7OD); i++) {
+                        outb(__Xilinx7OD[i], link->io.BasePort1+2);
+                        udelay(50);
                 }
         }
+        if (link->open) {
+                smc_reset(dev);
+                netif_device_attach(dev);
+        }
 
         return 0;
 }
@@ -931,7 +909,7 @@ static int smc91c92_resume(struct pcmcia_device *p_dev)
 
 ======================================================================*/
 
-static int check_sig(dev_link_t *link)
+static int check_sig(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     kio_addr_t ioaddr = dev->base_addr;
@@ -964,13 +942,15 @@ static int check_sig(dev_link_t *link)
     }
 
     if (width) {
-        printk(KERN_INFO "smc91c92_cs: using 8-bit IO window.\n");
-        smc91c92_suspend(link->handle);
-        pcmcia_release_io(link->handle, &link->io);
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-        pcmcia_request_io(link->handle, &link->io);
-        smc91c92_resume(link->handle);
-        return check_sig(link);
+            modconf_t mod = {
+                    .Attributes = CONF_IO_CHANGE_WIDTH,
+            };
+            printk(KERN_INFO "smc91c92_cs: using 8-bit IO window.\n");
+
+            smc91c92_suspend(link);
+            pcmcia_modify_configuration(link, &mod);
+            smc91c92_resume(link);
+            return check_sig(link);
     }
     return -ENODEV;
 }
@@ -984,11 +964,10 @@ static int check_sig(dev_link_t *link)
 ======================================================================*/
 
 #define CS_EXIT_TEST(ret, svc, label) \
-if (ret != CS_SUCCESS) { cs_error(link->handle, svc, ret); goto label; }
+if (ret != CS_SUCCESS) { cs_error(link, svc, ret); goto label; }
 
-static void smc91c92_config(dev_link_t *link)
+static int smc91c92_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     struct smc_private *smc = netdev_priv(dev);
     struct smc_cfg_mem *cfg_mem;
@@ -1015,21 +994,18 @@ static void smc91c92_config(dev_link_t *link)
     tuple->TupleDataMax = 64;
 
     tuple->DesiredTuple = CISTPL_CONFIG;
-    i = first_tuple(handle, tuple, parse);
+    i = first_tuple(link, tuple, parse);
     CS_EXIT_TEST(i, ParseTuple, config_failed);
     link->conf.ConfigBase = parse->config.base;
     link->conf.Present = parse->config.rmask[0];
 
     tuple->DesiredTuple = CISTPL_MANFID;
     tuple->Attributes = TUPLE_RETURN_COMMON;
-    if (first_tuple(handle, tuple, parse) == CS_SUCCESS) {
+    if (first_tuple(link, tuple, parse) == CS_SUCCESS) {
         smc->manfid = parse->manfid.manf;
         smc->cardid = parse->manfid.card;
     }
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     if ((smc->manfid == MANFID_OSITECH) &&
         (smc->cardid != PRODID_OSITECH_SEVEN)) {
         i = osi_config(link);
@@ -1043,9 +1019,9 @@ static void smc91c92_config(dev_link_t *link)
     }
     CS_EXIT_TEST(i, RequestIO, config_failed);
 
-    i = pcmcia_request_irq(link->handle, &link->irq);
+    i = pcmcia_request_irq(link, &link->irq);
     CS_EXIT_TEST(i, RequestIRQ, config_failed);
-    i = pcmcia_request_configuration(link->handle, &link->conf);
+    i = pcmcia_request_configuration(link, &link->conf);
     CS_EXIT_TEST(i, RequestConfiguration, config_failed);
 
     if (smc->manfid == MANFID_MOTOROLA)
@@ -1124,13 +1100,12 @@ static void smc91c92_config(dev_link_t *link)
         SMC_SELECT_BANK(0);
     }
 
-    link->dev = &smc->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &smc->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
         printk(KERN_ERR "smc91c92_cs: register_netdev() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto config_undo;
     }
 
@@ -1160,15 +1135,14 @@ static void smc91c92_config(dev_link_t *link)
         }
     }
     kfree(cfg_mem);
-    return;
+    return 0;
 
 config_undo:
     unregister_netdev(dev);
 config_failed:                  /* CS_EXIT_TEST() calls jump to here... */
     smc91c92_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
     kfree(cfg_mem);
-
+    return -ENODEV;
 } /* smc91c92_config */
 
 /*======================================================================
@@ -1179,22 +1153,15 @@ config_failed:			/* CS_EXIT_TEST() calls jump to here... */
 
 ======================================================================*/
 
-static void smc91c92_release(dev_link_t *link)
+static void smc91c92_release(struct pcmcia_device *link)
 {
-
-    DEBUG(0, "smc91c92_release(0x%p)\n", link);
-
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-    if (link->win) {
-        struct net_device *dev = link->priv;
-        struct smc_private *smc = netdev_priv(dev);
-        iounmap(smc->base);
-        pcmcia_release_window(link->win);
-    }
-
-    link->state &= ~DEV_CONFIG;
+        DEBUG(0, "smc91c92_release(0x%p)\n", link);
+        if (link->win) {
+                struct net_device *dev = link->priv;
+                struct smc_private *smc = netdev_priv(dev);
+                iounmap(smc->base);
+        }
+        pcmcia_disable_device(link);
 }
 
 /*======================================================================
@@ -1283,7 +1250,7 @@ static void smc_dump(struct net_device *dev)
 static int smc_open(struct net_device *dev)
 {
     struct smc_private *smc = netdev_priv(dev);
-    dev_link_t *link = &smc->link;
+    struct pcmcia_device *link = smc->p_dev;
 
 #ifdef PCMCIA_DEBUG
     DEBUG(0, "%s: smc_open(%p), ID/Window %4.4x.\n",
@@ -1292,7 +1259,7 @@ static int smc_open(struct net_device *dev)
 #endif
 
     /* Check that the PCMCIA card is still here. */
-    if (!DEV_OK(link))
+    if (!pcmcia_dev_present(link))
         return -ENODEV;
     /* Physical device present signature. */
     if (check_sig(link) < 0) {
@@ -1320,7 +1287,7 @@ static int smc_open(struct net_device *dev)
 static int smc_close(struct net_device *dev)
 {
     struct smc_private *smc = netdev_priv(dev);
-    dev_link_t *link = &smc->link;
+    struct pcmcia_device *link = smc->p_dev;
     kio_addr_t ioaddr = dev->base_addr;
 
     DEBUG(0, "%s: smc_close(), status %4.4x.\n",
@@ -2311,7 +2278,7 @@ static struct pcmcia_driver smc91c92_cs_driver = {
         .drv            = {
                 .name   = "smc91c92_cs",
         },
-        .probe          = smc91c92_attach,
+        .probe          = smc91c92_probe,
         .remove         = smc91c92_detach,
         .id_table       = smc91c92_ids,
         .suspend        = smc91c92_suspend,
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index eed496803fe4..71f45056a70c 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -289,9 +289,9 @@ static void mii_wr(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg,
  * and ejection events.  They are invoked from the event handler.
  */
 
-static int has_ce2_string(dev_link_t * link);
-static void xirc2ps_config(dev_link_t * link);
-static void xirc2ps_release(dev_link_t * link);
+static int has_ce2_string(struct pcmcia_device * link);
+static int xirc2ps_config(struct pcmcia_device * link);
+static void xirc2ps_release(struct pcmcia_device * link);
 
 /****************
  * The attach() and detach() entry points are used to create and destroy
@@ -313,10 +313,10 @@ static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs
 /****************
  * A linked list of "instances" of the device.  Each actual
  * PCMCIA card corresponds to one device instance, and is described
- * by one dev_link_t structure (defined in ds.h).
+ * by one struct pcmcia_device structure (defined in ds.h).
  *
  * You may not want to use a linked list for this -- for example, the
- * memory card driver uses an array of dev_link_t pointers, where minor
+ * memory card driver uses an array of struct pcmcia_device pointers, where minor
  * device numbers are used to derive the corresponding array index.
  */
 
@@ -326,13 +326,13 @@ static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs
  * example, ethernet cards, modems).  In other cases, there may be
  * many actual or logical devices (SCSI adapters, memory cards with
  * multiple partitions).  The dev_node_t structures need to be kept
- * in a linked list starting at the 'dev' field of a dev_link_t
+ * in a linked list starting at the 'dev' field of a struct pcmcia_device
  * structure.  We allocate them in the card's private data structure,
  * because they generally can't be allocated dynamically.
  */
 
 typedef struct local_info_t {
-    dev_link_t link;
+        struct pcmcia_device    *p_dev;
     dev_node_t node;
     struct net_device_stats stats;
     int card_type;
@@ -355,7 +355,7 @@ static void do_tx_timeout(struct net_device *dev);
 static struct net_device_stats *do_get_stats(struct net_device *dev);
 static void set_addresses(struct net_device *dev);
 static void set_multicast_list(struct net_device *dev);
-static int set_card_type(dev_link_t *link, const void *s);
+static int set_card_type(struct pcmcia_device *link, const void *s);
 static int do_config(struct net_device *dev, struct ifmap *map);
 static int do_open(struct net_device *dev);
 static int do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -368,7 +368,7 @@ static int do_stop(struct net_device *dev);
 
 /*=============== Helper functions =========================*/
 static int
-first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 {
         int err;
 
@@ -379,7 +379,7 @@ first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
 }
 
 static int
-next_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 {
         int err;
 
@@ -553,9 +553,8 @@ mii_wr(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg, unsigned data, int len)
  */
 
 static int
-xirc2ps_attach(struct pcmcia_device *p_dev)
+xirc2ps_probe(struct pcmcia_device *link)
 {
-    dev_link_t *link;
     struct net_device *dev;
     local_info_t *local;
 
@@ -566,12 +565,11 @@ xirc2ps_attach(struct pcmcia_device *p_dev)
     if (!dev)
             return -ENOMEM;
     local = netdev_priv(dev);
-    link = &local->link;
+    local->p_dev = link;
     link->priv = dev;
 
     /* General socket configuration */
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
     link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 1;
     link->conf.Present = PRESENT_OPTION;
@@ -593,13 +591,7 @@ xirc2ps_attach(struct pcmcia_device *p_dev)
     dev->watchdog_timeo = TX_TIMEOUT;
 #endif
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    xirc2ps_config(link);
-
-    return 0;
+    return xirc2ps_config(link);
 } /* xirc2ps_attach */
 
 /****************
@@ -610,18 +602,16 @@ xirc2ps_attach(struct pcmcia_device *p_dev)
  */
 
 static void
-xirc2ps_detach(struct pcmcia_device *p_dev)
+xirc2ps_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
     struct net_device *dev = link->priv;
 
     DEBUG(0, "detach(0x%p)\n", link);
 
-    if (link->dev)
+    if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        xirc2ps_release(link);
+    xirc2ps_release(link);
 
     free_netdev(dev);
 } /* xirc2ps_detach */
@@ -645,7 +635,7 @@ xirc2ps_detach(struct pcmcia_device *p_dev)
  *
  */
 static int
-set_card_type(dev_link_t *link, const void *s)
+set_card_type(struct pcmcia_device *link, const void *s)
 {
     struct net_device *dev = link->priv;
     local_info_t *local = netdev_priv(dev);
@@ -714,9 +704,8 @@ set_card_type(dev_link_t *link, const void *s)
  * Returns: true if this is a CE2
  */
 static int
-has_ce2_string(dev_link_t * link)
+has_ce2_string(struct pcmcia_device * link)
 {
-    client_handle_t handle = link->handle;
     tuple_t tuple;
     cisparse_t parse;
     u_char buf[256];
@@ -726,7 +715,7 @@ has_ce2_string(dev_link_t * link)
     tuple.TupleDataMax = 254;
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_VERS_1;
-    if (!first_tuple(handle, &tuple, &parse) && parse.version_1.ns > 2) {
+    if (!first_tuple(link, &tuple, &parse) && parse.version_1.ns > 2) {
         if (strstr(parse.version_1.str + parse.version_1.ofs[2], "CE2"))
             return 1;
     }
@@ -738,10 +727,9 @@ has_ce2_string(dev_link_t * link)
  * is received, to configure the PCMCIA socket, and to make the
  * ethernet device available to the system.
  */
-static void
-xirc2ps_config(dev_link_t * link)
+static int
+xirc2ps_config(struct pcmcia_device * link)
 {
-    client_handle_t handle = link->handle;
     struct net_device *dev = link->priv;
     local_info_t *local = netdev_priv(dev);
     tuple_t tuple;
@@ -767,7 +755,7 @@ xirc2ps_config(dev_link_t * link)
 
     /* Is this a valid  card */
     tuple.DesiredTuple = CISTPL_MANFID;
-    if ((err=first_tuple(handle, &tuple, &parse))) {
+    if ((err=first_tuple(link, &tuple, &parse))) {
         printk(KNOT_XIRC "manfid not found in CIS\n");
         goto failure;
     }
@@ -803,15 +791,15 @@ xirc2ps_config(dev_link_t * link)
 
     /* get configuration stuff */
     tuple.DesiredTuple = CISTPL_CONFIG;
-    if ((err=first_tuple(handle, &tuple, &parse)))
+    if ((err=first_tuple(link, &tuple, &parse)))
         goto cis_error;
     link->conf.ConfigBase = parse.config.base;
     link->conf.Present =    parse.config.rmask[0];
 
     /* get the ethernet address from the CIS */
     tuple.DesiredTuple = CISTPL_FUNCE;
-    for (err = first_tuple(handle, &tuple, &parse); !err;
-                             err = next_tuple(handle, &tuple, &parse)) {
+    for (err = first_tuple(link, &tuple, &parse); !err;
+                             err = next_tuple(link, &tuple, &parse)) {
         /* Once I saw two CISTPL_FUNCE_LAN_NODE_ID entries:
          * the first one with a length of zero the second correct -
          * so I skip all entries with length 0 */
@@ -821,8 +809,8 @@ xirc2ps_config(dev_link_t * link)
     }
     if (err) { /* not found: try to get the node-id from tuple 0x89 */
         tuple.DesiredTuple = 0x89;  /* data layout looks like tuple 0x22 */
-        if ((err = pcmcia_get_first_tuple(handle, &tuple)) == 0 &&
-                (err = pcmcia_get_tuple_data(handle, &tuple)) == 0) {
+        if ((err = pcmcia_get_first_tuple(link, &tuple)) == 0 &&
+                (err = pcmcia_get_tuple_data(link, &tuple)) == 0) {
             if (tuple.TupleDataLen == 8 && *buf == CISTPL_FUNCE_LAN_NODE_ID)
                 memcpy(&parse, buf, 8);
             else
@@ -831,8 +819,8 @@ xirc2ps_config(dev_link_t * link)
     }
     if (err) { /* another try   (James Lehmer's CE2 version 4.1)*/
         tuple.DesiredTuple = CISTPL_FUNCE;
-        for (err = first_tuple(handle, &tuple, &parse); !err;
-                                 err = next_tuple(handle, &tuple, &parse)) {
+        for (err = first_tuple(link, &tuple, &parse); !err;
+                                 err = next_tuple(link, &tuple, &parse)) {
             if (parse.funce.type == 0x02 && parse.funce.data[0] == 1
                 && parse.funce.data[1] == 6 && tuple.TupleDataLen == 13) {
                 buf[1] = 4;
@@ -853,9 +841,6 @@ xirc2ps_config(dev_link_t * link)
     for (i=0; i < 6; i++)
         dev->dev_addr[i] = node_id->id[i];
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     link->io.IOAddrLines =10;
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
     link->irq.Attributes = IRQ_HANDLE_PRESENT;
@@ -875,14 +860,14 @@ xirc2ps_config(dev_link_t * link)
              * Ethernet port */
             link->io.NumPorts1 = 16; /* no Mako stuff anymore */
             tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-            for (err = first_tuple(handle, &tuple, &parse); !err;
-                                 err = next_tuple(handle, &tuple, &parse)) {
+            for (err = first_tuple(link, &tuple, &parse); !err;
+                                 err = next_tuple(link, &tuple, &parse)) {
                 if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
                     for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
                         link->conf.ConfigIndex = cf->index ;
                         link->io.BasePort2 = cf->io.win[0].base;
                         link->io.BasePort1 = ioaddr;
-                        if (!(err=pcmcia_request_io(link->handle, &link->io)))
+                        if (!(err=pcmcia_request_io(link, &link->io)))
                             goto port_found;
                     }
                 }
@@ -896,15 +881,15 @@ xirc2ps_config(dev_link_t * link)
              */
             for (pass=0; pass < 2; pass++) {
                 tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-                for (err = first_tuple(handle, &tuple, &parse); !err;
-                                     err = next_tuple(handle, &tuple, &parse)){
+                for (err = first_tuple(link, &tuple, &parse); !err;
+                                     err = next_tuple(link, &tuple, &parse)){
                     if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8){
                         link->conf.ConfigIndex = cf->index ;
                         link->io.BasePort2 = cf->io.win[0].base;
                         link->io.BasePort1 = link->io.BasePort2
                                     + (pass ? (cf->index & 0x20 ? -24:8)
                                             : (cf->index & 0x20 ?   8:-24));
-                        if (!(err=pcmcia_request_io(link->handle, &link->io)))
+                        if (!(err=pcmcia_request_io(link, &link->io)))
                             goto port_found;
                     }
                 }
@@ -919,12 +904,12 @@ xirc2ps_config(dev_link_t * link)
         link->io.NumPorts1 = 16;
         for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
             link->io.BasePort1 = ioaddr;
-            if (!(err=pcmcia_request_io(link->handle, &link->io)))
+            if (!(err=pcmcia_request_io(link, &link->io)))
                 goto port_found;
         }
         link->io.BasePort1 = 0; /* let CS decide */
-        if ((err=pcmcia_request_io(link->handle, &link->io))) {
-            cs_error(link->handle, RequestIO, err);
+        if ((err=pcmcia_request_io(link, &link->io))) {
+            cs_error(link, RequestIO, err);
             goto config_error;
         }
     }
@@ -936,8 +921,8 @@ xirc2ps_config(dev_link_t * link)
      * Now allocate an interrupt line.  Note that this does not
      * actually assign a handler to the interrupt.
      */
-    if ((err=pcmcia_request_irq(link->handle, &link->irq))) {
-        cs_error(link->handle, RequestIRQ, err);
+    if ((err=pcmcia_request_irq(link, &link->irq))) {
+        cs_error(link, RequestIRQ, err);
         goto config_error;
     }
 
@@ -945,8 +930,8 @@ xirc2ps_config(dev_link_t * link)
      * This actually configures the PCMCIA socket -- setting up
      * the I/O windows and the interrupt mapping.
      */
-    if ((err=pcmcia_request_configuration(link->handle, &link->conf))) {
-        cs_error(link->handle, RequestConfiguration, err);
+    if ((err=pcmcia_request_configuration(link, &link->conf))) {
+        cs_error(link, RequestConfiguration, err);
         goto config_error;
     }
 
@@ -963,15 +948,15 @@ xirc2ps_config(dev_link_t * link)
         reg.Action = CS_WRITE;
         reg.Offset = CISREG_IOBASE_0;
         reg.Value = link->io.BasePort2 & 0xff;
-        if ((err = pcmcia_access_configuration_register(link->handle, &reg))) {
-            cs_error(link->handle, AccessConfigurationRegister, err);
+        if ((err = pcmcia_access_configuration_register(link, &reg))) {
+            cs_error(link, AccessConfigurationRegister, err);
             goto config_error;
         }
         reg.Action = CS_WRITE;
         reg.Offset = CISREG_IOBASE_1;
         reg.Value = (link->io.BasePort2 >> 8) & 0xff;
-        if ((err = pcmcia_access_configuration_register(link->handle, &reg))) {
-            cs_error(link->handle, AccessConfigurationRegister, err);
+        if ((err = pcmcia_access_configuration_register(link, &reg))) {
+            cs_error(link, AccessConfigurationRegister, err);
             goto config_error;
         }
 
@@ -982,15 +967,15 @@ xirc2ps_config(dev_link_t * link)
         req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
         req.Base = req.Size = 0;
         req.AccessSpeed = 0;
-        if ((err = pcmcia_request_window(&link->handle, &req, &link->win))) {
-            cs_error(link->handle, RequestWindow, err);
+        if ((err = pcmcia_request_window(&link, &req, &link->win))) {
+            cs_error(link, RequestWindow, err);
             goto config_error;
         }
         local->dingo_ccr = ioremap(req.Base,0x1000) + 0x0800;
         mem.CardOffset = 0x0;
         mem.Page = 0;
         if ((err = pcmcia_map_mem_page(link->win, &mem))) {
-            cs_error(link->handle, MapMemPage, err);
+            cs_error(link, MapMemPage, err);
             goto config_error;
         }
 
@@ -1050,13 +1035,12 @@ xirc2ps_config(dev_link_t * link)
     if (local->dingo)
         do_reset(dev, 1); /* a kludge to make the cem56 work */
 
-    link->dev = &local->node;
-    link->state &= ~DEV_CONFIG_PENDING;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    link->dev_node = &local->node;
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if ((err=register_netdev(dev))) {
         printk(KNOT_XIRC "register_netdev() failed\n");
-        link->dev = NULL;
+        link->dev_node = NULL;
         goto config_error;
     }
 
@@ -1069,17 +1053,16 @@ xirc2ps_config(dev_link_t * link)
         printk("%c%02X", i?':':' ', dev->dev_addr[i]);
     printk("\n");
 
-    return;
+    return 0;
 
   config_error:
-    link->state &= ~DEV_CONFIG_PENDING;
     xirc2ps_release(link);
-    return;
+    return -ENODEV;
 
   cis_error:
     printk(KNOT_XIRC "unable to parse CIS\n");
   failure:
-    link->state &= ~DEV_CONFIG_PENDING;
+    return -ENODEV;
 } /* xirc2ps_config */
 
 /****************
@@ -1088,57 +1071,41 @@ xirc2ps_config(dev_link_t * link)
  * still open, this will be postponed until it is closed.
  */
 static void
-xirc2ps_release(dev_link_t *link)
+xirc2ps_release(struct pcmcia_device *link)
 {
+        DEBUG(0, "release(0x%p)\n", link);
 
-    DEBUG(0, "release(0x%p)\n", link);
-
-    if (link->win) {
-        struct net_device *dev = link->priv;
-        local_info_t *local = netdev_priv(dev);
-        if (local->dingo)
-            iounmap(local->dingo_ccr - 0x0800);
-        pcmcia_release_window(link->win);
-    }
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-    link->state &= ~DEV_CONFIG;
-
+        if (link->win) {
+                struct net_device *dev = link->priv;
+                local_info_t *local = netdev_priv(dev);
+                if (local->dingo)
+                        iounmap(local->dingo_ccr - 0x0800);
+        }
+        pcmcia_disable_device(link);
 } /* xirc2ps_release */
 
 /*====================================================================*/
 
 
-static int xirc2ps_suspend(struct pcmcia_device *p_dev)
+static int xirc2ps_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open) {
-                        netif_device_detach(dev);
-                        do_powerdown(dev);
-                }
-                pcmcia_release_configuration(link->handle);
+        if (link->open) {
+                netif_device_detach(dev);
+                do_powerdown(dev);
         }
 
         return 0;
 }
 
-static int xirc2ps_resume(struct pcmcia_device *p_dev)
+static int xirc2ps_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        do_reset(dev,1);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                do_reset(dev,1);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -1552,13 +1519,13 @@ static int
 do_open(struct net_device *dev)
 {
     local_info_t *lp = netdev_priv(dev);
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
 
     DEBUG(0, "do_open(%p)\n", dev);
 
     /* Check that the PCMCIA card is still here. */
     /* Physical device present signature. */
-    if (!DEV_OK(link))
+    if (!pcmcia_dev_present(link))
         return -ENODEV;
 
     /* okay */
@@ -1882,7 +1849,7 @@ do_stop(struct net_device *dev)
 {
     kio_addr_t ioaddr = dev->base_addr;
     local_info_t *lp = netdev_priv(dev);
-    dev_link_t *link = &lp->link;
+    struct pcmcia_device *link = lp->p_dev;
 
     DEBUG(0, "do_stop(%p)\n", dev);
 
@@ -1935,7 +1902,7 @@ static struct pcmcia_driver xirc2ps_cs_driver = {
         .drv            = {
                 .name   = "xirc2ps_cs",
         },
-        .probe          = xirc2ps_attach,
+        .probe          = xirc2ps_probe,
         .remove         = xirc2ps_detach,
         .id_table       = xirc2ps_ids,
         .suspend        = xirc2ps_suspend,
@@ -1973,7 +1940,7 @@ static int __init setup_xirc2ps_cs(char *str)
         MAYBE_SET(lockup_hack, 6);
 #undef  MAYBE_SET
 
-        return 0;
+        return 1;
 }
 
 __setup("xirc2ps_cs=", setup_xirc2ps_cs);
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 9595f74da93f..07c31f19c6ba 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1167,8 +1167,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
          * station address PROM at the base address and programmed into the
          * "Physical Address Registers" CSR12-14.
          * As a precautionary measure, we read the PROM values and complain if
-         * they disagree with the CSRs.  Either way, we use the CSR values, and
-         * double check that they are valid.
+         * they disagree with the CSRs.  If they miscompare, and the PROM addr
+         * is valid, then the PROM addr is used.
          */
         for (i = 0; i < 3; i++) {
                 unsigned int val;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 35dbf05c7f06..a70c2b0cc104 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -78,6 +78,8 @@ static const struct pci_device_id skge_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE) },
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU) },
         { PCI_DEVICE(PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE510T), },
+        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) },
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) },
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */
         { PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) },
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 68f9c206a620..67b0eab16589 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -99,8 +99,6 @@ MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
 static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) },
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) },
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) },
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) },
@@ -579,8 +577,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
         reg = gma_read16(hw, port, GM_PHY_ADDR);
         gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);
 
-        for (i = 0; i < GM_MIB_CNT_SIZE; i++)
-                gma_read16(hw, port, GM_MIB_CNT_BASE + 8 * i);
+        for (i = GM_MIB_CNT_BASE; i <= GM_MIB_CNT_END; i += 4)
+                gma_read16(hw, port, i);
         gma_write16(hw, port, GM_PHY_ADDR, reg);
 
         /* transmit control */
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 62532b4e45c5..89dd18cd12f0 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1375,7 +1375,7 @@ enum {
         GM_PHY_ADDR     = 0x0088,       /* 16 bit r/w   GPHY Address Register */
 /* MIB Counters */
         GM_MIB_CNT_BASE = 0x0100,       /* Base Address of MIB Counters */
-        GM_MIB_CNT_SIZE = 256,
+        GM_MIB_CNT_END  = 0x025C,       /* Last MIB counter */
 };
 
 
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 1f5975a61e1f..43f5e86fc559 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1442,7 +1442,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
         case SPIDER_NET_GRFAFLLINT: /* fallthrough */
         case SPIDER_NET_GRMFLLINT:
                 if (netif_msg_intr(card) && net_ratelimit())
-                        pr_err("Spider RX RAM full, incoming packets "
+                        pr_debug("Spider RX RAM full, incoming packets "
                                "might be discarded!\n");
                 spider_net_rx_irq_off(card);
                 tasklet_schedule(&card->rxram_full_tl);
@@ -2086,7 +2086,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
 
         spider_net_setup_netdev_ops(netdev);
 
-        netdev->features = 0;
+        netdev->features = NETIF_F_HW_CSUM;
         /* some time: NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
          *              NETIF_F_HW_VLAN_FILTER */
 
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 35b18057fbdd..9b7805be21da 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -335,7 +335,7 @@ do { \
 
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
 KERN_INFO "starfire.c:v1.03 7/26/2000  Written by Donald Becker <becker@scyld.com>\n"
 KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
 
@@ -2122,8 +2122,7 @@ static void __devexit starfire_remove_one (struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
         struct netdev_private *np = netdev_priv(dev);
 
-        if (!dev)
-                BUG();
+        BUG_ON(!dev);
 
         unregister_netdev(dev);
 
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b5473325bff4..73e271e59c6a 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -69,8 +69,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.54"
-#define DRV_MODULE_RELDATE      "Mar 23, 2006"
+#define DRV_MODULE_VERSION      "3.56"
+#define DRV_MODULE_RELDATE      "Apr 1, 2006"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -497,21 +497,20 @@ static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val)
         unsigned long flags;
 
         spin_lock_irqsave(&tp->indirect_lock, flags);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
+        if (tp->tg3_flags & TG3_FLAG_SRAM_USE_CONFIG) {
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
 
-        /* Always leave this as zero. */
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-        spin_unlock_irqrestore(&tp->indirect_lock, flags);
-}
+                /* Always leave this as zero. */
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        } else {
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, off);
+                tw32_f(TG3PCI_MEM_WIN_DATA, val);
 
-static void tg3_write_mem_fast(struct tg3 *tp, u32 off, u32 val)
-{
-        /* If no workaround is needed, write to mem space directly */
-        if (tp->write32 != tg3_write_indirect_reg32)
-                tw32(NIC_SRAM_WIN_BASE + off, val);
-        else
-                tg3_write_mem(tp, off, val);
+                /* Always leave this as zero. */
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        }
+        spin_unlock_irqrestore(&tp->indirect_lock, flags);
 }
 
 static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
@@ -519,11 +518,19 @@ static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
         unsigned long flags;
 
         spin_lock_irqsave(&tp->indirect_lock, flags);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-        pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
+        if (tp->tg3_flags & TG3_FLAG_SRAM_USE_CONFIG) {
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
+                pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
 
-        /* Always leave this as zero. */
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+                /* Always leave this as zero. */
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        } else {
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, off);
+                *val = tr32(TG3PCI_MEM_WIN_DATA);
+
+                /* Always leave this as zero. */
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        }
         spin_unlock_irqrestore(&tp->indirect_lock, flags);
 }
 
@@ -1367,12 +1374,12 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                 }
         }
 
+        tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
+
         /* Finally, set the new power state. */
         pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, power_control);
         udelay(100);    /* Delay after power state change */
 
-        tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
-
         return 0;
 }
 
@@ -2959,9 +2966,7 @@ static void tg3_tx(struct tg3 *tp)
                 struct sk_buff *skb = ri->skb;
                 int i;
 
-                if (unlikely(skb == NULL))
-                        BUG();
-
+                BUG_ON(skb == NULL);
                 pci_unmap_single(tp->pdev,
                                  pci_unmap_addr(ri, mapping),
                                  skb_headlen(skb),
@@ -2972,12 +2977,10 @@ static void tg3_tx(struct tg3 *tp)
                 sw_idx = NEXT_TX(sw_idx);
 
                 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                        if (unlikely(sw_idx == hw_idx))
-                                BUG();
+                        BUG_ON(sw_idx == hw_idx);
 
                         ri = &tp->tx_buffers[sw_idx];
-                        if (unlikely(ri->skb != NULL))
-                                BUG();
+                        BUG_ON(ri->skb != NULL);
 
                         pci_unmap_page(tp->pdev,
                                        pci_unmap_addr(ri, mapping),
@@ -3600,7 +3603,7 @@ static inline int tg3_40bit_overflow_test(struct tg3 *tp, dma_addr_t mapping,
                                           int len)
 {
 #if defined(CONFIG_HIGHMEM) && (BITS_PER_LONG == 64)
-        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+        if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG)
                 return (((u64) mapping + len) > DMA_40BIT_MASK);
         return 0;
 #else
@@ -4928,9 +4931,8 @@ static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
 {
         int i;
 
-        if (offset == TX_CPU_BASE &&
-            (tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
-                BUG();
+        BUG_ON(offset == TX_CPU_BASE &&
+            (tp->tg3_flags2 & TG3_FLG2_5705_PLUS));
 
         if (offset == RX_CPU_BASE) {
                 for (i = 0; i < 10000; i++) {
@@ -5833,10 +5835,14 @@ static int tg3_reset_hw(struct tg3 *tp)
                           GRC_MODE_NO_TX_PHDR_CSUM |
                           GRC_MODE_NO_RX_PHDR_CSUM);
         tp->grc_mode |= GRC_MODE_HOST_SENDBDS;
-        if (tp->tg3_flags & TG3_FLAG_NO_TX_PSEUDO_CSUM)
-                tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
-        if (tp->tg3_flags & TG3_FLAG_NO_RX_PSEUDO_CSUM)
-                tp->grc_mode |= GRC_MODE_NO_RX_PHDR_CSUM;
+
+        /* Pseudo-header checksum is done by hardware logic and not
+         * the offload processers, so make the chip do the pseudo-
+         * header checksums on receive.  For transmit it is more
+         * convenient to do the pseudo-header checksum in software
+         * as Linux does that on transmit for us in all cases.
+         */
+        tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
 
         tw32(GRC_MODE,
              tp->grc_mode |
@@ -6461,6 +6467,9 @@ static void tg3_timer(unsigned long __opaque)
 {
         struct tg3 *tp = (struct tg3 *) __opaque;
 
+        if (tp->irq_sync)
+                goto restart_timer;
+
         spin_lock(&tp->lock);
 
         if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
@@ -6537,11 +6546,11 @@ static void tg3_timer(unsigned long __opaque)
                 if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
                         u32 val;
 
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_MBOX,
-                                           FWCMD_NICDRV_ALIVE2);
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,
+                                      FWCMD_NICDRV_ALIVE2);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
                         /* 5 seconds timeout */
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
                         val = tr32(GRC_RX_CPU_EVENT);
                         val |= (1 << 14);
                         tw32(GRC_RX_CPU_EVENT, val);
@@ -6551,6 +6560,7 @@ static void tg3_timer(unsigned long __opaque)
 
         spin_unlock(&tp->lock);
 
+restart_timer:
         tp->timer.expires = jiffies + tp->timer_offset;
         add_timer(&tp->timer);
 }
@@ -8035,9 +8045,13 @@ static int tg3_test_nvram(struct tg3 *tp)
                 for (i = 0; i < size; i++)
                         csum8 += buf8[i];
 
-                if (csum8 == 0)
-                        return 0;
-                return -EIO;
+                if (csum8 == 0) {
+                        err = 0;
+                        goto out;
+                }
+
+                err = -EIO;
+                goto out;
         }
 
         /* Bootstrap checksum at offset 0x10 */
@@ -8399,8 +8413,11 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                 }
                 mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
                            MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_GMII;
-                if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401)
+                if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
                         mac_mode &= ~MAC_MODE_LINK_POLARITY;
+                        tg3_writephy(tp, MII_TG3_EXT_CTRL,
+                                     MII_TG3_EXT_CTRL_LNK3_LED_MODE);
+                }
                 tw32(MAC_MODE, mac_mode);
         }
         else
@@ -9529,8 +9546,11 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
         tp->led_ctrl = LED_CTRL_MODE_PHY_1;
 
         /* Do not even try poking around in here on Sun parts.  */
-        if (tp->tg3_flags2 & TG3_FLG2_SUN_570X)
+        if (tp->tg3_flags2 & TG3_FLG2_SUN_570X) {
+                /* All SUN chips are built-in LOMs. */
+                tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
                 return;
+        }
 
         tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
         if (val == NIC_SRAM_DATA_SIG_MAGIC) {
@@ -9628,9 +9648,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                     tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)
                         tp->led_ctrl = LED_CTRL_MODE_PHY_2;
 
-                if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700) &&
-                    (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) &&
-                    (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP))
+                if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP)
                         tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
 
                 if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
@@ -10255,6 +10273,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 pci_write_config_word(tp->pdev, PCI_COMMAND, pci_cmd);
         }
 
+        if (tp->write32 == tg3_write_indirect_reg32 ||
+            ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) &&
+             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
+              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) ||
+            (tp->tg3_flags2 & TG3_FLG2_SUN_570X))
+                tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
+
         /* Get eeprom hw config before calling tg3_set_power_state().
          * In particular, the TG3_FLAG_EEPROM_WRITE_PROT flag must be
          * determined before calling tg3_set_power_state() so that
@@ -10297,15 +10322,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (tp->pci_chip_rev_id == CHIPREV_ID_5700_B0)
                 tp->tg3_flags |= TG3_FLAG_BROKEN_CHECKSUMS;
 
-        /* Pseudo-header checksum is done by hardware logic and not
-         * the offload processers, so make the chip do the pseudo-
-         * header checksums on receive.  For transmit it is more
-         * convenient to do the pseudo-header checksum in software
-         * as Linux does that on transmit for us in all cases.
-         */
-        tp->tg3_flags |= TG3_FLAG_NO_TX_PSEUDO_CSUM;
-        tp->tg3_flags &= ~TG3_FLAG_NO_RX_PSEUDO_CSUM;
-
         /* Derive initial jumbo mode from MTU assigned in
          * ether_setup() via the alloc_etherdev() call
          */
@@ -10531,6 +10547,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
 {
         struct net_device *dev = tp->dev;
         u32 hi, lo, mac_offset;
+        int addr_ok = 0;
 
 #ifdef CONFIG_SPARC64
         if (!tg3_get_macaddr_sparc(tp))
@@ -10560,29 +10577,34 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
                 dev->dev_addr[3] = (lo >> 16) & 0xff;
                 dev->dev_addr[4] = (lo >>  8) & 0xff;
                 dev->dev_addr[5] = (lo >>  0) & 0xff;
-        }
-        /* Next, try NVRAM. */
-        else if (!(tp->tg3_flags & TG3_FLG2_SUN_570X) &&
-                 !tg3_nvram_read(tp, mac_offset + 0, &hi) &&
-                 !tg3_nvram_read(tp, mac_offset + 4, &lo)) {
-                dev->dev_addr[0] = ((hi >> 16) & 0xff);
-                dev->dev_addr[1] = ((hi >> 24) & 0xff);
-                dev->dev_addr[2] = ((lo >>  0) & 0xff);
-                dev->dev_addr[3] = ((lo >>  8) & 0xff);
-                dev->dev_addr[4] = ((lo >> 16) & 0xff);
-                dev->dev_addr[5] = ((lo >> 24) & 0xff);
-        }
-        /* Finally just fetch it out of the MAC control regs. */
-        else {
-                hi = tr32(MAC_ADDR_0_HIGH);
-                lo = tr32(MAC_ADDR_0_LOW);
 
-                dev->dev_addr[5] = lo & 0xff;
-                dev->dev_addr[4] = (lo >> 8) & 0xff;
-                dev->dev_addr[3] = (lo >> 16) & 0xff;
-                dev->dev_addr[2] = (lo >> 24) & 0xff;
-                dev->dev_addr[1] = hi & 0xff;
-                dev->dev_addr[0] = (hi >> 8) & 0xff;
+                /* Some old bootcode may report a 0 MAC address in SRAM */
+                addr_ok = is_valid_ether_addr(&dev->dev_addr[0]);
+        }
+        if (!addr_ok) {
+                /* Next, try NVRAM. */
+                if (!(tp->tg3_flags & TG3_FLG2_SUN_570X) &&
+                    !tg3_nvram_read(tp, mac_offset + 0, &hi) &&
+                    !tg3_nvram_read(tp, mac_offset + 4, &lo)) {
+                        dev->dev_addr[0] = ((hi >> 16) & 0xff);
+                        dev->dev_addr[1] = ((hi >> 24) & 0xff);
+                        dev->dev_addr[2] = ((lo >>  0) & 0xff);
+                        dev->dev_addr[3] = ((lo >>  8) & 0xff);
+                        dev->dev_addr[4] = ((lo >> 16) & 0xff);
+                        dev->dev_addr[5] = ((lo >> 24) & 0xff);
+                }
+                /* Finally just fetch it out of the MAC control regs. */
+                else {
+                        hi = tr32(MAC_ADDR_0_HIGH);
+                        lo = tr32(MAC_ADDR_0_LOW);
+
+                        dev->dev_addr[5] = lo & 0xff;
+                        dev->dev_addr[4] = (lo >> 8) & 0xff;
+                        dev->dev_addr[3] = (lo >> 16) & 0xff;
+                        dev->dev_addr[2] = (lo >> 24) & 0xff;
+                        dev->dev_addr[1] = hi & 0xff;
+                        dev->dev_addr[0] = (hi >> 8) & 0xff;
+                }
         }
 
         if (!is_valid_ether_addr(&dev->dev_addr[0])) {
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index c43cc3264202..8c8b987d1250 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2171,8 +2171,7 @@ struct tg3 {
 #define TG3_FLAG_PCIX_MODE              0x00020000
 #define TG3_FLAG_PCI_HIGH_SPEED         0x00040000
 #define TG3_FLAG_PCI_32BIT              0x00080000
-#define TG3_FLAG_NO_TX_PSEUDO_CSUM      0x00100000
-#define TG3_FLAG_NO_RX_PSEUDO_CSUM      0x00200000
+#define TG3_FLAG_SRAM_USE_CONFIG        0x00100000
 #define TG3_FLAG_SERDES_WOL_CAP         0x00400000
 #define TG3_FLAG_JUMBO_RING_ENABLE      0x00800000
 #define TG3_FLAG_10_100_ONLY            0x01000000
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index e4cfc80b283b..99c4c1922f19 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menu "Token Ring devices"
-        depends on NETDEVICES
+        depends on NETDEVICES && !UML
 
 # So far, we only have PCI, ISA, and MCA token ring devices
 config TR
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 9345e68c451e..649d8ea354f5 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -438,8 +438,7 @@ static void __devexit abyss_detach (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         
-        if (!dev)
-                BUG();
+        BUG_ON(!dev);
         unregister_netdev(dev);
         release_region(dev->base_addr-0x10, ABYSS_IO_EXTENT);
         free_irq(dev->irq, dev);
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 3a25d191ea4a..19e6f4dfd69c 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -735,8 +735,7 @@ static int __devexit madgemc_remove(struct device *device)
         struct net_local *tp;
         struct card_info *card;
 
-        if (!dev)
-                BUG();
+        BUG_ON(!dev);
 
         tp = dev->priv;
         card = tp->tmspriv;
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index d1a86a080a65..f56094102042 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -4160,7 +4160,7 @@ get_hw_addr(struct net_device *dev)
     ** If the address starts with 00 a0, we have to bit-reverse
     ** each byte of the address.
     */
-    if ( (_machine & _MACH_Pmac) &&
+    if ( machine_is(powermac) &&
          (dev->dev_addr[0] == 0) &&
          (dev->dev_addr[1] == 0xa0) )
     {
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index c1ce87a5f8d3..d9258d42090c 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -134,7 +134,7 @@ static const int multicast_filter_limit = 32;
 #include "typhoon.h"
 #include "typhoon-firmware.h"
 
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
     "typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 241871589283..6a23964c1317 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -469,7 +469,7 @@ struct rhine_private {
         struct sk_buff *tx_skbuff[TX_RING_SIZE];
         dma_addr_t tx_skbuff_dma[TX_RING_SIZE];
 
-        /* Tx bounce buffers */
+        /* Tx bounce buffers (Rhine-I only) */
         unsigned char *tx_buf[TX_RING_SIZE];
         unsigned char *tx_bufs;
         dma_addr_t tx_bufs_dma;
@@ -1043,7 +1043,8 @@ static void alloc_tbufs(struct net_device* dev)
                 rp->tx_ring[i].desc_length = cpu_to_le32(TXDESC);
                 next += sizeof(struct tx_desc);
                 rp->tx_ring[i].next_desc = cpu_to_le32(next);
-                rp->tx_buf[i] = &rp->tx_bufs[i * PKT_BUF_SZ];
+                if (rp->quirks & rqRhineI)
+                        rp->tx_buf[i] = &rp->tx_bufs[i * PKT_BUF_SZ];
         }
         rp->tx_ring[i-1].next_desc = cpu_to_le32(rp->tx_ring_dma);
 
@@ -1085,6 +1086,25 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media)
         else
             iowrite8(ioread8(ioaddr + ChipCmd1) & ~Cmd1FDuplex,
                    ioaddr + ChipCmd1);
+        if (debug > 1)
+                printk(KERN_INFO "%s: force_media %d, carrier %d\n", dev->name,
+                        rp->mii_if.force_media, netif_carrier_ok(dev));
+}
+
+/* Called after status of force_media possibly changed */
+static void rhine_set_carrier(struct mii_if_info *mii)
+{
+        if (mii->force_media) {
+                /* autoneg is off: Link is always assumed to be up */
+                if (!netif_carrier_ok(mii->dev))
+                        netif_carrier_on(mii->dev);
+        }
+        else    /* Let MMI library update carrier status */
+                rhine_check_media(mii->dev, 0);
+        if (debug > 1)
+                printk(KERN_INFO "%s: force_media %d, carrier %d\n",
+                       mii->dev->name, mii->force_media,
+                       netif_carrier_ok(mii->dev));
 }
 
 static void rhine_check_media_task(struct net_device *dev)
@@ -1782,6 +1802,7 @@ static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         spin_lock_irq(&rp->lock);
         rc = mii_ethtool_sset(&rp->mii_if, cmd);
         spin_unlock_irq(&rp->lock);
+        rhine_set_carrier(&rp->mii_if);
 
         return rc;
 }
@@ -1869,6 +1890,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         spin_lock_irq(&rp->lock);
         rc = generic_mii_ioctl(&rp->mii_if, if_mii(rq), cmd, NULL);
         spin_unlock_irq(&rp->lock);
+        rhine_set_carrier(&rp->mii_if);
 
         return rc;
 }
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 883cf7da10fc..b5328b0ff927 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -410,103 +410,6 @@ config WAN_ROUTER_DRIVERS
 
           If unsure, say N.
 
-config VENDOR_SANGOMA
-        tristate "Sangoma WANPIPE(tm) multiprotocol cards"
-        depends on WAN_ROUTER_DRIVERS && WAN_ROUTER && (PCI || ISA) && BROKEN
-        ---help---
-          Driver for S514-PCI/ISA Synchronous Data Link Adapters (SDLA).
-
-          WANPIPE from Sangoma Technologies Inc. <http://www.sangoma.com/>
-          is a family of intelligent multiprotocol WAN adapters with data
-          transfer rates up to 4Mbps. Cards support:
-
-          - X.25, Frame Relay, PPP, Cisco HDLC protocols.
-
-          - API for protocols like HDLC (LAPB), HDLC Streaming, X.25,
-          Frame Relay and BiSync.
-
-          - Ethernet Bridging over Frame Relay protocol.
-
-          - MULTILINK PPP
-
-          - Async PPP (Modem Dialup)
-
-          The next questions will ask you about the protocols you want
-          the driver to support.
-
-          If you have one or more of these cards, say M to this option;
-          and read <file:Documentation/networking/wan-router.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called wanpipe.
-
-config WANPIPE_CHDLC
-        bool "WANPIPE Cisco HDLC support"
-        depends on VENDOR_SANGOMA
-        ---help---
-          Connect a WANPIPE card to a leased line using the Cisco HDLC.
-
-          - Supports Dual Port Cisco HDLC on the S514-PCI/S508-ISA cards
-          which allows user to build applications using the HDLC streaming API.
-
-          - CHDLC Streaming MULTILINK PPP that can bind multiple WANPIPE T1
-          cards into a single logical channel.
-
-          Say Y and the Cisco HDLC support, HDLC streaming API and
-          MULTILINK PPP will be included in the driver.
-
-config WANPIPE_FR
-        bool "WANPIPE Frame Relay support"
-        depends on VENDOR_SANGOMA
-        help
-          Connect a WANPIPE card to a Frame Relay network, or use Frame Relay
-          API to develop custom applications.
-
-          Contains the Ethernet Bridging over Frame Relay feature, where
-          a WANPIPE frame relay link can be directly connected to the Linux
-          kernel bridge. The Frame Relay option is supported on S514-PCI
-          and S508-ISA cards.
-
-          Say Y and the Frame Relay support will be included in the driver.
-
-config WANPIPE_X25
-        bool "WANPIPE X.25 support"
-        depends on VENDOR_SANGOMA
-        help
-          Connect a WANPIPE card to an X.25 network.
-
-          Includes the X.25 API support for custom applications over the
-          X.25 protocol. The X.25 option is supported on S514-PCI and
-          S508-ISA cards.
-
-          Say Y and the X.25 support will be included in the driver.
-
-config WANPIPE_PPP
-        bool "WANPIPE PPP support"
-        depends on VENDOR_SANGOMA
-        help
-          Connect a WANPIPE card to a leased line using Point-to-Point
-          Protocol (PPP).
-
-          The PPP option is supported on S514-PCI/S508-ISA cards.
-
-          Say Y and the PPP support will be included in the driver.
-
-config WANPIPE_MULTPPP
-        bool "WANPIPE Multi-Port PPP support"
-        depends on VENDOR_SANGOMA
-        help
-          Connect a WANPIPE card to a leased line using Point-to-Point
-          Protocol (PPP).
-
-          Uses in-kernel SyncPPP protocol over the Sangoma HDLC Streaming
-          adapter. In this case each Sangoma adapter port can support an
-          independent PPP connection. For example, a single Quad-Port PCI
-          adapter can support up to four independent PPP links. The PPP
-          option is supported on S514-PCI/S508-ISA cards.
-
-          Say Y and the Multi-Port PPP support will be included in the driver.
-
 config CYCLADES_SYNC
         tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)"
         depends on WAN_ROUTER_DRIVERS && (PCI || ISA)
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index ce6c56b903e7..823c6d5ab90d 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -5,14 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-wanpipe-y                       := sdlamain.o sdla_ft1.o
-wanpipe-$(CONFIG_WANPIPE_X25)   += sdla_x25.o
-wanpipe-$(CONFIG_WANPIPE_FR)    += sdla_fr.o
-wanpipe-$(CONFIG_WANPIPE_CHDLC) += sdla_chdlc.o
-wanpipe-$(CONFIG_WANPIPE_PPP)   += sdla_ppp.o
-wanpipe-$(CONFIG_WANPIPE_MULTPPP) += wanpipe_multppp.o
-wanpipe-objs                    := $(wanpipe-y)
-
 cyclomx-y                       := cycx_main.o
 cyclomx-$(CONFIG_CYCLOMX_X25)   += cycx_x25.o
 cyclomx-objs                    := $(cyclomx-y)  
@@ -43,11 +35,6 @@ obj-$(CONFIG_LANMEDIA)		+= lmc/
 
 obj-$(CONFIG_DLCI)              += dlci.o 
 obj-$(CONFIG_SDLA)              += sdla.o
-ifeq ($(CONFIG_WANPIPE_MULTPPP),y)
-  obj-$(CONFIG_VENDOR_SANGOMA) += sdladrv.o wanpipe.o syncppp.o 
-else
-  obj-$(CONFIG_VENDOR_SANGOMA) += sdladrv.o wanpipe.o
-endif
 obj-$(CONFIG_CYCLADES_SYNC)     += cycx_drv.o cyclomx.o
 obj-$(CONFIG_LAPBETHER)         += lapbether.o
 obj-$(CONFIG_SBNI)              += sbni.o
diff --git a/drivers/net/wan/sdla_chdlc.c b/drivers/net/wan/sdla_chdlc.c
deleted file mode 100644
index 496d29237e92..000000000000
--- a/drivers/net/wan/sdla_chdlc.c
+++ /dev/null
@@ -1,4428 +0,0 @@
-/*****************************************************************************
-* sdla_chdlc.c  WANPIPE(tm) Multiprotocol WAN Link Driver. Cisco HDLC module.
-*
-* Authors:      Nenad Corbic <ncorbic@sangoma.com>
-*               Gideon Hack  
-*
-* Copyright:    (c) 1995-2001 Sangoma Technologies 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.
-* ============================================================================
-* Feb 28, 2001  Nenad Corbic    Updated if_tx_timeout() routine for 
-*                               2.4.X kernels.
-* Jan 25, 2001  Nenad Corbic    Added a TTY Sync serial driver over the
-*                               HDLC streaming protocol
-*                               Added a TTY Async serial driver over the
-*                               Async protocol.
-* Dec 15, 2000  Nenad Corbic    Updated for 2.4.X Kernel support
-* Nov 13, 2000  Nenad Corbic    Added true interface type encoding option.
-*                               Tcpdump doesn't support CHDLC inteface
-*                               types, to fix this "true type" option will set
-*                               the interface type to RAW IP mode.
-* Nov 07, 2000  Nenad Corbic    Added security features for UDP debugging:
-*                               Deny all and specify allowed requests.
-* Jun 20, 2000  Nenad Corbic    Fixed the API IP ERROR bug. Caused by the 
-*                               latest update.
-* May 09, 2000  Nenad Corbic    Option to bring down an interface
-*                               upon disconnect.
-* Mar 23, 2000  Nenad Corbic    Improved task queue, bh handling.
-* Mar 16, 2000  Nenad Corbic    Fixed the SLARP Dynamic IP addressing.
-* Mar 06, 2000  Nenad Corbic    Bug Fix: corrupted mbox recovery.
-* Feb 10, 2000  Gideon Hack     Added ASYNC support.
-* Feb 09, 2000  Nenad Corbic    Fixed two shutdown bugs in update() and
-*                               if_stats() functions.
-* Jan 24, 2000  Nenad Corbic    Fixed a startup wanpipe state racing,  
-*                               condition between if_open and isr. 
-* Jan 10, 2000  Nenad Corbic    Added new socket API support.
-* Dev 15, 1999  Nenad Corbic    Fixed up header files for 2.0.X kernels
-* Nov 20, 1999  Nenad Corbic    Fixed zero length API bug.
-* Sep 30, 1999  Nenad Corbic    Fixed dynamic IP and route setup.
-* Sep 23, 1999  Nenad Corbic    Added SMP support, fixed tracing 
-* Sep 13, 1999  Nenad Corbic    Split up Port 0 and 1 into separate devices.
-* Jun 02, 1999  Gideon Hack     Added support for the S514 adapter.
-* Oct 30, 1998  Jaspreet Singh  Added Support for CHDLC API (HDLC STREAMING).
-* Oct 28, 1998  Jaspreet Singh  Added Support for Dual Port CHDLC.
-* Aug 07, 1998  David Fong      Initial version.
-*****************************************************************************/
-
-#include <linux/module.h>
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/slab.h> /* kmalloc(), kfree() */
-#include <linux/wanrouter.h>    /* WAN router definitions */
-#include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
-#include <linux/if_arp.h>       /* ARPHRD_* defines */
-
-
-#include <asm/uaccess.h>
-#include <linux/inetdevice.h>
-#include <linux/netdevice.h>
-
-#include <linux/in.h>           /* sockaddr_in */
-#include <linux/inet.h> 
-#include <linux/if.h>
-#include <asm/byteorder.h>      /* htons(), etc. */
-#include <linux/sdlapci.h>
-#include <asm/io.h>
-
-#include <linux/sdla_chdlc.h>           /* CHDLC firmware API definitions */
-#include <linux/sdla_asy.h>             /* CHDLC (async) API definitions */
-
-#include <linux/if_wanpipe_common.h>    /* Socket Driver common area */
-#include <linux/if_wanpipe.h>           
-
-/* TTY Includes */
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-
-
-/****** Defines & Macros ****************************************************/
-
-/* reasons for enabling the timer interrupt on the adapter */
-#define TMR_INT_ENABLED_UDP             0x01
-#define TMR_INT_ENABLED_UPDATE          0x02
-#define TMR_INT_ENABLED_CONFIG          0x10
-
-#define MAX_IP_ERRORS   10
-
-#define TTY_CHDLC_MAX_MTU       2000
-#define CHDLC_DFLT_DATA_LEN     1500            /* default MTU */
-#define CHDLC_HDR_LEN           1
-
-#define CHDLC_API 0x01
-
-#define PORT(x)   (x == 0 ? "PRIMARY" : "SECONDARY" )
-#define MAX_BH_BUFF     10
-
-//#define PRINT_DEBUG
-#ifdef PRINT_DEBUG
-#define dbg_printk(format, a...) printk(format, ## a)
-#else
-#define dbg_printk(format, a...)
-#endif  
-
-/******Data Structures*****************************************************/
-
-/* This structure is placed in the private data area of the device structure.
- * The card structure used to occupy the private area but now the following 
- * structure will incorporate the card structure along with CHDLC specific data
- */
-
-typedef struct chdlc_private_area
-{
-        wanpipe_common_t common;
-        sdla_t          *card;
-        int             TracingEnabled;         /* For enabling Tracing */
-        unsigned long   curr_trace_addr;        /* Used for Tracing */
-        unsigned long   start_trace_addr;
-        unsigned long   end_trace_addr;
-        unsigned long   base_addr_trace_buffer;
-        unsigned long   end_addr_trace_buffer;
-        unsigned short  number_trace_elements;
-        unsigned        available_buffer_space;
-        unsigned long   router_start_time;
-        unsigned char   route_status;
-        unsigned char   route_removed;
-        unsigned long   tick_counter;           /* For 5s timeout counter */
-        unsigned long   router_up_time;
-        u32             IP_address;             /* IP addressing */
-        u32             IP_netmask;
-        u32             ip_local;
-        u32             ip_remote;
-        u32             ip_local_tmp;
-        u32             ip_remote_tmp;
-        u8              ip_error;
-        u8              config_chdlc;
-        u8              config_chdlc_timeout;
-        unsigned char  mc;                      /* Mulitcast support on/off */
-        unsigned short udp_pkt_lgth;            /* udp packet processing */
-        char udp_pkt_src;
-        char udp_pkt_data[MAX_LGTH_UDP_MGNT_PKT];
-        unsigned short timer_int_enabled;
-        char update_comms_stats;                /* updating comms stats */
-
-        bh_data_t *bh_head;               /* Circular buffer for chdlc_bh */
-        unsigned long  tq_working;
-        volatile int  bh_write;
-        volatile int  bh_read;
-        atomic_t  bh_buff_used;
-        
-        unsigned char interface_down;
-
-        /* Polling work queue entry. Each interface
-         * has its own work queue entry, which is used
-         * to defer events from the interrupt */
-        struct work_struct poll_work;
-        struct timer_list poll_delay_timer;
-
-        u8 gateway;
-        u8 true_if_encoding;
-        //FIXME: add driver stats as per frame relay!
-
-} chdlc_private_area_t;
-
-/* Route Status options */
-#define NO_ROUTE        0x00
-#define ADD_ROUTE       0x01
-#define ROUTE_ADDED     0x02
-#define REMOVE_ROUTE    0x03
-
-
-/* variable for keeping track of enabling/disabling FT1 monitor status */
-static int rCount = 0;
-
-/* variable for tracking how many interfaces to open for WANPIPE on the
-   two ports */
-
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
-
-/****** Function Prototypes *************************************************/
-/* WAN link driver entry points. These are called by the WAN router module. */
-static int update(struct wan_device* wandev);
-static int new_if(struct wan_device* wandev, struct net_device* dev,
-                  wanif_conf_t* conf);
-
-/* Network device interface */
-static int if_init(struct net_device* dev);
-static int if_open(struct net_device* dev);
-static int if_close(struct net_device* dev);
-static int if_header(struct sk_buff* skb, struct net_device* dev,
-                     unsigned short type, void* daddr, void* saddr,
-                     unsigned len);
-
-static int if_rebuild_hdr (struct sk_buff *skb);
-static struct net_device_stats* if_stats(struct net_device* dev);
-  
-static int if_send(struct sk_buff* skb, struct net_device* dev);
-
-/* CHDLC Firmware interface functions */
-static int chdlc_configure      (sdla_t* card, void* data);
-static int chdlc_comm_enable    (sdla_t* card);
-static int chdlc_read_version   (sdla_t* card, char* str);
-static int chdlc_set_intr_mode  (sdla_t* card, unsigned mode);
-static int chdlc_send (sdla_t* card, void* data, unsigned len);
-static int chdlc_read_comm_err_stats (sdla_t* card);
-static int chdlc_read_op_stats (sdla_t* card);
-static int chdlc_error (sdla_t *card, int err, CHDLC_MAILBOX_STRUCT *mb);
-
-
-static int chdlc_disable_comm_shutdown (sdla_t *card);
-static void if_tx_timeout(struct net_device *dev);
-
-/* Miscellaneous CHDLC Functions */
-static int set_chdlc_config (sdla_t* card);
-static void init_chdlc_tx_rx_buff( sdla_t* card);
-static int process_chdlc_exception(sdla_t *card);
-static int process_global_exception(sdla_t *card);
-static int update_comms_stats(sdla_t* card,
-        chdlc_private_area_t* chdlc_priv_area);
-static int configure_ip (sdla_t* card);
-static int unconfigure_ip (sdla_t* card);
-static void process_route(sdla_t *card);
-static void port_set_state (sdla_t *card, int);
-static int config_chdlc (sdla_t *card);
-static void disable_comm (sdla_t *card);
-
-static void trigger_chdlc_poll(struct net_device *dev);
-static void chdlc_poll(struct net_device *dev);
-static void chdlc_poll_delay (unsigned long dev_ptr);
-
-
-/* Miscellaneous asynchronous interface Functions */
-static int set_asy_config (sdla_t* card);
-static int asy_comm_enable (sdla_t* card);
-
-/* Interrupt handlers */
-static void wpc_isr (sdla_t* card);
-static void rx_intr (sdla_t* card);
-static void timer_intr(sdla_t *);
-
-/* Bottom half handlers */
-static void chdlc_work(struct net_device *dev);
-static int chdlc_work_cleanup(struct net_device *dev);
-static int bh_enqueue(struct net_device *dev, struct sk_buff *skb);
-
-/* Miscellaneous functions */
-static int chk_bcast_mcast_addr(sdla_t* card, struct net_device* dev,
-                                struct sk_buff *skb);
-static int reply_udp( unsigned char *data, unsigned int mbox_len );
-static int intr_test( sdla_t* card);
-static int udp_pkt_type( struct sk_buff *skb , sdla_t* card);
-static int store_udp_mgmt_pkt(char udp_pkt_src, sdla_t* card,
-                                struct sk_buff *skb, struct net_device* dev,
-                                chdlc_private_area_t* chdlc_priv_area);
-static int process_udp_mgmt_pkt(sdla_t* card, struct net_device* dev,  
-                                chdlc_private_area_t* chdlc_priv_area);
-static unsigned short calc_checksum (char *, int);
-static void s508_lock (sdla_t *card, unsigned long *smp_flags);
-static void s508_unlock (sdla_t *card, unsigned long *smp_flags);
-
-
-static int  Intr_test_counter;
-
-/* TTY Global Definitions */
-
-#define NR_PORTS 4
-#define WAN_TTY_MAJOR 226
-#define WAN_TTY_MINOR 0
-
-#define WAN_CARD(port) (tty_card_map[port])
-#define MIN_PORT 0
-#define MAX_PORT NR_PORTS-1 
-
-#define CRC_LENGTH 2
-
-static int wanpipe_tty_init(sdla_t *card);
-static void wanpipe_tty_receive(sdla_t *, unsigned, unsigned int);
-static void wanpipe_tty_trigger_poll(sdla_t *card);
-
-static struct tty_driver serial_driver;
-static int tty_init_cnt=0;
-
-static struct serial_state rs_table[NR_PORTS];
-
-static char tty_driver_mode=WANOPT_TTY_SYNC;
-
-static char *opt_decode[] = {"NONE","CRTSCTS","XONXOFF-RX",
-                             "CRTSCTS XONXOFF-RX","XONXOFF-TX",
-                             "CRTSCTS XONXOFF-TX","CRTSCTS XONXOFF"};
-static char *p_decode[] = {"NONE","ODD","EVEN"};
-
-static void* tty_card_map[NR_PORTS] = {NULL,NULL,NULL,NULL};
-
-
-/****** Public Functions ****************************************************/
-
-/*============================================================================
- * Cisco HDLC protocol initialization routine.
- *
- * This routine is called by the main WANPIPE module during setup.  At this
- * point adapter is completely initialized and firmware is running.
- *  o read firmware version (to make sure it's alive)
- *  o configure adapter
- *  o initialize protocol-specific fields of the adapter data space.
- *
- * Return:      0       o.k.
- *              < 0     failure.
- */
-int wpc_init (sdla_t* card, wandev_conf_t* conf)
-{
-        unsigned char port_num;
-        int err;
-        unsigned long max_permitted_baud = 0;
-        SHARED_MEMORY_INFO_STRUCT *flags;
-
-        union
-                {
-                char str[80];
-                } u;
-        volatile CHDLC_MAILBOX_STRUCT* mb;
-        CHDLC_MAILBOX_STRUCT* mb1;
-        unsigned long timeout;
-
-        /* Verify configuration ID */
-        if (conf->config_id != WANCONFIG_CHDLC) {
-                printk(KERN_INFO "%s: invalid configuration ID %u!\n",
-                                  card->devname, conf->config_id);
-                return -EINVAL;
-        }
-
-        /* Find out which Port to use */
-        if ((conf->comm_port == WANOPT_PRI) || (conf->comm_port == WANOPT_SEC)){
-                if (card->next){
-
-                        if (conf->comm_port != card->next->u.c.comm_port){
-                                card->u.c.comm_port = conf->comm_port;
-                        }else{
-                                printk(KERN_INFO "%s: ERROR - %s port used!\n",
-                                        card->wandev.name, PORT(conf->comm_port));
-                                return -EINVAL;
-                        }
-                }else{
-                        card->u.c.comm_port = conf->comm_port;
-                }
-        }else{
-                printk(KERN_INFO "%s: ERROR - Invalid Port Selected!\n",
-                                        card->wandev.name);
-                return -EINVAL;
-        }
-        
-
-        /* Initialize protocol-specific fields */
-        if(card->hw.type != SDLA_S514){
-
-                if (card->u.c.comm_port == WANOPT_PRI){ 
-                        card->mbox  = (void *) card->hw.dpmbase;
-                }else{
-                        card->mbox  = (void *) card->hw.dpmbase + 
-                                SEC_BASE_ADDR_MB_STRUCT - PRI_BASE_ADDR_MB_STRUCT;
-                }       
-        }else{ 
-                /* for a S514 adapter, set a pointer to the actual mailbox in the */
-                /* allocated virtual memory area */
-                if (card->u.c.comm_port == WANOPT_PRI){
-                        card->mbox = (void *) card->hw.dpmbase + PRI_BASE_ADDR_MB_STRUCT;
-                }else{
-                        card->mbox = (void *) card->hw.dpmbase + SEC_BASE_ADDR_MB_STRUCT;
-                }       
-        }
-
-        mb = mb1 = card->mbox;
-
-        if (!card->configured){
-
-                /* The board will place an 'I' in the return code to indicate that it is
-                ready to accept commands.  We expect this to be completed in less
-                than 1 second. */
-
-                timeout = jiffies;
-                while (mb->return_code != 'I')  /* Wait 1s for board to initialize */
-                        if ((jiffies - timeout) > 1*HZ) break;
-
-                if (mb->return_code != 'I') {
-                        printk(KERN_INFO
-                                "%s: Initialization not completed by adapter\n",
-                                card->devname);
-                        printk(KERN_INFO "Please contact Sangoma representative.\n");
-                        return -EIO;
-                }
-        }
-
-        /* Read firmware version.  Note that when adapter initializes, it
-         * clears the mailbox, so it may appear that the first command was
-         * executed successfully when in fact it was merely erased. To work
-         * around this, we execute the first command twice.
-         */
-
-        if (chdlc_read_version(card, u.str))
-                return -EIO;
-
-        printk(KERN_INFO "%s: Running Cisco HDLC firmware v%s\n",
-                card->devname, u.str); 
-
-        card->isr                       = &wpc_isr;
-        card->poll                      = NULL;
-        card->exec                      = NULL;
-        card->wandev.update             = &update;
-        card->wandev.new_if             = &new_if;
-        card->wandev.del_if             = NULL;
-        card->wandev.udp_port           = conf->udp_port;
-        card->disable_comm              = &disable_comm;
-        card->wandev.new_if_cnt = 0;
-
-        /* reset the number of times the 'update()' proc has been called */
-        card->u.c.update_call_count = 0;
-        
-        card->wandev.ttl = conf->ttl;
-        card->wandev.interface = conf->interface; 
-
-        if ((card->u.c.comm_port == WANOPT_SEC && conf->interface == WANOPT_V35)&&
-            card->hw.type != SDLA_S514){
-                printk(KERN_INFO "%s: ERROR - V35 Interface not supported on S508 %s port \n",
-                        card->devname, PORT(card->u.c.comm_port));
-                return -EIO;
-        }
-
-        card->wandev.clocking = conf->clocking;
-
-        port_num = card->u.c.comm_port;
-
-        /* in API mode, we can configure for "receive only" buffering */
-        if(card->hw.type == SDLA_S514) {
-                card->u.c.receive_only = conf->receive_only;
-                if(conf->receive_only) {
-                        printk(KERN_INFO
-                                "%s: Configured for 'receive only' mode\n",
-                                card->devname);
-                }
-        }
-
-        /* Setup Port Bps */
-
-        if(card->wandev.clocking) {
-                if((port_num == WANOPT_PRI) || card->u.c.receive_only) {
-                        /* For Primary Port 0 */
-                        max_permitted_baud =
-                                (card->hw.type == SDLA_S514) ?
-                                PRI_MAX_BAUD_RATE_S514 : 
-                                PRI_MAX_BAUD_RATE_S508;
-
-                }else if(port_num == WANOPT_SEC) {
-                        /* For Secondary Port 1 */
-                        max_permitted_baud =
-                               (card->hw.type == SDLA_S514) ?
-                                SEC_MAX_BAUD_RATE_S514 :
-                                SEC_MAX_BAUD_RATE_S508;
-                        }
-  
-                        if(conf->bps > max_permitted_baud) {
-                                conf->bps = max_permitted_baud;
-                                printk(KERN_INFO "%s: Baud too high!\n",
-                                        card->wandev.name);
-                                printk(KERN_INFO "%s: Baud rate set to %lu bps\n", 
-                                        card->wandev.name, max_permitted_baud);
-                        }
-                        card->wandev.bps = conf->bps;
-        }else{
-                card->wandev.bps = 0;
-        }
-
-        /* Setup the Port MTU */
-        if((port_num == WANOPT_PRI) || card->u.c.receive_only) {
-
-                /* For Primary Port 0 */
-                card->wandev.mtu =
-                        (conf->mtu >= MIN_LGTH_CHDLC_DATA_CFG) ?
-                        min_t(unsigned int, conf->mtu, PRI_MAX_NO_DATA_BYTES_IN_FRAME) :
-                        CHDLC_DFLT_DATA_LEN;
-        } else if(port_num == WANOPT_SEC) { 
-                /* For Secondary Port 1 */
-                card->wandev.mtu =
-                        (conf->mtu >= MIN_LGTH_CHDLC_DATA_CFG) ?
-                        min_t(unsigned int, conf->mtu, SEC_MAX_NO_DATA_BYTES_IN_FRAME) :
-                        CHDLC_DFLT_DATA_LEN;
-        }
-
-        /* Set up the interrupt status area */
-        /* Read the CHDLC Configuration and obtain: 
-         *      Ptr to shared memory infor struct
-         * Use this pointer to calculate the value of card->u.c.flags !
-         */
-        mb1->buffer_length = 0;
-        mb1->command = READ_CHDLC_CONFIGURATION;
-        err = sdla_exec(mb1) ? mb1->return_code : CMD_TIMEOUT;
-        if(err != COMMAND_OK) {
-                if(card->hw.type != SDLA_S514)
-                        enable_irq(card->hw.irq);
-
-                chdlc_error(card, err, mb1);
-                return -EIO;
-        }
-
-        if(card->hw.type == SDLA_S514){
-                card->u.c.flags = (void *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb1->data)->
-                        ptr_shared_mem_info_struct));
-        }else{
-                card->u.c.flags = (void *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb1->data)->
-                        ptr_shared_mem_info_struct % SDLA_WINDOWSIZE));
-        }
-
-        flags = card->u.c.flags;
-        
-        /* This is for the ports link state */
-        card->wandev.state = WAN_DUALPORT;
-        card->u.c.state = WAN_DISCONNECTED;
-
-
-        if (!card->wandev.piggyback){   
-                int err;
-
-                /* Perform interrupt testing */
-                err = intr_test(card);
-
-                if(err || (Intr_test_counter < MAX_INTR_TEST_COUNTER)) { 
-                        printk(KERN_INFO "%s: Interrupt test failed (%i)\n",
-                                        card->devname, Intr_test_counter);
-                        printk(KERN_INFO "%s: Please choose another interrupt\n",
-                                        card->devname);
-                        return -EIO;
-                }
-                
-                printk(KERN_INFO "%s: Interrupt test passed (%i)\n", 
-                                card->devname, Intr_test_counter);
-                card->configured = 1;
-        }
-
-        if ((card->tty_opt=conf->tty) == WANOPT_YES){
-                int err;
-                card->tty_minor = conf->tty_minor;
-
-                /* On ASYNC connections internal clocking 
-                 * is mandatory */
-                if ((card->u.c.async_mode = conf->tty_mode)){
-                        card->wandev.clocking = 1;
-                }
-                err=wanpipe_tty_init(card);
-                if (err){
-                        return err;
-                }
-        }else{
-        
-
-                if (chdlc_set_intr_mode(card, APP_INT_ON_TIMER)){
-                        printk (KERN_INFO "%s: "
-                                "Failed to set interrupt triggers!\n",
-                                card->devname);
-                        return -EIO;    
-                }
-        
-                /* Mask the Timer interrupt */
-                flags->interrupt_info_struct.interrupt_permission &= 
-                        ~APP_INT_ON_TIMER;
-        }
-
-        /* If we are using CHDLC in backup mode, this flag will
-         * indicate not to look for IP addresses in config_chdlc()*/
-        card->u.c.backup = conf->backup;
-        
-        printk(KERN_INFO "\n");
-
-        return 0;
-}
-
-/******* WAN Device Driver Entry Points *************************************/
-
-/*============================================================================
- * Update device status & statistics
- * This procedure is called when updating the PROC file system and returns
- * various communications statistics. These statistics are accumulated from 3 
- * different locations:
- *      1) The 'if_stats' recorded for the device.
- *      2) Communication error statistics on the adapter.
- *      3) CHDLC operational statistics on the adapter.
- * The board level statistics are read during a timer interrupt. Note that we 
- * read the error and operational statistics during consecitive timer ticks so
- * as to minimize the time that we are inside the interrupt handler.
- *
- */
-static int update(struct wan_device* wandev)
-{
-        sdla_t* card = wandev->private;
-        struct net_device* dev;
-        volatile chdlc_private_area_t* chdlc_priv_area;
-        SHARED_MEMORY_INFO_STRUCT *flags;
-        unsigned long timeout;
-
-        /* sanity checks */
-        if((wandev == NULL) || (wandev->private == NULL))
-                return -EFAULT;
-        
-        if(wandev->state == WAN_UNCONFIGURED)
-                return -ENODEV;
-
-        /* more sanity checks */
-        if(!card->u.c.flags)
-                return -ENODEV;
-
-        if(test_bit(PERI_CRIT, (void*)&card->wandev.critical))
-                return -EAGAIN;
-
-        if((dev=card->wandev.dev) == NULL)
-                return -ENODEV;
-
-        if((chdlc_priv_area=dev->priv) == NULL)
-                return -ENODEV;
-
-        flags = card->u.c.flags;
-        if(chdlc_priv_area->update_comms_stats){
-                return -EAGAIN;
-        }
-                        
-        /* we will need 2 timer interrupts to complete the */
-        /* reading of the statistics */
-        chdlc_priv_area->update_comms_stats = 2;
-        flags->interrupt_info_struct.interrupt_permission |= APP_INT_ON_TIMER;
-        chdlc_priv_area->timer_int_enabled = TMR_INT_ENABLED_UPDATE;
-  
-        /* wait a maximum of 1 second for the statistics to be updated */ 
-        timeout = jiffies;
-        for(;;) {
-                if(chdlc_priv_area->update_comms_stats == 0)
-                        break;
-                if ((jiffies - timeout) > (1 * HZ)){
-                        chdlc_priv_area->update_comms_stats = 0;
-                        chdlc_priv_area->timer_int_enabled &=
-                                ~TMR_INT_ENABLED_UPDATE; 
-                        return -EAGAIN;
-                }
-        }
-
-        return 0;
-}
-
-
-/*============================================================================
- * Create new logical channel.
- * This routine is called by the router when ROUTER_IFNEW IOCTL is being
- * handled.
- * o parse media- and hardware-specific configuration
- * o make sure that a new channel can be created
- * o allocate resources, if necessary
- * o prepare network device structure for registaration.
- *
- * Return:      0       o.k.
- *              < 0     failure (channel will not be created)
- */
-static int new_if(struct wan_device* wandev, struct net_device* dev,
-                  wanif_conf_t* conf)
-{
-        sdla_t* card = wandev->private;
-        chdlc_private_area_t* chdlc_priv_area;
-
-
-        printk(KERN_INFO "%s: Configuring Interface: %s\n",
-                        card->devname, conf->name);
- 
-        if ((conf->name[0] == '\0') || (strlen(conf->name) > WAN_IFNAME_SZ)) {
-                printk(KERN_INFO "%s: Invalid interface name!\n",
-                        card->devname);
-                return -EINVAL;
-        }
-                
-        /* allocate and initialize private data */
-        chdlc_priv_area = kmalloc(sizeof(chdlc_private_area_t), GFP_KERNEL);
-        
-        if(chdlc_priv_area == NULL) 
-                return -ENOMEM;
-
-        memset(chdlc_priv_area, 0, sizeof(chdlc_private_area_t));
-
-        chdlc_priv_area->card = card; 
-        chdlc_priv_area->common.sk = NULL;
-        chdlc_priv_area->common.func = NULL;    
-
-        /* initialize data */
-        strcpy(card->u.c.if_name, conf->name);
-
-        if(card->wandev.new_if_cnt > 0) {
-                kfree(chdlc_priv_area);
-                return -EEXIST;
-        }
-
-        card->wandev.new_if_cnt++;
-
-        chdlc_priv_area->TracingEnabled = 0;
-        chdlc_priv_area->route_status = NO_ROUTE;
-        chdlc_priv_area->route_removed = 0;
-
-        card->u.c.async_mode = conf->async_mode;
-        
-        /* setup for asynchronous mode */
-        if(conf->async_mode) {
-                printk(KERN_INFO "%s: Configuring for asynchronous mode\n",
-                        wandev->name);
-
-                if(card->u.c.comm_port == WANOPT_PRI) {
-                        printk(KERN_INFO
-                                "%s:Asynchronous mode on secondary port only\n",
-                                        wandev->name);
-                        kfree(chdlc_priv_area);
-                        return -EINVAL;
-                }
-
-                if(strcmp(conf->usedby, "WANPIPE") == 0) {
-                        printk(KERN_INFO
-                                "%s: Running in WANIPE Async Mode\n",                                                           wandev->name);
-                        card->u.c.usedby = WANPIPE;
-                }else{
-                        card->u.c.usedby = API;
-                }
-
-                if(!card->wandev.clocking) {
-                        printk(KERN_INFO
-                                "%s: Asynch. clocking must be 'Internal'\n",
-                                wandev->name);
-                        kfree(chdlc_priv_area);
-                        return -EINVAL;
-                }
-
-                if((card->wandev.bps < MIN_ASY_BAUD_RATE) ||
-                        (card->wandev.bps > MAX_ASY_BAUD_RATE)) {
-                        printk(KERN_INFO "%s: Selected baud rate is invalid.\n",
-                                wandev->name);
-                        printk(KERN_INFO "Must be between %u and %u bps.\n",
-                                MIN_ASY_BAUD_RATE, MAX_ASY_BAUD_RATE);
-                        kfree(chdlc_priv_area);
-                        return -EINVAL;
-                }
-
-                card->u.c.api_options = 0;
-                if (conf->asy_data_trans == WANOPT_YES) {
-                        card->u.c.api_options |= ASY_RX_DATA_TRANSPARENT;
-                }
-                
-                card->u.c.protocol_options = 0;
-                if (conf->rts_hs_for_receive == WANOPT_YES) {
-                        card->u.c.protocol_options |= ASY_RTS_HS_FOR_RX;
-                }
-                if (conf->xon_xoff_hs_for_receive == WANOPT_YES) {
-                        card->u.c.protocol_options |= ASY_XON_XOFF_HS_FOR_RX;
-                }
-                if (conf->xon_xoff_hs_for_transmit == WANOPT_YES) {
-                        card->u.c.protocol_options |= ASY_XON_XOFF_HS_FOR_TX;
-                }
-                if (conf->dcd_hs_for_transmit == WANOPT_YES) {
-                        card->u.c.protocol_options |= ASY_DCD_HS_FOR_TX;
-                }
-                if (conf->cts_hs_for_transmit == WANOPT_YES) {
-                        card->u.c.protocol_options |= ASY_CTS_HS_FOR_TX;
-                }
-
-                card->u.c.tx_bits_per_char = conf->tx_bits_per_char;
-                card->u.c.rx_bits_per_char = conf->rx_bits_per_char;
-                card->u.c.stop_bits = conf->stop_bits;
-                card->u.c.parity = conf->parity;
-                card->u.c.break_timer = conf->break_timer;
-                card->u.c.inter_char_timer = conf->inter_char_timer;
-                card->u.c.rx_complete_length = conf->rx_complete_length;
-                card->u.c.xon_char = conf->xon_char;
-
-        } else {        /* setup for synchronous mode */
-
-                card->u.c.protocol_options = 0;
-                if (conf->ignore_dcd == WANOPT_YES){
-                        card->u.c.protocol_options |= IGNORE_DCD_FOR_LINK_STAT;
-                }
-                if (conf->ignore_cts == WANOPT_YES){
-                        card->u.c.protocol_options |= IGNORE_CTS_FOR_LINK_STAT;
-                }
-
-                if (conf->ignore_keepalive == WANOPT_YES) {
-                        card->u.c.protocol_options |=
-                                IGNORE_KPALV_FOR_LINK_STAT;
-                        card->u.c.kpalv_tx  = MIN_Tx_KPALV_TIMER; 
-                        card->u.c.kpalv_rx  = MIN_Rx_KPALV_TIMER; 
-                        card->u.c.kpalv_err = MIN_KPALV_ERR_TOL; 
-
-                } else {   /* Do not ignore keepalives */
-                        card->u.c.kpalv_tx =
-                                ((conf->keepalive_tx_tmr - MIN_Tx_KPALV_TIMER)
-                                >= 0) ?
-                                min_t(unsigned int, conf->keepalive_tx_tmr,MAX_Tx_KPALV_TIMER) :
-                                DEFAULT_Tx_KPALV_TIMER;
-
-                        card->u.c.kpalv_rx =
-                                ((conf->keepalive_rx_tmr - MIN_Rx_KPALV_TIMER)
-                                >= 0) ?
-                                min_t(unsigned int, conf->keepalive_rx_tmr,MAX_Rx_KPALV_TIMER) :
-                                DEFAULT_Rx_KPALV_TIMER;
-
-                        card->u.c.kpalv_err =
-                                ((conf->keepalive_err_margin-MIN_KPALV_ERR_TOL)
-                                >= 0) ?
-                                min_t(unsigned int, conf->keepalive_err_margin,
-                                MAX_KPALV_ERR_TOL) : 
-                                DEFAULT_KPALV_ERR_TOL;
-                }
-
-                /* Setup slarp timer to control delay between slarps */
-                card->u.c.slarp_timer = 
-                        ((conf->slarp_timer - MIN_SLARP_REQ_TIMER) >= 0) ?
-                        min_t(unsigned int, conf->slarp_timer, MAX_SLARP_REQ_TIMER) :
-                        DEFAULT_SLARP_REQ_TIMER;
-
-                if (conf->hdlc_streaming == WANOPT_YES) {
-                        printk(KERN_INFO "%s: Enabling HDLC STREAMING Mode\n",
-                                wandev->name);
-                        card->u.c.protocol_options = HDLC_STREAMING_MODE;
-                }
-
-                if ((chdlc_priv_area->true_if_encoding = conf->true_if_encoding) == WANOPT_YES){
-                        printk(KERN_INFO 
-                                "%s: Enabling, true interface type encoding.\n",
-                                card->devname);
-                }
-                
-                /* Setup wanpipe as a router (WANPIPE) or as an API */
-                if( strcmp(conf->usedby, "WANPIPE") == 0) {
-
-                        printk(KERN_INFO "%s: Running in WANPIPE mode!\n",
-                                wandev->name);
-                        card->u.c.usedby = WANPIPE;
-
-                        /* Option to bring down the interface when 
-                         * the link goes down */
-                        if (conf->if_down){
-                                set_bit(DYN_OPT_ON,&chdlc_priv_area->interface_down);
-                                printk(KERN_INFO 
-                                 "%s: Dynamic interface configuration enabled\n",
-                                   card->devname);
-                        } 
-
-                } else if( strcmp(conf->usedby, "API") == 0) {
-                        card->u.c.usedby = API;
-                        printk(KERN_INFO "%s: Running in API mode !\n",
-                                wandev->name);
-                }
-        }
-
-        /* Tells us that if this interface is a
-         * gateway or not */
-        if ((chdlc_priv_area->gateway = conf->gateway) == WANOPT_YES){
-                printk(KERN_INFO "%s: Interface %s is set as a gateway.\n",
-                        card->devname,card->u.c.if_name);
-        }
-
-        /* Get Multicast Information */
-        chdlc_priv_area->mc = conf->mc;
-
-        /* prepare network device data space for registration */
-        strcpy(dev->name,card->u.c.if_name);
-
-        dev->init = &if_init;
-        dev->priv = chdlc_priv_area;
-
-        /* Initialize the polling work routine */
-        INIT_WORK(&chdlc_priv_area->poll_work, (void*)(void*)chdlc_poll, dev);
-
-        /* Initialize the polling delay timer */
-        init_timer(&chdlc_priv_area->poll_delay_timer);
-        chdlc_priv_area->poll_delay_timer.data = (unsigned long)dev;
-        chdlc_priv_area->poll_delay_timer.function = chdlc_poll_delay;
-        
-        printk(KERN_INFO "\n");
-
-        return 0;
-}
-
-
-/****** Network Device Interface ********************************************/
-
-/*============================================================================
- * Initialize Linux network interface.
- *
- * This routine is called only once for each interface, during Linux network
- * interface registration.  Returning anything but zero will fail interface
- * registration.
- */
-static int if_init(struct net_device* dev)
-{
-        chdlc_private_area_t* chdlc_priv_area = dev->priv;
-        sdla_t* card = chdlc_priv_area->card;
-        struct wan_device* wandev = &card->wandev;
-
-        /* Initialize device driver entry points */
-        dev->open               = &if_open;
-        dev->stop               = &if_close;
-        dev->hard_header        = &if_header;
-        dev->rebuild_header     = &if_rebuild_hdr;
-        dev->hard_start_xmit    = &if_send;
-        dev->get_stats          = &if_stats;
-        dev->tx_timeout         = &if_tx_timeout;
-        dev->watchdog_timeo     = TX_TIMEOUT;
-        
-        /* Initialize media-specific parameters */
-        dev->flags              |= IFF_POINTOPOINT;
-        dev->flags              |= IFF_NOARP;
-
-        /* Enable Mulitcasting if user selected */
-        if (chdlc_priv_area->mc == WANOPT_YES){
-                dev->flags      |= IFF_MULTICAST;
-        }
-        
-        if (chdlc_priv_area->true_if_encoding){
-                dev->type       = ARPHRD_HDLC; /* This breaks the tcpdump */
-        }else{
-                dev->type       = ARPHRD_PPP;
-        }
-        
-        dev->mtu                = card->wandev.mtu;
-        /* for API usage, add the API header size to the requested MTU size */
-        if(card->u.c.usedby == API) {
-                dev->mtu += sizeof(api_tx_hdr_t);
-        }
- 
-        dev->hard_header_len    = CHDLC_HDR_LEN;
-
-        /* Initialize hardware parameters */
-        dev->irq        = wandev->irq;
-        dev->dma        = wandev->dma;
-        dev->base_addr  = wandev->ioport;
-        dev->mem_start  = wandev->maddr;
-        dev->mem_end    = wandev->maddr + wandev->msize - 1;
-
-        /* Set transmit buffer queue length 
-         * If too low packets will not be retransmitted 
-         * by stack.
-         */
-        dev->tx_queue_len = 100;
-        SET_MODULE_OWNER(dev);
-   
-        return 0;
-}
-
-/*============================================================================
- * Open network interface.
- * o enable communications and interrupts.
- * o prevent module from unloading by incrementing use count
- *
- * Return 0 if O.k. or errno.
- */
-static int if_open(struct net_device* dev)
-{
-        chdlc_private_area_t* chdlc_priv_area = dev->priv;
-        sdla_t* card = chdlc_priv_area->card;
-        struct timeval tv;
-        int err = 0;
-
-        /* Only one open per interface is allowed */
-
-        if (netif_running(dev))
-                return -EBUSY;
-
-        /* Initialize the work queue entry */
-        chdlc_priv_area->tq_working=0;
-
-        INIT_WORK(&chdlc_priv_area->common.wanpipe_work,
-                        (void *)(void *)chdlc_work, dev);
-
-        /* Allocate and initialize BH circular buffer */
-        /* Add 1 to MAX_BH_BUFF so we don't have test with (MAX_BH_BUFF-1) */
-        chdlc_priv_area->bh_head = kmalloc((sizeof(bh_data_t)*(MAX_BH_BUFF+1)),GFP_ATOMIC);
-        memset(chdlc_priv_area->bh_head,0,(sizeof(bh_data_t)*(MAX_BH_BUFF+1)));
-        atomic_set(&chdlc_priv_area->bh_buff_used, 0);
- 
-        do_gettimeofday(&tv);
-        chdlc_priv_area->router_start_time = tv.tv_sec;
-
-        netif_start_queue(dev);
-
-        wanpipe_open(card);
-
-        /* TTY is configured during wanpipe_set_termios
-         * call, not here */
-        if (card->tty_opt)
-                return err;
-        
-        set_bit(0,&chdlc_priv_area->config_chdlc);
-        chdlc_priv_area->config_chdlc_timeout=jiffies;
-
-        /* Start the CHDLC configuration after 1sec delay.
-         * This will give the interface initilization time
-         * to finish its configuration */
-        mod_timer(&chdlc_priv_area->poll_delay_timer, jiffies + HZ);
-        return err;
-}
-
-/*============================================================================
- * Close network interface.
- * o if this is the last close, then disable communications and interrupts.
- * o reset flags.
- */
-static int if_close(struct net_device* dev)
-{
-        chdlc_private_area_t* chdlc_priv_area = dev->priv;
-        sdla_t* card = chdlc_priv_area->card;
-
-        if (chdlc_priv_area->bh_head){
-                int i;
-                struct sk_buff *skb;
-        
-                for (i=0; i<(MAX_BH_BUFF+1); i++){
-                        skb = ((bh_data_t *)&chdlc_priv_area->bh_head[i])->skb;
-                        if (skb != NULL){
-                                dev_kfree_skb_any(skb);
-                        }
-                }
-                kfree(chdlc_priv_area->bh_head);
-                chdlc_priv_area->bh_head=NULL;
-        }
-
-        netif_stop_queue(dev);
-        wanpipe_close(card);
-        del_timer(&chdlc_priv_area->poll_delay_timer);
-        return 0;
-}
-
-static void disable_comm (sdla_t *card)
-{
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        
-        if (card->u.c.comm_enabled){
-                chdlc_disable_comm_shutdown (card);
-        }else{
-                flags->interrupt_info_struct.interrupt_permission = 0;  
-        }
-
-        if (!tty_init_cnt)
-                return;
-
-        if (card->tty_opt){
-                struct serial_state * state;
-                if (!(--tty_init_cnt)){
-                        int e1;
-                        serial_driver.refcount=0;
-                        
-                        if ((e1 = tty_unregister_driver(&serial_driver)))
-                                printk("SERIAL: failed to unregister serial driver (%d)\n",
-                                       e1);
-                        printk(KERN_INFO "%s: Unregistering TTY Driver, Major %i\n",
-                                        card->devname,WAN_TTY_MAJOR);
-                }
-                card->tty=NULL;
-                tty_card_map[card->tty_minor]=NULL;
-                state = &rs_table[card->tty_minor];
-                memset(state, 0, sizeof(*state));
-        }
-        return;
-}
-
-
-/*============================================================================
- * Build media header.
- *
- * The trick here is to put packet type (Ethertype) into 'protocol' field of
- * the socket buffer, so that we don't forget it.  If packet type is not
- * supported, set skb->protocol to 0 and discard packet later.
- *
- * Return:      media header length.
- */
-static int if_header(struct sk_buff* skb, struct net_device* dev,
-                     unsigned short type, void* daddr, void* saddr,
-                     unsigned len)
-{
-        skb->protocol = htons(type);
-
-        return CHDLC_HDR_LEN;
-}
-
-
-/*============================================================================
- * Handle transmit timeout event from netif watchdog
- */
-static void if_tx_timeout(struct net_device *dev)
-{
-        chdlc_private_area_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-        
-        /* If our device stays busy for at least 5 seconds then we will
-         * kick start the device by making dev->tbusy = 0.  We expect
-         * that our device never stays busy more than 5 seconds. So this                 
-         * is only used as a last resort.
-         */
-
-        ++card->wandev.stats.collisions;
-
-        printk (KERN_INFO "%s: Transmit timed out on %s\n", card->devname,dev->name);
-        netif_wake_queue (dev);
-}
-
-
-
-/*============================================================================
- * Re-build media header.
- *
- * Return:      1       physical address resolved.
- *              0       physical address not resolved
- */
-static int if_rebuild_hdr (struct sk_buff *skb)
-{
-        return 1;
-}
-
-
-/*============================================================================
- * Send a packet on a network interface.
- * o set tbusy flag (marks start of the transmission) to block a timer-based
- *   transmit from overlapping.
- * o check link state. If link is not up, then drop the packet.
- * o execute adapter send command.
- * o free socket buffer
- *
- * Return:      0       complete (socket buffer must be freed)
- *              non-0   packet may be re-transmitted (tbusy must be set)
- *
- * Notes:
- * 1. This routine is called either by the protocol stack or by the "net
- *    bottom half" (with interrupts enabled).
- * 2. Setting tbusy flag will inhibit further transmit requests from the
- *    protocol stack and can be used for flow control with protocol layer.
- */
-static int if_send(struct sk_buff* skb, struct net_device* dev)
-{
-        chdlc_private_area_t *chdlc_priv_area = dev->priv;
-        sdla_t *card = chdlc_priv_area->card;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        INTERRUPT_INFORMATION_STRUCT *chdlc_int = &flags->interrupt_info_struct;
-        int udp_type = 0;
-        unsigned long smp_flags;
-        int err=0;
-
-        netif_stop_queue(dev);
-        
-        if (skb == NULL){
-                /* If we get here, some higher layer thinks we've missed an
-                 * tx-done interrupt.
-                 */
-                printk(KERN_INFO "%s: interface %s got kicked!\n",
-                        card->devname, dev->name);
-
-                netif_wake_queue(dev);
-                return 0;
-        }
-
-        if (ntohs(skb->protocol) != htons(PVC_PROT)){
-
-                /* check the udp packet type */
-                
-                udp_type = udp_pkt_type(skb, card);
-
-                if (udp_type == UDP_CPIPE_TYPE){
-                        if(store_udp_mgmt_pkt(UDP_PKT_FRM_STACK, card, skb, dev,
-                                chdlc_priv_area)){
-                                chdlc_int->interrupt_permission |=
-                                        APP_INT_ON_TIMER;
-                        }
-                        netif_start_queue(dev);
-                        return 0;
-                }
-
-                /* check to see if the source IP address is a broadcast or */
-                /* multicast IP address */
-                if(chk_bcast_mcast_addr(card, dev, skb)){
-                        ++card->wandev.stats.tx_dropped;
-                        dev_kfree_skb_any(skb);
-                        netif_start_queue(dev);
-                        return 0;
-                }
-        }
-
-        /* Lock the 508 Card: SMP is supported */
-        if(card->hw.type != SDLA_S514){
-                s508_lock(card,&smp_flags);
-        } 
-
-        if(test_and_set_bit(SEND_CRIT, (void*)&card->wandev.critical)) {
-        
-                printk(KERN_INFO "%s: Critical in if_send: %lx\n",
-                                        card->wandev.name,card->wandev.critical);
-                ++card->wandev.stats.tx_dropped;
-                netif_start_queue(dev);
-                goto if_send_exit_crit;
-        }
-
-        if(card->u.c.state != WAN_CONNECTED){
-                ++card->wandev.stats.tx_dropped;
-                netif_start_queue(dev);
-                
-        }else if(!skb->protocol){
-                ++card->wandev.stats.tx_errors;
-                netif_start_queue(dev);
-                
-        }else {
-                void* data = skb->data;
-                unsigned len = skb->len;
-                unsigned char attr;
-
-                /* If it's an API packet pull off the API
-                 * header. Also check that the packet size
-                 * is larger than the API header
-                 */
-                if (card->u.c.usedby == API){
-                        api_tx_hdr_t* api_tx_hdr;
-
-                        /* discard the frame if we are configured for */
-                        /* 'receive only' mode or if there is no data */
-                        if (card->u.c.receive_only ||
-                                (len <= sizeof(api_tx_hdr_t))) {
-                                
-                                ++card->wandev.stats.tx_dropped;
-                                netif_start_queue(dev);
-                                goto if_send_exit_crit;
-                        }
-                                
-                        api_tx_hdr = (api_tx_hdr_t *)data;
-                        attr = api_tx_hdr->attr;
-                        data += sizeof(api_tx_hdr_t);
-                        len -= sizeof(api_tx_hdr_t);
-                }
-
-                if(chdlc_send(card, data, len)) {
-                        netif_stop_queue(dev);
-                }else{
-                        ++card->wandev.stats.tx_packets;
-                        card->wandev.stats.tx_bytes += len;
-                        
-                        netif_start_queue(dev);
-                        
-                        dev->trans_start = jiffies;
-                }       
-        }
-
-if_send_exit_crit:
-        
-        if (!(err=netif_queue_stopped(dev))) {
-                dev_kfree_skb_any(skb);
-        }else{
-                chdlc_priv_area->tick_counter = jiffies;
-                chdlc_int->interrupt_permission |= APP_INT_ON_TX_FRAME;
-        }
-
-        clear_bit(SEND_CRIT, (void*)&card->wandev.critical);
-        if(card->hw.type != SDLA_S514){
-                s508_unlock(card,&smp_flags);
-        }
-        
-        return err;
-}
-
-
-/*============================================================================
- * Check to see if the packet to be transmitted contains a broadcast or
- * multicast source IP address.
- */
-
-static int chk_bcast_mcast_addr(sdla_t *card, struct net_device* dev,
-                                struct sk_buff *skb)
-{
-        u32 src_ip_addr;
-        u32 broadcast_ip_addr = 0;
-        struct in_device *in_dev;
-
-        /* read the IP source address from the outgoing packet */
-        src_ip_addr = *(u32 *)(skb->data + 12);
-
-        /* read the IP broadcast address for the device */
-        in_dev = dev->ip_ptr;
-        if(in_dev != NULL) {
-                struct in_ifaddr *ifa= in_dev->ifa_list;
-                if(ifa != NULL)
-                        broadcast_ip_addr = ifa->ifa_broadcast;
-                else
-                        return 0;
-        }
- 
-        /* check if the IP Source Address is a Broadcast address */
-        if((dev->flags & IFF_BROADCAST) && (src_ip_addr == broadcast_ip_addr)) {
-                printk(KERN_INFO "%s: Broadcast Source Address silently discarded\n",
-                                card->devname);
-                return 1;
-        } 
-
-        /* check if the IP Source Address is a Multicast address */
-        if((ntohl(src_ip_addr) >= 0xE0000001) &&
-                (ntohl(src_ip_addr) <= 0xFFFFFFFE)) {
-                printk(KERN_INFO "%s: Multicast Source Address silently discarded\n",
-                                card->devname);
-                return 1;
-        }
-
-        return 0;
-}
-
-
-/*============================================================================
- * Reply to UDP Management system.
- * Return length of reply.
- */
-static int reply_udp( unsigned char *data, unsigned int mbox_len )
-{
-
-        unsigned short len, udp_length, temp, ip_length;
-        unsigned long ip_temp;
-        int even_bound = 0;
-        chdlc_udp_pkt_t *c_udp_pkt = (chdlc_udp_pkt_t *)data;
-         
-        /* Set length of packet */
-        len = sizeof(ip_pkt_t)+ 
-              sizeof(udp_pkt_t)+
-              sizeof(wp_mgmt_t)+
-              sizeof(cblock_t)+
-              sizeof(trace_info_t)+ 
-              mbox_len;
-
-        /* fill in UDP reply */
-        c_udp_pkt->wp_mgmt.request_reply = UDPMGMT_REPLY;
-   
-        /* fill in UDP length */
-        udp_length = sizeof(udp_pkt_t)+ 
-                     sizeof(wp_mgmt_t)+
-                     sizeof(cblock_t)+
-                     sizeof(trace_info_t)+
-                     mbox_len; 
-
-        /* put it on an even boundary */
-        if ( udp_length & 0x0001 ) {
-                udp_length += 1;
-                len += 1;
-                even_bound = 1;
-        }  
-
-        temp = (udp_length<<8)|(udp_length>>8);
-        c_udp_pkt->udp_pkt.udp_length = temp;
-                 
-        /* swap UDP ports */
-        temp = c_udp_pkt->udp_pkt.udp_src_port;
-        c_udp_pkt->udp_pkt.udp_src_port = 
-                        c_udp_pkt->udp_pkt.udp_dst_port; 
-        c_udp_pkt->udp_pkt.udp_dst_port = temp;
-
-        /* add UDP pseudo header */
-        temp = 0x1100;
-        *((unsigned short *)(c_udp_pkt->data+mbox_len+even_bound)) = temp;      
-        temp = (udp_length<<8)|(udp_length>>8);
-        *((unsigned short *)(c_udp_pkt->data+mbox_len+even_bound+2)) = temp;
-
-                 
-        /* calculate UDP checksum */
-        c_udp_pkt->udp_pkt.udp_checksum = 0;
-        c_udp_pkt->udp_pkt.udp_checksum = calc_checksum(&data[UDP_OFFSET],udp_length+UDP_OFFSET);
-
-        /* fill in IP length */
-        ip_length = len;
-        temp = (ip_length<<8)|(ip_length>>8);
-        c_udp_pkt->ip_pkt.total_length = temp;
-  
-        /* swap IP addresses */
-        ip_temp = c_udp_pkt->ip_pkt.ip_src_address;
-        c_udp_pkt->ip_pkt.ip_src_address = c_udp_pkt->ip_pkt.ip_dst_address;
-        c_udp_pkt->ip_pkt.ip_dst_address = ip_temp;
-
-        /* fill in IP checksum */
-        c_udp_pkt->ip_pkt.hdr_checksum = 0;
-        c_udp_pkt->ip_pkt.hdr_checksum = calc_checksum(data,sizeof(ip_pkt_t));
-
-        return len;
-
-} /* reply_udp */
-
-unsigned short calc_checksum (char *data, int len)
-{
-        unsigned short temp; 
-        unsigned long sum=0;
-        int i;
-
-        for( i = 0; i <len; i+=2 ) {
-                memcpy(&temp,&data[i],2);
-                sum += (unsigned long)temp;
-        }
-
-        while (sum >> 16 ) {
-                sum = (sum & 0xffffUL) + (sum >> 16);
-        }
-
-        temp = (unsigned short)sum;
-        temp = ~temp;
-
-        if( temp == 0 ) 
-                temp = 0xffff;
-
-        return temp;    
-}
-
-
-/*============================================================================
- * Get ethernet-style interface statistics.
- * Return a pointer to struct enet_statistics.
- */
-static struct net_device_stats* if_stats(struct net_device* dev)
-{
-        sdla_t *my_card;
-        chdlc_private_area_t* chdlc_priv_area;
-
-        if ((chdlc_priv_area=dev->priv) == NULL)
-                return NULL;
-
-        my_card = chdlc_priv_area->card;
-        return &my_card->wandev.stats; 
-}
-
-
-/****** Cisco HDLC Firmware Interface Functions *******************************/
-
-/*============================================================================
- * Read firmware code version.
- *      Put code version as ASCII string in str. 
- */
-static int chdlc_read_version (sdla_t* card, char* str)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        int len;
-        char err;
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_CODE_VERSION;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-        if(err != COMMAND_OK) {
-                chdlc_error(card,err,mb);
-        }
-        else if (str) {  /* is not null */
-                len = mb->buffer_length;
-                memcpy(str, mb->data, len);
-                str[len] = '\0';
-        }
-        return (err);
-}
-
-/*-----------------------------------------------------------------------------
- *  Configure CHDLC firmware.
- */
-static int chdlc_configure (sdla_t* card, void* data)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT *mailbox = card->mbox;
-        int data_length = sizeof(CHDLC_CONFIGURATION_STRUCT);
-        
-        mailbox->buffer_length = data_length;  
-        memcpy(mailbox->data, data, data_length);
-        mailbox->command = SET_CHDLC_CONFIGURATION;
-        err = sdla_exec(mailbox) ? mailbox->return_code : CMD_TIMEOUT;
-        
-        if (err != COMMAND_OK) chdlc_error (card, err, mailbox);
-                           
-        return err;
-}
-
-
-/*============================================================================
- * Set interrupt mode -- HDLC Version.
- */
-
-static int chdlc_set_intr_mode (sdla_t* card, unsigned mode)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        CHDLC_INT_TRIGGERS_STRUCT* int_data =
-                 (CHDLC_INT_TRIGGERS_STRUCT *)mb->data;
-        int err;
-
-        int_data->CHDLC_interrupt_triggers      = mode;
-        int_data->IRQ                           = card->hw.irq;
-        int_data->interrupt_timer               = 1;
-   
-        mb->buffer_length = sizeof(CHDLC_INT_TRIGGERS_STRUCT);
-        mb->command = SET_CHDLC_INTERRUPT_TRIGGERS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error (card, err, mb);
-        return err;
-}
-
-
-/*===========================================================
- * chdlc_disable_comm_shutdown
- *
- * Shutdown() disables the communications. We must
- * have a sparate functions, because we must not
- * call chdlc_error() hander since the private
- * area has already been replaced */
-
-static int chdlc_disable_comm_shutdown (sdla_t *card)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        CHDLC_INT_TRIGGERS_STRUCT* int_data =
-                 (CHDLC_INT_TRIGGERS_STRUCT *)mb->data;
-        int err;
-
-        /* Disable Interrutps */
-        int_data->CHDLC_interrupt_triggers      = 0;
-        int_data->IRQ                           = card->hw.irq;
-        int_data->interrupt_timer               = 1;
-   
-        mb->buffer_length = sizeof(CHDLC_INT_TRIGGERS_STRUCT);
-        mb->command = SET_CHDLC_INTERRUPT_TRIGGERS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-        /* Disable Communications */
-
-        if (card->u.c.async_mode) {
-                mb->command = DISABLE_ASY_COMMUNICATIONS;
-        }else{
-                mb->command = DISABLE_CHDLC_COMMUNICATIONS;
-        }
-        
-        mb->buffer_length = 0;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        
-        card->u.c.comm_enabled = 0;
-        
-        return 0;
-}
-
-/*============================================================================
- * Enable communications.
- */
-
-static int chdlc_comm_enable (sdla_t* card)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = ENABLE_CHDLC_COMMUNICATIONS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error(card, err, mb);
-        else
-                card->u.c.comm_enabled = 1;
-        
-        return err;
-}
-
-/*============================================================================
- * Read communication error statistics.
- */
-static int chdlc_read_comm_err_stats (sdla_t* card)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = READ_COMMS_ERROR_STATS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error(card,err,mb);
-        return err;
-}
-
-
-/*============================================================================
- * Read CHDLC operational statistics.
- */
-static int chdlc_read_op_stats (sdla_t* card)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_OPERATIONAL_STATS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error(card,err,mb);
-        return err;
-}
-
-
-/*============================================================================
- * Update communications error and general packet statistics.
- */
-static int update_comms_stats(sdla_t* card,
-        chdlc_private_area_t* chdlc_priv_area)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        COMMS_ERROR_STATS_STRUCT* err_stats;
-        CHDLC_OPERATIONAL_STATS_STRUCT *op_stats;
-
-        /* on the first timer interrupt, read the comms error statistics */
-        if(chdlc_priv_area->update_comms_stats == 2) {
-                if(chdlc_read_comm_err_stats(card))
-                        return 1;
-                err_stats = (COMMS_ERROR_STATS_STRUCT *)mb->data;
-                card->wandev.stats.rx_over_errors = 
-                                err_stats->Rx_overrun_err_count;
-                card->wandev.stats.rx_crc_errors = 
-                                err_stats->CRC_err_count;
-                card->wandev.stats.rx_frame_errors = 
-                                err_stats->Rx_abort_count;
-                card->wandev.stats.rx_fifo_errors = 
-                                err_stats->Rx_dis_pri_bfrs_full_count; 
-                card->wandev.stats.rx_missed_errors =
-                                card->wandev.stats.rx_fifo_errors;
-                card->wandev.stats.tx_aborted_errors =
-                                err_stats->sec_Tx_abort_count;
-        }
-
-        /* on the second timer interrupt, read the operational statistics */
-        else {
-                if(chdlc_read_op_stats(card))
-                        return 1;
-                op_stats = (CHDLC_OPERATIONAL_STATS_STRUCT *)mb->data;
-                card->wandev.stats.rx_length_errors =
-                        (op_stats->Rx_Data_discard_short_count +
-                        op_stats->Rx_Data_discard_long_count);
-        }
-
-        return 0;
-}
-
-/*============================================================================
- * Send packet.
- *      Return: 0 - o.k.
- *              1 - no transmit buffers available
- */
-static int chdlc_send (sdla_t* card, void* data, unsigned len)
-{
-        CHDLC_DATA_TX_STATUS_EL_STRUCT *txbuf = card->u.c.txbuf;
-
-        if (txbuf->opp_flag)
-                return 1;
-        
-        sdla_poke(&card->hw, txbuf->ptr_data_bfr, data, len);
-
-        txbuf->frame_length = len;
-        txbuf->opp_flag = 1;            /* start transmission */
-        
-        /* Update transmit buffer control fields */
-        card->u.c.txbuf = ++txbuf;
-        
-        if ((void*)txbuf > card->u.c.txbuf_last)
-                card->u.c.txbuf = card->u.c.txbuf_base;
-        
-        return 0;
-}
-
-/****** Firmware Error Handler **********************************************/
-
-/*============================================================================
- * Firmware error handler.
- *      This routine is called whenever firmware command returns non-zero
- *      return code.
- *
- * Return zero if previous command has to be cancelled.
- */
-static int chdlc_error (sdla_t *card, int err, CHDLC_MAILBOX_STRUCT *mb)
-{
-        unsigned cmd = mb->command;
-
-        switch (err) {
-
-        case CMD_TIMEOUT:
-                printk(KERN_INFO "%s: command 0x%02X timed out!\n",
-                        card->devname, cmd);
-                break;
-
-        case S514_BOTH_PORTS_SAME_CLK_MODE:
-                if(cmd == SET_CHDLC_CONFIGURATION) {
-                        printk(KERN_INFO
-                         "%s: Configure both ports for the same clock source\n",
-                                card->devname);
-                        break;
-                }
-
-        default:
-                printk(KERN_INFO "%s: command 0x%02X returned 0x%02X!\n",
-                        card->devname, cmd, err);
-        }
-
-        return 0;
-}
-
-
-/********** Bottom Half Handlers ********************************************/
-
-/* NOTE: There is no API, BH support for Kernels lower than 2.2.X.
- *       DO NOT INSERT ANY CODE HERE, NOTICE THE 
- *       PREPROCESSOR STATEMENT ABOVE, UNLESS YOU KNOW WHAT YOU ARE
- *       DOING */
-
-static void chdlc_work(struct net_device * dev)
-{
-        chdlc_private_area_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-        struct sk_buff *skb;
-
-        if (atomic_read(&chan->bh_buff_used) == 0){
-                clear_bit(0, &chan->tq_working);
-                return;
-        }
-
-        while (atomic_read(&chan->bh_buff_used)){
-
-                skb  = ((bh_data_t *)&chan->bh_head[chan->bh_read])->skb;
-
-                if (skb != NULL){
-
-                        if (chan->common.sk == NULL || chan->common.func == NULL){
-                                ++card->wandev.stats.rx_dropped;
-                                dev_kfree_skb_any(skb);
-                                chdlc_work_cleanup(dev);
-                                continue;
-                        }
-
-                        if (chan->common.func(skb,dev,chan->common.sk) != 0){
-                                /* Sock full cannot send, queue us for another
-                                 * try */
-                                atomic_set(&chan->common.receive_block,1);
-                                return;
-                        }else{
-                                chdlc_work_cleanup(dev);
-                        }
-                }else{
-                        chdlc_work_cleanup(dev);
-                }
-        }       
-        clear_bit(0, &chan->tq_working);
-
-        return;
-}
-
-static int chdlc_work_cleanup(struct net_device *dev)
-{
-        chdlc_private_area_t* chan = dev->priv;
-
-        ((bh_data_t *)&chan->bh_head[chan->bh_read])->skb = NULL;
-
-        if (chan->bh_read == MAX_BH_BUFF){
-                chan->bh_read=0;
-        }else{
-                ++chan->bh_read;        
-        }
-
-        atomic_dec(&chan->bh_buff_used);
-        return 0;
-}
-
-
-
-static int bh_enqueue(struct net_device *dev, struct sk_buff *skb)
-{
-        /* Check for full */
-        chdlc_private_area_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-
-        if (atomic_read(&chan->bh_buff_used) == (MAX_BH_BUFF+1)){
-                ++card->wandev.stats.rx_dropped;
-                dev_kfree_skb_any(skb);
-                return 1; 
-        }
-
-        ((bh_data_t *)&chan->bh_head[chan->bh_write])->skb = skb;
-
-        if (chan->bh_write == MAX_BH_BUFF){
-                chan->bh_write=0;
-        }else{
-                ++chan->bh_write;
-        }
-
-        atomic_inc(&chan->bh_buff_used);
-
-        return 0;
-}
-
-/* END OF API BH Support */
-
-
-/****** Interrupt Handlers **************************************************/
-
-/*============================================================================
- * Cisco HDLC interrupt service routine.
- */
-static void wpc_isr (sdla_t* card)
-{
-        struct net_device* dev;
-        SHARED_MEMORY_INFO_STRUCT* flags = NULL;
-        int i;
-        sdla_t *my_card;
-
-
-        /* Check for which port the interrupt has been generated
-         * Since Secondary Port is piggybacking on the Primary
-         * the check must be done here. 
-         */
-
-        flags = card->u.c.flags;
-        if (!flags->interrupt_info_struct.interrupt_type){
-                /* Check for a second port (piggybacking) */
-                if ((my_card = card->next)){
-                        flags = my_card->u.c.flags;
-                        if (flags->interrupt_info_struct.interrupt_type){
-                                card = my_card;
-                                card->isr(card);
-                                return;
-                        }
-                }
-        }
-
-        flags = card->u.c.flags;
-        card->in_isr = 1;
-        dev = card->wandev.dev;
-        
-        /* If we get an interrupt with no network device, stop the interrupts
-         * and issue an error */
-        if (!card->tty_opt && !dev && 
-            flags->interrupt_info_struct.interrupt_type != 
-                COMMAND_COMPLETE_APP_INT_PEND){
-
-                goto isr_done;
-        }
-        
-        /* if critical due to peripheral operations
-         * ie. update() or getstats() then reset the interrupt and
-         * wait for the board to retrigger.
-         */
-        if(test_bit(PERI_CRIT, (void*)&card->wandev.critical)) {
-                printk(KERN_INFO "ISR CRIT TO PERI\n");
-                goto isr_done;
-        }
-
-        /* On a 508 Card, if critical due to if_send 
-         * Major Error !!! */
-        if(card->hw.type != SDLA_S514) {
-                if(test_bit(SEND_CRIT, (void*)&card->wandev.critical)) {
-                        printk(KERN_INFO "%s: Critical while in ISR: %lx\n",
-                                card->devname, card->wandev.critical);
-                        card->in_isr = 0;
-                        flags->interrupt_info_struct.interrupt_type = 0;
-                        return;
-                }
-        }
-
-        switch(flags->interrupt_info_struct.interrupt_type) {
-
-        case RX_APP_INT_PEND:   /* 0x01: receive interrupt */
-                rx_intr(card);
-                break;
-
-        case TX_APP_INT_PEND:   /* 0x02: transmit interrupt */
-                flags->interrupt_info_struct.interrupt_permission &=
-                         ~APP_INT_ON_TX_FRAME;
-
-                if (card->tty_opt){
-                        wanpipe_tty_trigger_poll(card);
-                        break;
-                }
-
-                if (dev && netif_queue_stopped(dev)){
-                        if (card->u.c.usedby == API){
-                                netif_start_queue(dev);
-                                wakeup_sk_bh(dev);
-                        }else{
-                                netif_wake_queue(dev);
-                        }
-                }
-                break;
-
-        case COMMAND_COMPLETE_APP_INT_PEND:/* 0x04: cmd cplt */
-                ++ Intr_test_counter;
-                break;
-
-        case CHDLC_EXCEP_COND_APP_INT_PEND:     /* 0x20 */
-                process_chdlc_exception(card);
-                break;
-
-        case GLOBAL_EXCEP_COND_APP_INT_PEND:
-                process_global_exception(card);
-                break;
-
-        case TIMER_APP_INT_PEND:
-                timer_intr(card);
-                break;
-
-        default:
-                printk(KERN_INFO "%s: spurious interrupt 0x%02X!\n", 
-                        card->devname,
-                        flags->interrupt_info_struct.interrupt_type);
-                printk(KERN_INFO "Code name: ");
-                for(i = 0; i < 4; i ++)
-                        printk(KERN_INFO "%c",
-                                flags->global_info_struct.codename[i]); 
-                printk(KERN_INFO "\nCode version: ");
-                for(i = 0; i < 4; i ++)
-                        printk(KERN_INFO "%c", 
-                                flags->global_info_struct.codeversion[i]); 
-                printk(KERN_INFO "\n"); 
-                break;
-        }
-
-isr_done:
-
-        card->in_isr = 0;
-        flags->interrupt_info_struct.interrupt_type = 0;
-        return;
-}
-
-/*============================================================================
- * Receive interrupt handler.
- */
-static void rx_intr (sdla_t* card)
-{
-        struct net_device *dev;
-        chdlc_private_area_t *chdlc_priv_area;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        CHDLC_DATA_RX_STATUS_EL_STRUCT *rxbuf = card->u.c.rxmb;
-        struct sk_buff *skb;
-        unsigned len;
-        unsigned addr = rxbuf->ptr_data_bfr;
-        void *buf;
-        int i,udp_type;
-
-        if (rxbuf->opp_flag != 0x01) {
-                printk(KERN_INFO 
-                        "%s: corrupted Rx buffer @ 0x%X, flag = 0x%02X!\n", 
-                        card->devname, (unsigned)rxbuf, rxbuf->opp_flag);
-                printk(KERN_INFO "Code name: ");
-                for(i = 0; i < 4; i ++)
-                        printk(KERN_INFO "%c",
-                                flags->global_info_struct.codename[i]);
-                printk(KERN_INFO "\nCode version: ");
-                for(i = 0; i < 4; i ++)
-                        printk(KERN_INFO "%c",
-                                flags->global_info_struct.codeversion[i]);
-                printk(KERN_INFO "\n");
-
-
-                /* Bug Fix: Mar 6 2000
-                 * If we get a corrupted mailbox, it measn that driver 
-                 * is out of sync with the firmware. There is no recovery.
-                 * If we don't turn off all interrupts for this card
-                 * the machine will crash. 
-                 */
-                printk(KERN_INFO "%s: Critical router failure ...!!!\n", card->devname);
-                printk(KERN_INFO "Please contact Sangoma Technologies !\n");
-                chdlc_set_intr_mode(card,0);    
-                return;
-        }
-
-        len  = rxbuf->frame_length;
-
-        if (card->tty_opt){
-
-                if (rxbuf->error_flag){ 
-                        goto rx_exit;
-                }
-
-                if (len <= CRC_LENGTH){
-                        goto rx_exit;
-                }
-                
-                if (!card->u.c.async_mode){
-                        len -= CRC_LENGTH;
-                }
-
-                wanpipe_tty_receive(card,addr,len);
-                goto rx_exit;
-        }
-
-        dev = card->wandev.dev;
-
-        if (!dev){
-                goto rx_exit;
-        }
-
-        if (!netif_running(dev))
-                goto rx_exit;
-
-        chdlc_priv_area = dev->priv;
-
-        
-        /* Allocate socket buffer */
-        skb = dev_alloc_skb(len);
-
-        if (skb == NULL) {
-                printk(KERN_INFO "%s: no socket buffers available!\n",
-                                        card->devname);
-                ++card->wandev.stats.rx_dropped;
-                goto rx_exit;
-        }
-
-        /* Copy data to the socket buffer */
-        if((addr + len) > card->u.c.rx_top + 1) {
-                unsigned tmp = card->u.c.rx_top - addr + 1;
-                buf = skb_put(skb, tmp);
-                sdla_peek(&card->hw, addr, buf, tmp);
-                addr = card->u.c.rx_base;
-                len -= tmp;
-        }
-                
-        buf = skb_put(skb, len);
-        sdla_peek(&card->hw, addr, buf, len);
-
-        skb->protocol = htons(ETH_P_IP);
-
-        card->wandev.stats.rx_packets ++;
-        card->wandev.stats.rx_bytes += skb->len;
-        udp_type = udp_pkt_type( skb, card );
-
-        if(udp_type == UDP_CPIPE_TYPE) {
-                if(store_udp_mgmt_pkt(UDP_PKT_FRM_NETWORK,
-                                      card, skb, dev, chdlc_priv_area)) {
-                        flags->interrupt_info_struct.
-                                                interrupt_permission |= 
-                                                        APP_INT_ON_TIMER; 
-                }
-        } else if(card->u.c.usedby == API) {
-
-                api_rx_hdr_t* api_rx_hdr;
-                skb_push(skb, sizeof(api_rx_hdr_t));
-                api_rx_hdr = (api_rx_hdr_t*)&skb->data[0x00];
-                api_rx_hdr->error_flag = rxbuf->error_flag;
-                api_rx_hdr->time_stamp = rxbuf->time_stamp;
-
-                skb->protocol = htons(PVC_PROT);
-                skb->mac.raw  = skb->data;
-                skb->dev      = dev;
-                skb->pkt_type = WAN_PACKET_DATA;
-
-                bh_enqueue(dev, skb);
-
-                if (!test_and_set_bit(0,&chdlc_priv_area->tq_working))
-                        wanpipe_queue_work(&chdlc_priv_area->common.wanpipe_work);
-        }else{
-                /* FIXME: we should check to see if the received packet is a 
-                          multicast packet so that we can increment the multicast 
-                          statistic
-                          ++ chdlc_priv_area->if_stats.multicast;
-                */
-                /* Pass it up the protocol stack */
-        
-                skb->dev = dev;
-                skb->mac.raw  = skb->data;
-                netif_rx(skb);
-                dev->last_rx = jiffies;
-        }
-
-rx_exit:
-        /* Release buffer element and calculate a pointer to the next one */
-        rxbuf->opp_flag = 0x00;
-        card->u.c.rxmb = ++ rxbuf;
-        if((void*)rxbuf > card->u.c.rxbuf_last){
-                card->u.c.rxmb = card->u.c.rxbuf_base;
-        }
-}
-
-/*============================================================================
- * Timer interrupt handler.
- * The timer interrupt is used for two purposes:
- *    1) Processing udp calls from 'cpipemon'.
- *    2) Reading board-level statistics for updating the proc file system.
- */
-void timer_intr(sdla_t *card)
-{
-        struct net_device* dev;
-        chdlc_private_area_t* chdlc_priv_area = NULL;
-        SHARED_MEMORY_INFO_STRUCT* flags = NULL;
-
-        if ((dev = card->wandev.dev)==NULL){
-                flags = card->u.c.flags;
-                flags->interrupt_info_struct.interrupt_permission &=
-                        ~APP_INT_ON_TIMER;
-                return;
-        }
-        
-        chdlc_priv_area = dev->priv;
-
-        if (chdlc_priv_area->timer_int_enabled & TMR_INT_ENABLED_CONFIG) {
-                if (!config_chdlc(card)){
-                        chdlc_priv_area->timer_int_enabled &= ~TMR_INT_ENABLED_CONFIG;
-                }
-        }
-
-        /* process a udp call if pending */
-        if(chdlc_priv_area->timer_int_enabled & TMR_INT_ENABLED_UDP) {
-                process_udp_mgmt_pkt(card, dev,
-                       chdlc_priv_area);
-                chdlc_priv_area->timer_int_enabled &= ~TMR_INT_ENABLED_UDP;
-        }
-
-        /* read the communications statistics if required */
-        if(chdlc_priv_area->timer_int_enabled & TMR_INT_ENABLED_UPDATE) {
-                update_comms_stats(card, chdlc_priv_area);
-                if(!(-- chdlc_priv_area->update_comms_stats)) {
-                        chdlc_priv_area->timer_int_enabled &= 
-                                ~TMR_INT_ENABLED_UPDATE;
-                }
-        }
-
-        /* only disable the timer interrupt if there are no udp or statistic */
-        /* updates pending */
-        if(!chdlc_priv_area->timer_int_enabled) {
-                flags = card->u.c.flags;
-                flags->interrupt_info_struct.interrupt_permission &=
-                        ~APP_INT_ON_TIMER;
-        }
-}
-
-/*------------------------------------------------------------------------------
-  Miscellaneous Functions
-        - set_chdlc_config() used to set configuration options on the board
-------------------------------------------------------------------------------*/
-
-static int set_chdlc_config(sdla_t* card)
-{
-        CHDLC_CONFIGURATION_STRUCT cfg;
-
-        memset(&cfg, 0, sizeof(CHDLC_CONFIGURATION_STRUCT));
-
-        if(card->wandev.clocking){
-                cfg.baud_rate = card->wandev.bps;
-        }
-                
-        cfg.line_config_options = (card->wandev.interface == WANOPT_RS232) ?
-                INTERFACE_LEVEL_RS232 : INTERFACE_LEVEL_V35;
-
-        cfg.modem_config_options        = 0;
-        cfg.modem_status_timer          = 100;
-
-        cfg.CHDLC_protocol_options      = card->u.c.protocol_options;
-
-        if (card->tty_opt){
-                cfg.CHDLC_API_options   = DISCARD_RX_ERROR_FRAMES;
-        }
-        
-        cfg.percent_data_buffer_for_Tx  = (card->u.c.receive_only) ? 0 : 50;
-        cfg.CHDLC_statistics_options    = (CHDLC_TX_DATA_BYTE_COUNT_STAT |
-                CHDLC_RX_DATA_BYTE_COUNT_STAT);
-        
-        if (card->tty_opt){
-                card->wandev.mtu = TTY_CHDLC_MAX_MTU;
-        }
-        cfg.max_CHDLC_data_field_length = card->wandev.mtu;
-        cfg.transmit_keepalive_timer    = card->u.c.kpalv_tx;
-        cfg.receive_keepalive_timer     = card->u.c.kpalv_rx;
-        cfg.keepalive_error_tolerance   = card->u.c.kpalv_err;
-        cfg.SLARP_request_timer         = card->u.c.slarp_timer;
-
-        if (cfg.SLARP_request_timer) {
-                cfg.IP_address          = 0;
-                cfg.IP_netmask          = 0;
-                
-        }else if (card->wandev.dev){
-                struct net_device *dev = card->wandev.dev;
-                chdlc_private_area_t *chdlc_priv_area = dev->priv;
-                
-                struct in_device *in_dev = dev->ip_ptr;
-
-                if(in_dev != NULL) {
-                        struct in_ifaddr *ifa = in_dev->ifa_list;
-
-                        if (ifa != NULL ) {
-                                cfg.IP_address  = ntohl(ifa->ifa_local);
-                                cfg.IP_netmask  = ntohl(ifa->ifa_mask); 
-                                chdlc_priv_area->IP_address = ntohl(ifa->ifa_local);
-                                chdlc_priv_area->IP_netmask = ntohl(ifa->ifa_mask); 
-                        }
-                }
-
-                /* FIXME: We must re-think this message in next release
-                if((cfg.IP_address & 0x000000FF) > 2) {
-                        printk(KERN_WARNING "\n");
-                        printk(KERN_WARNING "  WARNING:%s configured with an\n",
-                                card->devname);
-                        printk(KERN_WARNING "  invalid local IP address.\n");
-                        printk(KERN_WARNING "  Slarp pragmatics will fail.\n");
-                        printk(KERN_WARNING "  IP address should be of the\n");
-                        printk(KERN_WARNING "  format A.B.C.1 or A.B.C.2.\n");
-                }
-                */              
-        }
-        
-        return chdlc_configure(card, &cfg);
-}
-
-
-/*-----------------------------------------------------------------------------
-   set_asy_config() used to set asynchronous configuration options on the board
-------------------------------------------------------------------------------*/
-
-static int set_asy_config(sdla_t* card)
-{
-
-        ASY_CONFIGURATION_STRUCT cfg;
-        CHDLC_MAILBOX_STRUCT *mailbox = card->mbox;
-        int err;
-
-        memset(&cfg, 0, sizeof(ASY_CONFIGURATION_STRUCT));
-
-        if(card->wandev.clocking)
-                cfg.baud_rate = card->wandev.bps;
-
-        cfg.line_config_options = (card->wandev.interface == WANOPT_RS232) ?
-                INTERFACE_LEVEL_RS232 : INTERFACE_LEVEL_V35;
-
-        cfg.modem_config_options        = 0;
-        cfg.asy_API_options             = card->u.c.api_options;
-        cfg.asy_protocol_options        = card->u.c.protocol_options;
-        cfg.Tx_bits_per_char            = card->u.c.tx_bits_per_char;
-        cfg.Rx_bits_per_char            = card->u.c.rx_bits_per_char;
-        cfg.stop_bits                   = card->u.c.stop_bits;
-        cfg.parity                      = card->u.c.parity;
-        cfg.break_timer                 = card->u.c.break_timer;
-        cfg.asy_Rx_inter_char_timer     = card->u.c.inter_char_timer; 
-        cfg.asy_Rx_complete_length      = card->u.c.rx_complete_length; 
-        cfg.XON_char                    = card->u.c.xon_char;
-        cfg.XOFF_char                   = card->u.c.xoff_char;
-        cfg.asy_statistics_options      = (CHDLC_TX_DATA_BYTE_COUNT_STAT |
-                CHDLC_RX_DATA_BYTE_COUNT_STAT);
-
-        mailbox->buffer_length = sizeof(ASY_CONFIGURATION_STRUCT);
-        memcpy(mailbox->data, &cfg, mailbox->buffer_length);
-        mailbox->command = SET_ASY_CONFIGURATION;
-        err = sdla_exec(mailbox) ? mailbox->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK) 
-                chdlc_error (card, err, mailbox);
-        return err;
-}
-
-/*============================================================================
- * Enable asynchronous communications.
- */
-
-static int asy_comm_enable (sdla_t* card)
-{
-
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = ENABLE_ASY_COMMUNICATIONS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK && card->wandev.dev)
-                chdlc_error(card, err, mb);
-        
-        if (!err)
-                card->u.c.comm_enabled = 1;
-
-        return err;
-}
-
-/*============================================================================
- * Process global exception condition
- */
-static int process_global_exception(sdla_t *card)
-{
-        CHDLC_MAILBOX_STRUCT* mbox = card->mbox;
-        int err;
-
-        mbox->buffer_length = 0;
-        mbox->command = READ_GLOBAL_EXCEPTION_CONDITION;
-        err = sdla_exec(mbox) ? mbox->return_code : CMD_TIMEOUT;
-
-        if(err != CMD_TIMEOUT ){
-        
-                switch(mbox->return_code) {
-         
-                case EXCEP_MODEM_STATUS_CHANGE:
-
-                        printk(KERN_INFO "%s: Modem status change\n",
-                                card->devname);
-
-                        switch(mbox->data[0] & (DCD_HIGH | CTS_HIGH)) {
-                                case (DCD_HIGH):
-                                        printk(KERN_INFO "%s: DCD high, CTS low\n",card->devname);
-                                        break;
-                                case (CTS_HIGH):
-                                        printk(KERN_INFO "%s: DCD low, CTS high\n",card->devname); 
-                                        break;
-                                case ((DCD_HIGH | CTS_HIGH)):
-                                        printk(KERN_INFO "%s: DCD high, CTS high\n",card->devname);
-                                        break;
-                                default:
-                                        printk(KERN_INFO "%s: DCD low, CTS low\n",card->devname);
-                                        break;
-                        }
-                        break;
-
-                case EXCEP_TRC_DISABLED:
-                        printk(KERN_INFO "%s: Line trace disabled\n",
-                                card->devname);
-                        break;
-
-                case EXCEP_IRQ_TIMEOUT:
-                        printk(KERN_INFO "%s: IRQ timeout occurred\n",
-                                card->devname); 
-                        break;
-
-                case 0x17:
-                        if (card->tty_opt){
-                                if (card->tty && card->tty_open){ 
-                                        printk(KERN_INFO 
-                                                "%s: Modem Hangup Exception: Hanging Up!\n",
-                                                card->devname);
-                                        tty_hangup(card->tty);
-                                }
-                                break;
-                        }
-
-                        /* If TTY is not used just drop throught */
-                        
-                default:
-                        printk(KERN_INFO "%s: Global exception %x\n",
-                                card->devname, mbox->return_code);
-                        break;
-                }
-        }
-        return 0;
-}
-
-
-/*============================================================================
- * Process chdlc exception condition
- */
-static int process_chdlc_exception(sdla_t *card)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        int err;
-
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_EXCEPTION_CONDITION;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if(err != CMD_TIMEOUT) {
-        
-                switch (err) {
-
-                case EXCEP_LINK_ACTIVE:
-                        port_set_state(card, WAN_CONNECTED);
-                        trigger_chdlc_poll(card->wandev.dev);
-                        break;
-
-                case EXCEP_LINK_INACTIVE_MODEM:
-                        port_set_state(card, WAN_DISCONNECTED);
-                        unconfigure_ip(card);
-                        trigger_chdlc_poll(card->wandev.dev);
-                        break;
-
-                case EXCEP_LINK_INACTIVE_KPALV:
-                        port_set_state(card, WAN_DISCONNECTED);
-                        printk(KERN_INFO "%s: Keepalive timer expired.\n",
-                                                card->devname);
-                        unconfigure_ip(card);
-                        trigger_chdlc_poll(card->wandev.dev);
-                        break;
-
-                case EXCEP_IP_ADDRESS_DISCOVERED:
-                        if (configure_ip(card)) 
-                                return -1;
-                        break;
-
-                case EXCEP_LOOPBACK_CONDITION:
-                        printk(KERN_INFO "%s: Loopback Condition Detected.\n",
-                                                card->devname);
-                        break;
-
-                case NO_CHDLC_EXCEP_COND_TO_REPORT:
-                        printk(KERN_INFO "%s: No exceptions reported.\n",
-                                                card->devname);
-                        break;
-                }
-
-        }
-        return 0;
-}
-
-
-/*============================================================================
- * Configure IP from SLARP negotiation
- * This adds dynamic routes when SLARP has provided valid addresses
- */
-
-static int configure_ip (sdla_t* card)
-{
-        struct net_device *dev = card->wandev.dev;
-        chdlc_private_area_t *chdlc_priv_area;
-        char err;
-
-        if (!dev)
-                return 0;
-
-        chdlc_priv_area = dev->priv;
-        
-        
-        /* set to discover */
-        if(card->u.c.slarp_timer != 0x00) {
-                CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-                CHDLC_CONFIGURATION_STRUCT *cfg;
-
-                mb->buffer_length = 0;
-                mb->command = READ_CHDLC_CONFIGURATION;
-                err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        
-                if(err != COMMAND_OK) {
-                        chdlc_error(card,err,mb);
-                        return -1;
-                }
-
-                cfg = (CHDLC_CONFIGURATION_STRUCT *)mb->data;
-                chdlc_priv_area->IP_address = cfg->IP_address;
-                chdlc_priv_area->IP_netmask = cfg->IP_netmask;
-
-                /* Set flag to add route */
-                chdlc_priv_area->route_status = ADD_ROUTE;
-
-                /* The idea here is to add the route in the poll routine.
-                This way, we aren't in interrupt context when adding routes */
-                trigger_chdlc_poll(dev);
-        }
-
-        return 0;
-}
-
-
-/*============================================================================
- * Un-Configure IP negotiated by SLARP
- * This removes dynamic routes when the link becomes inactive.
- */
-
-static int unconfigure_ip (sdla_t* card)
-{
-        struct net_device *dev = card->wandev.dev;
-        chdlc_private_area_t *chdlc_priv_area;
-
-        if (!dev)
-                return 0;
-
-        chdlc_priv_area= dev->priv;
-        
-        if (chdlc_priv_area->route_status == ROUTE_ADDED) {
-
-                /* Note: If this function is called, the 
-                 * port state has been DISCONNECTED.  This state
-                 * change will trigger a poll_disconnected 
-                 * function, that will check for this condition. 
-                 */
-                chdlc_priv_area->route_status = REMOVE_ROUTE;
-
-        }
-        return 0;
-}
-
-/*============================================================================
- * Routine to add/remove routes 
- * Called like a polling routine when Routes are flagged to be added/removed.
- */
-
-static void process_route (sdla_t *card)
-{
-        struct net_device *dev = card->wandev.dev;
-        unsigned char port_num;
-        chdlc_private_area_t *chdlc_priv_area = NULL;
-        u32 local_IP_addr = 0;
-        u32 remote_IP_addr = 0;
-        u32 IP_netmask, IP_addr;
-        int err = 0;
-        struct in_device *in_dev;
-        mm_segment_t fs;
-        struct ifreq if_info;
-        struct sockaddr_in *if_data1, *if_data2;
-        
-        chdlc_priv_area = dev->priv;
-        port_num = card->u.c.comm_port;
-
-        /* Bug Fix Mar 16 2000
-         * AND the IP address to the Mask before checking
-         * the last two bits. */
-
-        if((chdlc_priv_area->route_status == ADD_ROUTE) &&
-                ((chdlc_priv_area->IP_address & ~chdlc_priv_area->IP_netmask) > 2)) {
-
-                printk(KERN_INFO "%s: Dynamic route failure.\n",card->devname);
-
-                if(card->u.c.slarp_timer) {
-                        u32 addr_net = htonl(chdlc_priv_area->IP_address);
-
-                        printk(KERN_INFO "%s: Bad IP address %u.%u.%u.%u received\n",
-                                card->devname,
-                               NIPQUAD(addr_net));
-                        printk(KERN_INFO "%s: from remote station.\n",
-                                card->devname);
-
-                }else{ 
-                        u32 addr_net = htonl(chdlc_priv_area->IP_address);
-
-                        printk(KERN_INFO "%s: Bad IP address %u.%u.%u.%u issued\n",
-                               card->devname,
-                               NIPQUAD(addr_net));
-                        printk(KERN_INFO "%s: to remote station. Local\n",
-                                card->devname);
-                        printk(KERN_INFO "%s: IP address must be A.B.C.1\n",
-                                card->devname);
-                        printk(KERN_INFO "%s: or A.B.C.2.\n",card->devname);
-                }
-
-                /* remove the route due to the IP address error condition */
-                chdlc_priv_area->route_status = REMOVE_ROUTE;
-                err = 1;
-        }
-
-        /* If we are removing a route with bad IP addressing, then use the */
-        /* locally configured IP addresses */
-        if((chdlc_priv_area->route_status == REMOVE_ROUTE) && err) {
-
-                /* do not remove a bad route that has already been removed */
-                if(chdlc_priv_area->route_removed) {
-                        return;
-                }
-
-                in_dev = dev->ip_ptr;
-
-                if(in_dev != NULL) {
-                        struct in_ifaddr *ifa = in_dev->ifa_list;
-                        if (ifa != NULL ) {
-                                local_IP_addr = ifa->ifa_local;
-                                IP_netmask  = ifa->ifa_mask;
-                        }
-                }
-        }else{ 
-                /* According to Cisco HDLC, if the point-to-point address is
-                   A.B.C.1, then we are the opposite (A.B.C.2), and vice-versa.
-                */
-                IP_netmask = ntohl(chdlc_priv_area->IP_netmask);
-                remote_IP_addr = ntohl(chdlc_priv_area->IP_address);
-        
-
-                /* If Netmask is 255.255.255.255 the local address
-                 * calculation will fail. Default it back to 255.255.255.0 */
-                if (IP_netmask == 0xffffffff)
-                        IP_netmask &= 0x00ffffff;
-
-                /* Bug Fix Mar 16 2000
-                 * AND the Remote IP address with IP netmask, instead
-                 * of static netmask of 255.255.255.0 */
-                local_IP_addr = (remote_IP_addr & IP_netmask) +
-                        (~remote_IP_addr & ntohl(0x0003));
-
-                if(!card->u.c.slarp_timer) {
-                        IP_addr = local_IP_addr;
-                        local_IP_addr = remote_IP_addr;
-                        remote_IP_addr = IP_addr;
-                }
-        }
-
-        fs = get_fs();                  /* Save file system  */
-        set_fs(get_ds());               /* Get user space block */
-
-        /* Setup a structure for adding/removing routes */
-        memset(&if_info, 0, sizeof(if_info));
-        strcpy(if_info.ifr_name, dev->name);
-
-        switch (chdlc_priv_area->route_status) {
-
-        case ADD_ROUTE:
-
-                if(!card->u.c.slarp_timer) {
-                        if_data2 = (struct sockaddr_in *)&if_info.ifr_dstaddr;
-                        if_data2->sin_addr.s_addr = remote_IP_addr;
-                        if_data2->sin_family = AF_INET;
-                        err = devinet_ioctl(SIOCSIFDSTADDR, &if_info);
-                } else { 
-                        if_data1 = (struct sockaddr_in *)&if_info.ifr_addr;
-                        if_data1->sin_addr.s_addr = local_IP_addr;
-                        if_data1->sin_family = AF_INET;
-                        if(!(err = devinet_ioctl(SIOCSIFADDR, &if_info))){
-                                if_data2 = (struct sockaddr_in *)&if_info.ifr_dstaddr;
-                                if_data2->sin_addr.s_addr = remote_IP_addr;
-                                if_data2->sin_family = AF_INET;
-                                err = devinet_ioctl(SIOCSIFDSTADDR, &if_info);
-                        }
-                }
-
-               if(err) {
-                        printk(KERN_INFO "%s: Add route %u.%u.%u.%u failed (%d)\n", 
-                                card->devname, NIPQUAD(remote_IP_addr), err);
-                } else {
-                        ((chdlc_private_area_t *)dev->priv)->route_status = ROUTE_ADDED;
-                        printk(KERN_INFO "%s: Dynamic route added.\n",
-                                card->devname);
-                        printk(KERN_INFO "%s:    Local IP addr : %u.%u.%u.%u\n",
-                                card->devname, NIPQUAD(local_IP_addr));
-                        printk(KERN_INFO "%s:    Remote IP addr: %u.%u.%u.%u\n",
-                                card->devname, NIPQUAD(remote_IP_addr));
-                        chdlc_priv_area->route_removed = 0;
-                }
-                break;
-
-
-        case REMOVE_ROUTE:
-        
-                /* Change the local ip address of the interface to 0.
-                 * This will also delete the destination route.
-                 */
-                if(!card->u.c.slarp_timer) {
-                        if_data2 = (struct sockaddr_in *)&if_info.ifr_dstaddr;
-                        if_data2->sin_addr.s_addr = 0;
-                        if_data2->sin_family = AF_INET;
-                        err = devinet_ioctl(SIOCSIFDSTADDR, &if_info);
-                } else {
-                        if_data1 = (struct sockaddr_in *)&if_info.ifr_addr;
-                        if_data1->sin_addr.s_addr = 0;
-                        if_data1->sin_family = AF_INET;
-                        err = devinet_ioctl(SIOCSIFADDR,&if_info);
-                
-                }
-                if(err) {
-                        printk(KERN_INFO
-                                "%s: Remove route %u.%u.%u.%u failed, (err %d)\n",
-                                        card->devname, NIPQUAD(remote_IP_addr),
-                                        err);
-                } else {
-                        ((chdlc_private_area_t *)dev->priv)->route_status =
-                                NO_ROUTE;
-                        printk(KERN_INFO "%s: Dynamic route removed: %u.%u.%u.%u\n",
-                                        card->devname, NIPQUAD(local_IP_addr)); 
-                        chdlc_priv_area->route_removed = 1;
-                }
-                break;
-        }
-
-        set_fs(fs);                     /* Restore file system */
-
-}
-
-
-/*=============================================================================
- * Store a UDP management packet for later processing.
- */
-
-static int store_udp_mgmt_pkt(char udp_pkt_src, sdla_t* card,
-                              struct sk_buff *skb, struct net_device* dev,
-                              chdlc_private_area_t* chdlc_priv_area)
-{
-        int udp_pkt_stored = 0;
-
-        if(!chdlc_priv_area->udp_pkt_lgth &&
-          (skb->len <= MAX_LGTH_UDP_MGNT_PKT)) {
-                chdlc_priv_area->udp_pkt_lgth = skb->len;
-                chdlc_priv_area->udp_pkt_src = udp_pkt_src;
-                memcpy(chdlc_priv_area->udp_pkt_data, skb->data, skb->len);
-                chdlc_priv_area->timer_int_enabled = TMR_INT_ENABLED_UDP;
-                udp_pkt_stored = 1;
-        }
-
-        if(udp_pkt_src == UDP_PKT_FRM_STACK){
-                dev_kfree_skb_any(skb);
-        }else{
-                dev_kfree_skb_any(skb);
-        }
-                
-        return(udp_pkt_stored);
-}
-
-
-/*=============================================================================
- * Process UDP management packet.
- */
-
-static int process_udp_mgmt_pkt(sdla_t* card, struct net_device* dev,
-                                chdlc_private_area_t* chdlc_priv_area ) 
-{
-        unsigned char *buf;
-        unsigned int frames, len;
-        struct sk_buff *new_skb;
-        unsigned short buffer_length, real_len;
-        unsigned long data_ptr;
-        unsigned data_length;
-        int udp_mgmt_req_valid = 1;
-        CHDLC_MAILBOX_STRUCT *mb = card->mbox;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        chdlc_udp_pkt_t *chdlc_udp_pkt;
-        struct timeval tv;
-        int err;
-        char ut_char;
-
-        chdlc_udp_pkt = (chdlc_udp_pkt_t *) chdlc_priv_area->udp_pkt_data;
-
-        if(chdlc_priv_area->udp_pkt_src == UDP_PKT_FRM_NETWORK){
-
-                /* Only these commands are support for remote debugging.
-                 * All others are not */
-                switch(chdlc_udp_pkt->cblock.command) {
-
-                        case READ_GLOBAL_STATISTICS:
-                        case READ_MODEM_STATUS:  
-                        case READ_CHDLC_LINK_STATUS:
-                        case CPIPE_ROUTER_UP_TIME:
-                        case READ_COMMS_ERROR_STATS:
-                        case READ_CHDLC_OPERATIONAL_STATS:
-
-                        /* These two commands are executed for
-                         * each request */
-                        case READ_CHDLC_CONFIGURATION:
-                        case READ_CHDLC_CODE_VERSION:
-                                udp_mgmt_req_valid = 1;
-                                break;
-                        default:
-                                udp_mgmt_req_valid = 0;
-                                break;
-                } 
-        }
-        
-        if(!udp_mgmt_req_valid) {
-
-                /* set length to 0 */
-                chdlc_udp_pkt->cblock.buffer_length = 0;
-
-                /* set return code */
-                chdlc_udp_pkt->cblock.return_code = 0xCD;
-
-                if (net_ratelimit()){   
-                        printk(KERN_INFO 
-                        "%s: Warning, Illegal UDP command attempted from network: %x\n",
-                        card->devname,chdlc_udp_pkt->cblock.command);
-                }
-
-        } else {
-                unsigned long trace_status_cfg_addr = 0;
-                TRACE_STATUS_EL_CFG_STRUCT trace_cfg_struct;
-                TRACE_STATUS_ELEMENT_STRUCT trace_element_struct;
-
-                switch(chdlc_udp_pkt->cblock.command) {
-
-                case CPIPE_ENABLE_TRACING:
-                     if (!chdlc_priv_area->TracingEnabled) {
-
-                        /* OPERATE_DATALINE_MONITOR */
-
-                        mb->buffer_length = sizeof(LINE_TRACE_CONFIG_STRUCT);
-                        mb->command = SET_TRACE_CONFIGURATION;
-
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->
-                                trace_config = TRACE_ACTIVE;
-                        /* Trace delay mode is not used because it slows
-                           down transfer and results in a standoff situation
-                           when there is a lot of data */
-
-                        /* Configure the Trace based on user inputs */
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->trace_config |= 
-                                        chdlc_udp_pkt->data[0];
-
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->
-                           trace_deactivation_timer = 4000;
-
-
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                        if (err != COMMAND_OK) {
-                                chdlc_error(card,err,mb);
-                                card->TracingEnabled = 0;
-                                chdlc_udp_pkt->cblock.return_code = err;
-                                mb->buffer_length = 0;
-                                break;
-                        } 
-
-                        /* Get the base address of the trace element list */
-                        mb->buffer_length = 0;
-                        mb->command = READ_TRACE_CONFIGURATION;
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-                        if (err != COMMAND_OK) {
-                                chdlc_error(card,err,mb);
-                                chdlc_priv_area->TracingEnabled = 0;
-                                chdlc_udp_pkt->cblock.return_code = err;
-                                mb->buffer_length = 0;
-                                break;
-                        }       
-
-                        trace_status_cfg_addr =((LINE_TRACE_CONFIG_STRUCT *)
-                                mb->data) -> ptr_trace_stat_el_cfg_struct;
-
-                        sdla_peek(&card->hw, trace_status_cfg_addr,
-                                 &trace_cfg_struct, sizeof(trace_cfg_struct));
-                    
-                        chdlc_priv_area->start_trace_addr = trace_cfg_struct.
-                                base_addr_trace_status_elements;
-
-                        chdlc_priv_area->number_trace_elements = 
-                                        trace_cfg_struct.number_trace_status_elements;
-
-                        chdlc_priv_area->end_trace_addr = (unsigned long)
-                                        ((TRACE_STATUS_ELEMENT_STRUCT *)
-                                         chdlc_priv_area->start_trace_addr + 
-                                         (chdlc_priv_area->number_trace_elements - 1));
-
-                        chdlc_priv_area->base_addr_trace_buffer = 
-                                        trace_cfg_struct.base_addr_trace_buffer;
-
-                        chdlc_priv_area->end_addr_trace_buffer = 
-                                        trace_cfg_struct.end_addr_trace_buffer;
-
-                        chdlc_priv_area->curr_trace_addr = 
-                                        trace_cfg_struct.next_trace_element_to_use;
-
-                        chdlc_priv_area->available_buffer_space = 2000 - 
-                                                                  sizeof(ip_pkt_t) -
-                                                                  sizeof(udp_pkt_t) -
-                                                                  sizeof(wp_mgmt_t) -
-                                                                  sizeof(cblock_t) -
-                                                                  sizeof(trace_info_t); 
-                     }
-                     chdlc_udp_pkt->cblock.return_code = COMMAND_OK;
-                     mb->buffer_length = 0;
-                     chdlc_priv_area->TracingEnabled = 1;
-                     break;
-           
-
-                case CPIPE_DISABLE_TRACING:
-                     if (chdlc_priv_area->TracingEnabled) {
-
-                        /* OPERATE_DATALINE_MONITOR */
-                        mb->buffer_length = sizeof(LINE_TRACE_CONFIG_STRUCT);
-                        mb->command = SET_TRACE_CONFIGURATION;
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->
-                                trace_config = TRACE_INACTIVE;
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                     }          
-
-                     chdlc_priv_area->TracingEnabled = 0;
-                     chdlc_udp_pkt->cblock.return_code = COMMAND_OK;
-                     mb->buffer_length = 0;
-                     break;
-           
-
-                case CPIPE_GET_TRACE_INFO:
-
-                     if (!chdlc_priv_area->TracingEnabled) {
-                        chdlc_udp_pkt->cblock.return_code = 1;
-                        mb->buffer_length = 0;
-                        break;
-                     }
-
-                     chdlc_udp_pkt->trace_info.ismoredata = 0x00;
-                     buffer_length = 0; /* offset of packet already occupied */
-
-                     for (frames=0; frames < chdlc_priv_area->number_trace_elements; frames++){
-
-                        trace_pkt_t *trace_pkt = (trace_pkt_t *)
-                                &chdlc_udp_pkt->data[buffer_length];
-
-                        sdla_peek(&card->hw, chdlc_priv_area->curr_trace_addr,
-                                  (unsigned char *)&trace_element_struct,
-                                  sizeof(TRACE_STATUS_ELEMENT_STRUCT));
-
-                        if (trace_element_struct.opp_flag == 0x00) {
-                                break;
-                        }
-
-                        /* get pointer to real data */
-                        data_ptr = trace_element_struct.ptr_data_bfr;
-
-                        /* See if there is actual data on the trace buffer */
-                        if (data_ptr){
-                                data_length = trace_element_struct.trace_length;
-                        }else{
-                                data_length = 0;
-                                chdlc_udp_pkt->trace_info.ismoredata = 0x01;
-                        }
-        
-                        if( (chdlc_priv_area->available_buffer_space - buffer_length)
-                                < ( sizeof(trace_pkt_t) + data_length) ) {
-
-                            /* indicate there are more frames on board & exit */
-                                chdlc_udp_pkt->trace_info.ismoredata = 0x01;
-                                break;
-                         }
-
-                        trace_pkt->status = trace_element_struct.trace_type;
-
-                        trace_pkt->time_stamp =
-                                trace_element_struct.trace_time_stamp;
-
-                        trace_pkt->real_length =
-                                trace_element_struct.trace_length;
-
-                        /* see if we can fit the frame into the user buffer */
-                        real_len = trace_pkt->real_length;
-
-                        if (data_ptr == 0) {
-                                trace_pkt->data_avail = 0x00;
-                        } else {
-                                unsigned tmp = 0;
-
-                                /* get the data from circular buffer
-                                    must check for end of buffer */
-                                trace_pkt->data_avail = 0x01;
-
-                                if ((data_ptr + real_len) >
-                                             chdlc_priv_area->end_addr_trace_buffer + 1){
-
-                                        tmp = chdlc_priv_area->end_addr_trace_buffer - data_ptr + 1;
-                                        sdla_peek(&card->hw, data_ptr,
-                                                  trace_pkt->data,tmp);
-                                        data_ptr = chdlc_priv_area->base_addr_trace_buffer;
-                                }
-        
-                                sdla_peek(&card->hw, data_ptr,
-                                          &trace_pkt->data[tmp], real_len - tmp);
-                        }       
-
-                        /* zero the opp flag to show we got the frame */
-                        ut_char = 0x00;
-                        sdla_poke(&card->hw, chdlc_priv_area->curr_trace_addr, &ut_char, 1);
-
-                        /* now move onto the next frame */
-                        chdlc_priv_area->curr_trace_addr += sizeof(TRACE_STATUS_ELEMENT_STRUCT);
-
-                        /* check if we went over the last address */
-                        if ( chdlc_priv_area->curr_trace_addr > chdlc_priv_area->end_trace_addr ) {
-                                chdlc_priv_area->curr_trace_addr = chdlc_priv_area->start_trace_addr;
-                        }
-
-                        if(trace_pkt->data_avail == 0x01) {
-                                buffer_length += real_len - 1;
-                        }
-         
-                        /* for the header */
-                        buffer_length += sizeof(trace_pkt_t);
-
-                     }  /* For Loop */
-
-                     if (frames == chdlc_priv_area->number_trace_elements){
-                        chdlc_udp_pkt->trace_info.ismoredata = 0x01;
-                     }
-                     chdlc_udp_pkt->trace_info.num_frames = frames;
-                 
-                     mb->buffer_length = buffer_length;
-                     chdlc_udp_pkt->cblock.buffer_length = buffer_length; 
-                 
-                     chdlc_udp_pkt->cblock.return_code = COMMAND_OK; 
-                     
-                     break;
-
-
-                case CPIPE_FT1_READ_STATUS:
-                        ((unsigned char *)chdlc_udp_pkt->data )[0] =
-                                flags->FT1_info_struct.parallel_port_A_input;
-
-                        ((unsigned char *)chdlc_udp_pkt->data )[1] =
-                                flags->FT1_info_struct.parallel_port_B_input;
-                                
-                        chdlc_udp_pkt->cblock.return_code = COMMAND_OK;
-                        chdlc_udp_pkt->cblock.buffer_length = 2;
-                        mb->buffer_length = 2;
-                        break;
-
-                case CPIPE_ROUTER_UP_TIME:
-                        do_gettimeofday( &tv );
-                        chdlc_priv_area->router_up_time = tv.tv_sec - 
-                                        chdlc_priv_area->router_start_time;
-                        *(unsigned long *)&chdlc_udp_pkt->data = 
-                                        chdlc_priv_area->router_up_time;        
-                        mb->buffer_length = sizeof(unsigned long);
-                        chdlc_udp_pkt->cblock.buffer_length = sizeof(unsigned long);
-                        chdlc_udp_pkt->cblock.return_code = COMMAND_OK;
-                        break;
-
-                case FT1_MONITOR_STATUS_CTRL:
-                        /* Enable FT1 MONITOR STATUS */
-                        if ((chdlc_udp_pkt->data[0] & ENABLE_READ_FT1_STATUS) ||  
-                                (chdlc_udp_pkt->data[0] & ENABLE_READ_FT1_OP_STATS)) {
-                        
-                                if( rCount++ != 0 ) {
-                                        chdlc_udp_pkt->cblock.
-                                        return_code = COMMAND_OK;
-                                        mb->buffer_length = 1;
-                                        break;
-                                }
-                        }
-
-                        /* Disable FT1 MONITOR STATUS */
-                        if( chdlc_udp_pkt->data[0] == 0) {
-
-                                if( --rCount != 0) {
-                                        chdlc_udp_pkt->cblock.
-                                        return_code = COMMAND_OK;
-                                        mb->buffer_length = 1;
-                                        break;
-                                } 
-                        }       
-                        goto dflt_1;
-
-                default:
-dflt_1:
-                        /* it's a board command */
-                        mb->command = chdlc_udp_pkt->cblock.command;
-                        mb->buffer_length = chdlc_udp_pkt->cblock.buffer_length;
-                        if (mb->buffer_length) {
-                                memcpy(&mb->data, (unsigned char *) chdlc_udp_pkt->
-                                                        data, mb->buffer_length);
-                        } 
-                        /* run the command on the board */
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                        if (err != COMMAND_OK) {
-                                break;
-                        }
-
-                        /* copy the result back to our buffer */
-                        memcpy(&chdlc_udp_pkt->cblock, mb, sizeof(cblock_t)); 
-                        
-                        if (mb->buffer_length) {
-                                memcpy(&chdlc_udp_pkt->data, &mb->data, 
-                                                                mb->buffer_length); 
-                        }
-
-                } /* end of switch */
-        } /* end of else */
-
-        /* Fill UDP TTL */
-        chdlc_udp_pkt->ip_pkt.ttl = card->wandev.ttl; 
-
-        len = reply_udp(chdlc_priv_area->udp_pkt_data, mb->buffer_length);
-        
-
-        if(chdlc_priv_area->udp_pkt_src == UDP_PKT_FRM_NETWORK){
-
-                /* Must check if we interrupted if_send() routine. The
-                 * tx buffers might be used. If so drop the packet */
-                if (!test_bit(SEND_CRIT,&card->wandev.critical)) {
-                
-                        if(!chdlc_send(card, chdlc_priv_area->udp_pkt_data, len)) {
-                                ++ card->wandev.stats.tx_packets;
-                                card->wandev.stats.tx_bytes += len;
-                        }
-                }
-        } else {        
-        
-                /* Pass it up the stack
-                   Allocate socket buffer */
-                if ((new_skb = dev_alloc_skb(len)) != NULL) {
-                        /* copy data into new_skb */
-
-                        buf = skb_put(new_skb, len);
-                        memcpy(buf, chdlc_priv_area->udp_pkt_data, len);
-
-                        /* Decapsulate pkt and pass it up the protocol stack */
-                        new_skb->protocol = htons(ETH_P_IP);
-                        new_skb->dev = dev;
-                        new_skb->mac.raw  = new_skb->data;
-        
-                        netif_rx(new_skb);
-                        dev->last_rx = jiffies;
-                } else {
-                
-                        printk(KERN_INFO "%s: no socket buffers available!\n",
-                                        card->devname);
-                }
-        }
- 
-        chdlc_priv_area->udp_pkt_lgth = 0;
-        
-        return 0;
-}
-
-/*============================================================================
- * Initialize Receive and Transmit Buffers.
- */
-
-static void init_chdlc_tx_rx_buff( sdla_t* card)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        CHDLC_TX_STATUS_EL_CFG_STRUCT *tx_config;
-        CHDLC_RX_STATUS_EL_CFG_STRUCT *rx_config;
-        char err;
-        
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_CONFIGURATION;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-        if(err != COMMAND_OK) {
-                if (card->wandev.dev){
-                        chdlc_error(card,err,mb);
-                }
-                return;
-        }
-
-        if(card->hw.type == SDLA_S514) {
-                tx_config = (CHDLC_TX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                            ptr_CHDLC_Tx_stat_el_cfg_struct));
-                rx_config = (CHDLC_RX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                            ptr_CHDLC_Rx_stat_el_cfg_struct));
-
-                /* Setup Head and Tails for buffers */
-                card->u.c.txbuf_base = (void *)(card->hw.dpmbase +
-                tx_config->base_addr_Tx_status_elements);
-                card->u.c.txbuf_last = 
-                (CHDLC_DATA_TX_STATUS_EL_STRUCT *)  
-                card->u.c.txbuf_base +
-                (tx_config->number_Tx_status_elements - 1);
-
-                card->u.c.rxbuf_base = (void *)(card->hw.dpmbase +
-                rx_config->base_addr_Rx_status_elements);
-                card->u.c.rxbuf_last =
-                (CHDLC_DATA_RX_STATUS_EL_STRUCT *)
-                card->u.c.rxbuf_base +
-                (rx_config->number_Rx_status_elements - 1);
-
-                /* Set up next pointer to be used */
-                card->u.c.txbuf = (void *)(card->hw.dpmbase +
-                tx_config->next_Tx_status_element_to_use);
-                card->u.c.rxmb = (void *)(card->hw.dpmbase +
-                rx_config->next_Rx_status_element_to_use);
-        }
-        else {
-                tx_config = (CHDLC_TX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                        ptr_CHDLC_Tx_stat_el_cfg_struct % SDLA_WINDOWSIZE));
-
-                rx_config = (CHDLC_RX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                        ptr_CHDLC_Rx_stat_el_cfg_struct % SDLA_WINDOWSIZE));
-
-                /* Setup Head and Tails for buffers */
-                card->u.c.txbuf_base = (void *)(card->hw.dpmbase +
-                (tx_config->base_addr_Tx_status_elements % SDLA_WINDOWSIZE));
-                card->u.c.txbuf_last =
-                (CHDLC_DATA_TX_STATUS_EL_STRUCT *)card->u.c.txbuf_base
-                + (tx_config->number_Tx_status_elements - 1);
-                card->u.c.rxbuf_base = (void *)(card->hw.dpmbase +
-                (rx_config->base_addr_Rx_status_elements % SDLA_WINDOWSIZE));
-                card->u.c.rxbuf_last = 
-                (CHDLC_DATA_RX_STATUS_EL_STRUCT *)card->u.c.rxbuf_base
-                + (rx_config->number_Rx_status_elements - 1);
-
-                 /* Set up next pointer to be used */
-                card->u.c.txbuf = (void *)(card->hw.dpmbase +
-                (tx_config->next_Tx_status_element_to_use % SDLA_WINDOWSIZE));
-                card->u.c.rxmb = (void *)(card->hw.dpmbase +
-                (rx_config->next_Rx_status_element_to_use % SDLA_WINDOWSIZE));
-        }
-
-        /* Setup Actual Buffer Start and end addresses */
-        card->u.c.rx_base = rx_config->base_addr_Rx_buffer;
-        card->u.c.rx_top  = rx_config->end_addr_Rx_buffer;
-
-}
-
-/*=============================================================================
- * Perform Interrupt Test by running READ_CHDLC_CODE_VERSION command MAX_INTR
- * _TEST_COUNTER times.
- */
-static int intr_test( sdla_t* card)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        int err,i;
-
-        Intr_test_counter = 0;
-        
-        err = chdlc_set_intr_mode(card, APP_INT_ON_COMMAND_COMPLETE);
-
-        if (err == CMD_OK) { 
-                for (i = 0; i < MAX_INTR_TEST_COUNTER; i ++) {  
-                        mb->buffer_length  = 0;
-                        mb->command = READ_CHDLC_CODE_VERSION;
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                        if (err != CMD_OK) 
-                                chdlc_error(card, err, mb);
-                }
-        }
-        else {
-                return err;
-        }
-
-        err = chdlc_set_intr_mode(card, 0);
-
-        if (err != CMD_OK)
-                return err;
-
-        return 0;
-}
-
-/*==============================================================================
- * Determine what type of UDP call it is. CPIPEAB ?
- */
-static int udp_pkt_type(struct sk_buff *skb, sdla_t* card)
-{
-         chdlc_udp_pkt_t *chdlc_udp_pkt = (chdlc_udp_pkt_t *)skb->data;
-
-#ifdef _WAN_UDP_DEBUG
-                printk(KERN_INFO "SIG %s = %s\n\
-                                  UPP %x = %x\n\
-                                  PRT %x = %x\n\
-                                  REQ %i = %i\n\
-                                  36 th = %x 37th = %x\n",
-                                  chdlc_udp_pkt->wp_mgmt.signature,
-                                  UDPMGMT_SIGNATURE,
-                                  chdlc_udp_pkt->udp_pkt.udp_dst_port,
-                                  ntohs(card->wandev.udp_port),
-                                  chdlc_udp_pkt->ip_pkt.protocol,
-                                  UDPMGMT_UDP_PROTOCOL,
-                                  chdlc_udp_pkt->wp_mgmt.request_reply,
-                                  UDPMGMT_REQUEST,
-                                  skb->data[36], skb->data[37]);
-#endif  
-                
-        if (!strncmp(chdlc_udp_pkt->wp_mgmt.signature,UDPMGMT_SIGNATURE,8) &&
-           (chdlc_udp_pkt->udp_pkt.udp_dst_port == ntohs(card->wandev.udp_port)) &&
-           (chdlc_udp_pkt->ip_pkt.protocol == UDPMGMT_UDP_PROTOCOL) &&
-           (chdlc_udp_pkt->wp_mgmt.request_reply == UDPMGMT_REQUEST)) {
-
-                return UDP_CPIPE_TYPE;
-
-        }else{ 
-                return UDP_INVALID_TYPE;
-        }
-}
-
-/*============================================================================
- * Set PORT state.
- */
-static void port_set_state (sdla_t *card, int state)
-{
-        if (card->u.c.state != state)
-        {
-                switch (state)
-                {
-                case WAN_CONNECTED:
-                        printk (KERN_INFO "%s: Link connected!\n",
-                                card->devname);
-                        break;
-
-                case WAN_CONNECTING:
-                        printk (KERN_INFO "%s: Link connecting...\n",
-                                card->devname);
-                        break;
-
-                case WAN_DISCONNECTED:
-                        printk (KERN_INFO "%s: Link disconnected!\n",
-                                card->devname);
-                        break;
-                }
-
-                card->wandev.state = card->u.c.state = state;
-                if (card->wandev.dev){
-                        struct net_device *dev = card->wandev.dev;
-                        chdlc_private_area_t *chdlc_priv_area = dev->priv;
-                        chdlc_priv_area->common.state = state;
-                }
-        }
-}
-
-/*===========================================================================
- * config_chdlc
- *
- *      Configure the chdlc protocol and enable communications.         
- *
- *      The if_open() function binds this function to the poll routine.
- *      Therefore, this function will run every time the chdlc interface
- *      is brought up. We cannot run this function from the if_open 
- *      because if_open does not have access to the remote IP address.
- *      
- *      If the communications are not enabled, proceed to configure
- *      the card and enable communications.
- *
- *      If the communications are enabled, it means that the interface
- *      was shutdown by ether the user or driver. In this case, we 
- *      have to check that the IP addresses have not changed.  If
- *      the IP addresses have changed, we have to reconfigure the firmware
- *      and update the changed IP addresses.  Otherwise, just exit.
- *
- */
-
-static int config_chdlc (sdla_t *card)
-{
-        struct net_device *dev = card->wandev.dev;
-        chdlc_private_area_t *chdlc_priv_area = dev->priv;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-
-        if (card->u.c.comm_enabled){
-
-                /* Jun 20. 2000: NC
-                 * IP addresses are not used in the API mode */
-                
-                if ((chdlc_priv_area->ip_local_tmp != chdlc_priv_area->ip_local ||
-                     chdlc_priv_area->ip_remote_tmp != chdlc_priv_area->ip_remote) && 
-                     card->u.c.usedby == WANPIPE) {
-                        
-                        /* The IP addersses have changed, we must
-                         * stop the communications and reconfigure
-                         * the card. Reason: the firmware must know
-                         * the local and remote IP addresses. */
-                        disable_comm(card);
-                        port_set_state(card, WAN_DISCONNECTED);
-                        printk(KERN_INFO 
-                                "%s: IP addresses changed!\n",
-                                        card->devname);
-                        printk(KERN_INFO 
-                                "%s: Restarting communications ...\n",
-                                        card->devname);
-                }else{ 
-                        /* IP addresses are the same and the link is up, 
-                         * we don't have to do anything here. Therefore, exit */
-                        return 0;
-                }
-        }
-
-        chdlc_priv_area->ip_local = chdlc_priv_area->ip_local_tmp;
-        chdlc_priv_area->ip_remote = chdlc_priv_area->ip_remote_tmp;
-
-
-        /* Setup the Board for asynchronous mode */
-        if (card->u.c.async_mode){
-                
-                if (set_asy_config(card)) {
-                        printk (KERN_INFO "%s: Failed CHDLC Async configuration!\n",
-                                card->devname);
-                        return 0;
-                }
-        }else{
-                /* Setup the Board for CHDLC */
-                if (set_chdlc_config(card)) {
-                        printk (KERN_INFO "%s: Failed CHDLC configuration!\n",
-                                card->devname);
-                        return 0;
-                }
-        }
-
-        /* Set interrupt mode and mask */
-        if (chdlc_set_intr_mode(card, APP_INT_ON_RX_FRAME |
-                                APP_INT_ON_GLOBAL_EXCEP_COND |
-                                APP_INT_ON_TX_FRAME |
-                                APP_INT_ON_CHDLC_EXCEP_COND | APP_INT_ON_TIMER)){
-                printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
-                                card->devname);
-                return 0;       
-        }
-        
-
-        /* Mask the Transmit and Timer interrupt */
-        flags->interrupt_info_struct.interrupt_permission &= 
-                ~(APP_INT_ON_TX_FRAME | APP_INT_ON_TIMER);
-
-        /* In TTY mode, receive interrupt will be enabled during
-         * wanpipe_tty_open() operation */
-        if (card->tty_opt){
-                flags->interrupt_info_struct.interrupt_permission &= ~APP_INT_ON_RX_FRAME;
-        }
-
-        /* Enable communications */
-        if (card->u.c.async_mode){
-                if (asy_comm_enable(card) != 0) {
-                        printk(KERN_INFO "%s: Failed to enable async commnunication!\n",
-                                        card->devname);
-                        flags->interrupt_info_struct.interrupt_permission = 0;
-                        card->u.c.comm_enabled=0;
-                        chdlc_set_intr_mode(card,0);
-                        return 0;
-                }
-        }else{ 
-                if (chdlc_comm_enable(card) != 0) {
-                        printk(KERN_INFO "%s: Failed to enable chdlc communications!\n",
-                                        card->devname);
-                        flags->interrupt_info_struct.interrupt_permission = 0;
-                        card->u.c.comm_enabled=0;
-                        chdlc_set_intr_mode(card,0);
-                        return 0;
-                }
-        }
-
-        /* Initialize Rx/Tx buffer control fields */
-        init_chdlc_tx_rx_buff(card);
-        port_set_state(card, WAN_CONNECTING);
-        return 0; 
-}
-
-
-/*============================================================
- * chdlc_poll
- *      
- * Rationale:
- *      We cannot manipulate the routing tables, or
- *      ip addresses withing the interrupt. Therefore
- *      we must perform such actons outside an interrupt 
- *      at a later time. 
- *
- * Description: 
- *      CHDLC polling routine, responsible for 
- *      shutting down interfaces upon disconnect
- *      and adding/removing routes. 
- *      
- * Usage:        
- *      This function is executed for each CHDLC  
- *      interface through a tq_schedule bottom half.
- *      
- *      trigger_chdlc_poll() function is used to kick
- *      the chldc_poll routine.  
- */
-
-static void chdlc_poll(struct net_device *dev)
-{
-        chdlc_private_area_t *chdlc_priv_area;
-        sdla_t *card;
-        u8 check_gateway=0;     
-        SHARED_MEMORY_INFO_STRUCT* flags;
-
-        
-        if (!dev || (chdlc_priv_area=dev->priv) == NULL)
-                return;
-
-        card = chdlc_priv_area->card;
-        flags = card->u.c.flags;
-        
-        /* (Re)Configuraiton is in progress, stop what you are 
-         * doing and get out */
-        if (test_bit(PERI_CRIT,&card->wandev.critical)){
-                clear_bit(POLL_CRIT,&card->wandev.critical);
-                return;
-        }
-        
-        /* if_open() function has triggered the polling routine
-         * to determine the configured IP addresses.  Once the
-         * addresses are found, trigger the chdlc configuration */
-        if (test_bit(0,&chdlc_priv_area->config_chdlc)){
-
-                chdlc_priv_area->ip_local_tmp  = get_ip_address(dev,WAN_LOCAL_IP);
-                chdlc_priv_area->ip_remote_tmp = get_ip_address(dev,WAN_POINTOPOINT_IP);
-        
-               /* Jun 20. 2000 Bug Fix
-                * Only perform this check in WANPIPE mode, since
-                * IP addresses are not used in the API mode. */
-        
-                if (chdlc_priv_area->ip_local_tmp == chdlc_priv_area->ip_remote_tmp && 
-                    card->u.c.slarp_timer == 0x00 && 
-                    !card->u.c.backup && 
-                    card->u.c.usedby == WANPIPE){
-
-                        if (++chdlc_priv_area->ip_error > MAX_IP_ERRORS){
-                                printk(KERN_INFO "\n%s: --- WARNING ---\n",
-                                                card->devname);
-                                printk(KERN_INFO 
-                                "%s: The local IP address is the same as the\n",
-                                                card->devname);
-                                printk(KERN_INFO 
-                                "%s: Point-to-Point IP address.\n",
-                                                card->devname);
-                                printk(KERN_INFO "%s: --- WARNING ---\n\n",
-                                                card->devname);
-                        }else{
-                                clear_bit(POLL_CRIT,&card->wandev.critical);
-                                chdlc_priv_area->poll_delay_timer.expires = jiffies+HZ;
-                                add_timer(&chdlc_priv_area->poll_delay_timer);
-                                return;
-                        }
-                }
-
-                clear_bit(0,&chdlc_priv_area->config_chdlc);
-                clear_bit(POLL_CRIT,&card->wandev.critical);
-                
-                chdlc_priv_area->timer_int_enabled |= TMR_INT_ENABLED_CONFIG;
-                flags->interrupt_info_struct.interrupt_permission |= APP_INT_ON_TIMER;
-                return;
-        }
-        /* Dynamic interface implementation, as well as dynamic
-         * routing.  */
-        
-        switch (card->u.c.state){
-
-        case WAN_DISCONNECTED:
-
-                /* If the dynamic interface configuration is on, and interface 
-                 * is up, then bring down the netowrk interface */
-                
-                if (test_bit(DYN_OPT_ON,&chdlc_priv_area->interface_down) && 
-                    !test_bit(DEV_DOWN,  &chdlc_priv_area->interface_down) &&           
-                    card->wandev.dev->flags & IFF_UP){  
-
-                        printk(KERN_INFO "%s: Interface %s down.\n",
-                                card->devname,card->wandev.dev->name);
-                        change_dev_flags(card->wandev.dev,(card->wandev.dev->flags&~IFF_UP));
-                        set_bit(DEV_DOWN,&chdlc_priv_area->interface_down);
-                        chdlc_priv_area->route_status = NO_ROUTE;
-
-                }else{
-                        /* We need to check if the local IP address is
-                         * zero. If it is, we shouldn't try to remove it.
-                         */
-
-                        if (card->wandev.dev->flags & IFF_UP && 
-                            get_ip_address(card->wandev.dev,WAN_LOCAL_IP) && 
-                            chdlc_priv_area->route_status != NO_ROUTE &&
-                            card->u.c.slarp_timer){
-
-                                process_route(card);
-                        }
-                }
-                break;
-
-        case WAN_CONNECTED:
-
-                /* In SMP machine this code can execute before the interface
-                 * comes up.  In this case, we must make sure that we do not
-                 * try to bring up the interface before dev_open() is finished */
-
-
-                /* DEV_DOWN will be set only when we bring down the interface
-                 * for the very first time. This way we know that it was us
-                 * that brought the interface down */
-                
-                if (test_bit(DYN_OPT_ON,&chdlc_priv_area->interface_down) &&
-                    test_bit(DEV_DOWN,  &chdlc_priv_area->interface_down) &&
-                    !(card->wandev.dev->flags & IFF_UP)){
-                        
-                        printk(KERN_INFO "%s: Interface %s up.\n",
-                                card->devname,card->wandev.dev->name);
-                        change_dev_flags(card->wandev.dev,(card->wandev.dev->flags|IFF_UP));
-                        clear_bit(DEV_DOWN,&chdlc_priv_area->interface_down);
-                        check_gateway=1;
-                }
-
-                if (chdlc_priv_area->route_status == ADD_ROUTE && 
-                    card->u.c.slarp_timer){ 
-
-                        process_route(card);
-                        check_gateway=1;
-                }
-
-                if (chdlc_priv_area->gateway && check_gateway)
-                        add_gateway(card,dev);
-
-                break;
-        }       
-
-        clear_bit(POLL_CRIT,&card->wandev.critical);
-}
-
-/*============================================================
- * trigger_chdlc_poll
- *
- * Description:
- *      Add a chdlc_poll() work entry into the keventd work queue
- *      for a specific dlci/interface.  This will kick
- *      the fr_poll() routine at a later time. 
- *
- * Usage:
- *      Interrupts use this to defer a taks to 
- *      a polling routine.
- *
- */     
-static void trigger_chdlc_poll(struct net_device *dev)
-{
-        chdlc_private_area_t *chdlc_priv_area;
-        sdla_t *card;
-
-        if (!dev)
-                return;
-        
-        if ((chdlc_priv_area = dev->priv)==NULL)
-                return;
-
-        card = chdlc_priv_area->card;
-        
-        if (test_and_set_bit(POLL_CRIT,&card->wandev.critical)){
-                return;
-        }
-        if (test_bit(PERI_CRIT,&card->wandev.critical)){
-                return; 
-        }
-        schedule_work(&chdlc_priv_area->poll_work);
-}
-
-
-static void chdlc_poll_delay (unsigned long dev_ptr)
-{
-        struct net_device *dev = (struct net_device *)dev_ptr;
-        trigger_chdlc_poll(dev);
-}
-
-
-void s508_lock (sdla_t *card, unsigned long *smp_flags)
-{
-        spin_lock_irqsave(&card->wandev.lock, *smp_flags);
-        if (card->next){
-                spin_lock(&card->next->wandev.lock);
-        }
-}
-
-void s508_unlock (sdla_t *card, unsigned long *smp_flags)
-{
-        if (card->next){
-                spin_unlock(&card->next->wandev.lock);
-        }
-        spin_unlock_irqrestore(&card->wandev.lock, *smp_flags);
-}
-
-//*********** TTY SECTION ****************
-
-static void wanpipe_tty_trigger_tx_irq(sdla_t *card)
-{
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        INTERRUPT_INFORMATION_STRUCT *chdlc_int = &flags->interrupt_info_struct;
-        chdlc_int->interrupt_permission |= APP_INT_ON_TX_FRAME;
-}
-
-static void wanpipe_tty_trigger_poll(sdla_t *card)
-{
-        schedule_work(&card->tty_work);
-}
-
-static void tty_poll_work (void* data)
-{
-        sdla_t *card = (sdla_t*)data;
-        struct tty_struct *tty;
-
-        if ((tty=card->tty)==NULL)
-                return;
-        
-        tty_wakeup(tty);
-#if defined(SERIAL_HAVE_POLL_WAIT)
-        wake_up_interruptible(&tty->poll_wait);
-#endif  
-        return;
-}
-
-static void wanpipe_tty_close(struct tty_struct *tty, struct file * filp)
-{
-        sdla_t *card;
-        unsigned long smp_flags;
-        
-        if (!tty || !tty->driver_data){
-                return;
-        }
-        
-        card = (sdla_t*)tty->driver_data;
-        
-        if (!card)
-                return;
-
-        printk(KERN_INFO "%s: Closing TTY Driver!\n",
-                        card->devname);
-
-        /* Sanity Check */
-        if (!card->tty_open)
-                return;
-        
-        wanpipe_close(card);
-        if (--card->tty_open == 0){
-
-                lock_adapter_irq(&card->wandev.lock,&smp_flags);        
-                card->tty=NULL;
-                chdlc_disable_comm_shutdown(card);
-                unlock_adapter_irq(&card->wandev.lock,&smp_flags);
-
-                kfree(card->tty_buf);
-                card->tty_buf = NULL;                   
-                kfree(card->tty_rx);
-                card->tty_rx = NULL;
-        }
-        return;
-}
-static int wanpipe_tty_open(struct tty_struct *tty, struct file * filp)
-{
-        unsigned long smp_flags;
-        sdla_t *card;
-        
-        if (!tty){
-                return -ENODEV;
-        }
-        
-        if (!tty->driver_data){
-                int port;
-                port = tty->index;
-                if ((port < 0) || (port >= NR_PORTS)) 
-                        return -ENODEV;
-                
-                tty->driver_data = WAN_CARD(port);
-                if (!tty->driver_data)
-                        return -ENODEV;
-        }
-
-        card = (sdla_t*)tty->driver_data;
-
-        if (!card){
-                lock_adapter_irq(&card->wandev.lock,&smp_flags);        
-                card->tty=NULL;
-                unlock_adapter_irq(&card->wandev.lock,&smp_flags);
-                return -ENODEV;
-        }
-
-        printk(KERN_INFO "%s: Opening TTY Driver!\n",
-                        card->devname);
-
-        if (card->tty_open == 0){
-                lock_adapter_irq(&card->wandev.lock,&smp_flags);        
-                card->tty=tty;
-                unlock_adapter_irq(&card->wandev.lock,&smp_flags);
-
-                if (!card->tty_buf){
-                        card->tty_buf = kmalloc(TTY_CHDLC_MAX_MTU, GFP_KERNEL);
-                        if (!card->tty_buf){
-                                card->tty_buf=NULL;
-                                card->tty=NULL;
-                                return -ENOMEM; 
-                        }
-                }
-
-                if (!card->tty_rx){
-                        card->tty_rx = kmalloc(TTY_CHDLC_MAX_MTU, GFP_KERNEL);
-                        if (!card->tty_rx){
-                                /* Free the buffer above */
-                                kfree(card->tty_buf);
-                                card->tty_buf=NULL;
-                                card->tty=NULL;
-                                return -ENOMEM; 
-                        }
-                }
-        }
-
-        ++card->tty_open;
-        wanpipe_open(card);
-        return 0;
-}
-
-static int wanpipe_tty_write(struct tty_struct * tty, const unsigned char *buf, int count)
-{
-        unsigned long smp_flags=0;
-        sdla_t *card=NULL;
-
-        if (!tty){
-                dbg_printk(KERN_INFO "NO TTY in Write\n");
-                return -ENODEV;
-        }
-
-        card = (sdla_t *)tty->driver_data;
-                        
-        if (!card){
-                dbg_printk(KERN_INFO "No Card in TTY Write\n");
-                return -ENODEV;
-        }       
-
-        if (count > card->wandev.mtu){
-                dbg_printk(KERN_INFO "Frame too big in Write %i Max: %i\n",
-                                count,card->wandev.mtu);
-                return -EINVAL;
-        }
-        
-        if (card->wandev.state != WAN_CONNECTED){
-                dbg_printk(KERN_INFO "Card not connected in TTY Write\n");
-                return -EINVAL;
-        }
-
-        /* Lock the 508 Card: SMP is supported */
-        if(card->hw.type != SDLA_S514){
-                s508_lock(card,&smp_flags);
-        } 
-        
-        if (test_and_set_bit(SEND_CRIT,(void*)&card->wandev.critical)){
-                printk(KERN_INFO "%s: Critical in TTY Write\n",
-                                card->devname);
-                
-                /* Lock the 508 Card: SMP is supported */
-                if(card->hw.type != SDLA_S514)
-                        s508_unlock(card,&smp_flags);
-                
-                return -EINVAL; 
-        }
-        
-        if (chdlc_send(card,(void*)buf,count)){
-                dbg_printk(KERN_INFO "%s: Failed to send, retry later: kernel!\n",
-                                card->devname);
-                clear_bit(SEND_CRIT,(void*)&card->wandev.critical);
-
-                wanpipe_tty_trigger_tx_irq(card);
-                
-                if(card->hw.type != SDLA_S514)
-                        s508_unlock(card,&smp_flags);
-                return 0;
-        }
-        dbg_printk(KERN_INFO "%s: Packet sent OK: %i\n",card->devname,count);
-        clear_bit(SEND_CRIT,(void*)&card->wandev.critical);
-        
-        if(card->hw.type != SDLA_S514)
-                s508_unlock(card,&smp_flags);
-
-        return count;
-}
-
-static void wanpipe_tty_receive(sdla_t *card, unsigned addr, unsigned int len)
-{
-        unsigned offset=0;
-        unsigned olen=len;
-        char fp=0;
-        struct tty_struct *tty;
-        int i;
-        struct tty_ldisc *ld;
-        
-        if (!card->tty_open){
-                dbg_printk(KERN_INFO "%s: TTY not open during receive\n",
-                                card->devname);
-                return;
-        }
-        
-        if ((tty=card->tty) == NULL){
-                dbg_printk(KERN_INFO "%s: No TTY on receive\n",
-                                card->devname);
-                return;
-        }
-        
-        if (!tty->driver_data){
-                dbg_printk(KERN_INFO "%s: No Driver Data, or Flip on receive\n",
-                                card->devname);
-                return;
-        }
-        
-
-        if (card->u.c.async_mode){
-                if ((tty->flip.count+len) >= TTY_FLIPBUF_SIZE){
-                        if (net_ratelimit()){
-                                printk(KERN_INFO 
-                                        "%s: Received packet size too big: %i bytes, Max: %i!\n",
-                                        card->devname,len,TTY_FLIPBUF_SIZE);
-                        }
-                        return;
-                }
-
-                
-                if((addr + len) > card->u.c.rx_top + 1) {
-                        offset = card->u.c.rx_top - addr + 1;
-                        
-                        sdla_peek(&card->hw, addr, tty->flip.char_buf_ptr, offset);
-                        
-                        addr = card->u.c.rx_base;
-                        len -= offset;
-                        
-                        tty->flip.char_buf_ptr+=offset;
-                        tty->flip.count+=offset;
-                        for (i=0;i<offset;i++){
-                                *tty->flip.flag_buf_ptr = 0;
-                                tty->flip.flag_buf_ptr++;
-                        }
-                }
-                
-                sdla_peek(&card->hw, addr, tty->flip.char_buf_ptr, len);
-                        
-                tty->flip.char_buf_ptr+=len;
-                card->tty->flip.count+=len;
-                for (i=0;i<len;i++){
-                        *tty->flip.flag_buf_ptr = 0;
-                        tty->flip.flag_buf_ptr++;
-                }
-
-                tty->low_latency=1;
-                tty_flip_buffer_push(tty);
-        }else{
-                if (!card->tty_rx){     
-                        if (net_ratelimit()){
-                                printk(KERN_INFO 
-                                "%s: Receive sync buffer not available!\n",
-                                 card->devname);
-                        }
-                        return;
-                }
-        
-                if (len > TTY_CHDLC_MAX_MTU){
-                        if (net_ratelimit()){
-                                printk(KERN_INFO 
-                                "%s: Received packet size too big: %i bytes, Max: %i!\n",
-                                        card->devname,len,TTY_FLIPBUF_SIZE);
-                        }
-                        return;
-                }
-
-                
-                if((addr + len) > card->u.c.rx_top + 1) {
-                        offset = card->u.c.rx_top - addr + 1;
-                        
-                        sdla_peek(&card->hw, addr, card->tty_rx, offset);
-                        
-                        addr = card->u.c.rx_base;
-                        len -= offset;
-                }
-                sdla_peek(&card->hw, addr, card->tty_rx+offset, len);
-                ld = tty_ldisc_ref(tty);
-                if (ld) {
-                        if (ld->receive_buf)
-                                ld->receive_buf(tty,card->tty_rx,&fp,olen);
-                        tty_ldisc_deref(ld);
-                }else{
-                        if (net_ratelimit()){
-                                printk(KERN_INFO 
-                                        "%s: NO TTY Sync line discipline!\n",
-                                        card->devname);
-                        }
-                }
-        }
-
-        dbg_printk(KERN_INFO "%s: Received Data %i\n",card->devname,olen);
-        return;
-}
-
-#if 0
-static int wanpipe_tty_ioctl(struct tty_struct *tty, struct file * file,
-                    unsigned int cmd, unsigned long arg)
-{
-        return -ENOIOCTLCMD;
-}
-#endif
-
-static void wanpipe_tty_stop(struct tty_struct *tty)
-{
-        return;
-}
-
-static void wanpipe_tty_start(struct tty_struct *tty)
-{
-        return;
-}
-
-static int config_tty (sdla_t *card)
-{
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-
-        /* Setup the Board for asynchronous mode */
-        if (card->u.c.async_mode){
-                
-                if (set_asy_config(card)) {
-                        printk (KERN_INFO "%s: Failed CHDLC Async configuration!\n",
-                                card->devname);
-                        return -EINVAL;
-                }
-        }else{
-                /* Setup the Board for CHDLC */
-                if (set_chdlc_config(card)) {
-                        printk (KERN_INFO "%s: Failed CHDLC configuration!\n",
-                                card->devname);
-                        return -EINVAL;
-                }
-        }
-
-        /* Set interrupt mode and mask */
-        if (chdlc_set_intr_mode(card, APP_INT_ON_RX_FRAME |
-                                APP_INT_ON_GLOBAL_EXCEP_COND |
-                                APP_INT_ON_TX_FRAME |
-                                APP_INT_ON_CHDLC_EXCEP_COND | APP_INT_ON_TIMER)){
-                printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
-                                card->devname);
-                return -EINVAL; 
-        }
-        
-
-        /* Mask the Transmit and Timer interrupt */
-        flags->interrupt_info_struct.interrupt_permission &= 
-                ~(APP_INT_ON_TX_FRAME | APP_INT_ON_TIMER);
-
-        
-        /* Enable communications */
-        if (card->u.c.async_mode){
-                if (asy_comm_enable(card) != 0) {
-                        printk(KERN_INFO "%s: Failed to enable async commnunication!\n",
-                                        card->devname);
-                        flags->interrupt_info_struct.interrupt_permission = 0;
-                        card->u.c.comm_enabled=0;
-                        chdlc_set_intr_mode(card,0);
-                        return -EINVAL;
-                }
-        }else{ 
-                if (chdlc_comm_enable(card) != 0) {
-                        printk(KERN_INFO "%s: Failed to enable chdlc communications!\n",
-                                        card->devname);
-                        flags->interrupt_info_struct.interrupt_permission = 0;
-                        card->u.c.comm_enabled=0;
-                        chdlc_set_intr_mode(card,0);
-                        return -EINVAL;
-                }
-        }
-
-        /* Initialize Rx/Tx buffer control fields */
-        init_chdlc_tx_rx_buff(card);
-        port_set_state(card, WAN_CONNECTING);
-        return 0; 
-}
-
-
-static int change_speed(sdla_t *card, struct tty_struct *tty,
-                         struct termios *old_termios)
-{
-        int     baud, ret=0;
-        unsigned cflag; 
-        int     dbits,sbits,parity,handshaking;
-
-        cflag = tty->termios->c_cflag;
-
-        /* There is always one stop bit */
-        sbits=WANOPT_ONE;
-        
-        /* Parity is defaulted to NONE */
-        parity = WANOPT_NONE;
-
-        handshaking=0;
-        
-        /* byte size and parity */
-        switch (cflag & CSIZE) {
-              case CS5: dbits = 5; break;
-              case CS6: dbits = 6; break;
-              case CS7: dbits = 7; break;
-              case CS8: dbits = 8; break;
-              /* Never happens, but GCC is too dumb to figure it out */
-              default:  dbits = 8; break;
-        }
-        
-        /* One more stop bit should be supported, thus increment
-         * the number of stop bits Max=2 */
-        if (cflag & CSTOPB) {
-                sbits = WANOPT_TWO;
-        }
-        if (cflag & PARENB) {
-                parity = WANOPT_EVEN;
-        }
-        if (cflag & PARODD){
-                parity = WANOPT_ODD;
-        }
-
-        /* Determine divisor based on baud rate */
-        baud = tty_get_baud_rate(tty);
-
-        if (!baud)
-                baud = 9600;    /* B0 transition handled in rs_set_termios */
-
-        if (cflag & CRTSCTS) {
-                handshaking|=ASY_RTS_HS_FOR_RX;
-        }
-        
-        if (I_IGNPAR(tty))
-                parity = WANOPT_NONE;
-
-        if (I_IXOFF(tty)){
-                handshaking|=ASY_XON_XOFF_HS_FOR_RX;
-                handshaking|=ASY_XON_XOFF_HS_FOR_TX;
-        }
-
-        if (I_IXON(tty)){
-                handshaking|=ASY_XON_XOFF_HS_FOR_RX;
-                handshaking|=ASY_XON_XOFF_HS_FOR_TX;
-        }
-
-        if (card->u.c.async_mode){
-                if (card->wandev.bps != baud)
-                        ret=1;
-                card->wandev.bps = baud;
-        }
-
-        if (card->u.c.async_mode){
-                if (card->u.c.protocol_options != handshaking)
-                        ret=1;
-                card->u.c.protocol_options = handshaking;
-
-                if (card->u.c.tx_bits_per_char != dbits)
-                        ret=1;
-                card->u.c.tx_bits_per_char = dbits;
-
-                if (card->u.c.rx_bits_per_char != dbits)
-                        ret=1;
-                card->u.c.rx_bits_per_char = dbits;
-                
-                if (card->u.c.stop_bits != sbits)
-                        ret=1;
-                card->u.c.stop_bits = sbits;
-
-                if (card->u.c.parity != parity)
-                        ret=1;
-                card->u.c.parity = parity;      
-
-                card->u.c.break_timer = 50;
-                card->u.c.inter_char_timer = 10;
-                card->u.c.rx_complete_length = 100;
-                card->u.c.xon_char = 0xFE;
-        }else{
-                card->u.c.protocol_options = HDLC_STREAMING_MODE;
-        }
-        
-        return ret;
-}
-
-        
-static void wanpipe_tty_set_termios(struct tty_struct *tty, struct termios *old_termios)
-{
-        sdla_t *card;
-        int err=1;
-
-        if (!tty){
-                return;
-        }
-
-        card = (sdla_t *)tty->driver_data;
-                        
-        if (!card)
-                return;
-
-        if (change_speed(card, tty, old_termios) || !card->u.c.comm_enabled){
-                unsigned long smp_flags;
-                
-                if (card->u.c.comm_enabled){
-                        lock_adapter_irq(&card->wandev.lock,&smp_flags);
-                        chdlc_disable_comm_shutdown(card);
-                        unlock_adapter_irq(&card->wandev.lock,&smp_flags);
-                }
-                lock_adapter_irq(&card->wandev.lock,&smp_flags);
-                err = config_tty(card);
-                unlock_adapter_irq(&card->wandev.lock,&smp_flags);
-                if (card->u.c.async_mode){
-                        printk(KERN_INFO "%s: TTY Async Configuration:\n"
-                                 "   Baud        =%i\n"
-                                 "   Handshaking =%s\n"
-                                 "   Tx Dbits    =%i\n"
-                                 "   Rx Dbits    =%i\n"
-                                 "   Parity      =%s\n"
-                                 "   Stop Bits   =%i\n",
-                                 card->devname,
-                                 card->wandev.bps,
-                                 opt_decode[card->u.c.protocol_options],
-                                 card->u.c.tx_bits_per_char,
-                                 card->u.c.rx_bits_per_char,
-                                 p_decode[card->u.c.parity] ,
-                                 card->u.c.stop_bits);
-                }else{
-                        printk(KERN_INFO "%s: TTY Sync Configuration:\n"
-                                 "   Baud        =%i\n"
-                                 "   Protocol    =HDLC_STREAMING\n",
-                                 card->devname,card->wandev.bps);
-                }
-                if (!err){
-                        port_set_state(card,WAN_CONNECTED);
-                }else{
-                        port_set_state(card,WAN_DISCONNECTED);
-                }
-        }
-        return;
-}
-
-static void wanpipe_tty_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        sdla_t *card;
-        unsigned long smp_flags=0;
-
-        if (!tty){
-                return;
-        }
-        
-        card = (sdla_t *)tty->driver_data;
-                        
-        if (!card)
-                return;
-
-        if (card->wandev.state != WAN_CONNECTED)
-                return;
-
-        if(card->hw.type != SDLA_S514)
-                s508_lock(card,&smp_flags);
-        
-        if (test_and_set_bit(SEND_CRIT,(void*)&card->wandev.critical)){
-                
-                wanpipe_tty_trigger_tx_irq(card);
-
-                if(card->hw.type != SDLA_S514)
-                        s508_unlock(card,&smp_flags);
-                return;
-        }
-
-        if (chdlc_send(card,(void*)&ch,1)){
-                wanpipe_tty_trigger_tx_irq(card);
-                dbg_printk("%s: Failed to TX char!\n",card->devname);
-        }
-        
-        dbg_printk("%s: Char TX OK\n",card->devname);
-        
-        clear_bit(SEND_CRIT,(void*)&card->wandev.critical);
-        
-        if(card->hw.type != SDLA_S514)
-                s508_unlock(card,&smp_flags);
-        
-        return;
-}
-
-static void wanpipe_tty_flush_chars(struct tty_struct *tty)
-{
-        return;
-}
-
-static void wanpipe_tty_flush_buffer(struct tty_struct *tty)
-{
-        if (!tty)
-                return;
-        
-#if defined(SERIAL_HAVE_POLL_WAIT)
-        wake_up_interruptible(&tty->poll_wait);
-#endif
-        tty_wakeup(tty);
-        return;
-}
-
-/*
- * This function is used to send a high-priority XON/XOFF character to
- * the device
- */
-static void wanpipe_tty_send_xchar(struct tty_struct *tty, char ch)
-{
-        return;
-}
-
-
-static int wanpipe_tty_chars_in_buffer(struct tty_struct *tty)
-{
-        return 0;
-}
-
-
-static int wanpipe_tty_write_room(struct tty_struct *tty)
-{
-        sdla_t *card;
-
-        printk(KERN_INFO "TTY Write Room\n");
-        
-        if (!tty){
-                return 0;
-        }
-
-        card = (sdla_t *)tty->driver_data;
-        if (!card)
-                return 0;
-
-        if (card->wandev.state != WAN_CONNECTED)
-                return 0;
-        
-        return SEC_MAX_NO_DATA_BYTES_IN_FRAME;
-}
-
-
-static int set_modem_status(sdla_t *card, unsigned char data)
-{
-        CHDLC_MAILBOX_STRUCT *mb = card->mbox;
-        int err;
-
-        mb->buffer_length=1;
-        mb->command=SET_MODEM_STATUS;
-        mb->data[0]=data;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK) 
-                chdlc_error (card, err, mb);
-        
-        return err;
-}
-
-static void wanpipe_tty_hangup(struct tty_struct *tty)
-{
-        sdla_t *card;
-        unsigned long smp_flags;
-
-        printk(KERN_INFO "TTY Hangup!\n");
-        
-        if (!tty){
-                return;
-        }
-
-        card = (sdla_t *)tty->driver_data;
-        if (!card)
-                return;
-
-        lock_adapter_irq(&card->wandev.lock,&smp_flags);
-        set_modem_status(card,0);
-        unlock_adapter_irq(&card->wandev.lock,&smp_flags);
-        return;
-}
-
-static void wanpipe_tty_break(struct tty_struct *tty, int break_state)
-{
-        return;
-}
-
-static void wanpipe_tty_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        return;
-}
-
-static void wanpipe_tty_throttle(struct tty_struct * tty)
-{
-        return;
-}
-
-static void wanpipe_tty_unthrottle(struct tty_struct * tty)
-{
-        return;
-}
-
-int wanpipe_tty_read_proc(char *page, char **start, off_t off, int count,
-                 int *eof, void *data)
-{
-        return 0;
-}
-
-/*
- * The serial driver boot-time initialization code!
- */
-int wanpipe_tty_init(sdla_t *card)
-{
-        struct serial_state * state;
-        
-        /* Initialize the tty_driver structure */
-
-        if (card->tty_minor < 0 || card->tty_minor > NR_PORTS){
-                printk(KERN_INFO "%s: Illegal Minor TTY number (0-4): %i\n",
-                                card->devname,card->tty_minor);
-                return -EINVAL;
-        }
-
-        if (WAN_CARD(card->tty_minor)){
-                printk(KERN_INFO "%s: TTY Minor %i, already in use\n",
-                                card->devname,card->tty_minor);
-                return -EBUSY;
-        }
-
-        if (tty_init_cnt==0){
-                
-                printk(KERN_INFO "%s: TTY %s Driver Init: Major %i, Minor Range %i-%i\n",
-                                card->devname,
-                                card->u.c.async_mode ? "ASYNC" : "SYNC",
-                                WAN_TTY_MAJOR,MIN_PORT,MAX_PORT);
-                
-                tty_driver_mode = card->u.c.async_mode;
-                
-                memset(&serial_driver, 0, sizeof(struct tty_driver));
-                serial_driver.magic = TTY_DRIVER_MAGIC;
-                serial_driver.owner = THIS_MODULE;
-                serial_driver.driver_name = "wanpipe_tty"; 
-                serial_driver.name = "ttyW";
-                serial_driver.major = WAN_TTY_MAJOR;
-                serial_driver.minor_start = WAN_TTY_MINOR;
-                serial_driver.num = NR_PORTS; 
-                serial_driver.type = TTY_DRIVER_TYPE_SERIAL;
-                serial_driver.subtype = SERIAL_TYPE_NORMAL;
-                
-                serial_driver.init_termios = tty_std_termios;
-                serial_driver.init_termios.c_cflag =
-                        B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-                serial_driver.flags = TTY_DRIVER_REAL_RAW;
-                
-                serial_driver.refcount = 1;     /* !@!@^#^&!! */
-
-                serial_driver.open = wanpipe_tty_open;
-                serial_driver.close = wanpipe_tty_close;
-                serial_driver.write = wanpipe_tty_write;
-                
-                serial_driver.put_char = wanpipe_tty_put_char;
-                serial_driver.flush_chars = wanpipe_tty_flush_chars;
-                serial_driver.write_room = wanpipe_tty_write_room;
-                serial_driver.chars_in_buffer = wanpipe_tty_chars_in_buffer;
-                serial_driver.flush_buffer = wanpipe_tty_flush_buffer;
-                //serial_driver.ioctl = wanpipe_tty_ioctl;
-                serial_driver.throttle = wanpipe_tty_throttle;
-                serial_driver.unthrottle = wanpipe_tty_unthrottle;
-                serial_driver.send_xchar = wanpipe_tty_send_xchar;
-                serial_driver.set_termios = wanpipe_tty_set_termios;
-                serial_driver.stop = wanpipe_tty_stop;
-                serial_driver.start = wanpipe_tty_start;
-                serial_driver.hangup = wanpipe_tty_hangup;
-                serial_driver.break_ctl = wanpipe_tty_break;
-                serial_driver.wait_until_sent = wanpipe_tty_wait_until_sent;
-                serial_driver.read_proc = wanpipe_tty_read_proc;
-                
-                if (tty_register_driver(&serial_driver)){
-                        printk(KERN_INFO "%s: Failed to register serial driver!\n",
-                                        card->devname);
-                }
-        }
-
-
-        /* The subsequent ports must comply to the initial configuration */
-        if (tty_driver_mode != card->u.c.async_mode){
-                printk(KERN_INFO "%s: Error: TTY Driver operation mode mismatch!\n",
-                                card->devname);
-                printk(KERN_INFO "%s: The TTY driver is configured for %s!\n",
-                                card->devname, tty_driver_mode ? "ASYNC" : "SYNC");
-                return -EINVAL;
-        }
-        
-        tty_init_cnt++;
-        
-        printk(KERN_INFO "%s: Initializing TTY %s Driver Minor %i\n",
-                        card->devname,
-                        tty_driver_mode ? "ASYNC" : "SYNC",
-                        card->tty_minor);
-        
-        tty_card_map[card->tty_minor] = card;
-        state = &rs_table[card->tty_minor];
-        
-        state->magic = SSTATE_MAGIC;
-        state->line = 0;
-        state->type = PORT_UNKNOWN;
-        state->custom_divisor = 0;
-        state->close_delay = 5*HZ/10;
-        state->closing_wait = 30*HZ;
-        state->icount.cts = state->icount.dsr = 
-                state->icount.rng = state->icount.dcd = 0;
-        state->icount.rx = state->icount.tx = 0;
-        state->icount.frame = state->icount.parity = 0;
-        state->icount.overrun = state->icount.brk = 0;
-        state->irq = card->wandev.irq; 
-
-        INIT_WORK(&card->tty_work, tty_poll_work, (void*)card);
-        return 0;
-}
-
-
-MODULE_LICENSE("GPL");
-
-/****** End ****************************************************************/
diff --git a/drivers/net/wan/sdla_fr.c b/drivers/net/wan/sdla_fr.c
deleted file mode 100644
index 7f1ce9d4333e..000000000000
--- a/drivers/net/wan/sdla_fr.c
+++ /dev/null
@@ -1,5061 +0,0 @@
-/*****************************************************************************
-* sdla_fr.c     WANPIPE(tm) Multiprotocol WAN Link Driver. Frame relay module.
-*
-* Author(s):    Nenad Corbic  <ncorbic@sangoma.com>
-*               Gideon Hack
-*
-* Copyright:    (c) 1995-2001 Sangoma Technologies 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.
-* ============================================================================
-* Nov 23, 2000  Nenad Corbic    o Added support for 2.4.X kernels
-* Nov 15, 2000  David Rokavarg  
-*               Nenad Corbic    o Added frame relay bridging support.
-*                                 Original code from Mark Wells and Kristian Hoffmann has
-*                                 been integrated into the frame relay driver.
-* Nov 13, 2000  Nenad Corbic    o Added true interface type encoding option.
-*                                 Tcpdump doesn't support Frame Relay inteface
-*                                 types, to fix this true type option will set
-*                                 the interface type to RAW IP mode.
-* Nov 07, 2000  Nenad Corbic    o Added security features for UDP debugging:
-*                                 Deny all and specify allowed requests.
-* Nov 06, 2000  Nenad Corbic    o Wanpipe interfaces conform to raw packet interfaces.  
-*                                 Moved the if_header into the if_send() routine.
-*                                 The if_header() was breaking the libpcap 
-*                                 support. i.e. support for tcpdump, ethereal ...
-* Oct 12. 2000  Nenad Corbic    o Added error message in fr_configure
-* Jul 31, 2000  Nenad Corbic    o Fixed the Router UP Time.
-* Apr 28, 2000  Nenad Corbic    o Added the option to shutdown an interface
-*                                 when the channel gets disconnected.
-* Apr 28, 2000  Nenad Corbic    o Added M.Grants patch: disallow duplicate
-*                                 interface setups. 
-* Apr 25, 2000  Nenad Corbic    o Added M.Grants patch: dynamically add/remove 
-*                                 new dlcis/interfaces.
-* Mar 23, 2000  Nenad Corbic    o Improved task queue, bh handling.
-* Mar 16, 2000  Nenad Corbic    o Added Inverse ARP support
-* Mar 13, 2000  Nenad Corbic    o Added new socket API support.
-* Mar 06, 2000  Nenad Corbic    o Bug Fix: corrupted mbox recovery.
-* Feb 24, 2000  Nenad Corbic    o Fixed up FT1 UDP debugging problem.
-* Dev 15, 1999  Nenad Corbic    o Fixed up header files for 2.0.X kernels
-*
-* Nov 08, 1999  Nenad Corbic    o Combined all debug UDP calls into one function
-*                               o Removed the ARP support. This has to be done
-*                                 in the next version.
-*                               o Only a Node can implement NO signalling.
-*                                 Initialize DLCI during if_open() if NO 
-*                                 signalling.
-*                               o Took out IPX support, implement in next
-*                                 version
-* Sep 29, 1999  Nenad Corbic    o Added SMP support and changed the update
-*                                 function to use timer interrupt.
-*                               o Fixed the CIR bug:  Set the value of BC
-*                                 to CIR when the CIR is enabled.
-*                               o Updated comments, statistics and tracing.
-* Jun 02, 1999  Gideon Hack     o Updated for S514 support.
-* Sep 18, 1998  Jaspreet Singh  o Updated for 2.2.X kernels.
-* Jul 31, 1998  Jaspreet Singh  o Removed wpf_poll routine.  The channel/DLCI 
-*                                 status is received through an event interrupt.
-* Jul 08, 1998  David Fong      o Added inverse ARP support.
-* Mar 26, 1997  Jaspreet Singh  o Returning return codes for failed UDP cmds.
-* Jan 28, 1997  Jaspreet Singh  o Improved handling of inactive DLCIs.
-* Dec 30, 1997  Jaspreet Singh  o Replaced dev_tint() with mark_bh(NET_BH)
-* Dec 16, 1997  Jaspreet Singh  o Implemented Multiple IPX support.
-* Nov 26, 1997  Jaspreet Singh  o Improved load sharing with multiple boards
-*                               o Added Cli() to protect enabling of interrupts
-*                                 while polling is called.
-* Nov 24, 1997  Jaspreet Singh  o Added counters to avoid enabling of interrupts
-*                                 when they have been disabled by another
-*                                 interface or routine (eg. wpf_poll).
-* Nov 06, 1997  Jaspreet Singh  o Added INTR_TEST_MODE to avoid polling 
-*                                 routine disable interrupts during interrupt
-*                                 testing.
-* Oct 20, 1997  Jaspreet Singh  o Added hooks in for Router UP time.
-* Oct 16, 1997  Jaspreet Singh  o The critical flag is used to maintain flow
-*                                 control by avoiding RACE conditions.  The
-*                                 cli() and restore_flags() are taken out.
-*                                 The fr_channel structure is appended for 
-*                                 Driver Statistics.
-* Oct 15, 1997  Farhan Thawar    o updated if_send() and receive for IPX
-* Aug 29, 1997  Farhan Thawar    o Removed most of the cli() and sti()
-*                                o Abstracted the UDP management stuff
-*                                o Now use tbusy and critical more intelligently
-* Jul 21, 1997  Jaspreet Singh   o Can configure T391, T392, N391, N392 & N393
-*                                  through router.conf.
-*                                o Protected calls to sdla_peek() by adDing 
-*                                  save_flags(), cli() and restore_flags().
-*                                o Added error message for Inactive DLCIs in
-*                                  fr_event() and update_chan_state().
-*                                o Fixed freeing up of buffers using kfree() 
-*                                  when packets are received.
-* Jul 07, 1997  Jaspreet Singh   o Added configurable TTL for UDP packets 
-*                                o Added ability to discard multicast and 
-*                                  broadcast source addressed packets
-* Jun 27, 1997  Jaspreet Singh   o Added FT1 monitor capabilities 
-*                                  New case (0x44) statement in if_send routine 
-*                                  Added a global variable rCount to keep track
-*                                  of FT1 status enabled on the board.
-* May 29, 1997  Jaspreet Singh   o Fixed major Flow Control Problem
-*                                  With multiple boards a problem was seen where
-*                                  the second board always stopped transmitting
-*                                  packet after running for a while. The code
-*                                  got into a stage where the interrupts were
-*                                  disabled and dev->tbusy was set to 1.
-*                                  This caused the If_send() routine to get into
-*                                  the if clause for it(0,dev->tbusy) 
-*                                  forever.
-*                                  The code got into this stage due to an 
-*                                  interrupt occurring within the if clause for 
-*                                  set_bit(0,dev->tbusy).  Since an interrupt 
-*                                  disables furhter transmit interrupt and 
-*                                  makes dev->tbusy = 0, this effect was undone 
-*                                  by making dev->tbusy = 1 in the if clause.
-*                                  The Fix checks to see if Transmit interrupts
-*                                  are disabled then do not make dev->tbusy = 1
-*                                  Introduced a global variable: int_occur and
-*                                  added tx_int_enabled in the wan_device 
-*                                  structure.   
-* May 21, 1997  Jaspreet Singh   o Fixed UDP Management for multiple
-*                                  boards.
-*
-* Apr 25, 1997  Farhan Thawar    o added UDP Management stuff
-*                                o fixed bug in if_send() and tx_intr() to
-*                                  sleep and wakeup all devices
-* Mar 11, 1997  Farhan Thawar   Version 3.1.1
-*                                o fixed (+1) bug in fr508_rx_intr()
-*                                o changed if_send() to return 0 if
-*                                  wandev.critical() is true
-*                                o free socket buffer in if_send() if
-*                                  returning 0 
-*                                o added tx_intr() routine
-* Jan 30, 1997  Gene Kozin      Version 3.1.0
-*                                o implemented exec() entry point
-*                                o fixed a bug causing driver configured as
-*                                  a FR switch to be stuck in WAN_
-*                                  mode
-* Jan 02, 1997  Gene Kozin      Initial version.
-*****************************************************************************/
-
-#include <linux/module.h>
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/slab.h> /* kmalloc(), kfree() */
-#include <linux/wanrouter.h>    /* WAN router definitions */
-#include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
-#include <linux/workqueue.h>
-#include <linux/if_arp.h>       /* ARPHRD_* defines */
-#include <asm/byteorder.h>      /* htons(), etc. */
-#include <asm/io.h>             /* for inb(), outb(), etc. */
-#include <linux/time.h>         /* for do_gettimeofday */       
-#include <linux/in.h>           /* sockaddr_in */
-#include <linux/jiffies.h>      /* time_after() macro */
-#include <asm/errno.h>
-
-#include <linux/ip.h>
-#include <linux/if.h>
-
-#include <linux/if_wanpipe_common.h>    /* Wanpipe Socket */
-#include <linux/if_wanpipe.h>   
-
-#include <linux/sdla_fr.h>              /* frame relay firmware API definitions */
-
-#include <asm/uaccess.h>
-#include <linux/inetdevice.h>
-#include <linux/netdevice.h>
-
-#include <net/route.h>                  /* Dynamic Route Creation */
-#include <linux/etherdevice.h>          /* eth_type_trans() used for bridging */
-#include <linux/random.h>
-
-/****** Defines & Macros ****************************************************/
-
-#define MAX_CMD_RETRY   10              /* max number of firmware retries */
-
-#define FR_HEADER_LEN   8               /* max encapsulation header size */
-#define FR_CHANNEL_MTU  1500            /* unfragmented logical channel MTU */
-
-/* Q.922 frame types */
-#define Q922_UI         0x03            /* Unnumbered Info frame */
-#define Q922_XID        0xAF            
-
-/* DLCI configured or not */
-#define DLCI_NOT_CONFIGURED     0x00
-#define DLCI_CONFIG_PENDING     0x01
-#define DLCI_CONFIGURED         0x02
-
-/* CIR enabled or not */
-#define CIR_ENABLED     0x00
-#define CIR_DISABLED    0x01
-
-#define FRAME_RELAY_API 1
-#define MAX_BH_BUFF     10
-
-/* For handle_IPXWAN() */
-#define CVHexToAscii(b) (((unsigned char)(b) > (unsigned char)9) ? ((unsigned char)'A' + ((unsigned char)(b) - (unsigned char)10)) : ((unsigned char)'0' + (unsigned char)(b)))
- 
-/****** Data Structures *****************************************************/
-
-/* This is an extention of the 'struct device' we create for each network
- * interface to keep the rest of channel-specific data.
- */
-typedef struct fr_channel
-{
-        wanpipe_common_t common;
-        char name[WAN_IFNAME_SZ+1];     /* interface name, ASCIIZ */
-        unsigned dlci_configured  ;     /* check whether configured or not */
-        unsigned cir_status;            /* check whether CIR enabled or not */
-        unsigned dlci;                  /* logical channel number */
-        unsigned cir;                   /* committed information rate */
-        unsigned bc;                    /* committed burst size */
-        unsigned be;                    /* excess burst size */
-        unsigned mc;                    /* multicast support on or off */
-        unsigned tx_int_status;         /* Transmit Interrupt Status */ 
-        unsigned short pkt_length;      /* Packet Length */
-        unsigned long router_start_time;/* Router start time in seconds */
-        unsigned long tick_counter;     /* counter for transmit time out */
-        char dev_pending_devtint;       /* interface pending dev_tint() */
-        void *dlci_int_interface;       /* pointer to the DLCI Interface */ 
-        unsigned long IB_addr;          /* physical address of Interface Byte */
-        unsigned long state_tick;       /* time of the last state change */
-        unsigned char enable_IPX;       /* Enable/Disable the use of IPX */
-        unsigned long network_number;   /* Internal Network Number for IPX*/
-        sdla_t *card;                   /* -> owner */
-        unsigned route_flag;            /* Add/Rem dest addr in route tables */
-        unsigned inarp;                 /* Inverse Arp Request status */ 
-        long inarp_ready;               /* Ready to send requests */
-        int inarp_interval;             /* Time between InArp Requests */
-        unsigned long inarp_tick;       /* InArp jiffies tick counter */
-        long interface_down;            /* Bring interface down on disconnect */
-        struct net_device_stats ifstats;        /* interface statistics */
-        if_send_stat_t drvstats_if_send;
-        rx_intr_stat_t drvstats_rx_intr;
-        pipe_mgmt_stat_t drvstats_gen;
-        unsigned long router_up_time;
-
-        unsigned short transmit_length;
-        struct sk_buff *delay_skb;
-
-        bh_data_t *bh_head;               /* Circular buffer for chdlc_bh */
-        unsigned long  tq_working;
-        volatile int  bh_write;
-        volatile int  bh_read;
-        atomic_t  bh_buff_used;
-
-        /* Polling task queue. Each interface
-         * has its own task queue, which is used
-         * to defer events from the interrupt */
-        struct work_struct fr_poll_work;
-        struct timer_list fr_arp_timer;
-
-        u32 ip_local;
-        u32 ip_remote;
-        long config_dlci;
-        long unconfig_dlci;
-
-        /* Whether this interface should be setup as a gateway.
-         * Used by dynamic route setup code */
-        u8  gateway;
-
-        /* True interface type */
-        u8 true_if_encoding;
-        u8 fr_header[FR_HEADER_LEN];
-        char fr_header_len;
-
-} fr_channel_t;
-
-/* Route Flag options */
-#define NO_ROUTE        0x00
-#define ADD_ROUTE       0x01
-#define ROUTE_ADDED     0x02
-#define REMOVE_ROUTE    0x03
-#define ARP_REQ         0x04
-
-/* inarp options */
-#define INARP_NONE              0x00
-#define INARP_REQUEST           0x01
-#define INARP_CONFIGURED        0x02
-
-/* reasons for enabling the timer interrupt on the adapter */
-#define TMR_INT_ENABLED_UDP     0x01
-#define TMR_INT_ENABLED_UPDATE  0x02
-#define TMR_INT_ENABLED_ARP     0x04
-#define TMR_INT_ENABLED_UPDATE_STATE    0x08
-#define TMR_INT_ENABLED_CONFIG  0x10
-#define TMR_INT_ENABLED_UNCONFIG        0x20
-
-
-typedef struct dlci_status
-{
-        unsigned short dlci     PACKED;
-        unsigned char state     PACKED;
-} dlci_status_t;
-
-typedef struct dlci_IB_mapping
-{
-        unsigned short dlci             PACKED;
-        unsigned long  addr_value       PACKED;
-} dlci_IB_mapping_t;
-
-/* This structure is used for DLCI list Tx interrupt mode.  It is used to
-   enable interrupt bit and set the packet length for transmission
- */
-typedef struct fr_dlci_interface 
-{
-        unsigned char gen_interrupt     PACKED;
-        unsigned short packet_length    PACKED;
-        unsigned char reserved          PACKED;
-} fr_dlci_interface_t; 
-
-/* variable for keeping track of enabling/disabling FT1 monitor status */
-static int rCount = 0;
-
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
-
-/* variable for keeping track of number of interrupts generated during 
- * interrupt test routine 
- */
-static int Intr_test_counter;
-
-/****** Function Prototypes *************************************************/
-
-/* WAN link driver entry points. These are called by the WAN router module. */
-static int update(struct wan_device *wandev);
-static int new_if(struct wan_device *wandev, struct net_device *dev,
-                  wanif_conf_t *conf);
-static int del_if(struct wan_device *wandev, struct net_device *dev);
-static void disable_comm (sdla_t *card);
-
-/* WANPIPE-specific entry points */
-static int wpf_exec(struct sdla *card, void *u_cmd, void *u_data);
-
-/* Network device interface */
-static int if_init(struct net_device *dev);
-static int if_open(struct net_device *dev);
-static int if_close(struct net_device *dev);
-
-static void if_tx_timeout(struct net_device *dev);
-
-static int if_rebuild_hdr (struct sk_buff *skb);
-
-static int if_send(struct sk_buff *skb, struct net_device *dev);
-static int chk_bcast_mcast_addr(sdla_t *card, struct net_device* dev,
-                                struct sk_buff *skb);
-static struct net_device_stats *if_stats(struct net_device *dev);
-
-/* Interrupt handlers */
-static void fr_isr(sdla_t *card);
-static void rx_intr(sdla_t *card);
-static void tx_intr(sdla_t *card);
-static void timer_intr(sdla_t *card);
-static void spur_intr(sdla_t *card);
-
-/* Frame relay firmware interface functions */
-static int fr_read_version(sdla_t *card, char *str);
-static int fr_configure(sdla_t *card, fr_conf_t *conf);
-static int fr_dlci_configure(sdla_t *card, fr_dlc_conf_t *conf, unsigned dlci);
-static int fr_init_dlci (sdla_t *card, fr_channel_t *chan);
-static int fr_set_intr_mode (sdla_t *card, unsigned mode, unsigned mtu, unsigned short timeout);
-static int fr_comm_enable(sdla_t *card);
-static void fr_comm_disable(sdla_t *card);
-static int fr_get_err_stats(sdla_t *card);
-static int fr_get_stats(sdla_t *card);
-static int fr_add_dlci(sdla_t *card, int dlci);
-static int fr_activate_dlci(sdla_t *card, int dlci);
-static int fr_delete_dlci (sdla_t* card, int dlci);
-static int fr_issue_isf(sdla_t *card, int isf);
-static int fr_send(sdla_t *card, int dlci, unsigned char attr, int len,
-        void *buf);
-static int fr_send_data_header(sdla_t *card, int dlci, unsigned char attr, int len,
-        void *buf,unsigned char hdr_len);
-static unsigned int fr_send_hdr(sdla_t *card, int dlci, unsigned int offset);
-
-static int check_dlci_config (sdla_t *card, fr_channel_t *chan);
-static void initialize_rx_tx_buffers (sdla_t *card);
-
-
-/* Firmware asynchronous event handlers */
-static int fr_event(sdla_t *card, int event, fr_mbox_t *mbox);
-static int fr_modem_failure(sdla_t *card, fr_mbox_t *mbox);
-static int fr_dlci_change(sdla_t *card, fr_mbox_t *mbox);
-
-/* Miscellaneous functions */
-static int update_chan_state(struct net_device *dev);
-static void set_chan_state(struct net_device *dev, int state);
-static struct net_device *find_channel(sdla_t *card, unsigned dlci);
-static int is_tx_ready(sdla_t *card, fr_channel_t *chan);
-static unsigned int dec_to_uint(unsigned char *str, int len);
-static int reply_udp( unsigned char *data, unsigned int mbox_len );
-
-static int intr_test( sdla_t* card );
-static void init_chan_statistics( fr_channel_t* chan );
-static void init_global_statistics( sdla_t* card );
-static void read_DLCI_IB_mapping( sdla_t* card, fr_channel_t* chan );
-static int setup_for_delayed_transmit(struct net_device* dev,
-                                      struct sk_buff *skb);
-
-struct net_device *move_dev_to_next(sdla_t *card, struct net_device *dev);
-static int check_tx_status(sdla_t *card, struct net_device *dev);
-
-/* Frame Relay Socket API */
-static void trigger_fr_bh (fr_channel_t *);
-static void fr_bh(struct net_device *dev);
-static int fr_bh_cleanup(struct net_device *dev);
-static int bh_enqueue(struct net_device *dev, struct sk_buff *skb);
-
-static void trigger_fr_poll(struct net_device *dev);
-static void fr_poll(struct net_device *dev);
-//static void add_gateway(struct net_device *dev);
-
-static void trigger_unconfig_fr(struct net_device *dev);
-static void unconfig_fr (sdla_t *);
-
-static void trigger_config_fr (sdla_t *);
-static void config_fr (sdla_t *);
-
-
-/* Inverse ARP and Dynamic routing functions */
-int process_ARP(arphdr_1490_t *ArpPacket, sdla_t *card, struct net_device *dev);
-int is_arp(void *buf);
-int send_inarp_request(sdla_t *card, struct net_device *dev);
-
-static void trigger_fr_arp(struct net_device *dev);
-static void fr_arp (unsigned long data);
-
-
-/* Udp management functions */
-static int process_udp_mgmt_pkt(sdla_t *card);
-static int udp_pkt_type( struct sk_buff *skb, sdla_t *card );
-static int store_udp_mgmt_pkt(int udp_type, char udp_pkt_src, sdla_t* card,
-                                struct sk_buff *skb, int dlci);
-
-/* IPX functions */
-static void switch_net_numbers(unsigned char *sendpacket,
-        unsigned long network_number, unsigned char incoming);
-
-static int handle_IPXWAN(unsigned char *sendpacket, char *devname,
-        unsigned char enable_IPX, unsigned long network_number);
-
-/* Lock Functions: SMP supported */
-void    s508_s514_unlock(sdla_t *card, unsigned long *smp_flags);
-void    s508_s514_lock(sdla_t *card, unsigned long *smp_flags);
-
-unsigned short calc_checksum (char *, int);
-static int setup_fr_header(struct sk_buff *skb,
-                           struct net_device* dev, char op_mode);
-
-
-/****** Public Functions ****************************************************/
-
-/*============================================================================
- * Frame relay protocol initialization routine.
- *
- * This routine is called by the main WANPIPE module during setup.  At this
- * point adapter is completely initialized and firmware is running.
- *  o read firmware version (to make sure it's alive)
- *  o configure adapter
- *  o initialize protocol-specific fields of the adapter data space.
- *
- * Return:      0       o.k.
- *              < 0     failure.
- */
-int wpf_init(sdla_t *card, wandev_conf_t *conf)
-{
-
-        int err;
-        fr508_flags_t* flags;
-
-        union
-        {
-                char str[80];
-                fr_conf_t cfg;
-        } u;
-
-        fr_buf_info_t* buf_info;
-        int i;
-
-
-        printk(KERN_INFO "\n");
-
-        /* Verify configuration ID */
-        if (conf->config_id != WANCONFIG_FR) {
-                
-                printk(KERN_INFO "%s: invalid configuration ID %u!\n",
-                        card->devname, conf->config_id);
-                return -EINVAL;
-        
-        }
-
-        /* Initialize protocol-specific fields of adapter data space */
-        switch (card->hw.fwid) {
-        
-                case SFID_FR508:
-                        card->mbox  = (void*)(card->hw.dpmbase + 
-                                        FR508_MBOX_OFFS);
-                        card->flags = (void*)(card->hw.dpmbase + 
-                                        FR508_FLAG_OFFS);
-                        if(card->hw.type == SDLA_S514) {
-                                card->mbox += FR_MB_VECTOR;
-                                card->flags += FR_MB_VECTOR;
-                        }
-                        card->isr = &fr_isr;
-                        break;
-
-                default:
-                        return -EINVAL;
-        }
-
-        flags = card->flags;
-
-        /* Read firmware version.  Note that when adapter initializes, it
-         * clears the mailbox, so it may appear that the first command was
-         * executed successfully when in fact it was merely erased. To work
-         * around this, we execute the first command twice.
-         */
-
-        if (fr_read_version(card, NULL) || fr_read_version(card, u.str))
-                return -EIO;
-
-        printk(KERN_INFO "%s: running frame relay firmware v%s\n",
-                card->devname, u.str);
-
-        /* Adjust configuration */
-        conf->mtu += FR_HEADER_LEN;
-        conf->mtu = (conf->mtu >= MIN_LGTH_FR_DATA_CFG) ?
-                        min_t(unsigned int, conf->mtu, FR_MAX_NO_DATA_BYTES_IN_FRAME) :
-                        FR_CHANNEL_MTU + FR_HEADER_LEN;
-     
-        conf->bps = min_t(unsigned int, conf->bps, 2048000);
-
-        /* Initialze the configuration structure sent to the board to zero */
-        memset(&u.cfg, 0, sizeof(u.cfg));
-
-        memset(card->u.f.dlci_to_dev_map, 0, sizeof(card->u.f.dlci_to_dev_map));
-        
-        /* Configure adapter firmware */
-
-        u.cfg.mtu       = conf->mtu;
-        u.cfg.kbps      = conf->bps / 1000;
-
-        u.cfg.cir_fwd = u.cfg.cir_bwd = 16;
-        u.cfg.bc_fwd  = u.cfg.bc_bwd = 16;
-        
-        u.cfg.options   = 0x0000;
-        printk(KERN_INFO "%s: Global CIR enabled by Default\n", card->devname);
-        
-        switch (conf->u.fr.signalling) {
-
-                case WANOPT_FR_ANSI:
-                        u.cfg.options = 0x0000; 
-                        break;          
-        
-                case WANOPT_FR_Q933:    
-                        u.cfg.options |= 0x0200; 
-                        break;
-        
-                case WANOPT_FR_LMI:     
-                        u.cfg.options |= 0x0400; 
-                        break;
-
-                case WANOPT_NO:
-                        u.cfg.options |= 0x0800; 
-                        break;
-                default:
-                        printk(KERN_INFO "%s: Illegal Signalling option\n",
-                                        card->wandev.name);
-                        return -EINVAL;
-        }
-
-
-        card->wandev.signalling = conf->u.fr.signalling;
-
-        if (conf->station == WANOPT_CPE) {
-
-
-                if (conf->u.fr.signalling == WANOPT_NO){
-                        printk(KERN_INFO 
-                                "%s: ERROR - For NO signalling, station must be set to Node!",
-                                         card->devname);
-                        return -EINVAL;
-                }
-
-                u.cfg.station = 0;
-                u.cfg.options |= 0x8000;        /* auto config DLCI */
-                card->u.f.dlci_num  = 0;
-        
-        } else {
-
-                u.cfg.station = 1;      /* switch emulation mode */
-
-                /* For switch emulation we have to create a list of dlci(s)
-                 * that will be sent to be global SET_DLCI_CONFIGURATION 
-                 * command in fr_configure() routine. 
-                 */
-
-                card->u.f.dlci_num  = min_t(unsigned int, max_t(unsigned int, conf->u.fr.dlci_num, 1), 100);
-        
-                for ( i = 0; i < card->u.f.dlci_num; i++) {
-
-                        card->u.f.node_dlci[i] = (unsigned short) 
-                                conf->u.fr.dlci[i] ? conf->u.fr.dlci[i] : 16;
-        
-                }
-        }
-
-        if (conf->clocking == WANOPT_INTERNAL)
-                u.cfg.port |= 0x0001;
-
-        if (conf->interface == WANOPT_RS232)
-                u.cfg.port |= 0x0002;
-
-        if (conf->u.fr.t391)
-                u.cfg.t391 = min_t(unsigned int, conf->u.fr.t391, 30);
-        else
-                u.cfg.t391 = 5;
-
-        if (conf->u.fr.t392)
-                u.cfg.t392 = min_t(unsigned int, conf->u.fr.t392, 30);
-        else
-                u.cfg.t392 = 15;
-
-        if (conf->u.fr.n391)
-                u.cfg.n391 = min_t(unsigned int, conf->u.fr.n391, 255);
-        else
-                u.cfg.n391 = 2;
-
-        if (conf->u.fr.n392)
-                u.cfg.n392 = min_t(unsigned int, conf->u.fr.n392, 10);
-        else
-                u.cfg.n392 = 3; 
-
-        if (conf->u.fr.n393)
-                u.cfg.n393 = min_t(unsigned int, conf->u.fr.n393, 10);
-        else
-                u.cfg.n393 = 4;
-
-        if (fr_configure(card, &u.cfg))
-                return -EIO;
-
-        if (card->hw.type == SDLA_S514) {
-        
-                buf_info = (void*)(card->hw.dpmbase + FR_MB_VECTOR +
-                        FR508_RXBC_OFFS);
-
-                card->rxmb = (void*)(buf_info->rse_next + card->hw.dpmbase);
-
-                card->u.f.rxmb_base =
-                        (void*)(buf_info->rse_base + card->hw.dpmbase); 
-
-                card->u.f.rxmb_last =
-                        (void*)(buf_info->rse_base +
-                        (buf_info->rse_num - 1) * sizeof(fr_rx_buf_ctl_t) +
-                        card->hw.dpmbase);
-        }else{  
-                buf_info = (void*)(card->hw.dpmbase + FR508_RXBC_OFFS);
-
-                card->rxmb = (void*)(buf_info->rse_next -
-                        FR_MB_VECTOR + card->hw.dpmbase);
-                
-                card->u.f.rxmb_base =
-                        (void*)(buf_info->rse_base -
-                        FR_MB_VECTOR + card->hw.dpmbase);
-                
-                card->u.f.rxmb_last =
-                        (void*)(buf_info->rse_base +
-                        (buf_info->rse_num - 1) * sizeof(fr_rx_buf_ctl_t) -
-                        FR_MB_VECTOR + card->hw.dpmbase);
-        }
-
-        card->u.f.rx_base = buf_info->buf_base;
-        card->u.f.rx_top  = buf_info->buf_top;
-
-        card->u.f.tx_interrupts_pending = 0;
-
-        card->wandev.mtu        = conf->mtu;
-        card->wandev.bps        = conf->bps;
-        card->wandev.interface  = conf->interface;
-        card->wandev.clocking   = conf->clocking;
-        card->wandev.station    = conf->station;
-        card->poll              = NULL; 
-        card->exec              = &wpf_exec;
-        card->wandev.update     = &update;
-        card->wandev.new_if     = &new_if;
-        card->wandev.del_if     = &del_if;
-        card->wandev.state      = WAN_DISCONNECTED;
-        card->wandev.ttl        = conf->ttl;
-        card->wandev.udp_port   = conf->udp_port;       
-        card->disable_comm      = &disable_comm;        
-        card->u.f.arp_dev       = NULL;
-
-        /* Intialize global statistics for a card */
-        init_global_statistics( card );
-
-        card->TracingEnabled          = 0;
-
-        /* Interrupt Test */
-        Intr_test_counter = 0;
-        card->intr_mode = INTR_TEST_MODE;
-        err = intr_test( card );
-
-        printk(KERN_INFO "%s: End of Interrupt Test rc=0x%x  count=%i\n",
-                        card->devname,err,Intr_test_counter); 
-        
-        if (err || (Intr_test_counter < MAX_INTR_TEST_COUNTER)) {
-                printk(KERN_ERR "%s: Interrupt Test Failed, Counter: %i\n", 
-                        card->devname, Intr_test_counter);
-                printk(KERN_ERR "Please choose another interrupt\n");
-                err = -EIO;
-                return err;
-        }
-
-        printk(KERN_INFO "%s: Interrupt Test Passed, Counter: %i\n",
-                        card->devname, Intr_test_counter);
-
-
-        /* Apr 28 2000. Nenad Corbic
-         * Enable commnunications here, not in if_open or new_if, since
-         * interfaces come down when the link is disconnected. 
-         */
-         
-        /* If you enable comms and then set ints, you get a Tx int as you
-         * perform the SET_INT_TRIGGERS command. So, we only set int
-         * triggers and then adjust the interrupt mask (to disable Tx ints)
-         * before enabling comms. 
-         */     
-        if (fr_set_intr_mode(card, (FR_INTR_RXRDY | FR_INTR_TXRDY |
-                FR_INTR_DLC | FR_INTR_TIMER | FR_INTR_TX_MULT_DLCIs) ,
-                card->wandev.mtu, 0)) {
-                return -EIO;
-        }
-
-        flags->imask &= ~(FR_INTR_TXRDY | FR_INTR_TIMER);
- 
-        if (fr_comm_enable(card)) {
-                return -EIO;
-        }       
-        wanpipe_set_state(card, WAN_CONNECTED);
-        spin_lock_init(&card->u.f.if_send_lock);
-        
-        printk(KERN_INFO "\n");
-
-        return 0;
-}
-
-/******* WAN Device Driver Entry Points *************************************/
-
-/*============================================================================
- * Update device status & statistics.
- */
-static int update(struct wan_device* wandev)
-{
-        volatile sdla_t* card;
-        unsigned long timeout;
-        fr508_flags_t* flags;
-
-        /* sanity checks */
-        if ((wandev == NULL) || (wandev->private == NULL))
-                return -EFAULT;
-
-        if (wandev->state == WAN_UNCONFIGURED)
-                return -ENODEV;
-
-        card = wandev->private;
-        flags = card->flags;
-
-
-        card->u.f.update_comms_stats = 1;
-        card->u.f.timer_int_enabled |= TMR_INT_ENABLED_UPDATE;
-        flags->imask |= FR_INTR_TIMER;
-        timeout = jiffies;
-        for(;;) {
-                if(card->u.f.update_comms_stats == 0)
-                        break;
-                if (time_after(jiffies, timeout + 1 * HZ)){
-                        card->u.f.update_comms_stats = 0;
-                        return -EAGAIN;
-                }
-        }
-
-        return 0;
-}
-
-/*============================================================================
- * Create new logical channel.
- * This routine is called by the router when ROUTER_IFNEW IOCTL is being
- * handled.
- * o parse media- and hardware-specific configuration
- * o make sure that a new channel can be created
- * o allocate resources, if necessary
- * o prepare network device structure for registaration.
- *
- * Return:      0       o.k.
- *              < 0     failure (channel will not be created)
- */
-static int new_if(struct wan_device* wandev, struct net_device* dev,
-                  wanif_conf_t* conf)
-{
-        sdla_t* card = wandev->private;
-        fr_channel_t* chan;
-        int dlci = 0;
-        int err = 0;
-
-        
-        if ((conf->name[0] == '\0') || (strlen(conf->name) > WAN_IFNAME_SZ)) {
-                
-                printk(KERN_INFO "%s: Invalid interface name!\n",
-                        card->devname);
-                return -EINVAL;
-        }
-
-        /* allocate and initialize private data */
-        chan = kmalloc(sizeof(fr_channel_t), GFP_KERNEL);
-
-        if (chan == NULL)
-                return -ENOMEM;
-
-        memset(chan, 0, sizeof(fr_channel_t));
-        strcpy(chan->name, conf->name);
-        chan->card = card;
-
-        /* verify media address */
-        if (isdigit(conf->addr[0])) {
-
-                dlci = dec_to_uint(conf->addr, 0);
-
-                if (dlci && (dlci <= HIGHEST_VALID_DLCI)) {
-                
-                        chan->dlci = dlci;
-                
-                } else {
-                
-                        printk(KERN_ERR
-                                "%s: Invalid DLCI %u on interface %s!\n",
-                                wandev->name, dlci, chan->name);
-                        err = -EINVAL;
-                }
-
-        } else {
-                printk(KERN_ERR
-                        "%s: Invalid media address on interface %s!\n",
-                        wandev->name, chan->name);
-                err = -EINVAL;
-        }
-
-        if ((chan->true_if_encoding = conf->true_if_encoding) == WANOPT_YES){
-                printk(KERN_INFO 
-                        "%s: Enabling, true interface type encoding.\n",
-                        card->devname);
-        }
-        
-
-
-    /* Setup wanpipe as a router (WANPIPE) even if it is
-         * a bridged DLCI, or as an API 
-         */
-        if (strcmp(conf->usedby, "WANPIPE")  == 0  || 
-            strcmp(conf->usedby, "BRIDGE")   == 0  ||
-            strcmp(conf->usedby, "BRIDGE_N") == 0){
-                
-                if(strcmp(conf->usedby, "WANPIPE") == 0){
-                        chan->common.usedby = WANPIPE;
-                        
-                        printk(KERN_INFO "%s: Running in WANPIPE mode.\n", 
-                                        card->devname);
-                        
-                }else if(strcmp(conf->usedby, "BRIDGE") == 0){
-                        
-                        chan->common.usedby = BRIDGE;
-                        
-                        printk(KERN_INFO "%s: Running in WANPIPE (BRIDGE) mode.\n", 
-                                        card->devname);
-                }else if( strcmp(conf->usedby, "BRIDGE_N") == 0 ){
-                        
-                        chan->common.usedby = BRIDGE_NODE;
-                
-                        printk(KERN_INFO "%s: Running in WANPIPE (BRIDGE_NODE) mode.\n", 
-                                        card->devname);
-                }
-
-                if (!err){
-                        /* Dynamic interface configuration option.
-                         * On disconnect, if the options is selected,
-                         * the interface will be brought down */
-                        if (conf->if_down == WANOPT_YES){ 
-                                set_bit(DYN_OPT_ON,&chan->interface_down);
-                                printk(KERN_INFO 
-                                    "%s: Dynamic interface configuration enabled.\n",
-                                        card->devname);
-                        }
-                }
-
-        } else if(strcmp(conf->usedby, "API") == 0){
-
-                chan->common.usedby = API;
-                printk(KERN_INFO "%s: Running in API mode.\n",
-                        wandev->name);
-        }
-
-        if (err) {
-                
-                kfree(chan);
-                return err;
-        }
-
-        /* place cir,be,bc and other channel specific information into the
-         * chan structure 
-         */
-        if (conf->cir) {
-
-                chan->cir = max_t(unsigned int, 1,
-                                min_t(unsigned int, conf->cir, 512));
-                chan->cir_status = CIR_ENABLED; 
-
-                
-                /* If CIR is enabled, force BC to equal CIR
-                 * this solves number of potential problems if CIR is 
-                 * set and BC is not 
-                 */
-                chan->bc = chan->cir;
-
-                if (conf->be){
-                        chan->be = max_t(unsigned int,
-                                       0, min_t(unsigned int, conf->be, 511));
-                }else{  
-                        conf->be = 0;
-                }
-
-                printk (KERN_INFO "%s: CIR enabled for DLCI %i \n",
-                                wandev->name,chan->dlci);
-                printk (KERN_INFO "%s:     CIR = %i ; BC = %i ; BE = %i\n",
-                                wandev->name,chan->cir,chan->bc,chan->be);
-
-
-        }else{
-                chan->cir_status = CIR_DISABLED;
-                printk (KERN_INFO "%s: CIR disabled for DLCI %i\n",
-                                wandev->name,chan->dlci);
-        }
-
-        chan->mc = conf->mc;
-
-        if (conf->inarp == WANOPT_YES){
-                printk(KERN_INFO "%s: Inverse ARP Support Enabled\n",card->devname);
-                chan->inarp = conf->inarp ? INARP_REQUEST : INARP_NONE;
-                chan->inarp_interval = conf->inarp_interval ? conf->inarp_interval : 10;
-        }else{
-                printk(KERN_INFO "%s: Inverse ARP Support Disabled\n",card->devname);
-                chan->inarp = INARP_NONE;
-                chan->inarp_interval = 10;
-        }
-
-
-        chan->dlci_configured = DLCI_NOT_CONFIGURED;    
-
-
-        /*FIXME: IPX disabled in this WANPIPE version */
-        if (conf->enable_IPX == WANOPT_YES){
-                printk(KERN_INFO "%s: ERROR - This version of WANPIPE doesn't support IPX\n",
-                                card->devname);
-                kfree(chan);
-                return -EINVAL;
-        }else{
-                chan->enable_IPX = WANOPT_NO;
-        }       
-
-        if (conf->network_number){
-                chan->network_number = conf->network_number;
-        }else{
-                chan->network_number = 0xDEADBEEF;
-        }
-
-        chan->route_flag = NO_ROUTE;
-        
-        init_chan_statistics(chan);
-
-        chan->transmit_length = 0;
-
-        /* prepare network device data space for registration */
-        strcpy(dev->name,chan->name);
-        
-        dev->init = &if_init;
-        dev->priv = chan;
-
-        /* Initialize FR Polling Task Queue
-         * We need a poll routine for each network
-         * interface. 
-         */
-        INIT_WORK(&chan->fr_poll_work, (void *)fr_poll, dev);
-
-        init_timer(&chan->fr_arp_timer);
-        chan->fr_arp_timer.data=(unsigned long)dev;
-        chan->fr_arp_timer.function = fr_arp;
-
-        wandev->new_if_cnt++;
-
-        /* Tells us that if this interface is a
-         * gateway or not */
-        if ((chan->gateway = conf->gateway) == WANOPT_YES){
-                printk(KERN_INFO "%s: Interface %s is set as a gateway.\n",
-                        card->devname,dev->name);
-        }
-
-        /* M. Grant Patch Apr 28 2000 
-         * Disallow duplicate dlci configurations. */
-        if (card->u.f.dlci_to_dev_map[chan->dlci] != NULL) {
-                kfree(chan);
-                return -EBUSY;
-        }
-
-        /* Configure this dlci at a later date, when
-         * the interface comes up. i.e. when if_open() 
-         * executes */
-        set_bit(0,&chan->config_dlci);
-        
-        printk(KERN_INFO "\n");
-
-        return 0;
-}
-
-/*============================================================================
- * Delete logical channel.
- */
-static int del_if(struct wan_device* wandev, struct net_device* dev)
-{
-        fr_channel_t* chan = dev->priv;
-        unsigned long smp_flags=0;
-
-        /* This interface is dead, make sure the 
-         * ARP timer is stopped */
-        del_timer(&chan->fr_arp_timer);
-        
-        /* If we are a NODE, we must unconfigure this DLCI
-         * Trigger an unconfigure command that will
-         * be executed in timer interrupt. We must wait
-         * for the command to complete. */
-        trigger_unconfig_fr(dev);
-
-        lock_adapter_irq(&wandev->lock, &smp_flags);
-        wandev->new_if_cnt--;
-        unlock_adapter_irq(&wandev->lock, &smp_flags);
-
-        return 0;
-}
-
-
-/*=====================================================================
- * disable_comm
- *
- * Description:
- *      Disable communications.
- *      This code runs in shutdown (sdlamain.c)
- *      under critical flag. Therefore it is not
- *      necessary to set a critical flag here 
- *
- * Usage:
- *      Commnunications are disabled only on a card
- *      shutdown.
- */
-
-static void disable_comm (sdla_t *card)
-{
-        printk(KERN_INFO "%s: Disabling Communications!\n",
-                        card->devname);
-        fr_comm_disable(card);
-}
-
-/****** WANPIPE-specific entry points ***************************************/
-
-/*============================================================================
- * Execute adapter interface command.
- */
-static int wpf_exec (struct sdla* card, void* u_cmd, void* u_data)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err, len;
-        fr_cmd_t cmd;
-
-        if(copy_from_user((void*)&cmd, u_cmd, sizeof(cmd)))
-                return -EFAULT;
-        
-        /* execute command */
-        do
-        {
-                memcpy(&mbox->cmd, &cmd, sizeof(cmd));
-                
-                if (cmd.length){
-                        if( copy_from_user((void*)&mbox->data, u_data, cmd.length))
-                                return -EFAULT;
-                }
-                
-                if (sdla_exec(mbox))
-                        err = mbox->cmd.result;
-
-                else return -EIO;
-        
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        /* return result */
-        if (copy_to_user(u_cmd, (void*)&mbox->cmd, sizeof(fr_cmd_t)))
-                return -EFAULT;
-
-        len = mbox->cmd.length;
-
-        if (len && u_data && !copy_to_user(u_data, (void*)&mbox->data, len))
-                return -EFAULT;
-        return 0;
-}
-
-/****** Network Device Interface ********************************************/
-
-/*============================================================================
- * Initialize Linux network interface.
- *
- * This routine is called only once for each interface, during Linux network
- * interface registration.  Returning anything but zero will fail interface
- * registration.
- */
-static int if_init(struct net_device* dev)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        struct wan_device* wandev = &card->wandev;
-
-        /* Initialize device driver entry points */
-        dev->open               = &if_open;
-        dev->stop               = &if_close;
-        dev->hard_header        = NULL;
-        dev->rebuild_header     = &if_rebuild_hdr;
-        dev->hard_start_xmit    = &if_send;
-        dev->get_stats          = &if_stats;
-        dev->tx_timeout         = &if_tx_timeout;
-        dev->watchdog_timeo     = TX_TIMEOUT;
-        
-        if (chan->common.usedby == WANPIPE || chan->common.usedby == API){
-
-                /* Initialize media-specific parameters */
-                if (chan->true_if_encoding){
-                        dev->type               = ARPHRD_DLCI;  /* This breaks tcpdump */
-                }else{
-                        dev->type               = ARPHRD_PPP;   /* ARP h/w type */
-                }
-                
-                dev->flags              |= IFF_POINTOPOINT;
-                dev->flags              |= IFF_NOARP;
-
-                /* Enable Multicast addressing */
-                if (chan->mc == WANOPT_YES){
-                        dev->flags      |= IFF_MULTICAST;
-                }
-
-                dev->mtu                = wandev->mtu - FR_HEADER_LEN;
-                /* For an API, the maximum number of bytes that the stack will pass
-                   to the driver is (dev->mtu + dev->hard_header_len). So, adjust the
-                   mtu so that a frame of maximum size can be transmitted by the API. 
-                */
-                if(chan->common.usedby == API) {
-                        dev->mtu += (sizeof(api_tx_hdr_t) - FR_HEADER_LEN);
-                }
-                
-                dev->hard_header_len    = FR_HEADER_LEN;/* media header length */
-                dev->addr_len           = 2;            /* hardware address length */
-                *(unsigned short*)dev->dev_addr = htons(chan->dlci);
-
-                /* Set transmit buffer queue length */
-                dev->tx_queue_len = 100;
-
-        }else{
-
-                /* Setup the interface for Bridging */
-                int hw_addr=0;
-                ether_setup(dev);
-                
-                /* Use a random number to generate the MAC address */
-                memcpy(dev->dev_addr, "\xFE\xFC\x00\x00\x00\x00", 6);
-                get_random_bytes(&hw_addr, sizeof(hw_addr));
-                *(int *)(dev->dev_addr + 2) += hw_addr;
-        }
-                
-        /* Initialize hardware parameters (just for reference) */
-        dev->irq        = wandev->irq;
-        dev->dma        = wandev->dma;
-        dev->base_addr  = wandev->ioport;
-        dev->mem_start  = wandev->maddr;
-        dev->mem_end    = wandev->maddr + wandev->msize - 1;
-        SET_MODULE_OWNER(dev);
-
-        return 0;
-}
-
-/*============================================================================
- * Open network interface.
- * o if this is the first open, then enable communications and interrupts.
- * o prevent module from unloading by incrementing use count
- *
- * Return 0 if O.k. or errno.
- */
-static int if_open(struct net_device* dev)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        int err = 0;
-        struct timeval tv;
-
-        if (netif_running(dev))
-                return -EBUSY;
-        
-        /* Initialize the task queue */
-        chan->tq_working=0;
-
-        INIT_WORK(&chan->common.wanpipe_work, (void *)fr_bh, dev);
-
-        /* Allocate and initialize BH circular buffer */
-        chan->bh_head = kmalloc((sizeof(bh_data_t)*MAX_BH_BUFF),GFP_ATOMIC);
-        memset(chan->bh_head,0,(sizeof(bh_data_t)*MAX_BH_BUFF));
-        atomic_set(&chan->bh_buff_used, 0);
-
-        netif_start_queue(dev);
-
-        wanpipe_open(card);
-        do_gettimeofday( &tv );
-        chan->router_start_time = tv.tv_sec;
-        
-        if (test_bit(0,&chan->config_dlci)){
-                trigger_config_fr (card);
-        }else if (chan->inarp == INARP_REQUEST){
-                trigger_fr_arp(dev);
-        }
-        
-        return err;
-}
-
-/*============================================================================
- * Close network interface.
- * o if this is the last open, then disable communications and interrupts.
- * o reset flags.
- */
-static int if_close(struct net_device* dev)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-
-        if (chan->inarp == INARP_CONFIGURED) {
-                chan->inarp = INARP_REQUEST;
-        }
-
-        netif_stop_queue(dev);
-        wanpipe_close(card);
-
-        return 0;
-}
-
-/*============================================================================
- * Re-build media header.
- *
- * Return:      1       physical address resolved.
- *              0       physical address not resolved
- */
-static int if_rebuild_hdr (struct sk_buff* skb)
-{
-        struct net_device *dev = skb->dev;
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-
-        printk(KERN_INFO "%s: rebuild_header() called for interface %s!\n",
-                card->devname, dev->name);
-        return 1;
-}
-
-/*============================================================================
- * Handle transmit timeout event from netif watchdog
- */
-static void if_tx_timeout(struct net_device *dev)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-
-        /* If our device stays busy for at least 5 seconds then we will
-         * kick start the device by making dev->tbusy = 0.  We expect
-         * that our device never stays busy more than 5 seconds. So this                 
-         * is only used as a last resort.
-         */
-
-        chan->drvstats_if_send.if_send_tbusy++;
-        ++chan->ifstats.collisions;
-
-        printk (KERN_INFO "%s: Transmit timed out on %s\n", 
-                        card->devname, dev->name);
-        chan->drvstats_if_send.if_send_tbusy_timeout++;
-        netif_wake_queue (dev);
-
-}
-
-
-/*============================================================================
- * Send a packet on a network interface.
- * o set tbusy flag (marks start of the transmission) to block a timer-based
- *   transmit from overlapping.
- * o set critical flag when accessing board.
- * o check link state. If link is not up, then drop the packet.
- * o check channel status. If it's down then initiate a call.
- * o pass a packet to corresponding WAN device.
- * o free socket buffer
- *
- * Return:      0       complete (socket buffer must be freed)
- *              non-0   packet may be re-transmitted (tbusy must be set)
- *
- * Notes:
- * 1. This routine is called either by the protocol stack or by the "net
- *    bottom half" (with interrupts enabled).
- * 
- * 2. Using netif_start_queue() and netif_stop_queue()
- *    will inhibit further transmit requests from the protocol stack 
- *    and can be used for flow control with protocol layer.
- */
-static int if_send(struct sk_buff* skb, struct net_device* dev)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        int err;
-        unsigned char *sendpacket;
-        fr508_flags_t* adptr_flags = card->flags;
-        int udp_type;
-        long delay_tx_queued = 0;
-        unsigned long smp_flags=0;
-        unsigned char attr = 0;
-
-        chan->drvstats_if_send.if_send_entry++;
-
-        netif_stop_queue(dev);
-        
-        if (skb == NULL) {             
-                /* if we get here, some higher layer thinks we've missed an
-                 * tx-done interrupt.
-                 */
-                printk(KERN_INFO "%s: interface %s got kicked!\n", 
-                        card->devname, dev->name);
-                chan->drvstats_if_send.if_send_skb_null ++;
-
-                netif_wake_queue(dev);
-                return 0;
-        }
-
-        /* If a peripheral task is running just drop packets */
-        if (test_bit(PERI_CRIT, &card->wandev.critical)){
-                
-                printk(KERN_INFO "%s: Critical in if_send(): Peripheral running!\n",
-                                card->devname);
-                
-                dev_kfree_skb_any(skb);
-                netif_start_queue(dev);
-                return 0;
-        }
-
-        /* We must set the 'tbusy' flag if we already have a packet queued for
-           transmission in the transmit interrupt handler. However, we must
-           ensure that the transmit interrupt does not reset the 'tbusy' flag
-           just before we set it, as this will result in a "transmit timeout".
-        */
-        set_bit(SEND_TXIRQ_CRIT, (void*)&card->wandev.critical);
-        if(chan->transmit_length) {
-                netif_stop_queue(dev);
-                chan->tick_counter = jiffies;
-                clear_bit(SEND_TXIRQ_CRIT, (void*)&card->wandev.critical);
-                return 1;
-        }
-        clear_bit(SEND_TXIRQ_CRIT, (void*)&card->wandev.critical);
- 
-        /* Move the if_header() code to here. By inserting frame
-         * relay header in if_header() we would break the
-         * tcpdump and other packet sniffers */
-        chan->fr_header_len = setup_fr_header(skb,dev,chan->common.usedby);
-        if (chan->fr_header_len < 0 ){
-                ++chan->ifstats.tx_dropped;
-                ++card->wandev.stats.tx_dropped;
-                
-                dev_kfree_skb_any(skb);
-                netif_start_queue(dev); 
-                return 0;
-        }
-
-        sendpacket = skb->data;
-
-        udp_type = udp_pkt_type(skb, card);
-
-        if(udp_type != UDP_INVALID_TYPE) {
-                if(store_udp_mgmt_pkt(udp_type, UDP_PKT_FRM_STACK, card, skb,
-                        chan->dlci)) {
-                        adptr_flags->imask |= FR_INTR_TIMER;
-                        if (udp_type == UDP_FPIPE_TYPE){
-                                chan->drvstats_if_send.
-                                        if_send_PIPE_request ++;
-                        }
-                }
-                netif_start_queue(dev);
-                return 0;
-        }
-
-        //FIXME: can we do better than sendpacket[2]?
-        if ((chan->common.usedby == WANPIPE) && (sendpacket[2] == 0x45)) {
-                
-                /* check to see if the source IP address is a broadcast or */
-                /* multicast IP address */
-                if(chk_bcast_mcast_addr(card, dev, skb)){
-                        ++chan->ifstats.tx_dropped;
-                        ++card->wandev.stats.tx_dropped;
-                        dev_kfree_skb_any(skb);
-                        netif_start_queue(dev);
-                        return 0;
-                }
-        }
-
-        
-        /* Lock the S514/S508 card: SMP Supported */
-        s508_s514_lock(card,&smp_flags);
-
-        if (test_and_set_bit(SEND_CRIT, (void*)&card->wandev.critical)) {
-                
-                chan->drvstats_if_send.if_send_critical_non_ISR ++;
-                chan->ifstats.tx_dropped ++;
-                printk(KERN_INFO "%s Critical in IF_SEND: if_send() already running!\n", 
-                                card->devname);
-                goto if_send_start_and_exit;
-        }
-        
-        /* API packet check: minimum packet size must be greater than 
-         * 16 byte API header */
-        if((chan->common.usedby == API) && (skb->len <= sizeof(api_tx_hdr_t))) {
-                ++chan->ifstats.tx_dropped;
-                ++card->wandev.stats.tx_dropped;
-            
-                
-                goto if_send_start_and_exit;
-
-        }else{
-                /* During API transmission, get rid of the API header */
-                if (chan->common.usedby == API) {
-                        api_tx_hdr_t* api_tx_hdr;
-                        api_tx_hdr = (api_tx_hdr_t*)&skb->data[0x00];
-                        attr = api_tx_hdr->attr;
-                        skb_pull(skb,sizeof(api_tx_hdr_t));
-                }
-        }
-
-        if (card->wandev.state != WAN_CONNECTED) {
-                chan->drvstats_if_send.if_send_wan_disconnected ++;
-                ++chan->ifstats.tx_dropped;
-                ++card->wandev.stats.tx_dropped;
-        
-        } else if (chan->common.state != WAN_CONNECTED) {
-                chan->drvstats_if_send.if_send_dlci_disconnected ++;
-
-                /* Update the DLCI state in timer interrupt */
-                card->u.f.timer_int_enabled |= TMR_INT_ENABLED_UPDATE_STATE;    
-                adptr_flags->imask |= FR_INTR_TIMER;
-
-                ++chan->ifstats.tx_dropped;
-                ++card->wandev.stats.tx_dropped;
-                
-        } else if (!is_tx_ready(card, chan)) {
-                /* No tx buffers available, store for delayed transmit */
-                if (!setup_for_delayed_transmit(dev, skb)){
-                        set_bit(1,&delay_tx_queued);
-                }
-                chan->drvstats_if_send.if_send_no_bfrs++;
-                
-        } else if (!skb->protocol) {
-                /* No protocols drop packet */
-                chan->drvstats_if_send.if_send_protocol_error ++;
-                ++card->wandev.stats.tx_errors;
-        
-        } else if (test_bit(ARP_CRIT,&card->wandev.critical)){
-                /* We are trying to send an ARP Packet, block IP data until
-                 * ARP is sent */
-                ++chan->ifstats.tx_dropped;
-                ++card->wandev.stats.tx_dropped;
-                
-        } else {
-                //FIXME: IPX is not implemented in this version of Frame Relay ?
-                if((chan->common.usedby == WANPIPE) &&
-                        sendpacket[1] == 0x00 &&
-                        sendpacket[2] == 0x80 &&
-                        sendpacket[6] == 0x81 &&
-                        sendpacket[7] == 0x37) {
-                        
-                        if( chan->enable_IPX ) {
-                                switch_net_numbers(sendpacket, 
-                                                chan->network_number, 0);
-                        } else {
-                                //FIXME: Take this out when IPX is fixed 
-                                printk(KERN_INFO 
-                                "%s: WARNING: Unsupported IPX data in send, packet dropped\n",
-                                        card->devname);
-                        }
-                        
-                }else{
-                        err = fr_send_data_header(card, chan->dlci, attr, skb->len, skb->data, chan->fr_header_len);
-                        if (err) {
-                                switch(err) {
-                                case FRRES_CIR_OVERFLOW:
-                                case FRRES_BUFFER_OVERFLOW:
-                                        if (!setup_for_delayed_transmit(dev, skb)){
-                                                set_bit(1,&delay_tx_queued);
-                                        }
-                                        chan->drvstats_if_send.
-                                                if_send_adptr_bfrs_full ++;
-                                        break;
-                                        
-                                case FRRES_TOO_LONG:
-                                        if (net_ratelimit()){
-                                                printk(KERN_INFO 
-                                                "%s: Error: Frame too long, transmission failed %i\n",
-                                                 card->devname, (unsigned int)skb->len);
-                                        }
-                                        /* Drop down to default */
-                                default:
-                                        chan->drvstats_if_send.
-                                                if_send_dlci_disconnected ++;
-                                        ++chan->ifstats.tx_dropped;
-                                        ++card->wandev.stats.tx_dropped;
-                                        break;
-                                }
-                        } else {
-                                chan->drvstats_if_send.
-                                        if_send_bfr_passed_to_adptr++;
-                                ++chan->ifstats.tx_packets;
-                                ++card->wandev.stats.tx_packets;
-                                
-                                chan->ifstats.tx_bytes += skb->len;
-                                card->wandev.stats.tx_bytes += skb->len;
-                                dev->trans_start = jiffies;
-                        }
-                }
-        }
-
-if_send_start_and_exit:
-
-        netif_start_queue(dev);
-        
-        /* If we queued the packet for transmission, we must not
-         * deallocate it. The packet is unlinked from the IP stack
-         * not copied. Therefore, we must keep the original packet */
-        if (!test_bit(1,&delay_tx_queued)) {
-                dev_kfree_skb_any(skb);
-        }else{
-                adptr_flags->imask |= FR_INTR_TXRDY;
-                card->u.f.tx_interrupts_pending ++;
-        }
-
-        clear_bit(SEND_CRIT, (void*)&card->wandev.critical);
-
-        s508_s514_unlock(card,&smp_flags);
-
-        return 0;
-}
-
-
-
-/*============================================================================
- * Setup so that a frame can be transmitted on the occurrence of a transmit
- * interrupt.
- */
-static int setup_for_delayed_transmit(struct net_device* dev,
-                                      struct sk_buff *skb)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        fr_dlci_interface_t* dlci_interface;
-        int len = skb->len;
-
-        /* Check that the dlci is properly configured,
-         * before using tx interrupt */
-        if (!chan->dlci_int_interface){
-                if (net_ratelimit()){ 
-                        printk(KERN_INFO 
-                                "%s: ERROR on DLCI %i: Not configured properly !\n",
-                                        card->devname, chan->dlci);
-                        printk(KERN_INFO "%s: Please contact Sangoma Technologies\n",
-                                        card->devname);
-                }
-                return 1;
-        }
-                
-        dlci_interface = chan->dlci_int_interface;
-
-        if(chan->transmit_length) {
-                printk(KERN_INFO "%s: Big mess in setup_for_del...\n",
-                                card->devname);
-                return 1;
-        }
-
-        if(len > FR_MAX_NO_DATA_BYTES_IN_FRAME) {
-                //FIXME: increment some statistic */
-                return 1;
-        }
-
-        chan->transmit_length = len;
-        chan->delay_skb = skb;
-        
-        dlci_interface->gen_interrupt |= FR_INTR_TXRDY;
-        dlci_interface->packet_length = len;
-
-        /* Turn on TX interrupt at the end of if_send */
-        return 0;
-}
-
-
-/*============================================================================
- * Check to see if the packet to be transmitted contains a broadcast or
- * multicast source IP address.
- * Return 0 if not broadcast/multicast address, otherwise return 1.
- */
-
-static int chk_bcast_mcast_addr(sdla_t *card, struct net_device* dev,
-                                struct sk_buff *skb)
-{
-        u32 src_ip_addr;
-        u32 broadcast_ip_addr = 0;
-        struct in_device *in_dev;
-        fr_channel_t* chan = dev->priv;
- 
-        /* read the IP source address from the outgoing packet */
-        src_ip_addr = *(u32 *)(skb->data + 14);
-
-        /* read the IP broadcast address for the device */
-        in_dev = dev->ip_ptr;
-        if(in_dev != NULL) {
-                struct in_ifaddr *ifa= in_dev->ifa_list;
-                if(ifa != NULL)
-                        broadcast_ip_addr = ifa->ifa_broadcast;
-                else
-                        return 0;
-        }
-
-        /* check if the IP Source Address is a Broadcast address */
-        if((dev->flags & IFF_BROADCAST) && (src_ip_addr == broadcast_ip_addr)) {
-                printk(KERN_INFO
-                        "%s: Broadcast Source Address silently discarded\n",
-                        card->devname);
-                return 1;
-        }
-
-        /* check if the IP Source Address is a Multicast address */
-        if((chan->mc == WANOPT_NO) && (ntohl(src_ip_addr) >= 0xE0000001) &&
-                (ntohl(src_ip_addr) <= 0xFFFFFFFE)) {
-                printk(KERN_INFO
-                        "%s: Multicast Source Address silently discarded\n",
-                        card->devname);
-                return 1;
-        }
-
-        return 0;
-}
-
-/*============================================================================
- * Reply to UDP Management system.
- * Return nothing.
- */
-static int reply_udp( unsigned char *data, unsigned int mbox_len ) 
-{
-        unsigned short len, udp_length, temp, ip_length;
-        unsigned long ip_temp;
-        int even_bound = 0;
-
-  
-        fr_udp_pkt_t *fr_udp_pkt = (fr_udp_pkt_t *)data; 
-
-        /* Set length of packet */
-        len = //sizeof(fr_encap_hdr_t)+
-              sizeof(ip_pkt_t)+ 
-              sizeof(udp_pkt_t)+
-              sizeof(wp_mgmt_t)+
-              sizeof(cblock_t)+
-              mbox_len;
- 
-
-        /* fill in UDP reply */
-        fr_udp_pkt->wp_mgmt.request_reply = UDPMGMT_REPLY;
-  
-        /* fill in UDP length */
-        udp_length = sizeof(udp_pkt_t)+ 
-                     sizeof(wp_mgmt_t)+
-                     sizeof(cblock_t)+
-                     mbox_len; 
-
-
-        /* put it on an even boundary */
-        if ( udp_length & 0x0001 ) {
-                udp_length += 1;
-                len += 1;
-                even_bound = 1;
-        }
-
-        temp = (udp_length<<8)|(udp_length>>8);
-        fr_udp_pkt->udp_pkt.udp_length = temp;
-         
-        /* swap UDP ports */
-        temp = fr_udp_pkt->udp_pkt.udp_src_port;
-        fr_udp_pkt->udp_pkt.udp_src_port = 
-                        fr_udp_pkt->udp_pkt.udp_dst_port; 
-        fr_udp_pkt->udp_pkt.udp_dst_port = temp;
-
-
-
-        /* add UDP pseudo header */
-        temp = 0x1100;
-        *((unsigned short *)
-                (fr_udp_pkt->data+mbox_len+even_bound)) = temp; 
-        temp = (udp_length<<8)|(udp_length>>8);
-        *((unsigned short *)
-                (fr_udp_pkt->data+mbox_len+even_bound+2)) = temp;
-                 
-        /* calculate UDP checksum */
-        fr_udp_pkt->udp_pkt.udp_checksum = 0;
-
-        fr_udp_pkt->udp_pkt.udp_checksum = 
-                calc_checksum(&data[UDP_OFFSET/*+sizeof(fr_encap_hdr_t)*/],
-                              udp_length+UDP_OFFSET);
-
-        /* fill in IP length */
-        ip_length = udp_length + sizeof(ip_pkt_t);
-        temp = (ip_length<<8)|(ip_length>>8);
-        fr_udp_pkt->ip_pkt.total_length = temp;
-  
-        /* swap IP addresses */
-        ip_temp = fr_udp_pkt->ip_pkt.ip_src_address;
-        fr_udp_pkt->ip_pkt.ip_src_address = 
-                                fr_udp_pkt->ip_pkt.ip_dst_address;
-        fr_udp_pkt->ip_pkt.ip_dst_address = ip_temp;
-
-                 
-        /* fill in IP checksum */
-        fr_udp_pkt->ip_pkt.hdr_checksum = 0;
-        fr_udp_pkt->ip_pkt.hdr_checksum = 
-                calc_checksum(&data[/*sizeof(fr_encap_hdr_t)*/0],
-                              sizeof(ip_pkt_t));
-
-        return len;
-} /* reply_udp */
-
-unsigned short calc_checksum (char *data, int len)
-{
-        unsigned short temp; 
-        unsigned long sum=0;
-        int i;
-
-        for( i = 0; i <len; i+=2 ) {
-                memcpy(&temp,&data[i],2);
-                sum += (unsigned long)temp;
-        }
-
-        while (sum >> 16 ) {
-                sum = (sum & 0xffffUL) + (sum >> 16);
-        }
-
-        temp = (unsigned short)sum;
-        temp = ~temp;
-
-        if( temp == 0 ) 
-                temp = 0xffff;
-
-        return temp;    
-}
-
-/*
-   If incoming is 0 (outgoing)- if the net numbers is ours make it 0
-   if incoming is 1 - if the net number is 0 make it ours 
-
-*/
-static void switch_net_numbers(unsigned char *sendpacket, unsigned long network_number, unsigned char incoming)
-{
-        unsigned long pnetwork_number;
-
-        pnetwork_number = (unsigned long)((sendpacket[14] << 24) + 
-                          (sendpacket[15] << 16) + (sendpacket[16] << 8) + 
-                          sendpacket[17]);
-
-        if (!incoming) {
-                /* If the destination network number is ours, make it 0 */
-                if( pnetwork_number == network_number) {
-                        sendpacket[14] = sendpacket[15] = sendpacket[16] = 
-                                         sendpacket[17] = 0x00;
-                }
-        } else {
-                /* If the incoming network is 0, make it ours */
-                if( pnetwork_number == 0) {
-                        sendpacket[14] = (unsigned char)(network_number >> 24);
-                        sendpacket[15] = (unsigned char)((network_number & 
-                                         0x00FF0000) >> 16);
-                        sendpacket[16] = (unsigned char)((network_number & 
-                                         0x0000FF00) >> 8);
-                        sendpacket[17] = (unsigned char)(network_number & 
-                                         0x000000FF);
-                }
-        }
-
-
-        pnetwork_number = (unsigned long)((sendpacket[26] << 24) + 
-                          (sendpacket[27] << 16) + (sendpacket[28] << 8) + 
-                          sendpacket[29]);
-
-        if( !incoming ) {
-                /* If the source network is ours, make it 0 */
-                if( pnetwork_number == network_number) {
-                        sendpacket[26] = sendpacket[27] = sendpacket[28] = 
-                                         sendpacket[29] = 0x00;
-                }
-        } else {
-                /* If the source network is 0, make it ours */
-                if( pnetwork_number == 0 ) {
-                        sendpacket[26] = (unsigned char)(network_number >> 24);
-                        sendpacket[27] = (unsigned char)((network_number & 
-                                         0x00FF0000) >> 16);
-                        sendpacket[28] = (unsigned char)((network_number & 
-                                         0x0000FF00) >> 8);
-                        sendpacket[29] = (unsigned char)(network_number & 
-                                         0x000000FF);
-                }
-        }
-} /* switch_net_numbers */
-
-/*============================================================================
- * Get ethernet-style interface statistics.
- * Return a pointer to struct enet_statistics.
- */
-static struct net_device_stats *if_stats(struct net_device *dev)
-{
-        fr_channel_t* chan = dev->priv;
-        
-        if(chan == NULL)
-                return NULL;
-
-        return &chan->ifstats;
-}
-
-/****** Interrupt Handlers **************************************************/
-
-/*============================================================================
- * fr_isr:      S508 frame relay interrupt service routine.
- *
- * Description:
- *      Frame relay main interrupt service route. This
- *      function check the interrupt type and takes
- *      the appropriate action.
- */
-static void fr_isr (sdla_t* card)
-{
-        fr508_flags_t* flags = card->flags;
-        char *ptr = &flags->iflag;
-        int i,err;
-        fr_mbox_t* mbox = card->mbox;
-
-        /* This flag prevents nesting of interrupts.  See sdla_isr() routine
-         * in sdlamain.c.  */
-        card->in_isr = 1;
-        
-        ++card->statistics.isr_entry;
-
-
-        /* All peripheral (configuraiton, re-configuration) events
-         * take presidence over the ISR.  Thus, retrigger */
-        if (test_bit(PERI_CRIT, (void*)&card->wandev.critical)) {
-                ++card->statistics.isr_already_critical;
-                goto fr_isr_exit;
-        }
-        
-        if(card->hw.type != SDLA_S514) {
-                if (test_bit(SEND_CRIT, (void*)&card->wandev.critical)) {
-                        printk(KERN_INFO "%s: Critical while in ISR: If Send Running!\n",
-                                card->devname);
-                        ++card->statistics.isr_already_critical;
-                        goto fr_isr_exit;
-                }
-        }
-
-        switch (flags->iflag) {
-
-                case FR_INTR_RXRDY:  /* receive interrupt */
-                        ++card->statistics.isr_rx;
-                        rx_intr(card);
-                        break;
-
-
-                case FR_INTR_TXRDY:  /* transmit interrupt */
-                        ++ card->statistics.isr_tx; 
-                        tx_intr(card); 
-                        break;
-
-                case FR_INTR_READY:     
-                        Intr_test_counter++;
-                        ++card->statistics.isr_intr_test;
-                        break;  
-
-                case FR_INTR_DLC: /* Event interrupt occurred */
-                        mbox->cmd.command = FR_READ_STATUS;
-                        mbox->cmd.length = 0;
-                        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-                        if (err)
-                                fr_event(card, err, mbox);
-                        break;
-
-                case FR_INTR_TIMER:  /* Timer interrupt */
-                        timer_intr(card);
-                        break;
-        
-                default:
-                        ++card->statistics.isr_spurious;
-                        spur_intr(card);
-                        printk(KERN_INFO "%s: Interrupt Type 0x%02X!\n", 
-                                card->devname, flags->iflag);
-            
-                        printk(KERN_INFO "%s: ID Bytes = ",card->devname);
-                        for(i = 0; i < 8; i ++)
-                                printk(KERN_INFO "0x%02X ", *(ptr + 0x28 + i));
-                        printk(KERN_INFO "\n"); 
-            
-                        break;
-        }
-
-fr_isr_exit:
-        
-        card->in_isr = 0;
-        flags->iflag = 0;
-        return;
-}
-
-
-
-/*===========================================================
- * rx_intr      Receive interrupt handler.
- *
- * Description
- *      Upon receiveing an interrupt: 
- *      1. Check that the firmware is in sync with 
- *         the driver. 
- *      2. Find an appropriate network interface
- *         based on the received dlci number.
- *      3. Check that the netowrk interface exists
- *         and that it's setup properly.
- *      4. Copy the data into an skb buffer.
- *      5. Check the packet type and take
- *         appropriate acton: UPD, API, ARP or Data.
- */
-
-static void rx_intr (sdla_t* card)
-{
-        fr_rx_buf_ctl_t* frbuf = card->rxmb;
-        fr508_flags_t* flags = card->flags;
-        fr_channel_t* chan;
-        char *ptr = &flags->iflag;
-        struct sk_buff* skb;
-        struct net_device* dev;
-        void* buf;
-        unsigned dlci, len, offs, len_incl_hdr;
-        int i, udp_type;        
-
-
-        /* Check that firmware buffers are in sync */
-        if (frbuf->flag != 0x01) {
-
-                printk(KERN_INFO 
-                        "%s: corrupted Rx buffer @ 0x%X, flag = 0x%02X!\n", 
-                        card->devname, (unsigned)frbuf, frbuf->flag);
-      
-                printk(KERN_INFO "%s: ID Bytes = ",card->devname);
-                for(i = 0; i < 8; i ++)
-                        printk(KERN_INFO "0x%02X ", *(ptr + 0x28 + i));
-                printk(KERN_INFO "\n");
-        
-                ++card->statistics.rx_intr_corrupt_rx_bfr;
-
-                /* Bug Fix: Mar 6 2000
-                 * If we get a corrupted mailbox, it means that driver 
-                 * is out of sync with the firmware. There is no recovery.
-                 * If we don't turn off all interrupts for this card
-                 * the machine will crash. 
-                 */
-                printk(KERN_INFO "%s: Critical router failure ...!!!\n", card->devname);
-                printk(KERN_INFO "Please contact Sangoma Technologies !\n");
-                fr_set_intr_mode(card, 0, 0, 0);        
-                return;
-        }
-
-        len  = frbuf->length;
-        dlci = frbuf->dlci;
-        offs = frbuf->offset;
-
-        /* Find the network interface for this packet */
-        dev = find_channel(card, dlci);
-   
-
-        /* Check that the network interface is active and
-         * properly setup */
-        if (dev == NULL) {
-                if( net_ratelimit()) { 
-                        printk(KERN_INFO "%s: received data on unconfigured DLCI %d!\n",
-                                                card->devname, dlci);
-                }
-                ++card->statistics.rx_intr_on_orphaned_DLCI; 
-                ++card->wandev.stats.rx_dropped;
-                goto rx_done;
-        }
-
-        if ((chan = dev->priv) == NULL){
-                if( net_ratelimit()) { 
-                        printk(KERN_INFO "%s: received data on unconfigured DLCI %d!\n",
-                                                card->devname, dlci);
-                }
-                ++card->statistics.rx_intr_on_orphaned_DLCI; 
-                ++card->wandev.stats.rx_dropped;
-                goto rx_done;
-        }
-
-        skb = dev_alloc_skb(len); 
-
-        if (!netif_running(dev) || (skb == NULL)){
-
-                ++chan->ifstats.rx_dropped;
-        
-                if(skb == NULL) {
-                        if (net_ratelimit()) { 
-                                printk(KERN_INFO 
-                                        "%s: no socket buffers available!\n", 
-                                                card->devname);
-                        }
-                        chan->drvstats_rx_intr.rx_intr_no_socket ++;
-                } 
-
-                if (!netif_running(dev)){
-                        chan->drvstats_rx_intr.
-                                rx_intr_dev_not_started ++;
-                        if (skb){
-                                dev_kfree_skb_any(skb);
-                        }
-                }
-                goto rx_done;
-        }
-
-        /* Copy data from the board into the socket buffer */
-        if ((offs + len) > card->u.f.rx_top + 1) {
-                unsigned tmp = card->u.f.rx_top - offs + 1;
-
-                buf = skb_put(skb, tmp);
-                sdla_peek(&card->hw, offs, buf, tmp);
-                offs = card->u.f.rx_base;
-                len -= tmp;
-        }
-
-        buf = skb_put(skb, len);
-        sdla_peek(&card->hw, offs, buf, len);
-
-
-        /* We got the packet from the bard. 
-         * Check the packet type and take appropriate action */
-
-        udp_type = udp_pkt_type( skb, card );
-
-        if(udp_type != UDP_INVALID_TYPE) {
-
-                /* UDP Debug packet received, store the
-                 * packet and handle it in timer interrupt */
-
-                skb_pull(skb, 1); 
-                if (wanrouter_type_trans(skb, dev)){ 
-                        if(store_udp_mgmt_pkt(udp_type,UDP_PKT_FRM_NETWORK,card,skb,dlci)){
-
-                                flags->imask |= FR_INTR_TIMER;
-
-                                if (udp_type == UDP_FPIPE_TYPE){
-                                        ++chan->drvstats_rx_intr.rx_intr_PIPE_request;
-                                }
-                        }
-                }
-
-        }else if (chan->common.usedby == API) {
-
-                /* We are in API mode. 
-                 * Add an API header to the RAW packet
-                 * and queue it into a circular buffer.
-                 * Then kick the fr_bh() bottom half handler */
-
-                api_rx_hdr_t* api_rx_hdr;
-                chan->drvstats_rx_intr.rx_intr_bfr_passed_to_stack ++;
-                chan->ifstats.rx_packets ++;
-                card->wandev.stats.rx_packets ++;
-
-                chan->ifstats.rx_bytes += skb->len;
-                card->wandev.stats.rx_bytes += skb->len;
-
-                skb_push(skb, sizeof(api_rx_hdr_t));
-                api_rx_hdr = (api_rx_hdr_t*)&skb->data[0x00];
-                api_rx_hdr->attr = frbuf->attr;
-                api_rx_hdr->time_stamp = frbuf->tmstamp;
-
-                skb->protocol = htons(ETH_P_IP);
-                skb->mac.raw  = skb->data;
-                skb->dev      = dev;
-                skb->pkt_type = WAN_PACKET_DATA;
-
-                bh_enqueue(dev, skb);
-
-                trigger_fr_bh(chan);
-
-        }else if (handle_IPXWAN(skb->data,chan->name,chan->enable_IPX, chan->network_number)){
-
-                //FIXME: Frame Relay IPX is not supported, Yet !
-                //if (chan->enable_IPX) {
-                //      fr_send(card, dlci, 0, skb->len,skb->data);
-                //}
-                dev_kfree_skb_any(skb);
-
-        } else if (is_arp(skb->data)) {
-
-                /* ARP support enabled Mar 16 2000 
-                 * Process incoming ARP reply/request, setup
-                 * dynamic routes. */ 
-
-                if (process_ARP((arphdr_1490_t *)skb->data, card, dev)) {
-                        if (net_ratelimit()){  
-                                printk (KERN_INFO 
-                                   "%s: Error processing ARP Packet.\n", 
-                                        card->devname);
-                        }
-                }
-                dev_kfree_skb_any(skb);
-
-        } else if (skb->data[0] != 0x03) {
-
-                if (net_ratelimit()) { 
-                        printk(KERN_INFO "%s: Non IETF packet discarded.\n", 
-                                card->devname);
-                }
-                dev_kfree_skb_any(skb);
-
-        } else {
-
-                len_incl_hdr = skb->len;
-                /* Decapsulate packet and pass it up the
-                   protocol stack */
-                skb->dev = dev;
-                
-                if (chan->common.usedby == BRIDGE || chan->common.usedby == BRIDGE_NODE){
-                
-                        /* Make sure it's an Ethernet frame, otherwise drop it */
-                        if (!memcmp(skb->data, "\x03\x00\x80\x00\x80\xC2\x00\x07", 8)) {
-                                skb_pull(skb, 8);
-                                skb->protocol=eth_type_trans(skb,dev);
-                        }else{
-                                ++chan->drvstats_rx_intr.rx_intr_bfr_not_passed_to_stack;
-                                ++chan->ifstats.rx_errors;
-                                ++card->wandev.stats.rx_errors;
-                                goto rx_done;
-                        }
-                }else{
-                
-                        /* remove hardware header */
-                        buf = skb_pull(skb, 1); 
-                        
-                        if (!wanrouter_type_trans(skb, dev)) {
-                                
-                                /* can't decapsulate packet */
-                                dev_kfree_skb_any(skb);
-
-                                ++chan->drvstats_rx_intr.rx_intr_bfr_not_passed_to_stack;
-                                ++chan->ifstats.rx_errors;
-                                ++card->wandev.stats.rx_errors;
-                                goto rx_done;   
-                        }
-                        skb->mac.raw = skb->data;
-                } 
-                
-
-                /* Send a packet up the IP stack */
-                skb->dev->last_rx = jiffies;
-                netif_rx(skb);
-                ++chan->drvstats_rx_intr.rx_intr_bfr_passed_to_stack;
-                ++chan->ifstats.rx_packets;
-                ++card->wandev.stats.rx_packets;
-
-                chan->ifstats.rx_bytes += len_incl_hdr;
-                card->wandev.stats.rx_bytes += len_incl_hdr;
-        }
-
-rx_done:
-
-        /* Release buffer element and calculate a pointer to the next one */ 
-        frbuf->flag = 0;
-        card->rxmb = ++frbuf;
-        if ((void*)frbuf > card->u.f.rxmb_last)
-                card->rxmb = card->u.f.rxmb_base;
-
-}
-
-/*==================================================================
- * tx_intr:     Transmit interrupt handler.
- *
- * Rationale:
- *      If the board is busy transmitting, if_send() will
- *      buffers a single packet and turn on
- *      the tx interrupt. Tx interrupt will be called
- *      by the board, once the firmware can send more
- *      data. Thus, no polling is required.      
- *
- * Description:
- *      Tx interrupt is called for each 
- *      configured dlci channel. Thus: 
- *      1. Obtain the netowrk interface based on the
- *         dlci number.
- *      2. Check that network interface is up and
- *         properly setup.
- *      3. Check for a buffered packet.
- *      4. Transmit the packet.
- *      5. If we are in WANPIPE mode, mark the 
- *         NET_BH handler. 
- *      6. If we are in API mode, kick
- *         the AF_WANPIPE socket for more data. 
- *         
- */
-static void tx_intr(sdla_t *card)
-{
-        fr508_flags_t* flags = card->flags;
-        fr_tx_buf_ctl_t* bctl;
-        struct net_device* dev;
-        fr_channel_t* chan;
-
-        if(card->hw.type == SDLA_S514){
-                bctl = (void*)(flags->tse_offs + card->hw.dpmbase);
-        }else{
-                bctl = (void*)(flags->tse_offs - FR_MB_VECTOR +
-                        card->hw.dpmbase);
-        }
-
-        /* Find the structure and make it unbusy */
-        dev = find_channel(card, flags->dlci);
-        if (dev == NULL){
-                printk(KERN_INFO "NO DEV IN TX Interrupt\n");   
-                goto end_of_tx_intr;
-        }
-
-        if ((chan = dev->priv) == NULL){
-                printk(KERN_INFO "NO CHAN IN TX Interrupt\n");  
-                goto end_of_tx_intr;
-        }
-
-        if(!chan->transmit_length || !chan->delay_skb) {
-                printk(KERN_INFO "%s: tx int error - transmit length zero\n",
-                                card->wandev.name);
-                goto end_of_tx_intr;
-        }
-
-        /* If the 'if_send()' procedure is currently checking the 'tbusy'
-           status, then we cannot transmit. Instead, we configure the microcode
-           so as to re-issue this transmit interrupt at a later stage. 
-        */
-        if (test_bit(SEND_TXIRQ_CRIT, (void*)&card->wandev.critical)) {
-
-                fr_dlci_interface_t* dlci_interface = chan->dlci_int_interface;
-                bctl->flag = 0xA0;
-                dlci_interface->gen_interrupt |= FR_INTR_TXRDY;
-                return;
-
-        }else{
-                bctl->dlci = flags->dlci;
-                bctl->length = chan->transmit_length+chan->fr_header_len;
-                sdla_poke(&card->hw, 
-                          fr_send_hdr(card,bctl->dlci,bctl->offset), 
-                          chan->delay_skb->data,
-                          chan->delay_skb->len);
-                bctl->flag = 0xC0;
-
-                ++chan->ifstats.tx_packets;
-                ++card->wandev.stats.tx_packets;
-                chan->ifstats.tx_bytes += chan->transmit_length;
-                card->wandev.stats.tx_bytes += chan->transmit_length;
-
-                /* We must free an sk buffer, which we used
-                 * for delayed transmission; Otherwise, the sock
-                 * will run out of memory */
-                dev_kfree_skb_any(chan->delay_skb);
-
-                chan->delay_skb = NULL;                         
-                chan->transmit_length = 0;
-
-                dev->trans_start = jiffies;
-
-                if (netif_queue_stopped(dev)){
-                        /* If using API, than wakeup socket BH handler */
-                        if (chan->common.usedby == API){
-                                netif_start_queue(dev);
-                                wakeup_sk_bh(dev);
-                        }else{
-                                netif_wake_queue(dev);
-                        }
-                }
-        }
-
-end_of_tx_intr:
-
-        /* if any other interfaces have transmit interrupts pending, 
-         * do not disable the global transmit interrupt */
-        if(!(-- card->u.f.tx_interrupts_pending))
-                flags->imask &= ~FR_INTR_TXRDY;
-
-
-}
-
-
-/*============================================================================
- * timer_intr:  Timer interrupt handler.
- *
- * Rationale:
- *      All commans must be executed within the timer
- *      interrupt since no two commands should execute
- *      at the same time.
- *
- * Description:
- *      The timer interrupt is used to:
- *      1. Processing udp calls from 'fpipemon'.
- *      2. Processing update calls from /proc file system
- *      3. Reading board-level statistics for 
- *         updating the proc file system.
- *      4. Sending inverse ARP request packets.
- *      5. Configure a dlci/channel.
- *      6. Unconfigure a dlci/channel. (Node only)
- */
-
-static void timer_intr(sdla_t *card)
-{
-        fr508_flags_t* flags = card->flags;
-
-        /* UDP Debuging: fpipemon call */
-        if (card->u.f.timer_int_enabled & TMR_INT_ENABLED_UDP) {
-                if(card->u.f.udp_type == UDP_FPIPE_TYPE) {
-                        if(process_udp_mgmt_pkt(card)) {
-                                card->u.f.timer_int_enabled &=
-                                        ~TMR_INT_ENABLED_UDP;
-                        }
-                }
-        }
-
-        /* /proc update call : triggered from update() */
-        if (card->u.f.timer_int_enabled & TMR_INT_ENABLED_UPDATE) {
-                fr_get_err_stats(card);
-                fr_get_stats(card);
-                card->u.f.update_comms_stats = 0;
-                card->u.f.timer_int_enabled &= ~TMR_INT_ENABLED_UPDATE;
-        }
-
-        /* Update the channel state call.  This is call is
-         * triggered by if_send() function */
-        if (card->u.f.timer_int_enabled & TMR_INT_ENABLED_UPDATE_STATE){
-                struct net_device *dev;
-                if (card->wandev.state == WAN_CONNECTED){
-                        for (dev = card->wandev.dev; dev;
-                             dev = *((struct net_device **)dev->priv)){
-                                fr_channel_t *chan = dev->priv; 
-                                if (chan->common.state != WAN_CONNECTED){
-                                        update_chan_state(dev);
-                                }
-                        }
-                }
-                card->u.f.timer_int_enabled &= ~TMR_INT_ENABLED_UPDATE_STATE;
-        }
-
-        /* configure a dlci/channel */
-        if (card->u.f.timer_int_enabled & TMR_INT_ENABLED_CONFIG){
-                config_fr(card);
-                card->u.f.timer_int_enabled &= ~TMR_INT_ENABLED_CONFIG;
-        }
-
-        /* unconfigure a dlci/channel */
-        if (card->u.f.timer_int_enabled & TMR_INT_ENABLED_UNCONFIG){
-                unconfig_fr(card);
-                card->u.f.timer_int_enabled &= ~TMR_INT_ENABLED_UNCONFIG;
-        }
-
-        
-        /* Transmit ARP packets */
-        if (card->u.f.timer_int_enabled & TMR_INT_ENABLED_ARP){
-                int i=0;
-                struct net_device *dev;
-
-                if (card->u.f.arp_dev == NULL)
-                        card->u.f.arp_dev = card->wandev.dev;
-
-                dev = card->u.f.arp_dev;
-
-                for (;;){ 
-
-                        fr_channel_t *chan = dev->priv;
-
-                        /* If the interface is brought down cancel sending In-ARPs */
-                        if (!(dev->flags&IFF_UP)){
-                                clear_bit(0,&chan->inarp_ready);        
-                        }
-
-                        if (test_bit(0,&chan->inarp_ready)){
-
-                                if (check_tx_status(card,dev)){
-                                        set_bit(ARP_CRIT,&card->wandev.critical);
-                                        break;
-                                }
-
-                                if (!send_inarp_request(card,dev)){
-                                        trigger_fr_arp(dev);
-                                        chan->inarp_tick = jiffies;
-                                }
-
-                                clear_bit(0,&chan->inarp_ready);
-                                dev = move_dev_to_next(card,dev);
-                                break;
-                        }
-                        dev = move_dev_to_next(card,dev);
-
-                        if (++i == card->wandev.new_if_cnt){
-                                card->u.f.timer_int_enabled &= ~TMR_INT_ENABLED_ARP;
-                                break;
-                        }
-                }
-                card->u.f.arp_dev = dev;
-        }
-
-        if(!card->u.f.timer_int_enabled)
-                flags->imask &= ~FR_INTR_TIMER;
-}
-
-
-/*============================================================================
- * spur_intr:   Spurious interrupt handler.
- * 
- * Description:
- *      We don't know this interrupt.
- *      Print a warning.
- */
-
-static void spur_intr (sdla_t* card)
-{
-        if (net_ratelimit()){ 
-                printk(KERN_INFO "%s: spurious interrupt!\n", card->devname);
-        }
-}
-
-
-//FIXME: Fix the IPX in next version
-/*===========================================================================
- *  Return 0 for non-IPXWAN packet
- *         1 for IPXWAN packet or IPX is not enabled!
- *  FIXME: Use a IPX structure here not offsets
- */
-static int handle_IPXWAN(unsigned char *sendpacket, 
-                         char *devname, unsigned char enable_IPX, 
-                         unsigned long network_number)
-{
-        int i;
-
-        if( sendpacket[1] == 0x00 && sendpacket[2] == 0x80 &&
-            sendpacket[6] == 0x81 && sendpacket[7] == 0x37) { 
-
-                /* It's an IPX packet */
-                if (!enable_IPX){
-                        /* Return 1 so we don't pass it up the stack. */
-                        //FIXME: Take this out when IPX is fixed
-                        if (net_ratelimit()){ 
-                                printk (KERN_INFO 
-                                "%s: WARNING: Unsupported IPX packet received and dropped\n",
-                                        devname);
-                        }
-                        return 1;
-                }
-        } else {
-                /* It's not IPX so return and pass it up the stack. */
-                return 0;
-        }
-
-        if( sendpacket[24] == 0x90 && sendpacket[25] == 0x04){
-                /* It's IPXWAN */
-
-                if( sendpacket[10] == 0x02 && sendpacket[42] == 0x00){
-
-                        /* It's a timer request packet */
-                        printk(KERN_INFO "%s: Received IPXWAN Timer Request packet\n",
-                                        devname);
-
-                        /* Go through the routing options and answer no to every
-                         * option except Unnumbered RIP/SAP
-                         */
-                        for(i = 49; sendpacket[i] == 0x00; i += 5){
-                                /* 0x02 is the option for Unnumbered RIP/SAP */
-                                if( sendpacket[i + 4] != 0x02){
-                                        sendpacket[i + 1] = 0;
-                                }
-                        }
-
-                        /* Skip over the extended Node ID option */
-                        if( sendpacket[i] == 0x04 ){
-                                i += 8;
-                        }
-
-                        /* We also want to turn off all header compression opt.
-                         */
-                        for(; sendpacket[i] == 0x80 ;){
-                                sendpacket[i + 1] = 0;
-                                i += (sendpacket[i + 2] << 8) + (sendpacket[i + 3]) + 4;
-                        }
-
-                        /* Set the packet type to timer response */
-                        sendpacket[42] = 0x01;
-
-                        printk(KERN_INFO "%s: Sending IPXWAN Timer Response\n",
-                                        devname);
-
-                } else if( sendpacket[42] == 0x02 ){
-
-                        /* This is an information request packet */
-                        printk(KERN_INFO 
-                                "%s: Received IPXWAN Information Request packet\n",
-                                                devname);
-
-                        /* Set the packet type to information response */
-                        sendpacket[42] = 0x03;
-
-                        /* Set the router name */
-                        sendpacket[59] = 'F';
-                        sendpacket[60] = 'P';
-                        sendpacket[61] = 'I';
-                        sendpacket[62] = 'P';
-                        sendpacket[63] = 'E';
-                        sendpacket[64] = '-';
-                        sendpacket[65] = CVHexToAscii(network_number >> 28);
-                        sendpacket[66] = CVHexToAscii((network_number & 0x0F000000)>> 24);
-                        sendpacket[67] = CVHexToAscii((network_number & 0x00F00000)>> 20);
-                        sendpacket[68] = CVHexToAscii((network_number & 0x000F0000)>> 16);
-                        sendpacket[69] = CVHexToAscii((network_number & 0x0000F000)>> 12);
-                        sendpacket[70] = CVHexToAscii((network_number & 0x00000F00)>> 8);
-                        sendpacket[71] = CVHexToAscii((network_number & 0x000000F0)>> 4);
-                        sendpacket[72] = CVHexToAscii(network_number & 0x0000000F);
-                        for(i = 73; i < 107; i+= 1)
-                        {
-                                sendpacket[i] = 0;
-                        }
-
-                        printk(KERN_INFO "%s: Sending IPXWAN Information Response packet\n",
-                                        devname);
-                } else {
-
-                        printk(KERN_INFO "%s: Unknown IPXWAN packet!\n",devname);
-                        return 0;
-                }
-
-                /* Set the WNodeID to our network address */
-                sendpacket[43] = (unsigned char)(network_number >> 24);
-                sendpacket[44] = (unsigned char)((network_number & 0x00FF0000) >> 16);
-                sendpacket[45] = (unsigned char)((network_number & 0x0000FF00) >> 8);
-                sendpacket[46] = (unsigned char)(network_number & 0x000000FF);
-
-                return 1;
-        }
-
-        /* If we get here, it's an IPX-data packet so it'll get passed up the 
-         * stack.
-         * switch the network numbers 
-         */
-        switch_net_numbers(sendpacket, network_number ,1);
-        return 0;
-}
-/*============================================================================
- * process_route
- * 
- * Rationale:
- *      If the interface goes down, or we receive an ARP request,
- *      we have to change the network interface ip addresses.
- *      This cannot be done within the interrupt.
- *
- * Description:
- *
- *      This routine is called as a polling routine to dynamically 
- *      add/delete routes negotiated by inverse ARP.  It is in this 
- *      "task" because we don't want routes to be added while in 
- *      interrupt context.
- *
- * Usage:
- *      This function is called by fr_poll() polling funtion.
- */
-
-static void process_route(struct net_device *dev)
-{
-        fr_channel_t *chan = dev->priv;
-        sdla_t *card = chan->card;
-
-        struct ifreq if_info;
-        struct sockaddr_in *if_data;
-        mm_segment_t fs = get_fs();
-        u32 ip_tmp;
-        int err;
-
-
-        switch(chan->route_flag){
-
-        case ADD_ROUTE:
-                                
-                /* Set remote addresses */
-                memset(&if_info, 0, sizeof(if_info));
-                strcpy(if_info.ifr_name, dev->name);
-
-                set_fs(get_ds());     /* get user space block */ 
-                
-                if_data = (struct sockaddr_in *)&if_info.ifr_dstaddr;
-                if_data->sin_addr.s_addr = chan->ip_remote;
-                if_data->sin_family = AF_INET;
-                err = devinet_ioctl( SIOCSIFDSTADDR, &if_info );
-
-                set_fs(fs);           /* restore old block */
-
-                if (err) {
-                        printk(KERN_INFO 
-                                "%s: Route Add failed.  Error: %d\n", 
-                                        card->devname,err);
-                        printk(KERN_INFO "%s: Address: %u.%u.%u.%u\n",
-                                chan->name, NIPQUAD(chan->ip_remote));
-
-                }else {
-                        printk(KERN_INFO "%s: Route Added Successfully: %u.%u.%u.%u\n",
-                                card->devname,NIPQUAD(chan->ip_remote));
-                        chan->route_flag = ROUTE_ADDED;
-                }
-                break;
-
-        case REMOVE_ROUTE:
-
-                /* Set remote addresses */
-                memset(&if_info, 0, sizeof(if_info));
-                strcpy(if_info.ifr_name, dev->name);
-
-                ip_tmp = get_ip_address(dev,WAN_POINTOPOINT_IP);        
-
-                set_fs(get_ds());     /* get user space block */ 
-                
-                if_data = (struct sockaddr_in *)&if_info.ifr_dstaddr;
-                if_data->sin_addr.s_addr = 0;
-                if_data->sin_family = AF_INET;
-                err = devinet_ioctl( SIOCSIFDSTADDR, &if_info );
-
-                set_fs(fs);    
-                
-                if (err) {
-                        printk(KERN_INFO 
-                                "%s: Deleting of route failed.  Error: %d\n", 
-                                        card->devname,err);
-                        printk(KERN_INFO "%s: Address: %u.%u.%u.%u\n",
-                                dev->name,NIPQUAD(chan->ip_remote) );
-
-                } else {
-                        printk(KERN_INFO "%s: Route Removed Sucessfuly: %u.%u.%u.%u\n", 
-                                card->devname,NIPQUAD(ip_tmp));
-                        chan->route_flag = NO_ROUTE;
-                }
-                break;
-
-        } /* Case Statement */
-
-}
-
-
-
-/****** Frame Relay Firmware-Specific Functions *****************************/
-
-/*============================================================================
- * Read firmware code version.
- * o fill string str with firmware version info. 
- */
-static int fr_read_version (sdla_t* card, char* str)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                mbox->cmd.command = FR_READ_CODE_VERSION;
-                mbox->cmd.length = 0;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-        
-        if (!err && str) {
-                int len = mbox->cmd.length;
-                memcpy(str, mbox->data, len);
-                str[len] = '\0';
-        }
-        return err;
-}
-
-/*============================================================================
- * Set global configuration.
- */
-static int fr_configure (sdla_t* card, fr_conf_t *conf)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int dlci_num = card->u.f.dlci_num;
-        int err, i;
-
-        do
-        {
-                memcpy(mbox->data, conf, sizeof(fr_conf_t));
-
-                if (dlci_num) for (i = 0; i < dlci_num; ++i)
-                        ((fr_conf_t*)mbox->data)->dlci[i] = 
-                                        card->u.f.node_dlci[i]; 
-                
-                mbox->cmd.command = FR_SET_CONFIG;
-                mbox->cmd.length =
-                        sizeof(fr_conf_t) + dlci_num * sizeof(short);
-
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        /*NC Oct 12 2000 */
-        if (err != CMD_OK){
-                printk(KERN_ERR "%s: Frame Relay Configuration Failed: rc=0x%x\n",
-                                card->devname,err);
-        }
-        
-        return err;
-}
-
-/*============================================================================
- * Set DLCI configuration.
- */
-static int fr_dlci_configure (sdla_t* card, fr_dlc_conf_t *conf, unsigned dlci)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memcpy(mbox->data, conf, sizeof(fr_dlc_conf_t));
-                mbox->cmd.dlci = (unsigned short) dlci; 
-                mbox->cmd.command = FR_SET_CONFIG;
-                mbox->cmd.length = sizeof(fr_dlc_conf_t);
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry--);
-        
-        return err;
-}
-/*============================================================================
- * Set interrupt mode.
- */
-static int fr_set_intr_mode (sdla_t* card, unsigned mode, unsigned mtu,
-        unsigned short timeout)
-{
-        fr_mbox_t* mbox = card->mbox;
-        fr508_intr_ctl_t* ictl = (void*)mbox->data;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(ictl, 0, sizeof(fr508_intr_ctl_t));
-                ictl->mode   = mode;
-                ictl->tx_len = mtu;
-                ictl->irq    = card->hw.irq;
-
-                /* indicate timeout on timer */
-                if (mode & 0x20) ictl->timeout = timeout; 
-
-                mbox->cmd.length = sizeof(fr508_intr_ctl_t);
-                mbox->cmd.command = FR_SET_INTR_MODE;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-
-        } while (err && retry-- && fr_event(card, err, mbox));
-        
-        return err;
-}
-
-/*============================================================================
- * Enable communications.
- */
-static int fr_comm_enable (sdla_t* card)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                mbox->cmd.command = FR_COMM_ENABLE;
-                mbox->cmd.length = 0;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-        
-        return err;
-}
-
-/*============================================================================
- * fr_comm_disable 
- *
- * Warning: This functin is called by the shutdown() procedure. It is void
- *          since dev->priv are has already been deallocated and no
- *          error checking is possible using fr_event() function.
- */
-static void fr_comm_disable (sdla_t* card)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do {
-        mbox->cmd.command = FR_SET_MODEM_STATUS;
-        mbox->cmd.length = 1;
-        mbox->data[0] = 0;
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry--);
-        
-        retry = MAX_CMD_RETRY;
-        
-        do
-        {
-                mbox->cmd.command = FR_COMM_DISABLE;
-                mbox->cmd.length = 0;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry--);
-
-        return;
-}
-
-
-
-/*============================================================================
- * Get communications error statistics. 
- */
-static int fr_get_err_stats (sdla_t* card)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-
-        do
-        {
-                mbox->cmd.command = FR_READ_ERROR_STATS;
-                mbox->cmd.length = 0;
-                mbox->cmd.dlci = 0;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        if (!err) {
-                fr_comm_stat_t* stats = (void*)mbox->data;
-                card->wandev.stats.rx_over_errors    = stats->rx_overruns;
-                card->wandev.stats.rx_crc_errors     = stats->rx_bad_crc;
-                card->wandev.stats.rx_missed_errors  = stats->rx_aborts;
-                card->wandev.stats.rx_length_errors  = stats->rx_too_long;
-                card->wandev.stats.tx_aborted_errors = stats->tx_aborts;
-        
-        }
-
-        return err;
-}
-
-/*============================================================================
- * Get statistics. 
- */
-static int fr_get_stats (sdla_t* card)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-
-        do
-        {
-                mbox->cmd.command = FR_READ_STATISTICS;
-                mbox->cmd.length = 0;
-                mbox->cmd.dlci = 0;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        if (!err) {
-                fr_link_stat_t* stats = (void*)mbox->data;
-                card->wandev.stats.rx_frame_errors = stats->rx_bad_format;
-                card->wandev.stats.rx_dropped =
-                        stats->rx_dropped + stats->rx_dropped2;
-        }
-
-        return err;
-}
-
-/*============================================================================
- * Add DLCI(s) (Access Node only!).
- * This routine will perform the ADD_DLCIs command for the specified DLCI.
- */
-static int fr_add_dlci (sdla_t* card, int dlci)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                unsigned short* dlci_list = (void*)mbox->data;
-
-                mbox->cmd.length  = sizeof(short);
-                dlci_list[0] = dlci;
-                mbox->cmd.command = FR_ADD_DLCI;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-
-        } while (err && retry-- && fr_event(card, err, mbox));
-        
-        return err;
-}
-
-/*============================================================================
- * Activate DLCI(s) (Access Node only!). 
- * This routine will perform the ACTIVATE_DLCIs command with a DLCI number. 
- */
-static int fr_activate_dlci (sdla_t* card, int dlci)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                unsigned short* dlci_list = (void*)mbox->data;
-
-                mbox->cmd.length  = sizeof(short);
-                dlci_list[0] = dlci;
-                mbox->cmd.command = FR_ACTIVATE_DLCI;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-
-        } while (err && retry-- && fr_event(card, err, mbox));
-        
-        return err;
-}
-
-/*============================================================================
- * Delete DLCI(s) (Access Node only!). 
- * This routine will perform the DELETE_DLCIs command with a DLCI number. 
- */
-static int fr_delete_dlci (sdla_t* card, int dlci)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                unsigned short* dlci_list = (void*)mbox->data;
-
-                mbox->cmd.length  = sizeof(short);
-                dlci_list[0] = dlci;
-                mbox->cmd.command = FR_DELETE_DLCI;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-
-        } while (err && retry-- && fr_event(card, err, mbox));
-        
-        return err;
-}
-
-
-
-/*============================================================================
- * Issue in-channel signalling frame. 
- */
-static int fr_issue_isf (sdla_t* card, int isf)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                mbox->data[0] = isf;
-                mbox->cmd.length  = 1;
-                mbox->cmd.command = FR_ISSUE_IS_FRAME;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-        
-        return err;
-}
-
-
-static unsigned int fr_send_hdr (sdla_t*card, int dlci, unsigned int offset)
-{
-        struct net_device *dev = find_channel(card,dlci);       
-        fr_channel_t *chan;
-
-        if (!dev || !(chan=dev->priv))
-                return offset;
-        
-        if (chan->fr_header_len){
-                sdla_poke(&card->hw, offset, chan->fr_header, chan->fr_header_len);
-        }
-        
-        return offset+chan->fr_header_len;
-}
-
-/*============================================================================
- * Send a frame on a selected DLCI.  
- */
-static int fr_send_data_header (sdla_t* card, int dlci, unsigned char attr, int len,
-        void *buf, unsigned char hdr_len)
-{
-        fr_mbox_t* mbox = card->mbox + 0x800;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                mbox->cmd.dlci    = dlci;
-                mbox->cmd.attr    = attr;
-                mbox->cmd.length  = len+hdr_len;
-                mbox->cmd.command = FR_WRITE;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        if (!err) {
-                fr_tx_buf_ctl_t* frbuf;
- 
-                if(card->hw.type == SDLA_S514)
-                        frbuf = (void*)(*(unsigned long*)mbox->data +
-                                card->hw.dpmbase);
-                else
-                        frbuf = (void*)(*(unsigned long*)mbox->data -
-                                FR_MB_VECTOR + card->hw.dpmbase);
-
-                sdla_poke(&card->hw, fr_send_hdr(card,dlci,frbuf->offset), buf, len);
-                frbuf->flag = 0x01;
-        }
-
-        return err;
-}
-
-static int fr_send (sdla_t* card, int dlci, unsigned char attr, int len,
-        void *buf)
-{
-        fr_mbox_t* mbox = card->mbox + 0x800;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                mbox->cmd.dlci    = dlci;
-                mbox->cmd.attr    = attr;
-                mbox->cmd.length  = len;
-                mbox->cmd.command = FR_WRITE;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        if (!err) {
-                fr_tx_buf_ctl_t* frbuf;
- 
-                if(card->hw.type == SDLA_S514)
-                        frbuf = (void*)(*(unsigned long*)mbox->data +
-                                card->hw.dpmbase);
-                else
-                        frbuf = (void*)(*(unsigned long*)mbox->data -
-                                FR_MB_VECTOR + card->hw.dpmbase);
-
-                sdla_poke(&card->hw, frbuf->offset, buf, len);
-                frbuf->flag = 0x01;
-        }
-
-        return err;
-}
-
-
-/****** Firmware Asynchronous Event Handlers ********************************/
-
-/*============================================================================
- * Main asyncronous event/error handler.
- *      This routine is called whenever firmware command returns non-zero
- *      return code.
- *
- * Return zero if previous command has to be cancelled.
- */
-static int fr_event (sdla_t *card, int event, fr_mbox_t* mbox)
-{
-        fr508_flags_t* flags = card->flags;
-        char *ptr = &flags->iflag;
-        int i;
-
-        switch (event) {
-
-                case FRRES_MODEM_FAILURE:
-                        return fr_modem_failure(card, mbox);
-
-                case FRRES_CHANNEL_DOWN: {
-                        struct net_device *dev;
-
-                        /* Remove all routes from associated DLCI's */
-                        for (dev = card->wandev.dev; dev;
-                             dev = *((struct net_device **)dev->priv)) {
-                                fr_channel_t *chan = dev->priv;
-                                if (chan->route_flag == ROUTE_ADDED) {
-                                        chan->route_flag = REMOVE_ROUTE;
-                                }
-
-                                if (chan->inarp == INARP_CONFIGURED) {
-                                        chan->inarp = INARP_REQUEST;
-                                }
-
-                                /* If the link becomes disconnected then,
-                                 * all channels will be disconnected
-                                 * as well.
-                                 */
-                                set_chan_state(dev,WAN_DISCONNECTED);
-                        }
-                                
-                        wanpipe_set_state(card, WAN_DISCONNECTED);
-                        return 1;
-                        }
-
-                case FRRES_CHANNEL_UP: {
-                        struct net_device *dev;
-
-                        /* FIXME: Only startup devices that are on the list */
-                        
-                        for (dev = card->wandev.dev; dev;
-                             dev = *((struct net_device **)dev->priv)) {
-                                
-                                set_chan_state(dev,WAN_CONNECTED);
-                        }
-
-                        wanpipe_set_state(card, WAN_CONNECTED);
-                        return 1;
-                        }
-
-                case FRRES_DLCI_CHANGE:
-                        return fr_dlci_change(card, mbox);
-
-                case FRRES_DLCI_MISMATCH:
-                        printk(KERN_INFO "%s: DLCI list mismatch!\n", 
-                                card->devname);
-                        return 1;
-
-                case CMD_TIMEOUT:
-                        printk(KERN_ERR "%s: command 0x%02X timed out!\n",
-                                card->devname, mbox->cmd.command);
-                        printk(KERN_INFO "%s: ID Bytes = ",card->devname);
-                        for(i = 0; i < 8; i ++)
-                                printk(KERN_INFO "0x%02X ", *(ptr + 0x18 + i));
-                        printk(KERN_INFO "\n"); 
-            
-                        break;
-
-                case FRRES_DLCI_INACTIVE:
-                        break;
- 
-                case FRRES_CIR_OVERFLOW:
-                        break;
-                        
-                case FRRES_BUFFER_OVERFLOW:
-                        break; 
-                        
-                default:
-                        printk(KERN_INFO "%s: command 0x%02X returned 0x%02X!\n"
-                                , card->devname, mbox->cmd.command, event);
-        }
-
-        return 0;
-}
-
-/*============================================================================
- * Handle modem error.
- *
- * Return zero if previous command has to be cancelled.
- */
-static int fr_modem_failure (sdla_t *card, fr_mbox_t* mbox)
-{
-        printk(KERN_INFO "%s: physical link down! (modem error 0x%02X)\n",
-                card->devname, mbox->data[0]);
-
-        switch (mbox->cmd.command){
-                case FR_WRITE:
-        
-                case FR_READ:
-                        return 0;
-        }
-        
-        return 1;
-}
-
-/*============================================================================
- * Handle DLCI status change.
- *
- * Return zero if previous command has to be cancelled.
- */
-static int fr_dlci_change (sdla_t *card, fr_mbox_t* mbox)
-{
-        dlci_status_t* status = (void*)mbox->data;
-        int cnt = mbox->cmd.length / sizeof(dlci_status_t);
-        fr_channel_t *chan;
-        struct net_device* dev2;
-        
-
-        for (; cnt; --cnt, ++status) {
-
-                unsigned short dlci= status->dlci;
-                struct net_device* dev = find_channel(card, dlci);
-                
-                if (dev == NULL){
-                        printk(KERN_INFO 
-                                "%s: CPE contains unconfigured DLCI= %d\n", 
-                                card->devname, dlci);   
-
-                      printk(KERN_INFO
-                                "%s: unconfigured DLCI %d reported by network\n"
-                                , card->devname, dlci);
- 
-                }else{
-                        if (status->state == FR_LINK_INOPER) {
-                                printk(KERN_INFO
-                                        "%s: DLCI %u is inactive!\n",
-                                        card->devname, dlci);
-
-                                if (dev && netif_running(dev))
-                                        set_chan_state(dev, WAN_DISCONNECTED);
-                        }
-        
-                        if (status->state & FR_DLCI_DELETED) {
-
-                                printk(KERN_INFO
-                                        "%s: DLCI %u has been deleted!\n",
-                                        card->devname, dlci);
-
-                                if (dev && netif_running(dev)){
-
-                                        fr_channel_t *chan = dev->priv;
-
-                                        if (chan->route_flag == ROUTE_ADDED) {
-                                                chan->route_flag = REMOVE_ROUTE;
-                                                /* The state change will trigger
-                                                 * the fr polling routine */
-                                        }
-
-                                        if (chan->inarp == INARP_CONFIGURED) {
-                                                chan->inarp = INARP_REQUEST;
-                                        }
-
-                                        set_chan_state(dev, WAN_DISCONNECTED);
-                                }
-
-                        } else if (status->state & FR_DLCI_ACTIVE) {
-
-                                chan = dev->priv;
-                        
-                                /* This flag is used for configuring specific 
-                                   DLCI(s) when they become active.
-                                */ 
-                                chan->dlci_configured = DLCI_CONFIG_PENDING;
-        
-                                set_chan_state(dev, WAN_CONNECTED);
-                
-                        }
-                }
-        }
-        
-        for (dev2 = card->wandev.dev; dev2;
-             dev2 = *((struct net_device **)dev2->priv)){
-                
-                chan = dev2->priv;
-        
-                if (chan->dlci_configured == DLCI_CONFIG_PENDING) {
-                        if (fr_init_dlci(card, chan)){
-                                return 1;
-                        }
-                }
-
-        }
-        return 1;
-}
-
-
-static int fr_init_dlci (sdla_t *card, fr_channel_t *chan)
-{
-        fr_dlc_conf_t cfg;
-        
-        memset(&cfg, 0, sizeof(cfg));
-
-        if ( chan->cir_status == CIR_DISABLED) {
-
-                cfg.cir_fwd = cfg.cir_bwd  = 16;
-                cfg.bc_fwd = cfg.bc_bwd = 16;
-                cfg.conf_flags = 0x0001;        
-
-        }else if (chan->cir_status == CIR_ENABLED) {
-        
-                cfg.cir_fwd = cfg.cir_bwd = chan->cir;
-                cfg.bc_fwd  = cfg.bc_bwd  = chan->bc;
-                cfg.be_fwd  = cfg.be_bwd  = chan->be;
-                cfg.conf_flags = 0x0000;
-        }
-        
-        if (fr_dlci_configure( card, &cfg , chan->dlci)){
-                printk(KERN_INFO 
-                        "%s: DLCI Configure failed for %d\n",
-                                card->devname, chan->dlci);
-                return 1;       
-        }
-        
-        chan->dlci_configured = DLCI_CONFIGURED;
-
-        /* Read the interface byte mapping into the channel 
-         * structure.
-         */
-        read_DLCI_IB_mapping( card, chan );
-
-        return 0;
-}
-/******* Miscellaneous ******************************************************/
-
-/*============================================================================
- * Update channel state. 
- */
-static int update_chan_state(struct net_device* dev)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                mbox->cmd.command = FR_LIST_ACTIVE_DLCI;
-                mbox->cmd.length = 0;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        if (!err) {
-                
-                unsigned short* list = (void*)mbox->data;
-                int cnt = mbox->cmd.length / sizeof(short);
-                
-                err=1;
-                
-                for (; cnt; --cnt, ++list) {
-
-                        if (*list == chan->dlci) {
-                                set_chan_state(dev, WAN_CONNECTED);
-
-
-                                /* May 23 2000. NC
-                                 * When a dlci is added or restarted,
-                                 * the dlci_int_interface pointer must
-                                 * be reinitialized.  */
-                                if (!chan->dlci_int_interface){
-                                        err=fr_init_dlci (card,chan);
-                                }
-                                break;
-                        }
-                }
-        }
-
-        return err;
-}
-
-/*============================================================================
- * Set channel state.
- */
-static void set_chan_state(struct net_device* dev, int state)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-
-        if (chan->common.state != state) {
-
-                switch (state) {
-
-                        case WAN_CONNECTED:
-                                printk(KERN_INFO
-                                        "%s: Interface %s: DLCI %d connected\n",
-                                        card->devname, dev->name, chan->dlci);
-
-                                /* If the interface was previoulsy down,
-                                 * bring it up, since the channel is active */
-
-                                trigger_fr_poll (dev);
-                                trigger_fr_arp  (dev);
-                                break;
-
-                        case WAN_CONNECTING:
-                                printk(KERN_INFO 
-                                      "%s: Interface %s: DLCI %d connecting\n",
-                                        card->devname, dev->name, chan->dlci);
-                                break;
-
-                        case WAN_DISCONNECTED:
-                                printk (KERN_INFO 
-                                    "%s: Interface %s: DLCI %d disconnected!\n",
-                                        card->devname, dev->name, chan->dlci);
-                        
-                                /* If the interface is up, bring it down,
-                                 * since the channel is now disconnected */
-                                trigger_fr_poll (dev);
-                                break;
-                }
-
-                chan->common.state = state;
-        }
-
-        chan->state_tick = jiffies;
-}
-
-/*============================================================================
- * Find network device by its channel number.
- *
- * We need this critical flag because we change
- * the dlci_to_dev_map outside the interrupt.
- *
- * NOTE: del_if() functions updates this array, it uses
- *       the spin locks to avoid corruption.
- */
-static struct net_device* find_channel(sdla_t* card, unsigned dlci)
-{
-        if(dlci > HIGHEST_VALID_DLCI)
-                return NULL;
-
-        return(card->u.f.dlci_to_dev_map[dlci]);
-}
-
-/*============================================================================
- * Check to see if a frame can be sent. If no transmit buffers available,
- * enable transmit interrupts.
- *
- * Return:      1 - Tx buffer(s) available
- *              0 - no buffers available
- */
-static int is_tx_ready (sdla_t* card, fr_channel_t* chan)
-{
-        unsigned char sb;
-
-        if(card->hw.type == SDLA_S514)
-                return 1;
-
-        sb = inb(card->hw.port);
-        if (sb & 0x02) 
-                return 1;
-
-        return 0;
-}
-
-/*============================================================================
- * Convert decimal string to unsigned integer.
- * If len != 0 then only 'len' characters of the string are converted.
- */
-static unsigned int dec_to_uint (unsigned char* str, int len)
-{
-        unsigned val;
-
-        if (!len) 
-                len = strlen(str);
-
-        for (val = 0; len && isdigit(*str); ++str, --len)
-                val = (val * 10) + (*str - (unsigned)'0');
-
-        return val;
-}
-
-
-
-/*=============================================================================
- * Store a UDP management packet for later processing.
- */
-
-static int store_udp_mgmt_pkt(int udp_type, char udp_pkt_src, sdla_t* card,
-                                struct sk_buff *skb, int dlci)
-{
-        int udp_pkt_stored = 0;
-        
-        struct net_device *dev = find_channel(card, dlci);
-        fr_channel_t *chan;
-        
-        if (!dev || !(chan=dev->priv))
-                return 1;
-        
-        if(!card->u.f.udp_pkt_lgth && (skb->len <= MAX_LGTH_UDP_MGNT_PKT)){
-                card->u.f.udp_pkt_lgth = skb->len + chan->fr_header_len;
-                card->u.f.udp_type = udp_type;
-                card->u.f.udp_pkt_src = udp_pkt_src;
-                card->u.f.udp_dlci = dlci;
-                memcpy(card->u.f.udp_pkt_data, skb->data, skb->len);
-                card->u.f.timer_int_enabled |= TMR_INT_ENABLED_UDP;
-                udp_pkt_stored = 1;
-
-        }else{
-                printk(KERN_INFO "ERROR: UDP packet not stored for DLCI %d\n", 
-                                                        dlci);
-        }
-
-        if(udp_pkt_src == UDP_PKT_FRM_STACK){
-                dev_kfree_skb_any(skb);
-        }else{
-                dev_kfree_skb_any(skb);
-        }
-                
-        return(udp_pkt_stored);
-}
-
-
-/*==============================================================================
- * Process UDP call of type FPIPE8ND
- */
-static int process_udp_mgmt_pkt(sdla_t* card)
-{
-
-        int c_retry = MAX_CMD_RETRY;
-        unsigned char *buf;
-        unsigned char frames;
-        unsigned int len;
-        unsigned short buffer_length;
-        struct sk_buff *new_skb;
-        fr_mbox_t* mbox = card->mbox;
-        int err;
-        struct timeval tv;
-        int udp_mgmt_req_valid = 1;
-        struct net_device* dev;
-        fr_channel_t* chan;
-        fr_udp_pkt_t *fr_udp_pkt;
-        unsigned short num_trc_els;
-        fr_trc_el_t* ptr_trc_el;
-        fr_trc_el_t trc_el;
-        fpipemon_trc_t* fpipemon_trc;
-
-        char udp_pkt_src = card->u.f.udp_pkt_src; 
-        int dlci = card->u.f.udp_dlci;
-
-        /* Find network interface for this packet */
-        dev = find_channel(card, dlci);
-        if (!dev){
-                card->u.f.udp_pkt_lgth = 0;
-                return 1;
-        }
-        if ((chan = dev->priv) == NULL){
-                card->u.f.udp_pkt_lgth = 0;
-                return 1;
-        }
-
-        /* If the UDP packet is from the network, we are going to have to 
-           transmit a response. Before doing so, we must check to see that
-           we are not currently transmitting a frame (in 'if_send()') and
-           that we are not already in a 'delayed transmit' state.
-        */
-        if(udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-                if (check_tx_status(card,dev)){
-                        card->u.f.udp_pkt_lgth = 0;
-                        return 1;
-                }
-        }
-
-        fr_udp_pkt = (fr_udp_pkt_t *)card->u.f.udp_pkt_data;
-
-        if(udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-        
-                switch(fr_udp_pkt->cblock.command) {
-
-                        case FR_READ_MODEM_STATUS:
-                        case FR_READ_STATUS:
-                        case FPIPE_ROUTER_UP_TIME:
-                        case FR_READ_ERROR_STATS:
-                        case FPIPE_DRIVER_STAT_GEN:
-                        case FR_READ_STATISTICS:
-                        case FR_READ_ADD_DLC_STATS:
-                        case FR_READ_CONFIG:
-                        case FR_READ_CODE_VERSION:
-                                udp_mgmt_req_valid = 1;
-                                break;
-                        default:
-                                udp_mgmt_req_valid = 0;
-                                break;
-                }
-        }
-
-        if(!udp_mgmt_req_valid) {
-                /* set length to 0 */
-                fr_udp_pkt->cblock.length = 0;
-                /* set return code */
-                fr_udp_pkt->cblock.result = 0xCD; 
-                
-                chan->drvstats_gen.UDP_PIPE_mgmt_direction_err ++;
-
-                if (net_ratelimit()){   
-                        printk(KERN_INFO 
-                        "%s: Warning, Illegal UDP command attempted from network: %x\n",
-                        card->devname,fr_udp_pkt->cblock.command);
-                }
-                
-        } else {   
-           
-                switch(fr_udp_pkt->cblock.command) {
-
-                case FPIPE_ENABLE_TRACING:
-                        if(!card->TracingEnabled) {
-                                do {
-                                        mbox->cmd.command = FR_SET_TRACE_CONFIG;
-                                        mbox->cmd.length = 1;
-                                        mbox->cmd.dlci = 0x00;
-                                        mbox->data[0] = fr_udp_pkt->data[0] | 
-                                                RESET_TRC;
-                                        err = sdla_exec(mbox) ? 
-                                                        mbox->cmd.result : CMD_TIMEOUT;
-                                } while (err && c_retry-- && fr_event(card, err,
-                                         mbox));
-
-                                if(err) {
-                                        card->TracingEnabled = 0;
-                                        /* set the return code */
-                                        fr_udp_pkt->cblock.result =
-                                                mbox->cmd.result;
-                                        mbox->cmd.length = 0;
-                                        break;
-                                }
-
-                                sdla_peek(&card->hw, NO_TRC_ELEMENTS_OFF,
-                                                &num_trc_els, 2);
-                                sdla_peek(&card->hw, BASE_TRC_ELEMENTS_OFF,
-                                                &card->u.f.trc_el_base, 4);
-                                card->u.f.curr_trc_el = card->u.f.trc_el_base;
-                                card->u.f.trc_el_last = card->u.f.curr_trc_el +
-                                                        ((num_trc_els - 1) * 
-                                                        sizeof(fr_trc_el_t));
-   
-                                /* Calculate the maximum trace data area in */
-                                /* the UDP packet */
-                                card->u.f.trc_bfr_space=(MAX_LGTH_UDP_MGNT_PKT -
-                                        //sizeof(fr_encap_hdr_t) -
-                                        sizeof(ip_pkt_t) -
-                                        sizeof(udp_pkt_t) -
-                                        sizeof(wp_mgmt_t) -
-                                        sizeof(cblock_t));
-
-                                /* set return code */
-                                fr_udp_pkt->cblock.result = 0;
-                        
-                        } else {
-                                /* set return code to line trace already 
-                                   enabled */
-                                fr_udp_pkt->cblock.result = 1;
-                        }
-
-                        mbox->cmd.length = 0;
-                        card->TracingEnabled = 1;
-                        break;
-
-
-                case FPIPE_DISABLE_TRACING:
-                        if(card->TracingEnabled) {
-                        
-                                do {
-                                        mbox->cmd.command = FR_SET_TRACE_CONFIG;
-                                        mbox->cmd.length = 1;
-                                        mbox->cmd.dlci = 0x00;
-                                        mbox->data[0] = ~ACTIVATE_TRC;
-                                        err = sdla_exec(mbox) ? 
-                                                        mbox->cmd.result : CMD_TIMEOUT;
-                                } while (err && c_retry-- && fr_event(card, err, mbox));
-                        }
-
-                        /* set return code */
-                        fr_udp_pkt->cblock.result = 0;
-                        mbox->cmd.length = 0;
-                        card->TracingEnabled = 0;
-                        break;
-
-                case FPIPE_GET_TRACE_INFO:
-
-                        /* Line trace cannot be performed on the 502 */
-                        if(!card->TracingEnabled) {
-                                /* set return code */
-                                fr_udp_pkt->cblock.result = 1;
-                                mbox->cmd.length = 0;
-                                break;
-                        }
-
-                        ptr_trc_el = (void *)card->u.f.curr_trc_el;
-
-                        buffer_length = 0;
-                        fr_udp_pkt->data[0x00] = 0x00;
-
-                        for(frames = 0; frames < MAX_FRMS_TRACED; frames ++) {
-
-                                sdla_peek(&card->hw, (unsigned long)ptr_trc_el,
-                                          (void *)&trc_el.flag,
-                                          sizeof(fr_trc_el_t));
-                                if(trc_el.flag == 0x00) {
-                                        break;
-                                }
-                                if((card->u.f.trc_bfr_space - buffer_length)
-                                        < sizeof(fpipemon_trc_hdr_t)) { 
-                                        fr_udp_pkt->data[0x00] |= MORE_TRC_DATA;
-                                        break;
-                                }
-
-                                fpipemon_trc = 
-                                        (fpipemon_trc_t *)&fr_udp_pkt->data[buffer_length]; 
-                                fpipemon_trc->fpipemon_trc_hdr.status =
-                                        trc_el.attr;
-                                fpipemon_trc->fpipemon_trc_hdr.tmstamp =
-                                        trc_el.tmstamp;
-                                fpipemon_trc->fpipemon_trc_hdr.length = 
-                                        trc_el.length;
-
-                                if(!trc_el.offset || !trc_el.length) {
-
-                                        fpipemon_trc->fpipemon_trc_hdr.data_passed = 0x00;
-
-                                }else if((trc_el.length + sizeof(fpipemon_trc_hdr_t) + 1) >
-                                        (card->u.f.trc_bfr_space - buffer_length)){
-
-                                        fpipemon_trc->fpipemon_trc_hdr.data_passed = 0x00;
-                                        fr_udp_pkt->data[0x00] |= MORE_TRC_DATA;
- 
-                                }else {
-                                        fpipemon_trc->fpipemon_trc_hdr.data_passed = 0x01;
-                                        sdla_peek(&card->hw, trc_el.offset,
-                                                  fpipemon_trc->data,
-                                                  trc_el.length);
-                                }                       
-
-                                trc_el.flag = 0x00;
-                                sdla_poke(&card->hw, (unsigned long)ptr_trc_el,
-                                          &trc_el.flag, 1);
-                               
-                                ptr_trc_el ++;
-                                if((void *)ptr_trc_el > card->u.f.trc_el_last)
-                                        ptr_trc_el = (void*)card->u.f.trc_el_base;
-
-                                buffer_length += sizeof(fpipemon_trc_hdr_t);
-                                if(fpipemon_trc->fpipemon_trc_hdr.data_passed) {
-                                        buffer_length += trc_el.length;
-                                }
-
-                                if(fr_udp_pkt->data[0x00] & MORE_TRC_DATA) {
-                                        break;
-                                }
-                        }
-                      
-                        if(frames == MAX_FRMS_TRACED) {
-                                fr_udp_pkt->data[0x00] |= MORE_TRC_DATA;
-                        }
-             
-                        card->u.f.curr_trc_el = (void *)ptr_trc_el;
-
-                        /* set the total number of frames passed */
-                        fr_udp_pkt->data[0x00] |=
-                                ((frames << 1) & (MAX_FRMS_TRACED << 1));
-
-                        /* set the data length and return code */
-                        fr_udp_pkt->cblock.length = mbox->cmd.length = buffer_length;
-                        fr_udp_pkt->cblock.result = 0;
-                        break;
-
-                case FPIPE_FT1_READ_STATUS:
-                        sdla_peek(&card->hw, 0xF020,
-                                &fr_udp_pkt->data[0x00] , 2);
-                        fr_udp_pkt->cblock.length = mbox->cmd.length = 2;
-                        fr_udp_pkt->cblock.result = 0;
-                        break;
-
-                case FPIPE_FLUSH_DRIVER_STATS:
-                        init_chan_statistics(chan);
-                        init_global_statistics(card);
-                        mbox->cmd.length = 0;
-                        break;
-                
-                case FPIPE_ROUTER_UP_TIME:
-                        do_gettimeofday(&tv);
-                        chan->router_up_time = tv.tv_sec - 
-                                                chan->router_start_time;
-                        *(unsigned long *)&fr_udp_pkt->data =
-                                chan->router_up_time;   
-                        mbox->cmd.length = fr_udp_pkt->cblock.length = 4;
-                        fr_udp_pkt->cblock.result = 0;
-                        break;
-
-                case FPIPE_DRIVER_STAT_IFSEND:
-                        memcpy(fr_udp_pkt->data,
-                                &chan->drvstats_if_send.if_send_entry,
-                                sizeof(if_send_stat_t));
-                        mbox->cmd.length = fr_udp_pkt->cblock.length =sizeof(if_send_stat_t);   
-                        fr_udp_pkt->cblock.result = 0;
-                        break;
-        
-                case FPIPE_DRIVER_STAT_INTR:
-
-                        memcpy(fr_udp_pkt->data,
-                                &card->statistics.isr_entry,
-                                sizeof(global_stats_t));
-
-                        memcpy(&fr_udp_pkt->data[sizeof(global_stats_t)],
-                                &chan->drvstats_rx_intr.rx_intr_no_socket,
-                                sizeof(rx_intr_stat_t));
-
-                        mbox->cmd.length = fr_udp_pkt->cblock.length = 
-                                        sizeof(global_stats_t) +
-                                        sizeof(rx_intr_stat_t);
-                        fr_udp_pkt->cblock.result = 0;
-                        break;
-
-                case FPIPE_DRIVER_STAT_GEN:
-                        memcpy(fr_udp_pkt->data,
-                                &chan->drvstats_gen.UDP_PIPE_mgmt_kmalloc_err,
-                                sizeof(pipe_mgmt_stat_t));
-
-                        memcpy(&fr_udp_pkt->data[sizeof(pipe_mgmt_stat_t)],
-                               &card->statistics, sizeof(global_stats_t));
-
-                        mbox->cmd.length = fr_udp_pkt->cblock.length = sizeof(global_stats_t)+
-                                                     sizeof(rx_intr_stat_t);
-                        fr_udp_pkt->cblock.result = 0;
-                        break;
-
-
-                case FR_FT1_STATUS_CTRL:
-                        if(fr_udp_pkt->data[0] == 1) {
-                                if(rCount++ != 0 ){
-                                        fr_udp_pkt->cblock.result = 0;
-                                        mbox->cmd.length = 1;
-                                        break;
-                                } 
-                        }
-           
-                        /* Disable FT1 MONITOR STATUS */
-                        if(fr_udp_pkt->data[0] == 0) {
-                                if( --rCount != 0) {
-                                        fr_udp_pkt->cblock.result = 0;
-                                        mbox->cmd.length = 1;
-                                        break;
-                                } 
-                        }  
-                        goto udp_mgmt_dflt;
-
-                        
-                default:
-udp_mgmt_dflt:
-                        do {
-                                memcpy(&mbox->cmd,
-                                        &fr_udp_pkt->cblock.command,
-                                        sizeof(fr_cmd_t));
-                                if(mbox->cmd.length) {
-                                        memcpy(&mbox->data,
-                                                (char *)fr_udp_pkt->data,
-                                                mbox->cmd.length);
-                                }
-                                
-                                err = sdla_exec(mbox) ? mbox->cmd.result : 
-                                        CMD_TIMEOUT;
-                        } while (err && c_retry-- && fr_event(card, err, mbox));
-
-                        if(!err)
-                                chan->drvstats_gen.
-                                        UDP_PIPE_mgmt_adptr_cmnd_OK ++;
-                        else
-                                chan->drvstats_gen.
-                                        UDP_PIPE_mgmt_adptr_cmnd_timeout ++;
-
-                        /* copy the result back to our buffer */
-                        memcpy(&fr_udp_pkt->cblock.command,
-                                &mbox->cmd, sizeof(fr_cmd_t));
-
-                        if(mbox->cmd.length) {
-                                memcpy(&fr_udp_pkt->data,
-                                        &mbox->data, mbox->cmd.length);
-                        }
-                } 
-        }
-   
-        /* Fill UDP TTL */
-        fr_udp_pkt->ip_pkt.ttl = card->wandev.ttl;
-        len = reply_udp(card->u.f.udp_pkt_data, mbox->cmd.length);
-
-        if(udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-
-                chan->fr_header_len=2;
-                chan->fr_header[0]=Q922_UI;
-                chan->fr_header[1]=NLPID_IP;
-                        
-                err = fr_send_data_header(card, dlci, 0, len, 
-                        card->u.f.udp_pkt_data,chan->fr_header_len);
-                if (err){ 
-                        chan->drvstats_gen.UDP_PIPE_mgmt_adptr_send_passed ++;
-                }else{
-                        chan->drvstats_gen.UDP_PIPE_mgmt_adptr_send_failed ++;
-                }
-                
-        } else {
-                /* Allocate socket buffer */
-                if((new_skb = dev_alloc_skb(len)) != NULL) {
-
-                        /* copy data into new_skb */
-                        buf = skb_put(new_skb, len);
-                        memcpy(buf, card->u.f.udp_pkt_data, len);
-        
-                        chan->drvstats_gen.
-                                UDP_PIPE_mgmt_passed_to_stack ++;
-                        new_skb->dev = dev;
-                        new_skb->protocol = htons(ETH_P_IP);
-                        new_skb->mac.raw = new_skb->data;
-                        netif_rx(new_skb);
-                
-                } else {
-                        chan->drvstats_gen.UDP_PIPE_mgmt_no_socket ++;
-                        printk(KERN_INFO 
-                        "%s: UDP mgmt cmnd, no socket buffers available!\n", 
-                        card->devname);
-                }
-        }
-
-        card->u.f.udp_pkt_lgth = 0;
-
-        return 1;
-}
-
-/*==============================================================================
- * Send Inverse ARP Request
- */
-
-int send_inarp_request(sdla_t *card, struct net_device *dev)
-{
-        int err=0;
-
-        arphdr_1490_t *ArpPacket;
-        arphdr_fr_t *arphdr;
-        fr_channel_t *chan = dev->priv;
-        struct in_device *in_dev;
-
-        in_dev = dev->ip_ptr;
-
-        if(in_dev != NULL ) {   
-
-                ArpPacket = kmalloc(sizeof(arphdr_1490_t) + sizeof(arphdr_fr_t), GFP_ATOMIC);
-                /* SNAP Header indicating ARP */
-                ArpPacket->control      = 0x03;
-                ArpPacket->pad          = 0x00;
-                ArpPacket->NLPID        = 0x80;
-                ArpPacket->OUI[0]       = 0;
-                ArpPacket->OUI[1]       = 0;
-                ArpPacket->OUI[2]       = 0;
-                ArpPacket->PID          = 0x0608;
-
-                arphdr = (arphdr_fr_t *)(ArpPacket + 1); // Go to ARP Packet
-
-                /* InARP request */             
-                arphdr->ar_hrd = 0x0F00;        /* Frame Relay HW type */
-                arphdr->ar_pro = 0x0008;        /* IP Protocol         */
-                arphdr->ar_hln = 2;             /* HW addr length      */
-                arphdr->ar_pln = 4;             /* IP addr length      */
-                arphdr->ar_op = htons(0x08);    /* InARP Request       */
-                arphdr->ar_sha = 0;             /* src HW DLCI - Doesn't matter */
-                if(in_dev->ifa_list != NULL)
-                        arphdr->ar_sip = in_dev->ifa_list->ifa_local;  /* Local Address       */else
-                        arphdr->ar_sip = 0;
-                arphdr->ar_tha = 0;             /* dst HW DLCI - Doesn't matter */
-                arphdr->ar_tip = 0;             /* Remote Address -- what we want */
-
-                err = fr_send(card, chan->dlci, 0, sizeof(arphdr_1490_t) + sizeof(arphdr_fr_t),
-                                        (void *)ArpPacket);
-
-                if (!err){
-                        printk(KERN_INFO "\n%s: Sending InARP request on DLCI %d.\n", 
-                                card->devname, chan->dlci);
-                        clear_bit(ARP_CRIT,&card->wandev.critical);
-                }
-
-                kfree(ArpPacket);
-        }else{
-                printk(KERN_INFO "%s: INARP ERROR: %s doesn't have a local IP address!\n",
-                                card->devname,dev->name);
-                return 1;
-        }
-
-        return 0;
-}
-        
-
-/*==============================================================================
- * Check packet for ARP Type
- */
-
-int is_arp(void *buf)
-{
-        arphdr_1490_t *arphdr = (arphdr_1490_t *)buf;
-        
-        if (arphdr->pad   == 0x00  &&
-            arphdr->NLPID == 0x80  &&
-            arphdr->PID   == 0x0608) 
-                return 1;
-        else return 0;
-}
-
-/*==============================================================================
- * Process ARP Packet Type
- */
-
-int process_ARP(arphdr_1490_t *ArpPacket, sdla_t *card, struct net_device* dev)
-{
-
-
-        arphdr_fr_t *arphdr = (arphdr_fr_t *)(ArpPacket + 1); /* Skip header */
-        fr_rx_buf_ctl_t* frbuf = card->rxmb;
-        struct in_device *in_dev;
-        fr_channel_t *chan = dev->priv;         
-        
-        /* Before we transmit ARP packet, we must check 
-         * to see that we are not currently transmitting a 
-         * frame (in 'if_send()') and that we are not 
-         * already in a 'delayed transmit' state. */
-        if (check_tx_status(card,dev)){
-                if (net_ratelimit()){   
-                        printk(KERN_INFO "%s: Disabling comminication to process ARP\n",
-                                        card->devname);
-                }
-                set_bit(ARP_CRIT,&card->wandev.critical);
-                return 0;
-        }
-
-        in_dev = dev->ip_ptr;
-
-        /* Check that IP addresses exist for our network address */
-        if (in_dev == NULL || in_dev->ifa_list == NULL) 
-                return -1;
-
-        switch (ntohs(arphdr->ar_op)) {
-
-        case 0x08:  // Inverse ARP request  -- Send Reply, add route.
-                        
-                /* Check for valid Address */
-                printk(KERN_INFO "%s: Recvd PtP addr -InArp Req: %u.%u.%u.%u\n", 
-                        card->devname, NIPQUAD(arphdr->ar_sip));
-
-
-                /* Check that the network address is the same as ours, only
-                 * if the netowrk mask is not 255.255.255.255. Otherwise
-                 * this check would not make sense */
-
-                if (in_dev->ifa_list->ifa_mask != 0xFFFFFFFF && 
-                    (in_dev->ifa_list->ifa_mask & arphdr->ar_sip) != 
-                    (in_dev->ifa_list->ifa_mask & in_dev->ifa_list->ifa_local)){
-                        printk(KERN_INFO 
-                                "%s: Invalid PtP address. %u.%u.%u.%u  InARP ignored.\n", 
-                                        card->devname,NIPQUAD(arphdr->ar_sip));
-
-                        printk(KERN_INFO "%s: mask %u.%u.%u.%u\n", 
-                                card->devname, NIPQUAD(in_dev->ifa_list->ifa_mask));
-                                printk(KERN_INFO "%s: local %u.%u.%u.%u\n", 
-                                card->devname,NIPQUAD(in_dev->ifa_list->ifa_local));
-                        return -1;
-                }
-
-                if (in_dev->ifa_list->ifa_local == arphdr->ar_sip){
-                        printk(KERN_INFO 
-                                "%s: Local addr = PtP addr.  InARP ignored.\n", 
-                                        card->devname);
-                        return -1;
-                }
-        
-                arphdr->ar_op = htons(0x09);    /* InARP Reply */
-
-                /* Set addresses */
-                arphdr->ar_tip = arphdr->ar_sip;
-                arphdr->ar_sip = in_dev->ifa_list->ifa_local;
-
-                chan->ip_local = in_dev->ifa_list->ifa_local;
-                chan->ip_remote = arphdr->ar_sip;
-
-                fr_send(card, frbuf->dlci, 0, frbuf->length, (void *)ArpPacket);
-
-                if (test_bit(ARP_CRIT,&card->wandev.critical)){
-                        if (net_ratelimit()){   
-                                printk(KERN_INFO "%s: ARP Processed Enabling Communication!\n",
-                                        card->devname);
-                        }
-                }
-                clear_bit(ARP_CRIT,&card->wandev.critical);
-                
-                chan->ip_local = in_dev->ifa_list->ifa_local;
-                chan->ip_remote = arphdr->ar_sip;
-
-                /* Add Route Flag */
-                /* The route will be added in the polling routine so
-                   that it is not interrupt context. */
-
-                chan->route_flag = ADD_ROUTE;
-                trigger_fr_poll (dev);
-
-                break;
-
-        case 0x09:  // Inverse ARP reply
-
-                /* Check for valid Address */
-                printk(KERN_INFO "%s: Recvd PtP addr %u.%u.%u.%u -InArp Reply\n", 
-                                card->devname, NIPQUAD(arphdr->ar_sip));
-
-
-                /* Compare network addresses, only if network mask
-                 * is not 255.255.255.255  It would not make sense
-                 * to perform this test if the mask was all 1's */
-
-                if (in_dev->ifa_list->ifa_mask != 0xffffffff &&
-                    (in_dev->ifa_list->ifa_mask & arphdr->ar_sip) != 
-                        (in_dev->ifa_list->ifa_mask & in_dev->ifa_list->ifa_local)) {
-
-                        printk(KERN_INFO "%s: Invalid PtP address.  InARP ignored.\n", 
-                                        card->devname);
-                        return -1;
-                }
-
-                /* Make sure that the received IP address is not
-                 * the same as our own local address */
-                if (in_dev->ifa_list->ifa_local == arphdr->ar_sip) {
-                        printk(KERN_INFO "%s: Local addr = PtP addr.  InARP ignored.\n", 
-                                card->devname);
-                        return -1;
-                }                       
-
-                chan->ip_local  = in_dev->ifa_list->ifa_local;
-                chan->ip_remote = arphdr->ar_sip;
-
-                /* Add Route Flag */
-                /* The route will be added in the polling routine so
-                   that it is not interrupt context. */
-
-                chan->route_flag = ADD_ROUTE;
-                chan->inarp = INARP_CONFIGURED;
-                trigger_fr_poll(dev);
-                
-                break;
-        default:
-                break; // ARP's and RARP's -- Shouldn't happen.
-        }
-
-        return 0;       
-}
-
-
-/*============================================================
- * trigger_fr_arp
- *
- * Description:
- *      Add an fr_arp() task into a arp
- *      timer handler for a specific dlci/interface.  
- *      This will kick the fr_arp() routine 
- *      within the specified time interval. 
- *
- * Usage:
- *      This timer is used to send ARP requests at
- *      certain time intervals. 
- *      Called by an interrupt to request an action
- *      at a later date.
- */     
-
-static void trigger_fr_arp(struct net_device *dev)
-{
-        fr_channel_t* chan = dev->priv;
-
-        mod_timer(&chan->fr_arp_timer, jiffies + chan->inarp_interval * HZ);
-        return;
-}
-
-
-
-/*==============================================================================
- * ARP Request Action
- *
- *      This funciton is called by timer interrupt to send an arp request
- *      to the remote end.
- */
-
-static void fr_arp (unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        fr_channel_t *chan = dev->priv;
-        volatile sdla_t *card = chan->card;
-        fr508_flags_t* flags = card->flags;
-
-        /* Send ARP packets for all devs' until
-         * ARP state changes to CONFIGURED */
-
-        if (chan->inarp == INARP_REQUEST &&
-            chan->common.state == WAN_CONNECTED && 
-            card->wandev.state == WAN_CONNECTED){
-                set_bit(0,&chan->inarp_ready);
-                card->u.f.timer_int_enabled |= TMR_INT_ENABLED_ARP;
-                flags->imask |= FR_INTR_TIMER;  
-        }
- 
-        return;
-}
-        
-
-/*==============================================================================
- * Perform the Interrupt Test by running the READ_CODE_VERSION command MAX_INTR_
- * TEST_COUNTER times.
- */
-static int intr_test( sdla_t* card )
-{
-        fr_mbox_t* mb = card->mbox;
-        int err,i;
-
-        err = fr_set_intr_mode(card, FR_INTR_READY, card->wandev.mtu, 0 );
-        
-        if (err == CMD_OK) {
-
-                for ( i = 0; i < MAX_INTR_TEST_COUNTER; i++ ) {
-                        /* Run command READ_CODE_VERSION */
-                        mb->cmd.length  = 0;
-                        mb->cmd.command = FR_READ_CODE_VERSION;
-                        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-                        if (err != CMD_OK) 
-                                fr_event(card, err, mb);
-                }
-        
-        } else {
-                return err;     
-        }
-
-        err = fr_set_intr_mode( card, 0, card->wandev.mtu, 0 );
-
-        if( err != CMD_OK ) 
-                return err;
-
-        return 0;
-}
-
-/*==============================================================================
- * Determine what type of UDP call it is. FPIPE8ND ?
- */
-static int udp_pkt_type( struct sk_buff *skb, sdla_t* card )
-{
-        fr_udp_pkt_t *fr_udp_pkt = (fr_udp_pkt_t *)skb->data;
-
-        /* Quick HACK */
-        
-        
-        if((fr_udp_pkt->ip_pkt.protocol == UDPMGMT_UDP_PROTOCOL) &&
-                (fr_udp_pkt->ip_pkt.ver_inet_hdr_length == 0x45) &&
-                (fr_udp_pkt->udp_pkt.udp_dst_port == 
-                ntohs(card->wandev.udp_port)) &&
-                (fr_udp_pkt->wp_mgmt.request_reply == 
-                UDPMGMT_REQUEST)) {
-                        if(!strncmp(fr_udp_pkt->wp_mgmt.signature,
-                                UDPMGMT_FPIPE_SIGNATURE, 8)){
-                                return UDP_FPIPE_TYPE;
-                        }
-        }
-        return UDP_INVALID_TYPE;
-}
-
-
-/*==============================================================================
- * Initializes the Statistics values in the fr_channel structure.
- */
-void init_chan_statistics( fr_channel_t* chan)
-{
-        memset(&chan->drvstats_if_send.if_send_entry, 0,
-                sizeof(if_send_stat_t));
-        memset(&chan->drvstats_rx_intr.rx_intr_no_socket, 0,
-                sizeof(rx_intr_stat_t));
-        memset(&chan->drvstats_gen.UDP_PIPE_mgmt_kmalloc_err, 0,
-                sizeof(pipe_mgmt_stat_t));
-}
-        
-/*==============================================================================
- * Initializes the Statistics values in the Sdla_t structure.
- */
-void init_global_statistics( sdla_t* card )
-{
-        /* Intialize global statistics for a card */
-        memset(&card->statistics.isr_entry, 0, sizeof(global_stats_t));
-}
-
-static void read_DLCI_IB_mapping( sdla_t* card, fr_channel_t* chan )
-{
-        fr_mbox_t* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;      
-        dlci_IB_mapping_t* result; 
-        int err, counter, found;        
-
-        do {
-                mbox->cmd.command = FR_READ_DLCI_IB_MAPPING;
-                mbox->cmd.length = 0;   
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && fr_event(card, err, mbox));
-
-        if( mbox->cmd.result != 0){
-                printk(KERN_INFO "%s: Read DLCI IB Mapping failed\n", 
-                        chan->name);
-        }
-
-        counter = mbox->cmd.length / sizeof(dlci_IB_mapping_t);
-        result = (void *)mbox->data;
-        
-        found = 0;
-        for (; counter; --counter, ++result) {
-                if ( result->dlci == chan->dlci ) {
-                        chan->IB_addr = result->addr_value;
-                        if(card->hw.type == SDLA_S514){
-                                chan->dlci_int_interface =
-                                        (void*)(card->hw.dpmbase +
-                                        chan->IB_addr);
-                        }else{ 
-                                chan->dlci_int_interface = 
-                                        (void*)(card->hw.dpmbase + 
-                                        (chan->IB_addr & 0x00001FFF));
-
-                        }
-                        found = 1;
-                        break;  
-                } 
-        }
-        if (!found)
-                printk( KERN_INFO "%s: DLCI %d not found by IB MAPPING cmd\n", 
-                card->devname, chan->dlci);
-}
-
-
-
-void s508_s514_lock(sdla_t *card, unsigned long *smp_flags)
-{
-        if (card->hw.type != SDLA_S514){
-
-                spin_lock_irqsave(&card->wandev.lock, *smp_flags);
-        }else{
-                spin_lock(&card->u.f.if_send_lock);
-        }
-        return;
-}
-
-
-void s508_s514_unlock(sdla_t *card, unsigned long *smp_flags)
-{
-        if (card->hw.type != SDLA_S514){
-
-                spin_unlock_irqrestore (&card->wandev.lock, *smp_flags);
-        }else{
-                spin_unlock(&card->u.f.if_send_lock);
-        }
-        return;
-}
-
-
-
-/*----------------------------------------------------------------------
-                  RECEIVE INTERRUPT: BOTTOM HALF HANDLERS 
- ----------------------------------------------------------------------*/
-
-
-/*========================================================
- * bh_enqueue
- *
- * Description:
- *      Insert a received packet into a circular
- *      rx queue.  This packet will be picked up 
- *      by fr_bh() and sent up the stack to the
- *      user.
- *              
- * Usage: 
- *      This function is called by rx interrupt,
- *      in API mode.
- *
- */
-
-static int bh_enqueue(struct net_device *dev, struct sk_buff *skb)
-{
-        /* Check for full */
-        fr_channel_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-
-
-        if (atomic_read(&chan->bh_buff_used) == MAX_BH_BUFF){
-                ++card->wandev.stats.rx_dropped;
-                dev_kfree_skb_any(skb);
-                return 1; 
-        }
-
-        ((bh_data_t *)&chan->bh_head[chan->bh_write])->skb = skb;
-
-        if (chan->bh_write == (MAX_BH_BUFF-1)){
-                chan->bh_write=0;
-        }else{
-                ++chan->bh_write;
-        }
-
-        atomic_inc(&chan->bh_buff_used);
-
-        return 0;
-}
-
-
-/*========================================================
- * trigger_fr_bh
- *
- * Description:
- *      Kick the fr_bh() handler
- *
- * Usage:
- *      rx interrupt calls this function during
- *      the API mode. 
- */
-
-static void trigger_fr_bh (fr_channel_t *chan)
-{
-        if (!test_and_set_bit(0,&chan->tq_working)){
-                wanpipe_queue_work(&chan->common.wanpipe_work);
-        }
-}
-
-
-/*========================================================
- * fr_bh
- *
- * Description:
- *      Frame relay receive BH handler. 
- *      Dequeue data from the BH circular 
- *      buffer and pass it up the API sock.
- *              
- * Rationale: 
- *      This fuction is used to offload the 
- *      rx_interrupt during API operation mode.  
- *      The fr_bh() function executes for each 
- *      dlci/interface.  
- * 
- *      Once receive interrupt copies data from the
- *      card into an skb buffer, the skb buffer
- *      is appended to a circular BH buffer.
- *      Then the interrupt kicks fr_bh() to finish the
- *      job at a later time (not within the interrupt).
- *       
- * Usage:
- *      Interrupts use this to defer a task to 
- *      a polling routine.
- *
- */     
-
-static void fr_bh(struct net_device * dev)
-{
-        fr_channel_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-        struct sk_buff *skb;
-
-        if (atomic_read(&chan->bh_buff_used) == 0){
-                clear_bit(0, &chan->tq_working);
-                return;
-        }
-
-        while (atomic_read(&chan->bh_buff_used)){
-
-                if (chan->common.sk == NULL || chan->common.func == NULL){
-                        clear_bit(0, &chan->tq_working);
-                        return;
-                }
-
-                skb  = ((bh_data_t *)&chan->bh_head[chan->bh_read])->skb;
-
-                if (skb != NULL){
-
-                        if (chan->common.sk == NULL || chan->common.func == NULL){
-                                ++card->wandev.stats.rx_dropped;
-                                ++chan->ifstats.rx_dropped;
-                                dev_kfree_skb_any(skb);
-                                fr_bh_cleanup(dev);
-                                continue;
-                        }
-
-                        if (chan->common.func(skb,dev,chan->common.sk) != 0){
-                                /* Sock full cannot send, queue us for
-                                 * another try */
-                                atomic_set(&chan->common.receive_block,1);
-                                return;
-                        }else{
-                                fr_bh_cleanup(dev);
-                        }
-                }else{
-                        fr_bh_cleanup(dev);
-                }
-        }       
-        clear_bit(0, &chan->tq_working);
-
-        return;
-}
-
-static int fr_bh_cleanup(struct net_device *dev)
-{
-        fr_channel_t* chan = dev->priv;
-
-        ((bh_data_t *)&chan->bh_head[chan->bh_read])->skb = NULL;
-
-        if (chan->bh_read == (MAX_BH_BUFF-1)){
-                chan->bh_read=0;
-        }else{
-                ++chan->bh_read;        
-        }
-
-        atomic_dec(&chan->bh_buff_used);
-        return 0;
-}
-
-
-/*----------------------------------------------------------------------
-               POLL BH HANDLERS AND KICK ROUTINES 
- ----------------------------------------------------------------------*/
-
-/*============================================================
- * trigger_fr_poll
- *
- * Description:
- *      Add a fr_poll() task into a tq_scheduler bh handler
- *      for a specific dlci/interface.  This will kick
- *      the fr_poll() routine at a later time. 
- *
- * Usage:
- *      Interrupts use this to defer a taks to 
- *      a polling routine.
- *
- */     
-static void trigger_fr_poll(struct net_device *dev)
-{
-        fr_channel_t* chan = dev->priv;
-        schedule_work(&chan->fr_poll_work);
-        return;
-}
-
-
-/*============================================================
- * fr_poll
- *      
- * Rationale:
- *      We cannot manipulate the routing tables, or
- *      ip addresses withing the interrupt. Therefore
- *      we must perform such actons outside an interrupt 
- *      at a later time. 
- *
- * Description: 
- *      Frame relay polling routine, responsible for 
- *      shutting down interfaces upon disconnect
- *      and adding/removing routes. 
- *      
- * Usage:        
- *      This function is executed for each frame relay
- *      dlci/interface through a tq_schedule bottom half.
- *      
- *      trigger_fr_poll() function is used to kick
- *      the fr_poll routine.  
- */
-
-static void fr_poll(struct net_device *dev)
-{
-
-        fr_channel_t* chan;
-        sdla_t *card;
-        u8 check_gateway=0;
-
-        if (!dev || (chan = dev->priv) == NULL)
-                return;
-
-        card = chan->card;
-        
-        /* (Re)Configuraiton is in progress, stop what you are 
-         * doing and get out */
-        if (test_bit(PERI_CRIT,&card->wandev.critical)){
-                return;
-        }
-
-        switch (chan->common.state){
-
-        case WAN_DISCONNECTED:
-
-                if (test_bit(DYN_OPT_ON,&chan->interface_down) &&
-                    !test_bit(DEV_DOWN, &chan->interface_down) &&
-                    dev->flags&IFF_UP){
-
-                        printk(KERN_INFO "%s: Interface %s is Down.\n", 
-                                card->devname,dev->name);
-                        change_dev_flags(dev,dev->flags&~IFF_UP);
-                        set_bit(DEV_DOWN, &chan->interface_down);
-                        chan->route_flag = NO_ROUTE;
-                        
-                }else{
-                        if (chan->inarp != INARP_NONE)
-                                process_route(dev);     
-                }
-                break;
-
-        case WAN_CONNECTED:
-
-                if (test_bit(DYN_OPT_ON,&chan->interface_down) &&
-                    test_bit(DEV_DOWN, &chan->interface_down) &&
-                    !(dev->flags&IFF_UP)){
-
-                        printk(KERN_INFO "%s: Interface %s is Up.\n", 
-                                        card->devname,dev->name);
-
-                        change_dev_flags(dev,dev->flags|IFF_UP);
-                        clear_bit(DEV_DOWN, &chan->interface_down);
-                        check_gateway=1;
-                }
-
-                if (chan->inarp != INARP_NONE){
-                        process_route(dev);
-                        check_gateway=1;
-                }
-
-                if (chan->gateway && check_gateway)
-                        add_gateway(card,dev);
-
-                break;
-
-        }
-
-        return; 
-}
-
-/*==============================================================
- * check_tx_status
- *
- * Rationale:
- *      We cannot transmit from an interrupt while
- *      the if_send is transmitting data.  Therefore,
- *      we must check whether the tx buffers are
- *      begin used, before we transmit from an
- *      interrupt.      
- * 
- * Description: 
- *      Checks whether it's safe to use the transmit 
- *      buffers. 
- *
- * Usage:
- *      ARP and UDP handling routines use this function
- *      because, they need to transmit data during
- *      an interrupt.
- */
-
-static int check_tx_status(sdla_t *card, struct net_device *dev)
-{
-
-        if (card->hw.type == SDLA_S514){
-                if (test_bit(SEND_CRIT, (void*)&card->wandev.critical) ||
-                        test_bit(SEND_TXIRQ_CRIT, (void*)&card->wandev.critical)) {
-                        return 1;
-                }
-        }
-
-        if (netif_queue_stopped(dev) || (card->u.f.tx_interrupts_pending))
-                return 1; 
-
-        return 0;
-}
-
-/*===============================================================
- * move_dev_to_next
- *  
- * Description:
- *      Move the dev pointer to the next location in the
- *      link list.  Check if we are at the end of the 
- *      list, if so start from the begining.
- *
- * Usage:
- *      Timer interrupt uses this function to efficiently
- *      step through the devices that need to send ARP data.
- *
- */
-
-struct net_device *move_dev_to_next(sdla_t *card, struct net_device *dev)
-{
-        if (card->wandev.new_if_cnt != 1){
-                if (!*((struct net_device **)dev->priv))
-                        return card->wandev.dev;
-                else
-                        return *((struct net_device **)dev->priv);
-        }
-        return dev;
-}
-
-/*==============================================================
- * trigger_config_fr
- *
- * Rationale:
- *      All commands must be performed inside of a  
- *      interrupt.   
- *
- * Description:
- *      Kick the config_fr() routine throught the
- *      timer interrupt.
- */
-
-
-static void trigger_config_fr (sdla_t *card)
-{
-        fr508_flags_t* flags = card->flags;
-
-        card->u.f.timer_int_enabled |= TMR_INT_ENABLED_CONFIG;
-        flags->imask |= FR_INTR_TIMER;
-}
-
-
-/*==============================================================
- * config_fr
- *
- * Rationale:
- *      All commands must be performed inside of a  
- *      interrupt.  
- &
- * Description: 
- *      Configure a DLCI. This function is executed
- *      by a timer_interrupt.  The if_open() function
- *      triggers it.
- *
- * Usage:
- *      new_if() collects all data necessary to
- *      configure the DLCI. It sets the chan->dlci_ready 
- *      bit.  When the if_open() function is executed
- *      it checks this bit, and if its set it triggers
- *      the timer interrupt to execute the config_fr()
- *      function.
- */
-
-static void config_fr (sdla_t *card)
-{
-        struct net_device *dev;
-        fr_channel_t *chan;
-
-        for (dev = card->wandev.dev; dev;
-             dev = *((struct net_device **)dev->priv)) {
-        
-                if ((chan=dev->priv) == NULL)
-                        continue;
-                
-                if (!test_bit(0,&chan->config_dlci))
-                        continue;
-
-                clear_bit(0,&chan->config_dlci);
-
-                /* If signalling is set to NO, then setup 
-                 * DLCI addresses right away.  Don't have to wait for
-                 * link to connect. 
-                 */
-                if (card->wandev.signalling == WANOPT_NO){
-                        printk(KERN_INFO "%s: Signalling set to NO: Mapping DLCI's\n",
-                                        card->wandev.name);
-                        if (fr_init_dlci(card,chan)){
-                                printk(KERN_INFO "%s: ERROR: Failed to configure DLCI %i !\n",
-                                        card->devname, chan->dlci);
-                                return;
-                        }
-                }
-
-                if (card->wandev.station == WANOPT_CPE) {
-        
-                        update_chan_state(dev); 
-                        
-                        /* CPE: issue full status enquiry */
-                        fr_issue_isf(card, FR_ISF_FSE);
-
-                } else {        
-                        /* FR switch: activate DLCI(s) */
-        
-                        /* For Switch emulation we have to ADD and ACTIVATE
-                         * the DLCI(s) that were configured with the SET_DLCI_
-                         * CONFIGURATION command. Add and Activate will fail if
-                         * DLCI specified is not included in the list.
-                         *
-                         * Also If_open is called once for each interface. But
-                         * it does not get in here for all the interface. So
-                         * we have to pass the entire list of DLCI(s) to add 
-                         * activate routines.  
-                         */ 
-                        
-                        if (!check_dlci_config (card, chan)){
-                                fr_add_dlci(card, chan->dlci);
-                                fr_activate_dlci(card, chan->dlci);
-                        }
-                }
-
-                card->u.f.dlci_to_dev_map[chan->dlci] = dev;
-        }
-        return;
-}
-
-
-/*==============================================================
- * config_fr
- *
- * Rationale:
- *      All commands must be executed during an interrupt.
- * 
- * Description: 
- *      Trigger uncofig_fr() function through 
- *      the timer interrupt.
- *
- */
-
-static void trigger_unconfig_fr(struct net_device *dev)
-{
-        fr_channel_t *chan = dev->priv;
-        volatile sdla_t *card = chan->card;
-        unsigned long timeout;
-        fr508_flags_t* flags = card->flags;
-        int reset_critical=0;
-        
-        if (test_bit(PERI_CRIT,(void*)&card->wandev.critical)){
-                clear_bit(PERI_CRIT,(void*)&card->wandev.critical);
-                reset_critical=1;
-        }
-                
-        /* run unconfig_dlci() function 
-         * throught the timer interrupt */
-        set_bit(0,(void*)&chan->unconfig_dlci);
-        card->u.f.timer_int_enabled |= TMR_INT_ENABLED_UNCONFIG;
-        flags->imask |= FR_INTR_TIMER;
-
-        /* Wait for the command to complete */
-        timeout = jiffies;
-        for(;;) {
-
-                if(!(card->u.f.timer_int_enabled & TMR_INT_ENABLED_UNCONFIG))
-                        break;
-
-                if (time_after(jiffies, timeout + 1 * HZ)){
-                        card->u.f.timer_int_enabled &= ~TMR_INT_ENABLED_UNCONFIG;
-                        printk(KERN_INFO "%s: Failed to delete DLCI %i\n",
-                                card->devname,chan->dlci);
-                        break;
-                }
-        }
-
-        if (reset_critical){
-                set_bit(PERI_CRIT,(void*)&card->wandev.critical);
-        }
-}
-
-/*==============================================================
- * unconfig_fr
- *
- * Rationale:
- *      All commands must be executed during an interrupt.
- * 
- * Description: 
- *      Remove the dlci from firmware.
- *      This funciton is used in NODE shutdown.
- */
-
-static void unconfig_fr (sdla_t *card)
-{
-        struct net_device *dev;
-        fr_channel_t *chan;
-
-        for (dev = card->wandev.dev; dev;
-             dev = *((struct net_device **)dev->priv)){
-        
-                if ((chan=dev->priv) == NULL)
-                        continue;
-                
-                if (!test_bit(0,&chan->unconfig_dlci))
-                        continue;
-
-                clear_bit(0,&chan->unconfig_dlci);
-
-                if (card->wandev.station == WANOPT_NODE){
-                        printk(KERN_INFO "%s: Unconfiguring DLCI %i\n",
-                                        card->devname,chan->dlci);
-                        fr_delete_dlci(card,chan->dlci);
-                }
-                card->u.f.dlci_to_dev_map[chan->dlci] = NULL;
-        }
-}
-
-static int setup_fr_header(struct sk_buff *skb, struct net_device* dev,
-                           char op_mode)
-{
-        fr_channel_t *chan=dev->priv;
-
-        if (op_mode == WANPIPE) {
-                chan->fr_header[0]=Q922_UI;
-                
-                switch (htons(skb->protocol)){
-                case ETH_P_IP:
-                        chan->fr_header[1]=NLPID_IP;
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                        
-                return 2;
-        }
-
-        /* If we are in bridging mode, we must apply
-         * an Ethernet header
-         */
-        if (op_mode == BRIDGE || op_mode == BRIDGE_NODE) {
-                /* Encapsulate the packet as a bridged Ethernet frame. */
-#ifdef DEBUG
-                printk(KERN_INFO "%s: encapsulating skb for frame relay\n", 
-                        dev->name);
-#endif
-                chan->fr_header[0] = 0x03;
-                chan->fr_header[1] = 0x00;
-                chan->fr_header[2] = 0x80;
-                chan->fr_header[3] = 0x00;
-                chan->fr_header[4] = 0x80;
-                chan->fr_header[5] = 0xC2;
-                chan->fr_header[6] = 0x00;
-                chan->fr_header[7] = 0x07;
-
-                /* Yuck. */
-                skb->protocol = ETH_P_802_3;
-                return 8;
-        }
-                
-        return 0;
-}
-
-
-static int check_dlci_config (sdla_t *card, fr_channel_t *chan)
-{
-        fr_mbox_t* mbox = card->mbox;
-        int err=0;
-        fr_conf_t *conf=NULL;
-        unsigned short dlci_num = chan->dlci;
-        int dlci_offset=0;
-        struct net_device *dev = NULL;
-        
-        mbox->cmd.command = FR_READ_CONFIG;
-        mbox->cmd.length = 0;
-        mbox->cmd.dlci = dlci_num;      
-
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        
-        if (err == CMD_OK){
-                return 0;
-        }
-
-        for (dev = card->wandev.dev; dev;
-             dev=*((struct net_device **)dev->priv))
-                set_chan_state(dev,WAN_DISCONNECTED);
-        
-        printk(KERN_INFO "DLCI %i Not configured, configuring\n",dlci_num);
-        
-        mbox->cmd.command = FR_COMM_DISABLE;
-        mbox->cmd.length = 0;
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        if (err != CMD_OK){
-                fr_event(card, err, mbox);
-                return 2;
-        }
-
-        printk(KERN_INFO "Disabled Communications \n");
-        
-        mbox->cmd.command = FR_READ_CONFIG;
-        mbox->cmd.length = 0;
-        mbox->cmd.dlci = 0;     
-
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        
-        if (err != CMD_OK){
-                fr_event(card, err, mbox);
-                return 2;
-        }
-        
-        conf = (fr_conf_t *)mbox->data;
-
-        dlci_offset=0;
-        for (dev = card->wandev.dev; dev;
-             dev = *((struct net_device **)dev->priv)) {
-                fr_channel_t *chan_tmp = dev->priv;
-                conf->dlci[dlci_offset] = chan_tmp->dlci;               
-                dlci_offset++;
-        }
-        
-        printk(KERN_INFO "Got Fr configuration Buffer Length is %x Dlci %i Dlci Off %i\n",
-                mbox->cmd.length,
-                mbox->cmd.length > 0x20 ? conf->dlci[0] : -1, 
-                dlci_offset );
-        
-        mbox->cmd.length = 0x20 + dlci_offset*2;
-
-        mbox->cmd.command = FR_SET_CONFIG;
-        mbox->cmd.dlci = 0; 
-
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-
-        if (err != CMD_OK){
-                fr_event(card, err, mbox);
-                return 2;
-        }
-
-        initialize_rx_tx_buffers (card);
-
-        
-        printk(KERN_INFO "Configuraiton Succeded for new DLCI %i\n",dlci_num);
-
-        if (fr_comm_enable (card)){
-                return 2;
-        }
-
-        printk(KERN_INFO "Enabling Communications \n");
-
-        for (dev = card->wandev.dev; dev;
-             dev = *((struct net_device **)dev->priv)) {
-                fr_channel_t *chan_tmp = dev->priv;
-                fr_init_dlci(card,chan_tmp);
-                fr_add_dlci(card, chan_tmp->dlci);
-                fr_activate_dlci(card, chan_tmp->dlci);
-        }
-
-        printk(KERN_INFO "END OF CONFIGURAITON %i\n",dlci_num);
-        
-        return 1;
-}
-
-static void initialize_rx_tx_buffers (sdla_t *card)
-{
-        fr_buf_info_t* buf_info;
-        
-        if (card->hw.type == SDLA_S514) {
-        
-                buf_info = (void*)(card->hw.dpmbase + FR_MB_VECTOR +
-                        FR508_RXBC_OFFS);
-
-                card->rxmb = (void*)(buf_info->rse_next + card->hw.dpmbase);
-
-                card->u.f.rxmb_base =
-                        (void*)(buf_info->rse_base + card->hw.dpmbase); 
-
-                card->u.f.rxmb_last =
-                        (void*)(buf_info->rse_base +
-                        (buf_info->rse_num - 1) * sizeof(fr_rx_buf_ctl_t) +
-                        card->hw.dpmbase);
-        }else{  
-                buf_info = (void*)(card->hw.dpmbase + FR508_RXBC_OFFS);
-
-                card->rxmb = (void*)(buf_info->rse_next -
-                        FR_MB_VECTOR + card->hw.dpmbase);
-                
-                card->u.f.rxmb_base =
-                        (void*)(buf_info->rse_base -
-                        FR_MB_VECTOR + card->hw.dpmbase);
-                
-                card->u.f.rxmb_last =
-                        (void*)(buf_info->rse_base +
-                        (buf_info->rse_num - 1) * sizeof(fr_rx_buf_ctl_t) -
-                        FR_MB_VECTOR + card->hw.dpmbase);
-        }
-
-        card->u.f.rx_base = buf_info->buf_base;
-        card->u.f.rx_top  = buf_info->buf_top;
-
-        card->u.f.tx_interrupts_pending = 0;
-
-        return;
-}
-
-        
-
-MODULE_LICENSE("GPL");
-
-/****** End *****************************************************************/
diff --git a/drivers/net/wan/sdla_ft1.c b/drivers/net/wan/sdla_ft1.c
deleted file mode 100644
index 9d6528a50f7b..000000000000
--- a/drivers/net/wan/sdla_ft1.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*****************************************************************************
-* sdla_chdlc.c  WANPIPE(tm) Multiprotocol WAN Link Driver. Cisco HDLC module.
-*
-* Authors:      Nenad Corbic <ncorbic@sangoma.com>
-*               Gideon Hack  
-*
-* Copyright:    (c) 1995-1999 Sangoma Technologies 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.
-* ============================================================================
-* Sep 30, 1999  Nenad Corbic    Fixed dynamic IP and route setup.
-* Sep 23, 1999  Nenad Corbic    Added SMP support, fixed tracing 
-* Sep 13, 1999  Nenad Corbic    Split up Port 0 and 1 into separate devices.
-* Jun 02, 1999  Gideon Hack     Added support for the S514 adapter.
-* Oct 30, 1998  Jaspreet Singh  Added Support for CHDLC API (HDLC STREAMING).
-* Oct 28, 1998  Jaspreet Singh  Added Support for Dual Port CHDLC.
-* Aug 07, 1998  David Fong      Initial version.
-*****************************************************************************/
-
-#include <linux/module.h>
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/slab.h>         /* kmalloc(), kfree() */
-#include <linux/wanrouter.h>    /* WAN router definitions */
-#include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
-#include <linux/if_arp.h>       /* ARPHRD_* defines */
-#include <linux/jiffies.h>      /* time_after() macro */
-
-#include <linux/inetdevice.h>
-#include <asm/uaccess.h>
-
-#include <linux/in.h>           /* sockaddr_in */
-#include <linux/inet.h> 
-#include <linux/if.h>
-#include <asm/byteorder.h>      /* htons(), etc. */
-#include <linux/sdlapci.h>
-#include <asm/io.h>
-
-#include <linux/sdla_chdlc.h>           /* CHDLC firmware API definitions */
-
-/****** Defines & Macros ****************************************************/
-
-/* reasons for enabling the timer interrupt on the adapter */
-#define TMR_INT_ENABLED_UDP     0x0001
-#define TMR_INT_ENABLED_UPDATE  0x0002
- 
-#define CHDLC_DFLT_DATA_LEN     1500            /* default MTU */
-#define CHDLC_HDR_LEN           1
-
-#define IFF_POINTTOPOINT 0x10
-
-#define WANPIPE 0x00
-#define API     0x01
-#define CHDLC_API 0x01
-
-#define PORT(x)   (x == 0 ? "PRIMARY" : "SECONDARY" )
-
- 
-/******Data Structures*****************************************************/
-
-/* This structure is placed in the private data area of the device structure.
- * The card structure used to occupy the private area but now the following 
- * structure will incorporate the card structure along with CHDLC specific data
- */
-
-typedef struct chdlc_private_area
-{
-        struct net_device *slave;
-        sdla_t          *card;
-        int             TracingEnabled;         /* For enabling Tracing */
-        unsigned long   curr_trace_addr;        /* Used for Tracing */
-        unsigned long   start_trace_addr;
-        unsigned long   end_trace_addr;
-        unsigned long   base_addr_trace_buffer;
-        unsigned long   end_addr_trace_buffer;
-        unsigned short  number_trace_elements;
-        unsigned        available_buffer_space;
-        unsigned long   router_start_time;
-        unsigned char   route_status;
-        unsigned char   route_removed;
-        unsigned long   tick_counter;           /* For 5s timeout counter */
-        unsigned long   router_up_time;
-        u32             IP_address;             /* IP addressing */
-        u32             IP_netmask;
-        unsigned char  mc;                      /* Mulitcast support on/off */
-        unsigned short udp_pkt_lgth;            /* udp packet processing */
-        char udp_pkt_src;
-        char udp_pkt_data[MAX_LGTH_UDP_MGNT_PKT];
-        unsigned short timer_int_enabled;
-        char update_comms_stats;                /* updating comms stats */
-        //FIXME: add driver stats as per frame relay!
-
-} chdlc_private_area_t;
-
-/* Route Status options */
-#define NO_ROUTE        0x00
-#define ADD_ROUTE       0x01
-#define ROUTE_ADDED     0x02
-#define REMOVE_ROUTE    0x03
-
-
-/****** Function Prototypes *************************************************/
-/* WAN link driver entry points. These are called by the WAN router module. */
-static int wpft1_exec (struct sdla *card, void *u_cmd, void *u_data);
-static int chdlc_read_version (sdla_t* card, char* str);
-static int chdlc_error (sdla_t *card, int err, CHDLC_MAILBOX_STRUCT *mb);
-
-/****** Public Functions ****************************************************/
-
-/*============================================================================
- * Cisco HDLC protocol initialization routine.
- *
- * This routine is called by the main WANPIPE module during setup.  At this
- * point adapter is completely initialized and firmware is running.
- *  o read firmware version (to make sure it's alive)
- *  o configure adapter
- *  o initialize protocol-specific fields of the adapter data space.
- *
- * Return:      0       o.k.
- *              < 0     failure.
- */
-int wpft1_init (sdla_t* card, wandev_conf_t* conf)
-{
-        unsigned char port_num;
-        int err;
-
-        union
-                {
-                char str[80];
-                } u;
-        volatile CHDLC_MAILBOX_STRUCT* mb;
-        CHDLC_MAILBOX_STRUCT* mb1;
-        unsigned long timeout;
-
-        /* Verify configuration ID */
-        if (conf->config_id != WANCONFIG_CHDLC) {
-                printk(KERN_INFO "%s: invalid configuration ID %u!\n",
-                                  card->devname, conf->config_id);
-                return -EINVAL;
-        }
-
-        /* Use primary port */
-        card->u.c.comm_port = 0;
-        
-
-        /* Initialize protocol-specific fields */
-        if(card->hw.type != SDLA_S514){
-                card->mbox  = (void *) card->hw.dpmbase;
-        }else{ 
-                card->mbox = (void *) card->hw.dpmbase + PRI_BASE_ADDR_MB_STRUCT;
-        }
-
-        mb = mb1 = card->mbox;
-
-        if (!card->configured){
-
-                /* The board will place an 'I' in the return code to indicate that it is
-                ready to accept commands.  We expect this to be completed in less
-                than 1 second. */
-
-                timeout = jiffies;
-                while (mb->return_code != 'I')  /* Wait 1s for board to initialize */
-                        if (time_after(jiffies, timeout + 1*HZ)) break;
-
-                if (mb->return_code != 'I') {
-                        printk(KERN_INFO
-                                "%s: Initialization not completed by adapter\n",
-                                card->devname);
-                        printk(KERN_INFO "Please contact Sangoma representative.\n");
-                        return -EIO;
-                }
-        }
-
-        /* Read firmware version.  Note that when adapter initializes, it
-         * clears the mailbox, so it may appear that the first command was
-         * executed successfully when in fact it was merely erased. To work
-         * around this, we execute the first command twice.
-         */
-
-        if (chdlc_read_version(card, u.str))
-                return -EIO;
-
-        printk(KERN_INFO "%s: Running FT1 Configuration firmware v%s\n",
-                card->devname, u.str); 
-
-        card->isr                       = NULL;
-        card->poll                      = NULL;
-        card->exec                      = &wpft1_exec;
-        card->wandev.update             = NULL;
-        card->wandev.new_if             = NULL;
-        card->wandev.del_if             = NULL;
-        card->wandev.state              = WAN_DUALPORT;
-        card->wandev.udp_port           = conf->udp_port;
-
-        card->wandev.new_if_cnt = 0;
-
-        /* This is for the ports link state */
-        card->u.c.state = WAN_DISCONNECTED;
-        
-        /* reset the number of times the 'update()' proc has been called */
-        card->u.c.update_call_count = 0;
-        
-        card->wandev.ttl = 0x7F;
-        card->wandev.interface = 0; 
-
-        card->wandev.clocking = 0;
-
-        port_num = card->u.c.comm_port;
-
-        /* Setup Port Bps */
-
-        card->wandev.bps = 0;
-
-        card->wandev.mtu = MIN_LGTH_CHDLC_DATA_CFG;
-
-        /* Set up the interrupt status area */
-        /* Read the CHDLC Configuration and obtain: 
-         *      Ptr to shared memory infor struct
-         * Use this pointer to calculate the value of card->u.c.flags !
-         */
-        mb1->buffer_length = 0;
-        mb1->command = READ_CHDLC_CONFIGURATION;
-        err = sdla_exec(mb1) ? mb1->return_code : CMD_TIMEOUT;
-        if(err != COMMAND_OK) {
-                chdlc_error(card, err, mb1);
-                return -EIO;
-        }
-
-        if(card->hw.type == SDLA_S514){
-                card->u.c.flags = (void *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb1->data)->
-                        ptr_shared_mem_info_struct));
-        }else{
-                card->u.c.flags = (void *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb1->data)->
-                        ptr_shared_mem_info_struct % SDLA_WINDOWSIZE));
-        }
-
-        card->wandev.state = WAN_FT1_READY;
-        printk(KERN_INFO "%s: FT1 Config Ready !\n",card->devname);
-
-        return 0;
-}
-
-static int wpft1_exec(sdla_t *card, void *u_cmd, void *u_data)
-{
-        CHDLC_MAILBOX_STRUCT* mbox = card->mbox;
-        int len;
-
-        if (copy_from_user((void*)&mbox->command, u_cmd, sizeof(ft1_exec_cmd_t))){
-                return -EFAULT;
-        }
-
-        len = mbox->buffer_length;
-
-        if (len) {
-                if( copy_from_user((void*)&mbox->data, u_data, len)){
-                        return -EFAULT;
-                }
-        }
-
-        /* execute command */
-        if (!sdla_exec(mbox)){
-                return -EIO;
-        }
-
-        /* return result */
-        if( copy_to_user(u_cmd, (void*)&mbox->command, sizeof(ft1_exec_cmd_t))){
-                return -EFAULT;
-        }
-
-        len = mbox->buffer_length;
-
-        if (len && u_data && copy_to_user(u_data, (void*)&mbox->data, len)){
-                return -EFAULT;
-        }
-
-        return 0;
-
-}
-
-/*============================================================================
- * Read firmware code version.
- *      Put code version as ASCII string in str. 
- */
-static int chdlc_read_version (sdla_t* card, char* str)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        int len;
-        char err;
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_CODE_VERSION;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-        if(err != COMMAND_OK) {
-                chdlc_error(card,err,mb);
-        }
-        else if (str) {  /* is not null */
-                len = mb->buffer_length;
-                memcpy(str, mb->data, len);
-                str[len] = '\0';
-        }
-        return (err);
-}
-
-/*============================================================================
- * Firmware error handler.
- *      This routine is called whenever firmware command returns non-zero
- *      return code.
- *
- * Return zero if previous command has to be cancelled.
- */
-static int chdlc_error (sdla_t *card, int err, CHDLC_MAILBOX_STRUCT *mb)
-{
-        unsigned cmd = mb->command;
-
-        switch (err) {
-
-        case CMD_TIMEOUT:
-                printk(KERN_ERR "%s: command 0x%02X timed out!\n",
-                        card->devname, cmd);
-                break;
-
-        case S514_BOTH_PORTS_SAME_CLK_MODE:
-                if(cmd == SET_CHDLC_CONFIGURATION) {
-                        printk(KERN_INFO
-                         "%s: Configure both ports for the same clock source\n",
-                                card->devname);
-                        break;
-                }
-
-        default:
-                printk(KERN_INFO "%s: command 0x%02X returned 0x%02X!\n",
-                        card->devname, cmd, err);
-        }
-
-        return 0;
-}
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/wan/sdla_ppp.c b/drivers/net/wan/sdla_ppp.c
deleted file mode 100644
index a4b489cccbbf..000000000000
--- a/drivers/net/wan/sdla_ppp.c
+++ /dev/null
@@ -1,3430 +0,0 @@
-/*****************************************************************************
-* sdla_ppp.c    WANPIPE(tm) Multiprotocol WAN Link Driver. PPP module.
-*
-* Author:       Nenad Corbic <ncorbic@sangoma.com>
-*
-* Copyright:    (c) 1995-2001 Sangoma Technologies 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.
-* ============================================================================
-* Feb 28, 2001  Nenad Corbic    o Updated if_tx_timeout() routine for 
-*                                 2.4.X kernels.
-* Nov 29, 2000  Nenad Corbic    o Added the 2.4.x kernel support:
-*                                 get_ip_address() function has moved
-*                                 into the ppp_poll() routine. It cannot
-*                                 be called from an interrupt.
-* Nov 07, 2000  Nenad Corbic    o Added security features for UDP debugging:
-*                                 Deny all and specify allowed requests.
-* May 02, 2000  Nenad Corbic    o Added the dynamic interface shutdown
-*                                 option. When the link goes down, the
-*                                 network interface IFF_UP flag is reset.
-* Mar 06, 2000  Nenad Corbic    o Bug Fix: corrupted mbox recovery.
-* Feb 25, 2000  Nenad Corbic    o Fixed the FT1 UDP debugger problem.
-* Feb 09, 2000  Nenad Coribc    o Shutdown bug fix. update() was called
-*                                 with NULL dev pointer: no check.
-* Jan 24, 2000  Nenad Corbic    o Disabled use of CMD complete inter.
-* Dev 15, 1999  Nenad Corbic    o Fixed up header files for 2.0.X kernels
-* Oct 25, 1999  Nenad Corbic    o Support for 2.0.X kernels
-*                                 Moved dynamic route processing into 
-*                                 a polling routine.
-* Oct 07, 1999  Nenad Corbic    o Support for S514 PCI card.  
-*               Gideon Hack     o UPD and Updates executed using timer interrupt
-* Sep 10, 1999  Nenad Corbic    o Fixed up the /proc statistics
-* Jul 20, 1999  Nenad Corbic    o Remove the polling routines and use 
-*                                 interrupts instead.
-* Sep 17, 1998  Jaspreet Singh  o Updates for 2.2.X Kernels.
-* Aug 13, 1998  Jaspreet Singh  o Improved Line Tracing.
-* Jun 22, 1998  David Fong      o Added remote IP address assignment
-* Mar 15, 1998  Alan Cox        o 2.1.8x basic port.
-* Apr 16, 1998  Jaspreet Singh  o using htons() for the IPX protocol.
-* Dec 09, 1997  Jaspreet Singh  o Added PAP and CHAP.
-*                               o Implemented new routines like 
-*                                 ppp_set_inbnd_auth(), ppp_set_outbnd_auth(),
-*                                 tokenize() and strstrip().
-* Nov 27, 1997  Jaspreet Singh  o Added protection against enabling of irqs 
-*                                 while they have been disabled.
-* Nov 24, 1997  Jaspreet Singh  o Fixed another RACE condition caused by
-*                                 disabling and enabling of irqs.
-*                               o Added new counters for stats on disable/enable
-*                                 IRQs.
-* Nov 10, 1997  Jaspreet Singh  o Initialized 'skb->mac.raw' to 'skb->data'
-*                                 before every netif_rx().
-*                               o Free up the device structure in del_if().
-* Nov 07, 1997  Jaspreet Singh  o Changed the delay to zero for Line tracing
-*                                 command.
-* Oct 20, 1997  Jaspreet Singh  o Added hooks in for Router UP time.
-* Oct 16, 1997  Jaspreet Singh  o The critical flag is used to maintain flow
-*                                 control by avoiding RACE conditions.  The 
-*                                 cli() and restore_flags() are taken out.
-*                                 A new structure, "ppp_private_area", is added 
-*                                 to provide Driver Statistics.   
-* Jul 21, 1997  Jaspreet Singh  o Protected calls to sdla_peek() by adding 
-*                                 save_flags(), cli() and restore_flags().
-* Jul 07, 1997  Jaspreet Singh  o Added configurable TTL for UDP packets
-*                               o Added ability to discard mulitcast and
-*                                 broacast source addressed packets.
-* Jun 27, 1997  Jaspreet Singh  o Added FT1 monitor capabilities
-*                                 New case (0x25) statement in if_send routine.
-*                                 Added a global variable rCount to keep track
-*                                 of FT1 status enabled on the board.
-* May 22, 1997  Jaspreet Singh  o Added change in the PPP_SET_CONFIG command for
-*                               508 card to reflect changes in the new 
-*                               ppp508.sfm for supporting:continous transmission
-*                               of Configure-Request packets without receiving a
-*                               reply                           
-*                               OR-ed 0x300 to conf_flags 
-*                               o Changed connect_tmout from 900 to 0
-* May 21, 1997  Jaspreet Singh  o Fixed UDP Management for multiple boards
-* Apr 25, 1997  Farhan Thawar    o added UDP Management stuff
-* Mar 11, 1997  Farhan Thawar   Version 3.1.1
-*                                o fixed (+1) bug in rx_intr()
-*                                o changed if_send() to return 0 if
-*                                  wandev.critical() is true
-*                                o free socket buffer in if_send() if
-*                                  returning 0 
-* Jan 15, 1997  Gene Kozin      Version 3.1.0
-*                                o implemented exec() entry point
-* Jan 06, 1997  Gene Kozin      Initial version.
-*****************************************************************************/
-
-#include <linux/module.h>
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/slab.h> /* kmalloc(), kfree() */
-#include <linux/wanrouter.h>    /* WAN router definitions */
-#include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
-#include <linux/if_arp.h>       /* ARPHRD_* defines */
-#include <asm/byteorder.h>      /* htons(), etc. */
-#include <linux/in.h>           /* sockaddr_in */
-#include <linux/jiffies.h>      /* time_after() macro */
-
-
-#include <asm/uaccess.h>
-#include <linux/inetdevice.h>
-#include <linux/netdevice.h>
-
-#include <linux/if.h>
-#include <linux/sdla_ppp.h>             /* PPP firmware API definitions */
-#include <linux/sdlasfm.h>              /* S514 Type Definition */
-/****** Defines & Macros ****************************************************/
-
-#define PPP_DFLT_MTU    1500            /* default MTU */
-#define PPP_MAX_MTU     4000            /* maximum MTU */
-#define PPP_HDR_LEN     1
-
-#define MAX_IP_ERRORS 100 
-
-#define CONNECT_TIMEOUT (90*HZ)         /* link connection timeout */
-#define HOLD_DOWN_TIME  (5*HZ)          /* link hold down time : Changed from 30 to 5 */
-
-/* For handle_IPXWAN() */
-#define CVHexToAscii(b) (((unsigned char)(b) > (unsigned char)9) ? ((unsigned char)'A' + ((unsigned char)(b) - (unsigned char)10)) : ((unsigned char)'0' + (unsigned char)(b)))
-
-/* Macro for enabling/disabling debugging comments */
-//#define NEX_DEBUG
-#ifdef NEX_DEBUG
-#define NEX_PRINTK(format, a...) printk(format, ## a)
-#else
-#define NEX_PRINTK(format, a...)
-#endif /* NEX_DEBUG */ 
-
-#define DCD(a)   ( a & 0x08 ? "HIGH" : "LOW" )
-#define CTS(a)   ( a & 0x20 ? "HIGH" : "LOW" )
-#define LCP(a)   ( a == 0x09 ? "OPEN" : "CLOSED" )
-#define IP(a)    ( a == 0x09 ? "ENABLED" : "DISABLED" )
-
-#define TMR_INT_ENABLED_UPDATE          0x01
-#define TMR_INT_ENABLED_PPP_EVENT       0x02
-#define TMR_INT_ENABLED_UDP             0x04
-#define TMR_INT_ENABLED_CONFIG          0x20
-
-/* Set Configuraton Command Definitions */
-#define PERCENT_TX_BUFF                 60
-#define TIME_BETWEEN_CONF_REQ           30
-#define TIME_BETWEEN_PAP_CHAP_REQ       30
-#define WAIT_PAP_CHAP_WITHOUT_REPLY     300
-#define WAIT_AFTER_DCD_CTS_LOW          5
-#define TIME_DCD_CTS_LOW_AFTER_LNK_DOWN 10
-#define WAIT_DCD_HIGH_AFTER_ENABLE_COMM 900
-#define MAX_CONF_REQ_WITHOUT_REPLY      10
-#define MAX_TERM_REQ_WITHOUT_REPLY      2
-#define NUM_CONF_NAK_WITHOUT_REPLY      5
-#define NUM_AUTH_REQ_WITHOUT_REPLY      10
-
-#define END_OFFSET 0x1F0
-
-
-/******Data Structures*****************************************************/
-
-/* This structure is placed in the private data area of the device structure.
- * The card structure used to occupy the private area but now the following 
- * structure will incorporate the card structure along with PPP specific data
- */
-  
-typedef struct ppp_private_area
-{
-        struct net_device *slave;
-        sdla_t* card;   
-        unsigned long router_start_time;        /*router start time in sec */
-        unsigned long tick_counter;             /*used for 5 second counter*/
-        unsigned mc;                            /*multicast support on or off*/
-        unsigned char enable_IPX;
-        unsigned long network_number;
-        unsigned char pap;
-        unsigned char chap;
-        unsigned char sysname[31];              /* system name for in-bnd auth*/
-        unsigned char userid[511];              /* list of user ids */
-        unsigned char passwd[511];              /* list of passwords */
-        unsigned protocol;                      /* SKB Protocol */
-        u32 ip_local;                           /* Local IP Address */
-        u32 ip_remote;                          /* remote IP Address */
-
-        u32 ip_local_tmp;
-        u32 ip_remote_tmp;
-        
-        unsigned char timer_int_enabled;        /* Who enabled the timer inter*/
-        unsigned char update_comms_stats;       /* Used by update function */
-        unsigned long curr_trace_addr;          /* Trace information */
-        unsigned long start_trace_addr;
-        unsigned long end_trace_addr;
-
-        unsigned char interface_down;           /* Brind down interface when channel 
-                                                   goes down */
-        unsigned long config_wait_timeout;      /* After if_open() if in dynamic if mode,
-                                                   wait a few seconds before configuring */
-        
-        unsigned short udp_pkt_lgth;
-        char  udp_pkt_src;
-        char  udp_pkt_data[MAX_LGTH_UDP_MGNT_PKT];
-
-        /* PPP specific statistics */
-
-        if_send_stat_t if_send_stat;
-        rx_intr_stat_t rx_intr_stat;
-        pipe_mgmt_stat_t pipe_mgmt_stat;
-
-        unsigned long router_up_time; 
-
-        /* Polling work queue entry. Each interface
-         * has its own work queue entry, which is used
-         * to defer events from the interrupt */
-        struct work_struct poll_work;
-        struct timer_list poll_delay_timer;
-
-        u8 gateway;
-        u8 config_ppp;
-        u8 ip_error;
-        
-}ppp_private_area_t;
-
-/* variable for keeping track of enabling/disabling FT1 monitor status */
-static int rCount = 0;
-
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
-
-/****** Function Prototypes *************************************************/
-
-/* WAN link driver entry points. These are called by the WAN router module. */
-static int update(struct wan_device *wandev);
-static int new_if(struct wan_device *wandev, struct net_device *dev,
-                  wanif_conf_t *conf);
-static int del_if(struct wan_device *wandev, struct net_device *dev);
-
-/* WANPIPE-specific entry points */
-static int wpp_exec (struct sdla *card, void *u_cmd, void *u_data);
-
-/* Network device interface */
-static int if_init(struct net_device *dev);
-static int if_open(struct net_device *dev);
-static int if_close(struct net_device *dev);
-static int if_header(struct sk_buff *skb, struct net_device *dev,
-                     unsigned short type, 
-                     void *daddr, void *saddr, unsigned len);
-
-static void if_tx_timeout(struct net_device *dev);
-
-static int if_rebuild_hdr(struct sk_buff *skb);
-static struct net_device_stats *if_stats(struct net_device *dev);
-static int if_send(struct sk_buff *skb, struct net_device *dev);
-
-
-/* PPP firmware interface functions */
-static int ppp_read_version(sdla_t *card, char *str);
-static int ppp_set_outbnd_auth(sdla_t *card, ppp_private_area_t *ppp_priv_area);
-static int ppp_set_inbnd_auth(sdla_t *card, ppp_private_area_t *ppp_priv_area);
-static int ppp_configure(sdla_t *card, void *data);
-static int ppp_set_intr_mode(sdla_t *card, unsigned char mode);
-static int ppp_comm_enable(sdla_t *card);
-static int ppp_comm_disable(sdla_t *card);
-static int ppp_comm_disable_shutdown(sdla_t *card);
-static int ppp_get_err_stats(sdla_t *card);
-static int ppp_send(sdla_t *card, void *data, unsigned len, unsigned proto);
-static int ppp_error(sdla_t *card, int err, ppp_mbox_t *mb);
-
-static void wpp_isr(sdla_t *card);
-static void rx_intr(sdla_t *card);
-static void event_intr(sdla_t *card);
-static void timer_intr(sdla_t *card);
-
-/* Background polling routines */
-static void process_route(sdla_t *card);
-static void retrigger_comm(sdla_t *card);
-
-/* Miscellaneous functions */
-static int read_info( sdla_t *card );
-static int read_connection_info (sdla_t *card);
-static void remove_route( sdla_t *card );
-static int config508(struct net_device *dev, sdla_t *card);
-static void show_disc_cause(sdla_t * card, unsigned cause);
-static int reply_udp( unsigned char *data, unsigned int mbox_len );
-static void process_udp_mgmt_pkt(sdla_t *card, struct net_device *dev, 
-                                ppp_private_area_t *ppp_priv_area);
-static void init_ppp_tx_rx_buff( sdla_t *card );
-static int intr_test( sdla_t *card );
-static int udp_pkt_type( struct sk_buff *skb , sdla_t *card);
-static void init_ppp_priv_struct( ppp_private_area_t *ppp_priv_area);
-static void init_global_statistics( sdla_t *card );
-static int tokenize(char *str, char **tokens);
-static char* strstrip(char *str, char *s);
-static int chk_bcast_mcast_addr(sdla_t* card, struct net_device* dev,
-                                struct sk_buff *skb);
-
-static int config_ppp (sdla_t *);
-static void ppp_poll(struct net_device *dev);
-static void trigger_ppp_poll(struct net_device *dev);
-static void ppp_poll_delay (unsigned long dev_ptr);
-
-
-static int Read_connection_info;
-static int Intr_test_counter;
-static unsigned short available_buffer_space;
-
-
-/* IPX functions */
-static void switch_net_numbers(unsigned char *sendpacket, unsigned long network_number, 
-                               unsigned char incoming);
-static int handle_IPXWAN(unsigned char *sendpacket, char *devname, unsigned char enable_PX, 
-                         unsigned long network_number, unsigned short proto);
-
-/* Lock Functions */
-static void s508_lock (sdla_t *card, unsigned long *smp_flags);
-static void s508_unlock (sdla_t *card, unsigned long *smp_flags);
-
-static int store_udp_mgmt_pkt(char udp_pkt_src, sdla_t* card,
-                                struct sk_buff *skb, struct net_device* dev,
-                                ppp_private_area_t* ppp_priv_area );
-static unsigned short calc_checksum (char *data, int len);
-static void disable_comm (sdla_t *card);
-static int detect_and_fix_tx_bug (sdla_t *card);
-
-/****** Public Functions ****************************************************/
-
-/*============================================================================
- * PPP protocol initialization routine.
- *
- * This routine is called by the main WANPIPE module during setup.  At this
- * point adapter is completely initialized and firmware is running.
- *  o read firmware version (to make sure it's alive)
- *  o configure adapter
- *  o initialize protocol-specific fields of the adapter data space.
- *
- * Return:      0       o.k.
- *              < 0     failure.
- */
-int wpp_init(sdla_t *card, wandev_conf_t *conf)
-{
-        ppp_flags_t *flags;
-        union
-        {
-                char str[80];
-        } u;
-
-        /* Verify configuration ID */
-        if (conf->config_id != WANCONFIG_PPP) {
-                
-                printk(KERN_INFO "%s: invalid configuration ID %u!\n",
-                        card->devname, conf->config_id);
-                return -EINVAL;
-
-        }
-
-        /* Initialize miscellaneous pointers to structures on the adapter */
-        switch (card->hw.type) {
-
-                case SDLA_S508:
-                        card->mbox =(void*)(card->hw.dpmbase + PPP508_MB_OFFS);
-                        card->flags=(void*)(card->hw.dpmbase + PPP508_FLG_OFFS);
-                        break;
-                
-                case SDLA_S514:
-                        card->mbox =(void*)(card->hw.dpmbase + PPP514_MB_OFFS);
-                        card->flags=(void*)(card->hw.dpmbase + PPP514_FLG_OFFS);
-                        break;
-
-                default:
-                        return -EINVAL;
-
-        }
-        flags = card->flags;
-
-        /* Read firmware version.  Note that when adapter initializes, it
-         * clears the mailbox, so it may appear that the first command was
-         * executed successfully when in fact it was merely erased. To work
-         * around this, we execute the first command twice.
-         */
-        if (ppp_read_version(card, NULL) || ppp_read_version(card, u.str))
-                return -EIO;
-        
-        printk(KERN_INFO "%s: running PPP firmware v%s\n",card->devname, u.str); 
-        /* Adjust configuration and set defaults */
-        card->wandev.mtu = (conf->mtu) ?
-                min_t(unsigned int, conf->mtu, PPP_MAX_MTU) : PPP_DFLT_MTU;
-
-        card->wandev.bps        = conf->bps;
-        card->wandev.interface  = conf->interface;
-        card->wandev.clocking   = conf->clocking;
-        card->wandev.station    = conf->station;
-        card->isr               = &wpp_isr;
-        card->poll              = NULL; 
-        card->exec              = &wpp_exec;
-        card->wandev.update     = &update;
-        card->wandev.new_if     = &new_if;
-        card->wandev.del_if     = &del_if;
-        card->wandev.udp_port   = conf->udp_port;
-        card->wandev.ttl        = conf->ttl;
-        card->wandev.state      = WAN_DISCONNECTED;
-        card->disable_comm      = &disable_comm;
-        card->irq_dis_if_send_count = 0;
-        card->irq_dis_poll_count = 0;
-        card->u.p.authenticator = conf->u.ppp.authenticator;
-        card->u.p.ip_mode       = conf->u.ppp.ip_mode ?
-                                 conf->u.ppp.ip_mode : WANOPT_PPP_STATIC;
-        card->TracingEnabled    = 0;
-        Read_connection_info    = 1;
-
-        /* initialize global statistics */
-        init_global_statistics( card );
-
-
-
-        if (!card->configured){
-                int err;
-
-                Intr_test_counter = 0;
-                err = intr_test(card);
-
-                if(err || (Intr_test_counter < MAX_INTR_TEST_COUNTER)) {
-                        printk("%s: Interrupt Test Failed, Counter: %i\n", 
-                                card->devname, Intr_test_counter);
-                        printk( "%s: Please choose another interrupt\n",card->devname);
-                        return -EIO;
-                }
-                
-                printk(KERN_INFO "%s: Interrupt Test Passed, Counter: %i\n", 
-                        card->devname, Intr_test_counter);
-                card->configured = 1;
-        }
-
-        ppp_set_intr_mode(card, PPP_INTR_TIMER); 
-
-        /* Turn off the transmit and timer interrupt */
-        flags->imask &= ~PPP_INTR_TIMER;
-
-        printk(KERN_INFO "\n");
-
-        return 0;
-}
-
-/******* WAN Device Driver Entry Points *************************************/
-
-/*============================================================================
- * Update device status & statistics.
- */
-static int update(struct wan_device *wandev)
-{
-        sdla_t* card = wandev->private;
-        struct net_device* dev;
-        volatile ppp_private_area_t *ppp_priv_area;
-        ppp_flags_t *flags = card->flags;
-        unsigned long timeout;
-
-        /* sanity checks */
-        if ((wandev == NULL) || (wandev->private == NULL))
-                return -EFAULT;
-        
-        if (wandev->state == WAN_UNCONFIGURED)
-                return -ENODEV;
-        
-        /* Shutdown bug fix. This function can be
-         * called with NULL dev pointer during
-         * shutdown 
-         */
-        if ((dev=card->wandev.dev) == NULL){
-                return -ENODEV;
-        }
-
-        if ((ppp_priv_area=dev->priv) == NULL){
-                return -ENODEV;
-        }
-        
-        ppp_priv_area->update_comms_stats = 2;
-        ppp_priv_area->timer_int_enabled |= TMR_INT_ENABLED_UPDATE;
-        flags->imask |= PPP_INTR_TIMER; 
-        
-        /* wait a maximum of 1 second for the statistics to be updated */ 
-        timeout = jiffies;
-        for(;;) {
-                if(ppp_priv_area->update_comms_stats == 0){
-                        break;
-                }
-                if (time_after(jiffies, timeout + 1 * HZ)){
-                        ppp_priv_area->update_comms_stats = 0;
-                        ppp_priv_area->timer_int_enabled &=
-                                ~TMR_INT_ENABLED_UPDATE; 
-                        return -EAGAIN;
-                }
-        }
-
-        return 0;
-}
-
-/*============================================================================
- * Create new logical channel.
- * This routine is called by the router when ROUTER_IFNEW IOCTL is being
- * handled.
- * o parse media- and hardware-specific configuration
- * o make sure that a new channel can be created
- * o allocate resources, if necessary
- * o prepare network device structure for registaration.
- *
- * Return:      0       o.k.
- *              < 0     failure (channel will not be created)
- */
-static int new_if(struct wan_device *wandev, struct net_device *dev,
-                  wanif_conf_t *conf)
-{
-        sdla_t *card = wandev->private;
-        ppp_private_area_t *ppp_priv_area;
-
-        if (wandev->ndev)
-                return -EEXIST;
-        
-
-        printk(KERN_INFO "%s: Configuring Interface: %s\n",
-                        card->devname, conf->name);
-
-        if ((conf->name[0] == '\0') || (strlen(conf->name) > WAN_IFNAME_SZ)) {
-
-                printk(KERN_INFO "%s: Invalid interface name!\n",
-                        card->devname);
-                return -EINVAL;
-
-        }
-
-        /* allocate and initialize private data */
-        ppp_priv_area = kmalloc(sizeof(ppp_private_area_t), GFP_KERNEL);
-        
-        if( ppp_priv_area == NULL )
-                return  -ENOMEM;
-        
-        memset(ppp_priv_area, 0, sizeof(ppp_private_area_t));
-        
-        ppp_priv_area->card = card; 
-        
-        /* initialize data */
-        strcpy(card->u.p.if_name, conf->name);
-
-        /* initialize data in ppp_private_area structure */
-        
-        init_ppp_priv_struct( ppp_priv_area );
-
-        ppp_priv_area->mc = conf->mc;
-        ppp_priv_area->pap = conf->pap;
-        ppp_priv_area->chap = conf->chap;
-
-        /* Option to bring down the interface when 
-         * the link goes down */
-        if (conf->if_down){
-                set_bit(DYN_OPT_ON,&ppp_priv_area->interface_down);
-                printk("%s: Dynamic interface configuration enabled\n",
-                        card->devname);
-        } 
-
-        /* If no user ids are specified */
-        if(!strlen(conf->userid) && (ppp_priv_area->pap||ppp_priv_area->chap)){
-                kfree(ppp_priv_area);
-                return -EINVAL;
-        }
-
-        /* If no passwords are specified */
-        if(!strlen(conf->passwd) && (ppp_priv_area->pap||ppp_priv_area->chap)){
-                kfree(ppp_priv_area);
-                return -EINVAL;
-        }
-
-        if(strlen(conf->sysname) > 31){
-                kfree(ppp_priv_area);
-                return -EINVAL;
-        }
-
-        /* If no system name is specified */
-        if(!strlen(conf->sysname) && (card->u.p.authenticator)){
-                kfree(ppp_priv_area);
-                return -EINVAL;
-        }
-
-        /* copy the data into the ppp private structure */
-        memcpy(ppp_priv_area->userid, conf->userid, strlen(conf->userid));
-        memcpy(ppp_priv_area->passwd, conf->passwd, strlen(conf->passwd));
-        memcpy(ppp_priv_area->sysname, conf->sysname, strlen(conf->sysname));
-
-        
-        ppp_priv_area->enable_IPX = conf->enable_IPX;
-        if (conf->network_number){
-                ppp_priv_area->network_number = conf->network_number;
-        }else{
-                ppp_priv_area->network_number = 0xDEADBEEF;
-        }
-
-        /* Tells us that if this interface is a
-         * gateway or not */
-        if ((ppp_priv_area->gateway = conf->gateway) == WANOPT_YES){
-                printk(KERN_INFO "%s: Interface %s is set as a gateway.\n",
-                        card->devname,card->u.p.if_name);
-        }
-
-        /* prepare network device data space for registration */
-        strcpy(dev->name,card->u.p.if_name);
-        
-        dev->init = &if_init;
-        dev->priv = ppp_priv_area;
-        dev->mtu = min_t(unsigned int, dev->mtu, card->wandev.mtu);
-
-        /* Initialize the polling work routine */
-        INIT_WORK(&ppp_priv_area->poll_work, (void*)(void*)ppp_poll, dev);
-
-        /* Initialize the polling delay timer */
-        init_timer(&ppp_priv_area->poll_delay_timer);
-        ppp_priv_area->poll_delay_timer.data = (unsigned long)dev;
-        ppp_priv_area->poll_delay_timer.function = ppp_poll_delay;
-        
-        
-        /* Since we start with dummy IP addresses we can say
-         * that route exists */
-        printk(KERN_INFO "\n");
-
-        return 0;
-}
-
-/*============================================================================
- * Delete logical channel.
- */
-static int del_if(struct wan_device *wandev, struct net_device *dev)
-{
-        return 0;
-}
-
-static void disable_comm (sdla_t *card)
-{
-        ppp_comm_disable_shutdown(card);
-        return;
-}
-
-/****** WANPIPE-specific entry points ***************************************/
-
-/*============================================================================
- * Execute adapter interface command.
- */
-
-//FIXME: Why do we need this ????
-static int wpp_exec(struct sdla *card, void *u_cmd, void *u_data)
-{
-        ppp_mbox_t *mbox = card->mbox;
-        int len;
-
-        if (copy_from_user((void*)&mbox->cmd, u_cmd, sizeof(ppp_cmd_t)))
-                return -EFAULT;
-
-        len = mbox->cmd.length;
-
-        if (len) {
-
-                if( copy_from_user((void*)&mbox->data, u_data, len))
-                        return -EFAULT;
-
-        }
-
-        /* execute command */
-        if (!sdla_exec(mbox))
-                return -EIO;
-
-        /* return result */
-        if( copy_to_user(u_cmd, (void*)&mbox->cmd, sizeof(ppp_cmd_t)))
-                return -EFAULT;
-        len = mbox->cmd.length;
-
-        if (len && u_data && copy_to_user(u_data, (void*)&mbox->data, len))
-                return -EFAULT;
-
-        return 0;
-}
-
-/****** Network Device Interface ********************************************/
-
-/*============================================================================
- * Initialize Linux network interface.
- *
- * This routine is called only once for each interface, during Linux network
- * interface registration.  Returning anything but zero will fail interface
- * registration.
- */
-static int if_init(struct net_device *dev)
-{
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        sdla_t *card = ppp_priv_area->card;
-        struct wan_device *wandev = &card->wandev;
-
-        /* Initialize device driver entry points */
-        dev->open               = &if_open;
-        dev->stop               = &if_close;
-        dev->hard_header        = &if_header;
-        dev->rebuild_header     = &if_rebuild_hdr;
-        dev->hard_start_xmit    = &if_send;
-        dev->get_stats          = &if_stats;
-        dev->tx_timeout         = &if_tx_timeout;
-        dev->watchdog_timeo     = TX_TIMEOUT;
-
-        /* Initialize media-specific parameters */
-        dev->type               = ARPHRD_PPP;   /* ARP h/w type */
-        dev->flags              |= IFF_POINTOPOINT;
-        dev->flags              |= IFF_NOARP;
-
-        /* Enable Mulitcasting if specified by user*/
-        if (ppp_priv_area->mc == WANOPT_YES){
-                dev->flags      |= IFF_MULTICAST;
-        }
-
-        dev->mtu                = wandev->mtu;
-        dev->hard_header_len    = PPP_HDR_LEN;  /* media header length */
-
-        /* Initialize hardware parameters (just for reference) */
-        dev->irq                = wandev->irq;
-        dev->dma                = wandev->dma;
-        dev->base_addr          = wandev->ioport;
-        dev->mem_start          = wandev->maddr;
-        dev->mem_end            = wandev->maddr + wandev->msize - 1;
-
-        /* Set transmit buffer queue length */
-        dev->tx_queue_len = 100;
-        SET_MODULE_OWNER(dev);
-   
-        return 0;
-}
-
-/*============================================================================
- * Open network interface.
- * o enable communications and interrupts.
- * o prevent module from unloading by incrementing use count
- *
- * Return 0 if O.k. or errno.
- */
-static int if_open(struct net_device *dev)
-{
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        sdla_t *card = ppp_priv_area->card;
-        struct timeval tv;
-        //unsigned long smp_flags;
-
-        if (netif_running(dev))
-                return -EBUSY;
-
-        wanpipe_open(card);
-
-        netif_start_queue(dev);
-        
-        do_gettimeofday( &tv );
-        ppp_priv_area->router_start_time = tv.tv_sec;
-
-        /* We cannot configure the card here because we don't
-         * have access to the interface IP addresses.
-         * Once the interface initilization is complete, we will be
-         * able to access the IP addresses.  Therefore,
-         * configure the ppp link in the poll routine */
-        set_bit(0,&ppp_priv_area->config_ppp);
-        ppp_priv_area->config_wait_timeout=jiffies;
-
-        /* Start the PPP configuration after 1sec delay.
-         * This will give the interface initilization time
-         * to finish its configuration */
-        mod_timer(&ppp_priv_area->poll_delay_timer, jiffies + HZ);
-        return 0;
-}
-
-/*============================================================================
- * Close network interface.
- * o if this is the last open, then disable communications and interrupts.
- * o reset flags.
- */
-static int if_close(struct net_device *dev)
-{
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        sdla_t *card = ppp_priv_area->card;
-
-        netif_stop_queue(dev);
-        wanpipe_close(card);
-
-        del_timer (&ppp_priv_area->poll_delay_timer);
-        return 0;
-}
-
-/*============================================================================
- * Build media header.
- *
- * The trick here is to put packet type (Ethertype) into 'protocol' field of
- * the socket buffer, so that we don't forget it.  If packet type is not
- * supported, set skb->protocol to 0 and discard packet later.
- *
- * Return:      media header length.
- */
-static int if_header(struct sk_buff *skb, struct net_device *dev,
-        unsigned short type, void *daddr, void *saddr, unsigned len)
-{
-        switch (type)
-        {
-                case ETH_P_IP:
-                case ETH_P_IPX:
-                        skb->protocol = htons(type);
-                        break;
-
-                default:
-                        skb->protocol = 0;
-        }
-
-        return PPP_HDR_LEN;
-}
-
-/*============================================================================
- * Re-build media header.
- *
- * Return:      1       physical address resolved.
- *              0       physical address not resolved
- */
-static int if_rebuild_hdr (struct sk_buff *skb)
-{
-        struct net_device *dev = skb->dev;
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        sdla_t *card = ppp_priv_area->card;
-
-        printk(KERN_INFO "%s: rebuild_header() called for interface %s!\n",
-                card->devname, dev->name);
-        return 1;
-}
-
-/*============================================================================
- * Handle transmit timeout event from netif watchdog
- */
-static void if_tx_timeout(struct net_device *dev)
-{
-        ppp_private_area_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-        
-        /* If our device stays busy for at least 5 seconds then we will
-         * kick start the device by making dev->tbusy = 0.  We expect
-         * that our device never stays busy more than 5 seconds. So this                 
-         * is only used as a last resort.
-         */
-
-        ++ chan->if_send_stat.if_send_tbusy;
-        ++card->wandev.stats.collisions;
-
-        printk (KERN_INFO "%s: Transmit timed out on %s\n", card->devname,dev->name);
-        ++chan->if_send_stat.if_send_tbusy_timeout;
-        netif_wake_queue (dev);
-}
-
-
-
-/*============================================================================
- * Send a packet on a network interface.
- * o set tbusy flag (marks start of the transmission) to block a timer-based
- *   transmit from overlapping.
- * o check link state. If link is not up, then drop the packet.
- * o execute adapter send command.
- * o free socket buffer
- *
- * Return:      0       complete (socket buffer must be freed)
- *              non-0   packet may be re-transmitted (tbusy must be set)
- *
- * Notes:
- * 1. This routine is called either by the protocol stack or by the "net
- *    bottom half" (with interrupts enabled).
- * 2. Setting tbusy flag will inhibit further transmit requests from the
- *    protocol stack and can be used for flow control with protocol layer.
- */
-static int if_send (struct sk_buff *skb, struct net_device *dev)
-{
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        sdla_t *card = ppp_priv_area->card;
-        unsigned char *sendpacket;
-        unsigned long smp_flags;
-        ppp_flags_t *flags = card->flags;
-        int udp_type;
-        int err=0;
-        
-        ++ppp_priv_area->if_send_stat.if_send_entry;
-
-        netif_stop_queue(dev);
-        
-        if (skb == NULL) {
-
-                /* If we get here, some higher layer thinks we've missed an
-                 * tx-done interrupt.
-                 */
-                printk(KERN_INFO "%s: interface %s got kicked!\n",
-                        card->devname, dev->name);
-                
-                ++ppp_priv_area->if_send_stat.if_send_skb_null;
-        
-                netif_wake_queue(dev);
-                return 0;
-        }
-
-        sendpacket = skb->data;
-
-        udp_type = udp_pkt_type( skb, card );
-
-
-        if (udp_type == UDP_PTPIPE_TYPE){
-                if(store_udp_mgmt_pkt(UDP_PKT_FRM_STACK, card, skb, dev,
-                                      ppp_priv_area)){
-                        flags->imask |= PPP_INTR_TIMER;
-                }
-                ++ppp_priv_area->if_send_stat.if_send_PIPE_request;
-                netif_start_queue(dev);
-                return 0;
-        }
-
-        /* Check for broadcast and multicast addresses 
-         * If found, drop (deallocate) a packet and return.
-         */
-        if(chk_bcast_mcast_addr(card, dev, skb)){
-                ++card->wandev.stats.tx_dropped;
-                dev_kfree_skb_any(skb);
-                netif_start_queue(dev);
-                return 0;
-        }
-
-
-        if(card->hw.type != SDLA_S514){
-                s508_lock(card,&smp_flags);
-        }
-
-        if (test_and_set_bit(SEND_CRIT, (void*)&card->wandev.critical)) {
-
-                printk(KERN_INFO "%s: Critical in if_send: %lx\n",
-                                card->wandev.name,card->wandev.critical);
-                
-                ++card->wandev.stats.tx_dropped;
-                ++ppp_priv_area->if_send_stat.if_send_critical_non_ISR;
-                netif_start_queue(dev);
-                goto if_send_exit_crit;
-        }
-
-        if (card->wandev.state != WAN_CONNECTED) {
-
-                ++ppp_priv_area->if_send_stat.if_send_wan_disconnected;
-                ++card->wandev.stats.tx_dropped;
-                netif_start_queue(dev);
-                
-        } else if (!skb->protocol) {
-                ++ppp_priv_area->if_send_stat.if_send_protocol_error;
-                ++card->wandev.stats.tx_errors;
-                netif_start_queue(dev);
-                
-        } else {
-
-                /*If it's IPX change the network numbers to 0 if they're ours.*/
-                if( skb->protocol == htons(ETH_P_IPX) ) {
-                        if(ppp_priv_area->enable_IPX) {
-                                switch_net_numbers( skb->data, 
-                                        ppp_priv_area->network_number, 0);
-                        } else {
-                                ++card->wandev.stats.tx_dropped;
-                                netif_start_queue(dev);
-                                goto if_send_exit_crit;
-                        }
-                }
-
-                if (ppp_send(card, skb->data, skb->len, skb->protocol)) {
-                        netif_stop_queue(dev);
-                        ++ppp_priv_area->if_send_stat.if_send_adptr_bfrs_full;
-                        ++ppp_priv_area->if_send_stat.if_send_tx_int_enabled;
-                } else {
-                        ++ppp_priv_area->if_send_stat.if_send_bfr_passed_to_adptr;
-                        ++card->wandev.stats.tx_packets;
-                        card->wandev.stats.tx_bytes += skb->len;
-                        netif_start_queue(dev);
-                        dev->trans_start = jiffies;
-                }
-        }
-        
-if_send_exit_crit:
-        
-        if (!(err=netif_queue_stopped(dev))){
-                dev_kfree_skb_any(skb);
-        }else{
-                ppp_priv_area->tick_counter = jiffies;
-                flags->imask |= PPP_INTR_TXRDY; /* unmask Tx interrupts */
-        }
-        
-        clear_bit(SEND_CRIT,&card->wandev.critical);
-        if(card->hw.type != SDLA_S514){ 
-                s508_unlock(card,&smp_flags);
-        }
-
-        return err;
-}
-
-
-/*=============================================================================
- * Store a UDP management packet for later processing.
- */
-
-static int store_udp_mgmt_pkt(char udp_pkt_src, sdla_t* card,
-                                struct sk_buff *skb, struct net_device* dev,
-                                ppp_private_area_t* ppp_priv_area )
-{
-        int udp_pkt_stored = 0;
-
-        if(!ppp_priv_area->udp_pkt_lgth && (skb->len<=MAX_LGTH_UDP_MGNT_PKT)){
-                ppp_priv_area->udp_pkt_lgth = skb->len;
-                ppp_priv_area->udp_pkt_src = udp_pkt_src;
-                memcpy(ppp_priv_area->udp_pkt_data, skb->data, skb->len);
-                ppp_priv_area->timer_int_enabled |= TMR_INT_ENABLED_UDP;
-                ppp_priv_area->protocol = skb->protocol;
-                udp_pkt_stored = 1;
-        }else{
-                if (skb->len > MAX_LGTH_UDP_MGNT_PKT){
-                        printk(KERN_INFO "%s: PIPEMON UDP request too long : %i\n",
-                                card->devname, skb->len);
-                }else{
-                        printk(KERN_INFO "%s: PIPEMON UPD request already pending\n",
-                                card->devname);
-                }
-                ppp_priv_area->udp_pkt_lgth = 0;
-        }
-
-        if(udp_pkt_src == UDP_PKT_FRM_STACK){
-                dev_kfree_skb_any(skb);
-        }else{
-                dev_kfree_skb_any(skb);
-        }
-
-        return(udp_pkt_stored);
-}
-
-
-
-/*============================================================================
- * Reply to UDP Management system.
- * Return length of reply.
- */
-static int reply_udp( unsigned char *data, unsigned int mbox_len ) 
-{
-        unsigned short len, udp_length, temp, ip_length;
-        unsigned long ip_temp;
-        int even_bound = 0;
-        ppp_udp_pkt_t *p_udp_pkt = (ppp_udp_pkt_t *)data;
- 
-        /* Set length of packet */
-        len = sizeof(ip_pkt_t)+ 
-              sizeof(udp_pkt_t)+
-              sizeof(wp_mgmt_t)+
-              sizeof(cblock_t)+
-              mbox_len;
-
-        /* fill in UDP reply */
-        p_udp_pkt->wp_mgmt.request_reply = UDPMGMT_REPLY; 
-
-        /* fill in UDP length */
-        udp_length = sizeof(udp_pkt_t)+ 
-                     sizeof(wp_mgmt_t)+
-                     sizeof(cblock_t)+
-                     mbox_len; 
-  
- 
-        /* put it on an even boundary */
-        if ( udp_length & 0x0001 ) {
-                udp_length += 1;
-                len += 1;
-                even_bound=1;
-        } 
-        
-        temp = (udp_length<<8)|(udp_length>>8);
-        p_udp_pkt->udp_pkt.udp_length = temp;           
-
- 
-        /* swap UDP ports */
-        temp = p_udp_pkt->udp_pkt.udp_src_port;
-        p_udp_pkt->udp_pkt.udp_src_port = 
-                        p_udp_pkt->udp_pkt.udp_dst_port; 
-        p_udp_pkt->udp_pkt.udp_dst_port = temp;
-
-
-        /* add UDP pseudo header */
-        temp = 0x1100;
-        *((unsigned short *)(p_udp_pkt->data+mbox_len+even_bound)) = temp;
-        temp = (udp_length<<8)|(udp_length>>8);
-        *((unsigned short *)(p_udp_pkt->data+mbox_len+even_bound+2)) = temp;
- 
-        /* calculate UDP checksum */
-        p_udp_pkt->udp_pkt.udp_checksum = 0;
-        p_udp_pkt->udp_pkt.udp_checksum = 
-                calc_checksum(&data[UDP_OFFSET],udp_length+UDP_OFFSET);
-
-        /* fill in IP length */
-        ip_length = udp_length + sizeof(ip_pkt_t);
-        temp = (ip_length<<8)|(ip_length>>8);
-        p_udp_pkt->ip_pkt.total_length = temp;
- 
-        /* swap IP addresses */
-        ip_temp = p_udp_pkt->ip_pkt.ip_src_address;
-        p_udp_pkt->ip_pkt.ip_src_address = p_udp_pkt->ip_pkt.ip_dst_address;
-        p_udp_pkt->ip_pkt.ip_dst_address = ip_temp;
-
-        /* fill in IP checksum */
-        p_udp_pkt->ip_pkt.hdr_checksum = 0;
-        p_udp_pkt->ip_pkt.hdr_checksum = calc_checksum(data,sizeof(ip_pkt_t));
-
-        return len;
-
-} /* reply_udp */
-
-unsigned short calc_checksum (char *data, int len)
-{
-        unsigned short temp; 
-        unsigned long sum=0;
-        int i;
-
-        for( i = 0; i <len; i+=2 ) {
-                memcpy(&temp,&data[i],2);
-                sum += (unsigned long)temp;
-        }
-
-        while (sum >> 16 ) {
-                sum = (sum & 0xffffUL) + (sum >> 16);
-        }
-
-        temp = (unsigned short)sum;
-        temp = ~temp;
-
-        if( temp == 0 ) 
-                temp = 0xffff;
-
-        return temp;    
-}
-
-/*
-   If incoming is 0 (outgoing)- if the net numbers is ours make it 0
-   if incoming is 1 - if the net number is 0 make it ours 
-
-*/
-static void switch_net_numbers(unsigned char *sendpacket, unsigned long network_number, unsigned char incoming)
-{
-        unsigned long pnetwork_number;
-
-        pnetwork_number = (unsigned long)((sendpacket[6] << 24) + 
-                          (sendpacket[7] << 16) + (sendpacket[8] << 8) + 
-                          sendpacket[9]);
-
-        if (!incoming) {
-                //If the destination network number is ours, make it 0
-                if( pnetwork_number == network_number) {
-                        sendpacket[6] = sendpacket[7] = sendpacket[8] = 
-                                         sendpacket[9] = 0x00;
-                }
-        } else {
-                //If the incoming network is 0, make it ours
-                if( pnetwork_number == 0) {
-                        sendpacket[6] = (unsigned char)(network_number >> 24);
-                        sendpacket[7] = (unsigned char)((network_number & 
-                                         0x00FF0000) >> 16);
-                        sendpacket[8] = (unsigned char)((network_number & 
-                                         0x0000FF00) >> 8);
-                        sendpacket[9] = (unsigned char)(network_number & 
-                                         0x000000FF);
-                }
-        }
-
-
-        pnetwork_number = (unsigned long)((sendpacket[18] << 24) + 
-                          (sendpacket[19] << 16) + (sendpacket[20] << 8) + 
-                          sendpacket[21]);
-
-        if( !incoming ) {
-                //If the source network is ours, make it 0
-                if( pnetwork_number == network_number) {
-                        sendpacket[18] = sendpacket[19] = sendpacket[20] = 
-                                         sendpacket[21] = 0x00;
-                }
-        } else {
-                //If the source network is 0, make it ours
-                if( pnetwork_number == 0 ) {
-                        sendpacket[18] = (unsigned char)(network_number >> 24);
-                        sendpacket[19] = (unsigned char)((network_number & 
-                                         0x00FF0000) >> 16);
-                        sendpacket[20] = (unsigned char)((network_number & 
-                                         0x0000FF00) >> 8);
-                        sendpacket[21] = (unsigned char)(network_number & 
-                                         0x000000FF);
-                }
-        }
-} /* switch_net_numbers */
-
-/*============================================================================
- * Get ethernet-style interface statistics.
- * Return a pointer to struct net_device_stats.
- */
-static struct net_device_stats *if_stats(struct net_device *dev)
-{
-
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        sdla_t* card;
-        
-        if( ppp_priv_area == NULL )
-                return NULL;
-
-        card = ppp_priv_area->card;
-        return &card->wandev.stats;
-}
-
-/****** PPP Firmware Interface Functions ************************************/
-
-/*============================================================================
- * Read firmware code version.
- *      Put code version as ASCII string in str. 
- */
-static int ppp_read_version(sdla_t *card, char *str)
-{
-        ppp_mbox_t *mb = card->mbox;
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        mb->cmd.command = PPP_READ_CODE_VERSION;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-
-        if (err != CMD_OK)
- 
-                ppp_error(card, err, mb);
-
-        else if (str) {
-
-                int len = mb->cmd.length;
-
-                memcpy(str, mb->data, len);
-                str[len] = '\0';
-
-        }
-
-        return err;
-}
-/*===========================================================================
- * Set Out-Bound Authentication.
-*/
-static int ppp_set_outbnd_auth (sdla_t *card, ppp_private_area_t *ppp_priv_area)
-{
-        ppp_mbox_t *mb = card->mbox;
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        memset(&mb->data, 0, (strlen(ppp_priv_area->userid) + 
-                                        strlen(ppp_priv_area->passwd) + 2 ) );
-        memcpy(mb->data, ppp_priv_area->userid, strlen(ppp_priv_area->userid));
-        memcpy((mb->data + strlen(ppp_priv_area->userid) + 1), 
-                ppp_priv_area->passwd, strlen(ppp_priv_area->passwd));  
-        
-        mb->cmd.length  = strlen(ppp_priv_area->userid) + 
-                                        strlen(ppp_priv_area->passwd) + 2 ;
-        
-        mb->cmd.command = PPP_SET_OUTBOUND_AUTH;
-
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-
-        if (err != CMD_OK)
-                ppp_error(card, err, mb);
-
-        return err;
-}
-
-/*===========================================================================
- * Set In-Bound Authentication.
-*/
-static int ppp_set_inbnd_auth (sdla_t *card, ppp_private_area_t *ppp_priv_area)
-{
-        ppp_mbox_t *mb = card->mbox;
-        int err, i;
-        char* user_tokens[32];
-        char* pass_tokens[32];
-        int userids, passwds;
-        int add_ptr;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        memset(&mb->data, 0, 1008);
-        memcpy(mb->data, ppp_priv_area->sysname, 
-                                                strlen(ppp_priv_area->sysname));
-        
-        /* Parse the userid string and the password string and build a string
-           to copy it to the data area of the command structure.   The string
-           will look like "SYS_NAME<NULL>USER1<NULL>PASS1<NULL>USER2<NULL>PASS2
-           ....<NULL> " 
-         */
-        userids = tokenize( ppp_priv_area->userid, user_tokens);
-        passwds = tokenize( ppp_priv_area->passwd, pass_tokens);
-        
-        if (userids != passwds){
-                printk(KERN_INFO "%s: Number of passwords does not equal the number of user ids\n", card->devname);
-                return 1;       
-        }
-
-        add_ptr = strlen(ppp_priv_area->sysname) + 1;
-        for (i=0; i<userids; i++){
-                memcpy((mb->data + add_ptr), user_tokens[i], 
-                                                        strlen(user_tokens[i]));
-                memcpy((mb->data + add_ptr + strlen(user_tokens[i]) + 1), 
-                                        pass_tokens[i], strlen(pass_tokens[i]));
-                add_ptr = add_ptr + strlen(user_tokens[i]) + 1 + 
-                                                strlen(pass_tokens[i]) + 1;
-        }
-
-        mb->cmd.length  = add_ptr + 1;
-        mb->cmd.command = PPP_SET_INBOUND_AUTH;
-
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-
-        if (err != CMD_OK)
-                ppp_error(card, err, mb);
-
-        return err;
-}
-
-
-/*============================================================================
- * Tokenize string.
- *      Parse a string of the following syntax:
- *              <arg1>,<arg2>,...
- *      and fill array of tokens with pointers to string elements.
- *
- */
-static int tokenize (char *str, char **tokens)
-{
-        int cnt = 0;
-
-        tokens[0] = strsep(&str, "/");
-        while (tokens[cnt] && (cnt < 32 - 1))
-        {
-                tokens[cnt] = strstrip(tokens[cnt], " \t");
-                tokens[++cnt] = strsep(&str, "/");
-        }
-        return cnt;
-}
-
-/*============================================================================
- * Strip leading and trailing spaces off the string str.
- */
-static char* strstrip (char *str, char* s)
-{
-        char *eos = str + strlen(str);          /* -> end of string */
-
-        while (*str && strchr(s, *str))
-                ++str                           /* strip leading spaces */
-        ;
-        while ((eos > str) && strchr(s, *(eos - 1)))
-                --eos                           /* strip trailing spaces */
-        ;
-        *eos = '\0';
-        return str;
-}
-/*============================================================================
- * Configure PPP firmware.
- */
-static int ppp_configure(sdla_t *card, void *data)
-{
-        ppp_mbox_t *mb = card->mbox;
-        int data_len = sizeof(ppp508_conf_t); 
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        memcpy(mb->data, data, data_len);
-        mb->cmd.length  = data_len;
-        mb->cmd.command = PPP_SET_CONFIG;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-
-        if (err != CMD_OK) 
-                ppp_error(card, err, mb);
-        
-        return err;
-}
-
-/*============================================================================
- * Set interrupt mode.
- */
-static int ppp_set_intr_mode(sdla_t *card, unsigned char mode)
-{
-        ppp_mbox_t *mb = card->mbox;
-        ppp_intr_info_t *ppp_intr_data = (ppp_intr_info_t *) &mb->data[0];
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        ppp_intr_data->i_enable = mode;
-
-        ppp_intr_data->irq = card->hw.irq;
-        mb->cmd.length = 2;
-
-       /* If timer has been enabled, set the timer delay to 1sec */
-       if (mode & 0x80){
-                ppp_intr_data->timer_len = 250; //5;//100; //250;
-                mb->cmd.length = 4;
-        }
-        
-        mb->cmd.command = PPP_SET_INTR_FLAGS;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-        
-        if (err != CMD_OK) 
-                ppp_error(card, err, mb);
-                
-
-        return err;
-}
-
-/*============================================================================
- * Enable communications.
- */
-static int ppp_comm_enable(sdla_t *card)
-{
-        ppp_mbox_t *mb = card->mbox;
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        mb->cmd.command = PPP_COMM_ENABLE;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-        
-        if (err != CMD_OK) 
-                ppp_error(card, err, mb);
-        else    
-                card->u.p.comm_enabled = 1;     
-
-        return err;
-}
-
-/*============================================================================
- * Disable communications.
- */
-static int ppp_comm_disable(sdla_t *card)
-{
-        ppp_mbox_t *mb = card->mbox;
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        mb->cmd.command = PPP_COMM_DISABLE;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-        if (err != CMD_OK) 
-                ppp_error(card, err, mb);
-        else
-                card->u.p.comm_enabled = 0;
-
-        return err;
-}
-
-static int ppp_comm_disable_shutdown(sdla_t *card)
-{
-        ppp_mbox_t *mb = card->mbox;
-        ppp_intr_info_t *ppp_intr_data;
-        int err;
-
-        if (!mb){
-                return 1;
-        }
-        
-        ppp_intr_data = (ppp_intr_info_t *) &mb->data[0];
-        
-        /* Disable all interrupts */
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        ppp_intr_data->i_enable = 0;
-
-        ppp_intr_data->irq = card->hw.irq;
-        mb->cmd.length = 2;
-
-        mb->cmd.command = PPP_SET_INTR_FLAGS;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-
-        /* Disable communicatinons */
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        mb->cmd.command = PPP_COMM_DISABLE;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-
-        card->u.p.comm_enabled = 0;
-
-        return 0;
-}
-
-
-
-/*============================================================================
- * Get communications error statistics.
- */
-static int ppp_get_err_stats(sdla_t *card)
-{
-        ppp_mbox_t *mb = card->mbox;
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        mb->cmd.command = PPP_READ_ERROR_STATS;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-        
-        if (err == CMD_OK) {
-                
-                ppp_err_stats_t* stats = (void*)mb->data;
-                card->wandev.stats.rx_over_errors    = stats->rx_overrun;
-                card->wandev.stats.rx_crc_errors     = stats->rx_bad_crc;
-                card->wandev.stats.rx_missed_errors  = stats->rx_abort;
-                card->wandev.stats.rx_length_errors  = stats->rx_lost;
-                card->wandev.stats.tx_aborted_errors = stats->tx_abort;
-        
-        } else 
-                ppp_error(card, err, mb);
-        
-        return err;
-}
-
-/*============================================================================
- * Send packet.
- *      Return: 0 - o.k.
- *              1 - no transmit buffers available
- */
-static int ppp_send (sdla_t *card, void *data, unsigned len, unsigned proto)
-{
-        ppp_buf_ctl_t *txbuf = card->u.p.txbuf;
-
-        if (txbuf->flag)
-                return 1;
-        
-        sdla_poke(&card->hw, txbuf->buf.ptr, data, len);
-
-        txbuf->length = len;            /* frame length */
-        
-        if (proto == htons(ETH_P_IPX))
-                txbuf->proto = 0x01;    /* protocol ID */
-        else
-                txbuf->proto = 0x00;    /* protocol ID */
-        
-        txbuf->flag = 1;                /* start transmission */
-
-        /* Update transmit buffer control fields */
-        card->u.p.txbuf = ++txbuf;
-
-        if ((void*)txbuf > card->u.p.txbuf_last)
-                card->u.p.txbuf = card->u.p.txbuf_base;
-
-        return 0;
-}
-
-/****** Firmware Error Handler **********************************************/
-
-/*============================================================================
- * Firmware error handler.
- *      This routine is called whenever firmware command returns non-zero
- *      return code.
- *
- * Return zero if previous command has to be cancelled.
- */
-static int ppp_error(sdla_t *card, int err, ppp_mbox_t *mb)
-{
-        unsigned cmd = mb->cmd.command;
-
-        switch (err) {
-
-                case CMD_TIMEOUT:
-                        printk(KERN_ERR "%s: command 0x%02X timed out!\n",
-                                card->devname, cmd);
-                        break;
-
-                default:
-                        printk(KERN_INFO "%s: command 0x%02X returned 0x%02X!\n"
-                                , card->devname, cmd, err);
-        }
-
-        return 0;
-}
-
-/****** Interrupt Handlers **************************************************/
-
-/*============================================================================
- * PPP interrupt service routine.
- */
-static void wpp_isr (sdla_t *card)
-{
-        ppp_flags_t *flags = card->flags;
-        char *ptr = &flags->iflag;
-        struct net_device *dev = card->wandev.dev;
-        int i;
-
-        card->in_isr = 1;
-        ++card->statistics.isr_entry;
-
-        if (!dev && flags->iflag != PPP_INTR_CMD){
-                card->in_isr = 0;
-                flags->iflag = 0;
-                return;
-        }
-        
-        if (test_bit(PERI_CRIT, (void*)&card->wandev.critical)) {
-                card->in_isr = 0;
-                flags->iflag = 0;
-                return;
-        }
-        
-        
-        if(card->hw.type != SDLA_S514){
-                if (test_bit(SEND_CRIT, (void*)&card->wandev.critical)) {
-                        ++card->statistics.isr_already_critical;
-                        printk (KERN_INFO "%s: Critical while in ISR!\n",
-                                        card->devname);
-                        card->in_isr = 0;
-                        flags->iflag = 0;
-                        return;
-                }
-        }
-
-        switch (flags->iflag) {
-
-                case PPP_INTR_RXRDY:    /* receive interrupt  0x01  (bit 0)*/
-                        ++card->statistics.isr_rx;
-                        rx_intr(card);
-                        break;
-
-                case PPP_INTR_TXRDY:    /* transmit interrupt  0x02 (bit 1)*/
-                        ++card->statistics.isr_tx;
-                        flags->imask &= ~PPP_INTR_TXRDY;
-                        netif_wake_queue(dev);
-                        break;
-
-                case PPP_INTR_CMD:      /* interface command completed */
-                        ++Intr_test_counter;
-                        ++card->statistics.isr_intr_test;
-                        break;
-
-                case PPP_INTR_MODEM:    /* modem status change (DCD, CTS) 0x04 (bit 2)*/
-                case PPP_INTR_DISC:     /* Data link disconnected 0x10  (bit 4)*/       
-                case PPP_INTR_OPEN:     /* Data link open 0x20  (bit 5)*/
-                case PPP_INTR_DROP_DTR: /* DTR drop timeout expired  0x40 bit 6 */
-                        event_intr(card);
-                        break;
-        
-                case PPP_INTR_TIMER:
-                        timer_intr(card);
-                        break;   
-
-                default:        /* unexpected interrupt */
-                        ++card->statistics.isr_spurious;
-                        printk(KERN_INFO "%s: spurious interrupt 0x%02X!\n", 
-                                card->devname, flags->iflag);
-                        printk(KERN_INFO "%s: ID Bytes = ",card->devname);
-                        for(i = 0; i < 8; i ++)
-                                printk(KERN_INFO "0x%02X ", *(ptr + 0x28 + i));
-                        printk(KERN_INFO "\n"); 
-        }
-        
-        card->in_isr = 0;
-        flags->iflag = 0;
-        return;
-}
-
-/*============================================================================
- * Receive interrupt handler.
- */
-static void rx_intr(sdla_t *card)
-{
-        ppp_buf_ctl_t *rxbuf = card->rxmb;
-        struct net_device *dev = card->wandev.dev;
-        ppp_private_area_t *ppp_priv_area;
-        struct sk_buff *skb;
-        unsigned len;
-        void *buf;
-        int i;
-        ppp_flags_t *flags = card->flags;
-        char *ptr = &flags->iflag;
-        int udp_type;
-        
-
-        if (rxbuf->flag != 0x01) {
-
-                printk(KERN_INFO 
-                        "%s: corrupted Rx buffer @ 0x%X, flag = 0x%02X!\n", 
-                        card->devname, (unsigned)rxbuf, rxbuf->flag);
-        
-                printk(KERN_INFO "%s: ID Bytes = ",card->devname);
-                
-                for(i = 0; i < 8; i ++)
-                        printk(KERN_INFO "0x%02X ", *(ptr + 0x28 + i));
-                printk(KERN_INFO "\n"); 
-                
-                ++card->statistics.rx_intr_corrupt_rx_bfr;
-
-
-                /* Bug Fix: Mar 6 2000
-                 * If we get a corrupted mailbox, it means that driver 
-                 * is out of sync with the firmware. There is no recovery.
-                 * If we don't turn off all interrupts for this card
-                 * the machine will crash. 
-                 */
-                printk(KERN_INFO "%s: Critical router failure ...!!!\n", card->devname);
-                printk(KERN_INFO "Please contact Sangoma Technologies !\n");
-                ppp_set_intr_mode(card,0);
-                return;
-        }
-      
-        if (dev && netif_running(dev) && dev->priv){
-        
-                len  = rxbuf->length;
-                ppp_priv_area = dev->priv;
-
-                /* Allocate socket buffer */
-                skb = dev_alloc_skb(len);
-
-                if (skb != NULL) {
-                
-                        /* Copy data to the socket buffer */
-                        unsigned addr = rxbuf->buf.ptr;
-
-                        if ((addr + len) > card->u.p.rx_top + 1) {
-                        
-                                unsigned tmp = card->u.p.rx_top - addr + 1;
-                                buf = skb_put(skb, tmp);
-                                sdla_peek(&card->hw, addr, buf, tmp);
-                                addr = card->u.p.rx_base;
-                                len -= tmp;
-                        }
-                        buf = skb_put(skb, len);
-                        sdla_peek(&card->hw, addr, buf, len);
-
-                        /* Decapsulate packet */
-                        switch (rxbuf->proto) {
-        
-                                case 0x00:
-                                        skb->protocol = htons(ETH_P_IP);
-                                        break;
-
-                                case 0x01:
-                                        skb->protocol = htons(ETH_P_IPX);
-                                        break;
-                        }
-
-                        udp_type = udp_pkt_type( skb, card );
-
-                        if (udp_type == UDP_PTPIPE_TYPE){
-
-                                /* Handle a UDP Request in Timer Interrupt */
-                                if(store_udp_mgmt_pkt(UDP_PKT_FRM_NETWORK, card, skb, dev,
-                                                        ppp_priv_area)){
-                                        flags->imask |= PPP_INTR_TIMER;
-                                }
-                                ++ppp_priv_area->rx_intr_stat.rx_intr_PIPE_request;
-
-
-                        } else if (handle_IPXWAN(skb->data,card->devname, 
-                                                 ppp_priv_area->enable_IPX, 
-                                                 ppp_priv_area->network_number, 
-                                                 skb->protocol)) {
-                        
-                                /* Handle an IPXWAN packet */
-                                if( ppp_priv_area->enable_IPX) {
-                                        
-                                        /* Make sure we are not already sending */
-                                        if (!test_bit(SEND_CRIT, &card->wandev.critical)){
-                                                ppp_send(card, skb->data, skb->len, htons(ETH_P_IPX));
-                                        }
-                                        dev_kfree_skb_any(skb);
-
-                                } else {
-                                        ++card->wandev.stats.rx_dropped;
-                                }
-                        } else {
-                                /* Pass data up the protocol stack */
-                                skb->dev = dev;
-                                skb->mac.raw  = skb->data;
-
-                                ++card->wandev.stats.rx_packets;
-                                card->wandev.stats.rx_bytes += skb->len;
-                                ++ppp_priv_area->rx_intr_stat.rx_intr_bfr_passed_to_stack;      
-                                netif_rx(skb);
-                                dev->last_rx = jiffies;
-                        }
-
-                } else {
-        
-                        if (net_ratelimit()){
-                                printk(KERN_INFO "%s: no socket buffers available!\n",
-                                        card->devname);
-                        }
-                        ++card->wandev.stats.rx_dropped;
-                        ++ppp_priv_area->rx_intr_stat.rx_intr_no_socket;
-                }
-
-        } else {
-                ++card->statistics.rx_intr_dev_not_started;
-        }
-
-        /* Release buffer element and calculate a pointer to the next one */
-        rxbuf->flag = 0x00;
-        card->rxmb = ++rxbuf;
-        if ((void*)rxbuf > card->u.p.rxbuf_last)
-                card->rxmb = card->u.p.rxbuf_base;
-}
-
-
-void event_intr (sdla_t *card)
-{
-
-        struct net_device* dev = card->wandev.dev;
-        ppp_private_area_t* ppp_priv_area = dev->priv;
-        volatile ppp_flags_t *flags = card->flags;
-
-        switch (flags->iflag){
-
-                case PPP_INTR_MODEM:    /* modem status change (DCD, CTS) 0x04  (bit 2)*/
-
-                        if (net_ratelimit()){
-                                printk (KERN_INFO "%s: Modem status: DCD=%s CTS=%s\n",
-                                        card->devname, DCD(flags->mstatus), CTS(flags->mstatus));
-                        }
-                        break;
-
-                case PPP_INTR_DISC:     /* Data link disconnected 0x10  (bit 4)*/       
-
-                        NEX_PRINTK (KERN_INFO "Data link disconnected intr Cause %X\n",
-                                               flags->disc_cause);
-
-                        if (flags->disc_cause &
-                                (PPP_LOCAL_TERMINATION | PPP_DCD_CTS_DROP |
-                                PPP_REMOTE_TERMINATION)) {
-
-                                if (card->u.p.ip_mode == WANOPT_PPP_PEER) { 
-                                        set_bit(0,&Read_connection_info);
-                                }
-                                wanpipe_set_state(card, WAN_DISCONNECTED);
-
-                                show_disc_cause(card, flags->disc_cause);
-                                ppp_priv_area->timer_int_enabled |= TMR_INT_ENABLED_PPP_EVENT;
-                                flags->imask |= PPP_INTR_TIMER;
-                                trigger_ppp_poll(dev);
-                        }
-                        break;
-
-                case PPP_INTR_OPEN:     /* Data link open 0x20  (bit 5)*/
-
-                        NEX_PRINTK (KERN_INFO "%s: PPP Link Open, LCP=%s IP=%s\n",
-                                        card->devname,LCP(flags->lcp_state),
-                                        IP(flags->ip_state));
-
-                        if (flags->lcp_state == 0x09 && 
-                           (flags->ip_state == 0x09 || flags->ipx_state == 0x09)){
-
-                                /* Initialize the polling timer and set the state
-                                 * to WAN_CONNNECTED */
-
-
-                                /* BUG FIX: When the protocol restarts, during heavy 
-                                 * traffic, board tx buffers and driver tx buffers
-                                 * can go out of sync.  This checks the condition
-                                 * and if the tx buffers are out of sync, the 
-                                 * protocols are restarted. 
-                                 * I don't know why the board tx buffer is out
-                                 * of sync. It could be that a packets is tx
-                                 * while the link is down, but that is not 
-                                 * possible. The other possiblility is that the
-                                 * firmware doesn't reinitialize properly.
-                                 * FIXME: A better fix should be found.
-                                 */ 
-                                if (detect_and_fix_tx_bug(card)){
-
-                                        ppp_comm_disable(card);
-
-                                        wanpipe_set_state(card, WAN_DISCONNECTED);
-
-                                        ppp_priv_area->timer_int_enabled |= 
-                                                TMR_INT_ENABLED_PPP_EVENT;
-                                        flags->imask |= PPP_INTR_TIMER;
-                                        break;  
-                                }
-
-                                card->state_tick = jiffies;
-                                wanpipe_set_state(card, WAN_CONNECTED);
-
-                                NEX_PRINTK(KERN_INFO "CON: L Tx: %lx  B Tx: %lx || L Rx %lx B Rx %lx\n",
-                                        (unsigned long)card->u.p.txbuf, *card->u.p.txbuf_next,
-                                        (unsigned long)card->rxmb, *card->u.p.rxbuf_next);
-
-                                /* Tell timer interrupt that PPP event occurred */
-                                ppp_priv_area->timer_int_enabled |= TMR_INT_ENABLED_PPP_EVENT;
-                                flags->imask |= PPP_INTR_TIMER;
-
-                                /* If we are in PEER mode, we must first obtain the
-                                 * IP information and then go into the poll routine */
-                                if (card->u.p.ip_mode != WANOPT_PPP_PEER){      
-                                        trigger_ppp_poll(dev);
-                                }
-                        }
-                        break;
-
-                case PPP_INTR_DROP_DTR:         /* DTR drop timeout expired  0x40 bit 6 */
-
-                        NEX_PRINTK(KERN_INFO "DTR Drop Timeout Interrrupt \n"); 
-
-                        if (card->u.p.ip_mode == WANOPT_PPP_PEER) { 
-                                set_bit(0,&Read_connection_info);
-                        }
-                
-                        wanpipe_set_state(card, WAN_DISCONNECTED);
-
-                        show_disc_cause(card, flags->disc_cause);
-                        ppp_priv_area->timer_int_enabled |= TMR_INT_ENABLED_PPP_EVENT;
-                        flags->imask |= PPP_INTR_TIMER;
-                        trigger_ppp_poll(dev);
-                        break;
-                
-                default:
-                        printk(KERN_INFO "%s: Error, Invalid PPP Event\n",card->devname);
-        }
-}
-
-
-
-/* TIMER INTERRUPT */
-
-void timer_intr (sdla_t *card)
-{
-
-        struct net_device* dev = card->wandev.dev;
-        ppp_private_area_t* ppp_priv_area = dev->priv;
-        ppp_flags_t *flags = card->flags;
-
-
-        if (ppp_priv_area->timer_int_enabled & TMR_INT_ENABLED_CONFIG){
-                if (!config_ppp(card)){
-                        ppp_priv_area->timer_int_enabled &= 
-                                        ~TMR_INT_ENABLED_CONFIG;        
-                }
-        }
-
-        /* Update statistics */
-        if (ppp_priv_area->timer_int_enabled & TMR_INT_ENABLED_UPDATE){
-                ppp_get_err_stats(card);
-                if(!(--ppp_priv_area->update_comms_stats)){
-                        ppp_priv_area->timer_int_enabled &= 
-                                ~TMR_INT_ENABLED_UPDATE;
-                }
-        }
-
-        /* PPIPEMON UDP request */
-
-        if (ppp_priv_area->timer_int_enabled & TMR_INT_ENABLED_UDP){
-                process_udp_mgmt_pkt(card,dev, ppp_priv_area);
-                ppp_priv_area->timer_int_enabled &= ~TMR_INT_ENABLED_UDP;
-        }
-
-        /* PPP Event */
-        if (ppp_priv_area->timer_int_enabled & TMR_INT_ENABLED_PPP_EVENT){
-
-                if (card->wandev.state == WAN_DISCONNECTED){
-                        retrigger_comm(card);
-                }
-
-                /* If the state is CONNECTING, it means that communicatins were
-                 * enabled. When the remote side enables its comminication we
-                 * should get an interrupt PPP_INTR_OPEN, thus turn off polling 
-                 */
-
-                else if (card->wandev.state == WAN_CONNECTING){
-                        /* Turn off the timer interrupt */
-                        ppp_priv_area->timer_int_enabled &= ~TMR_INT_ENABLED_PPP_EVENT;
-                }
-
-                /* If state is connected and we are in PEER mode 
-                 * poll for an IP address which will be provided by remote end.
-                 */
-                else if ((card->wandev.state == WAN_CONNECTED && 
-                          card->u.p.ip_mode == WANOPT_PPP_PEER) && 
-                          test_bit(0,&Read_connection_info)){
-
-                        card->state_tick = jiffies;
-                        if (read_connection_info (card)){
-                                printk(KERN_INFO "%s: Failed to read PEER IP Addresses\n",
-                                        card->devname);
-                        }else{
-                                clear_bit(0,&Read_connection_info);
-                                set_bit(1,&Read_connection_info);
-                                trigger_ppp_poll(dev);
-                        }
-                }else{
-                        //FIXME Put the comment back int
-                        ppp_priv_area->timer_int_enabled &= ~TMR_INT_ENABLED_PPP_EVENT;
-                }
-
-        }/* End of PPP_EVENT */
-
-
-        /* Only disable the timer interrupt if there are no udp, statistic */
-        /* updates or events pending */
-        if(!ppp_priv_area->timer_int_enabled) {
-                flags->imask &= ~PPP_INTR_TIMER;
-        }
-}
-
-
-static int handle_IPXWAN(unsigned char *sendpacket, char *devname, unsigned char enable_IPX, unsigned long network_number, unsigned short proto)
-{
-        int i;
-
-        if( proto == htons(ETH_P_IPX) ) {
-                //It's an IPX packet
-                if(!enable_IPX) {
-                        //Return 1 so we don't pass it up the stack.
-                        return 1;
-                }
-        } else {
-                //It's not IPX so pass it up the stack.
-                return 0;
-        }
-
-        if( sendpacket[16] == 0x90 &&
-            sendpacket[17] == 0x04)
-        {
-                //It's IPXWAN
-
-                if( sendpacket[2] == 0x02 &&
-                    sendpacket[34] == 0x00)
-                {
-                        //It's a timer request packet
-                        printk(KERN_INFO "%s: Received IPXWAN Timer Request packet\n",devname);
-
-                        //Go through the routing options and answer no to every
-                        //option except Unnumbered RIP/SAP
-                        for(i = 41; sendpacket[i] == 0x00; i += 5)
-                        {
-                                //0x02 is the option for Unnumbered RIP/SAP
-                                if( sendpacket[i + 4] != 0x02)
-                                {
-                                        sendpacket[i + 1] = 0;
-                                }
-                        }
-
-                        //Skip over the extended Node ID option
-                        if( sendpacket[i] == 0x04 )
-                        {
-                                i += 8;
-                        }
-
-                        //We also want to turn off all header compression opt.
-                        for(; sendpacket[i] == 0x80 ;)
-                        {
-                                sendpacket[i + 1] = 0;
-                                i += (sendpacket[i + 2] << 8) + (sendpacket[i + 3]) + 4;
-                        }
-
-                        //Set the packet type to timer response
-                        sendpacket[34] = 0x01;
-
-                        printk(KERN_INFO "%s: Sending IPXWAN Timer Response\n",devname);
-                }
-                else if( sendpacket[34] == 0x02 )
-                {
-                        //This is an information request packet
-                        printk(KERN_INFO "%s: Received IPXWAN Information Request packet\n",devname);
-
-                        //Set the packet type to information response
-                        sendpacket[34] = 0x03;
-
-                        //Set the router name
-                        sendpacket[51] = 'P';
-                        sendpacket[52] = 'T';
-                        sendpacket[53] = 'P';
-                        sendpacket[54] = 'I';
-                        sendpacket[55] = 'P';
-                        sendpacket[56] = 'E';
-                        sendpacket[57] = '-';
-                        sendpacket[58] = CVHexToAscii(network_number >> 28);
-                        sendpacket[59] = CVHexToAscii((network_number & 0x0F000000)>> 24);
-                        sendpacket[60] = CVHexToAscii((network_number & 0x00F00000)>> 20);
-                        sendpacket[61] = CVHexToAscii((network_number & 0x000F0000)>> 16);
-                        sendpacket[62] = CVHexToAscii((network_number & 0x0000F000)>> 12);
-                        sendpacket[63] = CVHexToAscii((network_number & 0x00000F00)>> 8);
-                        sendpacket[64] = CVHexToAscii((network_number & 0x000000F0)>> 4);
-                        sendpacket[65] = CVHexToAscii(network_number & 0x0000000F);
-                        for(i = 66; i < 99; i+= 1)
-                        {
-                                sendpacket[i] = 0;
-                        }
-
-                        printk(KERN_INFO "%s: Sending IPXWAN Information Response packet\n",devname);
-                }
-                else
-                {
-                        printk(KERN_INFO "%s: Unknown IPXWAN packet!\n",devname);
-                        return 0;
-                }
-
-                //Set the WNodeID to our network address
-                sendpacket[35] = (unsigned char)(network_number >> 24);
-                sendpacket[36] = (unsigned char)((network_number & 0x00FF0000) >> 16);
-                sendpacket[37] = (unsigned char)((network_number & 0x0000FF00) >> 8);
-                sendpacket[38] = (unsigned char)(network_number & 0x000000FF);
-
-                return 1;
-        } else {
-                //If we get here it's an IPX-data packet, so it'll get passed up the stack.
-
-                //switch the network numbers
-                switch_net_numbers(sendpacket, network_number, 1);      
-                return 0;
-        }
-}
-
-/****** Background Polling Routines  ****************************************/
-
-/* All polling functions are invoked by the TIMER interrupt in the wpp_isr 
- * routine.  
- */
-
-/*============================================================================
- * Monitor active link phase.
- */
-static void process_route (sdla_t *card)
-{
-        ppp_flags_t *flags = card->flags;
-        struct net_device *dev = card->wandev.dev;
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        
-        if ((card->u.p.ip_mode == WANOPT_PPP_PEER) &&
-            (flags->ip_state == 0x09)){ 
-
-                /* We get ip_local from the firmware in PEER mode.
-                 * Therefore, if ip_local is 0, we failed to obtain
-                 * the remote IP address. */
-                if (ppp_priv_area->ip_local == 0) 
-                        return;
-                
-                printk(KERN_INFO "%s: IPCP State Opened.\n", card->devname);
-                if (read_info( card )) {
-                        printk(KERN_INFO 
-                                "%s: An error occurred in IP assignment.\n", 
-                                card->devname);
-                } else {
-                        struct in_device *in_dev = dev->ip_ptr;
-                        if (in_dev != NULL ) {
-                                struct in_ifaddr *ifa = in_dev->ifa_list;
-
-                                printk(KERN_INFO "%s: Assigned Lcl. Addr: %u.%u.%u.%u\n", 
-                                        card->devname, NIPQUAD(ifa->ifa_local));
-                                printk(KERN_INFO "%s: Assigned Rmt. Addr: %u.%u.%u.%u\n", 
-                                                card->devname, NIPQUAD(ifa->ifa_address));
-                        }else{
-                                printk(KERN_INFO 
-                                "%s: Error: Failed to add a route for PPP interface %s\n",
-                                        card->devname,dev->name);       
-                        }
-                }
-        }
-}
-
-/*============================================================================
- * Monitor physical link disconnected phase.
- *  o if interface is up and the hold-down timeout has expired, then retry
- *    connection.
- */
-static void retrigger_comm(sdla_t *card)
-{
-        struct net_device *dev = card->wandev.dev;
-
-        if (dev && ((jiffies - card->state_tick) > HOLD_DOWN_TIME)) {
-
-                wanpipe_set_state(card, WAN_CONNECTING);
-
-                if(ppp_comm_enable(card) == CMD_OK){
-                        init_ppp_tx_rx_buff( card );
-                }                
-        }
-}
-
-/****** Miscellaneous Functions *********************************************/
-
-/*============================================================================
- * Configure S508 adapter.
- */
-static int config508(struct net_device *dev, sdla_t *card)
-{
-        ppp508_conf_t cfg;
-        struct in_device *in_dev = dev->ip_ptr;
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-
-        /* Prepare PPP configuration structure */
-        memset(&cfg, 0, sizeof(ppp508_conf_t));
-
-        if (card->wandev.clocking)
-                cfg.line_speed = card->wandev.bps;
-
-        if (card->wandev.interface == WANOPT_RS232)
-                cfg.conf_flags |= INTERFACE_LEVEL_RS232;
-
-
-        cfg.conf_flags  |= DONT_TERMINATE_LNK_MAX_CONFIG; /*send Configure-Request packets forever*/
-        cfg.txbuf_percent       = PERCENT_TX_BUFF;      /* % of Tx bufs */
-        cfg.mtu_local           = card->wandev.mtu;
-        cfg.mtu_remote          = card->wandev.mtu;                  /*    Default   */
-        cfg.restart_tmr         = TIME_BETWEEN_CONF_REQ;             /*    30 = 3sec */
-        cfg.auth_rsrt_tmr       = TIME_BETWEEN_PAP_CHAP_REQ;         /*    30 = 3sec */
-        cfg.auth_wait_tmr       = WAIT_PAP_CHAP_WITHOUT_REPLY;       /*   300 = 30s  */
-        cfg.mdm_fail_tmr        = WAIT_AFTER_DCD_CTS_LOW;            /*     5 = 0.5s */
-        cfg.dtr_drop_tmr        = TIME_DCD_CTS_LOW_AFTER_LNK_DOWN;   /*    10 = 1s   */
-        cfg.connect_tmout       = WAIT_DCD_HIGH_AFTER_ENABLE_COMM;   /*   900 = 90s  */
-        cfg.conf_retry          = MAX_CONF_REQ_WITHOUT_REPLY;        /*    10 = 1s   */
-        cfg.term_retry          = MAX_TERM_REQ_WITHOUT_REPLY;        /*     2 times  */
-        cfg.fail_retry          = NUM_CONF_NAK_WITHOUT_REPLY;        /*     5 times  */
-        cfg.auth_retry          = NUM_AUTH_REQ_WITHOUT_REPLY;        /*     10 times */   
-
-
-        if( !card->u.p.authenticator ) {
-                printk(KERN_INFO "%s: Device is not configured as an authenticator\n", 
-                                card->devname);
-                cfg.auth_options = NO_AUTHENTICATION;
-        }else{
-                printk(KERN_INFO "%s: Device is configured as an authenticator\n", 
-                                card->devname);
-                cfg.auth_options = INBOUND_AUTH;
-        }
-
-        if( ppp_priv_area->pap == WANOPT_YES){
-                cfg.auth_options |=PAP_AUTH;
-                printk(KERN_INFO "%s: Pap enabled\n", card->devname);
-        }
-        if( ppp_priv_area->chap == WANOPT_YES){
-                cfg.auth_options |= CHAP_AUTH;
-                printk(KERN_INFO "%s: Chap enabled\n", card->devname);
-        }
-
-
-        if (ppp_priv_area->enable_IPX == WANOPT_YES){
-                printk(KERN_INFO "%s: Enabling IPX Protocol\n",card->devname);
-                cfg.ipx_options         = ENABLE_IPX | ROUTING_PROT_DEFAULT;
-        }else{
-                cfg.ipx_options         = DISABLE_IPX;
-        }
-
-        switch (card->u.p.ip_mode) {
-        
-                case WANOPT_PPP_STATIC:
-
-                        printk(KERN_INFO "%s: PPP IP Mode: STATIC\n",card->devname);
-                        cfg.ip_options          = L_AND_R_IP_NO_ASSIG | 
-                                                            ENABLE_IP;
-                        cfg.ip_local            = in_dev->ifa_list->ifa_local;
-                        cfg.ip_remote           = in_dev->ifa_list->ifa_address;
-                        /* Debugging code used to check that IP addresses
-                         * obtained from the kernel are correct */
-
-                        NEX_PRINTK(KERN_INFO "Local %u.%u.%u.%u Remote %u.%u.%u.%u Name %s\n",
-                                        NIPQUAD(ip_local),NIPQUAD(ip_remote), dev->name);
-                        break;
-
-                case WANOPT_PPP_HOST:
-
-                        printk(KERN_INFO "%s: PPP IP Mode: HOST\n",card->devname);
-                        cfg.ip_options          = L_IP_LOCAL_ASSIG |
-                                                  R_IP_LOCAL_ASSIG | 
-                                                  ENABLE_IP;
-                        cfg.ip_local            = in_dev->ifa_list->ifa_local;
-                        cfg.ip_remote           = in_dev->ifa_list->ifa_address;
-                        /* Debugging code used to check that IP addresses
-                         * obtained from the kernel are correct */
-                        NEX_PRINTK (KERN_INFO "Local %u.%u.%u.%u Remote %u.%u.%u.%u Name %s\n",
-                                        NIPQUAD(ip_local),NIPQUAD(ip_remote), dev->name);
-                        
-                        break;
-        
-                case WANOPT_PPP_PEER:
-
-                        printk(KERN_INFO "%s: PPP IP Mode: PEER\n",card->devname);
-                        cfg.ip_options          = L_IP_REMOTE_ASSIG | 
-                                                  R_IP_REMOTE_ASSIG | 
-                                                          ENABLE_IP;
-                        cfg.ip_local            = 0x00;
-                        cfg.ip_remote           = 0x00;
-                        break;
-
-                default:
-                        printk(KERN_INFO "%s: ERROR: Unsupported PPP Mode Selected\n",
-                                        card->devname);
-                        printk(KERN_INFO "%s:        PPP IP Modes: STATIC, PEER or HOST\n",
-                                        card->devname); 
-                        return 1;
-        }
-
-        return ppp_configure(card, &cfg);
-}
-
-/*============================================================================
- * Show disconnection cause.
- */
-static void show_disc_cause(sdla_t *card, unsigned cause)
-{
-        if (cause & 0x0802) 
-
-                printk(KERN_INFO "%s: link terminated by peer\n", 
-                        card->devname);
-
-        else if (cause & 0x0004) 
-
-                printk(KERN_INFO "%s: link terminated by user\n", 
-                        card->devname);
-
-        else if (cause & 0x0008) 
-
-                printk(KERN_INFO "%s: authentication failed\n", card->devname);
-        
-        else if (cause & 0x0010) 
-
-                printk(KERN_INFO 
-                        "%s: authentication protocol negotiation failed\n", 
-                        card->devname);
-
-        else if (cause & 0x0020) 
-                
-                printk(KERN_INFO
-                "%s: peer's request for authentication rejected\n",
-                card->devname);
-
-        else if (cause & 0x0040) 
-        
-                printk(KERN_INFO "%s: MRU option rejected by peer\n", 
-                card->devname);
-
-        else if (cause & 0x0080) 
-        
-                printk(KERN_INFO "%s: peer's MRU was too small\n", 
-                card->devname);
-
-        else if (cause & 0x0100) 
-
-                printk(KERN_INFO "%s: failed to negotiate peer's LCP options\n",
-                card->devname);
-
-        else if (cause & 0x0200) 
-                
-                printk(KERN_INFO "%s: failed to negotiate peer's IPCP options\n"
-                , card->devname);
-
-        else if (cause & 0x0400) 
-
-                printk(KERN_INFO 
-                        "%s: failed to negotiate peer's IPXCP options\n",
-                        card->devname);
-}
-
-/*=============================================================================
- * Process UDP call of type PTPIPEAB.
- */
-static void process_udp_mgmt_pkt(sdla_t *card, struct net_device *dev, 
-                                 ppp_private_area_t *ppp_priv_area ) 
-{
-        unsigned char buf2[5];
-        unsigned char *buf;
-        unsigned int frames, len;
-        struct sk_buff *new_skb;
-        unsigned short data_length, buffer_length, real_len;
-        unsigned long data_ptr;
-        int udp_mgmt_req_valid = 1;
-        ppp_mbox_t *mbox = card->mbox;
-        struct timeval tv;
-        int err;
-        ppp_udp_pkt_t *ppp_udp_pkt = (ppp_udp_pkt_t*)&ppp_priv_area->udp_pkt_data;
-
-        memcpy(&buf2, &card->wandev.udp_port, 2 );
-
-
-        if(ppp_priv_area->udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-
-                switch(ppp_udp_pkt->cblock.command) {
-
-                        case PPIPE_GET_IBA_DATA:
-                        case PPP_READ_CONFIG:
-                        case PPP_GET_CONNECTION_INFO:
-                        case PPIPE_ROUTER_UP_TIME:
-                        case PPP_READ_STATISTICS:
-                        case PPP_READ_ERROR_STATS:
-                        case PPP_READ_PACKET_STATS:
-                        case PPP_READ_LCP_STATS:
-                        case PPP_READ_IPCP_STATS:
-                        case PPP_READ_IPXCP_STATS:
-                        case PPP_READ_PAP_STATS:
-                        case PPP_READ_CHAP_STATS:
-                        case PPP_READ_CODE_VERSION:
-                                udp_mgmt_req_valid = 1;
-                                break;
-                           
-                        default:
-                                udp_mgmt_req_valid = 0;
-                                break;
-                } 
-        }
-        
-        if(!udp_mgmt_req_valid) {
-            
-                /* set length to 0 */
-                ppp_udp_pkt->cblock.length = 0x00;
-
-                /* set return code */
-                ppp_udp_pkt->cblock.result = 0xCD; 
-                ++ppp_priv_area->pipe_mgmt_stat.UDP_PIPE_mgmt_direction_err;
-        
-                if (net_ratelimit()){   
-                        printk(KERN_INFO 
-                        "%s: Warning, Illegal UDP command attempted from network: %x\n",
-                        card->devname,ppp_udp_pkt->cblock.command);
-                }
-        } else {
-                /* Initialize the trace element */
-                trace_element_t trace_element;              
-
-                switch (ppp_udp_pkt->cblock.command){
-
-                /* PPIPE_ENABLE_TRACING */
-                case PPIPE_ENABLE_TRACING:
-                        if (!card->TracingEnabled) {
-                        
-                                /* OPERATE_DATALINE_MONITOR */
-                                mbox->cmd.command = PPP_DATALINE_MONITOR;
-                                mbox->cmd.length = 0x01;
-                                mbox->data[0] = ppp_udp_pkt->data[0];
-                                err = sdla_exec(mbox) ? 
-                                        mbox->cmd.result : CMD_TIMEOUT;
-           
-                                if (err != CMD_OK) { 
-                                        
-                                        ppp_error(card, err, mbox);
-                                        card->TracingEnabled = 0;
-                                
-                                        /* set the return code */
-
-                                        ppp_udp_pkt->cblock.result = mbox->cmd.result;
-                                        mbox->cmd.length = 0;
-                                        break;
-                                } 
-
-                                sdla_peek(&card->hw, 0xC000, &buf2, 2);
-                    
-                                ppp_priv_area->curr_trace_addr = 0;
-                                memcpy(&ppp_priv_area->curr_trace_addr, &buf2, 2);
-                                ppp_priv_area->start_trace_addr = 
-                                                ppp_priv_area->curr_trace_addr;
-                                ppp_priv_area->end_trace_addr = 
-                                        ppp_priv_area->start_trace_addr + END_OFFSET;
-                        
-                                /* MAX_SEND_BUFFER_SIZE - 28 (IP header) 
-                                   - 32 (ppipemon CBLOCK) */
-                                available_buffer_space = MAX_LGTH_UDP_MGNT_PKT - 
-                                                         sizeof(ip_pkt_t)-
-                                                         sizeof(udp_pkt_t)-
-                                                         sizeof(wp_mgmt_t)-
-                                                         sizeof(cblock_t);
-                        }
-                        ppp_udp_pkt->cblock.result = 0;
-                        mbox->cmd.length = 0;
-                        card->TracingEnabled = 1;
-                        break;
-           
-                /* PPIPE_DISABLE_TRACING */
-                case PPIPE_DISABLE_TRACING:
-                        
-                        if(card->TracingEnabled) {
-                        
-                                /* OPERATE_DATALINE_MONITOR */
-                                mbox->cmd.command = 0x33;
-                                mbox->cmd.length = 1;
-                                mbox->data[0] = 0x00;
-                                err = sdla_exec(mbox) ? 
-                                        mbox->cmd.result : CMD_TIMEOUT;
-                  
-                        } 
-                
-                        /*set return code*/
-                        ppp_udp_pkt->cblock.result = 0;
-                        mbox->cmd.length = 0;
-                        card->TracingEnabled = 0;
-                        break;
-           
-                /* PPIPE_GET_TRACE_INFO */
-                case PPIPE_GET_TRACE_INFO:
-
-                        if(!card->TracingEnabled) {
-                                /* set return code */
-                                ppp_udp_pkt->cblock.result = 1;
-                                mbox->cmd.length = 0;
-                        }                   
-
-                        buffer_length = 0;
-                        
-                        /* frames < 62, where 62 is the number of trace
-                           information elements.  There is in total 496
-                           bytes of space and each trace information
-                           element is 8 bytes. 
-                         */
-                        for ( frames=0; frames<62; frames++) {
-        
-                                trace_pkt_t *trace_pkt = (trace_pkt_t *)
-                                        &ppp_udp_pkt->data[buffer_length];
-        
-                                /* Read the whole trace packet */
-                                sdla_peek(&card->hw, ppp_priv_area->curr_trace_addr, 
-                                          &trace_element, sizeof(trace_element_t));
-        
-                                /* no data on board so exit */
-                                if( trace_element.opp_flag == 0x00 ) 
-                                        break;
-              
-                                data_ptr = trace_element.trace_data_ptr;
-
-                                /* See if there is actual data on the trace buffer */
-                                if (data_ptr){
-                                        data_length = trace_element.trace_length;
-                                }else{
-                                        data_length = 0;
-                                        ppp_udp_pkt->data[0] |= 0x02;
-                                }
-
-                                //FIXME: Do we need this check
-                                if ((available_buffer_space - buffer_length) 
-                                     < (sizeof(trace_element_t)+1)){
-                                        
-                                        /*indicate we have more frames 
-                                         * on board and exit 
-                                         */
-                                        ppp_udp_pkt->data[0] |= 0x02;
-                                        break;
-                                }
-                                
-                                trace_pkt->status = trace_element.trace_type;
-                                trace_pkt->time_stamp = trace_element.trace_time_stamp;
-                                trace_pkt->real_length = trace_element.trace_length;
-
-                                real_len = trace_element.trace_length;  
-                                
-                                if(data_ptr == 0){
-                                        trace_pkt->data_avail = 0x00;
-                                }else{
-                                        /* we can take it next time */
-                                        if ((available_buffer_space - buffer_length)<
-                                                (real_len + sizeof(trace_pkt_t))){
-                                        
-                                                ppp_udp_pkt->data[0] |= 0x02;
-                                                break;
-                                        } 
-                                        trace_pkt->data_avail = 0x01;
-                                
-                                        /* get the data */
-                                        sdla_peek(&card->hw, data_ptr, 
-                                                  &trace_pkt->data,
-                                                  real_len);
-                                }       
-                                /* zero the opp flag to 
-                                   show we got the frame */
-                                buf2[0] = 0x00;
-                                sdla_poke(&card->hw, ppp_priv_area->curr_trace_addr,
-                                          &buf2, 1);
-
-                                /* now move onto the next 
-                                   frame */
-                                ppp_priv_area->curr_trace_addr += 8;
-
-                                /* check if we passed the last address */
-                                if ( ppp_priv_area->curr_trace_addr >= 
-                                        ppp_priv_area->end_trace_addr){
-
-                                        ppp_priv_area->curr_trace_addr = 
-                                                ppp_priv_area->start_trace_addr;
-                                }
- 
-                                /* update buffer length and make sure its even */ 
-
-                                if ( trace_pkt->data_avail == 0x01 ) {
-                                        buffer_length += real_len - 1;
-                                }
- 
-                                /* for the header */
-                                buffer_length += 8;
-
-                                if( buffer_length & 0x0001 )
-                                        buffer_length += 1;
-                        }
-
-                        /* ok now set the total number of frames passed
-                           in the high 5 bits */
-                        ppp_udp_pkt->data[0] |= (frames << 2);
-         
-                        /* set the data length */
-                        mbox->cmd.length = buffer_length;
-                        ppp_udp_pkt->cblock.length = buffer_length;
-         
-                        /* set return code */
-                        ppp_udp_pkt->cblock.result = 0;
-                        break;
-
-                /* PPIPE_GET_IBA_DATA */
-                case PPIPE_GET_IBA_DATA:
-                
-                        mbox->cmd.length = 0x09;
-                
-                        sdla_peek(&card->hw, 0xF003, &ppp_udp_pkt->data, 
-                                        mbox->cmd.length);
-                
-                        /* set the length of the data */
-                        ppp_udp_pkt->cblock.length = 0x09;
-
-                        /* set return code */
-                        ppp_udp_pkt->cblock.result = 0x00;
-                        ppp_udp_pkt->cblock.result = 0;
-                        break;
-
-                /* PPIPE_FT1_READ_STATUS */
-                case PPIPE_FT1_READ_STATUS:
-                        sdla_peek(&card->hw, 0xF020, &ppp_udp_pkt->data[0], 2);
-                        ppp_udp_pkt->cblock.length = mbox->cmd.length = 2;
-                        ppp_udp_pkt->cblock.result = 0;
-                        break;
-                
-                case PPIPE_FLUSH_DRIVER_STATS:   
-                        init_ppp_priv_struct( ppp_priv_area );
-                        init_global_statistics( card );
-                        mbox->cmd.length = 0;
-                        ppp_udp_pkt->cblock.result = 0;
-                        break;
-
-                
-                case PPIPE_ROUTER_UP_TIME:
-
-                        do_gettimeofday( &tv );
-                        ppp_priv_area->router_up_time = tv.tv_sec - 
-                                        ppp_priv_area->router_start_time;
-                        *(unsigned long *)&ppp_udp_pkt->data = ppp_priv_area->router_up_time;
-                        mbox->cmd.length = 4;
-                        ppp_udp_pkt->cblock.result = 0;
-                        break;
-
-                                /* PPIPE_DRIVER_STATISTICS */   
-                case PPIPE_DRIVER_STAT_IFSEND:
-                        memcpy(&ppp_udp_pkt->data, &ppp_priv_area->if_send_stat, 
-                                sizeof(if_send_stat_t));
-
-
-                        ppp_udp_pkt->cblock.result = 0;
-                        ppp_udp_pkt->cblock.length = sizeof(if_send_stat_t);
-                        mbox->cmd.length = sizeof(if_send_stat_t);      
-                        break;
-
-                case PPIPE_DRIVER_STAT_INTR:
-                        memcpy(&ppp_udp_pkt->data, &card->statistics, 
-                                sizeof(global_stats_t));
-
-                        memcpy(&ppp_udp_pkt->data+sizeof(global_stats_t),
-                                &ppp_priv_area->rx_intr_stat,
-                                sizeof(rx_intr_stat_t));
-
-                        ppp_udp_pkt->cblock.result = 0;
-                        ppp_udp_pkt->cblock.length = sizeof(global_stats_t)+
-                                                     sizeof(rx_intr_stat_t);
-                        mbox->cmd.length = ppp_udp_pkt->cblock.length;
-                        break;
-
-                case PPIPE_DRIVER_STAT_GEN:
-                        memcpy( &ppp_udp_pkt->data,
-                                &ppp_priv_area->pipe_mgmt_stat,
-                                sizeof(pipe_mgmt_stat_t));
-
-                        memcpy(&ppp_udp_pkt->data+sizeof(pipe_mgmt_stat_t), 
-                               &card->statistics, sizeof(global_stats_t));
-
-                        ppp_udp_pkt->cblock.result = 0;
-                        ppp_udp_pkt->cblock.length = sizeof(global_stats_t)+
-                                                     sizeof(rx_intr_stat_t);
-                        mbox->cmd.length = ppp_udp_pkt->cblock.length;
-                        break;
-
-
-                /* FT1 MONITOR STATUS */
-                case FT1_MONITOR_STATUS_CTRL:
-        
-                        /* Enable FT1 MONITOR STATUS */
-                        if( ppp_udp_pkt->data[0] == 1) {
-                        
-                                if( rCount++ != 0 ) {
-                                        ppp_udp_pkt->cblock.result = 0;
-                                        mbox->cmd.length = 1;
-                                        break;
-                                }       
-                        }
-
-                        /* Disable FT1 MONITOR STATUS */
-                        if( ppp_udp_pkt->data[0] == 0) {
-
-                                if( --rCount != 0) {
-                                        ppp_udp_pkt->cblock.result = 0;
-                                        mbox->cmd.length = 1;
-                                        break;
-                                } 
-                        }       
-                        goto udp_dflt_cmd;
-                        
-                /* WARNING: FIXME: This should be fixed.
-                 * The FT1 Status Ctrl doesn't have a break
-                 * statment.  Thus, no code must be inserted
-                 * HERE: between default and above case statement */
-
-                default:
-udp_dflt_cmd:
-                
-                        /* it's a board command */
-                        mbox->cmd.command = ppp_udp_pkt->cblock.command;
-                        mbox->cmd.length = ppp_udp_pkt->cblock.length;
- 
-                        if(mbox->cmd.length) {
-                                memcpy(&mbox->data,(unsigned char *)ppp_udp_pkt->data,
-                                       mbox->cmd.length);
-                        } 
-                  
-                        /* run the command on the board */
-                        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-                
-                        if (err != CMD_OK) {
-                
-                                ppp_error(card, err, mbox);
-                                ++ppp_priv_area->pipe_mgmt_stat.
-                                         UDP_PIPE_mgmt_adptr_cmnd_timeout;
-                                break;
-                        }
-                  
-                        ++ppp_priv_area->pipe_mgmt_stat.UDP_PIPE_mgmt_adptr_cmnd_OK;
-                
-                        /* copy the result back to our buffer */
-                        memcpy(&ppp_udp_pkt->cblock,mbox, sizeof(cblock_t));
-                  
-                        if(mbox->cmd.length) {
-                                memcpy(&ppp_udp_pkt->data,&mbox->data,mbox->cmd.length);
-                        } 
-
-                } /* end of switch */
-        } /* end of else */
-
-        /* Fill UDP TTL */
-        ppp_udp_pkt->ip_pkt.ttl = card->wandev.ttl; 
-        len = reply_udp(ppp_priv_area->udp_pkt_data, mbox->cmd.length);
-
-        if (ppp_priv_area->udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-
-                /* Make sure we are not already sending */
-                if (!test_bit(SEND_CRIT,&card->wandev.critical)){
-                        ++ppp_priv_area->pipe_mgmt_stat.UDP_PIPE_mgmt_passed_to_adptr;
-                        ppp_send(card,ppp_priv_area->udp_pkt_data,len,ppp_priv_area->protocol);
-                }
-
-        } else {        
-        
-                /* Pass it up the stack
-                   Allocate socket buffer */
-                if ((new_skb = dev_alloc_skb(len)) != NULL) {
-                
-                        /* copy data into new_skb */
-
-                        buf = skb_put(new_skb, len);
-                        memcpy(buf,ppp_priv_area->udp_pkt_data, len);
-
-                        ++ppp_priv_area->pipe_mgmt_stat.UDP_PIPE_mgmt_passed_to_stack;
-                        
-                        /* Decapsulate packet and pass it up the protocol 
-                           stack */
-                        new_skb->protocol = htons(ETH_P_IP);
-                        new_skb->dev = dev;
-                        new_skb->mac.raw  = new_skb->data;
-                        netif_rx(new_skb);
-                        dev->last_rx = jiffies;
-                
-                } else {
-                
-                        ++ppp_priv_area->pipe_mgmt_stat.UDP_PIPE_mgmt_no_socket;
-                        printk(KERN_INFO "no socket buffers available!\n");
-                }
-        }       
-
-        ppp_priv_area->udp_pkt_lgth = 0;
-        
-        return; 
-}
-
-/*=============================================================================
- * Initial the ppp_private_area structure.
- */
-static void init_ppp_priv_struct( ppp_private_area_t *ppp_priv_area )
-{
-
-        memset(&ppp_priv_area->if_send_stat, 0, sizeof(if_send_stat_t));
-        memset(&ppp_priv_area->rx_intr_stat, 0, sizeof(rx_intr_stat_t));
-        memset(&ppp_priv_area->pipe_mgmt_stat, 0, sizeof(pipe_mgmt_stat_t));    
-}
-
-/*============================================================================
- * Initialize Global Statistics
- */
-static void init_global_statistics( sdla_t *card )
-{
-        memset(&card->statistics, 0, sizeof(global_stats_t));
-}
-
-/*============================================================================
- * Initialize Receive and Transmit Buffers.
- */
-static void init_ppp_tx_rx_buff( sdla_t *card )
-{
-        ppp508_buf_info_t* info;
-
-        if (card->hw.type == SDLA_S514) {
-                
-                info = (void*)(card->hw.dpmbase + PPP514_BUF_OFFS);
-
-                card->u.p.txbuf_base = (void*)(card->hw.dpmbase +
-                        info->txb_ptr);
-
-                card->u.p.txbuf_last = (ppp_buf_ctl_t*)card->u.p.txbuf_base +
-                        (info->txb_num - 1);
-
-                card->u.p.rxbuf_base = (void*)(card->hw.dpmbase +
-                        info->rxb_ptr);
-
-                card->u.p.rxbuf_last = (ppp_buf_ctl_t*)card->u.p.rxbuf_base +
-                        (info->rxb_num - 1);
-
-        } else {
-                
-                info = (void*)(card->hw.dpmbase + PPP508_BUF_OFFS);
-
-                card->u.p.txbuf_base = (void*)(card->hw.dpmbase +
-                        (info->txb_ptr - PPP508_MB_VECT));
-
-                card->u.p.txbuf_last = (ppp_buf_ctl_t*)card->u.p.txbuf_base +
-                        (info->txb_num - 1);
-
-                card->u.p.rxbuf_base = (void*)(card->hw.dpmbase +
-                        (info->rxb_ptr - PPP508_MB_VECT));
-
-                card->u.p.rxbuf_last = (ppp_buf_ctl_t*)card->u.p.rxbuf_base +
-                        (info->rxb_num - 1);
-        }
-
-        card->u.p.txbuf_next = (unsigned long*)&info->txb_nxt; 
-        card->u.p.rxbuf_next = (unsigned long*)&info->rxb1_ptr;
-
-        card->u.p.rx_base = info->rxb_base;
-        card->u.p.rx_top  = info->rxb_end;
-      
-        card->u.p.txbuf = card->u.p.txbuf_base;
-        card->rxmb = card->u.p.rxbuf_base;
-
-}
-
-/*=============================================================================
- * Read Connection Information (ie for Remote IP address assginment).
- * Called when ppp interface connected.
- */
-static int read_info( sdla_t *card )
-{
-        struct net_device *dev = card->wandev.dev;
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        int err;
-
-        struct ifreq if_info;
-        struct sockaddr_in *if_data1, *if_data2;
-        mm_segment_t fs;
-
-        /* Set Local and remote addresses */
-        memset(&if_info, 0, sizeof(if_info));
-        strcpy(if_info.ifr_name, dev->name);
-
-
-        fs = get_fs();
-        set_fs(get_ds());     /* get user space block */ 
-
-        /* Change the local and remote ip address of the interface.
-         * This will also add in the destination route.
-         */     
-        if_data1 = (struct sockaddr_in *)&if_info.ifr_addr;
-        if_data1->sin_addr.s_addr = ppp_priv_area->ip_local;
-        if_data1->sin_family = AF_INET;
-        err = devinet_ioctl( SIOCSIFADDR, &if_info );
-        if_data2 = (struct sockaddr_in *)&if_info.ifr_dstaddr;
-        if_data2->sin_addr.s_addr = ppp_priv_area->ip_remote;
-        if_data2->sin_family = AF_INET;
-        err = devinet_ioctl( SIOCSIFDSTADDR, &if_info );
-
-        set_fs(fs);           /* restore old block */
-        
-        if (err) {
-                printk (KERN_INFO "%s: Adding of route failed: %i\n",
-                        card->devname,err);
-                printk (KERN_INFO "%s:  Local : %u.%u.%u.%u\n",
-                        card->devname,NIPQUAD(ppp_priv_area->ip_local));
-                printk (KERN_INFO "%s:  Remote: %u.%u.%u.%u\n",
-                        card->devname,NIPQUAD(ppp_priv_area->ip_remote));
-        }
-        return err;
-}
-
-/*=============================================================================
- * Remove Dynamic Route.
- * Called when ppp interface disconnected.
- */
-
-static void remove_route( sdla_t *card )
-{
-
-        struct net_device *dev = card->wandev.dev;
-        long ip_addr;
-        int err;
-
-        mm_segment_t fs;
-        struct ifreq if_info;
-        struct sockaddr_in *if_data1;
-        struct in_device *in_dev = dev->ip_ptr;
-        struct in_ifaddr *ifa = in_dev->ifa_list;       
-
-        ip_addr = ifa->ifa_local;
-
-        /* Set Local and remote addresses */
-        memset(&if_info, 0, sizeof(if_info));
-        strcpy(if_info.ifr_name, dev->name);
-
-        fs = get_fs();
-        set_fs(get_ds());     /* get user space block */ 
-
-        /* Change the local ip address of the interface to 0.
-         * This will also delete the destination route.
-         */     
-        if_data1 = (struct sockaddr_in *)&if_info.ifr_addr;
-        if_data1->sin_addr.s_addr = 0;
-        if_data1->sin_family = AF_INET;
-        err = devinet_ioctl( SIOCSIFADDR, &if_info );
-
-        set_fs(fs);           /* restore old block */
-
-        
-        if (err) {
-                printk (KERN_INFO "%s: Deleting dynamic route failed %d!\n",
-                         card->devname, err);
-                return;
-        }else{
-                printk (KERN_INFO "%s: PPP Deleting dynamic route %u.%u.%u.%u successfuly\n",
-                        card->devname, NIPQUAD(ip_addr));
-        }
-        return;
-}
-
-/*=============================================================================
- * Perform the Interrupt Test by running the READ_CODE_VERSION command MAX_INTR
- * _TEST_COUNTER times.
- */
-static int intr_test( sdla_t *card )
-{
-        ppp_mbox_t *mb = card->mbox;
-        int err,i;
-
-        err = ppp_set_intr_mode( card, 0x08 );
-        
-        if (err == CMD_OK) { 
-                
-                for (i = 0; i < MAX_INTR_TEST_COUNTER; i ++) {  
-                        /* Run command READ_CODE_VERSION */
-                        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-                        mb->cmd.length  = 0;
-                        mb->cmd.command = PPP_READ_CODE_VERSION;
-                        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-                        if (err != CMD_OK) 
-                                ppp_error(card, err, mb);
-                }
-        }
-        else return err;
-
-        err = ppp_set_intr_mode( card, 0 );
-        if (err != CMD_OK) 
-                return err;
-
-        return 0;
-}
-
-/*==============================================================================
- * Determine what type of UDP call it is. DRVSTATS or PTPIPEAB ?
- */
-static int udp_pkt_type( struct sk_buff *skb, sdla_t *card )
-{
-        unsigned char *sendpacket;
-        unsigned char buf2[5]; 
-        ppp_udp_pkt_t *ppp_udp_pkt = (ppp_udp_pkt_t *)skb->data; 
-        
-        sendpacket = skb->data;
-        memcpy(&buf2, &card->wandev.udp_port, 2);
-        
-        if(     ppp_udp_pkt->ip_pkt.ver_inet_hdr_length  == 0x45 &&        /* IP packet */ 
-                sendpacket[9]  == 0x11 &&        /* UDP packet */
-                sendpacket[22] == buf2[1] &&     /* UDP Port */
-                sendpacket[23] == buf2[0] &&
-                sendpacket[36] == 0x01 ) {
-        
-                if (    sendpacket[28] == 0x50 &&    /* PTPIPEAB: Signature */ 
-                        sendpacket[29] == 0x54 &&      
-                        sendpacket[30] == 0x50 &&      
-                        sendpacket[31] == 0x49 &&      
-                        sendpacket[32] == 0x50 &&      
-                        sendpacket[33] == 0x45 &&      
-                        sendpacket[34] == 0x41 &&      
-                        sendpacket[35] == 0x42 ){ 
-
-                        return UDP_PTPIPE_TYPE;
-        
-                } else if(sendpacket[28] == 0x44 &&  /* DRVSTATS: Signature */
-                        sendpacket[29] == 0x52 &&      
-                        sendpacket[30] == 0x56 &&      
-                        sendpacket[31] == 0x53 &&      
-                        sendpacket[32] == 0x54 &&      
-                        sendpacket[33] == 0x41 &&      
-                        sendpacket[34] == 0x54 &&      
-                        sendpacket[35] == 0x53 ){
-        
-                        return UDP_DRVSTATS_TYPE;
-
-                } else
-                        return UDP_INVALID_TYPE;
-
-        } else
-                return UDP_INVALID_TYPE;
-
-}
-
-/*============================================================================
- * Check to see if the packet to be transmitted contains a broadcast or
- * multicast source IP address.
- */
-
-static int chk_bcast_mcast_addr(sdla_t *card, struct net_device* dev,
-                                struct sk_buff *skb)
-{
-        u32 src_ip_addr;
-        u32 broadcast_ip_addr = 0;
-        struct in_device *in_dev;
-
-        /* read the IP source address from the outgoing packet */
-        src_ip_addr = *(u32 *)(skb->data + 12);
-
-        /* read the IP broadcast address for the device */
-        in_dev = dev->ip_ptr;
-        if(in_dev != NULL) {
-                struct in_ifaddr *ifa= in_dev->ifa_list;
-                if(ifa != NULL)
-                        broadcast_ip_addr = ifa->ifa_broadcast;
-                else
-                        return 0;
-        }
- 
-        /* check if the IP Source Address is a Broadcast address */
-        if((dev->flags & IFF_BROADCAST) && (src_ip_addr == broadcast_ip_addr)) {
-                printk(KERN_INFO "%s: Broadcast Source Address silently discarded\n",
-                                card->devname);
-                return 1;
-        } 
-
-        /* check if the IP Source Address is a Multicast address */
-        if((ntohl(src_ip_addr) >= 0xE0000001) &&
-                (ntohl(src_ip_addr) <= 0xFFFFFFFE)) {
-                printk(KERN_INFO "%s: Multicast Source Address silently discarded\n",
-                                card->devname);
-                return 1;
-        }
-
-        return 0;
-}
-
-void s508_lock (sdla_t *card, unsigned long *smp_flags)
-{
-        spin_lock_irqsave(&card->wandev.lock, *smp_flags);
-}
-
-void s508_unlock (sdla_t *card, unsigned long *smp_flags)
-{
-        spin_unlock_irqrestore(&card->wandev.lock, *smp_flags);
-}
-
-static int read_connection_info (sdla_t *card)
-{
-        ppp_mbox_t *mb = card->mbox;
-        struct net_device *dev = card->wandev.dev;
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-        ppp508_connect_info_t *ppp508_connect_info;
-        int err;
-
-        memset(&mb->cmd, 0, sizeof(ppp_cmd_t));
-        mb->cmd.length  = 0;
-        mb->cmd.command = PPP_GET_CONNECTION_INFO;
-        err = sdla_exec(mb) ? mb->cmd.result : CMD_TIMEOUT;
-
-        if (err != CMD_OK) { 
-                ppp_error(card, err, mb);
-                ppp_priv_area->ip_remote = 0;
-                ppp_priv_area->ip_local = 0;
-        }
-        else {
-                ppp508_connect_info = (ppp508_connect_info_t *)mb->data;
-                ppp_priv_area->ip_remote = ppp508_connect_info->ip_remote;
-                ppp_priv_area->ip_local = ppp508_connect_info->ip_local;
-
-                NEX_PRINTK(KERN_INFO "READ CONNECTION GOT IP ADDRESS %x, %x\n",
-                                ppp_priv_area->ip_remote,
-                                ppp_priv_area->ip_local);
-        }
-
-        return err;
-}
-
-/*===============================================================================
- * config_ppp
- *
- *      Configure the ppp protocol and enable communications.           
- *
- *      The if_open function binds this function to the poll routine.
- *      Therefore, this function will run every time the ppp interface
- *      is brought up.  
- *      
- *      If the communications are not enabled, proceed to configure
- *      the card and enable communications.
- *
- *      If the communications are enabled, it means that the interface
- *      was shutdown by ether the user or driver. In this case, we 
- *      have to check that the IP addresses have not changed.  If
- *      the IP addresses changed, we have to reconfigure the firmware
- *      and update the changed IP addresses.  Otherwise, just exit.
- */
-static int config_ppp (sdla_t *card)
-{
-
-        struct net_device *dev = card->wandev.dev;
-        ppp_flags_t *flags = card->flags;
-        ppp_private_area_t *ppp_priv_area = dev->priv;
-
-        if (card->u.p.comm_enabled){
-
-                if (ppp_priv_area->ip_local_tmp != ppp_priv_area->ip_local ||
-                    ppp_priv_area->ip_remote_tmp != ppp_priv_area->ip_remote){
-                        
-                        /* The IP addersses have changed, we must
-                         * stop the communications and reconfigure
-                         * the card. Reason: the firmware must know
-                         * the local and remote IP addresses. */
-                        disable_comm(card);
-                        wanpipe_set_state(card, WAN_DISCONNECTED);
-                        printk(KERN_INFO 
-                                "%s: IP addresses changed!\n",
-                                        card->devname);
-                        printk(KERN_INFO "%s: Restarting communications ...\n",
-                                        card->devname);
-                }else{ 
-                        /* IP addresses are the same and the link is up, 
-                         * we don't have to do anything here. Therefore, exit */
-                        return 0;
-                }
-        }
-
-        /* Record the new IP addreses */
-        ppp_priv_area->ip_local = ppp_priv_area->ip_local_tmp;
-        ppp_priv_area->ip_remote = ppp_priv_area->ip_remote_tmp;
-
-        if (config508(dev, card)){
-                printk(KERN_INFO "%s: Failed to configure PPP device\n",
-                        card->devname);
-                return 0;
-        }
-
-        if (ppp_set_intr_mode(card, PPP_INTR_RXRDY|
-                                        PPP_INTR_TXRDY|
-                                        PPP_INTR_MODEM|
-                                        PPP_INTR_DISC |
-                                        PPP_INTR_OPEN |
-                                        PPP_INTR_DROP_DTR |
-                                        PPP_INTR_TIMER)) {
-
-                printk(KERN_INFO "%s: Failed to configure board interrupts !\n", 
-                        card->devname);
-                return 0;
-        }
-
-        /* Turn off the transmit and timer interrupt */
-        flags->imask &= ~(PPP_INTR_TXRDY | PPP_INTR_TIMER) ;
-
-
-        /* If you are not the authenticator and any one of the protocol is 
-         * enabled then we call the set_out_bound_authentication.
-         */
-        if ( !card->u.p.authenticator  && (ppp_priv_area->pap || ppp_priv_area->chap)) {
-                if ( ppp_set_outbnd_auth(card, ppp_priv_area) ){
-                        printk(KERN_INFO "%s: Outbound authentication failed !\n",
-                                card->devname);
-                        return 0;
-                }
-        } 
-        
-        /* If you are the authenticator and any one of the protocol is enabled
-         * then we call the set_in_bound_authentication.
-         */
-        if (card->u.p.authenticator && (ppp_priv_area->pap || ppp_priv_area->chap)){
-                if (ppp_set_inbnd_auth(card, ppp_priv_area)){
-                        printk(KERN_INFO "%s: Inbound authentication failed !\n",
-                                card->devname); 
-                        return 0;
-                }
-        }
-
-        /* If we fail to enable communications here it's OK,
-         * since the DTR timer will cause a disconnected, which
-         * will retrigger communication in timer_intr() */
-        if (ppp_comm_enable(card) == CMD_OK) {
-                wanpipe_set_state(card, WAN_CONNECTING);
-                init_ppp_tx_rx_buff(card);
-        }
-
-        return 0; 
-}
-
-/*============================================================
- * ppp_poll
- *      
- * Rationale:
- *      We cannot manipulate the routing tables, or
- *      ip addresses withing the interrupt. Therefore
- *      we must perform such actons outside an interrupt 
- *      at a later time. 
- *
- * Description: 
- *      PPP polling routine, responsible for 
- *      shutting down interfaces upon disconnect
- *      and adding/removing routes. 
- *      
- * Usage:        
- *      This function is executed for each ppp  
- *      interface through a tq_schedule bottom half.
- *      
- *      trigger_ppp_poll() function is used to kick
- *      the ppp_poll routine.  
- */
-static void ppp_poll(struct net_device *dev)
-{
-        ppp_private_area_t *ppp_priv_area;      
-        sdla_t *card;
-        u8 check_gateway=0;
-        ppp_flags_t *flags;
-
-        if (!dev || (ppp_priv_area = dev->priv) == NULL)
-                return;
-
-        card = ppp_priv_area->card;
-        flags = card->flags;
-
-        /* Shutdown is in progress, stop what you are 
-         * doing and get out */
-        if (test_bit(PERI_CRIT,&card->wandev.critical)){
-                clear_bit(POLL_CRIT,&card->wandev.critical);
-                return;
-        }
-
-        /* if_open() function has triggered the polling routine
-         * to determine the configured IP addresses.  Once the
-         * addresses are found, trigger the chdlc configuration */
-        if (test_bit(0,&ppp_priv_area->config_ppp)){
-
-                ppp_priv_area->ip_local_tmp  = get_ip_address(dev,WAN_LOCAL_IP);
-                ppp_priv_area->ip_remote_tmp = get_ip_address(dev,WAN_POINTOPOINT_IP);
-
-                if (ppp_priv_area->ip_local_tmp == ppp_priv_area->ip_remote_tmp && 
-                    card->u.p.ip_mode == WANOPT_PPP_HOST){
-                        
-                        if (++ppp_priv_area->ip_error > MAX_IP_ERRORS){
-                                printk(KERN_INFO "\n%s: --- WARNING ---\n",
-                                                card->devname);
-                                printk(KERN_INFO "%s: The local IP address is the same as the\n",
-                                                card->devname);
-                                printk(KERN_INFO "%s: Point-to-Point IP address.\n",
-                                                card->devname);
-                                printk(KERN_INFO "%s: --- WARNING ---\n\n",
-                                                card->devname);
-                        }else{
-                                clear_bit(POLL_CRIT,&card->wandev.critical);
-                                ppp_priv_area->poll_delay_timer.expires = jiffies+HZ;
-                                add_timer(&ppp_priv_area->poll_delay_timer);
-                                return;
-                        }
-                }
-
-                ppp_priv_area->timer_int_enabled |= TMR_INT_ENABLED_CONFIG;
-                flags->imask |= PPP_INTR_TIMER; 
-                ppp_priv_area->ip_error=0;      
-                
-                clear_bit(0,&ppp_priv_area->config_ppp);
-                clear_bit(POLL_CRIT,&card->wandev.critical);
-                return;
-        }
-
-        /* Dynamic interface implementation, as well as dynamic
-         * routing.  */
-        
-        switch (card->wandev.state) {
-        
-        case WAN_DISCONNECTED:
-
-                /* If the dynamic interface configuration is on, and interface 
-                 * is up, then bring down the netowrk interface */
-
-                if (test_bit(DYN_OPT_ON,&ppp_priv_area->interface_down) &&
-                    !test_bit(DEV_DOWN,&ppp_priv_area->interface_down)  &&      
-                    card->wandev.dev->flags & IFF_UP){  
-
-                        printk(KERN_INFO "%s: Interface %s down.\n",
-                                card->devname,card->wandev.dev->name);
-                        change_dev_flags(card->wandev.dev,
-                                        (card->wandev.dev->flags&~IFF_UP));
-                        set_bit(DEV_DOWN,&ppp_priv_area->interface_down);
-                }else{
-                        /* We need to check if the local IP address is
-                         * zero. If it is, we shouldn't try to remove it.
-                         * For some reason the kernel crashes badly if 
-                         * we try to remove the route twice */
-
-                        if (card->wandev.dev->flags & IFF_UP && 
-                            get_ip_address(card->wandev.dev,WAN_LOCAL_IP) &&
-                            card->u.p.ip_mode == WANOPT_PPP_PEER){
-
-                                remove_route(card);
-                        }
-                }
-                break;
-
-        case WAN_CONNECTED:
-                
-                /* In SMP machine this code can execute before the interface
-                 * comes up.  In this case, we must make sure that we do not
-                 * try to bring up the interface before dev_open() is finished */
-
-
-                /* DEV_DOWN will be set only when we bring down the interface
-                 * for the very first time. This way we know that it was us
-                 * that brought the interface down */
-                
-                if (test_bit(DYN_OPT_ON,&ppp_priv_area->interface_down) &&
-                    test_bit(DEV_DOWN,  &ppp_priv_area->interface_down) &&
-                    !(card->wandev.dev->flags & IFF_UP)){
-                        
-                        printk(KERN_INFO "%s: Interface %s up.\n",
-                                card->devname,card->wandev.dev->name);
-                        
-                        change_dev_flags(card->wandev.dev,(card->wandev.dev->flags|IFF_UP));
-                        clear_bit(DEV_DOWN,&ppp_priv_area->interface_down);
-                        check_gateway=1;
-                }
-
-                if ((card->u.p.ip_mode == WANOPT_PPP_PEER) && 
-                    test_bit(1,&Read_connection_info)) { 
-                        
-                        process_route(card);
-                        clear_bit(1,&Read_connection_info);
-                        check_gateway=1;
-                }
-
-                if (ppp_priv_area->gateway && check_gateway)
-                        add_gateway(card,dev);
-
-                break;
-        }
-        clear_bit(POLL_CRIT,&card->wandev.critical);
-        return;
-}
-
-/*============================================================
- * trigger_ppp_poll
- *
- * Description:
- *      Add a ppp_poll() task into a tq_scheduler bh handler
- *      for a specific interface.  This will kick
- *      the ppp_poll() routine at a later time. 
- *
- * Usage:
- *      Interrupts use this to defer a taks to 
- *      a polling routine.
- *
- */     
-
-static void trigger_ppp_poll(struct net_device *dev)
-{
-        ppp_private_area_t *ppp_priv_area;
-        if ((ppp_priv_area=dev->priv) != NULL){         
-                
-                sdla_t *card = ppp_priv_area->card;
-
-                if (test_bit(PERI_CRIT,&card->wandev.critical)){
-                        return;
-                }
-                
-                if (test_and_set_bit(POLL_CRIT,&card->wandev.critical)){
-                        return;
-                }
-
-                schedule_work(&ppp_priv_area->poll_work);
-        }
-        return;
-}
-
-static void ppp_poll_delay (unsigned long dev_ptr)
-{
-        struct net_device *dev = (struct net_device *)dev_ptr;
-        trigger_ppp_poll(dev);
-}
-
-/*============================================================
- * detect_and_fix_tx_bug
- *
- * Description:
- *      On connect, if the board tx buffer ptr is not the same
- *      as the driver tx buffer ptr, we found a firmware bug.
- *      Report the bug to the above layer.  To fix the
- *      error restart communications again.
- *
- * Usage:
- *
- */     
-
-static int detect_and_fix_tx_bug (sdla_t *card)
-{
-        if (((unsigned long)card->u.p.txbuf_base&0xFFF) != ((*card->u.p.txbuf_next)&0xFFF)){
-                NEX_PRINTK(KERN_INFO "Major Error, Fix the bug\n");
-                return 1;
-        }
-        return 0;
-}
-
-MODULE_LICENSE("GPL");
-
-/****** End *****************************************************************/
diff --git a/drivers/net/wan/sdla_x25.c b/drivers/net/wan/sdla_x25.c
deleted file mode 100644
index 63f846d6f3a6..000000000000
--- a/drivers/net/wan/sdla_x25.c
+++ /dev/null
@@ -1,5497 +0,0 @@
-/*****************************************************************************
-* sdla_x25.c    WANPIPE(tm) Multiprotocol WAN Link Driver.  X.25 module.
-*
-* Author:       Nenad Corbic    <ncorbic@sangoma.com>
-*
-* Copyright:    (c) 1995-2001 Sangoma Technologies 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.
-* ============================================================================
-* Apr 03, 2001  Nenad Corbic     o Fixed the rx_skb=NULL bug in x25 in rx_intr().
-* Dec 26, 2000  Nenad Corbic     o Added a new polling routine, that uses
-*                                  a kernel timer (more efficient).
-* Dec 25, 2000  Nenad Corbic     o Updated for 2.4.X kernel
-* Jul 26, 2000  Nenad Corbic     o Increased the local packet buffering
-*                                  for API to 4096+header_size. 
-* Jul 17, 2000  Nenad Corbic     o Fixed the x25 startup bug. Enable 
-*                                  communications only after all interfaces
-*                                  come up.  HIGH SVC/PVC is used to calculate
-*                                  the number of channels.
-*                                  Enable protocol only after all interfaces
-*                                  are enabled.
-* Jul 10, 2000  Nenad Corbic     o Fixed the M_BIT bug. 
-* Apr 25, 2000  Nenad Corbic     o Pass Modem messages to the API.
-*                                  Disable idle timeout in X25 API.
-* Apr 14, 2000  Nenad Corbic     o Fixed: Large LCN number support.
-*                                  Maximum LCN number is 4095.
-*                                  Maximum number of X25 channels is 255.
-* Apr 06, 2000  Nenad Corbic     o Added SMP Support.
-* Mar 29, 2000  Nenad Corbic     o Added support for S514 PCI Card
-* Mar 23, 2000  Nenad Corbic     o Improved task queue, BH handling.
-* Mar 14, 2000  Nenad Corbic     o Updated Protocol Violation handling
-*                                  routines.  Bug Fix.
-* Mar 10, 2000  Nenad Corbic     o Bug Fix: corrupted mbox recovery.
-* Mar 09, 2000  Nenad Corbic     o Fixed the auto HDLC bug.
-* Mar 08, 2000  Nenad Corbic     o Fixed LAPB HDLC startup problems.
-*                                  Application must bring the link up 
-*                                  before tx/rx, and bring the 
-*                                  link down on close().
-* Mar 06, 2000  Nenad Corbic     o Added an option for logging call setup 
-*                                  information. 
-* Feb 29, 2000  Nenad Corbic     o Added support for LAPB HDLC API
-* Feb 25, 2000  Nenad Corbic     o Fixed the modem failure handling.
-*                                  No Modem OOB message will be passed 
-*                                  to the user.
-* Feb 21, 2000  Nenad Corbic     o Added Xpipemon Debug Support
-* Dec 30, 1999  Nenad Corbic     o Socket based X25API 
-* Sep 17, 1998  Jaspreet Singh   o Updates for 2.2.X  kernel
-* Mar 15, 1998  Alan Cox         o 2.1.x porting
-* Dec 19, 1997  Jaspreet Singh   o Added multi-channel IPX support
-* Nov 27, 1997  Jaspreet Singh   o Added protection against enabling of irqs
-*                                  when they are disabled.
-* Nov 17, 1997  Farhan Thawar    o Added IPX support
-*                                o Changed if_send() to now buffer packets when
-*                                  the board is busy
-*                                o Removed queueing of packets via the polling
-*                                  routing
-*                                o Changed if_send() critical flags to properly
-*                                  handle race conditions
-* Nov 06, 1997  Farhan Thawar    o Added support for SVC timeouts
-*                                o Changed PVC encapsulation to ETH_P_IP
-* Jul 21, 1997  Jaspreet Singh   o Fixed freeing up of buffers using kfree()
-*                                  when packets are received.
-* Mar 11, 1997  Farhan Thawar   Version 3.1.1
-*                                o added support for V35
-*                                o changed if_send() to return 0 if
-*                                  wandev.critical() is true
-*                                o free socket buffer in if_send() if
-*                                  returning 0
-*                                o added support for single '@' address to
-*                                  accept all incoming calls
-*                                o fixed bug in set_chan_state() to disconnect
-* Jan 15, 1997  Gene Kozin      Version 3.1.0
-*                                o implemented exec() entry point
-* Jan 07, 1997  Gene Kozin      Initial version.
-*****************************************************************************/
-
-/*======================================================
- *      Includes 
- *=====================================================*/
-
-#include <linux/module.h>
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/ctype.h>
-#include <linux/slab.h> /* kmalloc(), kfree() */
-#include <linux/wanrouter.h>    /* WAN router definitions */
-#include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
-#include <linux/workqueue.h>
-#include <linux/jiffies.h>      /* time_after() macro */
-#include <asm/byteorder.h>      /* htons(), etc. */
-#include <asm/atomic.h>
-#include <linux/delay.h>        /* Experimental delay */
-
-#include <asm/uaccess.h>
-
-#include <linux/if.h>
-#include <linux/if_arp.h>
-#include <linux/sdla_x25.h>     /* X.25 firmware API definitions */
-#include <linux/if_wanpipe_common.h>
-#include <linux/if_wanpipe.h>
-
-
-/*======================================================
- *      Defines & Macros 
- *=====================================================*/
-
-
-#define CMD_OK          0               /* normal firmware return code */
-#define CMD_TIMEOUT     0xFF            /* firmware command timed out */
-#define MAX_CMD_RETRY   10              /* max number of firmware retries */
-
-#define X25_CHAN_MTU    4096            /* unfragmented logical channel MTU */
-#define X25_HRDHDR_SZ   7               /* max encapsulation header size */
-#define X25_CONCT_TMOUT (90*HZ)         /* link connection timeout */
-#define X25_RECON_TMOUT (10*HZ)         /* link connection timeout */
-#define CONNECT_TIMEOUT (90*HZ)         /* link connection timeout */
-#define HOLD_DOWN_TIME  (30*HZ)         /* link hold down time */
-#define MAX_BH_BUFF     10
-#define M_BIT           0x01    
-
-//#define PRINT_DEBUG 1
-#ifdef PRINT_DEBUG
-#define DBG_PRINTK(format, a...) printk(format, ## a)
-#else
-#define DBG_PRINTK(format, a...)
-#endif  
-
-#define TMR_INT_ENABLED_POLL_ACTIVE      0x01
-#define TMR_INT_ENABLED_POLL_CONNECT_ON  0x02
-#define TMR_INT_ENABLED_POLL_CONNECT_OFF 0x04
-#define TMR_INT_ENABLED_POLL_DISCONNECT  0x08
-#define TMR_INT_ENABLED_CMD_EXEC         0x10
-#define TMR_INT_ENABLED_UPDATE           0x20
-#define TMR_INT_ENABLED_UDP_PKT          0x40
-
-#define MAX_X25_ADDR_SIZE       16
-#define MAX_X25_DATA_SIZE       129
-#define MAX_X25_FACL_SIZE       110
-
-#define TRY_CMD_AGAIN   2
-#define DELAY_RESULT    1
-#define RETURN_RESULT   0
-
-#define DCD(x) (x & 0x03 ? "HIGH" : "LOW")
-#define CTS(x) (x & 0x05 ? "HIGH" : "LOW")
-
-
-/* Driver will not write log messages about 
- * modem status if defined.*/
-#define MODEM_NOT_LOG 1
-
-/*==================================================== 
- *      For IPXWAN 
- *===================================================*/
-
-#define CVHexToAscii(b) (((unsigned char)(b) > (unsigned char)9) ? ((unsigned char)'A' + ((unsigned char)(b) - (unsigned char)10)) : ((unsigned char)'0' + (unsigned char)(b)))
-
-
-/*====================================================
- *           MEMORY DEBUGGING FUNCTION
- *====================================================
-
-#define KMEM_SAFETYZONE 8
-
-static void * dbg_kmalloc(unsigned int size, int prio, int line) {
-        int i = 0;
-        void * v = kmalloc(size+sizeof(unsigned int)+2*KMEM_SAFETYZONE*8,prio);
-        char * c1 = v;  
-        c1 += sizeof(unsigned int);
-        *((unsigned int *)v) = size;
-
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                c1[0] = 'D'; c1[1] = 'E'; c1[2] = 'A'; c1[3] = 'D';
-                c1[4] = 'B'; c1[5] = 'E'; c1[6] = 'E'; c1[7] = 'F';
-                c1 += 8;
-        }
-        c1 += size;
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                c1[0] = 'M'; c1[1] = 'U'; c1[2] = 'N'; c1[3] = 'G';
-                c1[4] = 'W'; c1[5] = 'A'; c1[6] = 'L'; c1[7] = 'L';
-                c1 += 8;
-        }
-        v = ((char *)v) + sizeof(unsigned int) + KMEM_SAFETYZONE*8;
-        printk(KERN_INFO "line %d  kmalloc(%d,%d) = %p\n",line,size,prio,v);
-        return v;
-}
-static void dbg_kfree(void * v, int line) {
-        unsigned int * sp = (unsigned int *)(((char *)v) - (sizeof(unsigned int) + KMEM_SAFETYZONE*8));
-        unsigned int size = *sp;
-        char * c1 = ((char *)v) - KMEM_SAFETYZONE*8;
-        int i = 0;
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                if (   c1[0] != 'D' || c1[1] != 'E' || c1[2] != 'A' || c1[3] != 'D'
-                    || c1[4] != 'B' || c1[5] != 'E' || c1[6] != 'E' || c1[7] != 'F') {
-                        printk(KERN_INFO "kmalloced block at %p has been corrupted (underrun)!\n",v);
-                        printk(KERN_INFO " %4x: %2x %2x %2x %2x %2x %2x %2x %2x\n", i*8,
-                                        c1[0],c1[1],c1[2],c1[3],c1[4],c1[5],c1[6],c1[7] );
-                }
-                c1 += 8;
-        }
-        c1 += size;
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                if (   c1[0] != 'M' || c1[1] != 'U' || c1[2] != 'N' || c1[3] != 'G'
-                    || c1[4] != 'W' || c1[5] != 'A' || c1[6] != 'L' || c1[7] != 'L'
-                   ) {
-                        printk(KERN_INFO "kmalloced block at %p has been corrupted (overrun):\n",v);
-                        printk(KERN_INFO " %4x: %2x %2x %2x %2x %2x %2x %2x %2x\n", i*8,
-                                        c1[0],c1[1],c1[2],c1[3],c1[4],c1[5],c1[6],c1[7] );
-                }
-                c1 += 8;
-        }
-        printk(KERN_INFO "line %d  kfree(%p)\n",line,v);
-        v = ((char *)v) - (sizeof(unsigned int) + KMEM_SAFETYZONE*8);
-        kfree(v);
-}
-
-#define kmalloc(x,y) dbg_kmalloc(x,y,__LINE__)
-#define kfree(x) dbg_kfree(x,__LINE__)
-
-==============================================================*/
-
-
-
-/*===============================================
- *      Data Structures 
- *===============================================*/
-
-
-/*========================================================
- * Name:        x25_channel
- *
- * Purpose:     To hold private informaton for each  
- *              logical channel.
- *              
- * Rationale:   Per-channel debugging is possible if each 
- *              channel has its own private area.
- *      
- * Assumptions:
- *
- * Description: This is an extention of the struct net_device
- *              we create for each network interface to keep 
- *              the rest of X.25 channel-specific data. 
- *
- * Construct:   Typedef
- */
-typedef struct x25_channel
-{
-        wanpipe_common_t common;        /* common area for x25api and socket */
-        char name[WAN_IFNAME_SZ+1];     /* interface name, ASCIIZ */
-        char addr[WAN_ADDRESS_SZ+1];    /* media address, ASCIIZ */
-        unsigned tx_pkt_size;
-        unsigned short protocol;        /* ethertype, 0 - multiplexed */
-        char drop_sequence;             /* mark sequence for dropping */
-        unsigned long state_tick;       /* time of the last state change */
-        unsigned idle_timeout;          /* sec, before disconnecting */
-        unsigned long i_timeout_sofar;  /* # of sec's we've been idle */
-        unsigned hold_timeout;          /* sec, before re-connecting */
-        unsigned long tick_counter;     /* counter for transmit time out */
-        char devtint;                   /* Weather we should dev_tint() */
-        struct sk_buff* rx_skb;         /* receive socket buffer */
-        struct sk_buff* tx_skb;         /* transmit socket buffer */
-
-        bh_data_t *bh_head;               /* Circular buffer for x25api_bh */
-        unsigned long  tq_working;
-        volatile int  bh_write;
-        volatile int  bh_read;
-        atomic_t  bh_buff_used;
-
-        sdla_t* card;                   /* -> owner */
-        struct net_device *dev;         /* -> bound devce */
-
-        int ch_idx;
-        unsigned char enable_IPX;
-        unsigned long network_number;
-        struct net_device_stats ifstats;        /* interface statistics */
-        unsigned short transmit_length;
-        unsigned short tx_offset;
-        char transmit_buffer[X25_CHAN_MTU+sizeof(x25api_hdr_t)];
-
-        if_send_stat_t   if_send_stat;
-        rx_intr_stat_t   rx_intr_stat;
-        pipe_mgmt_stat_t pipe_mgmt_stat;    
-
-        unsigned long router_start_time; /* Router start time in seconds */
-        unsigned long router_up_time;
-        
-} x25_channel_t;
-
-/* FIXME Take this out */
-
-#ifdef NEX_OLD_CALL_INFO
-typedef struct x25_call_info
-{
-        char dest[17];                  PACKED;/* ASCIIZ destination address */
-        char src[17];                   PACKED;/* ASCIIZ source address */
-        char nuser;                     PACKED;/* number of user data bytes */
-        unsigned char user[127];        PACKED;/* user data */
-        char nfacil;                    PACKED;/* number of facilities */
-        struct
-        {
-                unsigned char code;     PACKED;
-                unsigned char parm;     PACKED;
-        } facil[64];                            /* facilities */
-} x25_call_info_t;
-#else
-typedef struct x25_call_info
-{
-        char dest[MAX_X25_ADDR_SIZE]            PACKED;/* ASCIIZ destination address */
-        char src[MAX_X25_ADDR_SIZE]             PACKED;/* ASCIIZ source address */
-        unsigned char nuser                     PACKED;
-        unsigned char user[MAX_X25_DATA_SIZE]   PACKED;/* user data */
-        unsigned char nfacil                    PACKED;
-        unsigned char facil[MAX_X25_FACL_SIZE]  PACKED;
-        unsigned short lcn                      PACKED;
-} x25_call_info_t;
-#endif
-
-
-  
-/*===============================================
- *      Private Function Prototypes
- *==============================================*/
-
-
-/*================================================= 
- * WAN link driver entry points. These are 
- * called by the WAN router module.
- */
-static int update(struct wan_device* wandev);
-static int new_if(struct wan_device* wandev, struct net_device* dev,
-                  wanif_conf_t* conf);
-static int del_if(struct wan_device* wandev, struct net_device* dev);
-static void disable_comm (sdla_t* card);
-static void disable_comm_shutdown(sdla_t *card);
-
-
-
-/*================================================= 
- *      WANPIPE-specific entry points 
- */
-static int wpx_exec (struct sdla* card, void* u_cmd, void* u_data);
-static void x25api_bh(struct net_device *dev);
-static int x25api_bh_cleanup(struct net_device *dev);
-static int bh_enqueue(struct net_device *dev, struct sk_buff *skb);
-
-
-/*=================================================  
- *      Network device interface 
- */
-static int if_init(struct net_device* dev);
-static int if_open(struct net_device* dev);
-static int if_close(struct net_device* dev);
-static int if_header(struct sk_buff* skb, struct net_device* dev,
-        unsigned short type, void* daddr, void* saddr, unsigned len);
-static int if_rebuild_hdr (struct sk_buff* skb);
-static int if_send(struct sk_buff* skb, struct net_device* dev);
-static struct net_device_stats *if_stats(struct net_device* dev);
-
-static void if_tx_timeout(struct net_device *dev);
-
-/*=================================================  
- *      Interrupt handlers 
- */
-static void wpx_isr     (sdla_t *);
-static void rx_intr     (sdla_t *);
-static void tx_intr     (sdla_t *);
-static void status_intr (sdla_t *);
-static void event_intr  (sdla_t *);
-static void spur_intr   (sdla_t *);
-static void timer_intr  (sdla_t *);
-
-static int tx_intr_send(sdla_t *card, struct net_device *dev);
-static struct net_device *move_dev_to_next(sdla_t *card,
-                                           struct net_device *dev);
-
-/*=================================================  
- *      Background polling routines 
- */
-static void wpx_poll (sdla_t* card);
-static void poll_disconnected (sdla_t* card);
-static void poll_connecting (sdla_t* card);
-static void poll_active (sdla_t* card);
-static void trigger_x25_poll(sdla_t *card);
-static void x25_timer_routine(unsigned long data);
-
-
-
-/*=================================================  
- *      X.25 firmware interface functions 
- */
-static int x25_get_version (sdla_t* card, char* str);
-static int x25_configure (sdla_t* card, TX25Config* conf);
-static int hdlc_configure (sdla_t* card, TX25Config* conf);
-static int set_hdlc_level (sdla_t* card);
-static int x25_get_err_stats (sdla_t* card);
-static int x25_get_stats (sdla_t* card);
-static int x25_set_intr_mode (sdla_t* card, int mode);
-static int x25_close_hdlc (sdla_t* card);
-static int x25_open_hdlc (sdla_t* card);
-static int x25_setup_hdlc (sdla_t* card);
-static int x25_set_dtr (sdla_t* card, int dtr);
-static int x25_get_chan_conf (sdla_t* card, x25_channel_t* chan);
-static int x25_place_call (sdla_t* card, x25_channel_t* chan);
-static int x25_accept_call (sdla_t* card, int lcn, int qdm);
-static int x25_clear_call (sdla_t* card, int lcn, int cause, int diagn);
-static int x25_send (sdla_t* card, int lcn, int qdm, int len, void* buf);
-static int x25_fetch_events (sdla_t* card);
-static int x25_error (sdla_t* card, int err, int cmd, int lcn);
-
-/*=================================================  
- *      X.25 asynchronous event handlers 
- */
-static int incoming_call (sdla_t* card, int cmd, int lcn, TX25Mbox* mb);
-static int call_accepted (sdla_t* card, int cmd, int lcn, TX25Mbox* mb);
-static int call_cleared (sdla_t* card, int cmd, int lcn, TX25Mbox* mb);
-static int timeout_event (sdla_t* card, int cmd, int lcn, TX25Mbox* mb);
-static int restart_event (sdla_t* card, int cmd, int lcn, TX25Mbox* mb);
-
-
-/*=================================================  
- *      Miscellaneous functions 
- */
-static int connect (sdla_t* card);
-static int disconnect (sdla_t* card);
-static struct net_device* get_dev_by_lcn(struct wan_device* wandev,
-                                         unsigned lcn);
-static int chan_connect(struct net_device* dev);
-static int chan_disc(struct net_device* dev);
-static void set_chan_state(struct net_device* dev, int state);
-static int chan_send(struct net_device *dev, void* buff, unsigned data_len,
-                     unsigned char tx_intr);
-static unsigned char bps_to_speed_code (unsigned long bps);
-static unsigned int dec_to_uint (unsigned char* str, int len);
-static unsigned int hex_to_uint (unsigned char*, int);
-static void parse_call_info (unsigned char*, x25_call_info_t*);
-static struct net_device *find_channel(sdla_t *card, unsigned lcn);
-static void bind_lcn_to_dev(sdla_t *card, struct net_device *dev, unsigned lcn);
-static void setup_for_delayed_transmit(struct net_device *dev,
-                                       void *buf, unsigned len);
-
-
-/*=================================================  
- *      X25 API Functions 
- */
-static int wanpipe_pull_data_in_skb(sdla_t *card, struct net_device *dev,
-                                    struct sk_buff **);
-static void timer_intr_exec(sdla_t *, unsigned char);
-static int execute_delayed_cmd(sdla_t *card, struct net_device *dev,
-                               mbox_cmd_t *usr_cmd, char bad_cmd);
-static int api_incoming_call (sdla_t*, TX25Mbox *, int);
-static int alloc_and_init_skb_buf (sdla_t *,struct sk_buff **, int);
-static void send_delayed_cmd_result(sdla_t *card, struct net_device *dev,
-                                    TX25Mbox* mbox);
-static int clear_confirm_event (sdla_t *, TX25Mbox*);
-static void send_oob_msg (sdla_t *card, struct net_device *dev, TX25Mbox *mbox);
-static int timer_intr_cmd_exec(sdla_t *card);
-static void api_oob_event (sdla_t *card,TX25Mbox *mbox);
-static int check_bad_command(sdla_t *card, struct net_device *dev);
-static int channel_disconnect(sdla_t* card, struct net_device *dev);
-static void hdlc_link_down (sdla_t*);
-
-/*=================================================
- *     XPIPEMON Functions
- */
-static int process_udp_mgmt_pkt(sdla_t *);
-static int udp_pkt_type( struct sk_buff *, sdla_t*);
-static int reply_udp( unsigned char *, unsigned int); 
-static void init_x25_channel_struct( x25_channel_t *);
-static void init_global_statistics( sdla_t *);
-static int store_udp_mgmt_pkt(int udp_type, char udp_pkt_src, sdla_t *card,
-                              struct net_device *dev,
-                              struct sk_buff *skb, int lcn);
-static unsigned short calc_checksum (char *, int);
-
-
-
-/*================================================= 
- *      IPX functions 
- */
-static void switch_net_numbers(unsigned char *, unsigned long, unsigned char);
-static int handle_IPXWAN(unsigned char *, char *, unsigned char , 
-                         unsigned long , unsigned short );
-
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
-
-static void S508_S514_lock(sdla_t *, unsigned long *);
-static void S508_S514_unlock(sdla_t *, unsigned long *);
-
-
-/*=================================================  
- *      Global Variables 
- *=================================================*/
-
-
-
-/*================================================= 
- *      Public Functions 
- *=================================================*/
-
-
-
-
-/*===================================================================
- * wpx_init:    X.25 Protocol Initialization routine.
- *
- * Purpose:     To initialize the protocol/firmware.
- * 
- * Rationale:   This function is called by setup() function, in
- *              sdlamain.c, to dynamically setup the x25 protocol.
- *              This is the first protocol specific function, which
- *              executes once on startup.
- *                
- * Description: This procedure initializes the x25 firmware and
- *              sets up the mailbox, transmit and receive buffer
- *              pointers. It also initializes all debugging structures
- *              and sets up the X25 environment.
- *
- *              Sets up hardware options defined by user in [wanpipe#] 
- *              section of wanpipe#.conf configuration file. 
- *
- *              At this point adapter is completely initialized 
- *              and X.25 firmware is running.
- *              o read firmware version (to make sure it's alive)
- *              o configure adapter
- *              o initialize protocol-specific fields of the 
- *                adapter data space.
- *
- * Called by:   setup() function in sdlamain.c
- *
- * Assumptions: None
- *
- * Warnings:    None
- *
- * Return:      0       o.k.
- *              < 0     failure.
- */
-
-int wpx_init (sdla_t* card, wandev_conf_t* conf)
-{
-        union{
-                char str[80];
-                TX25Config cfg;
-        } u;
-
-        /* Verify configuration ID */
-        if (conf->config_id != WANCONFIG_X25){
-                printk(KERN_INFO "%s: invalid configuration ID %u!\n",
-                        card->devname, conf->config_id)
-                ;
-                return -EINVAL;
-        }
-
-        /* Initialize protocol-specific fields */
-        card->mbox  = (void*)(card->hw.dpmbase + X25_MBOX_OFFS);
-        card->rxmb  = (void*)(card->hw.dpmbase + X25_RXMBOX_OFFS);
-        card->flags = (void*)(card->hw.dpmbase + X25_STATUS_OFFS);
-
-        /* Initialize for S514 Card */
-        if(card->hw.type == SDLA_S514) {
-                card->mbox += X25_MB_VECTOR;
-                card->flags += X25_MB_VECTOR;
-                card->rxmb += X25_MB_VECTOR;
-        }
-
-
-        /* Read firmware version.  Note that when adapter initializes, it
-         * clears the mailbox, so it may appear that the first command was
-         * executed successfully when in fact it was merely erased. To work
-         * around this, we execute the first command twice.
-         */
-        if (x25_get_version(card, NULL) || x25_get_version(card, u.str))
-                return -EIO;
-
-
-        /* X25 firmware can run ether in X25 or LAPB HDLC mode.
-         * Check the user defined option and configure accordingly */
-        if (conf->u.x25.LAPB_hdlc_only == WANOPT_YES){
-                if (set_hdlc_level(card) != CMD_OK){
-                        return -EIO;    
-                }else{
-                        printk(KERN_INFO "%s: running LAP_B HDLC firmware v%s\n",
-                                card->devname, u.str);
-                }
-                card->u.x.LAPB_hdlc = 1;
-        }else{
-                printk(KERN_INFO "%s: running X.25 firmware v%s\n",
-                                card->devname, u.str);
-                card->u.x.LAPB_hdlc = 0;
-        }
-
-        /* Configure adapter. Here we set resonable defaults, then parse
-         * device configuration structure and set configuration options.
-         * Most configuration options are verified and corrected (if
-         * necessary) since we can't rely on the adapter to do so.
-         */
-        memset(&u.cfg, 0, sizeof(u.cfg));
-        u.cfg.t1                = 3;
-        u.cfg.n2                = 10;
-        u.cfg.autoHdlc          = 1;            /* automatic HDLC connection */
-        u.cfg.hdlcWindow        = 7;
-        u.cfg.pktWindow         = 2;
-        u.cfg.station           = 1;            /* DTE */
-        u.cfg.options           = 0x0090;       /* disable D-bit pragmatics */
-        u.cfg.ccittCompat       = 1988;
-        u.cfg.t10t20            = 30;
-        u.cfg.t11t21            = 30;
-        u.cfg.t12t22            = 30;
-        u.cfg.t13t23            = 30;
-        u.cfg.t16t26            = 30;
-        u.cfg.t28               = 30;
-        u.cfg.r10r20            = 5;
-        u.cfg.r12r22            = 5;
-        u.cfg.r13r23            = 5;
-        u.cfg.responseOpt       = 1;            /* RR's after every packet */
-
-        if (card->u.x.LAPB_hdlc){
-                u.cfg.hdlcMTU = 1027;
-        }
-
-        if (conf->u.x25.x25_conf_opt){
-                u.cfg.options = conf->u.x25.x25_conf_opt;
-        }
-
-        if (conf->clocking != WANOPT_EXTERNAL)
-                u.cfg.baudRate = bps_to_speed_code(conf->bps);
-
-        if (conf->station != WANOPT_DTE){
-                u.cfg.station = 0;              /* DCE mode */
-        }
-
-        if (conf->interface != WANOPT_RS232 ){
-                u.cfg.hdlcOptions |= 0x80;      /* V35 mode */
-        } 
-
-        /* adjust MTU */
-        if (!conf->mtu || (conf->mtu >= 1024))
-                card->wandev.mtu = 1024;
-        else if (conf->mtu >= 512)
-                card->wandev.mtu = 512;
-        else if (conf->mtu >= 256)
-                card->wandev.mtu = 256;
-        else if (conf->mtu >= 128)
-                card->wandev.mtu = 128;
-        else 
-                card->wandev.mtu = 64;
-
-        u.cfg.defPktSize = u.cfg.pktMTU = card->wandev.mtu;
-
-        if (conf->u.x25.hi_pvc){
-                card->u.x.hi_pvc = min_t(unsigned int, conf->u.x25.hi_pvc, MAX_LCN_NUM);
-                card->u.x.lo_pvc = min_t(unsigned int, conf->u.x25.lo_pvc, card->u.x.hi_pvc);
-        }
-
-        if (conf->u.x25.hi_svc){
-                card->u.x.hi_svc = min_t(unsigned int, conf->u.x25.hi_svc, MAX_LCN_NUM);
-                card->u.x.lo_svc = min_t(unsigned int, conf->u.x25.lo_svc, card->u.x.hi_svc);
-        }
-
-        /* Figure out the total number of channels to configure */
-        card->u.x.num_of_ch = 0;
-        if (card->u.x.hi_svc != 0){
-                card->u.x.num_of_ch = (card->u.x.hi_svc - card->u.x.lo_svc) + 1;
-        }
-        if (card->u.x.hi_pvc != 0){
-                card->u.x.num_of_ch += (card->u.x.hi_pvc - card->u.x.lo_pvc) + 1;
-        }
-
-        if (card->u.x.num_of_ch == 0){
-                printk(KERN_INFO "%s: ERROR, Minimum number of PVC/SVC channels is 1 !\n"
-                                 "%s: Please set the Lowest/Highest PVC/SVC values !\n",
-                                 card->devname,card->devname);
-                return -ECHRNG;
-        }
-        
-        u.cfg.loPVC = card->u.x.lo_pvc;
-        u.cfg.hiPVC = card->u.x.hi_pvc;
-        u.cfg.loTwoWaySVC = card->u.x.lo_svc;
-        u.cfg.hiTwoWaySVC = card->u.x.hi_svc;
-
-        if (conf->u.x25.hdlc_window)
-                u.cfg.hdlcWindow = min_t(unsigned int, conf->u.x25.hdlc_window, 7);
-        if (conf->u.x25.pkt_window)
-                u.cfg.pktWindow = min_t(unsigned int, conf->u.x25.pkt_window, 7);
-
-        if (conf->u.x25.t1)
-                u.cfg.t1 = min_t(unsigned int, conf->u.x25.t1, 30);
-        if (conf->u.x25.t2)
-                u.cfg.t2 = min_t(unsigned int, conf->u.x25.t2, 29);
-        if (conf->u.x25.t4)
-                u.cfg.t4 = min_t(unsigned int, conf->u.x25.t4, 240);
-        if (conf->u.x25.n2)
-                u.cfg.n2 = min_t(unsigned int, conf->u.x25.n2, 30);
-
-        if (conf->u.x25.t10_t20)
-                u.cfg.t10t20 = min_t(unsigned int, conf->u.x25.t10_t20,255);
-        if (conf->u.x25.t11_t21)
-                u.cfg.t11t21 = min_t(unsigned int, conf->u.x25.t11_t21,255);
-        if (conf->u.x25.t12_t22)
-                u.cfg.t12t22 = min_t(unsigned int, conf->u.x25.t12_t22,255);
-        if (conf->u.x25.t13_t23)        
-                u.cfg.t13t23 = min_t(unsigned int, conf->u.x25.t13_t23,255);
-        if (conf->u.x25.t16_t26)
-                u.cfg.t16t26 = min_t(unsigned int, conf->u.x25.t16_t26, 255);
-        if (conf->u.x25.t28)
-                u.cfg.t28 = min_t(unsigned int, conf->u.x25.t28, 255);
-
-        if (conf->u.x25.r10_r20)
-                u.cfg.r10r20 = min_t(unsigned int, conf->u.x25.r10_r20,250);
-        if (conf->u.x25.r12_r22)
-                u.cfg.r12r22 = min_t(unsigned int, conf->u.x25.r12_r22,250);
-        if (conf->u.x25.r13_r23)
-                u.cfg.r13r23 = min_t(unsigned int, conf->u.x25.r13_r23,250);
-
-
-        if (conf->u.x25.ccitt_compat)
-                u.cfg.ccittCompat = conf->u.x25.ccitt_compat;
-
-        /* initialize adapter */
-        if (card->u.x.LAPB_hdlc){
-                if (hdlc_configure(card, &u.cfg) != CMD_OK)
-                        return -EIO;
-        }else{
-                if (x25_configure(card, &u.cfg) != CMD_OK)
-                        return -EIO;
-        }
-
-        if ((x25_close_hdlc(card) != CMD_OK) ||         /* close HDLC link */
-            (x25_set_dtr(card, 0) != CMD_OK))           /* drop DTR */
-                return -EIO;
-
-        /* Initialize protocol-specific fields of adapter data space */
-        card->wandev.bps        = conf->bps;
-        card->wandev.interface  = conf->interface;
-        card->wandev.clocking   = conf->clocking;
-        card->wandev.station    = conf->station;
-        card->isr               = &wpx_isr;
-        card->poll              = NULL; //&wpx_poll;
-        card->disable_comm      = &disable_comm;
-        card->exec              = &wpx_exec;
-        card->wandev.update     = &update;
-        card->wandev.new_if     = &new_if;
-        card->wandev.del_if     = &del_if;
-
-        /* WARNING: This function cannot exit with an error
-         *          after the change of state */
-        card->wandev.state      = WAN_DISCONNECTED;
-        
-        card->wandev.enable_tx_int = 0;
-        card->irq_dis_if_send_count = 0;
-        card->irq_dis_poll_count = 0;
-        card->u.x.tx_dev = NULL;
-        card->u.x.no_dev = 0;
-
-
-        /* Configure for S514 PCI Card */
-        if (card->hw.type == SDLA_S514) {
-                card->u.x.hdlc_buf_status = 
-                        (volatile unsigned char *)
-                                (card->hw.dpmbase + X25_MB_VECTOR+ X25_MISC_HDLC_BITS);
-        }else{
-                card->u.x.hdlc_buf_status = 
-                        (volatile unsigned char *)(card->hw.dpmbase + X25_MISC_HDLC_BITS); 
-        }
-
-        card->u.x.poll_device=NULL;
-        card->wandev.udp_port = conf->udp_port;
-
-        /* Enable or disable call setup logging */
-        if (conf->u.x25.logging == WANOPT_YES){
-                printk(KERN_INFO "%s: Enabling Call Logging.\n",
-                        card->devname);
-                card->u.x.logging = 1;
-        }else{  
-                card->u.x.logging = 0;
-        }
-
-        /* Enable or disable modem status reporting */
-        if (conf->u.x25.oob_on_modem == WANOPT_YES){
-                printk(KERN_INFO "%s: Enabling OOB on Modem change.\n",
-                        card->devname);
-                card->u.x.oob_on_modem = 1;
-        }else{
-                card->u.x.oob_on_modem = 0;
-        }
-        
-        init_global_statistics(card);   
-
-        INIT_WORK(&card->u.x.x25_poll_work, (void *)wpx_poll, card);
-
-        init_timer(&card->u.x.x25_timer);
-        card->u.x.x25_timer.data = (unsigned long)card;
-        card->u.x.x25_timer.function = x25_timer_routine;
-        
-        return 0;
-}
-
-/*=========================================================
- *      WAN Device Driver Entry Points 
- *========================================================*/
-
-/*============================================================
- * Name:        update(),  Update device status & statistics.
- *
- * Purpose:     To provide debugging and statitical
- *              information to the /proc file system.
- *              /proc/net/wanrouter/wanpipe#
- *                      
- * Rationale:   The /proc file system is used to collect
- *              information about the kernel and drivers.
- *              Using the /proc file system the user
- *              can see exactly what the sangoma drivers are
- *              doing. And in what state they are in. 
- *                
- * Description: Collect all driver statistical information
- *              and pass it to the top laywer. 
- *              
- *              Since we have to execute a debugging command, 
- *              to obtain firmware statitics, we trigger a 
- *              UPDATE function within the timer interrtup.
- *              We wait until the timer update is complete.
- *              Once complete return the appropriate return
- *              code to indicate that the update was successful.
- *              
- * Called by:   device_stat() in wanmain.c
- *
- * Assumptions: 
- *
- * Warnings:    This function will degrade the performance
- *              of the router, since it uses the mailbox. 
- *
- * Return:      0       OK
- *              <0      Failed (or busy).
- */
-
-static int update(struct wan_device* wandev)
-{
-        volatile sdla_t* card;
-        TX25Status* status;
-        unsigned long timeout;
-
-        /* sanity checks */
-        if ((wandev == NULL) || (wandev->private == NULL))
-                return -EFAULT;
-
-        if (wandev->state == WAN_UNCONFIGURED)
-                return -ENODEV;
-
-        if (test_bit(SEND_CRIT, (void*)&wandev->critical))
-                return -EAGAIN;
-
-        if (!wandev->dev)
-                return -ENODEV;
-        
-        card = wandev->private;
-        status = card->flags;
-
-        card->u.x.timer_int_enabled |= TMR_INT_ENABLED_UPDATE;
-        status->imask |= INTR_ON_TIMER;
-        timeout = jiffies;      
-
-        for (;;){
-                if (!(card->u.x.timer_int_enabled & TMR_INT_ENABLED_UPDATE)){   
-                        break;
-                }
-                if (time_after(jiffies, timeout + 1*HZ)){
-                        card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_UPDATE;
-                        return -EAGAIN;
-                }
-        }
-        return 0;
-}
-
-
-/*===================================================================
- * Name:        new_if
- *
- * Purpose:     To allocate and initialize resources for a 
- *              new logical channel.  
- * 
- * Rationale:   A new channel can be added dynamically via
- *              ioctl call.
- *                
- * Description: Allocate a private channel structure, x25_channel_t.
- *              Parse the user interface options from wanpipe#.conf 
- *              configuration file. 
- *              Bind the private are into the network device private
- *              area pointer (dev->priv).
- *              Prepare the network device structure for registration.
- *
- * Called by:   ROUTER_IFNEW Ioctl call, from wanrouter_ioctl() 
- *              (wanmain.c)
- *
- * Assumptions: None
- *
- * Warnings:    None
- *
- * Return:      0       Ok
- *              <0      Failed (channel will not be created)
- */
-static int new_if(struct wan_device* wandev, struct net_device* dev,
-                  wanif_conf_t* conf)
-{
-        sdla_t* card = wandev->private;
-        x25_channel_t* chan;
-        int err = 0;
-
-        if ((conf->name[0] == '\0') || (strlen(conf->name) > WAN_IFNAME_SZ)){
-                printk(KERN_INFO "%s: invalid interface name!\n",
-                        card->devname);
-                return -EINVAL;
-        }
-
-        if(card->wandev.new_if_cnt++ > 0 && card->u.x.LAPB_hdlc) {
-                printk(KERN_INFO "%s: Error: Running LAPB HDLC Mode !\n",
-                                                card->devname);
-                printk(KERN_INFO 
-                        "%s: Maximum number of network interfaces must be one !\n",
-                                                card->devname);
-                return -EEXIST;
-        }
-
-        /* allocate and initialize private data */
-        chan = kmalloc(sizeof(x25_channel_t), GFP_ATOMIC);
-        if (chan == NULL){
-                return -ENOMEM;
-        }
-        
-        memset(chan, 0, sizeof(x25_channel_t));
-
-        /* Bug Fix: Seg Err on PVC startup
-         * It must be here since bind_lcn_to_dev expects 
-         * it bellow */
-        dev->priv = chan;
-        
-        strcpy(chan->name, conf->name);
-        chan->card = card;
-        chan->dev = dev;
-        chan->common.sk = NULL;
-        chan->common.func = NULL;
-        chan->common.rw_bind = 0;
-        chan->tx_skb = chan->rx_skb = NULL;
-
-        /* verify media address */
-        if (conf->addr[0] == '@'){              /* SVC */
-                chan->common.svc = 1;
-                strncpy(chan->addr, &conf->addr[1], WAN_ADDRESS_SZ);
-
-                /* Set channel timeouts (default if not specified) */
-                chan->idle_timeout = (conf->idle_timeout) ? 
-                                        conf->idle_timeout : 90;
-                chan->hold_timeout = (conf->hold_timeout) ? 
-                                        conf->hold_timeout : 10;
-
-        }else if (isdigit(conf->addr[0])){      /* PVC */
-                int lcn = dec_to_uint(conf->addr, 0);
-
-                if ((lcn >= card->u.x.lo_pvc) && (lcn <= card->u.x.hi_pvc)){
-                        bind_lcn_to_dev (card, dev, lcn);
-                }else{
-                        printk(KERN_ERR
-                                "%s: PVC %u is out of range on interface %s!\n",
-                                wandev->name, lcn, chan->name);
-                        err = -EINVAL;
-                }
-        }else{
-                printk(KERN_ERR
-                        "%s: invalid media address on interface %s!\n",
-                        wandev->name, chan->name);
-                err = -EINVAL;
-        }
-
-        if(strcmp(conf->usedby, "WANPIPE") == 0){
-                printk(KERN_INFO "%s: Running in WANPIPE mode %s\n",
-                        wandev->name, chan->name);
-                chan->common.usedby = WANPIPE;
-                chan->protocol = htons(ETH_P_IP);
-
-        }else if(strcmp(conf->usedby, "API") == 0){
-                chan->common.usedby = API;
-                printk(KERN_INFO "%s: Running in API mode %s\n",
-                        wandev->name, chan->name);
-                chan->protocol = htons(X25_PROT);
-        }
-
-
-        if (err){
-                kfree(chan);
-                dev->priv = NULL;
-                return err;
-        }
-        
-        chan->enable_IPX = conf->enable_IPX;
-        
-        if (chan->enable_IPX)
-                chan->protocol = htons(ETH_P_IPX);
-        
-        if (conf->network_number)
-                chan->network_number = conf->network_number;
-        else
-                chan->network_number = 0xDEADBEEF;
-
-        /* prepare network device data space for registration */
-        strcpy(dev->name,chan->name);
-
-        dev->init = &if_init;
-
-        init_x25_channel_struct(chan);
-
-        return 0;
-}
-
-/*===================================================================
- * Name:        del_if(),  Remove a logical channel.     
- *
- * Purpose:     To dynamically remove a logical channel.
- * 
- * Rationale:   Each logical channel should be dynamically
- *              removable. This functin is called by an 
- *              IOCTL_IFDEL ioctl call or shutdown(). 
- *                
- * Description: Do nothing.
- *
- * Called by:   IOCTL_IFDEL : wanrouter_ioctl() from wanmain.c
- *              shutdown() from sdlamain.c
- *
- * Assumptions: 
- *
- * Warnings:
- *
- * Return:      0 Ok. Void function.
- */
-
-//FIXME Del IF Should be taken out now.
-
-static int del_if(struct wan_device* wandev, struct net_device* dev)
-{
-        return 0;
-}
-
-
-/*============================================================
- * Name:        wpx_exec
- *
- * Description: Execute adapter interface command.
- *              This option is currently dissabled.
- *===========================================================*/
-
-static int wpx_exec (struct sdla* card, void* u_cmd, void* u_data)
-{
-        return 0;
-}
-
-/*============================================================
- * Name:        disable_comm    
- *
- * Description: Disable communications during shutdown.
- *              Dont check return code because there is 
- *              nothing we can do about it.  
- *
- * Warning:     Dev and private areas are gone at this point.
- *===========================================================*/
-
-static void disable_comm(sdla_t* card)
-{
-        disable_comm_shutdown(card);
-        del_timer(&card->u.x.x25_timer);
-        return;
-}
-
-
-/*============================================================
- *      Network Device Interface 
- *===========================================================*/
-
-/*===================================================================
- * Name:        if_init(),   Netowrk Interface Initialization    
- *
- * Purpose:     To initialize a network interface device structure.
- * 
- * Rationale:   During network interface startup, the if_init
- *              is called by the kernel to initialize the
- *              netowrk device structure.  Thus a driver
- *              can customze a network device. 
- *                
- * Description: Initialize the netowrk device call back
- *              routines.  This is where we tell the kernel
- *              which function to use when it wants to send
- *              via our interface. 
- *              Furthermore, we initialize the device flags, 
- *              MTU and physical address of the board.
- *
- * Called by:   Kernel (/usr/src/linux/net/core/dev.c)
- *              (dev->init())
- *
- * Assumptions: None
- *      
- * Warnings:    None
- *
- * Return:      0       Ok : Void function.
- */
-static int if_init(struct net_device* dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        struct wan_device* wandev = &card->wandev;
-
-        /* Initialize device driver entry points */
-        dev->open               = &if_open;
-        dev->stop               = &if_close;
-        dev->hard_header        = &if_header;
-        dev->rebuild_header     = &if_rebuild_hdr;
-        dev->hard_start_xmit    = &if_send;
-        dev->get_stats          = &if_stats;
-        dev->tx_timeout         = &if_tx_timeout;
-        dev->watchdog_timeo     = TX_TIMEOUT;
-
-        /* Initialize media-specific parameters */
-        dev->type               = ARPHRD_PPP;           /* ARP h/w type */
-        dev->flags              |= IFF_POINTOPOINT;
-        dev->flags              |= IFF_NOARP;
-
-        if (chan->common.usedby == API){
-                dev->mtu        = X25_CHAN_MTU+sizeof(x25api_hdr_t);
-        }else{
-                dev->mtu        = card->wandev.mtu;     
-        }
-        
-        dev->hard_header_len    = X25_HRDHDR_SZ; /* media header length */
-        dev->addr_len           = 2;            /* hardware address length */
-        
-        if (!chan->common.svc){
-                *(unsigned short*)dev->dev_addr = htons(chan->common.lcn);
-        }
-        
-        /* Initialize hardware parameters (just for reference) */
-        dev->irq        = wandev->irq;
-        dev->dma        = wandev->dma;
-        dev->base_addr  = wandev->ioport;
-        dev->mem_start  = (unsigned long)wandev->maddr;
-        dev->mem_end    = wandev->maddr + wandev->msize - 1;
-
-        /* Set transmit buffer queue length */
-        dev->tx_queue_len = 100;
-        SET_MODULE_OWNER(dev);
-
-        /* FIXME Why are we doing this */
-        set_chan_state(dev, WAN_DISCONNECTED);
-        return 0;
-}
-
-
-/*===================================================================
- * Name:        if_open(),   Open/Bring up the Netowrk Interface 
- *
- * Purpose:     To bring up a network interface.
- * 
- * Rationale:   
- *                
- * Description: Open network interface.
- *              o prevent module from unloading by incrementing use count
- *              o if link is disconnected then initiate connection
- *
- * Called by:   Kernel (/usr/src/linux/net/core/dev.c)
- *              (dev->open())
- *
- * Assumptions: None
- *      
- * Warnings:    None
- *
- * Return:      0       Ok
- *              <0      Failure: Interface will not come up.
- */
-
-static int if_open(struct net_device* dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        struct timeval tv;
-        unsigned long smp_flags;
-        
-        if (netif_running(dev))
-                return -EBUSY;
-
-        chan->tq_working = 0;
-
-        /* Initialize the workqueue */
-        INIT_WORK(&chan->common.wanpipe_work, (void *)x25api_bh, dev);
-
-        /* Allocate and initialize BH circular buffer */
-        /* Add 1 to MAX_BH_BUFF so we don't have test with (MAX_BH_BUFF-1) */
-        chan->bh_head = kmalloc((sizeof(bh_data_t)*(MAX_BH_BUFF+1)),GFP_ATOMIC);
-
-        if (chan->bh_head == NULL){
-                printk(KERN_INFO "%s: ERROR, failed to allocate memory ! BH_BUFFERS !\n",
-                                card->devname);
-
-                return -ENOBUFS;
-        }
-        memset(chan->bh_head,0,(sizeof(bh_data_t)*(MAX_BH_BUFF+1)));
-        atomic_set(&chan->bh_buff_used, 0);
-
-        /* Increment the number of interfaces */
-        ++card->u.x.no_dev;
-        
-        wanpipe_open(card);
-
-        /* LAPB protocol only uses one interface, thus
-         * start the protocol after it comes up. */
-        if (card->u.x.LAPB_hdlc){
-                if (card->open_cnt == 1){
-                        TX25Status* status = card->flags;
-                        S508_S514_lock(card, &smp_flags);
-                        x25_set_intr_mode(card, INTR_ON_TIMER); 
-                        status->imask &= ~INTR_ON_TIMER;
-                        S508_S514_unlock(card, &smp_flags);
-                }
-        }else{
-                /* X25 can have multiple interfaces thus, start the 
-                 * protocol once all interfaces are up */
-
-                //FIXME: There is a bug here. If interface is
-                //brought down and up, it will try to enable comm.
-                if (card->open_cnt == card->u.x.num_of_ch){
-
-                        S508_S514_lock(card, &smp_flags);
-                        connect(card);
-                        S508_S514_unlock(card, &smp_flags);
-
-                        mod_timer(&card->u.x.x25_timer, jiffies + HZ);
-                }
-        }
-        /* Device is not up until the we are in connected state */
-        do_gettimeofday( &tv );
-        chan->router_start_time = tv.tv_sec;
-
-        netif_start_queue(dev);
-
-        return 0;
-}
-
-/*===================================================================
- * Name:        if_close(),   Close/Bring down the Netowrk Interface 
- *
- * Purpose:     To bring down a network interface.
- * 
- * Rationale:   
- *                
- * Description: Close network interface.
- *              o decrement use module use count
- *
- * Called by:   Kernel (/usr/src/linux/net/core/dev.c)
- *              (dev->close())
- *              ifconfig <name> down: will trigger the kernel
- *              which will call this function.
- *
- * Assumptions: None
- *      
- * Warnings:    None
- *
- * Return:      0       Ok
- *              <0      Failure: Interface will not exit properly.
- */
-static int if_close(struct net_device* dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        unsigned long smp_flags;
-        
-        netif_stop_queue(dev);
-
-        if ((chan->common.state == WAN_CONNECTED) || 
-            (chan->common.state == WAN_CONNECTING)){
-                S508_S514_lock(card, &smp_flags);
-                chan_disc(dev);
-                S508_S514_unlock(card, &smp_flags);
-        }
-
-        wanpipe_close(card);
-
-        S508_S514_lock(card, &smp_flags);
-        if (chan->bh_head){
-                int i;
-                struct sk_buff *skb;
-        
-                for (i=0; i<(MAX_BH_BUFF+1); i++){
-                        skb = ((bh_data_t *)&chan->bh_head[i])->skb;
-                        if (skb != NULL){
-                                dev_kfree_skb_any(skb);
-                        }
-                }
-                kfree(chan->bh_head);
-                chan->bh_head=NULL;
-        }
-        S508_S514_unlock(card, &smp_flags);
-
-        /* If this is the last close, disconnect physical link */
-        if (!card->open_cnt){
-                S508_S514_lock(card, &smp_flags);
-                disconnect(card);
-                x25_set_intr_mode(card, 0);
-                S508_S514_unlock(card, &smp_flags);
-        }
-        
-        /* Decrement the number of interfaces */
-        --card->u.x.no_dev;
-        return 0;
-}
-
-/*======================================================================
- *      Build media header.
- *      o encapsulate packet according to encapsulation type.
- *
- *      The trick here is to put packet type (Ethertype) into 'protocol' 
- *      field of the socket buffer, so that we don't forget it.  
- *      If encapsulation fails, set skb->protocol to 0 and discard 
- *      packet later.
- *
- *      Return:         media header length.
- *======================================================================*/
-
-static int if_header(struct sk_buff* skb, struct net_device* dev,
-                     unsigned short type, void* daddr, void* saddr,
-                     unsigned len)
-{
-        x25_channel_t* chan = dev->priv;
-        int hdr_len = dev->hard_header_len;
-        
-        skb->protocol = htons(type);
-        if (!chan->protocol){
-                hdr_len = wanrouter_encapsulate(skb, dev, type);
-                if (hdr_len < 0){
-                        hdr_len = 0;
-                        skb->protocol = htons(0);
-                }
-        }
-        return hdr_len;
-}
-
-/*===============================================================
- *      Re-build media header.
- *
- *      Return:         1       physical address resolved.
- *                      0       physical address not resolved
- *==============================================================*/
-
-static int if_rebuild_hdr (struct sk_buff* skb)
-{
-        struct net_device *dev = skb->dev; 
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-
-        printk(KERN_INFO "%s: rebuild_header() called for interface %s!\n",
-                card->devname, dev->name);
-        return 1;
-}
-
-
-/*============================================================================
- * Handle transmit timeout event from netif watchdog
- */
-static void if_tx_timeout(struct net_device *dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-
-        /* If our device stays busy for at least 5 seconds then we will
-         * kick start the device by making dev->tbusy = 0.  We expect
-         * that our device never stays busy more than 5 seconds. So this                 
-         * is only used as a last resort.
-         */
-
-        ++chan->if_send_stat.if_send_tbusy_timeout;
-        printk (KERN_INFO "%s: Transmit timed out on %s\n", 
-                        card->devname, dev->name);
-        netif_wake_queue (dev);
-}
-
-
-/*=========================================================================
- *      Send a packet on a network interface.
- *      o set tbusy flag (marks start of the transmission).
- *      o check link state. If link is not up, then drop the packet.
- *      o check channel status. If it's down then initiate a call.
- *      o pass a packet to corresponding WAN device.
- *      o free socket buffer
- *
- *      Return: 0       complete (socket buffer must be freed)
- *              non-0   packet may be re-transmitted (tbusy must be set)
- *
- *      Notes:
- *      1. This routine is called either by the protocol stack or by the "net
- *      bottom half" (with interrupts enabled).
- *      2. Setting tbusy flag will inhibit further transmit requests from the
- *      protocol stack and can be used for flow control with protocol layer.
- *
- *========================================================================*/
-
-static int if_send(struct sk_buff* skb, struct net_device* dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        TX25Status* status = card->flags;
-        int udp_type;
-        unsigned long smp_flags=0;
-
-        ++chan->if_send_stat.if_send_entry;
-
-        netif_stop_queue(dev);
-
-        /* No need to check frame length, since socket code
-         * will perform the check for us */
-
-        chan->tick_counter = jiffies;
-        
-        /* Critical region starts here */
-        S508_S514_lock(card, &smp_flags);
-        
-        if (test_and_set_bit(SEND_CRIT, (void*)&card->wandev.critical)){
-                printk(KERN_INFO "Hit critical in if_send()! %lx\n",card->wandev.critical);
-                goto if_send_crit_exit;
-        }
-        
-        udp_type = udp_pkt_type(skb, card);
-
-        if(udp_type != UDP_INVALID_TYPE) {
-
-                if(store_udp_mgmt_pkt(udp_type, UDP_PKT_FRM_STACK, card, dev, skb,
-                        chan->common.lcn)) {
-
-                        status->imask |= INTR_ON_TIMER;
-                        if (udp_type == UDP_XPIPE_TYPE){
-                                chan->if_send_stat.if_send_PIPE_request++;
-                        }
-                }
-                netif_start_queue(dev);
-                clear_bit(SEND_CRIT,(void*)&card->wandev.critical);
-                S508_S514_unlock(card, &smp_flags);
-                return 0;
-        }
-
-        if (chan->transmit_length){
-                //FIXME: This check doesn't make sense any more
-                if (chan->common.state != WAN_CONNECTED){
-                        chan->transmit_length=0;
-                        atomic_set(&chan->common.driver_busy,0);
-                }else{
-                        netif_stop_queue(dev);
-                        ++card->u.x.tx_interrupts_pending;
-                        status->imask |= INTR_ON_TX_FRAME;
-                        clear_bit(SEND_CRIT,(void*)&card->wandev.critical);
-                        S508_S514_unlock(card, &smp_flags);
-                        return 1;
-                }
-        }
-
-        if (card->wandev.state != WAN_CONNECTED){
-                ++chan->ifstats.tx_dropped;
-                ++card->wandev.stats.tx_dropped;
-                ++chan->if_send_stat.if_send_wan_disconnected;  
-                
-        }else if ( chan->protocol && (chan->protocol != skb->protocol)){
-                printk(KERN_INFO
-                        "%s: unsupported Ethertype 0x%04X on interface %s!\n",
-                        chan->name, htons(skb->protocol), dev->name);
-                
-                printk(KERN_INFO "PROTO %Xn", htons(chan->protocol));
-                ++chan->ifstats.tx_errors;
-                ++chan->ifstats.tx_dropped;
-                ++card->wandev.stats.tx_dropped;
-                ++chan->if_send_stat.if_send_protocol_error;
-                
-        }else switch (chan->common.state){
-
-                case WAN_DISCONNECTED:
-                        /* Try to establish connection. If succeded, then start
-                         * transmission, else drop a packet.
-                         */
-                        if (chan->common.usedby == API){
-                                ++chan->ifstats.tx_dropped;
-                                ++card->wandev.stats.tx_dropped;
-                                break;
-                        }else{
-                                if (chan_connect(dev) != 0){
-                                        ++chan->ifstats.tx_dropped;
-                                        ++card->wandev.stats.tx_dropped;
-                                        break;
-                                }
-                        }
-                        /* fall through */
-
-                case WAN_CONNECTED:
-                        if( skb->protocol == htons(ETH_P_IPX)) {
-                                if(chan->enable_IPX) {
-                                        switch_net_numbers( skb->data, 
-                                                chan->network_number, 0);
-                                } else {
-                                        ++card->wandev.stats.tx_dropped;
-                                        ++chan->ifstats.tx_dropped;
-                                        ++chan->if_send_stat.if_send_protocol_error;
-                                        goto if_send_crit_exit;
-                                }
-                        }
-                        /* We never drop here, if cannot send than, copy
-                         * a packet into a transmit buffer 
-                         */
-                        chan_send(dev, skb->data, skb->len, 0);
-                        break;
-
-                default:
-                        ++chan->ifstats.tx_dropped;     
-                        ++card->wandev.stats.tx_dropped;
-                        break;
-        }
-
-
-if_send_crit_exit:
-        
-        dev_kfree_skb_any(skb);
-
-        netif_start_queue(dev);
-        clear_bit(SEND_CRIT,(void*)&card->wandev.critical);
-        S508_S514_unlock(card, &smp_flags);
-        return 0;
-}
-
-/*============================================================================
- * Setup so that a frame can be transmitted on the occurrence of a transmit
- * interrupt.
- *===========================================================================*/
-
-static void setup_for_delayed_transmit(struct net_device* dev, void* buf,
-                                       unsigned len)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        TX25Status* status = card->flags;
-
-        ++chan->if_send_stat.if_send_adptr_bfrs_full;
-
-        if(chan->transmit_length) {
-                printk(KERN_INFO "%s: Error, transmit length set in delayed transmit!\n",
-                                card->devname);
-                return;
-        }
-
-        if (chan->common.usedby == API){
-                if (len > X25_CHAN_MTU+sizeof(x25api_hdr_t)) {
-                        ++chan->ifstats.tx_dropped;     
-                        ++card->wandev.stats.tx_dropped;
-                        printk(KERN_INFO "%s: Length is too big for delayed transmit\n",
-                                card->devname);
-                        return;
-                }
-        }else{
-                if (len > X25_MAX_DATA) {
-                        ++chan->ifstats.tx_dropped;     
-                        ++card->wandev.stats.tx_dropped;
-                        printk(KERN_INFO "%s: Length is too big for delayed transmit\n",
-                                card->devname);
-                        return;
-                }
-        }
-
-        chan->transmit_length = len;
-        atomic_set(&chan->common.driver_busy,1);
-        memcpy(chan->transmit_buffer, buf, len);
-
-        ++chan->if_send_stat.if_send_tx_int_enabled;
-
-        /* Enable Transmit Interrupt */
-        ++card->u.x.tx_interrupts_pending;
-        status->imask |= INTR_ON_TX_FRAME;
-}
-
-
-/*===============================================================
- * net_device_stats
- *
- *      Get ethernet-style interface statistics.
- *      Return a pointer to struct enet_statistics.
- *
- *==============================================================*/
-static struct net_device_stats *if_stats(struct net_device* dev)
-{
-        x25_channel_t *chan = dev->priv;
-
-        if(chan == NULL)
-                return NULL;
-
-        return &chan->ifstats;
-}
-
-
-/*
- *      Interrupt Handlers 
- */
-
-/*
- * X.25 Interrupt Service Routine.
- */
-
-static void wpx_isr (sdla_t* card)
-{
-        TX25Status* status = card->flags;
-
-        card->in_isr = 1;
-        ++card->statistics.isr_entry;
-
-        if (test_bit(PERI_CRIT,(void*)&card->wandev.critical)){
-                card->in_isr=0;
-                status->iflags = 0;
-                return;
-        }
-        
-        if (test_bit(SEND_CRIT, (void*)&card->wandev.critical)){
-
-                printk(KERN_INFO "%s: wpx_isr: wandev.critical set to 0x%02lx, int type = 0x%02x\n", 
-                        card->devname, card->wandev.critical, status->iflags);
-                card->in_isr = 0;
-                status->iflags = 0;
-                return;
-        }
-
-        /* For all interrupts set the critical flag to CRITICAL_RX_INTR.
-         * If the if_send routine is called with this flag set it will set
-         * the enable transmit flag to 1. (for a delayed interrupt)
-         */
-        switch (status->iflags){
-
-                case RX_INTR_PENDING:           /* receive interrupt */
-                        rx_intr(card);
-                        break;
-
-                case TX_INTR_PENDING:           /* transmit interrupt */
-                        tx_intr(card);
-                        break;
-
-                case MODEM_INTR_PENDING:        /* modem status interrupt */
-                        status_intr(card);
-                        break;
-
-                case X25_ASY_TRANS_INTR_PENDING:        /* network event interrupt */
-                        event_intr(card);
-                        break;
-
-                case TIMER_INTR_PENDING:
-                        timer_intr(card);
-                        break;
-
-                default:                /* unwanted interrupt */
-                        spur_intr(card);
-        }
-
-        card->in_isr = 0;
-        status->iflags = 0;     /* clear interrupt condition */
-}
-
-/*
- *      Receive interrupt handler.
- *      This routine handles fragmented IP packets using M-bit according to the
- *      RFC1356.
- *      o map ligical channel number to network interface.
- *      o allocate socket buffer or append received packet to the existing one.
- *      o if M-bit is reset (i.e. it's the last packet in a sequence) then 
- *      decapsulate packet and pass socket buffer to the protocol stack.
- *
- *      Notes:
- *      1. When allocating a socket buffer, if M-bit is set then more data is
- *      coming and we have to allocate buffer for the maximum IP packet size
- *      expected on this channel.
- *      2. If something goes wrong and X.25 packet has to be dropped (e.g. no
- *      socket buffers available) the whole packet sequence must be discarded.
- */
-
-static void rx_intr (sdla_t* card)
-{
-        TX25Mbox* rxmb = card->rxmb;
-        unsigned lcn = rxmb->cmd.lcn;
-        struct net_device* dev = find_channel(card,lcn);
-        x25_channel_t* chan;
-        struct sk_buff* skb=NULL;
-
-        if (dev == NULL){
-                /* Invalid channel, discard packet */
-                printk(KERN_INFO "%s: receiving on orphaned LCN %d!\n",
-                        card->devname, lcn);
-                return;
-        }
-
-        chan = dev->priv;
-        chan->i_timeout_sofar = jiffies;
-
-
-        /* Copy the data from the board, into an
-         * skb buffer 
-         */
-        if (wanpipe_pull_data_in_skb(card,dev,&skb)){
-                ++chan->ifstats.rx_dropped;
-                ++card->wandev.stats.rx_dropped;
-                ++chan->rx_intr_stat.rx_intr_no_socket;
-                ++chan->rx_intr_stat.rx_intr_bfr_not_passed_to_stack;
-                return;
-        }
-
-        dev->last_rx = jiffies;         /* timestamp */
-
-
-        /* ------------ API ----------------*/
-
-        if (chan->common.usedby == API){
-
-                if (bh_enqueue(dev, skb)){
-                        ++chan->ifstats.rx_dropped;
-                        ++card->wandev.stats.rx_dropped;
-                        ++chan->rx_intr_stat.rx_intr_bfr_not_passed_to_stack;
-                        dev_kfree_skb_any(skb);
-                        return;
-                }               
-
-                ++chan->ifstats.rx_packets;
-                chan->ifstats.rx_bytes += skb->len;
-                
-
-                chan->rx_skb = NULL;
-                if (!test_and_set_bit(0, &chan->tq_working)){
-                        wanpipe_queue_work(&chan->common.wanpipe_work);
-                }
-                return;
-        }
-
-
-        /* ------------- WANPIPE -------------------*/
-        
-        /* set rx_skb to NULL so we won't access it later when kernel already owns it */
-        chan->rx_skb=NULL;
-        
-        /* Decapsulate packet, if necessary */
-        if (!skb->protocol && !wanrouter_type_trans(skb, dev)){
-                /* can't decapsulate packet */
-                dev_kfree_skb_any(skb);
-                ++chan->ifstats.rx_errors;
-                ++chan->ifstats.rx_dropped;
-                ++card->wandev.stats.rx_dropped;
-                ++chan->rx_intr_stat.rx_intr_bfr_not_passed_to_stack;
-
-        }else{
-                if( handle_IPXWAN(skb->data, chan->name, 
-                                  chan->enable_IPX, chan->network_number, 
-                                  skb->protocol)){
-
-                        if( chan->enable_IPX ){
-                                if(chan_send(dev, skb->data, skb->len,0)){
-                                        chan->tx_skb = skb;
-                                }else{
-                                        dev_kfree_skb_any(skb);
-                                        ++chan->rx_intr_stat.rx_intr_bfr_not_passed_to_stack;
-                                }
-                        }else{
-                                /* increment IPX packet dropped statistic */
-                                ++chan->ifstats.rx_dropped;
-                                ++chan->rx_intr_stat.rx_intr_bfr_not_passed_to_stack;
-                        }
-                }else{
-                        skb->mac.raw = skb->data;
-                        chan->ifstats.rx_bytes += skb->len;
-                        ++chan->ifstats.rx_packets;
-                        ++chan->rx_intr_stat.rx_intr_bfr_passed_to_stack;
-                        netif_rx(skb);
-                }
-        }
-        
-        return;
-}
-
-
-static int wanpipe_pull_data_in_skb(sdla_t *card, struct net_device *dev,
-                                    struct sk_buff **skb)
-{
-        void *bufptr;
-        TX25Mbox* rxmb = card->rxmb;
-        unsigned len = rxmb->cmd.length;        /* packet length */
-        unsigned qdm = rxmb->cmd.qdm;           /* Q,D and M bits */
-        x25_channel_t *chan = dev->priv;
-        struct sk_buff *new_skb = *skb;
-
-        if (chan->common.usedby == WANPIPE){
-                if (chan->drop_sequence){
-                        if (!(qdm & 0x01)){ 
-                                chan->drop_sequence = 0;
-                        }
-                        return 1;
-                }
-                new_skb = chan->rx_skb;
-        }else{
-                /* Add on the API header to the received
-                 * data 
-                 */
-                len += sizeof(x25api_hdr_t);
-        }
-
-        if (new_skb == NULL){
-                int bufsize;
-
-                if (chan->common.usedby == WANPIPE){
-                        bufsize = (qdm & 0x01) ? dev->mtu : len;
-                }else{
-                        bufsize = len;
-                }
-
-                /* Allocate new socket buffer */
-                new_skb = dev_alloc_skb(bufsize + dev->hard_header_len);
-                if (new_skb == NULL){
-                        printk(KERN_INFO "%s: no socket buffers available!\n",
-                                card->devname);
-                        chan->drop_sequence = 1;        /* set flag */
-                        ++chan->ifstats.rx_dropped;
-                        return 1;
-                }
-        }
-
-        if (skb_tailroom(new_skb) < len){
-                /* No room for the packet. Call off the whole thing! */
-                dev_kfree_skb_any(new_skb);
-                if (chan->common.usedby == WANPIPE){
-                        chan->rx_skb = NULL;
-                        if (qdm & 0x01){ 
-                                chan->drop_sequence = 1;
-                        }
-                }
-
-                printk(KERN_INFO "%s: unexpectedly long packet sequence "
-                        "on interface %s!\n", card->devname, dev->name);
-                ++chan->ifstats.rx_length_errors;
-                return 1;
-        }
-
-        bufptr = skb_put(new_skb,len);
-
-
-        if (chan->common.usedby == API){
-                /* Fill in the x25api header 
-                 */
-                x25api_t * api_data = (x25api_t*)bufptr;
-                api_data->hdr.qdm = rxmb->cmd.qdm;
-                api_data->hdr.cause = rxmb->cmd.cause;
-                api_data->hdr.diagn = rxmb->cmd.diagn;
-                api_data->hdr.length = rxmb->cmd.length;
-                memcpy(api_data->data, rxmb->data, rxmb->cmd.length);
-        }else{
-                memcpy(bufptr, rxmb->data, len);
-        }
-
-        new_skb->dev = dev;
-
-        if (chan->common.usedby == API){
-                new_skb->mac.raw = new_skb->data;
-                new_skb->protocol = htons(X25_PROT);
-                new_skb->pkt_type = WAN_PACKET_DATA;
-        }else{
-                new_skb->protocol = chan->protocol;
-                chan->rx_skb = new_skb;
-        }
-
-        /* If qdm bit is set, more data is coming 
-         * thus, exit and wait for more data before
-         * sending the packet up. (Used by router only) 
-         */
-        if ((qdm & 0x01) && (chan->common.usedby == WANPIPE)) 
-                return 1;       
-
-        *skb = new_skb; 
-
-        return 0;
-}
-
-/*===============================================================
- * tx_intr
- *  
- *      Transmit interrupt handler.
- *      For each dev, check that there is something to send.
- *      If data available, transmit.    
- *
- *===============================================================*/
-
-static void tx_intr (sdla_t* card)
-{
-        struct net_device *dev;
-        TX25Status* status = card->flags;
-        unsigned char more_to_tx=0;
-        x25_channel_t *chan=NULL;
-        int i=0;        
-
-        if (card->u.x.tx_dev == NULL){
-                card->u.x.tx_dev = card->wandev.dev;
-        }
-
-        dev = card->u.x.tx_dev;
-
-        for (;;){
-
-                chan = dev->priv;
-                if (chan->transmit_length){
-                        /* Device was set to transmit, check if the TX
-                         * buffers are available 
-                         */             
-                        if (chan->common.state != WAN_CONNECTED){
-                                chan->transmit_length = 0;
-                                atomic_set(&chan->common.driver_busy,0);
-                                chan->tx_offset=0;
-                                if (netif_queue_stopped(dev)){
-                                        if (chan->common.usedby == API){
-                                                netif_start_queue(dev);
-                                                wakeup_sk_bh(dev);
-                                        }else{
-                                                netif_wake_queue(dev);
-                                        }
-                                }
-                                dev = move_dev_to_next(card,dev);
-                                break;
-                        }                               
-
-                        if ((status->cflags[chan->ch_idx] & 0x40 || card->u.x.LAPB_hdlc) && 
-                             (*card->u.x.hdlc_buf_status & 0x40) ){
-                                /* Tx buffer available, we can send */
-                                
-                                if (tx_intr_send(card, dev)){
-                                        more_to_tx=1;
-                                }
-
-                                /* If more than one interface present, move the
-                                 * device pointer to the next interface, so on the 
-                                 * next TX interrupt we will try sending from it. 
-                                 */
-                                dev = move_dev_to_next(card,dev);
-                                break;
-                        }else{
-                                /* Tx buffers not available, but device set
-                                 * the TX interrupt.  Set more_to_tx and try  
-                                 * to transmit for other devices.
-                                 */
-                                more_to_tx=1;
-                                dev = move_dev_to_next(card,dev);
-                        }
-
-                }else{
-                        /* This device was not set to transmit,
-                         * go to next 
-                         */
-                        dev = move_dev_to_next(card,dev);
-                }       
-
-                if (++i == card->u.x.no_dev){
-                        if (!more_to_tx){
-                                DBG_PRINTK(KERN_INFO "%s: Nothing to Send in TX INTR\n",
-                                        card->devname);
-                        }
-                        break;
-                }
-
-        } //End of FOR
-
-        card->u.x.tx_dev = dev;
-        
-        if (!more_to_tx){
-                /* if any other interfaces have transmit interrupts pending, */
-                /* do not disable the global transmit interrupt */
-                if (!(--card->u.x.tx_interrupts_pending)){
-                        status->imask &= ~INTR_ON_TX_FRAME;
-                }
-        }
-        return;
-}
-
-/*===============================================================
- * move_dev_to_next
- *  
- *
- *===============================================================*/
-
-
-struct net_device *move_dev_to_next(sdla_t *card, struct net_device *dev)
-{
-        if (card->u.x.no_dev != 1){
-                if (!*((struct net_device **)dev->priv))
-                        return card->wandev.dev;
-                else
-                        return *((struct net_device **)dev->priv);
-        }
-        return dev;
-}
-
-/*===============================================================
- *  tx_intr_send
- *  
- *
- *===============================================================*/
-
-static int tx_intr_send(sdla_t *card, struct net_device *dev)
-{
-        x25_channel_t* chan = dev->priv; 
-
-        if (chan_send (dev,chan->transmit_buffer,chan->transmit_length,1)){
-                 
-                /* Packet was split up due to its size, do not disable
-                 * tx_intr 
-                 */
-                return 1;
-        }
-
-        chan->transmit_length=0;
-        atomic_set(&chan->common.driver_busy,0);
-        chan->tx_offset=0;
-
-        /* If we are in API mode, wakeup the 
-         * sock BH handler, not the NET_BH */
-        if (netif_queue_stopped(dev)){
-                if (chan->common.usedby == API){
-                        netif_start_queue(dev);
-                        wakeup_sk_bh(dev);
-                }else{
-                        netif_wake_queue(dev);
-                }
-        }
-        return 0;
-}
-
-
-/*===============================================================
- * timer_intr
- *  
- *      Timer interrupt handler.
- *      Check who called the timer interrupt and perform
- *      action accordingly.
- *
- *===============================================================*/
-
-static void timer_intr (sdla_t *card)
-{
-        TX25Status* status = card->flags;
-
-        if (card->u.x.timer_int_enabled & TMR_INT_ENABLED_CMD_EXEC){
-
-                if (timer_intr_cmd_exec(card) == 0){
-                        card->u.x.timer_int_enabled &=
-                                ~TMR_INT_ENABLED_CMD_EXEC;
-                }
-
-        }else  if(card->u.x.timer_int_enabled & TMR_INT_ENABLED_UDP_PKT) {
-
-                if ((*card->u.x.hdlc_buf_status & 0x40) && 
-                    card->u.x.udp_type == UDP_XPIPE_TYPE){
-
-                        if(process_udp_mgmt_pkt(card)) {
-                                card->u.x.timer_int_enabled &= 
-                                        ~TMR_INT_ENABLED_UDP_PKT;
-                        }
-                }
-
-        }else if (card->u.x.timer_int_enabled & TMR_INT_ENABLED_POLL_ACTIVE) {
-
-                struct net_device *dev = card->u.x.poll_device;
-                x25_channel_t *chan = NULL;
-
-                if (!dev){
-                        card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_POLL_ACTIVE;
-                        return;
-                }
-                chan = dev->priv;
-
-                printk(KERN_INFO 
-                        "%s: Closing down Idle link %s on LCN %d\n",
-                                        card->devname,chan->name,chan->common.lcn); 
-                chan->i_timeout_sofar = jiffies;
-                chan_disc(dev); 
-                card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_POLL_ACTIVE;
-                card->u.x.poll_device=NULL;
-
-        }else if (card->u.x.timer_int_enabled & TMR_INT_ENABLED_POLL_CONNECT_ON) {
-
-                wanpipe_set_state(card, WAN_CONNECTED);
-                if (card->u.x.LAPB_hdlc){
-                        struct net_device *dev = card->wandev.dev;
-                        set_chan_state(dev,WAN_CONNECTED);
-                        send_delayed_cmd_result(card,dev,card->mbox);   
-                }
-
-                /* 0x8F enable all interrupts */
-                x25_set_intr_mode(card, INTR_ON_RX_FRAME|       
-                                        INTR_ON_TX_FRAME|
-                                        INTR_ON_MODEM_STATUS_CHANGE|
-                                        //INTR_ON_COMMAND_COMPLETE|
-                                        X25_ASY_TRANS_INTR_PENDING |
-                                        INTR_ON_TIMER |
-                                        DIRECT_RX_INTR_USAGE
-                                ); 
-
-                status->imask &= ~INTR_ON_TX_FRAME;     /* mask Tx interrupts */
-                card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_POLL_CONNECT_ON;
-
-        }else if (card->u.x.timer_int_enabled & TMR_INT_ENABLED_POLL_CONNECT_OFF) {
-
-                //printk(KERN_INFO "Poll connect, Turning OFF\n");
-                disconnect(card);
-                card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_POLL_CONNECT_OFF;
-
-        }else if (card->u.x.timer_int_enabled & TMR_INT_ENABLED_POLL_DISCONNECT) {
-
-                //printk(KERN_INFO "POll disconnect, trying to connect\n");
-                connect(card);
-                card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_POLL_DISCONNECT;
-
-        }else if (card->u.x.timer_int_enabled & TMR_INT_ENABLED_UPDATE){
-
-                if (*card->u.x.hdlc_buf_status & 0x40){
-                        x25_get_err_stats(card);
-                        x25_get_stats(card);
-                        card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_UPDATE;
-                }
-        }
-
-        if(!card->u.x.timer_int_enabled){
-                //printk(KERN_INFO "Turning Timer Off \n");
-                status->imask &= ~INTR_ON_TIMER;        
-        }
-}
-
-/*====================================================================
- *      Modem status interrupt handler.
- *===================================================================*/
-static void status_intr (sdla_t* card)
-{
-
-        /* Added to avoid Modem status message flooding */
-        static TX25ModemStatus last_stat;
-
-        TX25Mbox* mbox = card->mbox;
-        TX25ModemStatus *modem_status;
-        struct net_device *dev;
-        x25_channel_t *chan;
-        int err;
-
-        memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-        mbox->cmd.command = X25_READ_MODEM_STATUS;
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        if (err){ 
-                x25_error(card, err, X25_READ_MODEM_STATUS, 0);
-        }else{
-        
-                modem_status = (TX25ModemStatus*)mbox->data;    
-        
-                /* Check if the last status was the same
-                 * if it was, do NOT print message again */
-        
-                if (last_stat.status != modem_status->status){
-
-                        printk(KERN_INFO "%s: Modem Status Change: DCD=%s, CTS=%s\n",
-                                card->devname,DCD(modem_status->status),CTS(modem_status->status));
-
-                        last_stat.status = modem_status->status;
-                
-                        if (card->u.x.oob_on_modem){
-
-                                mbox->cmd.pktType = mbox->cmd.command;
-                                mbox->cmd.result = 0x08;
-
-                                /* Send a OOB to all connected sockets */
-                                for (dev = card->wandev.dev; dev;
-                                     dev = *((struct net_device**)dev->priv)) {
-                                        chan=dev->priv;
-                                        if (chan->common.usedby == API){
-                                                send_oob_msg(card,dev,mbox);                            
-                                        }
-                                }
-
-                                /* The modem OOB message will probably kill the
-                                 * the link. If we don't clear the flag here,
-                                 * a deadlock could occur */ 
-                                if (atomic_read(&card->u.x.command_busy)){
-                                        atomic_set(&card->u.x.command_busy,0);
-                                }
-                        }
-                }
-        }
-
-        memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-        mbox->cmd.command = X25_HDLC_LINK_STATUS;
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        if (err){ 
-                x25_error(card, err, X25_HDLC_LINK_STATUS, 0);
-        }
-
-}
-
-/*====================================================================
- *      Network event interrupt handler.
- *===================================================================*/
-static void event_intr (sdla_t* card)
-{
-        x25_fetch_events(card);
-}
-
-/*====================================================================
- *      Spurious interrupt handler.
- *      o print a warning
- *      o        
- *====================================================================*/
-
-static void spur_intr (sdla_t* card)
-{
-        printk(KERN_INFO "%s: spurious interrupt!\n", card->devname);
-}
-
-
-/*
- *      Background Polling Routines  
- */
-
-/*====================================================================
- *      Main polling routine.
- *      This routine is repeatedly called by the WANPIPE 'thread' to allow for
- *      time-dependent housekeeping work.
- *
- *      Notes:
- *      1. This routine may be called on interrupt context with all interrupts
- *      enabled. Beware!
- *====================================================================*/
-
-static void wpx_poll (sdla_t *card)
-{
-        if (!card->wandev.dev){
-                goto wpx_poll_exit;
-        }
-
-        if (card->open_cnt != card->u.x.num_of_ch){
-                goto wpx_poll_exit;
-        }
-        
-        if (test_bit(PERI_CRIT,&card->wandev.critical)){
-                goto wpx_poll_exit;
-        }
-
-        if (test_bit(SEND_CRIT,&card->wandev.critical)){
-                goto wpx_poll_exit;
-        }
-
-        switch(card->wandev.state){
-                case WAN_CONNECTED:
-                        poll_active(card);
-                        break;
-
-                case WAN_CONNECTING:
-                        poll_connecting(card);
-                        break;
-
-                case WAN_DISCONNECTED:
-                        poll_disconnected(card);
-                        break;
-        }
-
-wpx_poll_exit:
-        clear_bit(POLL_CRIT,&card->wandev.critical);
-        return;
-}
-
-static void trigger_x25_poll(sdla_t *card)
-{
-        schedule_work(&card->u.x.x25_poll_work);
-}
-
-/*====================================================================
- *      Handle physical link establishment phase.
- *      o if connection timed out, disconnect the link.
- *===================================================================*/
-
-static void poll_connecting (sdla_t* card)
-{
-        volatile TX25Status* status = card->flags;
-
-        if (status->gflags & X25_HDLC_ABM){
-
-                timer_intr_exec (card, TMR_INT_ENABLED_POLL_CONNECT_ON);
-
-        }else if ((jiffies - card->state_tick) > CONNECT_TIMEOUT){
-
-                timer_intr_exec (card, TMR_INT_ENABLED_POLL_CONNECT_OFF);
-
-        }
-}
-
-/*====================================================================
- *      Handle physical link disconnected phase.
- *      o if hold-down timeout has expired and there are open interfaces, 
- *      connect link.
- *===================================================================*/
-
-static void poll_disconnected (sdla_t* card)
-{
-        struct net_device *dev; 
-        x25_channel_t *chan;
-        TX25Status* status = card->flags;
-
-        if (!card->u.x.LAPB_hdlc && card->open_cnt && 
-            ((jiffies - card->state_tick) > HOLD_DOWN_TIME)){
-                timer_intr_exec(card, TMR_INT_ENABLED_POLL_DISCONNECT);
-        }
-
-
-        if ((dev=card->wandev.dev) == NULL)
-                return;
-
-        if ((chan=dev->priv) == NULL)
-                return;
-
-        if (chan->common.usedby == API && 
-            atomic_read(&chan->common.command) && 
-            card->u.x.LAPB_hdlc){
-
-                if (!(card->u.x.timer_int_enabled & TMR_INT_ENABLED_CMD_EXEC)) 
-                        card->u.x.timer_int_enabled |= TMR_INT_ENABLED_CMD_EXEC;
-
-                if (!(status->imask & INTR_ON_TIMER))
-                        status->imask |= INTR_ON_TIMER;
-        }       
-
-}
-
-/*====================================================================
- *      Handle active link phase.
- *      o fetch X.25 asynchronous events.
- *      o kick off transmission on all interfaces.
- *===================================================================*/
-
-static void poll_active (sdla_t* card)
-{
-        struct net_device* dev;
-        TX25Status* status = card->flags;
-
-        for (dev = card->wandev.dev; dev;
-             dev = *((struct net_device **)dev->priv)){
-                x25_channel_t* chan = dev->priv;
-
-                /* If SVC has been idle long enough, close virtual circuit */
-                if ( chan->common.svc && 
-                     chan->common.state == WAN_CONNECTED &&
-                     chan->common.usedby == WANPIPE ){
-                
-                        if( (jiffies - chan->i_timeout_sofar) / HZ > chan->idle_timeout ){
-                                /* Close svc */
-                                card->u.x.poll_device=dev;
-                                timer_intr_exec (card, TMR_INT_ENABLED_POLL_ACTIVE);
-                        }
-                }
-
-#ifdef PRINT_DEBUG
-                chan->ifstats.tx_compressed = atomic_read(&chan->common.command);
-                chan->ifstats.tx_errors = chan->common.state;
-                chan->ifstats.rx_fifo_errors = atomic_read(&card->u.x.command_busy);
-                ++chan->ifstats.tx_bytes;
-
-                chan->ifstats.rx_fifo_errors=atomic_read(&chan->common.disconnect);
-                chan->ifstats.multicast=atomic_read(&chan->bh_buff_used);
-                chan->ifstats.rx_length_errors=*card->u.x.hdlc_buf_status;
-#endif  
-
-                if (chan->common.usedby == API && 
-                    atomic_read(&chan->common.command) && 
-                    !card->u.x.LAPB_hdlc){
-
-                        if (!(card->u.x.timer_int_enabled & TMR_INT_ENABLED_CMD_EXEC)) 
-                                card->u.x.timer_int_enabled |= TMR_INT_ENABLED_CMD_EXEC;
-
-                        if (!(status->imask & INTR_ON_TIMER))
-                                status->imask |= INTR_ON_TIMER;
-                }       
-
-                if ((chan->common.usedby == API) && 
-                     atomic_read(&chan->common.disconnect)){
-
-                        if (chan->common.state == WAN_DISCONNECTED){
-                                atomic_set(&chan->common.disconnect,0);
-                                return;
-                        }
-
-                        atomic_set(&chan->common.command,X25_CLEAR_CALL);
-                        if (!(card->u.x.timer_int_enabled & TMR_INT_ENABLED_CMD_EXEC)) 
-                                card->u.x.timer_int_enabled |= TMR_INT_ENABLED_CMD_EXEC;
-
-                        if (!(status->imask & INTR_ON_TIMER))
-                                status->imask |= INTR_ON_TIMER;
-                }
-        }
-}
-
-static void timer_intr_exec(sdla_t *card, unsigned char TYPE)
-{
-        TX25Status* status = card->flags;
-        card->u.x.timer_int_enabled |= TYPE;
-        if (!(status->imask & INTR_ON_TIMER))
-                status->imask |= INTR_ON_TIMER;
-}
-
-
-/*==================================================================== 
- * SDLA Firmware-Specific Functions 
- *
- *  Almost all X.25 commands can unexpetedly fail due to so called 'X.25
- *  asynchronous events' such as restart, interrupt, incoming call request,
- *  call clear request, etc.  They can't be ignored and have to be delt with
- *  immediately.  To tackle with this problem we execute each interface 
- *  command in a loop until good return code is received or maximum number 
- *  of retries is reached.  Each interface command returns non-zero return 
- *  code, an asynchronous event/error handler x25_error() is called.
- *====================================================================*/
-
-/*====================================================================
- *      Read X.25 firmware version.
- *              Put code version as ASCII string in str. 
- *===================================================================*/
-
-static int x25_get_version (sdla_t* card, char* str)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = X25_READ_CODE_VERSION;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- &&
-                 x25_error(card, err, X25_READ_CODE_VERSION, 0));
-
-        if (!err && str)
-        {
-                int len = mbox->cmd.length;
-
-                memcpy(str, mbox->data, len);
-                str[len] = '\0';
-        }
-        return err;
-}
-
-/*====================================================================
- *      Configure adapter.
- *===================================================================*/
-
-static int x25_configure (sdla_t* card, TX25Config* conf)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do{
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                memcpy(mbox->data, (void*)conf, sizeof(TX25Config));
-                mbox->cmd.length  = sizeof(TX25Config);
-                mbox->cmd.command = X25_SET_CONFIGURATION;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_SET_CONFIGURATION, 0));
-        return err;
-}
-
-/*====================================================================
- *      Configure adapter for HDLC only.
- *===================================================================*/
-
-static int hdlc_configure (sdla_t* card, TX25Config* conf)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do{
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                memcpy(mbox->data, (void*)conf, sizeof(TX25Config));
-                mbox->cmd.length  = sizeof(TX25Config);
-                mbox->cmd.command = X25_HDLC_SET_CONFIG;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_SET_CONFIGURATION, 0));
-
-        return err;
-}
-
-static int set_hdlc_level (sdla_t* card)
-{
-
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do{
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = SET_PROTOCOL_LEVEL;
-                mbox->cmd.length = 1;
-                mbox->data[0] = HDLC_LEVEL; //| DO_HDLC_LEVEL_ERROR_CHECKING;   
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, SET_PROTOCOL_LEVEL, 0));
-
-        return err;
-}
-
-
-
-/*====================================================================
- * Get communications error statistics.
- *====================================================================*/
-
-static int x25_get_err_stats (sdla_t* card)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = X25_HDLC_READ_COMM_ERR;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_HDLC_READ_COMM_ERR, 0));
-        
-        if (!err)
-        {
-                THdlcCommErr* stats = (void*)mbox->data;
-
-                card->wandev.stats.rx_over_errors    = stats->rxOverrun;
-                card->wandev.stats.rx_crc_errors     = stats->rxBadCrc;
-                card->wandev.stats.rx_missed_errors  = stats->rxAborted;
-                card->wandev.stats.tx_aborted_errors = stats->txAborted;
-        }
-        return err;
-}
-
-/*====================================================================
- *      Get protocol statistics.
- *===================================================================*/
-
-static int x25_get_stats (sdla_t* card)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = X25_READ_STATISTICS;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_READ_STATISTICS, 0)) ;
-        
-        if (!err)
-        {
-                TX25Stats* stats = (void*)mbox->data;
-
-                card->wandev.stats.rx_packets = stats->rxData;
-                card->wandev.stats.tx_packets = stats->txData;
-        }
-        return err;
-}
-
-/*====================================================================
- *      Close HDLC link.
- *===================================================================*/
-
-static int x25_close_hdlc (sdla_t* card)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = X25_HDLC_LINK_CLOSE;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_HDLC_LINK_CLOSE, 0));
-        
-        return err;
-}
-
-
-/*====================================================================
- *      Open HDLC link.
- *===================================================================*/
-
-static int x25_open_hdlc (sdla_t* card)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = X25_HDLC_LINK_OPEN;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_HDLC_LINK_OPEN, 0));
-
-        return err;
-}
-
-/*=====================================================================
- * Setup HDLC link.
- *====================================================================*/
-static int x25_setup_hdlc (sdla_t* card)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = X25_HDLC_LINK_SETUP;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_HDLC_LINK_SETUP, 0));
-        
-        return err;
-}
-
-/*====================================================================
- * Set (raise/drop) DTR.
- *===================================================================*/
-
-static int x25_set_dtr (sdla_t* card, int dtr)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->data[0] = 0;
-                mbox->data[2] = 0;
-                mbox->data[1] = dtr ? 0x02 : 0x01;
-                mbox->cmd.length  = 3;
-                mbox->cmd.command = X25_SET_GLOBAL_VARS;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_SET_GLOBAL_VARS, 0));
-        
-        return err;
-}
-
-/*====================================================================
- *      Set interrupt mode.
- *===================================================================*/
-
-static int x25_set_intr_mode (sdla_t* card, int mode)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->data[0] = mode;
-                if (card->hw.fwid == SFID_X25_508){
-                        mbox->data[1] = card->hw.irq;
-                        mbox->data[2] = 2;
-                        mbox->cmd.length = 3;
-                }else {
-                        mbox->cmd.length  = 1;
-                }
-                mbox->cmd.command = X25_SET_INTERRUPT_MODE;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_SET_INTERRUPT_MODE, 0));
-        
-        return err;
-}
-
-/*====================================================================
- *      Read X.25 channel configuration.
- *===================================================================*/
-
-static int x25_get_chan_conf (sdla_t* card, x25_channel_t* chan)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int lcn = chan->common.lcn;
-        int err;
-
-        do{
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.lcn     = lcn;
-                mbox->cmd.command = X25_READ_CHANNEL_CONFIG;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_READ_CHANNEL_CONFIG, lcn));
-
-        if (!err)
-        {
-                TX25Status* status = card->flags;
-
-                /* calculate an offset into the array of status bytes */
-                if (card->u.x.hi_svc <= X25_MAX_CHAN){ 
-
-                        chan->ch_idx = lcn - 1;
-
-                }else{
-                        int offset;
-
-                        /* FIX: Apr 14 2000 : Nenad Corbic
-                         * The data field was being compared to 0x1F using
-                         * '&&' instead of '&'. 
-                         * This caused X25API to fail for LCNs greater than 255.
-                         */
-                        switch (mbox->data[0] & 0x1F)
-                        {
-                                case 0x01: 
-                                        offset = status->pvc_map; break;
-                                case 0x03: 
-                                        offset = status->icc_map; break;
-                                case 0x07: 
-                                        offset = status->twc_map; break;
-                                case 0x0B: 
-                                        offset = status->ogc_map; break;
-                                default: 
-                                        offset = 0;
-                        }
-                        chan->ch_idx = lcn - 1 - offset;
-                }
-
-                /* get actual transmit packet size on this channel */
-                switch(mbox->data[1] & 0x38)
-                {
-                        case 0x00: 
-                                chan->tx_pkt_size = 16; 
-                                break;
-                        case 0x08: 
-                                chan->tx_pkt_size = 32; 
-                                break;
-                        case 0x10: 
-                                chan->tx_pkt_size = 64; 
-                                break;
-                        case 0x18: 
-                                chan->tx_pkt_size = 128; 
-                                break;
-                        case 0x20: 
-                                chan->tx_pkt_size = 256; 
-                                break;
-                        case 0x28: 
-                                chan->tx_pkt_size = 512; 
-                                break;
-                        case 0x30: 
-                                chan->tx_pkt_size = 1024; 
-                                break;
-                }
-                if (card->u.x.logging)
-                        printk(KERN_INFO "%s: X.25 packet size on LCN %d is %d.\n",
-                                card->devname, lcn, chan->tx_pkt_size);
-        }
-        return err;
-}
-
-/*====================================================================
- *      Place X.25 call.
- *====================================================================*/
-
-static int x25_place_call (sdla_t* card, x25_channel_t* chan)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-        char str[64];
-
-
-        if (chan->protocol == htons(ETH_P_IP)){
-                sprintf(str, "-d%s -uCC", chan->addr);
-        
-        }else if (chan->protocol == htons(ETH_P_IPX)){
-                sprintf(str, "-d%s -u800000008137", chan->addr);
-        
-        }
-        
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                strcpy(mbox->data, str);
-                mbox->cmd.length  = strlen(str);
-                mbox->cmd.command = X25_PLACE_CALL;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_PLACE_CALL, 0));
-
-        if (!err){
-                bind_lcn_to_dev (card, chan->dev, mbox->cmd.lcn);
-        }
-        return err;
-}
-
-/*====================================================================
- *      Accept X.25 call.
- *====================================================================*/
-
-static int x25_accept_call (sdla_t* card, int lcn, int qdm)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.lcn     = lcn;
-                mbox->cmd.qdm     = qdm;
-                mbox->cmd.command = X25_ACCEPT_CALL;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_ACCEPT_CALL, lcn));
-        
-        return err;
-}
-
-/*====================================================================
- *      Clear X.25 call.
- *====================================================================*/
-
-static int x25_clear_call (sdla_t* card, int lcn, int cause, int diagn)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.lcn     = lcn;
-                mbox->cmd.cause   = cause;
-                mbox->cmd.diagn   = diagn;
-                mbox->cmd.command = X25_CLEAR_CALL;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, X25_CLEAR_CALL, lcn));
-        
-        return err;
-}
-
-/*====================================================================
- *      Send X.25 data packet.
- *====================================================================*/
-
-static int x25_send (sdla_t* card, int lcn, int qdm, int len, void* buf)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = MAX_CMD_RETRY;
-        int err;
-        unsigned char cmd;
-                
-        if (card->u.x.LAPB_hdlc)
-                cmd = X25_HDLC_WRITE;
-        else
-                cmd = X25_WRITE;
-
-        do
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                memcpy(mbox->data, buf, len);
-                mbox->cmd.length  = len;
-                mbox->cmd.lcn     = lcn;
-
-                if (card->u.x.LAPB_hdlc){
-                        mbox->cmd.pf = qdm;
-                }else{                  
-                        mbox->cmd.qdm = qdm;
-                }
-
-                mbox->cmd.command = cmd;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        } while (err && retry-- && x25_error(card, err, cmd , lcn));
-
-
-        /* If buffers are busy the return code for LAPB HDLC is
-         * 1. The above functions are looking for return code
-         * of X25RES_NOT_READY if busy. */
-
-        if (card->u.x.LAPB_hdlc && err == 1){
-                err = X25RES_NOT_READY;
-        }
-
-        return err;
-}
-
-/*====================================================================
- *      Fetch X.25 asynchronous events.
- *===================================================================*/
-
-static int x25_fetch_events (sdla_t* card)
-{
-        TX25Status* status = card->flags;
-        TX25Mbox* mbox = card->mbox;
-        int err = 0;
-
-        if (status->gflags & 0x20)
-        {
-                memset(&mbox->cmd, 0, sizeof(TX25Cmd));
-                mbox->cmd.command = X25_IS_DATA_AVAILABLE;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-                if (err) x25_error(card, err, X25_IS_DATA_AVAILABLE, 0);
-        }
-        return err;
-}
-
-/*====================================================================
- *      X.25 asynchronous event/error handler.
- *              This routine is called each time interface command returns 
- *              non-zero return code to handle X.25 asynchronous events and 
- *              common errors. Return non-zero to repeat command or zero to 
- *              cancel it.
- *
- *      Notes:
- *      1. This function may be called recursively, as handling some of the
- *      asynchronous events (e.g. call request) requires execution of the
- *      interface command(s) that, in turn, may also return asynchronous
- *      events.  To avoid re-entrancy problems we copy mailbox to dynamically
- *      allocated memory before processing events.
- *====================================================================*/
-
-static int x25_error (sdla_t* card, int err, int cmd, int lcn)
-{
-        int retry = 1;
-        unsigned dlen = ((TX25Mbox*)card->mbox)->cmd.length;
-        TX25Mbox* mb;
-
-        mb = kmalloc(sizeof(TX25Mbox) + dlen, GFP_ATOMIC);
-        if (mb == NULL)
-        {
-                printk(KERN_ERR "%s: x25_error() out of memory!\n",
-                        card->devname);
-                return 0;
-        }
-        memcpy(mb, card->mbox, sizeof(TX25Mbox) + dlen);
-        switch (err){
-
-        case X25RES_ASYNC_PACKET:       /* X.25 asynchronous packet was received */
-
-                mb->data[dlen] = '\0';
-
-                switch (mb->cmd.pktType & 0x7F){
-
-                case ASE_CALL_RQST:             /* incoming call */
-                        retry = incoming_call(card, cmd, lcn, mb);
-                        break;
-
-                case ASE_CALL_ACCEPTED:         /* connected */
-                        retry = call_accepted(card, cmd, lcn, mb);
-                        break;
-
-                case ASE_CLEAR_RQST:            /* call clear request */
-                        retry = call_cleared(card, cmd, lcn, mb);
-                        break;
-
-                case ASE_RESET_RQST:            /* reset request */
-                        printk(KERN_INFO "%s: X.25 reset request on LCN %d! "
-                                "Cause:0x%02X Diagn:0x%02X\n",
-                                card->devname, mb->cmd.lcn, mb->cmd.cause,
-                                mb->cmd.diagn);
-                        api_oob_event (card,mb);
-                        break;
-
-                case ASE_RESTART_RQST:          /* restart request */
-                        retry = restart_event(card, cmd, lcn, mb);
-                        break;
-
-                case ASE_CLEAR_CONFRM:
-                        if (clear_confirm_event (card,mb))
-                                break;
-
-                        /* I use the goto statement here so if 
-                         * somebody inserts code between the
-                         * case and default, we will not have
-                         * ghost problems */
-
-                        goto dflt_1;
-
-                default:
-dflt_1:
-                        printk(KERN_INFO "%s: X.25 event 0x%02X on LCN %d! "
-                                "Cause:0x%02X Diagn:0x%02X\n",
-                                card->devname, mb->cmd.pktType,
-                                mb->cmd.lcn, mb->cmd.cause, mb->cmd.diagn);
-                }
-                break;
-
-        case X25RES_PROTO_VIOLATION:    /* X.25 protocol violation indication */
-
-                /* Bug Fix: Mar 14 2000
-                 * The Protocol violation error conditions were  
-                 * not handled previously */
-
-                switch (mb->cmd.pktType & 0x7F){
-
-                case PVE_CLEAR_RQST:    /* Clear request */             
-                        retry = call_cleared(card, cmd, lcn, mb);
-                        break;  
-
-                case PVE_RESET_RQST:    /* Reset request */
-                        printk(KERN_INFO "%s: X.25 reset request on LCN %d! "
-                                "Cause:0x%02X Diagn:0x%02X\n",
-                                card->devname, mb->cmd.lcn, mb->cmd.cause,
-                                mb->cmd.diagn);
-                        api_oob_event (card,mb);
-                        break;
-
-                case PVE_RESTART_RQST:  /* Restart request */
-                        retry = restart_event(card, cmd, lcn, mb);
-                        break;
-
-                default :
-                        printk(KERN_INFO
-                                "%s: X.25 protocol violation on LCN %d! "
-                                "Packet:0x%02X Cause:0x%02X Diagn:0x%02X\n",
-                                card->devname, mb->cmd.lcn,
-                                mb->cmd.pktType & 0x7F, mb->cmd.cause, mb->cmd.diagn);
-                        api_oob_event(card,mb);
-                }
-                break;
-
-        case 0x42:      /* X.25 timeout */
-                retry = timeout_event(card, cmd, lcn, mb);
-                break;
-
-        case 0x43:      /* X.25 retry limit exceeded */
-                printk(KERN_INFO
-                        "%s: exceeded X.25 retry limit on LCN %d! "
-                        "Packet:0x%02X Diagn:0x%02X\n", card->devname,
-                        mb->cmd.lcn, mb->cmd.pktType, mb->cmd.diagn)
-                ;
-                break;
-
-        case 0x08:      /* modem failure */
-#ifndef MODEM_NOT_LOG
-                printk(KERN_INFO "%s: modem failure!\n", card->devname);
-#endif /* MODEM_NOT_LOG */
-                api_oob_event(card,mb);
-                break;
-
-        case 0x09:      /* N2 retry limit */
-                printk(KERN_INFO "%s: exceeded HDLC retry limit!\n",
-                        card->devname);
-                api_oob_event(card,mb);
-                break;
-
-        case 0x06:      /* unnumbered frame was received while in ABM */
-                printk(KERN_INFO "%s: received Unnumbered frame 0x%02X!\n",
-                        card->devname, mb->data[0]);
-                api_oob_event(card,mb);
-                break;
-
-        case CMD_TIMEOUT:
-                printk(KERN_ERR "%s: command 0x%02X timed out!\n",
-                        card->devname, cmd)
-                ;
-                retry = 0;      /* abort command */
-                break;
-
-        case X25RES_NOT_READY:
-                retry = 1;
-                break;
-
-        case 0x01:
-                if (card->u.x.LAPB_hdlc)
-                        break;
-
-                if (mb->cmd.command == 0x16)
-                        break;
-                /* I use the goto statement here so if 
-                 * somebody inserts code between the
-                 * case and default, we will not have
-                 * ghost problems */
-                goto dflt_2;
-
-        default:
-dflt_2:
-                printk(KERN_INFO "%s: command 0x%02X returned 0x%02X! Lcn %i\n",
-                        card->devname, cmd, err, mb->cmd.lcn)
-                ;
-                retry = 0;      /* abort command */
-        }
-        kfree(mb);
-        return retry;
-}
-
-/*==================================================================== 
- *      X.25 Asynchronous Event Handlers
- *      These functions are called by the x25_error() and should return 0, if
- *      the command resulting in the asynchronous event must be aborted.
- *====================================================================*/
-
-
-
-/*====================================================================
- *Handle X.25 incoming call request.
- *      RFC 1356 establishes the following rules:
- *      1. The first octet in the Call User Data (CUD) field of the call
- *         request packet contains NLPID identifying protocol encapsulation
- *      2. Calls MUST NOT be accepted unless router supports requested
- *         protocol encapsulation.
- *      3. A diagnostic code 249 defined by ISO/IEC 8208 may be used 
- *         when clearing a call because protocol encapsulation is not 
- *         supported.
- *      4. If an incoming call is received while a call request is 
- *         pending (i.e. call collision has occurred), the incoming call 
- *         shall be rejected and call request shall be retried.
- *====================================================================*/
-
-static int incoming_call (sdla_t* card, int cmd, int lcn, TX25Mbox* mb)
-{
-        struct wan_device* wandev = &card->wandev;
-        int new_lcn = mb->cmd.lcn;
-        struct net_device* dev = get_dev_by_lcn(wandev, new_lcn);
-        x25_channel_t* chan = NULL;
-        int accept = 0;         /* set to '1' if o.k. to accept call */
-        unsigned int user_data;
-        x25_call_info_t* info;
-        
-        /* Make sure there is no call collision */
-        if (dev != NULL)
-        {
-                printk(KERN_INFO
-                        "%s: X.25 incoming call collision on LCN %d!\n",
-                        card->devname, new_lcn);
-
-                x25_clear_call(card, new_lcn, 0, 0);
-                return 1;
-        }
-
-        /* Make sure D bit is not set in call request */
-//FIXME: THIS IS NOT TURE !!!! TAKE IT OUT
-//      if (mb->cmd.qdm & 0x02)
-//      {
-//              printk(KERN_INFO
-//                      "%s: X.25 incoming call on LCN %d with D-bit set!\n",
-//                      card->devname, new_lcn);
-//
-//              x25_clear_call(card, new_lcn, 0, 0);
-//              return 1;
-//      }
-
-        /* Parse call request data */
-        info = kmalloc(sizeof(x25_call_info_t), GFP_ATOMIC);
-        if (info == NULL)
-        {
-                printk(KERN_ERR
-                        "%s: not enough memory to parse X.25 incoming call "
-                        "on LCN %d!\n", card->devname, new_lcn);
-                x25_clear_call(card, new_lcn, 0, 0);
-                return 1;
-        }
- 
-        parse_call_info(mb->data, info);
-
-        if (card->u.x.logging)
-                printk(KERN_INFO "\n%s: X.25 incoming call on LCN %d!\n",
-                        card->devname, new_lcn);
-
-        /* Conver the first two ASCII characters into an
-         * interger. Used to check the incoming protocol 
-         */
-        user_data = hex_to_uint(info->user,2);
-
-        /* Find available channel */
-        for (dev = wandev->dev; dev; dev = *((struct net_device **)dev->priv)) {
-                chan = dev->priv;
-
-                if (chan->common.usedby == API)
-                        continue;
-
-                if (!chan->common.svc || (chan->common.state != WAN_DISCONNECTED))
-                        continue;
-
-                if (user_data == NLPID_IP && chan->protocol != htons(ETH_P_IP)){
-                        printk(KERN_INFO "IP packet but configured for IPX : %x, %x\n",
-                                       htons(chan->protocol), info->user[0]);
-                        continue;
-                }
-        
-                if (user_data == NLPID_SNAP && chan->protocol != htons(ETH_P_IPX)){
-                        printk(KERN_INFO "IPX packet but configured for IP: %x\n",
-                                       htons(chan->protocol));
-                        continue;
-                }
-                if (strcmp(info->src, chan->addr) == 0)
-                        break;
-
-                /* If just an '@' is specified, accept all incoming calls */
-                if (strcmp(chan->addr, "") == 0)
-                        break;
-        }
-
-        if (dev == NULL){
-
-                /* If the call is not for any WANPIPE interfaces
-                 * check to see if there is an API listening queue
-                 * waiting for data. If there is send the packet
-                 * up the stack.
-                 */
-                if (card->sk != NULL && card->func != NULL){
-                        if (api_incoming_call(card,mb,new_lcn)){
-                                x25_clear_call(card, new_lcn, 0, 0);
-                        }
-                        accept = 0;
-                }else{
-                        printk(KERN_INFO "%s: no channels available!\n",
-                                card->devname);
-                        
-                        x25_clear_call(card, new_lcn, 0, 0);
-                }
-
-        }else if (info->nuser == 0){
-
-                printk(KERN_INFO
-                        "%s: no user data in incoming call on LCN %d!\n",
-                        card->devname, new_lcn)
-                ;
-                x25_clear_call(card, new_lcn, 0, 0);
-
-        }else switch (info->user[0]){
-
-                case 0:         /* multiplexed */
-                        chan->protocol = htons(0);
-                        accept = 1;
-                        break;
-
-                case NLPID_IP:  /* IP datagrams */
-                        accept = 1;
-                        break;
-
-                case NLPID_SNAP: /* IPX datagrams */
-                        accept = 1;
-                        break;
-
-                default:
-                        printk(KERN_INFO
-                                "%s: unsupported NLPID 0x%02X in incoming call "
-                                "on LCN %d!\n", card->devname, info->user[0], new_lcn);
-                        x25_clear_call(card, new_lcn, 0, 249);
-        }
-        
-        if (accept && (x25_accept_call(card, new_lcn, 0) == CMD_OK)){
-
-                bind_lcn_to_dev (card, chan->dev, new_lcn);
-                
-                if (x25_get_chan_conf(card, chan) == CMD_OK)
-                        set_chan_state(dev, WAN_CONNECTED);
-                else 
-                        x25_clear_call(card, new_lcn, 0, 0);
-        }
-        kfree(info);
-        return 1;
-}
-
-/*====================================================================
- *      Handle accepted call.
- *====================================================================*/
-
-static int call_accepted (sdla_t* card, int cmd, int lcn, TX25Mbox* mb)
-{
-        unsigned new_lcn = mb->cmd.lcn;
-        struct net_device* dev = find_channel(card, new_lcn);
-        x25_channel_t* chan;
-
-        if (dev == NULL){
-                printk(KERN_INFO
-                        "%s: clearing orphaned connection on LCN %d!\n",
-                        card->devname, new_lcn);
-                x25_clear_call(card, new_lcn, 0, 0);
-                return 1;
-        }
-
-        if (card->u.x.logging)  
-                printk(KERN_INFO "%s: X.25 call accepted on Dev %s and LCN %d!\n",
-                        card->devname, dev->name, new_lcn);
-
-        /* Get channel configuration and notify router */
-        chan = dev->priv;
-        if (x25_get_chan_conf(card, chan) != CMD_OK)
-        {
-                x25_clear_call(card, new_lcn, 0, 0);
-                return 1;
-        }
-
-        set_chan_state(dev, WAN_CONNECTED);
-
-        if (chan->common.usedby == API){
-                send_delayed_cmd_result(card,dev,mb);
-                bind_lcn_to_dev (card, dev, new_lcn);
-        }
-
-        return 1;
-}
-
-/*====================================================================
- *      Handle cleared call.
- *====================================================================*/
-
-static int call_cleared (sdla_t* card, int cmd, int lcn, TX25Mbox* mb)
-{
-        unsigned new_lcn = mb->cmd.lcn;
-        struct net_device* dev = find_channel(card, new_lcn);
-        x25_channel_t *chan;
-        unsigned char old_state;
-
-        if (card->u.x.logging){
-                printk(KERN_INFO "%s: X.25 clear request on LCN %d! Cause:0x%02X "
-                "Diagn:0x%02X\n",
-                card->devname, new_lcn, mb->cmd.cause, mb->cmd.diagn);
-        }
-
-        if (dev == NULL){ 
-                printk(KERN_INFO "%s: X.25 clear request : No device for clear\n",
-                                card->devname);
-                return 1;
-        }
-
-        chan=dev->priv;
-
-        old_state = chan->common.state;
-
-        set_chan_state(dev, WAN_DISCONNECTED);
-
-        if (chan->common.usedby == API){
-
-                switch (old_state){
-                
-                case WAN_CONNECTING:
-                        send_delayed_cmd_result(card,dev,mb);
-                        break;
-                case WAN_CONNECTED:
-                        send_oob_msg(card,dev,mb);                              
-                        break;
-                }
-        }
-        
-        return ((cmd == X25_WRITE) && (lcn == new_lcn)) ? 0 : 1;
-}
-
-/*====================================================================
- *      Handle X.25 restart event.
- *====================================================================*/
-
-static int restart_event (sdla_t* card, int cmd, int lcn, TX25Mbox* mb)
-{
-        struct wan_device* wandev = &card->wandev;
-        struct net_device* dev;
-        x25_channel_t *chan;
-        unsigned char old_state;
-
-        printk(KERN_INFO
-                "%s: X.25 restart request! Cause:0x%02X Diagn:0x%02X\n",
-                card->devname, mb->cmd.cause, mb->cmd.diagn);
-
-        /* down all logical channels */
-        for (dev = wandev->dev; dev; dev = *((struct net_device **)dev->priv)) {
-                chan=dev->priv;
-                old_state = chan->common.state;
-
-                set_chan_state(dev, WAN_DISCONNECTED);
-
-                if (chan->common.usedby == API){
-                        switch (old_state){
-                
-                        case WAN_CONNECTING:
-                                send_delayed_cmd_result(card,dev,mb);
-                                break;
-                        case WAN_CONNECTED:
-                                send_oob_msg(card,dev,mb);                              
-                                break;
-                        }
-                }
-        }
-        return (cmd == X25_WRITE) ? 0 : 1;
-}
-
-/*====================================================================
- * Handle timeout event.
- *====================================================================*/
-
-static int timeout_event (sdla_t* card, int cmd, int lcn, TX25Mbox* mb)
-{
-        unsigned new_lcn = mb->cmd.lcn;
-
-        if (mb->cmd.pktType == 0x05)    /* call request time out */
-        {
-                struct net_device* dev = find_channel(card,new_lcn);
-
-                printk(KERN_INFO "%s: X.25 call timed timeout on LCN %d!\n",
-                        card->devname, new_lcn);
-
-                if (dev){
-                        x25_channel_t *chan = dev->priv;
-                        set_chan_state(dev, WAN_DISCONNECTED);
-
-                        if (chan->common.usedby == API){
-                                send_delayed_cmd_result(card,dev,card->mbox);
-                        }
-                }
-        }else{ 
-                printk(KERN_INFO "%s: X.25 packet 0x%02X timeout on LCN %d!\n",
-                card->devname, mb->cmd.pktType, new_lcn);
-        }
-        return 1;
-}
-
-/* 
- *      Miscellaneous 
- */
-
-/*====================================================================
- *      Establish physical connection.
- *      o open HDLC and raise DTR
- *
- *      Return:         0       connection established
- *                      1       connection is in progress
- *                      <0      error
- *===================================================================*/
-
-static int connect (sdla_t* card)
-{
-        TX25Status* status = card->flags;
-
-        if (x25_open_hdlc(card) || x25_setup_hdlc(card))
-                return -EIO;
-
-        wanpipe_set_state(card, WAN_CONNECTING);
-
-        x25_set_intr_mode(card, INTR_ON_TIMER); 
-        status->imask &= ~INTR_ON_TIMER;
-
-        return 1;
-}
-
-/*
- *      Tear down physical connection.
- *      o close HDLC link
- *      o drop DTR
- *
- *      Return:         0
- *                      <0      error
- */
-
-static int disconnect (sdla_t* card)
-{
-        wanpipe_set_state(card, WAN_DISCONNECTED);
-        x25_set_intr_mode(card, INTR_ON_TIMER); /* disable all interrupt except timer */
-        x25_close_hdlc(card);                   /* close HDLC link */
-        x25_set_dtr(card, 0);                   /* drop DTR */
-        return 0;
-}
-
-/*
- * Find network device by its channel number.
- */
-
-static struct net_device* get_dev_by_lcn(struct wan_device* wandev,
-                                         unsigned lcn)
-{
-        struct net_device* dev;
-
-        for (dev = wandev->dev; dev; dev = *((struct net_device **)dev->priv))
-                if (((x25_channel_t*)dev->priv)->common.lcn == lcn) 
-                        break;
-        return dev;
-}
-
-/*
- *      Initiate connection on the logical channel.
- *      o for PVC we just get channel configuration
- *      o for SVCs place an X.25 call
- *
- *      Return:         0       connected
- *                      >0      connection in progress
- *                      <0      failure
- */
-
-static int chan_connect(struct net_device* dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-
-        if (chan->common.svc && chan->common.usedby == WANPIPE){
-                if (!chan->addr[0]){
-                        printk(KERN_INFO "%s: No Destination Address\n",
-                                        card->devname);
-                        return -EINVAL; /* no destination address */
-                }
-                printk(KERN_INFO "%s: placing X.25 call to %s ...\n",
-                        card->devname, chan->addr);
-
-                if (x25_place_call(card, chan) != CMD_OK)
-                        return -EIO;
-
-                set_chan_state(dev, WAN_CONNECTING);
-                return 1;
-        }else{
-                if (x25_get_chan_conf(card, chan) != CMD_OK)
-                        return -EIO;
-
-                set_chan_state(dev, WAN_CONNECTED);
-        }
-        return 0;
-}
-
-/*
- *      Disconnect logical channel.
- *      o if SVC then clear X.25 call
- */
-
-static int chan_disc(struct net_device* dev)
-{
-        x25_channel_t* chan = dev->priv;
-
-        if (chan->common.svc){ 
-                x25_clear_call(chan->card, chan->common.lcn, 0, 0);
-
-                /* For API we disconnect on clear
-                 * confirmation. 
-                 */
-                if (chan->common.usedby == API)
-                        return 0;
-        }
-
-        set_chan_state(dev, WAN_DISCONNECTED);
-        
-        return 0;
-}
-
-/*
- *      Set logical channel state.
- */
-
-static void set_chan_state(struct net_device* dev, int state)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        unsigned long flags;
-
-        save_flags(flags);
-        cli();
-        if (chan->common.state != state)
-        {
-                switch (state)
-                {
-                        case WAN_CONNECTED:
-                                if (card->u.x.logging){
-                                        printk (KERN_INFO 
-                                                "%s: interface %s connected, lcn %i !\n", 
-                                                card->devname, dev->name,chan->common.lcn);
-                                }
-                                *(unsigned short*)dev->dev_addr = htons(chan->common.lcn);
-                                chan->i_timeout_sofar = jiffies;
-
-                                /* LAPB is PVC Based */
-                                if (card->u.x.LAPB_hdlc)
-                                        chan->common.svc=0;
-                                break;
-
-                        case WAN_CONNECTING:
-                                if (card->u.x.logging){
-                                        printk (KERN_INFO 
-                                                "%s: interface %s connecting, lcn %i ...\n", 
-                                                card->devname, dev->name, chan->common.lcn);
-                                }
-                                break;
-
-                        case WAN_DISCONNECTED:
-                                if (card->u.x.logging){
-                                        printk (KERN_INFO 
-                                                "%s: interface %s disconnected, lcn %i !\n", 
-                                                card->devname, dev->name,chan->common.lcn);
-                                }
-                                atomic_set(&chan->common.disconnect,0);
-                                
-                                if (chan->common.svc) {
-                                        *(unsigned short*)dev->dev_addr = 0;
-                                        card->u.x.svc_to_dev_map[(chan->common.lcn%X25_MAX_CHAN)]=NULL;
-                                        chan->common.lcn = 0;
-                                }
-
-                                if (chan->transmit_length){
-                                        chan->transmit_length=0;
-                                        atomic_set(&chan->common.driver_busy,0);
-                                        chan->tx_offset=0;
-                                        if (netif_queue_stopped(dev)){
-                                                netif_wake_queue(dev);
-                                        }
-                                }
-                                atomic_set(&chan->common.command,0);
-                                break;
-
-                        case WAN_DISCONNECTING:
-                                if (card->u.x.logging){
-                                        printk (KERN_INFO 
-                                        "\n%s: interface %s disconnecting, lcn %i ...\n", 
-                                        card->devname, dev->name,chan->common.lcn);
-                                }
-                                atomic_set(&chan->common.disconnect,0);
-                                break;
-                }
-                chan->common.state = state;
-        }
-        chan->state_tick = jiffies;
-        restore_flags(flags);
-}
-
-/*
- *      Send packet on a logical channel.
- *              When this function is called, tx_skb field of the channel data 
- *              space points to the transmit socket buffer.  When transmission 
- *              is complete, release socket buffer and reset 'tbusy' flag.
- *
- *      Return:         0       - transmission complete
- *                      1       - busy
- *
- *      Notes:
- *      1. If packet length is greater than MTU for this channel, we'll fragment
- *      the packet into 'complete sequence' using M-bit.
- *      2. When transmission is complete, an event notification should be issued
- *      to the router.
- */
-
-static int chan_send(struct net_device* dev, void* buff, unsigned data_len,
-                     unsigned char tx_intr)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        TX25Status* status = card->flags;
-        unsigned len=0, qdm=0, res=0, orig_len = 0;
-        void *data;
-
-        /* Check to see if channel is ready */
-        if ((!(status->cflags[chan->ch_idx] & 0x40) && !card->u.x.LAPB_hdlc)  || 
-             !(*card->u.x.hdlc_buf_status & 0x40)){ 
-            
-                if (!tx_intr){
-                        setup_for_delayed_transmit (dev, buff, data_len);
-                        return 0;
-                }else{
-                        /* By returning 0 to tx_intr the packet will be dropped */
-                        ++card->wandev.stats.tx_dropped;
-                        ++chan->ifstats.tx_dropped;
-                        printk(KERN_INFO "%s: ERROR, Tx intr could not send, dropping %s:\n", 
-                                card->devname,dev->name);
-                        ++chan->if_send_stat.if_send_bfr_not_passed_to_adptr;
-                        return 0;
-                }
-        }
-
-        if (chan->common.usedby == API){
-                /* Remove the API Header */
-                x25api_hdr_t *api_data = (x25api_hdr_t *)buff;
-
-                /* Set the qdm bits from the packet header 
-                 * User has the option to set the qdm bits
-                 */
-                qdm = api_data->qdm;
-
-                orig_len = len = data_len - sizeof(x25api_hdr_t);
-                data = (unsigned char*)buff + sizeof(x25api_hdr_t);
-        }else{
-                data = buff;
-                orig_len = len = data_len;
-        }       
-
-        if (tx_intr){
-                /* We are in tx_intr, minus the tx_offset from 
-                 * the total length. The tx_offset part of the
-                 * data has already been sent. Also, move the 
-                 * data pointer to proper offset location.
-                 */
-                len -= chan->tx_offset;
-                data = (unsigned char*)data + chan->tx_offset;
-        }
-                
-        /* Check if the packet length is greater than MTU
-         * If YES: Cut the len to MTU and set the M bit 
-         */
-        if (len > chan->tx_pkt_size && !card->u.x.LAPB_hdlc){
-                len = chan->tx_pkt_size;
-                qdm |= M_BIT;           
-        } 
-
-
-        /* Pass only first three bits of the qdm byte to the send
-         * routine. In case user sets any other bit which might
-         * cause errors. 
-         */
-
-        switch(x25_send(card, chan->common.lcn, (qdm&0x07), len, data)){
-                case 0x00:      /* success */
-                        chan->i_timeout_sofar = jiffies;
-
-                        dev->trans_start=jiffies;
-                        
-                        if ((qdm & M_BIT) && !card->u.x.LAPB_hdlc){
-                                if (!tx_intr){
-                                        /* The M bit was set, which means that part of the
-                                         * packet has been sent. Copy the packet into a buffer
-                                         * and set the offset to len, so on next tx_inter 
-                                         * the packet will be sent using the below offset.
-                                         */
-                                        chan->tx_offset += len;
-
-                                        ++chan->ifstats.tx_packets;
-                                        chan->ifstats.tx_bytes += len;
-                                        
-                                        if (chan->tx_offset < orig_len){
-                                                setup_for_delayed_transmit (dev, buff, data_len);
-                                        }
-                                        res=0;
-                                }else{
-                                        /* We are already in tx_inter, thus data is already
-                                         * in the buffer. Update the offset and wait for
-                                         * next tx_intr. We add on to the offset, since data can
-                                         * be X number of times larger than max data size.
-                                         */
-                                        ++chan->ifstats.tx_packets;
-                                        chan->ifstats.tx_bytes += len;
-                                        
-                                        ++chan->if_send_stat.if_send_bfr_passed_to_adptr;
-                                        chan->tx_offset += len;
-
-                                        /* The user can set the qdm bit as well.
-                                         * If the entire packet was sent and qdm is still
-                                         * set, than it's the user who has set the M bit. In that,
-                                         * case indicate that the packet was send by returning 
-                                         * 0 and wait for a new packet. Otherwise, wait for next
-                                         * tx interrupt to send the rest of the packet */
-
-                                        if (chan->tx_offset < orig_len){
-                                                res=1;
-                                        }else{  
-                                                res=0;
-                                        }
-                                }
-                        }else{
-                                ++chan->ifstats.tx_packets;
-                                chan->ifstats.tx_bytes += len;
-                                ++chan->if_send_stat.if_send_bfr_passed_to_adptr;
-                                res=0;
-                        }
-                        break;
-
-                case 0x33:      /* Tx busy */
-                        if (tx_intr){
-                                printk(KERN_INFO "%s: Tx_intr: Big Error dropping packet %s\n",
-                                                card->devname,dev->name);
-                                ++chan->ifstats.tx_dropped;
-                                ++card->wandev.stats.tx_dropped;
-                                ++chan->if_send_stat.if_send_bfr_not_passed_to_adptr;
-                                res=0;
-                        }else{
-                                DBG_PRINTK(KERN_INFO 
-                                        "%s: Send: Big Error should have tx: storring %s\n",
-                                                card->devname,dev->name);
-                                setup_for_delayed_transmit (dev, buff, data_len);       
-                                res=1;
-                        }
-                        break;
-
-                default:        /* failure */
-                        ++chan->ifstats.tx_errors;
-                        if (tx_intr){
-                                printk(KERN_INFO "%s: Tx_intr: Failure to send, dropping %s\n",
-                                        card->devname,dev->name);
-                                ++chan->ifstats.tx_dropped;
-                                ++card->wandev.stats.tx_dropped;
-                                ++chan->if_send_stat.if_send_bfr_not_passed_to_adptr;
-                                res=0;
-                        }else{
-                                DBG_PRINTK(KERN_INFO "%s: Send: Failure to send !!!, storing %s\n",
-                                        card->devname,dev->name);                       
-                                setup_for_delayed_transmit (dev, buff, data_len);
-                                res=1;
-                        }
-                        break;  
-        }
-        return res;
-}
-
-
-/*
- *      Parse X.25 call request data and fill x25_call_info_t structure.
- */
-
-static void parse_call_info (unsigned char* str, x25_call_info_t* info)
-{
-        memset(info, 0, sizeof(x25_call_info_t));
-        for (; *str; ++str)
-        {
-                int i;
-                unsigned char ch;
-
-                if (*str == '-') switch (str[1]) {
-
-                        /* Take minus 2 off the maximum size so that 
-                         * last byte is 0. This way we can use string
-                         * manipulaton functions on call information.
-                         */
-
-                        case 'd':       /* destination address */
-                                for (i = 0; i < (MAX_X25_ADDR_SIZE-2); ++i){
-                                        ch = str[2+i];
-                                        if (isspace(ch)) break;
-                                        info->dest[i] = ch;
-                                }
-                                break;
-
-                        case 's':       /* source address */
-                                for (i = 0; i < (MAX_X25_ADDR_SIZE-2); ++i){
-                                        ch = str[2+i];
-                                        if (isspace(ch)) break;
-                                        info->src[i] = ch;
-                                }
-                                break;
-
-                        case 'u':       /* user data */
-                                for (i = 0; i < (MAX_X25_DATA_SIZE-2); ++i){
-                                        ch = str[2+i];
-                                        if (isspace(ch)) break;
-                                        info->user[i] = ch; 
-                                }
-                                info->nuser = i;
-                                break;
-
-                        case 'f':       /* facilities */
-                                for (i = 0; i < (MAX_X25_FACL_SIZE-2); ++i){
-                                        ch = str[2+i];
-                                        if (isspace(ch)) break;
-                                        info->facil[i] = ch;
-                                }
-                                info->nfacil = i;
-                                break;
-                }
-        }
-}
-
-/*
- *      Convert line speed in bps to a number used by S502 code.
- */
-
-static unsigned char bps_to_speed_code (unsigned long bps)
-{
-        unsigned char   number;
-
-        if (bps <= 1200)        number = 0x01;
-        else if (bps <= 2400)   number = 0x02;
-        else if (bps <= 4800)   number = 0x03;
-        else if (bps <= 9600)   number = 0x04;
-        else if (bps <= 19200)  number = 0x05;
-        else if (bps <= 38400)  number = 0x06;
-        else if (bps <= 45000)  number = 0x07;
-        else if (bps <= 56000)  number = 0x08;
-        else if (bps <= 64000)  number = 0x09;
-        else if (bps <= 74000)  number = 0x0A;
-        else if (bps <= 112000) number = 0x0B;
-        else if (bps <= 128000) number = 0x0C;
-        else number = 0x0D;
-
-        return number;
-}
-
-/*
- *      Convert decimal string to unsigned integer.
- *      If len != 0 then only 'len' characters of the string are converted.
- */
-
-static unsigned int dec_to_uint (unsigned char* str, int len)
-{
-        unsigned val;
-
-        if (!len) 
-                len = strlen(str);
-
-        for (val = 0; len && isdigit(*str); ++str, --len)
-                val = (val * 10) + (*str - (unsigned)'0');
-        
-        return val;
-}
-
-/*
- *      Convert hex string to unsigned integer.
- *      If len != 0 then only 'len' characters of the string are conferted.
- */
-
-static unsigned int hex_to_uint (unsigned char* str, int len)
-{
-        unsigned val, ch;
-
-        if (!len) 
-                len = strlen(str);
-
-        for (val = 0; len; ++str, --len)
-        {
-                ch = *str;
-                if (isdigit(ch))
-                        val = (val << 4) + (ch - (unsigned)'0');
-                else if (isxdigit(ch))
-                        val = (val << 4) + ((ch & 0xDF) - (unsigned)'A' + 10);
-                else break;
-        }
-        return val;
-}
-
-
-static int handle_IPXWAN(unsigned char *sendpacket, char *devname, unsigned char enable_IPX, unsigned long network_number, unsigned short proto)
-{
-        int i;
-
-        if( proto == ETH_P_IPX) {
-                /* It's an IPX packet */
-                if(!enable_IPX) {
-                        /* Return 1 so we don't pass it up the stack. */
-                        return 1;
-                }
-        } else {
-                /* It's not IPX so pass it up the stack.*/ 
-                return 0;
-        }
-
-        if( sendpacket[16] == 0x90 &&
-            sendpacket[17] == 0x04)
-        {
-                /* It's IPXWAN  */
-
-                if( sendpacket[2] == 0x02 &&
-                    sendpacket[34] == 0x00)
-                {
-                        /* It's a timer request packet */
-                        printk(KERN_INFO "%s: Received IPXWAN Timer Request packet\n",devname);
-
-                        /* Go through the routing options and answer no to every
-                         * option except Unnumbered RIP/SAP
-                         */
-                        for(i = 41; sendpacket[i] == 0x00; i += 5)
-                        {
-                                /* 0x02 is the option for Unnumbered RIP/SAP */
-                                if( sendpacket[i + 4] != 0x02)
-                                {
-                                        sendpacket[i + 1] = 0;
-                                }
-                        }
-
-                        /* Skip over the extended Node ID option */
-                        if( sendpacket[i] == 0x04 )
-                        {
-                                i += 8;
-                        }
-
-                        /* We also want to turn off all header compression opt.                          */ 
-                        for(; sendpacket[i] == 0x80 ;)
-                        {
-                                sendpacket[i + 1] = 0;
-                                i += (sendpacket[i + 2] << 8) + (sendpacket[i + 3]) + 4;
-                        }
-
-                        /* Set the packet type to timer response */
-                        sendpacket[34] = 0x01;
-
-                        printk(KERN_INFO "%s: Sending IPXWAN Timer Response\n",devname);
-                }
-                else if( sendpacket[34] == 0x02 )
-                {
-                        /* This is an information request packet */
-                        printk(KERN_INFO "%s: Received IPXWAN Information Request packet\n",devname);
-
-                        /* Set the packet type to information response */
-                        sendpacket[34] = 0x03;
-
-                        /* Set the router name */
-                        sendpacket[51] = 'X';
-                        sendpacket[52] = 'T';
-                        sendpacket[53] = 'P';
-                        sendpacket[54] = 'I';
-                        sendpacket[55] = 'P';
-                        sendpacket[56] = 'E';
-                        sendpacket[57] = '-';
-                        sendpacket[58] = CVHexToAscii(network_number >> 28);
-                        sendpacket[59] = CVHexToAscii((network_number & 0x0F000000)>> 24);
-                        sendpacket[60] = CVHexToAscii((network_number & 0x00F00000)>> 20);
-                        sendpacket[61] = CVHexToAscii((network_number & 0x000F0000)>> 16);
-                        sendpacket[62] = CVHexToAscii((network_number & 0x0000F000)>> 12);
-                        sendpacket[63] = CVHexToAscii((network_number & 0x00000F00)>> 8);
-                        sendpacket[64] = CVHexToAscii((network_number & 0x000000F0)>> 4);
-                        sendpacket[65] = CVHexToAscii(network_number & 0x0000000F);
-                        for(i = 66; i < 99; i+= 1)
-                        {
-                                sendpacket[i] = 0;
-                        }
-
-                        printk(KERN_INFO "%s: Sending IPXWAN Information Response packet\n",devname);
-                }
-                else
-                {
-                        printk(KERN_INFO "%s: Unknown IPXWAN packet!\n",devname);
-                        return 0;
-                }
-
-                /* Set the WNodeID to our network address */
-                sendpacket[35] = (unsigned char)(network_number >> 24);
-                sendpacket[36] = (unsigned char)((network_number & 0x00FF0000) >> 16);
-                sendpacket[37] = (unsigned char)((network_number & 0x0000FF00) >> 8);
-                sendpacket[38] = (unsigned char)(network_number & 0x000000FF);
-
-                return 1;
-        } else {
-                /*If we get here it's an IPX-data packet, so it'll get passed up the stack.
-                 */
-                /* switch the network numbers */
-                switch_net_numbers(sendpacket, network_number, 1);      
-                return 0;
-        }
-}
-
-/*
- *      If incoming is 0 (outgoing)- if the net numbers is ours make it 0
- *      if incoming is 1 - if the net number is 0 make it ours 
- */
-
-static void switch_net_numbers(unsigned char *sendpacket, unsigned long network_number, unsigned char incoming)
-{
-        unsigned long pnetwork_number;
-
-        pnetwork_number = (unsigned long)((sendpacket[6] << 24) + 
-                          (sendpacket[7] << 16) + (sendpacket[8] << 8) + 
-                          sendpacket[9]);
-        
-
-        if (!incoming) {
-                /*If the destination network number is ours, make it 0 */
-                if( pnetwork_number == network_number) {
-                        sendpacket[6] = sendpacket[7] = sendpacket[8] = 
-                                         sendpacket[9] = 0x00;
-                }
-        } else {
-                /* If the incoming network is 0, make it ours */
-                if( pnetwork_number == 0) {
-                        sendpacket[6] = (unsigned char)(network_number >> 24);
-                        sendpacket[7] = (unsigned char)((network_number & 
-                                         0x00FF0000) >> 16);
-                        sendpacket[8] = (unsigned char)((network_number & 
-                                         0x0000FF00) >> 8);
-                        sendpacket[9] = (unsigned char)(network_number & 
-                                         0x000000FF);
-                }
-        }
-
-
-        pnetwork_number = (unsigned long)((sendpacket[18] << 24) + 
-                          (sendpacket[19] << 16) + (sendpacket[20] << 8) + 
-                          sendpacket[21]);
-        
-        
-        if( !incoming ) {
-                /* If the source network is ours, make it 0 */
-                if( pnetwork_number == network_number) {
-                        sendpacket[18] = sendpacket[19] = sendpacket[20] = 
-                                 sendpacket[21] = 0x00;
-                }
-        } else {
-                /* If the source network is 0, make it ours */
-                if( pnetwork_number == 0 ) {
-                        sendpacket[18] = (unsigned char)(network_number >> 24);
-                        sendpacket[19] = (unsigned char)((network_number & 
-                                         0x00FF0000) >> 16);
-                        sendpacket[20] = (unsigned char)((network_number & 
-                                         0x0000FF00) >> 8);
-                        sendpacket[21] = (unsigned char)(network_number & 
-                                         0x000000FF);
-                }
-        }
-} /* switch_net_numbers */
-
-
-
-
-/********************* X25API SPECIFIC FUNCTIONS ****************/
-
-
-/*===============================================================
- *  find_channel
- *
- *      Manages the lcn to device map. It increases performance
- *      because it eliminates the need to search through the link  
- *      list for a device which is bounded to a specific lcn.
- *
- *===============================================================*/
-
-
-struct net_device *find_channel(sdla_t *card, unsigned lcn)
-{
-        if (card->u.x.LAPB_hdlc){
-
-                return card->wandev.dev;
-
-        }else{
-                /* We don't know whether the incoming lcn
-                 * is a PVC or an SVC channel. But we do know that
-                 * the lcn cannot be for both the PVC and the SVC
-                 * channel.
-
-                 * If the lcn number is greater or equal to 255, 
-                 * take the modulo 255 of that number. We only have
-                 * 255 locations, thus higher numbers must be mapped
-                 * to a number between 0 and 245. 
-
-                 * We must separate pvc's and svc's since two don't
-                 * have to be contiguous.  Meaning pvc's can start
-                 * from 1 to 10 and svc's can start from 256 to 266.
-                 * But 256%255 is 1, i.e. CONFLICT.
-                 */
-
-
-                /* Highest LCN number must be less or equal to 4096 */
-                if ((lcn <= MAX_LCN_NUM) && (lcn > 0)){
-
-                        if (lcn < X25_MAX_CHAN){
-                                if (card->u.x.svc_to_dev_map[lcn])
-                                        return card->u.x.svc_to_dev_map[lcn];
-
-                                if (card->u.x.pvc_to_dev_map[lcn])
-                                        return card->u.x.pvc_to_dev_map[lcn];
-                        
-                        }else{
-                                int new_lcn = lcn%X25_MAX_CHAN;
-                                if (card->u.x.svc_to_dev_map[new_lcn])
-                                        return card->u.x.svc_to_dev_map[new_lcn];
-
-                                if (card->u.x.pvc_to_dev_map[new_lcn])
-                                        return card->u.x.pvc_to_dev_map[new_lcn];
-                        }
-                }
-                return NULL;
-        }
-}
-
-void bind_lcn_to_dev(sdla_t *card, struct net_device *dev, unsigned lcn)
-{
-        x25_channel_t *chan = dev->priv;
-
-        /* Modulo the lcn number by X25_MAX_CHAN (255)
-         * because the lcn number can be greater than 255 
-         *
-         * We need to split svc and pvc since they don't have
-         * to be contigous. 
-         */
-
-        if (chan->common.svc){
-                card->u.x.svc_to_dev_map[(lcn % X25_MAX_CHAN)] = dev;
-        }else{
-                card->u.x.pvc_to_dev_map[(lcn % X25_MAX_CHAN)] = dev;
-        }
-        chan->common.lcn = lcn;
-}
-
-
-
-/*===============================================================
- * x25api_bh 
- *
- *
- *==============================================================*/
-
-static void x25api_bh(struct net_device* dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t* card = chan->card;
-        struct sk_buff *skb;
-
-        if (atomic_read(&chan->bh_buff_used) == 0){
-                printk(KERN_INFO "%s: BH Buffer Empty in BH\n",
-                                card->devname);
-                clear_bit(0, &chan->tq_working);
-                return;
-        }
-
-        while (atomic_read(&chan->bh_buff_used)){
-
-                /* If the sock is in the process of unlinking the
-                 * driver from the socket, we must get out. 
-                 * This never happends but is a sanity check. */
-                if (test_bit(0,&chan->common.common_critical)){
-                        clear_bit(0, &chan->tq_working);
-                        return;
-                }
-                
-                /* If LAPB HDLC, do not drop packets if socket is
-                 * not connected.  Let the buffer fill up and
-                 * turn off rx interrupt */
-                if (card->u.x.LAPB_hdlc){
-                        if (chan->common.sk == NULL || chan->common.func == NULL){
-                                clear_bit(0, &chan->tq_working);                        
-                                return;
-                        }
-                }
-
-                skb  = ((bh_data_t *)&chan->bh_head[chan->bh_read])->skb;
-
-                if (skb == NULL){
-                        printk(KERN_INFO "%s: BH Skb empty for read %i\n",
-                                        card->devname,chan->bh_read);
-                }else{
-                        
-                        if (chan->common.sk == NULL || chan->common.func == NULL){
-                                printk(KERN_INFO "%s: BH: Socket disconnected, dropping\n",
-                                                card->devname);
-                                dev_kfree_skb_any(skb);
-                                x25api_bh_cleanup(dev);
-                                ++chan->ifstats.rx_dropped;
-                                ++chan->rx_intr_stat.rx_intr_bfr_not_passed_to_stack;
-                                continue;
-                        }
-
-
-                        if (chan->common.func(skb,dev,chan->common.sk) != 0){
-                                /* Sock full cannot send, queue us for another
-                                 * try 
-                                 */
-                                printk(KERN_INFO "%s: BH: !!! Packet failed to send !!!!! \n",
-                                                card->devname);
-                                atomic_set(&chan->common.receive_block,1);
-                                return;
-                        }else{
-                                x25api_bh_cleanup(dev);
-                                ++chan->rx_intr_stat.rx_intr_bfr_passed_to_stack;
-                        }
-                }
-        }       
-        clear_bit(0, &chan->tq_working);
-
-        return;
-}
-
-/*===============================================================
- * x25api_bh_cleanup 
- *
- *
- *==============================================================*/
-
-static int x25api_bh_cleanup(struct net_device *dev)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-        TX25Status* status = card->flags;
-
-
-        ((bh_data_t *)&chan->bh_head[chan->bh_read])->skb = NULL;
-
-        if (chan->bh_read == MAX_BH_BUFF){
-                chan->bh_read=0;
-        }else{
-                ++chan->bh_read;        
-        }
-
-        /* If the Receive interrupt was off, it means
-         * that we filled up our circular buffer. Check    
-         * that we have space in the buffer. If so 
-         * turn the RX interrupt back on. 
-         */
-        if (!(status->imask & INTR_ON_RX_FRAME)){
-                if (atomic_read(&chan->bh_buff_used) < (MAX_BH_BUFF+1)){
-                        printk(KERN_INFO "%s: BH: Turning on the interrupt\n",
-                                        card->devname);
-                        status->imask |= INTR_ON_RX_FRAME;
-                }
-        }       
-
-        atomic_dec(&chan->bh_buff_used);
-        return 0;
-}
-
-
-/*===============================================================
- * bh_enqueue 
- *
- *
- *==============================================================*/
-
-static int bh_enqueue(struct net_device *dev, struct sk_buff *skb)
-{
-        x25_channel_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-        TX25Status* status = card->flags;
-
-        if (atomic_read(&chan->bh_buff_used) == (MAX_BH_BUFF+1)){
-                printk(KERN_INFO "%s: Bottom half buffer FULL\n",
-                                card->devname);
-                return 1; 
-        }
-
-        ((bh_data_t *)&chan->bh_head[chan->bh_write])->skb = skb;
-
-        if (chan->bh_write == MAX_BH_BUFF){
-                chan->bh_write=0;
-        }else{
-                ++chan->bh_write;
-        }
-
-        atomic_inc(&chan->bh_buff_used);
-
-        if (atomic_read(&chan->bh_buff_used) == (MAX_BH_BUFF+1)){
-                printk(KERN_INFO "%s: Buffer is now full, Turning off RX Intr\n",
-                                card->devname);
-                status->imask &= ~INTR_ON_RX_FRAME;
-        }
-
-        return 0;
-}
-
-
-/*===============================================================
- * timer_intr_cmd_exec
- *  
- *      Called by timer interrupt to execute a command
- *===============================================================*/
-
-static int timer_intr_cmd_exec (sdla_t* card)
-{
-        struct net_device *dev;
-        unsigned char more_to_exec=0;
-        volatile x25_channel_t *chan=NULL;
-        int i=0,bad_cmd=0,err=0;        
-
-        if (card->u.x.cmd_dev == NULL){
-                card->u.x.cmd_dev = card->wandev.dev;
-        }
-
-        dev = card->u.x.cmd_dev;
-
-        for (;;){
-
-                chan = dev->priv;
-                
-                if (atomic_read(&chan->common.command)){ 
-
-                        bad_cmd = check_bad_command(card,dev);
-
-                        if ((!chan->common.mbox || atomic_read(&chan->common.disconnect)) && 
-                             !bad_cmd){
-
-                                /* Socket has died or exited, We must bring the
-                                 * channel down before anybody else tries to 
-                                 * use it */
-                                err = channel_disconnect(card,dev);
-                        }else{
-                                err = execute_delayed_cmd(card, dev,
-                                                         (mbox_cmd_t*)chan->common.mbox,
-                                                          bad_cmd);
-                        }
-
-                        switch (err){
-
-                        case RETURN_RESULT:
-
-                                /* Return the result to the socket without
-                                 * delay. NO_WAIT Command */    
-                                atomic_set(&chan->common.command,0);
-                                if (atomic_read(&card->u.x.command_busy))
-                                        atomic_set(&card->u.x.command_busy,0);
-
-                                send_delayed_cmd_result(card,dev,card->mbox);
-
-                                more_to_exec=0;
-                                break;
-                        case DELAY_RESULT:
-                
-                                /* Wait for the remote to respond, before
-                                 * sending the result up to the socket.
-                                 * WAIT command */
-                                if (atomic_read(&card->u.x.command_busy))
-                                        atomic_set(&card->u.x.command_busy,0);
-                                
-                                atomic_set(&chan->common.command,0);
-                                more_to_exec=0;
-                                break;
-                        default:
-
-                                /* If command could not be executed for
-                                 * some reason (i.e return code 0x33 busy)
-                                 * set the more_to_exec bit which will
-                                 * indicate that this command must be exectued
-                                 * again during next timer interrupt 
-                                 */
-                                more_to_exec=1;
-                                if (atomic_read(&card->u.x.command_busy) == 0)
-                                        atomic_set(&card->u.x.command_busy,1);
-                                break;
-                        }
-
-                        bad_cmd=0;
-
-                        /* If flags is set, there are no hdlc buffers,
-                         * thus, wait for the next pass and try the
-                         * same command again. Otherwise, start searching 
-                         * from next device on the next pass. 
-                         */
-                        if (!more_to_exec){
-                                dev = move_dev_to_next(card,dev);
-                        }
-                        break;
-                }else{
-                        /* This device has nothing to execute,
-                         * go to next. 
-                         */
-                        if (atomic_read(&card->u.x.command_busy))
-                                        atomic_set(&card->u.x.command_busy,0);
-                        dev = move_dev_to_next(card,dev);
-                }       
-
-                if (++i == card->u.x.no_dev){
-                        if (!more_to_exec){
-                                DBG_PRINTK(KERN_INFO "%s: Nothing to execute in Timer\n",
-                                        card->devname);
-                                if (atomic_read(&card->u.x.command_busy)){
-                                        atomic_set(&card->u.x.command_busy,0);
-                                }
-                        }
-                        break;
-                }
-
-        } //End of FOR
-
-        card->u.x.cmd_dev = dev;
-        
-        if (more_to_exec){
-                /* If more commands are pending, do not turn off timer 
-                 * interrupt */
-                return 1;
-        }else{
-                /* No more commands, turn off timer interrupt */
-                return 0;
-        }       
-}
-
-/*===============================================================
- * execute_delayed_cmd 
- *
- *      Execute an API command which was passed down from the
- *      sock.  Sock is very limited in which commands it can
- *      execute.  Wait and No Wait commands are supported.  
- *      Place Call, Clear Call and Reset wait commands, where
- *      Accept Call is a no_wait command.
- *
- *===============================================================*/
-
-static int execute_delayed_cmd(sdla_t* card, struct net_device *dev,
-                               mbox_cmd_t *usr_cmd, char bad_cmd)
-{
-        TX25Mbox* mbox = card->mbox;
-        int err;
-        x25_channel_t *chan = dev->priv;
-        int delay=RETURN_RESULT;
-
-        if (!(*card->u.x.hdlc_buf_status & 0x40) && !bad_cmd){
-                return TRY_CMD_AGAIN;
-        }
-
-        /* This way a command is guaranteed to be executed for
-         * a specific lcn, the network interface is bound to. */
-        usr_cmd->cmd.lcn = chan->common.lcn;
-        
-
-        /* If channel is pvc, instead of place call
-         * run x25_channel configuration. If running LAPB HDLC
-         * enable communications. 
-         */
-        if ((!chan->common.svc) && (usr_cmd->cmd.command == X25_PLACE_CALL)){
-
-                if (card->u.x.LAPB_hdlc){
-                        DBG_PRINTK(KERN_INFO "LAPB: Connecting\n");
-                        connect(card);
-                        set_chan_state(dev,WAN_CONNECTING);
-                        return DELAY_RESULT;
-                }else{
-                        DBG_PRINTK(KERN_INFO "%s: PVC is CONNECTING\n",card->devname);
-                        if (x25_get_chan_conf(card, chan) == CMD_OK){
-                                set_chan_state(dev, WAN_CONNECTED);
-                        }else{ 
-                                set_chan_state(dev, WAN_DISCONNECTED);
-                        }
-                        return RETURN_RESULT;
-                }
-        }
-
-        /* Copy the socket mbox command onto the board */
-
-        memcpy(&mbox->cmd, &usr_cmd->cmd, sizeof(TX25Cmd));
-        if (usr_cmd->cmd.length){
-                memcpy(mbox->data, usr_cmd->data, usr_cmd->cmd.length);
-        }
-
-        /* Check if command is bad. We need to copy the cmd into
-         * the buffer regardless since we return the, mbox to
-         * the user */
-        if (bad_cmd){
-                mbox->cmd.result=0x01;
-                return RETURN_RESULT;
-        }
-
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-
-        if (err != CMD_OK && err != X25RES_NOT_READY)
-                x25_error(card, err, usr_cmd->cmd.command, usr_cmd->cmd.lcn);
-
-        if (mbox->cmd.result == X25RES_NOT_READY){
-                return TRY_CMD_AGAIN;
-        }
-
-        switch (mbox->cmd.command){
-
-        case X25_PLACE_CALL:
-                
-                switch (mbox->cmd.result){
-
-                case CMD_OK:
-
-                        /* Check if Place call is a wait command or a 
-                         * no wait command */
-                        if (atomic_read(&chan->common.command) & 0x80)
-                                delay=RETURN_RESULT;
-                        else
-                                delay=DELAY_RESULT;
-                
-
-                        DBG_PRINTK(KERN_INFO "\n%s: PLACE CALL Binding dev %s to lcn %i\n",
-                                        card->devname,dev->name, mbox->cmd.lcn);
-                
-                        bind_lcn_to_dev (card, dev, mbox->cmd.lcn);
-                        set_chan_state(dev, WAN_CONNECTING);
-                        break;
-
-
-                default:
-                        delay=RETURN_RESULT;
-                        set_chan_state(dev, WAN_DISCONNECTED);
-                        break;
-                }
-                break;
-
-        case X25_ACCEPT_CALL: 
-                
-                switch (mbox->cmd.result){
-
-                case CMD_OK:
-
-                        DBG_PRINTK(KERN_INFO "\n%s: ACCEPT Binding dev %s to lcn %i\n",
-                                card->devname,dev->name,mbox->cmd.lcn);
-
-                        bind_lcn_to_dev (card, dev, mbox->cmd.lcn);
-
-                        if (x25_get_chan_conf(card, chan) == CMD_OK){
-
-                                set_chan_state(dev, WAN_CONNECTED);
-                                delay=RETURN_RESULT;
-
-                        }else{ 
-                                if (x25_clear_call(card, usr_cmd->cmd.lcn, 0, 0) == CMD_OK){
-                                        /* if clear is successful, wait for clear confirm 
-                                         */ 
-                                        delay=DELAY_RESULT;
-                                }else{
-                                        /* Do not change the state here. If we fail 
-                                         * the accept the return code is send up 
-                                         *the stack, which will ether retry
-                                         * or clear the call 
-                                         */
-                                        DBG_PRINTK(KERN_INFO 
-                                                "%s: ACCEPT: STATE MAY BE CURRUPTED 2 !!!!!\n",
-                                                card->devname);
-                                        delay=RETURN_RESULT;
-                                }
-                        }
-                        break;
-
-
-                case X25RES_ASYNC_PACKET:
-                        delay=TRY_CMD_AGAIN;
-                        break;
-
-                default: 
-                        DBG_PRINTK(KERN_INFO "%s: ACCEPT FAILED\n",card->devname);
-                        if (x25_clear_call(card, usr_cmd->cmd.lcn, 0, 0) == CMD_OK){
-                                delay=DELAY_RESULT;
-                        }else{
-                                /* Do not change the state here. If we fail the accept. The
-                                 * return code is send up the stack, which will ether retry
-                                 * or clear the call */
-                                DBG_PRINTK(KERN_INFO 
-                                        "%s: ACCEPT: STATE MAY BE CORRUPTED 1 !!!!!\n",
-                                                card->devname);
-                                delay=RETURN_RESULT;
-                        }
-                }
-                break;
-
-        case X25_CLEAR_CALL:
-
-                switch (mbox->cmd.result){
-
-                case CMD_OK:
-                        DBG_PRINTK(KERN_INFO 
-                                        "CALL CLEAR OK: Dev %s Mbox Lcn %i  Chan Lcn %i\n",
-                                        dev->name,mbox->cmd.lcn,chan->common.lcn);
-                        set_chan_state(dev, WAN_DISCONNECTING);
-                        delay = DELAY_RESULT;
-                        break;
-
-                case X25RES_CHANNEL_IN_USE:
-                case X25RES_ASYNC_PACKET:
-                        delay = TRY_CMD_AGAIN;
-                        break;
-                        
-                case X25RES_LINK_NOT_IN_ABM:
-                case X25RES_INVAL_LCN:
-                case X25RES_INVAL_STATE:
-                        set_chan_state(dev, WAN_DISCONNECTED);
-                        delay = RETURN_RESULT;
-                        break;
-                
-                default:
-                        /* If command did not execute because of user
-                         * fault, do not change the state. This will
-                         * signal the socket that clear command failed.
-                         * User can retry or close the socket.
-                         * When socket gets killed, it will set the 
-                         * chan->disconnect which will signal
-                         * driver to clear the call */
-                        printk(KERN_INFO "%s: Clear Command Failed, Rc %x\n",
-                                card->devname,mbox->cmd.command); 
-                        delay = RETURN_RESULT;
-                }
-                break;
-        }       
-
-        return delay;
-}
-
-/*===============================================================
- * api_incoming_call 
- *
- *      Pass an incoming call request up the listening
- *      sock.  If the API sock is not listening reject the
- *      call.
- *
- *===============================================================*/
-
-static int api_incoming_call (sdla_t* card, TX25Mbox *mbox, int lcn)
-{
-        struct sk_buff *skb;
-        int len = sizeof(TX25Cmd)+mbox->cmd.length;
-
-        if (alloc_and_init_skb_buf(card, &skb, len)){
-                printk(KERN_INFO "%s: API incoming call, no memory\n",card->devname);
-                return 1;
-        }
-
-        memcpy(skb_put(skb,len),&mbox->cmd,len);
-
-        skb->mac.raw = skb->data;
-        skb->protocol = htons(X25_PROT);
-        skb->pkt_type = WAN_PACKET_ASYNC;
-
-        if (card->func(skb,card->sk) < 0){
-                printk(KERN_INFO "%s: MAJOR ERROR: Failed to send up place call \n",card->devname);
-                dev_kfree_skb_any(skb);
-                return 1;
-        }
-
-        return 0;
-}
-
-/*===============================================================
- * send_delayed_cmd_result
- *
- *      Wait commands like PLEACE CALL or CLEAR CALL must wait
- *      until the result arrives. This function passes
- *      the result to a waiting sock. 
- *
- *===============================================================*/
-static void send_delayed_cmd_result(sdla_t *card, struct net_device *dev,
-                                    TX25Mbox* mbox)
-{
-        x25_channel_t *chan = dev->priv;
-        mbox_cmd_t *usr_cmd = (mbox_cmd_t *)chan->common.mbox;
-        struct sk_buff *skb;
-        int len=sizeof(unsigned char);
-
-        atomic_set(&chan->common.command,0);
-
-        /* If the sock is in the process of unlinking the
-         * driver from the socket, we must get out. 
-         * This never happends but is a sanity check. */
-        if (test_bit(0,&chan->common.common_critical)){
-                return;
-        }
-
-        if (!usr_cmd || !chan->common.sk || !chan->common.func){
-                DBG_PRINTK(KERN_INFO "Delay result: Sock not bounded sk: %u, func: %u, mbox: %u\n",
-                        (unsigned int)chan->common.sk,
-                        (unsigned int)chan->common.func,
-                        (unsigned int)usr_cmd); 
-                return;
-        }
-
-        memcpy(&usr_cmd->cmd, &mbox->cmd, sizeof(TX25Cmd)); 
-        if (mbox->cmd.length > 0){
-                memcpy(usr_cmd->data, mbox->data, mbox->cmd.length);
-        }
-
-        if (alloc_and_init_skb_buf(card,&skb,len)){
-                printk(KERN_INFO "Delay result: No sock buffers\n");
-                return;
-        }
-
-        memcpy(skb_put(skb,len),&mbox->cmd.command,len);
-        
-        skb->mac.raw = skb->data;
-        skb->pkt_type = WAN_PACKET_CMD;
-                        
-        chan->common.func(skb,dev,chan->common.sk);
-}
-
-/*===============================================================
- * clear_confirm_event
- *
- *      Pass the clear confirmation event up the sock. The
- *      API will disconnect only after the clear confirmation
- *      has been received. 
- *
- *      Depending on the state, clear confirmation could 
- *      be an OOB event, or a result of an API command.
- *===============================================================*/
-
-static int clear_confirm_event (sdla_t *card, TX25Mbox* mb)
-{
-        struct net_device *dev;
-        x25_channel_t *chan;
-        unsigned char old_state;        
-
-        dev = find_channel(card,mb->cmd.lcn);
-        if (!dev){
-                DBG_PRINTK(KERN_INFO "%s: *** GOT CLEAR BUT NO DEV %i\n",
-                                card->devname,mb->cmd.lcn);
-                return 0;
-        }
-
-        chan=dev->priv;
-        DBG_PRINTK(KERN_INFO "%s: GOT CLEAR CONFIRM %s:  Mbox lcn %i  Chan lcn %i\n",
-                        card->devname, dev->name, mb->cmd.lcn, chan->common.lcn);
-
-        /* If not API fall through to default. 
-         * If API, send the result to a waiting
-         * socket.
-         */
-        
-        old_state = chan->common.state;
-        set_chan_state(dev, WAN_DISCONNECTED);
-
-        if (chan->common.usedby == API){
-                switch (old_state) {
-
-                case WAN_DISCONNECTING:
-                case WAN_CONNECTING:
-                        send_delayed_cmd_result(card,dev,mb);
-                        break;
-                case WAN_CONNECTED:
-                        send_oob_msg(card,dev,mb);
-                        break;
-                }
-                return 1;
-        }
-
-        return 0;
-}
-
-/*===============================================================
- * send_oob_msg
- *
- *    Construct an NEM Message and pass it up the connected
- *    sock. If the sock is not bounded discard the NEM.
- *
- *===============================================================*/
-
-static void send_oob_msg(sdla_t *card, struct net_device *dev, TX25Mbox *mbox)
-{
-        x25_channel_t *chan = dev->priv;
-        mbox_cmd_t *usr_cmd = (mbox_cmd_t *)chan->common.mbox;
-        struct sk_buff *skb;
-        int len=sizeof(x25api_hdr_t)+mbox->cmd.length;
-        x25api_t *api_hdr;
-
-        /* If the sock is in the process of unlinking the
-         * driver from the socket, we must get out. 
-         * This never happends but is a sanity check. */
-        if (test_bit(0,&chan->common.common_critical)){
-                return;
-        }
-
-        if (!usr_cmd || !chan->common.sk || !chan->common.func){
-                DBG_PRINTK(KERN_INFO "OOB MSG: Sock not bounded\n"); 
-                return;
-        }
-
-        memcpy(&usr_cmd->cmd, &mbox->cmd, sizeof(TX25Cmd)); 
-        if (mbox->cmd.length > 0){
-                memcpy(usr_cmd->data, mbox->data, mbox->cmd.length);
-        }
-
-        if (alloc_and_init_skb_buf(card,&skb,len)){
-                printk(KERN_INFO "%s: OOB MSG: No sock buffers\n",card->devname);
-                return;
-        }
-
-        api_hdr = (x25api_t*)skb_put(skb,len); 
-        api_hdr->hdr.pktType = mbox->cmd.pktType & 0x7F;
-        api_hdr->hdr.qdm     = mbox->cmd.qdm;
-        api_hdr->hdr.cause   = mbox->cmd.cause;
-        api_hdr->hdr.diagn   = mbox->cmd.diagn;
-        api_hdr->hdr.length  = mbox->cmd.length;
-        api_hdr->hdr.result  = mbox->cmd.result;
-        api_hdr->hdr.lcn     = mbox->cmd.lcn;
-
-        if (mbox->cmd.length > 0){
-                memcpy(api_hdr->data,mbox->data,mbox->cmd.length);
-        }
-        
-        skb->mac.raw = skb->data;
-        skb->pkt_type = WAN_PACKET_ERR;
-                        
-        if (chan->common.func(skb,dev,chan->common.sk) < 0){
-                if (bh_enqueue(dev,skb)){
-                        printk(KERN_INFO "%s: Dropping OOB MSG\n",card->devname);
-                        dev_kfree_skb_any(skb);
-                }
-        }
-
-        DBG_PRINTK(KERN_INFO "%s: OOB MSG OK, %s, lcn %i\n",
-                        card->devname, dev->name, mbox->cmd.lcn);
-}       
-
-/*===============================================================
- *  alloc_and_init_skb_buf 
- *
- *      Allocate and initialize an skb buffer. 
- *
- *===============================================================*/
-
-static int alloc_and_init_skb_buf (sdla_t *card, struct sk_buff **skb, int len)
-{
-        struct sk_buff *new_skb = *skb;
-
-        new_skb = dev_alloc_skb(len + X25_HRDHDR_SZ);
-        if (new_skb == NULL){
-                printk(KERN_INFO "%s: no socket buffers available!\n",
-                        card->devname);
-                return 1;
-        }
-
-        if (skb_tailroom(new_skb) < len){
-                /* No room for the packet. Call off the whole thing! */
-                dev_kfree_skb_any(new_skb);
-                printk(KERN_INFO "%s: Listen: unexpectedly long packet sequence\n"
-                        ,card->devname);
-                *skb = NULL;
-                return 1;
-        }
-
-        *skb = new_skb;
-        return 0;
-
-}
-
-/*===============================================================
- *  api_oob_event 
- *
- *      Send an OOB event up to the sock 
- *
- *===============================================================*/
-
-static void api_oob_event (sdla_t *card,TX25Mbox *mbox)
-{
-        struct net_device *dev = find_channel(card, mbox->cmd.lcn);
-        x25_channel_t *chan;
-
-        if (!dev)
-                return;
-
-        chan=dev->priv;
-
-        if (chan->common.usedby == API)
-                send_oob_msg(card,dev,mbox);
-        
-}
-
-
-
-
-static int channel_disconnect(sdla_t* card, struct net_device *dev)
-{
-
-        int err;
-        x25_channel_t *chan = dev->priv;
-
-        DBG_PRINTK(KERN_INFO "%s: TIMER: %s, Device down disconnecting\n",
-                                card->devname,dev->name);
-
-        if (chan->common.svc){
-                err = x25_clear_call(card,chan->common.lcn,0,0);
-        }else{
-                /* If channel is PVC or LAPB HDLC, there is no call
-                 * to be cleared, thus drop down to the default
-                 * area 
-                 */
-                err = 1;
-        }
-
-        switch (err){
-        
-                case X25RES_CHANNEL_IN_USE:     
-                case X25RES_NOT_READY:
-                        err = TRY_CMD_AGAIN;
-                        break;
-                case CMD_OK:
-                        DBG_PRINTK(KERN_INFO "CALL CLEAR OK: Dev %s Chan Lcn %i\n",
-                                                dev->name,chan->common.lcn);
-
-                        set_chan_state(dev,WAN_DISCONNECTING);
-                        atomic_set(&chan->common.command,0);
-                        err = DELAY_RESULT;
-                        break;
-                default:
-                        /* If LAPB HDLC protocol, bring the whole link down
-                         * once the application terminates 
-                         */
-
-                        set_chan_state(dev,WAN_DISCONNECTED);
-
-                        if (card->u.x.LAPB_hdlc){
-                                DBG_PRINTK(KERN_INFO "LAPB: Disconnecting Link\n");
-                                hdlc_link_down (card);
-                        }
-                        atomic_set(&chan->common.command,0);
-                        err = RETURN_RESULT;
-                        break;
-        }
-
-        return err;
-}
-
-static void hdlc_link_down (sdla_t *card)
-{
-        TX25Mbox* mbox = card->mbox;
-        int retry = 5;
-        int err=0;
-
-        do {
-                memset(mbox,0,sizeof(TX25Mbox));
-                mbox->cmd.command = X25_HDLC_LINK_DISC;
-                mbox->cmd.length = 1;
-                mbox->data[0]=0;
-                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-
-        } while (err && retry-- && x25_error(card, err, X25_HDLC_LINK_DISC, 0));
-
-        if (err)
-                printk(KERN_INFO "%s: Hdlc Link Down Failed %x\n",card->devname,err);
-
-        disconnect (card);
-        
-}
-
-static int check_bad_command(sdla_t* card, struct net_device *dev)
-{
-        x25_channel_t *chan = dev->priv;
-        int bad_cmd = 0;
-
-        switch (atomic_read(&chan->common.command)&0x7F){
-
-                case X25_PLACE_CALL:
-                        if (chan->common.state != WAN_DISCONNECTED)
-                                bad_cmd=1;
-                        break;
-                case X25_CLEAR_CALL:
-                        if (chan->common.state == WAN_DISCONNECTED)
-                                bad_cmd=1;
-                        break;
-                case X25_ACCEPT_CALL:
-                        if (chan->common.state != WAN_CONNECTING)
-                                bad_cmd=1;
-                        break;
-                case X25_RESET:
-                        if (chan->common.state != WAN_CONNECTED)
-                                bad_cmd=1;
-                        break;
-                default:
-                        bad_cmd=1;
-                        break;
-        }
-
-        if (bad_cmd){
-                printk(KERN_INFO "%s: Invalid State, BAD Command %x, dev %s, lcn %i, st %i\n", 
-                        card->devname,atomic_read(&chan->common.command),dev->name, 
-                        chan->common.lcn, chan->common.state);
-        }
-
-        return bad_cmd;
-}
-
-
-
-/*************************** XPIPEMON FUNCTIONS **************************/
-
-/*==============================================================================
- * Process UDP call of type XPIPE
- */
-
-static int process_udp_mgmt_pkt(sdla_t *card)
-{
-        int            c_retry = MAX_CMD_RETRY;
-        unsigned int   len;
-        struct sk_buff *new_skb;
-        TX25Mbox       *mbox = card->mbox;
-        int            err;
-        int            udp_mgmt_req_valid = 1;
-        struct net_device *dev;
-        x25_channel_t  *chan;
-        unsigned short lcn;
-        struct timeval tv;
-        
-
-        x25_udp_pkt_t *x25_udp_pkt;
-        x25_udp_pkt = (x25_udp_pkt_t *)card->u.x.udp_pkt_data;
-
-        dev = card->u.x.udp_dev;
-        chan = dev->priv;
-        lcn = chan->common.lcn;
-
-        switch(x25_udp_pkt->cblock.command) {
-            
-                /* XPIPE_ENABLE_TRACE */
-                case XPIPE_ENABLE_TRACING:
-
-                /* XPIPE_GET_TRACE_INFO */
-                case XPIPE_GET_TRACE_INFO:
- 
-                /* SET FT1 MODE */
-                case XPIPE_SET_FT1_MODE:
-           
-                        if(card->u.x.udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-                                ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_direction_err;
-                                udp_mgmt_req_valid = 0;
-                                break;
-                        }
-
-                /* XPIPE_FT1_READ_STATUS */
-                case XPIPE_FT1_READ_STATUS:
-
-                /* FT1 MONITOR STATUS */
-                case XPIPE_FT1_STATUS_CTRL:
-                        if(card->hw.fwid !=  SFID_X25_508) {
-                                ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_adptr_type_err;
-                                udp_mgmt_req_valid = 0;
-                                break;
-                        }
-                default:
-                        break;
-        }
-
-        if(!udp_mgmt_req_valid) {
-                /* set length to 0 */
-                x25_udp_pkt->cblock.length = 0;
-                /* set return code */
-                x25_udp_pkt->cblock.result = (card->hw.fwid != SFID_X25_508) ? 0x1F : 0xCD;
-                
-        } else {   
-        
-                switch (x25_udp_pkt->cblock.command) {
-    
-        
-                case XPIPE_FLUSH_DRIVER_STATS:
-                        init_x25_channel_struct(chan);
-                        init_global_statistics(card);
-                        mbox->cmd.length = 0;
-                        break;
-
-
-                case XPIPE_DRIVER_STAT_IFSEND:
-                        memcpy(x25_udp_pkt->data, &chan->if_send_stat, sizeof(if_send_stat_t));
-                        mbox->cmd.length = sizeof(if_send_stat_t);
-                        x25_udp_pkt->cblock.length =  mbox->cmd.length; 
-                        break;
-        
-                case XPIPE_DRIVER_STAT_INTR:
-                        memcpy(&x25_udp_pkt->data[0], &card->statistics, sizeof(global_stats_t));
-                        memcpy(&x25_udp_pkt->data[sizeof(global_stats_t)],
-                                &chan->rx_intr_stat, sizeof(rx_intr_stat_t));
-                        
-                        mbox->cmd.length = sizeof(global_stats_t) +
-                                        sizeof(rx_intr_stat_t);
-                        x25_udp_pkt->cblock.length =  mbox->cmd.length;
-                        break;
-
-                case XPIPE_DRIVER_STAT_GEN:
-                        memcpy(x25_udp_pkt->data,
-                                &chan->pipe_mgmt_stat.UDP_PIPE_mgmt_kmalloc_err,
-                                sizeof(pipe_mgmt_stat_t));
-
-                        memcpy(&x25_udp_pkt->data[sizeof(pipe_mgmt_stat_t)],
-                               &card->statistics, sizeof(global_stats_t));
-
-                        x25_udp_pkt->cblock.result = 0;
-                        x25_udp_pkt->cblock.length = sizeof(global_stats_t)+
-                                                     sizeof(rx_intr_stat_t);
-                        mbox->cmd.length = x25_udp_pkt->cblock.length;
-                        break;
-
-                case XPIPE_ROUTER_UP_TIME:
-                        do_gettimeofday(&tv);
-                        chan->router_up_time = tv.tv_sec - chan->router_start_time;
-                        *(unsigned long *)&x25_udp_pkt->data = chan->router_up_time;    
-                        x25_udp_pkt->cblock.length = mbox->cmd.length = 4;
-                        x25_udp_pkt->cblock.result = 0;
-                        break;
-        
-                default :
-
-                        do {
-                                memcpy(&mbox->cmd, &x25_udp_pkt->cblock.command, sizeof(TX25Cmd));
-                                if(mbox->cmd.length){ 
-                                        memcpy(&mbox->data, 
-                                               (char *)x25_udp_pkt->data, 
-                                               mbox->cmd.length);
-                                }       
-                
-                                err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-                        } while (err && c_retry-- && x25_error(card, err, mbox->cmd.command, 0));
-
-
-                        if ( err == CMD_OK || 
-                            (err == 1 && 
-                             (mbox->cmd.command == 0x06 || 
-                              mbox->cmd.command == 0x16)  ) ){
-
-                                ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_adptr_cmnd_OK;
-                        } else {
-                                ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_adptr_cmnd_timeout;
-                        }
-
-                          /* copy the result back to our buffer */
-                        memcpy(&x25_udp_pkt->cblock.command, &mbox->cmd, sizeof(TX25Cmd));
-
-                        if(mbox->cmd.length) {
-                               memcpy(&x25_udp_pkt->data, &mbox->data, mbox->cmd.length);
-                        }
-                        break;
-
-                } //switch
-
-        }
-    
-        /* Fill UDP TTL */
-
-        x25_udp_pkt->ip_pkt.ttl = card->wandev.ttl;
-        len = reply_udp(card->u.x.udp_pkt_data, mbox->cmd.length);
-
-
-        if(card->u.x.udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-                
-                err = x25_send(card, lcn, 0, len, card->u.x.udp_pkt_data);
-                if (!err) 
-                        ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_adptr_send_passed;
-                else
-                        ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_adptr_send_failed;
-        
-        } else {
-
-                /* Allocate socket buffer */
-                if((new_skb = dev_alloc_skb(len)) != NULL) {
-                        void *buf;
-
-                        /* copy data into new_skb */
-                        buf = skb_put(new_skb, len);
-                        memcpy(buf, card->u.x.udp_pkt_data, len);
-        
-                        /* Decapsulate packet and pass it up the protocol 
-                           stack */
-                        new_skb->dev = dev;
-        
-                        if (chan->common.usedby == API)
-                                new_skb->protocol = htons(X25_PROT);
-                        else 
-                                new_skb->protocol = htons(ETH_P_IP);
-        
-                        new_skb->mac.raw = new_skb->data;
-
-                        netif_rx(new_skb);
-                        ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_passed_to_stack;
-                
-                } else {
-                        ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_no_socket;
-                        printk(KERN_INFO 
-                        "%s: UDP mgmt cmnd, no socket buffers available!\n", 
-                        card->devname);
-                }
-        }
-
-        card->u.x.udp_pkt_lgth = 0;
-
-        return 1;
-}
-
-
-/*==============================================================================
- * Determine what type of UDP call it is. DRVSTATS or XPIPE8ND ?
- */
-static int udp_pkt_type( struct sk_buff *skb, sdla_t* card )
-{
-        x25_udp_pkt_t *x25_udp_pkt = (x25_udp_pkt_t *)skb->data;
-
-        if((x25_udp_pkt->ip_pkt.protocol == UDPMGMT_UDP_PROTOCOL) &&
-                (x25_udp_pkt->ip_pkt.ver_inet_hdr_length == 0x45) &&
-                (x25_udp_pkt->udp_pkt.udp_dst_port == ntohs(card->wandev.udp_port)) &&
-                (x25_udp_pkt->wp_mgmt.request_reply == UDPMGMT_REQUEST)) {
-
-                        if(!strncmp(x25_udp_pkt->wp_mgmt.signature,
-                                UDPMGMT_XPIPE_SIGNATURE, 8)){
-                                return UDP_XPIPE_TYPE;
-                        }else{
-                                printk(KERN_INFO "%s: UDP Packet, Failed Signature !\n",
-                                        card->devname);
-                        }
-        }
-
-        return UDP_INVALID_TYPE;
-}
-
-
-/*============================================================================
- * Reply to UDP Management system.
- * Return nothing.
- */
-static int reply_udp( unsigned char *data, unsigned int mbox_len ) 
-{
-        unsigned short len, udp_length, temp, ip_length;
-        unsigned long ip_temp;
-        int even_bound = 0;
-
-  
-        x25_udp_pkt_t *x25_udp_pkt = (x25_udp_pkt_t *)data; 
-
-        /* Set length of packet */
-        len = sizeof(ip_pkt_t)+ 
-              sizeof(udp_pkt_t)+
-              sizeof(wp_mgmt_t)+
-              sizeof(cblock_t)+
-              mbox_len;
- 
-
-        /* fill in UDP reply */
-        x25_udp_pkt->wp_mgmt.request_reply = UDPMGMT_REPLY;
-  
-        /* fill in UDP length */
-        udp_length = sizeof(udp_pkt_t)+ 
-                     sizeof(wp_mgmt_t)+
-                     sizeof(cblock_t)+
-                     mbox_len; 
-
-
-        /* put it on an even boundary */
-        if ( udp_length & 0x0001 ) {
-                udp_length += 1;
-                len += 1;
-                even_bound = 1;
-        }
-
-        temp = (udp_length<<8)|(udp_length>>8);
-        x25_udp_pkt->udp_pkt.udp_length = temp;
-         
-        /* swap UDP ports */
-        temp = x25_udp_pkt->udp_pkt.udp_src_port;
-        x25_udp_pkt->udp_pkt.udp_src_port = 
-                        x25_udp_pkt->udp_pkt.udp_dst_port; 
-        x25_udp_pkt->udp_pkt.udp_dst_port = temp;
-
-
-
-        /* add UDP pseudo header */
-        temp = 0x1100;
-        *((unsigned short *)
-                (x25_udp_pkt->data+mbox_len+even_bound)) = temp;        
-        temp = (udp_length<<8)|(udp_length>>8);
-        *((unsigned short *)
-                (x25_udp_pkt->data+mbox_len+even_bound+2)) = temp;
-                 
-        /* calculate UDP checksum */
-        x25_udp_pkt->udp_pkt.udp_checksum = 0;
-
-        x25_udp_pkt->udp_pkt.udp_checksum = 
-                calc_checksum(&data[UDP_OFFSET], udp_length+UDP_OFFSET);
-
-        /* fill in IP length */
-        ip_length = len;
-        temp = (ip_length<<8)|(ip_length>>8);
-        x25_udp_pkt->ip_pkt.total_length = temp;
-  
-        /* swap IP addresses */
-        ip_temp = x25_udp_pkt->ip_pkt.ip_src_address;
-        x25_udp_pkt->ip_pkt.ip_src_address = 
-                                x25_udp_pkt->ip_pkt.ip_dst_address;
-        x25_udp_pkt->ip_pkt.ip_dst_address = ip_temp;
-
-                 
-        /* fill in IP checksum */
-        x25_udp_pkt->ip_pkt.hdr_checksum = 0;
-        x25_udp_pkt->ip_pkt.hdr_checksum = calc_checksum(data, sizeof(ip_pkt_t));
-
-        return len;
-} /* reply_udp */
-
-unsigned short calc_checksum (char *data, int len)
-{
-        unsigned short temp; 
-        unsigned long sum=0;
-        int i;
-
-        for( i = 0; i <len; i+=2 ) {
-                memcpy(&temp,&data[i],2);
-                sum += (unsigned long)temp;
-        }
-
-        while (sum >> 16 ) {
-                sum = (sum & 0xffffUL) + (sum >> 16);
-        }
-
-        temp = (unsigned short)sum;
-        temp = ~temp;
-
-        if( temp == 0 ) 
-                temp = 0xffff;
-
-        return temp;    
-}
-
-/*=============================================================================
- * Store a UDP management packet for later processing.
- */
-
-static int store_udp_mgmt_pkt(int udp_type, char udp_pkt_src, sdla_t* card,
-                              struct net_device *dev, struct sk_buff *skb,
-                              int lcn)
-{
-        int udp_pkt_stored = 0;
-
-        if(!card->u.x.udp_pkt_lgth && (skb->len <= MAX_LGTH_UDP_MGNT_PKT)){
-                card->u.x.udp_pkt_lgth = skb->len;
-                card->u.x.udp_type = udp_type;
-                card->u.x.udp_pkt_src = udp_pkt_src;
-                card->u.x.udp_lcn = lcn;
-                card->u.x.udp_dev = dev;
-                memcpy(card->u.x.udp_pkt_data, skb->data, skb->len);
-                card->u.x.timer_int_enabled |= TMR_INT_ENABLED_UDP_PKT;
-                udp_pkt_stored = 1;
-
-        }else{
-                printk(KERN_INFO "%s: ERROR: UDP packet not stored for LCN %d\n", 
-                                                        card->devname,lcn);
-        }
-
-        if(udp_pkt_src == UDP_PKT_FRM_STACK){
-                dev_kfree_skb_any(skb);
-        }else{
-                dev_kfree_skb_any(skb);
-        }
-
-        return(udp_pkt_stored);
-}
-
-
-
-/*=============================================================================
- * Initial the ppp_private_area structure.
- */
-static void init_x25_channel_struct( x25_channel_t *chan )
-{
-        memset(&chan->if_send_stat.if_send_entry,0,sizeof(if_send_stat_t));
-        memset(&chan->rx_intr_stat.rx_intr_no_socket,0,sizeof(rx_intr_stat_t));
-        memset(&chan->pipe_mgmt_stat.UDP_PIPE_mgmt_kmalloc_err,0,sizeof(pipe_mgmt_stat_t));
-}
-
-/*============================================================================
- * Initialize Global Statistics
- */
-static void init_global_statistics( sdla_t *card )
-{
-        memset(&card->statistics.isr_entry,0,sizeof(global_stats_t));
-}
-
-
-/*===============================================================
- * SMP Support
- * ==============================================================*/
-
-static void S508_S514_lock(sdla_t *card, unsigned long *smp_flags)
-{
-        spin_lock_irqsave(&card->wandev.lock, *smp_flags);
-}
-static void S508_S514_unlock(sdla_t *card, unsigned long *smp_flags)
-{
-        spin_unlock_irqrestore(&card->wandev.lock, *smp_flags);
-}
-
-/*===============================================================
- * x25_timer_routine
- *
- *      A more efficient polling routine.  Each half a second
- *      queue a polling task. We want to do the polling in a 
- *      task not timer, because timer runs in interrupt time.
- *
- *      FIXME Polling should be rethinked.
- *==============================================================*/
-
-static void x25_timer_routine(unsigned long data)
-{
-        sdla_t *card = (sdla_t*)data;
-
-        if (!card->wandev.dev){
-                printk(KERN_INFO "%s: Stopping the X25 Poll Timer: No Dev.\n",
-                                card->devname);
-                return;
-        }
-
-        if (card->open_cnt != card->u.x.num_of_ch){
-                printk(KERN_INFO "%s: Stopping the X25 Poll Timer: Interface down.\n",
-                                card->devname);
-                return;
-        }
-
-        if (test_bit(PERI_CRIT,&card->wandev.critical)){
-                printk(KERN_INFO "%s: Stopping the X25 Poll Timer: Shutting down.\n",
-                                card->devname);
-                return;
-        }
-        
-        if (!test_and_set_bit(POLL_CRIT,&card->wandev.critical)){
-                trigger_x25_poll(card);
-        }
-        
-        card->u.x.x25_timer.expires=jiffies+(HZ>>1);
-        add_timer(&card->u.x.x25_timer);
-        return;
-}
-
-void disable_comm_shutdown(sdla_t *card)
-{
-        TX25Mbox* mbox = card->mbox;
-        int err;
-
-        /* Turn of interrutps */
-        mbox->data[0] = 0;
-        if (card->hw.fwid == SFID_X25_508){
-                mbox->data[1] = card->hw.irq;
-                mbox->data[2] = 2;
-                mbox->cmd.length = 3;
-        }else {
-                mbox->cmd.length  = 1;
-        }
-        mbox->cmd.command = X25_SET_INTERRUPT_MODE;
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        if (err)
-                printk(KERN_INFO "INTERRUPT OFF FAIED %x\n",err);
-
-        /* Bring down HDLC */
-        mbox->cmd.command = X25_HDLC_LINK_CLOSE;
-        mbox->cmd.length  = 0;
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        if (err)
-                printk(KERN_INFO "LINK CLOSED FAILED %x\n",err);
-
-
-        /* Brind down DTR */
-        mbox->data[0] = 0;
-        mbox->data[2] = 0;
-        mbox->data[1] = 0x01;
-        mbox->cmd.length  = 3;
-        mbox->cmd.command = X25_SET_GLOBAL_VARS;
-        err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT;
-        if (err)
-                printk(KERN_INFO "DTR DOWN FAILED %x\n",err);
-
-}
-
-MODULE_LICENSE("GPL");
-
-/****** End *****************************************************************/
diff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c
deleted file mode 100644
index 032c0f81928e..000000000000
--- a/drivers/net/wan/sdladrv.c
+++ /dev/null
@@ -1,2314 +0,0 @@
-/*****************************************************************************
-* sdladrv.c     SDLA Support Module.  Main module.
-*
-*               This module is a library of common hardware-specific functions
-*               used by all Sangoma drivers.
-*
-* Author:       Gideon Hack     
-*
-* Copyright:    (c) 1995-2000 Sangoma Technologies 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.
-* ============================================================================
-* Mar 20, 2001  Nenad Corbic    Added the auto_pci_cfg filed, to support
-*                               the PCISLOT #0. 
-* Apr 04, 2000  Nenad Corbic    Fixed the auto memory detection code.
-*                               The memory test at address 0xC8000.
-* Mar 09, 2000  Nenad Corbic    Added Gideon's Bug Fix: clear pci
-*                               interrupt flags on initial load.
-* Jun 02, 1999  Gideon Hack     Added support for the S514 adapter.
-*                               Updates for Linux 2.2.X kernels.        
-* Sep 17, 1998  Jaspreet Singh  Updates for linux 2.2.X kernels
-* Dec 20, 1996  Gene Kozin      Version 3.0.0. Complete overhaul.
-* Jul 12, 1996  Gene Kozin      Changes for Linux 2.0 compatibility.
-* Jun 12, 1996  Gene Kozin      Added support for S503 card.
-* Apr 30, 1996  Gene Kozin      SDLA hardware interrupt is acknowledged before
-*                               calling protocolspecific ISR.
-*                               Register I/O ports with Linux kernel.
-*                               Miscellaneous bug fixes.
-* Dec 20, 1995  Gene Kozin      Fixed a bug in interrupt routine.
-* Oct 14, 1995  Gene Kozin      Initial version.
-*****************************************************************************/
-
-/*****************************************************************************
- * Notes:
- * ------
- * 1. This code is ment to be system-independent (as much as possible).  To
- *    achive this, various macros are used to hide system-specific interfaces.
- *    To compile this code, one of the following constants must be defined:
- *
- *      Platform        Define
- *      --------        ------
- *      Linux           _LINUX_
- *      SCO Unix        _SCO_UNIX_
- *
- * 2. Supported adapter types:
- *
- *      S502A
- *      ES502A (S502E)
- *      S503
- *      S507
- *      S508 (S509)
- *
- * 3. S502A Notes:
- *
- *      There is no separate DPM window enable/disable control in S502A.  It
- *      opens immediately after a window number it written to the HMCR
- *      register.  To close the window, HMCR has to be written a value
- *      ????1111b (e.g. 0x0F or 0xFF).
- *
- *      S502A DPM window cannot be located at offset E000 (e.g. 0xAE000).
- *
- *      There should be a delay of ??? before reading back S502A status
- *      register.
- *
- * 4. S502E Notes:
- *
- *      S502E has a h/w bug: although default IRQ line state is HIGH, enabling
- *      interrupts by setting bit 1 of the control register (BASE) to '1'
- *      causes it to go LOW! Therefore, disabling interrupts by setting that
- *      bit to '0' causes low-to-high transition on IRQ line (ghosty
- *      interrupt). The same occurs when disabling CPU by resetting bit 0 of
- *      CPU control register (BASE+3) - see the next note.
- *
- *      S502E CPU and DPM control is limited:
- *
- *      o CPU cannot be stopped independently. Resetting bit 0 of the CPUi
- *        control register (BASE+3) shuts the board down entirely, including
- *        DPM;
- *
- *      o DPM access cannot be controlled dynamically. Ones CPU is started,
- *        bit 1 of the control register (BASE) is used to enable/disable IRQ,
- *        so that access to shared memory cannot be disabled while CPU is
- *        running.
- ****************************************************************************/
-
-#define _LINUX_
-
-#if     defined(_LINUX_)        /****** Linux *******************************/
-
-#include <linux/config.h>
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/module.h>       /* support for loadable modules */
-#include <linux/jiffies.h>      /* for jiffies, HZ, etc. */
-#include <linux/sdladrv.h>      /* API definitions */
-#include <linux/sdlasfm.h>      /* SDLA firmware module definitions */
-#include <linux/sdlapci.h>      /* SDLA PCI hardware definitions */
-#include <linux/pci.h>          /* PCI defines and function prototypes */
-#include <asm/io.h>             /* for inb(), outb(), etc. */
-
-#define _INB(port)              (inb(port))
-#define _OUTB(port, byte)       (outb((byte),(port)))
-#define SYSTEM_TICK             jiffies
-
-#include <linux/init.h>
-
-
-#elif   defined(_SCO_UNIX_)     /****** SCO Unix ****************************/
-
-#if     !defined(INKERNEL)
-#error  This code MUST be compiled in kernel mode!
-#endif
-#include <sys/sdladrv.h>        /* API definitions */
-#include <sys/sdlasfm.h>        /* SDLA firmware module definitions */
-#include <sys/inline.h>         /* for inb(), outb(), etc. */
-#define _INB(port)              (inb(port))
-#define _OUTB(port, byte)       (outb((port),(byte)))
-#define SYSTEM_TICK             lbolt
-
-#else
-#error  Unknown system type!
-#endif
-
-#define MOD_VERSION     3
-#define MOD_RELEASE     0
-
-#define SDLA_IODELAY    100     /* I/O Rd/Wr delay, 10 works for 486DX2-66 */
-#define EXEC_DELAY      20      /* shared memory access delay, mks */
-#define EXEC_TIMEOUT    (HZ*2)  /* command timeout, in ticks */
-
-/* I/O port address range */
-#define S502A_IORANGE   3
-#define S502E_IORANGE   4
-#define S503_IORANGE    3
-#define S507_IORANGE    4
-#define S508_IORANGE    4
-
-/* Maximum amount of memory */
-#define S502_MAXMEM     0x10000L
-#define S503_MAXMEM     0x10000L
-#define S507_MAXMEM     0x40000L
-#define S508_MAXMEM     0x40000L
-
-/* Minimum amount of memory */
-#define S502_MINMEM     0x8000L
-#define S503_MINMEM     0x8000L
-#define S507_MINMEM     0x20000L
-#define S508_MINMEM     0x20000L
-#define NO_PORT         -1
-
-
-
-
-
-/****** Function Prototypes *************************************************/
-
-/* Hardware-specific functions */
-static int sdla_detect  (sdlahw_t* hw);
-static int sdla_autodpm (sdlahw_t* hw);
-static int sdla_setdpm  (sdlahw_t* hw);
-static int sdla_load    (sdlahw_t* hw, sfm_t* sfm, unsigned len);
-static int sdla_init    (sdlahw_t* hw);
-static unsigned long sdla_memtest (sdlahw_t* hw);
-static int sdla_bootcfg (sdlahw_t* hw, sfm_info_t* sfminfo);
-static unsigned char make_config_byte (sdlahw_t* hw);
-static int sdla_start   (sdlahw_t* hw, unsigned addr);
-
-static int init_s502a   (sdlahw_t* hw);
-static int init_s502e   (sdlahw_t* hw);
-static int init_s503    (sdlahw_t* hw);
-static int init_s507    (sdlahw_t* hw);
-static int init_s508    (sdlahw_t* hw);
-            
-static int detect_s502a (int port);
-static int detect_s502e (int port);
-static int detect_s503  (int port);
-static int detect_s507  (int port);
-static int detect_s508  (int port);
-static int detect_s514  (sdlahw_t* hw);
-static int find_s514_adapter(sdlahw_t* hw, char find_first_S514_card);
-
-/* Miscellaneous functions */
-static void peek_by_4 (unsigned long src, void* buf, unsigned len);
-static void poke_by_4 (unsigned long dest, void* buf, unsigned len);
-static int calibrate_delay (int mks);
-static int get_option_index (unsigned* optlist, unsigned optval);
-static unsigned check_memregion (void* ptr, unsigned len);
-static unsigned test_memregion (void* ptr, unsigned len);
-static unsigned short checksum (unsigned char* buf, unsigned len);
-static int init_pci_slot(sdlahw_t *);
-
-static int pci_probe(sdlahw_t *hw);
-
-/****** Global Data **********************************************************
- * Note: All data must be explicitly initialized!!!
- */
-
-static struct pci_device_id sdladrv_pci_tbl[] = {
-        { V3_VENDOR_ID, V3_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, },
-        { }                     /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(pci, sdladrv_pci_tbl);
-
-MODULE_LICENSE("GPL");
-
-/* private data */
-static char modname[]   = "sdladrv";
-static char fullname[]  = "SDLA Support Module";
-static char copyright[] = "(c) 1995-1999 Sangoma Technologies Inc.";
-static unsigned exec_idle;
-
-/* Hardware configuration options.
- * These are arrays of configuration options used by verification routines.
- * The first element of each array is its size (i.e. number of options).
- */
-static unsigned s502_port_options[] =
-        { 4, 0x250, 0x300, 0x350, 0x360 }
-;
-static unsigned s503_port_options[] =
-        { 8, 0x250, 0x254, 0x300, 0x304, 0x350, 0x354, 0x360, 0x364 }
-;
-static unsigned s508_port_options[] =
-        { 8, 0x250, 0x270, 0x280, 0x300, 0x350, 0x360, 0x380, 0x390 }
-;
-
-static unsigned s502a_irq_options[] = { 0 };
-static unsigned s502e_irq_options[] = { 4, 2, 3, 5, 7 };
-static unsigned s503_irq_options[]  = { 5, 2, 3, 4, 5, 7 };
-static unsigned s508_irq_options[]  = { 8, 3, 4, 5, 7, 10, 11, 12, 15 };
-
-static unsigned s502a_dpmbase_options[] =
-{
-        28,
-        0xA0000, 0xA2000, 0xA4000, 0xA6000, 0xA8000, 0xAA000, 0xAC000,
-        0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000,
-        0xD0000, 0xD2000, 0xD4000, 0xD6000, 0xD8000, 0xDA000, 0xDC000,
-        0xE0000, 0xE2000, 0xE4000, 0xE6000, 0xE8000, 0xEA000, 0xEC000,
-};
-static unsigned s507_dpmbase_options[] =
-{
-        32,
-        0xA0000, 0xA2000, 0xA4000, 0xA6000, 0xA8000, 0xAA000, 0xAC000, 0xAE000,
-        0xB0000, 0xB2000, 0xB4000, 0xB6000, 0xB8000, 0xBA000, 0xBC000, 0xBE000,
-        0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000, 0xCE000,
-        0xE0000, 0xE2000, 0xE4000, 0xE6000, 0xE8000, 0xEA000, 0xEC000, 0xEE000,
-};
-static unsigned s508_dpmbase_options[] =        /* incl. S502E and S503 */
-{
-        32,
-        0xA0000, 0xA2000, 0xA4000, 0xA6000, 0xA8000, 0xAA000, 0xAC000, 0xAE000,
-        0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000, 0xCE000,
-        0xD0000, 0xD2000, 0xD4000, 0xD6000, 0xD8000, 0xDA000, 0xDC000, 0xDE000,
-        0xE0000, 0xE2000, 0xE4000, 0xE6000, 0xE8000, 0xEA000, 0xEC000, 0xEE000,
-};
-
-/*
-static unsigned s502_dpmsize_options[] = { 2, 0x2000, 0x10000 };
-static unsigned s507_dpmsize_options[] = { 2, 0x2000, 0x4000 };
-static unsigned s508_dpmsize_options[] = { 1, 0x2000 };
-*/
-
-static unsigned s502a_pclk_options[] = { 2, 3600, 7200 };
-static unsigned s502e_pclk_options[] = { 5, 3600, 5000, 7200, 8000, 10000 };
-static unsigned s503_pclk_options[]  = { 3, 7200, 8000, 10000 };
-static unsigned s507_pclk_options[]  = { 1, 12288 };
-static unsigned s508_pclk_options[]  = { 1, 16000 };
-
-/* Host memory control register masks */
-static unsigned char s502a_hmcr[] =
-{
-        0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x1C,       /* A0000 - AC000 */
-        0x20, 0x22, 0x24, 0x26, 0x28, 0x2A, 0x2C,       /* C0000 - CC000 */
-        0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C,       /* D0000 - DC000 */
-        0x30, 0x32, 0x34, 0x36, 0x38, 0x3A, 0x3C,       /* E0000 - EC000 */
-};
-static unsigned char s502e_hmcr[] =
-{
-        0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x1C, 0x1E, /* A0000 - AE000 */
-        0x20, 0x22, 0x24, 0x26, 0x28, 0x2A, 0x2C, 0x2E, /* C0000 - CE000 */
-        0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, /* D0000 - DE000 */
-        0x30, 0x32, 0x34, 0x36, 0x38, 0x3A, 0x3C, 0x3E, /* E0000 - EE000 */
-};
-static unsigned char s507_hmcr[] =
-{
-        0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, /* A0000 - AE000 */
-        0x40, 0x42, 0x44, 0x46, 0x48, 0x4A, 0x4C, 0x4E, /* B0000 - BE000 */
-        0x80, 0x82, 0x84, 0x86, 0x88, 0x8A, 0x8C, 0x8E, /* C0000 - CE000 */
-        0xC0, 0xC2, 0xC4, 0xC6, 0xC8, 0xCA, 0xCC, 0xCE, /* E0000 - EE000 */
-};
-static unsigned char s508_hmcr[] =
-{
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* A0000 - AE000 */
-        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* C0000 - CE000 */
-        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, /* D0000 - DE000 */
-        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, /* E0000 - EE000 */
-};
-
-static unsigned char s507_irqmask[] =
-{
-        0x00, 0x20, 0x40, 0x60, 0x80, 0xA0, 0xC0, 0xE0
-};
-
-static int pci_slot_ar[MAX_S514_CARDS];
-
-/******* Kernel Loadable Module Entry Points ********************************/
-
-/*============================================================================
- * Module 'insert' entry point.
- * o print announcement
- * o initialize static data
- * o calibrate SDLA shared memory access delay.
- *
- * Return:      0       Ok
- *              < 0     error.
- * Context:     process
- */
-
-static int __init sdladrv_init(void)
-{
-        int i=0;
-
-        printk(KERN_INFO "%s v%u.%u %s\n",
-                fullname, MOD_VERSION, MOD_RELEASE, copyright);
-        exec_idle = calibrate_delay(EXEC_DELAY);
-#ifdef WANDEBUG 
-        printk(KERN_DEBUG "%s: exec_idle = %d\n", modname, exec_idle);
-#endif  
-
-        /* Initialize the PCI Card array, which
-         * will store flags, used to mark 
-         * card initialization state */
-        for (i=0; i<MAX_S514_CARDS; i++)
-                pci_slot_ar[i] = 0xFF;
-
-        return 0;
-}
-
-/*============================================================================
- * Module 'remove' entry point.
- * o release all remaining system resources
- */
-static void __exit sdladrv_cleanup(void)
-{
-}
-
-module_init(sdladrv_init);
-module_exit(sdladrv_cleanup);
-
-/******* Kernel APIs ********************************************************/
-
-/*============================================================================
- * Set up adapter.
- * o detect adapter type
- * o verify hardware configuration options
- * o check for hardware conflicts
- * o set up adapter shared memory
- * o test adapter memory
- * o load firmware
- * Return:      0       ok.
- *              < 0     error
- */
-
-EXPORT_SYMBOL(sdla_setup);
-
-int sdla_setup (sdlahw_t* hw, void* sfm, unsigned len)
-{
-        unsigned* irq_opt       = NULL; /* IRQ options */
-        unsigned* dpmbase_opt   = NULL; /* DPM window base options */
-        unsigned* pclk_opt      = NULL; /* CPU clock rate options */
-        int err=0;
-
-        if (sdla_detect(hw)) {
-                if(hw->type != SDLA_S514)
-                        printk(KERN_INFO "%s: no SDLA card found at port 0x%X\n",
-                        modname, hw->port);
-                return -EINVAL;
-        }
-
-        if(hw->type != SDLA_S514) {
-                printk(KERN_INFO "%s: found S%04u card at port 0x%X.\n",
-                modname, hw->type, hw->port);
-
-                hw->dpmsize = SDLA_WINDOWSIZE;
-                switch (hw->type) {
-                case SDLA_S502A:
-                        hw->io_range    = S502A_IORANGE;
-                        irq_opt         = s502a_irq_options;
-                        dpmbase_opt     = s502a_dpmbase_options;
-                        pclk_opt        = s502a_pclk_options;
-                        break;
-
-                case SDLA_S502E:
-                        hw->io_range    = S502E_IORANGE;
-                        irq_opt         = s502e_irq_options;
-                        dpmbase_opt     = s508_dpmbase_options;
-                        pclk_opt        = s502e_pclk_options;
-                        break;
-
-                case SDLA_S503:
-                        hw->io_range    = S503_IORANGE;
-                        irq_opt         = s503_irq_options;
-                        dpmbase_opt     = s508_dpmbase_options;
-                        pclk_opt        = s503_pclk_options;
-                        break;
-
-                case SDLA_S507:
-                        hw->io_range    = S507_IORANGE;
-                        irq_opt         = s508_irq_options;
-                        dpmbase_opt     = s507_dpmbase_options;
-                        pclk_opt        = s507_pclk_options;
-                        break;
-
-                case SDLA_S508:
-                        hw->io_range    = S508_IORANGE;
-                        irq_opt         = s508_irq_options;
-                        dpmbase_opt     = s508_dpmbase_options;
-                        pclk_opt        = s508_pclk_options;
-                        break;
-                }
-
-                /* Verify IRQ configuration options */
-                if (!get_option_index(irq_opt, hw->irq)) {
-                        printk(KERN_INFO "%s: IRQ %d is invalid!\n",
-                                modname, hw->irq);
-                      return -EINVAL;
-                } 
-
-                /* Verify CPU clock rate configuration options */
-                if (hw->pclk == 0)
-                        hw->pclk = pclk_opt[1];  /* use default */
-        
-                else if (!get_option_index(pclk_opt, hw->pclk)) {
-                        printk(KERN_INFO "%s: CPU clock %u is invalid!\n",
-                                modname, hw->pclk);
-                        return -EINVAL;
-                } 
-                printk(KERN_INFO "%s: assuming CPU clock rate of %u kHz.\n",
-                        modname, hw->pclk);
-
-                /* Setup adapter dual-port memory window and test memory */
-                if (hw->dpmbase == 0) {
-                        err = sdla_autodpm(hw);
-                        if (err) {
-                                printk(KERN_INFO
-                                "%s: can't find available memory region!\n",
-                                        modname);
-                                return err;
-                        }
-                }
-                else if (!get_option_index(dpmbase_opt,
-                        virt_to_phys(hw->dpmbase))) {
-                        printk(KERN_INFO
-                                "%s: memory address 0x%lX is invalid!\n",
-                                modname, virt_to_phys(hw->dpmbase));
-                        return -EINVAL;
-                }               
-                else if (sdla_setdpm(hw)) {
-                        printk(KERN_INFO
-                        "%s: 8K memory region at 0x%lX is not available!\n",
-                                modname, virt_to_phys(hw->dpmbase));
-                        return -EINVAL;
-                } 
-                printk(KERN_INFO
-                        "%s: dual-port memory window is set at 0x%lX.\n",
-                                modname, virt_to_phys(hw->dpmbase));
-
-
-                /* If we find memory in 0xE**** Memory region, 
-                 * warn the user to disable the SHADOW RAM.  
-                 * Since memory corruption can occur if SHADOW is
-                 * enabled. This can causes random crashes ! */
-                if (virt_to_phys(hw->dpmbase) >= 0xE0000){
-                        printk(KERN_WARNING "\n%s: !!!!!!!!  WARNING !!!!!!!!\n",modname);
-                        printk(KERN_WARNING "%s: WANPIPE is using 0x%lX memory region !!!\n",
-                                                modname, virt_to_phys(hw->dpmbase));
-                        printk(KERN_WARNING "         Please disable the SHADOW RAM, otherwise\n");
-                        printk(KERN_WARNING "         your system might crash randomly from time to time !\n");
-                        printk(KERN_WARNING "%s: !!!!!!!!  WARNING !!!!!!!!\n\n",modname);
-                }
-        }
-
-        else {
-                hw->memory = test_memregion((void*)hw->dpmbase, 
-                        MAX_SIZEOF_S514_MEMORY);
-                if(hw->memory < (256 * 1024)) {
-                        printk(KERN_INFO
-                                "%s: error in testing S514 memory (0x%lX)\n",
-                                modname, hw->memory);
-                        sdla_down(hw);
-                        return -EINVAL;
-                }
-        }
-    
-        printk(KERN_INFO "%s: found %luK bytes of on-board memory\n",
-                modname, hw->memory / 1024);
-
-        /* Load firmware. If loader fails then shut down adapter */
-        err = sdla_load(hw, sfm, len);
-        if (err) sdla_down(hw);         /* shutdown adapter */
-
-        return err;
-} 
-
-/*============================================================================
- * Shut down SDLA: disable shared memory access and interrupts, stop CPU, etc.
- */
-
-EXPORT_SYMBOL(sdla_down);
-
-int sdla_down (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int i;
-        unsigned char CPU_no;
-        u32 int_config, int_status;
-
-        if(!port && (hw->type != SDLA_S514))
-                return -EFAULT;
-
-        switch (hw->type) {
-        case SDLA_S502A:
-                _OUTB(port, 0x08);              /* halt CPU */
-                _OUTB(port, 0x08);
-                _OUTB(port, 0x08);
-                hw->regs[0] = 0x08;
-                _OUTB(port + 1, 0xFF);          /* close memory window */
-                hw->regs[1] = 0xFF;
-                break;
-
-        case SDLA_S502E:
-                _OUTB(port + 3, 0);             /* stop CPU */
-                _OUTB(port, 0);                 /* reset board */
-                for (i = 0; i < S502E_IORANGE; ++i)
-                        hw->regs[i] = 0
-                ;
-                break;
-
-        case SDLA_S503:
-        case SDLA_S507:
-        case SDLA_S508:
-                _OUTB(port, 0);                 /* reset board logic */
-                hw->regs[0] = 0;
-                break;
-
-        case SDLA_S514:
-                /* halt the adapter */
-                *(char *)hw->vector = S514_CPU_HALT;
-                CPU_no = hw->S514_cpu_no[0];
-
-                /* disable the PCI IRQ and disable memory access */
-                pci_read_config_dword(hw->pci_dev, PCI_INT_CONFIG, &int_config);
-                int_config &= (CPU_no == S514_CPU_A) ? ~PCI_DISABLE_IRQ_CPU_A : ~PCI_DISABLE_IRQ_CPU_B;
-                pci_write_config_dword(hw->pci_dev, PCI_INT_CONFIG, int_config);
-                read_S514_int_stat(hw, &int_status);
-                S514_intack(hw, int_status);
-                if(CPU_no == S514_CPU_A)
-                        pci_write_config_dword(hw->pci_dev, PCI_MAP0_DWORD,
-                                PCI_CPU_A_MEM_DISABLE);
-                else
-                        pci_write_config_dword(hw->pci_dev, PCI_MAP1_DWORD,
-                                PCI_CPU_B_MEM_DISABLE);
-
-                /* free up the allocated virtual memory */
-                iounmap((void *)hw->dpmbase);
-                iounmap((void *)hw->vector);
-                break;
-
-
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-/*============================================================================
- * Map shared memory window into SDLA address space.
- */
-
-EXPORT_SYMBOL(sdla_mapmem);
-
-int sdla_mapmem (sdlahw_t* hw, unsigned long addr)
-{
-        unsigned port = hw->port;
-        register int tmp;
-
-        switch (hw->type) {
-        case SDLA_S502A:
-        case SDLA_S502E:
-                if (addr < S502_MAXMEM) { /* verify parameter */
-                        tmp = addr >> 13;       /* convert to register mask */
-                        _OUTB(port + 2, tmp);
-                        hw->regs[2] = tmp;
-                }
-                else return -EINVAL;
-                break;
-
-        case SDLA_S503:
-                if (addr < S503_MAXMEM) { /* verify parameter */
-                        tmp = (hw->regs[0] & 0x8F) | ((addr >> 9) & 0x70);
-                        _OUTB(port, tmp);
-                        hw->regs[0] = tmp;
-                }
-                else return -EINVAL;
-                break;
-
-        case SDLA_S507:
-                if (addr < S507_MAXMEM) {
-                        if (!(_INB(port) & 0x02))
-                                return -EIO;
-                        tmp = addr >> 13;       /* convert to register mask */
-                        _OUTB(port + 2, tmp);
-                        hw->regs[2] = tmp;
-                }
-                else return -EINVAL;
-                break;
-
-        case SDLA_S508:
-                if (addr < S508_MAXMEM) {
-                        tmp = addr >> 13;       /* convert to register mask */
-                        _OUTB(port + 2, tmp);
-                        hw->regs[2] = tmp;
-                }
-                else return -EINVAL;
-                break;
-
-        case SDLA_S514:
-                return 0;
-
-        default:
-                return -EINVAL;
-        }
-        hw->vector = addr & 0xFFFFE000L;
-        return 0;
-}
-
-/*============================================================================
- * Enable interrupt generation.
- */
-
-static int sdla_inten (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp, i;
-
-        switch (hw->type) {
-        case SDLA_S502E:
-                /* Note thar interrupt control operations on S502E are allowed
-                 * only if CPU is enabled (bit 0 of status register is set).
-                 */
-                if (_INB(port) & 0x01) {
-                        _OUTB(port, 0x02);      /* bit1 = 1, bit2 = 0 */
-                        _OUTB(port, 0x06);      /* bit1 = 1, bit2 = 1 */
-                        hw->regs[0] = 0x06;
-                }
-                else return -EIO;
-                break;
-
-        case SDLA_S503:
-                tmp = hw->regs[0] | 0x04;
-                _OUTB(port, tmp);
-                hw->regs[0] = tmp;              /* update mirror */
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-                if (!(_INB(port) & 0x02))               /* verify */
-                        return -EIO;
-                break;
-
-        case SDLA_S508:
-                tmp = hw->regs[0] | 0x10;
-                _OUTB(port, tmp);
-                hw->regs[0] = tmp;              /* update mirror */
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-                if (!(_INB(port + 1) & 0x10))           /* verify */
-                        return -EIO;
-                break;
-
-        case SDLA_S502A:
-        case SDLA_S507:
-                break;
-
-        case SDLA_S514:
-                break;
-
-        default:
-                return -EINVAL;
-
-        }
-        return 0;
-}
-
-/*============================================================================
- * Disable interrupt generation.
- */
-
-#if 0
-int sdla_intde (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp, i;
-
-        switch (hw->type) {
-        case SDLA_S502E:
-                /* Notes:
-                 *  1) interrupt control operations are allowed only if CPU is
-                 *     enabled (bit 0 of status register is set).
-                 *  2) disabling interrupts using bit 1 of control register
-                 *     causes IRQ line go high, therefore we are going to use
-                 *     0x04 instead: lower it to inhibit interrupts to PC.
-                 */
-                if (_INB(port) & 0x01) {
-                        _OUTB(port, hw->regs[0] & ~0x04);
-                        hw->regs[0] &= ~0x04;
-                }
-                else return -EIO;
-                break;
-
-        case SDLA_S503:
-                tmp = hw->regs[0] & ~0x04;
-                _OUTB(port, tmp);
-                hw->regs[0] = tmp;                      /* update mirror */
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-                if (_INB(port) & 0x02)                  /* verify */
-                        return -EIO;
-                break;
-
-        case SDLA_S508:
-                tmp = hw->regs[0] & ~0x10;
-                _OUTB(port, tmp);
-                hw->regs[0] = tmp;                      /* update mirror */
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-                if (_INB(port) & 0x10)                  /* verify */
-                        return -EIO;
-                break;
-
-        case SDLA_S502A:
-        case SDLA_S507:
-                break;
-
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-#endif  /*  0  */
-
-/*============================================================================
- * Acknowledge SDLA hardware interrupt.
- */
-
-static int sdla_intack (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp;
-
-        switch (hw->type) {
-        case SDLA_S502E:
-                /* To acknoledge hardware interrupt we have to toggle bit 3 of
-                 * control register: \_/
-                 * Note that interrupt control operations on S502E are allowed
-                 * only if CPU is enabled (bit 1 of status register is set).
-                 */
-                if (_INB(port) & 0x01) {
-                        tmp = hw->regs[0] & ~0x04;
-                        _OUTB(port, tmp);
-                        tmp |= 0x04;
-                        _OUTB(port, tmp);
-                        hw->regs[0] = tmp;
-                }
-                else return -EIO;
-                break;
-
-        case SDLA_S503:
-                if (_INB(port) & 0x04) {
-                        tmp = hw->regs[0] & ~0x08;
-                        _OUTB(port, tmp);
-                        tmp |= 0x08;
-                        _OUTB(port, tmp);
-                        hw->regs[0] = tmp;
-                }
-                break;
-
-        case SDLA_S502A:
-        case SDLA_S507:
-        case SDLA_S508:
-        break;
-
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-
-/*============================================================================
- * Acknowledge S514 hardware interrupt.
- */
-
-EXPORT_SYMBOL(S514_intack);
-
-void S514_intack (sdlahw_t* hw, u32 int_status)
-{
-        pci_write_config_dword(hw->pci_dev, PCI_INT_STATUS, int_status);
-}
-
-
-/*============================================================================
- * Read the S514 hardware interrupt status.
- */
-
-EXPORT_SYMBOL(read_S514_int_stat);
-
-void read_S514_int_stat (sdlahw_t* hw, u32* int_status)
-{
-        pci_read_config_dword(hw->pci_dev, PCI_INT_STATUS, int_status);
-}
-
-
-/*============================================================================
- * Generate an interrupt to adapter's CPU.
- */
-
-#if 0
-int sdla_intr (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-
-        switch (hw->type) {
-        case SDLA_S502A:
-                if (!(_INB(port) & 0x40)) {
-                        _OUTB(port, 0x10);              /* issue NMI to CPU */
-                        hw->regs[0] = 0x10;
-                }
-                else return -EIO;
-                break;
-
-        case SDLA_S507:
-                if ((_INB(port) & 0x06) == 0x06) {
-                        _OUTB(port + 3, 0);
-                }
-                else return -EIO;
-                break;
-
-        case SDLA_S508:
-                if (_INB(port + 1) & 0x02) {
-                        _OUTB(port, 0x08);
-                }
-                else return -EIO;
-                break;
-
-        case SDLA_S502E:
-        case SDLA_S503:
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-#endif  /*  0  */
-
-/*============================================================================
- * Execute Adapter Command.
- * o Set exec flag.
- * o Busy-wait until flag is reset.
- * o Return number of loops made, or 0 if command timed out.
- */
-
-EXPORT_SYMBOL(sdla_exec);
-
-int sdla_exec (void* opflag)
-{
-        volatile unsigned char* flag = opflag;
-        unsigned long tstop;
-        int nloops;
-
-        if(readb(flag) != 0x00) {
-                printk(KERN_INFO
-                        "WANPIPE: opp flag set on entry to sdla_exec\n");
-                return 0;
-        }
-        
-        writeb(0x01, flag);
-
-        tstop = SYSTEM_TICK + EXEC_TIMEOUT;
-
-        for (nloops = 1; (readb(flag) == 0x01); ++ nloops) {
-                unsigned delay = exec_idle;
-                while (-- delay);                       /* delay */
-                if (SYSTEM_TICK > tstop) return 0;      /* time is up! */
-        }
-        return nloops;
-}
-
-/*============================================================================
- * Read absolute adapter memory.
- * Transfer data from adapter's memory to data buffer.
- *
- * Note:
- * Care should be taken when crossing dual-port memory window boundary.
- * This function is not atomic, so caller must disable interrupt if
- * interrupt routines are accessing adapter shared memory.
- */
-
-EXPORT_SYMBOL(sdla_peek);
-
-int sdla_peek (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len)
-{
-
-        if (addr + len > hw->memory)    /* verify arguments */
-                return -EINVAL;
-
-        if(hw->type == SDLA_S514) {     /* copy data for the S514 adapter */
-                peek_by_4 ((unsigned long)hw->dpmbase + addr, buf, len);
-                return 0;
-        }
-
-        else {                          /* copy data for the S508 adapter */
-                unsigned long oldvec = hw->vector;
-                unsigned winsize = hw->dpmsize;
-                unsigned curpos, curlen;   /* current offset and block size */
-                unsigned long curvec;      /* current DPM window vector */
-                int err = 0;
-
-                while (len && !err) {
-                        curpos = addr % winsize;  /* current window offset */
-                        curvec = addr - curpos;   /* current window vector */
-                        curlen = (len > (winsize - curpos)) ?
-                                (winsize - curpos) : len;
-                        /* Relocate window and copy block of data */
-                        err = sdla_mapmem(hw, curvec);
-                        peek_by_4 ((unsigned long)hw->dpmbase + curpos, buf,
-                                curlen);
-                        addr       += curlen;
-                        buf         = (char*)buf + curlen;
-                        len        -= curlen;
-                }
-
-                /* Restore DPM window position */
-                sdla_mapmem(hw, oldvec);
-                return err;
-        }
-}
-
-
-/*============================================================================
- * Read data from adapter's memory to a data buffer in 4-byte chunks.
- * Note that we ensure that the SDLA memory address is on a 4-byte boundary
- * before we begin moving the data in 4-byte chunks.
-*/
-
-static void peek_by_4 (unsigned long src, void* buf, unsigned len)
-{
-
-        /* byte copy data until we get to a 4-byte boundary */
-        while (len && (src & 0x03)) {
-                *(char *)buf ++ = readb(src ++);
-                len --;
-        }
-
-        /* copy data in 4-byte chunks */
-        while (len >= 4) {
-                *(unsigned long *)buf = readl(src);
-                buf += 4;
-                src += 4;
-                len -= 4;
-        }
-
-        /* byte copy any remaining data */
-        while (len) {
-                *(char *)buf ++ = readb(src ++);
-                len --;
-        }
-}
-
-
-/*============================================================================
- * Write Absolute Adapter Memory.
- * Transfer data from data buffer to adapter's memory.
- *
- * Note:
- * Care should be taken when crossing dual-port memory window boundary.
- * This function is not atomic, so caller must disable interrupt if
- * interrupt routines are accessing adapter shared memory.
- */
-
-EXPORT_SYMBOL(sdla_poke);
- 
-int sdla_poke (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len)
-{
-
-        if (addr + len > hw->memory)    /* verify arguments */
-                return -EINVAL;
-   
-        if(hw->type == SDLA_S514) {     /* copy data for the S514 adapter */
-                poke_by_4 ((unsigned long)hw->dpmbase + addr, buf, len);
-                return 0;
-        }
-        
-        else {                          /* copy data for the S508 adapter */
-                unsigned long oldvec = hw->vector;
-                unsigned winsize = hw->dpmsize;
-                unsigned curpos, curlen;     /* current offset and block size */
-                unsigned long curvec;        /* current DPM window vector */
-                int err = 0;
-
-                while (len && !err) {
-                        curpos = addr % winsize;    /* current window offset */
-                        curvec = addr - curpos;     /* current window vector */
-                        curlen = (len > (winsize - curpos)) ?
-                                (winsize - curpos) : len;
-                        /* Relocate window and copy block of data */
-                        sdla_mapmem(hw, curvec);
-                        poke_by_4 ((unsigned long)hw->dpmbase + curpos, buf,
-                                curlen);
-                        addr       += curlen;
-                        buf         = (char*)buf + curlen;
-                        len        -= curlen;
-                }
-
-                /* Restore DPM window position */
-                sdla_mapmem(hw, oldvec);
-                return err;
-        }
-}
-
-
-/*============================================================================
- * Write from a data buffer to adapter's memory in 4-byte chunks.
- * Note that we ensure that the SDLA memory address is on a 4-byte boundary
- * before we begin moving the data in 4-byte chunks.
-*/
-
-static void poke_by_4 (unsigned long dest, void* buf, unsigned len)
-{
-
-        /* byte copy data until we get to a 4-byte boundary */
-        while (len && (dest & 0x03)) {
-                writeb (*(char *)buf ++, dest ++);
-                len --;
-        }
-
-        /* copy data in 4-byte chunks */
-        while (len >= 4) {
-                writel (*(unsigned long *)buf, dest);
-                dest += 4;
-                buf += 4;
-                len -= 4;
-        }
-
-        /* byte copy any remaining data */
-        while (len) {
-                writeb (*(char *)buf ++ , dest ++);
-                len --;
-        }
-}
-
-
-#ifdef  DONT_COMPIPLE_THIS
-#endif  /* DONT_COMPIPLE_THIS */
-
-/****** Hardware-Specific Functions *****************************************/
-
-/*============================================================================
- * Detect adapter type.
- * o if adapter type is specified then call detection routine for that adapter
- *   type.  Otherwise call detection routines for every adapter types until
- *   adapter is detected.
- *
- * Notes:
- * 1) Detection tests are destructive! Adapter will be left in shutdown state
- *    after the test.
- */
-static int sdla_detect (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int err = 0;
-
-        if (!port && (hw->type != SDLA_S514))
-                return -EFAULT;
-
-        switch (hw->type) {
-        case SDLA_S502A:
-                if (!detect_s502a(port)) err = -ENODEV;
-                break;
-
-        case SDLA_S502E:
-                if (!detect_s502e(port)) err = -ENODEV;
-                break;
-
-        case SDLA_S503:
-                if (!detect_s503(port)) err = -ENODEV;
-                break;
-
-        case SDLA_S507:
-                if (!detect_s507(port)) err = -ENODEV;
-                break;
-
-        case SDLA_S508:
-                if (!detect_s508(port)) err = -ENODEV;
-                break;
-
-        case SDLA_S514:
-                if (!detect_s514(hw)) err = -ENODEV;
-                break;
-
-        default:
-                if (detect_s502a(port))
-                        hw->type = SDLA_S502A;
-                else if (detect_s502e(port))
-                        hw->type = SDLA_S502E;
-                else if (detect_s503(port))
-                        hw->type = SDLA_S503;
-                else if (detect_s507(port))
-                        hw->type = SDLA_S507;
-                else if (detect_s508(port))
-                        hw->type = SDLA_S508;
-                else err = -ENODEV;
-        }
-        return err;
-}
-
-/*============================================================================
- * Autoselect memory region. 
- * o try all available DMP address options from the top down until success.
- */
-static int sdla_autodpm (sdlahw_t* hw)
-{
-        int i, err = -EINVAL;
-        unsigned* opt;
-
-        switch (hw->type) {
-        case SDLA_S502A:
-                opt = s502a_dpmbase_options;
-                break;
-
-        case SDLA_S502E:
-        case SDLA_S503:
-        case SDLA_S508:
-                opt = s508_dpmbase_options;
-                break;
-
-        case SDLA_S507:
-                opt = s507_dpmbase_options;
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        /* Start testing from 8th position, address
-         * 0xC8000 from the 508 address table. 
-         * We don't want to test A**** addresses, since
-         * they are usually used for Video */
-        for (i = 8; i <= opt[0] && err; i++) {
-                hw->dpmbase = phys_to_virt(opt[i]);
-                err = sdla_setdpm(hw);
-        }
-        return err;
-}
-
-/*============================================================================
- * Set up adapter dual-port memory window. 
- * o shut down adapter
- * o make sure that no physical memory exists in this region, i.e entire
- *   region reads 0xFF and is not writable when adapter is shut down.
- * o initialize adapter hardware
- * o make sure that region is usable with SDLA card, i.e. we can write to it
- *   when adapter is configured.
- */
-static int sdla_setdpm (sdlahw_t* hw)
-{
-        int err;
-
-        /* Shut down card and verify memory region */
-        sdla_down(hw);
-        if (check_memregion(hw->dpmbase, hw->dpmsize))
-                return -EINVAL;
-
-        /* Initialize adapter and test on-board memory segment by segment.
-         * If memory size appears to be less than shared memory window size,
-         * assume that memory region is unusable.
-         */
-        err = sdla_init(hw);
-        if (err) return err;
-
-        if (sdla_memtest(hw) < hw->dpmsize) {   /* less than window size */
-                sdla_down(hw);
-                return -EIO;
-        }
-        sdla_mapmem(hw, 0L);    /* set window vector at bottom */
-        return 0;
-}
-
-/*============================================================================
- * Load adapter from the memory image of the SDLA firmware module. 
- * o verify firmware integrity and compatibility
- * o start adapter up
- */
-static int sdla_load (sdlahw_t* hw, sfm_t* sfm, unsigned len)
-{
-
-        int i;
-
-        /* Verify firmware signature */
-        if (strcmp(sfm->signature, SFM_SIGNATURE)) {
-                printk(KERN_INFO "%s: not SDLA firmware!\n",
-                        modname);
-                return -EINVAL;
-        }
-
-        /* Verify firmware module format version */
-        if (sfm->version != SFM_VERSION) {
-                printk(KERN_INFO
-                        "%s: firmware format %u rejected! Expecting %u.\n",
-                        modname, sfm->version, SFM_VERSION);
-                return -EINVAL;
-        }
-
-        /* Verify firmware module length and checksum */
-        if ((len - offsetof(sfm_t, image) != sfm->info.codesize) ||
-                (checksum((void*)&sfm->info,
-                sizeof(sfm_info_t) + sfm->info.codesize) != sfm->checksum)) {
-                printk(KERN_INFO "%s: firmware corrupted!\n", modname);
-                return -EINVAL;
-        }
-
-        /* Announce */
-        printk(KERN_INFO "%s: loading %s (ID=%u)...\n", modname,
-                (sfm->descr[0] != '\0') ? sfm->descr : "unknown firmware",
-                sfm->info.codeid);
-
-        if(hw->type == SDLA_S514)
-                printk(KERN_INFO "%s: loading S514 adapter, CPU %c\n",
-                        modname, hw->S514_cpu_no[0]);
-
-        /* Scan through the list of compatible adapters and make sure our
-         * adapter type is listed.
-         */
-        for (i = 0;
-             (i < SFM_MAX_SDLA) && (sfm->info.adapter[i] != hw->type);
-             ++i);
-        
-        if (i == SFM_MAX_SDLA) {
-                printk(KERN_INFO "%s: firmware is not compatible with S%u!\n",
-                        modname, hw->type);
-                return -EINVAL;
-        }
-
-
-        /* Make sure there is enough on-board memory */
-        if (hw->memory < sfm->info.memsize) {
-                printk(KERN_INFO
-                        "%s: firmware needs %lu bytes of on-board memory!\n",
-                        modname, sfm->info.memsize);
-                return -EINVAL;
-        }
-
-        /* Move code onto adapter */
-        if (sdla_poke(hw, sfm->info.codeoffs, sfm->image, sfm->info.codesize)) {
-                printk(KERN_INFO "%s: failed to load code segment!\n",
-                        modname);
-                return -EIO;
-        }
-
-        /* Prepare boot-time configuration data and kick-off CPU */
-        sdla_bootcfg(hw, &sfm->info);
-        if (sdla_start(hw, sfm->info.startoffs)) {
-                printk(KERN_INFO "%s: Damn... Adapter won't start!\n",
-                        modname);
-                return -EIO;
-        }
-
-        /* position DPM window over the mailbox and enable interrupts */
-        if (sdla_mapmem(hw, sfm->info.winoffs) || sdla_inten(hw)) {
-                printk(KERN_INFO "%s: adapter hardware failure!\n",
-                        modname);
-                return -EIO;
-        }
-        hw->fwid = sfm->info.codeid;            /* set firmware ID */
-        return 0;
-}
-
-/*============================================================================
- * Initialize SDLA hardware: setup memory window, IRQ, etc.
- */
-static int sdla_init (sdlahw_t* hw)
-{
-        int i;
-
-        for (i = 0; i < SDLA_MAXIORANGE; ++i)
-                hw->regs[i] = 0;
-
-        switch (hw->type) {
-        case SDLA_S502A: return init_s502a(hw);
-        case SDLA_S502E: return init_s502e(hw);
-        case SDLA_S503:  return init_s503(hw);
-        case SDLA_S507:  return init_s507(hw);
-        case SDLA_S508:  return init_s508(hw);
-        }
-        return -EINVAL;
-}
-
-/*============================================================================
- * Test adapter on-board memory.
- * o slide DPM window from the bottom up and test adapter memory segment by
- *   segment.
- * Return adapter memory size.
- */
-static unsigned long sdla_memtest (sdlahw_t* hw)
-{
-        unsigned long memsize;
-        unsigned winsize;
-
-        for (memsize = 0, winsize = hw->dpmsize;
-             !sdla_mapmem(hw, memsize) &&
-                (test_memregion(hw->dpmbase, winsize) == winsize)
-             ;
-             memsize += winsize)
-        ;
-        hw->memory = memsize;
-        return memsize;
-}
-
-/*============================================================================
- * Prepare boot-time firmware configuration data.
- * o position DPM window
- * o initialize configuration data area
- */
-static int sdla_bootcfg (sdlahw_t* hw, sfm_info_t* sfminfo)
-{
-        unsigned char* data;
-
-        if (!sfminfo->datasize) return 0;       /* nothing to do */
-
-        if (sdla_mapmem(hw, sfminfo->dataoffs) != 0)
-                return -EIO;
-
-        if(hw->type == SDLA_S514)
-                data = (void*)(hw->dpmbase + sfminfo->dataoffs);
-        else
-                data = (void*)((u8 *)hw->dpmbase +
-                        (sfminfo->dataoffs - hw->vector));
-
-        memset_io (data, 0, sfminfo->datasize);
-
-        writeb (make_config_byte(hw), &data[0x00]);
-
-        switch (sfminfo->codeid) {
-        case SFID_X25_502:
-        case SFID_X25_508:
-                writeb (3, &data[0x01]);        /* T1 timer */
-                writeb (10, &data[0x03]);       /* N2 */
-                writeb (7, &data[0x06]);        /* HDLC window size */
-                writeb (1, &data[0x0B]);        /* DTE */
-                writeb (2, &data[0x0C]);        /* X.25 packet window size */
-                writew (128, &data[0x0D]);      /* default X.25 data size */
-                writew (128, &data[0x0F]);      /* maximum X.25 data size */
-                break;
-        }
-        return 0;
-}
-
-/*============================================================================
- * Prepare configuration byte identifying adapter type and CPU clock rate.
- */
-static unsigned char make_config_byte (sdlahw_t* hw)
-{
-        unsigned char byte = 0;
-
-        switch (hw->pclk) {
-                case 5000:  byte = 0x01; break;
-                case 7200:  byte = 0x02; break;
-                case 8000:  byte = 0x03; break;
-                case 10000: byte = 0x04; break;
-                case 16000: byte = 0x05; break;
-        }
-
-        switch (hw->type) {
-                case SDLA_S502E: byte |= 0x80; break;
-                case SDLA_S503:  byte |= 0x40; break;
-        }
-        return byte;
-}
-
-/*============================================================================
- * Start adapter's CPU.
- * o calculate a pointer to adapter's cold boot entry point
- * o position DPM window
- * o place boot instruction (jp addr) at cold boot entry point
- * o start CPU
- */
-static int sdla_start (sdlahw_t* hw, unsigned addr)
-{
-        unsigned port = hw->port;
-        unsigned char *bootp;
-        int err, tmp, i;
-
-        if (!port && (hw->type != SDLA_S514)) return -EFAULT;
-
-        switch (hw->type) {
-        case SDLA_S502A:
-                bootp = hw->dpmbase;
-                bootp += 0x66;
-                break;
-
-        case SDLA_S502E:
-        case SDLA_S503:
-        case SDLA_S507:
-        case SDLA_S508:
-        case SDLA_S514:
-                bootp = hw->dpmbase;
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        err = sdla_mapmem(hw, 0);
-        if (err) return err;
-
-        writeb (0xC3, bootp);   /* Z80: 'jp' opcode */
-        bootp ++;
-        writew (addr, bootp);
-
-        switch (hw->type) {
-        case SDLA_S502A:
-                _OUTB(port, 0x10);              /* issue NMI to CPU */
-                hw->regs[0] = 0x10;
-                break;
-
-        case SDLA_S502E:
-                _OUTB(port + 3, 0x01);          /* start CPU */
-                hw->regs[3] = 0x01;
-                for (i = 0; i < SDLA_IODELAY; ++i);
-                if (_INB(port) & 0x01) {        /* verify */
-                        /*
-                         * Enabling CPU changes functionality of the
-                         * control register, so we have to reset its
-                         * mirror.
-                         */
-                        _OUTB(port, 0);         /* disable interrupts */
-                        hw->regs[0] = 0;
-                }
-                else return -EIO;
-                break;
-
-        case SDLA_S503:
-                tmp = hw->regs[0] | 0x09;       /* set bits 0 and 3 */
-                _OUTB(port, tmp);
-                hw->regs[0] = tmp;              /* update mirror */
-                for (i = 0; i < SDLA_IODELAY; ++i);
-                if (!(_INB(port) & 0x01))       /* verify */
-                        return -EIO;
-                break;
-
-        case SDLA_S507:
-                tmp = hw->regs[0] | 0x02;
-                _OUTB(port, tmp);
-                hw->regs[0] = tmp;              /* update mirror */
-                for (i = 0; i < SDLA_IODELAY; ++i);
-                if (!(_INB(port) & 0x04))       /* verify */
-                        return -EIO;
-                break;
-
-        case SDLA_S508:
-                tmp = hw->regs[0] | 0x02;
-                _OUTB(port, tmp);
-                hw->regs[0] = tmp;      /* update mirror */
-                for (i = 0; i < SDLA_IODELAY; ++i);
-                if (!(_INB(port + 1) & 0x02))   /* verify */
-                        return -EIO;
-                break;
-
-        case SDLA_S514:
-                writeb (S514_CPU_START, hw->vector);
-                break;
-
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-/*============================================================================
- * Initialize S502A adapter.
- */
-static int init_s502a (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp, i;
-
-        if (!detect_s502a(port))
-                return -ENODEV;
-
-        hw->regs[0] = 0x08;
-        hw->regs[1] = 0xFF;
-
-        /* Verify configuration options */
-        i = get_option_index(s502a_dpmbase_options, virt_to_phys(hw->dpmbase));
-        if (i == 0)
-                return -EINVAL;
-
-        tmp = s502a_hmcr[i - 1];
-        switch (hw->dpmsize) {
-        case 0x2000:
-                tmp |= 0x01;
-                break;
-
-        case 0x10000L:
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        /* Setup dual-port memory window (this also enables memory access) */
-        _OUTB(port + 1, tmp);
-        hw->regs[1] = tmp;
-        hw->regs[0] = 0x08;
-        return 0;
-}
-
-/*============================================================================
- * Initialize S502E adapter.
- */
-static int init_s502e (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp, i;
-
-        if (!detect_s502e(port))
-                return -ENODEV;
-
-        /* Verify configuration options */
-        i = get_option_index(s508_dpmbase_options, virt_to_phys(hw->dpmbase));
-        if (i == 0)
-                return -EINVAL;
-
-        tmp = s502e_hmcr[i - 1];
-        switch (hw->dpmsize) {
-        case 0x2000:
-                tmp |= 0x01;
-                break;
-
-        case 0x10000L:
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        /* Setup dual-port memory window */
-        _OUTB(port + 1, tmp);
-        hw->regs[1] = tmp;
-
-        /* Enable memory access */
-        _OUTB(port, 0x02);
-        hw->regs[0] = 0x02;
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        return (_INB(port) & 0x02) ? 0 : -EIO;
-}
-
-/*============================================================================
- * Initialize S503 adapter.
- * ---------------------------------------------------------------------------
- */
-static int init_s503 (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp, i;
-
-        if (!detect_s503(port))
-                return -ENODEV;
-
-        /* Verify configuration options */
-        i = get_option_index(s508_dpmbase_options, virt_to_phys(hw->dpmbase));
-        if (i == 0)
-                return -EINVAL;
-
-        tmp = s502e_hmcr[i - 1];
-        switch (hw->dpmsize) {
-        case 0x2000:
-                tmp |= 0x01;
-                break;
-
-        case 0x10000L:
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        /* Setup dual-port memory window */
-        _OUTB(port + 1, tmp);
-        hw->regs[1] = tmp;
-
-        /* Enable memory access */
-        _OUTB(port, 0x02);
-        hw->regs[0] = 0x02;     /* update mirror */
-        return 0;
-}
-
-/*============================================================================
- * Initialize S507 adapter.
- */
-static int init_s507 (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp, i;
-
-        if (!detect_s507(port))
-                return -ENODEV;
-
-        /* Verify configuration options */
-        i = get_option_index(s507_dpmbase_options, virt_to_phys(hw->dpmbase));
-        if (i == 0)
-                return -EINVAL;
-
-        tmp = s507_hmcr[i - 1];
-        switch (hw->dpmsize) {
-        case 0x2000:
-                tmp |= 0x01;
-                break;
-
-        case 0x10000L:
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        /* Enable adapter's logic */
-        _OUTB(port, 0x01);
-        hw->regs[0] = 0x01;
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (!(_INB(port) & 0x20))
-                return -EIO;
-
-        /* Setup dual-port memory window */
-        _OUTB(port + 1, tmp);
-        hw->regs[1] = tmp;
-
-        /* Enable memory access */
-        tmp = hw->regs[0] | 0x04;
-        if (hw->irq) {
-                i = get_option_index(s508_irq_options, hw->irq);
-                if (i) tmp |= s507_irqmask[i - 1];
-        }
-        _OUTB(port, tmp);
-        hw->regs[0] = tmp;              /* update mirror */
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        return (_INB(port) & 0x08) ? 0 : -EIO;
-}
-
-/*============================================================================
- * Initialize S508 adapter.
- */
-static int init_s508 (sdlahw_t* hw)
-{
-        unsigned port = hw->port;
-        int tmp, i;
-
-        if (!detect_s508(port))
-                return -ENODEV;
-
-        /* Verify configuration options */
-        i = get_option_index(s508_dpmbase_options, virt_to_phys(hw->dpmbase));
-        if (i == 0)
-                return -EINVAL;
-
-        /* Setup memory configuration */
-        tmp = s508_hmcr[i - 1];
-        _OUTB(port + 1, tmp);
-        hw->regs[1] = tmp;
-
-        /* Enable memory access */
-        _OUTB(port, 0x04);
-        hw->regs[0] = 0x04;             /* update mirror */
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        return (_INB(port + 1) & 0x04) ? 0 : -EIO;
-}
-
-/*============================================================================
- * Detect S502A adapter.
- *      Following tests are used to detect S502A adapter:
- *      1. All registers other than status (BASE) should read 0xFF
- *      2. After writing 00001000b to control register, status register should
- *         read 01000000b.
- *      3. After writing 0 to control register, status register should still
- *         read  01000000b.
- *      4. After writing 00000100b to control register, status register should
- *         read 01000100b.
- *      Return 1 if detected o.k. or 0 if failed.
- *      Note:   This test is destructive! Adapter will be left in shutdown
- *              state after the test.
- */
-static int detect_s502a (int port)
-{
-        int i, j;
-
-        if (!get_option_index(s502_port_options, port))
-                return 0;
-        
-        for (j = 1; j < SDLA_MAXIORANGE; ++j) {
-                if (_INB(port + j) != 0xFF)
-                        return 0;
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        }
-
-        _OUTB(port, 0x08);                      /* halt CPU */
-        _OUTB(port, 0x08);
-        _OUTB(port, 0x08);
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (_INB(port) != 0x40)
-                return 0;
-        _OUTB(port, 0x00);
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (_INB(port) != 0x40)
-                return 0;
-        _OUTB(port, 0x04);
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (_INB(port) != 0x44)
-                return 0;
-
-        /* Reset adapter */
-        _OUTB(port, 0x08);
-        _OUTB(port, 0x08);
-        _OUTB(port, 0x08);
-        _OUTB(port + 1, 0xFF);
-        return 1;
-}
-
-/*============================================================================
- * Detect S502E adapter.
- *      Following tests are used to verify adapter presence:
- *      1. All registers other than status (BASE) should read 0xFF.
- *      2. After writing 0 to CPU control register (BASE+3), status register
- *         (BASE) should read 11111000b.
- *      3. After writing 00000100b to port BASE (set bit 2), status register
- *         (BASE) should read 11111100b.
- *      Return 1 if detected o.k. or 0 if failed.
- *      Note:   This test is destructive! Adapter will be left in shutdown
- *              state after the test.
- */
-static int detect_s502e (int port)
-{
-        int i, j;
-
-        if (!get_option_index(s502_port_options, port))
-                return 0;
-        for (j = 1; j < SDLA_MAXIORANGE; ++j) {
-                if (_INB(port + j) != 0xFF)
-                        return 0;
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        }
-
-        _OUTB(port + 3, 0);                     /* CPU control reg. */
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (_INB(port) != 0xF8)                 /* read status */
-                return 0;
-        _OUTB(port, 0x04);                      /* set bit 2 */
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (_INB(port) != 0xFC)                 /* verify */
-                return 0;
-
-        /* Reset adapter */
-        _OUTB(port, 0);
-        return 1;
-}
-
-/*============================================================================
- * Detect s503 adapter.
- *      Following tests are used to verify adapter presence:
- *      1. All registers other than status (BASE) should read 0xFF.
- *      2. After writing 0 to control register (BASE), status register (BASE)
- *         should read 11110000b.
- *      3. After writing 00000100b (set bit 2) to control register (BASE),
- *         status register should read 11110010b.
- *      Return 1 if detected o.k. or 0 if failed.
- *      Note:   This test is destructive! Adapter will be left in shutdown
- *              state after the test.
- */
-static int detect_s503 (int port)
-{
-        int i, j;
-
-        if (!get_option_index(s503_port_options, port))
-                return 0;
-        for (j = 1; j < SDLA_MAXIORANGE; ++j) {
-                if (_INB(port + j) != 0xFF)
-                        return 0;
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        }
-
-        _OUTB(port, 0);                         /* reset control reg.*/
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (_INB(port) != 0xF0)                 /* read status */
-                return 0;
-        _OUTB(port, 0x04);                      /* set bit 2 */
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if (_INB(port) != 0xF2)                 /* verify */
-                return 0;
-
-        /* Reset adapter */
-        _OUTB(port, 0);
-        return 1;
-}
-
-/*============================================================================
- * Detect s507 adapter.
- *      Following tests are used to detect s507 adapter:
- *      1. All ports should read the same value.
- *      2. After writing 0x00 to control register, status register should read
- *         ?011000?b.
- *      3. After writing 0x01 to control register, status register should read
- *         ?011001?b.
- *      Return 1 if detected o.k. or 0 if failed.
- *      Note:   This test is destructive! Adapter will be left in shutdown
- *              state after the test.
- */
-static int detect_s507 (int port)
-{
-        int tmp, i, j;
-
-        if (!get_option_index(s508_port_options, port))
-                return 0;
-        tmp = _INB(port);
-        for (j = 1; j < S507_IORANGE; ++j) {
-                if (_INB(port + j) != tmp)
-                        return 0;
-                for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        }
-
-        _OUTB(port, 0x00);
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if ((_INB(port) & 0x7E) != 0x30)
-                return 0;
-        _OUTB(port, 0x01);
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if ((_INB(port) & 0x7E) != 0x32)
-                return 0;
-
-        /* Reset adapter */
-        _OUTB(port, 0x00);
-        return 1;
-}
-
-/*============================================================================
- * Detect s508 adapter.
- *      Following tests are used to detect s508 adapter:
- *      1. After writing 0x00 to control register, status register should read
- *         ??000000b.
- *      2. After writing 0x10 to control register, status register should read
- *         ??010000b
- *      Return 1 if detected o.k. or 0 if failed.
- *      Note:   This test is destructive! Adapter will be left in shutdown
- *              state after the test.
- */
-static int detect_s508 (int port)
-{
-        int i;
-
-        if (!get_option_index(s508_port_options, port))
-                return 0;
-        _OUTB(port, 0x00);
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if ((_INB(port + 1) & 0x3F) != 0x00)
-                return 0;
-        _OUTB(port, 0x10);
-        for (i = 0; i < SDLA_IODELAY; ++i);     /* delay */
-        if ((_INB(port + 1) & 0x3F) != 0x10)
-                return 0;
-
-        /* Reset adapter */
-        _OUTB(port, 0x00);
-        return 1;
-}
-
-/*============================================================================
- * Detect s514 PCI adapter.
- *      Return 1 if detected o.k. or 0 if failed.
- *      Note:   This test is destructive! Adapter will be left in shutdown
- *              state after the test.
- */
-static int detect_s514 (sdlahw_t* hw)
-{
-        unsigned char CPU_no, slot_no, auto_slot_cfg;
-        int number_S514_cards = 0;
-        u32 S514_mem_base_addr = 0;
-        u32 ut_u32;
-        struct pci_dev *pci_dev;
-
-
-#ifndef CONFIG_PCI
-        printk(KERN_INFO "%s: Linux not compiled for PCI usage!\n", modname);
-        return 0;
-#endif
-
-        /*
-        The 'setup()' procedure in 'sdlamain.c' passes the CPU number and the
-        slot number defined in 'router.conf' via the 'port' definition.
-        */
-        CPU_no = hw->S514_cpu_no[0];
-        slot_no = hw->S514_slot_no;
-        auto_slot_cfg = hw->auto_pci_cfg;
-
-        if (auto_slot_cfg){
-                printk(KERN_INFO "%s: srch... S514 card, CPU %c, Slot=Auto\n",
-                modname, CPU_no);
-
-        }else{
-                printk(KERN_INFO "%s: srch... S514 card, CPU %c, Slot #%d\n",
-                modname, CPU_no, slot_no);
-        }
-        
-        /* check to see that CPU A or B has been selected in 'router.conf' */
-        switch(CPU_no) {
-                case S514_CPU_A:
-                case S514_CPU_B:
-                        break;
-        
-                default:
-                        printk(KERN_INFO "%s: S514 CPU definition invalid.\n", 
-                                modname);
-                        printk(KERN_INFO "Must be 'A' or 'B'\n");
-                        return 0;
-        }
-
-        number_S514_cards = find_s514_adapter(hw, 0);
-        if(!number_S514_cards)
-                return 0;
-
-        /* we are using a single S514 adapter with a slot of 0 so re-read the */        
-        /* location of this adapter */
-        if((number_S514_cards == 1) && auto_slot_cfg) { 
-                number_S514_cards = find_s514_adapter(hw, 1);
-                if(!number_S514_cards) {
-                        printk(KERN_INFO "%s: Error finding PCI card\n",
-                                modname);
-                        return 0;
-                }
-        }
-
-        pci_dev = hw->pci_dev;
-        /* read the physical memory base address */
-        S514_mem_base_addr = (CPU_no == S514_CPU_A) ? 
-                (pci_dev->resource[1].start) :
-                (pci_dev->resource[2].start);
-        
-        printk(KERN_INFO "%s: S514 PCI memory at 0x%X\n",
-                modname, S514_mem_base_addr);
-        if(!S514_mem_base_addr) {
-                if(CPU_no == S514_CPU_B)
-                        printk(KERN_INFO "%s: CPU #B not present on the card\n",                                modname);
-                else
-                        printk(KERN_INFO "%s: No PCI memory allocated to card\n",                               modname);
-                return 0;
-        }
-
-        /* enable the PCI memory */
-        pci_read_config_dword(pci_dev, 
-                (CPU_no == S514_CPU_A) ? PCI_MAP0_DWORD : PCI_MAP1_DWORD,
-                &ut_u32);
-        pci_write_config_dword(pci_dev,
-                (CPU_no == S514_CPU_A) ? PCI_MAP0_DWORD : PCI_MAP1_DWORD,
-                (ut_u32 | PCI_MEMORY_ENABLE));
-
-        /* check the IRQ allocated and enable IRQ usage */
-        if(!(hw->irq = pci_dev->irq)) {
-                printk(KERN_INFO "%s: IRQ not allocated to S514 adapter\n",
-                        modname);
-                return 0;
-        }
-
-        /* BUG FIX : Mar 6 2000
-         * On a initial loading of the card, we must check
-         * and clear PCI interrupt bits, due to a reset
-         * problem on some other boards.  i.e. An interrupt
-         * might be pending, even after system bootup, 
-         * in which case, when starting wanrouter the machine
-         * would crash. 
-         */
-        if (init_pci_slot(hw))
-                return 0;
-
-        pci_read_config_dword(pci_dev, PCI_INT_CONFIG, &ut_u32);
-        ut_u32 |= (CPU_no == S514_CPU_A) ?
-                PCI_ENABLE_IRQ_CPU_A : PCI_ENABLE_IRQ_CPU_B;
-        pci_write_config_dword(pci_dev, PCI_INT_CONFIG, ut_u32);
-
-        printk(KERN_INFO "%s: IRQ %d allocated to the S514 card\n",
-                modname, hw->irq);
-
-        /* map the physical PCI memory to virtual memory */
-        hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,
-                (unsigned long)MAX_SIZEOF_S514_MEMORY);
-        /* map the physical control register memory to virtual memory */
-        hw->vector = (unsigned long)ioremap(
-                (unsigned long)(S514_mem_base_addr + S514_CTRL_REG_BYTE),
-                (unsigned long)16);
-     
-        if(!hw->dpmbase || !hw->vector) {
-                printk(KERN_INFO "%s: PCI virtual memory allocation failed\n",
-                        modname);
-                return 0;
-        }
-
-        /* halt the adapter */
-        writeb (S514_CPU_HALT, hw->vector);     
-
-        return 1;
-}
-
-/*============================================================================
- * Find the S514 PCI adapter in the PCI bus.
- *      Return the number of S514 adapters found (0 if no adapter found).
- */
-static int find_s514_adapter(sdlahw_t* hw, char find_first_S514_card)
-{
-        unsigned char slot_no;
-        int number_S514_cards = 0;
-        char S514_found_in_slot = 0;
-        u16 PCI_subsys_vendor;
-
-        struct pci_dev *pci_dev = NULL;
- 
-       slot_no = hw->S514_slot_no;
-  
-        while ((pci_dev = pci_find_device(V3_VENDOR_ID, V3_DEVICE_ID, pci_dev))
-                != NULL) {
-                
-                pci_read_config_word(pci_dev, PCI_SUBSYS_VENDOR_WORD,
-                        &PCI_subsys_vendor);
-                
-                if(PCI_subsys_vendor != SANGOMA_SUBSYS_VENDOR)
-                        continue;
-                
-                hw->pci_dev = pci_dev;
-                
-                if(find_first_S514_card)
-                        return(1);
-                
-                number_S514_cards ++;
-                
-                printk(KERN_INFO
-                        "%s: S514 card found, slot #%d (devfn 0x%X)\n",
-                        modname, ((pci_dev->devfn >> 3) & PCI_DEV_SLOT_MASK),
-                        pci_dev->devfn);
-                
-                if (hw->auto_pci_cfg){
-                        hw->S514_slot_no = ((pci_dev->devfn >> 3) & PCI_DEV_SLOT_MASK);
-                        slot_no = hw->S514_slot_no;
-                        
-                }else if (((pci_dev->devfn >> 3) & PCI_DEV_SLOT_MASK) == slot_no){
-                        S514_found_in_slot = 1;
-                        break;
-                }
-        }
-
-        /* if no S514 adapter has been found, then exit */
-        if (!number_S514_cards) {
-                printk(KERN_INFO "%s: Error, no S514 adapters found\n", modname);
-                return 0;
-        }
-        /* if more than one S514 card has been found, then the user must have */        /* defined a slot number so that the correct adapter is used */
-        else if ((number_S514_cards > 1) && hw->auto_pci_cfg) {
-                printk(KERN_INFO "%s: Error, PCI Slot autodetect Failed! \n"
-                                 "%s:        More than one S514 adapter found.\n"
-                                 "%s:        Disable the Autodetect feature and supply\n"
-                                 "%s:        the PCISLOT numbers for each card.\n",
-                        modname,modname,modname,modname);
-                return 0;
-        }
-        /* if the user has specified a slot number and the S514 adapter has */
-        /* not been found in that slot, then exit */
-        else if (!hw->auto_pci_cfg && !S514_found_in_slot) {
-                printk(KERN_INFO
-                        "%s: Error, S514 card not found in specified slot #%d\n",
-                        modname, slot_no);
-                return 0;
-        }
-
-        return (number_S514_cards);
-}
-
-
-
-/******* Miscellaneous ******************************************************/
-
-/*============================================================================
- * Calibrate SDLA memory access delay.
- * Count number of idle loops made within 1 second and then calculate the
- * number of loops that should be made to achive desired delay.
- */
-static int calibrate_delay (int mks)
-{
-        unsigned int delay;
-        unsigned long stop;
-
-        for (delay = 0, stop = SYSTEM_TICK + HZ; SYSTEM_TICK < stop; ++delay);
-        return (delay/(1000000L/mks) + 1);
-}
-
-/*============================================================================
- * Get option's index into the options list.
- *      Return option's index (1 .. N) or zero if option is invalid.
- */
-static int get_option_index (unsigned* optlist, unsigned optval)
-{
-        int i;
-
-        for (i = 1; i <= optlist[0]; ++i)
-                if ( optlist[i] == optval)
-                        return i;
-        return 0;
-}
-
-/*============================================================================
- * Check memory region to see if it's available. 
- * Return:      0       ok.
- */
-static unsigned check_memregion (void* ptr, unsigned len)
-{
-        volatile unsigned char* p = ptr;
-
-        for (; len && (readb (p) == 0xFF); --len, ++p) {
-                writeb (0, p);          /* attempt to write 0 */
-                if (readb(p) != 0xFF) { /* still has to read 0xFF */
-                        writeb (0xFF, p);/* restore original value */
-                        break;          /* not good */
-                }
-        }
-
-        return len;
-}
-
-/*============================================================================
- * Test memory region.
- * Return:      size of the region that passed the test.
- * Note:        Region size must be multiple of 2 !
- */
-static unsigned test_memregion (void* ptr, unsigned len)
-{
-        volatile unsigned short* w_ptr;
-        unsigned len_w = len >> 1;      /* region len in words */
-        unsigned i;
-
-        for (i = 0, w_ptr = ptr; i < len_w; ++i, ++w_ptr)
-                writew (0xAA55, w_ptr);
-        
-        for (i = 0, w_ptr = ptr; i < len_w; ++i, ++w_ptr)
-                if (readw (w_ptr) != 0xAA55) {
-                        len_w = i;
-                        break;
-                }
-
-        for (i = 0, w_ptr = ptr; i < len_w; ++i, ++w_ptr)
-                writew (0x55AA, w_ptr);
-        
-        for (i = 0, w_ptr = ptr; i < len_w; ++i, ++w_ptr)
-                if (readw(w_ptr) != 0x55AA) {
-                        len_w = i;
-                        break;
-                }
-        
-        for (i = 0, w_ptr = ptr; i < len_w; ++i, ++w_ptr)
-                writew (0, w_ptr);
-
-        return len_w << 1;
-}
-
-/*============================================================================
- * Calculate 16-bit CRC using CCITT polynomial.
- */
-static unsigned short checksum (unsigned char* buf, unsigned len)
-{
-        unsigned short crc = 0;
-        unsigned mask, flag;
-
-        for (; len; --len, ++buf) {
-                for (mask = 0x80; mask; mask >>= 1) {
-                        flag = (crc & 0x8000);
-                        crc <<= 1;
-                        crc |= ((*buf & mask) ? 1 : 0);
-                        if (flag) crc ^= 0x1021;
-                }
-        }
-        return crc;
-}
-
-static int init_pci_slot(sdlahw_t *hw)
-{
-
-        u32 int_status;
-        int volatile found=0;
-        int i=0;
-
-        /* Check if this is a very first load for a specific
-         * pci card. If it is, clear the interrput bits, and
-         * set the flag indicating that this card was initialized.
-         */
-        
-        for (i=0; (i<MAX_S514_CARDS) && !found; i++){
-                if (pci_slot_ar[i] == hw->S514_slot_no){
-                        found=1;
-                        break;
-                }
-                if (pci_slot_ar[i] == 0xFF){
-                        break;
-                }
-        }
-
-        if (!found){
-                read_S514_int_stat(hw,&int_status);
-                S514_intack(hw,int_status);
-                if (i == MAX_S514_CARDS){
-                        printk(KERN_INFO "%s: Critical Error !!!\n",modname);
-                        printk(KERN_INFO 
-                                "%s: Number of Sangoma PCI cards exceeded maximum limit.\n",
-                                        modname);
-                        printk(KERN_INFO "Please contact Sangoma Technologies\n");
-                        return 1;
-                }
-                pci_slot_ar[i] = hw->S514_slot_no;
-        }
-        return 0;
-}
-
-static int pci_probe(sdlahw_t *hw)
-{
-
-        unsigned char slot_no;
-        int number_S514_cards = 0;
-        u16 PCI_subsys_vendor;
-        u16 PCI_card_type;
-
-        struct pci_dev *pci_dev = NULL;
-        struct pci_bus *bus = NULL;
- 
-       slot_no = 0;
-  
-        while ((pci_dev = pci_find_device(V3_VENDOR_ID, V3_DEVICE_ID, pci_dev))
-                != NULL) {
-                
-                pci_read_config_word(pci_dev, PCI_SUBSYS_VENDOR_WORD,
-                        &PCI_subsys_vendor);
-                
-                if(PCI_subsys_vendor != SANGOMA_SUBSYS_VENDOR)
-                        continue;
-
-                pci_read_config_word(pci_dev, PCI_CARD_TYPE,
-                        &PCI_card_type);
-        
-                bus = pci_dev->bus;
-                
-                /* A dual cpu card can support up to 4 physical connections,
-                 * where a single cpu card can support up to 2 physical
-                 * connections.  The FT1 card can only support a single 
-                 * connection, however we cannot distinguish between a Single
-                 * CPU card and an FT1 card. */
-                if (PCI_card_type == S514_DUAL_CPU){
-                        number_S514_cards += 4;
-                         printk(KERN_INFO
-                                "wanpipe: S514-PCI card found, cpu(s) 2, bus #%d, slot #%d, irq #%d\n",
-                                bus->number,((pci_dev->devfn >> 3) & PCI_DEV_SLOT_MASK),
-                                pci_dev->irq);
-                }else{
-                        number_S514_cards += 2;
-                        printk(KERN_INFO
-                                "wanpipe: S514-PCI card found, cpu(s) 1, bus #%d, slot #%d, irq #%d\n",
-                                bus->number,((pci_dev->devfn >> 3) & PCI_DEV_SLOT_MASK),
-                                pci_dev->irq);
-                }
-        }
-
-        return number_S514_cards;
-
-}
-
-
-
-EXPORT_SYMBOL(wanpipe_hw_probe);
-
-unsigned wanpipe_hw_probe(void)
-{
-        sdlahw_t hw;
-        unsigned* opt = s508_port_options; 
-        unsigned cardno=0;
-        int i;
-        
-        memset(&hw, 0, sizeof(hw));
-        
-        for (i = 1; i <= opt[0]; i++) {
-                if (detect_s508(opt[i])){
-                        /* S508 card can support up to two physical links */
-                        cardno+=2;
-                        printk(KERN_INFO "wanpipe: S508-ISA card found, port 0x%x\n",opt[i]);
-                }
-        }
-
-      #ifdef CONFIG_PCI
-        hw.S514_slot_no = 0;
-        cardno += pci_probe(&hw);
-      #else
-        printk(KERN_INFO "wanpipe: Warning, Kernel not compiled for PCI support!\n");
-        printk(KERN_INFO "wanpipe: PCI Hardware Probe Failed!\n");
-      #endif
-
-        return cardno;
-}
-
-/****** End *****************************************************************/
diff --git a/drivers/net/wan/sdlamain.c b/drivers/net/wan/sdlamain.c
deleted file mode 100644
index 7a8b22a7ea31..000000000000
--- a/drivers/net/wan/sdlamain.c
+++ /dev/null
@@ -1,1346 +0,0 @@
-/****************************************************************************
-* sdlamain.c    WANPIPE(tm) Multiprotocol WAN Link Driver.  Main module.
-*
-* Author:       Nenad Corbic    <ncorbic@sangoma.com>
-*               Gideon Hack     
-*
-* Copyright:    (c) 1995-2000 Sangoma Technologies 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.
-* ============================================================================
-* Dec 22, 2000  Nenad Corbic    Updated for 2.4.X kernels.
-*                               Removed the polling routine.
-* Nov 13, 2000  Nenad Corbic    Added hw probing on module load and dynamic
-*                               device allocation. 
-* Nov 7,  2000  Nenad Corbic    Fixed the Multi-Port PPP for kernels
-*                               2.2.16 and above.
-* Aug 2,  2000  Nenad Corbic    Block the Multi-Port PPP from running on
-*                               kernels 2.2.16 or greater.  The SyncPPP 
-*                               has changed.
-* Jul 25, 2000  Nenad Corbic    Updated the Piggiback support for MultPPPP.
-* Jul 13, 2000  Nenad Corbic    Added Multi-PPP support.
-* Feb 02, 2000  Nenad Corbic    Fixed up piggyback probing and selection.
-* Sep 23, 1999  Nenad Corbic    Added support for SMP
-* Sep 13, 1999  Nenad Corbic    Each port is treated as a separate device.
-* Jun 02, 1999  Gideon Hack     Added support for the S514 adapter.
-*                               Updates for Linux 2.2.X kernels.
-* Sep 17, 1998  Jaspreet Singh  Updated for 2.1.121+ kernel
-* Nov 28, 1997  Jaspreet Singh  Changed DRV_RELEASE to 1
-* Nov 10, 1997  Jaspreet Singh  Changed sti() to restore_flags();
-* Nov 06, 1997  Jaspreet Singh  Changed DRV_VERSION to 4 and DRV_RELEASE to 0
-* Oct 20, 1997  Jaspreet Singh  Modified sdla_isr routine so that card->in_isr
-*                               assignments are taken out and placed in the
-*                               sdla_ppp.c, sdla_fr.c and sdla_x25.c isr
-*                               routines. Took out 'wandev->tx_int_enabled' and
-*                               replaced it with 'wandev->enable_tx_int'. 
-* May 29, 1997  Jaspreet Singh  Flow Control Problem
-*                               added "wandev->tx_int_enabled=1" line in the
-*                               init module. This line initializes the flag for 
-*                               preventing Interrupt disabled with device set to
-*                               busy
-* Jan 15, 1997  Gene Kozin      Version 3.1.0
-*                                o added UDP management stuff
-* Jan 02, 1997  Gene Kozin      Initial version.
-*****************************************************************************/
-
-#include <linux/config.h>       /* OS configuration options */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/init.h>
-#include <linux/slab.h> /* kmalloc(), kfree() */
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/module.h>       /* support for loadable modules */
-#include <linux/ioport.h>       /* request_region(), release_region() */
-#include <linux/wanrouter.h>    /* WAN router definitions */
-#include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
-#include <linux/rcupdate.h>
-
-#include <linux/in.h>
-#include <asm/io.h>             /* phys_to_virt() */
-#include <linux/pci.h>
-#include <linux/sdlapci.h>
-#include <linux/if_wanpipe_common.h>
-
-#include <asm/uaccess.h>        /* kernel <-> user copy */
-#include <linux/inetdevice.h>
-
-#include <linux/ip.h>
-#include <net/route.h>
- 
-#define KMEM_SAFETYZONE 8
-
-
-#ifndef CONFIG_WANPIPE_FR
-  #define wpf_init(a,b) (-EPROTONOSUPPORT) 
-#endif
-
-#ifndef CONFIG_WANPIPE_CHDLC
- #define wpc_init(a,b) (-EPROTONOSUPPORT) 
-#endif
-
-#ifndef CONFIG_WANPIPE_X25
- #define wpx_init(a,b) (-EPROTONOSUPPORT) 
-#endif
- 
-#ifndef CONFIG_WANPIPE_PPP
- #define wpp_init(a,b) (-EPROTONOSUPPORT) 
-#endif
-
-#ifndef CONFIG_WANPIPE_MULTPPP 
- #define wsppp_init(a,b) (-EPROTONOSUPPORT) 
-#endif
- 
- 
-/***********FOR DEBUGGING PURPOSES*********************************************
-static void * dbg_kmalloc(unsigned int size, int prio, int line) {
-        int i = 0;
-        void * v = kmalloc(size+sizeof(unsigned int)+2*KMEM_SAFETYZONE*8,prio);
-        char * c1 = v;  
-        c1 += sizeof(unsigned int);
-        *((unsigned int *)v) = size;
-
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                c1[0] = 'D'; c1[1] = 'E'; c1[2] = 'A'; c1[3] = 'D';
-                c1[4] = 'B'; c1[5] = 'E'; c1[6] = 'E'; c1[7] = 'F';
-                c1 += 8;
-        }
-        c1 += size;
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                c1[0] = 'M'; c1[1] = 'U'; c1[2] = 'N'; c1[3] = 'G';
-                c1[4] = 'W'; c1[5] = 'A'; c1[6] = 'L'; c1[7] = 'L';
-                c1 += 8;
-        }
-        v = ((char *)v) + sizeof(unsigned int) + KMEM_SAFETYZONE*8;
-        printk(KERN_INFO "line %d  kmalloc(%d,%d) = %p\n",line,size,prio,v);
-        return v;
-}
-static void dbg_kfree(void * v, int line) {
-        unsigned int * sp = (unsigned int *)(((char *)v) - (sizeof(unsigned int) + KMEM_SAFETYZONE*8));
-        unsigned int size = *sp;
-        char * c1 = ((char *)v) - KMEM_SAFETYZONE*8;
-        int i = 0;
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                if (   c1[0] != 'D' || c1[1] != 'E' || c1[2] != 'A' || c1[3] != 'D'
-                    || c1[4] != 'B' || c1[5] != 'E' || c1[6] != 'E' || c1[7] != 'F') {
-                        printk(KERN_INFO "kmalloced block at %p has been corrupted (underrun)!\n",v);
-                        printk(KERN_INFO " %4x: %2x %2x %2x %2x %2x %2x %2x %2x\n", i*8,
-                                        c1[0],c1[1],c1[2],c1[3],c1[4],c1[5],c1[6],c1[7] );
-                }
-                c1 += 8;
-        }
-        c1 += size;
-        for (i = 0; i < KMEM_SAFETYZONE; i++) {
-                if (   c1[0] != 'M' || c1[1] != 'U' || c1[2] != 'N' || c1[3] != 'G'
-                    || c1[4] != 'W' || c1[5] != 'A' || c1[6] != 'L' || c1[7] != 'L'
-                   ) {
-                        printk(KERN_INFO "kmalloced block at %p has been corrupted (overrun):\n",v);
-                        printk(KERN_INFO " %4x: %2x %2x %2x %2x %2x %2x %2x %2x\n", i*8,
-                                        c1[0],c1[1],c1[2],c1[3],c1[4],c1[5],c1[6],c1[7] );
-                }
-                c1 += 8;
-        }
-        printk(KERN_INFO "line %d  kfree(%p)\n",line,v);
-        v = ((char *)v) - (sizeof(unsigned int) + KMEM_SAFETYZONE*8);
-        kfree(v);
-}
-
-#define kmalloc(x,y) dbg_kmalloc(x,y,__LINE__)
-#define kfree(x) dbg_kfree(x,__LINE__)
-******************************************************************************/
-
-
-
-/****** Defines & Macros ****************************************************/
-
-#ifdef  _DEBUG_
-#define STATIC
-#else
-#define STATIC          static
-#endif
-
-#define DRV_VERSION     5               /* version number */
-#define DRV_RELEASE     0               /* release (minor version) number */
-#define MAX_CARDS       16              /* max number of adapters */
-
-#ifndef CONFIG_WANPIPE_CARDS            /* configurable option */
-#define CONFIG_WANPIPE_CARDS 1
-#endif
-
-#define CMD_OK          0               /* normal firmware return code */
-#define CMD_TIMEOUT     0xFF            /* firmware command timed out */
-#define MAX_CMD_RETRY   10              /* max number of firmware retries */
-/****** Function Prototypes *************************************************/
-
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
- 
-/* WAN link driver entry points */
-static int setup(struct wan_device* wandev, wandev_conf_t* conf);
-static int shutdown(struct wan_device* wandev);
-static int ioctl(struct wan_device* wandev, unsigned cmd, unsigned long arg);
-
-/* IOCTL handlers */
-static int ioctl_dump   (sdla_t* card, sdla_dump_t* u_dump);
-static int ioctl_exec   (sdla_t* card, sdla_exec_t* u_exec, int);
-
-/* Miscellaneous functions */
-STATIC irqreturn_t sdla_isr     (int irq, void* dev_id, struct pt_regs *regs);
-static void release_hw  (sdla_t *card);
-
-static int check_s508_conflicts (sdla_t* card,wandev_conf_t* conf, int*);
-static int check_s514_conflicts (sdla_t* card,wandev_conf_t* conf, int*);
-
-
-/****** Global Data **********************************************************
- * Note: All data must be explicitly initialized!!!
- */
-
-/* private data */
-static char drvname[]   = "wanpipe";
-static char fullname[]  = "WANPIPE(tm) Multiprotocol Driver";
-static char copyright[] = "(c) 1995-2000 Sangoma Technologies Inc.";
-static int ncards; 
-static sdla_t* card_array;              /* adapter data space */
-
-/* Wanpipe's own workqueue, used for all API's.
- * All protocol specific tasks will be inserted
- * into the "wanpipe_wq" workqueue. 
-
- * The kernel workqueue mechanism will execute
- * all pending tasks in the "wanpipe_wq" workqueue.
- */
-
-struct workqueue_struct *wanpipe_wq;
-DECLARE_WORK(wanpipe_work, NULL, NULL);
-
-static int wanpipe_bh_critical;
-
-/******* Kernel Loadable Module Entry Points ********************************/
-
-/*============================================================================
- * Module 'insert' entry point.
- * o print announcement
- * o allocate adapter data space
- * o initialize static data
- * o register all cards with WAN router
- * o calibrate SDLA shared memory access delay.
- *
- * Return:      0       Ok
- *              < 0     error.
- * Context:     process
- */
- 
-static int __init wanpipe_init(void)
-{
-        int cnt, err = 0;
-
-        printk(KERN_INFO "%s v%u.%u %s\n",
-                fullname, DRV_VERSION, DRV_RELEASE, copyright);
-
-        wanpipe_wq = create_workqueue("wanpipe_wq");
-        if (!wanpipe_wq)
-                return -ENOMEM;
-
-        /* Probe for wanpipe cards and return the number found */
-        printk(KERN_INFO "wanpipe: Probing for WANPIPE hardware.\n");
-        ncards = wanpipe_hw_probe();
-        if (ncards){
-                printk(KERN_INFO "wanpipe: Allocating maximum %i devices: wanpipe%i - wanpipe%i.\n",ncards,1,ncards);
-        }else{
-                printk(KERN_INFO "wanpipe: No S514/S508 cards found, unloading modules!\n");
-                destroy_workqueue(wanpipe_wq);
-                return -ENODEV;
-        }
-        
-        /* Verify number of cards and allocate adapter data space */
-        card_array = kmalloc(sizeof(sdla_t) * ncards, GFP_KERNEL);
-        if (card_array == NULL) {
-                destroy_workqueue(wanpipe_wq);
-                return -ENOMEM;
-        }
-
-        memset(card_array, 0, sizeof(sdla_t) * ncards);
-
-        /* Register adapters with WAN router */
-        for (cnt = 0; cnt < ncards; ++ cnt) {
-                sdla_t* card = &card_array[cnt];
-                struct wan_device* wandev = &card->wandev;
-
-                card->next = NULL;
-                sprintf(card->devname, "%s%d", drvname, cnt + 1);
-                wandev->magic    = ROUTER_MAGIC;
-                wandev->name     = card->devname;
-                wandev->private  = card;
-                wandev->enable_tx_int = 0;
-                wandev->setup    = &setup;
-                wandev->shutdown = &shutdown;
-                wandev->ioctl    = &ioctl;
-                err = register_wan_device(wandev);
-                if (err) {
-                        printk(KERN_INFO
-                                "%s: %s registration failed with error %d!\n",
-                                drvname, card->devname, err);
-                        break;
-                }
-        }
-        if (cnt){
-                ncards = cnt;   /* adjust actual number of cards */
-        }else {
-                kfree(card_array);
-                destroy_workqueue(wanpipe_wq);
-                printk(KERN_INFO "IN Init Module: NO Cards registered\n");
-                err = -ENODEV;
-        }
-
-        return err;
-}
-
-/*============================================================================
- * Module 'remove' entry point.
- * o unregister all adapters from the WAN router
- * o release all remaining system resources
- */
-static void __exit wanpipe_cleanup(void)
-{
-        int i;
-
-        if (!ncards)
-                return;
-                
-        for (i = 0; i < ncards; ++i) {
-                sdla_t* card = &card_array[i];
-                unregister_wan_device(card->devname);
-        }
-        destroy_workqueue(wanpipe_wq);
-        kfree(card_array);
-
-        printk(KERN_INFO "\nwanpipe: WANPIPE Modules Unloaded.\n");
-}
-
-module_init(wanpipe_init);
-module_exit(wanpipe_cleanup);
-
-/******* WAN Device Driver Entry Points *************************************/
-
-/*============================================================================
- * Setup/configure WAN link driver.
- * o check adapter state
- * o make sure firmware is present in configuration
- * o make sure I/O port and IRQ are specified
- * o make sure I/O region is available
- * o allocate interrupt vector
- * o setup SDLA hardware
- * o call appropriate routine to perform protocol-specific initialization
- * o mark I/O region as used
- * o if this is the first active card, then schedule background task
- *
- * This function is called when router handles ROUTER_SETUP IOCTL. The
- * configuration structure is in kernel memory (including extended data, if
- * any).
- */
- 
-static int setup(struct wan_device* wandev, wandev_conf_t* conf)
-{
-        sdla_t* card;
-        int err = 0;
-        int irq=0;
-
-        /* Sanity checks */
-        if ((wandev == NULL) || (wandev->private == NULL) || (conf == NULL)){
-                printk(KERN_INFO 
-                      "%s: Failed Sdlamain Setup wandev %u, card %u, conf %u !\n",
-                      wandev->name,
-                      (unsigned int)wandev,(unsigned int)wandev->private,
-                      (unsigned int)conf); 
-                return -EFAULT;
-        }
-
-        printk(KERN_INFO "%s: Starting WAN Setup\n", wandev->name);
-
-        card = wandev->private;
-        if (wandev->state != WAN_UNCONFIGURED){
-                printk(KERN_INFO "%s: failed sdlamain setup, busy!\n",
-                        wandev->name);
-                return -EBUSY;          /* already configured */
-        }
-
-        printk(KERN_INFO "\nProcessing WAN device %s...\n", wandev->name);
-
-        /* Initialize the counters for each wandev 
-         * Used for counting number of times new_if and 
-         * del_if get called.
-         */
-        wandev->del_if_cnt = 0;
-        wandev->new_if_cnt = 0;
-        wandev->config_id  = conf->config_id;
-
-        if (!conf->data_size || (conf->data == NULL)) {
-                printk(KERN_INFO
-                        "%s: firmware not found in configuration data!\n",
-                        wandev->name);
-                return -EINVAL;
-        }
-
-        /* Check for resource conflicts and setup the
-         * card for piggibacking if necessary */
-        if(!conf->S514_CPU_no[0]) {
-                if ((err=check_s508_conflicts(card,conf,&irq)) != 0){
-                        return err;
-                }
-        }else {
-                if ((err=check_s514_conflicts(card,conf,&irq)) != 0){
-                        return err;
-                }
-        }
-
-        /* If the current card has already been configured
-         * or it's a piggyback card, do not try to allocate
-         * resources.
-         */
-        if (!card->wandev.piggyback && !card->configured){
-
-                /* Configure hardware, load firmware, etc. */
-                memset(&card->hw, 0, sizeof(sdlahw_t));
-
-                /* for an S514 adapter, pass the CPU number and the slot number read */
-                /* from 'router.conf' to the 'sdla_setup()' function via the 'port' */
-                /* parameter */
-                if (conf->S514_CPU_no[0]){
-
-                        card->hw.S514_cpu_no[0] = conf->S514_CPU_no[0];
-                        card->hw.S514_slot_no = conf->PCI_slot_no;
-                        card->hw.auto_pci_cfg = conf->auto_pci_cfg;
-
-                        if (card->hw.auto_pci_cfg == WANOPT_YES){
-                                printk(KERN_INFO "%s: Setting CPU to %c and Slot to Auto\n",
-                                card->devname, card->hw.S514_cpu_no[0]);
-                        }else{
-                                printk(KERN_INFO "%s: Setting CPU to %c and Slot to %i\n",
-                                card->devname, card->hw.S514_cpu_no[0], card->hw.S514_slot_no);
-                        }
-
-                }else{
-                        /* 508 Card io port and irq initialization */
-                        card->hw.port = conf->ioport;
-                        card->hw.irq = (conf->irq == 9) ? 2 : conf->irq;
-                }
-
-
-                /* Compute the virtual address of the card in kernel space */
-                if(conf->maddr){
-                        card->hw.dpmbase = phys_to_virt(conf->maddr);
-                }else{  
-                        card->hw.dpmbase = (void *)conf->maddr;
-                }
-                        
-                card->hw.dpmsize = SDLA_WINDOWSIZE;
-                
-                /* set the adapter type if using an S514 adapter */
-                card->hw.type = (conf->S514_CPU_no[0]) ? SDLA_S514 : conf->hw_opt[0]; 
-                card->hw.pclk = conf->hw_opt[1];
-
-                err = sdla_setup(&card->hw, conf->data, conf->data_size);
-                if (err){
-                        printk(KERN_INFO "%s: Hardware setup Failed %i\n",
-                                        card->devname,err);
-                        return err;
-                }
-
-                if(card->hw.type != SDLA_S514)
-                        irq = (conf->irq == 2) ? 9 : conf->irq; /* IRQ2 -> IRQ9 */
-                else
-                        irq = card->hw.irq;
-
-                /* request an interrupt vector - note that interrupts may be shared */
-                /* when using the S514 PCI adapter */
-                
-                if(request_irq(irq, sdla_isr, 
-                      (card->hw.type == SDLA_S514) ? SA_SHIRQ : 0, 
-                       wandev->name, card)){
-
-                        printk(KERN_INFO "%s: Can't reserve IRQ %d!\n", wandev->name, irq);
-                        return -EINVAL;
-                }
-
-        }else{
-                printk(KERN_INFO "%s: Card Configured %lu or Piggybacking %i!\n",
-                        wandev->name,card->configured,card->wandev.piggyback);
-        } 
-
-
-        if (!card->configured){
-
-                /* Initialize the Spin lock */
-                printk(KERN_INFO "%s: Initializing for SMP\n",wandev->name);
-
-                /* Piggyback spin lock has already been initialized,
-                 * in check_s514/s508_conflicts() */
-                if (!card->wandev.piggyback){
-                        spin_lock_init(&card->wandev.lock);
-                }
-                
-                /* Intialize WAN device data space */
-                wandev->irq       = irq;
-                wandev->dma       = 0;
-                if(card->hw.type != SDLA_S514){ 
-                        wandev->ioport = card->hw.port;
-                }else{
-                        wandev->S514_cpu_no[0] = card->hw.S514_cpu_no[0];
-                        wandev->S514_slot_no = card->hw.S514_slot_no;
-                }
-                wandev->maddr     = (unsigned long)card->hw.dpmbase;
-                wandev->msize     = card->hw.dpmsize;
-                wandev->hw_opt[0] = card->hw.type;
-                wandev->hw_opt[1] = card->hw.pclk;
-                wandev->hw_opt[2] = card->hw.memory;
-                wandev->hw_opt[3] = card->hw.fwid;
-        }
-
-        /* Protocol-specific initialization */
-        switch (card->hw.fwid) {
-
-        case SFID_X25_502:
-        case SFID_X25_508:
-                printk(KERN_INFO "%s: Starting X.25 Protocol Init.\n",
-                                card->devname);
-                err = wpx_init(card, conf);
-                break;
-        case SFID_FR502:
-        case SFID_FR508:
-                printk(KERN_INFO "%s: Starting Frame Relay Protocol Init.\n",
-                                card->devname);
-                err = wpf_init(card, conf);
-                break;
-        case SFID_PPP502:
-        case SFID_PPP508:
-                printk(KERN_INFO "%s: Starting PPP Protocol Init.\n",
-                                card->devname);
-                err = wpp_init(card, conf);
-                break;
-                
-        case SFID_CHDLC508:
-        case SFID_CHDLC514:
-                if (conf->ft1){         
-                        printk(KERN_INFO "%s: Starting FT1 CSU/DSU Config Driver.\n",
-                                card->devname);
-                        err = wpft1_init(card, conf);
-                        break;
-                        
-                }else if (conf->config_id == WANCONFIG_MPPP){
-                        printk(KERN_INFO "%s: Starting Multi-Port PPP Protocol Init.\n",
-                                        card->devname);
-                        err = wsppp_init(card,conf);
-                        break;
-
-                }else{
-                        printk(KERN_INFO "%s: Starting CHDLC Protocol Init.\n",
-                                        card->devname);
-                        err = wpc_init(card, conf);
-                        break;
-                }
-        default:
-                printk(KERN_INFO "%s: Error, Firmware is not supported %X %X!\n",
-                        wandev->name,card->hw.fwid,SFID_CHDLC508);
-                err = -EPROTONOSUPPORT;
-        }
-
-        if (err != 0){
-                if (err == -EPROTONOSUPPORT){
-                        printk(KERN_INFO 
-                                "%s: Error, Protocol selected has not been compiled!\n",
-                                        card->devname);
-                        printk(KERN_INFO 
-                                "%s:        Re-configure the kernel and re-build the modules!\n",
-                                        card->devname);
-                }
-                
-                release_hw(card);
-                wandev->state = WAN_UNCONFIGURED;
-                return err;
-        }
-
-
-        /* Reserve I/O region and schedule background task */
-        if(card->hw.type != SDLA_S514 && !card->wandev.piggyback)
-                if (!request_region(card->hw.port, card->hw.io_range, 
-                                wandev->name)) {
-                        printk(KERN_WARNING "port 0x%04x busy\n", card->hw.port);
-                        release_hw(card);
-                        wandev->state = WAN_UNCONFIGURED;
-                        return -EBUSY;
-          }
-
-        /* Only use the polling routine for the X25 protocol */
-        
-        card->wandev.critical=0;
-        return 0;
-}
-
-/*================================================================== 
- * configure_s508_card
- * 
- * For a S508 adapter, check for a possible configuration error in that
- * we are loading an adapter in the same IO port as a previously loaded S508
- * card.
- */ 
-
-static int check_s508_conflicts (sdla_t* card,wandev_conf_t* conf, int *irq)
-{
-        unsigned long smp_flags;
-        int i;
-        
-        if (conf->ioport <= 0) {
-                printk(KERN_INFO
-                "%s: can't configure without I/O port address!\n",
-                card->wandev.name);
-                return -EINVAL;
-        }
-
-        if (conf->irq <= 0) {
-                printk(KERN_INFO "%s: can't configure without IRQ!\n",
-                card->wandev.name);
-                return -EINVAL;
-        }
-
-        if (test_bit(0,&card->configured))
-                return 0;
-
-
-        /* Check for already loaded card with the same IO port and IRQ 
-         * If found, copy its hardware configuration and use its
-         * resources (i.e. piggybacking)
-         */
-        
-        for (i = 0; i < ncards; i++) {
-                sdla_t *nxt_card = &card_array[i];
-
-                /* Skip the current card ptr */
-                if (nxt_card == card)   
-                        continue;
-
-
-                /* Find a card that is already configured with the
-                 * same IO Port */
-                if ((nxt_card->hw.type == SDLA_S508) &&
-                    (nxt_card->hw.port == conf->ioport) && 
-                    (nxt_card->next == NULL)){
-                        
-                        /* We found a card the card that has same configuration
-                         * as us. This means, that we must setup this card in 
-                         * piggibacking mode. However, only CHDLC and MPPP protocol
-                         * support this setup */
-                
-                        if ((conf->config_id == WANCONFIG_CHDLC || 
-                             conf->config_id == WANCONFIG_MPPP) &&
-                            (nxt_card->wandev.config_id == WANCONFIG_CHDLC || 
-                             nxt_card->wandev.config_id == WANCONFIG_MPPP)){ 
-                                
-                                *irq = nxt_card->hw.irq;
-                                memcpy(&card->hw, &nxt_card->hw, sizeof(sdlahw_t));
-                        
-                                /* The master could already be running, we must
-                                 * set this as a critical area */
-                                lock_adapter_irq(&nxt_card->wandev.lock, &smp_flags);
-
-                                nxt_card->next = card;
-                                card->next = nxt_card;
-
-                                card->wandev.piggyback = WANOPT_YES;
-
-                                /* We must initialise the piggiback spin lock here
-                                 * since isr will try to lock card->next if it
-                                 * exists */
-                                spin_lock_init(&card->wandev.lock);
-                                
-                                unlock_adapter_irq(&nxt_card->wandev.lock, &smp_flags);
-                                break;
-                        }else{
-                                /* Trying to run piggibacking with a wrong protocol */
-                                printk(KERN_INFO "%s: ERROR: Resource busy, ioport: 0x%x\n"
-                                                 "%s:        This protocol doesn't support\n"
-                                                 "%s:        multi-port operation!\n",
-                                                 card->devname,nxt_card->hw.port,
-                                                 card->devname,card->devname);
-                                return -EEXIST;
-                        }
-                }
-        }
-        
-
-        /* Make sure I/O port region is available only if we are the
-         * master device.  If we are running in piggybacking mode, 
-         * we will use the resources of the master card. */
-        if (!card->wandev.piggyback) {
-                struct resource *rr =
-                        request_region(conf->ioport, SDLA_MAXIORANGE, "sdlamain");
-                release_region(conf->ioport, SDLA_MAXIORANGE);
-
-                if (!rr) {
-                        printk(KERN_INFO
-                                "%s: I/O region 0x%X - 0x%X is in use!\n",
-                                card->wandev.name, conf->ioport,
-                                conf->ioport + SDLA_MAXIORANGE - 1);
-                        return -EINVAL;
-                }
-        }
-
-        return 0;
-}
-
-/*================================================================== 
- * configure_s514_card
- * 
- * For a S514 adapter, check for a possible configuration error in that
- * we are loading an adapter in the same slot as a previously loaded S514
- * card.
- */ 
-
-
-static int check_s514_conflicts(sdla_t* card,wandev_conf_t* conf, int *irq)
-{
-        unsigned long smp_flags;
-        int i;
-        
-        if (test_bit(0,&card->configured))
-                return 0;
-
-        
-        /* Check for already loaded card with the same IO port and IRQ 
-         * If found, copy its hardware configuration and use its
-         * resources (i.e. piggybacking)
-         */
-
-        for (i = 0; i < ncards; i ++) {
-        
-                sdla_t* nxt_card = &card_array[i];
-                if(nxt_card == card)
-                        continue;
-                
-                if((nxt_card->hw.type == SDLA_S514) &&
-                   (nxt_card->hw.S514_slot_no == conf->PCI_slot_no) &&
-                   (nxt_card->hw.S514_cpu_no[0] == conf->S514_CPU_no[0])&&
-                   (nxt_card->next == NULL)){
-
-
-                        if ((conf->config_id == WANCONFIG_CHDLC || 
-                             conf->config_id == WANCONFIG_MPPP) &&
-                            (nxt_card->wandev.config_id == WANCONFIG_CHDLC || 
-                             nxt_card->wandev.config_id == WANCONFIG_MPPP)){ 
-                                
-                                *irq = nxt_card->hw.irq;
-                                memcpy(&card->hw, &nxt_card->hw, sizeof(sdlahw_t));
-        
-                                /* The master could already be running, we must
-                                 * set this as a critical area */
-                                lock_adapter_irq(&nxt_card->wandev.lock,&smp_flags);
-                                nxt_card->next = card;
-                                card->next = nxt_card;
-
-                                card->wandev.piggyback = WANOPT_YES;
-
-                                /* We must initialise the piggiback spin lock here
-                                 * since isr will try to lock card->next if it
-                                 * exists */
-                                spin_lock_init(&card->wandev.lock);
-
-                                unlock_adapter_irq(&nxt_card->wandev.lock,&smp_flags);
-
-                        }else{
-                                /* Trying to run piggibacking with a wrong protocol */
-                                printk(KERN_INFO "%s: ERROR: Resource busy: CPU %c PCISLOT %i\n"
-                                                 "%s:        This protocol doesn't support\n"
-                                                 "%s:        multi-port operation!\n",
-                                                 card->devname,
-                                                 conf->S514_CPU_no[0],conf->PCI_slot_no,
-                                                 card->devname,card->devname);
-                                return -EEXIST;
-                        }
-                }
-        }
-
-        return 0;
-}
-
-
-
-/*============================================================================
- * Shut down WAN link driver. 
- * o shut down adapter hardware
- * o release system resources.
- *
- * This function is called by the router when device is being unregistered or
- * when it handles ROUTER_DOWN IOCTL.
- */
-static int shutdown(struct wan_device* wandev)
-{
-        sdla_t *card;
-        int err=0;
-        
-        /* sanity checks */
-        if ((wandev == NULL) || (wandev->private == NULL)){
-                return -EFAULT;
-        }
-                
-        if (wandev->state == WAN_UNCONFIGURED){
-                return 0;
-        }
-
-        card = wandev->private;
-
-        if (card->tty_opt){
-                if (card->tty_open){
-                        printk(KERN_INFO 
-                                "%s: Shutdown Failed: TTY is still open\n",
-                                  card->devname);
-                        return -EBUSY;
-                }
-        }
-        
-        wandev->state = WAN_UNCONFIGURED;
-
-        set_bit(PERI_CRIT,(void*)&wandev->critical);
-        
-        /* In case of piggibacking, make sure that 
-         * we never try to shutdown both devices at the same
-         * time, because they depend on one another */
-        
-        if (card->disable_comm){
-                card->disable_comm(card);
-        }
-
-        /* Release Resources */
-        release_hw(card);
-
-        /* only free the allocated I/O range if not an S514 adapter */
-        if (wandev->hw_opt[0] != SDLA_S514 && !card->configured){
-                release_region(card->hw.port, card->hw.io_range);
-        }
-
-        if (!card->configured){
-                memset(&card->hw, 0, sizeof(sdlahw_t));
-                if (card->next){
-                        memset(&card->next->hw, 0, sizeof(sdlahw_t));
-                }
-        }
-        
-
-        clear_bit(PERI_CRIT,(void*)&wandev->critical);
-        return err;
-}
-
-static void release_hw (sdla_t *card)
-{
-        sdla_t *nxt_card;
-
-        
-        /* Check if next device exists */
-        if (card->next){
-                nxt_card = card->next;
-                /* If next device is down then release resources */
-                if (nxt_card->wandev.state == WAN_UNCONFIGURED){
-                        if (card->wandev.piggyback){
-                                /* If this device is piggyback then use
-                                 * information of the master device 
-                                 */
-                                printk(KERN_INFO "%s: Piggyback shutting down\n",card->devname);
-                                sdla_down(&card->next->hw);
-                                free_irq(card->wandev.irq, card->next);
-                                card->configured = 0;
-                                card->next->configured = 0;
-                                card->wandev.piggyback = 0;
-                        }else{
-                                /* Master device shutting down */
-                                printk(KERN_INFO "%s: Master shutting down\n",card->devname);
-                                sdla_down(&card->hw);
-                                free_irq(card->wandev.irq, card);
-                                card->configured = 0;
-                                card->next->configured = 0;
-                        }
-                }else{
-                        printk(KERN_INFO "%s: Device still running %i\n",
-                                nxt_card->devname,nxt_card->wandev.state);
-
-                        card->configured = 1;
-                }
-        }else{
-                printk(KERN_INFO "%s: Master shutting down\n",card->devname);
-                sdla_down(&card->hw);
-                free_irq(card->wandev.irq, card);
-                card->configured = 0;
-        }
-        return;
-}
-
-
-/*============================================================================
- * Driver I/O control. 
- * o verify arguments
- * o perform requested action
- *
- * This function is called when router handles one of the reserved user
- * IOCTLs.  Note that 'arg' stil points to user address space.
- */
-static int ioctl(struct wan_device* wandev, unsigned cmd, unsigned long arg)
-{
-        sdla_t* card;
-        int err;
-
-        /* sanity checks */
-        if ((wandev == NULL) || (wandev->private == NULL))
-                return -EFAULT;
-        if (wandev->state == WAN_UNCONFIGURED)
-                return -ENODEV;
-
-        card = wandev->private;
-
-        if(card->hw.type != SDLA_S514){
-                disable_irq(card->hw.irq);
-        }
-
-        if (test_bit(SEND_CRIT, (void*)&wandev->critical)) {
-                return -EAGAIN;
-        }
-        
-        switch (cmd) {
-        case WANPIPE_DUMP:
-                err = ioctl_dump(wandev->private, (void*)arg);
-                break;
-
-        case WANPIPE_EXEC:
-                err = ioctl_exec(wandev->private, (void*)arg, cmd);
-                break;
-        default:
-                err = -EINVAL;
-        }
- 
-        return err;
-}
-
-/****** Driver IOCTL Handlers ***********************************************/
-
-/*============================================================================
- * Dump adapter memory to user buffer.
- * o verify request structure
- * o copy request structure to kernel data space
- * o verify length/offset
- * o verify user buffer
- * o copy adapter memory image to user buffer
- *
- * Note: when dumping memory, this routine switches curent dual-port memory
- *       vector, so care must be taken to avoid racing conditions.
- */
-static int ioctl_dump (sdla_t* card, sdla_dump_t* u_dump)
-{
-        sdla_dump_t dump;
-        unsigned winsize;
-        unsigned long oldvec;   /* DPM window vector */
-        unsigned long smp_flags;
-        int err = 0;
-
-        if(copy_from_user((void*)&dump, (void*)u_dump, sizeof(sdla_dump_t)))
-                return -EFAULT;
-                
-        if ((dump.magic != WANPIPE_MAGIC) ||
-            (dump.offset + dump.length > card->hw.memory))
-                return -EINVAL;
-        
-        winsize = card->hw.dpmsize;
-
-        if(card->hw.type != SDLA_S514) {
-
-                lock_adapter_irq(&card->wandev.lock, &smp_flags);
-                
-                oldvec = card->hw.vector;
-                while (dump.length) {
-                        /* current offset */                            
-                        unsigned pos = dump.offset % winsize;
-                        /* current vector */
-                        unsigned long vec = dump.offset - pos;
-                        unsigned len = (dump.length > (winsize - pos)) ?
-                                (winsize - pos) : dump.length;
-                        /* relocate window */
-                        if (sdla_mapmem(&card->hw, vec) != 0) {
-                                err = -EIO;
-                                break;
-                        }
-                        
-                        if(copy_to_user((void *)dump.ptr,
-                                (u8 *)card->hw.dpmbase + pos, len)){ 
-                                
-                                unlock_adapter_irq(&card->wandev.lock, &smp_flags);
-                                return -EFAULT;
-                        }
-
-                        dump.length     -= len;
-                        dump.offset     += len;
-                        dump.ptr         = (char*)dump.ptr + len;
-                }
-                
-                sdla_mapmem(&card->hw, oldvec);/* restore DPM window position */
-                unlock_adapter_irq(&card->wandev.lock, &smp_flags);
-        
-        }else {
-
-               if(copy_to_user((void *)dump.ptr,
-                               (u8 *)card->hw.dpmbase + dump.offset, dump.length)){
-                        return -EFAULT;
-                }
-        }
-
-        return err;
-}
-
-/*============================================================================
- * Execute adapter firmware command.
- * o verify request structure
- * o copy request structure to kernel data space
- * o call protocol-specific 'exec' function
- */
-static int ioctl_exec (sdla_t* card, sdla_exec_t* u_exec, int cmd)
-{
-        sdla_exec_t exec;
-        int err=0;
-
-        if (card->exec == NULL && cmd == WANPIPE_EXEC){
-                return -ENODEV;
-        }
-
-        if(copy_from_user((void*)&exec, (void*)u_exec, sizeof(sdla_exec_t)))
-                return -EFAULT;
-
-        if ((exec.magic != WANPIPE_MAGIC) || (exec.cmd == NULL))
-                return -EINVAL;
-
-        switch (cmd) {
-                case WANPIPE_EXEC:      
-                        err = card->exec(card, exec.cmd, exec.data);
-                        break;
-        }       
-        return err;
-}
-
-/******* Miscellaneous ******************************************************/
-
-/*============================================================================
- * SDLA Interrupt Service Routine.
- * o acknowledge SDLA hardware interrupt.
- * o call protocol-specific interrupt service routine, if any.
- */
-STATIC irqreturn_t sdla_isr (int irq, void* dev_id, struct pt_regs *regs)
-{
-#define card    ((sdla_t*)dev_id)
-
-        if(card->hw.type == SDLA_S514) {        /* handle interrrupt on S514 */
-                u32 int_status;
-                unsigned char CPU_no = card->hw.S514_cpu_no[0];
-                unsigned char card_found_for_IRQ;
-                u8 IRQ_count = 0;
-
-                for(;;) {
-
-                        read_S514_int_stat(&card->hw, &int_status);
-
-                        /* check if the interrupt is for this device */
-                        if(!((unsigned char)int_status &
-                                (IRQ_CPU_A | IRQ_CPU_B)))
-                                return IRQ_HANDLED;
-
-                        /* if the IRQ is for both CPUs on the same adapter, */
-                        /* then alter the interrupt status so as to handle */
-                        /* one CPU at a time */
-                        if(((unsigned char)int_status & (IRQ_CPU_A | IRQ_CPU_B))
-                                == (IRQ_CPU_A | IRQ_CPU_B)) {
-                                int_status &= (CPU_no == S514_CPU_A) ?
-                                        ~IRQ_CPU_B : ~IRQ_CPU_A;
-                        }
- 
-                        card_found_for_IRQ = 0;
-
-                        /* check to see that the CPU number for this device */
-                        /* corresponds to the interrupt status read */
-                        switch (CPU_no) {
-                                case S514_CPU_A:
-                                        if((unsigned char)int_status &
-                                                IRQ_CPU_A)
-                                        card_found_for_IRQ = 1;
-                                break;
-
-                                case S514_CPU_B:
-                                        if((unsigned char)int_status &
-                                                IRQ_CPU_B)
-                                        card_found_for_IRQ = 1;
-                                break;
-                        }
-
-                        /* exit if the interrupt is for another CPU on the */
-                        /* same IRQ */
-                        if(!card_found_for_IRQ)
-                                return IRQ_HANDLED;
-
-                        if (!card || 
-                           (card->wandev.state == WAN_UNCONFIGURED && !card->configured)){
-                                        printk(KERN_INFO
-                                                "Received IRQ %d for CPU #%c\n",
-                                                irq, CPU_no);
-                                        printk(KERN_INFO
-                                                "IRQ for unconfigured adapter\n");
-                                        S514_intack(&card->hw, int_status);
-                                        return IRQ_HANDLED;
-                        }
-
-                        if (card->in_isr) {
-                                printk(KERN_INFO
-                                        "%s: interrupt re-entrancy on IRQ %d\n",
-                                        card->devname, card->wandev.irq);
-                                S514_intack(&card->hw, int_status);
-                                return IRQ_HANDLED;
-                        }
-
-                        spin_lock(&card->wandev.lock);
-                        if (card->next){
-                                spin_lock(&card->next->wandev.lock);
-                        }
-                                
-                        S514_intack(&card->hw, int_status);
-                        if (card->isr)
-                                card->isr(card);
-
-                        if (card->next){
-                                spin_unlock(&card->next->wandev.lock);
-                        }
-                        spin_unlock(&card->wandev.lock);
-
-                        /* handle a maximum of two interrupts (one for each */
-                        /* CPU on the adapter) before returning */  
-                        if((++ IRQ_count) == 2)
-                                return IRQ_HANDLED;
-                }
-        }
-
-        else {                  /* handle interrupt on S508 adapter */
-
-                if (!card || ((card->wandev.state == WAN_UNCONFIGURED) && !card->configured))
-                        return IRQ_HANDLED;
-
-                if (card->in_isr) {
-                        printk(KERN_INFO
-                                "%s: interrupt re-entrancy on IRQ %d!\n",
-                                card->devname, card->wandev.irq);
-                        return IRQ_HANDLED;
-                }
-
-                spin_lock(&card->wandev.lock);
-                if (card->next){
-                        spin_lock(&card->next->wandev.lock);
-                }
-        
-                sdla_intack(&card->hw);
-                if (card->isr)
-                        card->isr(card);
-                
-                if (card->next){
-                        spin_unlock(&card->next->wandev.lock);
-                }
-                spin_unlock(&card->wandev.lock);
-
-        }
-        return IRQ_HANDLED;
-#undef  card
-}
-
-/*============================================================================
- * This routine is called by the protocol-specific modules when network
- * interface is being open.  The only reason we need this, is because we
- * have to call MOD_INC_USE_COUNT, but cannot include 'module.h' where it's
- * defined more than once into the same kernel module.
- */
-void wanpipe_open (sdla_t* card)
-{
-        ++card->open_cnt;
-}
-
-/*============================================================================
- * This routine is called by the protocol-specific modules when network
- * interface is being closed.  The only reason we need this, is because we
- * have to call MOD_DEC_USE_COUNT, but cannot include 'module.h' where it's
- * defined more than once into the same kernel module.
- */
-void wanpipe_close (sdla_t* card)
-{
-        --card->open_cnt;
-}
-
-/*============================================================================
- * Set WAN device state.
- */
-void wanpipe_set_state (sdla_t* card, int state)
-{
-        if (card->wandev.state != state) {
-                switch (state) {
-                case WAN_CONNECTED:
-                        printk (KERN_INFO "%s: link connected!\n",
-                                card->devname);
-                        break;
-
-                case WAN_CONNECTING:
-                        printk (KERN_INFO "%s: link connecting...\n",
-                                card->devname);
-                        break;
-
-                case WAN_DISCONNECTED:
-                        printk (KERN_INFO "%s: link disconnected!\n",
-                                card->devname);
-                        break;
-                }
-                card->wandev.state = state;
-        }
-        card->state_tick = jiffies;
-}
-
-sdla_t * wanpipe_find_card (char *name)
-{
-        int cnt;
-        for (cnt = 0; cnt < ncards; ++ cnt) {
-                sdla_t* card = &card_array[cnt];
-                if (!strcmp(card->devname,name))
-                        return card;
-        }
-        return NULL;
-}
-
-sdla_t * wanpipe_find_card_num (int num)
-{
-        if (num < 1 || num > ncards)
-                return NULL;    
-        num--;
-        return &card_array[num];
-}
-
-/*
- * @work_pointer:       work_struct to be done;
- *                      should already have PREPARE_WORK() or
- *                        INIT_WORK() done on it by caller;
- */
-void wanpipe_queue_work (struct work_struct *work_pointer)
-{
-        if (test_and_set_bit(1, (void*)&wanpipe_bh_critical))
-                printk(KERN_INFO "CRITICAL IN QUEUING WORK\n");
-
-        queue_work(wanpipe_wq, work_pointer);
-        clear_bit(1,(void*)&wanpipe_bh_critical);
-}
-
-void wakeup_sk_bh(struct net_device *dev)
-{
-        wanpipe_common_t *chan = dev->priv;
-
-        if (test_bit(0,&chan->common_critical))
-                return;
-        
-        if (chan->sk && chan->tx_timer){
-                chan->tx_timer->expires=jiffies+1;
-                add_timer(chan->tx_timer);
-        }
-}
-
-int change_dev_flags(struct net_device *dev, unsigned flags)
-{
-        struct ifreq if_info;
-        mm_segment_t fs = get_fs();
-        int err;
-
-        memset(&if_info, 0, sizeof(if_info));
-        strcpy(if_info.ifr_name, dev->name);
-        if_info.ifr_flags = flags;      
-
-        set_fs(get_ds());     /* get user space block */ 
-        err = devinet_ioctl(SIOCSIFFLAGS, &if_info);
-        set_fs(fs);
-
-        return err;
-}
-
-unsigned long get_ip_address(struct net_device *dev, int option)
-{
-        
-        struct in_ifaddr *ifaddr;
-        struct in_device *in_dev;
-        unsigned long addr = 0;
-
-        rcu_read_lock();
-        if ((in_dev = __in_dev_get_rcu(dev)) == NULL){
-                goto out;
-        }
-
-        if ((ifaddr = in_dev->ifa_list)== NULL ){
-                goto out;
-        }
-        
-        switch (option){
-
-        case WAN_LOCAL_IP:
-                addr = ifaddr->ifa_local;
-                break;
-        
-        case WAN_POINTOPOINT_IP:
-                addr = ifaddr->ifa_address;
-                break;  
-
-        case WAN_NETMASK_IP:
-                addr = ifaddr->ifa_mask;
-                break;
-
-        case WAN_BROADCAST_IP:
-                addr = ifaddr->ifa_broadcast;
-                break;
-        default:
-                break;
-        }
-
-out:
-        rcu_read_unlock();
-        return addr;
-}       
-
-void add_gateway(sdla_t *card, struct net_device *dev)
-{
-        mm_segment_t oldfs;
-        struct rtentry route;
-        int res;
-
-        memset((char*)&route,0,sizeof(struct rtentry));
-
-        ((struct sockaddr_in *)
-                &(route.rt_dst))->sin_addr.s_addr = 0;
-        ((struct sockaddr_in *)
-                &(route.rt_dst))->sin_family = AF_INET;
-
-        ((struct sockaddr_in *)
-                &(route.rt_genmask))->sin_addr.s_addr = 0;
-        ((struct sockaddr_in *) 
-                &(route.rt_genmask)) ->sin_family = AF_INET;
-
-
-        route.rt_flags = 0;  
-        route.rt_dev = dev->name;
-
-        oldfs = get_fs();
-        set_fs(get_ds());
-        res = ip_rt_ioctl(SIOCADDRT,&route);
-        set_fs(oldfs);
-
-        if (res == 0){
-                printk(KERN_INFO "%s: Gateway added for %s\n",
-                        card->devname,dev->name);
-        }
-
-        return;
-}
-
-MODULE_LICENSE("GPL");
-
-/****** End *********************************************************/
diff --git a/drivers/net/wan/wanpipe_multppp.c b/drivers/net/wan/wanpipe_multppp.c
deleted file mode 100644
index 812a1183c502..000000000000
--- a/drivers/net/wan/wanpipe_multppp.c
+++ /dev/null
@@ -1,2358 +0,0 @@
-/*****************************************************************************
-* wanpipe_multppp.c Multi-Port PPP driver module.
-*
-* Authors:      Nenad Corbic <ncorbic@sangoma.com>
-*
-* Copyright:    (c) 1995-2001 Sangoma Technologies 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.
-* ============================================================================
-* Dec 15 2000   Updated for 2.4.X kernel
-* Nov 15 2000   Fixed the SyncPPP support for kernels 2.2.16 and higher.
-*               The pppstruct has changed.
-* Jul 13 2000   Using the kernel Syncppp module on top of RAW Wanpipe CHDLC
-*               module.
-*****************************************************************************/
-
-#include <linux/module.h>
-#include <linux/kernel.h>       /* printk(), and other useful stuff */
-#include <linux/stddef.h>       /* offsetof(), etc. */
-#include <linux/errno.h>        /* return codes */
-#include <linux/string.h>       /* inline memset(), etc. */
-#include <linux/slab.h> /* kmalloc(), kfree() */
-#include <linux/wanrouter.h>    /* WAN router definitions */
-#include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
-#include <linux/if_arp.h>       /* ARPHRD_* defines */
-#include <linux/jiffies.h>      /* time_after() macro */
-
-#include <linux/in.h>           /* sockaddr_in */
-#include <linux/inet.h> 
-#include <linux/if.h>
-#include <asm/byteorder.h>      /* htons(), etc. */
-#include <linux/sdlapci.h>
-#include <asm/io.h>
-
-#include <linux/sdla_chdlc.h>           /* CHDLC firmware API definitions */
-#include <linux/sdla_asy.h>             /* CHDLC (async) API definitions */
-
-#include <linux/if_wanpipe_common.h>    /* Socket Driver common area */
-#include <linux/if_wanpipe.h>           
-
-
-#include <linux/inetdevice.h>
-#include <asm/uaccess.h>
-
-#include <net/syncppp.h>
-
-
-/****** Defines & Macros ****************************************************/
-
-#ifdef  _DEBUG_
-#define STATIC
-#else
-#define STATIC          static
-#endif
-
-/* reasons for enabling the timer interrupt on the adapter */
-#define TMR_INT_ENABLED_UDP     0x01
-#define TMR_INT_ENABLED_UPDATE  0x02
-#define TMR_INT_ENABLED_CONFIG  0x04
- 
-#define CHDLC_DFLT_DATA_LEN     1500            /* default MTU */
-#define CHDLC_HDR_LEN           1
-
-#define IFF_POINTTOPOINT 0x10
-
-#define CHDLC_API 0x01
-
-#define PORT(x)   (x == 0 ? "PRIMARY" : "SECONDARY" )
-#define MAX_BH_BUFF     10
-
-#define CRC_LENGTH      2 
-#define PPP_HEADER_LEN  4
- 
-/******Data Structures*****************************************************/
-
-/* This structure is placed in the private data area of the device structure.
- * The card structure used to occupy the private area but now the following 
- * structure will incorporate the card structure along with CHDLC specific data
- */
-
-typedef struct chdlc_private_area
-{
-        void *if_ptr;                           /* General Pointer used by SPPP */
-        wanpipe_common_t common;
-        sdla_t          *card;
-        int             TracingEnabled;         /* For enabling Tracing */
-        unsigned long   curr_trace_addr;        /* Used for Tracing */
-        unsigned long   start_trace_addr;
-        unsigned long   end_trace_addr;
-        unsigned long   base_addr_trace_buffer;
-        unsigned long   end_addr_trace_buffer;
-        unsigned short  number_trace_elements;
-        unsigned        available_buffer_space;
-        unsigned long   router_start_time;
-        unsigned char   route_status;
-        unsigned char   route_removed;
-        unsigned long   tick_counter;           /* For 5s timeout counter */
-        unsigned long   router_up_time;
-        u32             IP_address;             /* IP addressing */
-        u32             IP_netmask;
-        unsigned char  mc;                      /* Mulitcast support on/off */
-        unsigned short udp_pkt_lgth;            /* udp packet processing */
-        char udp_pkt_src;
-        char udp_pkt_data[MAX_LGTH_UDP_MGNT_PKT];
-        unsigned short timer_int_enabled;
-        char update_comms_stats;                /* updating comms stats */
-
-        //FIXME: add driver stats as per frame relay!
-
-} chdlc_private_area_t;
-
-/* Route Status options */
-#define NO_ROUTE        0x00
-#define ADD_ROUTE       0x01
-#define ROUTE_ADDED     0x02
-#define REMOVE_ROUTE    0x03
-
-
-/* variable for keeping track of enabling/disabling FT1 monitor status */
-static int rCount = 0;
-
-/* variable for tracking how many interfaces to open for WANPIPE on the
-   two ports */
-
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
-
-/****** Function Prototypes *************************************************/
-/* WAN link driver entry points. These are called by the WAN router module. */
-static int update(struct wan_device* wandev);
-static int new_if(struct wan_device* wandev, struct net_device* dev,
-                  wanif_conf_t* conf);
-static int del_if(struct wan_device* wandev, struct net_device* dev);
-
-/* Network device interface */
-static int if_init(struct net_device* dev);
-static int if_open(struct net_device* dev);
-static int if_close(struct net_device* dev);
-static int if_send(struct sk_buff* skb, struct net_device* dev);
-static struct net_device_stats* if_stats(struct net_device* dev);
-
-static void if_tx_timeout(struct net_device *dev);
-
-/* CHDLC Firmware interface functions */
-static int chdlc_configure      (sdla_t* card, void* data);
-static int chdlc_comm_enable    (sdla_t* card);
-static int chdlc_comm_disable   (sdla_t* card);
-static int chdlc_read_version   (sdla_t* card, char* str);
-static int chdlc_set_intr_mode  (sdla_t* card, unsigned mode);
-static int chdlc_send (sdla_t* card, void* data, unsigned len);
-static int chdlc_read_comm_err_stats (sdla_t* card);
-static int chdlc_read_op_stats (sdla_t* card);
-static int config_chdlc (sdla_t *card);
-
-
-/* Miscellaneous CHDLC Functions */
-static int set_chdlc_config (sdla_t* card);
-static void init_chdlc_tx_rx_buff(sdla_t* card, struct net_device *dev);
-static int chdlc_error (sdla_t *card, int err, CHDLC_MAILBOX_STRUCT *mb);
-static int process_chdlc_exception(sdla_t *card);
-static int process_global_exception(sdla_t *card);
-static int update_comms_stats(sdla_t* card,
-        chdlc_private_area_t* chdlc_priv_area);
-static void port_set_state (sdla_t *card, int);
-
-/* Interrupt handlers */
-static void wsppp_isr (sdla_t* card);
-static void rx_intr (sdla_t* card);
-static void timer_intr(sdla_t *);
-
-/* Miscellaneous functions */
-static int reply_udp( unsigned char *data, unsigned int mbox_len );
-static int intr_test( sdla_t* card);
-static int udp_pkt_type( struct sk_buff *skb , sdla_t* card);
-static int store_udp_mgmt_pkt(char udp_pkt_src, sdla_t* card,
-                              struct sk_buff *skb, struct net_device* dev,
-                              chdlc_private_area_t* chdlc_priv_area);
-static int process_udp_mgmt_pkt(sdla_t* card, struct net_device* dev,  
-                                chdlc_private_area_t* chdlc_priv_area);
-static unsigned short calc_checksum (char *, int);
-static void s508_lock (sdla_t *card, unsigned long *smp_flags);
-static void s508_unlock (sdla_t *card, unsigned long *smp_flags);
-static void send_ppp_term_request(struct net_device *dev);
-
-
-static int  Intr_test_counter;
-/****** Public Functions ****************************************************/
-
-/*============================================================================
- * Cisco HDLC protocol initialization routine.
- *
- * This routine is called by the main WANPIPE module during setup.  At this
- * point adapter is completely initialized and firmware is running.
- *  o read firmware version (to make sure it's alive)
- *  o configure adapter
- *  o initialize protocol-specific fields of the adapter data space.
- *
- * Return:      0       o.k.
- *              < 0     failure.
- */
-int wsppp_init (sdla_t* card, wandev_conf_t* conf)
-{
-        unsigned char port_num;
-        int err;
-        unsigned long max_permitted_baud = 0;
-        SHARED_MEMORY_INFO_STRUCT *flags;
-
-        union
-                {
-                char str[80];
-                } u;
-        volatile CHDLC_MAILBOX_STRUCT* mb;
-        CHDLC_MAILBOX_STRUCT* mb1;
-        unsigned long timeout;
-
-        /* Verify configuration ID */
-        if (conf->config_id != WANCONFIG_MPPP) {
-                printk(KERN_INFO "%s: invalid configuration ID %u!\n",
-                                  card->devname, conf->config_id);
-                return -EINVAL;
-        }
-
-        /* Find out which Port to use */
-        if ((conf->comm_port == WANOPT_PRI) || (conf->comm_port == WANOPT_SEC)){
-                if (card->next){
-
-                        if (conf->comm_port != card->next->u.c.comm_port){
-                                card->u.c.comm_port = conf->comm_port;
-                        }else{
-                                printk(KERN_ERR "%s: ERROR - %s port used!\n",
-                                        card->wandev.name, PORT(conf->comm_port));
-                                return -EINVAL;
-                        }
-                }else{
-                        card->u.c.comm_port = conf->comm_port;
-                }
-        }else{
-                printk(KERN_ERR "%s: ERROR - Invalid Port Selected!\n",
-                                        card->wandev.name);
-                return -EINVAL;
-        }
-        
-
-        /* Initialize protocol-specific fields */
-        if(card->hw.type != SDLA_S514){
-
-                if (card->u.c.comm_port == WANOPT_PRI){ 
-                        card->mbox  = (void *) card->hw.dpmbase;
-                }else{
-                        card->mbox  = (void *) card->hw.dpmbase + 
-                                SEC_BASE_ADDR_MB_STRUCT - PRI_BASE_ADDR_MB_STRUCT;
-                }       
-        }else{ 
-                /* for a S514 adapter, set a pointer to the actual mailbox in the */
-                /* allocated virtual memory area */
-                if (card->u.c.comm_port == WANOPT_PRI){
-                        card->mbox = (void *) card->hw.dpmbase + PRI_BASE_ADDR_MB_STRUCT;
-                }else{
-                        card->mbox = (void *) card->hw.dpmbase + SEC_BASE_ADDR_MB_STRUCT;
-                }       
-        }
-
-        mb = mb1 = card->mbox;
-
-        if (!card->configured){
-
-                /* The board will place an 'I' in the return code to indicate that it is
-                ready to accept commands.  We expect this to be completed in less
-                than 1 second. */
-
-                timeout = jiffies + 1 * HZ;
-                while (mb->return_code != 'I')  /* Wait 1s for board to initialize */
-                        if (time_after(jiffies, timeout)) break;
-
-                if (mb->return_code != 'I') {
-                        printk(KERN_INFO
-                                "%s: Initialization not completed by adapter\n",
-                                card->devname);
-                        printk(KERN_INFO "Please contact Sangoma representative.\n");
-                        return -EIO;
-                }
-        }
-
-        /* Read firmware version.  Note that when adapter initializes, it
-         * clears the mailbox, so it may appear that the first command was
-         * executed successfully when in fact it was merely erased. To work
-         * around this, we execute the first command twice.
-         */
-
-        if (chdlc_read_version(card, u.str))
-                return -EIO;
-
-        printk(KERN_INFO "%s: Running Raw CHDLC firmware v%s\n" 
-                         "%s: for Multi-Port PPP protocol.\n",
-                        card->devname,u.str,card->devname); 
-
-        card->isr                       = &wsppp_isr;
-        card->poll                      = NULL;
-        card->exec                      = NULL;
-        card->wandev.update             = &update;
-        card->wandev.new_if             = &new_if;
-        card->wandev.del_if             = &del_if;
-        card->wandev.udp_port           = conf->udp_port;
-
-        card->wandev.new_if_cnt = 0;
-
-        /* reset the number of times the 'update()' proc has been called */
-        card->u.c.update_call_count = 0;
-        
-        card->wandev.ttl = conf->ttl;
-        card->wandev.interface = conf->interface; 
-
-        if ((card->u.c.comm_port == WANOPT_SEC && conf->interface == WANOPT_V35)&&
-            card->hw.type != SDLA_S514){
-                printk(KERN_INFO "%s: ERROR - V35 Interface not supported on S508 %s port \n",
-                        card->devname, PORT(card->u.c.comm_port));
-                return -EIO;
-        }
-
-
-        card->wandev.clocking = conf->clocking;
-
-        port_num = card->u.c.comm_port;
-
-        /* Setup Port Bps */
-
-        if(card->wandev.clocking) {
-                if((port_num == WANOPT_PRI) || card->u.c.receive_only) {
-                        /* For Primary Port 0 */
-                        max_permitted_baud =
-                                (card->hw.type == SDLA_S514) ?
-                                PRI_MAX_BAUD_RATE_S514 : 
-                                PRI_MAX_BAUD_RATE_S508;
-                }
-                else if(port_num == WANOPT_SEC) {
-                        /* For Secondary Port 1 */
-                        max_permitted_baud =
-                               (card->hw.type == SDLA_S514) ?
-                                SEC_MAX_BAUD_RATE_S514 :
-                                SEC_MAX_BAUD_RATE_S508;
-                        }
-  
-                        if(conf->bps > max_permitted_baud) {
-                                conf->bps = max_permitted_baud;
-                                printk(KERN_INFO "%s: Baud too high!\n",
-                                        card->wandev.name);
-                                printk(KERN_INFO "%s: Baud rate set to %lu bps\n", 
-                                        card->wandev.name, max_permitted_baud);
-                        }
-                             
-                        card->wandev.bps = conf->bps;
-        }else{
-                card->wandev.bps = 0;
-        }
-
-        /* Setup the Port MTU */
-        if((port_num == WANOPT_PRI) || card->u.c.receive_only) {
-
-                /* For Primary Port 0 */
-                card->wandev.mtu =
-                        (conf->mtu >= MIN_LGTH_CHDLC_DATA_CFG) ?
-                        min_t(unsigned int, conf->mtu, PRI_MAX_NO_DATA_BYTES_IN_FRAME) :
-                        CHDLC_DFLT_DATA_LEN;
-        } else if(port_num == WANOPT_SEC) { 
-                /* For Secondary Port 1 */
-                card->wandev.mtu =
-                        (conf->mtu >= MIN_LGTH_CHDLC_DATA_CFG) ?
-                        min_t(unsigned int, conf->mtu, SEC_MAX_NO_DATA_BYTES_IN_FRAME) :
-                        CHDLC_DFLT_DATA_LEN;
-        }
-
-        /* Add on a PPP Header */
-        card->wandev.mtu += PPP_HEADER_LEN;
-
-        /* Set up the interrupt status area */
-        /* Read the CHDLC Configuration and obtain: 
-         *      Ptr to shared memory infor struct
-         * Use this pointer to calculate the value of card->u.c.flags !
-         */
-        mb1->buffer_length = 0;
-        mb1->command = READ_CHDLC_CONFIGURATION;
-        err = sdla_exec(mb1) ? mb1->return_code : CMD_TIMEOUT;
-        if(err != COMMAND_OK) {
-                clear_bit(1, (void*)&card->wandev.critical);
-
-                if(card->hw.type != SDLA_S514)
-                        enable_irq(card->hw.irq);
-
-                chdlc_error(card, err, mb1);
-                return -EIO;
-        }
-
-        if(card->hw.type == SDLA_S514){
-                card->u.c.flags = (void *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb1->data)->
-                        ptr_shared_mem_info_struct));
-        }else{
-                card->u.c.flags = (void *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb1->data)->
-                        ptr_shared_mem_info_struct % SDLA_WINDOWSIZE));
-        }
-        
-        flags = card->u.c.flags;
-        
-        /* This is for the ports link state */
-        card->wandev.state = WAN_DUALPORT;
-        card->u.c.state = WAN_DISCONNECTED;
-
-
-        if (!card->wandev.piggyback){
-                err = intr_test(card);
-
-                if(err || (Intr_test_counter < MAX_INTR_TEST_COUNTER)) { 
-                        printk(KERN_ERR "%s: Interrupt test failed (%i)\n",
-                                        card->devname, Intr_test_counter);
-                        printk(KERN_ERR "%s: Please choose another interrupt\n",
-                                        card->devname);
-                        return  -EIO;
-                }
-                        
-                printk(KERN_INFO "%s: Interrupt test passed (%i)\n", 
-                                card->devname, Intr_test_counter);
-        }
-
-
-        if (chdlc_set_intr_mode(card, APP_INT_ON_TIMER)){
-                printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
-                                card->devname);
-                return -EIO;    
-        }
-        
-        /* Mask the Timer interrupt */
-        flags->interrupt_info_struct.interrupt_permission &= 
-                ~APP_INT_ON_TIMER;
-
-        printk(KERN_INFO "\n");
-
-        return 0;
-}
-
-/******* WAN Device Driver Entry Points *************************************/
-
-/*============================================================================
- * Update device status & statistics
- * This procedure is called when updating the PROC file system and returns
- * various communications statistics. These statistics are accumulated from 3 
- * different locations:
- *      1) The 'if_stats' recorded for the device.
- *      2) Communication error statistics on the adapter.
- *      3) CHDLC operational statistics on the adapter.
- * The board level statistics are read during a timer interrupt. Note that we 
- * read the error and operational statistics during consecitive timer ticks so
- * as to minimize the time that we are inside the interrupt handler.
- *
- */
-static int update(struct wan_device* wandev)
-{
-        sdla_t* card = wandev->private;
-        struct net_device* dev;
-        volatile chdlc_private_area_t* chdlc_priv_area;
-        SHARED_MEMORY_INFO_STRUCT *flags;
-        unsigned long timeout;
-
-        /* sanity checks */
-        if((wandev == NULL) || (wandev->private == NULL))
-                return -EFAULT;
-        
-        if(wandev->state == WAN_UNCONFIGURED)
-                return -ENODEV;
-
-        /* more sanity checks */
-        if(!card->u.c.flags)
-                return -ENODEV;
-
-        if((dev=card->wandev.dev) == NULL)
-                return -ENODEV;
-
-        if((chdlc_priv_area=dev->priv) == NULL)
-                return -ENODEV;
-
-        flags = card->u.c.flags;
-
-        if(chdlc_priv_area->update_comms_stats){
-                return -EAGAIN;
-        }
-                        
-        /* we will need 2 timer interrupts to complete the */
-        /* reading of the statistics */
-        chdlc_priv_area->update_comms_stats = 2;
-        flags->interrupt_info_struct.interrupt_permission |= APP_INT_ON_TIMER;
-        chdlc_priv_area->timer_int_enabled = TMR_INT_ENABLED_UPDATE;
-  
-        /* wait a maximum of 1 second for the statistics to be updated */ 
-        timeout = jiffies + 1 * HZ;
-        for(;;) {
-                if(chdlc_priv_area->update_comms_stats == 0)
-                        break;
-                if (time_after(jiffies, timeout)){
-                        chdlc_priv_area->update_comms_stats = 0;
-                        chdlc_priv_area->timer_int_enabled &=
-                                ~TMR_INT_ENABLED_UPDATE; 
-                        return -EAGAIN;
-                }
-        }
-
-        return 0;
-}
-
-
-/*============================================================================
- * Create new logical channel.
- * This routine is called by the router when ROUTER_IFNEW IOCTL is being
- * handled.
- * o parse media- and hardware-specific configuration
- * o make sure that a new channel can be created
- * o allocate resources, if necessary
- * o prepare network device structure for registaration.
- *
- * Return:      0       o.k.
- *              < 0     failure (channel will not be created)
- */
-static int new_if(struct wan_device* wandev, struct net_device* pdev,
-                  wanif_conf_t* conf)
-{
-
-        struct ppp_device *pppdev = (struct ppp_device *)pdev;
-        struct net_device *dev = NULL;
-        struct sppp *sp;
-        sdla_t* card = wandev->private;
-        chdlc_private_area_t* chdlc_priv_area;
-        
-        if ((conf->name[0] == '\0') || (strlen(conf->name) > WAN_IFNAME_SZ)) {
-                printk(KERN_INFO "%s: invalid interface name!\n",
-                        card->devname);
-                return -EINVAL;
-        }
-                
-        /* allocate and initialize private data */
-        chdlc_priv_area = kmalloc(sizeof(chdlc_private_area_t), GFP_KERNEL);
-        
-        if(chdlc_priv_area == NULL) 
-                return -ENOMEM;
-
-        memset(chdlc_priv_area, 0, sizeof(chdlc_private_area_t));
-
-        chdlc_priv_area->card = card; 
-
-        /* initialize data */
-        strcpy(card->u.c.if_name, conf->name);
-
-        if(card->wandev.new_if_cnt > 0) {
-                kfree(chdlc_priv_area);
-                return -EEXIST;
-        }
-
-        card->wandev.new_if_cnt++;
-
-        chdlc_priv_area->TracingEnabled = 0;
-
-        //We don't need this any more
-        chdlc_priv_area->route_status = NO_ROUTE;
-        chdlc_priv_area->route_removed = 0;
-
-        printk(KERN_INFO "%s: Firmware running in HDLC STREAMING Mode\n",
-                wandev->name);
-        
-        /* Setup wanpipe as a router (WANPIPE) or as an API */
-        if( strcmp(conf->usedby, "WANPIPE") == 0) {
-                printk(KERN_INFO "%s: Driver running in WANPIPE mode!\n",
-                        wandev->name);
-                card->u.c.usedby = WANPIPE;
-        } else {
-                printk(KERN_INFO 
-                        "%s: API Mode is not supported for SyncPPP!\n",
-                        wandev->name);
-                kfree(chdlc_priv_area);
-                return -EINVAL;
-        }
-
-        /* Get Multicast Information */
-        chdlc_priv_area->mc = conf->mc;
-
-
-        chdlc_priv_area->if_ptr = pppdev;
-
-        /* prepare network device data space for registration */
-
-        strcpy(dev->name,card->u.c.if_name);
-
-        /* Attach PPP protocol layer to pppdev
-         * The sppp_attach() will initilize the dev structure
-         * and setup ppp layer protocols.
-         * All we have to do is to bind in:
-         *        if_open(), if_close(), if_send() and get_stats() functions.
-         */
-        sppp_attach(pppdev);
-        dev = pppdev->dev;
-        sp = &pppdev->sppp;
-        
-        /* Enable PPP Debugging */
-        // FIXME Fix this up somehow
-        //sp->pp_flags |= PP_DEBUG;     
-        sp->pp_flags &= ~PP_CISCO;
-
-        dev->init = &if_init;
-        dev->priv = chdlc_priv_area;
-        
-        return 0;
-}
-
-
-
-
-/*============================================================================
- * Delete logical channel.
- */
-static int del_if(struct wan_device* wandev, struct net_device* dev)
-{
-        chdlc_private_area_t *chdlc_priv_area = dev->priv;
-        sdla_t *card = chdlc_priv_area->card;
-        unsigned long smp_lock;
-        
-        /* Detach the PPP layer */
-        printk(KERN_INFO "%s: Detaching SyncPPP Module from %s\n",
-                        wandev->name,dev->name);
-
-        lock_adapter_irq(&wandev->lock,&smp_lock);
-
-        sppp_detach(dev);
-        chdlc_priv_area->if_ptr=NULL;
-        
-        chdlc_set_intr_mode(card, 0);
-        if (card->u.c.comm_enabled)
-                chdlc_comm_disable(card);
-        unlock_adapter_irq(&wandev->lock,&smp_lock);
-        
-        port_set_state(card, WAN_DISCONNECTED);
-
-        return 0;
-}
-
-
-/****** Network Device Interface ********************************************/
-
-/*============================================================================
- * Initialize Linux network interface.
- *
- * This routine is called only once for each interface, during Linux network
- * interface registration.  Returning anything but zero will fail interface
- * registration.
- */
-static int if_init(struct net_device* dev)
-{
-        chdlc_private_area_t* chdlc_priv_area = dev->priv;
-        sdla_t* card = chdlc_priv_area->card;
-        struct wan_device* wandev = &card->wandev;
-        
-        /* NOTE: Most of the dev initialization was
-         *       done in sppp_attach(), called by new_if() 
-         *       function. All we have to do here is
-         *       to link four major routines below. 
-         */
-
-        /* Initialize device driver entry points */
-        dev->open               = &if_open;
-        dev->stop               = &if_close;
-        dev->hard_start_xmit    = &if_send;
-        dev->get_stats          = &if_stats;
-        dev->tx_timeout         = &if_tx_timeout;
-        dev->watchdog_timeo     = TX_TIMEOUT;
-
-
-        /* Initialize hardware parameters */
-        dev->irq        = wandev->irq;
-        dev->dma        = wandev->dma;
-        dev->base_addr  = wandev->ioport;
-        dev->mem_start  = wandev->maddr;
-        dev->mem_end    = wandev->maddr + wandev->msize - 1;
-
-        /* Set transmit buffer queue length 
-         * If we over fill this queue the packets will
-         * be droped by the kernel.
-         * sppp_attach() sets this to 10, but
-         * 100 will give us more room at low speeds.
-         */
-        dev->tx_queue_len = 100;
-   
-        return 0;
-}
-
-
-/*============================================================================
- * Handle transmit timeout event from netif watchdog
- */
-static void if_tx_timeout(struct net_device *dev)
-{
-        chdlc_private_area_t* chan = dev->priv;
-        sdla_t *card = chan->card;
-        
-        /* If our device stays busy for at least 5 seconds then we will
-         * kick start the device by making dev->tbusy = 0.  We expect
-         * that our device never stays busy more than 5 seconds. So this                 
-         * is only used as a last resort.
-         */
-
-        ++card->wandev.stats.collisions;
-
-        printk (KERN_INFO "%s: Transmit timed out on %s\n", card->devname,dev->name);
-        netif_wake_queue (dev);
-}
-
-
-/*============================================================================
- * Open network interface.
- * o enable communications and interrupts.
- * o prevent module from unloading by incrementing use count
- *
- * Return 0 if O.k. or errno.
- */
-static int if_open(struct net_device* dev)
-{
-        chdlc_private_area_t* chdlc_priv_area = dev->priv;
-        sdla_t* card = chdlc_priv_area->card;
-        struct timeval tv;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-
-        /* Only one open per interface is allowed */
-        if (netif_running(dev))
-                return -EBUSY;
-
-        /* Start PPP Layer */
-        if (sppp_open(dev)){
-                return -EIO;
-        }
-
-        do_gettimeofday(&tv);
-        chdlc_priv_area->router_start_time = tv.tv_sec;
- 
-        netif_start_queue(dev);
-        
-        wanpipe_open(card);
-
-        chdlc_priv_area->timer_int_enabled |= TMR_INT_ENABLED_CONFIG;
-        flags->interrupt_info_struct.interrupt_permission |= APP_INT_ON_TIMER;
-        return 0;
-}
-
-/*============================================================================
- * Close network interface.
- * o if this is the last close, then disable communications and interrupts.
- * o reset flags.
- */
-static int if_close(struct net_device* dev)
-{
-        chdlc_private_area_t* chdlc_priv_area = dev->priv;
-        sdla_t* card = chdlc_priv_area->card;
-
-        /* Stop the PPP Layer */
-        sppp_close(dev);
-        netif_stop_queue(dev);
-
-        wanpipe_close(card);
-        
-        return 0;
-}
-
-/*============================================================================
- * Send a packet on a network interface.
- * o set tbusy flag (marks start of the transmission) to block a timer-based
- *   transmit from overlapping.
- * o check link state. If link is not up, then drop the packet.
- * o execute adapter send command.
- * o free socket buffer
- *
- * Return:      0       complete (socket buffer must be freed)
- *              non-0   packet may be re-transmitted (tbusy must be set)
- *
- * Notes:
- * 1. This routine is called either by the protocol stack or by the "net
- *    bottom half" (with interrupts enabled).
- * 2. Setting tbusy flag will inhibit further transmit requests from the
- *    protocol stack and can be used for flow control with protocol layer.
- */
-static int if_send(struct sk_buff* skb, struct net_device* dev)
-{
-        chdlc_private_area_t *chdlc_priv_area = dev->priv;
-        sdla_t *card = chdlc_priv_area->card;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        INTERRUPT_INFORMATION_STRUCT *chdlc_int = &flags->interrupt_info_struct;
-        int udp_type = 0;
-        unsigned long smp_flags;
-        int err=0;
-
-        netif_stop_queue(dev);
-
-        
-        if (skb == NULL){
-                /* If we get here, some higher layer thinks we've missed an
-                 * tx-done interrupt.
-                 */
-                printk(KERN_INFO "%s: Received NULL skb buffer! interface %s got kicked!\n",
-                        card->devname, dev->name);
-
-                netif_wake_queue(dev);
-                return 0;
-        }
-
-        if (ntohs(skb->protocol) != htons(PVC_PROT)){
-                /* check the udp packet type */
-                
-                udp_type = udp_pkt_type(skb, card);
-                if (udp_type == UDP_CPIPE_TYPE){
-                        if(store_udp_mgmt_pkt(UDP_PKT_FRM_STACK, card, skb, dev,
-                                chdlc_priv_area)){
-                                chdlc_int->interrupt_permission |=
-                                        APP_INT_ON_TIMER;
-                        }
-                        netif_start_queue(dev);
-                        return 0;
-                }
-        }
-
-        /* Lock the 508 Card: SMP is supported */
-        if(card->hw.type != SDLA_S514){
-                s508_lock(card,&smp_flags);
-        } 
-
-        if (test_and_set_bit(SEND_CRIT, (void*)&card->wandev.critical)){
-        
-                printk(KERN_INFO "%s: Critical in if_send: %lx\n",
-                                        card->wandev.name,card->wandev.critical);
-                ++card->wandev.stats.tx_dropped;
-                netif_start_queue(dev);
-                goto if_send_crit_exit;
-        }
-
-        if (card->wandev.state != WAN_CONNECTED){
-                ++card->wandev.stats.tx_dropped;
-                netif_start_queue(dev);
-                goto if_send_crit_exit;
-        }
-        
-        if (chdlc_send(card, skb->data, skb->len)){
-                netif_stop_queue(dev);
-
-        }else{
-                ++card->wandev.stats.tx_packets;
-                card->wandev.stats.tx_bytes += skb->len;
-                dev->trans_start = jiffies;
-                netif_start_queue(dev);
-        }       
-
-if_send_crit_exit:
-        if (!(err=netif_queue_stopped(dev))){
-                dev_kfree_skb_any(skb);
-        }else{
-                chdlc_priv_area->tick_counter = jiffies;
-                chdlc_int->interrupt_permission |= APP_INT_ON_TX_FRAME;
-        }
-
-        clear_bit(SEND_CRIT, (void*)&card->wandev.critical);
-        if(card->hw.type != SDLA_S514){
-                s508_unlock(card,&smp_flags);
-        }
-
-        return err;
-}
-
-
-/*============================================================================
- * Reply to UDP Management system.
- * Return length of reply.
- */
-static int reply_udp( unsigned char *data, unsigned int mbox_len )
-{
-
-        unsigned short len, udp_length, temp, ip_length;
-        unsigned long ip_temp;
-        int even_bound = 0;
-        chdlc_udp_pkt_t *c_udp_pkt = (chdlc_udp_pkt_t *)data;
-         
-        /* Set length of packet */
-        len = sizeof(ip_pkt_t)+ 
-              sizeof(udp_pkt_t)+
-              sizeof(wp_mgmt_t)+
-              sizeof(cblock_t)+
-              sizeof(trace_info_t)+ 
-              mbox_len;
-
-        /* fill in UDP reply */
-        c_udp_pkt->wp_mgmt.request_reply = UDPMGMT_REPLY;
-   
-        /* fill in UDP length */
-        udp_length = sizeof(udp_pkt_t)+ 
-                     sizeof(wp_mgmt_t)+
-                     sizeof(cblock_t)+
-                     sizeof(trace_info_t)+
-                     mbox_len; 
-
-        /* put it on an even boundary */
-        if ( udp_length & 0x0001 ) {
-                udp_length += 1;
-                len += 1;
-                even_bound = 1;
-        }  
-
-        temp = (udp_length<<8)|(udp_length>>8);
-        c_udp_pkt->udp_pkt.udp_length = temp;
-                 
-        /* swap UDP ports */
-        temp = c_udp_pkt->udp_pkt.udp_src_port;
-        c_udp_pkt->udp_pkt.udp_src_port = 
-                        c_udp_pkt->udp_pkt.udp_dst_port; 
-        c_udp_pkt->udp_pkt.udp_dst_port = temp;
-
-        /* add UDP pseudo header */
-        temp = 0x1100;
-        *((unsigned short *)(c_udp_pkt->data+mbox_len+even_bound)) = temp;      
-        temp = (udp_length<<8)|(udp_length>>8);
-        *((unsigned short *)(c_udp_pkt->data+mbox_len+even_bound+2)) = temp;
-
-                 
-        /* calculate UDP checksum */
-        c_udp_pkt->udp_pkt.udp_checksum = 0;
-        c_udp_pkt->udp_pkt.udp_checksum = calc_checksum(&data[UDP_OFFSET],udp_length+UDP_OFFSET);
-
-        /* fill in IP length */
-        ip_length = len;
-        temp = (ip_length<<8)|(ip_length>>8);
-        c_udp_pkt->ip_pkt.total_length = temp;
-  
-        /* swap IP addresses */
-        ip_temp = c_udp_pkt->ip_pkt.ip_src_address;
-        c_udp_pkt->ip_pkt.ip_src_address = c_udp_pkt->ip_pkt.ip_dst_address;
-        c_udp_pkt->ip_pkt.ip_dst_address = ip_temp;
-
-        /* fill in IP checksum */
-        c_udp_pkt->ip_pkt.hdr_checksum = 0;
-        c_udp_pkt->ip_pkt.hdr_checksum = calc_checksum(data,sizeof(ip_pkt_t));
-
-        return len;
-
-} /* reply_udp */
-
-unsigned short calc_checksum (char *data, int len)
-{
-        unsigned short temp; 
-        unsigned long sum=0;
-        int i;
-
-        for( i = 0; i <len; i+=2 ) {
-                memcpy(&temp,&data[i],2);
-                sum += (unsigned long)temp;
-        }
-
-        while (sum >> 16 ) {
-                sum = (sum & 0xffffUL) + (sum >> 16);
-        }
-
-        temp = (unsigned short)sum;
-        temp = ~temp;
-
-        if( temp == 0 ) 
-                temp = 0xffff;
-
-        return temp;    
-}
-
-
-/*============================================================================
- * Get ethernet-style interface statistics.
- * Return a pointer to struct enet_statistics.
- */
-static struct net_device_stats* if_stats(struct net_device* dev)
-{
-        sdla_t *my_card;
-        chdlc_private_area_t* chdlc_priv_area;
-
-        /* Shutdown bug fix. In del_if() we kill
-         * dev->priv pointer. This function, gets
-         * called after del_if(), thus check
-         * if pointer has been deleted */
-        if ((chdlc_priv_area=dev->priv) == NULL)
-                return NULL;
-
-        my_card = chdlc_priv_area->card;
-        return &my_card->wandev.stats; 
-}
-
-
-/****** Cisco HDLC Firmware Interface Functions *******************************/
-
-/*============================================================================
- * Read firmware code version.
- *      Put code version as ASCII string in str. 
- */
-static int chdlc_read_version (sdla_t* card, char* str)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        int len;
-        char err;
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_CODE_VERSION;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-        if(err != COMMAND_OK) {
-                chdlc_error(card,err,mb);
-        }
-        else if (str) {  /* is not null */
-                len = mb->buffer_length;
-                memcpy(str, mb->data, len);
-                str[len] = '\0';
-        }
-        return (err);
-}
-
-/*-----------------------------------------------------------------------------
- *  Configure CHDLC firmware.
- */
-static int chdlc_configure (sdla_t* card, void* data)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT *mailbox = card->mbox;
-        int data_length = sizeof(CHDLC_CONFIGURATION_STRUCT);
-        
-        mailbox->buffer_length = data_length;  
-        memcpy(mailbox->data, data, data_length);
-        mailbox->command = SET_CHDLC_CONFIGURATION;
-        err = sdla_exec(mailbox) ? mailbox->return_code : CMD_TIMEOUT;
-        
-        if (err != COMMAND_OK) chdlc_error (card, err, mailbox);
-                           
-        return err;
-}
-
-
-/*============================================================================
- * Set interrupt mode -- HDLC Version.
- */
-
-static int chdlc_set_intr_mode (sdla_t* card, unsigned mode)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        CHDLC_INT_TRIGGERS_STRUCT* int_data =
-                 (CHDLC_INT_TRIGGERS_STRUCT *)mb->data;
-        int err;
-
-        int_data->CHDLC_interrupt_triggers      = mode;
-        int_data->IRQ                           = card->hw.irq;
-        int_data->interrupt_timer               = 1;
-   
-        mb->buffer_length = sizeof(CHDLC_INT_TRIGGERS_STRUCT);
-        mb->command = SET_CHDLC_INTERRUPT_TRIGGERS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error (card, err, mb);
-        return err;
-}
-
-
-/*============================================================================
- * Enable communications.
- */
-
-static int chdlc_comm_enable (sdla_t* card)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = ENABLE_CHDLC_COMMUNICATIONS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error(card, err, mb);
-        else
-                card->u.c.comm_enabled=1;
-
-        return err;
-}
-
-/*============================================================================
- * Disable communications and Drop the Modem lines (DCD and RTS).
- */
-static int chdlc_comm_disable (sdla_t* card)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = DISABLE_CHDLC_COMMUNICATIONS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error(card,err,mb);
-
-        return err;
-}
-
-/*============================================================================
- * Read communication error statistics.
- */
-static int chdlc_read_comm_err_stats (sdla_t* card)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = READ_COMMS_ERROR_STATS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error(card,err,mb);
-        return err;
-}
-
-
-/*============================================================================
- * Read CHDLC operational statistics.
- */
-static int chdlc_read_op_stats (sdla_t* card)
-{
-        int err;
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_OPERATIONAL_STATS;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if (err != COMMAND_OK)
-                chdlc_error(card,err,mb);
-        return err;
-}
-
-
-/*============================================================================
- * Update communications error and general packet statistics.
- */
-static int update_comms_stats(sdla_t* card,
-        chdlc_private_area_t* chdlc_priv_area)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        COMMS_ERROR_STATS_STRUCT* err_stats;
-        CHDLC_OPERATIONAL_STATS_STRUCT *op_stats;
-
-        /* on the first timer interrupt, read the comms error statistics */
-        if(chdlc_priv_area->update_comms_stats == 2) {
-                if(chdlc_read_comm_err_stats(card))
-                        return 1;
-                err_stats = (COMMS_ERROR_STATS_STRUCT *)mb->data;
-                card->wandev.stats.rx_over_errors = 
-                                err_stats->Rx_overrun_err_count;
-                card->wandev.stats.rx_crc_errors = 
-                                err_stats->CRC_err_count;
-                card->wandev.stats.rx_frame_errors = 
-                                err_stats->Rx_abort_count;
-                card->wandev.stats.rx_fifo_errors = 
-                                err_stats->Rx_dis_pri_bfrs_full_count; 
-                card->wandev.stats.rx_missed_errors =
-                                card->wandev.stats.rx_fifo_errors;
-                card->wandev.stats.tx_aborted_errors =
-                                err_stats->sec_Tx_abort_count;
-        }
-
-        /* on the second timer interrupt, read the operational statistics */
-        else {
-                if(chdlc_read_op_stats(card))
-                        return 1;
-                op_stats = (CHDLC_OPERATIONAL_STATS_STRUCT *)mb->data;
-                card->wandev.stats.rx_length_errors =
-                        (op_stats->Rx_Data_discard_short_count +
-                        op_stats->Rx_Data_discard_long_count);
-        }
-
-        return 0;
-}
-
-/*============================================================================
- * Send packet.
- *      Return: 0 - o.k.
- *              1 - no transmit buffers available
- */
-static int chdlc_send (sdla_t* card, void* data, unsigned len)
-{
-        CHDLC_DATA_TX_STATUS_EL_STRUCT *txbuf = card->u.c.txbuf;
-
-        if (txbuf->opp_flag)
-                return 1;
-        
-        sdla_poke(&card->hw, txbuf->ptr_data_bfr, data, len);
-
-        txbuf->frame_length = len;
-        txbuf->opp_flag = 1;            /* start transmission */
-        
-        /* Update transmit buffer control fields */
-        card->u.c.txbuf = ++txbuf;
-
-        if ((void*)txbuf > card->u.c.txbuf_last)
-                card->u.c.txbuf = card->u.c.txbuf_base;
-
-        return 0;
-}
-
-/****** Firmware Error Handler **********************************************/
-
-/*============================================================================
- * Firmware error handler.
- *      This routine is called whenever firmware command returns non-zero
- *      return code.
- *
- * Return zero if previous command has to be cancelled.
- */
-static int chdlc_error (sdla_t *card, int err, CHDLC_MAILBOX_STRUCT *mb)
-{
-        unsigned cmd = mb->command;
-
-        switch (err) {
-
-        case CMD_TIMEOUT:
-                printk(KERN_ERR "%s: command 0x%02X timed out!\n",
-                        card->devname, cmd);
-                break;
-
-        case S514_BOTH_PORTS_SAME_CLK_MODE:
-                if(cmd == SET_CHDLC_CONFIGURATION) {
-                        printk(KERN_INFO
-                         "%s: Configure both ports for the same clock source\n",
-                                card->devname);
-                        break;
-                }
-
-        default:
-                printk(KERN_INFO "%s: command 0x%02X returned 0x%02X!\n",
-                        card->devname, cmd, err);
-        }
-
-        return 0;
-}
-
-/****** Interrupt Handlers **************************************************/
-
-/*============================================================================
- * Cisco HDLC interrupt service routine.
- */
-STATIC void wsppp_isr (sdla_t* card)
-{
-        struct net_device* dev;
-        SHARED_MEMORY_INFO_STRUCT* flags = NULL;
-        int i;
-        sdla_t *my_card;
-
-
-        /* Check for which port the interrupt has been generated
-         * Since Secondary Port is piggybacking on the Primary
-         * the check must be done here. 
-         */
-
-        flags = card->u.c.flags;
-        if (!flags->interrupt_info_struct.interrupt_type){
-                /* Check for a second port (piggybacking) */
-                if((my_card = card->next)){
-                        flags = my_card->u.c.flags;
-                        if (flags->interrupt_info_struct.interrupt_type){
-                                card = my_card;
-                                card->isr(card);
-                                return;
-                        }
-                }
-        }
-
-        dev = card->wandev.dev;
-        card->in_isr = 1;
-        flags = card->u.c.flags;
-                
-        /* If we get an interrupt with no network device, stop the interrupts
-         * and issue an error */
-        if ((!dev || !dev->priv) && flags->interrupt_info_struct.interrupt_type != 
-                COMMAND_COMPLETE_APP_INT_PEND){
-                goto isr_done;
-        }
-
-        
-        /* if critical due to peripheral operations
-         * ie. update() or getstats() then reset the interrupt and
-         * wait for the board to retrigger.
-         */
-        if(test_bit(PERI_CRIT, (void*)&card->wandev.critical)) {
-                flags->interrupt_info_struct.
-                                        interrupt_type = 0;
-                goto isr_done;
-        }
-
-
-        /* On a 508 Card, if critical due to if_send 
-         * Major Error !!!
-         */
-        if(card->hw.type != SDLA_S514) {
-                if(test_bit(0, (void*)&card->wandev.critical)) {
-                        printk(KERN_INFO "%s: Critical while in ISR: %lx\n",
-                                card->devname, card->wandev.critical);
-                        goto isr_done;
-                }
-        }
-
-        switch(flags->interrupt_info_struct.interrupt_type) {
-
-                case RX_APP_INT_PEND:   /* 0x01: receive interrupt */
-                        rx_intr(card);
-                        break;
-
-                case TX_APP_INT_PEND:   /* 0x02: transmit interrupt */
-                        flags->interrupt_info_struct.interrupt_permission &=
-                                 ~APP_INT_ON_TX_FRAME;
-
-                        netif_wake_queue(dev);
-                        break;
-
-                case COMMAND_COMPLETE_APP_INT_PEND:/* 0x04: cmd cplt */
-                        ++ Intr_test_counter;
-                        break;
-
-                case CHDLC_EXCEP_COND_APP_INT_PEND:     /* 0x20 */
-                        process_chdlc_exception(card);
-                        break;
-
-                case GLOBAL_EXCEP_COND_APP_INT_PEND:
-                        process_global_exception(card);
-                        break;
-
-                case TIMER_APP_INT_PEND:
-                        timer_intr(card);
-                        break;
-
-                default:
-                        printk(KERN_INFO "%s: spurious interrupt 0x%02X!\n", 
-                                card->devname,
-                                flags->interrupt_info_struct.interrupt_type);
-                        printk(KERN_INFO "Code name: ");
-                        for(i = 0; i < 4; i ++)
-                                printk(KERN_INFO "%c",
-                                        flags->global_info_struct.codename[i]); 
-                        printk(KERN_INFO "\nCode version: ");
-                        for(i = 0; i < 4; i ++)
-                                printk(KERN_INFO "%c", 
-                                        flags->global_info_struct.codeversion[i]); 
-                        printk(KERN_INFO "\n"); 
-                        break;
-        }
-
-isr_done:
-        card->in_isr = 0;
-        flags->interrupt_info_struct.interrupt_type = 0;
-}
-
-/*============================================================================
- * Receive interrupt handler.
- */
-static void rx_intr (sdla_t* card)
-{
-        struct net_device *dev;
-        chdlc_private_area_t *chdlc_priv_area;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        CHDLC_DATA_RX_STATUS_EL_STRUCT *rxbuf = card->u.c.rxmb;
-        struct sk_buff *skb;
-        unsigned len;
-        unsigned addr = rxbuf->ptr_data_bfr;
-        void *buf;
-        int i,udp_type;
-        
-        if (rxbuf->opp_flag != 0x01) {
-                printk(KERN_INFO 
-                        "%s: corrupted Rx buffer @ 0x%X, flag = 0x%02X!\n", 
-                        card->devname, (unsigned)rxbuf, rxbuf->opp_flag);
-                printk(KERN_INFO "Code name: ");
-                for(i = 0; i < 4; i ++)
-                        printk(KERN_INFO "%c",
-                                flags->global_info_struct.codename[i]);
-                printk(KERN_INFO "\nCode version: ");
-                for(i = 0; i < 4; i ++)
-                        printk(KERN_INFO "%c",
-                                flags->global_info_struct.codeversion[i]);
-                printk(KERN_INFO "\n");
-
-
-                /* Bug Fix: Mar 6 2000
-                 * If we get a corrupted mailbox, it measn that driver 
-                 * is out of sync with the firmware. There is no recovery.
-                 * If we don't turn off all interrupts for this card
-                 * the machine will crash. 
-                 */
-                printk(KERN_INFO "%s: Critical router failure ...!!!\n", card->devname);
-                printk(KERN_INFO "Please contact Sangoma Technologies !\n");
-                chdlc_set_intr_mode(card,0);    
-                return;
-        }
-
-        dev = card->wandev.dev;
-
-        if (!dev){ 
-                goto rx_exit;
-        }
-        
-        if (!netif_running(dev)){
-                goto rx_exit;
-        }
-
-        chdlc_priv_area = dev->priv;
-
-        if (rxbuf->error_flag){ 
-                goto rx_exit;
-        }
-        /* Take off two CRC bytes */
-
-        if (rxbuf->frame_length < 7 || rxbuf->frame_length > 1506 ){
-                goto rx_exit;
-        }       
-
-        len = rxbuf->frame_length - CRC_LENGTH;
-
-        /* Allocate socket buffer */
-        skb = dev_alloc_skb(len);
-
-        if (skb == NULL) {
-                if (net_ratelimit()){
-                        printk(KERN_INFO "%s: no socket buffers available!\n",
-                                                card->devname);
-                }
-                ++card->wandev.stats.rx_dropped;
-                goto rx_exit;
-        }
-
-        /* Copy data to the socket buffer */
-        if((addr + len) > card->u.c.rx_top + 1) {
-                unsigned tmp = card->u.c.rx_top - addr + 1;
-                buf = skb_put(skb, tmp);
-                sdla_peek(&card->hw, addr, buf, tmp);
-                addr = card->u.c.rx_base;
-                len -= tmp;
-        }
-                
-        buf = skb_put(skb, len);
-        sdla_peek(&card->hw, addr, buf, len);
-
-        skb->protocol = htons(ETH_P_WAN_PPP);
-
-        card->wandev.stats.rx_packets ++;
-        card->wandev.stats.rx_bytes += skb->len;
-        udp_type = udp_pkt_type( skb, card );
-
-        if(udp_type == UDP_CPIPE_TYPE) {
-                if(store_udp_mgmt_pkt(UDP_PKT_FRM_NETWORK,
-                                      card, skb, dev, chdlc_priv_area)) {
-                        flags->interrupt_info_struct.
-                                                interrupt_permission |= 
-                                                        APP_INT_ON_TIMER; 
-                }
-        }else{
-                /* Pass it up the protocol stack */
-                skb->dev = dev;
-                skb->mac.raw  = skb->data;
-                netif_rx(skb);
-                dev->last_rx = jiffies;
-        }
-
-rx_exit:
-        /* Release buffer element and calculate a pointer to the next one */
-        rxbuf->opp_flag = 0x00;
-        card->u.c.rxmb = ++ rxbuf;
-        if((void*)rxbuf > card->u.c.rxbuf_last){
-                card->u.c.rxmb = card->u.c.rxbuf_base;
-        }
-}
-
-/*============================================================================
- * Timer interrupt handler.
- * The timer interrupt is used for two purposes:
- *    1) Processing udp calls from 'cpipemon'.
- *    2) Reading board-level statistics for updating the proc file system.
- */
-void timer_intr(sdla_t *card)
-{
-        struct net_device* dev;
-        chdlc_private_area_t* chdlc_priv_area = NULL;
-        SHARED_MEMORY_INFO_STRUCT* flags = NULL;
-
-        dev = card->wandev.dev; 
-        chdlc_priv_area = dev->priv;
-
-        if (chdlc_priv_area->timer_int_enabled & TMR_INT_ENABLED_CONFIG) {
-                if (!config_chdlc(card)){
-                        chdlc_priv_area->timer_int_enabled &= ~TMR_INT_ENABLED_CONFIG;
-                }
-        }
-        
-        /* process a udp call if pending */
-        if(chdlc_priv_area->timer_int_enabled & TMR_INT_ENABLED_UDP) {
-                process_udp_mgmt_pkt(card, dev,
-                       chdlc_priv_area);
-                chdlc_priv_area->timer_int_enabled &= ~TMR_INT_ENABLED_UDP;
-        }
-        
-
-        /* read the communications statistics if required */
-        if(chdlc_priv_area->timer_int_enabled & TMR_INT_ENABLED_UPDATE) {
-                update_comms_stats(card, chdlc_priv_area);
-                if(!(-- chdlc_priv_area->update_comms_stats)) {
-                        chdlc_priv_area->timer_int_enabled &= 
-                                ~TMR_INT_ENABLED_UPDATE;
-                }
-        }
-
-        /* only disable the timer interrupt if there are no udp or statistic */
-        /* updates pending */
-        if(!chdlc_priv_area->timer_int_enabled) {
-                flags = card->u.c.flags;
-                flags->interrupt_info_struct.interrupt_permission &=
-                        ~APP_INT_ON_TIMER;
-        }
-}
-
-/*------------------------------------------------------------------------------
-  Miscellaneous Functions
-        - set_chdlc_config() used to set configuration options on the board
-------------------------------------------------------------------------------*/
-
-static int set_chdlc_config(sdla_t* card)
-{
-
-        CHDLC_CONFIGURATION_STRUCT cfg;
-
-        memset(&cfg, 0, sizeof(CHDLC_CONFIGURATION_STRUCT));
-
-        if(card->wandev.clocking)
-                cfg.baud_rate = card->wandev.bps;
-
-        cfg.line_config_options = (card->wandev.interface == WANOPT_RS232) ?
-                INTERFACE_LEVEL_RS232 : INTERFACE_LEVEL_V35;
-
-        cfg.modem_config_options        = 0;
-        //API OPTIONS
-        cfg.CHDLC_API_options           = DISCARD_RX_ERROR_FRAMES;
-        cfg.modem_status_timer          = 100;
-        cfg.CHDLC_protocol_options      = HDLC_STREAMING_MODE;
-        cfg.percent_data_buffer_for_Tx  = 50;
-        cfg.CHDLC_statistics_options    = (CHDLC_TX_DATA_BYTE_COUNT_STAT |
-                CHDLC_RX_DATA_BYTE_COUNT_STAT);
-        cfg.max_CHDLC_data_field_length = card->wandev.mtu;
-
-        cfg.transmit_keepalive_timer    = 0;
-        cfg.receive_keepalive_timer     = 0;
-        cfg.keepalive_error_tolerance   = 0;
-        cfg.SLARP_request_timer         = 0;
-
-        cfg.IP_address          = 0;
-        cfg.IP_netmask          = 0;
-        
-        return chdlc_configure(card, &cfg);
-}
-
-/*============================================================================
- * Process global exception condition
- */
-static int process_global_exception(sdla_t *card)
-{
-        CHDLC_MAILBOX_STRUCT* mbox = card->mbox;
-        int err;
-
-        mbox->buffer_length = 0;
-        mbox->command = READ_GLOBAL_EXCEPTION_CONDITION;
-        err = sdla_exec(mbox) ? mbox->return_code : CMD_TIMEOUT;
-
-        if(err != CMD_TIMEOUT ){
-        
-                switch(mbox->return_code) {
-         
-                case EXCEP_MODEM_STATUS_CHANGE:
-
-                        printk(KERN_INFO "%s: Modem status change\n",
-                                card->devname);
-
-                        switch(mbox->data[0] & (DCD_HIGH | CTS_HIGH)) {
-                                case (DCD_HIGH):
-                                        printk(KERN_INFO "%s: DCD high, CTS low\n",card->devname);
-                                        break;
-                                case (CTS_HIGH):
-                                        printk(KERN_INFO "%s: DCD low, CTS high\n",card->devname);
-                                        break;
-                                case ((DCD_HIGH | CTS_HIGH)):
-                                        printk(KERN_INFO "%s: DCD high, CTS high\n",card->devname);
-                                        break;
-                                default:
-                                        printk(KERN_INFO "%s: DCD low, CTS low\n",card->devname);
-                                        break;
-                        }
-
-                        if (!(mbox->data[0] & DCD_HIGH) || !(mbox->data[0] & DCD_HIGH)){
-                                //printk(KERN_INFO "Sending TERM Request Manually !\n");
-                                send_ppp_term_request(card->wandev.dev);
-                        }       
-                        break;
-
-                case EXCEP_TRC_DISABLED:
-                        printk(KERN_INFO "%s: Line trace disabled\n",
-                                card->devname);
-                        break;
-
-                case EXCEP_IRQ_TIMEOUT:
-                        printk(KERN_INFO "%s: IRQ timeout occurred\n",
-                                card->devname); 
-                        break;
-
-                default:
-                        printk(KERN_INFO "%s: Global exception %x\n",
-                                card->devname, mbox->return_code);
-                        break;
-                }
-        }
-        return 0;
-}
-
-
-/*============================================================================
- * Process chdlc exception condition
- */
-static int process_chdlc_exception(sdla_t *card)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        int err;
-
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_EXCEPTION_CONDITION;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-        if(err != CMD_TIMEOUT) {
-        
-                switch (err) {
-
-                case EXCEP_LINK_ACTIVE:
-                        port_set_state(card, WAN_CONNECTED);
-                        break;
-
-                case EXCEP_LINK_INACTIVE_MODEM:
-                        port_set_state(card, WAN_DISCONNECTED);
-                        break;
-
-                case EXCEP_LOOPBACK_CONDITION:
-                        printk(KERN_INFO "%s: Loopback Condition Detected.\n",
-                                                card->devname);
-                        break;
-
-                case NO_CHDLC_EXCEP_COND_TO_REPORT:
-                        printk(KERN_INFO "%s: No exceptions reported.\n",
-                                                card->devname);
-                        break;
-                default:
-                        printk(KERN_INFO "%s: Exception Condition %x!\n",
-                                        card->devname,err);
-                        break;
-                }
-
-        }
-        return 0;
-}
-
-
-/*=============================================================================
- * Store a UDP management packet for later processing.
- */
-
-static int store_udp_mgmt_pkt(char udp_pkt_src, sdla_t* card,
-                              struct sk_buff *skb, struct net_device* dev,
-                              chdlc_private_area_t* chdlc_priv_area )
-{
-        int udp_pkt_stored = 0;
-
-        if(!chdlc_priv_area->udp_pkt_lgth &&
-          (skb->len <= MAX_LGTH_UDP_MGNT_PKT)) {
-                chdlc_priv_area->udp_pkt_lgth = skb->len;
-                chdlc_priv_area->udp_pkt_src = udp_pkt_src;
-                memcpy(chdlc_priv_area->udp_pkt_data, skb->data, skb->len);
-                chdlc_priv_area->timer_int_enabled = TMR_INT_ENABLED_UDP;
-                udp_pkt_stored = 1;
-        }
-
-        if(udp_pkt_src == UDP_PKT_FRM_STACK)
-                dev_kfree_skb_any(skb);
-        else
-                dev_kfree_skb_any(skb);
-        
-        return(udp_pkt_stored);
-}
-
-
-/*=============================================================================
- * Process UDP management packet.
- */
-
-static int process_udp_mgmt_pkt(sdla_t* card, struct net_device* dev,
-                                chdlc_private_area_t* chdlc_priv_area ) 
-{
-        unsigned char *buf;
-        unsigned int frames, len;
-        struct sk_buff *new_skb;
-        unsigned short buffer_length, real_len;
-        unsigned long data_ptr;
-        unsigned data_length;
-        int udp_mgmt_req_valid = 1;
-        CHDLC_MAILBOX_STRUCT *mb = card->mbox;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-        chdlc_udp_pkt_t *chdlc_udp_pkt;
-        struct timeval tv;
-        int err;
-        char ut_char;
-
-        chdlc_udp_pkt = (chdlc_udp_pkt_t *) chdlc_priv_area->udp_pkt_data;
-
-        if(chdlc_priv_area->udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-
-                switch(chdlc_udp_pkt->cblock.command) {
-                        case READ_GLOBAL_STATISTICS:
-                        case READ_MODEM_STATUS:  
-                        case READ_CHDLC_LINK_STATUS:
-                        case CPIPE_ROUTER_UP_TIME:
-                        case READ_COMMS_ERROR_STATS:
-                        case READ_CHDLC_OPERATIONAL_STATS:
-
-                        /* These two commands are executed for
-                         * each request */
-                        case READ_CHDLC_CONFIGURATION:
-                        case READ_CHDLC_CODE_VERSION:
-                                udp_mgmt_req_valid = 1;
-                                break;
-                        default:
-                                udp_mgmt_req_valid = 0;
-                                break;
-                } 
-        }
-        
-        if(!udp_mgmt_req_valid) {
-
-                /* set length to 0 */
-                chdlc_udp_pkt->cblock.buffer_length = 0;
-
-                /* set return code */
-                chdlc_udp_pkt->cblock.return_code = 0xCD;
-
-                if (net_ratelimit()){   
-                        printk(KERN_INFO 
-                        "%s: Warning, Illegal UDP command attempted from network: %x\n",
-                        card->devname,chdlc_udp_pkt->cblock.command);
-                }
-
-        } else {
-                unsigned long trace_status_cfg_addr = 0;
-                TRACE_STATUS_EL_CFG_STRUCT trace_cfg_struct;
-                TRACE_STATUS_ELEMENT_STRUCT trace_element_struct;
-
-                switch(chdlc_udp_pkt->cblock.command) {
-
-                case CPIPE_ENABLE_TRACING:
-                     if (!chdlc_priv_area->TracingEnabled) {
-
-                        /* OPERATE_DATALINE_MONITOR */
-
-                        mb->buffer_length = sizeof(LINE_TRACE_CONFIG_STRUCT);
-                        mb->command = SET_TRACE_CONFIGURATION;
-
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->
-                                trace_config = TRACE_ACTIVE;
-                        /* Trace delay mode is not used because it slows
-                           down transfer and results in a standoff situation
-                           when there is a lot of data */
-
-                        /* Configure the Trace based on user inputs */
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->trace_config |= 
-                                        chdlc_udp_pkt->data[0];
-
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->
-                           trace_deactivation_timer = 4000;
-
-
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                        if (err != COMMAND_OK) {
-                                chdlc_error(card,err,mb);
-                                card->TracingEnabled = 0;
-                                chdlc_udp_pkt->cblock.return_code = err;
-                                mb->buffer_length = 0;
-                                break;
-                        } 
-
-                        /* Get the base address of the trace element list */
-                        mb->buffer_length = 0;
-                        mb->command = READ_TRACE_CONFIGURATION;
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-                        if (err != COMMAND_OK) {
-                                chdlc_error(card,err,mb);
-                                chdlc_priv_area->TracingEnabled = 0;
-                                chdlc_udp_pkt->cblock.return_code = err;
-                                mb->buffer_length = 0;
-                                break;
-                        }       
-
-                        trace_status_cfg_addr =((LINE_TRACE_CONFIG_STRUCT *)
-                                mb->data) -> ptr_trace_stat_el_cfg_struct;
-
-                        sdla_peek(&card->hw, trace_status_cfg_addr,
-                                 &trace_cfg_struct, sizeof(trace_cfg_struct));
-                    
-                        chdlc_priv_area->start_trace_addr = trace_cfg_struct.
-                                base_addr_trace_status_elements;
-
-                        chdlc_priv_area->number_trace_elements = 
-                                        trace_cfg_struct.number_trace_status_elements;
-
-                        chdlc_priv_area->end_trace_addr = (unsigned long)
-                                        ((TRACE_STATUS_ELEMENT_STRUCT *)
-                                         chdlc_priv_area->start_trace_addr + 
-                                         (chdlc_priv_area->number_trace_elements - 1));
-
-                        chdlc_priv_area->base_addr_trace_buffer = 
-                                        trace_cfg_struct.base_addr_trace_buffer;
-
-                        chdlc_priv_area->end_addr_trace_buffer = 
-                                        trace_cfg_struct.end_addr_trace_buffer;
-
-                        chdlc_priv_area->curr_trace_addr = 
-                                        trace_cfg_struct.next_trace_element_to_use;
-
-                        chdlc_priv_area->available_buffer_space = 2000 - 
-                                                                  sizeof(ip_pkt_t) -
-                                                                  sizeof(udp_pkt_t) -
-                                                                  sizeof(wp_mgmt_t) -
-                                                                  sizeof(cblock_t) -
-                                                                  sizeof(trace_info_t); 
-                     }
-                     chdlc_udp_pkt->cblock.return_code = COMMAND_OK;
-                     mb->buffer_length = 0;
-                     chdlc_priv_area->TracingEnabled = 1;
-                     break;
-           
-
-                case CPIPE_DISABLE_TRACING:
-                     if (chdlc_priv_area->TracingEnabled) {
-
-                        /* OPERATE_DATALINE_MONITOR */
-                        mb->buffer_length = sizeof(LINE_TRACE_CONFIG_STRUCT);
-                        mb->command = SET_TRACE_CONFIGURATION;
-                        ((LINE_TRACE_CONFIG_STRUCT *)mb->data)->
-                                trace_config = TRACE_INACTIVE;
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                     }          
-
-                     chdlc_priv_area->TracingEnabled = 0;
-                     chdlc_udp_pkt->cblock.return_code = COMMAND_OK;
-                     mb->buffer_length = 0;
-                     break;
-           
-
-                case CPIPE_GET_TRACE_INFO:
-
-                     if (!chdlc_priv_area->TracingEnabled) {
-                        chdlc_udp_pkt->cblock.return_code = 1;
-                        mb->buffer_length = 0;
-                        break;
-                     }
-
-                     chdlc_udp_pkt->trace_info.ismoredata = 0x00;
-                     buffer_length = 0; /* offset of packet already occupied */
-
-                     for (frames=0; frames < chdlc_priv_area->number_trace_elements; frames++){
-
-                        trace_pkt_t *trace_pkt = (trace_pkt_t *)
-                                &chdlc_udp_pkt->data[buffer_length];
-
-                        sdla_peek(&card->hw, chdlc_priv_area->curr_trace_addr,
-                                  (unsigned char *)&trace_element_struct,
-                                  sizeof(TRACE_STATUS_ELEMENT_STRUCT));
-
-                        if (trace_element_struct.opp_flag == 0x00) {
-                                break;
-                        }
-
-                        /* get pointer to real data */
-                        data_ptr = trace_element_struct.ptr_data_bfr;
-
-                        /* See if there is actual data on the trace buffer */
-                        if (data_ptr){
-                                data_length = trace_element_struct.trace_length;
-                        }else{
-                                data_length = 0;
-                                chdlc_udp_pkt->trace_info.ismoredata = 0x01;
-                        }
-        
-                        if( (chdlc_priv_area->available_buffer_space - buffer_length)
-                                < ( sizeof(trace_pkt_t) + data_length) ) {
-
-                            /* indicate there are more frames on board & exit */
-                                chdlc_udp_pkt->trace_info.ismoredata = 0x01;
-                                break;
-                         }
-
-                        trace_pkt->status = trace_element_struct.trace_type;
-
-                        trace_pkt->time_stamp =
-                                trace_element_struct.trace_time_stamp;
-
-                        trace_pkt->real_length =
-                                trace_element_struct.trace_length;
-
-                        /* see if we can fit the frame into the user buffer */
-                        real_len = trace_pkt->real_length;
-
-                        if (data_ptr == 0) {
-                                trace_pkt->data_avail = 0x00;
-                        } else {
-                                unsigned tmp = 0;
-
-                                /* get the data from circular buffer
-                                    must check for end of buffer */
-                                trace_pkt->data_avail = 0x01;
-
-                                if ((data_ptr + real_len) >
-                                             chdlc_priv_area->end_addr_trace_buffer + 1){
-
-                                        tmp = chdlc_priv_area->end_addr_trace_buffer - data_ptr + 1;
-                                        sdla_peek(&card->hw, data_ptr,
-                                                  trace_pkt->data,tmp);
-                                        data_ptr = chdlc_priv_area->base_addr_trace_buffer;
-                                }
-        
-                                sdla_peek(&card->hw, data_ptr,
-                                          &trace_pkt->data[tmp], real_len - tmp);
-                        }       
-
-                        /* zero the opp flag to show we got the frame */
-                        ut_char = 0x00;
-                        sdla_poke(&card->hw, chdlc_priv_area->curr_trace_addr, &ut_char, 1);
-
-                        /* now move onto the next frame */
-                        chdlc_priv_area->curr_trace_addr += sizeof(TRACE_STATUS_ELEMENT_STRUCT);
-
-                        /* check if we went over the last address */
-                        if ( chdlc_priv_area->curr_trace_addr > chdlc_priv_area->end_trace_addr ) {
-                                chdlc_priv_area->curr_trace_addr = chdlc_priv_area->start_trace_addr;
-                        }
-
-                        if(trace_pkt->data_avail == 0x01) {
-                                buffer_length += real_len - 1;
-                        }
-         
-                        /* for the header */
-                        buffer_length += sizeof(trace_pkt_t);
-
-                     }  /* For Loop */
-
-                     if (frames == chdlc_priv_area->number_trace_elements){
-                        chdlc_udp_pkt->trace_info.ismoredata = 0x01;
-                     }
-                     chdlc_udp_pkt->trace_info.num_frames = frames;
-                 
-                     mb->buffer_length = buffer_length;
-                     chdlc_udp_pkt->cblock.buffer_length = buffer_length; 
-                 
-                     chdlc_udp_pkt->cblock.return_code = COMMAND_OK; 
-                     
-                     break;
-
-
-                case CPIPE_FT1_READ_STATUS:
-                        ((unsigned char *)chdlc_udp_pkt->data )[0] =
-                                flags->FT1_info_struct.parallel_port_A_input;
-
-                        ((unsigned char *)chdlc_udp_pkt->data )[1] =
-                                flags->FT1_info_struct.parallel_port_B_input;
-                                 
-                        chdlc_udp_pkt->cblock.return_code = COMMAND_OK;
-                        mb->buffer_length = 2;
-                        break;
-                
-                case CPIPE_ROUTER_UP_TIME:
-                        do_gettimeofday( &tv );
-                        chdlc_priv_area->router_up_time = tv.tv_sec - 
-                                        chdlc_priv_area->router_start_time;
-                        *(unsigned long *)&chdlc_udp_pkt->data = 
-                                        chdlc_priv_area->router_up_time;        
-                        mb->buffer_length = sizeof(unsigned long);
-                        break;
-
-                case FT1_MONITOR_STATUS_CTRL:
-                        /* Enable FT1 MONITOR STATUS */
-                        if ((chdlc_udp_pkt->data[0] & ENABLE_READ_FT1_STATUS) ||  
-                                (chdlc_udp_pkt->data[0] & ENABLE_READ_FT1_OP_STATS)) {
-                        
-                                if( rCount++ != 0 ) {
-                                        chdlc_udp_pkt->cblock.
-                                        return_code = COMMAND_OK;
-                                        mb->buffer_length = 1;
-                                        break;
-                                }
-                        }
-
-                        /* Disable FT1 MONITOR STATUS */
-                        if( chdlc_udp_pkt->data[0] == 0) {
-
-                                if( --rCount != 0) {
-                                        chdlc_udp_pkt->cblock.
-                                        return_code = COMMAND_OK;
-                                        mb->buffer_length = 1;
-                                        break;
-                                } 
-                        }       
-        
-                default:
-                        /* it's a board command */
-                        mb->command = chdlc_udp_pkt->cblock.command;
-                        mb->buffer_length = chdlc_udp_pkt->cblock.buffer_length;
-                        if (mb->buffer_length) {
-                                memcpy(&mb->data, (unsigned char *) chdlc_udp_pkt->
-                                                        data, mb->buffer_length);
-                        } 
-                        /* run the command on the board */
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                        if (err != COMMAND_OK) {
-                                break;
-                        }
-
-                        /* copy the result back to our buffer */
-                        memcpy(&chdlc_udp_pkt->cblock, mb, sizeof(cblock_t)); 
-                        
-                        if (mb->buffer_length) {
-                                memcpy(&chdlc_udp_pkt->data, &mb->data, 
-                                                                mb->buffer_length); 
-                        }
-
-                } /* end of switch */
-        } /* end of else */
-
-        /* Fill UDP TTL */
-        chdlc_udp_pkt->ip_pkt.ttl = card->wandev.ttl; 
-
-        len = reply_udp(chdlc_priv_area->udp_pkt_data, mb->buffer_length);
-        
-        if(chdlc_priv_area->udp_pkt_src == UDP_PKT_FRM_NETWORK) {
-                if(!chdlc_send(card, chdlc_priv_area->udp_pkt_data, len)) {
-                        ++ card->wandev.stats.tx_packets;
-                        card->wandev.stats.tx_bytes += len;
-                }
-        } else {        
-        
-                /* Pass it up the stack
-                   Allocate socket buffer */
-                if ((new_skb = dev_alloc_skb(len)) != NULL) {
-                        /* copy data into new_skb */
-
-                        buf = skb_put(new_skb, len);
-                        memcpy(buf, chdlc_priv_area->udp_pkt_data, len);
-
-                        /* Decapsulate pkt and pass it up the protocol stack */
-                        new_skb->protocol = htons(ETH_P_IP);
-                        new_skb->dev = dev;
-                        new_skb->mac.raw  = new_skb->data;
-        
-                        netif_rx(new_skb);
-                        dev->last_rx = jiffies;
-                } else {
-                
-                        printk(KERN_INFO "%s: no socket buffers available!\n",
-                                        card->devname);
-                }
-        }
- 
-        chdlc_priv_area->udp_pkt_lgth = 0;
-        
-        return 0;
-}
-
-/*============================================================================
- * Initialize Receive and Transmit Buffers.
- */
-
-static void init_chdlc_tx_rx_buff(sdla_t* card, struct net_device *dev)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        CHDLC_TX_STATUS_EL_CFG_STRUCT *tx_config;
-        CHDLC_RX_STATUS_EL_CFG_STRUCT *rx_config;
-        char err;
-        
-        mb->buffer_length = 0;
-        mb->command = READ_CHDLC_CONFIGURATION;
-        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-
-        if(err != COMMAND_OK) {
-                chdlc_error(card,err,mb);
-                return;
-        }
-
-        if(card->hw.type == SDLA_S514) {
-                tx_config = (CHDLC_TX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                            ptr_CHDLC_Tx_stat_el_cfg_struct));
-                rx_config = (CHDLC_RX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                            ptr_CHDLC_Rx_stat_el_cfg_struct));
-
-                /* Setup Head and Tails for buffers */
-                card->u.c.txbuf_base = (void *)(card->hw.dpmbase +
-                tx_config->base_addr_Tx_status_elements);
-                card->u.c.txbuf_last = 
-                (CHDLC_DATA_TX_STATUS_EL_STRUCT *)  
-                card->u.c.txbuf_base +
-                (tx_config->number_Tx_status_elements - 1);
-
-                card->u.c.rxbuf_base = (void *)(card->hw.dpmbase +
-                rx_config->base_addr_Rx_status_elements);
-                card->u.c.rxbuf_last =
-                (CHDLC_DATA_RX_STATUS_EL_STRUCT *)
-                card->u.c.rxbuf_base +
-                (rx_config->number_Rx_status_elements - 1);
-
-                /* Set up next pointer to be used */
-                card->u.c.txbuf = (void *)(card->hw.dpmbase +
-                tx_config->next_Tx_status_element_to_use);
-                card->u.c.rxmb = (void *)(card->hw.dpmbase +
-                rx_config->next_Rx_status_element_to_use);
-        }
-        else {
-                tx_config = (CHDLC_TX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                        ptr_CHDLC_Tx_stat_el_cfg_struct % SDLA_WINDOWSIZE));
-
-                rx_config = (CHDLC_RX_STATUS_EL_CFG_STRUCT *)(card->hw.dpmbase +
-                        (((CHDLC_CONFIGURATION_STRUCT *)mb->data)->
-                        ptr_CHDLC_Rx_stat_el_cfg_struct % SDLA_WINDOWSIZE));
-
-                /* Setup Head and Tails for buffers */
-                card->u.c.txbuf_base = (void *)(card->hw.dpmbase +
-                (tx_config->base_addr_Tx_status_elements % SDLA_WINDOWSIZE));
-                card->u.c.txbuf_last =
-                (CHDLC_DATA_TX_STATUS_EL_STRUCT *)card->u.c.txbuf_base
-                + (tx_config->number_Tx_status_elements - 1);
-                card->u.c.rxbuf_base = (void *)(card->hw.dpmbase +
-                (rx_config->base_addr_Rx_status_elements % SDLA_WINDOWSIZE));
-                card->u.c.rxbuf_last = 
-                (CHDLC_DATA_RX_STATUS_EL_STRUCT *)card->u.c.rxbuf_base
-                + (rx_config->number_Rx_status_elements - 1);
-
-                 /* Set up next pointer to be used */
-                card->u.c.txbuf = (void *)(card->hw.dpmbase +
-                (tx_config->next_Tx_status_element_to_use % SDLA_WINDOWSIZE));
-                card->u.c.rxmb = (void *)(card->hw.dpmbase +
-                (rx_config->next_Rx_status_element_to_use % SDLA_WINDOWSIZE));
-        }
-
-        /* Setup Actual Buffer Start and end addresses */
-        card->u.c.rx_base = rx_config->base_addr_Rx_buffer;
-        card->u.c.rx_top  = rx_config->end_addr_Rx_buffer;
-
-}
-
-/*=============================================================================
- * Perform Interrupt Test by running READ_CHDLC_CODE_VERSION command MAX_INTR
- * _TEST_COUNTER times.
- */
-static int intr_test( sdla_t* card)
-{
-        CHDLC_MAILBOX_STRUCT* mb = card->mbox;
-        int err,i;
-
-        Intr_test_counter = 0;
-
-        /* The critical flag is unset because during initialization (if_open) 
-         * we want the interrupts to be enabled so that when the wpc_isr is
-         * called it does not exit due to critical flag set.
-         */ 
-
-        err = chdlc_set_intr_mode(card, APP_INT_ON_COMMAND_COMPLETE);
-
-        if (err == CMD_OK) { 
-                for (i = 0; i < MAX_INTR_TEST_COUNTER; i ++) {  
-                        mb->buffer_length  = 0;
-                        mb->command = READ_CHDLC_CODE_VERSION;
-                        err = sdla_exec(mb) ? mb->return_code : CMD_TIMEOUT;
-                }
-        }
-        else {
-                return err;
-        }
-
-        err = chdlc_set_intr_mode(card, 0);
-
-        if (err != CMD_OK)
-                return err;
-
-        return 0;
-}
-
-/*==============================================================================
- * Determine what type of UDP call it is. CPIPEAB ?
- */
-static int udp_pkt_type(struct sk_buff *skb, sdla_t* card)
-{
-         chdlc_udp_pkt_t *chdlc_udp_pkt = (chdlc_udp_pkt_t *)skb->data;
-
-        if (!strncmp(chdlc_udp_pkt->wp_mgmt.signature,UDPMGMT_SIGNATURE,8) &&
-           (chdlc_udp_pkt->udp_pkt.udp_dst_port == ntohs(card->wandev.udp_port)) &&
-           (chdlc_udp_pkt->ip_pkt.protocol == UDPMGMT_UDP_PROTOCOL) &&
-           (chdlc_udp_pkt->wp_mgmt.request_reply == UDPMGMT_REQUEST)) {
-                return UDP_CPIPE_TYPE;
-        }
-        else return UDP_INVALID_TYPE;
-}
-
-/*============================================================================
- * Set PORT state.
- */
-static void port_set_state (sdla_t *card, int state)
-{
-        struct net_device *dev = card->wandev.dev;
-        chdlc_private_area_t *chdlc_priv_area = dev->priv;
-
-        if (card->u.c.state != state)
-        {
-                switch (state)
-                {
-                case WAN_CONNECTED:
-                        printk (KERN_INFO "%s: HDLC link connected!\n",
-                                card->devname);
-                      break;
-
-                case WAN_CONNECTING:
-                        printk (KERN_INFO "%s: HDLC link connecting...\n",
-                                card->devname);
-                        break;
-
-                case WAN_DISCONNECTED:
-                        printk (KERN_INFO "%s: HDLC link disconnected!\n",
-                                card->devname);
-                        break;
-                }
-
-                card->wandev.state = card->u.c.state = state;
-                chdlc_priv_area->common.state = state;
-        }
-}
-
-void s508_lock (sdla_t *card, unsigned long *smp_flags)
-{
-        spin_lock_irqsave(&card->wandev.lock, *smp_flags);
-        if (card->next){
-                /* It is ok to use spin_lock here, since we
-                 * already turned off interrupts */
-                spin_lock(&card->next->wandev.lock);
-        }
-}
-
-void s508_unlock (sdla_t *card, unsigned long *smp_flags)
-{
-        if (card->next){
-                spin_unlock(&card->next->wandev.lock);
-        }
-        spin_unlock_irqrestore(&card->wandev.lock, *smp_flags);
-}
-
-
-
-/*===========================================================================
- * config_chdlc
- *
- *      Configure the chdlc protocol and enable communications.         
- *
- *      The if_open() function binds this function to the poll routine.
- *      Therefore, this function will run every time the chdlc interface
- *      is brought up. We cannot run this function from the if_open 
- *      because if_open does not have access to the remote IP address.
- *      
- *      If the communications are not enabled, proceed to configure
- *      the card and enable communications.
- *
- *      If the communications are enabled, it means that the interface
- *      was shutdown by ether the user or driver. In this case, we 
- *      have to check that the IP addresses have not changed.  If
- *      the IP addresses have changed, we have to reconfigure the firmware
- *      and update the changed IP addresses.  Otherwise, just exit.
- *
- */
-
-static int config_chdlc (sdla_t *card)
-{
-        struct net_device *dev = card->wandev.dev;
-        SHARED_MEMORY_INFO_STRUCT *flags = card->u.c.flags;
-
-        if (card->u.c.comm_enabled){
-                chdlc_comm_disable(card);
-                port_set_state(card, WAN_DISCONNECTED);
-        }
-
-        if (set_chdlc_config(card)) {
-                printk(KERN_INFO "%s: CHDLC Configuration Failed!\n",
-                                card->devname);
-                return 0;
-        }
-        init_chdlc_tx_rx_buff(card, dev);
-
-        /* Set interrupt mode and mask */
-        if (chdlc_set_intr_mode(card, APP_INT_ON_RX_FRAME |
-                                APP_INT_ON_GLOBAL_EXCEP_COND |
-                                APP_INT_ON_TX_FRAME |
-                                APP_INT_ON_CHDLC_EXCEP_COND | APP_INT_ON_TIMER)){
-                printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
-                                card->devname);
-                return 0;       
-        }
-        
-
-        /* Mask the Transmit and Timer interrupt */
-        flags->interrupt_info_struct.interrupt_permission &= 
-                ~(APP_INT_ON_TX_FRAME | APP_INT_ON_TIMER);
-
-
-        if (chdlc_comm_enable(card) != 0) {
-                printk(KERN_INFO "%s: Failed to enable chdlc communications!\n",
-                                card->devname);
-                flags->interrupt_info_struct.interrupt_permission = 0;
-                card->u.c.comm_enabled=0;
-                chdlc_set_intr_mode(card,0);
-                return 0;
-        }
-
-        /* Initialize Rx/Tx buffer control fields */
-        port_set_state(card, WAN_CONNECTING);
-        return 0; 
-}
-
-
-static void send_ppp_term_request(struct net_device *dev)
-{
-        struct sk_buff *new_skb;
-        unsigned char *buf;
-
-        if ((new_skb = dev_alloc_skb(8)) != NULL) {
-                /* copy data into new_skb */
-
-                buf = skb_put(new_skb, 8);
-                sprintf(buf,"%c%c%c%c%c%c%c%c", 0xFF,0x03,0xC0,0x21,0x05,0x98,0x00,0x07);
-
-                /* Decapsulate pkt and pass it up the protocol stack */
-                new_skb->protocol = htons(ETH_P_WAN_PPP);
-                new_skb->dev = dev;
-                new_skb->mac.raw  = new_skb->data;
-
-                netif_rx(new_skb);
-                dev->last_rx = jiffies;
-        }
-}
-
-
-MODULE_LICENSE("GPL");
-
-/****** End ****************************************************************/
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index fd17aa8491b6..bad09ebdb50b 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -309,7 +309,10 @@ config APPLE_AIRPORT
           Say Y here to support the Airport 802.11b wireless Ethernet hardware
           built into the Macintosh iBook and other recent PowerPC-based
           Macintosh machines. This is essentially a Lucent Orinoco card with 
-          a non-standard interface
+          a non-standard interface.
+
+          This driver does not support the Airport Extreme (802.11b/g). Use
+          the BCM43xx driver for Airport Extreme cards.
 
 config PLX_HERMES
         tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)"
@@ -353,7 +356,7 @@ config PCI_HERMES
 
 config ATMEL
       tristate "Atmel at76c50x chipset  802.11b support"
-      depends on NET_RADIO
+      depends on NET_RADIO && (PCI || PCMCIA)
       select FW_LOADER
       select CRC32
        ---help---
@@ -401,6 +404,7 @@ config PCMCIA_HERMES
 config PCMCIA_SPECTRUM
         tristate "Symbol Spectrum24 Trilogy PCMCIA card support"
         depends on NET_RADIO && PCMCIA && HERMES
+        select FW_LOADER
         ---help---
 
           This is a driver for 802.11b cards using RAM-loadable Symbol
@@ -500,6 +504,7 @@ config PRISM54
           will be called prism54.ko.
 
 source "drivers/net/wireless/hostap/Kconfig"
+source "drivers/net/wireless/bcm43xx/Kconfig"
 
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 3a6f7ba326ca..c86779879361 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
 obj-$(CONFIG_PRISM54)           += prism54/
 
 obj-$(CONFIG_HOSTAP)            += hostap/
+obj-$(CONFIG_BCM43XX)           += bcm43xx/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)      += ray_cs.o
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index a496460ce224..af0cbb6c5c0c 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -80,8 +80,8 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards");
    event handler. 
 */
 
-static void airo_config(dev_link_t *link);
-static void airo_release(dev_link_t *link);
+static int airo_config(struct pcmcia_device *link);
+static void airo_release(struct pcmcia_device *link);
 
 /*
    The attach() and detach() entry points are used to create and destroy
@@ -101,10 +101,10 @@ static void airo_detach(struct pcmcia_device *p_dev);
 /*
    A linked list of "instances" of the  aironet device.  Each actual
    PCMCIA card corresponds to one device instance, and is described
-   by one dev_link_t structure (defined in ds.h).
+   by one struct pcmcia_device structure (defined in ds.h).
 
    You may not want to use a linked list for this -- for example, the
-   memory card driver uses an array of dev_link_t pointers, where minor
+   memory card driver uses an array of struct pcmcia_device pointers, where minor
    device numbers are used to derive the corresponding array index.
 */
 
@@ -114,7 +114,7 @@ static void airo_detach(struct pcmcia_device *p_dev);
    example, ethernet cards, modems).  In other cases, there may be
    many actual or logical devices (SCSI adapters, memory cards with
    multiple partitions).  The dev_node_t structures need to be kept
-   in a linked list starting at the 'dev' field of a dev_link_t
+   in a linked list starting at the 'dev' field of a struct pcmcia_device
    structure.  We allocate them in the card's private data structure,
    because they generally shouldn't be allocated dynamically.
 
@@ -141,24 +141,16 @@ typedef struct local_info_t {
   
   ======================================================================*/
 
-static int airo_attach(struct pcmcia_device *p_dev)
+static int airo_probe(struct pcmcia_device *p_dev)
 {
-        dev_link_t *link;
         local_info_t *local;
 
         DEBUG(0, "airo_attach()\n");
 
-        /* Initialize the dev_link_t structure */
-        link = kzalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-        if (!link) {
-                printk(KERN_ERR "airo_cs: no memory for new device\n");
-                return -ENOMEM;
-        }
-        
         /* Interrupt setup */
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
-        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-        link->irq.Handler = NULL;
+        p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+        p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+        p_dev->irq.Handler = NULL;
         
         /*
           General socket configuration defaults can go here.  In this
@@ -167,26 +159,18 @@ static int airo_attach(struct pcmcia_device *p_dev)
           and attributes of IO windows) are fixed by the nature of the
           device, and can be hard-wired here.
         */
-        link->conf.Attributes = 0;
-        link->conf.Vcc = 50;
-        link->conf.IntType = INT_MEMORY_AND_IO;
+        p_dev->conf.Attributes = 0;
+        p_dev->conf.IntType = INT_MEMORY_AND_IO;
         
         /* Allocate space for private device-specific data */
         local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
         if (!local) {
                 printk(KERN_ERR "airo_cs: no memory for new device\n");
-                kfree (link);
                 return -ENOMEM;
         }
-        link->priv = local;
+        p_dev->priv = local;
 
-        link->handle = p_dev;
-        p_dev->instance = link;
-
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        airo_config(link);
-
-        return 0;
+        return airo_config(p_dev);
 } /* airo_attach */
 
 /*======================================================================
@@ -198,14 +182,11 @@ static int airo_attach(struct pcmcia_device *p_dev)
   
   ======================================================================*/
 
-static void airo_detach(struct pcmcia_device *p_dev)
+static void airo_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         DEBUG(0, "airo_detach(0x%p)\n", link);
 
-        if (link->state & DEV_CONFIG)
-                airo_release(link);
+        airo_release(link);
 
         if ( ((local_info_t*)link->priv)->eth_dev ) {
                 stop_airo_card( ((local_info_t*)link->priv)->eth_dev, 0 );
@@ -213,7 +194,6 @@ static void airo_detach(struct pcmcia_device *p_dev)
         ((local_info_t*)link->priv)->eth_dev = NULL;
 
         kfree(link->priv);
-        kfree(link);
 } /* airo_detach */
 
 /*======================================================================
@@ -227,9 +207,8 @@ static void airo_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void airo_config(dev_link_t *link)
+static int airo_config(struct pcmcia_device *link)
 {
-        client_handle_t handle;
         tuple_t tuple;
         cisparse_t parse;
         local_info_t *dev;
@@ -237,8 +216,7 @@ static void airo_config(dev_link_t *link)
         u_char buf[64];
         win_req_t req;
         memreq_t map;
-        
-        handle = link->handle;
+
         dev = link->priv;
 
         DEBUG(0, "airo_config(0x%p)\n", link);
@@ -252,15 +230,12 @@ static void airo_config(dev_link_t *link)
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present = parse.config.rmask[0];
-        
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-        
+
         /*
           In this loop, we scan the CIS for configuration table entries,
           each of which describes a valid card configuration, including
@@ -274,12 +249,12 @@ static void airo_config(dev_link_t *link)
           will only use the CIS to fill in implementation-defined details.
         */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         while (1) {
                 cistpl_cftable_entry_t dflt = { 0 };
                 cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                                pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
+                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
                         goto next_entry;
                 
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
@@ -294,16 +269,11 @@ static void airo_config(dev_link_t *link)
                 
                 /* Use power settings for Vcc and Vpp if present */
                 /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vcc = cfg->vcc.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vcc = dflt.vcc.param[CISTPL_POWER_VNOM]/10000;
-                
                 if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
                 else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
                 
                 /* Do we need to allocate an interrupt? */
@@ -329,12 +299,12 @@ static void airo_config(dev_link_t *link)
                 }
                 
                 /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link->handle, &link->io) != 0)
+                if (pcmcia_request_io(link, &link->io) != 0)
                         goto next_entry;
                 
                 /*
                   Now set up a common memory window, if needed.  There is room
-                  in the dev_link_t structure for one memory window handle,
+                  in the struct pcmcia_device structure for one memory window handle,
                   but if the base addresses need to be saved, or if multiple
                   windows are needed, the info should go in the private data
                   structure for this device.
@@ -350,7 +320,7 @@ static void airo_config(dev_link_t *link)
                         req.Base = mem->win[0].host_addr;
                         req.Size = mem->win[0].len;
                         req.AccessSpeed = 0;
-                        if (pcmcia_request_window(&link->handle, &req, &link->win) != 0)
+                        if (pcmcia_request_window(&link, &req, &link->win) != 0)
                                 goto next_entry;
                         map.Page = 0; map.CardOffset = mem->win[0].card_addr;
                         if (pcmcia_map_mem_page(link->win, &map) != 0)
@@ -360,7 +330,7 @@ static void airo_config(dev_link_t *link)
                 break;
                 
         next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
         }
         
     /*
@@ -369,33 +339,32 @@ static void airo_config(dev_link_t *link)
       irq structure is initialized.
     */
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
-                CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+                CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
         
         /*
           This actually configures the PCMCIA socket -- setting up
           the I/O windows and the interrupt mapping, and putting the
           card and host interface into "Memory and IO" mode.
         */
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
         ((local_info_t*)link->priv)->eth_dev = 
                 init_airo_card( link->irq.AssignedIRQ,
-                                link->io.BasePort1, 1, &handle_to_dev(handle) );
+                                link->io.BasePort1, 1, &handle_to_dev(link) );
         if (!((local_info_t*)link->priv)->eth_dev) goto cs_failed;
         
         /*
           At this point, the dev_node_t structure(s) need to be
-          initialized and arranged in a linked list at link->dev.
+          initialized and arranged in a linked list at link->dev_node.
         */
         strcpy(dev->node.dev_name, ((local_info_t*)link->priv)->eth_dev->name );
         dev->node.major = dev->node.minor = 0;
-        link->dev = &dev->node;
+        link->dev_node = &dev->node;
         
         /* Finally, report what we've done */
-        printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
-               dev->node.dev_name, link->conf.ConfigIndex,
-               link->conf.Vcc/10, link->conf.Vcc%10);
-        if (link->conf.Vpp1)
-                printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
+        printk(KERN_INFO "%s: index 0x%02x: ",
+               dev->node.dev_name, link->conf.ConfigIndex);
+        if (link->conf.Vpp)
+                printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %d", link->irq.AssignedIRQ);
         if (link->io.NumPorts1)
@@ -408,14 +377,12 @@ static void airo_config(dev_link_t *link)
                 printk(", mem 0x%06lx-0x%06lx", req.Base,
                        req.Base+req.Size-1);
         printk("\n");
-        
-        link->state &= ~DEV_CONFIG_PENDING;
-        return;
-        
+        return 0;
+
  cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
         airo_release(link);
-        
+        return -ENODEV;
 } /* airo_config */
 
 /*======================================================================
@@ -426,51 +393,26 @@ static void airo_config(dev_link_t *link)
   
   ======================================================================*/
 
-static void airo_release(dev_link_t *link)
+static void airo_release(struct pcmcia_device *link)
 {
         DEBUG(0, "airo_release(0x%p)\n", link);
-        
-        /* Unlink the device chain */
-        link->dev = NULL;
-        
-        /*
-          In a normal driver, additional code may be needed to release
-          other kernel data structures associated with this device. 
-        */
-        
-        /* Don't bother checking to see if these succeed or not */
-        if (link->win)
-                pcmcia_release_window(link->win);
-        pcmcia_release_configuration(link->handle);
-        if (link->io.NumPorts1)
-                pcmcia_release_io(link->handle, &link->io);
-        if (link->irq.AssignedIRQ)
-                pcmcia_release_irq(link->handle, &link->irq);
-        link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
 }
 
-static int airo_suspend(struct pcmcia_device *p_dev)
+static int airo_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         local_info_t *local = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                netif_device_detach(local->eth_dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        netif_device_detach(local->eth_dev);
 
         return 0;
 }
 
-static int airo_resume(struct pcmcia_device *p_dev)
+static int airo_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         local_info_t *local = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
+        if (link->open) {
                 reset_airo_card(local->eth_dev);
                 netif_device_attach(local->eth_dev);
         }
@@ -492,7 +434,7 @@ static struct pcmcia_driver airo_driver = {
         .drv            = {
                 .name   = "airo_cs",
         },
-        .probe          = airo_attach,
+        .probe          = airo_probe,
         .remove         = airo_detach,
         .id_table       = airo_ids,
         .suspend        = airo_suspend,
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index d6f4a5a3e55a..26bf1127524d 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -91,8 +91,8 @@ MODULE_SUPPORTED_DEVICE("Atmel at76c50x PCMCIA cards");
    event handler. 
 */
 
-static void atmel_config(dev_link_t *link);
-static void atmel_release(dev_link_t *link);
+static int atmel_config(struct pcmcia_device *link);
+static void atmel_release(struct pcmcia_device *link);
 
 /*
    The attach() and detach() entry points are used to create and destroy
@@ -112,10 +112,10 @@ static void atmel_detach(struct pcmcia_device *p_dev);
 /*
    A linked list of "instances" of the  atmelnet device.  Each actual
    PCMCIA card corresponds to one device instance, and is described
-   by one dev_link_t structure (defined in ds.h).
+   by one struct pcmcia_device structure (defined in ds.h).
 
    You may not want to use a linked list for this -- for example, the
-   memory card driver uses an array of dev_link_t pointers, where minor
+   memory card driver uses an array of struct pcmcia_device pointers, where minor
    device numbers are used to derive the corresponding array index.
 */
 
@@ -125,7 +125,7 @@ static void atmel_detach(struct pcmcia_device *p_dev);
    example, ethernet cards, modems).  In other cases, there may be
    many actual or logical devices (SCSI adapters, memory cards with
    multiple partitions).  The dev_node_t structures need to be kept
-   in a linked list starting at the 'dev' field of a dev_link_t
+   in a linked list starting at the 'dev' field of a struct pcmcia_device
    structure.  We allocate them in the card's private data structure,
    because they generally shouldn't be allocated dynamically.
 
@@ -152,24 +152,16 @@ typedef struct local_info_t {
   
   ======================================================================*/
 
-static int atmel_attach(struct pcmcia_device *p_dev)
+static int atmel_probe(struct pcmcia_device *p_dev)
 {
-        dev_link_t *link;
         local_info_t *local;
 
         DEBUG(0, "atmel_attach()\n");
 
-        /* Initialize the dev_link_t structure */
-        link = kzalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-        if (!link) {
-                printk(KERN_ERR "atmel_cs: no memory for new device\n");
-                return -ENOMEM;
-        }
-
         /* Interrupt setup */
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
-        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-        link->irq.Handler = NULL;
+        p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+        p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+        p_dev->irq.Handler = NULL;
 
         /*
           General socket configuration defaults can go here.  In this
@@ -178,26 +170,18 @@ static int atmel_attach(struct pcmcia_device *p_dev)
           and attributes of IO windows) are fixed by the nature of the
           device, and can be hard-wired here.
         */
-        link->conf.Attributes = 0;
-        link->conf.Vcc = 50;
-        link->conf.IntType = INT_MEMORY_AND_IO;
+        p_dev->conf.Attributes = 0;
+        p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
         /* Allocate space for private device-specific data */
         local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
         if (!local) {
                 printk(KERN_ERR "atmel_cs: no memory for new device\n");
-                kfree (link);
                 return -ENOMEM;
         }
-        link->priv = local;
+        p_dev->priv = local;
 
-        link->handle = p_dev;
-        p_dev->instance = link;
-
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        atmel_config(link);
-
-        return 0;
+        return atmel_config(p_dev);
 } /* atmel_attach */
 
 /*======================================================================
@@ -209,17 +193,13 @@ static int atmel_attach(struct pcmcia_device *p_dev)
   
   ======================================================================*/
 
-static void atmel_detach(struct pcmcia_device *p_dev)
+static void atmel_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         DEBUG(0, "atmel_detach(0x%p)\n", link);
 
-        if (link->state & DEV_CONFIG)
-                atmel_release(link);
+        atmel_release(link);
 
         kfree(link->priv);
-        kfree(link);
 }
 
 /*======================================================================
@@ -236,19 +216,17 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 /* Call-back function to interrogate PCMCIA-specific information
    about the current existance of the card */
 static int card_present(void *arg)
-{ 
-        dev_link_t *link = (dev_link_t *)arg;
-        if (link->state & DEV_SUSPEND)
-                return 0;
-        else if (link->state & DEV_PRESENT)
+{
+        struct pcmcia_device *link = (struct pcmcia_device *)arg;
+
+        if (pcmcia_dev_present(link))
                 return 1;
-        
+
         return 0;
 }
 
-static void atmel_config(dev_link_t *link)
+static int atmel_config(struct pcmcia_device *link)
 {
-        client_handle_t handle;
         tuple_t tuple;
         cisparse_t parse;
         local_info_t *dev;
@@ -256,9 +234,8 @@ static void atmel_config(dev_link_t *link)
         u_char buf[64];
         struct pcmcia_device_id *did;
 
-        handle = link->handle;
         dev = link->priv;
-        did = handle_to_dev(handle).driver_data;
+        did = handle_to_dev(link).driver_data;
 
         DEBUG(0, "atmel_config(0x%p)\n", link);
         
@@ -272,15 +249,12 @@ static void atmel_config(dev_link_t *link)
           registers.
         */
         tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present = parse.config.rmask[0];
-        
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-        
+
         /*
           In this loop, we scan the CIS for configuration table entries,
           each of which describes a valid card configuration, including
@@ -294,12 +268,12 @@ static void atmel_config(dev_link_t *link)
           will only use the CIS to fill in implementation-defined details.
         */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         while (1) {
                 cistpl_cftable_entry_t dflt = { 0 };
                 cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                                pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
+                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
                         goto next_entry;
                 
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
@@ -314,16 +288,11 @@ static void atmel_config(dev_link_t *link)
                 
                 /* Use power settings for Vcc and Vpp if present */
                 /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vcc = cfg->vcc.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vcc = dflt.vcc.param[CISTPL_POWER_VNOM]/10000;
-                
                 if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
                 else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
                 
                 /* Do we need to allocate an interrupt? */
@@ -349,14 +318,14 @@ static void atmel_config(dev_link_t *link)
                 }
                 
                 /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link->handle, &link->io) != 0)
+                if (pcmcia_request_io(link, &link->io) != 0)
                         goto next_entry;
 
                 /* If we got this far, we're cool! */
                 break;
                 
         next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
         }
         
         /*
@@ -365,14 +334,14 @@ static void atmel_config(dev_link_t *link)
           irq structure is initialized.
         */
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
-                CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+                CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
         
         /*
           This actually configures the PCMCIA socket -- setting up
           the I/O windows and the interrupt mapping, and putting the
           card and host interface into "Memory and IO" mode.
         */
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
         
         if (link->irq.AssignedIRQ == 0) {
                 printk(KERN_ALERT 
@@ -384,7 +353,7 @@ static void atmel_config(dev_link_t *link)
                 init_atmel_card(link->irq.AssignedIRQ,
                                 link->io.BasePort1,
                                 did ? did->driver_info : ATMEL_FW_TYPE_NONE,
-                                &handle_to_dev(handle),
+                                &handle_to_dev(link),
                                 card_present, 
                                 link);
         if (!((local_info_t*)link->priv)->eth_dev) 
@@ -393,18 +362,18 @@ static void atmel_config(dev_link_t *link)
         
         /*
           At this point, the dev_node_t structure(s) need to be
-          initialized and arranged in a linked list at link->dev.
+          initialized and arranged in a linked list at link->dev_node.
         */
         strcpy(dev->node.dev_name, ((local_info_t*)link->priv)->eth_dev->name );
         dev->node.major = dev->node.minor = 0;
-        link->dev = &dev->node;
-                        
-        link->state &= ~DEV_CONFIG_PENDING;
-        return;
-        
+        link->dev_node = &dev->node;
+
+        return 0;
+
  cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
         atmel_release(link);
+        return -ENODEV;
 }
 
 /*======================================================================
@@ -415,53 +384,34 @@ static void atmel_config(dev_link_t *link)
   
   ======================================================================*/
 
-static void atmel_release(dev_link_t *link)
+static void atmel_release(struct pcmcia_device *link)
 {
         struct net_device *dev = ((local_info_t*)link->priv)->eth_dev;
-                
+
         DEBUG(0, "atmel_release(0x%p)\n", link);
-        
-        /* Unlink the device chain */
-        link->dev = NULL;
-        
-        if (dev) 
+
+        if (dev)
                 stop_atmel_card(dev);
-        ((local_info_t*)link->priv)->eth_dev = NULL; 
-        
-        /* Don't bother checking to see if these succeed or not */
-        pcmcia_release_configuration(link->handle);
-        if (link->io.NumPorts1)
-                pcmcia_release_io(link->handle, &link->io);
-        if (link->irq.AssignedIRQ)
-                pcmcia_release_irq(link->handle, &link->irq);
-        link->state &= ~DEV_CONFIG;
+        ((local_info_t*)link->priv)->eth_dev = NULL;
+
+        pcmcia_disable_device(link);
 }
 
-static int atmel_suspend(struct pcmcia_device *dev)
+static int atmel_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
         local_info_t *local = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                netif_device_detach(local->eth_dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        netif_device_detach(local->eth_dev);
 
         return 0;
 }
 
-static int atmel_resume(struct pcmcia_device *dev)
+static int atmel_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
         local_info_t *local = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                atmel_open(local->eth_dev);
-                netif_device_attach(local->eth_dev);
-        }
+        atmel_open(local->eth_dev);
+        netif_device_attach(local->eth_dev);
 
         return 0;
 }
@@ -515,7 +465,7 @@ static struct pcmcia_driver atmel_driver = {
         .drv            = {
                 .name   = "atmel_cs",
         },
-        .probe          = atmel_attach,
+        .probe          = atmel_probe,
         .remove         = atmel_detach,
         .id_table       = atmel_ids,
         .suspend        = atmel_suspend,
diff --git a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig
new file mode 100644
index 000000000000..418465600a77
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/Kconfig
@@ -0,0 +1,62 @@
+config BCM43XX
+        tristate "Broadcom BCM43xx wireless support"
+        depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL
+        select FW_LOADER
+        ---help---
+          This is an experimental driver for the Broadcom 43xx wireless chip,
+          found in the Apple Airport Extreme and various other devices.
+
+config BCM43XX_DEBUG
+        bool "Broadcom BCM43xx debugging (RECOMMENDED)"
+        depends on BCM43XX
+        default y
+        ---help---
+          Broadcom 43xx debugging messages.
+          Say Y, because the driver is still very experimental and
+          this will help you get it running.
+
+config BCM43XX_DMA
+        bool
+config BCM43XX_PIO
+        bool
+
+choice
+        prompt "BCM43xx data transfer mode"
+        depends on BCM43XX
+        default BCM43XX_DMA_AND_PIO_MODE
+
+config BCM43XX_DMA_AND_PIO_MODE
+        bool "DMA + PIO"
+        select BCM43XX_DMA
+        select BCM43XX_PIO
+        ---help---
+          Include both, Direct Memory Access (DMA) and Programmed I/O (PIO)
+          data transfer modes.
+          The actually used mode is selectable through the module
+          parameter "pio". If the module parameter is pio=0, DMA is used.
+          Otherwise PIO is used. DMA is default.
+
+          If unsure, choose this option.
+
+config BCM43XX_DMA_MODE
+        bool "DMA (Direct Memory Access) only"
+        select BCM43XX_DMA
+        ---help---
+          Only include Direct Memory Access (DMA).
+          This reduces the size of the driver module, by omitting the PIO code.
+
+config BCM43XX_PIO_MODE
+        bool "PIO (Programmed I/O) only"
+        select BCM43XX_PIO
+        ---help---
+          Only include Programmed I/O (PIO).
+          This reduces the size of the driver module, by omitting the DMA code.
+          Please note that PIO transfers are slow (compared to DMA).
+
+          Also note that not all devices of the 43xx series support PIO.
+          The 4306 (Apple Airport Extreme and others) supports PIO, while
+          the 4318 is known to _not_ support PIO.
+
+          Only use PIO, if DMA does not work for you.
+
+endchoice
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
new file mode 100644
index 000000000000..bb5220c629d2
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/Makefile
@@ -0,0 +1,12 @@
+obj-$(CONFIG_BCM43XX) += bcm43xx.o
+bcm43xx-obj-$(CONFIG_BCM43XX_DEBUG) += bcm43xx_debugfs.o
+
+bcm43xx-obj-$(CONFIG_BCM43XX_DMA) += bcm43xx_dma.o
+bcm43xx-obj-$(CONFIG_BCM43XX_PIO) += bcm43xx_pio.o
+
+bcm43xx-objs := bcm43xx_main.o bcm43xx_ilt.o \
+                bcm43xx_radio.o bcm43xx_phy.o \
+                bcm43xx_power.o bcm43xx_wx.o \
+                bcm43xx_leds.o bcm43xx_ethtool.o \
+                bcm43xx_xmit.o bcm43xx_sysfs.o \
+                $(bcm43xx-obj-y)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
new file mode 100644
index 000000000000..dcadd295de4f
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -0,0 +1,926 @@
+#ifndef BCM43xx_H_
+#define BCM43xx_H_
+
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/stringify.h>
+#include <linux/pci.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211softmac.h>
+#include <asm/atomic.h>
+#include <asm/io.h>
+
+
+#include "bcm43xx_debugfs.h"
+#include "bcm43xx_leds.h"
+#include "bcm43xx_sysfs.h"
+
+
+#define PFX                             KBUILD_MODNAME ": "
+
+#define BCM43xx_SWITCH_CORE_MAX_RETRIES 50
+#define BCM43xx_IRQWAIT_MAX_RETRIES     50
+
+#define BCM43xx_IO_SIZE                 8192
+
+/* Active Core PCI Configuration Register. */
+#define BCM43xx_PCICFG_ACTIVE_CORE      0x80
+/* SPROM control register. */
+#define BCM43xx_PCICFG_SPROMCTL         0x88
+/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */
+#define BCM43xx_PCICFG_ICR              0x94
+
+/* MMIO offsets */
+#define BCM43xx_MMIO_DMA1_REASON        0x20
+#define BCM43xx_MMIO_DMA1_IRQ_MASK      0x24
+#define BCM43xx_MMIO_DMA2_REASON        0x28
+#define BCM43xx_MMIO_DMA2_IRQ_MASK      0x2C
+#define BCM43xx_MMIO_DMA3_REASON        0x30
+#define BCM43xx_MMIO_DMA3_IRQ_MASK      0x34
+#define BCM43xx_MMIO_DMA4_REASON        0x38
+#define BCM43xx_MMIO_DMA4_IRQ_MASK      0x3C
+#define BCM43xx_MMIO_STATUS_BITFIELD    0x120
+#define BCM43xx_MMIO_STATUS2_BITFIELD   0x124
+#define BCM43xx_MMIO_GEN_IRQ_REASON     0x128
+#define BCM43xx_MMIO_GEN_IRQ_MASK       0x12C
+#define BCM43xx_MMIO_RAM_CONTROL        0x130
+#define BCM43xx_MMIO_RAM_DATA           0x134
+#define BCM43xx_MMIO_PS_STATUS          0x140
+#define BCM43xx_MMIO_RADIO_HWENABLED_HI 0x158
+#define BCM43xx_MMIO_SHM_CONTROL        0x160
+#define BCM43xx_MMIO_SHM_DATA           0x164
+#define BCM43xx_MMIO_SHM_DATA_UNALIGNED 0x166
+#define BCM43xx_MMIO_XMITSTAT_0         0x170
+#define BCM43xx_MMIO_XMITSTAT_1         0x174
+#define BCM43xx_MMIO_REV3PLUS_TSF_LOW   0x180 /* core rev >= 3 only */
+#define BCM43xx_MMIO_REV3PLUS_TSF_HIGH  0x184 /* core rev >= 3 only */
+#define BCM43xx_MMIO_DMA1_BASE          0x200
+#define BCM43xx_MMIO_DMA2_BASE          0x220
+#define BCM43xx_MMIO_DMA3_BASE          0x240
+#define BCM43xx_MMIO_DMA4_BASE          0x260
+#define BCM43xx_MMIO_PIO1_BASE          0x300
+#define BCM43xx_MMIO_PIO2_BASE          0x310
+#define BCM43xx_MMIO_PIO3_BASE          0x320
+#define BCM43xx_MMIO_PIO4_BASE          0x330
+#define BCM43xx_MMIO_PHY_VER            0x3E0
+#define BCM43xx_MMIO_PHY_RADIO          0x3E2
+#define BCM43xx_MMIO_ANTENNA            0x3E8
+#define BCM43xx_MMIO_CHANNEL            0x3F0
+#define BCM43xx_MMIO_CHANNEL_EXT        0x3F4
+#define BCM43xx_MMIO_RADIO_CONTROL      0x3F6
+#define BCM43xx_MMIO_RADIO_DATA_HIGH    0x3F8
+#define BCM43xx_MMIO_RADIO_DATA_LOW     0x3FA
+#define BCM43xx_MMIO_PHY_CONTROL        0x3FC
+#define BCM43xx_MMIO_PHY_DATA           0x3FE
+#define BCM43xx_MMIO_MACFILTER_CONTROL  0x420
+#define BCM43xx_MMIO_MACFILTER_DATA     0x422
+#define BCM43xx_MMIO_RADIO_HWENABLED_LO 0x49A
+#define BCM43xx_MMIO_GPIO_CONTROL       0x49C
+#define BCM43xx_MMIO_GPIO_MASK          0x49E
+#define BCM43xx_MMIO_TSF_0              0x632 /* core rev < 3 only */
+#define BCM43xx_MMIO_TSF_1              0x634 /* core rev < 3 only */
+#define BCM43xx_MMIO_TSF_2              0x636 /* core rev < 3 only */
+#define BCM43xx_MMIO_TSF_3              0x638 /* core rev < 3 only */
+#define BCM43xx_MMIO_POWERUP_DELAY      0x6A8
+
+/* SPROM offsets. */
+#define BCM43xx_SPROM_BASE              0x1000
+#define BCM43xx_SPROM_BOARDFLAGS2       0x1c
+#define BCM43xx_SPROM_IL0MACADDR        0x24
+#define BCM43xx_SPROM_ET0MACADDR        0x27
+#define BCM43xx_SPROM_ET1MACADDR        0x2a
+#define BCM43xx_SPROM_ETHPHY            0x2d
+#define BCM43xx_SPROM_BOARDREV          0x2e
+#define BCM43xx_SPROM_PA0B0             0x2f
+#define BCM43xx_SPROM_PA0B1             0x30
+#define BCM43xx_SPROM_PA0B2             0x31
+#define BCM43xx_SPROM_WL0GPIO0          0x32
+#define BCM43xx_SPROM_WL0GPIO2          0x33
+#define BCM43xx_SPROM_MAXPWR            0x34
+#define BCM43xx_SPROM_PA1B0             0x35
+#define BCM43xx_SPROM_PA1B1             0x36
+#define BCM43xx_SPROM_PA1B2             0x37
+#define BCM43xx_SPROM_IDL_TSSI_TGT      0x38
+#define BCM43xx_SPROM_BOARDFLAGS        0x39
+#define BCM43xx_SPROM_ANTENNA_GAIN      0x3a
+#define BCM43xx_SPROM_VERSION           0x3f
+
+/* BCM43xx_SPROM_BOARDFLAGS values */
+#define BCM43xx_BFL_BTCOEXIST           0x0001 /* implements Bluetooth coexistance */
+#define BCM43xx_BFL_PACTRL              0x0002 /* GPIO 9 controlling the PA */
+#define BCM43xx_BFL_AIRLINEMODE         0x0004 /* implements GPIO 13 radio disable indication */
+#define BCM43xx_BFL_RSSI                0x0008 /* software calculates nrssi slope. */
+#define BCM43xx_BFL_ENETSPI             0x0010 /* has ephy roboswitch spi */
+#define BCM43xx_BFL_XTAL_NOSLOW         0x0020 /* no slow clock available */
+#define BCM43xx_BFL_CCKHIPWR            0x0040 /* can do high power CCK transmission */
+#define BCM43xx_BFL_ENETADM             0x0080 /* has ADMtek switch */
+#define BCM43xx_BFL_ENETVLAN            0x0100 /* can do vlan */
+#define BCM43xx_BFL_AFTERBURNER         0x0200 /* supports Afterburner mode */
+#define BCM43xx_BFL_NOPCI               0x0400 /* leaves PCI floating */
+#define BCM43xx_BFL_FEM                 0x0800 /* supports the Front End Module */
+#define BCM43xx_BFL_EXTLNA              0x1000 /* has an external LNA */
+#define BCM43xx_BFL_HGPA                0x2000 /* had high gain PA */
+#define BCM43xx_BFL_BTCMOD              0x4000 /* BFL_BTCOEXIST is given in alternate GPIOs */
+#define BCM43xx_BFL_ALTIQ               0x8000 /* alternate I/Q settings */
+
+/* GPIO register offset, in both ChipCommon and PCI core. */
+#define BCM43xx_GPIO_CONTROL            0x6c
+
+/* SHM Routing */
+#define BCM43xx_SHM_SHARED              0x0001
+#define BCM43xx_SHM_WIRELESS            0x0002
+#define BCM43xx_SHM_PCM                 0x0003
+#define BCM43xx_SHM_HWMAC               0x0004
+#define BCM43xx_SHM_UCODE               0x0300
+
+/* MacFilter offsets. */
+#define BCM43xx_MACFILTER_SELF          0x0000
+#define BCM43xx_MACFILTER_ASSOC         0x0003
+
+/* Chipcommon registers. */
+#define BCM43xx_CHIPCOMMON_CAPABILITIES         0x04
+#define BCM43xx_CHIPCOMMON_PLLONDELAY           0xB0
+#define BCM43xx_CHIPCOMMON_FREFSELDELAY         0xB4
+#define BCM43xx_CHIPCOMMON_SLOWCLKCTL           0xB8
+#define BCM43xx_CHIPCOMMON_SYSCLKCTL            0xC0
+
+/* PCI core specific registers. */
+#define BCM43xx_PCICORE_BCAST_ADDR      0x50
+#define BCM43xx_PCICORE_BCAST_DATA      0x54
+#define BCM43xx_PCICORE_SBTOPCI2        0x108
+
+/* SBTOPCI2 values. */
+#define BCM43xx_SBTOPCI2_PREFETCH       0x4
+#define BCM43xx_SBTOPCI2_BURST          0x8
+
+/* Chipcommon capabilities. */
+#define BCM43xx_CAPABILITIES_PCTL               0x00040000
+#define BCM43xx_CAPABILITIES_PLLMASK            0x00030000
+#define BCM43xx_CAPABILITIES_PLLSHIFT           16
+#define BCM43xx_CAPABILITIES_FLASHMASK          0x00000700
+#define BCM43xx_CAPABILITIES_FLASHSHIFT         8
+#define BCM43xx_CAPABILITIES_EXTBUSPRESENT      0x00000040
+#define BCM43xx_CAPABILITIES_UARTGPIO           0x00000020
+#define BCM43xx_CAPABILITIES_UARTCLOCKMASK      0x00000018
+#define BCM43xx_CAPABILITIES_UARTCLOCKSHIFT     3
+#define BCM43xx_CAPABILITIES_MIPSBIGENDIAN      0x00000004
+#define BCM43xx_CAPABILITIES_NRUARTSMASK        0x00000003
+
+/* PowerControl */
+#define BCM43xx_PCTL_IN                 0xB0
+#define BCM43xx_PCTL_OUT                0xB4
+#define BCM43xx_PCTL_OUTENABLE          0xB8
+#define BCM43xx_PCTL_XTAL_POWERUP       0x40
+#define BCM43xx_PCTL_PLL_POWERDOWN      0x80
+
+/* PowerControl Clock Modes */
+#define BCM43xx_PCTL_CLK_FAST           0x00
+#define BCM43xx_PCTL_CLK_SLOW           0x01
+#define BCM43xx_PCTL_CLK_DYNAMIC        0x02
+
+#define BCM43xx_PCTL_FORCE_SLOW         0x0800
+#define BCM43xx_PCTL_FORCE_PLL          0x1000
+#define BCM43xx_PCTL_DYN_XTAL           0x2000
+
+/* COREIDs */
+#define BCM43xx_COREID_CHIPCOMMON       0x800
+#define BCM43xx_COREID_ILINE20          0x801
+#define BCM43xx_COREID_SDRAM            0x803
+#define BCM43xx_COREID_PCI              0x804
+#define BCM43xx_COREID_MIPS             0x805
+#define BCM43xx_COREID_ETHERNET         0x806
+#define BCM43xx_COREID_V90              0x807
+#define BCM43xx_COREID_USB11_HOSTDEV    0x80a
+#define BCM43xx_COREID_IPSEC            0x80b
+#define BCM43xx_COREID_PCMCIA           0x80d
+#define BCM43xx_COREID_EXT_IF           0x80f
+#define BCM43xx_COREID_80211            0x812
+#define BCM43xx_COREID_MIPS_3302        0x816
+#define BCM43xx_COREID_USB11_HOST       0x817
+#define BCM43xx_COREID_USB11_DEV        0x818
+#define BCM43xx_COREID_USB20_HOST       0x819
+#define BCM43xx_COREID_USB20_DEV        0x81a
+#define BCM43xx_COREID_SDIO_HOST        0x81b
+
+/* Core Information Registers */
+#define BCM43xx_CIR_BASE                0xf00
+#define BCM43xx_CIR_SBTPSFLAG           (BCM43xx_CIR_BASE + 0x18)
+#define BCM43xx_CIR_SBIMSTATE           (BCM43xx_CIR_BASE + 0x90)
+#define BCM43xx_CIR_SBINTVEC            (BCM43xx_CIR_BASE + 0x94)
+#define BCM43xx_CIR_SBTMSTATELOW        (BCM43xx_CIR_BASE + 0x98)
+#define BCM43xx_CIR_SBTMSTATEHIGH       (BCM43xx_CIR_BASE + 0x9c)
+#define BCM43xx_CIR_SBIMCONFIGLOW       (BCM43xx_CIR_BASE + 0xa8)
+#define BCM43xx_CIR_SB_ID_HI            (BCM43xx_CIR_BASE + 0xfc)
+
+/* Mask to get the Backplane Flag Number from SBTPSFLAG. */
+#define BCM43xx_BACKPLANE_FLAG_NR_MASK  0x3f
+
+/* SBIMCONFIGLOW values/masks. */
+#define BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK         0x00000007
+#define BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT        0
+#define BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK         0x00000070
+#define BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT        4
+#define BCM43xx_SBIMCONFIGLOW_CONNID_MASK               0x00ff0000
+#define BCM43xx_SBIMCONFIGLOW_CONNID_SHIFT              16
+
+/* sbtmstatelow state flags */
+#define BCM43xx_SBTMSTATELOW_RESET              0x01
+#define BCM43xx_SBTMSTATELOW_REJECT             0x02
+#define BCM43xx_SBTMSTATELOW_CLOCK              0x10000
+#define BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK   0x20000
+
+/* sbtmstatehigh state flags */
+#define BCM43xx_SBTMSTATEHIGH_SERROR            0x1
+#define BCM43xx_SBTMSTATEHIGH_BUSY              0x4
+
+/* sbimstate flags */
+#define BCM43xx_SBIMSTATE_IB_ERROR              0x20000
+#define BCM43xx_SBIMSTATE_TIMEOUT               0x40000
+
+/* PHYVersioning */
+#define BCM43xx_PHYTYPE_A               0x00
+#define BCM43xx_PHYTYPE_B               0x01
+#define BCM43xx_PHYTYPE_G               0x02
+
+/* PHYRegisters */
+#define BCM43xx_PHY_ILT_A_CTRL          0x0072
+#define BCM43xx_PHY_ILT_A_DATA1         0x0073
+#define BCM43xx_PHY_ILT_A_DATA2         0x0074
+#define BCM43xx_PHY_G_LO_CONTROL        0x0810
+#define BCM43xx_PHY_ILT_G_CTRL          0x0472
+#define BCM43xx_PHY_ILT_G_DATA1         0x0473
+#define BCM43xx_PHY_ILT_G_DATA2         0x0474
+#define BCM43xx_PHY_A_PCTL              0x007B
+#define BCM43xx_PHY_G_PCTL              0x0029
+#define BCM43xx_PHY_A_CRS               0x0029
+#define BCM43xx_PHY_RADIO_BITFIELD      0x0401
+#define BCM43xx_PHY_G_CRS               0x0429
+#define BCM43xx_PHY_NRSSILT_CTRL        0x0803
+#define BCM43xx_PHY_NRSSILT_DATA        0x0804
+
+/* RadioRegisters */
+#define BCM43xx_RADIOCTL_ID             0x01
+
+/* StatusBitField */
+#define BCM43xx_SBF_MAC_ENABLED         0x00000001
+#define BCM43xx_SBF_2                   0x00000002 /*FIXME: fix name*/
+#define BCM43xx_SBF_CORE_READY          0x00000004
+#define BCM43xx_SBF_400                 0x00000400 /*FIXME: fix name*/
+#define BCM43xx_SBF_4000                0x00004000 /*FIXME: fix name*/
+#define BCM43xx_SBF_8000                0x00008000 /*FIXME: fix name*/
+#define BCM43xx_SBF_XFER_REG_BYTESWAP   0x00010000
+#define BCM43xx_SBF_MODE_NOTADHOC       0x00020000
+#define BCM43xx_SBF_MODE_AP             0x00040000
+#define BCM43xx_SBF_RADIOREG_LOCK       0x00080000
+#define BCM43xx_SBF_MODE_MONITOR        0x00400000
+#define BCM43xx_SBF_MODE_PROMISC        0x01000000
+#define BCM43xx_SBF_PS1                 0x02000000
+#define BCM43xx_SBF_PS2                 0x04000000
+#define BCM43xx_SBF_NO_SSID_BCAST       0x08000000
+#define BCM43xx_SBF_TIME_UPDATE         0x10000000
+#define BCM43xx_SBF_80000000            0x80000000 /*FIXME: fix name*/
+
+/* MicrocodeFlagsBitfield (addr + lo-word values?)*/
+#define BCM43xx_UCODEFLAGS_OFFSET       0x005E
+
+#define BCM43xx_UCODEFLAG_AUTODIV       0x0001
+#define BCM43xx_UCODEFLAG_UNKBGPHY      0x0002
+#define BCM43xx_UCODEFLAG_UNKBPHY       0x0004
+#define BCM43xx_UCODEFLAG_UNKGPHY       0x0020
+#define BCM43xx_UCODEFLAG_UNKPACTRL     0x0040
+#define BCM43xx_UCODEFLAG_JAPAN         0x0080
+
+/* Generic-Interrupt reasons. */
+#define BCM43xx_IRQ_READY               (1 << 0)
+#define BCM43xx_IRQ_BEACON              (1 << 1)
+#define BCM43xx_IRQ_PS                  (1 << 2)
+#define BCM43xx_IRQ_REG124              (1 << 5)
+#define BCM43xx_IRQ_PMQ                 (1 << 6)
+#define BCM43xx_IRQ_PIO_WORKAROUND      (1 << 8)
+#define BCM43xx_IRQ_XMIT_ERROR          (1 << 11)
+#define BCM43xx_IRQ_RX                  (1 << 15)
+#define BCM43xx_IRQ_SCAN                (1 << 16)
+#define BCM43xx_IRQ_NOISE               (1 << 18)
+#define BCM43xx_IRQ_XMIT_STATUS         (1 << 29)
+
+#define BCM43xx_IRQ_ALL                 0xffffffff
+#define BCM43xx_IRQ_INITIAL             (BCM43xx_IRQ_PS |               \
+                                         BCM43xx_IRQ_REG124 |           \
+                                         BCM43xx_IRQ_PMQ |              \
+                                         BCM43xx_IRQ_XMIT_ERROR |       \
+                                         BCM43xx_IRQ_RX |               \
+                                         BCM43xx_IRQ_SCAN |             \
+                                         BCM43xx_IRQ_NOISE |            \
+                                         BCM43xx_IRQ_XMIT_STATUS)
+                                         
+
+/* Initial default iw_mode */
+#define BCM43xx_INITIAL_IWMODE                  IW_MODE_INFRA
+
+/* Bus type PCI. */
+#define BCM43xx_BUSTYPE_PCI     0
+/* Bus type Silicone Backplane Bus. */
+#define BCM43xx_BUSTYPE_SB      1
+/* Bus type PCMCIA. */
+#define BCM43xx_BUSTYPE_PCMCIA  2
+
+/* Threshold values. */
+#define BCM43xx_MIN_RTS_THRESHOLD               1U
+#define BCM43xx_MAX_RTS_THRESHOLD               2304U
+#define BCM43xx_DEFAULT_RTS_THRESHOLD           BCM43xx_MAX_RTS_THRESHOLD
+
+#define BCM43xx_DEFAULT_SHORT_RETRY_LIMIT       7
+#define BCM43xx_DEFAULT_LONG_RETRY_LIMIT        4
+
+/* Max size of a security key */
+#define BCM43xx_SEC_KEYSIZE                     16
+/* Security algorithms. */
+enum {
+        BCM43xx_SEC_ALGO_NONE = 0, /* unencrypted, as of TX header. */
+        BCM43xx_SEC_ALGO_WEP,
+        BCM43xx_SEC_ALGO_UNKNOWN,
+        BCM43xx_SEC_ALGO_AES,
+        BCM43xx_SEC_ALGO_WEP104,
+        BCM43xx_SEC_ALGO_TKIP,
+};
+
+#ifdef assert
+# undef assert
+#endif
+#ifdef CONFIG_BCM43XX_DEBUG
+#define assert(expr) \
+        do {                                                                    \
+                if (unlikely(!(expr))) {                                        \
+                printk(KERN_ERR PFX "ASSERTION FAILED (%s) at: %s:%d:%s()\n",   \
+                        #expr, __FILE__, __LINE__, __FUNCTION__);               \
+                }                                                               \
+        } while (0)
+#else
+#define assert(expr)    do { /* nothing */ } while (0)
+#endif
+
+/* rate limited printk(). */
+#ifdef printkl
+# undef printkl
+#endif
+#define printkl(f, x...)  do { if (printk_ratelimit()) printk(f ,##x); } while (0)
+/* rate limited printk() for debugging */
+#ifdef dprintkl
+# undef dprintkl
+#endif
+#ifdef CONFIG_BCM43XX_DEBUG
+# define dprintkl               printkl
+#else
+# define dprintkl(f, x...)      do { /* nothing */ } while (0)
+#endif
+
+/* Helper macro for if branches.
+ * An if branch marked with this macro is only taken in DEBUG mode.
+ * Example:
+ *      if (DEBUG_ONLY(foo == bar)) {
+ *              do something
+ *      }
+ *      In DEBUG mode, the branch will be taken if (foo == bar).
+ *      In non-DEBUG mode, the branch will never be taken.
+ */
+#ifdef DEBUG_ONLY
+# undef DEBUG_ONLY
+#endif
+#ifdef CONFIG_BCM43XX_DEBUG
+# define DEBUG_ONLY(x)  (x)
+#else
+# define DEBUG_ONLY(x)  0
+#endif
+
+/* debugging printk() */
+#ifdef dprintk
+# undef dprintk
+#endif
+#ifdef CONFIG_BCM43XX_DEBUG
+# define dprintk(f, x...)  do { printk(f ,##x); } while (0)
+#else
+# define dprintk(f, x...)  do { /* nothing */ } while (0)
+#endif
+
+
+struct net_device;
+struct pci_dev;
+struct bcm43xx_dmaring;
+struct bcm43xx_pioqueue;
+
+struct bcm43xx_initval {
+        u16 offset;
+        u16 size;
+        u32 value;
+} __attribute__((__packed__));
+
+/* Values for bcm430x_sprominfo.locale */
+enum {
+        BCM43xx_LOCALE_WORLD = 0,
+        BCM43xx_LOCALE_THAILAND,
+        BCM43xx_LOCALE_ISRAEL,
+        BCM43xx_LOCALE_JORDAN,
+        BCM43xx_LOCALE_CHINA,
+        BCM43xx_LOCALE_JAPAN,
+        BCM43xx_LOCALE_USA_CANADA_ANZ,
+        BCM43xx_LOCALE_EUROPE,
+        BCM43xx_LOCALE_USA_LOW,
+        BCM43xx_LOCALE_JAPAN_HIGH,
+        BCM43xx_LOCALE_ALL,
+        BCM43xx_LOCALE_NONE,
+};
+
+#define BCM43xx_SPROM_SIZE      64 /* in 16-bit words. */
+struct bcm43xx_sprominfo {
+        u16 boardflags2;
+        u8 il0macaddr[6];
+        u8 et0macaddr[6];
+        u8 et1macaddr[6];
+        u8 et0phyaddr:5;
+        u8 et1phyaddr:5;
+        u8 et0mdcport:1;
+        u8 et1mdcport:1;
+        u8 boardrev;
+        u8 locale:4;
+        u8 antennas_aphy:2;
+        u8 antennas_bgphy:2;
+        u16 pa0b0;
+        u16 pa0b1;
+        u16 pa0b2;
+        u8 wl0gpio0;
+        u8 wl0gpio1;
+        u8 wl0gpio2;
+        u8 wl0gpio3;
+        u8 maxpower_aphy;
+        u8 maxpower_bgphy;
+        u16 pa1b0;
+        u16 pa1b1;
+        u16 pa1b2;
+        u8 idle_tssi_tgt_aphy;
+        u8 idle_tssi_tgt_bgphy;
+        u16 boardflags;
+        u16 antennagain_aphy;
+        u16 antennagain_bgphy;
+};
+
+/* Value pair to measure the LocalOscillator. */
+struct bcm43xx_lopair {
+        s8 low;
+        s8 high;
+        u8 used:1;
+};
+#define BCM43xx_LO_COUNT        (14*4)
+
+struct bcm43xx_phyinfo {
+        /* Hardware Data */
+        u8 version;
+        u8 type;
+        u8 rev;
+        u16 antenna_diversity;
+        u16 savedpctlreg;
+        u16 minlowsig[2];
+        u16 minlowsigpos[2];
+        u8 connected:1,
+           calibrated:1,
+           is_locked:1, /* used in bcm43xx_phy_{un}lock() */
+           dyn_tssi_tbl:1; /* used in bcm43xx_phy_init_tssi2dbm_table() */
+        /* LO Measurement Data.
+         * Use bcm43xx_get_lopair() to get a value.
+         */
+        struct bcm43xx_lopair *_lo_pairs;
+
+        /* TSSI to dBm table in use */
+        const s8 *tssi2dbm;
+        /* idle TSSI value */
+        s8 idle_tssi;
+
+        /* Values from bcm43xx_calc_loopback_gain() */
+        u16 loopback_gain[2];
+
+        /* PHY lock for core.rev < 3
+         * This lock is only used by bcm43xx_phy_{un}lock()
+         */
+        spinlock_t lock;
+};
+
+
+struct bcm43xx_radioinfo {
+        u16 manufact;
+        u16 version;
+        u8 revision;
+
+        /* Desired TX power in dBm Q5.2 */
+        u16 txpower_desired;
+        /* TX Power control values. */
+        union {
+                /* B/G PHY */
+                struct {
+                        u16 baseband_atten;
+                        u16 radio_atten;
+                        u16 txctl1;
+                        u16 txctl2;
+                };
+                /* A PHY */
+                struct {
+                        u16 txpwr_offset;
+                };
+        };
+
+        /* Current Interference Mitigation mode */
+        int interfmode;
+        /* Stack of saved values from the Interference Mitigation code.
+         * Each value in the stack is layed out as follows:
+         * bit 0-11:  offset
+         * bit 12-15: register ID
+         * bit 16-32: value
+         * register ID is: 0x1 PHY, 0x2 Radio, 0x3 ILT
+         */
+#define BCM43xx_INTERFSTACK_SIZE        26
+        u32 interfstack[BCM43xx_INTERFSTACK_SIZE];
+
+        /* Saved values from the NRSSI Slope calculation */
+        s16 nrssi[2];
+        s32 nrssislope;
+        /* In memory nrssi lookup table. */
+        s8 nrssi_lt[64];
+
+        /* current channel */
+        u8 channel;
+        u8 initial_channel;
+
+        u16 lofcal;
+
+        u16 initval;
+
+        u8 enabled:1;
+        /* ACI (adjacent channel interference) flags. */
+        u8 aci_enable:1,
+           aci_wlan_automatic:1,
+           aci_hw_rssi:1;
+};
+
+/* Data structures for DMA transmission, per 80211 core. */
+struct bcm43xx_dma {
+        struct bcm43xx_dmaring *tx_ring0;
+        struct bcm43xx_dmaring *tx_ring1;
+        struct bcm43xx_dmaring *tx_ring2;
+        struct bcm43xx_dmaring *tx_ring3;
+        struct bcm43xx_dmaring *rx_ring0;
+        struct bcm43xx_dmaring *rx_ring1; /* only available on core.rev < 5 */
+};
+
+/* Data structures for PIO transmission, per 80211 core. */
+struct bcm43xx_pio {
+        struct bcm43xx_pioqueue *queue0;
+        struct bcm43xx_pioqueue *queue1;
+        struct bcm43xx_pioqueue *queue2;
+        struct bcm43xx_pioqueue *queue3;
+};
+
+#define BCM43xx_MAX_80211_CORES         2
+
+#ifdef CONFIG_BCM947XX
+#define core_offset(bcm) (bcm)->current_core_offset
+#else
+#define core_offset(bcm) 0
+#endif
+
+/* Generic information about a core. */
+struct bcm43xx_coreinfo {
+        u8 available:1,
+           enabled:1,
+           initialized:1;
+        /** core_id ID number */
+        u16 id;
+        /** core_rev revision number */
+        u8 rev;
+        /** Index number for _switch_core() */
+        u8 index;
+};
+
+/* Additional information for each 80211 core. */
+struct bcm43xx_coreinfo_80211 {
+        /* PHY device. */
+        struct bcm43xx_phyinfo phy;
+        /* Radio device. */
+        struct bcm43xx_radioinfo radio;
+        union {
+                /* DMA context. */
+                struct bcm43xx_dma dma;
+                /* PIO context. */
+                struct bcm43xx_pio pio;
+        };
+};
+
+/* Context information for a noise calculation (Link Quality). */
+struct bcm43xx_noise_calculation {
+        struct bcm43xx_coreinfo *core_at_start;
+        u8 channel_at_start;
+        u8 calculation_running:1;
+        u8 nr_samples;
+        s8 samples[8][4];
+};
+
+struct bcm43xx_stats {
+        u8 link_quality;
+        u8 noise;
+        struct iw_statistics wstats;
+        /* Store the last TX/RX times here for updating the leds. */
+        unsigned long last_tx;
+        unsigned long last_rx;
+};
+
+struct bcm43xx_key {
+        u8 enabled:1;
+        u8 algorithm;
+};
+
+struct bcm43xx_private {
+        struct bcm43xx_sysfs sysfs;
+
+        struct ieee80211_device *ieee;
+        struct ieee80211softmac_device *softmac;
+
+        struct net_device *net_dev;
+        struct pci_dev *pci_dev;
+        unsigned int irq;
+
+        void __iomem *mmio_addr;
+        unsigned int mmio_len;
+
+        /* Do not use the lock directly. Use the bcm43xx_lock* helper
+         * functions, to be MMIO-safe. */
+        spinlock_t _lock;
+
+        /* Driver status flags. */
+        u32 initialized:1,              /* init_board() succeed */
+            was_initialized:1,          /* for PCI suspend/resume. */
+            shutting_down:1,            /* free_board() in progress */
+            __using_pio:1,              /* Internal, use bcm43xx_using_pio(). */
+            bad_frames_preempt:1,       /* Use "Bad Frames Preemption" (default off) */
+            reg124_set_0x4:1,           /* Some variable to keep track of IRQ stuff. */
+            powersaving:1,              /* TRUE if we are in PowerSaving mode. FALSE otherwise. */
+            short_preamble:1,           /* TRUE, if short preamble is enabled. */
+            firmware_norelease:1;       /* Do not release the firmware. Used on suspend. */
+
+        struct bcm43xx_stats stats;
+
+        /* Bus type we are connected to.
+         * This is currently always BCM43xx_BUSTYPE_PCI
+         */
+        u8 bustype;
+
+        u16 board_vendor;
+        u16 board_type;
+        u16 board_revision;
+
+        u16 chip_id;
+        u8 chip_rev;
+        u8 chip_package;
+
+        struct bcm43xx_sprominfo sprom;
+#define BCM43xx_NR_LEDS         4
+        struct bcm43xx_led leds[BCM43xx_NR_LEDS];
+
+        /* The currently active core. */
+        struct bcm43xx_coreinfo *current_core;
+#ifdef CONFIG_BCM947XX
+        /** current core memory offset */
+        u32 current_core_offset;
+#endif
+        struct bcm43xx_coreinfo *active_80211_core;
+        /* coreinfo structs for all possible cores follow.
+         * Note that a core might not exist.
+         * So check the coreinfo flags before using it.
+         */
+        struct bcm43xx_coreinfo core_chipcommon;
+        struct bcm43xx_coreinfo core_pci;
+        struct bcm43xx_coreinfo core_80211[ BCM43xx_MAX_80211_CORES ];
+        /* Additional information, specific to the 80211 cores. */
+        struct bcm43xx_coreinfo_80211 core_80211_ext[ BCM43xx_MAX_80211_CORES ];
+        /* Index of the current 80211 core. If current_core is not
+         * an 80211 core, this is -1.
+         */
+        int current_80211_core_idx;
+        /* Number of available 80211 cores. */
+        int nr_80211_available;
+
+        u32 chipcommon_capabilities;
+
+        /* Reason code of the last interrupt. */
+        u32 irq_reason;
+        u32 dma_reason[4];
+        /* saved irq enable/disable state bitfield. */
+        u32 irq_savedstate;
+        /* Link Quality calculation context. */
+        struct bcm43xx_noise_calculation noisecalc;
+
+        /* Threshold values. */
+        //TODO: The RTS thr has to be _used_. Currently, it is only set via WX.
+        u32 rts_threshold;
+
+        /* Interrupt Service Routine tasklet (bottom-half) */
+        struct tasklet_struct isr_tasklet;
+
+        /* Periodic tasks */
+        struct timer_list periodic_tasks;
+        unsigned int periodic_state;
+
+        struct work_struct restart_work;
+
+        /* Informational stuff. */
+        char nick[IW_ESSID_MAX_SIZE + 1];
+
+        /* encryption/decryption */
+        u16 security_offset;
+        struct bcm43xx_key key[54];
+        u8 default_key_idx;
+
+        /* Firmware. */
+        const struct firmware *ucode;
+        const struct firmware *pcm;
+        const struct firmware *initvals0;
+        const struct firmware *initvals1;
+
+        /* Debugging stuff follows. */
+#ifdef CONFIG_BCM43XX_DEBUG
+        struct bcm43xx_dfsentry *dfsentry;
+#endif
+};
+
+/* bcm43xx_(un)lock() protect struct bcm43xx_private.
+ * Note that _NO_ MMIO writes are allowed. If you want to
+ * write to the device through MMIO in the critical section, use
+ * the *_mmio lock functions.
+ * MMIO read-access is allowed, though.
+ */
+#define bcm43xx_lock(bcm, flags)        spin_lock_irqsave(&(bcm)->_lock, flags)
+#define bcm43xx_unlock(bcm, flags)      spin_unlock_irqrestore(&(bcm)->_lock, flags)
+/* bcm43xx_(un)lock_mmio() protect struct bcm43xx_private and MMIO.
+ * MMIO write-access to the device is allowed.
+ * All MMIO writes are flushed on unlock, so it is guaranteed to not
+ * interfere with other threads writing MMIO registers.
+ */
+#define bcm43xx_lock_mmio(bcm, flags)   bcm43xx_lock(bcm, flags)
+#define bcm43xx_unlock_mmio(bcm, flags) do { mmiowb(); bcm43xx_unlock(bcm, flags); } while (0)
+
+static inline
+struct bcm43xx_private * bcm43xx_priv(struct net_device *dev)
+{
+        return ieee80211softmac_priv(dev);
+}
+
+
+/* Helper function, which returns a boolean.
+ * TRUE, if PIO is used; FALSE, if DMA is used.
+ */
+#if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO)
+static inline
+int bcm43xx_using_pio(struct bcm43xx_private *bcm)
+{
+        return bcm->__using_pio;
+}
+#elif defined(CONFIG_BCM43XX_DMA)
+static inline
+int bcm43xx_using_pio(struct bcm43xx_private *bcm)
+{
+        return 0;
+}
+#elif defined(CONFIG_BCM43XX_PIO)
+static inline
+int bcm43xx_using_pio(struct bcm43xx_private *bcm)
+{
+        return 1;
+}
+#else
+# error "Using neither DMA nor PIO? Confused..."
+#endif
+
+/* Helper functions to access data structures private to the 80211 cores.
+ * Note that we _must_ have an 80211 core mapped when calling
+ * any of these functions.
+ */
+static inline
+struct bcm43xx_pio * bcm43xx_current_pio(struct bcm43xx_private *bcm)
+{
+        assert(bcm43xx_using_pio(bcm));
+        assert(bcm->current_80211_core_idx >= 0);
+        assert(bcm->current_80211_core_idx < BCM43xx_MAX_80211_CORES);
+        return &(bcm->core_80211_ext[bcm->current_80211_core_idx].pio);
+}
+static inline
+struct bcm43xx_dma * bcm43xx_current_dma(struct bcm43xx_private *bcm)
+{
+        assert(!bcm43xx_using_pio(bcm));
+        assert(bcm->current_80211_core_idx >= 0);
+        assert(bcm->current_80211_core_idx < BCM43xx_MAX_80211_CORES);
+        return &(bcm->core_80211_ext[bcm->current_80211_core_idx].dma);
+}
+static inline
+struct bcm43xx_phyinfo * bcm43xx_current_phy(struct bcm43xx_private *bcm)
+{
+        assert(bcm->current_80211_core_idx >= 0);
+        assert(bcm->current_80211_core_idx < BCM43xx_MAX_80211_CORES);
+        return &(bcm->core_80211_ext[bcm->current_80211_core_idx].phy);
+}
+static inline
+struct bcm43xx_radioinfo * bcm43xx_current_radio(struct bcm43xx_private *bcm)
+{
+        assert(bcm->current_80211_core_idx >= 0);
+        assert(bcm->current_80211_core_idx < BCM43xx_MAX_80211_CORES);
+        return &(bcm->core_80211_ext[bcm->current_80211_core_idx].radio);
+}
+
+/* Are we running in init_board() context? */
+static inline
+int bcm43xx_is_initializing(struct bcm43xx_private *bcm)
+{
+        if (bcm->initialized)
+                return 0;
+        if (bcm->shutting_down)
+                return 0;
+        return 1;
+}
+
+static inline
+struct bcm43xx_lopair * bcm43xx_get_lopair(struct bcm43xx_phyinfo *phy,
+                                           u16 radio_attenuation,
+                                           u16 baseband_attenuation)
+{
+        return phy->_lo_pairs + (radio_attenuation + 14 * (baseband_attenuation / 2));
+}
+
+
+static inline
+u16 bcm43xx_read16(struct bcm43xx_private *bcm, u16 offset)
+{
+        return ioread16(bcm->mmio_addr + core_offset(bcm) + offset);
+}
+
+static inline
+void bcm43xx_write16(struct bcm43xx_private *bcm, u16 offset, u16 value)
+{
+        iowrite16(value, bcm->mmio_addr + core_offset(bcm) + offset);
+}
+
+static inline
+u32 bcm43xx_read32(struct bcm43xx_private *bcm, u16 offset)
+{
+        return ioread32(bcm->mmio_addr + core_offset(bcm) + offset);
+}
+
+static inline
+void bcm43xx_write32(struct bcm43xx_private *bcm, u16 offset, u32 value)
+{
+        iowrite32(value, bcm->mmio_addr + core_offset(bcm) + offset);
+}
+
+static inline
+int bcm43xx_pci_read_config16(struct bcm43xx_private *bcm, int offset, u16 *value)
+{
+        return pci_read_config_word(bcm->pci_dev, offset, value);
+}
+
+static inline
+int bcm43xx_pci_read_config32(struct bcm43xx_private *bcm, int offset, u32 *value)
+{
+        return pci_read_config_dword(bcm->pci_dev, offset, value);
+}
+
+static inline
+int bcm43xx_pci_write_config16(struct bcm43xx_private *bcm, int offset, u16 value)
+{
+        return pci_write_config_word(bcm->pci_dev, offset, value);
+}
+
+static inline
+int bcm43xx_pci_write_config32(struct bcm43xx_private *bcm, int offset, u32 value)
+{
+        return pci_write_config_dword(bcm->pci_dev, offset, value);
+}
+
+/** Limit a value between two limits */
+#ifdef limit_value
+# undef limit_value
+#endif
+#define limit_value(value, min, max)  \
+        ({                                              \
+                typeof(value) __value = (value);        \
+                typeof(value) __min = (min);            \
+                typeof(value) __max = (max);            \
+                if (__value < __min)                    \
+                        __value = __min;                \
+                else if (__value > __max)               \
+                        __value = __max;                \
+                __value;                                \
+        })
+
+/** Helpers to print MAC addresses. */
+#define BCM43xx_MACFMT          "%02x:%02x:%02x:%02x:%02x:%02x"
+#define BCM43xx_MACARG(x)       ((u8*)(x))[0], ((u8*)(x))[1], \
+                                ((u8*)(x))[2], ((u8*)(x))[3], \
+                                ((u8*)(x))[4], ((u8*)(x))[5]
+
+#endif /* BCM43xx_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
new file mode 100644
index 000000000000..d2c3401e9b70
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -0,0 +1,499 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  debugfs driver debugging code
+
+  Copyright (c) 2005 Michael Buesch <mbuesch@freenet.de>
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+
+
+#include <linux/fs.h>
+#include <linux/debugfs.h>
+#include <linux/slab.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+
+#include "bcm43xx.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_debugfs.h"
+#include "bcm43xx_dma.h"
+#include "bcm43xx_pio.h"
+#include "bcm43xx_xmit.h"
+
+#define REALLY_BIG_BUFFER_SIZE  (1024*256)
+
+static struct bcm43xx_debugfs fs;
+static char really_big_buffer[REALLY_BIG_BUFFER_SIZE];
+static DECLARE_MUTEX(big_buffer_sem);
+
+
+static ssize_t write_file_dummy(struct file *file, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        return count;
+}
+
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->u.generic_ip;
+        return 0;
+}
+
+#define fappend(fmt, x...)      pos += snprintf(buf + pos, len - pos, fmt , ##x)
+
+static ssize_t devinfo_read_file(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        const size_t len = REALLY_BIG_BUFFER_SIZE;
+
+        struct bcm43xx_private *bcm = file->private_data;
+        char *buf = really_big_buffer;
+        size_t pos = 0;
+        ssize_t res;
+        struct net_device *net_dev;
+        struct pci_dev *pci_dev;
+        unsigned long flags;
+        u16 tmp16;
+        int i;
+
+        down(&big_buffer_sem);
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (!bcm->initialized) {
+                fappend("Board not initialized.\n");
+                goto out;
+        }
+        net_dev = bcm->net_dev;
+        pci_dev = bcm->pci_dev;
+
+        /* This is where the information is written to the "devinfo" file */
+        fappend("*** %s devinfo ***\n", net_dev->name);
+        fappend("vendor:           0x%04x   device:           0x%04x\n",
+                pci_dev->vendor, pci_dev->device);
+        fappend("subsystem_vendor: 0x%04x   subsystem_device: 0x%04x\n",
+                pci_dev->subsystem_vendor, pci_dev->subsystem_device);
+        fappend("IRQ: %d\n", bcm->irq);
+        fappend("mmio_addr: 0x%p   mmio_len: %u\n", bcm->mmio_addr, bcm->mmio_len);
+        fappend("chip_id: 0x%04x   chip_rev: 0x%02x\n", bcm->chip_id, bcm->chip_rev);
+        if ((bcm->core_80211[0].rev >= 3) && (bcm43xx_read32(bcm, 0x0158) & (1 << 16)))
+                fappend("Radio disabled by hardware!\n");
+        if ((bcm->core_80211[0].rev < 3) && !(bcm43xx_read16(bcm, 0x049A) & (1 << 4)))
+                fappend("Radio disabled by hardware!\n");
+        fappend("board_vendor: 0x%04x   board_type: 0x%04x\n", bcm->board_vendor,
+                bcm->board_type);
+
+        fappend("\nCores:\n");
+#define fappend_core(name, info) fappend("core \"" name "\" %s, %s, id: 0x%04x, "       \
+                                         "rev: 0x%02x, index: 0x%02x\n",                \
+                                         (info).available                               \
+                                                ? "available" : "nonavailable",         \
+                                         (info).enabled                                 \
+                                                ? "enabled" : "disabled",               \
+                                         (info).id, (info).rev, (info).index)
+        fappend_core("CHIPCOMMON", bcm->core_chipcommon);
+        fappend_core("PCI", bcm->core_pci);
+        fappend_core("first 80211", bcm->core_80211[0]);
+        fappend_core("second 80211", bcm->core_80211[1]);
+#undef fappend_core
+        tmp16 = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
+        fappend("LEDs: ");
+        for (i = 0; i < BCM43xx_NR_LEDS; i++)
+                fappend("%d ", !!(tmp16 & (1 << i)));
+        fappend("\n");
+
+out:
+        bcm43xx_unlock_mmio(bcm, flags);
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        up(&big_buffer_sem);
+        return res;
+}
+
+static ssize_t drvinfo_read_file(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        const size_t len = REALLY_BIG_BUFFER_SIZE;
+
+        char *buf = really_big_buffer;
+        size_t pos = 0;
+        ssize_t res;
+
+        down(&big_buffer_sem);
+
+        /* This is where the information is written to the "driver" file */
+        fappend(KBUILD_MODNAME " driver\n");
+        fappend("Compiled at: %s %s\n", __DATE__, __TIME__);
+
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        up(&big_buffer_sem);
+        return res;
+}
+
+static ssize_t spromdump_read_file(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        const size_t len = REALLY_BIG_BUFFER_SIZE;
+
+        struct bcm43xx_private *bcm = file->private_data;
+        char *buf = really_big_buffer;
+        size_t pos = 0;
+        ssize_t res;
+        unsigned long flags;
+
+        down(&big_buffer_sem);
+        bcm43xx_lock_mmio(bcm, flags);
+        if (!bcm->initialized) {
+                fappend("Board not initialized.\n");
+                goto out;
+        }
+
+        /* This is where the information is written to the "sprom_dump" file */
+        fappend("boardflags: 0x%04x\n", bcm->sprom.boardflags);
+
+out:
+        bcm43xx_unlock_mmio(bcm, flags);
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        up(&big_buffer_sem);
+        return res;
+}
+
+static ssize_t tsf_read_file(struct file *file, char __user *userbuf,
+                             size_t count, loff_t *ppos)
+{
+        const size_t len = REALLY_BIG_BUFFER_SIZE;
+
+        struct bcm43xx_private *bcm = file->private_data;
+        char *buf = really_big_buffer;
+        size_t pos = 0;
+        ssize_t res;
+        unsigned long flags;
+        u64 tsf;
+
+        down(&big_buffer_sem);
+        bcm43xx_lock_mmio(bcm, flags);
+        if (!bcm->initialized) {
+                fappend("Board not initialized.\n");
+                goto out;
+        }
+        bcm43xx_tsf_read(bcm, &tsf);
+        fappend("0x%08x%08x\n",
+                (unsigned int)((tsf & 0xFFFFFFFF00000000ULL) >> 32),
+                (unsigned int)(tsf & 0xFFFFFFFFULL));
+
+out:
+        bcm43xx_unlock_mmio(bcm, flags);
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        up(&big_buffer_sem);
+        return res;
+}
+
+static ssize_t tsf_write_file(struct file *file, const char __user *user_buf,
+                              size_t count, loff_t *ppos)
+{
+        struct bcm43xx_private *bcm = file->private_data;
+        char *buf = really_big_buffer;
+        ssize_t buf_size;
+        ssize_t res;
+        unsigned long flags;
+        u64 tsf;
+
+        buf_size = min(count, sizeof (really_big_buffer) - 1);
+        down(&big_buffer_sem);
+        if (copy_from_user(buf, user_buf, buf_size)) {
+                res = -EFAULT;
+                goto out_up;
+        }
+        bcm43xx_lock_mmio(bcm, flags);
+        if (!bcm->initialized) {
+                printk(KERN_INFO PFX "debugfs: Board not initialized.\n");
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        if (sscanf(buf, "%lli", &tsf) != 1) {
+                printk(KERN_INFO PFX "debugfs: invalid values for \"tsf\"\n");
+                res = -EINVAL;
+                goto out_unlock;
+        }
+        bcm43xx_tsf_write(bcm, tsf);
+        res = buf_size;
+        
+out_unlock:
+        bcm43xx_unlock_mmio(bcm, flags);
+out_up:
+        up(&big_buffer_sem);
+        return res;
+}
+
+static ssize_t txstat_read_file(struct file *file, char __user *userbuf,
+                                size_t count, loff_t *ppos)
+{
+        const size_t len = REALLY_BIG_BUFFER_SIZE;
+
+        struct bcm43xx_private *bcm = file->private_data;
+        char *buf = really_big_buffer;
+        size_t pos = 0;
+        ssize_t res;
+        unsigned long flags;
+        struct bcm43xx_dfsentry *e;
+        struct bcm43xx_xmitstatus *status;
+        int i, cnt, j = 0;
+
+        down(&big_buffer_sem);
+        bcm43xx_lock(bcm, flags);
+
+        fappend("Last %d logged xmitstatus blobs (Latest first):\n\n",
+                BCM43xx_NR_LOGGED_XMITSTATUS);
+        e = bcm->dfsentry;
+        if (e->xmitstatus_printing == 0) {
+                /* At the beginning, make a copy of all data to avoid
+                 * concurrency, as this function is called multiple
+                 * times for big logs. Without copying, the data might
+                 * change between reads. This would result in total trash.
+                 */
+                e->xmitstatus_printing = 1;
+                e->saved_xmitstatus_ptr = e->xmitstatus_ptr;
+                e->saved_xmitstatus_cnt = e->xmitstatus_cnt;
+                memcpy(e->xmitstatus_print_buffer, e->xmitstatus_buffer,
+                       BCM43xx_NR_LOGGED_XMITSTATUS * sizeof(*(e->xmitstatus_buffer)));
+        }
+        i = e->saved_xmitstatus_ptr - 1;
+        if (i < 0)
+                i = BCM43xx_NR_LOGGED_XMITSTATUS - 1;
+        cnt = e->saved_xmitstatus_cnt;
+        while (cnt) {
+                status = e->xmitstatus_print_buffer + i;
+                fappend("0x%02x:   cookie: 0x%04x,  flags: 0x%02x,  "
+                        "cnt1: 0x%02x,  cnt2: 0x%02x,  seq: 0x%04x,  "
+                        "unk: 0x%04x\n", j,
+                        status->cookie, status->flags,
+                        status->cnt1, status->cnt2, status->seq,
+                        status->unknown);
+                j++;
+                cnt--;
+                i--;
+                if (i < 0)
+                        i = BCM43xx_NR_LOGGED_XMITSTATUS - 1;
+        }
+
+        bcm43xx_unlock(bcm, flags);
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+        bcm43xx_lock(bcm, flags);
+        if (*ppos == pos) {
+                /* Done. Drop the copied data. */
+                e->xmitstatus_printing = 0;
+        }
+        bcm43xx_unlock(bcm, flags);
+        up(&big_buffer_sem);
+        return res;
+}
+
+#undef fappend
+
+
+static struct file_operations devinfo_fops = {
+        .read = devinfo_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations spromdump_fops = {
+        .read = spromdump_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations drvinfo_fops = {
+        .read = drvinfo_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations tsf_fops = {
+        .read = tsf_read_file,
+        .write = tsf_write_file,
+        .open = open_file_generic,
+};
+
+static struct file_operations txstat_fops = {
+        .read = txstat_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+
+void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_dfsentry *e;
+        char devdir[IFNAMSIZ];
+
+        assert(bcm);
+        e = kzalloc(sizeof(*e), GFP_KERNEL);
+        if (!e) {
+                printk(KERN_ERR PFX "out of memory\n");
+                return;
+        }
+        e->bcm = bcm;
+        e->xmitstatus_buffer = kzalloc(BCM43xx_NR_LOGGED_XMITSTATUS
+                                       * sizeof(*(e->xmitstatus_buffer)),
+                                       GFP_KERNEL);
+        if (!e->xmitstatus_buffer) {
+                printk(KERN_ERR PFX "out of memory\n");
+                kfree(e);
+                return;
+        }
+        e->xmitstatus_print_buffer = kzalloc(BCM43xx_NR_LOGGED_XMITSTATUS
+                                             * sizeof(*(e->xmitstatus_buffer)),
+                                             GFP_KERNEL);
+        if (!e->xmitstatus_print_buffer) {
+                printk(KERN_ERR PFX "out of memory\n");
+                kfree(e);
+                return;
+        }
+
+
+        bcm->dfsentry = e;
+
+        strncpy(devdir, bcm->net_dev->name, ARRAY_SIZE(devdir));
+        e->subdir = debugfs_create_dir(devdir, fs.root);
+        e->dentry_devinfo = debugfs_create_file("devinfo", 0444, e->subdir,
+                                                bcm, &devinfo_fops);
+        if (!e->dentry_devinfo)
+                printk(KERN_ERR PFX "debugfs: creating \"devinfo\" for \"%s\" failed!\n", devdir);
+        e->dentry_spromdump = debugfs_create_file("sprom_dump", 0444, e->subdir,
+                                                  bcm, &spromdump_fops);
+        if (!e->dentry_spromdump)
+                printk(KERN_ERR PFX "debugfs: creating \"sprom_dump\" for \"%s\" failed!\n", devdir);
+        e->dentry_tsf = debugfs_create_file("tsf", 0666, e->subdir,
+                                            bcm, &tsf_fops);
+        if (!e->dentry_tsf)
+                printk(KERN_ERR PFX "debugfs: creating \"tsf\" for \"%s\" failed!\n", devdir);
+        e->dentry_txstat = debugfs_create_file("tx_status", 0444, e->subdir,
+                                                bcm, &txstat_fops);
+        if (!e->dentry_txstat)
+                printk(KERN_ERR PFX "debugfs: creating \"tx_status\" for \"%s\" failed!\n", devdir);
+}
+
+void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_dfsentry *e;
+
+        if (!bcm)
+                return;
+
+        e = bcm->dfsentry;
+        assert(e);
+        debugfs_remove(e->dentry_spromdump);
+        debugfs_remove(e->dentry_devinfo);
+        debugfs_remove(e->dentry_tsf);
+        debugfs_remove(e->dentry_txstat);
+        debugfs_remove(e->subdir);
+        kfree(e->xmitstatus_buffer);
+        kfree(e->xmitstatus_print_buffer);
+        kfree(e);
+}
+
+void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
+                                struct bcm43xx_xmitstatus *status)
+{
+        struct bcm43xx_dfsentry *e;
+        struct bcm43xx_xmitstatus *savedstatus;
+
+        /* This is protected by bcm->_lock */
+        e = bcm->dfsentry;
+        assert(e);
+        savedstatus = e->xmitstatus_buffer + e->xmitstatus_ptr;
+        memcpy(savedstatus, status, sizeof(*status));
+        e->xmitstatus_ptr++;
+        if (e->xmitstatus_ptr >= BCM43xx_NR_LOGGED_XMITSTATUS)
+                e->xmitstatus_ptr = 0;
+        if (e->xmitstatus_cnt < BCM43xx_NR_LOGGED_XMITSTATUS)
+                e->xmitstatus_cnt++;
+}
+
+void bcm43xx_debugfs_init(void)
+{
+        memset(&fs, 0, sizeof(fs));
+        fs.root = debugfs_create_dir(KBUILD_MODNAME, NULL);
+        if (!fs.root)
+                printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "\" subdir failed!\n");
+        fs.dentry_driverinfo = debugfs_create_file("driver", 0444, fs.root, NULL, &drvinfo_fops);
+        if (!fs.dentry_driverinfo)
+                printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "/driver\" failed!\n");
+}
+
+void bcm43xx_debugfs_exit(void)
+{
+        debugfs_remove(fs.dentry_driverinfo);
+        debugfs_remove(fs.root);
+}
+
+void bcm43xx_printk_dump(const char *data,
+                         size_t size,
+                         const char *description)
+{
+        size_t i;
+        char c;
+
+        printk(KERN_INFO PFX "Data dump (%s, %u bytes):",
+               description, size);
+        for (i = 0; i < size; i++) {
+                c = data[i];
+                if (i % 8 == 0)
+                        printk("\n" KERN_INFO PFX "0x%08x:  0x%02x, ", i, c & 0xff);
+                else
+                        printk("0x%02x, ", c & 0xff);
+        }
+        printk("\n");
+}
+
+void bcm43xx_printk_bitdump(const unsigned char *data,
+                            size_t bytes, int msb_to_lsb,
+                            const char *description)
+{
+        size_t i;
+        int j;
+        const unsigned char *d;
+
+        printk(KERN_INFO PFX "*** Bitdump (%s, %u bytes, %s) ***",
+               description, bytes, msb_to_lsb ? "MSB to LSB" : "LSB to MSB");
+        for (i = 0; i < bytes; i++) {
+                d = data + i;
+                if (i % 8 == 0)
+                        printk("\n" KERN_INFO PFX "0x%08x:  ", i);
+                if (msb_to_lsb) {
+                        for (j = 7; j >= 0; j--) {
+                                if (*d & (1 << j))
+                                        printk("1");
+                                else
+                                        printk("0");
+                        }
+                } else {
+                        for (j = 0; j < 8; j++) {
+                                if (*d & (1 << j))
+                                        printk("1");
+                                else
+                                        printk("0");
+                        }
+                }
+                printk(" ");
+        }
+        printk("\n");
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h
new file mode 100644
index 000000000000..50ce267f794d
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h
@@ -0,0 +1,117 @@
+#ifndef BCM43xx_DEBUGFS_H_
+#define BCM43xx_DEBUGFS_H_
+
+struct bcm43xx_private;
+struct bcm43xx_xmitstatus;
+
+#ifdef CONFIG_BCM43XX_DEBUG
+
+#include <linux/list.h>
+#include <asm/semaphore.h>
+
+struct dentry;
+
+/* limited by the size of the "really_big_buffer" */
+#define BCM43xx_NR_LOGGED_XMITSTATUS    100
+
+struct bcm43xx_dfsentry {
+        struct dentry *subdir;
+        struct dentry *dentry_devinfo;
+        struct dentry *dentry_spromdump;
+        struct dentry *dentry_tsf;
+        struct dentry *dentry_txstat;
+
+        struct bcm43xx_private *bcm;
+
+        /* saved xmitstatus. */
+        struct bcm43xx_xmitstatus *xmitstatus_buffer;
+        int xmitstatus_ptr;
+        int xmitstatus_cnt;
+        /* We need a seperate buffer while printing to avoid
+         * concurrency issues. (New xmitstatus can arrive
+         * while we are printing).
+         */
+        struct bcm43xx_xmitstatus *xmitstatus_print_buffer;
+        int saved_xmitstatus_ptr;
+        int saved_xmitstatus_cnt;
+        int xmitstatus_printing;
+};
+
+struct bcm43xx_debugfs {
+        struct dentry *root;
+        struct dentry *dentry_driverinfo;
+};
+
+void bcm43xx_debugfs_init(void);
+void bcm43xx_debugfs_exit(void);
+void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm);
+void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm);
+void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
+                                struct bcm43xx_xmitstatus *status);
+
+/* Debug helper: Dump binary data through printk. */
+void bcm43xx_printk_dump(const char *data,
+                         size_t size,
+                         const char *description);
+/* Debug helper: Dump bitwise binary data through printk. */
+void bcm43xx_printk_bitdump(const unsigned char *data,
+                            size_t bytes, int msb_to_lsb,
+                            const char *description);
+#define bcm43xx_printk_bitdumpt(pointer, msb_to_lsb, description) \
+        do {                                                                    \
+                bcm43xx_printk_bitdump((const unsigned char *)(pointer),        \
+                                       sizeof(*(pointer)),                      \
+                                       (msb_to_lsb),                            \
+                                       (description));                          \
+        } while (0)
+
+#else /* CONFIG_BCM43XX_DEBUG*/
+
+static inline
+void bcm43xx_debugfs_init(void) { }
+static inline
+void bcm43xx_debugfs_exit(void) { }
+static inline
+void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm) { }
+static inline
+void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm) { }
+static inline
+void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
+                                struct bcm43xx_xmitstatus *status) { }
+
+static inline
+void bcm43xx_printk_dump(const char *data,
+                         size_t size,
+                         const char *description)
+{
+}
+static inline
+void bcm43xx_printk_bitdump(const unsigned char *data,
+                            size_t bytes, int msb_to_lsb,
+                            const char *description)
+{
+}
+#define bcm43xx_printk_bitdumpt(pointer, msb_to_lsb, description)  do { /* nothing */ } while (0)
+
+#endif /* CONFIG_BCM43XX_DEBUG*/
+
+/* Ugly helper macros to make incomplete code more verbose on runtime */
+#ifdef TODO
+# undef TODO
+#endif
+#define TODO()  \
+        do {                                                                            \
+                printk(KERN_INFO PFX "TODO: Incomplete code in %s() at %s:%d\n",        \
+                       __FUNCTION__, __FILE__, __LINE__);                               \
+        } while (0)
+
+#ifdef FIXME
+# undef FIXME
+#endif
+#define FIXME()  \
+        do {                                                                            \
+                printk(KERN_INFO PFX "FIXME: Possibly broken code in %s() at %s:%d\n",  \
+                       __FUNCTION__, __FILE__, __LINE__);                               \
+        } while (0)
+
+#endif /* BCM43xx_DEBUGFS_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
new file mode 100644
index 000000000000..c3681b8f09b4
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -0,0 +1,968 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  DMA ringbuffer and descriptor allocation/management
+
+  Copyright (c) 2005 Michael Buesch <mbuesch@freenet.de>
+
+  Some code in this file is derived from the b44.c driver
+  Copyright (C) 2002 David S. Miller
+  Copyright (C) Pekka Pietikainen
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx.h"
+#include "bcm43xx_dma.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_debugfs.h"
+#include "bcm43xx_power.h"
+#include "bcm43xx_xmit.h"
+
+#include <linux/dma-mapping.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+
+
+static inline int free_slots(struct bcm43xx_dmaring *ring)
+{
+        return (ring->nr_slots - ring->used_slots);
+}
+
+static inline int next_slot(struct bcm43xx_dmaring *ring, int slot)
+{
+        assert(slot >= -1 && slot <= ring->nr_slots - 1);
+        if (slot == ring->nr_slots - 1)
+                return 0;
+        return slot + 1;
+}
+
+static inline int prev_slot(struct bcm43xx_dmaring *ring, int slot)
+{
+        assert(slot >= 0 && slot <= ring->nr_slots - 1);
+        if (slot == 0)
+                return ring->nr_slots - 1;
+        return slot - 1;
+}
+
+/* Request a slot for usage. */
+static inline
+int request_slot(struct bcm43xx_dmaring *ring)
+{
+        int slot;
+
+        assert(ring->tx);
+        assert(!ring->suspended);
+        assert(free_slots(ring) != 0);
+
+        slot = next_slot(ring, ring->current_slot);
+        ring->current_slot = slot;
+        ring->used_slots++;
+
+        /* Check the number of available slots and suspend TX,
+         * if we are running low on free slots.
+         */
+        if (unlikely(free_slots(ring) < ring->suspend_mark)) {
+                netif_stop_queue(ring->bcm->net_dev);
+                ring->suspended = 1;
+        }
+#ifdef CONFIG_BCM43XX_DEBUG
+        if (ring->used_slots > ring->max_used_slots)
+                ring->max_used_slots = ring->used_slots;
+#endif /* CONFIG_BCM43XX_DEBUG*/
+
+        return slot;
+}
+
+/* Return a slot to the free slots. */
+static inline
+void return_slot(struct bcm43xx_dmaring *ring, int slot)
+{
+        assert(ring->tx);
+
+        ring->used_slots--;
+
+        /* Check if TX is suspended and check if we have
+         * enough free slots to resume it again.
+         */
+        if (unlikely(ring->suspended)) {
+                if (free_slots(ring) >= ring->resume_mark) {
+                        ring->suspended = 0;
+                        netif_wake_queue(ring->bcm->net_dev);
+                }
+        }
+}
+
+static inline
+dma_addr_t map_descbuffer(struct bcm43xx_dmaring *ring,
+                          unsigned char *buf,
+                          size_t len,
+                          int tx)
+{
+        dma_addr_t dmaaddr;
+
+        if (tx) {
+                dmaaddr = dma_map_single(&ring->bcm->pci_dev->dev,
+                                         buf, len,
+                                         DMA_TO_DEVICE);
+        } else {
+                dmaaddr = dma_map_single(&ring->bcm->pci_dev->dev,
+                                         buf, len,
+                                         DMA_FROM_DEVICE);
+        }
+
+        return dmaaddr;
+}
+
+static inline
+void unmap_descbuffer(struct bcm43xx_dmaring *ring,
+                      dma_addr_t addr,
+                      size_t len,
+                      int tx)
+{
+        if (tx) {
+                dma_unmap_single(&ring->bcm->pci_dev->dev,
+                                 addr, len,
+                                 DMA_TO_DEVICE);
+        } else {
+                dma_unmap_single(&ring->bcm->pci_dev->dev,
+                                 addr, len,
+                                 DMA_FROM_DEVICE);
+        }
+}
+
+static inline
+void sync_descbuffer_for_cpu(struct bcm43xx_dmaring *ring,
+                             dma_addr_t addr,
+                             size_t len)
+{
+        assert(!ring->tx);
+
+        dma_sync_single_for_cpu(&ring->bcm->pci_dev->dev,
+                                addr, len, DMA_FROM_DEVICE);
+}
+
+static inline
+void sync_descbuffer_for_device(struct bcm43xx_dmaring *ring,
+                                dma_addr_t addr,
+                                size_t len)
+{
+        assert(!ring->tx);
+
+        dma_sync_single_for_device(&ring->bcm->pci_dev->dev,
+                                   addr, len, DMA_FROM_DEVICE);
+}
+
+/* Unmap and free a descriptor buffer. */
+static inline
+void free_descriptor_buffer(struct bcm43xx_dmaring *ring,
+                            struct bcm43xx_dmadesc *desc,
+                            struct bcm43xx_dmadesc_meta *meta,
+                            int irq_context)
+{
+        assert(meta->skb);
+        if (irq_context)
+                dev_kfree_skb_irq(meta->skb);
+        else
+                dev_kfree_skb(meta->skb);
+        meta->skb = NULL;
+}
+
+static int alloc_ringmemory(struct bcm43xx_dmaring *ring)
+{
+        struct device *dev = &(ring->bcm->pci_dev->dev);
+
+        ring->vbase = dma_alloc_coherent(dev, BCM43xx_DMA_RINGMEMSIZE,
+                                         &(ring->dmabase), GFP_KERNEL);
+        if (!ring->vbase) {
+                printk(KERN_ERR PFX "DMA ringmemory allocation failed\n");
+                return -ENOMEM;
+        }
+        if (ring->dmabase + BCM43xx_DMA_RINGMEMSIZE > BCM43xx_DMA_BUSADDRMAX) {
+                printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA RINGMEMORY >1G "
+                                    "(0x%08x, len: %lu)\n",
+                       ring->dmabase, BCM43xx_DMA_RINGMEMSIZE);
+                dma_free_coherent(dev, BCM43xx_DMA_RINGMEMSIZE,
+                                  ring->vbase, ring->dmabase);
+                return -ENOMEM;
+        }
+        assert(!(ring->dmabase & 0x000003FF));
+        memset(ring->vbase, 0, BCM43xx_DMA_RINGMEMSIZE);
+
+        return 0;
+}
+
+static void free_ringmemory(struct bcm43xx_dmaring *ring)
+{
+        struct device *dev = &(ring->bcm->pci_dev->dev);
+
+        dma_free_coherent(dev, BCM43xx_DMA_RINGMEMSIZE,
+                          ring->vbase, ring->dmabase);
+}
+
+/* Reset the RX DMA channel */
+int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
+                                   u16 mmio_base)
+{
+        int i;
+        u32 value;
+
+        bcm43xx_write32(bcm,
+                        mmio_base + BCM43xx_DMA_RX_CONTROL,
+                        0x00000000);
+        for (i = 0; i < 1000; i++) {
+                value = bcm43xx_read32(bcm,
+                                       mmio_base + BCM43xx_DMA_RX_STATUS);
+                value &= BCM43xx_DMA_RXSTAT_STAT_MASK;
+                if (value == BCM43xx_DMA_RXSTAT_STAT_DISABLED) {
+                        i = -1;
+                        break;
+                }
+                udelay(10);
+        }
+        if (i != -1) {
+                printk(KERN_ERR PFX "Error: Wait on DMA RX status timed out.\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+/* Reset the RX DMA channel */
+int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
+                                   u16 mmio_base)
+{
+        int i;
+        u32 value;
+
+        for (i = 0; i < 1000; i++) {
+                value = bcm43xx_read32(bcm,
+                                       mmio_base + BCM43xx_DMA_TX_STATUS);
+                value &= BCM43xx_DMA_TXSTAT_STAT_MASK;
+                if (value == BCM43xx_DMA_TXSTAT_STAT_DISABLED ||
+                    value == BCM43xx_DMA_TXSTAT_STAT_IDLEWAIT ||
+                    value == BCM43xx_DMA_TXSTAT_STAT_STOPPED)
+                        break;
+                udelay(10);
+        }
+        bcm43xx_write32(bcm,
+                        mmio_base + BCM43xx_DMA_TX_CONTROL,
+                        0x00000000);
+        for (i = 0; i < 1000; i++) {
+                value = bcm43xx_read32(bcm,
+                                       mmio_base + BCM43xx_DMA_TX_STATUS);
+                value &= BCM43xx_DMA_TXSTAT_STAT_MASK;
+                if (value == BCM43xx_DMA_TXSTAT_STAT_DISABLED) {
+                        i = -1;
+                        break;
+                }
+                udelay(10);
+        }
+        if (i != -1) {
+                printk(KERN_ERR PFX "Error: Wait on DMA TX status timed out.\n");
+                return -ENODEV;
+        }
+        /* ensure the reset is completed. */
+        udelay(300);
+
+        return 0;
+}
+
+static int setup_rx_descbuffer(struct bcm43xx_dmaring *ring,
+                               struct bcm43xx_dmadesc *desc,
+                               struct bcm43xx_dmadesc_meta *meta,
+                               gfp_t gfp_flags)
+{
+        struct bcm43xx_rxhdr *rxhdr;
+        dma_addr_t dmaaddr;
+        u32 desc_addr;
+        u32 desc_ctl;
+        const int slot = (int)(desc - ring->vbase);
+        struct sk_buff *skb;
+
+        assert(slot >= 0 && slot < ring->nr_slots);
+        assert(!ring->tx);
+
+        skb = __dev_alloc_skb(ring->rx_buffersize, gfp_flags);
+        if (unlikely(!skb))
+                return -ENOMEM;
+        dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0);
+        if (unlikely(dmaaddr + ring->rx_buffersize > BCM43xx_DMA_BUSADDRMAX)) {
+                unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0);
+                dev_kfree_skb_any(skb);
+                printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA RX SKB >1G "
+                                    "(0x%08x, len: %u)\n",
+                       dmaaddr, ring->rx_buffersize);
+                return -ENOMEM;
+        }
+        meta->skb = skb;
+        meta->dmaaddr = dmaaddr;
+        skb->dev = ring->bcm->net_dev;
+        desc_addr = (u32)(dmaaddr + ring->memoffset);
+        desc_ctl = (BCM43xx_DMADTOR_BYTECNT_MASK &
+                    (u32)(ring->rx_buffersize - ring->frameoffset));
+        if (slot == ring->nr_slots - 1)
+                desc_ctl |= BCM43xx_DMADTOR_DTABLEEND;
+        set_desc_addr(desc, desc_addr);
+        set_desc_ctl(desc, desc_ctl);
+
+        rxhdr = (struct bcm43xx_rxhdr *)(skb->data);
+        rxhdr->frame_length = 0;
+        rxhdr->flags1 = 0;
+
+        return 0;
+}
+
+/* Allocate the initial descbuffers.
+ * This is used for an RX ring only.
+ */
+static int alloc_initial_descbuffers(struct bcm43xx_dmaring *ring)
+{
+        int i, err = -ENOMEM;
+        struct bcm43xx_dmadesc *desc;
+        struct bcm43xx_dmadesc_meta *meta;
+
+        for (i = 0; i < ring->nr_slots; i++) {
+                desc = ring->vbase + i;
+                meta = ring->meta + i;
+
+                err = setup_rx_descbuffer(ring, desc, meta, GFP_KERNEL);
+                if (err)
+                        goto err_unwind;
+        }
+        ring->used_slots = ring->nr_slots;
+        err = 0;
+out:
+        return err;
+
+err_unwind:
+        for (i--; i >= 0; i--) {
+                desc = ring->vbase + i;
+                meta = ring->meta + i;
+
+                unmap_descbuffer(ring, meta->dmaaddr, ring->rx_buffersize, 0);
+                dev_kfree_skb(meta->skb);
+        }
+        goto out;
+}
+
+/* Do initial setup of the DMA controller.
+ * Reset the controller, write the ring busaddress
+ * and switch the "enable" bit on.
+ */
+static int dmacontroller_setup(struct bcm43xx_dmaring *ring)
+{
+        int err = 0;
+        u32 value;
+
+        if (ring->tx) {
+                /* Set Transmit Control register to "transmit enable" */
+                bcm43xx_dma_write(ring, BCM43xx_DMA_TX_CONTROL,
+                                  BCM43xx_DMA_TXCTRL_ENABLE);
+                /* Set Transmit Descriptor ring address. */
+                bcm43xx_dma_write(ring, BCM43xx_DMA_TX_DESC_RING,
+                                  ring->dmabase + ring->memoffset);
+        } else {
+                err = alloc_initial_descbuffers(ring);
+                if (err)
+                        goto out;
+                /* Set Receive Control "receive enable" and frame offset */
+                value = (ring->frameoffset << BCM43xx_DMA_RXCTRL_FRAMEOFF_SHIFT);
+                value |= BCM43xx_DMA_RXCTRL_ENABLE;
+                bcm43xx_dma_write(ring, BCM43xx_DMA_RX_CONTROL, value);
+                /* Set Receive Descriptor ring address. */
+                bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_RING,
+                                  ring->dmabase + ring->memoffset);
+                /* Init the descriptor pointer. */
+                bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_INDEX, 200);
+        }
+
+out:
+        return err;
+}
+
+/* Shutdown the DMA controller. */
+static void dmacontroller_cleanup(struct bcm43xx_dmaring *ring)
+{
+        if (ring->tx) {
+                bcm43xx_dmacontroller_tx_reset(ring->bcm, ring->mmio_base);
+                /* Zero out Transmit Descriptor ring address. */
+                bcm43xx_dma_write(ring, BCM43xx_DMA_TX_DESC_RING, 0);
+        } else {
+                bcm43xx_dmacontroller_rx_reset(ring->bcm, ring->mmio_base);
+                /* Zero out Receive Descriptor ring address. */
+                bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_RING, 0);
+        }
+}
+
+static void free_all_descbuffers(struct bcm43xx_dmaring *ring)
+{
+        struct bcm43xx_dmadesc *desc;
+        struct bcm43xx_dmadesc_meta *meta;
+        int i;
+
+        if (!ring->used_slots)
+                return;
+        for (i = 0; i < ring->nr_slots; i++) {
+                desc = ring->vbase + i;
+                meta = ring->meta + i;
+
+                if (!meta->skb) {
+                        assert(ring->tx);
+                        continue;
+                }
+                if (ring->tx) {
+                        unmap_descbuffer(ring, meta->dmaaddr,
+                                         meta->skb->len, 1);
+                } else {
+                        unmap_descbuffer(ring, meta->dmaaddr,
+                                         ring->rx_buffersize, 0);
+                }
+                free_descriptor_buffer(ring, desc, meta, 0);
+        }
+}
+
+/* Main initialization function. */
+static
+struct bcm43xx_dmaring * bcm43xx_setup_dmaring(struct bcm43xx_private *bcm,
+                                               u16 dma_controller_base,
+                                               int nr_descriptor_slots,
+                                               int tx)
+{
+        struct bcm43xx_dmaring *ring;
+        int err;
+
+        ring = kzalloc(sizeof(*ring), GFP_KERNEL);
+        if (!ring)
+                goto out;
+
+        ring->meta = kzalloc(sizeof(*ring->meta) * nr_descriptor_slots,
+                             GFP_KERNEL);
+        if (!ring->meta)
+                goto err_kfree_ring;
+
+        ring->memoffset = BCM43xx_DMA_DMABUSADDROFFSET;
+#ifdef CONFIG_BCM947XX
+        if (bcm->pci_dev->bus->number == 0)
+                ring->memoffset = 0;
+#endif
+
+        ring->bcm = bcm;
+        ring->nr_slots = nr_descriptor_slots;
+        ring->suspend_mark = ring->nr_slots * BCM43xx_TXSUSPEND_PERCENT / 100;
+        ring->resume_mark = ring->nr_slots * BCM43xx_TXRESUME_PERCENT / 100;
+        assert(ring->suspend_mark < ring->resume_mark);
+        ring->mmio_base = dma_controller_base;
+        if (tx) {
+                ring->tx = 1;
+                ring->current_slot = -1;
+        } else {
+                switch (dma_controller_base) {
+                case BCM43xx_MMIO_DMA1_BASE:
+                        ring->rx_buffersize = BCM43xx_DMA1_RXBUFFERSIZE;
+                        ring->frameoffset = BCM43xx_DMA1_RX_FRAMEOFFSET;
+                        break;
+                case BCM43xx_MMIO_DMA4_BASE:
+                        ring->rx_buffersize = BCM43xx_DMA4_RXBUFFERSIZE;
+                        ring->frameoffset = BCM43xx_DMA4_RX_FRAMEOFFSET;
+                        break;
+                default:
+                        assert(0);
+                }
+        }
+
+        err = alloc_ringmemory(ring);
+        if (err)
+                goto err_kfree_meta;
+        err = dmacontroller_setup(ring);
+        if (err)
+                goto err_free_ringmemory;
+
+out:
+        return ring;
+
+err_free_ringmemory:
+        free_ringmemory(ring);
+err_kfree_meta:
+        kfree(ring->meta);
+err_kfree_ring:
+        kfree(ring);
+        ring = NULL;
+        goto out;
+}
+
+/* Main cleanup function. */
+static void bcm43xx_destroy_dmaring(struct bcm43xx_dmaring *ring)
+{
+        if (!ring)
+                return;
+
+        dprintk(KERN_INFO PFX "DMA 0x%04x (%s) max used slots: %d/%d\n",
+                ring->mmio_base,
+                (ring->tx) ? "TX" : "RX",
+                ring->max_used_slots, ring->nr_slots);
+        /* Device IRQs are disabled prior entering this function,
+         * so no need to take care of concurrency with rx handler stuff.
+         */
+        dmacontroller_cleanup(ring);
+        free_all_descbuffers(ring);
+        free_ringmemory(ring);
+
+        kfree(ring->meta);
+        kfree(ring);
+}
+
+void bcm43xx_dma_free(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_dma *dma;
+
+        if (bcm43xx_using_pio(bcm))
+                return;
+        dma = bcm43xx_current_dma(bcm);
+
+        bcm43xx_destroy_dmaring(dma->rx_ring1);
+        dma->rx_ring1 = NULL;
+        bcm43xx_destroy_dmaring(dma->rx_ring0);
+        dma->rx_ring0 = NULL;
+        bcm43xx_destroy_dmaring(dma->tx_ring3);
+        dma->tx_ring3 = NULL;
+        bcm43xx_destroy_dmaring(dma->tx_ring2);
+        dma->tx_ring2 = NULL;
+        bcm43xx_destroy_dmaring(dma->tx_ring1);
+        dma->tx_ring1 = NULL;
+        bcm43xx_destroy_dmaring(dma->tx_ring0);
+        dma->tx_ring0 = NULL;
+}
+
+int bcm43xx_dma_init(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_dma *dma = bcm43xx_current_dma(bcm);
+        struct bcm43xx_dmaring *ring;
+        int err = -ENOMEM;
+
+        /* setup TX DMA channels. */
+        ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA1_BASE,
+                                     BCM43xx_TXRING_SLOTS, 1);
+        if (!ring)
+                goto out;
+        dma->tx_ring0 = ring;
+
+        ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA2_BASE,
+                                     BCM43xx_TXRING_SLOTS, 1);
+        if (!ring)
+                goto err_destroy_tx0;
+        dma->tx_ring1 = ring;
+
+        ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA3_BASE,
+                                     BCM43xx_TXRING_SLOTS, 1);
+        if (!ring)
+                goto err_destroy_tx1;
+        dma->tx_ring2 = ring;
+
+        ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA4_BASE,
+                                     BCM43xx_TXRING_SLOTS, 1);
+        if (!ring)
+                goto err_destroy_tx2;
+        dma->tx_ring3 = ring;
+
+        /* setup RX DMA channels. */
+        ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA1_BASE,
+                                     BCM43xx_RXRING_SLOTS, 0);
+        if (!ring)
+                goto err_destroy_tx3;
+        dma->rx_ring0 = ring;
+
+        if (bcm->current_core->rev < 5) {
+                ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA4_BASE,
+                                             BCM43xx_RXRING_SLOTS, 0);
+                if (!ring)
+                        goto err_destroy_rx0;
+                dma->rx_ring1 = ring;
+        }
+
+        dprintk(KERN_INFO PFX "DMA initialized\n");
+        err = 0;
+out:
+        return err;
+
+err_destroy_rx0:
+        bcm43xx_destroy_dmaring(dma->rx_ring0);
+        dma->rx_ring0 = NULL;
+err_destroy_tx3:
+        bcm43xx_destroy_dmaring(dma->tx_ring3);
+        dma->tx_ring3 = NULL;
+err_destroy_tx2:
+        bcm43xx_destroy_dmaring(dma->tx_ring2);
+        dma->tx_ring2 = NULL;
+err_destroy_tx1:
+        bcm43xx_destroy_dmaring(dma->tx_ring1);
+        dma->tx_ring1 = NULL;
+err_destroy_tx0:
+        bcm43xx_destroy_dmaring(dma->tx_ring0);
+        dma->tx_ring0 = NULL;
+        goto out;
+}
+
+/* Generate a cookie for the TX header. */
+static u16 generate_cookie(struct bcm43xx_dmaring *ring,
+                           int slot)
+{
+        u16 cookie = 0x0000;
+
+        /* Use the upper 4 bits of the cookie as
+         * DMA controller ID and store the slot number
+         * in the lower 12 bits
+         */
+        switch (ring->mmio_base) {
+        default:
+                assert(0);
+        case BCM43xx_MMIO_DMA1_BASE:
+                break;
+        case BCM43xx_MMIO_DMA2_BASE:
+                cookie = 0x1000;
+                break;
+        case BCM43xx_MMIO_DMA3_BASE:
+                cookie = 0x2000;
+                break;
+        case BCM43xx_MMIO_DMA4_BASE:
+                cookie = 0x3000;
+                break;
+        }
+        assert(((u16)slot & 0xF000) == 0x0000);
+        cookie |= (u16)slot;
+
+        return cookie;
+}
+
+/* Inspect a cookie and find out to which controller/slot it belongs. */
+static
+struct bcm43xx_dmaring * parse_cookie(struct bcm43xx_private *bcm,
+                                      u16 cookie, int *slot)
+{
+        struct bcm43xx_dma *dma = bcm43xx_current_dma(bcm);
+        struct bcm43xx_dmaring *ring = NULL;
+
+        switch (cookie & 0xF000) {
+        case 0x0000:
+                ring = dma->tx_ring0;
+                break;
+        case 0x1000:
+                ring = dma->tx_ring1;
+                break;
+        case 0x2000:
+                ring = dma->tx_ring2;
+                break;
+        case 0x3000:
+                ring = dma->tx_ring3;
+                break;
+        default:
+                assert(0);
+        }
+        *slot = (cookie & 0x0FFF);
+        assert(*slot >= 0 && *slot < ring->nr_slots);
+
+        return ring;
+}
+
+static void dmacontroller_poke_tx(struct bcm43xx_dmaring *ring,
+                                  int slot)
+{
+        /* Everything is ready to start. Buffers are DMA mapped and
+         * associated with slots.
+         * "slot" is the last slot of the new frame we want to transmit.
+         * Close your seat belts now, please.
+         */
+        wmb();
+        slot = next_slot(ring, slot);
+        bcm43xx_dma_write(ring, BCM43xx_DMA_TX_DESC_INDEX,
+                          (u32)(slot * sizeof(struct bcm43xx_dmadesc)));
+}
+
+static int dma_tx_fragment(struct bcm43xx_dmaring *ring,
+                           struct sk_buff *skb,
+                           u8 cur_frag)
+{
+        int slot;
+        struct bcm43xx_dmadesc *desc;
+        struct bcm43xx_dmadesc_meta *meta;
+        u32 desc_ctl;
+        u32 desc_addr;
+
+        assert(skb_shinfo(skb)->nr_frags == 0);
+
+        slot = request_slot(ring);
+        desc = ring->vbase + slot;
+        meta = ring->meta + slot;
+
+        /* Add a device specific TX header. */
+        assert(skb_headroom(skb) >= sizeof(struct bcm43xx_txhdr));
+        /* Reserve enough headroom for the device tx header. */
+        __skb_push(skb, sizeof(struct bcm43xx_txhdr));
+        /* Now calculate and add the tx header.
+         * The tx header includes the PLCP header.
+         */
+        bcm43xx_generate_txhdr(ring->bcm,
+                               (struct bcm43xx_txhdr *)skb->data,
+                               skb->data + sizeof(struct bcm43xx_txhdr),
+                               skb->len - sizeof(struct bcm43xx_txhdr),
+                               (cur_frag == 0),
+                               generate_cookie(ring, slot));
+
+        meta->skb = skb;
+        meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
+        if (unlikely(meta->dmaaddr + skb->len > BCM43xx_DMA_BUSADDRMAX)) {
+                return_slot(ring, slot);
+                printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA TX SKB >1G "
+                                    "(0x%08x, len: %u)\n",
+                       meta->dmaaddr, skb->len);
+                return -ENOMEM;
+        }
+
+        desc_addr = (u32)(meta->dmaaddr + ring->memoffset);
+        desc_ctl = BCM43xx_DMADTOR_FRAMESTART | BCM43xx_DMADTOR_FRAMEEND;
+        desc_ctl |= BCM43xx_DMADTOR_COMPIRQ;
+        desc_ctl |= (BCM43xx_DMADTOR_BYTECNT_MASK &
+                     (u32)(meta->skb->len - ring->frameoffset));
+        if (slot == ring->nr_slots - 1)
+                desc_ctl |= BCM43xx_DMADTOR_DTABLEEND;
+
+        set_desc_ctl(desc, desc_ctl);
+        set_desc_addr(desc, desc_addr);
+        /* Now transfer the whole frame. */
+        dmacontroller_poke_tx(ring, slot);
+
+        return 0;
+}
+
+int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
+                   struct ieee80211_txb *txb)
+{
+        /* We just received a packet from the kernel network subsystem.
+         * Add headers and DMA map the memory. Poke
+         * the device to send the stuff.
+         * Note that this is called from atomic context.
+         */
+        struct bcm43xx_dmaring *ring = bcm43xx_current_dma(bcm)->tx_ring1;
+        u8 i;
+        struct sk_buff *skb;
+
+        assert(ring->tx);
+        if (unlikely(free_slots(ring) < txb->nr_frags)) {
+                /* The queue should be stopped,
+                 * if we are low on free slots.
+                 * If this ever triggers, we have to lower the suspend_mark.
+                 */
+                dprintkl(KERN_ERR PFX "Out of DMA descriptor slots!\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < txb->nr_frags; i++) {
+                skb = txb->fragments[i];
+                /* Take skb from ieee80211_txb_free */
+                txb->fragments[i] = NULL;
+                dma_tx_fragment(ring, skb, i);
+                //TODO: handle failure of dma_tx_fragment
+        }
+        ieee80211_txb_free(txb);
+
+        return 0;
+}
+
+void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
+                                   struct bcm43xx_xmitstatus *status)
+{
+        struct bcm43xx_dmaring *ring;
+        struct bcm43xx_dmadesc *desc;
+        struct bcm43xx_dmadesc_meta *meta;
+        int is_last_fragment;
+        int slot;
+
+        ring = parse_cookie(bcm, status->cookie, &slot);
+        assert(ring);
+        assert(ring->tx);
+        assert(get_desc_ctl(ring->vbase + slot) & BCM43xx_DMADTOR_FRAMESTART);
+        while (1) {
+                assert(slot >= 0 && slot < ring->nr_slots);
+                desc = ring->vbase + slot;
+                meta = ring->meta + slot;
+
+                is_last_fragment = !!(get_desc_ctl(desc) & BCM43xx_DMADTOR_FRAMEEND);
+                unmap_descbuffer(ring, meta->dmaaddr, meta->skb->len, 1);
+                free_descriptor_buffer(ring, desc, meta, 1);
+                /* Everything belonging to the slot is unmapped
+                 * and freed, so we can return it.
+                 */
+                return_slot(ring, slot);
+
+                if (is_last_fragment)
+                        break;
+                slot = next_slot(ring, slot);
+        }
+        bcm->stats.last_tx = jiffies;
+}
+
+static void dma_rx(struct bcm43xx_dmaring *ring,
+                   int *slot)
+{
+        struct bcm43xx_dmadesc *desc;
+        struct bcm43xx_dmadesc_meta *meta;
+        struct bcm43xx_rxhdr *rxhdr;
+        struct sk_buff *skb;
+        u16 len;
+        int err;
+        dma_addr_t dmaaddr;
+
+        desc = ring->vbase + *slot;
+        meta = ring->meta + *slot;
+
+        sync_descbuffer_for_cpu(ring, meta->dmaaddr, ring->rx_buffersize);
+        skb = meta->skb;
+
+        if (ring->mmio_base == BCM43xx_MMIO_DMA4_BASE) {
+                /* We received an xmit status. */
+                struct bcm43xx_hwxmitstatus *hw = (struct bcm43xx_hwxmitstatus *)skb->data;
+                struct bcm43xx_xmitstatus stat;
+
+                stat.cookie = le16_to_cpu(hw->cookie);
+                stat.flags = hw->flags;
+                stat.cnt1 = hw->cnt1;
+                stat.cnt2 = hw->cnt2;
+                stat.seq = le16_to_cpu(hw->seq);
+                stat.unknown = le16_to_cpu(hw->unknown);
+
+                bcm43xx_debugfs_log_txstat(ring->bcm, &stat);
+                bcm43xx_dma_handle_xmitstatus(ring->bcm, &stat);
+                /* recycle the descriptor buffer. */
+                sync_descbuffer_for_device(ring, meta->dmaaddr, ring->rx_buffersize);
+
+                return;
+        }
+        rxhdr = (struct bcm43xx_rxhdr *)skb->data;
+        len = le16_to_cpu(rxhdr->frame_length);
+        if (len == 0) {
+                int i = 0;
+
+                do {
+                        udelay(2);
+                        barrier();
+                        len = le16_to_cpu(rxhdr->frame_length);
+                } while (len == 0 && i++ < 5);
+                if (unlikely(len == 0)) {
+                        /* recycle the descriptor buffer. */
+                        sync_descbuffer_for_device(ring, meta->dmaaddr,
+                                                   ring->rx_buffersize);
+                        goto drop;
+                }
+        }
+        if (unlikely(len > ring->rx_buffersize)) {
+                /* The data did not fit into one descriptor buffer
+                 * and is split over multiple buffers.
+                 * This should never happen, as we try to allocate buffers
+                 * big enough. So simply ignore this packet.
+                 */
+                int cnt = 0;
+                s32 tmp = len;
+
+                while (1) {
+                        desc = ring->vbase + *slot;
+                        meta = ring->meta + *slot;
+                        /* recycle the descriptor buffer. */
+                        sync_descbuffer_for_device(ring, meta->dmaaddr,
+                                                   ring->rx_buffersize);
+                        *slot = next_slot(ring, *slot);
+                        cnt++;
+                        tmp -= ring->rx_buffersize;
+                        if (tmp <= 0)
+                                break;
+                }
+                printkl(KERN_ERR PFX "DMA RX buffer too small "
+                                     "(len: %u, buffer: %u, nr-dropped: %d)\n",
+                        len, ring->rx_buffersize, cnt);
+                goto drop;
+        }
+        len -= IEEE80211_FCS_LEN;
+
+        dmaaddr = meta->dmaaddr;
+        err = setup_rx_descbuffer(ring, desc, meta, GFP_ATOMIC);
+        if (unlikely(err)) {
+                dprintkl(KERN_ERR PFX "DMA RX: setup_rx_descbuffer() failed\n");
+                sync_descbuffer_for_device(ring, dmaaddr,
+                                           ring->rx_buffersize);
+                goto drop;
+        }
+
+        unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0);
+        skb_put(skb, len + ring->frameoffset);
+        skb_pull(skb, ring->frameoffset);
+
+        err = bcm43xx_rx(ring->bcm, skb, rxhdr);
+        if (err) {
+                dev_kfree_skb_irq(skb);
+                goto drop;
+        }
+
+drop:
+        return;
+}
+
+void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
+{
+        u32 status;
+        u16 descptr;
+        int slot, current_slot;
+#ifdef CONFIG_BCM43XX_DEBUG
+        int used_slots = 0;
+#endif
+
+        assert(!ring->tx);
+        status = bcm43xx_dma_read(ring, BCM43xx_DMA_RX_STATUS);
+        descptr = (status & BCM43xx_DMA_RXSTAT_DPTR_MASK);
+        current_slot = descptr / sizeof(struct bcm43xx_dmadesc);
+        assert(current_slot >= 0 && current_slot < ring->nr_slots);
+
+        slot = ring->current_slot;
+        for ( ; slot != current_slot; slot = next_slot(ring, slot)) {
+                dma_rx(ring, &slot);
+#ifdef CONFIG_BCM43XX_DEBUG
+                if (++used_slots > ring->max_used_slots)
+                        ring->max_used_slots = used_slots;
+#endif
+        }
+        bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_INDEX,
+                          (u32)(slot * sizeof(struct bcm43xx_dmadesc)));
+        ring->current_slot = slot;
+}
+
+void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring)
+{
+        assert(ring->tx);
+        bcm43xx_power_saving_ctl_bits(ring->bcm, -1, 1);
+        bcm43xx_dma_write(ring, BCM43xx_DMA_TX_CONTROL,
+                          bcm43xx_dma_read(ring, BCM43xx_DMA_TX_CONTROL)
+                          | BCM43xx_DMA_TXCTRL_SUSPEND);
+}
+
+void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring)
+{
+        assert(ring->tx);
+        bcm43xx_dma_write(ring, BCM43xx_DMA_TX_CONTROL,
+                          bcm43xx_dma_read(ring, BCM43xx_DMA_TX_CONTROL)
+                          & ~BCM43xx_DMA_TXCTRL_SUSPEND);
+        bcm43xx_power_saving_ctl_bits(ring->bcm, -1, -1);
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
new file mode 100644
index 000000000000..2d520e4b0276
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
@@ -0,0 +1,218 @@
+#ifndef BCM43xx_DMA_H_
+#define BCM43xx_DMA_H_
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/linkage.h>
+#include <asm/atomic.h>
+
+
+/* DMA-Interrupt reasons. */
+#define BCM43xx_DMAIRQ_FATALMASK        ((1 << 10) | (1 << 11) | (1 << 12) \
+                                         | (1 << 14) | (1 << 15))
+#define BCM43xx_DMAIRQ_NONFATALMASK     (1 << 13)
+#define BCM43xx_DMAIRQ_RX_DONE          (1 << 16)
+
+/* DMA controller register offsets. (relative to BCM43xx_DMA#_BASE) */
+#define BCM43xx_DMA_TX_CONTROL          0x00
+#define BCM43xx_DMA_TX_DESC_RING        0x04
+#define BCM43xx_DMA_TX_DESC_INDEX       0x08
+#define BCM43xx_DMA_TX_STATUS           0x0c
+#define BCM43xx_DMA_RX_CONTROL          0x10
+#define BCM43xx_DMA_RX_DESC_RING        0x14
+#define BCM43xx_DMA_RX_DESC_INDEX       0x18
+#define BCM43xx_DMA_RX_STATUS           0x1c
+
+/* DMA controller channel control word values. */
+#define BCM43xx_DMA_TXCTRL_ENABLE               (1 << 0)
+#define BCM43xx_DMA_TXCTRL_SUSPEND              (1 << 1)
+#define BCM43xx_DMA_TXCTRL_LOOPBACK             (1 << 2)
+#define BCM43xx_DMA_TXCTRL_FLUSH                (1 << 4)
+#define BCM43xx_DMA_RXCTRL_ENABLE               (1 << 0)
+#define BCM43xx_DMA_RXCTRL_FRAMEOFF_MASK        0x000000fe
+#define BCM43xx_DMA_RXCTRL_FRAMEOFF_SHIFT       1
+#define BCM43xx_DMA_RXCTRL_PIO                  (1 << 8)
+/* DMA controller channel status word values. */
+#define BCM43xx_DMA_TXSTAT_DPTR_MASK            0x00000fff
+#define BCM43xx_DMA_TXSTAT_STAT_MASK            0x0000f000
+#define BCM43xx_DMA_TXSTAT_STAT_DISABLED        0x00000000
+#define BCM43xx_DMA_TXSTAT_STAT_ACTIVE          0x00001000
+#define BCM43xx_DMA_TXSTAT_STAT_IDLEWAIT        0x00002000
+#define BCM43xx_DMA_TXSTAT_STAT_STOPPED         0x00003000
+#define BCM43xx_DMA_TXSTAT_STAT_SUSP            0x00004000
+#define BCM43xx_DMA_TXSTAT_ERROR_MASK           0x000f0000
+#define BCM43xx_DMA_TXSTAT_FLUSHED              (1 << 20)
+#define BCM43xx_DMA_RXSTAT_DPTR_MASK            0x00000fff
+#define BCM43xx_DMA_RXSTAT_STAT_MASK            0x0000f000
+#define BCM43xx_DMA_RXSTAT_STAT_DISABLED        0x00000000
+#define BCM43xx_DMA_RXSTAT_STAT_ACTIVE          0x00001000
+#define BCM43xx_DMA_RXSTAT_STAT_IDLEWAIT        0x00002000
+#define BCM43xx_DMA_RXSTAT_STAT_RESERVED        0x00003000
+#define BCM43xx_DMA_RXSTAT_STAT_ERRORS          0x00004000
+#define BCM43xx_DMA_RXSTAT_ERROR_MASK           0x000f0000
+
+/* DMA descriptor control field values. */
+#define BCM43xx_DMADTOR_BYTECNT_MASK            0x00001fff
+#define BCM43xx_DMADTOR_DTABLEEND               (1 << 28) /* End of descriptor table */
+#define BCM43xx_DMADTOR_COMPIRQ                 (1 << 29) /* IRQ on completion request */
+#define BCM43xx_DMADTOR_FRAMEEND                (1 << 30)
+#define BCM43xx_DMADTOR_FRAMESTART              (1 << 31)
+
+/* Misc DMA constants */
+#define BCM43xx_DMA_RINGMEMSIZE         PAGE_SIZE
+#define BCM43xx_DMA_BUSADDRMAX          0x3FFFFFFF
+#define BCM43xx_DMA_DMABUSADDROFFSET    (1 << 30)
+#define BCM43xx_DMA1_RX_FRAMEOFFSET     30
+#define BCM43xx_DMA4_RX_FRAMEOFFSET     0
+
+/* DMA engine tuning knobs */
+#define BCM43xx_TXRING_SLOTS            512
+#define BCM43xx_RXRING_SLOTS            64
+#define BCM43xx_DMA1_RXBUFFERSIZE       (2304 + 100)
+#define BCM43xx_DMA4_RXBUFFERSIZE       16
+/* Suspend the tx queue, if less than this percent slots are free. */
+#define BCM43xx_TXSUSPEND_PERCENT       20
+/* Resume the tx queue, if more than this percent slots are free. */
+#define BCM43xx_TXRESUME_PERCENT        50
+
+
+
+#ifdef CONFIG_BCM43XX_DMA
+
+
+struct sk_buff;
+struct bcm43xx_private;
+struct bcm43xx_xmitstatus;
+
+
+struct bcm43xx_dmadesc {
+        __le32 _control;
+        __le32 _address;
+} __attribute__((__packed__));
+
+/* Macros to access the bcm43xx_dmadesc struct */
+#define get_desc_ctl(desc)              le32_to_cpu((desc)->_control)
+#define set_desc_ctl(desc, ctl)         do { (desc)->_control = cpu_to_le32(ctl); } while (0)
+#define get_desc_addr(desc)             le32_to_cpu((desc)->_address)
+#define set_desc_addr(desc, addr)       do { (desc)->_address = cpu_to_le32(addr); } while (0)
+
+struct bcm43xx_dmadesc_meta {
+        /* The kernel DMA-able buffer. */
+        struct sk_buff *skb;
+        /* DMA base bus-address of the descriptor buffer. */
+        dma_addr_t dmaaddr;
+};
+
+struct bcm43xx_dmaring {
+        struct bcm43xx_private *bcm;
+        /* Kernel virtual base address of the ring memory. */
+        struct bcm43xx_dmadesc *vbase;
+        /* DMA memory offset */
+        dma_addr_t memoffset;
+        /* (Unadjusted) DMA base bus-address of the ring memory. */
+        dma_addr_t dmabase;
+        /* Meta data about all descriptors. */
+        struct bcm43xx_dmadesc_meta *meta;
+        /* Number of descriptor slots in the ring. */
+        int nr_slots;
+        /* Number of used descriptor slots. */
+        int used_slots;
+        /* Currently used slot in the ring. */
+        int current_slot;
+        /* Marks to suspend/resume the queue. */
+        int suspend_mark;
+        int resume_mark;
+        /* Frameoffset in octets. */
+        u32 frameoffset;
+        /* Descriptor buffer size. */
+        u16 rx_buffersize;
+        /* The MMIO base register of the DMA controller, this
+         * ring is posted to.
+         */
+        u16 mmio_base;
+        u8 tx:1,        /* TRUE, if this is a TX ring. */
+           suspended:1; /* TRUE, if transfers are suspended on this ring. */
+#ifdef CONFIG_BCM43XX_DEBUG
+        /* Maximum number of used slots. */
+        int max_used_slots;
+#endif /* CONFIG_BCM43XX_DEBUG*/
+};
+
+
+static inline
+u32 bcm43xx_dma_read(struct bcm43xx_dmaring *ring,
+                     u16 offset)
+{
+        return bcm43xx_read32(ring->bcm, ring->mmio_base + offset);
+}
+
+static inline
+void bcm43xx_dma_write(struct bcm43xx_dmaring *ring,
+                       u16 offset, u32 value)
+{
+        bcm43xx_write32(ring->bcm, ring->mmio_base + offset, value);
+}
+
+
+int bcm43xx_dma_init(struct bcm43xx_private *bcm);
+void bcm43xx_dma_free(struct bcm43xx_private *bcm);
+
+int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
+                                   u16 dmacontroller_mmio_base);
+int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
+                                   u16 dmacontroller_mmio_base);
+
+void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring);
+void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring);
+
+void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
+                                   struct bcm43xx_xmitstatus *status);
+
+int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
+                   struct ieee80211_txb *txb);
+void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring);
+
+
+#else /* CONFIG_BCM43XX_DMA */
+
+
+static inline
+int bcm43xx_dma_init(struct bcm43xx_private *bcm)
+{
+        return 0;
+}
+static inline
+void bcm43xx_dma_free(struct bcm43xx_private *bcm)
+{
+}
+static inline
+int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
+                                   u16 dmacontroller_mmio_base)
+{
+        return 0;
+}
+static inline
+int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
+                                   u16 dmacontroller_mmio_base)
+{
+        return 0;
+}
+static inline
+int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
+                   struct ieee80211_txb *txb)
+{
+        return 0;
+}
+static inline
+void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
+                                   struct bcm43xx_xmitstatus *status)
+{
+}
+static inline
+void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
+{
+}
+
+#endif /* CONFIG_BCM43XX_DMA */
+#endif /* BCM43xx_DMA_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
new file mode 100644
index 000000000000..b3ffcf501311
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
@@ -0,0 +1,50 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  ethtool support
+
+  Copyright (c) 2006 Jason Lunz <lunz@falooley.org>
+
+  Some code in this file is derived from the 8139too.c driver
+  Copyright (C) 2002 Jeff Garzik
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx.h"
+#include "bcm43xx_ethtool.h"
+
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/version.h>
+
+
+static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+        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->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
+}
+
+struct ethtool_ops bcm43xx_ethtool_ops = {
+        .get_drvinfo = bcm43xx_get_drvinfo,
+        .get_link = ethtool_op_get_link,
+};
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
new file mode 100644
index 000000000000..813704991f62
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
@@ -0,0 +1,8 @@
+#ifndef BCM43xx_ETHTOOL_H_
+#define BCM43xx_ETHTOOL_H_
+
+#include <linux/ethtool.h>
+
+extern struct ethtool_ops bcm43xx_ethtool_ops;
+
+#endif /* BCM43xx_ETHTOOL_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c
new file mode 100644
index 000000000000..ad8e569d1faf
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c
@@ -0,0 +1,337 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx.h"
+#include "bcm43xx_ilt.h"
+#include "bcm43xx_phy.h"
+
+
+/**** Initial Internal Lookup Tables ****/
+
+const u32 bcm43xx_ilt_rotor[BCM43xx_ILT_ROTOR_SIZE] = {
+        0xFEB93FFD, 0xFEC63FFD, /* 0 */
+        0xFED23FFD, 0xFEDF3FFD,
+        0xFEEC3FFE, 0xFEF83FFE,
+        0xFF053FFE, 0xFF113FFE,
+        0xFF1E3FFE, 0xFF2A3FFF, /* 8 */
+        0xFF373FFF, 0xFF443FFF,
+        0xFF503FFF, 0xFF5D3FFF,
+        0xFF693FFF, 0xFF763FFF,
+        0xFF824000, 0xFF8F4000, /* 16 */
+        0xFF9B4000, 0xFFA84000,
+        0xFFB54000, 0xFFC14000,
+        0xFFCE4000, 0xFFDA4000,
+        0xFFE74000, 0xFFF34000, /* 24 */
+        0x00004000, 0x000D4000,
+        0x00194000, 0x00264000,
+        0x00324000, 0x003F4000,
+        0x004B4000, 0x00584000, /* 32 */
+        0x00654000, 0x00714000,
+        0x007E4000, 0x008A3FFF,
+        0x00973FFF, 0x00A33FFF,
+        0x00B03FFF, 0x00BC3FFF, /* 40 */
+        0x00C93FFF, 0x00D63FFF,
+        0x00E23FFE, 0x00EF3FFE,
+        0x00FB3FFE, 0x01083FFE,
+        0x01143FFE, 0x01213FFD, /* 48 */
+        0x012E3FFD, 0x013A3FFD,
+        0x01473FFD,
+};
+
+const u32 bcm43xx_ilt_retard[BCM43xx_ILT_RETARD_SIZE] = {
+        0xDB93CB87, 0xD666CF64, /* 0 */
+        0xD1FDD358, 0xCDA6D826,
+        0xCA38DD9F, 0xC729E2B4,
+        0xC469E88E, 0xC26AEE2B,
+        0xC0DEF46C, 0xC073FA62, /* 8 */
+        0xC01D00D5, 0xC0760743,
+        0xC1560D1E, 0xC2E51369,
+        0xC4ED18FF, 0xC7AC1ED7,
+        0xCB2823B2, 0xCEFA28D9, /* 16 */
+        0xD2F62D3F, 0xD7BB3197,
+        0xDCE53568, 0xE1FE3875,
+        0xE7D13B35, 0xED663D35,
+        0xF39B3EC4, 0xF98E3FA7, /* 24 */
+        0x00004000, 0x06723FA7,
+        0x0C653EC4, 0x129A3D35,
+        0x182F3B35, 0x1E023875,
+        0x231B3568, 0x28453197, /* 32 */
+        0x2D0A2D3F, 0x310628D9,
+        0x34D823B2, 0x38541ED7,
+        0x3B1318FF, 0x3D1B1369,
+        0x3EAA0D1E, 0x3F8A0743, /* 40 */
+        0x3FE300D5, 0x3F8DFA62,
+        0x3F22F46C, 0x3D96EE2B,
+        0x3B97E88E, 0x38D7E2B4,
+        0x35C8DD9F, 0x325AD826, /* 48 */
+        0x2E03D358, 0x299ACF64,
+        0x246DCB87,
+};
+
+const u16 bcm43xx_ilt_finefreqa[BCM43xx_ILT_FINEFREQA_SIZE] = {
+        0x0082, 0x0082, 0x0102, 0x0182, /* 0 */
+        0x0202, 0x0282, 0x0302, 0x0382,
+        0x0402, 0x0482, 0x0502, 0x0582,
+        0x05E2, 0x0662, 0x06E2, 0x0762,
+        0x07E2, 0x0842, 0x08C2, 0x0942, /* 16 */
+        0x09C2, 0x0A22, 0x0AA2, 0x0B02,
+        0x0B82, 0x0BE2, 0x0C62, 0x0CC2,
+        0x0D42, 0x0DA2, 0x0E02, 0x0E62,
+        0x0EE2, 0x0F42, 0x0FA2, 0x1002, /* 32 */
+        0x1062, 0x10C2, 0x1122, 0x1182,
+        0x11E2, 0x1242, 0x12A2, 0x12E2,
+        0x1342, 0x13A2, 0x1402, 0x1442,
+        0x14A2, 0x14E2, 0x1542, 0x1582, /* 48 */
+        0x15E2, 0x1622, 0x1662, 0x16C1,
+        0x1701, 0x1741, 0x1781, 0x17E1,
+        0x1821, 0x1861, 0x18A1, 0x18E1,
+        0x1921, 0x1961, 0x19A1, 0x19E1, /* 64 */
+        0x1A21, 0x1A61, 0x1AA1, 0x1AC1,
+        0x1B01, 0x1B41, 0x1B81, 0x1BA1,
+        0x1BE1, 0x1C21, 0x1C41, 0x1C81,
+        0x1CA1, 0x1CE1, 0x1D01, 0x1D41, /* 80 */
+        0x1D61, 0x1DA1, 0x1DC1, 0x1E01,
+        0x1E21, 0x1E61, 0x1E81, 0x1EA1,
+        0x1EE1, 0x1F01, 0x1F21, 0x1F41,
+        0x1F81, 0x1FA1, 0x1FC1, 0x1FE1, /* 96 */
+        0x2001, 0x2041, 0x2061, 0x2081,
+        0x20A1, 0x20C1, 0x20E1, 0x2101,
+        0x2121, 0x2141, 0x2161, 0x2181,
+        0x21A1, 0x21C1, 0x21E1, 0x2201, /* 112 */
+        0x2221, 0x2241, 0x2261, 0x2281,
+        0x22A1, 0x22C1, 0x22C1, 0x22E1,
+        0x2301, 0x2321, 0x2341, 0x2361,
+        0x2361, 0x2381, 0x23A1, 0x23C1, /* 128 */
+        0x23E1, 0x23E1, 0x2401, 0x2421,
+        0x2441, 0x2441, 0x2461, 0x2481,
+        0x2481, 0x24A1, 0x24C1, 0x24C1,
+        0x24E1, 0x2501, 0x2501, 0x2521, /* 144 */
+        0x2541, 0x2541, 0x2561, 0x2561,
+        0x2581, 0x25A1, 0x25A1, 0x25C1,
+        0x25C1, 0x25E1, 0x2601, 0x2601,
+        0x2621, 0x2621, 0x2641, 0x2641, /* 160 */
+        0x2661, 0x2661, 0x2681, 0x2681,
+        0x26A1, 0x26A1, 0x26C1, 0x26C1,
+        0x26E1, 0x26E1, 0x2701, 0x2701,
+        0x2721, 0x2721, 0x2740, 0x2740, /* 176 */
+        0x2760, 0x2760, 0x2780, 0x2780,
+        0x2780, 0x27A0, 0x27A0, 0x27C0,
+        0x27C0, 0x27E0, 0x27E0, 0x27E0,
+        0x2800, 0x2800, 0x2820, 0x2820, /* 192 */
+        0x2820, 0x2840, 0x2840, 0x2840,
+        0x2860, 0x2860, 0x2880, 0x2880,
+        0x2880, 0x28A0, 0x28A0, 0x28A0,
+        0x28C0, 0x28C0, 0x28C0, 0x28E0, /* 208 */
+        0x28E0, 0x28E0, 0x2900, 0x2900,
+        0x2900, 0x2920, 0x2920, 0x2920,
+        0x2940, 0x2940, 0x2940, 0x2960,
+        0x2960, 0x2960, 0x2960, 0x2980, /* 224 */
+        0x2980, 0x2980, 0x29A0, 0x29A0,
+        0x29A0, 0x29A0, 0x29C0, 0x29C0,
+        0x29C0, 0x29E0, 0x29E0, 0x29E0,
+        0x29E0, 0x2A00, 0x2A00, 0x2A00, /* 240 */
+        0x2A00, 0x2A20, 0x2A20, 0x2A20,
+        0x2A20, 0x2A40, 0x2A40, 0x2A40,
+        0x2A40, 0x2A60, 0x2A60, 0x2A60,
+};
+
+const u16 bcm43xx_ilt_finefreqg[BCM43xx_ILT_FINEFREQG_SIZE] = {
+        0x0089, 0x02E9, 0x0409, 0x04E9, /* 0 */
+        0x05A9, 0x0669, 0x0709, 0x0789,
+        0x0829, 0x08A9, 0x0929, 0x0989,
+        0x0A09, 0x0A69, 0x0AC9, 0x0B29,
+        0x0BA9, 0x0BE9, 0x0C49, 0x0CA9, /* 16 */
+        0x0D09, 0x0D69, 0x0DA9, 0x0E09,
+        0x0E69, 0x0EA9, 0x0F09, 0x0F49,
+        0x0FA9, 0x0FE9, 0x1029, 0x1089,
+        0x10C9, 0x1109, 0x1169, 0x11A9, /* 32 */
+        0x11E9, 0x1229, 0x1289, 0x12C9,
+        0x1309, 0x1349, 0x1389, 0x13C9,
+        0x1409, 0x1449, 0x14A9, 0x14E9,
+        0x1529, 0x1569, 0x15A9, 0x15E9, /* 48 */
+        0x1629, 0x1669, 0x16A9, 0x16E8,
+        0x1728, 0x1768, 0x17A8, 0x17E8,
+        0x1828, 0x1868, 0x18A8, 0x18E8,
+        0x1928, 0x1968, 0x19A8, 0x19E8, /* 64 */
+        0x1A28, 0x1A68, 0x1AA8, 0x1AE8,
+        0x1B28, 0x1B68, 0x1BA8, 0x1BE8,
+        0x1C28, 0x1C68, 0x1CA8, 0x1CE8,
+        0x1D28, 0x1D68, 0x1DC8, 0x1E08, /* 80 */
+        0x1E48, 0x1E88, 0x1EC8, 0x1F08,
+        0x1F48, 0x1F88, 0x1FE8, 0x2028,
+        0x2068, 0x20A8, 0x2108, 0x2148,
+        0x2188, 0x21C8, 0x2228, 0x2268, /* 96 */
+        0x22C8, 0x2308, 0x2348, 0x23A8,
+        0x23E8, 0x2448, 0x24A8, 0x24E8,
+        0x2548, 0x25A8, 0x2608, 0x2668,
+        0x26C8, 0x2728, 0x2787, 0x27E7, /* 112 */
+        0x2847, 0x28C7, 0x2947, 0x29A7,
+        0x2A27, 0x2AC7, 0x2B47, 0x2BE7,
+        0x2CA7, 0x2D67, 0x2E47, 0x2F67,
+        0x3247, 0x3526, 0x3646, 0x3726, /* 128 */
+        0x3806, 0x38A6, 0x3946, 0x39E6,
+        0x3A66, 0x3AE6, 0x3B66, 0x3BC6,
+        0x3C45, 0x3CA5, 0x3D05, 0x3D85,
+        0x3DE5, 0x3E45, 0x3EA5, 0x3EE5, /* 144 */
+        0x3F45, 0x3FA5, 0x4005, 0x4045,
+        0x40A5, 0x40E5, 0x4145, 0x4185,
+        0x41E5, 0x4225, 0x4265, 0x42C5,
+        0x4305, 0x4345, 0x43A5, 0x43E5, /* 160 */
+        0x4424, 0x4464, 0x44C4, 0x4504,
+        0x4544, 0x4584, 0x45C4, 0x4604,
+        0x4644, 0x46A4, 0x46E4, 0x4724,
+        0x4764, 0x47A4, 0x47E4, 0x4824, /* 176 */
+        0x4864, 0x48A4, 0x48E4, 0x4924,
+        0x4964, 0x49A4, 0x49E4, 0x4A24,
+        0x4A64, 0x4AA4, 0x4AE4, 0x4B23,
+        0x4B63, 0x4BA3, 0x4BE3, 0x4C23, /* 192 */
+        0x4C63, 0x4CA3, 0x4CE3, 0x4D23,
+        0x4D63, 0x4DA3, 0x4DE3, 0x4E23,
+        0x4E63, 0x4EA3, 0x4EE3, 0x4F23,
+        0x4F63, 0x4FC3, 0x5003, 0x5043, /* 208 */
+        0x5083, 0x50C3, 0x5103, 0x5143,
+        0x5183, 0x51E2, 0x5222, 0x5262,
+        0x52A2, 0x52E2, 0x5342, 0x5382,
+        0x53C2, 0x5402, 0x5462, 0x54A2, /* 224 */
+        0x5502, 0x5542, 0x55A2, 0x55E2,
+        0x5642, 0x5682, 0x56E2, 0x5722,
+        0x5782, 0x57E1, 0x5841, 0x58A1,
+        0x5901, 0x5961, 0x59C1, 0x5A21, /* 240 */
+        0x5AA1, 0x5B01, 0x5B81, 0x5BE1,
+        0x5C61, 0x5D01, 0x5D80, 0x5E20,
+        0x5EE0, 0x5FA0, 0x6080, 0x61C0,
+};
+
+const u16 bcm43xx_ilt_noisea2[BCM43xx_ILT_NOISEA2_SIZE] = {
+        0x0001, 0x0001, 0x0001, 0xFFFE,
+        0xFFFE, 0x3FFF, 0x1000, 0x0393,
+};
+
+const u16 bcm43xx_ilt_noisea3[BCM43xx_ILT_NOISEA3_SIZE] = {
+        0x4C4C, 0x4C4C, 0x4C4C, 0x2D36,
+        0x4C4C, 0x4C4C, 0x4C4C, 0x2D36,
+};
+
+const u16 bcm43xx_ilt_noiseg1[BCM43xx_ILT_NOISEG1_SIZE] = {
+        0x013C, 0x01F5, 0x031A, 0x0631,
+        0x0001, 0x0001, 0x0001, 0x0001,
+};
+
+const u16 bcm43xx_ilt_noiseg2[BCM43xx_ILT_NOISEG2_SIZE] = {
+        0x5484, 0x3C40, 0x0000, 0x0000,
+        0x0000, 0x0000, 0x0000, 0x0000,
+};
+
+const u16 bcm43xx_ilt_noisescaleg1[BCM43xx_ILT_NOISESCALEG_SIZE] = {
+        0x6C77, 0x5162, 0x3B40, 0x3335, /* 0 */
+        0x2F2D, 0x2A2A, 0x2527, 0x1F21,
+        0x1A1D, 0x1719, 0x1616, 0x1414,
+        0x1414, 0x1400, 0x1414, 0x1614,
+        0x1716, 0x1A19, 0x1F1D, 0x2521, /* 16 */
+        0x2A27, 0x2F2A, 0x332D, 0x3B35,
+        0x5140, 0x6C62, 0x0077,
+};
+
+const u16 bcm43xx_ilt_noisescaleg2[BCM43xx_ILT_NOISESCALEG_SIZE] = {
+        0xD8DD, 0xCBD4, 0xBCC0, 0XB6B7, /* 0 */
+        0xB2B0, 0xADAD, 0xA7A9, 0x9FA1,
+        0x969B, 0x9195, 0x8F8F, 0x8A8A,
+        0x8A8A, 0x8A00, 0x8A8A, 0x8F8A,
+        0x918F, 0x9695, 0x9F9B, 0xA7A1, /* 16 */
+        0xADA9, 0xB2AD, 0xB6B0, 0xBCB7,
+        0xCBC0, 0xD8D4, 0x00DD,
+};
+
+const u16 bcm43xx_ilt_noisescaleg3[BCM43xx_ILT_NOISESCALEG_SIZE] = {
+        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4, /* 0 */
+        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4,
+        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4,
+        0xA4A4, 0xA400, 0xA4A4, 0xA4A4,
+        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4, /* 16 */
+        0xA4A4, 0xA4A4, 0xA4A4, 0xA4A4,
+        0xA4A4, 0xA4A4, 0x00A4,
+};
+
+const u16 bcm43xx_ilt_sigmasqr1[BCM43xx_ILT_SIGMASQR_SIZE] = {
+        0x007A, 0x0075, 0x0071, 0x006C, /* 0 */
+        0x0067, 0x0063, 0x005E, 0x0059,
+        0x0054, 0x0050, 0x004B, 0x0046,
+        0x0042, 0x003D, 0x003D, 0x003D,
+        0x003D, 0x003D, 0x003D, 0x003D, /* 16 */
+        0x003D, 0x003D, 0x003D, 0x003D,
+        0x003D, 0x003D, 0x0000, 0x003D,
+        0x003D, 0x003D, 0x003D, 0x003D,
+        0x003D, 0x003D, 0x003D, 0x003D, /* 32 */
+        0x003D, 0x003D, 0x003D, 0x003D,
+        0x0042, 0x0046, 0x004B, 0x0050,
+        0x0054, 0x0059, 0x005E, 0x0063,
+        0x0067, 0x006C, 0x0071, 0x0075, /* 48 */
+        0x007A,
+};
+
+const u16 bcm43xx_ilt_sigmasqr2[BCM43xx_ILT_SIGMASQR_SIZE] = {
+        0x00DE, 0x00DC, 0x00DA, 0x00D8, /* 0 */
+        0x00D6, 0x00D4, 0x00D2, 0x00CF,
+        0x00CD, 0x00CA, 0x00C7, 0x00C4,
+        0x00C1, 0x00BE, 0x00BE, 0x00BE,
+        0x00BE, 0x00BE, 0x00BE, 0x00BE, /* 16 */
+        0x00BE, 0x00BE, 0x00BE, 0x00BE,
+        0x00BE, 0x00BE, 0x0000, 0x00BE,
+        0x00BE, 0x00BE, 0x00BE, 0x00BE,
+        0x00BE, 0x00BE, 0x00BE, 0x00BE, /* 32 */
+        0x00BE, 0x00BE, 0x00BE, 0x00BE,
+        0x00C1, 0x00C4, 0x00C7, 0x00CA,
+        0x00CD, 0x00CF, 0x00D2, 0x00D4,
+        0x00D6, 0x00D8, 0x00DA, 0x00DC, /* 48 */
+        0x00DE,
+};
+
+/**** Helper functions to access the device Internal Lookup Tables ****/
+
+void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val)
+{
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) {
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset);
+                mmiowb();
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, val);
+        } else {
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset);
+                mmiowb();
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA1, val);
+        }
+}
+
+u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset)
+{
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) {
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset);
+                return bcm43xx_phy_read(bcm, BCM43xx_PHY_ILT_A_DATA1);
+        } else {
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset);
+                return bcm43xx_phy_read(bcm, BCM43xx_PHY_ILT_G_DATA1);
+        }
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h
new file mode 100644
index 000000000000..464521abf73c
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h
@@ -0,0 +1,32 @@
+#ifndef BCM43xx_ILT_H_
+#define BCM43xx_ILT_H_
+
+#define BCM43xx_ILT_ROTOR_SIZE          53
+extern const u32 bcm43xx_ilt_rotor[BCM43xx_ILT_ROTOR_SIZE];
+#define BCM43xx_ILT_RETARD_SIZE         53
+extern const u32 bcm43xx_ilt_retard[BCM43xx_ILT_RETARD_SIZE];
+#define BCM43xx_ILT_FINEFREQA_SIZE      256
+extern const u16 bcm43xx_ilt_finefreqa[BCM43xx_ILT_FINEFREQA_SIZE];
+#define BCM43xx_ILT_FINEFREQG_SIZE      256
+extern const u16 bcm43xx_ilt_finefreqg[BCM43xx_ILT_FINEFREQG_SIZE];
+#define BCM43xx_ILT_NOISEA2_SIZE        8
+extern const u16 bcm43xx_ilt_noisea2[BCM43xx_ILT_NOISEA2_SIZE];
+#define BCM43xx_ILT_NOISEA3_SIZE        8
+extern const u16 bcm43xx_ilt_noisea3[BCM43xx_ILT_NOISEA3_SIZE];
+#define BCM43xx_ILT_NOISEG1_SIZE        8
+extern const u16 bcm43xx_ilt_noiseg1[BCM43xx_ILT_NOISEG1_SIZE];
+#define BCM43xx_ILT_NOISEG2_SIZE        8
+extern const u16 bcm43xx_ilt_noiseg2[BCM43xx_ILT_NOISEG2_SIZE];
+#define BCM43xx_ILT_NOISESCALEG_SIZE    27
+extern const u16 bcm43xx_ilt_noisescaleg1[BCM43xx_ILT_NOISESCALEG_SIZE];
+extern const u16 bcm43xx_ilt_noisescaleg2[BCM43xx_ILT_NOISESCALEG_SIZE];
+extern const u16 bcm43xx_ilt_noisescaleg3[BCM43xx_ILT_NOISESCALEG_SIZE];
+#define BCM43xx_ILT_SIGMASQR_SIZE       53
+extern const u16 bcm43xx_ilt_sigmasqr1[BCM43xx_ILT_SIGMASQR_SIZE];
+extern const u16 bcm43xx_ilt_sigmasqr2[BCM43xx_ILT_SIGMASQR_SIZE];
+
+
+void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val);
+u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset);
+
+#endif /* BCM43xx_ILT_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
new file mode 100644
index 000000000000..4b2c02c0b31e
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
@@ -0,0 +1,293 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx_leds.h"
+#include "bcm43xx.h"
+
+#include <asm/bitops.h>
+
+
+static void bcm43xx_led_changestate(struct bcm43xx_led *led)
+{
+        struct bcm43xx_private *bcm = led->bcm;
+        const int index = bcm43xx_led_index(led);
+        const u16 mask = (1 << index);
+        u16 ledctl;
+
+        assert(index >= 0 && index < BCM43xx_NR_LEDS);
+        assert(led->blink_interval);
+        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
+        ledctl = (ledctl & mask) ? (ledctl & ~mask) : (ledctl | mask);
+        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
+}
+
+static void bcm43xx_led_blink(unsigned long d)
+{
+        struct bcm43xx_led *led = (struct bcm43xx_led *)d;
+        struct bcm43xx_private *bcm = led->bcm;
+        unsigned long flags;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (led->blink_interval) {
+                bcm43xx_led_changestate(led);
+                mod_timer(&led->blink_timer, jiffies + led->blink_interval);
+        }
+        bcm43xx_unlock_mmio(bcm, flags);
+}
+
+static void bcm43xx_led_blink_start(struct bcm43xx_led *led,
+                                    unsigned long interval)
+{
+        if (led->blink_interval)
+                return;
+        led->blink_interval = interval;
+        bcm43xx_led_changestate(led);
+        led->blink_timer.expires = jiffies + interval;
+        add_timer(&led->blink_timer);
+}
+
+static void bcm43xx_led_blink_stop(struct bcm43xx_led *led, int sync)
+{
+        struct bcm43xx_private *bcm = led->bcm;
+        const int index = bcm43xx_led_index(led);
+        u16 ledctl;
+
+        if (!led->blink_interval)
+                return;
+        if (unlikely(sync))
+                del_timer_sync(&led->blink_timer);
+        else
+                del_timer(&led->blink_timer);
+        led->blink_interval = 0;
+
+        /* Make sure the LED is turned off. */
+        assert(index >= 0 && index < BCM43xx_NR_LEDS);
+        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
+        if (led->activelow)
+                ledctl |= (1 << index);
+        else
+                ledctl &= ~(1 << index);
+        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
+}
+
+static void bcm43xx_led_init_hardcoded(struct bcm43xx_private *bcm,
+                                       struct bcm43xx_led *led,
+                                       int led_index)
+{
+        /* This function is called, if the behaviour (and activelow)
+         * information for a LED is missing in the SPROM.
+         * We hardcode the behaviour values for various devices here.
+         * Note that the BCM43xx_LED_TEST_XXX behaviour values can
+         * be used to figure out which led is mapped to which index.
+         */
+
+        switch (led_index) {
+        case 0:
+                led->behaviour = BCM43xx_LED_ACTIVITY;
+                if (bcm->board_vendor == PCI_VENDOR_ID_COMPAQ)
+                        led->behaviour = BCM43xx_LED_RADIO_ALL;
+                break;
+        case 1:
+                led->behaviour = BCM43xx_LED_RADIO_B;
+                if (bcm->board_vendor == PCI_VENDOR_ID_ASUSTEK)
+                        led->behaviour = BCM43xx_LED_ASSOC;
+                break;
+        case 2:
+                led->behaviour = BCM43xx_LED_RADIO_A;
+                break;
+        case 3:
+                led->behaviour = BCM43xx_LED_OFF;
+                break;
+        default:
+                assert(0);
+        }
+}
+
+int bcm43xx_leds_init(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_led *led;
+        u8 sprom[4];
+        int i;
+
+        sprom[0] = bcm->sprom.wl0gpio0;
+        sprom[1] = bcm->sprom.wl0gpio1;
+        sprom[2] = bcm->sprom.wl0gpio2;
+        sprom[3] = bcm->sprom.wl0gpio3;
+
+        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
+                led = &(bcm->leds[i]);
+                led->bcm = bcm;
+                setup_timer(&led->blink_timer,
+                            bcm43xx_led_blink,
+                            (unsigned long)led);
+
+                if (sprom[i] == 0xFF) {
+                        bcm43xx_led_init_hardcoded(bcm, led, i);
+                } else {
+                        led->behaviour = sprom[i] & BCM43xx_LED_BEHAVIOUR;
+                        led->activelow = !!(sprom[i] & BCM43xx_LED_ACTIVELOW);
+                }
+        }
+
+        return 0;
+}
+
+void bcm43xx_leds_exit(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_led *led;
+        int i;
+
+        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
+                led = &(bcm->leds[i]);
+                bcm43xx_led_blink_stop(led, 1);
+        }
+        bcm43xx_leds_switch_all(bcm, 0);
+}
+
+void bcm43xx_leds_update(struct bcm43xx_private *bcm, int activity)
+{
+        struct bcm43xx_led *led;
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        const int transferring = (jiffies - bcm->stats.last_tx) < BCM43xx_LED_XFER_THRES;
+        int i, turn_on;
+        unsigned long interval = 0;
+        u16 ledctl;
+
+        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
+        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
+                led = &(bcm->leds[i]);
+
+                turn_on = 0;
+                switch (led->behaviour) {
+                case BCM43xx_LED_INACTIVE:
+                        continue;
+                case BCM43xx_LED_OFF:
+                        break;
+                case BCM43xx_LED_ON:
+                        turn_on = 1;
+                        break;
+                case BCM43xx_LED_ACTIVITY:
+                        turn_on = activity;
+                        break;
+                case BCM43xx_LED_RADIO_ALL:
+                        turn_on = radio->enabled;
+                        break;
+                case BCM43xx_LED_RADIO_A:
+                        turn_on = (radio->enabled && phy->type == BCM43xx_PHYTYPE_A);
+                        break;
+                case BCM43xx_LED_RADIO_B:
+                        turn_on = (radio->enabled &&
+                                   (phy->type == BCM43xx_PHYTYPE_B ||
+                                    phy->type == BCM43xx_PHYTYPE_G));
+                        break;
+                case BCM43xx_LED_MODE_BG:
+                        if (phy->type == BCM43xx_PHYTYPE_G &&
+                            1/*FIXME: using G rates.*/)
+                                turn_on = 1;
+                        break;
+                case BCM43xx_LED_TRANSFER:
+                        if (transferring)
+                                bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_MEDIUM);
+                        else
+                                bcm43xx_led_blink_stop(led, 0);
+                        continue;
+                case BCM43xx_LED_APTRANSFER:
+                        if (bcm->ieee->iw_mode == IW_MODE_MASTER) {
+                                if (transferring) {
+                                        interval = BCM43xx_LEDBLINK_FAST;
+                                        turn_on = 1;
+                                }
+                        } else {
+                                turn_on = 1;
+                                if (0/*TODO: not assoc*/)
+                                        interval = BCM43xx_LEDBLINK_SLOW;
+                                else if (transferring)
+                                        interval = BCM43xx_LEDBLINK_FAST;
+                                else
+                                        turn_on = 0;
+                        }
+                        if (turn_on)
+                                bcm43xx_led_blink_start(led, interval);
+                        else
+                                bcm43xx_led_blink_stop(led, 0);
+                        continue;
+                case BCM43xx_LED_WEIRD:
+                        //TODO
+                        break;
+                case BCM43xx_LED_ASSOC:
+                        if (bcm->softmac->associated)
+                                turn_on = 1;
+                        break;
+#ifdef CONFIG_BCM43XX_DEBUG
+                case BCM43xx_LED_TEST_BLINKSLOW:
+                        bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_SLOW);
+                        continue;
+                case BCM43xx_LED_TEST_BLINKMEDIUM:
+                        bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_MEDIUM);
+                        continue;
+                case BCM43xx_LED_TEST_BLINKFAST:
+                        bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_FAST);
+                        continue;
+#endif /* CONFIG_BCM43XX_DEBUG */
+                default:
+                        assert(0);
+                };
+
+                if (led->activelow)
+                        turn_on = !turn_on;
+                if (turn_on)
+                        ledctl |= (1 << i);
+                else
+                        ledctl &= ~(1 << i);
+        }
+        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
+}
+
+void bcm43xx_leds_switch_all(struct bcm43xx_private *bcm, int on)
+{
+        struct bcm43xx_led *led;
+        u16 ledctl;
+        int i;
+        int bit_on;
+
+        ledctl = bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_CONTROL);
+        for (i = 0; i < BCM43xx_NR_LEDS; i++) {
+                led = &(bcm->leds[i]);
+                if (led->behaviour == BCM43xx_LED_INACTIVE)
+                        continue;
+                if (on)
+                        bit_on = led->activelow ? 0 : 1;
+                else
+                        bit_on = led->activelow ? 1 : 0;
+                if (bit_on)
+                        ledctl |= (1 << i);
+                else
+                        ledctl &= ~(1 << i);
+        }
+        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.h b/drivers/net/wireless/bcm43xx/bcm43xx_leds.h
new file mode 100644
index 000000000000..d3716cf3aebc
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_leds.h
@@ -0,0 +1,56 @@
+#ifndef BCM43xx_LEDS_H_
+#define BCM43xx_LEDS_H_
+
+#include <linux/types.h>
+#include <linux/timer.h>
+
+
+struct bcm43xx_led {
+        u8 behaviour:7;
+        u8 activelow:1;
+
+        struct bcm43xx_private *bcm;
+        struct timer_list blink_timer;
+        unsigned long blink_interval;
+};
+#define bcm43xx_led_index(led)  ((int)((led) - (led)->bcm->leds))
+
+/* Delay between state changes when blinking in jiffies */
+#define BCM43xx_LEDBLINK_SLOW           (HZ / 1)
+#define BCM43xx_LEDBLINK_MEDIUM         (HZ / 4)
+#define BCM43xx_LEDBLINK_FAST           (HZ / 8)
+
+#define BCM43xx_LED_XFER_THRES          (HZ / 100)
+
+#define BCM43xx_LED_BEHAVIOUR           0x7F
+#define BCM43xx_LED_ACTIVELOW           0x80
+enum { /* LED behaviour values */
+        BCM43xx_LED_OFF,
+        BCM43xx_LED_ON,
+        BCM43xx_LED_ACTIVITY,
+        BCM43xx_LED_RADIO_ALL,
+        BCM43xx_LED_RADIO_A,
+        BCM43xx_LED_RADIO_B,
+        BCM43xx_LED_MODE_BG,
+        BCM43xx_LED_TRANSFER,
+        BCM43xx_LED_APTRANSFER,
+        BCM43xx_LED_WEIRD,//FIXME
+        BCM43xx_LED_ASSOC,
+        BCM43xx_LED_INACTIVE,
+
+        /* Behaviour values for testing.
+         * With these values it is easier to figure out
+         * the real behaviour of leds, in case the SPROM
+         * is missing information.
+         */
+        BCM43xx_LED_TEST_BLINKSLOW,
+        BCM43xx_LED_TEST_BLINKMEDIUM,
+        BCM43xx_LED_TEST_BLINKFAST,
+};
+
+int bcm43xx_leds_init(struct bcm43xx_private *bcm);
+void bcm43xx_leds_exit(struct bcm43xx_private *bcm);
+void bcm43xx_leds_update(struct bcm43xx_private *bcm, int activity);
+void bcm43xx_leds_switch_all(struct bcm43xx_private *bcm, int on);
+
+#endif /* BCM43xx_LEDS_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
new file mode 100644
index 000000000000..c37371fc9e01
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -0,0 +1,3973 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <linux/if_arp.h>
+#include <linux/etherdevice.h>
+#include <linux/version.h>
+#include <linux/firmware.h>
+#include <linux/wireless.h>
+#include <linux/workqueue.h>
+#include <linux/skbuff.h>
+#include <linux/dma-mapping.h>
+#include <net/iw_handler.h>
+
+#include "bcm43xx.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_debugfs.h"
+#include "bcm43xx_radio.h"
+#include "bcm43xx_phy.h"
+#include "bcm43xx_dma.h"
+#include "bcm43xx_pio.h"
+#include "bcm43xx_power.h"
+#include "bcm43xx_wx.h"
+#include "bcm43xx_ethtool.h"
+#include "bcm43xx_xmit.h"
+
+
+MODULE_DESCRIPTION("Broadcom BCM43xx wireless driver");
+MODULE_AUTHOR("Martin Langer");
+MODULE_AUTHOR("Stefano Brivio");
+MODULE_AUTHOR("Michael Buesch");
+MODULE_LICENSE("GPL");
+
+#ifdef CONFIG_BCM947XX
+extern char *nvram_get(char *name);
+#endif
+
+#if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO)
+static int modparam_pio;
+module_param_named(pio, modparam_pio, int, 0444);
+MODULE_PARM_DESC(pio, "enable(1) / disable(0) PIO mode");
+#elif defined(CONFIG_BCM43XX_DMA)
+# define modparam_pio   0
+#elif defined(CONFIG_BCM43XX_PIO)
+# define modparam_pio   1
+#endif
+
+static int modparam_bad_frames_preempt;
+module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
+MODULE_PARM_DESC(bad_frames_preempt, "enable(1) / disable(0) Bad Frames Preemption");
+
+static int modparam_short_retry = BCM43xx_DEFAULT_SHORT_RETRY_LIMIT;
+module_param_named(short_retry, modparam_short_retry, int, 0444);
+MODULE_PARM_DESC(short_retry, "Short-Retry-Limit (0 - 15)");
+
+static int modparam_long_retry = BCM43xx_DEFAULT_LONG_RETRY_LIMIT;
+module_param_named(long_retry, modparam_long_retry, int, 0444);
+MODULE_PARM_DESC(long_retry, "Long-Retry-Limit (0 - 15)");
+
+static int modparam_locale = -1;
+module_param_named(locale, modparam_locale, int, 0444);
+MODULE_PARM_DESC(country, "Select LocaleCode 0-11 (For travelers)");
+
+static int modparam_noleds;
+module_param_named(noleds, modparam_noleds, int, 0444);
+MODULE_PARM_DESC(noleds, "Turn off all LED activity");
+
+#ifdef CONFIG_BCM43XX_DEBUG
+static char modparam_fwpostfix[64];
+module_param_string(fwpostfix, modparam_fwpostfix, 64, 0444);
+MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for debugging.");
+#else
+# define modparam_fwpostfix  ""
+#endif /* CONFIG_BCM43XX_DEBUG*/
+
+
+/* If you want to debug with just a single device, enable this,
+ * where the string is the pci device ID (as given by the kernel's
+ * pci_name function) of the device to be used.
+ */
+//#define DEBUG_SINGLE_DEVICE_ONLY      "0001:11:00.0"
+
+/* If you want to enable printing of each MMIO access, enable this. */
+//#define DEBUG_ENABLE_MMIO_PRINT
+
+/* If you want to enable printing of MMIO access within
+ * ucode/pcm upload, initvals write, enable this.
+ */
+//#define DEBUG_ENABLE_UCODE_MMIO_PRINT
+
+/* If you want to enable printing of PCI Config Space access, enable this */
+//#define DEBUG_ENABLE_PCILOG
+
+
+/* Detailed list maintained at:
+ * http://openfacts.berlios.de/index-en.phtml?title=Bcm43xxDevices
+ */
+        static struct pci_device_id bcm43xx_pci_tbl[] = {
+        /* Broadcom 4303 802.11b */
+        { PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+                /* Broadcom 4307 802.11b */
+        { PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+                /* Broadcom 4318 802.11b/g */
+        { PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        /* Broadcom 4306 802.11b/g */
+        { PCI_VENDOR_ID_BROADCOM, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+                /* Broadcom 4306 802.11a */
+//      { PCI_VENDOR_ID_BROADCOM, 0x4321, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        /* Broadcom 4309 802.11a/b/g */
+        { PCI_VENDOR_ID_BROADCOM, 0x4324, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        /* Broadcom 43XG 802.11b/g */
+        { PCI_VENDOR_ID_BROADCOM, 0x4325, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#ifdef CONFIG_BCM947XX
+        /* SB bus on BCM947xx */
+        { PCI_VENDOR_ID_BROADCOM, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#endif
+        { 0 },
+};
+MODULE_DEVICE_TABLE(pci, bcm43xx_pci_tbl);
+
+static void bcm43xx_ram_write(struct bcm43xx_private *bcm, u16 offset, u32 val)
+{
+        u32 status;
+
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        if (!(status & BCM43xx_SBF_XFER_REG_BYTESWAP))
+                val = swab32(val);
+
+        bcm43xx_write32(bcm, BCM43xx_MMIO_RAM_CONTROL, offset);
+        mmiowb();
+        bcm43xx_write32(bcm, BCM43xx_MMIO_RAM_DATA, val);
+}
+
+static inline
+void bcm43xx_shm_control_word(struct bcm43xx_private *bcm,
+                              u16 routing, u16 offset)
+{
+        u32 control;
+
+        /* "offset" is the WORD offset. */
+
+        control = routing;
+        control <<= 16;
+        control |= offset;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_CONTROL, control);
+}
+
+u32 bcm43xx_shm_read32(struct bcm43xx_private *bcm,
+                       u16 routing, u16 offset)
+{
+        u32 ret;
+
+        if (routing == BCM43xx_SHM_SHARED) {
+                if (offset & 0x0003) {
+                        /* Unaligned access */
+                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
+                        ret = bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED);
+                        ret <<= 16;
+                        bcm43xx_shm_control_word(bcm, routing, (offset >> 2) + 1);
+                        ret |= bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA);
+
+                        return ret;
+                }
+                offset >>= 2;
+        }
+        bcm43xx_shm_control_word(bcm, routing, offset);
+        ret = bcm43xx_read32(bcm, BCM43xx_MMIO_SHM_DATA);
+
+        return ret;
+}
+
+u16 bcm43xx_shm_read16(struct bcm43xx_private *bcm,
+                       u16 routing, u16 offset)
+{
+        u16 ret;
+
+        if (routing == BCM43xx_SHM_SHARED) {
+                if (offset & 0x0003) {
+                        /* Unaligned access */
+                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
+                        ret = bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED);
+
+                        return ret;
+                }
+                offset >>= 2;
+        }
+        bcm43xx_shm_control_word(bcm, routing, offset);
+        ret = bcm43xx_read16(bcm, BCM43xx_MMIO_SHM_DATA);
+
+        return ret;
+}
+
+void bcm43xx_shm_write32(struct bcm43xx_private *bcm,
+                         u16 routing, u16 offset,
+                         u32 value)
+{
+        if (routing == BCM43xx_SHM_SHARED) {
+                if (offset & 0x0003) {
+                        /* Unaligned access */
+                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
+                        mmiowb();
+                        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED,
+                                        (value >> 16) & 0xffff);
+                        mmiowb();
+                        bcm43xx_shm_control_word(bcm, routing, (offset >> 2) + 1);
+                        mmiowb();
+                        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA,
+                                        value & 0xffff);
+                        return;
+                }
+                offset >>= 2;
+        }
+        bcm43xx_shm_control_word(bcm, routing, offset);
+        mmiowb();
+        bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA, value);
+}
+
+void bcm43xx_shm_write16(struct bcm43xx_private *bcm,
+                         u16 routing, u16 offset,
+                         u16 value)
+{
+        if (routing == BCM43xx_SHM_SHARED) {
+                if (offset & 0x0003) {
+                        /* Unaligned access */
+                        bcm43xx_shm_control_word(bcm, routing, offset >> 2);
+                        mmiowb();
+                        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA_UNALIGNED,
+                                        value);
+                        return;
+                }
+                offset >>= 2;
+        }
+        bcm43xx_shm_control_word(bcm, routing, offset);
+        mmiowb();
+        bcm43xx_write16(bcm, BCM43xx_MMIO_SHM_DATA, value);
+}
+
+void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf)
+{
+        /* We need to be careful. As we read the TSF from multiple
+         * registers, we should take care of register overflows.
+         * In theory, the whole tsf read process should be atomic.
+         * We try to be atomic here, by restaring the read process,
+         * if any of the high registers changed (overflew).
+         */
+        if (bcm->current_core->rev >= 3) {
+                u32 low, high, high2;
+
+                do {
+                        high = bcm43xx_read32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_HIGH);
+                        low = bcm43xx_read32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_LOW);
+                        high2 = bcm43xx_read32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_HIGH);
+                } while (unlikely(high != high2));
+
+                *tsf = high;
+                *tsf <<= 32;
+                *tsf |= low;
+        } else {
+                u64 tmp;
+                u16 v0, v1, v2, v3;
+                u16 test1, test2, test3;
+
+                do {
+                        v3 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_3);
+                        v2 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_2);
+                        v1 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_1);
+                        v0 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_0);
+
+                        test3 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_3);
+                        test2 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_2);
+                        test1 = bcm43xx_read16(bcm, BCM43xx_MMIO_TSF_1);
+                } while (v3 != test3 || v2 != test2 || v1 != test1);
+
+                *tsf = v3;
+                *tsf <<= 48;
+                tmp = v2;
+                tmp <<= 32;
+                *tsf |= tmp;
+                tmp = v1;
+                tmp <<= 16;
+                *tsf |= tmp;
+                *tsf |= v0;
+        }
+}
+
+void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf)
+{
+        u32 status;
+
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        status |= BCM43xx_SBF_TIME_UPDATE;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+        mmiowb();
+
+        /* Be careful with the in-progress timer.
+         * First zero out the low register, so we have a full
+         * register-overflow duration to complete the operation.
+         */
+        if (bcm->current_core->rev >= 3) {
+                u32 lo = (tsf & 0x00000000FFFFFFFFULL);
+                u32 hi = (tsf & 0xFFFFFFFF00000000ULL) >> 32;
+
+                bcm43xx_write32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_LOW, 0);
+                mmiowb();
+                bcm43xx_write32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_HIGH, hi);
+                mmiowb();
+                bcm43xx_write32(bcm, BCM43xx_MMIO_REV3PLUS_TSF_LOW, lo);
+        } else {
+                u16 v0 = (tsf & 0x000000000000FFFFULL);
+                u16 v1 = (tsf & 0x00000000FFFF0000ULL) >> 16;
+                u16 v2 = (tsf & 0x0000FFFF00000000ULL) >> 32;
+                u16 v3 = (tsf & 0xFFFF000000000000ULL) >> 48;
+
+                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_0, 0);
+                mmiowb();
+                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_3, v3);
+                mmiowb();
+                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_2, v2);
+                mmiowb();
+                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_1, v1);
+                mmiowb();
+                bcm43xx_write16(bcm, BCM43xx_MMIO_TSF_0, v0);
+        }
+
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        status &= ~BCM43xx_SBF_TIME_UPDATE;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+}
+
+static
+void bcm43xx_macfilter_set(struct bcm43xx_private *bcm,
+                           u16 offset,
+                           const u8 *mac)
+{
+        u16 data;
+
+        offset |= 0x0020;
+        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_CONTROL, offset);
+
+        data = mac[0];
+        data |= mac[1] << 8;
+        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_DATA, data);
+        data = mac[2];
+        data |= mac[3] << 8;
+        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_DATA, data);
+        data = mac[4];
+        data |= mac[5] << 8;
+        bcm43xx_write16(bcm, BCM43xx_MMIO_MACFILTER_DATA, data);
+}
+
+static void bcm43xx_macfilter_clear(struct bcm43xx_private *bcm,
+                                    u16 offset)
+{
+        const u8 zero_addr[ETH_ALEN] = { 0 };
+
+        bcm43xx_macfilter_set(bcm, offset, zero_addr);
+}
+
+static void bcm43xx_write_mac_bssid_templates(struct bcm43xx_private *bcm)
+{
+        const u8 *mac = (const u8 *)(bcm->net_dev->dev_addr);
+        const u8 *bssid = (const u8 *)(bcm->ieee->bssid);
+        u8 mac_bssid[ETH_ALEN * 2];
+        int i;
+
+        memcpy(mac_bssid, mac, ETH_ALEN);
+        memcpy(mac_bssid + ETH_ALEN, bssid, ETH_ALEN);
+
+        /* Write our MAC address and BSSID to template ram */
+        for (i = 0; i < ARRAY_SIZE(mac_bssid); i += sizeof(u32))
+                bcm43xx_ram_write(bcm, 0x20 + i, *((u32 *)(mac_bssid + i)));
+        for (i = 0; i < ARRAY_SIZE(mac_bssid); i += sizeof(u32))
+                bcm43xx_ram_write(bcm, 0x78 + i, *((u32 *)(mac_bssid + i)));
+        for (i = 0; i < ARRAY_SIZE(mac_bssid); i += sizeof(u32))
+                bcm43xx_ram_write(bcm, 0x478 + i, *((u32 *)(mac_bssid + i)));
+}
+
+//FIXME: Well, we should probably call them from somewhere.
+#if 0
+static void bcm43xx_set_slot_time(struct bcm43xx_private *bcm, u16 slot_time)
+{
+        /* slot_time is in usec. */
+        if (bcm43xx_current_phy(bcm)->type != BCM43xx_PHYTYPE_G)
+                return;
+        bcm43xx_write16(bcm, 0x684, 510 + slot_time);
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0010, slot_time);
+}
+
+static void bcm43xx_short_slot_timing_enable(struct bcm43xx_private *bcm)
+{
+        bcm43xx_set_slot_time(bcm, 9);
+}
+
+static void bcm43xx_short_slot_timing_disable(struct bcm43xx_private *bcm)
+{
+        bcm43xx_set_slot_time(bcm, 20);
+}
+#endif
+
+/* FIXME: To get the MAC-filter working, we need to implement the
+ *        following functions (and rename them :)
+ */
+#if 0
+static void bcm43xx_disassociate(struct bcm43xx_private *bcm)
+{
+        bcm43xx_mac_suspend(bcm);
+        bcm43xx_macfilter_clear(bcm, BCM43xx_MACFILTER_ASSOC);
+
+        bcm43xx_ram_write(bcm, 0x0026, 0x0000);
+        bcm43xx_ram_write(bcm, 0x0028, 0x0000);
+        bcm43xx_ram_write(bcm, 0x007E, 0x0000);
+        bcm43xx_ram_write(bcm, 0x0080, 0x0000);
+        bcm43xx_ram_write(bcm, 0x047E, 0x0000);
+        bcm43xx_ram_write(bcm, 0x0480, 0x0000);
+
+        if (bcm->current_core->rev < 3) {
+                bcm43xx_write16(bcm, 0x0610, 0x8000);
+                bcm43xx_write16(bcm, 0x060E, 0x0000);
+        } else
+                bcm43xx_write32(bcm, 0x0188, 0x80000000);
+
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0004, 0x000003ff);
+
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_G &&
+            ieee80211_is_ofdm_rate(bcm->softmac->txrates.default_rate))
+                bcm43xx_short_slot_timing_enable(bcm);
+
+        bcm43xx_mac_enable(bcm);
+}
+
+static void bcm43xx_associate(struct bcm43xx_private *bcm,
+                              const u8 *mac)
+{
+        memcpy(bcm->ieee->bssid, mac, ETH_ALEN);
+
+        bcm43xx_mac_suspend(bcm);
+        bcm43xx_macfilter_set(bcm, BCM43xx_MACFILTER_ASSOC, mac);
+        bcm43xx_write_mac_bssid_templates(bcm);
+        bcm43xx_mac_enable(bcm);
+}
+#endif
+
+/* Enable a Generic IRQ. "mask" is the mask of which IRQs to enable.
+ * Returns the _previously_ enabled IRQ mask.
+ */
+static inline u32 bcm43xx_interrupt_enable(struct bcm43xx_private *bcm, u32 mask)
+{
+        u32 old_mask;
+
+        old_mask = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK, old_mask | mask);
+
+        return old_mask;
+}
+
+/* Disable a Generic IRQ. "mask" is the mask of which IRQs to disable.
+ * Returns the _previously_ enabled IRQ mask.
+ */
+static inline u32 bcm43xx_interrupt_disable(struct bcm43xx_private *bcm, u32 mask)
+{
+        u32 old_mask;
+
+        old_mask = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK, old_mask & ~mask);
+
+        return old_mask;
+}
+
+/* Make sure we don't receive more data from the device. */
+static int bcm43xx_disable_interrupts_sync(struct bcm43xx_private *bcm, u32 *oldstate)
+{
+        u32 old;
+        unsigned long flags;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (bcm43xx_is_initializing(bcm) || bcm->shutting_down) {
+                bcm43xx_unlock_mmio(bcm, flags);
+                return -EBUSY;
+        }
+        old = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+        tasklet_disable(&bcm->isr_tasklet);
+        bcm43xx_unlock_mmio(bcm, flags);
+        if (oldstate)
+                *oldstate = old;
+
+        return 0;
+}
+
+static int bcm43xx_read_radioinfo(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u32 radio_id;
+        u16 manufact;
+        u16 version;
+        u8 revision;
+        s8 i;
+
+        if (bcm->chip_id == 0x4317) {
+                if (bcm->chip_rev == 0x00)
+                        radio_id = 0x3205017F;
+                else if (bcm->chip_rev == 0x01)
+                        radio_id = 0x4205017F;
+                else
+                        radio_id = 0x5205017F;
+        } else {
+                bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, BCM43xx_RADIOCTL_ID);
+                radio_id = bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_DATA_HIGH);
+                radio_id <<= 16;
+                bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, BCM43xx_RADIOCTL_ID);
+                radio_id |= bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW);
+        }
+
+        manufact = (radio_id & 0x00000FFF);
+        version = (radio_id & 0x0FFFF000) >> 12;
+        revision = (radio_id & 0xF0000000) >> 28;
+
+        dprintk(KERN_INFO PFX "Detected Radio: ID: %x (Manuf: %x Ver: %x Rev: %x)\n",
+                radio_id, manufact, version, revision);
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A:
+                if ((version != 0x2060) || (revision != 1) || (manufact != 0x17f))
+                        goto err_unsupported_radio;
+                break;
+        case BCM43xx_PHYTYPE_B:
+                if ((version & 0xFFF0) != 0x2050)
+                        goto err_unsupported_radio;
+                break;
+        case BCM43xx_PHYTYPE_G:
+                if (version != 0x2050)
+                        goto err_unsupported_radio;
+                break;
+        }
+
+        radio->manufact = manufact;
+        radio->version = version;
+        radio->revision = revision;
+
+        /* Set default attenuation values. */
+        radio->baseband_atten = bcm43xx_default_baseband_attenuation(bcm);
+        radio->radio_atten = bcm43xx_default_radio_attenuation(bcm);
+        radio->txctl1 = bcm43xx_default_txctl1(bcm);
+        radio->txctl2 = 0xFFFF;
+        if (phy->type == BCM43xx_PHYTYPE_A)
+                radio->txpower_desired = bcm->sprom.maxpower_aphy;
+        else
+                radio->txpower_desired = bcm->sprom.maxpower_bgphy;
+
+        /* Initialize the in-memory nrssi Lookup Table. */
+        for (i = 0; i < 64; i++)
+                radio->nrssi_lt[i] = i;
+
+        return 0;
+
+err_unsupported_radio:
+        printk(KERN_ERR PFX "Unsupported Radio connected to the PHY!\n");
+        return -ENODEV;
+}
+
+static const char * bcm43xx_locale_iso(u8 locale)
+{
+        /* ISO 3166-1 country codes.
+         * Note that there aren't ISO 3166-1 codes for
+         * all or locales. (Not all locales are countries)
+         */
+        switch (locale) {
+        case BCM43xx_LOCALE_WORLD:
+        case BCM43xx_LOCALE_ALL:
+                return "XX";
+        case BCM43xx_LOCALE_THAILAND:
+                return "TH";
+        case BCM43xx_LOCALE_ISRAEL:
+                return "IL";
+        case BCM43xx_LOCALE_JORDAN:
+                return "JO";
+        case BCM43xx_LOCALE_CHINA:
+                return "CN";
+        case BCM43xx_LOCALE_JAPAN:
+        case BCM43xx_LOCALE_JAPAN_HIGH:
+                return "JP";
+        case BCM43xx_LOCALE_USA_CANADA_ANZ:
+        case BCM43xx_LOCALE_USA_LOW:
+                return "US";
+        case BCM43xx_LOCALE_EUROPE:
+                return "EU";
+        case BCM43xx_LOCALE_NONE:
+                return "  ";
+        }
+        assert(0);
+        return "  ";
+}
+
+static const char * bcm43xx_locale_string(u8 locale)
+{
+        switch (locale) {
+        case BCM43xx_LOCALE_WORLD:
+                return "World";
+        case BCM43xx_LOCALE_THAILAND:
+                return "Thailand";
+        case BCM43xx_LOCALE_ISRAEL:
+                return "Israel";
+        case BCM43xx_LOCALE_JORDAN:
+                return "Jordan";
+        case BCM43xx_LOCALE_CHINA:
+                return "China";
+        case BCM43xx_LOCALE_JAPAN:
+                return "Japan";
+        case BCM43xx_LOCALE_USA_CANADA_ANZ:
+                return "USA/Canada/ANZ";
+        case BCM43xx_LOCALE_EUROPE:
+                return "Europe";
+        case BCM43xx_LOCALE_USA_LOW:
+                return "USAlow";
+        case BCM43xx_LOCALE_JAPAN_HIGH:
+                return "JapanHigh";
+        case BCM43xx_LOCALE_ALL:
+                return "All";
+        case BCM43xx_LOCALE_NONE:
+                return "None";
+        }
+        assert(0);
+        return "";
+}
+
+static inline u8 bcm43xx_crc8(u8 crc, u8 data)
+{
+        static const u8 t[] = {
+                0x00, 0xF7, 0xB9, 0x4E, 0x25, 0xD2, 0x9C, 0x6B,
+                0x4A, 0xBD, 0xF3, 0x04, 0x6F, 0x98, 0xD6, 0x21,
+                0x94, 0x63, 0x2D, 0xDA, 0xB1, 0x46, 0x08, 0xFF,
+                0xDE, 0x29, 0x67, 0x90, 0xFB, 0x0C, 0x42, 0xB5,
+                0x7F, 0x88, 0xC6, 0x31, 0x5A, 0xAD, 0xE3, 0x14,
+                0x35, 0xC2, 0x8C, 0x7B, 0x10, 0xE7, 0xA9, 0x5E,
+                0xEB, 0x1C, 0x52, 0xA5, 0xCE, 0x39, 0x77, 0x80,
+                0xA1, 0x56, 0x18, 0xEF, 0x84, 0x73, 0x3D, 0xCA,
+                0xFE, 0x09, 0x47, 0xB0, 0xDB, 0x2C, 0x62, 0x95,
+                0xB4, 0x43, 0x0D, 0xFA, 0x91, 0x66, 0x28, 0xDF,
+                0x6A, 0x9D, 0xD3, 0x24, 0x4F, 0xB8, 0xF6, 0x01,
+                0x20, 0xD7, 0x99, 0x6E, 0x05, 0xF2, 0xBC, 0x4B,
+                0x81, 0x76, 0x38, 0xCF, 0xA4, 0x53, 0x1D, 0xEA,
+                0xCB, 0x3C, 0x72, 0x85, 0xEE, 0x19, 0x57, 0xA0,
+                0x15, 0xE2, 0xAC, 0x5B, 0x30, 0xC7, 0x89, 0x7E,
+                0x5F, 0xA8, 0xE6, 0x11, 0x7A, 0x8D, 0xC3, 0x34,
+                0xAB, 0x5C, 0x12, 0xE5, 0x8E, 0x79, 0x37, 0xC0,
+                0xE1, 0x16, 0x58, 0xAF, 0xC4, 0x33, 0x7D, 0x8A,
+                0x3F, 0xC8, 0x86, 0x71, 0x1A, 0xED, 0xA3, 0x54,
+                0x75, 0x82, 0xCC, 0x3B, 0x50, 0xA7, 0xE9, 0x1E,
+                0xD4, 0x23, 0x6D, 0x9A, 0xF1, 0x06, 0x48, 0xBF,
+                0x9E, 0x69, 0x27, 0xD0, 0xBB, 0x4C, 0x02, 0xF5,
+                0x40, 0xB7, 0xF9, 0x0E, 0x65, 0x92, 0xDC, 0x2B,
+                0x0A, 0xFD, 0xB3, 0x44, 0x2F, 0xD8, 0x96, 0x61,
+                0x55, 0xA2, 0xEC, 0x1B, 0x70, 0x87, 0xC9, 0x3E,
+                0x1F, 0xE8, 0xA6, 0x51, 0x3A, 0xCD, 0x83, 0x74,
+                0xC1, 0x36, 0x78, 0x8F, 0xE4, 0x13, 0x5D, 0xAA,
+                0x8B, 0x7C, 0x32, 0xC5, 0xAE, 0x59, 0x17, 0xE0,
+                0x2A, 0xDD, 0x93, 0x64, 0x0F, 0xF8, 0xB6, 0x41,
+                0x60, 0x97, 0xD9, 0x2E, 0x45, 0xB2, 0xFC, 0x0B,
+                0xBE, 0x49, 0x07, 0xF0, 0x9B, 0x6C, 0x22, 0xD5,
+                0xF4, 0x03, 0x4D, 0xBA, 0xD1, 0x26, 0x68, 0x9F,
+        };
+        return t[crc ^ data];
+}
+
+static u8 bcm43xx_sprom_crc(const u16 *sprom)
+{
+        int word;
+        u8 crc = 0xFF;
+
+        for (word = 0; word < BCM43xx_SPROM_SIZE - 1; word++) {
+                crc = bcm43xx_crc8(crc, sprom[word] & 0x00FF);
+                crc = bcm43xx_crc8(crc, (sprom[word] & 0xFF00) >> 8);
+        }
+        crc = bcm43xx_crc8(crc, sprom[BCM43xx_SPROM_VERSION] & 0x00FF);
+        crc ^= 0xFF;
+
+        return crc;
+}
+
+int bcm43xx_sprom_read(struct bcm43xx_private *bcm, u16 *sprom)
+{
+        int i;
+        u8 crc, expected_crc;
+
+        for (i = 0; i < BCM43xx_SPROM_SIZE; i++)
+                sprom[i] = bcm43xx_read16(bcm, BCM43xx_SPROM_BASE + (i * 2));
+        /* CRC-8 check. */
+        crc = bcm43xx_sprom_crc(sprom);
+        expected_crc = (sprom[BCM43xx_SPROM_VERSION] & 0xFF00) >> 8;
+        if (crc != expected_crc) {
+                printk(KERN_WARNING PFX "WARNING: Invalid SPROM checksum "
+                                        "(0x%02X, expected: 0x%02X)\n",
+                       crc, expected_crc);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+int bcm43xx_sprom_write(struct bcm43xx_private *bcm, const u16 *sprom)
+{
+        int i, err;
+        u8 crc, expected_crc;
+        u32 spromctl;
+
+        /* CRC-8 validation of the input data. */
+        crc = bcm43xx_sprom_crc(sprom);
+        expected_crc = (sprom[BCM43xx_SPROM_VERSION] & 0xFF00) >> 8;
+        if (crc != expected_crc) {
+                printk(KERN_ERR PFX "SPROM input data: Invalid CRC\n");
+                return -EINVAL;
+        }
+
+        printk(KERN_INFO PFX "Writing SPROM. Do NOT turn off the power! Please stand by...\n");
+        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCICFG_SPROMCTL, &spromctl);
+        if (err)
+                goto err_ctlreg;
+        spromctl |= 0x10; /* SPROM WRITE enable. */
+        bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);
+        if (err)
+                goto err_ctlreg;
+        /* We must burn lots of CPU cycles here, but that does not
+         * really matter as one does not write the SPROM every other minute...
+         */
+        printk(KERN_INFO PFX "[ 0%%");
+        mdelay(500);
+        for (i = 0; i < BCM43xx_SPROM_SIZE; i++) {
+                if (i == 16)
+                        printk("25%%");
+                else if (i == 32)
+                        printk("50%%");
+                else if (i == 48)
+                        printk("75%%");
+                else if (i % 2)
+                        printk(".");
+                bcm43xx_write16(bcm, BCM43xx_SPROM_BASE + (i * 2), sprom[i]);
+                mmiowb();
+                mdelay(20);
+        }
+        spromctl &= ~0x10; /* SPROM WRITE enable. */
+        bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);
+        if (err)
+                goto err_ctlreg;
+        mdelay(500);
+        printk("100%% ]\n");
+        printk(KERN_INFO PFX "SPROM written.\n");
+        bcm43xx_controller_restart(bcm, "SPROM update");
+
+        return 0;
+err_ctlreg:
+        printk(KERN_ERR PFX "Could not access SPROM control register.\n");
+        return -ENODEV;
+}
+
+static int bcm43xx_sprom_extract(struct bcm43xx_private *bcm)
+{
+        u16 value;
+        u16 *sprom;
+#ifdef CONFIG_BCM947XX
+        char *c;
+#endif
+
+        sprom = kzalloc(BCM43xx_SPROM_SIZE * sizeof(u16),
+                        GFP_KERNEL);
+        if (!sprom) {
+                printk(KERN_ERR PFX "sprom_extract OOM\n");
+                return -ENOMEM;
+        }
+#ifdef CONFIG_BCM947XX
+        sprom[BCM43xx_SPROM_BOARDFLAGS2] = atoi(nvram_get("boardflags2"));
+        sprom[BCM43xx_SPROM_BOARDFLAGS] = atoi(nvram_get("boardflags"));
+
+        if ((c = nvram_get("il0macaddr")) != NULL)
+                e_aton(c, (char *) &(sprom[BCM43xx_SPROM_IL0MACADDR]));
+
+        if ((c = nvram_get("et1macaddr")) != NULL)
+                e_aton(c, (char *) &(sprom[BCM43xx_SPROM_ET1MACADDR]));
+
+        sprom[BCM43xx_SPROM_PA0B0] = atoi(nvram_get("pa0b0"));
+        sprom[BCM43xx_SPROM_PA0B1] = atoi(nvram_get("pa0b1"));
+        sprom[BCM43xx_SPROM_PA0B2] = atoi(nvram_get("pa0b2"));
+
+        sprom[BCM43xx_SPROM_PA1B0] = atoi(nvram_get("pa1b0"));
+        sprom[BCM43xx_SPROM_PA1B1] = atoi(nvram_get("pa1b1"));
+        sprom[BCM43xx_SPROM_PA1B2] = atoi(nvram_get("pa1b2"));
+
+        sprom[BCM43xx_SPROM_BOARDREV] = atoi(nvram_get("boardrev"));
+#else
+        bcm43xx_sprom_read(bcm, sprom);
+#endif
+
+        /* boardflags2 */
+        value = sprom[BCM43xx_SPROM_BOARDFLAGS2];
+        bcm->sprom.boardflags2 = value;
+
+        /* il0macaddr */
+        value = sprom[BCM43xx_SPROM_IL0MACADDR + 0];
+        *(((u16 *)bcm->sprom.il0macaddr) + 0) = cpu_to_be16(value);
+        value = sprom[BCM43xx_SPROM_IL0MACADDR + 1];
+        *(((u16 *)bcm->sprom.il0macaddr) + 1) = cpu_to_be16(value);
+        value = sprom[BCM43xx_SPROM_IL0MACADDR + 2];
+        *(((u16 *)bcm->sprom.il0macaddr) + 2) = cpu_to_be16(value);
+
+        /* et0macaddr */
+        value = sprom[BCM43xx_SPROM_ET0MACADDR + 0];
+        *(((u16 *)bcm->sprom.et0macaddr) + 0) = cpu_to_be16(value);
+        value = sprom[BCM43xx_SPROM_ET0MACADDR + 1];
+        *(((u16 *)bcm->sprom.et0macaddr) + 1) = cpu_to_be16(value);
+        value = sprom[BCM43xx_SPROM_ET0MACADDR + 2];
+        *(((u16 *)bcm->sprom.et0macaddr) + 2) = cpu_to_be16(value);
+
+        /* et1macaddr */
+        value = sprom[BCM43xx_SPROM_ET1MACADDR + 0];
+        *(((u16 *)bcm->sprom.et1macaddr) + 0) = cpu_to_be16(value);
+        value = sprom[BCM43xx_SPROM_ET1MACADDR + 1];
+        *(((u16 *)bcm->sprom.et1macaddr) + 1) = cpu_to_be16(value);
+        value = sprom[BCM43xx_SPROM_ET1MACADDR + 2];
+        *(((u16 *)bcm->sprom.et1macaddr) + 2) = cpu_to_be16(value);
+
+        /* ethernet phy settings */
+        value = sprom[BCM43xx_SPROM_ETHPHY];
+        bcm->sprom.et0phyaddr = (value & 0x001F);
+        bcm->sprom.et1phyaddr = (value & 0x03E0) >> 5;
+        bcm->sprom.et0mdcport = (value & (1 << 14)) >> 14;
+        bcm->sprom.et1mdcport = (value & (1 << 15)) >> 15;
+
+        /* boardrev, antennas, locale */
+        value = sprom[BCM43xx_SPROM_BOARDREV];
+        bcm->sprom.boardrev = (value & 0x00FF);
+        bcm->sprom.locale = (value & 0x0F00) >> 8;
+        bcm->sprom.antennas_aphy = (value & 0x3000) >> 12;
+        bcm->sprom.antennas_bgphy = (value & 0xC000) >> 14;
+        if (modparam_locale != -1) {
+                if (modparam_locale >= 0 && modparam_locale <= 11) {
+                        bcm->sprom.locale = modparam_locale;
+                        printk(KERN_WARNING PFX "Operating with modified "
+                                                "LocaleCode %u (%s)\n",
+                               bcm->sprom.locale,
+                               bcm43xx_locale_string(bcm->sprom.locale));
+                } else {
+                        printk(KERN_WARNING PFX "Module parameter \"locale\" "
+                                                "invalid value. (0 - 11)\n");
+                }
+        }
+
+        /* pa0b* */
+        value = sprom[BCM43xx_SPROM_PA0B0];
+        bcm->sprom.pa0b0 = value;
+        value = sprom[BCM43xx_SPROM_PA0B1];
+        bcm->sprom.pa0b1 = value;
+        value = sprom[BCM43xx_SPROM_PA0B2];
+        bcm->sprom.pa0b2 = value;
+
+        /* wl0gpio* */
+        value = sprom[BCM43xx_SPROM_WL0GPIO0];
+        if (value == 0x0000)
+                value = 0xFFFF;
+        bcm->sprom.wl0gpio0 = value & 0x00FF;
+        bcm->sprom.wl0gpio1 = (value & 0xFF00) >> 8;
+        value = sprom[BCM43xx_SPROM_WL0GPIO2];
+        if (value == 0x0000)
+                value = 0xFFFF;
+        bcm->sprom.wl0gpio2 = value & 0x00FF;
+        bcm->sprom.wl0gpio3 = (value & 0xFF00) >> 8;
+
+        /* maxpower */
+        value = sprom[BCM43xx_SPROM_MAXPWR];
+        bcm->sprom.maxpower_aphy = (value & 0xFF00) >> 8;
+        bcm->sprom.maxpower_bgphy = value & 0x00FF;
+
+        /* pa1b* */
+        value = sprom[BCM43xx_SPROM_PA1B0];
+        bcm->sprom.pa1b0 = value;
+        value = sprom[BCM43xx_SPROM_PA1B1];
+        bcm->sprom.pa1b1 = value;
+        value = sprom[BCM43xx_SPROM_PA1B2];
+        bcm->sprom.pa1b2 = value;
+
+        /* idle tssi target */
+        value = sprom[BCM43xx_SPROM_IDL_TSSI_TGT];
+        bcm->sprom.idle_tssi_tgt_aphy = value & 0x00FF;
+        bcm->sprom.idle_tssi_tgt_bgphy = (value & 0xFF00) >> 8;
+
+        /* boardflags */
+        value = sprom[BCM43xx_SPROM_BOARDFLAGS];
+        if (value == 0xFFFF)
+                value = 0x0000;
+        bcm->sprom.boardflags = value;
+        /* boardflags workarounds */
+        if (bcm->board_vendor == PCI_VENDOR_ID_DELL &&
+            bcm->chip_id == 0x4301 &&
+            bcm->board_revision == 0x74)
+                bcm->sprom.boardflags |= BCM43xx_BFL_BTCOEXIST;
+        if (bcm->board_vendor == PCI_VENDOR_ID_APPLE &&
+            bcm->board_type == 0x4E &&
+            bcm->board_revision > 0x40)
+                bcm->sprom.boardflags |= BCM43xx_BFL_PACTRL;
+
+        /* antenna gain */
+        value = sprom[BCM43xx_SPROM_ANTENNA_GAIN];
+        if (value == 0x0000 || value == 0xFFFF)
+                value = 0x0202;
+        /* convert values to Q5.2 */
+        bcm->sprom.antennagain_aphy = ((value & 0xFF00) >> 8) * 4;
+        bcm->sprom.antennagain_bgphy = (value & 0x00FF) * 4;
+
+        kfree(sprom);
+
+        return 0;
+}
+
+static void bcm43xx_geo_init(struct bcm43xx_private *bcm)
+{
+        struct ieee80211_geo geo;
+        struct ieee80211_channel *chan;
+        int have_a = 0, have_bg = 0;
+        int i;
+        u8 channel;
+        struct bcm43xx_phyinfo *phy;
+        const char *iso_country;
+
+        memset(&geo, 0, sizeof(geo));
+        for (i = 0; i < bcm->nr_80211_available; i++) {
+                phy = &(bcm->core_80211_ext[i].phy);
+                switch (phy->type) {
+                case BCM43xx_PHYTYPE_B:
+                case BCM43xx_PHYTYPE_G:
+                        have_bg = 1;
+                        break;
+                case BCM43xx_PHYTYPE_A:
+                        have_a = 1;
+                        break;
+                default:
+                        assert(0);
+                }
+        }
+        iso_country = bcm43xx_locale_iso(bcm->sprom.locale);
+
+        if (have_a) {
+                for (i = 0, channel = 0; channel < 201; channel++) {
+                        chan = &geo.a[i++];
+                        chan->freq = bcm43xx_channel_to_freq_a(channel);
+                        chan->channel = channel;
+                }
+                geo.a_channels = i;
+        }
+        if (have_bg) {
+                for (i = 0, channel = 1; channel < 15; channel++) {
+                        chan = &geo.bg[i++];
+                        chan->freq = bcm43xx_channel_to_freq_bg(channel);
+                        chan->channel = channel;
+                }
+                geo.bg_channels = i;
+        }
+        memcpy(geo.name, iso_country, 2);
+        if (0 /*TODO: Outdoor use only */)
+                geo.name[2] = 'O';
+        else if (0 /*TODO: Indoor use only */)
+                geo.name[2] = 'I';
+        else
+                geo.name[2] = ' ';
+        geo.name[3] = '\0';
+
+        ieee80211_set_geo(bcm->ieee, &geo);
+}
+
+/* DummyTransmission function, as documented on 
+ * http://bcm-specs.sipsolutions.net/DummyTransmission
+ */
+void bcm43xx_dummy_transmission(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        unsigned int i, max_loop;
+        u16 value = 0;
+        u32 buffer[5] = {
+                0x00000000,
+                0x0000D400,
+                0x00000000,
+                0x00000001,
+                0x00000000,
+        };
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A:
+                max_loop = 0x1E;
+                buffer[0] = 0xCC010200;
+                break;
+        case BCM43xx_PHYTYPE_B:
+        case BCM43xx_PHYTYPE_G:
+                max_loop = 0xFA;
+                buffer[0] = 0x6E840B00; 
+                break;
+        default:
+                assert(0);
+                return;
+        }
+
+        for (i = 0; i < 5; i++)
+                bcm43xx_ram_write(bcm, i * 4, buffer[i]);
+
+        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* dummy read */
+
+        bcm43xx_write16(bcm, 0x0568, 0x0000);
+        bcm43xx_write16(bcm, 0x07C0, 0x0000);
+        bcm43xx_write16(bcm, 0x050C, ((phy->type == BCM43xx_PHYTYPE_A) ? 1 : 0));
+        bcm43xx_write16(bcm, 0x0508, 0x0000);
+        bcm43xx_write16(bcm, 0x050A, 0x0000);
+        bcm43xx_write16(bcm, 0x054C, 0x0000);
+        bcm43xx_write16(bcm, 0x056A, 0x0014);
+        bcm43xx_write16(bcm, 0x0568, 0x0826);
+        bcm43xx_write16(bcm, 0x0500, 0x0000);
+        bcm43xx_write16(bcm, 0x0502, 0x0030);
+
+        if (radio->version == 0x2050 && radio->revision <= 0x5)
+                bcm43xx_radio_write16(bcm, 0x0051, 0x0017);
+        for (i = 0x00; i < max_loop; i++) {
+                value = bcm43xx_read16(bcm, 0x050E);
+                if (value & 0x0080)
+                        break;
+                udelay(10);
+        }
+        for (i = 0x00; i < 0x0A; i++) {
+                value = bcm43xx_read16(bcm, 0x050E);
+                if (value & 0x0400)
+                        break;
+                udelay(10);
+        }
+        for (i = 0x00; i < 0x0A; i++) {
+                value = bcm43xx_read16(bcm, 0x0690);
+                if (!(value & 0x0100))
+                        break;
+                udelay(10);
+        }
+        if (radio->version == 0x2050 && radio->revision <= 0x5)
+                bcm43xx_radio_write16(bcm, 0x0051, 0x0037);
+}
+
+static void key_write(struct bcm43xx_private *bcm,
+                      u8 index, u8 algorithm, const u16 *key)
+{
+        unsigned int i, basic_wep = 0;
+        u32 offset;
+        u16 value;
+ 
+        /* Write associated key information */
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x100 + (index * 2),
+                            ((index << 4) | (algorithm & 0x0F)));
+ 
+        /* The first 4 WEP keys need extra love */
+        if (((algorithm == BCM43xx_SEC_ALGO_WEP) ||
+            (algorithm == BCM43xx_SEC_ALGO_WEP104)) && (index < 4))
+                basic_wep = 1;
+ 
+        /* Write key payload, 8 little endian words */
+        offset = bcm->security_offset + (index * BCM43xx_SEC_KEYSIZE);
+        for (i = 0; i < (BCM43xx_SEC_KEYSIZE / sizeof(u16)); i++) {
+                value = cpu_to_le16(key[i]);
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
+                                    offset + (i * 2), value);
+ 
+                if (!basic_wep)
+                        continue;
+ 
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
+                                    offset + (i * 2) + 4 * BCM43xx_SEC_KEYSIZE,
+                                    value);
+        }
+}
+
+static void keymac_write(struct bcm43xx_private *bcm,
+                         u8 index, const u32 *addr)
+{
+        /* for keys 0-3 there is no associated mac address */
+        if (index < 4)
+                return;
+
+        index -= 4;
+        if (bcm->current_core->rev >= 5) {
+                bcm43xx_shm_write32(bcm,
+                                    BCM43xx_SHM_HWMAC,
+                                    index * 2,
+                                    cpu_to_be32(*addr));
+                bcm43xx_shm_write16(bcm,
+                                    BCM43xx_SHM_HWMAC,
+                                    (index * 2) + 1,
+                                    cpu_to_be16(*((u16 *)(addr + 1))));
+        } else {
+                if (index < 8) {
+                        TODO(); /* Put them in the macaddress filter */
+                } else {
+                        TODO();
+                        /* Put them BCM43xx_SHM_SHARED, stating index 0x0120.
+                           Keep in mind to update the count of keymacs in 0x003E as well! */
+                }
+        }
+}
+
+static int bcm43xx_key_write(struct bcm43xx_private *bcm,
+                             u8 index, u8 algorithm,
+                             const u8 *_key, int key_len,
+                             const u8 *mac_addr)
+{
+        u8 key[BCM43xx_SEC_KEYSIZE] = { 0 };
+
+        if (index >= ARRAY_SIZE(bcm->key))
+                return -EINVAL;
+        if (key_len > ARRAY_SIZE(key))
+                return -EINVAL;
+        if (algorithm < 1 || algorithm > 5)
+                return -EINVAL;
+
+        memcpy(key, _key, key_len);
+        key_write(bcm, index, algorithm, (const u16 *)key);
+        keymac_write(bcm, index, (const u32 *)mac_addr);
+
+        bcm->key[index].algorithm = algorithm;
+
+        return 0;
+}
+
+static void bcm43xx_clear_keys(struct bcm43xx_private *bcm)
+{
+        static const u32 zero_mac[2] = { 0 };
+        unsigned int i,j, nr_keys = 54;
+        u16 offset;
+
+        if (bcm->current_core->rev < 5)
+                nr_keys = 16;
+        assert(nr_keys <= ARRAY_SIZE(bcm->key));
+
+        for (i = 0; i < nr_keys; i++) {
+                bcm->key[i].enabled = 0;
+                /* returns for i < 4 immediately */
+                keymac_write(bcm, i, zero_mac);
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
+                                    0x100 + (i * 2), 0x0000);
+                for (j = 0; j < 8; j++) {
+                        offset = bcm->security_offset + (j * 4) + (i * BCM43xx_SEC_KEYSIZE);
+                        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED,
+                                            offset, 0x0000);
+                }
+        }
+        dprintk(KERN_INFO PFX "Keys cleared\n");
+}
+
+/* Lowlevel core-switch function. This is only to be used in
+ * bcm43xx_switch_core() and bcm43xx_probe_cores()
+ */
+static int _switch_core(struct bcm43xx_private *bcm, int core)
+{
+        int err;
+        int attempts = 0;
+        u32 current_core;
+
+        assert(core >= 0);
+        while (1) {
+                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_ACTIVE_CORE,
+                                                 (core * 0x1000) + 0x18000000);
+                if (unlikely(err))
+                        goto error;
+                err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCICFG_ACTIVE_CORE,
+                                                &current_core);
+                if (unlikely(err))
+                        goto error;
+                current_core = (current_core - 0x18000000) / 0x1000;
+                if (current_core == core)
+                        break;
+
+                if (unlikely(attempts++ > BCM43xx_SWITCH_CORE_MAX_RETRIES))
+                        goto error;
+                udelay(10);
+        }
+#ifdef CONFIG_BCM947XX
+        if (bcm->pci_dev->bus->number == 0)
+                bcm->current_core_offset = 0x1000 * core;
+        else
+                bcm->current_core_offset = 0;
+#endif
+
+        return 0;
+error:
+        printk(KERN_ERR PFX "Failed to switch to core %d\n", core);
+        return -ENODEV;
+}
+
+int bcm43xx_switch_core(struct bcm43xx_private *bcm, struct bcm43xx_coreinfo *new_core)
+{
+        int err;
+
+        if (unlikely(!new_core))
+                return 0;
+        if (!new_core->available)
+                return -ENODEV;
+        if (bcm->current_core == new_core)
+                return 0;
+        err = _switch_core(bcm, new_core->index);
+        if (unlikely(err))
+                goto out;
+
+        bcm->current_core = new_core;
+        bcm->current_80211_core_idx = -1;
+        if (new_core->id == BCM43xx_COREID_80211)
+                bcm->current_80211_core_idx = (int)(new_core - &(bcm->core_80211[0]));
+
+out:
+        return err;
+}
+
+static int bcm43xx_core_enabled(struct bcm43xx_private *bcm)
+{
+        u32 value;
+
+        value = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+        value &= BCM43xx_SBTMSTATELOW_CLOCK | BCM43xx_SBTMSTATELOW_RESET
+                 | BCM43xx_SBTMSTATELOW_REJECT;
+
+        return (value == BCM43xx_SBTMSTATELOW_CLOCK);
+}
+
+/* disable current core */
+static int bcm43xx_core_disable(struct bcm43xx_private *bcm, u32 core_flags)
+{
+        u32 sbtmstatelow;
+        u32 sbtmstatehigh;
+        int i;
+
+        /* fetch sbtmstatelow from core information registers */
+        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+
+        /* core is already in reset */
+        if (sbtmstatelow & BCM43xx_SBTMSTATELOW_RESET)
+                goto out;
+
+        if (sbtmstatelow & BCM43xx_SBTMSTATELOW_CLOCK) {
+                sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK |
+                               BCM43xx_SBTMSTATELOW_REJECT;
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+
+                for (i = 0; i < 1000; i++) {
+                        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+                        if (sbtmstatelow & BCM43xx_SBTMSTATELOW_REJECT) {
+                                i = -1;
+                                break;
+                        }
+                        udelay(10);
+                }
+                if (i != -1) {
+                        printk(KERN_ERR PFX "Error: core_disable() REJECT timeout!\n");
+                        return -EBUSY;
+                }
+
+                for (i = 0; i < 1000; i++) {
+                        sbtmstatehigh = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
+                        if (!(sbtmstatehigh & BCM43xx_SBTMSTATEHIGH_BUSY)) {
+                                i = -1;
+                                break;
+                        }
+                        udelay(10);
+                }
+                if (i != -1) {
+                        printk(KERN_ERR PFX "Error: core_disable() BUSY timeout!\n");
+                        return -EBUSY;
+                }
+
+                sbtmstatelow = BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK |
+                               BCM43xx_SBTMSTATELOW_REJECT |
+                               BCM43xx_SBTMSTATELOW_RESET |
+                               BCM43xx_SBTMSTATELOW_CLOCK |
+                               core_flags;
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+                udelay(10);
+        }
+
+        sbtmstatelow = BCM43xx_SBTMSTATELOW_RESET |
+                       BCM43xx_SBTMSTATELOW_REJECT |
+                       core_flags;
+        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+
+out:
+        bcm->current_core->enabled = 0;
+
+        return 0;
+}
+
+/* enable (reset) current core */
+static int bcm43xx_core_enable(struct bcm43xx_private *bcm, u32 core_flags)
+{
+        u32 sbtmstatelow;
+        u32 sbtmstatehigh;
+        u32 sbimstate;
+        int err;
+
+        err = bcm43xx_core_disable(bcm, core_flags);
+        if (err)
+                goto out;
+
+        sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK |
+                       BCM43xx_SBTMSTATELOW_RESET |
+                       BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK |
+                       core_flags;
+        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+        udelay(1);
+
+        sbtmstatehigh = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
+        if (sbtmstatehigh & BCM43xx_SBTMSTATEHIGH_SERROR) {
+                sbtmstatehigh = 0x00000000;
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATEHIGH, sbtmstatehigh);
+        }
+
+        sbimstate = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMSTATE);
+        if (sbimstate & (BCM43xx_SBIMSTATE_IB_ERROR | BCM43xx_SBIMSTATE_TIMEOUT)) {
+                sbimstate &= ~(BCM43xx_SBIMSTATE_IB_ERROR | BCM43xx_SBIMSTATE_TIMEOUT);
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBIMSTATE, sbimstate);
+        }
+
+        sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK |
+                       BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK |
+                       core_flags;
+        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+        udelay(1);
+
+        sbtmstatelow = BCM43xx_SBTMSTATELOW_CLOCK | core_flags;
+        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+        udelay(1);
+
+        bcm->current_core->enabled = 1;
+        assert(err == 0);
+out:
+        return err;
+}
+
+/* http://bcm-specs.sipsolutions.net/80211CoreReset */
+void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy)
+{
+        u32 flags = 0x00040000;
+
+        if ((bcm43xx_core_enabled(bcm)) &&
+            !bcm43xx_using_pio(bcm)) {
+//FIXME: Do we _really_ want #ifndef CONFIG_BCM947XX here?
+#ifndef CONFIG_BCM947XX
+                /* reset all used DMA controllers. */
+                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA1_BASE);
+                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA2_BASE);
+                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA3_BASE);
+                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA4_BASE);
+                bcm43xx_dmacontroller_rx_reset(bcm, BCM43xx_MMIO_DMA1_BASE);
+                if (bcm->current_core->rev < 5)
+                        bcm43xx_dmacontroller_rx_reset(bcm, BCM43xx_MMIO_DMA4_BASE);
+#endif
+        }
+        if (bcm->shutting_down) {
+                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
+                                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
+                                & ~(BCM43xx_SBF_MAC_ENABLED | 0x00000002));
+        } else {
+                if (connect_phy)
+                        flags |= 0x20000000;
+                bcm43xx_phy_connect(bcm, connect_phy);
+                bcm43xx_core_enable(bcm, flags);
+                bcm43xx_write16(bcm, 0x03E6, 0x0000);
+                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
+                                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
+                                | BCM43xx_SBF_400);
+        }
+}
+
+static void bcm43xx_wireless_core_disable(struct bcm43xx_private *bcm)
+{
+        bcm43xx_radio_turn_off(bcm);
+        bcm43xx_write16(bcm, 0x03E6, 0x00F4);
+        bcm43xx_core_disable(bcm, 0);
+}
+
+/* Mark the current 80211 core inactive.
+ * "active_80211_core" is the other 80211 core, which is used.
+ */
+static int bcm43xx_wireless_core_mark_inactive(struct bcm43xx_private *bcm,
+                                               struct bcm43xx_coreinfo *active_80211_core)
+{
+        u32 sbtmstatelow;
+        struct bcm43xx_coreinfo *old_core;
+        int err = 0;
+
+        bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+        bcm43xx_radio_turn_off(bcm);
+        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+        sbtmstatelow &= ~0x200a0000;
+        sbtmstatelow |= 0xa0000;
+        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+        udelay(1);
+        sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+        sbtmstatelow &= ~0xa0000;
+        sbtmstatelow |= 0x80000;
+        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+        udelay(1);
+
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_G) {
+                old_core = bcm->current_core;
+                err = bcm43xx_switch_core(bcm, active_80211_core);
+                if (err)
+                        goto out;
+                sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+                sbtmstatelow &= ~0x20000000;
+                sbtmstatelow |= 0x20000000;
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
+                err = bcm43xx_switch_core(bcm, old_core);
+        }
+
+out:
+        return err;
+}
+
+static void handle_irq_transmit_status(struct bcm43xx_private *bcm)
+{
+        u32 v0, v1;
+        u16 tmp;
+        struct bcm43xx_xmitstatus stat;
+
+        while (1) {
+                v0 = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_0);
+                if (!v0)
+                        break;
+                v1 = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_1);
+
+                stat.cookie = (v0 >> 16) & 0x0000FFFF;
+                tmp = (u16)((v0 & 0xFFF0) | ((v0 & 0xF) >> 1));
+                stat.flags = tmp & 0xFF;
+                stat.cnt1 = (tmp & 0x0F00) >> 8;
+                stat.cnt2 = (tmp & 0xF000) >> 12;
+                stat.seq = (u16)(v1 & 0xFFFF);
+                stat.unknown = (u16)((v1 >> 16) & 0xFF);
+
+                bcm43xx_debugfs_log_txstat(bcm, &stat);
+
+                if (stat.flags & BCM43xx_TXSTAT_FLAG_IGNORE)
+                        continue;
+                if (!(stat.flags & BCM43xx_TXSTAT_FLAG_ACK)) {
+                        //TODO: packet was not acked (was lost)
+                }
+                //TODO: There are more (unknown) flags to test. see bcm43xx_main.h
+
+                if (bcm43xx_using_pio(bcm))
+                        bcm43xx_pio_handle_xmitstatus(bcm, &stat);
+                else
+                        bcm43xx_dma_handle_xmitstatus(bcm, &stat);
+        }
+}
+
+static void bcm43xx_generate_noise_sample(struct bcm43xx_private *bcm)
+{
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x408, 0x7F7F);
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x40A, 0x7F7F);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD,
+                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD) | (1 << 4));
+        assert(bcm->noisecalc.core_at_start == bcm->current_core);
+        assert(bcm->noisecalc.channel_at_start == bcm43xx_current_radio(bcm)->channel);
+}
+
+static void bcm43xx_calculate_link_quality(struct bcm43xx_private *bcm)
+{
+        /* Top half of Link Quality calculation. */
+
+        if (bcm->noisecalc.calculation_running)
+                return;
+        bcm->noisecalc.core_at_start = bcm->current_core;
+        bcm->noisecalc.channel_at_start = bcm43xx_current_radio(bcm)->channel;
+        bcm->noisecalc.calculation_running = 1;
+        bcm->noisecalc.nr_samples = 0;
+
+        bcm43xx_generate_noise_sample(bcm);
+}
+
+static void handle_irq_noise(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 tmp;
+        u8 noise[4];
+        u8 i, j;
+        s32 average;
+
+        /* Bottom half of Link Quality calculation. */
+
+        assert(bcm->noisecalc.calculation_running);
+        if (bcm->noisecalc.core_at_start != bcm->current_core ||
+            bcm->noisecalc.channel_at_start != radio->channel)
+                goto drop_calculation;
+        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x408);
+        noise[0] = (tmp & 0x00FF);
+        noise[1] = (tmp & 0xFF00) >> 8;
+        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x40A);
+        noise[2] = (tmp & 0x00FF);
+        noise[3] = (tmp & 0xFF00) >> 8;
+        if (noise[0] == 0x7F || noise[1] == 0x7F ||
+            noise[2] == 0x7F || noise[3] == 0x7F)
+                goto generate_new;
+
+        /* Get the noise samples. */
+        assert(bcm->noisecalc.nr_samples <= 8);
+        i = bcm->noisecalc.nr_samples;
+        noise[0] = limit_value(noise[0], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+        noise[1] = limit_value(noise[1], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+        noise[2] = limit_value(noise[2], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+        noise[3] = limit_value(noise[3], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+        bcm->noisecalc.samples[i][0] = radio->nrssi_lt[noise[0]];
+        bcm->noisecalc.samples[i][1] = radio->nrssi_lt[noise[1]];
+        bcm->noisecalc.samples[i][2] = radio->nrssi_lt[noise[2]];
+        bcm->noisecalc.samples[i][3] = radio->nrssi_lt[noise[3]];
+        bcm->noisecalc.nr_samples++;
+        if (bcm->noisecalc.nr_samples == 8) {
+                /* Calculate the Link Quality by the noise samples. */
+                average = 0;
+                for (i = 0; i < 8; i++) {
+                        for (j = 0; j < 4; j++)
+                                average += bcm->noisecalc.samples[i][j];
+                }
+                average /= (8 * 4);
+                average *= 125;
+                average += 64;
+                average /= 128;
+
+                tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x40C);
+                tmp = (tmp / 128) & 0x1F;
+                if (tmp >= 8)
+                        average += 2;
+                else
+                        average -= 25;
+                if (tmp == 8)
+                        average -= 72;
+                else
+                        average -= 48;
+
+/* FIXME: This is wrong, but people want fancy stats. well... */
+bcm->stats.noise = average;
+                if (average > -65)
+                        bcm->stats.link_quality = 0;
+                else if (average > -75)
+                        bcm->stats.link_quality = 1;
+                else if (average > -85)
+                        bcm->stats.link_quality = 2;
+                else
+                        bcm->stats.link_quality = 3;
+//              dprintk(KERN_INFO PFX "Link Quality: %u (avg was %d)\n", bcm->stats.link_quality, average);
+drop_calculation:
+                bcm->noisecalc.calculation_running = 0;
+                return;
+        }
+generate_new:
+        bcm43xx_generate_noise_sample(bcm);
+}
+
+static void handle_irq_ps(struct bcm43xx_private *bcm)
+{
+        if (bcm->ieee->iw_mode == IW_MODE_MASTER) {
+                ///TODO: PS TBTT
+        } else {
+                if (1/*FIXME: the last PSpoll frame was sent successfully */)
+                        bcm43xx_power_saving_ctl_bits(bcm, -1, -1);
+        }
+        if (bcm->ieee->iw_mode == IW_MODE_ADHOC)
+                bcm->reg124_set_0x4 = 1;
+        //FIXME else set to false?
+}
+
+static void handle_irq_reg124(struct bcm43xx_private *bcm)
+{
+        if (!bcm->reg124_set_0x4)
+                return;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD,
+                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD)
+                        | 0x4);
+        //FIXME: reset reg124_set_0x4 to false?
+}
+
+static void handle_irq_pmq(struct bcm43xx_private *bcm)
+{
+        u32 tmp;
+
+        //TODO: AP mode.
+
+        while (1) {
+                tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_PS_STATUS);
+                if (!(tmp & 0x00000008))
+                        break;
+        }
+        /* 16bit write is odd, but correct. */
+        bcm43xx_write16(bcm, BCM43xx_MMIO_PS_STATUS, 0x0002);
+}
+
+static void bcm43xx_generate_beacon_template(struct bcm43xx_private *bcm,
+                                             u16 ram_offset, u16 shm_size_offset)
+{
+        u32 value;
+        u16 size = 0;
+
+        /* Timestamp. */
+        //FIXME: assumption: The chip sets the timestamp
+        value = 0;
+        bcm43xx_ram_write(bcm, ram_offset++, value);
+        bcm43xx_ram_write(bcm, ram_offset++, value);
+        size += 8;
+
+        /* Beacon Interval / Capability Information */
+        value = 0x0000;//FIXME: Which interval?
+        value |= (1 << 0) << 16; /* ESS */
+        value |= (1 << 2) << 16; /* CF Pollable */      //FIXME?
+        value |= (1 << 3) << 16; /* CF Poll Request */  //FIXME?
+        if (!bcm->ieee->open_wep)
+                value |= (1 << 4) << 16; /* Privacy */
+        bcm43xx_ram_write(bcm, ram_offset++, value);
+        size += 4;
+
+        /* SSID */
+        //TODO
+
+        /* FH Parameter Set */
+        //TODO
+
+        /* DS Parameter Set */
+        //TODO
+
+        /* CF Parameter Set */
+        //TODO
+
+        /* TIM */
+        //TODO
+
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, shm_size_offset, size);
+}
+
+static void handle_irq_beacon(struct bcm43xx_private *bcm)
+{
+        u32 status;
+
+        bcm->irq_savedstate &= ~BCM43xx_IRQ_BEACON;
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD);
+
+        if ((status & 0x1) && (status & 0x2)) {
+                /* ACK beacon IRQ. */
+                bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON,
+                                BCM43xx_IRQ_BEACON);
+                bcm->irq_savedstate |= BCM43xx_IRQ_BEACON;
+                return;
+        }
+        if (!(status & 0x1)) {
+                bcm43xx_generate_beacon_template(bcm, 0x68, 0x18);
+                status |= 0x1;
+                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD, status);
+        }
+        if (!(status & 0x2)) {
+                bcm43xx_generate_beacon_template(bcm, 0x468, 0x1A);
+                status |= 0x2;
+                bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD, status);
+        }
+}
+
+/* Interrupt handler bottom-half */
+static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)
+{
+        u32 reason;
+        u32 dma_reason[4];
+        int activity = 0;
+        unsigned long flags;
+
+#ifdef CONFIG_BCM43XX_DEBUG
+        u32 _handled = 0x00000000;
+# define bcmirq_handled(irq)    do { _handled |= (irq); } while (0)
+#else
+# define bcmirq_handled(irq)    do { /* nothing */ } while (0)
+#endif /* CONFIG_BCM43XX_DEBUG*/
+
+        bcm43xx_lock_mmio(bcm, flags);
+        reason = bcm->irq_reason;
+        dma_reason[0] = bcm->dma_reason[0];
+        dma_reason[1] = bcm->dma_reason[1];
+        dma_reason[2] = bcm->dma_reason[2];
+        dma_reason[3] = bcm->dma_reason[3];
+
+        if (unlikely(reason & BCM43xx_IRQ_XMIT_ERROR)) {
+                /* TX error. We get this when Template Ram is written in wrong endianess
+                 * in dummy_tx(). We also get this if something is wrong with the TX header
+                 * on DMA or PIO queues.
+                 * Maybe we get this in other error conditions, too.
+                 */
+                printkl(KERN_ERR PFX "FATAL ERROR: BCM43xx_IRQ_XMIT_ERROR\n");
+                bcmirq_handled(BCM43xx_IRQ_XMIT_ERROR);
+        }
+        if (unlikely((dma_reason[0] & BCM43xx_DMAIRQ_FATALMASK) |
+                     (dma_reason[1] & BCM43xx_DMAIRQ_FATALMASK) |
+                     (dma_reason[2] & BCM43xx_DMAIRQ_FATALMASK) |
+                     (dma_reason[3] & BCM43xx_DMAIRQ_FATALMASK))) {
+                printkl(KERN_ERR PFX "FATAL ERROR: Fatal DMA error: "
+                                     "0x%08X, 0x%08X, 0x%08X, 0x%08X\n",
+                        dma_reason[0], dma_reason[1],
+                        dma_reason[2], dma_reason[3]);
+                bcm43xx_controller_restart(bcm, "DMA error");
+                bcm43xx_unlock_mmio(bcm, flags);
+                return;
+        }
+        if (unlikely((dma_reason[0] & BCM43xx_DMAIRQ_NONFATALMASK) |
+                     (dma_reason[1] & BCM43xx_DMAIRQ_NONFATALMASK) |
+                     (dma_reason[2] & BCM43xx_DMAIRQ_NONFATALMASK) |
+                     (dma_reason[3] & BCM43xx_DMAIRQ_NONFATALMASK))) {
+                printkl(KERN_ERR PFX "DMA error: "
+                                     "0x%08X, 0x%08X, 0x%08X, 0x%08X\n",
+                        dma_reason[0], dma_reason[1],
+                        dma_reason[2], dma_reason[3]);
+        }
+
+        if (reason & BCM43xx_IRQ_PS) {
+                handle_irq_ps(bcm);
+                bcmirq_handled(BCM43xx_IRQ_PS);
+        }
+
+        if (reason & BCM43xx_IRQ_REG124) {
+                handle_irq_reg124(bcm);
+                bcmirq_handled(BCM43xx_IRQ_REG124);
+        }
+
+        if (reason & BCM43xx_IRQ_BEACON) {
+                if (bcm->ieee->iw_mode == IW_MODE_MASTER)
+                        handle_irq_beacon(bcm);
+                bcmirq_handled(BCM43xx_IRQ_BEACON);
+        }
+
+        if (reason & BCM43xx_IRQ_PMQ) {
+                handle_irq_pmq(bcm);
+                bcmirq_handled(BCM43xx_IRQ_PMQ);
+        }
+
+        if (reason & BCM43xx_IRQ_SCAN) {
+                /*TODO*/
+                //bcmirq_handled(BCM43xx_IRQ_SCAN);
+        }
+
+        if (reason & BCM43xx_IRQ_NOISE) {
+                handle_irq_noise(bcm);
+                bcmirq_handled(BCM43xx_IRQ_NOISE);
+        }
+
+        /* Check the DMA reason registers for received data. */
+        assert(!(dma_reason[1] & BCM43xx_DMAIRQ_RX_DONE));
+        assert(!(dma_reason[2] & BCM43xx_DMAIRQ_RX_DONE));
+        if (dma_reason[0] & BCM43xx_DMAIRQ_RX_DONE) {
+                if (bcm43xx_using_pio(bcm))
+                        bcm43xx_pio_rx(bcm43xx_current_pio(bcm)->queue0);
+                else
+                        bcm43xx_dma_rx(bcm43xx_current_dma(bcm)->rx_ring0);
+                /* We intentionally don't set "activity" to 1, here. */
+        }
+        if (dma_reason[3] & BCM43xx_DMAIRQ_RX_DONE) {
+                if (bcm43xx_using_pio(bcm))
+                        bcm43xx_pio_rx(bcm43xx_current_pio(bcm)->queue3);
+                else
+                        bcm43xx_dma_rx(bcm43xx_current_dma(bcm)->rx_ring1);
+                activity = 1;
+        }
+        bcmirq_handled(BCM43xx_IRQ_RX);
+
+        if (reason & BCM43xx_IRQ_XMIT_STATUS) {
+                handle_irq_transmit_status(bcm);
+                activity = 1;
+                //TODO: In AP mode, this also causes sending of powersave responses.
+                bcmirq_handled(BCM43xx_IRQ_XMIT_STATUS);
+        }
+
+        /* IRQ_PIO_WORKAROUND is handled in the top-half. */
+        bcmirq_handled(BCM43xx_IRQ_PIO_WORKAROUND);
+#ifdef CONFIG_BCM43XX_DEBUG
+        if (unlikely(reason & ~_handled)) {
+                printkl(KERN_WARNING PFX
+                        "Unhandled IRQ! Reason: 0x%08x,  Unhandled: 0x%08x,  "
+                        "DMA: 0x%08x, 0x%08x, 0x%08x, 0x%08x\n",
+                        reason, (reason & ~_handled),
+                        dma_reason[0], dma_reason[1],
+                        dma_reason[2], dma_reason[3]);
+        }
+#endif
+#undef bcmirq_handled
+
+        if (!modparam_noleds)
+                bcm43xx_leds_update(bcm, activity);
+        bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate);
+        bcm43xx_unlock_mmio(bcm, flags);
+}
+
+static void pio_irq_workaround(struct bcm43xx_private *bcm,
+                               u16 base, int queueidx)
+{
+        u16 rxctl;
+
+        rxctl = bcm43xx_read16(bcm, base + BCM43xx_PIO_RXCTL);
+        if (rxctl & BCM43xx_PIO_RXCTL_DATAAVAILABLE)
+                bcm->dma_reason[queueidx] |= BCM43xx_DMAIRQ_RX_DONE;
+        else
+                bcm->dma_reason[queueidx] &= ~BCM43xx_DMAIRQ_RX_DONE;
+}
+
+static void bcm43xx_interrupt_ack(struct bcm43xx_private *bcm, u32 reason)
+{
+        if (bcm43xx_using_pio(bcm) &&
+            (bcm->current_core->rev < 3) &&
+            (!(reason & BCM43xx_IRQ_PIO_WORKAROUND))) {
+                /* Apply a PIO specific workaround to the dma_reasons */
+                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO1_BASE, 0);
+                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO2_BASE, 1);
+                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO3_BASE, 2);
+                pio_irq_workaround(bcm, BCM43xx_MMIO_PIO4_BASE, 3);
+        }
+
+        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, reason);
+
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA1_REASON,
+                        bcm->dma_reason[0]);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA2_REASON,
+                        bcm->dma_reason[1]);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA3_REASON,
+                        bcm->dma_reason[2]);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA4_REASON,
+                        bcm->dma_reason[3]);
+}
+
+/* Interrupt handler top-half */
+static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_regs *regs)
+{
+        irqreturn_t ret = IRQ_HANDLED;
+        struct bcm43xx_private *bcm = dev_id;
+        u32 reason;
+
+        if (!bcm)
+                return IRQ_NONE;
+
+        spin_lock(&bcm->_lock);
+
+        reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
+        if (reason == 0xffffffff) {
+                /* irq not for us (shared irq) */
+                ret = IRQ_NONE;
+                goto out;
+        }
+        reason &= bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_MASK);
+        if (!reason)
+                goto out;
+
+        bcm->dma_reason[0] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA1_REASON)
+                             & 0x0001dc00;
+        bcm->dma_reason[1] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA2_REASON)
+                             & 0x0000dc00;
+        bcm->dma_reason[2] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA3_REASON)
+                             & 0x0000dc00;
+        bcm->dma_reason[3] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA4_REASON)
+                             & 0x0001dc00;
+
+        bcm43xx_interrupt_ack(bcm, reason);
+
+        /* Only accept IRQs, if we are initialized properly.
+         * This avoids an RX race while initializing.
+         * We should probably not enable IRQs before we are initialized
+         * completely, but some careful work is needed to fix this. I think it
+         * is best to stay with this cheap workaround for now... .
+         */
+        if (likely(bcm->initialized)) {
+                /* disable all IRQs. They are enabled again in the bottom half. */
+                bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+                /* save the reason code and call our bottom half. */
+                bcm->irq_reason = reason;
+                tasklet_schedule(&bcm->isr_tasklet);
+        }
+
+out:
+        mmiowb();
+        spin_unlock(&bcm->_lock);
+
+        return ret;
+}
+
+static void bcm43xx_release_firmware(struct bcm43xx_private *bcm, int force)
+{
+        if (bcm->firmware_norelease && !force)
+                return; /* Suspending or controller reset. */
+        release_firmware(bcm->ucode);
+        bcm->ucode = NULL;
+        release_firmware(bcm->pcm);
+        bcm->pcm = NULL;
+        release_firmware(bcm->initvals0);
+        bcm->initvals0 = NULL;
+        release_firmware(bcm->initvals1);
+        bcm->initvals1 = NULL;
+}
+
+static int bcm43xx_request_firmware(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u8 rev = bcm->current_core->rev;
+        int err = 0;
+        int nr;
+        char buf[22 + sizeof(modparam_fwpostfix) - 1] = { 0 };
+
+        if (!bcm->ucode) {
+                snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_microcode%d%s.fw",
+                         (rev >= 5 ? 5 : rev),
+                         modparam_fwpostfix);
+                err = request_firmware(&bcm->ucode, buf, &bcm->pci_dev->dev);
+                if (err) {
+                        printk(KERN_ERR PFX 
+                               "Error: Microcode \"%s\" not available or load failed.\n",
+                                buf);
+                        goto error;
+                }
+        }
+
+        if (!bcm->pcm) {
+                snprintf(buf, ARRAY_SIZE(buf),
+                         "bcm43xx_pcm%d%s.fw",
+                         (rev < 5 ? 4 : 5),
+                         modparam_fwpostfix);
+                err = request_firmware(&bcm->pcm, buf, &bcm->pci_dev->dev);
+                if (err) {
+                        printk(KERN_ERR PFX
+                               "Error: PCM \"%s\" not available or load failed.\n",
+                               buf);
+                        goto error;
+                }
+        }
+
+        if (!bcm->initvals0) {
+                if (rev == 2 || rev == 4) {
+                        switch (phy->type) {
+                        case BCM43xx_PHYTYPE_A:
+                                nr = 3;
+                                break;
+                        case BCM43xx_PHYTYPE_B:
+                        case BCM43xx_PHYTYPE_G:
+                                nr = 1;
+                                break;
+                        default:
+                                goto err_noinitval;
+                        }
+                
+                } else if (rev >= 5) {
+                        switch (phy->type) {
+                        case BCM43xx_PHYTYPE_A:
+                                nr = 7;
+                                break;
+                        case BCM43xx_PHYTYPE_B:
+                        case BCM43xx_PHYTYPE_G:
+                                nr = 5;
+                                break;
+                        default:
+                                goto err_noinitval;
+                        }
+                } else
+                        goto err_noinitval;
+                snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_initval%02d%s.fw",
+                         nr, modparam_fwpostfix);
+
+                err = request_firmware(&bcm->initvals0, buf, &bcm->pci_dev->dev);
+                if (err) {
+                        printk(KERN_ERR PFX 
+                               "Error: InitVals \"%s\" not available or load failed.\n",
+                                buf);
+                        goto error;
+                }
+                if (bcm->initvals0->size % sizeof(struct bcm43xx_initval)) {
+                        printk(KERN_ERR PFX "InitVals fileformat error.\n");
+                        goto error;
+                }
+        }
+
+        if (!bcm->initvals1) {
+                if (rev >= 5) {
+                        u32 sbtmstatehigh;
+
+                        switch (phy->type) {
+                        case BCM43xx_PHYTYPE_A:
+                                sbtmstatehigh = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
+                                if (sbtmstatehigh & 0x00010000)
+                                        nr = 9;
+                                else
+                                        nr = 10;
+                                break;
+                        case BCM43xx_PHYTYPE_B:
+                        case BCM43xx_PHYTYPE_G:
+                                        nr = 6;
+                                break;
+                        default:
+                                goto err_noinitval;
+                        }
+                        snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_initval%02d%s.fw",
+                                 nr, modparam_fwpostfix);
+
+                        err = request_firmware(&bcm->initvals1, buf, &bcm->pci_dev->dev);
+                        if (err) {
+                                printk(KERN_ERR PFX 
+                                       "Error: InitVals \"%s\" not available or load failed.\n",
+                                        buf);
+                                goto error;
+                        }
+                        if (bcm->initvals1->size % sizeof(struct bcm43xx_initval)) {
+                                printk(KERN_ERR PFX "InitVals fileformat error.\n");
+                                goto error;
+                        }
+                }
+        }
+
+out:
+        return err;
+error:
+        bcm43xx_release_firmware(bcm, 1);
+        goto out;
+err_noinitval:
+        printk(KERN_ERR PFX "Error: No InitVals available!\n");
+        err = -ENOENT;
+        goto error;
+}
+
+static void bcm43xx_upload_microcode(struct bcm43xx_private *bcm)
+{
+        const u32 *data;
+        unsigned int i, len;
+
+        /* Upload Microcode. */
+        data = (u32 *)(bcm->ucode->data);
+        len = bcm->ucode->size / sizeof(u32);
+        bcm43xx_shm_control_word(bcm, BCM43xx_SHM_UCODE, 0x0000);
+        for (i = 0; i < len; i++) {
+                bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA,
+                                be32_to_cpu(data[i]));
+                udelay(10);
+        }
+
+        /* Upload PCM data. */
+        data = (u32 *)(bcm->pcm->data);
+        len = bcm->pcm->size / sizeof(u32);
+        bcm43xx_shm_control_word(bcm, BCM43xx_SHM_PCM, 0x01ea);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA, 0x00004000);
+        bcm43xx_shm_control_word(bcm, BCM43xx_SHM_PCM, 0x01eb);
+        for (i = 0; i < len; i++) {
+                bcm43xx_write32(bcm, BCM43xx_MMIO_SHM_DATA,
+                                be32_to_cpu(data[i]));
+                udelay(10);
+        }
+}
+
+static int bcm43xx_write_initvals(struct bcm43xx_private *bcm,
+                                  const struct bcm43xx_initval *data,
+                                  const unsigned int len)
+{
+        u16 offset, size;
+        u32 value;
+        unsigned int i;
+
+        for (i = 0; i < len; i++) {
+                offset = be16_to_cpu(data[i].offset);
+                size = be16_to_cpu(data[i].size);
+                value = be32_to_cpu(data[i].value);
+
+                if (unlikely(offset >= 0x1000))
+                        goto err_format;
+                if (size == 2) {
+                        if (unlikely(value & 0xFFFF0000))
+                                goto err_format;
+                        bcm43xx_write16(bcm, offset, (u16)value);
+                } else if (size == 4) {
+                        bcm43xx_write32(bcm, offset, value);
+                } else
+                        goto err_format;
+        }
+
+        return 0;
+
+err_format:
+        printk(KERN_ERR PFX "InitVals (bcm43xx_initvalXX.fw) file-format error. "
+                            "Please fix your bcm43xx firmware files.\n");
+        return -EPROTO;
+}
+
+static int bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
+{
+        int err;
+
+        err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals0->data,
+                                     bcm->initvals0->size / sizeof(struct bcm43xx_initval));
+        if (err)
+                goto out;
+        if (bcm->initvals1) {
+                err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals1->data,
+                                             bcm->initvals1->size / sizeof(struct bcm43xx_initval));
+                if (err)
+                        goto out;
+        }
+out:
+        return err;
+}
+
+static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
+{
+        int res;
+        unsigned int i;
+        u32 data;
+
+        bcm->irq = bcm->pci_dev->irq;
+#ifdef CONFIG_BCM947XX
+        if (bcm->pci_dev->bus->number == 0) {
+                struct pci_dev *d = NULL;
+                /* FIXME: we will probably need more device IDs here... */
+                d = pci_find_device(PCI_VENDOR_ID_BROADCOM, 0x4324, NULL);
+                if (d != NULL) {
+                        bcm->irq = d->irq;
+                }
+        }
+#endif
+        res = request_irq(bcm->irq, bcm43xx_interrupt_handler,
+                          SA_SHIRQ, KBUILD_MODNAME, bcm);
+        if (res) {
+                printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
+                return -ENODEV;
+        }
+        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, 0xffffffff);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, 0x00020402);
+        i = 0;
+        while (1) {
+                data = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
+                if (data == BCM43xx_IRQ_READY)
+                        break;
+                i++;
+                if (i >= BCM43xx_IRQWAIT_MAX_RETRIES) {
+                        printk(KERN_ERR PFX "Card IRQ register not responding. "
+                                            "Giving up.\n");
+                        free_irq(bcm->irq, bcm);
+                        return -ENODEV;
+                }
+                udelay(10);
+        }
+        // dummy read
+        bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
+
+        return 0;
+}
+
+/* Switch to the core used to write the GPIO register.
+ * This is either the ChipCommon, or the PCI core.
+ */
+static int switch_to_gpio_core(struct bcm43xx_private *bcm)
+{
+        int err;
+
+        /* Where to find the GPIO register depends on the chipset.
+         * If it has a ChipCommon, its register at offset 0x6c is the GPIO
+         * control register. Otherwise the register at offset 0x6c in the
+         * PCI core is the GPIO control register.
+         */
+        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
+        if (err == -ENODEV) {
+                err = bcm43xx_switch_core(bcm, &bcm->core_pci);
+                if (unlikely(err == -ENODEV)) {
+                        printk(KERN_ERR PFX "gpio error: "
+                               "Neither ChipCommon nor PCI core available!\n");
+                }
+        }
+
+        return err;
+}
+
+/* Initialize the GPIOs
+ * http://bcm-specs.sipsolutions.net/GPIO
+ */
+static int bcm43xx_gpio_init(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_coreinfo *old_core;
+        int err;
+        u32 mask, set;
+
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
+                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
+                        & 0xFFFF3FFF);
+
+        bcm43xx_leds_switch_all(bcm, 0);
+        bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_MASK,
+                        bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_MASK) | 0x000F);
+
+        mask = 0x0000001F;
+        set = 0x0000000F;
+        if (bcm->chip_id == 0x4301) {
+                mask |= 0x0060;
+                set |= 0x0060;
+        }
+        if (0 /* FIXME: conditional unknown */) {
+                bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_MASK,
+                                bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_MASK)
+                                | 0x0100);
+                mask |= 0x0180;
+                set |= 0x0180;
+        }
+        if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) {
+                bcm43xx_write16(bcm, BCM43xx_MMIO_GPIO_MASK,
+                                bcm43xx_read16(bcm, BCM43xx_MMIO_GPIO_MASK)
+                                | 0x0200);
+                mask |= 0x0200;
+                set |= 0x0200;
+        }
+        if (bcm->current_core->rev >= 2)
+                mask  |= 0x0010; /* FIXME: This is redundant. */
+
+        old_core = bcm->current_core;
+        err = switch_to_gpio_core(bcm);
+        if (err)
+                goto out;
+        bcm43xx_write32(bcm, BCM43xx_GPIO_CONTROL,
+                        (bcm43xx_read32(bcm, BCM43xx_GPIO_CONTROL) & mask) | set);
+        err = bcm43xx_switch_core(bcm, old_core);
+out:
+        return err;
+}
+
+/* Turn off all GPIO stuff. Call this on module unload, for example. */
+static int bcm43xx_gpio_cleanup(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_coreinfo *old_core;
+        int err;
+
+        old_core = bcm->current_core;
+        err = switch_to_gpio_core(bcm);
+        if (err)
+                return err;
+        bcm43xx_write32(bcm, BCM43xx_GPIO_CONTROL, 0x00000000);
+        err = bcm43xx_switch_core(bcm, old_core);
+        assert(err == 0);
+
+        return 0;
+}
+
+/* http://bcm-specs.sipsolutions.net/EnableMac */
+void bcm43xx_mac_enable(struct bcm43xx_private *bcm)
+{
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
+                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
+                        | BCM43xx_SBF_MAC_ENABLED);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, BCM43xx_IRQ_READY);
+        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* dummy read */
+        bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */
+        bcm43xx_power_saving_ctl_bits(bcm, -1, -1);
+}
+
+/* http://bcm-specs.sipsolutions.net/SuspendMAC */
+void bcm43xx_mac_suspend(struct bcm43xx_private *bcm)
+{
+        int i;
+        u32 tmp;
+
+        bcm43xx_power_saving_ctl_bits(bcm, -1, 1);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
+                        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
+                        & ~BCM43xx_SBF_MAC_ENABLED);
+        bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */
+        for (i = 100000; i; i--) {
+                tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
+                if (tmp & BCM43xx_IRQ_READY)
+                        return;
+                udelay(10);
+        }
+        printkl(KERN_ERR PFX "MAC suspend failed\n");
+}
+
+void bcm43xx_set_iwmode(struct bcm43xx_private *bcm,
+                        int iw_mode)
+{
+        unsigned long flags;
+        struct net_device *net_dev = bcm->net_dev;
+        u32 status;
+        u16 value;
+
+        spin_lock_irqsave(&bcm->ieee->lock, flags);
+        bcm->ieee->iw_mode = iw_mode;
+        spin_unlock_irqrestore(&bcm->ieee->lock, flags);
+        if (iw_mode == IW_MODE_MONITOR)
+                net_dev->type = ARPHRD_IEEE80211;
+        else
+                net_dev->type = ARPHRD_ETHER;
+
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        /* Reset status to infrastructured mode */
+        status &= ~(BCM43xx_SBF_MODE_AP | BCM43xx_SBF_MODE_MONITOR);
+        status &= ~BCM43xx_SBF_MODE_PROMISC;
+        status |= BCM43xx_SBF_MODE_NOTADHOC;
+
+/* FIXME: Always enable promisc mode, until we get the MAC filters working correctly. */
+status |= BCM43xx_SBF_MODE_PROMISC;
+
+        switch (iw_mode) {
+        case IW_MODE_MONITOR:
+                status |= BCM43xx_SBF_MODE_MONITOR;
+                status |= BCM43xx_SBF_MODE_PROMISC;
+                break;
+        case IW_MODE_ADHOC:
+                status &= ~BCM43xx_SBF_MODE_NOTADHOC;
+                break;
+        case IW_MODE_MASTER:
+                status |= BCM43xx_SBF_MODE_AP;
+                break;
+        case IW_MODE_SECOND:
+        case IW_MODE_REPEAT:
+                TODO(); /* TODO */
+                break;
+        case IW_MODE_INFRA:
+                /* nothing to be done here... */
+                break;
+        default:
+                dprintk(KERN_ERR PFX "Unknown mode in set_iwmode: %d\n", iw_mode);
+        }
+        if (net_dev->flags & IFF_PROMISC)
+                status |= BCM43xx_SBF_MODE_PROMISC;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+
+        value = 0x0002;
+        if (iw_mode != IW_MODE_ADHOC && iw_mode != IW_MODE_MASTER) {
+                if (bcm->chip_id == 0x4306 && bcm->chip_rev == 3)
+                        value = 0x0064;
+                else
+                        value = 0x0032;
+        }
+        bcm43xx_write16(bcm, 0x0612, value);
+}
+
+/* This is the opposite of bcm43xx_chip_init() */
+static void bcm43xx_chip_cleanup(struct bcm43xx_private *bcm)
+{
+        bcm43xx_radio_turn_off(bcm);
+        if (!modparam_noleds)
+                bcm43xx_leds_exit(bcm);
+        bcm43xx_gpio_cleanup(bcm);
+        free_irq(bcm->irq, bcm);
+        bcm43xx_release_firmware(bcm, 0);
+}
+
+/* Initialize the chip
+ * http://bcm-specs.sipsolutions.net/ChipInit
+ */
+static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        int err;
+        int tmp;
+        u32 value32;
+        u16 value16;
+
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
+                        BCM43xx_SBF_CORE_READY
+                        | BCM43xx_SBF_400);
+
+        err = bcm43xx_request_firmware(bcm);
+        if (err)
+                goto out;
+        bcm43xx_upload_microcode(bcm);
+
+        err = bcm43xx_initialize_irq(bcm);
+        if (err)
+                goto err_release_fw;
+
+        err = bcm43xx_gpio_init(bcm);
+        if (err)
+                goto err_free_irq;
+
+        err = bcm43xx_upload_initvals(bcm);
+        if (err)
+                goto err_gpio_cleanup;
+        bcm43xx_radio_turn_on(bcm);
+
+        bcm43xx_write16(bcm, 0x03E6, 0x0000);
+        err = bcm43xx_phy_init(bcm);
+        if (err)
+                goto err_radio_off;
+
+        /* Select initial Interference Mitigation. */
+        tmp = radio->interfmode;
+        radio->interfmode = BCM43xx_RADIO_INTERFMODE_NONE;
+        bcm43xx_radio_set_interference_mitigation(bcm, tmp);
+
+        bcm43xx_phy_set_antenna_diversity(bcm);
+        bcm43xx_radio_set_txantenna(bcm, BCM43xx_RADIO_TXANTENNA_DEFAULT);
+        if (phy->type == BCM43xx_PHYTYPE_B) {
+                value16 = bcm43xx_read16(bcm, 0x005E);
+                value16 |= 0x0004;
+                bcm43xx_write16(bcm, 0x005E, value16);
+        }
+        bcm43xx_write32(bcm, 0x0100, 0x01000000);
+        if (bcm->current_core->rev < 5)
+                bcm43xx_write32(bcm, 0x010C, 0x01000000);
+
+        value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        value32 &= ~ BCM43xx_SBF_MODE_NOTADHOC;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32);
+        value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        value32 |= BCM43xx_SBF_MODE_NOTADHOC;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32);
+
+        value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        value32 |= 0x100000;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32);
+
+        if (bcm43xx_using_pio(bcm)) {
+                bcm43xx_write32(bcm, 0x0210, 0x00000100);
+                bcm43xx_write32(bcm, 0x0230, 0x00000100);
+                bcm43xx_write32(bcm, 0x0250, 0x00000100);
+                bcm43xx_write32(bcm, 0x0270, 0x00000100);
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0034, 0x0000);
+        }
+
+        /* Probe Response Timeout value */
+        /* FIXME: Default to 0, has to be set by ioctl probably... :-/ */
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0074, 0x0000);
+
+        /* Initially set the wireless operation mode. */
+        bcm43xx_set_iwmode(bcm, bcm->ieee->iw_mode);
+
+        if (bcm->current_core->rev < 3) {
+                bcm43xx_write16(bcm, 0x060E, 0x0000);
+                bcm43xx_write16(bcm, 0x0610, 0x8000);
+                bcm43xx_write16(bcm, 0x0604, 0x0000);
+                bcm43xx_write16(bcm, 0x0606, 0x0200);
+        } else {
+                bcm43xx_write32(bcm, 0x0188, 0x80000000);
+                bcm43xx_write32(bcm, 0x018C, 0x02000000);
+        }
+        bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON, 0x00004000);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA1_IRQ_MASK, 0x0001DC00);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA2_IRQ_MASK, 0x0000DC00);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA3_IRQ_MASK, 0x0000DC00);
+        bcm43xx_write32(bcm, BCM43xx_MMIO_DMA4_IRQ_MASK, 0x0001DC00);
+
+        value32 = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+        value32 |= 0x00100000;
+        bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, value32);
+
+        bcm43xx_write16(bcm, BCM43xx_MMIO_POWERUP_DELAY, bcm43xx_pctl_powerup_delay(bcm));
+
+        assert(err == 0);
+        dprintk(KERN_INFO PFX "Chip initialized\n");
+out:
+        return err;
+
+err_radio_off:
+        bcm43xx_radio_turn_off(bcm);
+err_gpio_cleanup:
+        bcm43xx_gpio_cleanup(bcm);
+err_free_irq:
+        free_irq(bcm->irq, bcm);
+err_release_fw:
+        bcm43xx_release_firmware(bcm, 1);
+        goto out;
+}
+        
+/* Validate chip access
+ * http://bcm-specs.sipsolutions.net/ValidateChipAccess */
+static int bcm43xx_validate_chip(struct bcm43xx_private *bcm)
+{
+        u32 value;
+        u32 shm_backup;
+
+        shm_backup = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0000);
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED, 0x0000, 0xAA5555AA);
+        if (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0000) != 0xAA5555AA)
+                goto error;
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED, 0x0000, 0x55AAAA55);
+        if (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0000) != 0x55AAAA55)
+                goto error;
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED, 0x0000, shm_backup);
+
+        value = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        if ((value | 0x80000000) != 0x80000400)
+                goto error;
+
+        value = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
+        if (value != 0x00000000)
+                goto error;
+
+        return 0;
+error:
+        printk(KERN_ERR PFX "Failed to validate the chipaccess\n");
+        return -ENODEV;
+}
+
+static void bcm43xx_init_struct_phyinfo(struct bcm43xx_phyinfo *phy)
+{
+        /* Initialize a "phyinfo" structure. The structure is already
+         * zeroed out.
+         */
+        phy->antenna_diversity = 0xFFFF;
+        phy->savedpctlreg = 0xFFFF;
+        phy->minlowsig[0] = 0xFFFF;
+        phy->minlowsig[1] = 0xFFFF;
+        spin_lock_init(&phy->lock);
+}
+
+static void bcm43xx_init_struct_radioinfo(struct bcm43xx_radioinfo *radio)
+{
+        /* Initialize a "radioinfo" structure. The structure is already
+         * zeroed out.
+         */
+        radio->interfmode = BCM43xx_RADIO_INTERFMODE_NONE;
+        radio->channel = 0xFF;
+        radio->initial_channel = 0xFF;
+        radio->lofcal = 0xFFFF;
+        radio->initval = 0xFFFF;
+        radio->nrssi[0] = -1000;
+        radio->nrssi[1] = -1000;
+}
+
+static int bcm43xx_probe_cores(struct bcm43xx_private *bcm)
+{
+        int err, i;
+        int current_core;
+        u32 core_vendor, core_id, core_rev;
+        u32 sb_id_hi, chip_id_32 = 0;
+        u16 pci_device, chip_id_16;
+        u8 core_count;
+
+        memset(&bcm->core_chipcommon, 0, sizeof(struct bcm43xx_coreinfo));
+        memset(&bcm->core_pci, 0, sizeof(struct bcm43xx_coreinfo));
+        memset(&bcm->core_80211, 0, sizeof(struct bcm43xx_coreinfo)
+                                    * BCM43xx_MAX_80211_CORES);
+        memset(&bcm->core_80211_ext, 0, sizeof(struct bcm43xx_coreinfo_80211)
+                                        * BCM43xx_MAX_80211_CORES);
+        bcm->current_80211_core_idx = -1;
+        bcm->nr_80211_available = 0;
+        bcm->current_core = NULL;
+        bcm->active_80211_core = NULL;
+
+        /* map core 0 */
+        err = _switch_core(bcm, 0);
+        if (err)
+                goto out;
+
+        /* fetch sb_id_hi from core information registers */
+        sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI);
+
+        core_id = (sb_id_hi & 0xFFF0) >> 4;
+        core_rev = (sb_id_hi & 0xF);
+        core_vendor = (sb_id_hi & 0xFFFF0000) >> 16;
+
+        /* if present, chipcommon is always core 0; read the chipid from it */
+        if (core_id == BCM43xx_COREID_CHIPCOMMON) {
+                chip_id_32 = bcm43xx_read32(bcm, 0);
+                chip_id_16 = chip_id_32 & 0xFFFF;
+                bcm->core_chipcommon.available = 1;
+                bcm->core_chipcommon.id = core_id;
+                bcm->core_chipcommon.rev = core_rev;
+                bcm->core_chipcommon.index = 0;
+                /* While we are at it, also read the capabilities. */
+                bcm->chipcommon_capabilities = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_CAPABILITIES);
+        } else {
+                /* without a chipCommon, use a hard coded table. */
+                pci_device = bcm->pci_dev->device;
+                if (pci_device == 0x4301)
+                        chip_id_16 = 0x4301;
+                else if ((pci_device >= 0x4305) && (pci_device <= 0x4307))
+                        chip_id_16 = 0x4307;
+                else if ((pci_device >= 0x4402) && (pci_device <= 0x4403))
+                        chip_id_16 = 0x4402;
+                else if ((pci_device >= 0x4610) && (pci_device <= 0x4615))
+                        chip_id_16 = 0x4610;
+                else if ((pci_device >= 0x4710) && (pci_device <= 0x4715))
+                        chip_id_16 = 0x4710;
+#ifdef CONFIG_BCM947XX
+                else if ((pci_device >= 0x4320) && (pci_device <= 0x4325))
+                        chip_id_16 = 0x4309;
+#endif
+                else {
+                        printk(KERN_ERR PFX "Could not determine Chip ID\n");
+                        return -ENODEV;
+                }
+        }
+
+        /* ChipCommon with Core Rev >=4 encodes number of cores,
+         * otherwise consult hardcoded table */
+        if ((core_id == BCM43xx_COREID_CHIPCOMMON) && (core_rev >= 4)) {
+                core_count = (chip_id_32 & 0x0F000000) >> 24;
+        } else {
+                switch (chip_id_16) {
+                        case 0x4610:
+                        case 0x4704:
+                        case 0x4710:
+                                core_count = 9;
+                                break;
+                        case 0x4310:
+                                core_count = 8;
+                                break;
+                        case 0x5365:
+                                core_count = 7;
+                                break;
+                        case 0x4306:
+                                core_count = 6;
+                                break;
+                        case 0x4301:
+                        case 0x4307:
+                                core_count = 5;
+                                break;
+                        case 0x4402:
+                                core_count = 3;
+                                break;
+                        default:
+                                /* SOL if we get here */
+                                assert(0);
+                                core_count = 1;
+                }
+        }
+
+        bcm->chip_id = chip_id_16;
+        bcm->chip_rev = (chip_id_32 & 0x000F0000) >> 16;
+        bcm->chip_package = (chip_id_32 & 0x00F00000) >> 20;
+
+        dprintk(KERN_INFO PFX "Chip ID 0x%x, rev 0x%x\n",
+                bcm->chip_id, bcm->chip_rev);
+        dprintk(KERN_INFO PFX "Number of cores: %d\n", core_count);
+        if (bcm->core_chipcommon.available) {
+                dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n",
+                        core_id, core_rev, core_vendor,
+                        bcm43xx_core_enabled(bcm) ? "enabled" : "disabled");
+        }
+
+        if (bcm->core_chipcommon.available)
+                current_core = 1;
+        else
+                current_core = 0;
+        for ( ; current_core < core_count; current_core++) {
+                struct bcm43xx_coreinfo *core;
+                struct bcm43xx_coreinfo_80211 *ext_80211;
+
+                err = _switch_core(bcm, current_core);
+                if (err)
+                        goto out;
+                /* Gather information */
+                /* fetch sb_id_hi from core information registers */
+                sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI);
+
+                /* extract core_id, core_rev, core_vendor */
+                core_id = (sb_id_hi & 0xFFF0) >> 4;
+                core_rev = (sb_id_hi & 0xF);
+                core_vendor = (sb_id_hi & 0xFFFF0000) >> 16;
+
+                dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n",
+                        current_core, core_id, core_rev, core_vendor,
+                        bcm43xx_core_enabled(bcm) ? "enabled" : "disabled" );
+
+                core = NULL;
+                switch (core_id) {
+                case BCM43xx_COREID_PCI:
+                        core = &bcm->core_pci;
+                        if (core->available) {
+                                printk(KERN_WARNING PFX "Multiple PCI cores found.\n");
+                                continue;
+                        }
+                        break;
+                case BCM43xx_COREID_80211:
+                        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
+                                core = &(bcm->core_80211[i]);
+                                ext_80211 = &(bcm->core_80211_ext[i]);
+                                if (!core->available)
+                                        break;
+                                core = NULL;
+                        }
+                        if (!core) {
+                                printk(KERN_WARNING PFX "More than %d cores of type 802.11 found.\n",
+                                       BCM43xx_MAX_80211_CORES);
+                                continue;
+                        }
+                        if (i != 0) {
+                                /* More than one 80211 core is only supported
+                                 * by special chips.
+                                 * There are chips with two 80211 cores, but with
+                                 * dangling pins on the second core. Be careful
+                                 * and ignore these cores here.
+                                 */
+                                if (bcm->pci_dev->device != 0x4324) {
+                                        dprintk(KERN_INFO PFX "Ignoring additional 802.11 core.\n");
+                                        continue;
+                                }
+                        }
+                        switch (core_rev) {
+                        case 2:
+                        case 4:
+                        case 5:
+                        case 6:
+                        case 7:
+                        case 9:
+                                break;
+                        default:
+                                printk(KERN_ERR PFX "Error: Unsupported 80211 core revision %u\n",
+                                       core_rev);
+                                err = -ENODEV;
+                                goto out;
+                        }
+                        bcm->nr_80211_available++;
+                        bcm43xx_init_struct_phyinfo(&ext_80211->phy);
+                        bcm43xx_init_struct_radioinfo(&ext_80211->radio);
+                        break;
+                case BCM43xx_COREID_CHIPCOMMON:
+                        printk(KERN_WARNING PFX "Multiple CHIPCOMMON cores found.\n");
+                        break;
+                }
+                if (core) {
+                        core->available = 1;
+                        core->id = core_id;
+                        core->rev = core_rev;
+                        core->index = current_core;
+                }
+        }
+
+        if (!bcm->core_80211[0].available) {
+                printk(KERN_ERR PFX "Error: No 80211 core found!\n");
+                err = -ENODEV;
+                goto out;
+        }
+
+        err = bcm43xx_switch_core(bcm, &bcm->core_80211[0]);
+
+        assert(err == 0);
+out:
+        return err;
+}
+
+static void bcm43xx_gen_bssid(struct bcm43xx_private *bcm)
+{
+        const u8 *mac = (const u8*)(bcm->net_dev->dev_addr);
+        u8 *bssid = bcm->ieee->bssid;
+
+        switch (bcm->ieee->iw_mode) {
+        case IW_MODE_ADHOC:
+                random_ether_addr(bssid);
+                break;
+        case IW_MODE_MASTER:
+        case IW_MODE_INFRA:
+        case IW_MODE_REPEAT:
+        case IW_MODE_SECOND:
+        case IW_MODE_MONITOR:
+                memcpy(bssid, mac, ETH_ALEN);
+                break;
+        default:
+                assert(0);
+        }
+}
+
+static void bcm43xx_rate_memory_write(struct bcm43xx_private *bcm,
+                                      u16 rate,
+                                      int is_ofdm)
+{
+        u16 offset;
+
+        if (is_ofdm) {
+                offset = 0x480;
+                offset += (bcm43xx_plcp_get_ratecode_ofdm(rate) & 0x000F) * 2;
+        }
+        else {
+                offset = 0x4C0;
+                offset += (bcm43xx_plcp_get_ratecode_cck(rate) & 0x000F) * 2;
+        }
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, offset + 0x20,
+                            bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, offset));
+}
+
+static void bcm43xx_rate_memory_init(struct bcm43xx_private *bcm)
+{
+        switch (bcm43xx_current_phy(bcm)->type) {
+        case BCM43xx_PHYTYPE_A:
+        case BCM43xx_PHYTYPE_G:
+                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_6MB, 1);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_12MB, 1);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_18MB, 1);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_24MB, 1);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_36MB, 1);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_48MB, 1);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_OFDM_RATE_54MB, 1);
+        case BCM43xx_PHYTYPE_B:
+                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_1MB, 0);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_2MB, 0);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_5MB, 0);
+                bcm43xx_rate_memory_write(bcm, IEEE80211_CCK_RATE_11MB, 0);
+                break;
+        default:
+                assert(0);
+        }
+}
+
+static void bcm43xx_wireless_core_cleanup(struct bcm43xx_private *bcm)
+{
+        bcm43xx_chip_cleanup(bcm);
+        bcm43xx_pio_free(bcm);
+        bcm43xx_dma_free(bcm);
+
+        bcm->current_core->initialized = 0;
+}
+
+/* http://bcm-specs.sipsolutions.net/80211Init */
+static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u32 ucodeflags;
+        int err;
+        u32 sbimconfiglow;
+        u8 limit;
+
+        if (bcm->chip_rev < 5) {
+                sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW);
+                sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK;
+                sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK;
+                if (bcm->bustype == BCM43xx_BUSTYPE_PCI)
+                        sbimconfiglow |= 0x32;
+                else if (bcm->bustype == BCM43xx_BUSTYPE_SB)
+                        sbimconfiglow |= 0x53;
+                else
+                        assert(0);
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow);
+        }
+
+        bcm43xx_phy_calibrate(bcm);
+        err = bcm43xx_chip_init(bcm);
+        if (err)
+                goto out;
+
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0016, bcm->current_core->rev);
+        ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, BCM43xx_UCODEFLAGS_OFFSET);
+
+        if (0 /*FIXME: which condition has to be used here? */)
+                ucodeflags |= 0x00000010;
+
+        /* HW decryption needs to be set now */
+        ucodeflags |= 0x40000000;
+        
+        if (phy->type == BCM43xx_PHYTYPE_G) {
+                ucodeflags |= BCM43xx_UCODEFLAG_UNKBGPHY;
+                if (phy->rev == 1)
+                        ucodeflags |= BCM43xx_UCODEFLAG_UNKGPHY;
+                if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
+                        ucodeflags |= BCM43xx_UCODEFLAG_UNKPACTRL;
+        } else if (phy->type == BCM43xx_PHYTYPE_B) {
+                ucodeflags |= BCM43xx_UCODEFLAG_UNKBGPHY;
+                if (phy->rev >= 2 && radio->version == 0x2050)
+                        ucodeflags &= ~BCM43xx_UCODEFLAG_UNKGPHY;
+        }
+
+        if (ucodeflags != bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+                                             BCM43xx_UCODEFLAGS_OFFSET)) {
+                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+                                    BCM43xx_UCODEFLAGS_OFFSET, ucodeflags);
+        }
+
+        /* Short/Long Retry Limit.
+         * The retry-limit is a 4-bit counter. Enforce this to avoid overflowing
+         * the chip-internal counter.
+         */
+        limit = limit_value(modparam_short_retry, 0, 0xF);
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0006, limit);
+        limit = limit_value(modparam_long_retry, 0, 0xF);
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0007, limit);
+
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0044, 3);
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0046, 2);
+
+        bcm43xx_rate_memory_init(bcm);
+
+        /* Minimum Contention Window */
+        if (phy->type == BCM43xx_PHYTYPE_B)
+                bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0003, 0x0000001f);
+        else
+                bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0003, 0x0000000f);
+        /* Maximum Contention Window */
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0004, 0x000003ff);
+
+        bcm43xx_gen_bssid(bcm);
+        bcm43xx_write_mac_bssid_templates(bcm);
+
+        if (bcm->current_core->rev >= 5)
+                bcm43xx_write16(bcm, 0x043C, 0x000C);
+
+        if (bcm43xx_using_pio(bcm))
+                err = bcm43xx_pio_init(bcm);
+        else
+                err = bcm43xx_dma_init(bcm);
+        if (err)
+                goto err_chip_cleanup;
+        bcm43xx_write16(bcm, 0x0612, 0x0050);
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0416, 0x0050);
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0414, 0x01F4);
+
+        bcm43xx_mac_enable(bcm);
+        bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate);
+
+        bcm->current_core->initialized = 1;
+out:
+        return err;
+
+err_chip_cleanup:
+        bcm43xx_chip_cleanup(bcm);
+        goto out;
+}
+
+static int bcm43xx_chipset_attach(struct bcm43xx_private *bcm)
+{
+        int err;
+        u16 pci_status;
+
+        err = bcm43xx_pctl_set_crystal(bcm, 1);
+        if (err)
+                goto out;
+        bcm43xx_pci_read_config16(bcm, PCI_STATUS, &pci_status);
+        bcm43xx_pci_write_config16(bcm, PCI_STATUS, pci_status & ~PCI_STATUS_SIG_TARGET_ABORT);
+
+out:
+        return err;
+}
+
+static void bcm43xx_chipset_detach(struct bcm43xx_private *bcm)
+{
+        bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_SLOW);
+        bcm43xx_pctl_set_crystal(bcm, 0);
+}
+
+static void bcm43xx_pcicore_broadcast_value(struct bcm43xx_private *bcm,
+                                            u32 address,
+                                            u32 data)
+{
+        bcm43xx_write32(bcm, BCM43xx_PCICORE_BCAST_ADDR, address);
+        bcm43xx_write32(bcm, BCM43xx_PCICORE_BCAST_DATA, data);
+}
+
+static int bcm43xx_pcicore_commit_settings(struct bcm43xx_private *bcm)
+{
+        int err;
+        struct bcm43xx_coreinfo *old_core;
+
+        old_core = bcm->current_core;
+        err = bcm43xx_switch_core(bcm, &bcm->core_pci);
+        if (err)
+                goto out;
+
+        bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000);
+
+        bcm43xx_switch_core(bcm, old_core);
+        assert(err == 0);
+out:
+        return err;
+}
+
+/* Make an I/O Core usable. "core_mask" is the bitmask of the cores to enable.
+ * To enable core 0, pass a core_mask of 1<<0
+ */
+static int bcm43xx_setup_backplane_pci_connection(struct bcm43xx_private *bcm,
+                                                  u32 core_mask)
+{
+        u32 backplane_flag_nr;
+        u32 value;
+        struct bcm43xx_coreinfo *old_core;
+        int err = 0;
+
+        value = bcm43xx_read32(bcm, BCM43xx_CIR_SBTPSFLAG);
+        backplane_flag_nr = value & BCM43xx_BACKPLANE_FLAG_NR_MASK;
+
+        old_core = bcm->current_core;
+        err = bcm43xx_switch_core(bcm, &bcm->core_pci);
+        if (err)
+                goto out;
+
+        if (bcm->core_pci.rev < 6) {
+                value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC);
+                value |= (1 << backplane_flag_nr);
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBINTVEC, value);
+        } else {
+                err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCICFG_ICR, &value);
+                if (err) {
+                        printk(KERN_ERR PFX "Error: ICR setup failure!\n");
+                        goto out_switch_back;
+                }
+                value |= core_mask << 8;
+                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_ICR, value);
+                if (err) {
+                        printk(KERN_ERR PFX "Error: ICR setup failure!\n");
+                        goto out_switch_back;
+                }
+        }
+
+        value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2);
+        value |= BCM43xx_SBTOPCI2_PREFETCH | BCM43xx_SBTOPCI2_BURST;
+        bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value);
+
+        if (bcm->core_pci.rev < 5) {
+                value = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW);
+                value |= (2 << BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT)
+                         & BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK;
+                value |= (3 << BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT)
+                         & BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK;
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, value);
+                err = bcm43xx_pcicore_commit_settings(bcm);
+                assert(err == 0);
+        }
+
+out_switch_back:
+        err = bcm43xx_switch_core(bcm, old_core);
+out:
+        return err;
+}
+
+static void bcm43xx_softmac_init(struct bcm43xx_private *bcm)
+{
+        ieee80211softmac_start(bcm->net_dev);
+}
+
+static void bcm43xx_periodic_every120sec(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+
+        if (phy->type != BCM43xx_PHYTYPE_G || phy->rev < 2)
+                return;
+
+        bcm43xx_mac_suspend(bcm);
+        bcm43xx_phy_lo_g_measure(bcm);
+        bcm43xx_mac_enable(bcm);
+}
+
+static void bcm43xx_periodic_every60sec(struct bcm43xx_private *bcm)
+{
+        bcm43xx_phy_lo_mark_all_unused(bcm);
+        if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
+                bcm43xx_mac_suspend(bcm);
+                bcm43xx_calc_nrssi_slope(bcm);
+                bcm43xx_mac_enable(bcm);
+        }
+}
+
+static void bcm43xx_periodic_every30sec(struct bcm43xx_private *bcm)
+{
+        /* Update device statistics. */
+        bcm43xx_calculate_link_quality(bcm);
+}
+
+static void bcm43xx_periodic_every15sec(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+
+        if (phy->type == BCM43xx_PHYTYPE_G) {
+                //TODO: update_aci_moving_average
+                if (radio->aci_enable && radio->aci_wlan_automatic) {
+                        bcm43xx_mac_suspend(bcm);
+                        if (!radio->aci_enable && 1 /*TODO: not scanning? */) {
+                                if (0 /*TODO: bunch of conditions*/) {
+                                        bcm43xx_radio_set_interference_mitigation(bcm,
+                                                                                  BCM43xx_RADIO_INTERFMODE_MANUALWLAN);
+                                }
+                        } else if (1/*TODO*/) {
+                                /*
+                                if ((aci_average > 1000) && !(bcm43xx_radio_aci_scan(bcm))) {
+                                        bcm43xx_radio_set_interference_mitigation(bcm,
+                                                                                  BCM43xx_RADIO_INTERFMODE_NONE);
+                                }
+                                */
+                        }
+                        bcm43xx_mac_enable(bcm);
+                } else if (radio->interfmode == BCM43xx_RADIO_INTERFMODE_NONWLAN &&
+                           phy->rev == 1) {
+                        //TODO: implement rev1 workaround
+                }
+        }
+        bcm43xx_phy_xmitpower(bcm); //FIXME: unless scanning?
+        //TODO for APHY (temperature?)
+}
+
+static void bcm43xx_periodic_task_handler(unsigned long d)
+{
+        struct bcm43xx_private *bcm = (struct bcm43xx_private *)d;
+        unsigned long flags;
+        unsigned int state;
+
+        bcm43xx_lock_mmio(bcm, flags);
+
+        assert(bcm->initialized);
+        state = bcm->periodic_state;
+        if (state % 8 == 0)
+                bcm43xx_periodic_every120sec(bcm);
+        if (state % 4 == 0)
+                bcm43xx_periodic_every60sec(bcm);
+        if (state % 2 == 0)
+                bcm43xx_periodic_every30sec(bcm);
+        bcm43xx_periodic_every15sec(bcm);
+        bcm->periodic_state = state + 1;
+
+        mod_timer(&bcm->periodic_tasks, jiffies + (HZ * 15));
+
+        bcm43xx_unlock_mmio(bcm, flags);
+}
+
+static void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)
+{
+        del_timer_sync(&bcm->periodic_tasks);
+}
+
+static void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
+{
+        struct timer_list *timer = &(bcm->periodic_tasks);
+
+        assert(bcm->initialized);
+        setup_timer(timer,
+                    bcm43xx_periodic_task_handler,
+                    (unsigned long)bcm);
+        timer->expires = jiffies;
+        add_timer(timer);
+}
+
+static void bcm43xx_security_init(struct bcm43xx_private *bcm)
+{
+        bcm->security_offset = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
+                                                  0x0056) * 2;
+        bcm43xx_clear_keys(bcm);
+}
+
+/* This is the opposite of bcm43xx_init_board() */
+static void bcm43xx_free_board(struct bcm43xx_private *bcm)
+{
+        int i, err;
+        unsigned long flags;
+
+        bcm43xx_sysfs_unregister(bcm);
+
+        bcm43xx_periodic_tasks_delete(bcm);
+
+        bcm43xx_lock(bcm, flags);
+        bcm->initialized = 0;
+        bcm->shutting_down = 1;
+        bcm43xx_unlock(bcm, flags);
+
+        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
+                if (!bcm->core_80211[i].available)
+                        continue;
+                if (!bcm->core_80211[i].initialized)
+                        continue;
+
+                err = bcm43xx_switch_core(bcm, &bcm->core_80211[i]);
+                assert(err == 0);
+                bcm43xx_wireless_core_cleanup(bcm);
+        }
+
+        bcm43xx_pctl_set_crystal(bcm, 0);
+
+        bcm43xx_lock(bcm, flags);
+        bcm->shutting_down = 0;
+        bcm43xx_unlock(bcm, flags);
+}
+
+static int bcm43xx_init_board(struct bcm43xx_private *bcm)
+{
+        int i, err;
+        int connect_phy;
+        unsigned long flags;
+
+        might_sleep();
+
+        bcm43xx_lock(bcm, flags);
+        bcm->initialized = 0;
+        bcm->shutting_down = 0;
+        bcm43xx_unlock(bcm, flags);
+
+        err = bcm43xx_pctl_set_crystal(bcm, 1);
+        if (err)
+                goto out;
+        err = bcm43xx_pctl_init(bcm);
+        if (err)
+                goto err_crystal_off;
+        err = bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_FAST);
+        if (err)
+                goto err_crystal_off;
+
+        tasklet_enable(&bcm->isr_tasklet);
+        for (i = 0; i < bcm->nr_80211_available; i++) {
+                err = bcm43xx_switch_core(bcm, &bcm->core_80211[i]);
+                assert(err != -ENODEV);
+                if (err)
+                        goto err_80211_unwind;
+
+                /* Enable the selected wireless core.
+                 * Connect PHY only on the first core.
+                 */
+                if (!bcm43xx_core_enabled(bcm)) {
+                        if (bcm->nr_80211_available == 1) {
+                                connect_phy = bcm43xx_current_phy(bcm)->connected;
+                        } else {
+                                if (i == 0)
+                                        connect_phy = 1;
+                                else
+                                        connect_phy = 0;
+                        }
+                        bcm43xx_wireless_core_reset(bcm, connect_phy);
+                }
+
+                if (i != 0)
+                        bcm43xx_wireless_core_mark_inactive(bcm, &bcm->core_80211[0]);
+
+                err = bcm43xx_wireless_core_init(bcm);
+                if (err)
+                        goto err_80211_unwind;
+
+                if (i != 0) {
+                        bcm43xx_mac_suspend(bcm);
+                        bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+                        bcm43xx_radio_turn_off(bcm);
+                }
+        }
+        bcm->active_80211_core = &bcm->core_80211[0];
+        if (bcm->nr_80211_available >= 2) {
+                bcm43xx_switch_core(bcm, &bcm->core_80211[0]);
+                bcm43xx_mac_enable(bcm);
+        }
+        bcm43xx_macfilter_clear(bcm, BCM43xx_MACFILTER_ASSOC);
+        bcm43xx_macfilter_set(bcm, BCM43xx_MACFILTER_SELF, (u8 *)(bcm->net_dev->dev_addr));
+        dprintk(KERN_INFO PFX "80211 cores initialized\n");
+        bcm43xx_security_init(bcm);
+        bcm43xx_softmac_init(bcm);
+
+        bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_DYNAMIC);
+
+        if (bcm43xx_current_radio(bcm)->initial_channel != 0xFF) {
+                bcm43xx_mac_suspend(bcm);
+                bcm43xx_radio_selectchannel(bcm, bcm43xx_current_radio(bcm)->initial_channel, 0);
+                bcm43xx_mac_enable(bcm);
+        }
+
+        /* Initialization of the board is done. Flag it as such. */
+        bcm43xx_lock(bcm, flags);
+        bcm->initialized = 1;
+        bcm43xx_unlock(bcm, flags);
+
+        bcm43xx_periodic_tasks_setup(bcm);
+        bcm43xx_sysfs_register(bcm);
+        //FIXME: check for bcm43xx_sysfs_register failure. This function is a bit messy regarding unwinding, though...
+
+        assert(err == 0);
+out:
+        return err;
+
+err_80211_unwind:
+        tasklet_disable(&bcm->isr_tasklet);
+        /* unwind all 80211 initialization */
+        for (i = 0; i < bcm->nr_80211_available; i++) {
+                if (!bcm->core_80211[i].initialized)
+                        continue;
+                bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+                bcm43xx_wireless_core_cleanup(bcm);
+        }
+err_crystal_off:
+        bcm43xx_pctl_set_crystal(bcm, 0);
+        goto out;
+}
+
+static void bcm43xx_detach_board(struct bcm43xx_private *bcm)
+{
+        struct pci_dev *pci_dev = bcm->pci_dev;
+        int i;
+
+        bcm43xx_chipset_detach(bcm);
+        /* Do _not_ access the chip, after it is detached. */
+        iounmap(bcm->mmio_addr);
+        
+        pci_release_regions(pci_dev);
+        pci_disable_device(pci_dev);
+
+        /* Free allocated structures/fields */
+        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
+                kfree(bcm->core_80211_ext[i].phy._lo_pairs);
+                if (bcm->core_80211_ext[i].phy.dyn_tssi_tbl)
+                        kfree(bcm->core_80211_ext[i].phy.tssi2dbm);
+        }
+}       
+
+static int bcm43xx_read_phyinfo(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 value;
+        u8 phy_version;
+        u8 phy_type;
+        u8 phy_rev;
+        int phy_rev_ok = 1;
+        void *p;
+
+        value = bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_VER);
+
+        phy_version = (value & 0xF000) >> 12;
+        phy_type = (value & 0x0F00) >> 8;
+        phy_rev = (value & 0x000F);
+
+        dprintk(KERN_INFO PFX "Detected PHY: Version: %x, Type %x, Revision %x\n",
+                phy_version, phy_type, phy_rev);
+
+        switch (phy_type) {
+        case BCM43xx_PHYTYPE_A:
+                if (phy_rev >= 4)
+                        phy_rev_ok = 0;
+                /*FIXME: We need to switch the ieee->modulation, etc.. flags,
+                 *       if we switch 80211 cores after init is done.
+                 *       As we do not implement on the fly switching between
+                 *       wireless cores, I will leave this as a future task.
+                 */
+                bcm->ieee->modulation = IEEE80211_OFDM_MODULATION;
+                bcm->ieee->mode = IEEE_A;
+                bcm->ieee->freq_band = IEEE80211_52GHZ_BAND |
+                                       IEEE80211_24GHZ_BAND;
+                break;
+        case BCM43xx_PHYTYPE_B:
+                if (phy_rev != 2 && phy_rev != 4 && phy_rev != 6 && phy_rev != 7)
+                        phy_rev_ok = 0;
+                bcm->ieee->modulation = IEEE80211_CCK_MODULATION;
+                bcm->ieee->mode = IEEE_B;
+                bcm->ieee->freq_band = IEEE80211_24GHZ_BAND;
+                break;
+        case BCM43xx_PHYTYPE_G:
+                if (phy_rev > 7)
+                        phy_rev_ok = 0;
+                bcm->ieee->modulation = IEEE80211_OFDM_MODULATION |
+                                        IEEE80211_CCK_MODULATION;
+                bcm->ieee->mode = IEEE_G;
+                bcm->ieee->freq_band = IEEE80211_24GHZ_BAND;
+                break;
+        default:
+                printk(KERN_ERR PFX "Error: Unknown PHY Type %x\n",
+                       phy_type);
+                return -ENODEV;
+        };
+        if (!phy_rev_ok) {
+                printk(KERN_WARNING PFX "Invalid PHY Revision %x\n",
+                       phy_rev);
+        }
+
+        phy->version = phy_version;
+        phy->type = phy_type;
+        phy->rev = phy_rev;
+        if ((phy_type == BCM43xx_PHYTYPE_B) || (phy_type == BCM43xx_PHYTYPE_G)) {
+                p = kzalloc(sizeof(struct bcm43xx_lopair) * BCM43xx_LO_COUNT,
+                            GFP_KERNEL);
+                if (!p)
+                        return -ENOMEM;
+                phy->_lo_pairs = p;
+        }
+
+        return 0;
+}
+
+static int bcm43xx_attach_board(struct bcm43xx_private *bcm)
+{
+        struct pci_dev *pci_dev = bcm->pci_dev;
+        struct net_device *net_dev = bcm->net_dev;
+        int err;
+        int i;
+        unsigned long mmio_start, mmio_flags, mmio_len;
+        u32 coremask;
+
+        err = pci_enable_device(pci_dev);
+        if (err) {
+                printk(KERN_ERR PFX "unable to wake up pci device (%i)\n", err);
+                goto out;
+        }
+        mmio_start = pci_resource_start(pci_dev, 0);
+        mmio_flags = pci_resource_flags(pci_dev, 0);
+        mmio_len = pci_resource_len(pci_dev, 0);
+        if (!(mmio_flags & IORESOURCE_MEM)) {
+                printk(KERN_ERR PFX
+                       "%s, region #0 not an MMIO resource, aborting\n",
+                       pci_name(pci_dev));
+                err = -ENODEV;
+                goto err_pci_disable;
+        }
+        err = pci_request_regions(pci_dev, KBUILD_MODNAME);
+        if (err) {
+                printk(KERN_ERR PFX
+                       "could not access PCI resources (%i)\n", err);
+                goto err_pci_disable;
+        }
+        /* enable PCI bus-mastering */
+        pci_set_master(pci_dev);
+        bcm->mmio_addr = ioremap(mmio_start, mmio_len);
+        if (!bcm->mmio_addr) {
+                printk(KERN_ERR PFX "%s: cannot remap MMIO, aborting\n",
+                       pci_name(pci_dev));
+                err = -EIO;
+                goto err_pci_release;
+        }
+        bcm->mmio_len = mmio_len;
+        net_dev->base_addr = (unsigned long)bcm->mmio_addr;
+
+        bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID,
+                                  &bcm->board_vendor);
+        bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_ID,
+                                  &bcm->board_type);
+        bcm43xx_pci_read_config16(bcm, PCI_REVISION_ID,
+                                  &bcm->board_revision);
+
+        err = bcm43xx_chipset_attach(bcm);
+        if (err)
+                goto err_iounmap;
+        err = bcm43xx_pctl_init(bcm);
+        if (err)
+                goto err_chipset_detach;
+        err = bcm43xx_probe_cores(bcm);
+        if (err)
+                goto err_chipset_detach;
+        
+        /* Attach all IO cores to the backplane. */
+        coremask = 0;
+        for (i = 0; i < bcm->nr_80211_available; i++)
+                coremask |= (1 << bcm->core_80211[i].index);
+        //FIXME: Also attach some non80211 cores?
+        err = bcm43xx_setup_backplane_pci_connection(bcm, coremask);
+        if (err) {
+                printk(KERN_ERR PFX "Backplane->PCI connection failed!\n");
+                goto err_chipset_detach;
+        }
+
+        err = bcm43xx_sprom_extract(bcm);
+        if (err)
+                goto err_chipset_detach;
+        err = bcm43xx_leds_init(bcm);
+        if (err)
+                goto err_chipset_detach;
+
+        for (i = 0; i < bcm->nr_80211_available; i++) {
+                err = bcm43xx_switch_core(bcm, &bcm->core_80211[i]);
+                assert(err != -ENODEV);
+                if (err)
+                        goto err_80211_unwind;
+
+                /* Enable the selected wireless core.
+                 * Connect PHY only on the first core.
+                 */
+                bcm43xx_wireless_core_reset(bcm, (i == 0));
+
+                err = bcm43xx_read_phyinfo(bcm);
+                if (err && (i == 0))
+                        goto err_80211_unwind;
+
+                err = bcm43xx_read_radioinfo(bcm);
+                if (err && (i == 0))
+                        goto err_80211_unwind;
+
+                err = bcm43xx_validate_chip(bcm);
+                if (err && (i == 0))
+                        goto err_80211_unwind;
+
+                bcm43xx_radio_turn_off(bcm);
+                err = bcm43xx_phy_init_tssi2dbm_table(bcm);
+                if (err)
+                        goto err_80211_unwind;
+                bcm43xx_wireless_core_disable(bcm);
+        }
+        bcm43xx_pctl_set_crystal(bcm, 0);
+
+        /* Set the MAC address in the networking subsystem */
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
+                memcpy(bcm->net_dev->dev_addr, bcm->sprom.et1macaddr, 6);
+        else
+                memcpy(bcm->net_dev->dev_addr, bcm->sprom.il0macaddr, 6);
+
+        bcm43xx_geo_init(bcm);
+
+        snprintf(bcm->nick, IW_ESSID_MAX_SIZE,
+                 "Broadcom %04X", bcm->chip_id);
+
+        assert(err == 0);
+out:
+        return err;
+
+err_80211_unwind:
+        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
+                kfree(bcm->core_80211_ext[i].phy._lo_pairs);
+                if (bcm->core_80211_ext[i].phy.dyn_tssi_tbl)
+                        kfree(bcm->core_80211_ext[i].phy.tssi2dbm);
+        }
+err_chipset_detach:
+        bcm43xx_chipset_detach(bcm);
+err_iounmap:
+        iounmap(bcm->mmio_addr);
+err_pci_release:
+        pci_release_regions(pci_dev);
+err_pci_disable:
+        pci_disable_device(pci_dev);
+        goto out;
+}
+
+/* Do the Hardware IO operations to send the txb */
+static inline int bcm43xx_tx(struct bcm43xx_private *bcm,
+                             struct ieee80211_txb *txb)
+{
+        int err = -ENODEV;
+
+        if (bcm43xx_using_pio(bcm))
+                err = bcm43xx_pio_tx(bcm, txb);
+        else
+                err = bcm43xx_dma_tx(bcm, txb);
+
+        return err;
+}
+
+static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev,
+                                       u8 channel)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        struct bcm43xx_radioinfo *radio;
+        unsigned long flags;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (bcm->initialized) {
+                bcm43xx_mac_suspend(bcm);
+                bcm43xx_radio_selectchannel(bcm, channel, 0);
+                bcm43xx_mac_enable(bcm);
+        } else {
+                radio = bcm43xx_current_radio(bcm);
+                radio->initial_channel = channel;
+        }
+        bcm43xx_unlock_mmio(bcm, flags);
+}
+
+/* set_security() callback in struct ieee80211_device */
+static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,
+                                           struct ieee80211_security *sec)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        struct ieee80211_security *secinfo = &bcm->ieee->sec;
+        unsigned long flags;
+        int keyidx;
+        
+        dprintk(KERN_INFO PFX "set security called\n");
+
+        bcm43xx_lock_mmio(bcm, flags);
+
+        for (keyidx = 0; keyidx<WEP_KEYS; keyidx++)
+                if (sec->flags & (1<<keyidx)) {
+                        secinfo->encode_alg[keyidx] = sec->encode_alg[keyidx];
+                        secinfo->key_sizes[keyidx] = sec->key_sizes[keyidx];
+                        memcpy(secinfo->keys[keyidx], sec->keys[keyidx], SCM_KEY_LEN);
+                }
+        
+        if (sec->flags & SEC_ACTIVE_KEY) {
+                secinfo->active_key = sec->active_key;
+                dprintk(KERN_INFO PFX "   .active_key = %d\n", sec->active_key);
+        }
+        if (sec->flags & SEC_UNICAST_GROUP) {
+                secinfo->unicast_uses_group = sec->unicast_uses_group;
+                dprintk(KERN_INFO PFX "   .unicast_uses_group = %d\n", sec->unicast_uses_group);
+        }
+        if (sec->flags & SEC_LEVEL) {
+                secinfo->level = sec->level;
+                dprintk(KERN_INFO PFX "   .level = %d\n", sec->level);
+        }
+        if (sec->flags & SEC_ENABLED) {
+                secinfo->enabled = sec->enabled;
+                dprintk(KERN_INFO PFX "   .enabled = %d\n", sec->enabled);
+        }
+        if (sec->flags & SEC_ENCRYPT) {
+                secinfo->encrypt = sec->encrypt;
+                dprintk(KERN_INFO PFX "   .encrypt = %d\n", sec->encrypt);
+        }
+        if (bcm->initialized && !bcm->ieee->host_encrypt) {
+                if (secinfo->enabled) {
+                        /* upload WEP keys to hardware */
+                        char null_address[6] = { 0 };
+                        u8 algorithm = 0;
+                        for (keyidx = 0; keyidx<WEP_KEYS; keyidx++) {
+                                if (!(sec->flags & (1<<keyidx)))
+                                        continue;
+                                switch (sec->encode_alg[keyidx]) {
+                                        case SEC_ALG_NONE: algorithm = BCM43xx_SEC_ALGO_NONE; break;
+                                        case SEC_ALG_WEP:
+                                                algorithm = BCM43xx_SEC_ALGO_WEP;
+                                                if (secinfo->key_sizes[keyidx] == 13)
+                                                        algorithm = BCM43xx_SEC_ALGO_WEP104;
+                                                break;
+                                        case SEC_ALG_TKIP:
+                                                FIXME();
+                                                algorithm = BCM43xx_SEC_ALGO_TKIP;
+                                                break;
+                                        case SEC_ALG_CCMP:
+                                                FIXME();
+                                                algorithm = BCM43xx_SEC_ALGO_AES;
+                                                break;
+                                        default:
+                                                assert(0);
+                                                break;
+                                }
+                                bcm43xx_key_write(bcm, keyidx, algorithm, sec->keys[keyidx], secinfo->key_sizes[keyidx], &null_address[0]);
+                                bcm->key[keyidx].enabled = 1;
+                                bcm->key[keyidx].algorithm = algorithm;
+                        }
+                } else
+                                bcm43xx_clear_keys(bcm);
+        }
+        bcm43xx_unlock_mmio(bcm, flags);
+}
+
+/* hard_start_xmit() callback in struct ieee80211_device */
+static int bcm43xx_ieee80211_hard_start_xmit(struct ieee80211_txb *txb,
+                                             struct net_device *net_dev,
+                                             int pri)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err = -ENODEV;
+        unsigned long flags;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (likely(bcm->initialized))
+                err = bcm43xx_tx(bcm, txb);
+        bcm43xx_unlock_mmio(bcm, flags);
+
+        return err;
+}
+
+static struct net_device_stats * bcm43xx_net_get_stats(struct net_device *net_dev)
+{
+        return &(bcm43xx_priv(net_dev)->ieee->stats);
+}
+
+static void bcm43xx_net_tx_timeout(struct net_device *net_dev)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        bcm43xx_controller_restart(bcm, "TX timeout");
+        bcm43xx_unlock_mmio(bcm, flags);
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void bcm43xx_net_poll_controller(struct net_device *net_dev)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+
+        local_irq_save(flags);
+        bcm43xx_interrupt_handler(bcm->irq, bcm, NULL);
+        local_irq_restore(flags);
+}
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+
+static int bcm43xx_net_open(struct net_device *net_dev)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+
+        return bcm43xx_init_board(bcm);
+}
+
+static int bcm43xx_net_stop(struct net_device *net_dev)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+
+        ieee80211softmac_stop(net_dev);
+        bcm43xx_disable_interrupts_sync(bcm, NULL);
+        bcm43xx_free_board(bcm);
+
+        return 0;
+}
+
+static int bcm43xx_init_private(struct bcm43xx_private *bcm,
+                                struct net_device *net_dev,
+                                struct pci_dev *pci_dev)
+{
+        int err;
+
+        bcm->ieee = netdev_priv(net_dev);
+        bcm->softmac = ieee80211_priv(net_dev);
+        bcm->softmac->set_channel = bcm43xx_ieee80211_set_chan;
+
+        bcm->irq_savedstate = BCM43xx_IRQ_INITIAL;
+        bcm->pci_dev = pci_dev;
+        bcm->net_dev = net_dev;
+        bcm->bad_frames_preempt = modparam_bad_frames_preempt;
+        spin_lock_init(&bcm->_lock);
+        tasklet_init(&bcm->isr_tasklet,
+                     (void (*)(unsigned long))bcm43xx_interrupt_tasklet,
+                     (unsigned long)bcm);
+        tasklet_disable_nosync(&bcm->isr_tasklet);
+        if (modparam_pio) {
+                bcm->__using_pio = 1;
+        } else {
+                err = pci_set_dma_mask(pci_dev, DMA_30BIT_MASK);
+                err |= pci_set_consistent_dma_mask(pci_dev, DMA_30BIT_MASK);
+                if (err) {
+#ifdef CONFIG_BCM43XX_PIO
+                        printk(KERN_WARNING PFX "DMA not supported. Falling back to PIO.\n");
+                        bcm->__using_pio = 1;
+#else
+                        printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. "
+                                            "Recompile the driver with PIO support, please.\n");
+                        return -ENODEV;
+#endif /* CONFIG_BCM43XX_PIO */
+                }
+        }
+        bcm->rts_threshold = BCM43xx_DEFAULT_RTS_THRESHOLD;
+
+        /* default to sw encryption for now */
+        bcm->ieee->host_build_iv = 0;
+        bcm->ieee->host_encrypt = 1;
+        bcm->ieee->host_decrypt = 1;
+        
+        bcm->ieee->iw_mode = BCM43xx_INITIAL_IWMODE;
+        bcm->ieee->tx_headroom = sizeof(struct bcm43xx_txhdr);
+        bcm->ieee->set_security = bcm43xx_ieee80211_set_security;
+        bcm->ieee->hard_start_xmit = bcm43xx_ieee80211_hard_start_xmit;
+
+        return 0;
+}
+
+static int __devinit bcm43xx_init_one(struct pci_dev *pdev,
+                                      const struct pci_device_id *ent)
+{
+        struct net_device *net_dev;
+        struct bcm43xx_private *bcm;
+        int err;
+
+#ifdef CONFIG_BCM947XX
+        if ((pdev->bus->number == 0) && (pdev->device != 0x0800))
+                return -ENODEV;
+#endif
+
+#ifdef DEBUG_SINGLE_DEVICE_ONLY
+        if (strcmp(pci_name(pdev), DEBUG_SINGLE_DEVICE_ONLY))
+                return -ENODEV;
+#endif
+
+        net_dev = alloc_ieee80211softmac(sizeof(*bcm));
+        if (!net_dev) {
+                printk(KERN_ERR PFX
+                       "could not allocate ieee80211 device %s\n",
+                       pci_name(pdev));
+                err = -ENOMEM;
+                goto out;
+        }
+        /* initialize the net_device struct */
+        SET_MODULE_OWNER(net_dev);
+        SET_NETDEV_DEV(net_dev, &pdev->dev);
+
+        net_dev->open = bcm43xx_net_open;
+        net_dev->stop = bcm43xx_net_stop;
+        net_dev->get_stats = bcm43xx_net_get_stats;
+        net_dev->tx_timeout = bcm43xx_net_tx_timeout;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        net_dev->poll_controller = bcm43xx_net_poll_controller;
+#endif
+        net_dev->wireless_handlers = &bcm43xx_wx_handlers_def;
+        net_dev->irq = pdev->irq;
+        SET_ETHTOOL_OPS(net_dev, &bcm43xx_ethtool_ops);
+
+        /* initialize the bcm43xx_private struct */
+        bcm = bcm43xx_priv(net_dev);
+        memset(bcm, 0, sizeof(*bcm));
+        err = bcm43xx_init_private(bcm, net_dev, pdev);
+        if (err)
+                goto err_free_netdev;
+
+        pci_set_drvdata(pdev, net_dev);
+
+        err = bcm43xx_attach_board(bcm);
+        if (err)
+                goto err_free_netdev;
+
+        err = register_netdev(net_dev);
+        if (err) {
+                printk(KERN_ERR PFX "Cannot register net device, "
+                       "aborting.\n");
+                err = -ENOMEM;
+                goto err_detach_board;
+        }
+
+        bcm43xx_debugfs_add_device(bcm);
+
+        assert(err == 0);
+out:
+        return err;
+
+err_detach_board:
+        bcm43xx_detach_board(bcm);
+err_free_netdev:
+        free_ieee80211softmac(net_dev);
+        goto out;
+}
+
+static void __devexit bcm43xx_remove_one(struct pci_dev *pdev)
+{
+        struct net_device *net_dev = pci_get_drvdata(pdev);
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+
+        bcm43xx_debugfs_remove_device(bcm);
+        unregister_netdev(net_dev);
+        bcm43xx_detach_board(bcm);
+        assert(bcm->ucode == NULL);
+        free_ieee80211softmac(net_dev);
+}
+
+/* Hard-reset the chip. Do not call this directly.
+ * Use bcm43xx_controller_restart()
+ */
+static void bcm43xx_chip_reset(void *_bcm)
+{
+        struct bcm43xx_private *bcm = _bcm;
+        struct net_device *net_dev = bcm->net_dev;
+        struct pci_dev *pci_dev = bcm->pci_dev;
+        int err;
+        int was_initialized = bcm->initialized;
+
+        netif_stop_queue(bcm->net_dev);
+        tasklet_disable(&bcm->isr_tasklet);
+
+        bcm->firmware_norelease = 1;
+        if (was_initialized)
+                bcm43xx_free_board(bcm);
+        bcm->firmware_norelease = 0;
+        bcm43xx_detach_board(bcm);
+        err = bcm43xx_init_private(bcm, net_dev, pci_dev);
+        if (err)
+                goto failure;
+        err = bcm43xx_attach_board(bcm);
+        if (err)
+                goto failure;
+        if (was_initialized) {
+                err = bcm43xx_init_board(bcm);
+                if (err)
+                        goto failure;
+        }
+        netif_wake_queue(bcm->net_dev);
+        printk(KERN_INFO PFX "Controller restarted\n");
+
+        return;
+failure:
+        printk(KERN_ERR PFX "Controller restart failed\n");
+}
+
+/* Hard-reset the chip.
+ * This can be called from interrupt or process context.
+ * Make sure to _not_ re-enable device interrupts after this has been called.
+*/
+void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason)
+{
+        bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* dummy read */
+        printk(KERN_ERR PFX "Controller RESET (%s) ...\n", reason);
+        INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset, bcm);
+        schedule_work(&bcm->restart_work);
+}
+
+#ifdef CONFIG_PM
+
+static int bcm43xx_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *net_dev = pci_get_drvdata(pdev);
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int try_to_shutdown = 0, err;
+
+        dprintk(KERN_INFO PFX "Suspending...\n");
+
+        bcm43xx_lock(bcm, flags);
+        bcm->was_initialized = bcm->initialized;
+        if (bcm->initialized)
+                try_to_shutdown = 1;
+        bcm43xx_unlock(bcm, flags);
+
+        netif_device_detach(net_dev);
+        if (try_to_shutdown) {
+                ieee80211softmac_stop(net_dev);
+                err = bcm43xx_disable_interrupts_sync(bcm, &bcm->irq_savedstate);
+                if (unlikely(err)) {
+                        dprintk(KERN_ERR PFX "Suspend failed.\n");
+                        return -EAGAIN;
+                }
+                bcm->firmware_norelease = 1;
+                bcm43xx_free_board(bcm);
+                bcm->firmware_norelease = 0;
+        }
+        bcm43xx_chipset_detach(bcm);
+
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        dprintk(KERN_INFO PFX "Device suspended.\n");
+
+        return 0;
+}
+
+static int bcm43xx_resume(struct pci_dev *pdev)
+{
+        struct net_device *net_dev = pci_get_drvdata(pdev);
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err = 0;
+
+        dprintk(KERN_INFO PFX "Resuming...\n");
+
+        pci_set_power_state(pdev, 0);
+        pci_enable_device(pdev);
+        pci_restore_state(pdev);
+
+        bcm43xx_chipset_attach(bcm);
+        if (bcm->was_initialized) {
+                bcm->irq_savedstate = BCM43xx_IRQ_INITIAL;
+                err = bcm43xx_init_board(bcm);
+        }
+        if (err) {
+                printk(KERN_ERR PFX "Resume failed!\n");
+                return err;
+        }
+
+        netif_device_attach(net_dev);
+        
+        /*FIXME: This should be handled by softmac instead. */
+        schedule_work(&bcm->softmac->associnfo.work);
+
+        dprintk(KERN_INFO PFX "Device resumed.\n");
+
+        return 0;
+}
+
+#endif                          /* CONFIG_PM */
+
+static struct pci_driver bcm43xx_pci_driver = {
+        .name = KBUILD_MODNAME,
+        .id_table = bcm43xx_pci_tbl,
+        .probe = bcm43xx_init_one,
+        .remove = __devexit_p(bcm43xx_remove_one),
+#ifdef CONFIG_PM
+        .suspend = bcm43xx_suspend,
+        .resume = bcm43xx_resume,
+#endif                          /* CONFIG_PM */
+};
+
+static int __init bcm43xx_init(void)
+{
+        printk(KERN_INFO KBUILD_MODNAME " driver\n");
+        bcm43xx_debugfs_init();
+        return pci_register_driver(&bcm43xx_pci_driver);
+}
+
+static void __exit bcm43xx_exit(void)
+{
+        pci_unregister_driver(&bcm43xx_pci_driver);
+        bcm43xx_debugfs_exit();
+}
+
+module_init(bcm43xx_init)
+module_exit(bcm43xx_exit)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.h b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
new file mode 100644
index 000000000000..eca79a38594a
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
@@ -0,0 +1,168 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef BCM43xx_MAIN_H_
+#define BCM43xx_MAIN_H_
+
+#include "bcm43xx.h"
+
+#ifdef CONFIG_BCM947XX
+#define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
+
+static inline void e_aton(char *str, char *dest)
+{
+        int i = 0;
+        u16 *d = (u16 *) dest;
+
+        for (;;) {
+                dest[i++] = (char) simple_strtoul(str, NULL, 16);
+                str += 2;
+                if (!*str++ || i == 6)
+                        break;
+        }
+        for (i = 0; i < 3; i++)
+                d[i] = cpu_to_be16(d[i]);
+}
+#endif
+
+#define P4D_BYT3S(magic, nr_bytes)      u8 __p4dding##magic[nr_bytes]
+#define P4D_BYTES(line, nr_bytes)       P4D_BYT3S(line, nr_bytes)
+/* Magic helper macro to pad structures. Ignore those above. It's magic. */
+#define PAD_BYTES(nr_bytes)             P4D_BYTES( __LINE__ , (nr_bytes))
+
+
+/* Lightweight function to convert a frequency (in Mhz) to a channel number. */
+static inline
+u8 bcm43xx_freq_to_channel_a(int freq)
+{
+        return ((freq - 5000) / 5);
+}
+static inline
+u8 bcm43xx_freq_to_channel_bg(int freq)
+{
+        u8 channel;
+
+        if (freq == 2484)
+                channel = 14;
+        else
+                channel = (freq - 2407) / 5;
+
+        return channel;
+}
+static inline
+u8 bcm43xx_freq_to_channel(struct bcm43xx_private *bcm,
+                           int freq)
+{
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
+                return bcm43xx_freq_to_channel_a(freq);
+        return bcm43xx_freq_to_channel_bg(freq);
+}
+
+/* Lightweight function to convert a channel number to a frequency (in Mhz). */
+static inline
+int bcm43xx_channel_to_freq_a(u8 channel)
+{
+        return (5000 + (5 * channel));
+}
+static inline
+int bcm43xx_channel_to_freq_bg(u8 channel)
+{
+        int freq;
+
+        if (channel == 14)
+                freq = 2484;
+        else
+                freq = 2407 + (5 * channel);
+
+        return freq;
+}
+static inline
+int bcm43xx_channel_to_freq(struct bcm43xx_private *bcm,
+                            u8 channel)
+{
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
+                return bcm43xx_channel_to_freq_a(channel);
+        return bcm43xx_channel_to_freq_bg(channel);
+}
+
+/* Lightweight function to check if a channel number is valid.
+ * Note that this does _NOT_ check for geographical restrictions!
+ */
+static inline
+int bcm43xx_is_valid_channel_a(u8 channel)
+{
+        return (channel <= 200);
+}
+static inline
+int bcm43xx_is_valid_channel_bg(u8 channel)
+{
+        return (channel >= 1 && channel <= 14);
+}
+static inline
+int bcm43xx_is_valid_channel(struct bcm43xx_private *bcm,
+                             u8 channel)
+{
+        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
+                return bcm43xx_is_valid_channel_a(channel);
+        return bcm43xx_is_valid_channel_bg(channel);
+}
+
+void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf);
+void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf);
+
+void bcm43xx_set_iwmode(struct bcm43xx_private *bcm,
+                        int iw_mode);
+
+u32 bcm43xx_shm_read32(struct bcm43xx_private *bcm,
+                       u16 routing, u16 offset);
+u16 bcm43xx_shm_read16(struct bcm43xx_private *bcm,
+                       u16 routing, u16 offset);
+void bcm43xx_shm_write32(struct bcm43xx_private *bcm,
+                         u16 routing, u16 offset,
+                         u32 value);
+void bcm43xx_shm_write16(struct bcm43xx_private *bcm,
+                         u16 routing, u16 offset,
+                         u16 value);
+
+void bcm43xx_dummy_transmission(struct bcm43xx_private *bcm);
+
+int bcm43xx_switch_core(struct bcm43xx_private *bcm, struct bcm43xx_coreinfo *new_core);
+
+void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy);
+
+void bcm43xx_mac_suspend(struct bcm43xx_private *bcm);
+void bcm43xx_mac_enable(struct bcm43xx_private *bcm);
+
+void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason);
+
+int bcm43xx_sprom_read(struct bcm43xx_private *bcm, u16 *sprom);
+int bcm43xx_sprom_write(struct bcm43xx_private *bcm, const u16 *sprom);
+
+#endif /* BCM43xx_MAIN_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
new file mode 100644
index 000000000000..0a66f43ca0c0
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -0,0 +1,2345 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/types.h>
+
+#include "bcm43xx.h"
+#include "bcm43xx_phy.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_radio.h"
+#include "bcm43xx_ilt.h"
+#include "bcm43xx_power.h"
+
+
+static const s8 bcm43xx_tssi2dbm_b_table[] = {
+        0x4D, 0x4C, 0x4B, 0x4A,
+        0x4A, 0x49, 0x48, 0x47,
+        0x47, 0x46, 0x45, 0x45,
+        0x44, 0x43, 0x42, 0x42,
+        0x41, 0x40, 0x3F, 0x3E,
+        0x3D, 0x3C, 0x3B, 0x3A,
+        0x39, 0x38, 0x37, 0x36,
+        0x35, 0x34, 0x32, 0x31,
+        0x30, 0x2F, 0x2D, 0x2C,
+        0x2B, 0x29, 0x28, 0x26,
+        0x25, 0x23, 0x21, 0x1F,
+        0x1D, 0x1A, 0x17, 0x14,
+        0x10, 0x0C, 0x06, 0x00,
+          -7,   -7,   -7,   -7,
+          -7,   -7,   -7,   -7,
+          -7,   -7,   -7,   -7,
+};
+
+static const s8 bcm43xx_tssi2dbm_g_table[] = {
+         77,  77,  77,  76,
+         76,  76,  75,  75,
+         74,  74,  73,  73,
+         73,  72,  72,  71,
+         71,  70,  70,  69,
+         68,  68,  67,  67,
+         66,  65,  65,  64,
+         63,  63,  62,  61,
+         60,  59,  58,  57,
+         56,  55,  54,  53,
+         52,  50,  49,  47,
+         45,  43,  40,  37,
+         33,  28,  22,  14,
+          5,  -7, -20, -20,
+        -20, -20, -20, -20,
+        -20, -20, -20, -20,
+};
+
+static void bcm43xx_phy_initg(struct bcm43xx_private *bcm);
+
+
+void bcm43xx_raw_phy_lock(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+
+        assert(irqs_disabled());
+        if (bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD) == 0x00000000) {
+                phy->is_locked = 0;
+                return;
+        }
+        if (bcm->current_core->rev < 3) {
+                bcm43xx_mac_suspend(bcm);
+                spin_lock(&phy->lock);
+        } else {
+                if (bcm->ieee->iw_mode != IW_MODE_MASTER)
+                        bcm43xx_power_saving_ctl_bits(bcm, -1, 1);
+        }
+        phy->is_locked = 1;
+}
+
+void bcm43xx_raw_phy_unlock(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+
+        assert(irqs_disabled());
+        if (bcm->current_core->rev < 3) {
+                if (phy->is_locked) {
+                        spin_unlock(&phy->lock);
+                        bcm43xx_mac_enable(bcm);
+                }
+        } else {
+                if (bcm->ieee->iw_mode != IW_MODE_MASTER)
+                        bcm43xx_power_saving_ctl_bits(bcm, -1, -1);
+        }
+        phy->is_locked = 0;
+}
+
+u16 bcm43xx_phy_read(struct bcm43xx_private *bcm, u16 offset)
+{
+        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_CONTROL, offset);
+        return bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_DATA);
+}
+
+void bcm43xx_phy_write(struct bcm43xx_private *bcm, u16 offset, u16 val)
+{
+        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_CONTROL, offset);
+        mmiowb();
+        bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_DATA, val);
+}
+
+void bcm43xx_phy_calibrate(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        unsigned long flags;
+
+        bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* Dummy read. */
+        if (phy->calibrated)
+                return;
+        if (phy->type == BCM43xx_PHYTYPE_G && phy->rev == 1) {
+                /* We do not want to be preempted while calibrating
+                 * the hardware.
+                 */
+                local_irq_save(flags);
+
+                bcm43xx_wireless_core_reset(bcm, 0);
+                bcm43xx_phy_initg(bcm);
+                bcm43xx_wireless_core_reset(bcm, 1);
+
+                local_irq_restore(flags);
+        }
+        phy->calibrated = 1;
+}
+
+/* Connect the PHY 
+ * http://bcm-specs.sipsolutions.net/SetPHY
+ */
+int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int connect)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u32 flags;
+
+        if (bcm->current_core->rev < 5)
+                goto out;
+
+        flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
+        if (connect) {
+                if (!(flags & 0x00010000))
+                        return -ENODEV;
+                flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+                flags |= (0x800 << 18);
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
+        } else {
+                if (!(flags & 0x00020000))
+                        return -ENODEV;
+                flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
+                flags &= ~(0x800 << 18);
+                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
+        }
+out:
+        phy->connected = connect;
+        if (connect)
+                dprintk(KERN_INFO PFX "PHY connected\n");
+        else
+                dprintk(KERN_INFO PFX "PHY disconnected\n");
+
+        return 0;
+}
+
+/* intialize B PHY power control
+ * as described in http://bcm-specs.sipsolutions.net/InitPowerControl
+ */
+static void bcm43xx_phy_init_pctl(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 saved_batt = 0, saved_ratt = 0, saved_txctl1 = 0;
+        int must_reset_txpower = 0;
+
+        assert(phy->type != BCM43xx_PHYTYPE_A);
+        if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
+            (bcm->board_type == 0x0416))
+                return;
+
+        bcm43xx_write16(bcm, 0x03E6, bcm43xx_read16(bcm, 0x03E6) & 0xFFDF);
+        bcm43xx_phy_write(bcm, 0x0028, 0x8018);
+
+        if (phy->type == BCM43xx_PHYTYPE_G) {
+                if (!phy->connected)
+                        return;
+                bcm43xx_phy_write(bcm, 0x047A, 0xC111);
+        }
+        if (phy->savedpctlreg != 0xFFFF)
+                return;
+
+        if (phy->type == BCM43xx_PHYTYPE_B &&
+            phy->rev >= 2 &&
+            radio->version == 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0076,
+                                      bcm43xx_radio_read16(bcm, 0x0076) | 0x0084);
+        } else {
+                saved_batt = radio->baseband_atten;
+                saved_ratt = radio->radio_atten;
+                saved_txctl1 = radio->txctl1;
+                if ((radio->revision >= 6) && (radio->revision <= 8)
+                    && /*FIXME: incomplete specs for 5 < revision < 9 */ 0)
+                        bcm43xx_radio_set_txpower_bg(bcm, 0xB, 0x1F, 0);
+                else
+                        bcm43xx_radio_set_txpower_bg(bcm, 0xB, 9, 0);
+                must_reset_txpower = 1;
+        }
+        bcm43xx_dummy_transmission(bcm);
+
+        phy->savedpctlreg = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_PCTL);
+
+        if (must_reset_txpower)
+                bcm43xx_radio_set_txpower_bg(bcm, saved_batt, saved_ratt, saved_txctl1);
+        else
+                bcm43xx_radio_write16(bcm, 0x0076, bcm43xx_radio_read16(bcm, 0x0076) & 0xFF7B);
+        bcm43xx_radio_clear_tssi(bcm);
+}
+
+static void bcm43xx_phy_agcsetup(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 offset = 0x0000;
+
+        if (phy->rev == 1)
+                offset = 0x4C00;
+
+        bcm43xx_ilt_write(bcm, offset, 0x00FE);
+        bcm43xx_ilt_write(bcm, offset + 1, 0x000D);
+        bcm43xx_ilt_write(bcm, offset + 2, 0x0013);
+        bcm43xx_ilt_write(bcm, offset + 3, 0x0019);
+
+        if (phy->rev == 1) {
+                bcm43xx_ilt_write(bcm, 0x1800, 0x2710);
+                bcm43xx_ilt_write(bcm, 0x1801, 0x9B83);
+                bcm43xx_ilt_write(bcm, 0x1802, 0x9B83);
+                bcm43xx_ilt_write(bcm, 0x1803, 0x0F8D);
+                bcm43xx_phy_write(bcm, 0x0455, 0x0004);
+        }
+
+        bcm43xx_phy_write(bcm, 0x04A5, (bcm43xx_phy_read(bcm, 0x04A5) & 0x00FF) | 0x5700);
+        bcm43xx_phy_write(bcm, 0x041A, (bcm43xx_phy_read(bcm, 0x041A) & 0xFF80) | 0x000F);
+        bcm43xx_phy_write(bcm, 0x041A, (bcm43xx_phy_read(bcm, 0x041A) & 0xC07F) | 0x2B80);
+        bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C) & 0xF0FF) | 0x0300);
+
+        bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0008);
+
+        bcm43xx_phy_write(bcm, 0x04A0, (bcm43xx_phy_read(bcm, 0x04A0) & 0xFFF0) | 0x0008);
+        bcm43xx_phy_write(bcm, 0x04A1, (bcm43xx_phy_read(bcm, 0x04A1) & 0xF0FF) | 0x0600);
+        bcm43xx_phy_write(bcm, 0x04A2, (bcm43xx_phy_read(bcm, 0x04A2) & 0xF0FF) | 0x0700);
+        bcm43xx_phy_write(bcm, 0x04A0, (bcm43xx_phy_read(bcm, 0x04A0) & 0xF0FF) | 0x0100);
+
+        if (phy->rev == 1)
+                bcm43xx_phy_write(bcm, 0x04A2, (bcm43xx_phy_read(bcm, 0x04A2) & 0xFFF0) | 0x0007);
+
+        bcm43xx_phy_write(bcm, 0x0488, (bcm43xx_phy_read(bcm, 0x0488) & 0xFF00) | 0x001C);
+        bcm43xx_phy_write(bcm, 0x0488, (bcm43xx_phy_read(bcm, 0x0488) & 0xC0FF) | 0x0200);
+        bcm43xx_phy_write(bcm, 0x0496, (bcm43xx_phy_read(bcm, 0x0496) & 0xFF00) | 0x001C);
+        bcm43xx_phy_write(bcm, 0x0489, (bcm43xx_phy_read(bcm, 0x0489) & 0xFF00) | 0x0020);
+        bcm43xx_phy_write(bcm, 0x0489, (bcm43xx_phy_read(bcm, 0x0489) & 0xC0FF) | 0x0200);
+        bcm43xx_phy_write(bcm, 0x0482, (bcm43xx_phy_read(bcm, 0x0482) & 0xFF00) | 0x002E);
+        bcm43xx_phy_write(bcm, 0x0496, (bcm43xx_phy_read(bcm, 0x0496) & 0x00FF) | 0x1A00);
+        bcm43xx_phy_write(bcm, 0x0481, (bcm43xx_phy_read(bcm, 0x0481) & 0xFF00) | 0x0028);
+        bcm43xx_phy_write(bcm, 0x0481, (bcm43xx_phy_read(bcm, 0x0481) & 0x00FF) | 0x2C00);
+
+        if (phy->rev == 1) {
+                bcm43xx_phy_write(bcm, 0x0430, 0x092B);
+                bcm43xx_phy_write(bcm, 0x041B, (bcm43xx_phy_read(bcm, 0x041B) & 0xFFE1) | 0x0002);
+        } else {
+                bcm43xx_phy_write(bcm, 0x041B, bcm43xx_phy_read(bcm, 0x041B) & 0xFFE1);
+                bcm43xx_phy_write(bcm, 0x041F, 0x287A);
+                bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420) & 0xFFF0) | 0x0004);
+        }
+
+        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, 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, 0x048B, 0x005E);
+                bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C) & 0xFF00) | 0x001E);
+                bcm43xx_phy_write(bcm, 0x048D, 0x0002);
+        }
+
+        bcm43xx_ilt_write(bcm, offset + 0x0800, 0);
+        bcm43xx_ilt_write(bcm, offset + 0x0801, 7);
+        bcm43xx_ilt_write(bcm, offset + 0x0802, 16);
+        bcm43xx_ilt_write(bcm, offset + 0x0803, 28);
+}
+
+static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 i;
+
+        assert(phy->type == BCM43xx_PHYTYPE_G);
+        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_write(bcm, 0x042C, 0x005A);
+                bcm43xx_phy_write(bcm, 0x0427, 0x001A);
+
+                for (i = 0; i < BCM43xx_ILT_FINEFREQG_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x5800 + i, bcm43xx_ilt_finefreqg[i]);
+                for (i = 0; i < BCM43xx_ILT_NOISEG1_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg1[i]);
+                for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]);
+        } else {
+                /* nrssi values are signed 6-bit values. Not sure why we write 0x7654 here... */
+                bcm43xx_nrssi_hw_write(bcm, 0xBA98, (s16)0x7654);
+
+                if (phy->rev == 2) {
+                        bcm43xx_phy_write(bcm, 0x04C0, 0x1861);
+                        bcm43xx_phy_write(bcm, 0x04C1, 0x0271);
+                } else if (phy->rev > 2) {
+                        bcm43xx_phy_write(bcm, 0x04C0, 0x0098);
+                        bcm43xx_phy_write(bcm, 0x04C1, 0x0070);
+                        bcm43xx_phy_write(bcm, 0x04C9, 0x0080);
+                }
+                bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x800);
+
+                for (i = 0; i < 64; i++)
+                        bcm43xx_ilt_write(bcm, 0x4000 + i, i);
+                for (i = 0; i < BCM43xx_ILT_NOISEG2_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg2[i]);
+        }
+        
+        if (phy->rev <= 2)
+                for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg1[i]);
+        else if ((phy->rev == 7) && (bcm43xx_phy_read(bcm, 0x0449) & 0x0200))
+                for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg3[i]);
+        else
+                for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg2[i]);
+        
+        if (phy->rev == 2)
+                for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr1[i]);
+        else if ((phy->rev > 2) && (phy->rev <= 7))
+                for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr2[i]);
+        
+        if (phy->rev == 1) {
+                for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]);
+                for (i = 0; i < 4; i++) {
+                        bcm43xx_ilt_write(bcm, 0x5404 + i, 0x0020);
+                        bcm43xx_ilt_write(bcm, 0x5408 + i, 0x0020);
+                        bcm43xx_ilt_write(bcm, 0x540C + i, 0x0020);
+                        bcm43xx_ilt_write(bcm, 0x5410 + i, 0x0020);
+                }
+                bcm43xx_phy_agcsetup(bcm);
+
+                if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
+                    (bcm->board_type == 0x0416) &&
+                    (bcm->board_revision == 0x0017))
+                        return;
+
+                bcm43xx_ilt_write(bcm, 0x5001, 0x0002);
+                bcm43xx_ilt_write(bcm, 0x5002, 0x0001);
+        } else {
+                for (i = 0; i <= 0x2F; i++)
+                        bcm43xx_ilt_write(bcm, 0x1000 + i, 0x0820);
+                bcm43xx_phy_agcsetup(bcm);
+                bcm43xx_phy_read(bcm, 0x0400); /* dummy read */
+                bcm43xx_phy_write(bcm, 0x0403, 0x1000);
+                bcm43xx_ilt_write(bcm, 0x3C02, 0x000F);
+                bcm43xx_ilt_write(bcm, 0x3C03, 0x0014);
+
+                if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
+                    (bcm->board_type == 0x0416) &&
+                    (bcm->board_revision == 0x0017))
+                        return;
+
+                bcm43xx_ilt_write(bcm, 0x0401, 0x0002);
+                bcm43xx_ilt_write(bcm, 0x0402, 0x0001);
+        }
+}
+
+/* Initialize the noisescaletable for APHY */
+static void bcm43xx_phy_init_noisescaletbl(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        int i;
+
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, 0x1400);
+        for (i = 0; i < 12; i++) {
+                if (phy->rev == 2)
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6767);
+                else
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2323);
+        }
+        if (phy->rev == 2)
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6700);
+        else
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2300);
+        for (i = 0; i < 11; i++) {
+                if (phy->rev == 2)
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6767);
+                else
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2323);
+        }
+        if (phy->rev == 2)
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x0067);
+        else
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x0023);
+}
+
+static void bcm43xx_phy_setupa(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 i;
+
+        assert(phy->type == BCM43xx_PHYTYPE_A);
+        switch (phy->rev) {
+        case 2:
+                bcm43xx_phy_write(bcm, 0x008E, 0x3800);
+                bcm43xx_phy_write(bcm, 0x0035, 0x03FF);
+                bcm43xx_phy_write(bcm, 0x0036, 0x0400);
+
+                bcm43xx_ilt_write(bcm, 0x3807, 0x0051);
+
+                bcm43xx_phy_write(bcm, 0x001C, 0x0FF9);
+                bcm43xx_phy_write(bcm, 0x0020, bcm43xx_phy_read(bcm, 0x0020) & 0xFF0F);
+                bcm43xx_ilt_write(bcm, 0x3C0C, 0x07BF);
+                bcm43xx_radio_write16(bcm, 0x0002, 0x07BF);
+
+                bcm43xx_phy_write(bcm, 0x0024, 0x4680);
+                bcm43xx_phy_write(bcm, 0x0020, 0x0003);
+                bcm43xx_phy_write(bcm, 0x001D, 0x0F40);
+                bcm43xx_phy_write(bcm, 0x001F, 0x1C00);
+
+                bcm43xx_phy_write(bcm, 0x002A, (bcm43xx_phy_read(bcm, 0x002A) & 0x00FF) | 0x0400);
+                bcm43xx_phy_write(bcm, 0x002B, bcm43xx_phy_read(bcm, 0x002B) & 0xFBFF);
+                bcm43xx_phy_write(bcm, 0x008E, 0x58C1);
+
+                bcm43xx_ilt_write(bcm, 0x0803, 0x000F);
+                bcm43xx_ilt_write(bcm, 0x0804, 0x001F);
+                bcm43xx_ilt_write(bcm, 0x0805, 0x002A);
+                bcm43xx_ilt_write(bcm, 0x0805, 0x0030);
+                bcm43xx_ilt_write(bcm, 0x0807, 0x003A);
+
+                bcm43xx_ilt_write(bcm, 0x0000, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0001, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0002, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0003, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0004, 0x0015);
+                bcm43xx_ilt_write(bcm, 0x0005, 0x0015);
+                bcm43xx_ilt_write(bcm, 0x0006, 0x0019);
+
+                bcm43xx_ilt_write(bcm, 0x0404, 0x0003);
+                bcm43xx_ilt_write(bcm, 0x0405, 0x0003);
+                bcm43xx_ilt_write(bcm, 0x0406, 0x0007);
+
+                for (i = 0; i < 16; i++)
+                        bcm43xx_ilt_write(bcm, 0x4000 + i, (0x8 + i) & 0x000F);
+
+                bcm43xx_ilt_write(bcm, 0x3003, 0x1044);
+                bcm43xx_ilt_write(bcm, 0x3004, 0x7201);
+                bcm43xx_ilt_write(bcm, 0x3006, 0x0040);
+                bcm43xx_ilt_write(bcm, 0x3001, (bcm43xx_ilt_read(bcm, 0x3001) & 0x0010) | 0x0008);
+
+                for (i = 0; i < BCM43xx_ILT_FINEFREQA_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x5800 + i, bcm43xx_ilt_finefreqa[i]);
+                for (i = 0; i < BCM43xx_ILT_NOISEA2_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea2[i]);
+                for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]);
+                bcm43xx_phy_init_noisescaletbl(bcm);
+                for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]);
+                break;
+        case 3:
+                for (i = 0; i < 64; i++)
+                        bcm43xx_ilt_write(bcm, 0x4000 + i, i);
+
+                bcm43xx_ilt_write(bcm, 0x3807, 0x0051);
+
+                bcm43xx_phy_write(bcm, 0x001C, 0x0FF9);
+                bcm43xx_phy_write(bcm, 0x0020, bcm43xx_phy_read(bcm, 0x0020) & 0xFF0F);
+                bcm43xx_radio_write16(bcm, 0x0002, 0x07BF);
+
+                bcm43xx_phy_write(bcm, 0x0024, 0x4680);
+                bcm43xx_phy_write(bcm, 0x0020, 0x0003);
+                bcm43xx_phy_write(bcm, 0x001D, 0x0F40);
+                bcm43xx_phy_write(bcm, 0x001F, 0x1C00);
+                bcm43xx_phy_write(bcm, 0x002A, (bcm43xx_phy_read(bcm, 0x002A) & 0x00FF) | 0x0400);
+
+                bcm43xx_ilt_write(bcm, 0x3001, (bcm43xx_ilt_read(bcm, 0x3001) & 0x0010) | 0x0008);
+                for (i = 0; i < BCM43xx_ILT_NOISEA3_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea3[i]);
+                bcm43xx_phy_init_noisescaletbl(bcm);
+                for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
+                        bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr1[i]);
+
+                bcm43xx_phy_write(bcm, 0x0003, 0x1808);
+
+                bcm43xx_ilt_write(bcm, 0x0803, 0x000F);
+                bcm43xx_ilt_write(bcm, 0x0804, 0x001F);
+                bcm43xx_ilt_write(bcm, 0x0805, 0x002A);
+                bcm43xx_ilt_write(bcm, 0x0805, 0x0030);
+                bcm43xx_ilt_write(bcm, 0x0807, 0x003A);
+
+                bcm43xx_ilt_write(bcm, 0x0000, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0001, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0002, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0003, 0x0013);
+                bcm43xx_ilt_write(bcm, 0x0004, 0x0015);
+                bcm43xx_ilt_write(bcm, 0x0005, 0x0015);
+                bcm43xx_ilt_write(bcm, 0x0006, 0x0019);
+
+                bcm43xx_ilt_write(bcm, 0x0404, 0x0003);
+                bcm43xx_ilt_write(bcm, 0x0405, 0x0003);
+                bcm43xx_ilt_write(bcm, 0x0406, 0x0007);
+
+                bcm43xx_ilt_write(bcm, 0x3C02, 0x000F);
+                bcm43xx_ilt_write(bcm, 0x3C03, 0x0014);
+                break;
+        default:
+                assert(0);
+        }
+}
+
+/* Initialize APHY. This is also called for the GPHY in some cases. */
+static void bcm43xx_phy_inita(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 tval;
+
+        if (phy->type == BCM43xx_PHYTYPE_A) {
+                bcm43xx_phy_setupa(bcm);
+        } else {
+                bcm43xx_phy_setupg(bcm);
+                if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
+                        bcm43xx_phy_write(bcm, 0x046E, 0x03CF);
+                return;
+        }
+
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_A_CRS,
+                          (bcm43xx_phy_read(bcm, BCM43xx_PHY_A_CRS) & 0xF83C) | 0x0340);
+        bcm43xx_phy_write(bcm, 0x0034, 0x0001);
+
+        TODO();//TODO: RSSI AGC
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_A_CRS,
+                          bcm43xx_phy_read(bcm, BCM43xx_PHY_A_CRS) | (1 << 14));
+        bcm43xx_radio_init2060(bcm);
+
+        if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM)
+            && ((bcm->board_type == 0x0416) || (bcm->board_type == 0x040A))) {
+                if (radio->lofcal == 0xFFFF) {
+                        TODO();//TODO: LOF Cal
+                        bcm43xx_radio_set_tx_iq(bcm);
+                } else
+                        bcm43xx_radio_write16(bcm, 0x001E, radio->lofcal);
+        }
+
+        bcm43xx_phy_write(bcm, 0x007A, 0xF111);
+
+        if (phy->savedpctlreg == 0xFFFF) {
+                bcm43xx_radio_write16(bcm, 0x0019, 0x0000);
+                bcm43xx_radio_write16(bcm, 0x0017, 0x0020);
+
+                tval = bcm43xx_ilt_read(bcm, 0x3001);
+                if (phy->rev == 1) {
+                        bcm43xx_ilt_write(bcm, 0x3001,
+                                          (bcm43xx_ilt_read(bcm, 0x3001) & 0xFF87)
+                                          | 0x0058);
+                } else {
+                        bcm43xx_ilt_write(bcm, 0x3001,
+                                          (bcm43xx_ilt_read(bcm, 0x3001) & 0xFFC3)
+                                          | 0x002C);
+                }
+                bcm43xx_dummy_transmission(bcm);
+                phy->savedpctlreg = bcm43xx_phy_read(bcm, BCM43xx_PHY_A_PCTL);
+                bcm43xx_ilt_write(bcm, 0x3001, tval);
+
+                bcm43xx_radio_set_txpower_a(bcm, 0x0018);
+        }
+        bcm43xx_radio_clear_tssi(bcm);
+}
+
+static void bcm43xx_phy_initb2(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 offset, val;
+
+        bcm43xx_write16(bcm, 0x03EC, 0x3F22);
+        bcm43xx_phy_write(bcm, 0x0020, 0x301C);
+        bcm43xx_phy_write(bcm, 0x0026, 0x0000);
+        bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
+        bcm43xx_phy_write(bcm, 0x0088, 0x3E00);
+        val = 0x3C3D;
+        for (offset = 0x0089; offset < 0x00A7; offset++) {
+                bcm43xx_phy_write(bcm, offset, val);
+                val -= 0x0202;
+        }
+        bcm43xx_phy_write(bcm, 0x03E4, 0x3000);
+        if (radio->channel == 0xFF)
+                bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
+        else
+                bcm43xx_radio_selectchannel(bcm, radio->channel, 0);
+        if (radio->version != 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
+                bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
+        }
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
+        if (radio->version == 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
+                bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
+                bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
+                bcm43xx_radio_write16(bcm, 0x007A, 0x000F);
+                bcm43xx_phy_write(bcm, 0x0038, 0x0677);
+                bcm43xx_radio_init2050(bcm);
+        }
+        bcm43xx_phy_write(bcm, 0x0014, 0x0080);
+        bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
+        bcm43xx_phy_write(bcm, 0x0032, 0x00CC);
+        bcm43xx_phy_write(bcm, 0x0035, 0x07C2);
+        bcm43xx_phy_lo_b_measure(bcm);
+        bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
+        if (radio->version != 0x2050)
+                bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
+        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x1000);
+        bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
+        if (radio->version != 0x2050)
+                bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
+        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
+        bcm43xx_phy_init_pctl(bcm);
+}
+
+static void bcm43xx_phy_initb4(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 offset, val;
+
+        bcm43xx_write16(bcm, 0x03EC, 0x3F22);
+        bcm43xx_phy_write(bcm, 0x0020, 0x301C);
+        bcm43xx_phy_write(bcm, 0x0026, 0x0000);
+        bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
+        bcm43xx_phy_write(bcm, 0x0088, 0x3E00);
+        val = 0x3C3D;
+        for (offset = 0x0089; offset < 0x00A7; offset++) {
+                bcm43xx_phy_write(bcm, offset, val);
+                val -= 0x0202;
+        }
+        bcm43xx_phy_write(bcm, 0x03E4, 0x3000);
+        if (radio->channel == 0xFF)
+                bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
+        else
+                bcm43xx_radio_selectchannel(bcm, radio->channel, 0);
+        if (radio->version != 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
+                bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
+        }
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
+        if (radio->version == 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
+                bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
+                bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
+                bcm43xx_radio_write16(bcm, 0x007A, 0x000F);
+                bcm43xx_phy_write(bcm, 0x0038, 0x0677);
+                bcm43xx_radio_init2050(bcm);
+        }
+        bcm43xx_phy_write(bcm, 0x0014, 0x0080);
+        bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
+        if (radio->version == 0x2050)
+                bcm43xx_phy_write(bcm, 0x0032, 0x00E0);
+        bcm43xx_phy_write(bcm, 0x0035, 0x07C2);
+
+        bcm43xx_phy_lo_b_measure(bcm);
+
+        bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
+        if (radio->version == 0x2050)
+                bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
+        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x1100);
+        bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
+        if (radio->version == 0x2050)
+                bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
+        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
+        if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
+                bcm43xx_calc_nrssi_slope(bcm);
+                bcm43xx_calc_nrssi_threshold(bcm);
+        }
+        bcm43xx_phy_init_pctl(bcm);
+}
+
+static void bcm43xx_phy_initb5(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 offset;
+
+        if (phy->version == 1 &&
+            radio->version == 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A)
+                                      | 0x0050);
+        }
+        if ((bcm->board_vendor != PCI_VENDOR_ID_BROADCOM) &&
+            (bcm->board_type != 0x0416)) {
+                for (offset = 0x00A8 ; offset < 0x00C7; offset++) {
+                        bcm43xx_phy_write(bcm, offset,
+                                          (bcm43xx_phy_read(bcm, offset) + 0x2020)
+                                          & 0x3F3F);
+                }
+        }
+        bcm43xx_phy_write(bcm, 0x0035,
+                          (bcm43xx_phy_read(bcm, 0x0035) & 0xF0FF)
+                          | 0x0700);
+        if (radio->version == 0x2050)
+                bcm43xx_phy_write(bcm, 0x0038, 0x0667);
+
+        if (phy->connected) {
+                if (radio->version == 0x2050) {
+                        bcm43xx_radio_write16(bcm, 0x007A,
+                                              bcm43xx_radio_read16(bcm, 0x007A)
+                                              | 0x0020);
+                        bcm43xx_radio_write16(bcm, 0x0051,
+                                              bcm43xx_radio_read16(bcm, 0x0051)
+                                              | 0x0004);
+                }
+                bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO, 0x0000);
+
+                bcm43xx_phy_write(bcm, 0x0802, bcm43xx_phy_read(bcm, 0x0802) | 0x0100);
+                bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x2000);
+
+                bcm43xx_phy_write(bcm, 0x001C, 0x186A);
+
+                bcm43xx_phy_write(bcm, 0x0013, (bcm43xx_phy_read(bcm, 0x0013) & 0x00FF) | 0x1900);
+                bcm43xx_phy_write(bcm, 0x0035, (bcm43xx_phy_read(bcm, 0x0035) & 0xFFC0) | 0x0064);
+                bcm43xx_phy_write(bcm, 0x005D, (bcm43xx_phy_read(bcm, 0x005D) & 0xFF80) | 0x000A);
+        }
+
+        if (bcm->bad_frames_preempt) {
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
+                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | (1 << 11));
+        }
+
+        if (phy->version == 1 && radio->version == 0x2050) {
+                bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
+                bcm43xx_phy_write(bcm, 0x0021, 0x3763);
+                bcm43xx_phy_write(bcm, 0x0022, 0x1BC3);
+                bcm43xx_phy_write(bcm, 0x0023, 0x06F9);
+                bcm43xx_phy_write(bcm, 0x0024, 0x037E);
+        } else
+                bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
+        bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
+        bcm43xx_write16(bcm, 0x03EC, 0x3F22);
+
+        if (phy->version == 1 && radio->version == 0x2050)
+                bcm43xx_phy_write(bcm, 0x0020, 0x3E1C);
+        else
+                bcm43xx_phy_write(bcm, 0x0020, 0x301C);
+
+        if (phy->version == 0)
+                bcm43xx_write16(bcm, 0x03E4, 0x3000);
+
+        /* Force to channel 7, even if not supported. */
+        bcm43xx_radio_selectchannel(bcm, 7, 0);
+
+        if (radio->version != 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
+                bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
+        }
+
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
+
+        if (radio->version == 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
+        }
+
+        bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
+        bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
+
+        bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0007);
+
+        bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
+
+        bcm43xx_phy_write(bcm, 0x0014, 0x0080);
+        bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
+        bcm43xx_phy_write(bcm, 0x88A3, 0x002A);
+
+        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
+
+        if (radio->version == 0x2050)
+                bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
+
+        bcm43xx_write16(bcm, 0x03E4, (bcm43xx_read16(bcm, 0x03E4) & 0xFFC0) | 0x0004);
+}
+
+static void bcm43xx_phy_initb6(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 offset, val;
+
+        bcm43xx_phy_write(bcm, 0x003E, 0x817A);
+        bcm43xx_radio_write16(bcm, 0x007A,
+                              (bcm43xx_radio_read16(bcm, 0x007A) | 0x0058));
+        if ((radio->manufact == 0x17F) &&
+            (radio->version == 0x2050) &&
+            (radio->revision == 3 ||
+             radio->revision == 4 ||
+             radio->revision == 5)) {
+                bcm43xx_radio_write16(bcm, 0x0051, 0x001F);
+                bcm43xx_radio_write16(bcm, 0x0052, 0x0040);
+                bcm43xx_radio_write16(bcm, 0x0053, 0x005B);
+                bcm43xx_radio_write16(bcm, 0x0054, 0x0098);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x005B, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x005D, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x005E, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x007D, 0x0088);
+        }
+        if ((radio->manufact == 0x17F) &&
+            (radio->version == 0x2050) &&
+            (radio->revision == 6)) {
+                bcm43xx_radio_write16(bcm, 0x0051, 0x0000);
+                bcm43xx_radio_write16(bcm, 0x0052, 0x0040);
+                bcm43xx_radio_write16(bcm, 0x0053, 0x00B7);
+                bcm43xx_radio_write16(bcm, 0x0054, 0x0098);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x005B, 0x008B);
+                bcm43xx_radio_write16(bcm, 0x005C, 0x00B5);
+                bcm43xx_radio_write16(bcm, 0x005D, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x005E, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x007D, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x007C, 0x0001);
+                bcm43xx_radio_write16(bcm, 0x007E, 0x0008);
+        }
+        if ((radio->manufact == 0x17F) &&
+            (radio->version == 0x2050) &&
+            (radio->revision == 7)) {
+                bcm43xx_radio_write16(bcm, 0x0051, 0x0000);
+                bcm43xx_radio_write16(bcm, 0x0052, 0x0040);
+                bcm43xx_radio_write16(bcm, 0x0053, 0x00B7);
+                bcm43xx_radio_write16(bcm, 0x0054, 0x0098);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x005B, 0x00A8);
+                bcm43xx_radio_write16(bcm, 0x005C, 0x0075);
+                bcm43xx_radio_write16(bcm, 0x005D, 0x00F5);
+                bcm43xx_radio_write16(bcm, 0x005E, 0x00B8);
+                bcm43xx_radio_write16(bcm, 0x007D, 0x00E8);
+                bcm43xx_radio_write16(bcm, 0x007C, 0x0001);
+                bcm43xx_radio_write16(bcm, 0x007E, 0x0008);
+                bcm43xx_radio_write16(bcm, 0x007B, 0x0000);
+        }
+        if ((radio->manufact == 0x17F) &&
+            (radio->version == 0x2050) &&
+            (radio->revision == 8)) {
+                bcm43xx_radio_write16(bcm, 0x0051, 0x0000);
+                bcm43xx_radio_write16(bcm, 0x0052, 0x0040);
+                bcm43xx_radio_write16(bcm, 0x0053, 0x00B7);
+                bcm43xx_radio_write16(bcm, 0x0054, 0x0098);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
+                bcm43xx_radio_write16(bcm, 0x005B, 0x006B);
+                bcm43xx_radio_write16(bcm, 0x005C, 0x000F);
+                if (bcm->sprom.boardflags & 0x8000) {
+                        bcm43xx_radio_write16(bcm, 0x005D, 0x00FA);
+                        bcm43xx_radio_write16(bcm, 0x005E, 0x00D8);
+                } else {
+                        bcm43xx_radio_write16(bcm, 0x005D, 0x00F5);
+                        bcm43xx_radio_write16(bcm, 0x005E, 0x00B8);
+                }
+                bcm43xx_radio_write16(bcm, 0x0073, 0x0003);
+                bcm43xx_radio_write16(bcm, 0x007D, 0x00A8);
+                bcm43xx_radio_write16(bcm, 0x007C, 0x0001);
+                bcm43xx_radio_write16(bcm, 0x007E, 0x0008);
+        }
+        val = 0x1E1F;
+        for (offset = 0x0088; offset < 0x0098; offset++) {
+                bcm43xx_phy_write(bcm, offset, val);
+                val -= 0x0202;
+        }
+        val = 0x3E3F;
+        for (offset = 0x0098; offset < 0x00A8; offset++) {
+                bcm43xx_phy_write(bcm, offset, val);
+                val -= 0x0202;
+        }
+        val = 0x2120;
+        for (offset = 0x00A8; offset < 0x00C8; offset++) {
+                bcm43xx_phy_write(bcm, offset, (val & 0x3F3F));
+                val += 0x0202;
+        }
+        if (phy->type == BCM43xx_PHYTYPE_G) {
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0020);
+                bcm43xx_radio_write16(bcm, 0x0051,
+                                      bcm43xx_radio_read16(bcm, 0x0051) | 0x0004);
+                bcm43xx_phy_write(bcm, 0x0802,
+                                  bcm43xx_phy_read(bcm, 0x0802) | 0x0100);
+                bcm43xx_phy_write(bcm, 0x042B,
+                                  bcm43xx_phy_read(bcm, 0x042B) | 0x2000);
+        }
+
+        /* Force to channel 7, even if not supported. */
+        bcm43xx_radio_selectchannel(bcm, 7, 0);
+
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
+        udelay(40);
+        bcm43xx_radio_write16(bcm, 0x007C, (bcm43xx_radio_read16(bcm, 0x007C) | 0x0002));
+        bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+        if (radio->manufact == 0x17F &&
+            radio->version == 0x2050 &&
+            radio->revision <= 2) {
+                bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
+                bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
+                bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
+        }
+        bcm43xx_radio_write16(bcm, 0x007A,
+                              (bcm43xx_radio_read16(bcm, 0x007A) & 0x00F8) | 0x0007);
+
+        bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
+
+        bcm43xx_phy_write(bcm, 0x0014, 0x0200);
+        if (radio->version == 0x2050){
+                if (radio->revision == 3 ||
+                    radio->revision == 4 ||
+                    radio->revision == 5)
+                        bcm43xx_phy_write(bcm, 0x002A, 0x8AC0);
+                else
+                        bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
+        }
+        bcm43xx_phy_write(bcm, 0x0038, 0x0668);
+        bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
+        if (radio->version == 0x2050) {
+                if (radio->revision == 3 ||
+                    radio->revision == 4 ||
+                    radio->revision == 5)
+                        bcm43xx_phy_write(bcm, 0x005D, bcm43xx_phy_read(bcm, 0x005D) | 0x0003);
+                else if (radio->revision <= 2)
+                        bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
+        }
+        
+        if (phy->rev == 4)
+                bcm43xx_phy_write(bcm, 0x0002, (bcm43xx_phy_read(bcm, 0x0002) & 0xFFC0) | 0x0004);
+        else
+                bcm43xx_write16(bcm, 0x03E4, 0x0009);
+        if (phy->type == BCM43xx_PHYTYPE_B) {
+                bcm43xx_write16(bcm, 0x03E6, 0x8140);
+                bcm43xx_phy_write(bcm, 0x0016, 0x0410);
+                bcm43xx_phy_write(bcm, 0x0017, 0x0820);
+                bcm43xx_phy_write(bcm, 0x0062, 0x0007);
+                (void) bcm43xx_radio_calibrationvalue(bcm);
+                bcm43xx_phy_lo_b_measure(bcm);
+                if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
+                        bcm43xx_calc_nrssi_slope(bcm);
+                        bcm43xx_calc_nrssi_threshold(bcm);
+                }
+                bcm43xx_phy_init_pctl(bcm);
+        } else
+                bcm43xx_write16(bcm, 0x03E6, 0x0);
+}
+
+static void bcm43xx_calc_loopback_gain(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 backup_phy[15];
+        u16 backup_radio[3];
+        u16 backup_bband;
+        u16 i;
+        u16 loop1_cnt, loop1_done, loop1_omitted;
+        u16 loop2_done;
+
+        backup_phy[0] = bcm43xx_phy_read(bcm, 0x0429);
+        backup_phy[1] = bcm43xx_phy_read(bcm, 0x0001);
+        backup_phy[2] = bcm43xx_phy_read(bcm, 0x0811);
+        backup_phy[3] = bcm43xx_phy_read(bcm, 0x0812);
+        backup_phy[4] = bcm43xx_phy_read(bcm, 0x0814);
+        backup_phy[5] = bcm43xx_phy_read(bcm, 0x0815);
+        backup_phy[6] = bcm43xx_phy_read(bcm, 0x005A);
+        backup_phy[7] = bcm43xx_phy_read(bcm, 0x0059);
+        backup_phy[8] = bcm43xx_phy_read(bcm, 0x0058);
+        backup_phy[9] = bcm43xx_phy_read(bcm, 0x000A);
+        backup_phy[10] = bcm43xx_phy_read(bcm, 0x0003);
+        backup_phy[11] = bcm43xx_phy_read(bcm, 0x080F);
+        backup_phy[12] = bcm43xx_phy_read(bcm, 0x0810);
+        backup_phy[13] = bcm43xx_phy_read(bcm, 0x002B);
+        backup_phy[14] = bcm43xx_phy_read(bcm, 0x0015);
+        bcm43xx_phy_read(bcm, 0x002D); /* dummy read */
+        backup_bband = radio->baseband_atten;
+        backup_radio[0] = bcm43xx_radio_read16(bcm, 0x0052);
+        backup_radio[1] = bcm43xx_radio_read16(bcm, 0x0043);
+        backup_radio[2] = bcm43xx_radio_read16(bcm, 0x007A);
+
+        bcm43xx_phy_write(bcm, 0x0429,
+                          bcm43xx_phy_read(bcm, 0x0429) & 0x3FFF);
+        bcm43xx_phy_write(bcm, 0x0001,
+                          bcm43xx_phy_read(bcm, 0x0001) & 0x8000);
+        bcm43xx_phy_write(bcm, 0x0811,
+                          bcm43xx_phy_read(bcm, 0x0811) | 0x0002);
+        bcm43xx_phy_write(bcm, 0x0812,
+                          bcm43xx_phy_read(bcm, 0x0812) & 0xFFFD);
+        bcm43xx_phy_write(bcm, 0x0811,
+                          bcm43xx_phy_read(bcm, 0x0811) | 0x0001);
+        bcm43xx_phy_write(bcm, 0x0812,
+                          bcm43xx_phy_read(bcm, 0x0812) & 0xFFFE);
+        bcm43xx_phy_write(bcm, 0x0814,
+                          bcm43xx_phy_read(bcm, 0x0814) | 0x0001);
+        bcm43xx_phy_write(bcm, 0x0815,
+                          bcm43xx_phy_read(bcm, 0x0815) & 0xFFFE);
+        bcm43xx_phy_write(bcm, 0x0814,
+                          bcm43xx_phy_read(bcm, 0x0814) | 0x0002);
+        bcm43xx_phy_write(bcm, 0x0815,
+                          bcm43xx_phy_read(bcm, 0x0815) & 0xFFFD);
+        bcm43xx_phy_write(bcm, 0x0811,
+                          bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
+        bcm43xx_phy_write(bcm, 0x0812,
+                          bcm43xx_phy_read(bcm, 0x0812) | 0x000C);
+
+        bcm43xx_phy_write(bcm, 0x0811,
+                          (bcm43xx_phy_read(bcm, 0x0811)
+                           & 0xFFCF) | 0x0030);
+        bcm43xx_phy_write(bcm, 0x0812,
+                          (bcm43xx_phy_read(bcm, 0x0812)
+                           & 0xFFCF) | 0x0010);
+
+        bcm43xx_phy_write(bcm, 0x005A, 0x0780);
+        bcm43xx_phy_write(bcm, 0x0059, 0xC810);
+        bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+        if (phy->version == 0) {
+                bcm43xx_phy_write(bcm, 0x0003, 0x0122);
+        } else {
+                bcm43xx_phy_write(bcm, 0x000A,
+                                  bcm43xx_phy_read(bcm, 0x000A)
+                                  | 0x2000);
+        }
+        bcm43xx_phy_write(bcm, 0x0814,
+                          bcm43xx_phy_read(bcm, 0x0814) | 0x0004);
+        bcm43xx_phy_write(bcm, 0x0815,
+                          bcm43xx_phy_read(bcm, 0x0815) & 0xFFFB);
+        bcm43xx_phy_write(bcm, 0x0003,
+                          (bcm43xx_phy_read(bcm, 0x0003)
+                           & 0xFF9F) | 0x0040);
+        if (radio->version == 0x2050 && radio->revision == 2) {
+                bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
+                bcm43xx_radio_write16(bcm, 0x0043,
+                                      (bcm43xx_radio_read16(bcm, 0x0043)
+                                       & 0xFFF0) | 0x0009);
+                loop1_cnt = 9;
+        } else if (radio->revision == 8) {
+                bcm43xx_radio_write16(bcm, 0x0043, 0x000F);
+                loop1_cnt = 15;
+        } else
+                loop1_cnt = 0;
+
+        bcm43xx_phy_set_baseband_attenuation(bcm, 11);
+
+        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, 0x002B,
+                          (bcm43xx_phy_read(bcm, 0x002B)
+                           & 0xFFC0) | 0x0001);
+        bcm43xx_phy_write(bcm, 0x002B,
+                          (bcm43xx_phy_read(bcm, 0x002B)
+                           & 0xC0FF) | 0x0800);
+        bcm43xx_phy_write(bcm, 0x0811,
+                          bcm43xx_phy_read(bcm, 0x0811) | 0x0100);
+        bcm43xx_phy_write(bcm, 0x0812,
+                          bcm43xx_phy_read(bcm, 0x0812) & 0xCFFF);
+        if (bcm->sprom.boardflags & BCM43xx_BFL_EXTLNA) {
+                if (phy->rev >= 7) {
+                        bcm43xx_phy_write(bcm, 0x0811,
+                                          bcm43xx_phy_read(bcm, 0x0811)
+                                          | 0x0800);
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          bcm43xx_phy_read(bcm, 0x0812)
+                                          | 0x8000);
+                }
+        }
+        bcm43xx_radio_write16(bcm, 0x007A,
+                              bcm43xx_radio_read16(bcm, 0x007A)
+                              & 0x00F7);
+
+        for (i = 0; i < loop1_cnt; i++) {
+                bcm43xx_radio_write16(bcm, 0x0043, loop1_cnt);
+                bcm43xx_phy_write(bcm, 0x0812,
+                                  (bcm43xx_phy_read(bcm, 0x0812)
+                                   & 0xF0FF) | (i << 8));
+                bcm43xx_phy_write(bcm, 0x0015,
+                                  (bcm43xx_phy_read(bcm, 0x0015)
+                                   & 0x0FFF) | 0xA000);
+                bcm43xx_phy_write(bcm, 0x0015,
+                                  (bcm43xx_phy_read(bcm, 0x0015)
+                                   & 0x0FFF) | 0xF000);
+                udelay(20);
+                if (bcm43xx_phy_read(bcm, 0x002D) >= 0x0DFC)
+                        break;
+        }
+        loop1_done = i;
+        loop1_omitted = loop1_cnt - loop1_done;
+
+        loop2_done = 0;
+        if (loop1_done >= 8) {
+                bcm43xx_phy_write(bcm, 0x0812,
+                                  bcm43xx_phy_read(bcm, 0x0812)
+                                  | 0x0030);
+                for (i = loop1_done - 8; i < 16; i++) {
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          (bcm43xx_phy_read(bcm, 0x0812)
+                                           & 0xF0FF) | (i << 8));
+                        bcm43xx_phy_write(bcm, 0x0015,
+                                          (bcm43xx_phy_read(bcm, 0x0015)
+                                           & 0x0FFF) | 0xA000);
+                        bcm43xx_phy_write(bcm, 0x0015,
+                                          (bcm43xx_phy_read(bcm, 0x0015)
+                                           & 0x0FFF) | 0xF000);
+                        udelay(20);
+                        if (bcm43xx_phy_read(bcm, 0x002D) >= 0x0DFC)
+                                break;
+                }
+        }
+
+        bcm43xx_phy_write(bcm, 0x0814, backup_phy[4]);
+        bcm43xx_phy_write(bcm, 0x0815, backup_phy[5]);
+        bcm43xx_phy_write(bcm, 0x005A, backup_phy[6]);
+        bcm43xx_phy_write(bcm, 0x0059, backup_phy[7]);
+        bcm43xx_phy_write(bcm, 0x0058, backup_phy[8]);
+        bcm43xx_phy_write(bcm, 0x000A, backup_phy[9]);
+        bcm43xx_phy_write(bcm, 0x0003, backup_phy[10]);
+        bcm43xx_phy_write(bcm, 0x080F, backup_phy[11]);
+        bcm43xx_phy_write(bcm, 0x0810, backup_phy[12]);
+        bcm43xx_phy_write(bcm, 0x002B, backup_phy[13]);
+        bcm43xx_phy_write(bcm, 0x0015, backup_phy[14]);
+
+        bcm43xx_phy_set_baseband_attenuation(bcm, backup_bband);
+
+        bcm43xx_radio_write16(bcm, 0x0052, backup_radio[0]);
+        bcm43xx_radio_write16(bcm, 0x0043, backup_radio[1]);
+        bcm43xx_radio_write16(bcm, 0x007A, backup_radio[2]);
+
+        bcm43xx_phy_write(bcm, 0x0811, backup_phy[2] | 0x0003);
+        udelay(10);
+        bcm43xx_phy_write(bcm, 0x0811, backup_phy[2]);
+        bcm43xx_phy_write(bcm, 0x0812, backup_phy[3]);
+        bcm43xx_phy_write(bcm, 0x0429, backup_phy[0]);
+        bcm43xx_phy_write(bcm, 0x0001, backup_phy[1]);
+
+        phy->loopback_gain[0] = ((loop1_done * 6) - (loop1_omitted * 4)) - 11;
+        phy->loopback_gain[1] = (24 - (3 * loop2_done)) * 2;
+}
+
+static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 tmp;
+
+        if (phy->rev == 1)
+                bcm43xx_phy_initb5(bcm);
+        else if (phy->rev >= 2 && phy->rev <= 7)
+                bcm43xx_phy_initb6(bcm);
+        if (phy->rev >= 2 || phy->connected)
+                bcm43xx_phy_inita(bcm);
+
+        if (phy->rev >= 2) {
+                bcm43xx_phy_write(bcm, 0x0814, 0x0000);
+                bcm43xx_phy_write(bcm, 0x0815, 0x0000);
+                if (phy->rev == 2)
+                        bcm43xx_phy_write(bcm, 0x0811, 0x0000);
+                else if (phy->rev >= 3)
+                        bcm43xx_phy_write(bcm, 0x0811, 0x0400);
+                bcm43xx_phy_write(bcm, 0x0015, 0x00C0);
+                if (phy->connected) {
+                        tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF;
+                        if (tmp < 6) {
+                                bcm43xx_phy_write(bcm, 0x04C2, 0x1816);
+                                bcm43xx_phy_write(bcm, 0x04C3, 0x8006);
+                                if (tmp != 3) {
+                                        bcm43xx_phy_write(bcm, 0x04CC,
+                                                          (bcm43xx_phy_read(bcm, 0x04CC)
+                                                           & 0x00FF) | 0x1F00);
+                                }
+                        }
+                }
+        }
+        if (phy->rev < 3 && phy->connected)
+                bcm43xx_phy_write(bcm, 0x047E, 0x0078);
+        if (phy->rev >= 6 && phy->rev <= 8) {
+                bcm43xx_phy_write(bcm, 0x0801, bcm43xx_phy_read(bcm, 0x0801) | 0x0080);
+                bcm43xx_phy_write(bcm, 0x043E, bcm43xx_phy_read(bcm, 0x043E) | 0x0004);
+        }
+        if (phy->rev >= 2 && phy->connected)
+                bcm43xx_calc_loopback_gain(bcm);
+        if (radio->revision != 8) {
+                if (radio->initval == 0xFFFF)
+                        radio->initval = bcm43xx_radio_init2050(bcm);
+                else
+                        bcm43xx_radio_write16(bcm, 0x0078, radio->initval);
+        }
+        if (radio->txctl2 == 0xFFFF) {
+                bcm43xx_phy_lo_g_measure(bcm);
+        } else {
+                if (radio->version == 0x2050 && radio->revision == 8) {
+                        //FIXME
+                } else {
+                        bcm43xx_radio_write16(bcm, 0x0052,
+                                              (bcm43xx_radio_read16(bcm, 0x0052)
+                                               & 0xFFF0) | radio->txctl1);
+                }
+                if (phy->rev >= 6) {
+                        /*
+                        bcm43xx_phy_write(bcm, 0x0036,
+                                          (bcm43xx_phy_read(bcm, 0x0036)
+                                           & 0xF000) | (FIXME << 12));
+                        */
+                }
+                if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
+                        bcm43xx_phy_write(bcm, 0x002E, 0x8075);
+                else
+                        bcm43xx_phy_write(bcm, 0x003E, 0x807F);
+                if (phy->rev < 2)
+                        bcm43xx_phy_write(bcm, 0x002F, 0x0101);
+                else
+                        bcm43xx_phy_write(bcm, 0x002F, 0x0202);
+        }
+        if (phy->connected) {
+                bcm43xx_phy_lo_adjust(bcm, 0);
+                bcm43xx_phy_write(bcm, 0x080F, 0x8078);
+        }
+
+        if (!(bcm->sprom.boardflags & BCM43xx_BFL_RSSI)) {
+                /* The specs state to update the NRSSI LT with
+                 * the value 0x7FFFFFFF here. I think that is some weird
+                 * compiler optimization in the original driver.
+                 * Essentially, what we do here is resetting all NRSSI LT
+                 * entries to -32 (see the limit_value() in nrssi_hw_update())
+                 */
+                bcm43xx_nrssi_hw_update(bcm, 0xFFFF);
+                bcm43xx_calc_nrssi_threshold(bcm);
+        } else if (phy->connected) {
+                if (radio->nrssi[0] == -1000) {
+                        assert(radio->nrssi[1] == -1000);
+                        bcm43xx_calc_nrssi_slope(bcm);
+                } else {
+                        assert(radio->nrssi[1] != -1000);
+                        bcm43xx_calc_nrssi_threshold(bcm);
+                }
+        }
+        if (radio->revision == 8)
+                bcm43xx_phy_write(bcm, 0x0805, 0x3230);
+        bcm43xx_phy_init_pctl(bcm);
+        if (bcm->chip_id == 0x4306 && bcm->chip_package != 2) {
+                bcm43xx_phy_write(bcm, 0x0429,
+                                  bcm43xx_phy_read(bcm, 0x0429) & 0xBFFF);
+                bcm43xx_phy_write(bcm, 0x04C3,
+                                  bcm43xx_phy_read(bcm, 0x04C3) & 0x7FFF);
+        }
+}
+
+static u16 bcm43xx_phy_lo_b_r15_loop(struct bcm43xx_private *bcm)
+{
+        int i;
+        u16 ret = 0;
+
+        for (i = 0; i < 10; i++){
+                bcm43xx_phy_write(bcm, 0x0015, 0xAFA0);
+                udelay(1);
+                bcm43xx_phy_write(bcm, 0x0015, 0xEFA0);
+                udelay(10);
+                bcm43xx_phy_write(bcm, 0x0015, 0xFFA0);
+                udelay(40);
+                ret += bcm43xx_phy_read(bcm, 0x002C);
+        }
+
+        return ret;
+}
+
+void bcm43xx_phy_lo_b_measure(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 regstack[12] = { 0 };
+        u16 mls;
+        u16 fval;
+        int i, j;
+
+        regstack[0] = bcm43xx_phy_read(bcm, 0x0015);
+        regstack[1] = bcm43xx_radio_read16(bcm, 0x0052) & 0xFFF0;
+
+        if (radio->version == 0x2053) {
+                regstack[2] = bcm43xx_phy_read(bcm, 0x000A);
+                regstack[3] = bcm43xx_phy_read(bcm, 0x002A);
+                regstack[4] = bcm43xx_phy_read(bcm, 0x0035);
+                regstack[5] = bcm43xx_phy_read(bcm, 0x0003);
+                regstack[6] = bcm43xx_phy_read(bcm, 0x0001);
+                regstack[7] = bcm43xx_phy_read(bcm, 0x0030);
+
+                regstack[8] = bcm43xx_radio_read16(bcm, 0x0043);
+                regstack[9] = bcm43xx_radio_read16(bcm, 0x007A);
+                regstack[10] = bcm43xx_read16(bcm, 0x03EC);
+                regstack[11] = bcm43xx_radio_read16(bcm, 0x0052) & 0x00F0;
+
+                bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
+                bcm43xx_write16(bcm, 0x03EC, 0x3F3F);
+                bcm43xx_phy_write(bcm, 0x0035, regstack[4] & 0xFF7F);
+                bcm43xx_radio_write16(bcm, 0x007A, regstack[9] & 0xFFF0);
+        }
+        bcm43xx_phy_write(bcm, 0x0015, 0xB000);
+        bcm43xx_phy_write(bcm, 0x002B, 0x0004);
+
+        if (radio->version == 0x2053) {
+                bcm43xx_phy_write(bcm, 0x002B, 0x0203);
+                bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
+        }
+
+        phy->minlowsig[0] = 0xFFFF;
+
+        for (i = 0; i < 4; i++) {
+                bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | i);
+                bcm43xx_phy_lo_b_r15_loop(bcm);
+        }
+        for (i = 0; i < 10; i++) {
+                bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | i);
+                mls = bcm43xx_phy_lo_b_r15_loop(bcm) / 10;
+                if (mls < phy->minlowsig[0]) {
+                        phy->minlowsig[0] = mls;
+                        phy->minlowsigpos[0] = i;
+                }
+        }
+        bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | phy->minlowsigpos[0]);
+
+        phy->minlowsig[1] = 0xFFFF;
+
+        for (i = -4; i < 5; i += 2) {
+                for (j = -4; j < 5; j += 2) {
+                        if (j < 0)
+                                fval = (0x0100 * i) + j + 0x0100;
+                        else
+                                fval = (0x0100 * i) + j;
+                        bcm43xx_phy_write(bcm, 0x002F, fval);
+                        mls = bcm43xx_phy_lo_b_r15_loop(bcm) / 10;
+                        if (mls < phy->minlowsig[1]) {
+                                phy->minlowsig[1] = mls;
+                                phy->minlowsigpos[1] = fval;
+                        }
+                }
+        }
+        phy->minlowsigpos[1] += 0x0101;
+
+        bcm43xx_phy_write(bcm, 0x002F, phy->minlowsigpos[1]);
+        if (radio->version == 0x2053) {
+                bcm43xx_phy_write(bcm, 0x000A, regstack[2]);
+                bcm43xx_phy_write(bcm, 0x002A, regstack[3]);
+                bcm43xx_phy_write(bcm, 0x0035, regstack[4]);
+                bcm43xx_phy_write(bcm, 0x0003, regstack[5]);
+                bcm43xx_phy_write(bcm, 0x0001, regstack[6]);
+                bcm43xx_phy_write(bcm, 0x0030, regstack[7]);
+
+                bcm43xx_radio_write16(bcm, 0x0043, regstack[8]);
+                bcm43xx_radio_write16(bcm, 0x007A, regstack[9]);
+
+                bcm43xx_radio_write16(bcm, 0x0052,
+                                      (bcm43xx_radio_read16(bcm, 0x0052) & 0x000F)
+                                      | regstack[11]);
+
+                bcm43xx_write16(bcm, 0x03EC, regstack[10]);
+        }
+        bcm43xx_phy_write(bcm, 0x0015, regstack[0]);
+}
+
+static inline
+u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_private *bcm, u16 control)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+
+        if (phy->connected) {
+                bcm43xx_phy_write(bcm, 0x15, 0xE300);
+                control <<= 8;
+                bcm43xx_phy_write(bcm, 0x0812, control | 0x00B0);
+                udelay(5);
+                bcm43xx_phy_write(bcm, 0x0812, control | 0x00B2);
+                udelay(2);
+                bcm43xx_phy_write(bcm, 0x0812, control | 0x00B3);
+                udelay(4);
+                bcm43xx_phy_write(bcm, 0x0015, 0xF300);
+                udelay(8);
+        } else {
+                bcm43xx_phy_write(bcm, 0x0015, control | 0xEFA0);
+                udelay(2);
+                bcm43xx_phy_write(bcm, 0x0015, control | 0xEFE0);
+                udelay(4);
+                bcm43xx_phy_write(bcm, 0x0015, control | 0xFFE0);
+                udelay(8);
+        }
+
+        return bcm43xx_phy_read(bcm, 0x002D);
+}
+
+static u32 bcm43xx_phy_lo_g_singledeviation(struct bcm43xx_private *bcm, u16 control)
+{
+        int i;
+        u32 ret = 0;
+
+        for (i = 0; i < 8; i++)
+                ret += bcm43xx_phy_lo_g_deviation_subval(bcm, control);
+
+        return ret;
+}
+
+/* Write the LocalOscillator CONTROL */
+static inline
+void bcm43xx_lo_write(struct bcm43xx_private *bcm,
+                      struct bcm43xx_lopair *pair)
+{
+        u16 value;
+
+        value = (u8)(pair->low);
+        value |= ((u8)(pair->high)) << 8;
+
+#ifdef CONFIG_BCM43XX_DEBUG
+        /* Sanity check. */
+        if (pair->low < -8 || pair->low > 8 ||
+            pair->high < -8 || pair->high > 8) {
+                printk(KERN_WARNING PFX
+                       "WARNING: Writing invalid LOpair "
+                       "(low: %d, high: %d, index: %lu)\n",
+                       pair->low, pair->high,
+                       (unsigned long)(pair - bcm43xx_current_phy(bcm)->_lo_pairs));
+                dump_stack();
+        }
+#endif
+
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, value);
+}
+
+static inline
+struct bcm43xx_lopair * bcm43xx_find_lopair(struct bcm43xx_private *bcm,
+                                            u16 baseband_attenuation,
+                                            u16 radio_attenuation,
+                                            u16 tx)
+{
+        static const u8 dict[10] = { 11, 10, 11, 12, 13, 12, 13, 12, 13, 12 };
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+
+        if (baseband_attenuation > 6)
+                baseband_attenuation = 6;
+        assert(radio_attenuation < 10);
+
+        if (tx == 3) {
+                return bcm43xx_get_lopair(phy,
+                                          radio_attenuation,
+                                          baseband_attenuation);
+        }
+        return bcm43xx_get_lopair(phy, dict[radio_attenuation], baseband_attenuation);
+}
+
+static inline
+struct bcm43xx_lopair * bcm43xx_current_lopair(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+
+        return bcm43xx_find_lopair(bcm,
+                                   radio->baseband_atten,
+                                   radio->radio_atten,
+                                   radio->txctl1);
+}
+
+/* Adjust B/G LO */
+void bcm43xx_phy_lo_adjust(struct bcm43xx_private *bcm, int fixed)
+{
+        struct bcm43xx_lopair *pair;
+
+        if (fixed) {
+                /* Use fixed values. Only for initialization. */
+                pair = bcm43xx_find_lopair(bcm, 2, 3, 0);
+        } else
+                pair = bcm43xx_current_lopair(bcm);
+        bcm43xx_lo_write(bcm, pair);
+}
+
+static void bcm43xx_phy_lo_g_measure_txctl2(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 txctl2 = 0, i;
+        u32 smallest, tmp;
+
+        bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
+        udelay(10);
+        smallest = bcm43xx_phy_lo_g_singledeviation(bcm, 0);
+        for (i = 0; i < 16; i++) {
+                bcm43xx_radio_write16(bcm, 0x0052, i);
+                udelay(10);
+                tmp = bcm43xx_phy_lo_g_singledeviation(bcm, 0);
+                if (tmp < smallest) {
+                        smallest = tmp;
+                        txctl2 = i;
+                }
+        }
+        radio->txctl2 = txctl2;
+}
+
+static
+void bcm43xx_phy_lo_g_state(struct bcm43xx_private *bcm,
+                            const struct bcm43xx_lopair *in_pair,
+                            struct bcm43xx_lopair *out_pair,
+                            u16 r27)
+{
+        static const struct bcm43xx_lopair transitions[8] = {
+                { .high =  1,  .low =  1, },
+                { .high =  1,  .low =  0, },
+                { .high =  1,  .low = -1, },
+                { .high =  0,  .low = -1, },
+                { .high = -1,  .low = -1, },
+                { .high = -1,  .low =  0, },
+                { .high = -1,  .low =  1, },
+                { .high =  0,  .low =  1, },
+        };
+        struct bcm43xx_lopair lowest_transition = {
+                .high = in_pair->high,
+                .low = in_pair->low,
+        };
+        struct bcm43xx_lopair tmp_pair;
+        struct bcm43xx_lopair transition;
+        int i = 12;
+        int state = 0;
+        int found_lower;
+        int j, begin, end;
+        u32 lowest_deviation;
+        u32 tmp;
+
+        /* Note that in_pair and out_pair can point to the same pair. Be careful. */
+
+        bcm43xx_lo_write(bcm, &lowest_transition);
+        lowest_deviation = bcm43xx_phy_lo_g_singledeviation(bcm, r27);
+        do {
+                found_lower = 0;
+                assert(state >= 0 && state <= 8);
+                if (state == 0) {
+                        begin = 1;
+                        end = 8;
+                } else if (state % 2 == 0) {
+                        begin = state - 1;
+                        end = state + 1;
+                } else {
+                        begin = state - 2;
+                        end = state + 2;
+                }
+                if (begin < 1)
+                        begin += 8;
+                if (end > 8)
+                        end -= 8;
+
+                j = begin;
+                tmp_pair.high = lowest_transition.high;
+                tmp_pair.low = lowest_transition.low;
+                while (1) {
+                        assert(j >= 1 && j <= 8);
+                        transition.high = tmp_pair.high + transitions[j - 1].high;
+                        transition.low = tmp_pair.low + transitions[j - 1].low;
+                        if ((abs(transition.low) < 9) && (abs(transition.high) < 9)) {
+                                bcm43xx_lo_write(bcm, &transition);
+                                tmp = bcm43xx_phy_lo_g_singledeviation(bcm, r27);
+                                if (tmp < lowest_deviation) {
+                                        lowest_deviation = tmp;
+                                        state = j;
+                                        found_lower = 1;
+
+                                        lowest_transition.high = transition.high;
+                                        lowest_transition.low = transition.low;
+                                }
+                        }
+                        if (j == end)
+                                break;
+                        if (j == 8)
+                                j = 1;
+                        else
+                                j++;
+                }
+        } while (i-- && found_lower);
+
+        out_pair->high = lowest_transition.high;
+        out_pair->low = lowest_transition.low;
+}
+
+/* Set the baseband attenuation value on chip. */
+void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,
+                                          u16 baseband_attenuation)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 value;
+
+        if (phy->version == 0) {
+                value = (bcm43xx_read16(bcm, 0x03E6) & 0xFFF0);
+                value |= (baseband_attenuation & 0x000F);
+                bcm43xx_write16(bcm, 0x03E6, value);
+                return;
+        }
+
+        if (phy->version > 1) {
+                value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C;
+                value |= (baseband_attenuation << 2) & 0x003C;
+        } else {
+                value = bcm43xx_phy_read(bcm, 0x0060) & ~0x0078;
+                value |= (baseband_attenuation << 3) & 0x0078;
+        }
+        bcm43xx_phy_write(bcm, 0x0060, value);
+}
+
+/* http://bcm-specs.sipsolutions.net/LocalOscillator/Measure */
+void bcm43xx_phy_lo_g_measure(struct bcm43xx_private *bcm)
+{
+        static const u8 pairorder[10] = { 3, 1, 5, 7, 9, 2, 0, 4, 6, 8 };
+        const int is_initializing = bcm43xx_is_initializing(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 h, i, oldi = 0, j;
+        struct bcm43xx_lopair control;
+        struct bcm43xx_lopair *tmp_control;
+        u16 tmp;
+        u16 regstack[16] = { 0 };
+        u8 oldchannel;
+
+        //XXX: What are these?
+        u8 r27 = 0, r31;
+
+        oldchannel = radio->channel;
+        /* Setup */
+        if (phy->connected) {
+                regstack[0] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS);
+                regstack[1] = bcm43xx_phy_read(bcm, 0x0802);
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
+                bcm43xx_phy_write(bcm, 0x0802, regstack[1] & 0xFFFC);
+        }
+        regstack[3] = bcm43xx_read16(bcm, 0x03E2);
+        bcm43xx_write16(bcm, 0x03E2, regstack[3] | 0x8000);
+        regstack[4] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
+        regstack[5] = bcm43xx_phy_read(bcm, 0x15);
+        regstack[6] = bcm43xx_phy_read(bcm, 0x2A);
+        regstack[7] = bcm43xx_phy_read(bcm, 0x35);
+        regstack[8] = bcm43xx_phy_read(bcm, 0x60);
+        regstack[9] = bcm43xx_radio_read16(bcm, 0x43);
+        regstack[10] = bcm43xx_radio_read16(bcm, 0x7A);
+        regstack[11] = bcm43xx_radio_read16(bcm, 0x52);
+        if (phy->connected) {
+                regstack[12] = bcm43xx_phy_read(bcm, 0x0811);
+                regstack[13] = bcm43xx_phy_read(bcm, 0x0812);
+                regstack[14] = bcm43xx_phy_read(bcm, 0x0814);
+                regstack[15] = bcm43xx_phy_read(bcm, 0x0815);
+        }
+        bcm43xx_radio_selectchannel(bcm, 6, 0);
+        if (phy->connected) {
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
+                bcm43xx_phy_write(bcm, 0x0802, regstack[1] & 0xFFFC);
+                bcm43xx_dummy_transmission(bcm);
+        }
+        bcm43xx_radio_write16(bcm, 0x0043, 0x0006);
+
+        bcm43xx_phy_set_baseband_attenuation(bcm, 2);
+
+        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x0000);
+        bcm43xx_phy_write(bcm, 0x002E, 0x007F);
+        bcm43xx_phy_write(bcm, 0x080F, 0x0078);
+        bcm43xx_phy_write(bcm, 0x0035, regstack[7] & ~(1 << 7));
+        bcm43xx_radio_write16(bcm, 0x007A, regstack[10] & 0xFFF0);
+        bcm43xx_phy_write(bcm, 0x002B, 0x0203);
+        bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
+        if (phy->connected) {
+                bcm43xx_phy_write(bcm, 0x0814, regstack[14] | 0x0003);
+                bcm43xx_phy_write(bcm, 0x0815, regstack[15] & 0xFFFC);
+                bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
+                bcm43xx_phy_write(bcm, 0x0812, 0x00B2);
+        }
+        if (is_initializing)
+                bcm43xx_phy_lo_g_measure_txctl2(bcm);
+        bcm43xx_phy_write(bcm, 0x080F, 0x8078);
+
+        /* Measure */
+        control.low = 0;
+        control.high = 0;
+        for (h = 0; h < 10; h++) {
+                /* Loop over each possible RadioAttenuation (0-9) */
+                i = pairorder[h];
+                if (is_initializing) {
+                        if (i == 3) {
+                                control.low = 0;
+                                control.high = 0;
+                        } else if (((i % 2 == 1) && (oldi % 2 == 1)) ||
+                                  ((i % 2 == 0) && (oldi % 2 == 0))) {
+                                tmp_control = bcm43xx_get_lopair(phy, oldi, 0);
+                                memcpy(&control, tmp_control, sizeof(control));
+                        } else {
+                                tmp_control = bcm43xx_get_lopair(phy, 3, 0);
+                                memcpy(&control, tmp_control, sizeof(control));
+                        }
+                }
+                /* Loop over each possible BasebandAttenuation/2 */
+                for (j = 0; j < 4; j++) {
+                        if (is_initializing) {
+                                tmp = i * 2 + j;
+                                r27 = 0;
+                                r31 = 0;
+                                if (tmp > 14) {
+                                        r31 = 1;
+                                        if (tmp > 17)
+                                                r27 = 1;
+                                        if (tmp > 19)
+                                                r27 = 2;
+                                }
+                        } else {
+                                tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
+                                if (!tmp_control->used)
+                                        continue;
+                                memcpy(&control, tmp_control, sizeof(control));
+                                r27 = 3;
+                                r31 = 0;
+                        }
+                        bcm43xx_radio_write16(bcm, 0x43, i);
+                        bcm43xx_radio_write16(bcm, 0x52, radio->txctl2);
+                        udelay(10);
+
+                        bcm43xx_phy_set_baseband_attenuation(bcm, j * 2);
+
+                        tmp = (regstack[10] & 0xFFF0);
+                        if (r31)
+                                tmp |= 0x0008;
+                        bcm43xx_radio_write16(bcm, 0x007A, tmp);
+
+                        tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
+                        bcm43xx_phy_lo_g_state(bcm, &control, tmp_control, r27);
+                }
+                oldi = i;
+        }
+        /* Loop over each possible RadioAttenuation (10-13) */
+        for (i = 10; i < 14; i++) {
+                /* Loop over each possible BasebandAttenuation/2 */
+                for (j = 0; j < 4; j++) {
+                        if (is_initializing) {
+                                tmp_control = bcm43xx_get_lopair(phy, i - 9, j * 2);
+                                memcpy(&control, tmp_control, sizeof(control));
+                                tmp = (i - 9) * 2 + j - 5;//FIXME: This is wrong, as the following if statement can never trigger.
+                                r27 = 0;
+                                r31 = 0;
+                                if (tmp > 14) {
+                                        r31 = 1;
+                                        if (tmp > 17)
+                                                r27 = 1;
+                                        if (tmp > 19)
+                                                r27 = 2;
+                                }
+                        } else {
+                                tmp_control = bcm43xx_get_lopair(phy, i - 9, j * 2);
+                                if (!tmp_control->used)
+                                        continue;
+                                memcpy(&control, tmp_control, sizeof(control));
+                                r27 = 3;
+                                r31 = 0;
+                        }
+                        bcm43xx_radio_write16(bcm, 0x43, i - 9);
+                        bcm43xx_radio_write16(bcm, 0x52,
+                                              radio->txctl2
+                                              | (3/*txctl1*/ << 4));//FIXME: shouldn't txctl1 be zero here and 3 in the loop above?
+                        udelay(10);
+
+                        bcm43xx_phy_set_baseband_attenuation(bcm, j * 2);
+
+                        tmp = (regstack[10] & 0xFFF0);
+                        if (r31)
+                                tmp |= 0x0008;
+                        bcm43xx_radio_write16(bcm, 0x7A, tmp);
+
+                        tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
+                        bcm43xx_phy_lo_g_state(bcm, &control, tmp_control, r27);
+                }
+        }
+
+        /* Restoration */
+        if (phy->connected) {
+                bcm43xx_phy_write(bcm, 0x0015, 0xE300);
+                bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA0);
+                udelay(5);
+                bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA2);
+                udelay(2);
+                bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA3);
+        } else
+                bcm43xx_phy_write(bcm, 0x0015, r27 | 0xEFA0);
+        bcm43xx_phy_lo_adjust(bcm, is_initializing);
+        bcm43xx_phy_write(bcm, 0x002E, 0x807F);
+        if (phy->connected)
+                bcm43xx_phy_write(bcm, 0x002F, 0x0202);
+        else
+                bcm43xx_phy_write(bcm, 0x002F, 0x0101);
+        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, regstack[4]);
+        bcm43xx_phy_write(bcm, 0x0015, regstack[5]);
+        bcm43xx_phy_write(bcm, 0x002A, regstack[6]);
+        bcm43xx_phy_write(bcm, 0x0035, regstack[7]);
+        bcm43xx_phy_write(bcm, 0x0060, regstack[8]);
+        bcm43xx_radio_write16(bcm, 0x0043, regstack[9]);
+        bcm43xx_radio_write16(bcm, 0x007A, regstack[10]);
+        regstack[11] &= 0x00F0;
+        regstack[11] |= (bcm43xx_radio_read16(bcm, 0x52) & 0x000F);
+        bcm43xx_radio_write16(bcm, 0x52, regstack[11]);
+        bcm43xx_write16(bcm, 0x03E2, regstack[3]);
+        if (phy->connected) {
+                bcm43xx_phy_write(bcm, 0x0811, regstack[12]);
+                bcm43xx_phy_write(bcm, 0x0812, regstack[13]);
+                bcm43xx_phy_write(bcm, 0x0814, regstack[14]);
+                bcm43xx_phy_write(bcm, 0x0815, regstack[15]);
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0]);
+                bcm43xx_phy_write(bcm, 0x0802, regstack[1]);
+        }
+        bcm43xx_radio_selectchannel(bcm, oldchannel, 1);
+
+#ifdef CONFIG_BCM43XX_DEBUG
+        {
+                /* Sanity check for all lopairs. */
+                for (i = 0; i < BCM43xx_LO_COUNT; i++) {
+                        tmp_control = phy->_lo_pairs + i;
+                        if (tmp_control->low < -8 || tmp_control->low > 8 ||
+                            tmp_control->high < -8 || tmp_control->high > 8) {
+                                printk(KERN_WARNING PFX
+                                       "WARNING: Invalid LOpair (low: %d, high: %d, index: %d)\n",
+                                       tmp_control->low, tmp_control->high, i);
+                        }
+                }
+        }
+#endif /* CONFIG_BCM43XX_DEBUG */
+}
+
+static
+void bcm43xx_phy_lo_mark_current_used(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_lopair *pair;
+
+        pair = bcm43xx_current_lopair(bcm);
+        pair->used = 1;
+}
+
+void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_lopair *pair;
+        int i;
+
+        for (i = 0; i < BCM43xx_LO_COUNT; i++) {
+                pair = phy->_lo_pairs + i;
+                pair->used = 0;
+        }
+}
+
+/* http://bcm-specs.sipsolutions.net/EstimatePowerOut
+ * This function converts a TSSI value to dBm in Q5.2
+ */
+static s8 bcm43xx_phy_estimate_power_out(struct bcm43xx_private *bcm, s8 tssi)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        s8 dbm = 0;
+        s32 tmp;
+
+        tmp = phy->idle_tssi;
+        tmp += tssi;
+        tmp -= phy->savedpctlreg;
+
+        switch (phy->type) {
+                case BCM43xx_PHYTYPE_A:
+                        tmp += 0x80;
+                        tmp = limit_value(tmp, 0x00, 0xFF);
+                        dbm = phy->tssi2dbm[tmp];
+                        TODO(); //TODO: There's a FIXME on the specs
+                        break;
+                case BCM43xx_PHYTYPE_B:
+                case BCM43xx_PHYTYPE_G:
+                        tmp = limit_value(tmp, 0x00, 0x3F);
+                        dbm = phy->tssi2dbm[tmp];
+                        break;
+                default:
+                        assert(0);
+        }
+
+        return dbm;
+}
+
+/* http://bcm-specs.sipsolutions.net/RecalculateTransmissionPower */
+void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        
+        if (phy->savedpctlreg == 0xFFFF)
+                return;
+        if ((bcm->board_type == 0x0416) &&
+            (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM))
+                return;
+        
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A: {
+
+                TODO(); //TODO: Nothing for A PHYs yet :-/
+
+                break;
+        }
+        case BCM43xx_PHYTYPE_B:
+        case BCM43xx_PHYTYPE_G: {
+                u16 tmp;
+                u16 txpower;
+                s8 v0, v1, v2, v3;
+                s8 average;
+                u8 max_pwr;
+                s16 desired_pwr, estimated_pwr, pwr_adjust;
+                s16 radio_att_delta, baseband_att_delta;
+                s16 radio_attenuation, baseband_attenuation;
+                unsigned long phylock_flags;
+
+                tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0058);
+                v0 = (s8)(tmp & 0x00FF);
+                v1 = (s8)((tmp & 0xFF00) >> 8);
+                tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x005A);
+                v2 = (s8)(tmp & 0x00FF);
+                v3 = (s8)((tmp & 0xFF00) >> 8);
+                tmp = 0;
+
+                if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F) {
+                        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0070);
+                        v0 = (s8)(tmp & 0x00FF);
+                        v1 = (s8)((tmp & 0xFF00) >> 8);
+                        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0072);
+                        v2 = (s8)(tmp & 0x00FF);
+                        v3 = (s8)((tmp & 0xFF00) >> 8);
+                        if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F)
+                                return;
+                        v0 = (v0 + 0x20) & 0x3F;
+                        v1 = (v1 + 0x20) & 0x3F;
+                        v2 = (v2 + 0x20) & 0x3F;
+                        v3 = (v3 + 0x20) & 0x3F;
+                        tmp = 1;
+                }
+                bcm43xx_radio_clear_tssi(bcm);
+
+                average = (v0 + v1 + v2 + v3 + 2) / 4;
+
+                if (tmp && (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x005E) & 0x8))
+                        average -= 13;
+
+                estimated_pwr = bcm43xx_phy_estimate_power_out(bcm, average);
+
+                max_pwr = bcm->sprom.maxpower_bgphy;
+
+                if ((bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) &&
+                    (phy->type == BCM43xx_PHYTYPE_G))
+                        max_pwr -= 0x3;
+
+                /*TODO:
+                max_pwr = min(REG - bcm->sprom.antennagain_bgphy - 0x6, max_pwr)
+                        where REG is the max power as per the regulatory domain
+                */
+
+                desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr);
+                /* Check if we need to adjust the current power. */
+                pwr_adjust = desired_pwr - estimated_pwr;
+                radio_att_delta = -(pwr_adjust + 7) >> 3;
+                baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta);
+                if ((radio_att_delta == 0) && (baseband_att_delta == 0)) {
+                        bcm43xx_phy_lo_mark_current_used(bcm);
+                        return;
+                }
+
+                /* Calculate the new attenuation values. */
+                baseband_attenuation = radio->baseband_atten;
+                baseband_attenuation += baseband_att_delta;
+                radio_attenuation = radio->radio_atten;
+                radio_attenuation += radio_att_delta;
+
+                /* Get baseband and radio attenuation values into their permitted ranges.
+                 * baseband 0-11, radio 0-9.
+                 * Radio attenuation affects power level 4 times as much as baseband.
+                 */
+                if (radio_attenuation < 0) {
+                        baseband_attenuation -= (4 * -radio_attenuation);
+                        radio_attenuation = 0;
+                } else if (radio_attenuation > 9) {
+                        baseband_attenuation += (4 * (radio_attenuation - 9));
+                        radio_attenuation = 9;
+                } else {
+                        while (baseband_attenuation < 0 && radio_attenuation > 0) {
+                                baseband_attenuation += 4;
+                                radio_attenuation--;
+                        }
+                        while (baseband_attenuation > 11 && radio_attenuation < 9) {
+                                baseband_attenuation -= 4;
+                                radio_attenuation++;
+                        }
+                }
+                baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
+
+                txpower = radio->txctl1;
+                if ((radio->version == 0x2050) && (radio->revision == 2)) {
+                        if (radio_attenuation <= 1) {
+                                if (txpower == 0) {
+                                        txpower = 3;
+                                        radio_attenuation += 2;
+                                        baseband_attenuation += 2;
+                                } else if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) {
+                                        baseband_attenuation += 4 * (radio_attenuation - 2);
+                                        radio_attenuation = 2;
+                                }
+                        } else if (radio_attenuation > 4 && txpower != 0) {
+                                txpower = 0;
+                                if (baseband_attenuation < 3) {
+                                        radio_attenuation -= 3;
+                                        baseband_attenuation += 2;
+                                } else {
+                                        radio_attenuation -= 2;
+                                        baseband_attenuation -= 2;
+                                }
+                        }
+                }
+                radio->txctl1 = txpower;
+                baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
+                radio_attenuation = limit_value(radio_attenuation, 0, 9);
+
+                bcm43xx_phy_lock(bcm, phylock_flags);
+                bcm43xx_radio_lock(bcm);
+                bcm43xx_radio_set_txpower_bg(bcm, baseband_attenuation,
+                                             radio_attenuation, txpower);
+                bcm43xx_phy_lo_mark_current_used(bcm);
+                bcm43xx_radio_unlock(bcm);
+                bcm43xx_phy_unlock(bcm, phylock_flags);
+                break;
+        }
+        default:
+                assert(0);
+        }
+}
+
+static inline
+s32 bcm43xx_tssi2dbm_ad(s32 num, s32 den)
+{
+        if (num < 0)
+                return num/den;
+        else
+                return (num+den/2)/den;
+}
+
+static inline
+s8 bcm43xx_tssi2dbm_entry(s8 entry [], u8 index, s16 pab0, s16 pab1, s16 pab2)
+{
+        s32 m1, m2, f = 256, q, delta;
+        s8 i = 0;
+        
+        m1 = bcm43xx_tssi2dbm_ad(16 * pab0 + index * pab1, 32);
+        m2 = max(bcm43xx_tssi2dbm_ad(32768 + index * pab2, 256), 1);
+        do {
+                if (i > 15)
+                        return -EINVAL;
+                q = bcm43xx_tssi2dbm_ad(f * 4096 -
+                                        bcm43xx_tssi2dbm_ad(m2 * f, 16) * f, 2048);
+                delta = abs(q - f);
+                f = q;
+                i++;
+        } while (delta >= 2);
+        entry[index] = limit_value(bcm43xx_tssi2dbm_ad(m1 * f, 8192), -127, 128);
+        return 0;
+}
+
+/* http://bcm-specs.sipsolutions.net/TSSI_to_DBM_Table */
+int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        s16 pab0, pab1, pab2;
+        u8 idx;
+        s8 *dyn_tssi2dbm;
+        
+        if (phy->type == BCM43xx_PHYTYPE_A) {
+                pab0 = (s16)(bcm->sprom.pa1b0);
+                pab1 = (s16)(bcm->sprom.pa1b1);
+                pab2 = (s16)(bcm->sprom.pa1b2);
+        } else {
+                pab0 = (s16)(bcm->sprom.pa0b0);
+                pab1 = (s16)(bcm->sprom.pa0b1);
+                pab2 = (s16)(bcm->sprom.pa0b2);
+        }
+
+        if ((bcm->chip_id == 0x4301) && (radio->version != 0x2050)) {
+                phy->idle_tssi = 0x34;
+                phy->tssi2dbm = bcm43xx_tssi2dbm_b_table;
+                return 0;
+        }
+
+        if (pab0 != 0 && pab1 != 0 && pab2 != 0 &&
+            pab0 != -1 && pab1 != -1 && pab2 != -1) {
+                /* The pabX values are set in SPROM. Use them. */
+                if (phy->type == BCM43xx_PHYTYPE_A) {
+                        if ((s8)bcm->sprom.idle_tssi_tgt_aphy != 0 &&
+                            (s8)bcm->sprom.idle_tssi_tgt_aphy != -1)
+                                phy->idle_tssi = (s8)(bcm->sprom.idle_tssi_tgt_aphy);
+                        else
+                                phy->idle_tssi = 62;
+                } else {
+                        if ((s8)bcm->sprom.idle_tssi_tgt_bgphy != 0 &&
+                            (s8)bcm->sprom.idle_tssi_tgt_bgphy != -1)
+                                phy->idle_tssi = (s8)(bcm->sprom.idle_tssi_tgt_bgphy);
+                        else
+                                phy->idle_tssi = 62;
+                }
+                dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
+                if (dyn_tssi2dbm == NULL) {
+                        printk(KERN_ERR PFX "Could not allocate memory"
+                                            "for tssi2dbm table\n");
+                        return -ENOMEM;
+                }
+                for (idx = 0; idx < 64; idx++)
+                        if (bcm43xx_tssi2dbm_entry(dyn_tssi2dbm, idx, pab0, pab1, pab2)) {
+                                phy->tssi2dbm = NULL;
+                                printk(KERN_ERR PFX "Could not generate "
+                                                    "tssi2dBm table\n");
+                                return -ENODEV;
+                        }
+                phy->tssi2dbm = dyn_tssi2dbm;
+                phy->dyn_tssi_tbl = 1;
+        } else {
+                /* pabX values not set in SPROM. */
+                switch (phy->type) {
+                case BCM43xx_PHYTYPE_A:
+                        /* APHY needs a generated table. */
+                        phy->tssi2dbm = NULL;
+                        printk(KERN_ERR PFX "Could not generate tssi2dBm "
+                                            "table (wrong SPROM info)!\n");
+                        return -ENODEV;
+                case BCM43xx_PHYTYPE_B:
+                        phy->idle_tssi = 0x34;
+                        phy->tssi2dbm = bcm43xx_tssi2dbm_b_table;
+                        break;
+                case BCM43xx_PHYTYPE_G:
+                        phy->idle_tssi = 0x34;
+                        phy->tssi2dbm = bcm43xx_tssi2dbm_g_table;
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+int bcm43xx_phy_init(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        int err = -ENODEV;
+        unsigned long flags;
+
+        /* We do not want to be preempted while calibrating
+         * the hardware.
+         */
+        local_irq_save(flags);
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A:
+                if (phy->rev == 2 || phy->rev == 3) {
+                        bcm43xx_phy_inita(bcm);
+                        err = 0;
+                }
+                break;
+        case BCM43xx_PHYTYPE_B:
+                switch (phy->rev) {
+                case 2:
+                        bcm43xx_phy_initb2(bcm);
+                        err = 0;
+                        break;
+                case 4:
+                        bcm43xx_phy_initb4(bcm);
+                        err = 0;
+                        break;
+                case 5:
+                        bcm43xx_phy_initb5(bcm);
+                        err = 0;
+                        break;
+                case 6:
+                        bcm43xx_phy_initb6(bcm);
+                        err = 0;
+                        break;
+                }
+                break;
+        case BCM43xx_PHYTYPE_G:
+                bcm43xx_phy_initg(bcm);
+                err = 0;
+                break;
+        }
+        local_irq_restore(flags);
+        if (err)
+                printk(KERN_WARNING PFX "Unknown PHYTYPE found!\n");
+
+        return err;
+}
+
+void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 antennadiv;
+        u16 offset;
+        u16 value;
+        u32 ucodeflags;
+
+        antennadiv = phy->antenna_diversity;
+
+        if (antennadiv == 0xFFFF)
+                antennadiv = 3;
+        assert(antennadiv <= 3);
+
+        ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+                                        BCM43xx_UCODEFLAGS_OFFSET);
+        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+                            BCM43xx_UCODEFLAGS_OFFSET,
+                            ucodeflags & ~BCM43xx_UCODEFLAG_AUTODIV);
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A:
+        case BCM43xx_PHYTYPE_G:
+                if (phy->type == BCM43xx_PHYTYPE_A)
+                        offset = 0x0000;
+                else
+                        offset = 0x0400;
+
+                if (antennadiv == 2)
+                        value = (3/*automatic*/ << 7);
+                else
+                        value = (antennadiv << 7);
+                bcm43xx_phy_write(bcm, offset + 1,
+                                  (bcm43xx_phy_read(bcm, offset + 1)
+                                   & 0x7E7F) | value);
+
+                if (antennadiv >= 2) {
+                        if (antennadiv == 2)
+                                value = (antennadiv << 7);
+                        else
+                                value = (0/*force0*/ << 7);
+                        bcm43xx_phy_write(bcm, offset + 0x2B,
+                                          (bcm43xx_phy_read(bcm, offset + 0x2B)
+                                           & 0xFEFF) | value);
+                }
+
+                if (phy->type == BCM43xx_PHYTYPE_G) {
+                        if (antennadiv >= 2)
+                                bcm43xx_phy_write(bcm, 0x048C,
+                                                  bcm43xx_phy_read(bcm, 0x048C)
+                                                   | 0x2000);
+                        else
+                                bcm43xx_phy_write(bcm, 0x048C,
+                                                  bcm43xx_phy_read(bcm, 0x048C)
+                                                   & ~0x2000);
+                        if (phy->rev >= 2) {
+                                bcm43xx_phy_write(bcm, 0x0461,
+                                                  bcm43xx_phy_read(bcm, 0x0461)
+                                                   | 0x0010);
+                                bcm43xx_phy_write(bcm, 0x04AD,
+                                                  (bcm43xx_phy_read(bcm, 0x04AD)
+                                                   & 0x00FF) | 0x0015);
+                                if (phy->rev == 2)
+                                        bcm43xx_phy_write(bcm, 0x0427, 0x0008);
+                                else
+                                        bcm43xx_phy_write(bcm, 0x0427,
+                                                (bcm43xx_phy_read(bcm, 0x0427)
+                                                 & 0x00FF) | 0x0008);
+                        }
+                        else if (phy->rev >= 6)
+                                bcm43xx_phy_write(bcm, 0x049B, 0x00DC);
+                } else {
+                        if (phy->rev < 3)
+                                bcm43xx_phy_write(bcm, 0x002B,
+                                                  (bcm43xx_phy_read(bcm, 0x002B)
+                                                   & 0x00FF) | 0x0024);
+                        else {
+                                bcm43xx_phy_write(bcm, 0x0061,
+                                                  bcm43xx_phy_read(bcm, 0x0061)
+                                                   | 0x0010);
+                                if (phy->rev == 3) {
+                                        bcm43xx_phy_write(bcm, 0x0093, 0x001D);
+                                        bcm43xx_phy_write(bcm, 0x0027, 0x0008);
+                                } else {
+                                        bcm43xx_phy_write(bcm, 0x0093, 0x003A);
+                                        bcm43xx_phy_write(bcm, 0x0027,
+                                                (bcm43xx_phy_read(bcm, 0x0027)
+                                                 & 0x00FF) | 0x0008);
+                                }
+                        }
+                }
+                break;
+        case BCM43xx_PHYTYPE_B:
+                if (bcm->current_core->rev == 2)
+                        value = (3/*automatic*/ << 7);
+                else
+                        value = (antennadiv << 7);
+                bcm43xx_phy_write(bcm, 0x03E2,
+                                  (bcm43xx_phy_read(bcm, 0x03E2)
+                                   & 0xFE7F) | value);
+                break;
+        default:
+                assert(0);
+        }
+
+        if (antennadiv >= 2) {
+                ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+                                                BCM43xx_UCODEFLAGS_OFFSET);
+                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+                                    BCM43xx_UCODEFLAGS_OFFSET,
+                                    ucodeflags | BCM43xx_UCODEFLAG_AUTODIV);
+        }
+
+        phy->antenna_diversity = antennadiv;
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.h b/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
new file mode 100644
index 000000000000..1f321ef42be8
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
@@ -0,0 +1,74 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef BCM43xx_PHY_H_
+#define BCM43xx_PHY_H_
+
+#include <linux/types.h>
+
+struct bcm43xx_private;
+
+void bcm43xx_raw_phy_lock(struct bcm43xx_private *bcm);
+#define bcm43xx_phy_lock(bcm, flags) \
+        do {                                    \
+                local_irq_save(flags);          \
+                bcm43xx_raw_phy_lock(bcm);      \
+        } while (0)
+void bcm43xx_raw_phy_unlock(struct bcm43xx_private *bcm);
+#define bcm43xx_phy_unlock(bcm, flags) \
+        do {                                    \
+                bcm43xx_raw_phy_unlock(bcm);    \
+                local_irq_restore(flags);       \
+        } while (0)
+
+u16 bcm43xx_phy_read(struct bcm43xx_private *bcm, u16 offset);
+void bcm43xx_phy_write(struct bcm43xx_private *bcm, u16 offset, u16 val);
+
+int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm);
+int bcm43xx_phy_init(struct bcm43xx_private *bcm);
+
+void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_private *bcm);
+void bcm43xx_phy_calibrate(struct bcm43xx_private *bcm);
+int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int connect);
+
+void bcm43xx_phy_lo_b_measure(struct bcm43xx_private *bcm);
+void bcm43xx_phy_lo_g_measure(struct bcm43xx_private *bcm);
+void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm);
+
+/* Adjust the LocalOscillator to the saved values.
+ * "fixed" is only set to 1 once in initialization. Set to 0 otherwise.
+ */
+void bcm43xx_phy_lo_adjust(struct bcm43xx_private *bcm, int fixed);
+void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_private *bcm);
+
+void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,
+                                          u16 baseband_attenuation);
+
+#endif /* BCM43xx_PHY_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
new file mode 100644
index 000000000000..c59ddd40680d
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
@@ -0,0 +1,606 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  PIO Transmission
+
+  Copyright (c) 2005 Michael Buesch <mbuesch@freenet.de>
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx.h"
+#include "bcm43xx_pio.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_xmit.h"
+
+#include <linux/delay.h>
+
+
+static void tx_start(struct bcm43xx_pioqueue *queue)
+{
+        bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+                          BCM43xx_PIO_TXCTL_INIT);
+}
+
+static void tx_octet(struct bcm43xx_pioqueue *queue,
+                     u8 octet)
+{
+        if (queue->need_workarounds) {
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
+                                  octet);
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+                                  BCM43xx_PIO_TXCTL_WRITEHI);
+        } else {
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+                                  BCM43xx_PIO_TXCTL_WRITEHI);
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
+                                  octet);
+        }
+}
+
+static u16 tx_get_next_word(struct bcm43xx_txhdr *txhdr,
+                            const u8 *packet,
+                            unsigned int *pos)
+{
+        const u8 *source;
+        unsigned int i = *pos;
+        u16 ret;
+
+        if (i < sizeof(*txhdr)) {
+                source = (const u8 *)txhdr;
+        } else {
+                source = packet;
+                i -= sizeof(*txhdr);
+        }
+        ret = le16_to_cpu( *((u16 *)(source + i)) );
+        *pos += 2;
+
+        return ret;
+}
+
+static void tx_data(struct bcm43xx_pioqueue *queue,
+                    struct bcm43xx_txhdr *txhdr,
+                    const u8 *packet,
+                    unsigned int octets)
+{
+        u16 data;
+        unsigned int i = 0;
+
+        if (queue->need_workarounds) {
+                data = tx_get_next_word(txhdr, packet, &i);
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, data);
+        }
+        bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+                          BCM43xx_PIO_TXCTL_WRITELO |
+                          BCM43xx_PIO_TXCTL_WRITEHI);
+        while (i < octets - 1) {
+                data = tx_get_next_word(txhdr, packet, &i);
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, data);
+        }
+        if (octets % 2)
+                tx_octet(queue, packet[octets - sizeof(*txhdr) - 1]);
+}
+
+static void tx_complete(struct bcm43xx_pioqueue *queue,
+                        struct sk_buff *skb)
+{
+        if (queue->need_workarounds) {
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
+                                  skb->data[skb->len - 1]);
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+                                  BCM43xx_PIO_TXCTL_WRITEHI |
+                                  BCM43xx_PIO_TXCTL_COMPLETE);
+        } else {
+                bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+                                  BCM43xx_PIO_TXCTL_COMPLETE);
+        }
+}
+
+static u16 generate_cookie(struct bcm43xx_pioqueue *queue,
+                           int packetindex)
+{
+        u16 cookie = 0x0000;
+
+        /* We use the upper 4 bits for the PIO
+         * controller ID and the lower 12 bits
+         * for the packet index (in the cache).
+         */
+        switch (queue->mmio_base) {
+        case BCM43xx_MMIO_PIO1_BASE:
+                break;
+        case BCM43xx_MMIO_PIO2_BASE:
+                cookie = 0x1000;
+                break;
+        case BCM43xx_MMIO_PIO3_BASE:
+                cookie = 0x2000;
+                break;
+        case BCM43xx_MMIO_PIO4_BASE:
+                cookie = 0x3000;
+                break;
+        default:
+                assert(0);
+        }
+        assert(((u16)packetindex & 0xF000) == 0x0000);
+        cookie |= (u16)packetindex;
+
+        return cookie;
+}
+
+static
+struct bcm43xx_pioqueue * parse_cookie(struct bcm43xx_private *bcm,
+                                       u16 cookie,
+                                       struct bcm43xx_pio_txpacket **packet)
+{
+        struct bcm43xx_pio *pio = bcm43xx_current_pio(bcm);
+        struct bcm43xx_pioqueue *queue = NULL;
+        int packetindex;
+
+        switch (cookie & 0xF000) {
+        case 0x0000:
+                queue = pio->queue0;
+                break;
+        case 0x1000:
+                queue = pio->queue1;
+                break;
+        case 0x2000:
+                queue = pio->queue2;
+                break;
+        case 0x3000:
+                queue = pio->queue3;
+                break;
+        default:
+                assert(0);
+        }
+        packetindex = (cookie & 0x0FFF);
+        assert(packetindex >= 0 && packetindex < BCM43xx_PIO_MAXTXPACKETS);
+        *packet = &(queue->tx_packets_cache[packetindex]);
+
+        return queue;
+}
+
+static void pio_tx_write_fragment(struct bcm43xx_pioqueue *queue,
+                                  struct sk_buff *skb,
+                                  struct bcm43xx_pio_txpacket *packet)
+{
+        struct bcm43xx_txhdr txhdr;
+        unsigned int octets;
+
+        assert(skb_shinfo(skb)->nr_frags == 0);
+        bcm43xx_generate_txhdr(queue->bcm,
+                               &txhdr, skb->data, skb->len,
+                               (packet->xmitted_frags == 0),
+                               generate_cookie(queue, pio_txpacket_getindex(packet)));
+
+        tx_start(queue);
+        octets = skb->len + sizeof(txhdr);
+        if (queue->need_workarounds)
+                octets--;
+        tx_data(queue, &txhdr, (u8 *)skb->data, octets);
+        tx_complete(queue, skb);
+}
+
+static void free_txpacket(struct bcm43xx_pio_txpacket *packet,
+                          int irq_context)
+{
+        struct bcm43xx_pioqueue *queue = packet->queue;
+
+        ieee80211_txb_free(packet->txb);
+        list_move(&packet->list, &queue->txfree);
+        queue->nr_txfree++;
+
+        assert(queue->tx_devq_used >= packet->xmitted_octets);
+        assert(queue->tx_devq_packets >= packet->xmitted_frags);
+        queue->tx_devq_used -= packet->xmitted_octets;
+        queue->tx_devq_packets -= packet->xmitted_frags;
+}
+
+static int pio_tx_packet(struct bcm43xx_pio_txpacket *packet)
+{
+        struct bcm43xx_pioqueue *queue = packet->queue;
+        struct ieee80211_txb *txb = packet->txb;
+        struct sk_buff *skb;
+        u16 octets;
+        int i;
+
+        for (i = packet->xmitted_frags; i < txb->nr_frags; i++) {
+                skb = txb->fragments[i];
+
+                octets = (u16)skb->len + sizeof(struct bcm43xx_txhdr);
+                assert(queue->tx_devq_size >= octets);
+                assert(queue->tx_devq_packets <= BCM43xx_PIO_MAXTXDEVQPACKETS);
+                assert(queue->tx_devq_used <= queue->tx_devq_size);
+                /* Check if there is sufficient free space on the device
+                 * TX queue. If not, return and let the TX tasklet
+                 * retry later.
+                 */
+                if (queue->tx_devq_packets == BCM43xx_PIO_MAXTXDEVQPACKETS)
+                        return -EBUSY;
+                if (queue->tx_devq_used + octets > queue->tx_devq_size)
+                        return -EBUSY;
+                /* Now poke the device. */
+                pio_tx_write_fragment(queue, skb, packet);
+
+                /* Account for the packet size.
+                 * (We must not overflow the device TX queue)
+                 */
+                queue->tx_devq_packets++;
+                queue->tx_devq_used += octets;
+
+                assert(packet->xmitted_frags <= packet->txb->nr_frags);
+                packet->xmitted_frags++;
+                packet->xmitted_octets += octets;
+        }
+        list_move_tail(&packet->list, &queue->txrunning);
+
+        return 0;
+}
+
+static void tx_tasklet(unsigned long d)
+{
+        struct bcm43xx_pioqueue *queue = (struct bcm43xx_pioqueue *)d;
+        struct bcm43xx_private *bcm = queue->bcm;
+        unsigned long flags;
+        struct bcm43xx_pio_txpacket *packet, *tmp_packet;
+        int err;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list) {
+                assert(packet->xmitted_frags < packet->txb->nr_frags);
+                if (packet->xmitted_frags == 0) {
+                        int i;
+                        struct sk_buff *skb;
+
+                        /* Check if the device queue is big
+                         * enough for every fragment. If not, drop the
+                         * whole packet.
+                         */
+                        for (i = 0; i < packet->txb->nr_frags; i++) {
+                                skb = packet->txb->fragments[i];
+                                if (unlikely(skb->len > queue->tx_devq_size)) {
+                                        dprintkl(KERN_ERR PFX "PIO TX device queue too small. "
+                                                              "Dropping packet.\n");
+                                        free_txpacket(packet, 1);
+                                        goto next_packet;
+                                }
+                        }
+                }
+                /* Try to transmit the packet.
+                 * This may not completely succeed.
+                 */
+                err = pio_tx_packet(packet);
+                if (err)
+                        break;
+        next_packet:
+                continue;
+        }
+        bcm43xx_unlock_mmio(bcm, flags);
+}
+
+static void setup_txqueues(struct bcm43xx_pioqueue *queue)
+{
+        struct bcm43xx_pio_txpacket *packet;
+        int i;
+
+        queue->nr_txfree = BCM43xx_PIO_MAXTXPACKETS;
+        for (i = 0; i < BCM43xx_PIO_MAXTXPACKETS; i++) {
+                packet = &(queue->tx_packets_cache[i]);
+
+                packet->queue = queue;
+                INIT_LIST_HEAD(&packet->list);
+
+                list_add(&packet->list, &queue->txfree);
+        }
+}
+
+static
+struct bcm43xx_pioqueue * bcm43xx_setup_pioqueue(struct bcm43xx_private *bcm,
+                                                 u16 pio_mmio_base)
+{
+        struct bcm43xx_pioqueue *queue;
+        u32 value;
+        u16 qsize;
+
+        queue = kzalloc(sizeof(*queue), GFP_KERNEL);
+        if (!queue)
+                goto out;
+
+        queue->bcm = bcm;
+        queue->mmio_base = pio_mmio_base;
+        queue->need_workarounds = (bcm->current_core->rev < 3);
+
+        INIT_LIST_HEAD(&queue->txfree);
+        INIT_LIST_HEAD(&queue->txqueue);
+        INIT_LIST_HEAD(&queue->txrunning);
+        tasklet_init(&queue->txtask, tx_tasklet,
+                     (unsigned long)queue);
+
+        value = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        value |= BCM43xx_SBF_XFER_REG_BYTESWAP;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value);
+
+        qsize = bcm43xx_read16(bcm, queue->mmio_base + BCM43xx_PIO_TXQBUFSIZE);
+        if (qsize <= BCM43xx_PIO_TXQADJUST) {
+                printk(KERN_ERR PFX "PIO tx device-queue too small (%u)\n", qsize);
+                goto err_freequeue;
+        }
+        qsize -= BCM43xx_PIO_TXQADJUST;
+        queue->tx_devq_size = qsize;
+
+        setup_txqueues(queue);
+
+out:
+        return queue;
+
+err_freequeue:
+        kfree(queue);
+        queue = NULL;
+        goto out;
+}
+
+static void cancel_transfers(struct bcm43xx_pioqueue *queue)
+{
+        struct bcm43xx_pio_txpacket *packet, *tmp_packet;
+
+        netif_tx_disable(queue->bcm->net_dev);
+        assert(queue->bcm->shutting_down);
+        tasklet_disable(&queue->txtask);
+
+        list_for_each_entry_safe(packet, tmp_packet, &queue->txrunning, list)
+                free_txpacket(packet, 0);
+        list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list)
+                free_txpacket(packet, 0);
+}
+
+static void bcm43xx_destroy_pioqueue(struct bcm43xx_pioqueue *queue)
+{
+        if (!queue)
+                return;
+
+        cancel_transfers(queue);
+        kfree(queue);
+}
+
+void bcm43xx_pio_free(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_pio *pio;
+
+        if (!bcm43xx_using_pio(bcm))
+                return;
+        pio = bcm43xx_current_pio(bcm);
+
+        bcm43xx_destroy_pioqueue(pio->queue3);
+        pio->queue3 = NULL;
+        bcm43xx_destroy_pioqueue(pio->queue2);
+        pio->queue2 = NULL;
+        bcm43xx_destroy_pioqueue(pio->queue1);
+        pio->queue1 = NULL;
+        bcm43xx_destroy_pioqueue(pio->queue0);
+        pio->queue0 = NULL;
+}
+
+int bcm43xx_pio_init(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_pio *pio = bcm43xx_current_pio(bcm);
+        struct bcm43xx_pioqueue *queue;
+        int err = -ENOMEM;
+
+        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO1_BASE);
+        if (!queue)
+                goto out;
+        pio->queue0 = queue;
+
+        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO2_BASE);
+        if (!queue)
+                goto err_destroy0;
+        pio->queue1 = queue;
+
+        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO3_BASE);
+        if (!queue)
+                goto err_destroy1;
+        pio->queue2 = queue;
+
+        queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO4_BASE);
+        if (!queue)
+                goto err_destroy2;
+        pio->queue3 = queue;
+
+        if (bcm->current_core->rev < 3)
+                bcm->irq_savedstate |= BCM43xx_IRQ_PIO_WORKAROUND;
+
+        dprintk(KERN_INFO PFX "PIO initialized\n");
+        err = 0;
+out:
+        return err;
+
+err_destroy2:
+        bcm43xx_destroy_pioqueue(pio->queue2);
+        pio->queue2 = NULL;
+err_destroy1:
+        bcm43xx_destroy_pioqueue(pio->queue1);
+        pio->queue1 = NULL;
+err_destroy0:
+        bcm43xx_destroy_pioqueue(pio->queue0);
+        pio->queue0 = NULL;
+        goto out;
+}
+
+int bcm43xx_pio_tx(struct bcm43xx_private *bcm,
+                   struct ieee80211_txb *txb)
+{
+        struct bcm43xx_pioqueue *queue = bcm43xx_current_pio(bcm)->queue1;
+        struct bcm43xx_pio_txpacket *packet;
+        u16 tmp;
+
+        assert(!queue->tx_suspended);
+        assert(!list_empty(&queue->txfree));
+
+        tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL);
+        if (tmp & BCM43xx_PIO_TXCTL_SUSPEND)
+                return -EBUSY;
+
+        packet = list_entry(queue->txfree.next, struct bcm43xx_pio_txpacket, list);
+        packet->txb = txb;
+        packet->xmitted_frags = 0;
+        packet->xmitted_octets = 0;
+        list_move_tail(&packet->list, &queue->txqueue);
+        queue->nr_txfree--;
+        assert(queue->nr_txfree < BCM43xx_PIO_MAXTXPACKETS);
+
+        /* Suspend TX, if we are out of packets in the "free" queue. */
+        if (unlikely(list_empty(&queue->txfree))) {
+                netif_stop_queue(queue->bcm->net_dev);
+                queue->tx_suspended = 1;
+        }
+
+        tasklet_schedule(&queue->txtask);
+
+        return 0;
+}
+
+void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
+                                   struct bcm43xx_xmitstatus *status)
+{
+        struct bcm43xx_pioqueue *queue;
+        struct bcm43xx_pio_txpacket *packet;
+
+        queue = parse_cookie(bcm, status->cookie, &packet);
+        assert(queue);
+//TODO
+if (!queue)
+return;
+        free_txpacket(packet, 1);
+        if (unlikely(queue->tx_suspended)) {
+                queue->tx_suspended = 0;
+                netif_wake_queue(queue->bcm->net_dev);
+        }
+        /* If there are packets on the txqueue, poke the tasklet. */
+        if (!list_empty(&queue->txqueue))
+                tasklet_schedule(&queue->txtask);
+}
+
+static void pio_rx_error(struct bcm43xx_pioqueue *queue,
+                         int clear_buffers,
+                         const char *error)
+{
+        int i;
+
+        printkl("PIO RX error: %s\n", error);
+        bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL,
+                          BCM43xx_PIO_RXCTL_READY);
+        if (clear_buffers) {
+                assert(queue->mmio_base == BCM43xx_MMIO_PIO1_BASE);
+                for (i = 0; i < 15; i++) {
+                        /* Dummy read. */
+                        bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
+                }
+        }
+}
+
+void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue)
+{
+        u16 preamble[21] = { 0 };
+        struct bcm43xx_rxhdr *rxhdr;
+        u16 tmp, len, rxflags2;
+        int i, preamble_readwords;
+        struct sk_buff *skb;
+
+return;
+        tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL);
+        if (!(tmp & BCM43xx_PIO_RXCTL_DATAAVAILABLE)) {
+                dprintkl(KERN_ERR PFX "PIO RX: No data available\n");//TODO: remove this printk.
+                return;
+        }
+        bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL,
+                          BCM43xx_PIO_RXCTL_DATAAVAILABLE);
+
+        for (i = 0; i < 10; i++) {
+                tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL);
+                if (tmp & BCM43xx_PIO_RXCTL_READY)
+                        goto data_ready;
+                udelay(10);
+        }
+        dprintkl(KERN_ERR PFX "PIO RX timed out\n");
+        return;
+data_ready:
+
+//FIXME: endianess in this function.
+        len = le16_to_cpu(bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA));
+        if (unlikely(len > 0x700)) {
+                pio_rx_error(queue, 0, "len > 0x700");
+                return;
+        }
+        if (unlikely(len == 0 && queue->mmio_base != BCM43xx_MMIO_PIO4_BASE)) {
+                pio_rx_error(queue, 0, "len == 0");
+                return;
+        }
+        preamble[0] = cpu_to_le16(len);
+        if (queue->mmio_base == BCM43xx_MMIO_PIO4_BASE)
+                preamble_readwords = 14 / sizeof(u16);
+        else
+                preamble_readwords = 18 / sizeof(u16);
+        for (i = 0; i < preamble_readwords; i++) {
+                tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
+                preamble[i + 1] = cpu_to_be16(tmp);//FIXME?
+        }
+        rxhdr = (struct bcm43xx_rxhdr *)preamble;
+        rxflags2 = le16_to_cpu(rxhdr->flags2);
+        if (unlikely(rxflags2 & BCM43xx_RXHDR_FLAGS2_INVALIDFRAME)) {
+                pio_rx_error(queue,
+                             (queue->mmio_base == BCM43xx_MMIO_PIO1_BASE),
+                             "invalid frame");
+                return;
+        }
+        if (queue->mmio_base == BCM43xx_MMIO_PIO4_BASE) {
+                /* We received an xmit status. */
+                struct bcm43xx_hwxmitstatus *hw;
+                struct bcm43xx_xmitstatus stat;
+
+                hw = (struct bcm43xx_hwxmitstatus *)(preamble + 1);
+                stat.cookie = le16_to_cpu(hw->cookie);
+                stat.flags = hw->flags;
+                stat.cnt1 = hw->cnt1;
+                stat.cnt2 = hw->cnt2;
+                stat.seq = le16_to_cpu(hw->seq);
+                stat.unknown = le16_to_cpu(hw->unknown);
+
+                bcm43xx_debugfs_log_txstat(queue->bcm, &stat);
+                bcm43xx_pio_handle_xmitstatus(queue->bcm, &stat);
+
+                return;
+        }
+
+        skb = dev_alloc_skb(len);
+        if (unlikely(!skb)) {
+                pio_rx_error(queue, 1, "OOM");
+                return;
+        }
+        skb_put(skb, len);
+        for (i = 0; i < len - 1; i += 2) {
+                tmp = cpu_to_be16(bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA));
+                *((u16 *)(skb->data + i)) = tmp;
+        }
+        if (len % 2) {
+                tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
+                skb->data[len - 1] = (tmp & 0x00FF);
+                if (rxflags2 & BCM43xx_RXHDR_FLAGS2_TYPE2FRAME)
+                        skb->data[0x20] = (tmp & 0xFF00) >> 8;
+                else
+                        skb->data[0x1E] = (tmp & 0xFF00) >> 8;
+        }
+        bcm43xx_rx(queue->bcm, skb, rxhdr);
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.h b/drivers/net/wireless/bcm43xx/bcm43xx_pio.h
new file mode 100644
index 000000000000..970627bc1769
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.h
@@ -0,0 +1,138 @@
+#ifndef BCM43xx_PIO_H_
+#define BCM43xx_PIO_H_
+
+#include "bcm43xx.h"
+
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/skbuff.h>
+
+
+#define BCM43xx_PIO_TXCTL               0x00
+#define BCM43xx_PIO_TXDATA              0x02
+#define BCM43xx_PIO_TXQBUFSIZE          0x04
+#define BCM43xx_PIO_RXCTL               0x08
+#define BCM43xx_PIO_RXDATA              0x0A
+
+#define BCM43xx_PIO_TXCTL_WRITEHI       (1 << 0)
+#define BCM43xx_PIO_TXCTL_WRITELO       (1 << 1)
+#define BCM43xx_PIO_TXCTL_COMPLETE      (1 << 2)
+#define BCM43xx_PIO_TXCTL_INIT          (1 << 3)
+#define BCM43xx_PIO_TXCTL_SUSPEND       (1 << 7)
+
+#define BCM43xx_PIO_RXCTL_DATAAVAILABLE (1 << 0)
+#define BCM43xx_PIO_RXCTL_READY         (1 << 1)
+
+/* PIO constants */
+#define BCM43xx_PIO_MAXTXDEVQPACKETS    31
+#define BCM43xx_PIO_TXQADJUST           80
+
+/* PIO tuning knobs */
+#define BCM43xx_PIO_MAXTXPACKETS        256
+
+
+
+#ifdef CONFIG_BCM43XX_PIO
+
+
+struct bcm43xx_pioqueue;
+struct bcm43xx_xmitstatus;
+
+struct bcm43xx_pio_txpacket {
+        struct bcm43xx_pioqueue *queue;
+        struct ieee80211_txb *txb;
+        struct list_head list;
+
+        u8 xmitted_frags;
+        u16 xmitted_octets;
+};
+
+#define pio_txpacket_getindex(packet) ((int)((packet) - (packet)->queue->tx_packets_cache)) 
+
+struct bcm43xx_pioqueue {
+        struct bcm43xx_private *bcm;
+        u16 mmio_base;
+
+        u8 tx_suspended:1,
+           need_workarounds:1; /* Workarounds needed for core.rev < 3 */
+
+        /* Adjusted size of the device internal TX buffer. */
+        u16 tx_devq_size;
+        /* Used octets of the device internal TX buffer. */
+        u16 tx_devq_used;
+        /* Used packet slots in the device internal TX buffer. */
+        u8 tx_devq_packets;
+        /* Packets from the txfree list can
+         * be taken on incoming TX requests.
+         */
+        struct list_head txfree;
+        unsigned int nr_txfree;
+        /* Packets on the txqueue are queued,
+         * but not completely written to the chip, yet.
+         */
+        struct list_head txqueue;
+        /* Packets on the txrunning queue are completely
+         * posted to the device. We are waiting for the txstatus.
+         */
+        struct list_head txrunning;
+        /* Total number or packets sent.
+         * (This counter can obviously wrap).
+         */
+        unsigned int nr_tx_packets;
+        struct tasklet_struct txtask;
+        struct bcm43xx_pio_txpacket tx_packets_cache[BCM43xx_PIO_MAXTXPACKETS];
+};
+
+static inline
+u16 bcm43xx_pio_read(struct bcm43xx_pioqueue *queue,
+                     u16 offset)
+{
+        return bcm43xx_read16(queue->bcm, queue->mmio_base + offset);
+}
+
+static inline
+void bcm43xx_pio_write(struct bcm43xx_pioqueue *queue,
+                       u16 offset, u16 value)
+{
+        bcm43xx_write16(queue->bcm, queue->mmio_base + offset, value);
+}
+
+
+int bcm43xx_pio_init(struct bcm43xx_private *bcm);
+void bcm43xx_pio_free(struct bcm43xx_private *bcm);
+
+int bcm43xx_pio_tx(struct bcm43xx_private *bcm,
+                   struct ieee80211_txb *txb);
+void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
+                                   struct bcm43xx_xmitstatus *status);
+void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue);
+
+#else /* CONFIG_BCM43XX_PIO */
+
+static inline
+int bcm43xx_pio_init(struct bcm43xx_private *bcm)
+{
+        return 0;
+}
+static inline
+void bcm43xx_pio_free(struct bcm43xx_private *bcm)
+{
+}
+static inline
+int bcm43xx_pio_tx(struct bcm43xx_private *bcm,
+                   struct ieee80211_txb *txb)
+{
+        return 0;
+}
+static inline
+void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
+                                   struct bcm43xx_xmitstatus *status)
+{
+}
+static inline
+void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue)
+{
+}
+
+#endif /* CONFIG_BCM43XX_PIO */
+#endif /* BCM43xx_PIO_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_power.c b/drivers/net/wireless/bcm43xx/bcm43xx_power.c
new file mode 100644
index 000000000000..3c92b62807c5
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_power.c
@@ -0,0 +1,358 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include <linux/delay.h>
+
+#include "bcm43xx.h"
+#include "bcm43xx_power.h"
+#include "bcm43xx_main.h"
+
+
+/* Get max/min slowclock frequency
+ * as described in http://bcm-specs.sipsolutions.net/PowerControl
+ */
+static int bcm43xx_pctl_clockfreqlimit(struct bcm43xx_private *bcm,
+                                       int get_max)
+{
+        int limit = 0;
+        int divisor;
+        int selection;
+        int err;
+        u32 tmp;
+        struct bcm43xx_coreinfo *old_core;
+
+        if (!(bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL))
+                goto out;
+        old_core = bcm->current_core;
+        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
+        if (err)
+                goto out;
+
+        if (bcm->current_core->rev < 6) {
+                if ((bcm->bustype == BCM43xx_BUSTYPE_PCMCIA) ||
+                        (bcm->bustype == BCM43xx_BUSTYPE_SB)) {
+                        selection = 1;
+                        divisor = 32;
+                } else {
+                        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_OUT, &tmp);
+                        if (err) {
+                                printk(KERN_ERR PFX "clockfreqlimit pcicfg read failure\n");
+                                goto out_switchback;
+                        }
+                        if (tmp & 0x10) {
+                                /* PCI */
+                                selection = 2;
+                                divisor = 64;
+                        } else {
+                                /* XTAL */
+                                selection = 1;
+                                divisor = 32;
+                        }
+                }
+        } else if (bcm->current_core->rev < 10) {
+                selection = (tmp & 0x07);
+                if (selection) {
+                        tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
+                        divisor = 4 * (1 + ((tmp & 0xFFFF0000) >> 16));
+                } else
+                        divisor = 1;
+        } else {
+                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL);
+                divisor = 4 * (1 + ((tmp & 0xFFFF0000) >> 16));
+                selection = 1;
+        }
+        
+        switch (selection) {
+        case 0:
+                /* LPO */
+                if (get_max)
+                        limit = 43000;
+                else
+                        limit = 25000;
+                break;
+        case 1:
+                /* XTAL */
+                if (get_max)
+                        limit = 20200000;
+                else
+                        limit = 19800000;
+                break;
+        case 2:
+                /* PCI */
+                if (get_max)
+                        limit = 34000000;
+                else
+                        limit = 25000000;
+                break;
+        default:
+                assert(0);
+        }
+        limit /= divisor;
+
+out_switchback:
+        err = bcm43xx_switch_core(bcm, old_core);
+        assert(err == 0);
+
+out:
+        return limit;
+}
+
+/* init power control
+ * as described in http://bcm-specs.sipsolutions.net/PowerControl
+ */
+int bcm43xx_pctl_init(struct bcm43xx_private *bcm)
+{
+        int err, maxfreq;
+        struct bcm43xx_coreinfo *old_core;
+
+        if (!(bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL))
+                return 0;
+        old_core = bcm->current_core;
+        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
+        if (err == -ENODEV)
+                return 0;
+        if (err)
+                goto out;
+
+        maxfreq = bcm43xx_pctl_clockfreqlimit(bcm, 1);
+        bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY,
+                        (maxfreq * 150 + 999999) / 1000000);
+        bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_FREFSELDELAY,
+                        (maxfreq * 15 + 999999) / 1000000);
+
+        err = bcm43xx_switch_core(bcm, old_core);
+        assert(err == 0);
+
+out:
+        return err;
+}
+
+u16 bcm43xx_pctl_powerup_delay(struct bcm43xx_private *bcm)
+{
+        u16 delay = 0;
+        int err;
+        u32 pll_on_delay;
+        struct bcm43xx_coreinfo *old_core;
+        int minfreq;
+
+        if (bcm->bustype != BCM43xx_BUSTYPE_PCI)
+                goto out;
+        if (!(bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL))
+                goto out;
+        old_core = bcm->current_core;
+        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
+        if (err == -ENODEV)
+                goto out;
+
+        minfreq = bcm43xx_pctl_clockfreqlimit(bcm, 0);
+        pll_on_delay = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY);
+        delay = (((pll_on_delay + 2) * 1000000) + (minfreq - 1)) / minfreq;
+
+        err = bcm43xx_switch_core(bcm, old_core);
+        assert(err == 0);
+
+out:
+        return delay;
+}
+
+/* set the powercontrol clock
+ * as described in http://bcm-specs.sipsolutions.net/PowerControl
+ */
+int bcm43xx_pctl_set_clock(struct bcm43xx_private *bcm, u16 mode)
+{
+        int err;
+        struct bcm43xx_coreinfo *old_core;
+        u32 tmp;
+
+        old_core = bcm->current_core;
+        err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
+        if (err == -ENODEV)
+                return 0;
+        if (err)
+                goto out;
+        
+        if (bcm->core_chipcommon.rev < 6) {
+                if (mode == BCM43xx_PCTL_CLK_FAST) {
+                        err = bcm43xx_pctl_set_crystal(bcm, 1);
+                        if (err)
+                                goto out;
+                }
+        } else {
+                if ((bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL) &&
+                        (bcm->core_chipcommon.rev < 10)) {
+                        switch (mode) {
+                        case BCM43xx_PCTL_CLK_FAST:
+                                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
+                                tmp = (tmp & ~BCM43xx_PCTL_FORCE_SLOW) | BCM43xx_PCTL_FORCE_PLL;
+                                bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL, tmp);
+                                break;
+                        case BCM43xx_PCTL_CLK_SLOW:
+                                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
+                                tmp |= BCM43xx_PCTL_FORCE_SLOW;
+                                bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL, tmp);
+                                break;
+                        case BCM43xx_PCTL_CLK_DYNAMIC:
+                                tmp = bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL);
+                                tmp &= ~BCM43xx_PCTL_FORCE_SLOW;
+                                tmp |= BCM43xx_PCTL_FORCE_PLL;
+                                tmp &= ~BCM43xx_PCTL_DYN_XTAL;
+                                bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SLOWCLKCTL, tmp);
+                        }
+                }
+        }
+        
+        err = bcm43xx_switch_core(bcm, old_core);
+        assert(err == 0);
+
+out:
+        return err;
+}
+
+int bcm43xx_pctl_set_crystal(struct bcm43xx_private *bcm, int on)
+{
+        int err;
+        u32 in, out, outenable;
+
+        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_IN, &in);
+        if (err)
+                goto err_pci;
+        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_OUT, &out);
+        if (err)
+                goto err_pci;
+        err = bcm43xx_pci_read_config32(bcm, BCM43xx_PCTL_OUTENABLE, &outenable);
+        if (err)
+                goto err_pci;
+
+        outenable |= (BCM43xx_PCTL_XTAL_POWERUP | BCM43xx_PCTL_PLL_POWERDOWN);
+
+        if (on) {
+                if (in & 0x40)
+                        return 0;
+
+                out |= (BCM43xx_PCTL_XTAL_POWERUP | BCM43xx_PCTL_PLL_POWERDOWN);
+
+                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUT, out);
+                if (err)
+                        goto err_pci;
+                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUTENABLE, outenable);
+                if (err)
+                        goto err_pci;
+                udelay(1000);
+
+                out &= ~BCM43xx_PCTL_PLL_POWERDOWN;
+                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUT, out);
+                if (err)
+                        goto err_pci;
+                udelay(5000);
+        } else {
+                if (bcm->current_core->rev < 5)
+                        return 0;
+                if (bcm->sprom.boardflags & BCM43xx_BFL_XTAL_NOSLOW)
+                        return 0;
+
+/*              XXX: Why BCM43xx_MMIO_RADIO_HWENABLED_xx can't be read at this time?
+ *              err = bcm43xx_switch_core(bcm, bcm->active_80211_core);
+ *              if (err)
+ *                      return err;
+ *              if (((bcm->current_core->rev >= 3) &&
+ *                      (bcm43xx_read32(bcm, BCM43xx_MMIO_RADIO_HWENABLED_HI) & (1 << 16))) ||
+ *                    ((bcm->current_core->rev < 3) &&
+ *                      !(bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_HWENABLED_LO) & (1 << 4))))
+ *                      return 0;
+ *              err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon);
+ *              if (err)
+ *                      return err;
+ */
+                
+                err = bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_SLOW);
+                if (err)
+                        goto out;
+                out &= ~BCM43xx_PCTL_XTAL_POWERUP;
+                out |= BCM43xx_PCTL_PLL_POWERDOWN;
+                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUT, out);
+                if (err)
+                        goto err_pci;
+                err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCTL_OUTENABLE, outenable);
+                if (err)
+                        goto err_pci;
+        }
+
+out:
+        return err;
+
+err_pci:
+        printk(KERN_ERR PFX "Error: pctl_set_clock() could not access PCI config space!\n");
+        err = -EBUSY;
+        goto out;
+}
+
+/* Set the PowerSavingControlBits.
+ * Bitvalues:
+ *   0  => unset the bit
+ *   1  => set the bit
+ *   -1 => calculate the bit
+ */
+void bcm43xx_power_saving_ctl_bits(struct bcm43xx_private *bcm,
+                                   int bit25, int bit26)
+{
+        int i;
+        u32 status;
+
+//FIXME: Force 25 to off and 26 to on for now:
+bit25 = 0;
+bit26 = 1;
+
+        if (bit25 == -1) {
+                //TODO: If powersave is not off and FIXME is not set and we are not in adhoc
+                //      and thus is not an AP and we are associated, set bit 25
+        }
+        if (bit26 == -1) {
+                //TODO: If the device is awake or this is an AP, or we are scanning, or FIXME,
+                //      or we are associated, or FIXME, or the latest PS-Poll packet sent was
+                //      successful, set bit26
+        }
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        if (bit25)
+                status |= BCM43xx_SBF_PS1;
+        else
+                status &= ~BCM43xx_SBF_PS1;
+        if (bit26)
+                status |= BCM43xx_SBF_PS2;
+        else
+                status &= ~BCM43xx_SBF_PS2;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+        if (bit26 && bcm->current_core->rev >= 5) {
+                for (i = 0; i < 100; i++) {
+                        if (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED, 0x0040) != 4)
+                                break;
+                        udelay(10);
+                }
+        }
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_power.h b/drivers/net/wireless/bcm43xx/bcm43xx_power.h
new file mode 100644
index 000000000000..5f63640810bd
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_power.h
@@ -0,0 +1,47 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef BCM43xx_POWER_H_
+#define BCM43xx_POWER_H_
+
+#include <linux/types.h>
+
+
+struct bcm43xx_private;
+
+int bcm43xx_pctl_init(struct bcm43xx_private *bcm);
+int bcm43xx_pctl_set_clock(struct bcm43xx_private *bcm, u16 mode);
+int bcm43xx_pctl_set_crystal(struct bcm43xx_private *bcm, int on);
+u16 bcm43xx_pctl_powerup_delay(struct bcm43xx_private *bcm);
+
+void bcm43xx_power_saving_ctl_bits(struct bcm43xx_private *bcm,
+                                   int bit25, int bit26);
+
+#endif /* BCM43xx_POWER_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
new file mode 100644
index 000000000000..af5c0bff1696
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -0,0 +1,2026 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include <linux/delay.h>
+
+#include "bcm43xx.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_phy.h"
+#include "bcm43xx_radio.h"
+#include "bcm43xx_ilt.h"
+
+
+/* Table for bcm43xx_radio_calibrationvalue() */
+static const u16 rcc_table[16] = {
+        0x0002, 0x0003, 0x0001, 0x000F,
+        0x0006, 0x0007, 0x0005, 0x000F,
+        0x000A, 0x000B, 0x0009, 0x000F,
+        0x000E, 0x000F, 0x000D, 0x000F,
+};
+
+/* Reverse the bits of a 4bit value.
+ * Example:  1101 is flipped 1011
+ */
+static u16 flip_4bit(u16 value)
+{
+        u16 flipped = 0x0000;
+
+        assert((value & ~0x000F) == 0x0000);
+
+        flipped |= (value & 0x0001) << 3;
+        flipped |= (value & 0x0002) << 1;
+        flipped |= (value & 0x0004) >> 1;
+        flipped |= (value & 0x0008) >> 3;
+
+        return flipped;
+}
+
+/* Get the freq, as it has to be written to the device. */
+static inline
+u16 channel2freq_bg(u8 channel)
+{
+        /* Frequencies are given as frequencies_bg[index] + 2.4GHz
+         * Starting with channel 1
+         */
+        static const u16 frequencies_bg[14] = {
+                12, 17, 22, 27,
+                32, 37, 42, 47,
+                52, 57, 62, 67,
+                72, 84,
+        };
+
+        assert(channel >= 1 && channel <= 14);
+
+        return frequencies_bg[channel - 1];
+}
+
+/* Get the freq, as it has to be written to the device. */
+static inline
+u16 channel2freq_a(u8 channel)
+{
+        assert(channel <= 200);
+
+        return (5000 + 5 * channel);
+}
+
+void bcm43xx_radio_lock(struct bcm43xx_private *bcm)
+{
+        u32 status;
+
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        status |= BCM43xx_SBF_RADIOREG_LOCK;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+        mmiowb();
+        udelay(10);
+}
+
+void bcm43xx_radio_unlock(struct bcm43xx_private *bcm)
+{
+        u32 status;
+
+        bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_VER); /* dummy read */
+        status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+        status &= ~BCM43xx_SBF_RADIOREG_LOCK;
+        bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+        mmiowb();
+}
+
+u16 bcm43xx_radio_read16(struct bcm43xx_private *bcm, u16 offset)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A:
+                offset |= 0x0040;
+                break;
+        case BCM43xx_PHYTYPE_B:
+                if (radio->version == 0x2053) {
+                        if (offset < 0x70)
+                                offset += 0x80;
+                        else if (offset < 0x80)
+                                offset += 0x70;
+                } else if (radio->version == 0x2050) {
+                        offset |= 0x80;
+                } else
+                        assert(0);
+                break;
+        case BCM43xx_PHYTYPE_G:
+                offset |= 0x80;
+                break;
+        }
+
+        bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, offset);
+        return bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW);
+}
+
+void bcm43xx_radio_write16(struct bcm43xx_private *bcm, u16 offset, u16 val)
+{
+        bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, offset);
+        mmiowb();
+        bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW, val);
+}
+
+static void bcm43xx_set_all_gains(struct bcm43xx_private *bcm,
+                                  s16 first, s16 second, s16 third)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 i;
+        u16 start = 0x08, end = 0x18;
+        u16 offset = 0x0400;
+        u16 tmp;
+
+        if (phy->rev <= 1) {
+                offset = 0x5000;
+                start = 0x10;
+                end = 0x20;
+        }
+
+        for (i = 0; i < 4; i++)
+                bcm43xx_ilt_write(bcm, offset + i, first);
+
+        for (i = start; i < end; i++)
+                bcm43xx_ilt_write(bcm, offset + i, second);
+
+        if (third != -1) {
+                tmp = ((u16)third << 14) | ((u16)third << 6);
+                bcm43xx_phy_write(bcm, 0x04A0,
+                                  (bcm43xx_phy_read(bcm, 0x04A0) & 0xBFBF) | tmp);
+                bcm43xx_phy_write(bcm, 0x04A1,
+                                  (bcm43xx_phy_read(bcm, 0x04A1) & 0xBFBF) | tmp);
+                bcm43xx_phy_write(bcm, 0x04A2,
+                                  (bcm43xx_phy_read(bcm, 0x04A2) & 0xBFBF) | tmp);
+        }
+        bcm43xx_dummy_transmission(bcm);
+}
+
+static void bcm43xx_set_original_gains(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 i, tmp;
+        u16 offset = 0x0400;
+        u16 start = 0x0008, end = 0x0018;
+
+        if (phy->rev <= 1) {
+                offset = 0x5000;
+                start = 0x0010;
+                end = 0x0020;
+        }
+
+        for (i = 0; i < 4; i++) {
+                tmp = (i & 0xFFFC);
+                tmp |= (i & 0x0001) << 1;
+                tmp |= (i & 0x0002) >> 1;
+
+                bcm43xx_ilt_write(bcm, offset + i, tmp);
+        }
+
+        for (i = start; i < end; i++)
+                bcm43xx_ilt_write(bcm, offset + i, i - start);
+
+        bcm43xx_phy_write(bcm, 0x04A0,
+                          (bcm43xx_phy_read(bcm, 0x04A0) & 0xBFBF) | 0x4040);
+        bcm43xx_phy_write(bcm, 0x04A1,
+                          (bcm43xx_phy_read(bcm, 0x04A1) & 0xBFBF) | 0x4040);
+        bcm43xx_phy_write(bcm, 0x04A2,
+                          (bcm43xx_phy_read(bcm, 0x04A2) & 0xBFBF) | 0x4000);
+        bcm43xx_dummy_transmission(bcm);
+}
+
+/* Synthetic PU workaround */
+static void bcm43xx_synth_pu_workaround(struct bcm43xx_private *bcm, u8 channel)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        
+        if (radio->version != 0x2050 || radio->revision >= 6) {
+                /* We do not need the workaround. */
+                return;
+        }
+
+        if (channel <= 10) {
+                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
+                                channel2freq_bg(channel + 4));
+        } else {
+                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
+                                channel2freq_bg(1));
+        }
+        udelay(100);
+        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
+                        channel2freq_bg(channel));
+}
+
+u8 bcm43xx_radio_aci_detect(struct bcm43xx_private *bcm, u8 channel)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u8 ret = 0;
+        u16 saved, rssi, temp;
+        int i, j = 0;
+
+        saved = bcm43xx_phy_read(bcm, 0x0403);
+        bcm43xx_radio_selectchannel(bcm, channel, 0);
+        bcm43xx_phy_write(bcm, 0x0403, (saved & 0xFFF8) | 5);
+        if (radio->aci_hw_rssi)
+                rssi = bcm43xx_phy_read(bcm, 0x048A) & 0x3F;
+        else
+                rssi = saved & 0x3F;
+        /* clamp temp to signed 5bit */
+        if (rssi > 32)
+                rssi -= 64;
+        for (i = 0;i < 100; i++) {
+                temp = (bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x3F;
+                if (temp > 32)
+                        temp -= 64;
+                if (temp < rssi)
+                        j++;
+                if (j >= 20)
+                        ret = 1;
+        }
+        bcm43xx_phy_write(bcm, 0x0403, saved);
+
+        return ret;
+}
+
+u8 bcm43xx_radio_aci_scan(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u8 ret[13];
+        unsigned int channel = radio->channel;
+        unsigned int i, j, start, end;
+        unsigned long phylock_flags;
+
+        if (!((phy->type == BCM43xx_PHYTYPE_G) && (phy->rev > 0)))
+                return 0;
+
+        bcm43xx_phy_lock(bcm, phylock_flags);
+        bcm43xx_radio_lock(bcm);
+        bcm43xx_phy_write(bcm, 0x0802,
+                          bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC);
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0x7FFF);
+        bcm43xx_set_all_gains(bcm, 3, 8, 1);
+
+        start = (channel - 5 > 0) ? channel - 5 : 1;
+        end = (channel + 5 < 14) ? channel + 5 : 13;
+
+        for (i = start; i <= end; i++) {
+                if (abs(channel - i) > 2)
+                        ret[i-1] = bcm43xx_radio_aci_detect(bcm, i);
+        }
+        bcm43xx_radio_selectchannel(bcm, channel, 0);
+        bcm43xx_phy_write(bcm, 0x0802,
+                          (bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC) | 0x0003);
+        bcm43xx_phy_write(bcm, 0x0403,
+                          bcm43xx_phy_read(bcm, 0x0403) & 0xFFF8);
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x8000);
+        bcm43xx_set_original_gains(bcm);
+        for (i = 0; i < 13; i++) {
+                if (!ret[i])
+                        continue;
+                end = (i + 5 < 13) ? i + 5 : 13;
+                for (j = i; j < end; j++)
+                        ret[j] = 1;
+        }
+        bcm43xx_radio_unlock(bcm);
+        bcm43xx_phy_unlock(bcm, phylock_flags);
+
+        return ret[channel - 1];
+}
+
+/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
+void bcm43xx_nrssi_hw_write(struct bcm43xx_private *bcm, u16 offset, s16 val)
+{
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_CTRL, offset);
+        mmiowb();
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_DATA, (u16)val);
+}
+
+/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
+s16 bcm43xx_nrssi_hw_read(struct bcm43xx_private *bcm, u16 offset)
+{
+        u16 val;
+
+        bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_CTRL, offset);
+        val = bcm43xx_phy_read(bcm, BCM43xx_PHY_NRSSILT_DATA);
+
+        return (s16)val;
+}
+
+/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
+void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val)
+{
+        u16 i;
+        s16 tmp;
+
+        for (i = 0; i < 64; i++) {
+                tmp = bcm43xx_nrssi_hw_read(bcm, i);
+                tmp -= val;
+                tmp = limit_value(tmp, -32, 31);
+                bcm43xx_nrssi_hw_write(bcm, i, tmp);
+        }
+}
+
+/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
+void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        s16 i, delta;
+        s32 tmp;
+
+        delta = 0x1F - radio->nrssi[0];
+        for (i = 0; i < 64; i++) {
+                tmp = (i - delta) * radio->nrssislope;
+                tmp /= 0x10000;
+                tmp += 0x3A;
+                tmp = limit_value(tmp, 0, 0x3F);
+                radio->nrssi_lt[i] = tmp;
+        }
+}
+
+static void bcm43xx_calc_nrssi_offset(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 backup[20] = { 0 };
+        s16 v47F;
+        u16 i;
+        u16 saved = 0xFFFF;
+
+        backup[0] = bcm43xx_phy_read(bcm, 0x0001);
+        backup[1] = bcm43xx_phy_read(bcm, 0x0811);
+        backup[2] = bcm43xx_phy_read(bcm, 0x0812);
+        backup[3] = bcm43xx_phy_read(bcm, 0x0814);
+        backup[4] = bcm43xx_phy_read(bcm, 0x0815);
+        backup[5] = bcm43xx_phy_read(bcm, 0x005A);
+        backup[6] = bcm43xx_phy_read(bcm, 0x0059);
+        backup[7] = bcm43xx_phy_read(bcm, 0x0058);
+        backup[8] = bcm43xx_phy_read(bcm, 0x000A);
+        backup[9] = bcm43xx_phy_read(bcm, 0x0003);
+        backup[10] = bcm43xx_radio_read16(bcm, 0x007A);
+        backup[11] = bcm43xx_radio_read16(bcm, 0x0043);
+
+        bcm43xx_phy_write(bcm, 0x0429,
+                          bcm43xx_phy_read(bcm, 0x0429) & 0x7FFF);
+        bcm43xx_phy_write(bcm, 0x0001,
+                          (bcm43xx_phy_read(bcm, 0x0001) & 0x3FFF) | 0x4000);
+        bcm43xx_phy_write(bcm, 0x0811,
+                          bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
+        bcm43xx_phy_write(bcm, 0x0812,
+                          (bcm43xx_phy_read(bcm, 0x0812) & 0xFFF3) | 0x0004);
+        bcm43xx_phy_write(bcm, 0x0802,
+                          bcm43xx_phy_read(bcm, 0x0802) & ~(0x1 | 0x2));
+        if (phy->rev >= 6) {
+                backup[12] = bcm43xx_phy_read(bcm, 0x002E);
+                backup[13] = bcm43xx_phy_read(bcm, 0x002F);
+                backup[14] = bcm43xx_phy_read(bcm, 0x080F);
+                backup[15] = bcm43xx_phy_read(bcm, 0x0810);
+                backup[16] = bcm43xx_phy_read(bcm, 0x0801);
+                backup[17] = bcm43xx_phy_read(bcm, 0x0060);
+                backup[18] = bcm43xx_phy_read(bcm, 0x0014);
+                backup[19] = bcm43xx_phy_read(bcm, 0x0478);
+
+                bcm43xx_phy_write(bcm, 0x002E, 0);
+                bcm43xx_phy_write(bcm, 0x002F, 0);
+                bcm43xx_phy_write(bcm, 0x080F, 0);
+                bcm43xx_phy_write(bcm, 0x0810, 0);
+                bcm43xx_phy_write(bcm, 0x0478,
+                                  bcm43xx_phy_read(bcm, 0x0478) | 0x0100);
+                bcm43xx_phy_write(bcm, 0x0801,
+                                  bcm43xx_phy_read(bcm, 0x0801) | 0x0040);
+                bcm43xx_phy_write(bcm, 0x0060,
+                                  bcm43xx_phy_read(bcm, 0x0060) | 0x0040);
+                bcm43xx_phy_write(bcm, 0x0014,
+                                  bcm43xx_phy_read(bcm, 0x0014) | 0x0200);
+        }
+        bcm43xx_radio_write16(bcm, 0x007A,
+                              bcm43xx_radio_read16(bcm, 0x007A) | 0x0070);
+        bcm43xx_radio_write16(bcm, 0x007A,
+                              bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
+        udelay(30);
+
+        v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+        if (v47F >= 0x20)
+                v47F -= 0x40;
+        if (v47F == 31) {
+                for (i = 7; i >= 4; i--) {
+                        bcm43xx_radio_write16(bcm, 0x007B, i);
+                        udelay(20);
+                        v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+                        if (v47F >= 0x20)
+                                v47F -= 0x40;
+                        if (v47F < 31 && saved == 0xFFFF)
+                                saved = i;
+                }
+                if (saved == 0xFFFF)
+                        saved = 4;
+        } else {
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
+                bcm43xx_phy_write(bcm, 0x0814,
+                                  bcm43xx_phy_read(bcm, 0x0814) | 0x0001);
+                bcm43xx_phy_write(bcm, 0x0815,
+                                  bcm43xx_phy_read(bcm, 0x0815) & 0xFFFE);
+                bcm43xx_phy_write(bcm, 0x0811,
+                                  bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
+                bcm43xx_phy_write(bcm, 0x0812,
+                                  bcm43xx_phy_read(bcm, 0x0812) | 0x000C);
+                bcm43xx_phy_write(bcm, 0x0811,
+                                  bcm43xx_phy_read(bcm, 0x0811) | 0x0030);
+                bcm43xx_phy_write(bcm, 0x0812,
+                                  bcm43xx_phy_read(bcm, 0x0812) | 0x0030);
+                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
+                bcm43xx_phy_write(bcm, 0x0059, 0x0810);
+                bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+                if (phy->rev == 0) {
+                        bcm43xx_phy_write(bcm, 0x0003, 0x0122);
+                } else {
+                        bcm43xx_phy_write(bcm, 0x000A,
+                                          bcm43xx_phy_read(bcm, 0x000A)
+                                          | 0x2000);
+                }
+                bcm43xx_phy_write(bcm, 0x0814,
+                                  bcm43xx_phy_read(bcm, 0x0814) | 0x0004);
+                bcm43xx_phy_write(bcm, 0x0815,
+                                  bcm43xx_phy_read(bcm, 0x0815) & 0xFFFB);
+                bcm43xx_phy_write(bcm, 0x0003,
+                                  (bcm43xx_phy_read(bcm, 0x0003) & 0xFF9F)
+                                  | 0x0040);
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x000F);
+                bcm43xx_set_all_gains(bcm, 3, 0, 1);
+                bcm43xx_radio_write16(bcm, 0x0043,
+                                      (bcm43xx_radio_read16(bcm, 0x0043)
+                                       & 0x00F0) | 0x000F);
+                udelay(30);
+                v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+                if (v47F >= 0x20)
+                        v47F -= 0x40;
+                if (v47F == -32) {
+                        for (i = 0; i < 4; i++) {
+                                bcm43xx_radio_write16(bcm, 0x007B, i);
+                                udelay(20);
+                                v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+                                if (v47F >= 0x20)
+                                        v47F -= 0x40;
+                                if (v47F > -31 && saved == 0xFFFF)
+                                        saved = i;
+                        }
+                        if (saved == 0xFFFF)
+                                saved = 3;
+                } else
+                        saved = 0;
+        }
+        bcm43xx_radio_write16(bcm, 0x007B, saved);
+
+        if (phy->rev >= 6) {
+                bcm43xx_phy_write(bcm, 0x002E, backup[12]);
+                bcm43xx_phy_write(bcm, 0x002F, backup[13]);
+                bcm43xx_phy_write(bcm, 0x080F, backup[14]);
+                bcm43xx_phy_write(bcm, 0x0810, backup[15]);
+        }
+        bcm43xx_phy_write(bcm, 0x0814, backup[3]);
+        bcm43xx_phy_write(bcm, 0x0815, backup[4]);
+        bcm43xx_phy_write(bcm, 0x005A, backup[5]);
+        bcm43xx_phy_write(bcm, 0x0059, backup[6]);
+        bcm43xx_phy_write(bcm, 0x0058, backup[7]);
+        bcm43xx_phy_write(bcm, 0x000A, backup[8]);
+        bcm43xx_phy_write(bcm, 0x0003, backup[9]);
+        bcm43xx_radio_write16(bcm, 0x0043, backup[11]);
+        bcm43xx_radio_write16(bcm, 0x007A, backup[10]);
+        bcm43xx_phy_write(bcm, 0x0802,
+                          bcm43xx_phy_read(bcm, 0x0802) | 0x1 | 0x2);
+        bcm43xx_phy_write(bcm, 0x0429,
+                          bcm43xx_phy_read(bcm, 0x0429) | 0x8000);
+        bcm43xx_set_original_gains(bcm);
+        if (phy->rev >= 6) {
+                bcm43xx_phy_write(bcm, 0x0801, backup[16]);
+                bcm43xx_phy_write(bcm, 0x0060, backup[17]);
+                bcm43xx_phy_write(bcm, 0x0014, backup[18]);
+                bcm43xx_phy_write(bcm, 0x0478, backup[19]);
+        }
+        bcm43xx_phy_write(bcm, 0x0001, backup[0]);
+        bcm43xx_phy_write(bcm, 0x0812, backup[2]);
+        bcm43xx_phy_write(bcm, 0x0811, backup[1]);
+}
+
+void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 backup[18] = { 0 };
+        u16 tmp;
+        s16 nrssi0, nrssi1;
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_B:
+                backup[0] = bcm43xx_radio_read16(bcm, 0x007A);
+                backup[1] = bcm43xx_radio_read16(bcm, 0x0052);
+                backup[2] = bcm43xx_radio_read16(bcm, 0x0043);
+                backup[3] = bcm43xx_phy_read(bcm, 0x0030);
+                backup[4] = bcm43xx_phy_read(bcm, 0x0026);
+                backup[5] = bcm43xx_phy_read(bcm, 0x0015);
+                backup[6] = bcm43xx_phy_read(bcm, 0x002A);
+                backup[7] = bcm43xx_phy_read(bcm, 0x0020);
+                backup[8] = bcm43xx_phy_read(bcm, 0x005A);
+                backup[9] = bcm43xx_phy_read(bcm, 0x0059);
+                backup[10] = bcm43xx_phy_read(bcm, 0x0058);
+                backup[11] = bcm43xx_read16(bcm, 0x03E2);
+                backup[12] = bcm43xx_read16(bcm, 0x03E6);
+                backup[13] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
+
+                tmp  = bcm43xx_radio_read16(bcm, 0x007A);
+                tmp &= (phy->rev >= 5) ? 0x007F : 0x000F;
+                bcm43xx_radio_write16(bcm, 0x007A, tmp);
+                bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
+                bcm43xx_write16(bcm, 0x03EC, 0x7F7F);
+                bcm43xx_phy_write(bcm, 0x0026, 0x0000);
+                bcm43xx_phy_write(bcm, 0x0015,
+                                  bcm43xx_phy_read(bcm, 0x0015) | 0x0020);
+                bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
+
+                nrssi0 = (s16)bcm43xx_phy_read(bcm, 0x0027);
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
+                if (phy->rev >= 2) {
+                        bcm43xx_write16(bcm, 0x03E6, 0x0040);
+                } else if (phy->rev == 0) {
+                        bcm43xx_write16(bcm, 0x03E6, 0x0122);
+                } else {
+                        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
+                                        bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT) & 0x2000);
+                }
+                bcm43xx_phy_write(bcm, 0x0020, 0x3F3F);
+                bcm43xx_phy_write(bcm, 0x0015, 0xF330);
+                bcm43xx_radio_write16(bcm, 0x005A, 0x0060);
+                bcm43xx_radio_write16(bcm, 0x0043,
+                                      bcm43xx_radio_read16(bcm, 0x0043) & 0x00F0);
+                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
+                bcm43xx_phy_write(bcm, 0x0059, 0x0810);
+                bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+                udelay(20);
+
+                nrssi1 = (s16)bcm43xx_phy_read(bcm, 0x0027);
+                bcm43xx_phy_write(bcm, 0x0030, backup[3]);
+                bcm43xx_radio_write16(bcm, 0x007A, backup[0]);
+                bcm43xx_write16(bcm, 0x03E2, backup[11]);
+                bcm43xx_phy_write(bcm, 0x0026, backup[4]);
+                bcm43xx_phy_write(bcm, 0x0015, backup[5]);
+                bcm43xx_phy_write(bcm, 0x002A, backup[6]);
+                bcm43xx_synth_pu_workaround(bcm, radio->channel);
+                if (phy->rev != 0)
+                        bcm43xx_write16(bcm, 0x03F4, backup[13]);
+
+                bcm43xx_phy_write(bcm, 0x0020, backup[7]);
+                bcm43xx_phy_write(bcm, 0x005A, backup[8]);
+                bcm43xx_phy_write(bcm, 0x0059, backup[9]);
+                bcm43xx_phy_write(bcm, 0x0058, backup[10]);
+                bcm43xx_radio_write16(bcm, 0x0052, backup[1]);
+                bcm43xx_radio_write16(bcm, 0x0043, backup[2]);
+
+                if (nrssi0 == nrssi1)
+                        radio->nrssislope = 0x00010000;
+                else 
+                        radio->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
+
+                if (nrssi0 <= -4) {
+                        radio->nrssi[0] = nrssi0;
+                        radio->nrssi[1] = nrssi1;
+                }
+                break;
+        case BCM43xx_PHYTYPE_G:
+                if (radio->revision >= 9)
+                        return;
+                if (radio->revision == 8)
+                        bcm43xx_calc_nrssi_offset(bcm);
+
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0x7FFF);
+                bcm43xx_phy_write(bcm, 0x0802,
+                                  bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC);
+                backup[7] = bcm43xx_read16(bcm, 0x03E2);
+                bcm43xx_write16(bcm, 0x03E2,
+                                bcm43xx_read16(bcm, 0x03E2) | 0x8000);
+                backup[0] = bcm43xx_radio_read16(bcm, 0x007A);
+                backup[1] = bcm43xx_radio_read16(bcm, 0x0052);
+                backup[2] = bcm43xx_radio_read16(bcm, 0x0043);
+                backup[3] = bcm43xx_phy_read(bcm, 0x0015);
+                backup[4] = bcm43xx_phy_read(bcm, 0x005A);
+                backup[5] = bcm43xx_phy_read(bcm, 0x0059);
+                backup[6] = bcm43xx_phy_read(bcm, 0x0058);
+                backup[8] = bcm43xx_read16(bcm, 0x03E6);
+                backup[9] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
+                if (phy->rev >= 3) {
+                        backup[10] = bcm43xx_phy_read(bcm, 0x002E);
+                        backup[11] = bcm43xx_phy_read(bcm, 0x002F);
+                        backup[12] = bcm43xx_phy_read(bcm, 0x080F);
+                        backup[13] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_LO_CONTROL);
+                        backup[14] = bcm43xx_phy_read(bcm, 0x0801);
+                        backup[15] = bcm43xx_phy_read(bcm, 0x0060);
+                        backup[16] = bcm43xx_phy_read(bcm, 0x0014);
+                        backup[17] = bcm43xx_phy_read(bcm, 0x0478);
+                        bcm43xx_phy_write(bcm, 0x002E, 0);
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, 0);
+                        switch (phy->rev) {
+                        case 4: case 6: case 7:
+                                bcm43xx_phy_write(bcm, 0x0478,
+                                                  bcm43xx_phy_read(bcm, 0x0478)
+                                                  | 0x0100);
+                                bcm43xx_phy_write(bcm, 0x0801,
+                                                  bcm43xx_phy_read(bcm, 0x0801)
+                                                  | 0x0040);
+                                break;
+                        case 3: case 5:
+                                bcm43xx_phy_write(bcm, 0x0801,
+                                                  bcm43xx_phy_read(bcm, 0x0801)
+                                                  & 0xFFBF);
+                                break;
+                        }
+                        bcm43xx_phy_write(bcm, 0x0060,
+                                          bcm43xx_phy_read(bcm, 0x0060)
+                                          | 0x0040);
+                        bcm43xx_phy_write(bcm, 0x0014,
+                                          bcm43xx_phy_read(bcm, 0x0014)
+                                          | 0x0200);
+                }
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0070);
+                bcm43xx_set_all_gains(bcm, 0, 8, 0);
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x00F7);
+                if (phy->rev >= 2) {
+                        bcm43xx_phy_write(bcm, 0x0811,
+                                          (bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF) | 0x0030);
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          (bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF) | 0x0010);
+                }
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
+                udelay(20);
+
+                nrssi0 = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+                if (nrssi0 >= 0x0020)
+                        nrssi0 -= 0x0040;
+
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
+                if (phy->rev >= 2) {
+                        bcm43xx_phy_write(bcm, 0x0003,
+                                          (bcm43xx_phy_read(bcm, 0x0003)
+                                           & 0xFF9F) | 0x0040);
+                }
+
+                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
+                                bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
+                                | 0x2000);
+                bcm43xx_radio_write16(bcm, 0x007A,
+                                      bcm43xx_radio_read16(bcm, 0x007A) | 0x000F);
+                bcm43xx_phy_write(bcm, 0x0015, 0xF330);
+                if (phy->rev >= 2) {
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          (bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF) | 0x0020);
+                        bcm43xx_phy_write(bcm, 0x0811,
+                                          (bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF) | 0x0020);
+                }
+
+                bcm43xx_set_all_gains(bcm, 3, 0, 1);
+                if (radio->revision == 8) {
+                        bcm43xx_radio_write16(bcm, 0x0043, 0x001F);
+                } else {
+                        tmp = bcm43xx_radio_read16(bcm, 0x0052) & 0xFF0F;
+                        bcm43xx_radio_write16(bcm, 0x0052, tmp | 0x0060);
+                        tmp = bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0;
+                        bcm43xx_radio_write16(bcm, 0x0043, tmp | 0x0009);
+                }
+                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
+                bcm43xx_phy_write(bcm, 0x0059, 0x0810);
+                bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+                udelay(20);
+                nrssi1 = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+                if (nrssi1 >= 0x0020)
+                        nrssi1 -= 0x0040;
+                if (nrssi0 == nrssi1)
+                        radio->nrssislope = 0x00010000;
+                else
+                        radio->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
+                if (nrssi0 >= -4) {
+                        radio->nrssi[0] = nrssi1;
+                        radio->nrssi[1] = nrssi0;
+                }
+                if (phy->rev >= 3) {
+                        bcm43xx_phy_write(bcm, 0x002E, backup[10]);
+                        bcm43xx_phy_write(bcm, 0x002F, backup[11]);
+                        bcm43xx_phy_write(bcm, 0x080F, backup[12]);
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, backup[13]);
+                }
+                if (phy->rev >= 2) {
+                        bcm43xx_phy_write(bcm, 0x0812,
+                                          bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF);
+                        bcm43xx_phy_write(bcm, 0x0811,
+                                          bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF);
+                }
+
+                bcm43xx_radio_write16(bcm, 0x007A, backup[0]);
+                bcm43xx_radio_write16(bcm, 0x0052, backup[1]);
+                bcm43xx_radio_write16(bcm, 0x0043, backup[2]);
+                bcm43xx_write16(bcm, 0x03E2, backup[7]);
+                bcm43xx_write16(bcm, 0x03E6, backup[8]);
+                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[9]);
+                bcm43xx_phy_write(bcm, 0x0015, backup[3]);
+                bcm43xx_phy_write(bcm, 0x005A, backup[4]);
+                bcm43xx_phy_write(bcm, 0x0059, backup[5]);
+                bcm43xx_phy_write(bcm, 0x0058, backup[6]);
+                bcm43xx_synth_pu_workaround(bcm, radio->channel);
+                bcm43xx_phy_write(bcm, 0x0802,
+                                  bcm43xx_phy_read(bcm, 0x0802) | (0x0001 | 0x0002));
+                bcm43xx_set_original_gains(bcm);
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x8000);
+                if (phy->rev >= 3) {
+                        bcm43xx_phy_write(bcm, 0x0801, backup[14]);
+                        bcm43xx_phy_write(bcm, 0x0060, backup[15]);
+                        bcm43xx_phy_write(bcm, 0x0014, backup[16]);
+                        bcm43xx_phy_write(bcm, 0x0478, backup[17]);
+                }
+                bcm43xx_nrssi_mem_update(bcm);
+                bcm43xx_calc_nrssi_threshold(bcm);
+                break;
+        default:
+                assert(0);
+        }
+}
+
+void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        s32 threshold;
+        s32 a, b;
+        s16 tmp16;
+        u16 tmp_u16;
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_B: {
+                if (radio->version != 0x2050)
+                        return;
+                if (!(bcm->sprom.boardflags & BCM43xx_BFL_RSSI))
+                        return;
+
+                if (radio->revision >= 6) {
+                        threshold = (radio->nrssi[1] - radio->nrssi[0]) * 32;
+                        threshold += 20 * (radio->nrssi[0] + 1);
+                        threshold /= 40;
+                } else
+                        threshold = radio->nrssi[1] - 5;
+
+                threshold = limit_value(threshold, 0, 0x3E);
+                bcm43xx_phy_read(bcm, 0x0020); /* dummy read */
+                bcm43xx_phy_write(bcm, 0x0020, (((u16)threshold) << 8) | 0x001C);
+
+                if (radio->revision >= 6) {
+                        bcm43xx_phy_write(bcm, 0x0087, 0x0E0D);
+                        bcm43xx_phy_write(bcm, 0x0086, 0x0C0B);
+                        bcm43xx_phy_write(bcm, 0x0085, 0x0A09);
+                        bcm43xx_phy_write(bcm, 0x0084, 0x0808);
+                        bcm43xx_phy_write(bcm, 0x0083, 0x0808);
+                        bcm43xx_phy_write(bcm, 0x0082, 0x0604);
+                        bcm43xx_phy_write(bcm, 0x0081, 0x0302);
+                        bcm43xx_phy_write(bcm, 0x0080, 0x0100);
+                }
+                break;
+        }
+        case BCM43xx_PHYTYPE_G:
+                if (!phy->connected ||
+                    !(bcm->sprom.boardflags & BCM43xx_BFL_RSSI)) {
+                        tmp16 = bcm43xx_nrssi_hw_read(bcm, 0x20);
+                        if (tmp16 >= 0x20)
+                                tmp16 -= 0x40;
+                        if (tmp16 < 3) {
+                                bcm43xx_phy_write(bcm, 0x048A,
+                                                  (bcm43xx_phy_read(bcm, 0x048A)
+                                                   & 0xF000) | 0x09EB);
+                        } else {
+                                bcm43xx_phy_write(bcm, 0x048A,
+                                                  (bcm43xx_phy_read(bcm, 0x048A)
+                                                   & 0xF000) | 0x0AED);
+                        }
+                } else {
+                        if (radio->interfmode == BCM43xx_RADIO_INTERFMODE_NONWLAN) {
+                                a = 0xE;
+                                b = 0xA;
+                        } else if (!radio->aci_wlan_automatic && radio->aci_enable) {
+                                a = 0x13;
+                                b = 0x12;
+                        } else {
+                                a = 0xE;
+                                b = 0x11;
+                        }
+
+                        a = a * (radio->nrssi[1] - radio->nrssi[0]);
+                        a += (radio->nrssi[0] << 6);
+                        if (a < 32)
+                                a += 31;
+                        else
+                                a += 32;
+                        a = a >> 6;
+                        a = limit_value(a, -31, 31);
+
+                        b = b * (radio->nrssi[1] - radio->nrssi[0]);
+                        b += (radio->nrssi[0] << 6);
+                        if (b < 32)
+                                b += 31;
+                        else
+                                b += 32;
+                        b = b >> 6;
+                        b = limit_value(b, -31, 31);
+
+                        tmp_u16 = bcm43xx_phy_read(bcm, 0x048A) & 0xF000;
+                        tmp_u16 |= ((u32)b & 0x0000003F);
+                        tmp_u16 |= (((u32)a & 0x0000003F) << 6);
+                        bcm43xx_phy_write(bcm, 0x048A, tmp_u16);
+                }
+                break;
+        default:
+                assert(0);
+        }
+}
+
+/* Stack implementation to save/restore values from the
+ * interference mitigation code.
+ * It is save to restore values in random order.
+ */
+static void _stack_save(u32 *_stackptr, size_t *stackidx,
+                        u8 id, u16 offset, u16 value)
+{
+        u32 *stackptr = &(_stackptr[*stackidx]);
+
+        assert((offset & 0xF000) == 0x0000);
+        assert((id & 0xF0) == 0x00);
+        *stackptr = offset;
+        *stackptr |= ((u32)id) << 12;
+        *stackptr |= ((u32)value) << 16;
+        (*stackidx)++;
+        assert(*stackidx < BCM43xx_INTERFSTACK_SIZE);
+}
+
+static u16 _stack_restore(u32 *stackptr,
+                          u8 id, u16 offset)
+{
+        size_t i;
+
+        assert((offset & 0xF000) == 0x0000);
+        assert((id & 0xF0) == 0x00);
+        for (i = 0; i < BCM43xx_INTERFSTACK_SIZE; i++, stackptr++) {
+                if ((*stackptr & 0x00000FFF) != offset)
+                        continue;
+                if (((*stackptr & 0x0000F000) >> 12) != id)
+                        continue;
+                return ((*stackptr & 0xFFFF0000) >> 16);
+        }
+        assert(0);
+
+        return 0;
+}
+
+#define phy_stacksave(offset)                                   \
+        do {                                                    \
+                _stack_save(stack, &stackidx, 0x1, (offset),    \
+                            bcm43xx_phy_read(bcm, (offset)));   \
+        } while (0)
+#define phy_stackrestore(offset)                                \
+        do {                                                    \
+                bcm43xx_phy_write(bcm, (offset),                \
+                                  _stack_restore(stack, 0x1,    \
+                                                 (offset)));    \
+        } while (0)
+#define radio_stacksave(offset)                                         \
+        do {                                                            \
+                _stack_save(stack, &stackidx, 0x2, (offset),            \
+                            bcm43xx_radio_read16(bcm, (offset)));       \
+        } while (0)
+#define radio_stackrestore(offset)                                      \
+        do {                                                            \
+                bcm43xx_radio_write16(bcm, (offset),                    \
+                                      _stack_restore(stack, 0x2,        \
+                                                     (offset)));        \
+        } while (0)
+#define ilt_stacksave(offset)                                   \
+        do {                                                    \
+                _stack_save(stack, &stackidx, 0x3, (offset),    \
+                            bcm43xx_ilt_read(bcm, (offset)));   \
+        } while (0)
+#define ilt_stackrestore(offset)                                \
+        do {                                                    \
+                bcm43xx_ilt_write(bcm, (offset),                \
+                                  _stack_restore(stack, 0x3,    \
+                                                 (offset)));    \
+        } while (0)
+
+static void
+bcm43xx_radio_interference_mitigation_enable(struct bcm43xx_private *bcm,
+                                             int mode)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 tmp, flipped;
+        u32 tmp32;
+        size_t stackidx = 0;
+        u32 *stack = radio->interfstack;
+
+        switch (mode) {
+        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
+                if (phy->rev != 1) {
+                        bcm43xx_phy_write(bcm, 0x042B,
+                                          bcm43xx_phy_read(bcm, 0x042B) | 0x0800);
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & ~0x4000);
+                        break;
+                }
+                radio_stacksave(0x0078);
+                tmp = (bcm43xx_radio_read16(bcm, 0x0078) & 0x001E);
+                flipped = flip_4bit(tmp);
+                if (flipped < 10 && flipped >= 8)
+                        flipped = 7;
+                else if (flipped >= 10)
+                        flipped -= 3;
+                flipped = flip_4bit(flipped);
+                flipped = (flipped << 1) | 0x0020;
+                bcm43xx_radio_write16(bcm, 0x0078, flipped);
+
+                bcm43xx_calc_nrssi_threshold(bcm);
+
+                phy_stacksave(0x0406);
+                bcm43xx_phy_write(bcm, 0x0406, 0x7E28);
+
+                bcm43xx_phy_write(bcm, 0x042B,
+                                  bcm43xx_phy_read(bcm, 0x042B) | 0x0800);
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
+                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | 0x1000);
+
+                phy_stacksave(0x04A0);
+                bcm43xx_phy_write(bcm, 0x04A0,
+                                  (bcm43xx_phy_read(bcm, 0x04A0) & 0xC0C0) | 0x0008);
+                phy_stacksave(0x04A1);
+                bcm43xx_phy_write(bcm, 0x04A1,
+                                  (bcm43xx_phy_read(bcm, 0x04A1) & 0xC0C0) | 0x0605);
+                phy_stacksave(0x04A2);
+                bcm43xx_phy_write(bcm, 0x04A2,
+                                  (bcm43xx_phy_read(bcm, 0x04A2) & 0xC0C0) | 0x0204);
+                phy_stacksave(0x04A8);
+                bcm43xx_phy_write(bcm, 0x04A8,
+                                  (bcm43xx_phy_read(bcm, 0x04A8) & 0xC0C0) | 0x0803);
+                phy_stacksave(0x04AB);
+                bcm43xx_phy_write(bcm, 0x04AB,
+                                  (bcm43xx_phy_read(bcm, 0x04AB) & 0xC0C0) | 0x0605);
+
+                phy_stacksave(0x04A7);
+                bcm43xx_phy_write(bcm, 0x04A7, 0x0002);
+                phy_stacksave(0x04A3);
+                bcm43xx_phy_write(bcm, 0x04A3, 0x287A);
+                phy_stacksave(0x04A9);
+                bcm43xx_phy_write(bcm, 0x04A9, 0x2027);
+                phy_stacksave(0x0493);
+                bcm43xx_phy_write(bcm, 0x0493, 0x32F5);
+                phy_stacksave(0x04AA);
+                bcm43xx_phy_write(bcm, 0x04AA, 0x2027);
+                phy_stacksave(0x04AC);
+                bcm43xx_phy_write(bcm, 0x04AC, 0x32F5);
+                break;
+        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
+                if (bcm43xx_phy_read(bcm, 0x0033) & 0x0800)
+                        break;
+
+                radio->aci_enable = 1;
+
+                phy_stacksave(BCM43xx_PHY_RADIO_BITFIELD);
+                phy_stacksave(BCM43xx_PHY_G_CRS);
+                if (phy->rev < 2) {
+                        phy_stacksave(0x0406);
+                } else {
+                        phy_stacksave(0x04C0);
+                        phy_stacksave(0x04C1);
+                }
+                phy_stacksave(0x0033);
+                phy_stacksave(0x04A7);
+                phy_stacksave(0x04A3);
+                phy_stacksave(0x04A9);
+                phy_stacksave(0x04AA);
+                phy_stacksave(0x04AC);
+                phy_stacksave(0x0493);
+                phy_stacksave(0x04A1);
+                phy_stacksave(0x04A0);
+                phy_stacksave(0x04A2);
+                phy_stacksave(0x048A);
+                phy_stacksave(0x04A8);
+                phy_stacksave(0x04AB);
+                if (phy->rev == 2) {
+                        phy_stacksave(0x04AD);
+                        phy_stacksave(0x04AE);
+                } else if (phy->rev >= 3) {
+                        phy_stacksave(0x04AD);
+                        phy_stacksave(0x0415);
+                        phy_stacksave(0x0416);
+                        phy_stacksave(0x0417);
+                        ilt_stacksave(0x1A00 + 0x2);
+                        ilt_stacksave(0x1A00 + 0x3);
+                }
+                phy_stacksave(0x042B);
+                phy_stacksave(0x048C);
+
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
+                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD)
+                                  & ~0x1000);
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                                  (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
+                                   & 0xFFFC) | 0x0002);
+
+                bcm43xx_phy_write(bcm, 0x0033, 0x0800);
+                bcm43xx_phy_write(bcm, 0x04A3, 0x2027);
+                bcm43xx_phy_write(bcm, 0x04A9, 0x1CA8);
+                bcm43xx_phy_write(bcm, 0x0493, 0x287A);
+                bcm43xx_phy_write(bcm, 0x04AA, 0x1CA8);
+                bcm43xx_phy_write(bcm, 0x04AC, 0x287A);
+
+                bcm43xx_phy_write(bcm, 0x04A0,
+                                  (bcm43xx_phy_read(bcm, 0x04A0)
+                                   & 0xFFC0) | 0x001A);
+                bcm43xx_phy_write(bcm, 0x04A7, 0x000D);
+
+                if (phy->rev < 2) {
+                        bcm43xx_phy_write(bcm, 0x0406, 0xFF0D);
+                } else if (phy->rev == 2) {
+                        bcm43xx_phy_write(bcm, 0x04C0, 0xFFFF);
+                        bcm43xx_phy_write(bcm, 0x04C1, 0x00A9);
+                } else {
+                        bcm43xx_phy_write(bcm, 0x04C0, 0x00C1);
+                        bcm43xx_phy_write(bcm, 0x04C1, 0x0059);
+                }
+
+                bcm43xx_phy_write(bcm, 0x04A1,
+                                  (bcm43xx_phy_read(bcm, 0x04A1)
+                                   & 0xC0FF) | 0x1800);
+                bcm43xx_phy_write(bcm, 0x04A1,
+                                  (bcm43xx_phy_read(bcm, 0x04A1)
+                                   & 0xFFC0) | 0x0015);
+                bcm43xx_phy_write(bcm, 0x04A8,
+                                  (bcm43xx_phy_read(bcm, 0x04A8)
+                                   & 0xCFFF) | 0x1000);
+                bcm43xx_phy_write(bcm, 0x04A8,
+                                  (bcm43xx_phy_read(bcm, 0x04A8)
+                                   & 0xF0FF) | 0x0A00);
+                bcm43xx_phy_write(bcm, 0x04AB,
+                                  (bcm43xx_phy_read(bcm, 0x04AB)
+                                   & 0xCFFF) | 0x1000);
+                bcm43xx_phy_write(bcm, 0x04AB,
+                                  (bcm43xx_phy_read(bcm, 0x04AB)
+                                   & 0xF0FF) | 0x0800);
+                bcm43xx_phy_write(bcm, 0x04AB,
+                                  (bcm43xx_phy_read(bcm, 0x04AB)
+                                   & 0xFFCF) | 0x0010);
+                bcm43xx_phy_write(bcm, 0x04AB,
+                                  (bcm43xx_phy_read(bcm, 0x04AB)
+                                   & 0xFFF0) | 0x0005);
+                bcm43xx_phy_write(bcm, 0x04A8,
+                                  (bcm43xx_phy_read(bcm, 0x04A8)
+                                   & 0xFFCF) | 0x0010);
+                bcm43xx_phy_write(bcm, 0x04A8,
+                                  (bcm43xx_phy_read(bcm, 0x04A8)
+                                   & 0xFFF0) | 0x0006);
+                bcm43xx_phy_write(bcm, 0x04A2,
+                                  (bcm43xx_phy_read(bcm, 0x04A2)
+                                   & 0xF0FF) | 0x0800);
+                bcm43xx_phy_write(bcm, 0x04A0,
+                                  (bcm43xx_phy_read(bcm, 0x04A0)
+                                   & 0xF0FF) | 0x0500);
+                bcm43xx_phy_write(bcm, 0x04A2,
+                                  (bcm43xx_phy_read(bcm, 0x04A2)
+                                   & 0xFFF0) | 0x000B);
+
+                if (phy->rev >= 3) {
+                        bcm43xx_phy_write(bcm, 0x048A,
+                                          bcm43xx_phy_read(bcm, 0x048A)
+                                          & ~0x8000);
+                        bcm43xx_phy_write(bcm, 0x0415,
+                                          (bcm43xx_phy_read(bcm, 0x0415)
+                                           & 0x8000) | 0x36D8);
+                        bcm43xx_phy_write(bcm, 0x0416,
+                                          (bcm43xx_phy_read(bcm, 0x0416)
+                                           & 0x8000) | 0x36D8);
+                        bcm43xx_phy_write(bcm, 0x0417,
+                                          (bcm43xx_phy_read(bcm, 0x0417)
+                                           & 0xFE00) | 0x016D);
+                } else {
+                        bcm43xx_phy_write(bcm, 0x048A,
+                                          bcm43xx_phy_read(bcm, 0x048A)
+                                          | 0x1000);
+                        bcm43xx_phy_write(bcm, 0x048A,
+                                          (bcm43xx_phy_read(bcm, 0x048A)
+                                           & 0x9FFF) | 0x2000);
+                        tmp32 = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+                                                   BCM43xx_UCODEFLAGS_OFFSET);
+                        if (!(tmp32 & 0x800)) {
+                                tmp32 |= 0x800;
+                                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+                                                    BCM43xx_UCODEFLAGS_OFFSET,
+                                                    tmp32);
+                        }
+                }
+                if (phy->rev >= 2) {
+                        bcm43xx_phy_write(bcm, 0x042B,
+                                          bcm43xx_phy_read(bcm, 0x042B)
+                                          | 0x0800);
+                }
+                bcm43xx_phy_write(bcm, 0x048C,
+                                  (bcm43xx_phy_read(bcm, 0x048C)
+                                   & 0xF0FF) | 0x0200);
+                if (phy->rev == 2) {
+                        bcm43xx_phy_write(bcm, 0x04AE,
+                                          (bcm43xx_phy_read(bcm, 0x04AE)
+                                           & 0xFF00) | 0x007F);
+                        bcm43xx_phy_write(bcm, 0x04AD,
+                                          (bcm43xx_phy_read(bcm, 0x04AD)
+                                           & 0x00FF) | 0x1300);
+                } else if (phy->rev >= 6) {
+                        bcm43xx_ilt_write(bcm, 0x1A00 + 0x3, 0x007F);
+                        bcm43xx_ilt_write(bcm, 0x1A00 + 0x2, 0x007F);
+                        bcm43xx_phy_write(bcm, 0x04AD,
+                                          bcm43xx_phy_read(bcm, 0x04AD)
+                                          & 0x00FF);
+                }
+                bcm43xx_calc_nrssi_slope(bcm);
+                break;
+        default:
+                assert(0);
+        }
+}
+
+static void
+bcm43xx_radio_interference_mitigation_disable(struct bcm43xx_private *bcm,
+                                              int mode)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u32 tmp32;
+        u32 *stack = radio->interfstack;
+
+        switch (mode) {
+        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
+                if (phy->rev != 1) {
+                        bcm43xx_phy_write(bcm, 0x042B,
+                                          bcm43xx_phy_read(bcm, 0x042B) & ~0x0800);
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                                          bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x4000);
+                        break;
+                }
+                phy_stackrestore(0x0078);
+                bcm43xx_calc_nrssi_threshold(bcm);
+                phy_stackrestore(0x0406);
+                bcm43xx_phy_write(bcm, 0x042B,
+                                  bcm43xx_phy_read(bcm, 0x042B) & ~0x0800);
+                if (!bcm->bad_frames_preempt) {
+                        bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
+                                          bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD)
+                                          & ~(1 << 11));
+                }
+                bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+                                  bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x4000);
+                phy_stackrestore(0x04A0);
+                phy_stackrestore(0x04A1);
+                phy_stackrestore(0x04A2);
+                phy_stackrestore(0x04A8);
+                phy_stackrestore(0x04AB);
+                phy_stackrestore(0x04A7);
+                phy_stackrestore(0x04A3);
+                phy_stackrestore(0x04A9);
+                phy_stackrestore(0x0493);
+                phy_stackrestore(0x04AA);
+                phy_stackrestore(0x04AC);
+                break;
+        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
+                if (!(bcm43xx_phy_read(bcm, 0x0033) & 0x0800))
+                        break;
+
+                radio->aci_enable = 0;
+
+                phy_stackrestore(BCM43xx_PHY_RADIO_BITFIELD);
+                phy_stackrestore(BCM43xx_PHY_G_CRS);
+                phy_stackrestore(0x0033);
+                phy_stackrestore(0x04A3);
+                phy_stackrestore(0x04A9);
+                phy_stackrestore(0x0493);
+                phy_stackrestore(0x04AA);
+                phy_stackrestore(0x04AC);
+                phy_stackrestore(0x04A0);
+                phy_stackrestore(0x04A7);
+                if (phy->rev >= 2) {
+                        phy_stackrestore(0x04C0);
+                        phy_stackrestore(0x04C1);
+                } else
+                        phy_stackrestore(0x0406);
+                phy_stackrestore(0x04A1);
+                phy_stackrestore(0x04AB);
+                phy_stackrestore(0x04A8);
+                if (phy->rev == 2) {
+                        phy_stackrestore(0x04AD);
+                        phy_stackrestore(0x04AE);
+                } else if (phy->rev >= 3) {
+                        phy_stackrestore(0x04AD);
+                        phy_stackrestore(0x0415);
+                        phy_stackrestore(0x0416);
+                        phy_stackrestore(0x0417);
+                        ilt_stackrestore(0x1A00 + 0x2);
+                        ilt_stackrestore(0x1A00 + 0x3);
+                }
+                phy_stackrestore(0x04A2);
+                phy_stackrestore(0x04A8);
+                phy_stackrestore(0x042B);
+                phy_stackrestore(0x048C);
+                tmp32 = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+                                           BCM43xx_UCODEFLAGS_OFFSET);
+                if (tmp32 & 0x800) {
+                        tmp32 &= ~0x800;
+                        bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+                                            BCM43xx_UCODEFLAGS_OFFSET,
+                                            tmp32);
+                }
+                bcm43xx_calc_nrssi_slope(bcm);
+                break;
+        default:
+                assert(0);
+        }
+}
+
+#undef phy_stacksave
+#undef phy_stackrestore
+#undef radio_stacksave
+#undef radio_stackrestore
+#undef ilt_stacksave
+#undef ilt_stackrestore
+
+int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_private *bcm,
+                                              int mode)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        int currentmode;
+
+        if ((phy->type != BCM43xx_PHYTYPE_G) ||
+            (phy->rev == 0) ||
+            (!phy->connected))
+                return -ENODEV;
+
+        radio->aci_wlan_automatic = 0;
+        switch (mode) {
+        case BCM43xx_RADIO_INTERFMODE_AUTOWLAN:
+                radio->aci_wlan_automatic = 1;
+                if (radio->aci_enable)
+                        mode = BCM43xx_RADIO_INTERFMODE_MANUALWLAN;
+                else
+                        mode = BCM43xx_RADIO_INTERFMODE_NONE;
+                break;
+        case BCM43xx_RADIO_INTERFMODE_NONE:
+        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
+        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        currentmode = radio->interfmode;
+        if (currentmode == mode)
+                return 0;
+        if (currentmode != BCM43xx_RADIO_INTERFMODE_NONE)
+                bcm43xx_radio_interference_mitigation_disable(bcm, currentmode);
+
+        if (mode == BCM43xx_RADIO_INTERFMODE_NONE) {
+                radio->aci_enable = 0;
+                radio->aci_hw_rssi = 0;
+        } else
+                bcm43xx_radio_interference_mitigation_enable(bcm, mode);
+        radio->interfmode = mode;
+
+        return 0;
+}
+
+u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)
+{
+        u16 reg, index, ret;
+
+        reg = bcm43xx_radio_read16(bcm, 0x0060);
+        index = (reg & 0x001E) >> 1;
+        ret = rcc_table[index] << 1;
+        ret |= (reg & 0x0001);
+        ret |= 0x0020;
+
+        return ret;
+}
+
+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 ret;
+        u16 i, j;
+        u32 tmp1 = 0, tmp2 = 0;
+
+        backup[0] = bcm43xx_radio_read16(bcm, 0x0043);
+        backup[14] = bcm43xx_radio_read16(bcm, 0x0051);
+        backup[15] = bcm43xx_radio_read16(bcm, 0x0052);
+        backup[1] = bcm43xx_phy_read(bcm, 0x0015);
+        backup[16] = bcm43xx_phy_read(bcm, 0x005A);
+        backup[17] = bcm43xx_phy_read(bcm, 0x0059);
+        backup[18] = bcm43xx_phy_read(bcm, 0x0058);
+        if (phy->type == BCM43xx_PHYTYPE_B) {
+                backup[2] = bcm43xx_phy_read(bcm, 0x0030);
+                backup[3] = bcm43xx_read16(bcm, 0x03EC);
+                bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
+                bcm43xx_write16(bcm, 0x03EC, 0x3F3F);
+        } else {
+                if (phy->connected) {
+                        backup[4] = bcm43xx_phy_read(bcm, 0x0811);
+                        backup[5] = bcm43xx_phy_read(bcm, 0x0812);
+                        backup[6] = bcm43xx_phy_read(bcm, 0x0814);
+                        backup[7] = bcm43xx_phy_read(bcm, 0x0815);
+                        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_write(bcm, 0x0815,
+                                          (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_write(bcm, 0x0802,
+                                          (bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC));
+                        bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
+                        bcm43xx_phy_write(bcm, 0x0812, 0x0FB2);
+                }
+                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));
+        backup[11] = bcm43xx_read16(bcm, 0x03E6);
+        backup[12] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
+
+        // Initialization
+        if (phy->version == 0) {
+                bcm43xx_write16(bcm, 0x03E6, 0x0122);
+        } else {
+                if (phy->version >= 2)
+                        bcm43xx_write16(bcm, 0x03E6, 0x0040);
+                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
+                                (bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT) | 0x2000));
+        }
+
+        ret = bcm43xx_radio_calibrationvalue(bcm);
+
+        if (phy->type == BCM43xx_PHYTYPE_B)
+                bcm43xx_radio_write16(bcm, 0x0078, 0x0003);
+
+        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, 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) | 0x0009);
+        bcm43xx_phy_write(bcm, 0x0058, 0x0000);
+
+        for (i = 0; i < 16; i++) {
+                bcm43xx_phy_write(bcm, 0x005A, 0x0480);
+                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, 0x0015, 0xAFB0);
+                udelay(10);
+                if (phy->connected)
+                        bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                bcm43xx_phy_write(bcm, 0x0015, 0xEFB0);
+                udelay(10);
+                if (phy->connected)
+                        bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                bcm43xx_phy_write(bcm, 0x0015, 0xFFF0);
+                udelay(10);
+                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, 0x0015, 0xAFB0);
+        }
+
+        tmp1++;
+        tmp1 >>= 9;
+        udelay(10);
+        bcm43xx_phy_write(bcm, 0x0058, 0x0000);
+
+        for (i = 0; i < 16; i++) {
+                bcm43xx_radio_write16(bcm, 0x0078, (flip_4bit(i) << 1) | 0x0020);
+                backup[13] = bcm43xx_radio_read16(bcm, 0x0078);
+                udelay(10);
+                for (j = 0; j < 16; j++) {
+                        bcm43xx_phy_write(bcm, 0x005A, 0x0D80);
+                        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, 0x0015, 0xAFB0);
+                        udelay(10);
+                        if (phy->connected)
+                                bcm43xx_phy_write(bcm, 0x0812, 0x30B2);
+                        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, 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, 0x0015, 0xAFB0);
+                }
+                tmp2++;
+                tmp2 >>= 8;
+                if (tmp1 < tmp2)
+                        break;
+        }
+
+        /* Restore the registers */
+        bcm43xx_phy_write(bcm, 0x0015, backup[1]);
+        bcm43xx_radio_write16(bcm, 0x0051, backup[14]);
+        bcm43xx_radio_write16(bcm, 0x0052, backup[15]);
+        bcm43xx_radio_write16(bcm, 0x0043, backup[0]);
+        bcm43xx_phy_write(bcm, 0x005A, backup[16]);
+        bcm43xx_phy_write(bcm, 0x0059, backup[17]);
+        bcm43xx_phy_write(bcm, 0x0058, backup[18]);
+        bcm43xx_write16(bcm, 0x03E6, backup[11]);
+        if (phy->version != 0)
+                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[12]);
+        bcm43xx_phy_write(bcm, 0x0035, backup[10]);
+        bcm43xx_radio_selectchannel(bcm, radio->channel, 1);
+        if (phy->type == BCM43xx_PHYTYPE_B) {
+                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_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 (i >= 15)
+                ret = backup[13];
+
+        return ret;
+}
+
+void bcm43xx_radio_init2060(struct bcm43xx_private *bcm)
+{
+        int err;
+
+        bcm43xx_radio_write16(bcm, 0x0004, 0x00C0);
+        bcm43xx_radio_write16(bcm, 0x0005, 0x0008);
+        bcm43xx_radio_write16(bcm, 0x0009, 0x0040);
+        bcm43xx_radio_write16(bcm, 0x0005, 0x00AA);
+        bcm43xx_radio_write16(bcm, 0x0032, 0x008F);
+        bcm43xx_radio_write16(bcm, 0x0006, 0x008F);
+        bcm43xx_radio_write16(bcm, 0x0034, 0x008F);
+        bcm43xx_radio_write16(bcm, 0x002C, 0x0007);
+        bcm43xx_radio_write16(bcm, 0x0082, 0x0080);
+        bcm43xx_radio_write16(bcm, 0x0080, 0x0000);
+        bcm43xx_radio_write16(bcm, 0x003F, 0x00DA);
+        bcm43xx_radio_write16(bcm, 0x0005, bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008);
+        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0010);
+        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020);
+        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020);
+        udelay(400);
+
+        bcm43xx_radio_write16(bcm, 0x0081, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020) | 0x0010);
+        udelay(400);
+
+        bcm43xx_radio_write16(bcm, 0x0005, (bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008) | 0x0008);
+        bcm43xx_radio_write16(bcm, 0x0085, bcm43xx_radio_read16(bcm, 0x0085) & ~0x0010);
+        bcm43xx_radio_write16(bcm, 0x0005, bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008);
+        bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0040);
+        bcm43xx_radio_write16(bcm, 0x0081, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0040) | 0x0040);
+        bcm43xx_radio_write16(bcm, 0x0005, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0008) | 0x0008);
+        bcm43xx_phy_write(bcm, 0x0063, 0xDDC6);
+        bcm43xx_phy_write(bcm, 0x0069, 0x07BE);
+        bcm43xx_phy_write(bcm, 0x006A, 0x0000);
+
+        err = bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_A, 0);
+        assert(err == 0);
+        udelay(1000);
+}
+
+static inline
+u16 freq_r3A_value(u16 frequency)
+{
+        u16 value;
+
+        if (frequency < 5091)
+                value = 0x0040;
+        else if (frequency < 5321)
+                value = 0x0000;
+        else if (frequency < 5806)
+                value = 0x0080;
+        else
+                value = 0x0040;
+
+        return value;
+}
+
+void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm)
+{
+        static const u8 data_high[5] = { 0x00, 0x40, 0x80, 0x90, 0xD0 };
+        static const u8 data_low[5]  = { 0x00, 0x01, 0x05, 0x06, 0x0A };
+        u16 tmp = bcm43xx_radio_read16(bcm, 0x001E);
+        int i, j;
+        
+        for (i = 0; i < 5; i++) {
+                for (j = 0; j < 5; j++) {
+                        if (tmp == (data_high[i] << 4 | data_low[j])) {
+                                bcm43xx_phy_write(bcm, 0x0069, (i - j) << 8 | 0x00C0);
+                                return;
+                        }
+                }
+        }
+}
+
+int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,
+                                u8 channel,
+                                int synthetic_pu_workaround)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 r8, tmp;
+        u16 freq;
+
+        if ((radio->manufact == 0x17F) &&
+            (radio->version == 0x2060) &&
+            (radio->revision == 1)) {
+                if (channel > 200)
+                        return -EINVAL;
+                freq = channel2freq_a(channel);
+
+                r8 = bcm43xx_radio_read16(bcm, 0x0008);
+                bcm43xx_write16(bcm, 0x03F0, freq);
+                bcm43xx_radio_write16(bcm, 0x0008, r8);
+
+                TODO();//TODO: write max channel TX power? to Radio 0x2D
+                tmp = bcm43xx_radio_read16(bcm, 0x002E);
+                tmp &= 0x0080;
+                TODO();//TODO: OR tmp with the Power out estimation for this channel?
+                bcm43xx_radio_write16(bcm, 0x002E, tmp);
+
+                if (freq >= 4920 && freq <= 5500) {
+                        /* 
+                         * r8 = (((freq * 15 * 0xE1FC780F) >> 32) / 29) & 0x0F;
+                         *    = (freq * 0.025862069
+                         */
+                        r8 = 3 * freq / 116; /* is equal to r8 = freq * 0.025862 */
+                }
+                bcm43xx_radio_write16(bcm, 0x0007, (r8 << 4) | r8);
+                bcm43xx_radio_write16(bcm, 0x0020, (r8 << 4) | r8);
+                bcm43xx_radio_write16(bcm, 0x0021, (r8 << 4) | r8);
+                bcm43xx_radio_write16(bcm, 0x0022,
+                                      (bcm43xx_radio_read16(bcm, 0x0022)
+                                       & 0x000F) | (r8 << 4));
+                bcm43xx_radio_write16(bcm, 0x002A, (r8 << 4));
+                bcm43xx_radio_write16(bcm, 0x002B, (r8 << 4));
+                bcm43xx_radio_write16(bcm, 0x0008,
+                                      (bcm43xx_radio_read16(bcm, 0x0008)
+                                       & 0x00F0) | (r8 << 4));
+                bcm43xx_radio_write16(bcm, 0x0029,
+                                      (bcm43xx_radio_read16(bcm, 0x0029)
+                                       & 0xFF0F) | 0x00B0);
+                bcm43xx_radio_write16(bcm, 0x0035, 0x00AA);
+                bcm43xx_radio_write16(bcm, 0x0036, 0x0085);
+                bcm43xx_radio_write16(bcm, 0x003A,
+                                      (bcm43xx_radio_read16(bcm, 0x003A)
+                                       & 0xFF20) | freq_r3A_value(freq));
+                bcm43xx_radio_write16(bcm, 0x003D,
+                                      bcm43xx_radio_read16(bcm, 0x003D) & 0x00FF);
+                bcm43xx_radio_write16(bcm, 0x0081,
+                                      (bcm43xx_radio_read16(bcm, 0x0081)
+                                       & 0xFF7F) | 0x0080);
+                bcm43xx_radio_write16(bcm, 0x0035,
+                                      bcm43xx_radio_read16(bcm, 0x0035) & 0xFFEF);
+                bcm43xx_radio_write16(bcm, 0x0035,
+                                      (bcm43xx_radio_read16(bcm, 0x0035)
+                                       & 0xFFEF) | 0x0010);
+                bcm43xx_radio_set_tx_iq(bcm);
+                TODO(); //TODO: TSSI2dbm workaround
+                bcm43xx_phy_xmitpower(bcm);//FIXME correct?
+        } else {
+                if ((channel < 1) || (channel > 14))
+                        return -EINVAL;
+
+                if (synthetic_pu_workaround)
+                        bcm43xx_synth_pu_workaround(bcm, channel);
+
+                bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
+                                channel2freq_bg(channel));
+
+                if (channel == 14) {
+                        if (bcm->sprom.locale == BCM43xx_LOCALE_JAPAN) {
+                                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+                                                    BCM43xx_UCODEFLAGS_OFFSET,
+                                                    bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+                                                                       BCM43xx_UCODEFLAGS_OFFSET)
+                                                    & ~(1 << 7));
+                        } else {
+                                bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+                                                    BCM43xx_UCODEFLAGS_OFFSET,
+                                                    bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+                                                                       BCM43xx_UCODEFLAGS_OFFSET)
+                                                    | (1 << 7));
+                        }
+                        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
+                                        bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
+                                        | (1 << 11));
+                } else {
+                        bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
+                                        bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
+                                        & 0xF7BF);
+                }
+        }
+
+        radio->channel = channel;
+        //XXX: Using the longer of 2 timeouts (8000 vs 2000 usecs). Specs states
+        //     that 2000 usecs might suffice.
+        udelay(8000);
+
+        return 0;
+}
+
+void bcm43xx_radio_set_txantenna(struct bcm43xx_private *bcm, u32 val)
+{
+        u16 tmp;
+
+        val <<= 8;
+        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0022) & 0xFCFF;
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0022, tmp | val);
+        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x03A8) & 0xFCFF;
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x03A8, tmp | val);
+        tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0054) & 0xFCFF;
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0054, tmp | val);
+}
+
+/* http://bcm-specs.sipsolutions.net/TX_Gain_Base_Band */
+static u16 bcm43xx_get_txgain_base_band(u16 txpower)
+{
+        u16 ret;
+
+        assert(txpower <= 63);
+
+        if (txpower >= 54)
+                ret = 2;
+        else if (txpower >= 49)
+                ret = 4;
+        else if (txpower >= 44)
+                ret = 5;
+        else
+                ret = 6;
+
+        return ret;
+}
+
+/* http://bcm-specs.sipsolutions.net/TX_Gain_Radio_Frequency_Power_Amplifier */
+static u16 bcm43xx_get_txgain_freq_power_amp(u16 txpower)
+{
+        u16 ret;
+
+        assert(txpower <= 63);
+
+        if (txpower >= 32)
+                ret = 0;
+        else if (txpower >= 25)
+                ret = 1;
+        else if (txpower >= 20)
+                ret = 2;
+        else if (txpower >= 12)
+                ret = 3;
+        else
+                ret = 4;
+
+        return ret;
+}
+
+/* http://bcm-specs.sipsolutions.net/TX_Gain_Digital_Analog_Converter */
+static u16 bcm43xx_get_txgain_dac(u16 txpower)
+{
+        u16 ret;
+
+        assert(txpower <= 63);
+
+        if (txpower >= 54)
+                ret = txpower - 53;
+        else if (txpower >= 49)
+                ret = txpower - 42;
+        else if (txpower >= 44)
+                ret = txpower - 37;
+        else if (txpower >= 32)
+                ret = txpower - 32;
+        else if (txpower >= 25)
+                ret = txpower - 20;
+        else if (txpower >= 20)
+                ret = txpower - 13;
+        else if (txpower >= 12)
+                ret = txpower - 8;
+        else
+                ret = txpower;
+
+        return ret;
+}
+
+void bcm43xx_radio_set_txpower_a(struct bcm43xx_private *bcm, u16 txpower)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 pamp, base, dac, ilt;
+
+        txpower = limit_value(txpower, 0, 63);
+
+        pamp = bcm43xx_get_txgain_freq_power_amp(txpower);
+        pamp <<= 5;
+        pamp &= 0x00E0;
+        bcm43xx_phy_write(bcm, 0x0019, pamp);
+
+        base = bcm43xx_get_txgain_base_band(txpower);
+        base &= 0x000F;
+        bcm43xx_phy_write(bcm, 0x0017, base | 0x0020);
+
+        ilt = bcm43xx_ilt_read(bcm, 0x3001);
+        ilt &= 0x0007;
+
+        dac = bcm43xx_get_txgain_dac(txpower);
+        dac <<= 3;
+        dac |= ilt;
+
+        bcm43xx_ilt_write(bcm, 0x3001, dac);
+
+        radio->txpwr_offset = txpower;
+
+        TODO();
+        //TODO: FuncPlaceholder (Adjust BB loft cancel)
+}
+
+void bcm43xx_radio_set_txpower_bg(struct bcm43xx_private *bcm,
+                                 u16 baseband_attenuation, u16 radio_attenuation,
+                                 u16 txpower)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+
+        if (baseband_attenuation == 0xFFFF)
+                baseband_attenuation = radio->baseband_atten;
+        if (radio_attenuation == 0xFFFF)
+                radio_attenuation = radio->radio_atten;
+        if (txpower == 0xFFFF)
+                txpower = radio->txctl1;
+        radio->baseband_atten = baseband_attenuation;
+        radio->radio_atten = radio_attenuation;
+        radio->txctl1 = txpower;
+
+        assert(/*baseband_attenuation >= 0 &&*/ baseband_attenuation <= 11);
+        if (radio->revision < 6)
+                assert(/*radio_attenuation >= 0 &&*/ radio_attenuation <= 9);
+        else
+                assert(/* radio_attenuation >= 0 &&*/ radio_attenuation <= 31);
+        assert(/*txpower >= 0 &&*/ txpower <= 7);
+
+        bcm43xx_phy_set_baseband_attenuation(bcm, baseband_attenuation);
+        bcm43xx_radio_write16(bcm, 0x0043, radio_attenuation);
+        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0064, radio_attenuation);
+        if (radio->version == 0x2050) {
+                bcm43xx_radio_write16(bcm, 0x0052,
+                                      (bcm43xx_radio_read16(bcm, 0x0052) & ~0x0070)
+                                       | ((txpower << 4) & 0x0070));
+        }
+        //FIXME: The spec is very weird and unclear here.
+        if (phy->type == BCM43xx_PHYTYPE_G)
+                bcm43xx_phy_lo_adjust(bcm, 0);
+}
+
+u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+
+        if (radio->version == 0x2050 && radio->revision < 6)
+                return 0;
+        return 2;
+}
+
+u16 bcm43xx_default_radio_attenuation(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        u16 att = 0xFFFF;
+
+        if (phy->type == BCM43xx_PHYTYPE_A)
+                return 0x60;
+
+        switch (radio->version) {
+        case 0x2053:
+                switch (radio->revision) {
+                case 1:
+                        att = 6;
+                        break;
+                }
+                break;
+        case 0x2050:
+                switch (radio->revision) {
+                case 0:
+                        att = 5;
+                        break;
+                case 1:
+                        if (phy->type == BCM43xx_PHYTYPE_G) {
+                                if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
+                                    bcm->board_type == 0x421 &&
+                                    bcm->board_revision >= 30)
+                                        att = 3;
+                                else if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
+                                         bcm->board_type == 0x416)
+                                        att = 3;
+                                else
+                                        att = 1;
+                        } else {
+                                if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
+                                    bcm->board_type == 0x421 &&
+                                    bcm->board_revision >= 30)
+                                        att = 7;
+                                else
+                                        att = 6;
+                        }
+                        break;
+                case 2:
+                        if (phy->type == BCM43xx_PHYTYPE_G) {
+                                if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
+                                    bcm->board_type == 0x421 &&
+                                    bcm->board_revision >= 30)
+                                        att = 3;
+                                else if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
+                                         bcm->board_type == 0x416)
+                                        att = 5;
+                                else if (bcm->chip_id == 0x4320)
+                                        att = 4;
+                                else
+                                        att = 3;
+                        } else
+                                att = 6;
+                        break;
+                case 3:
+                        att = 5;
+                        break;
+                case 4:
+                case 5:
+                        att = 1;
+                        break;
+                case 6:
+                case 7:
+                        att = 5;
+                        break;
+                case 8:
+                        att = 0x1A;
+                        break;
+                case 9:
+                default:
+                        att = 5;
+                }
+        }
+        if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
+            bcm->board_type == 0x421) {
+                if (bcm->board_revision < 0x43)
+                        att = 2;
+                else if (bcm->board_revision < 0x51)
+                        att = 3;
+        }
+        if (att == 0xFFFF)
+                att = 5;
+
+        return att;
+}
+
+u16 bcm43xx_default_txctl1(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+
+        if (radio->version != 0x2050)
+                return 0;
+        if (radio->revision == 1)
+                return 3;
+        if (radio->revision < 6)
+                return 2;
+        if (radio->revision == 8)
+                return 1;
+        return 0;
+}
+
+void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        int err;
+
+        if (radio->enabled)
+                return;
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A:
+                bcm43xx_radio_write16(bcm, 0x0004, 0x00C0);
+                bcm43xx_radio_write16(bcm, 0x0005, 0x0008);
+                bcm43xx_phy_write(bcm, 0x0010, bcm43xx_phy_read(bcm, 0x0010) & 0xFFF7);
+                bcm43xx_phy_write(bcm, 0x0011, bcm43xx_phy_read(bcm, 0x0011) & 0xFFF7);
+                bcm43xx_radio_init2060(bcm);    
+                break;
+        case BCM43xx_PHYTYPE_B:
+        case BCM43xx_PHYTYPE_G:
+                bcm43xx_phy_write(bcm, 0x0015, 0x8000);
+                bcm43xx_phy_write(bcm, 0x0015, 0xCC00);
+                bcm43xx_phy_write(bcm, 0x0015, (phy->connected ? 0x00C0 : 0x0000));
+                err = bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 1);
+                assert(err == 0);
+                break;
+        default:
+                assert(0);
+        }
+        radio->enabled = 1;
+        dprintk(KERN_INFO PFX "Radio turned on\n");
+}
+        
+void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+
+        if (phy->type == BCM43xx_PHYTYPE_A) {
+                bcm43xx_radio_write16(bcm, 0x0004, 0x00FF);
+                bcm43xx_radio_write16(bcm, 0x0005, 0x00FB);
+                bcm43xx_phy_write(bcm, 0x0010, bcm43xx_phy_read(bcm, 0x0010) | 0x0008);
+                bcm43xx_phy_write(bcm, 0x0011, bcm43xx_phy_read(bcm, 0x0011) | 0x0008);
+        }
+        if (phy->type == BCM43xx_PHYTYPE_G && bcm->current_core->rev >= 5) {
+                bcm43xx_phy_write(bcm, 0x0811, bcm43xx_phy_read(bcm, 0x0811) | 0x008C);
+                bcm43xx_phy_write(bcm, 0x0812, bcm43xx_phy_read(bcm, 0x0812) & 0xFF73);
+        } else
+                bcm43xx_phy_write(bcm, 0x0015, 0xAA00);
+        radio->enabled = 0;
+        dprintk(KERN_INFO PFX "Radio turned off\n");
+}
+
+void bcm43xx_radio_clear_tssi(struct bcm43xx_private *bcm)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+
+        switch (phy->type) {
+        case BCM43xx_PHYTYPE_A:
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0068, 0x7F7F);
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x006a, 0x7F7F);
+                break;
+        case BCM43xx_PHYTYPE_B:
+        case BCM43xx_PHYTYPE_G:
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0058, 0x7F7F);
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x005a, 0x7F7F);
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0070, 0x7F7F);
+                bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0072, 0x7F7F);
+                break;
+        }
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
new file mode 100644
index 000000000000..9ed18039fa3e
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
@@ -0,0 +1,99 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef BCM43xx_RADIO_H_
+#define BCM43xx_RADIO_H_
+
+#include "bcm43xx.h"
+
+
+#define BCM43xx_RADIO_DEFAULT_CHANNEL_A         36
+#define BCM43xx_RADIO_DEFAULT_CHANNEL_BG        6
+
+/* Force antenna 0. */
+#define BCM43xx_RADIO_TXANTENNA_0               0
+/* Force antenna 1. */
+#define BCM43xx_RADIO_TXANTENNA_1               1
+/* Use the RX antenna, that was selected for the most recently
+ * received good PLCP header.
+ */
+#define BCM43xx_RADIO_TXANTENNA_LASTPLCP        3
+#define BCM43xx_RADIO_TXANTENNA_DEFAULT         BCM43xx_RADIO_TXANTENNA_LASTPLCP
+
+#define BCM43xx_RADIO_INTERFMODE_NONE           0
+#define BCM43xx_RADIO_INTERFMODE_NONWLAN        1
+#define BCM43xx_RADIO_INTERFMODE_MANUALWLAN     2
+#define BCM43xx_RADIO_INTERFMODE_AUTOWLAN       3
+
+
+void bcm43xx_radio_lock(struct bcm43xx_private *bcm);
+void bcm43xx_radio_unlock(struct bcm43xx_private *bcm);
+
+u16 bcm43xx_radio_read16(struct bcm43xx_private *bcm, u16 offset);
+void bcm43xx_radio_write16(struct bcm43xx_private *bcm, u16 offset, u16 val);
+
+u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm);
+void bcm43xx_radio_init2060(struct bcm43xx_private *bcm);
+
+void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm);
+void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm);
+
+int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm, u8 channel,
+                                int synthetic_pu_workaround);
+
+void bcm43xx_radio_set_txpower_a(struct bcm43xx_private *bcm, u16 txpower);
+void bcm43xx_radio_set_txpower_bg(struct bcm43xx_private *bcm,
+                               u16 baseband_attenuation, u16 attenuation,
+                               u16 txpower);
+
+u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_private *bcm);
+u16 bcm43xx_default_radio_attenuation(struct bcm43xx_private *bcm);
+u16 bcm43xx_default_txctl1(struct bcm43xx_private *bcm);
+
+void bcm43xx_radio_set_txantenna(struct bcm43xx_private *bcm, u32 val);
+
+void bcm43xx_radio_clear_tssi(struct bcm43xx_private *bcm);
+
+u8 bcm43xx_radio_aci_detect(struct bcm43xx_private *bcm, u8 channel);
+u8 bcm43xx_radio_aci_scan(struct bcm43xx_private *bcm);
+
+int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_private *bcm, int mode);
+
+void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm);
+void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm);
+s16 bcm43xx_nrssi_hw_read(struct bcm43xx_private *bcm, u16 offset);
+void bcm43xx_nrssi_hw_write(struct bcm43xx_private *bcm, u16 offset, s16 val);
+void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val);
+void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm);
+
+void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm);
+u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm);
+
+#endif /* BCM43xx_RADIO_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
new file mode 100644
index 000000000000..c44d890b949b
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
@@ -0,0 +1,322 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  SYSFS support routines
+
+  Copyright (c) 2006 Michael Buesch <mbuesch@freenet.de>
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx_sysfs.h"
+#include "bcm43xx.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_radio.h"
+
+#include <linux/capability.h>
+
+
+#define GENERIC_FILESIZE        64
+
+
+static int get_integer(const char *buf, size_t count)
+{
+        char tmp[10 + 1] = { 0 };
+        int ret = -EINVAL;
+
+        if (count == 0)
+                goto out;
+        count = min(count, (size_t)10);
+        memcpy(tmp, buf, count);
+        ret = simple_strtol(tmp, NULL, 10);
+out:
+        return ret;
+}
+
+static int get_boolean(const char *buf, size_t count)
+{
+        if (count != 0) {
+                if (buf[0] == '1')
+                        return 1;
+                if (buf[0] == '0')
+                        return 0;
+                if (count >= 4 && memcmp(buf, "true", 4) == 0)
+                        return 1;
+                if (count >= 5 && memcmp(buf, "false", 5) == 0)
+                        return 0;
+                if (count >= 3 && memcmp(buf, "yes", 3) == 0)
+                        return 1;
+                if (count >= 2 && memcmp(buf, "no", 2) == 0)
+                        return 0;
+                if (count >= 2 && memcmp(buf, "on", 2) == 0)
+                        return 1;
+                if (count >= 3 && memcmp(buf, "off", 3) == 0)
+                        return 0;
+        }
+        return -EINVAL;
+}
+
+static ssize_t bcm43xx_attr_sprom_show(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+        struct bcm43xx_private *bcm = devattr_to_bcm(attr, attr_sprom);
+        u16 *sprom;
+        unsigned long flags;
+        int i, err;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        assert(BCM43xx_SPROM_SIZE * sizeof(u16) <= PAGE_SIZE);
+        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
+                        GFP_KERNEL);
+        if (!sprom)
+                return -ENOMEM;
+        bcm43xx_lock_mmio(bcm, flags);
+        assert(bcm->initialized);
+        err = bcm43xx_sprom_read(bcm, sprom);
+        if (!err) {
+                for (i = 0; i < BCM43xx_SPROM_SIZE; i++) {
+                        buf[i * 2] = sprom[i] & 0x00FF;
+                        buf[i * 2 + 1] = (sprom[i] & 0xFF00) >> 8;
+                }
+        }
+        bcm43xx_unlock_mmio(bcm, flags);
+        kfree(sprom);
+
+        return err ? err : BCM43xx_SPROM_SIZE * sizeof(u16);
+}
+
+static ssize_t bcm43xx_attr_sprom_store(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
+{
+        struct bcm43xx_private *bcm = devattr_to_bcm(attr, attr_sprom);
+        u16 *sprom;
+        unsigned long flags;
+        int i, err;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        if (count != BCM43xx_SPROM_SIZE * sizeof(u16))
+                return -EINVAL;
+        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
+                        GFP_KERNEL);
+        if (!sprom)
+                return -ENOMEM;
+        for (i = 0; i < BCM43xx_SPROM_SIZE; i++) {
+                sprom[i] = buf[i * 2] & 0xFF;
+                sprom[i] |= ((u16)(buf[i * 2 + 1] & 0xFF)) << 8;
+        }
+        bcm43xx_lock_mmio(bcm, flags);
+        assert(bcm->initialized);
+        err = bcm43xx_sprom_write(bcm, sprom);
+        bcm43xx_unlock_mmio(bcm, flags);
+        kfree(sprom);
+
+        return err ? err : count;
+
+}
+
+static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,
+                                            struct device_attribute *attr,
+                                            char *buf)
+{
+        struct bcm43xx_private *bcm = devattr_to_bcm(attr, attr_interfmode);
+        unsigned long flags;
+        int err;
+        ssize_t count = 0;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        bcm43xx_lock(bcm, flags);
+        assert(bcm->initialized);
+
+        switch (bcm43xx_current_radio(bcm)->interfmode) {
+        case BCM43xx_RADIO_INTERFMODE_NONE:
+                count = snprintf(buf, PAGE_SIZE, "0 (No Interference Mitigation)\n");
+                break;
+        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
+                count = snprintf(buf, PAGE_SIZE, "1 (Non-WLAN Interference Mitigation)\n");
+                break;
+        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
+                count = snprintf(buf, PAGE_SIZE, "2 (WLAN Interference Mitigation)\n");
+                break;
+        default:
+                assert(0);
+        }
+        err = 0;
+
+        bcm43xx_unlock(bcm, flags);
+
+        return err ? err : count;
+
+}
+
+static ssize_t bcm43xx_attr_interfmode_store(struct device *dev,
+                                             struct device_attribute *attr,
+                                             const char *buf, size_t count)
+{
+        struct bcm43xx_private *bcm = devattr_to_bcm(attr, attr_interfmode);
+        unsigned long flags;
+        int err;
+        int mode;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        mode = get_integer(buf, count);
+        switch (mode) {
+        case 0:
+                mode = BCM43xx_RADIO_INTERFMODE_NONE;
+                break;
+        case 1:
+                mode = BCM43xx_RADIO_INTERFMODE_NONWLAN;
+                break;
+        case 2:
+                mode = BCM43xx_RADIO_INTERFMODE_MANUALWLAN;
+                break;
+        case 3:
+                mode = BCM43xx_RADIO_INTERFMODE_AUTOWLAN;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        bcm43xx_lock_mmio(bcm, flags);
+        assert(bcm->initialized);
+
+        err = bcm43xx_radio_set_interference_mitigation(bcm, mode);
+        if (err) {
+                printk(KERN_ERR PFX "Interference Mitigation not "
+                                    "supported by device\n");
+        }
+
+        bcm43xx_unlock_mmio(bcm, flags);
+
+        return err ? err : count;
+}
+
+static ssize_t bcm43xx_attr_preamble_show(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        struct bcm43xx_private *bcm = devattr_to_bcm(attr, attr_preamble);
+        unsigned long flags;
+        int err;
+        ssize_t count;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        bcm43xx_lock(bcm, flags);
+        assert(bcm->initialized);
+
+        if (bcm->short_preamble)
+                count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble enabled)\n");
+        else
+                count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble disabled)\n");
+
+        err = 0;
+        bcm43xx_unlock(bcm, flags);
+
+        return err ? err : count;
+}
+
+static ssize_t bcm43xx_attr_preamble_store(struct device *dev,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+        struct bcm43xx_private *bcm = devattr_to_bcm(attr, attr_preamble);
+        unsigned long flags;
+        int err;
+        int value;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        value = get_boolean(buf, count);
+        if (value < 0)
+                return value;
+        bcm43xx_lock(bcm, flags);
+        assert(bcm->initialized);
+
+        bcm->short_preamble = !!value;
+
+        err = 0;
+        bcm43xx_unlock(bcm, flags);
+
+        return err ? err : count;
+}
+
+int bcm43xx_sysfs_register(struct bcm43xx_private *bcm)
+{
+        struct device *dev = &bcm->pci_dev->dev;
+        struct bcm43xx_sysfs *sysfs = &bcm->sysfs;
+        int err;
+
+        assert(bcm->initialized);
+
+        sysfs->attr_sprom.attr.name = "sprom";
+        sysfs->attr_sprom.attr.owner = THIS_MODULE;
+        sysfs->attr_sprom.attr.mode = 0600;
+        sysfs->attr_sprom.show = bcm43xx_attr_sprom_show;
+        sysfs->attr_sprom.store = bcm43xx_attr_sprom_store;
+        err = device_create_file(dev, &sysfs->attr_sprom);
+        if (err)
+                goto out;
+
+        sysfs->attr_interfmode.attr.name = "interference";
+        sysfs->attr_interfmode.attr.owner = THIS_MODULE;
+        sysfs->attr_interfmode.attr.mode = 0600;
+        sysfs->attr_interfmode.show = bcm43xx_attr_interfmode_show;
+        sysfs->attr_interfmode.store = bcm43xx_attr_interfmode_store;
+        err = device_create_file(dev, &sysfs->attr_interfmode);
+        if (err)
+                goto err_remove_sprom;
+
+        sysfs->attr_preamble.attr.name = "shortpreamble";
+        sysfs->attr_preamble.attr.owner = THIS_MODULE;
+        sysfs->attr_preamble.attr.mode = 0600;
+        sysfs->attr_preamble.show = bcm43xx_attr_preamble_show;
+        sysfs->attr_preamble.store = bcm43xx_attr_preamble_store;
+        err = device_create_file(dev, &sysfs->attr_preamble);
+        if (err)
+                goto err_remove_interfmode;
+
+out:
+        return err;
+err_remove_interfmode:
+        device_remove_file(dev, &sysfs->attr_interfmode);
+err_remove_sprom:
+        device_remove_file(dev, &sysfs->attr_sprom);
+        goto out;
+}
+
+void bcm43xx_sysfs_unregister(struct bcm43xx_private *bcm)
+{
+        struct device *dev = &bcm->pci_dev->dev;
+        struct bcm43xx_sysfs *sysfs = &bcm->sysfs;
+
+        device_remove_file(dev, &sysfs->attr_preamble);
+        device_remove_file(dev, &sysfs->attr_interfmode);
+        device_remove_file(dev, &sysfs->attr_sprom);
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h
new file mode 100644
index 000000000000..57f14514e3e0
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h
@@ -0,0 +1,25 @@
+#ifndef BCM43xx_SYSFS_H_
+#define BCM43xx_SYSFS_H_
+
+#include <linux/device.h>
+
+
+struct bcm43xx_sysfs {
+        struct device_attribute attr_sprom;
+        struct device_attribute attr_interfmode;
+        struct device_attribute attr_preamble;
+};
+
+#define devattr_to_bcm(attr, attr_name) ({                              \
+        struct bcm43xx_sysfs *__s; struct bcm43xx_private *__p;         \
+        __s = container_of((attr), struct bcm43xx_sysfs, attr_name);    \
+        __p = container_of(__s, struct bcm43xx_private, sysfs);         \
+        __p;                                                            \
+                                        })
+
+struct bcm43xx_private;
+
+int bcm43xx_sysfs_register(struct bcm43xx_private *bcm);
+void bcm43xx_sysfs_unregister(struct bcm43xx_private *bcm);
+
+#endif /* BCM43xx_SYSFS_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
new file mode 100644
index 000000000000..3daee828ef4b
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -0,0 +1,1002 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+#include <net/ieee80211softmac.h>
+#include <net/ieee80211softmac_wx.h>
+#include <linux/capability.h>
+#include <linux/sched.h> /* for capable() */
+#include <linux/delay.h>
+
+#include "bcm43xx.h"
+#include "bcm43xx_wx.h"
+#include "bcm43xx_main.h"
+#include "bcm43xx_radio.h"
+#include "bcm43xx_phy.h"
+
+
+/* The WIRELESS_EXT version, which is implemented by this driver. */
+#define BCM43xx_WX_VERSION      18
+
+#define MAX_WX_STRING           80
+
+
+static int bcm43xx_wx_get_name(struct net_device *net_dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *data,
+                               char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int i;
+        struct bcm43xx_phyinfo *phy;
+        char suffix[7] = { 0 };
+        int have_a = 0, have_b = 0, have_g = 0;
+
+        bcm43xx_lock(bcm, flags);
+        for (i = 0; i < bcm->nr_80211_available; i++) {
+                phy = &(bcm->core_80211_ext[i].phy);
+                switch (phy->type) {
+                case BCM43xx_PHYTYPE_A:
+                        have_a = 1;
+                        break;
+                case BCM43xx_PHYTYPE_G:
+                        have_g = 1;
+                case BCM43xx_PHYTYPE_B:
+                        have_b = 1;
+                        break;
+                default:
+                        assert(0);
+                }
+        }
+        bcm43xx_unlock(bcm, flags);
+
+        i = 0;
+        if (have_a) {
+                suffix[i++] = 'a';
+                suffix[i++] = '/';
+        }
+        if (have_b) {
+                suffix[i++] = 'b';
+                suffix[i++] = '/';
+        }
+        if (have_g) {
+                suffix[i++] = 'g';
+                suffix[i++] = '/';
+        }
+        if (i != 0) 
+                suffix[i - 1] = '\0';
+
+        snprintf(data->name, IFNAMSIZ, "IEEE 802.11%s", suffix);
+
+        return 0;
+}
+
+static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
+                                      struct iw_request_info *info,
+                                      union iwreq_data *data,
+                                      char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        u8 channel;
+        int freq;
+        int err = -EINVAL;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if ((data->freq.m >= 0) && (data->freq.m <= 1000)) {
+                channel = data->freq.m;
+                freq = bcm43xx_channel_to_freq(bcm, channel);
+        } else {
+                channel = bcm43xx_freq_to_channel(bcm, data->freq.m);
+                freq = data->freq.m;
+        }
+        if (!bcm43xx_is_valid_channel(bcm, channel))
+                goto out_unlock;
+        if (bcm->initialized) {
+                //ieee80211softmac_disassoc(softmac, $REASON);
+                bcm43xx_mac_suspend(bcm);
+                err = bcm43xx_radio_selectchannel(bcm, channel, 0);
+                bcm43xx_mac_enable(bcm);
+        } else {
+                bcm43xx_current_radio(bcm)->initial_channel = channel;
+                err = 0;
+        }
+out_unlock:
+        bcm43xx_unlock_mmio(bcm, flags);
+
+        return err;
+}
+
+static int bcm43xx_wx_get_channelfreq(struct net_device *net_dev,
+                                      struct iw_request_info *info,
+                                      union iwreq_data *data,
+                                      char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        struct bcm43xx_radioinfo *radio;
+        unsigned long flags;
+        int err = -ENODEV;
+        u16 channel;
+
+        bcm43xx_lock(bcm, flags);
+        radio = bcm43xx_current_radio(bcm);
+        channel = radio->channel;
+        if (channel == 0xFF) {
+                assert(!bcm->initialized);
+                channel = radio->initial_channel;
+                if (channel == 0xFF)
+                        goto out_unlock;
+        }
+        assert(channel > 0 && channel <= 1000);
+        data->freq.e = 1;
+        data->freq.m = bcm43xx_channel_to_freq(bcm, channel) * 100000;
+        data->freq.flags = 1;
+
+        err = 0;
+out_unlock:
+        bcm43xx_unlock(bcm, flags);
+
+        return err;
+}
+
+static int bcm43xx_wx_set_mode(struct net_device *net_dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *data,
+                               char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int mode;
+
+        mode = data->mode;
+        if (mode == IW_MODE_AUTO)
+                mode = BCM43xx_INITIAL_IWMODE;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (bcm->ieee->iw_mode != mode)
+                bcm43xx_set_iwmode(bcm, mode);
+        bcm43xx_unlock_mmio(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_get_mode(struct net_device *net_dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *data,
+                               char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+
+        bcm43xx_lock(bcm, flags);
+        data->mode = bcm->ieee->iw_mode;
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
+                                      struct iw_request_info *info,
+                                      union iwreq_data *data,
+                                      char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        struct iw_range *range = (struct iw_range *)extra;
+        const struct ieee80211_geo *geo;
+        unsigned long flags;
+        int i, j;
+        struct bcm43xx_phyinfo *phy;
+
+        data->data.length = sizeof(*range);
+        memset(range, 0, sizeof(*range));
+
+        //TODO: What about 802.11b?
+        /* 54Mb/s == ~27Mb/s payload throughput (802.11g) */
+        range->throughput = 27 * 1000 * 1000;
+
+        range->max_qual.qual = 100;
+        /* TODO: Real max RSSI */
+        range->max_qual.level = 3;
+        range->max_qual.noise = 100;
+        range->max_qual.updated = 7;
+
+        range->avg_qual.qual = 70;
+        range->avg_qual.level = 2;
+        range->avg_qual.noise = 40;
+        range->avg_qual.updated = 7;
+
+        range->min_rts = BCM43xx_MIN_RTS_THRESHOLD;
+        range->max_rts = BCM43xx_MAX_RTS_THRESHOLD;
+        range->min_frag = MIN_FRAG_THRESHOLD;
+        range->max_frag = MAX_FRAG_THRESHOLD;
+
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13;
+        range->num_encoding_sizes = 2;
+        range->max_encoding_tokens = WEP_KEYS;
+
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = BCM43xx_WX_VERSION;
+
+        range->enc_capa = IW_ENC_CAPA_WPA |
+                          IW_ENC_CAPA_WPA2 |
+                          IW_ENC_CAPA_CIPHER_TKIP |
+                          IW_ENC_CAPA_CIPHER_CCMP;
+
+        bcm43xx_lock(bcm, flags);
+        phy = bcm43xx_current_phy(bcm);
+
+        range->num_bitrates = 0;
+        i = 0;
+        if (phy->type == BCM43xx_PHYTYPE_A ||
+            phy->type == BCM43xx_PHYTYPE_G) {
+                range->num_bitrates = 8;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB;
+                range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB;
+        }
+        if (phy->type == BCM43xx_PHYTYPE_B ||
+            phy->type == BCM43xx_PHYTYPE_G) {
+                range->num_bitrates += 4;
+                range->bitrate[i++] = IEEE80211_CCK_RATE_1MB;
+                range->bitrate[i++] = IEEE80211_CCK_RATE_2MB;
+                range->bitrate[i++] = IEEE80211_CCK_RATE_5MB;
+                range->bitrate[i++] = IEEE80211_CCK_RATE_11MB;
+        }
+
+        geo = ieee80211_get_geo(bcm->ieee);
+        range->num_channels = geo->a_channels + geo->bg_channels;
+        j = 0;
+        for (i = 0; i < geo->a_channels; i++) {
+                if (j == IW_MAX_FREQUENCIES)
+                        break;
+                range->freq[j].i = j + 1;
+                range->freq[j].m = geo->a[i].freq;//FIXME?
+                range->freq[j].e = 1;
+                j++;
+        }
+        for (i = 0; i < geo->bg_channels; i++) {
+                if (j == IW_MAX_FREQUENCIES)
+                        break;
+                range->freq[j].i = j + 1;
+                range->freq[j].m = geo->bg[i].freq;//FIXME?
+                range->freq[j].e = 1;
+                j++;
+        }
+        range->num_frequency = j;
+
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_set_nick(struct net_device *net_dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *data,
+                               char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        size_t len;
+
+        bcm43xx_lock(bcm, flags);
+        len =  min((size_t)data->data.length, (size_t)IW_ESSID_MAX_SIZE);
+        memcpy(bcm->nick, extra, len);
+        bcm->nick[len] = '\0';
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_get_nick(struct net_device *net_dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *data,
+                               char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        size_t len;
+
+        bcm43xx_lock(bcm, flags);
+        len = strlen(bcm->nick) + 1;
+        memcpy(extra, bcm->nick, len);
+        data->data.length = (__u16)len;
+        data->data.flags = 1;
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_set_rts(struct net_device *net_dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *data,
+                              char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int err = -EINVAL;
+
+        bcm43xx_lock(bcm, flags);
+        if (data->rts.disabled) {
+                bcm->rts_threshold = BCM43xx_MAX_RTS_THRESHOLD;
+                err = 0;
+        } else {
+                if (data->rts.value >= BCM43xx_MIN_RTS_THRESHOLD &&
+                    data->rts.value <= BCM43xx_MAX_RTS_THRESHOLD) {
+                        bcm->rts_threshold = data->rts.value;
+                        err = 0;
+                }
+        }
+        bcm43xx_unlock(bcm, flags);
+
+        return err;
+}
+
+static int bcm43xx_wx_get_rts(struct net_device *net_dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *data,
+                              char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+
+        bcm43xx_lock(bcm, flags);
+        data->rts.value = bcm->rts_threshold;
+        data->rts.fixed = 0;
+        data->rts.disabled = (bcm->rts_threshold == BCM43xx_MAX_RTS_THRESHOLD);
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_set_frag(struct net_device *net_dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *data,
+                               char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int err = -EINVAL;
+
+        bcm43xx_lock(bcm, flags);
+        if (data->frag.disabled) {
+                bcm->ieee->fts = MAX_FRAG_THRESHOLD;
+                err = 0;
+        } else {
+                if (data->frag.value >= MIN_FRAG_THRESHOLD &&
+                    data->frag.value <= MAX_FRAG_THRESHOLD) {
+                        bcm->ieee->fts = data->frag.value & ~0x1;
+                        err = 0;
+                }
+        }
+        bcm43xx_unlock(bcm, flags);
+
+        return err;
+}
+
+static int bcm43xx_wx_get_frag(struct net_device *net_dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *data,
+                               char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+
+        bcm43xx_lock(bcm, flags);
+        data->frag.value = bcm->ieee->fts;
+        data->frag.fixed = 0;
+        data->frag.disabled = (bcm->ieee->fts == MAX_FRAG_THRESHOLD);
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *data,
+                                    char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        struct bcm43xx_radioinfo *radio;
+        struct bcm43xx_phyinfo *phy;
+        unsigned long flags;
+        int err = -ENODEV;
+        u16 maxpower;
+
+        if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
+                printk(PFX KERN_ERR "TX power not in dBm.\n");
+                return -EOPNOTSUPP;
+        }
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (!bcm->initialized)
+                goto out_unlock;
+        radio = bcm43xx_current_radio(bcm);
+        phy = bcm43xx_current_phy(bcm);
+        if (data->txpower.disabled != (!(radio->enabled))) {
+                if (data->txpower.disabled)
+                        bcm43xx_radio_turn_off(bcm);
+                else
+                        bcm43xx_radio_turn_on(bcm);
+        }
+        if (data->txpower.value > 0) {
+                /* desired and maxpower dBm values are in Q5.2 */
+                if (phy->type == BCM43xx_PHYTYPE_A)
+                        maxpower = bcm->sprom.maxpower_aphy;
+                else
+                        maxpower = bcm->sprom.maxpower_bgphy;
+                radio->txpower_desired = limit_value(data->txpower.value << 2,
+                                                     0, maxpower);
+                bcm43xx_phy_xmitpower(bcm);
+        }
+        err = 0;
+
+out_unlock:
+        bcm43xx_unlock_mmio(bcm, flags);
+
+        return err;
+}
+
+static int bcm43xx_wx_get_xmitpower(struct net_device *net_dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *data,
+                                    char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        struct bcm43xx_radioinfo *radio;
+        unsigned long flags;
+        int err = -ENODEV;
+
+        bcm43xx_lock(bcm, flags);
+        if (!bcm->initialized)
+                goto out_unlock;
+        radio = bcm43xx_current_radio(bcm);
+        /* desired dBm value is in Q5.2 */
+        data->txpower.value = radio->txpower_desired >> 2;
+        data->txpower.fixed = 1;
+        data->txpower.flags = IW_TXPOW_DBM;
+        data->txpower.disabled = !(radio->enabled);
+
+        err = 0;
+out_unlock:
+        bcm43xx_unlock(bcm, flags);
+
+        return err;
+}
+
+static int bcm43xx_wx_set_encoding(struct net_device *net_dev,
+                                   struct iw_request_info *info,
+                                   union iwreq_data *data,
+                                   char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err;
+
+        err = ieee80211_wx_set_encode(bcm->ieee, info, data, extra);
+
+        return err;
+}
+
+static int bcm43xx_wx_set_encodingext(struct net_device *net_dev,
+                                   struct iw_request_info *info,
+                                   union iwreq_data *data,
+                                   char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err;
+
+        err = ieee80211_wx_set_encodeext(bcm->ieee, info, data, extra);
+
+        return err;
+}
+
+static int bcm43xx_wx_get_encoding(struct net_device *net_dev,
+                                   struct iw_request_info *info,
+                                   union iwreq_data *data,
+                                   char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err;
+
+        err = ieee80211_wx_get_encode(bcm->ieee, info, data, extra);
+
+        return err;
+}
+
+static int bcm43xx_wx_get_encodingext(struct net_device *net_dev,
+                                   struct iw_request_info *info,
+                                   union iwreq_data *data,
+                                   char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err;
+
+        err = ieee80211_wx_get_encodeext(bcm->ieee, info, data, extra);
+
+        return err;
+}
+
+static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,
+                                     struct iw_request_info *info,
+                                     union iwreq_data *data,
+                                     char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int mode, err = 0;
+
+        mode = *((int *)extra);
+        switch (mode) {
+        case 0:
+                mode = BCM43xx_RADIO_INTERFMODE_NONE;
+                break;
+        case 1:
+                mode = BCM43xx_RADIO_INTERFMODE_NONWLAN;
+                break;
+        case 2:
+                mode = BCM43xx_RADIO_INTERFMODE_MANUALWLAN;
+                break;
+        case 3:
+                mode = BCM43xx_RADIO_INTERFMODE_AUTOWLAN;
+                break;
+        default:
+                printk(KERN_ERR PFX "set_interfmode allowed parameters are: "
+                                    "0 => None,  1 => Non-WLAN,  2 => WLAN,  "
+                                    "3 => Auto-WLAN\n");
+                return -EINVAL;
+        }
+
+        bcm43xx_lock_mmio(bcm, flags);
+        if (bcm->initialized) {
+                err = bcm43xx_radio_set_interference_mitigation(bcm, mode);
+                if (err) {
+                        printk(KERN_ERR PFX "Interference Mitigation not "
+                                            "supported by device\n");
+                }
+        } else {
+                if (mode == BCM43xx_RADIO_INTERFMODE_AUTOWLAN) {
+                        printk(KERN_ERR PFX "Interference Mitigation mode Auto-WLAN "
+                                            "not supported while the interface is down.\n");
+                        err = -ENODEV;
+                } else
+                        bcm43xx_current_radio(bcm)->interfmode = mode;
+        }
+        bcm43xx_unlock_mmio(bcm, flags);
+
+        return err;
+}
+
+static int bcm43xx_wx_get_interfmode(struct net_device *net_dev,
+                                     struct iw_request_info *info,
+                                     union iwreq_data *data,
+                                     char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int mode;
+
+        bcm43xx_lock(bcm, flags);
+        mode = bcm43xx_current_radio(bcm)->interfmode;
+        bcm43xx_unlock(bcm, flags);
+
+        switch (mode) {
+        case BCM43xx_RADIO_INTERFMODE_NONE:
+                strncpy(extra, "0 (No Interference Mitigation)", MAX_WX_STRING);
+                break;
+        case BCM43xx_RADIO_INTERFMODE_NONWLAN:
+                strncpy(extra, "1 (Non-WLAN Interference Mitigation)", MAX_WX_STRING);
+                break;
+        case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
+                strncpy(extra, "2 (WLAN Interference Mitigation)", MAX_WX_STRING);
+                break;
+        default:
+                assert(0);
+        }
+        data->data.length = strlen(extra) + 1;
+
+        return 0;
+}
+
+static int bcm43xx_wx_set_shortpreamble(struct net_device *net_dev,
+                                        struct iw_request_info *info,
+                                        union iwreq_data *data,
+                                        char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int on;
+
+        on = *((int *)extra);
+        bcm43xx_lock(bcm, flags);
+        bcm->short_preamble = !!on;
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_get_shortpreamble(struct net_device *net_dev,
+                                        struct iw_request_info *info,
+                                        union iwreq_data *data,
+                                        char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int on;
+
+        bcm43xx_lock(bcm, flags);
+        on = bcm->short_preamble;
+        bcm43xx_unlock(bcm, flags);
+
+        if (on)
+                strncpy(extra, "1 (Short Preamble enabled)", MAX_WX_STRING);
+        else
+                strncpy(extra, "0 (Short Preamble disabled)", MAX_WX_STRING);
+        data->data.length = strlen(extra) + 1;
+
+        return 0;
+}
+
+static int bcm43xx_wx_set_swencryption(struct net_device *net_dev,
+                                       struct iw_request_info *info,
+                                       union iwreq_data *data,
+                                       char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int on;
+        
+        on = *((int *)extra);
+
+        bcm43xx_lock(bcm, flags);
+        bcm->ieee->host_encrypt = !!on;
+        bcm->ieee->host_decrypt = !!on;
+        bcm->ieee->host_build_iv = !on;
+        bcm43xx_unlock(bcm, flags);
+
+        return 0;
+}
+
+static int bcm43xx_wx_get_swencryption(struct net_device *net_dev,
+                                       struct iw_request_info *info,
+                                       union iwreq_data *data,
+                                       char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        unsigned long flags;
+        int on;
+
+        bcm43xx_lock(bcm, flags);
+        on = bcm->ieee->host_encrypt;
+        bcm43xx_unlock(bcm, flags);
+
+        if (on)
+                strncpy(extra, "1 (SW encryption enabled) ", MAX_WX_STRING);
+        else
+                strncpy(extra, "0 (SW encryption disabled) ", MAX_WX_STRING);
+        data->data.length = strlen(extra + 1);
+
+        return 0;
+}
+
+/* Enough buffer to hold a hexdump of the sprom data. */
+#define SPROM_BUFFERSIZE        512
+
+static int sprom2hex(const u16 *sprom, char *dump)
+{
+        int i, pos = 0;
+
+        for (i = 0; i < BCM43xx_SPROM_SIZE; i++) {
+                pos += snprintf(dump + pos, SPROM_BUFFERSIZE - pos - 1,
+                                "%04X", swab16(sprom[i]) & 0xFFFF);
+        }
+
+        return pos + 1;
+}
+
+static int hex2sprom(u16 *sprom, const char *dump, unsigned int len)
+{
+        char tmp[5] = { 0 };
+        int cnt = 0;
+        unsigned long parsed;
+
+        if (len < BCM43xx_SPROM_SIZE * sizeof(u16) * 2)
+                return -EINVAL;
+        while (cnt < BCM43xx_SPROM_SIZE) {
+                memcpy(tmp, dump, 4);
+                dump += 4;
+                parsed = simple_strtoul(tmp, NULL, 16);
+                sprom[cnt++] = swab16((u16)parsed);
+        }
+
+        return 0;
+}
+
+static int bcm43xx_wx_sprom_read(struct net_device *net_dev,
+                                 struct iw_request_info *info,
+                                 union iwreq_data *data,
+                                 char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err = -EPERM;
+        u16 *sprom;
+        unsigned long flags;
+
+        if (!capable(CAP_SYS_RAWIO))
+                goto out;
+
+        err = -ENOMEM;
+        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
+                        GFP_KERNEL);
+        if (!sprom)
+                goto out;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        err = -ENODEV;
+        if (bcm->initialized)
+                err = bcm43xx_sprom_read(bcm, sprom);
+        bcm43xx_unlock_mmio(bcm, flags);
+        if (!err)
+                data->data.length = sprom2hex(sprom, extra);
+        kfree(sprom);
+out:
+        return err;
+}
+
+static int bcm43xx_wx_sprom_write(struct net_device *net_dev,
+                                  struct iw_request_info *info,
+                                  union iwreq_data *data,
+                                  char *extra)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        int err = -EPERM;
+        u16 *sprom;
+        unsigned long flags;
+        char *input;
+        unsigned int len;
+
+        if (!capable(CAP_SYS_RAWIO))
+                goto out;
+
+        err = -ENOMEM;
+        sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
+                        GFP_KERNEL);
+        if (!sprom)
+                goto out;
+
+        len = data->data.length;
+        extra[len - 1] = '\0';
+        input = strchr(extra, ':');
+        if (input) {
+                input++;
+                len -= input - extra;
+        } else
+                input = extra;
+        err = hex2sprom(sprom, input, len);
+        if (err)
+                goto out_kfree;
+
+        bcm43xx_lock_mmio(bcm, flags);
+        err = -ENODEV;
+        if (bcm->initialized)
+                err = bcm43xx_sprom_write(bcm, sprom);
+        bcm43xx_unlock_mmio(bcm, flags);
+out_kfree:
+        kfree(sprom);
+out:
+        return err;
+}
+
+/* Get wireless statistics.  Called by /proc/net/wireless and by SIOCGIWSTATS */
+
+static struct iw_statistics *bcm43xx_get_wireless_stats(struct net_device *net_dev)
+{
+        struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+        struct ieee80211softmac_device *mac = ieee80211_priv(net_dev);
+        struct iw_statistics *wstats;
+
+        wstats = &bcm->stats.wstats;
+        if (!mac->associated) {
+                wstats->miss.beacon = 0;
+//              bcm->ieee->ieee_stats.tx_retry_limit_exceeded = 0; // FIXME: should this be cleared here?
+                wstats->discard.retries = 0;
+//              bcm->ieee->ieee_stats.tx_discards_wrong_sa = 0; // FIXME: same question
+                wstats->discard.nwid = 0;
+//              bcm->ieee->ieee_stats.rx_discards_undecryptable = 0; // FIXME: ditto
+                wstats->discard.code = 0;
+//              bcm->ieee->ieee_stats.rx_fragments = 0;  // FIXME: same here
+                wstats->discard.fragment = 0;
+                wstats->discard.misc = 0;
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+                wstats->qual.noise = 0;
+                wstats->qual.updated = 7;
+                wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
+                        IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+                return wstats;
+        }
+        /* fill in the real statistics when iface associated */
+        wstats->qual.qual = 100;     // TODO: get the real signal quality
+        wstats->qual.level = 3 - bcm->stats.link_quality;
+        wstats->qual.noise = bcm->stats.noise;
+        wstats->qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |
+                        IW_QUAL_NOISE_UPDATED;
+        wstats->discard.code = bcm->ieee->ieee_stats.rx_discards_undecryptable;
+        wstats->discard.retries = bcm->ieee->ieee_stats.tx_retry_limit_exceeded;
+        wstats->discard.nwid = bcm->ieee->ieee_stats.tx_discards_wrong_sa;
+        wstats->discard.fragment = bcm->ieee->ieee_stats.rx_fragments;
+        wstats->discard.misc = 0;       // FIXME
+        wstats->miss.beacon = 0;        // FIXME
+        return wstats;
+}
+
+
+#ifdef WX
+# undef WX
+#endif
+#define WX(ioctl)  [(ioctl) - SIOCSIWCOMMIT]
+static const iw_handler bcm43xx_wx_handlers[] = {
+        /* Wireless Identification */
+        WX(SIOCGIWNAME)         = bcm43xx_wx_get_name,
+        /* Basic operations */
+        WX(SIOCSIWFREQ)         = bcm43xx_wx_set_channelfreq,
+        WX(SIOCGIWFREQ)         = bcm43xx_wx_get_channelfreq,
+        WX(SIOCSIWMODE)         = bcm43xx_wx_set_mode,
+        WX(SIOCGIWMODE)         = bcm43xx_wx_get_mode,
+        /* Informative stuff */
+        WX(SIOCGIWRANGE)        = bcm43xx_wx_get_rangeparams,
+        /* Access Point manipulation */
+        WX(SIOCSIWAP)           = ieee80211softmac_wx_set_wap,
+        WX(SIOCGIWAP)           = ieee80211softmac_wx_get_wap,
+        WX(SIOCSIWSCAN)         = ieee80211softmac_wx_trigger_scan,
+        WX(SIOCGIWSCAN)         = ieee80211softmac_wx_get_scan_results,
+        /* 802.11 specific support */
+        WX(SIOCSIWESSID)        = ieee80211softmac_wx_set_essid,
+        WX(SIOCGIWESSID)        = ieee80211softmac_wx_get_essid,
+        WX(SIOCSIWNICKN)        = bcm43xx_wx_set_nick,
+        WX(SIOCGIWNICKN)        = bcm43xx_wx_get_nick,
+        /* Other parameters */
+        WX(SIOCSIWRATE)         = ieee80211softmac_wx_set_rate,
+        WX(SIOCGIWRATE)         = ieee80211softmac_wx_get_rate,
+        WX(SIOCSIWRTS)          = bcm43xx_wx_set_rts,
+        WX(SIOCGIWRTS)          = bcm43xx_wx_get_rts,
+        WX(SIOCSIWFRAG)         = bcm43xx_wx_set_frag,
+        WX(SIOCGIWFRAG)         = bcm43xx_wx_get_frag,
+        WX(SIOCSIWTXPOW)        = bcm43xx_wx_set_xmitpower,
+        WX(SIOCGIWTXPOW)        = bcm43xx_wx_get_xmitpower,
+//TODO  WX(SIOCSIWRETRY)        = bcm43xx_wx_set_retry,
+//TODO  WX(SIOCGIWRETRY)        = bcm43xx_wx_get_retry,
+        /* Encoding */
+        WX(SIOCSIWENCODE)       = bcm43xx_wx_set_encoding,
+        WX(SIOCGIWENCODE)       = bcm43xx_wx_get_encoding,
+        WX(SIOCSIWENCODEEXT)    = bcm43xx_wx_set_encodingext,
+        WX(SIOCGIWENCODEEXT)    = bcm43xx_wx_get_encodingext,
+        /* Power saving */
+//TODO  WX(SIOCSIWPOWER)        = bcm43xx_wx_set_power,
+//TODO  WX(SIOCGIWPOWER)        = bcm43xx_wx_get_power,
+        WX(SIOCSIWGENIE)        = ieee80211softmac_wx_set_genie,
+        WX(SIOCGIWGENIE)        = ieee80211softmac_wx_get_genie,
+        WX(SIOCSIWAUTH)         = ieee80211_wx_set_auth,
+        WX(SIOCGIWAUTH)         = ieee80211_wx_get_auth,
+};
+#undef WX
+
+static const iw_handler bcm43xx_priv_wx_handlers[] = {
+        /* Set Interference Mitigation Mode. */
+        bcm43xx_wx_set_interfmode,
+        /* Get Interference Mitigation Mode. */
+        bcm43xx_wx_get_interfmode,
+        /* Enable/Disable Short Preamble mode. */
+        bcm43xx_wx_set_shortpreamble,
+        /* Get Short Preamble mode. */
+        bcm43xx_wx_get_shortpreamble,
+        /* Enable/Disable Software Encryption mode */
+        bcm43xx_wx_set_swencryption,
+        /* Get Software Encryption mode */
+        bcm43xx_wx_get_swencryption,
+        /* Write SRPROM data. */
+        bcm43xx_wx_sprom_write,
+        /* Read SPROM data. */
+        bcm43xx_wx_sprom_read,
+};
+
+#define PRIV_WX_SET_INTERFMODE          (SIOCIWFIRSTPRIV + 0)
+#define PRIV_WX_GET_INTERFMODE          (SIOCIWFIRSTPRIV + 1)
+#define PRIV_WX_SET_SHORTPREAMBLE       (SIOCIWFIRSTPRIV + 2)
+#define PRIV_WX_GET_SHORTPREAMBLE       (SIOCIWFIRSTPRIV + 3)
+#define PRIV_WX_SET_SWENCRYPTION        (SIOCIWFIRSTPRIV + 4)
+#define PRIV_WX_GET_SWENCRYPTION        (SIOCIWFIRSTPRIV + 5)
+#define PRIV_WX_SPROM_WRITE             (SIOCIWFIRSTPRIV + 6)
+#define PRIV_WX_SPROM_READ              (SIOCIWFIRSTPRIV + 7)
+
+#define PRIV_WX_DUMMY(ioctl)    \
+        {                                       \
+                .cmd            = (ioctl),      \
+                .name           = "__unused"    \
+        }
+
+static const struct iw_priv_args bcm43xx_priv_wx_args[] = {
+        {
+                .cmd            = PRIV_WX_SET_INTERFMODE,
+                .set_args       = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+                .name           = "set_interfmode",
+        },
+        {
+                .cmd            = PRIV_WX_GET_INTERFMODE,
+                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+                .name           = "get_interfmode",
+        },
+        {
+                .cmd            = PRIV_WX_SET_SHORTPREAMBLE,
+                .set_args       = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+                .name           = "set_shortpreambl",
+        },
+        {
+                .cmd            = PRIV_WX_GET_SHORTPREAMBLE,
+                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+                .name           = "get_shortpreambl",
+        },
+        {
+                .cmd            = PRIV_WX_SET_SWENCRYPTION,
+                .set_args       = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+                .name           = "set_swencryption",
+        },
+        {
+                .cmd            = PRIV_WX_GET_SWENCRYPTION,
+                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+                .name           = "get_swencryption",
+        },
+        {
+                .cmd            = PRIV_WX_SPROM_WRITE,
+                .set_args       = IW_PRIV_TYPE_CHAR | SPROM_BUFFERSIZE,
+                .name           = "write_sprom",
+        },
+        {
+                .cmd            = PRIV_WX_SPROM_READ,
+                .get_args       = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | SPROM_BUFFERSIZE,
+                .name           = "read_sprom",
+        },
+};
+
+const struct iw_handler_def bcm43xx_wx_handlers_def = {
+        .standard               = bcm43xx_wx_handlers,
+        .num_standard           = ARRAY_SIZE(bcm43xx_wx_handlers),
+        .num_private            = ARRAY_SIZE(bcm43xx_priv_wx_handlers),
+        .num_private_args       = ARRAY_SIZE(bcm43xx_priv_wx_args),
+        .private                = bcm43xx_priv_wx_handlers,
+        .private_args           = bcm43xx_priv_wx_args,
+        .get_wireless_stats     = bcm43xx_get_wireless_stats,
+};
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.h b/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
new file mode 100644
index 000000000000..1f29ff3aa4c3
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
@@ -0,0 +1,36 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef BCM43xx_WX_H_
+#define BCM43xx_WX_H_
+
+extern const struct iw_handler_def bcm43xx_wx_handlers_def;
+
+#endif /* BCM43xx_WX_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
new file mode 100644
index 000000000000..d8ece28c079f
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -0,0 +1,582 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Transmission (TX/RX) related functions.
+
+  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
+                     Stefano Brivio <st3@riseup.net>
+                     Michael Buesch <mbuesch@freenet.de>
+                     Danny van Dyk <kugelfang@gentoo.org>
+                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
+
+  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 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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx_xmit.h"
+
+#include <linux/etherdevice.h>
+
+
+/* Extract the bitrate out of a CCK PLCP header. */
+static u8 bcm43xx_plcp_get_bitrate_cck(struct bcm43xx_plcp_hdr4 *plcp)
+{
+        switch (plcp->raw[0]) {
+        case 0x0A:
+                return IEEE80211_CCK_RATE_1MB;
+        case 0x14:
+                return IEEE80211_CCK_RATE_2MB;
+        case 0x37:
+                return IEEE80211_CCK_RATE_5MB;
+        case 0x6E:
+                return IEEE80211_CCK_RATE_11MB;
+        }
+        assert(0);
+        return 0;
+}
+
+/* Extract the bitrate out of an OFDM PLCP header. */
+static u8 bcm43xx_plcp_get_bitrate_ofdm(struct bcm43xx_plcp_hdr4 *plcp)
+{
+        switch (plcp->raw[0] & 0xF) {
+        case 0xB:
+                return IEEE80211_OFDM_RATE_6MB;
+        case 0xF:
+                return IEEE80211_OFDM_RATE_9MB;
+        case 0xA:
+                return IEEE80211_OFDM_RATE_12MB;
+        case 0xE:
+                return IEEE80211_OFDM_RATE_18MB;
+        case 0x9:
+                return IEEE80211_OFDM_RATE_24MB;
+        case 0xD:
+                return IEEE80211_OFDM_RATE_36MB;
+        case 0x8:
+                return IEEE80211_OFDM_RATE_48MB;
+        case 0xC:
+                return IEEE80211_OFDM_RATE_54MB;
+        }
+        assert(0);
+        return 0;
+}
+
+u8 bcm43xx_plcp_get_ratecode_cck(const u8 bitrate)
+{
+        switch (bitrate) {
+        case IEEE80211_CCK_RATE_1MB:
+                return 0x0A;
+        case IEEE80211_CCK_RATE_2MB:
+                return 0x14;
+        case IEEE80211_CCK_RATE_5MB:
+                return 0x37;
+        case IEEE80211_CCK_RATE_11MB:
+                return 0x6E;
+        }
+        assert(0);
+        return 0;
+}
+
+u8 bcm43xx_plcp_get_ratecode_ofdm(const u8 bitrate)
+{
+        switch (bitrate) {
+        case IEEE80211_OFDM_RATE_6MB:
+                return 0xB;
+        case IEEE80211_OFDM_RATE_9MB:
+                return 0xF;
+        case IEEE80211_OFDM_RATE_12MB:
+                return 0xA;
+        case IEEE80211_OFDM_RATE_18MB:
+                return 0xE;
+        case IEEE80211_OFDM_RATE_24MB:
+                return 0x9;
+        case IEEE80211_OFDM_RATE_36MB:
+                return 0xD;
+        case IEEE80211_OFDM_RATE_48MB:
+                return 0x8;
+        case IEEE80211_OFDM_RATE_54MB:
+                return 0xC;
+        }
+        assert(0);
+        return 0;
+}
+
+static void bcm43xx_generate_plcp_hdr(struct bcm43xx_plcp_hdr4 *plcp,
+                                      const u16 octets, const u8 bitrate,
+                                      const int ofdm_modulation)
+{
+        __le32 *data = &(plcp->data);
+        __u8 *raw = plcp->raw;
+
+        if (ofdm_modulation) {
+                *data = bcm43xx_plcp_get_ratecode_ofdm(bitrate);
+                assert(!(octets & 0xF000));
+                *data |= (octets << 5);
+                *data = cpu_to_le32(*data);
+        } else {
+                u32 plen;
+
+                plen = octets * 16 / bitrate;
+                if ((octets * 16 % bitrate) > 0) {
+                        plen++;
+                        if ((bitrate == IEEE80211_CCK_RATE_11MB)
+                            && ((octets * 8 % 11) < 4)) {
+                                raw[1] = 0x84;
+                        } else
+                                raw[1] = 0x04;
+                } else
+                        raw[1] = 0x04;
+                *data |= cpu_to_le32(plen << 16);
+                raw[0] = bcm43xx_plcp_get_ratecode_cck(bitrate);
+        }
+}
+
+static u8 bcm43xx_calc_fallback_rate(u8 bitrate)
+{
+        switch (bitrate) {
+        case IEEE80211_CCK_RATE_1MB:
+                return IEEE80211_CCK_RATE_1MB;
+        case IEEE80211_CCK_RATE_2MB:
+                return IEEE80211_CCK_RATE_1MB;
+        case IEEE80211_CCK_RATE_5MB:
+                return IEEE80211_CCK_RATE_2MB;
+        case IEEE80211_CCK_RATE_11MB:
+                return IEEE80211_CCK_RATE_5MB;
+        case IEEE80211_OFDM_RATE_6MB:
+                return IEEE80211_CCK_RATE_5MB;
+        case IEEE80211_OFDM_RATE_9MB:
+                return IEEE80211_OFDM_RATE_6MB;
+        case IEEE80211_OFDM_RATE_12MB:
+                return IEEE80211_OFDM_RATE_9MB;
+        case IEEE80211_OFDM_RATE_18MB:
+                return IEEE80211_OFDM_RATE_12MB;
+        case IEEE80211_OFDM_RATE_24MB:
+                return IEEE80211_OFDM_RATE_18MB;
+        case IEEE80211_OFDM_RATE_36MB:
+                return IEEE80211_OFDM_RATE_24MB;
+        case IEEE80211_OFDM_RATE_48MB:
+                return IEEE80211_OFDM_RATE_36MB;
+        case IEEE80211_OFDM_RATE_54MB:
+                return IEEE80211_OFDM_RATE_48MB;
+        }
+        assert(0);
+        return 0;
+}
+
+static
+__le16 bcm43xx_calc_duration_id(const struct ieee80211_hdr *wireless_header,
+                                u8 bitrate)
+{
+        const u16 frame_ctl = le16_to_cpu(wireless_header->frame_ctl);
+        __le16 duration_id = wireless_header->duration_id;
+
+        switch (WLAN_FC_GET_TYPE(frame_ctl)) {
+        case IEEE80211_FTYPE_DATA:
+        case IEEE80211_FTYPE_MGMT:
+                //TODO: Steal the code from ieee80211, once it is completed there.
+                break;
+        case IEEE80211_FTYPE_CTL:
+                /* Use the original duration/id. */
+                break;
+        default:
+                assert(0);
+        }
+
+        return duration_id;
+}
+
+static inline
+u16 ceiling_div(u16 dividend, u16 divisor)
+{
+        return ((dividend + divisor - 1) / divisor);
+}
+
+static void bcm43xx_generate_rts(const struct bcm43xx_phyinfo *phy,
+                                 struct bcm43xx_txhdr *txhdr,
+                                 u16 *flags,
+                                 u8 bitrate,
+                                 const struct ieee80211_hdr_4addr *wlhdr)
+{
+        u16 fctl;
+        u16 dur;
+        u8 fallback_bitrate;
+        int ofdm_modulation;
+        int fallback_ofdm_modulation;
+//      u8 *sa, *da;
+        u16 flen;
+
+//FIXME sa = ieee80211_get_SA((struct ieee80211_hdr *)wlhdr);
+//FIXME da = ieee80211_get_DA((struct ieee80211_hdr *)wlhdr);
+        fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate);
+        ofdm_modulation = !(ieee80211_is_cck_rate(bitrate));
+        fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));
+
+        flen = sizeof(u16) + sizeof(u16) + ETH_ALEN + ETH_ALEN + IEEE80211_FCS_LEN,
+        bcm43xx_generate_plcp_hdr((struct bcm43xx_plcp_hdr4 *)(&txhdr->rts_cts_plcp),
+                                  flen, bitrate,
+                                  !ieee80211_is_cck_rate(bitrate));
+        bcm43xx_generate_plcp_hdr((struct bcm43xx_plcp_hdr4 *)(&txhdr->rts_cts_fallback_plcp),
+                                  flen, fallback_bitrate,
+                                  !ieee80211_is_cck_rate(fallback_bitrate));
+        fctl = IEEE80211_FTYPE_CTL;
+        fctl |= IEEE80211_STYPE_RTS;
+        dur = le16_to_cpu(wlhdr->duration_id);
+/*FIXME: should we test for dur==0 here and let it unmodified in this case?
+ *       The following assert checks for this case...
+ */
+assert(dur);
+/*FIXME: The duration calculation is not really correct.
+ *       I am not 100% sure which bitrate to use. We use the RTS rate here,
+ *       but this is likely to be wrong.
+ */
+        if (phy->type == BCM43xx_PHYTYPE_A) {
+                /* Three times SIFS */
+                dur += 16 * 3;
+                /* Add ACK duration. */
+                dur += ceiling_div((16 + 8 * (14 /*bytes*/) + 6) * 10,
+                                   bitrate * 4);
+                /* Add CTS duration. */
+                dur += ceiling_div((16 + 8 * (14 /*bytes*/) + 6) * 10,
+                                   bitrate * 4);
+        } else {
+                /* Three times SIFS */
+                dur += 10 * 3;
+                /* Add ACK duration. */
+                dur += ceiling_div(8 * (14 /*bytes*/) * 10,
+                                   bitrate);
+                /* Add CTS duration. */
+                dur += ceiling_div(8 * (14 /*bytes*/) * 10,
+                                   bitrate);
+        }
+
+        txhdr->rts_cts_frame_control = cpu_to_le16(fctl);
+        txhdr->rts_cts_dur = cpu_to_le16(dur);
+//printk(BCM43xx_MACFMT "  " BCM43xx_MACFMT "  " BCM43xx_MACFMT "\n", BCM43xx_MACARG(wlhdr->addr1), BCM43xx_MACARG(wlhdr->addr2), BCM43xx_MACARG(wlhdr->addr3));
+//printk(BCM43xx_MACFMT "  " BCM43xx_MACFMT "\n", BCM43xx_MACARG(sa), BCM43xx_MACARG(da));
+        memcpy(txhdr->rts_cts_mac1, wlhdr->addr1, ETH_ALEN);//FIXME!
+//      memcpy(txhdr->rts_cts_mac2, sa, ETH_ALEN);
+
+        *flags |= BCM43xx_TXHDRFLAG_RTSCTS;
+        *flags |= BCM43xx_TXHDRFLAG_RTS;
+        if (ofdm_modulation)
+                *flags |= BCM43xx_TXHDRFLAG_RTSCTS_OFDM;
+        if (fallback_ofdm_modulation)
+                *flags |= BCM43xx_TXHDRFLAG_RTSCTSFALLBACK_OFDM;
+}
+                                 
+void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
+                            struct bcm43xx_txhdr *txhdr,
+                            const unsigned char *fragment_data,
+                            const unsigned int fragment_len,
+                            const int is_first_fragment,
+                            const u16 cookie)
+{
+        const struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        const struct ieee80211_hdr_4addr *wireless_header = (const struct ieee80211_hdr_4addr *)fragment_data;
+        const struct ieee80211_security *secinfo = &bcm->ieee->sec;
+        u8 bitrate;
+        u8 fallback_bitrate;
+        int ofdm_modulation;
+        int fallback_ofdm_modulation;
+        u16 plcp_fragment_len = fragment_len;
+        u16 flags = 0;
+        u16 control = 0;
+        u16 wsec_rate = 0;
+        u16 encrypt_frame;
+
+        /* Now construct the TX header. */
+        memset(txhdr, 0, sizeof(*txhdr));
+
+        bitrate = bcm->softmac->txrates.default_rate;
+        ofdm_modulation = !(ieee80211_is_cck_rate(bitrate));
+        fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate);
+        fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));
+
+        /* Set Frame Control from 80211 header. */
+        txhdr->frame_control = wireless_header->frame_ctl;
+        /* Copy address1 from 80211 header. */
+        memcpy(txhdr->mac1, wireless_header->addr1, 6);
+        /* Set the fallback duration ID. */
+        txhdr->fallback_dur_id = bcm43xx_calc_duration_id((const struct ieee80211_hdr *)wireless_header,
+                                                          fallback_bitrate);
+        /* Set the cookie (used as driver internal ID for the frame) */
+        txhdr->cookie = cpu_to_le16(cookie);
+
+        /* Hardware appends FCS. */
+        plcp_fragment_len += IEEE80211_FCS_LEN;
+
+        /* Hardware encryption. */
+        encrypt_frame = le16_to_cpup(&wireless_header->frame_ctl) & IEEE80211_FCTL_PROTECTED;
+        if (encrypt_frame && !bcm->ieee->host_encrypt) {
+                const struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *)wireless_header;
+                memcpy(txhdr->wep_iv, hdr->payload, 4);
+                /* Hardware appends ICV. */
+                plcp_fragment_len += 4;
+
+                wsec_rate |= (bcm->key[secinfo->active_key].algorithm << BCM43xx_TXHDR_WSEC_ALGO_SHIFT)
+                             & BCM43xx_TXHDR_WSEC_ALGO_MASK;
+                wsec_rate |= (secinfo->active_key << BCM43xx_TXHDR_WSEC_KEYINDEX_SHIFT)
+                             & BCM43xx_TXHDR_WSEC_KEYINDEX_MASK;
+        }
+
+        /* Generate the PLCP header and the fallback PLCP header. */
+        bcm43xx_generate_plcp_hdr((struct bcm43xx_plcp_hdr4 *)(&txhdr->plcp),
+                                  plcp_fragment_len,
+                                  bitrate, ofdm_modulation);
+        bcm43xx_generate_plcp_hdr(&txhdr->fallback_plcp, plcp_fragment_len,
+                                  fallback_bitrate, fallback_ofdm_modulation);
+
+        /* Set the CONTROL field */
+        if (ofdm_modulation)
+                control |= BCM43xx_TXHDRCTL_OFDM;
+        if (bcm->short_preamble) //FIXME: could be the other way around, please test
+                control |= BCM43xx_TXHDRCTL_SHORT_PREAMBLE;
+        control |= (phy->antenna_diversity << BCM43xx_TXHDRCTL_ANTENNADIV_SHIFT)
+                   & BCM43xx_TXHDRCTL_ANTENNADIV_MASK;
+
+        /* Set the FLAGS field */
+        if (!is_multicast_ether_addr(wireless_header->addr1) &&
+            !is_broadcast_ether_addr(wireless_header->addr1))
+                flags |= BCM43xx_TXHDRFLAG_EXPECTACK;
+        if (1 /* FIXME: PS poll?? */)
+                flags |= 0x10; // FIXME: unknown meaning.
+        if (fallback_ofdm_modulation)
+                flags |= BCM43xx_TXHDRFLAG_FALLBACKOFDM;
+        if (is_first_fragment)
+                flags |= BCM43xx_TXHDRFLAG_FIRSTFRAGMENT;
+
+        /* Set WSEC/RATE field */
+        wsec_rate |= (txhdr->plcp.raw[0] << BCM43xx_TXHDR_RATE_SHIFT)
+                     & BCM43xx_TXHDR_RATE_MASK;
+
+        /* Generate the RTS/CTS packet, if required. */
+        /* FIXME: We should first try with CTS-to-self,
+         *        if we are on 80211g. If we get too many
+         *        failures (hidden nodes), we should switch back to RTS/CTS.
+         */
+        if (0/*FIXME txctl->use_rts_cts*/) {
+                bcm43xx_generate_rts(phy, txhdr, &flags,
+                                     0/*FIXME txctl->rts_cts_rate*/,
+                                     wireless_header);
+        }
+
+        txhdr->flags = cpu_to_le16(flags);
+        txhdr->control = cpu_to_le16(control);
+        txhdr->wsec_rate = cpu_to_le16(wsec_rate);
+}
+
+static s8 bcm43xx_rssi_postprocess(struct bcm43xx_private *bcm,
+                                   u8 in_rssi, int ofdm,
+                                   int adjust_2053, int adjust_2050)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        s32 tmp;
+
+        switch (radio->version) {
+        case 0x2050:
+                if (ofdm) {
+                        tmp = in_rssi;
+                        if (tmp > 127)
+                                tmp -= 256;
+                        tmp *= 73;
+                        tmp /= 64;
+                        if (adjust_2050)
+                                tmp += 25;
+                        else
+                                tmp -= 3;
+                } else {
+                        if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
+                                if (in_rssi > 63)
+                                        in_rssi = 63;
+                                tmp = radio->nrssi_lt[in_rssi];
+                                tmp = 31 - tmp;
+                                tmp *= -131;
+                                tmp /= 128;
+                                tmp -= 57;
+                        } else {
+                                tmp = in_rssi;
+                                tmp = 31 - tmp;
+                                tmp *= -149;
+                                tmp /= 128;
+                                tmp -= 68;
+                        }
+                        if (phy->type == BCM43xx_PHYTYPE_G &&
+                            adjust_2050)
+                                tmp += 25;
+                }
+                break;
+        case 0x2060:
+                if (in_rssi > 127)
+                        tmp = in_rssi - 256;
+                else
+                        tmp = in_rssi;
+                break;
+        default:
+                tmp = in_rssi;
+                tmp -= 11;
+                tmp *= 103;
+                tmp /= 64;
+                if (adjust_2053)
+                        tmp -= 109;
+                else
+                        tmp -= 83;
+        }
+
+        return (s8)tmp;
+}
+
+//TODO
+#if 0
+static s8 bcm43xx_rssinoise_postprocess(struct bcm43xx_private *bcm,
+                                        u8 in_rssi)
+{
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        s8 ret;
+
+        if (phy->type == BCM43xx_PHYTYPE_A) {
+                //TODO: Incomplete specs.
+                ret = 0;
+        } else
+                ret = bcm43xx_rssi_postprocess(bcm, in_rssi, 0, 1, 1);
+
+        return ret;
+}
+#endif
+
+int bcm43xx_rx(struct bcm43xx_private *bcm,
+               struct sk_buff *skb,
+               struct bcm43xx_rxhdr *rxhdr)
+{
+        struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        struct bcm43xx_plcp_hdr4 *plcp;
+        struct ieee80211_rx_stats stats;
+        struct ieee80211_hdr_4addr *wlhdr;
+        u16 frame_ctl;
+        int is_packet_for_us = 0;
+        int err = -EINVAL;
+        const u16 rxflags1 = le16_to_cpu(rxhdr->flags1);
+        const u16 rxflags2 = le16_to_cpu(rxhdr->flags2);
+        const u16 rxflags3 = le16_to_cpu(rxhdr->flags3);
+        const int is_ofdm = !!(rxflags1 & BCM43xx_RXHDR_FLAGS1_OFDM);
+
+        if (rxflags2 & BCM43xx_RXHDR_FLAGS2_TYPE2FRAME) {
+                plcp = (struct bcm43xx_plcp_hdr4 *)(skb->data + 2);
+                /* Skip two unknown bytes and the PLCP header. */
+                skb_pull(skb, 2 + sizeof(struct bcm43xx_plcp_hdr6));
+        } else {
+                plcp = (struct bcm43xx_plcp_hdr4 *)(skb->data);
+                /* Skip the PLCP header. */
+                skb_pull(skb, sizeof(struct bcm43xx_plcp_hdr6));
+        }
+        /* The SKB contains the PAYLOAD (wireless header + data)
+         * at this point. The FCS at the end is stripped.
+         */
+
+        memset(&stats, 0, sizeof(stats));
+        stats.mac_time = le16_to_cpu(rxhdr->mactime);
+        stats.rssi = bcm43xx_rssi_postprocess(bcm, rxhdr->rssi, is_ofdm,
+                                              !!(rxflags1 & BCM43xx_RXHDR_FLAGS1_2053RSSIADJ),
+                                              !!(rxflags3 & BCM43xx_RXHDR_FLAGS3_2050RSSIADJ));
+        stats.signal = rxhdr->signal_quality;   //FIXME
+//TODO  stats.noise = 
+        if (is_ofdm)
+                stats.rate = bcm43xx_plcp_get_bitrate_ofdm(plcp);
+        else
+                stats.rate = bcm43xx_plcp_get_bitrate_cck(plcp);
+//printk("RX ofdm %d, rate == %u\n", is_ofdm, stats.rate);
+        stats.received_channel = radio->channel;
+//TODO  stats.control = 
+        stats.mask = IEEE80211_STATMASK_SIGNAL |
+//TODO               IEEE80211_STATMASK_NOISE |
+                     IEEE80211_STATMASK_RATE |
+                     IEEE80211_STATMASK_RSSI;
+        if (phy->type == BCM43xx_PHYTYPE_A)
+                stats.freq = IEEE80211_52GHZ_BAND;
+        else
+                stats.freq = IEEE80211_24GHZ_BAND;
+        stats.len = skb->len;
+
+        bcm->stats.last_rx = jiffies;
+        if (bcm->ieee->iw_mode == IW_MODE_MONITOR) {
+                err = ieee80211_rx(bcm->ieee, skb, &stats);
+                return (err == 0) ? -EINVAL : 0;
+        }
+
+        wlhdr = (struct ieee80211_hdr_4addr *)(skb->data);
+
+        switch (bcm->ieee->iw_mode) {
+        case IW_MODE_ADHOC:
+                if (memcmp(wlhdr->addr1, bcm->net_dev->dev_addr, ETH_ALEN) == 0 ||
+                    memcmp(wlhdr->addr3, bcm->ieee->bssid, ETH_ALEN) == 0 ||
+                    is_broadcast_ether_addr(wlhdr->addr1) ||
+                    is_multicast_ether_addr(wlhdr->addr1) ||
+                    bcm->net_dev->flags & IFF_PROMISC)
+                        is_packet_for_us = 1;
+                break;
+        case IW_MODE_INFRA:
+        default:
+                /* When receiving multicast or broadcast packets, filter out
+                   the packets we send ourself; we shouldn't see those */
+                if (memcmp(wlhdr->addr3, bcm->ieee->bssid, ETH_ALEN) == 0 ||
+                    memcmp(wlhdr->addr1, bcm->net_dev->dev_addr, ETH_ALEN) == 0 ||
+                    (memcmp(wlhdr->addr3, bcm->net_dev->dev_addr, ETH_ALEN) &&
+                     (is_broadcast_ether_addr(wlhdr->addr1) ||
+                      is_multicast_ether_addr(wlhdr->addr1) ||
+                      bcm->net_dev->flags & IFF_PROMISC)))
+                        is_packet_for_us = 1;
+                break;
+        }
+
+        frame_ctl = le16_to_cpu(wlhdr->frame_ctl);
+        if ((frame_ctl & IEEE80211_FCTL_PROTECTED) && !bcm->ieee->host_decrypt) {
+                frame_ctl &= ~IEEE80211_FCTL_PROTECTED;
+                wlhdr->frame_ctl = cpu_to_le16(frame_ctl);              
+                /* trim IV and ICV */
+                /* FIXME: this must be done only for WEP encrypted packets */
+                if (skb->len < 32) {
+                        dprintkl(KERN_ERR PFX "RX packet dropped (PROTECTED flag "
+                                              "set and length < 32)\n");
+                        return -EINVAL;
+                } else {                
+                        memmove(skb->data + 4, skb->data, 24);
+                        skb_pull(skb, 4);
+                        skb_trim(skb, skb->len - 4);
+                        stats.len -= 8;
+                }
+                wlhdr = (struct ieee80211_hdr_4addr *)(skb->data);
+        }
+        
+        switch (WLAN_FC_GET_TYPE(frame_ctl)) {
+        case IEEE80211_FTYPE_MGMT:
+                ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats);
+                break;
+        case IEEE80211_FTYPE_DATA:
+                if (is_packet_for_us) {
+                        err = ieee80211_rx(bcm->ieee, skb, &stats);
+                        err = (err == 0) ? -EINVAL : 0;
+                }
+                break;
+        case IEEE80211_FTYPE_CTL:
+                break;
+        default:
+                assert(0);
+                return -EINVAL;
+        }
+
+        return err;
+}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
new file mode 100644
index 000000000000..2aed19e35c77
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
@@ -0,0 +1,156 @@
+#ifndef BCM43xx_XMIT_H_
+#define BCM43xx_XMIT_H_
+
+#include "bcm43xx_main.h"
+
+
+#define _bcm43xx_declare_plcp_hdr(size) \
+        struct bcm43xx_plcp_hdr##size {         \
+                union {                         \
+                        __le32 data;            \
+                        __u8 raw[size];         \
+                } __attribute__((__packed__));  \
+        } __attribute__((__packed__))
+
+/* struct bcm43xx_plcp_hdr4 */
+_bcm43xx_declare_plcp_hdr(4);
+/* struct bcm43xx_plcp_hdr6 */
+_bcm43xx_declare_plcp_hdr(6);
+
+#undef _bcm43xx_declare_plcp_hdr
+
+/* Device specific TX header. To be prepended to TX frames. */
+struct bcm43xx_txhdr {
+        union {
+                struct {
+                        __le16 flags;
+                        __le16 wsec_rate;
+                        __le16 frame_control;
+                        u16 unknown_zeroed_0;
+                        __le16 control;
+                        u8 wep_iv[10];
+                        u8 unknown_wsec_tkip_data[3]; //FIXME
+                        PAD_BYTES(3);
+                        u8 mac1[6];
+                        u16 unknown_zeroed_1;
+                        struct bcm43xx_plcp_hdr4 rts_cts_fallback_plcp;
+                        __le16 rts_cts_dur_fallback;
+                        struct bcm43xx_plcp_hdr4 fallback_plcp;
+                        __le16 fallback_dur_id;
+                        PAD_BYTES(2);
+                        __le16 cookie;
+                        __le16 unknown_scb_stuff; //FIXME
+                        struct bcm43xx_plcp_hdr6 rts_cts_plcp;
+                        __le16 rts_cts_frame_control;
+                        __le16 rts_cts_dur;
+                        u8 rts_cts_mac1[6];
+                        u8 rts_cts_mac2[6];
+                        PAD_BYTES(2);
+                        struct bcm43xx_plcp_hdr6 plcp;
+                } __attribute__((__packed__));
+                u8 raw[82];
+        } __attribute__((__packed__));
+} __attribute__((__packed__));
+
+/* Values/Masks for the device TX header */
+#define BCM43xx_TXHDRFLAG_EXPECTACK             0x0001
+#define BCM43xx_TXHDRFLAG_RTSCTS                0x0002
+#define BCM43xx_TXHDRFLAG_RTS                   0x0004
+#define BCM43xx_TXHDRFLAG_FIRSTFRAGMENT         0x0008
+#define BCM43xx_TXHDRFLAG_DESTPSMODE            0x0020
+#define BCM43xx_TXHDRFLAG_RTSCTS_OFDM           0x0080
+#define BCM43xx_TXHDRFLAG_FALLBACKOFDM          0x0100
+#define BCM43xx_TXHDRFLAG_RTSCTSFALLBACK_OFDM   0x0200
+#define BCM43xx_TXHDRFLAG_CTS                   0x0400
+#define BCM43xx_TXHDRFLAG_FRAMEBURST            0x0800
+
+#define BCM43xx_TXHDRCTL_OFDM                   0x0001
+#define BCM43xx_TXHDRCTL_SHORT_PREAMBLE         0x0010
+#define BCM43xx_TXHDRCTL_ANTENNADIV_MASK        0x0030
+#define BCM43xx_TXHDRCTL_ANTENNADIV_SHIFT       8
+
+#define BCM43xx_TXHDR_RATE_MASK                 0x0F00
+#define BCM43xx_TXHDR_RATE_SHIFT                8
+#define BCM43xx_TXHDR_RTSRATE_MASK              0xF000
+#define BCM43xx_TXHDR_RTSRATE_SHIFT             12
+#define BCM43xx_TXHDR_WSEC_KEYINDEX_MASK        0x00F0
+#define BCM43xx_TXHDR_WSEC_KEYINDEX_SHIFT       4
+#define BCM43xx_TXHDR_WSEC_ALGO_MASK            0x0003
+#define BCM43xx_TXHDR_WSEC_ALGO_SHIFT           0
+
+void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
+                            struct bcm43xx_txhdr *txhdr,
+                            const unsigned char *fragment_data,
+                            const unsigned int fragment_len,
+                            const int is_first_fragment,
+                            const u16 cookie);
+
+/* RX header as received from the hardware. */
+struct bcm43xx_rxhdr {
+        /* Frame Length. Must be generated explicitely in PIO mode. */
+        __le16 frame_length;
+        PAD_BYTES(2);
+        /* Flags field 1 */
+        __le16 flags1;
+        u8 rssi;
+        u8 signal_quality;
+        PAD_BYTES(2);
+        /* Flags field 3 */
+        __le16 flags3;
+        /* Flags field 2 */
+        __le16 flags2;
+        /* Lower 16bits of the TSF at the time the frame started. */
+        __le16 mactime;
+        PAD_BYTES(14);
+} __attribute__((__packed__));
+
+#define BCM43xx_RXHDR_FLAGS1_OFDM               (1 << 0)
+/*#define BCM43xx_RXHDR_FLAGS1_SIGNAL???        (1 << 3) FIXME */
+#define BCM43xx_RXHDR_FLAGS1_SHORTPREAMBLE      (1 << 7)
+#define BCM43xx_RXHDR_FLAGS1_2053RSSIADJ        (1 << 14)
+
+#define BCM43xx_RXHDR_FLAGS2_INVALIDFRAME       (1 << 0)
+#define BCM43xx_RXHDR_FLAGS2_TYPE2FRAME         (1 << 2)
+/*FIXME: WEP related flags */
+
+#define BCM43xx_RXHDR_FLAGS3_2050RSSIADJ        (1 << 10)
+
+/* Transmit Status as received from the hardware. */
+struct bcm43xx_hwxmitstatus {
+        PAD_BYTES(4);
+        __le16 cookie;
+        u8 flags;
+        u8 cnt1:4,
+           cnt2:4;
+        PAD_BYTES(2);
+        __le16 seq;
+        __le16 unknown; //FIXME
+} __attribute__((__packed__));
+
+/* Transmit Status in CPU byteorder. */
+struct bcm43xx_xmitstatus {
+        u16 cookie;
+        u8 flags;
+        u8 cnt1:4,
+           cnt2:4;
+        u16 seq;
+        u16 unknown; //FIXME
+};
+
+#define BCM43xx_TXSTAT_FLAG_ACK         0x01
+//TODO #define BCM43xx_TXSTAT_FLAG_???  0x02
+//TODO #define BCM43xx_TXSTAT_FLAG_???  0x04
+//TODO #define BCM43xx_TXSTAT_FLAG_???  0x08
+//TODO #define BCM43xx_TXSTAT_FLAG_???  0x10
+#define BCM43xx_TXSTAT_FLAG_IGNORE      0x20
+//TODO #define BCM43xx_TXSTAT_FLAG_???  0x40
+//TODO #define BCM43xx_TXSTAT_FLAG_???  0x80
+
+u8 bcm43xx_plcp_get_ratecode_cck(const u8 bitrate);
+u8 bcm43xx_plcp_get_ratecode_ofdm(const u8 bitrate);
+
+int bcm43xx_rx(struct bcm43xx_private *bcm,
+               struct sk_buff *skb,
+               struct bcm43xx_rxhdr *rxhdr);
+
+#endif /* BCM43xx_XMIT_H_ */
diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h
index 1fc72fe511e9..cc1ee7f4f5f8 100644
--- a/drivers/net/wireless/hostap/hostap_80211.h
+++ b/drivers/net/wireless/hostap/hostap_80211.h
@@ -92,8 +92,6 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
 void hostap_dump_tx_80211(const char *name, struct sk_buff *skb);
 int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev);
 int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev);
-struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
-                                   struct ieee80211_crypt_data *crypt);
 int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev);
 
 #endif /* HOSTAP_80211_H */
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 4a85e63906f1..06a5214145e3 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -299,8 +299,8 @@ int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 
 /* Called only from software IRQ */
-struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
-                                   struct ieee80211_crypt_data *crypt)
+static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
+                                          struct ieee80211_crypt_data *crypt)
 {
         struct hostap_interface *iface;
         local_info_t *local;
@@ -317,7 +317,7 @@ struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
         }
 
         if (local->tkip_countermeasures &&
-            crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
+            strcmp(crypt->ops->name, "TKIP") == 0) {
                 hdr = (struct ieee80211_hdr_4addr *) skb->data;
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
@@ -469,7 +469,7 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (local->ieee_802_1x && meta->ethertype == ETH_P_PAE && tx.crypt &&
-            !(fc & IEEE80211_FCTL_VERS)) {
+            !(fc & IEEE80211_FCTL_PROTECTED)) {
                 no_encrypt = 1;
                 PDEBUG(DEBUG_EXTRA2, "%s: TX: IEEE 802.1X - passing "
                        "unencrypted EAPOL frame\n", dev->name);
@@ -535,5 +535,4 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 
 EXPORT_SYMBOL(hostap_dump_tx_80211);
-EXPORT_SYMBOL(hostap_tx_encrypt);
 EXPORT_SYMBOL(hostap_master_start_xmit);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index d335b250923a..55bed923fbe9 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -42,7 +42,7 @@ MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");
 /* struct local_info::hw_priv */
 struct hostap_cs_priv {
         dev_node_t node;
-        dev_link_t *link;
+        struct pcmcia_device *link;
         int sandisk_connectplus;
 };
 
@@ -204,15 +204,13 @@ static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)
 
 static void prism2_detach(struct pcmcia_device *p_dev);
 static void prism2_release(u_long arg);
-static int prism2_config(dev_link_t *link);
+static int prism2_config(struct pcmcia_device *link);
 
 
 static int prism2_pccard_card_present(local_info_t *local)
 {
         struct hostap_cs_priv *hw_priv = local->hw_priv;
-        if (hw_priv != NULL && hw_priv->link != NULL &&
-            ((hw_priv->link->state & (DEV_PRESENT | DEV_CONFIG)) ==
-             (DEV_PRESENT | DEV_CONFIG)))
+        if (hw_priv != NULL && hw_priv->link != NULL && pcmcia_dev_present(hw_priv->link))
                 return 1;
         return 0;
 }
@@ -237,7 +235,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Action = CS_WRITE;
         reg.Offset = 0x10; /* 0x3f0 IO base 1 */
         reg.Value = hw_priv->link->io.BasePort1 & 0x00ff;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"
@@ -249,7 +247,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Action = CS_WRITE;
         reg.Offset = 0x12; /* 0x3f2 IO base 2 */
         reg.Value = (hw_priv->link->io.BasePort1 & 0xff00) >> 8;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"
@@ -301,9 +299,9 @@ static int sandisk_enable_wireless(struct net_device *dev)
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
-        if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
-            pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
-            pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
+        if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
+            pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
+            pcmcia_parse_tuple(hw_priv->link, &tuple, parse) ||
             parse->manfid.manf != 0xd601 || parse->manfid.card != 0x0101) {
                 /* No SanDisk manfid found */
                 ret = -ENODEV;
@@ -311,9 +309,9 @@ static int sandisk_enable_wireless(struct net_device *dev)
         }
 
         tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
-        if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
-            pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
-            pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
+        if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
+            pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
+            pcmcia_parse_tuple(hw_priv->link, &tuple, parse) ||
                 parse->longlink_mfc.nfn < 2) {
                 /* No multi-function links found */
                 ret = -ENODEV;
@@ -328,7 +326,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         reg.Action = CS_WRITE;
         reg.Offset = CISREG_COR;
         reg.Value = COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
@@ -345,7 +343,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
          * will be enabled during the first cor_sreset call.
          */
         reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
@@ -380,7 +378,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Action = CS_READ;
         reg.Offset = CISREG_COR;
         reg.Value = 0;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",
@@ -392,7 +390,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
 
         reg.Action = CS_WRITE;
         reg.Value |= COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",
@@ -405,7 +403,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Value &= ~COR_SOFT_RESET;
         if (hw_priv->sandisk_connectplus)
                 reg.Value |= COR_IREQ_ENA;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",
@@ -439,7 +437,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Action = CS_READ;
         reg.Offset = CISREG_COR;
         reg.Value = 0;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
@@ -452,7 +450,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 
         reg.Action = CS_WRITE;
         reg.Value |= COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
@@ -466,7 +464,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Action = CS_WRITE;
         reg.Value = hcr;
         reg.Offset = CISREG_CCSR;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
@@ -478,7 +476,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Action = CS_WRITE;
         reg.Offset = CISREG_COR;
         reg.Value = old_cor & ~COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
@@ -501,40 +499,27 @@ static struct prism2_helper_functions prism2_pccard_funcs =
 
 /* allocate local data and register with CardServices
  * initialize dev_link structure, but do not configure the card yet */
-static int prism2_attach(struct pcmcia_device *p_dev)
+static int hostap_cs_probe(struct pcmcia_device *p_dev)
 {
-        dev_link_t *link;
-
-        link = kmalloc(sizeof(dev_link_t), GFP_KERNEL);
-        if (link == NULL)
-                return -ENOMEM;
-
-        memset(link, 0, sizeof(dev_link_t));
+        int ret;
 
         PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
-        link->conf.Vcc = 33;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-
-        link->handle = p_dev;
-        p_dev->instance = link;
+        p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        if (prism2_config(link))
+        ret = prism2_config(p_dev);
+        if (ret) {
                 PDEBUG(DEBUG_EXTRA, "prism2_config() failed\n");
+        }
 
-        return 0;
+        return ret;
 }
 
 
-static void prism2_detach(struct pcmcia_device *p_dev)
+static void prism2_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         PDEBUG(DEBUG_FLOW, "prism2_detach\n");
 
-        if (link->state & DEV_CONFIG) {
-                prism2_release((u_long)link);
-        }
+        prism2_release((u_long)link);
 
         /* release net devices */
         if (link->priv) {
@@ -547,7 +532,6 @@ static void prism2_detach(struct pcmcia_device *p_dev)
                 prism2_free_local_data(dev);
                 kfree(hw_priv);
         }
-        kfree(link);
 }
 
 
@@ -558,7 +542,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 do { int ret = (retf); \
 if (ret != 0) { \
         PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", ret); \
-        cs_error(link->handle, fn, ret); \
+        cs_error(link, fn, ret); \
         goto next_entry; \
 } \
 } while (0)
@@ -566,7 +550,7 @@ if (ret != 0) { \
 
 /* run after a CARD_INSERTION event is received to configure the PCMCIA
  * socket and make the device available to the system */
-static int prism2_config(dev_link_t *link)
+static int prism2_config(struct pcmcia_device *link)
 {
         struct net_device *dev;
         struct hostap_interface *iface;
@@ -595,27 +579,24 @@ static int prism2_config(dev_link_t *link)
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link->handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link->handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link->handle, &tuple, parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, parse));
         link->conf.ConfigBase = parse->config.base;
         link->conf.Present = parse->config.rmask[0];
 
         CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link->handle, &conf));
-        PDEBUG(DEBUG_HW, "%s: %s Vcc=%d (from config)\n", dev_info,
-               ignore_cis_vcc ? "ignoring" : "setting", conf.Vcc);
-        link->conf.Vcc = conf.Vcc;
+                 pcmcia_get_configuration_info(link, &conf));
 
         /* Look for an appropriate configuration table entry in the CIS */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link->handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         for (;;) {
                 cistpl_cftable_entry_t *cfg = &(parse->cftable_entry);
                 CFG_CHECK2(GetTupleData,
-                           pcmcia_get_tuple_data(link->handle, &tuple));
+                           pcmcia_get_tuple_data(link, &tuple));
                 CFG_CHECK2(ParseTuple,
-                           pcmcia_parse_tuple(link->handle, &tuple, parse));
+                           pcmcia_parse_tuple(link, &tuple, parse));
 
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
                         dflt = *cfg;
@@ -650,10 +631,10 @@ static int prism2_config(dev_link_t *link)
                 }
 
                 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
 
                 /* Do we need to allocate an interrupt? */
@@ -695,19 +676,19 @@ static int prism2_config(dev_link_t *link)
 
                 /* This reserves IO space but doesn't actually enable it */
                 CFG_CHECK2(RequestIO,
-                           pcmcia_request_io(link->handle, &link->io));
+                           pcmcia_request_io(link, &link->io));
 
                 /* This configuration table entry is OK */
                 break;
 
         next_entry:
                 CS_CHECK(GetNextTuple,
-                         pcmcia_get_next_tuple(link->handle, &tuple));
+                         pcmcia_get_next_tuple(link, &tuple));
         }
 
         /* Need to allocate net_device before requesting IRQ handler */
         dev = prism2_init_local_data(&prism2_pccard_funcs, 0,
-                                     &handle_to_dev(link->handle));
+                                     &handle_to_dev(link));
         if (dev == NULL)
                 goto failed;
         link->priv = dev;
@@ -717,7 +698,7 @@ static int prism2_config(dev_link_t *link)
         local->hw_priv = hw_priv;
         hw_priv->link = link;
         strcpy(hw_priv->node.dev_name, dev->name);
-        link->dev = &hw_priv->node;
+        link->dev_node = &hw_priv->node;
 
         /*
          * Allocate an interrupt line.  Note that this does not assign a
@@ -730,7 +711,7 @@ static int prism2_config(dev_link_t *link)
                 link->irq.Handler = prism2_interrupt;
                 link->irq.Instance = dev;
                 CS_CHECK(RequestIRQ,
-                         pcmcia_request_irq(link->handle, &link->irq));
+                         pcmcia_request_irq(link, &link->irq));
         }
 
         /*
@@ -739,18 +720,17 @@ static int prism2_config(dev_link_t *link)
          * card and host interface into "Memory and IO" mode.
          */
         CS_CHECK(RequestConfiguration,
-                 pcmcia_request_configuration(link->handle, &link->conf));
+                 pcmcia_request_configuration(link, &link->conf));
 
         dev->irq = link->irq.AssignedIRQ;
         dev->base_addr = link->io.BasePort1;
 
         /* Finally, report what we've done */
-        printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
-               dev_info, link->conf.ConfigIndex,
-               link->conf.Vcc / 10, link->conf.Vcc % 10);
-        if (link->conf.Vpp1)
-                printk(", Vpp %d.%d", link->conf.Vpp1 / 10,
-                       link->conf.Vpp1 % 10);
+        printk(KERN_INFO "%s: index 0x%02x: ",
+               dev_info, link->conf.ConfigIndex);
+        if (link->conf.Vpp)
+                printk(", Vpp %d.%d", link->conf.Vpp / 10,
+                       link->conf.Vpp % 10);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %d", link->irq.AssignedIRQ);
         if (link->io.NumPorts1)
@@ -761,9 +741,6 @@ static int prism2_config(dev_link_t *link)
                        link->io.BasePort2+link->io.NumPorts2-1);
         printk("\n");
 
-        link->state |= DEV_CONFIG;
-        link->state &= ~DEV_CONFIG_PENDING;
-
         local->shutdown = 0;
 
         sandisk_enable_wireless(dev);
@@ -778,7 +755,7 @@ static int prism2_config(dev_link_t *link)
         return ret;
 
  cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 
  failed:
         kfree(parse);
@@ -790,7 +767,7 @@ static int prism2_config(dev_link_t *link)
 
 static void prism2_release(u_long arg)
 {
-        dev_link_t *link = (dev_link_t *)arg;
+        struct pcmcia_device *link = (struct pcmcia_device *)arg;
 
         PDEBUG(DEBUG_FLOW, "prism2_release\n");
 
@@ -799,71 +776,54 @@ static void prism2_release(u_long arg)
                 struct hostap_interface *iface;
 
                 iface = netdev_priv(dev);
-                if (link->state & DEV_CONFIG)
-                        prism2_hw_shutdown(dev, 0);
+                prism2_hw_shutdown(dev, 0);
                 iface->local->shutdown = 1;
         }
 
-        if (link->win)
-                pcmcia_release_window(link->win);
-        pcmcia_release_configuration(link->handle);
-        if (link->io.NumPorts1)
-                pcmcia_release_io(link->handle, &link->io);
-        if (link->irq.AssignedIRQ)
-                pcmcia_release_irq(link->handle, &link->irq);
-
-        link->state &= ~DEV_CONFIG;
-
+        pcmcia_disable_device(link);
         PDEBUG(DEBUG_FLOW, "release - done\n");
 }
 
-static int hostap_cs_suspend(struct pcmcia_device *p_dev)
+static int hostap_cs_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = (struct net_device *) link->priv;
         int dev_open = 0;
+        struct hostap_interface *iface = NULL;
 
-        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
-
-        link->state |= DEV_SUSPEND;
+        if (dev)
+                iface = netdev_priv(dev);
 
-        if (link->state & DEV_CONFIG) {
-                struct hostap_interface *iface = netdev_priv(dev);
-                if (iface && iface->local)
-                        dev_open = iface->local->num_dev_open > 0;
-                if (dev_open) {
-                        netif_stop_queue(dev);
-                        netif_device_detach(dev);
-                }
-                prism2_suspend(dev);
-                pcmcia_release_configuration(link->handle);
+        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
+        if (iface && iface->local)
+                dev_open = iface->local->num_dev_open > 0;
+        if (dev_open) {
+                netif_stop_queue(dev);
+                netif_device_detach(dev);
         }
+        prism2_suspend(dev);
 
         return 0;
 }
 
-static int hostap_cs_resume(struct pcmcia_device *p_dev)
+static int hostap_cs_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = (struct net_device *) link->priv;
         int dev_open = 0;
+        struct hostap_interface *iface = NULL;
 
-        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
+        if (dev)
+                iface = netdev_priv(dev);
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                struct hostap_interface *iface = netdev_priv(dev);
-                if (iface && iface->local)
-                        dev_open = iface->local->num_dev_open > 0;
+        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
 
-                pcmcia_request_configuration(link->handle, &link->conf);
+        if (iface && iface->local)
+                dev_open = iface->local->num_dev_open > 0;
 
-                prism2_hw_shutdown(dev, 1);
-                prism2_hw_config(dev, dev_open ? 0 : 1);
-                if (dev_open) {
-                        netif_device_attach(dev);
-                        netif_start_queue(dev);
-                }
+        prism2_hw_shutdown(dev, 1);
+        prism2_hw_config(dev, dev_open ? 0 : 1);
+        if (dev_open) {
+                netif_device_attach(dev);
+                netif_start_queue(dev);
         }
 
         return 0;
@@ -930,7 +890,7 @@ static struct pcmcia_driver hostap_driver = {
         .drv            = {
                 .name   = "hostap_cs",
         },
-        .probe          = prism2_attach,
+        .probe          = hostap_cs_probe,
         .remove         = prism2_detach,
         .owner          = THIS_MODULE,
         .id_table       = hostap_cs_ids,
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 9dce522526c5..bca89cff85a6 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -5573,8 +5573,7 @@ static void ipw_adhoc_create(struct ipw_priv *priv,
         case IEEE80211_52GHZ_BAND:
                 network->mode = IEEE_A;
                 i = ieee80211_channel_to_index(priv->ieee, priv->channel);
-                if (i == -1)
-                        BUG();
+                BUG_ON(i == -1);
                 if (geo->a[i].flags & IEEE80211_CH_PASSIVE_ONLY) {
                         IPW_WARNING("Overriding invalid channel\n");
                         priv->channel = geo->a[0].channel;
@@ -5587,8 +5586,7 @@ static void ipw_adhoc_create(struct ipw_priv *priv,
                 else
                         network->mode = IEEE_B;
                 i = ieee80211_channel_to_index(priv->ieee, priv->channel);
-                if (i == -1)
-                        BUG();
+                BUG_ON(i == -1);
                 if (geo->bg[i].flags & IEEE80211_CH_PASSIVE_ONLY) {
                         IPW_WARNING("Overriding invalid channel\n");
                         priv->channel = geo->bg[0].channel;
@@ -6715,8 +6713,7 @@ static int ipw_qos_association(struct ipw_priv *priv,
 
         switch (priv->ieee->iw_mode) {
         case IW_MODE_ADHOC:
-                if (!(network->capability & WLAN_CAPABILITY_IBSS))
-                        BUG();
+                BUG_ON(!(network->capability & WLAN_CAPABILITY_IBSS));
 
                 qos_data = &ibss_data;
                 break;
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 75ce6ddb0cf5..9343d970537b 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -190,8 +190,8 @@ module_param(mem_speed, int, 0);
 /*====================================================================*/
 
 /* PCMCIA (Card Services) related functions */
-static void netwave_release(dev_link_t *link);     /* Card removal */
-static void netwave_pcmcia_config(dev_link_t *arg); /* Runs after card 
+static void netwave_release(struct pcmcia_device *link);     /* Card removal */
+static int netwave_pcmcia_config(struct pcmcia_device *arg); /* Runs after card
                                                                                                            insertion */
 static void netwave_detach(struct pcmcia_device *p_dev);    /* Destroy instance */
 
@@ -221,10 +221,10 @@ static struct iw_statistics* netwave_get_wireless_stats(struct net_device *dev);
 static void set_multicast_list(struct net_device *dev);
 
 /*
-   A dev_link_t structure has fields for most things that are needed
+   A struct pcmcia_device structure has fields for most things that are needed
    to keep track of a socket, but there will usually be some device
    specific information that also needs to be kept track of.  The
-   'priv' pointer in a dev_link_t structure can be used to point to
+   'priv' pointer in a struct pcmcia_device structure can be used to point to
    a device-specific private data structure, like this.
 
    A driver needs to provide a dev_node_t structure for each device
@@ -232,7 +232,7 @@ static void set_multicast_list(struct net_device *dev);
    example, ethernet cards, modems).  In other cases, there may be
    many actual or logical devices (SCSI adapters, memory cards with
    multiple partitions).  The dev_node_t structures need to be kept
-   in a linked list starting at the 'dev' field of a dev_link_t
+   in a linked list starting at the 'dev' field of a struct pcmcia_device
    structure.  We allocate them in the card's private data structure,
    because they generally can't be allocated dynamically.
 */
@@ -268,7 +268,7 @@ struct site_survey {
 };      
    
 typedef struct netwave_private {
-    dev_link_t link;
+        struct pcmcia_device    *p_dev;
     spinlock_t  spinlock;       /* Serialize access to the hardware (SMP) */
     dev_node_t node;
     u_char     __iomem *ramBase;
@@ -376,20 +376,19 @@ static struct iw_statistics *netwave_get_wireless_stats(struct net_device *dev)
  *     configure the card at this point -- we wait until we receive a
  *     card insertion event.
  */
-static int netwave_attach(struct pcmcia_device *p_dev)
+static int netwave_probe(struct pcmcia_device *link)
 {
-    dev_link_t *link;
     struct net_device *dev;
     netwave_private *priv;
 
     DEBUG(0, "netwave_attach()\n");
 
-    /* Initialize the dev_link_t structure */
+    /* Initialize the struct pcmcia_device structure */
     dev = alloc_etherdev(sizeof(netwave_private));
     if (!dev)
         return -ENOMEM;
     priv = netdev_priv(dev);
-    link = &priv->link;
+    priv->p_dev = link;
     link->priv = dev;
 
     /* The io structure describes IO port mapping */
@@ -406,7 +405,6 @@ static int netwave_attach(struct pcmcia_device *p_dev)
     
     /* General socket configuration */
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
     link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 1;
     link->conf.Present = PRESENT_OPTION;
@@ -430,13 +428,7 @@ static int netwave_attach(struct pcmcia_device *p_dev)
     dev->stop = &netwave_close;
     link->irq.Instance = dev;
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    netwave_pcmcia_config( link);
-
-    return 0;
+    return netwave_pcmcia_config( link);
 } /* netwave_attach */
 
 /*
@@ -447,17 +439,15 @@ static int netwave_attach(struct pcmcia_device *p_dev)
  *    structures are freed.  Otherwise, the structures will be freed
  *    when the device is released.
  */
-static void netwave_detach(struct pcmcia_device *p_dev)
+static void netwave_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
         DEBUG(0, "netwave_detach(0x%p)\n", link);
 
-        if (link->state & DEV_CONFIG)
-                netwave_release(link);
+        netwave_release(link);
 
-        if (link->dev)
+        if (link->dev_node)
                 unregister_netdev(dev);
 
         free_netdev(dev);
@@ -743,8 +733,7 @@ static const struct iw_handler_def	netwave_handler_def =
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void netwave_pcmcia_config(dev_link_t *link) {
-    client_handle_t handle = link->handle;
+static int netwave_pcmcia_config(struct pcmcia_device *link) {
     struct net_device *dev = link->priv;
     netwave_private *priv = netdev_priv(dev);
     tuple_t tuple;
@@ -766,15 +755,12 @@ static void netwave_pcmcia_config(dev_link_t *link) {
     tuple.TupleDataMax = 64;
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
     link->conf.Present = parse.config.rmask[0];
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     /*
      *  Try allocating IO ports.  This tries a few fixed addresses.
      *  If you want, you can also read the card's config table to
@@ -782,11 +768,11 @@ static void netwave_pcmcia_config(dev_link_t *link) {
      */
     for (i = j = 0x0; j < 0x400; j += 0x20) {
         link->io.BasePort1 = j ^ 0x300;
-        i = pcmcia_request_io(link->handle, &link->io);
+        i = pcmcia_request_io(link, &link->io);
         if (i == CS_SUCCESS) break;
     }
     if (i != CS_SUCCESS) {
-        cs_error(link->handle, RequestIO, i);
+        cs_error(link, RequestIO, i);
         goto failed;
     }
 
@@ -794,16 +780,16 @@ static void netwave_pcmcia_config(dev_link_t *link) {
      *  Now allocate an interrupt line.  Note that this does not
      *  actually assign a handler to the interrupt.
      */
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
 
     /*
      *  This actually configures the PCMCIA socket -- setting up
      *  the I/O windows and the interrupt mapping.
      */
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
     /*
-     *  Allocate a 32K memory window.  Note that the dev_link_t
+     *  Allocate a 32K memory window.  Note that the struct pcmcia_device
      *  structure provides space for one window handle -- if your
      *  device needs several windows, you'll need to keep track of
      *  the handles in your private data structure, dev->priv.
@@ -813,7 +799,7 @@ static void netwave_pcmcia_config(dev_link_t *link) {
     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_CM|WIN_ENABLE;
     req.Base = 0; req.Size = 0x8000;
     req.AccessSpeed = mem_speed;
-    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+    CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win));
     mem.CardOffset = 0x20000; mem.Page = 0; 
     CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem));
 
@@ -823,7 +809,7 @@ static void netwave_pcmcia_config(dev_link_t *link) {
 
     dev->irq = link->irq.AssignedIRQ;
     dev->base_addr = link->io.BasePort1;
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
         printk(KERN_DEBUG "netwave_cs: register_netdev() failed\n");
@@ -831,8 +817,7 @@ static void netwave_pcmcia_config(dev_link_t *link) {
     }
 
     strcpy(priv->node.dev_name, dev->name);
-    link->dev = &priv->node;
-    link->state &= ~DEV_CONFIG_PENDING;
+    link->dev_node = &priv->node;
 
     /* Reset card before reading physical address */
     netwave_doreset(dev->base_addr, ramBase);
@@ -852,12 +837,13 @@ static void netwave_pcmcia_config(dev_link_t *link) {
     printk(KERN_DEBUG "Netwave_reset: revision %04x %04x\n", 
            get_uint16(ramBase + NETWAVE_EREG_ARW),
            get_uint16(ramBase + NETWAVE_EREG_ARW+2));
-    return;
+    return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 failed:
     netwave_release(link);
+    return -ENODEV;
 } /* netwave_pcmcia_config */
 
 /*
@@ -867,52 +853,35 @@ failed:
  *    device, and release the PCMCIA configuration.  If the device is
  *    still open, this will be postponed until it is closed.
  */
-static void netwave_release(dev_link_t *link)
+static void netwave_release(struct pcmcia_device *link)
 {
-    struct net_device *dev = link->priv;
-    netwave_private *priv = netdev_priv(dev);
-
-    DEBUG(0, "netwave_release(0x%p)\n", link);
+        struct net_device *dev = link->priv;
+        netwave_private *priv = netdev_priv(dev);
 
-    /* Don't bother checking to see if these succeed or not */
-    if (link->win) {
-        iounmap(priv->ramBase);
-        pcmcia_release_window(link->win);
-    }
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
+        DEBUG(0, "netwave_release(0x%p)\n", link);
 
-    link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
+        if (link->win)
+                iounmap(priv->ramBase);
 }
 
-static int netwave_suspend(struct pcmcia_device *p_dev)
+static int netwave_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int netwave_resume(struct pcmcia_device *p_dev)
+static int netwave_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        netwave_reset(dev);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                netwave_reset(dev);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -1119,7 +1088,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id, struct pt_regs *regs
     u_char __iomem *ramBase;
     struct net_device *dev = (struct net_device *)dev_id;
     struct netwave_private *priv = netdev_priv(dev);
-    dev_link_t *link = &priv->link;
+    struct pcmcia_device *link = priv->p_dev;
     int i;
     
     if (!netif_device_present(dev))
@@ -1138,7 +1107,7 @@ static irqreturn_t netwave_interrupt(int irq, void* dev_id, struct pt_regs *regs
         
         status = inb(iobase + NETWAVE_REG_ASR);
                 
-        if (!DEV_OK(link)) {
+        if (!pcmcia_dev_present(link)) {
             DEBUG(1, "netwave_interrupt: Interrupt with status 0x%x "
                   "from removed or suspended card!\n", status);
             break;
@@ -1373,11 +1342,11 @@ static int netwave_rx(struct net_device *dev)
 
 static int netwave_open(struct net_device *dev) {
     netwave_private *priv = netdev_priv(dev);
-    dev_link_t *link = &priv->link;
+    struct pcmcia_device *link = priv->p_dev;
 
     DEBUG(1, "netwave_open: starting.\n");
     
-    if (!DEV_OK(link))
+    if (!pcmcia_dev_present(link))
         return -ENODEV;
 
     link->open++;
@@ -1390,7 +1359,7 @@ static int netwave_open(struct net_device *dev) {
 
 static int netwave_close(struct net_device *dev) {
     netwave_private *priv = netdev_priv(dev);
-    dev_link_t *link = &priv->link;
+    struct pcmcia_device *link = priv->p_dev;
 
     DEBUG(1, "netwave_close: finishing.\n");
 
@@ -1411,7 +1380,7 @@ static struct pcmcia_driver netwave_driver = {
         .drv            = {
                 .name   = "netwave_cs",
         },
-        .probe          = netwave_attach,
+        .probe          = netwave_probe,
         .remove         = netwave_detach,
         .id_table       = netwave_ids,
         .suspend        = netwave_suspend,
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index ec6f2a48895b..434f7d7ad841 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -49,7 +49,7 @@ MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket
 /* PCMCIA specific device information (goes in the card field of
  * struct orinoco_private */
 struct orinoco_pccard {
-        dev_link_t link;
+        struct pcmcia_device    *p_dev;
         dev_node_t node;
 
         /* Used to handle hard reset */
@@ -63,8 +63,8 @@ struct orinoco_pccard {
 /* Function prototypes                                              */
 /********************************************************************/
 
-static void orinoco_cs_config(dev_link_t *link);
-static void orinoco_cs_release(dev_link_t *link);
+static int orinoco_cs_config(struct pcmcia_device *link);
+static void orinoco_cs_release(struct pcmcia_device *link);
 static void orinoco_cs_detach(struct pcmcia_device *p_dev);
 
 /********************************************************************/
@@ -75,13 +75,13 @@ static int
 orinoco_cs_hard_reset(struct orinoco_private *priv)
 {
         struct orinoco_pccard *card = priv->card;
-        dev_link_t *link = &card->link;
+        struct pcmcia_device *link = card->p_dev;
         int err;
 
         /* We need atomic ops here, because we're not holding the lock */
         set_bit(0, &card->hard_reset_in_progress);
 
-        err = pcmcia_reset_card(link->handle, NULL);
+        err = pcmcia_reset_card(link, NULL);
         if (err)
                 return err;
 
@@ -104,12 +104,11 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
  * configure the card at this point -- we wait until we receive a card
  * insertion event.  */
 static int
-orinoco_cs_attach(struct pcmcia_device *p_dev)
+orinoco_cs_probe(struct pcmcia_device *link)
 {
         struct net_device *dev;
         struct orinoco_private *priv;
         struct orinoco_pccard *card;
-        dev_link_t *link;
 
         dev = alloc_orinocodev(sizeof(*card), orinoco_cs_hard_reset);
         if (! dev)
@@ -118,7 +117,7 @@ orinoco_cs_attach(struct pcmcia_device *p_dev)
         card = priv->card;
 
         /* Link both structures together */
-        link = &card->link;
+        card->p_dev = link;
         link->priv = dev;
 
         /* Interrupt setup */
@@ -135,16 +134,7 @@ orinoco_cs_attach(struct pcmcia_device *p_dev)
         link->conf.Attributes = 0;
         link->conf.IntType = INT_MEMORY_AND_IO;
 
-        /* Register with Card Services */
-        link->next = NULL;
-
-        link->handle = p_dev;
-        p_dev->instance = link;
-
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        orinoco_cs_config(link);
-
-        return 0;
+        return orinoco_cs_config(link);
 }                               /* orinoco_cs_attach */
 
 /*
@@ -153,16 +143,14 @@ orinoco_cs_attach(struct pcmcia_device *p_dev)
  * are freed.  Otherwise, the structures will be freed when the device
  * is released.
  */
-static void orinoco_cs_detach(struct pcmcia_device *p_dev)
+static void orinoco_cs_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        if (link->state & DEV_CONFIG)
-                orinoco_cs_release(link);
+        orinoco_cs_release(link);
 
-        DEBUG(0, PFX "detach: link=%p link->dev=%p\n", link, link->dev);
-        if (link->dev) {
+        DEBUG(0, PFX "detach: link=%p link->dev_node=%p\n", link, link->dev_node);
+        if (link->dev_node) {
                 DEBUG(0, PFX "About to unregister net device %p\n",
                       dev);
                 unregister_netdev(dev);
@@ -180,11 +168,10 @@ static void orinoco_cs_detach(struct pcmcia_device *p_dev)
                 last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \
         } while (0)
 
-static void
-orinoco_cs_config(dev_link_t *link)
+static int
+orinoco_cs_config(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
-        client_handle_t handle = link->handle;
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
@@ -196,7 +183,7 @@ orinoco_cs_config(dev_link_t *link)
         cisparse_t parse;
         void __iomem *mem;
 
-        CS_CHECK(ValidateCIS, pcmcia_validate_cis(handle, &info));
+        CS_CHECK(ValidateCIS, pcmcia_validate_cis(link, &info));
 
         /*
          * This reads the card's CONFIG tuple to find its
@@ -207,19 +194,15 @@ orinoco_cs_config(dev_link_t *link)
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present = parse.config.rmask[0];
 
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-
         /* Look up the current Vcc */
         CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(handle, &conf));
-        link->conf.Vcc = conf.Vcc;
+                 pcmcia_get_configuration_info(link, &conf));
 
         /*
          * In this loop, we scan the CIS for configuration table
@@ -236,13 +219,13 @@ orinoco_cs_config(dev_link_t *link)
          * implementation-defined details.
          */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         while (1) {
                 cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                 cistpl_cftable_entry_t dflt = { .index = 0 };
 
-                if ( (pcmcia_get_tuple_data(handle, &tuple) != 0)
-                    || (pcmcia_parse_tuple(handle, &tuple, &parse) != 0))
+                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
+                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
                         goto next_entry;
 
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
@@ -274,10 +257,10 @@ orinoco_cs_config(dev_link_t *link)
                 }
 
                 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                             cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                             dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 
                 /* Do we need to allocate an interrupt? */
@@ -307,7 +290,7 @@ orinoco_cs_config(dev_link_t *link)
                         }
 
                         /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link->handle, &link->io) != 0)
+                        if (pcmcia_request_io(link, &link->io) != 0)
                                 goto next_entry;
                 }
 
@@ -317,9 +300,8 @@ orinoco_cs_config(dev_link_t *link)
                 break;
                 
         next_entry:
-                if (link->io.NumPorts1)
-                        pcmcia_release_io(link->handle, &link->io);
-                last_ret = pcmcia_get_next_tuple(handle, &tuple);
+                pcmcia_disable_device(link);
+                last_ret = pcmcia_get_next_tuple(link, &tuple);
                 if (last_ret  == CS_NO_MORE_ITEMS) {
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
                                "CIS configuration.  Maybe you need the "
@@ -333,7 +315,7 @@ orinoco_cs_config(dev_link_t *link)
          * a handler to the interrupt, unless the 'Handler' member of
          * the irq structure is initialized.
          */
-        CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
 
         /* We initialize the hermes structure before completing PCMCIA
          * configuration just in case the interrupt handler gets
@@ -350,7 +332,7 @@ orinoco_cs_config(dev_link_t *link)
          * card and host interface into "Memory and IO" mode.
          */
         CS_CHECK(RequestConfiguration,
-                 pcmcia_request_configuration(link->handle, &link->conf));
+                 pcmcia_request_configuration(link, &link->conf));
 
         /* Ok, we have the configuration, prepare to register the netdev */
         dev->base_addr = link->io.BasePort1;
@@ -358,7 +340,7 @@ orinoco_cs_config(dev_link_t *link)
         SET_MODULE_OWNER(dev);
         card->node.major = card->node.minor = 0;
 
-        SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+        SET_NETDEV_DEV(dev, &handle_to_dev(link));
         /* Tell the stack we exist */
         if (register_netdev(dev) != 0) {
                 printk(KERN_ERR PFX "register_netdev() failed\n");
@@ -366,20 +348,18 @@ orinoco_cs_config(dev_link_t *link)
         }
 
         /* At this point, the dev_node_t structure(s) needs to be
-         * initialized and arranged in a linked list at link->dev. */
+         * initialized and arranged in a linked list at link->dev_node. */
         strcpy(card->node.dev_name, dev->name);
-        link->dev = &card->node; /* link->dev being non-NULL is also
+        link->dev_node = &card->node; /* link->dev_node being non-NULL is also
                                     used to indicate that the
                                     net_device has been registered */
-        link->state &= ~DEV_CONFIG_PENDING;
 
         /* Finally, report what we've done */
-        printk(KERN_DEBUG "%s: index 0x%02x: Vcc %d.%d",
-               dev->name, link->conf.ConfigIndex,
-               link->conf.Vcc / 10, link->conf.Vcc % 10);
-        if (link->conf.Vpp1)
-                printk(", Vpp %d.%d", link->conf.Vpp1 / 10,
-                       link->conf.Vpp1 % 10);
+        printk(KERN_DEBUG "%s: index 0x%02x: ",
+               dev->name, link->conf.ConfigIndex);
+        if (link->conf.Vpp)
+                printk(", Vpp %d.%d", link->conf.Vpp / 10,
+                       link->conf.Vpp % 10);
         printk(", irq %d", link->irq.AssignedIRQ);
         if (link->io.NumPorts1)
                 printk(", io 0x%04x-0x%04x", link->io.BasePort1,
@@ -389,13 +369,14 @@ orinoco_cs_config(dev_link_t *link)
                        link->io.BasePort2 + link->io.NumPorts2 - 1);
         printk("\n");
 
-        return;
+        return 0;
 
  cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 
  failed:
         orinoco_cs_release(link);
+        return -ENODEV;
 }                               /* orinoco_cs_config */
 
 /*
@@ -404,7 +385,7 @@ orinoco_cs_config(dev_link_t *link)
  * still open, this will be postponed until it is closed.
  */
 static void
-orinoco_cs_release(dev_link_t *link)
+orinoco_cs_release(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
@@ -416,88 +397,68 @@ orinoco_cs_release(dev_link_t *link)
         priv->hw_unavailable++;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        /* Don't bother checking to see if these succeed or not */
-        pcmcia_release_configuration(link->handle);
-        if (link->io.NumPorts1)
-                pcmcia_release_io(link->handle, &link->io);
-        if (link->irq.AssignedIRQ)
-                pcmcia_release_irq(link->handle, &link->irq);
-        link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
         if (priv->hw.iobase)
                 ioport_unmap(priv->hw.iobase);
 }                               /* orinoco_cs_release */
 
-static int orinoco_cs_suspend(struct pcmcia_device *p_dev)
+static int orinoco_cs_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
         int err = 0;
         unsigned long flags;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                /* This is probably racy, but I can't think of
-                   a better way, short of rewriting the PCMCIA
-                   layer to not suck :-( */
-                if (! test_bit(0, &card->hard_reset_in_progress)) {
-                        spin_lock_irqsave(&priv->lock, flags);
+        /* This is probably racy, but I can't think of
+           a better way, short of rewriting the PCMCIA
+           layer to not suck :-( */
+        if (! test_bit(0, &card->hard_reset_in_progress)) {
+                spin_lock_irqsave(&priv->lock, flags);
 
-                        err = __orinoco_down(dev);
-                        if (err)
-                                printk(KERN_WARNING "%s: Error %d downing interface\n",
-                                       dev->name, err);
+                err = __orinoco_down(dev);
+                if (err)
+                        printk(KERN_WARNING "%s: Error %d downing interface\n",
+                               dev->name, err);
 
-                        netif_device_detach(dev);
-                        priv->hw_unavailable++;
+                netif_device_detach(dev);
+                priv->hw_unavailable++;
 
-                        spin_unlock_irqrestore(&priv->lock, flags);
-                }
-
-                pcmcia_release_configuration(link->handle);
+                spin_unlock_irqrestore(&priv->lock, flags);
         }
 
         return 0;
 }
 
-static int orinoco_cs_resume(struct pcmcia_device *p_dev)
+static int orinoco_cs_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
         int err = 0;
         unsigned long flags;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                /* FIXME: should we double check that this is
-                 * the same card as we had before */
-                pcmcia_request_configuration(link->handle, &link->conf);
-
-                if (! test_bit(0, &card->hard_reset_in_progress)) {
-                        err = orinoco_reinit_firmware(dev);
-                        if (err) {
-                                printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
-                                       dev->name, err);
-                                return -EIO;
-                        }
-
-                        spin_lock_irqsave(&priv->lock, flags);
+        if (! test_bit(0, &card->hard_reset_in_progress)) {
+                err = orinoco_reinit_firmware(dev);
+                if (err) {
+                        printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
+                               dev->name, err);
+                        return -EIO;
+                }
 
-                        netif_device_attach(dev);
-                        priv->hw_unavailable--;
+                spin_lock_irqsave(&priv->lock, flags);
 
-                        if (priv->open && ! priv->hw_unavailable) {
-                                err = __orinoco_up(dev);
-                                if (err)
-                                        printk(KERN_ERR "%s: Error %d restarting card\n",
-                                               dev->name, err);
-                        }
+                netif_device_attach(dev);
+                priv->hw_unavailable--;
 
-                        spin_unlock_irqrestore(&priv->lock, flags);
+                if (priv->open && ! priv->hw_unavailable) {
+                        err = __orinoco_up(dev);
+                        if (err)
+                                printk(KERN_ERR "%s: Error %d restarting card\n",
+                                       dev->name, err);
                 }
+
+                spin_unlock_irqrestore(&priv->lock, flags);
         }
 
         return 0;
@@ -604,7 +565,7 @@ static struct pcmcia_driver orinoco_driver = {
         .drv            = {
                 .name   = DRIVER_NAME,
         },
-        .probe          = orinoco_cs_attach,
+        .probe          = orinoco_cs_probe,
         .remove         = orinoco_cs_detach,
         .id_table       = orinoco_cs_ids,
         .suspend        = orinoco_cs_suspend,
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 7880d8c31aad..879eb427607c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -90,8 +90,8 @@ module_param(pc_debug, int, 0);
 #define DEBUG(n, args...)
 #endif
 /** Prototypes based on PCMCIA skeleton driver *******************************/
-static void ray_config(dev_link_t *link);
-static void ray_release(dev_link_t *link);
+static int ray_config(struct pcmcia_device *link);
+static void ray_release(struct pcmcia_device *link);
 static void ray_detach(struct pcmcia_device *p_dev);
 
 /***** Prototypes indicated by device structure ******************************/
@@ -190,20 +190,17 @@ static int bc;
 static char *phy_addr = NULL;
 
 
-/* A linked list of "instances" of the ray device.  Each actual
-   PCMCIA card corresponds to one device instance, and is described
-   by one dev_link_t structure (defined in ds.h).
-*/
-static dev_link_t *dev_list = NULL;
-
-/* A dev_link_t structure has fields for most things that are needed
+/* A struct pcmcia_device structure has fields for most things that are needed
    to keep track of a socket, but there will usually be some device
    specific information that also needs to be kept track of.  The
-   'priv' pointer in a dev_link_t structure can be used to point to
+   'priv' pointer in a struct pcmcia_device structure can be used to point to
    a device-specific private data structure, like this.
 */
 static unsigned int ray_mem_speed = 500;
 
+/* WARNING: THIS DRIVER IS NOT CAPABLE OF HANDLING MULTIPLE DEVICES! */
+static struct pcmcia_device *this_device = NULL;
+
 MODULE_AUTHOR("Corey Thomas <corey@world.std.com>");
 MODULE_DESCRIPTION("Raylink/WebGear wireless LAN driver");
 MODULE_LICENSE("GPL");
@@ -306,56 +303,46 @@ static char rcsid[] = "Raylink/WebGear wireless LAN - Corey <Thomas corey@world.
     configure the card at this point -- we wait until we receive a
     card insertion event.
 =============================================================================*/
-static int ray_attach(struct pcmcia_device *p_dev)
+static int ray_probe(struct pcmcia_device *p_dev)
 {
-    dev_link_t *link;
     ray_dev_t *local;
     struct net_device *dev;
-    
-    DEBUG(1, "ray_attach()\n");
 
-    /* Initialize the dev_link_t structure */
-    link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-
-    if (!link)
-            return -ENOMEM;
+    DEBUG(1, "ray_attach()\n");
 
     /* Allocate space for private device-specific data */
     dev = alloc_etherdev(sizeof(ray_dev_t));
-
     if (!dev)
             goto fail_alloc_dev;
 
     local = dev->priv;
-
-    memset(link, 0, sizeof(struct dev_link_t));
+    local->finder = p_dev;
 
     /* The io structure describes IO port mapping. None used here */
-    link->io.NumPorts1 = 0;
-    link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-    link->io.IOAddrLines = 5;
+    p_dev->io.NumPorts1 = 0;
+    p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+    p_dev->io.IOAddrLines = 5;
 
     /* Interrupt setup. For PCMCIA, driver takes what's given */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
-    link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-    link->irq.Handler = &ray_interrupt;
+    p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+    p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+    p_dev->irq.Handler = &ray_interrupt;
 
     /* General socket configuration */
-    link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Vcc = 50;
-    link->conf.IntType = INT_MEMORY_AND_IO;
-    link->conf.ConfigIndex = 1;
-    link->conf.Present = PRESENT_OPTION;
-
-    link->priv = dev;
-    link->irq.Instance = dev;
+    p_dev->conf.Attributes = CONF_ENABLE_IRQ;
+    p_dev->conf.IntType = INT_MEMORY_AND_IO;
+    p_dev->conf.ConfigIndex = 1;
+    p_dev->conf.Present = PRESENT_OPTION;
+
+    p_dev->priv = dev;
+    p_dev->irq.Instance = dev;
     
-    local->finder = link;
+    local->finder = p_dev;
     local->card_status = CARD_INSERTED;
     local->authentication_state = UNAUTHENTICATED;
     local->num_multi = 0;
-    DEBUG(2,"ray_attach link = %p,  dev = %p,  local = %p, intr = %p\n",
-          link,dev,local,&ray_interrupt);
+    DEBUG(2,"ray_attach p_dev = %p,  dev = %p,  local = %p, intr = %p\n",
+          p_dev,dev,local,&ray_interrupt);
 
     /* Raylink entries in the device structure */
     dev->hard_start_xmit = &ray_dev_start_xmit;
@@ -379,16 +366,10 @@ static int ray_attach(struct pcmcia_device *p_dev)
 
     init_timer(&local->timer);
 
-    link->handle = p_dev;
-    p_dev->instance = link;
-
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    ray_config(link);
-
-    return 0;
+    this_device = p_dev;
+    return ray_config(p_dev);
 
 fail_alloc_dev:
-    kfree(link);
     return -ENOMEM;
 } /* ray_attach */
 /*=============================================================================
@@ -397,37 +378,25 @@ fail_alloc_dev:
     structures are freed.  Otherwise, the structures will be freed
     when the device is released.
 =============================================================================*/
-static void ray_detach(struct pcmcia_device *p_dev)
+static void ray_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
-    dev_link_t **linkp;
     struct net_device *dev;
     ray_dev_t *local;
 
     DEBUG(1, "ray_detach(0x%p)\n", link);
-    
-    /* Locate device structure */
-    for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
-        if (*linkp == link) break;
-    if (*linkp == NULL)
-        return;
 
+    this_device = NULL;
     dev = link->priv;
 
-    if (link->state & DEV_CONFIG) {
-            ray_release(link);
+    ray_release(link);
 
-            local = (ray_dev_t *)dev->priv;
-            del_timer(&local->timer);
-    }
+    local = (ray_dev_t *)dev->priv;
+    del_timer(&local->timer);
 
-    /* Unlink device structure, free pieces */
-    *linkp = link->next;
     if (link->priv) {
-        if (link->dev) unregister_netdev(dev);
+        if (link->dev_node) unregister_netdev(dev);
         free_netdev(dev);
     }
-    kfree(link);
     DEBUG(2,"ray_cs ray_detach ending\n");
 } /* ray_detach */
 /*=============================================================================
@@ -438,9 +407,8 @@ static void ray_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 #define MAX_TUPLE_SIZE 128
-static void ray_config(dev_link_t *link)
+static int ray_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     tuple_t tuple;
     cisparse_t parse;
     int last_fn = 0, last_ret = 0;
@@ -455,48 +423,45 @@ static void ray_config(dev_link_t *link)
 
     /* This reads the card's CONFIG tuple to find its configuration regs */
     tuple.DesiredTuple = CISTPL_CONFIG;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     tuple.TupleData = buf;
     tuple.TupleDataMax = MAX_TUPLE_SIZE;
     tuple.TupleOffset = 0;
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
     link->conf.Present = parse.config.rmask[0];
 
     /* Determine card type and firmware version */
     buf[0] = buf[MAX_TUPLE_SIZE - 1] = 0;
     tuple.DesiredTuple = CISTPL_VERS_1;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     tuple.TupleData = buf;
     tuple.TupleDataMax = MAX_TUPLE_SIZE;
     tuple.TupleOffset = 2;
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
 
     for (i=0; i<tuple.TupleDataLen - 4; i++) 
         if (buf[i] == 0) buf[i] = ' ';
     printk(KERN_INFO "ray_cs Detected: %s\n",buf);
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     /* Now allocate an interrupt line.  Note that this does not
        actually assign a handler to the interrupt.
     */
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     dev->irq = link->irq.AssignedIRQ;
     
     /* This actually configures the PCMCIA socket -- setting up
        the I/O windows and the interrupt mapping.
     */
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
 /*** Set up 32k window for shared memory (transmit and control) ************/
     req.Attributes = WIN_DATA_WIDTH_8 | WIN_MEMORY_TYPE_CM | WIN_ENABLE | WIN_USE_WAIT;
     req.Base = 0;
     req.Size = 0x8000;
     req.AccessSpeed = ray_mem_speed;
-    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+    CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &link->win));
     mem.CardOffset = 0x0000; mem.Page = 0;
     CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem));
     local->sram = ioremap(req.Base,req.Size);
@@ -506,7 +471,7 @@ static void ray_config(dev_link_t *link)
     req.Base = 0;
     req.Size = 0x4000;
     req.AccessSpeed = ray_mem_speed;
-    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &local->rmem_handle));
+    CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &local->rmem_handle));
     mem.CardOffset = 0x8000; mem.Page = 0;
     CS_CHECK(MapMemPage, pcmcia_map_mem_page(local->rmem_handle, &mem));
     local->rmem = ioremap(req.Base,req.Size);
@@ -516,7 +481,7 @@ static void ray_config(dev_link_t *link)
     req.Base = 0;
     req.Size = 0x1000;
     req.AccessSpeed = ray_mem_speed;
-    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &local->amem_handle));
+    CS_CHECK(RequestWindow, pcmcia_request_window(&link, &req, &local->amem_handle));
     mem.CardOffset = 0x0000; mem.Page = 0;
     CS_CHECK(MapMemPage, pcmcia_map_mem_page(local->amem_handle, &mem));
     local->amem = ioremap(req.Base,req.Size);
@@ -526,32 +491,32 @@ static void ray_config(dev_link_t *link)
     DEBUG(3,"ray_config amem=%p\n",local->amem);
     if (ray_init(dev) < 0) {
         ray_release(link);
-        return;
+        return -ENODEV;
     }
 
-    SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+    SET_NETDEV_DEV(dev, &handle_to_dev(link));
     i = register_netdev(dev);
     if (i != 0) {
         printk("ray_config register_netdev() failed\n");
         ray_release(link);
-        return;
+        return i;
     }
 
     strcpy(local->node.dev_name, dev->name);
-    link->dev = &local->node;
+    link->dev_node = &local->node;
 
-    link->state &= ~DEV_CONFIG_PENDING;
     printk(KERN_INFO "%s: RayLink, irq %d, hw_addr ",
        dev->name, dev->irq);
     for (i = 0; i < 6; i++)
     printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
 
-    return;
+    return 0;
 
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
 
     ray_release(link);
+    return -ENODEV;
 } /* ray_config */
 
 static inline struct ccs __iomem *ccs_base(ray_dev_t *dev)
@@ -578,9 +543,9 @@ static int ray_init(struct net_device *dev)
     UCHAR *p;
     struct ccs __iomem *pccs;
     ray_dev_t *local = (ray_dev_t *)dev->priv;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     DEBUG(1, "ray_init(0x%p)\n", dev);
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(0,"ray_init - device not present\n");
         return -1;
     }
@@ -640,10 +605,10 @@ static int dl_startup_params(struct net_device *dev)
     int ccsindex;
     ray_dev_t *local = (ray_dev_t *)dev->priv;
     struct ccs __iomem *pccs;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
 
     DEBUG(1,"dl_startup_params entered\n");
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs dl_startup_params - device not present\n");
         return -1;
     }
@@ -747,9 +712,9 @@ static void verify_dl_startup(u_long data)
     ray_dev_t *local = (ray_dev_t *)data;
     struct ccs __iomem *pccs = ccs_base(local) + local->dl_param_ccs;
     UCHAR status;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
 
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs verify_dl_startup - device not present\n");
         return;
     }
@@ -787,8 +752,8 @@ static void start_net(u_long data)
     ray_dev_t *local = (ray_dev_t *)data;
     struct ccs __iomem *pccs;
     int ccsindex;
-    dev_link_t *link = local->finder;
-    if (!(link->state & DEV_PRESENT)) {
+    struct pcmcia_device *link = local->finder;
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs start_net - device not present\n");
         return;
     }
@@ -814,9 +779,9 @@ static void join_net(u_long data)
 
     struct ccs __iomem *pccs;
     int ccsindex;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs join_net - device not present\n");
         return;
     }
@@ -840,7 +805,7 @@ static void join_net(u_long data)
     device, and release the PCMCIA configuration.  If the device is
     still open, this will be postponed until it is closed.
 =============================================================================*/
-static void ray_release(dev_link_t *link)
+static void ray_release(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv; 
     ray_dev_t *local = dev->priv;
@@ -849,56 +814,38 @@ static void ray_release(dev_link_t *link)
     DEBUG(1, "ray_release(0x%p)\n", link);
 
     del_timer(&local->timer);
-    link->state &= ~DEV_CONFIG;
 
     iounmap(local->sram);
     iounmap(local->rmem);
     iounmap(local->amem);
     /* Do bother checking to see if these succeed or not */
-    i = pcmcia_release_window(link->win);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(link->win) ret = %x\n",i);
     i = pcmcia_release_window(local->amem_handle);
     if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
     i = pcmcia_release_window(local->rmem_handle);
     if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
-    i = pcmcia_release_configuration(link->handle);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseConfiguration ret = %x\n",i);
-    i = pcmcia_release_irq(link->handle, &link->irq);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseIRQ ret = %x\n",i);
+    pcmcia_disable_device(link);
 
     DEBUG(2,"ray_release ending\n");
 }
 
-static int ray_suspend(struct pcmcia_device *p_dev)
+static int ray_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-
-                pcmcia_release_configuration(link->handle);
-        }
-
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int ray_resume(struct pcmcia_device *p_dev)
+static int ray_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        ray_reset(dev);
-                        netif_device_attach(dev);
-                }
-        }
+        if (link->open) {
+                ray_reset(dev);
+                netif_device_attach(dev);
+        }
 
         return 0;
 }
@@ -910,10 +857,10 @@ int ray_dev_init(struct net_device *dev)
     int i;
 #endif  /* RAY_IMMEDIATE_INIT */
     ray_dev_t *local = dev->priv;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
 
     DEBUG(1,"ray_dev_init(dev=%p)\n",dev);
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_dev_init - device not present\n");
         return -1;
     }
@@ -944,10 +891,10 @@ int ray_dev_init(struct net_device *dev)
 static int ray_dev_config(struct net_device *dev, struct ifmap *map)
 {
     ray_dev_t *local = dev->priv;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     /* Dummy routine to satisfy device structure */
     DEBUG(1,"ray_dev_config(dev=%p,ifmap=%p)\n",dev,map);
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_dev_config - device not present\n");
         return -1;
     }
@@ -958,10 +905,10 @@ static int ray_dev_config(struct net_device *dev, struct ifmap *map)
 static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
     ray_dev_t *local = dev->priv;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     short length = skb->len;
 
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_dev_start_xmit - device not present\n");
         return -1;
     }
@@ -1570,7 +1517,7 @@ static int ray_commit(struct net_device *dev,
 static iw_stats * ray_get_wireless_stats(struct net_device *    dev)
 {
   ray_dev_t *   local = (ray_dev_t *) dev->priv;
-  dev_link_t *link = local->finder;
+  struct pcmcia_device *link = local->finder;
   struct status __iomem *p = local->sram + STATUS_BASE;
 
   if(local == (ray_dev_t *) NULL)
@@ -1588,7 +1535,7 @@ static iw_stats * ray_get_wireless_stats(struct net_device *	dev)
     }
 #endif /* WIRELESS_SPY */
 
-  if((link->state & DEV_PRESENT)) {
+  if(pcmcia_dev_present(link)) {
     local->wstats.qual.noise = readb(&p->rxnoise);
     local->wstats.qual.updated |= 4;
   }
@@ -1657,18 +1604,14 @@ static const struct iw_handler_def	ray_handler_def =
 /*===========================================================================*/
 static int ray_open(struct net_device *dev)
 {
-    dev_link_t *link;
     ray_dev_t *local = (ray_dev_t *)dev->priv;
+    struct pcmcia_device *link;
+    link = local->finder;
     
     DEBUG(1, "ray_open('%s')\n", dev->name);
 
-    for (link = dev_list; link; link = link->next)
-        if (link->priv == dev) break;
-    if (!DEV_OK(link)) {
-        return -ENODEV;
-    }
-
-    if (link->open == 0) local->num_multi = 0;
+    if (link->open == 0)
+            local->num_multi = 0;
     link->open++;
 
     /* If the card is not started, time to start it ! - Jean II */
@@ -1695,15 +1638,12 @@ static int ray_open(struct net_device *dev)
 /*===========================================================================*/
 static int ray_dev_close(struct net_device *dev)
 {
-    dev_link_t *link;
+    ray_dev_t *local = (ray_dev_t *)dev->priv;
+    struct pcmcia_device *link;
+    link = local->finder;
 
     DEBUG(1, "ray_dev_close('%s')\n", dev->name);
 
-    for (link = dev_list; link; link = link->next)
-        if (link->priv == dev) break;
-    if (link == NULL)
-        return -ENODEV;
-
     link->open--;
     netif_stop_queue(dev);
 
@@ -1725,9 +1665,9 @@ static void ray_reset(struct net_device *dev) {
 static int interrupt_ecf(ray_dev_t *local, int ccs)
 {
     int i = 50;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
 
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs interrupt_ecf - device not present\n");
         return -1;
     }
@@ -1752,9 +1692,9 @@ static int get_free_tx_ccs(ray_dev_t *local)
 {
     int i;
     struct ccs __iomem *pccs = ccs_base(local);
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
 
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs get_free_tx_ccs - device not present\n");
         return ECARDGONE;
     }
@@ -1783,9 +1723,9 @@ static int get_free_ccs(ray_dev_t *local)
 {
     int i;
     struct ccs __iomem *pccs = ccs_base(local);
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
 
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs get_free_ccs - device not present\n");
         return ECARDGONE;
     }
@@ -1858,9 +1798,9 @@ static int parse_addr(char *in_str, UCHAR *out)
 static struct net_device_stats *ray_get_stats(struct net_device *dev)
 {
     ray_dev_t *local = (ray_dev_t *)dev->priv;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     struct status __iomem *p = local->sram + STATUS_BASE;
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs net_device_stats - device not present\n");
         return &local->stats;
     }
@@ -1888,12 +1828,12 @@ static struct net_device_stats *ray_get_stats(struct net_device *dev)
 static void ray_update_parm(struct net_device *dev, UCHAR objid, UCHAR *value, int len)
 {
     ray_dev_t *local = (ray_dev_t *)dev->priv;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     int ccsindex;
     int i;
     struct ccs __iomem *pccs;
 
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_update_parm - device not present\n");
         return;
     }
@@ -1925,10 +1865,10 @@ static void ray_update_multi_list(struct net_device *dev, int all)
     struct ccs __iomem *pccs;
     int i = 0;
     ray_dev_t *local = (ray_dev_t *)dev->priv;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     void __iomem *p = local->sram + HOST_TO_ECF_BASE;
 
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_update_multi_list - device not present\n");
         return;
     }
@@ -2005,7 +1945,7 @@ static void set_multicast_list(struct net_device *dev)
 static irqreturn_t ray_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
     struct net_device *dev = (struct net_device *)dev_id;
-    dev_link_t *link;
+    struct pcmcia_device *link;
     ray_dev_t *local;
     struct ccs __iomem *pccs;
     struct rcs __iomem *prcs;
@@ -2020,8 +1960,8 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id, struct pt_regs * regs)
     DEBUG(4,"ray_cs: interrupt for *dev=%p\n",dev);
 
     local = (ray_dev_t *)dev->priv;
-    link = (dev_link_t *)local->finder;
-    if ( ! (link->state & DEV_PRESENT) || link->state & DEV_SUSPEND ) {
+    link = (struct pcmcia_device *)local->finder;
+    if (!pcmcia_dev_present(link)) {
         DEBUG(2,"ray_cs interrupt from device not present or suspended.\n");
         return IRQ_NONE;
     }
@@ -2540,9 +2480,9 @@ static void release_frag_chain(ray_dev_t *local, struct rcs __iomem * prcs)
 /*===========================================================================*/
 static void authenticate(ray_dev_t *local)
 {
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     DEBUG(0,"ray_cs Starting authentication.\n");
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs authenticate - device not present\n");
         return;
     }
@@ -2606,10 +2546,10 @@ static void rx_authenticate(ray_dev_t *local, struct rcs __iomem *prcs,
 static void associate(ray_dev_t *local)
 {
     struct ccs __iomem *pccs;
-    dev_link_t *link = local->finder;
+    struct pcmcia_device *link = local->finder;
     struct net_device *dev = link->priv;
     int ccsindex;
-    if (!(link->state & DEV_PRESENT)) {
+    if (!(pcmcia_dev_present(link))) {
         DEBUG(2,"ray_cs associate - device not present\n");
         return;
     }
@@ -2689,14 +2629,14 @@ static int ray_cs_proc_read(char *buf, char **start, off_t offset, int len)
  * eg ifconfig 
  */
     int i;
-    dev_link_t *link;
+    struct pcmcia_device *link;
     struct net_device *dev;
     ray_dev_t *local;
     UCHAR *p;
     struct freq_hop_element *pfh;
     UCHAR c[33];
 
-    link = dev_list;
+    link = this_device;
     if (!link)
         return 0;
     dev = (struct net_device *)link->priv;
@@ -2898,7 +2838,7 @@ static struct pcmcia_driver ray_driver = {
         .drv            = {
                 .name   = "ray_cs",
         },
-        .probe          = ray_attach,
+        .probe          = ray_probe,
         .remove         = ray_detach,
         .id_table       = ray_ids,
         .suspend        = ray_suspend,
@@ -2940,7 +2880,6 @@ static void __exit exit_ray_cs(void)
 #endif
 
     pcmcia_unregister_driver(&ray_driver);
-    BUG_ON(dev_list != NULL);
 } /* exit_ray_cs */
 
 module_init(init_ray_cs);
diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h
index 42660fe64bfd..bd73ebf03340 100644
--- a/drivers/net/wireless/ray_cs.h
+++ b/drivers/net/wireless/ray_cs.h
@@ -31,7 +31,7 @@ typedef struct ray_dev_t {
     void __iomem *sram;            /* pointer to beginning of shared RAM     */
     void __iomem *amem;            /* pointer to attribute mem window        */
     void __iomem *rmem;            /* pointer to receive buffer window       */
-    dev_link_t *finder;            /* pointer back to dev_link_t for card    */
+    struct pcmcia_device *finder;            /* pointer back to struct pcmcia_device for card    */
     struct timer_list timer;
     long tx_ccs_lock;
     long ccs_lock;
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 5fa6fbe35bb9..f7b77ce54d7b 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -63,7 +63,7 @@ MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket
 /* PCMCIA specific device information (goes in the card field of
  * struct orinoco_private */
 struct orinoco_pccard {
-        dev_link_t link;
+        struct pcmcia_device    *p_dev;
         dev_node_t node;
 };
 
@@ -71,8 +71,8 @@ struct orinoco_pccard {
 /* Function prototypes                                              */
 /********************************************************************/
 
-static void spectrum_cs_config(dev_link_t *link);
-static void spectrum_cs_release(dev_link_t *link);
+static int spectrum_cs_config(struct pcmcia_device *link);
+static void spectrum_cs_release(struct pcmcia_device *link);
 
 /********************************************************************/
 /* Firmware downloader                                              */
@@ -238,14 +238,14 @@ spectrum_aux_open(hermes_t *hw)
  * If IDLE is 1, stop the firmware, so that it can be safely rewritten.
  */
 static int
-spectrum_reset(dev_link_t *link, int idle)
+spectrum_reset(struct pcmcia_device *link, int idle)
 {
         int last_ret, last_fn;
         conf_reg_t reg;
         u_int save_cor;
 
         /* Doing it if hardware is gone is guaranteed crash */
-        if (!(link->state & DEV_CONFIG))
+        if (pcmcia_dev_present(link))
                 return -ENODEV;
 
         /* Save original COR value */
@@ -253,7 +253,7 @@ spectrum_reset(dev_link_t *link, int idle)
         reg.Action = CS_READ;
         reg.Offset = CISREG_COR;
         CS_CHECK(AccessConfigurationRegister,
-                 pcmcia_access_configuration_register(link->handle, &reg));
+                 pcmcia_access_configuration_register(link, &reg));
         save_cor = reg.Value;
 
         /* Soft-Reset card */
@@ -261,14 +261,14 @@ spectrum_reset(dev_link_t *link, int idle)
         reg.Offset = CISREG_COR;
         reg.Value = (save_cor | COR_SOFT_RESET);
         CS_CHECK(AccessConfigurationRegister,
-                 pcmcia_access_configuration_register(link->handle, &reg));
+                 pcmcia_access_configuration_register(link, &reg));
         udelay(1000);
 
         /* Read CCSR */
         reg.Action = CS_READ;
         reg.Offset = CISREG_CCSR;
         CS_CHECK(AccessConfigurationRegister,
-                 pcmcia_access_configuration_register(link->handle, &reg));
+                 pcmcia_access_configuration_register(link, &reg));
 
         /*
          * Start or stop the firmware.  Memory width bit should be
@@ -278,7 +278,7 @@ spectrum_reset(dev_link_t *link, int idle)
         reg.Offset = CISREG_CCSR;
         reg.Value = (idle ? HCR_IDLE : HCR_RUN) | (reg.Value & HCR_MEM16);
         CS_CHECK(AccessConfigurationRegister,
-                 pcmcia_access_configuration_register(link->handle, &reg));
+                 pcmcia_access_configuration_register(link, &reg));
         udelay(1000);
 
         /* Restore original COR configuration index */
@@ -286,12 +286,12 @@ spectrum_reset(dev_link_t *link, int idle)
         reg.Offset = CISREG_COR;
         reg.Value = (save_cor & ~COR_SOFT_RESET);
         CS_CHECK(AccessConfigurationRegister,
-                 pcmcia_access_configuration_register(link->handle, &reg));
+                 pcmcia_access_configuration_register(link, &reg));
         udelay(1000);
         return 0;
 
       cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
         return -ENODEV;
 }
 
@@ -441,7 +441,7 @@ spectrum_load_blocks(hermes_t *hw, const struct dblock *first_block)
  * care of the PDA - read it and then write it on top of the firmware.
  */
 static int
-spectrum_dl_image(hermes_t *hw, dev_link_t *link,
+spectrum_dl_image(hermes_t *hw, struct pcmcia_device *link,
                   const unsigned char *image)
 {
         int ret;
@@ -505,14 +505,13 @@ spectrum_dl_image(hermes_t *hw, dev_link_t *link,
  * reset on the card, to make sure it's in a sane state.
  */
 static int
-spectrum_dl_firmware(hermes_t *hw, dev_link_t *link)
+spectrum_dl_firmware(hermes_t *hw, struct pcmcia_device *link)
 {
         int ret;
-        client_handle_t handle = link->handle;
         const struct firmware *fw_entry;
 
         if (request_firmware(&fw_entry, primary_fw_name,
-                             &handle_to_dev(handle)) == 0) {
+                             &handle_to_dev(link)) == 0) {
                 primsym = fw_entry->data;
         } else {
                 printk(KERN_ERR PFX "Cannot find firmware: %s\n",
@@ -521,7 +520,7 @@ spectrum_dl_firmware(hermes_t *hw, dev_link_t *link)
         }
 
         if (request_firmware(&fw_entry, secondary_fw_name,
-                             &handle_to_dev(handle)) == 0) {
+                             &handle_to_dev(link)) == 0) {
                 secsym = fw_entry->data;
         } else {
                 printk(KERN_ERR PFX "Cannot find firmware: %s\n",
@@ -554,12 +553,12 @@ static int
 spectrum_cs_hard_reset(struct orinoco_private *priv)
 {
         struct orinoco_pccard *card = priv->card;
-        dev_link_t *link = &card->link;
+        struct pcmcia_device *link = card->p_dev;
         int err;
 
         if (!hermes_present(&priv->hw)) {
                 /* The firmware needs to be reloaded */
-                if (spectrum_dl_firmware(&priv->hw, &card->link) != 0) {
+                if (spectrum_dl_firmware(&priv->hw, link) != 0) {
                         printk(KERN_ERR PFX "Firmware download failed\n");
                         err = -ENODEV;
                 }
@@ -584,12 +583,11 @@ spectrum_cs_hard_reset(struct orinoco_private *priv)
  * configure the card at this point -- we wait until we receive a card
  * insertion event.  */
 static int
-spectrum_cs_attach(struct pcmcia_device *p_dev)
+spectrum_cs_probe(struct pcmcia_device *link)
 {
         struct net_device *dev;
         struct orinoco_private *priv;
         struct orinoco_pccard *card;
-        dev_link_t *link;
 
         dev = alloc_orinocodev(sizeof(*card), spectrum_cs_hard_reset);
         if (! dev)
@@ -598,7 +596,7 @@ spectrum_cs_attach(struct pcmcia_device *p_dev)
         card = priv->card;
 
         /* Link both structures together */
-        link = &card->link;
+        card->p_dev = link;
         link->priv = dev;
 
         /* Interrupt setup */
@@ -615,13 +613,7 @@ spectrum_cs_attach(struct pcmcia_device *p_dev)
         link->conf.Attributes = 0;
         link->conf.IntType = INT_MEMORY_AND_IO;
 
-        link->handle = p_dev;
-        p_dev->instance = link;
-
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        spectrum_cs_config(link);
-
-        return 0;
+        return spectrum_cs_config(link);
 }                               /* spectrum_cs_attach */
 
 /*
@@ -630,16 +622,14 @@ spectrum_cs_attach(struct pcmcia_device *p_dev)
  * are freed.  Otherwise, the structures will be freed when the device
  * is released.
  */
-static void spectrum_cs_detach(struct pcmcia_device *p_dev)
+static void spectrum_cs_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        if (link->state & DEV_CONFIG)
-                spectrum_cs_release(link);
+        spectrum_cs_release(link);
 
-        DEBUG(0, PFX "detach: link=%p link->dev=%p\n", link, link->dev);
-        if (link->dev) {
+        DEBUG(0, PFX "detach: link=%p link->dev_node=%p\n", link, link->dev_node);
+        if (link->dev_node) {
                 DEBUG(0, PFX "About to unregister net device %p\n",
                       dev);
                 unregister_netdev(dev);
@@ -653,11 +643,10 @@ static void spectrum_cs_detach(struct pcmcia_device *p_dev)
  * device available to the system.
  */
 
-static void
-spectrum_cs_config(dev_link_t *link)
+static int
+spectrum_cs_config(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
-        client_handle_t handle = link->handle;
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
@@ -669,7 +658,7 @@ spectrum_cs_config(dev_link_t *link)
         cisparse_t parse;
         void __iomem *mem;
 
-        CS_CHECK(ValidateCIS, pcmcia_validate_cis(handle, &info));
+        CS_CHECK(ValidateCIS, pcmcia_validate_cis(link, &info));
 
         /*
          * This reads the card's CONFIG tuple to find its
@@ -680,19 +669,15 @@ spectrum_cs_config(dev_link_t *link)
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present = parse.config.rmask[0];
 
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-
         /* Look up the current Vcc */
         CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(handle, &conf));
-        link->conf.Vcc = conf.Vcc;
+                 pcmcia_get_configuration_info(link, &conf));
 
         /*
          * In this loop, we scan the CIS for configuration table
@@ -709,13 +694,13 @@ spectrum_cs_config(dev_link_t *link)
          * implementation-defined details.
          */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         while (1) {
                 cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                 cistpl_cftable_entry_t dflt = { .index = 0 };
 
-                if ( (pcmcia_get_tuple_data(handle, &tuple) != 0)
-                    || (pcmcia_parse_tuple(handle, &tuple, &parse) != 0))
+                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
+                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
                         goto next_entry;
 
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
@@ -747,10 +732,10 @@ spectrum_cs_config(dev_link_t *link)
                 }
 
                 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                             cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                             dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 
                 /* Do we need to allocate an interrupt? */
@@ -780,7 +765,7 @@ spectrum_cs_config(dev_link_t *link)
                         }
 
                         /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link->handle, &link->io) != 0)
+                        if (pcmcia_request_io(link, &link->io) != 0)
                                 goto next_entry;
                 }
 
@@ -790,9 +775,8 @@ spectrum_cs_config(dev_link_t *link)
                 break;
                 
         next_entry:
-                if (link->io.NumPorts1)
-                        pcmcia_release_io(link->handle, &link->io);
-                last_ret = pcmcia_get_next_tuple(handle, &tuple);
+                pcmcia_disable_device(link);
+                last_ret = pcmcia_get_next_tuple(link, &tuple);
                 if (last_ret  == CS_NO_MORE_ITEMS) {
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
                                "CIS configuration.  Maybe you need the "
@@ -806,7 +790,7 @@ spectrum_cs_config(dev_link_t *link)
          * a handler to the interrupt, unless the 'Handler' member of
          * the irq structure is initialized.
          */
-        CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
 
         /* We initialize the hermes structure before completing PCMCIA
          * configuration just in case the interrupt handler gets
@@ -823,7 +807,7 @@ spectrum_cs_config(dev_link_t *link)
          * card and host interface into "Memory and IO" mode.
          */
         CS_CHECK(RequestConfiguration,
-                 pcmcia_request_configuration(link->handle, &link->conf));
+                 pcmcia_request_configuration(link, &link->conf));
 
         /* Ok, we have the configuration, prepare to register the netdev */
         dev->base_addr = link->io.BasePort1;
@@ -836,7 +820,7 @@ spectrum_cs_config(dev_link_t *link)
                 goto failed;
         }
 
-        SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+        SET_NETDEV_DEV(dev, &handle_to_dev(link));
         /* Tell the stack we exist */
         if (register_netdev(dev) != 0) {
                 printk(KERN_ERR PFX "register_netdev() failed\n");
@@ -844,20 +828,18 @@ spectrum_cs_config(dev_link_t *link)
         }
 
         /* At this point, the dev_node_t structure(s) needs to be
-         * initialized and arranged in a linked list at link->dev. */
+         * initialized and arranged in a linked list at link->dev_node. */
         strcpy(card->node.dev_name, dev->name);
-        link->dev = &card->node; /* link->dev being non-NULL is also
+        link->dev_node = &card->node; /* link->dev_node being non-NULL is also
                                     used to indicate that the
                                     net_device has been registered */
-        link->state &= ~DEV_CONFIG_PENDING;
 
         /* Finally, report what we've done */
-        printk(KERN_DEBUG "%s: index 0x%02x: Vcc %d.%d",
-               dev->name, link->conf.ConfigIndex,
-               link->conf.Vcc / 10, link->conf.Vcc % 10);
-        if (link->conf.Vpp1)
-                printk(", Vpp %d.%d", link->conf.Vpp1 / 10,
-                       link->conf.Vpp1 % 10);
+        printk(KERN_DEBUG "%s: index 0x%02x: ",
+               dev->name, link->conf.ConfigIndex);
+        if (link->conf.Vpp)
+                printk(", Vpp %d.%d", link->conf.Vpp / 10,
+                       link->conf.Vpp % 10);
         printk(", irq %d", link->irq.AssignedIRQ);
         if (link->io.NumPorts1)
                 printk(", io 0x%04x-0x%04x", link->io.BasePort1,
@@ -867,13 +849,14 @@ spectrum_cs_config(dev_link_t *link)
                        link->io.BasePort2 + link->io.NumPorts2 - 1);
         printk("\n");
 
-        return;
+        return 0;
 
  cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 
  failed:
         spectrum_cs_release(link);
+        return -ENODEV;
 }                               /* spectrum_cs_config */
 
 /*
@@ -882,7 +865,7 @@ spectrum_cs_config(dev_link_t *link)
  * still open, this will be postponed until it is closed.
  */
 static void
-spectrum_cs_release(dev_link_t *link)
+spectrum_cs_release(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
@@ -894,64 +877,46 @@ spectrum_cs_release(dev_link_t *link)
         priv->hw_unavailable++;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        /* Don't bother checking to see if these succeed or not */
-        pcmcia_release_configuration(link->handle);
-        if (link->io.NumPorts1)
-                pcmcia_release_io(link->handle, &link->io);
-        if (link->irq.AssignedIRQ)
-                pcmcia_release_irq(link->handle, &link->irq);
-        link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
         if (priv->hw.iobase)
                 ioport_unmap(priv->hw.iobase);
 }                               /* spectrum_cs_release */
 
 
 static int
-spectrum_cs_suspend(struct pcmcia_device *p_dev)
+spectrum_cs_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
         unsigned long flags;
         int err = 0;
 
-        link->state |= DEV_SUSPEND;
         /* Mark the device as stopped, to block IO until later */
-        if (link->state & DEV_CONFIG) {
-                spin_lock_irqsave(&priv->lock, flags);
-
-                err = __orinoco_down(dev);
-                if (err)
-                        printk(KERN_WARNING "%s: Error %d downing interface\n",
-                               dev->name, err);
+        spin_lock_irqsave(&priv->lock, flags);
 
-                netif_device_detach(dev);
-                priv->hw_unavailable++;
+        err = __orinoco_down(dev);
+        if (err)
+                printk(KERN_WARNING "%s: Error %d downing interface\n",
+                       dev->name, err);
 
-                spin_unlock_irqrestore(&priv->lock, flags);
+        netif_device_detach(dev);
+        priv->hw_unavailable++;
 
-                pcmcia_release_configuration(link->handle);
-        }
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
 static int
-spectrum_cs_resume(struct pcmcia_device *p_dev)
+spectrum_cs_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                /* FIXME: should we double check that this is
-                 * the same card as we had before */
-                pcmcia_request_configuration(link->handle, &link->conf);
-                netif_device_attach(dev);
-                priv->hw_unavailable--;
-                schedule_work(&priv->reset_work);
-        }
+        netif_device_attach(dev);
+        priv->hw_unavailable--;
+        schedule_work(&priv->reset_work);
+
         return 0;
 }
 
@@ -979,7 +944,7 @@ static struct pcmcia_driver orinoco_driver = {
         .drv            = {
                 .name   = DRIVER_NAME,
         },
-        .probe          = spectrum_cs_attach,
+        .probe          = spectrum_cs_probe,
         .remove         = spectrum_cs_detach,
         .suspend        = spectrum_cs_suspend,
         .resume         = spectrum_cs_resume,
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 98122f3a4bc2..f7724eb2fa7e 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -1005,7 +1005,7 @@ static inline void
 wv_82593_reconfig(struct net_device *   dev)
 {
   net_local *           lp = netdev_priv(dev);
-  dev_link_t *          link = lp->link;
+  struct pcmcia_device *                link = lp->link;
   unsigned long         flags;
 
   /* Arm the flag, will be cleard in wv_82593_config() */
@@ -3744,16 +3744,16 @@ wv_pcmcia_reset(struct net_device *	dev)
 {
   int           i;
   conf_reg_t    reg = { 0, CS_READ, CISREG_COR, 0 };
-  dev_link_t *  link = ((net_local *)netdev_priv(dev))->link;
+  struct pcmcia_device *        link = ((net_local *)netdev_priv(dev))->link;
 
 #ifdef DEBUG_CONFIG_TRACE
   printk(KERN_DEBUG "%s: ->wv_pcmcia_reset()\n", dev->name);
 #endif
 
-  i = pcmcia_access_configuration_register(link->handle, &reg);
+  i = pcmcia_access_configuration_register(link, &reg);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, AccessConfigurationRegister, i);
+      cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
     }
       
@@ -3764,19 +3764,19 @@ wv_pcmcia_reset(struct net_device *	dev)
 
   reg.Action = CS_WRITE;
   reg.Value = reg.Value | COR_SW_RESET;
-  i = pcmcia_access_configuration_register(link->handle, &reg);
+  i = pcmcia_access_configuration_register(link, &reg);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, AccessConfigurationRegister, i);
+      cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
     }
       
   reg.Action = CS_WRITE;
   reg.Value = COR_LEVEL_IRQ | COR_CONFIG;
-  i = pcmcia_access_configuration_register(link->handle, &reg);
+  i = pcmcia_access_configuration_register(link, &reg);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, AccessConfigurationRegister, i);
+      cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
     }
 
@@ -3940,9 +3940,8 @@ wv_hw_reset(struct net_device *	dev)
  * (called by wavelan_event())
  */
 static inline int
-wv_pcmcia_config(dev_link_t *   link)
+wv_pcmcia_config(struct pcmcia_device * link)
 {
-  client_handle_t       handle = link->handle;
   tuple_t               tuple;
   cisparse_t            parse;
   struct net_device *   dev = (struct net_device *) link->priv;
@@ -3965,16 +3964,16 @@ wv_pcmcia_config(dev_link_t *	link)
     {
       tuple.Attributes = 0;
       tuple.DesiredTuple = CISTPL_CONFIG;
-      i = pcmcia_get_first_tuple(handle, &tuple);
+      i = pcmcia_get_first_tuple(link, &tuple);
       if(i != CS_SUCCESS)
         break;
       tuple.TupleData = (cisdata_t *)buf;
       tuple.TupleDataMax = 64;
       tuple.TupleOffset = 0;
-      i = pcmcia_get_tuple_data(handle, &tuple);
+      i = pcmcia_get_tuple_data(link, &tuple);
       if(i != CS_SUCCESS)
         break;
-      i = pcmcia_parse_tuple(handle, &tuple, &parse);
+      i = pcmcia_parse_tuple(link, &tuple, &parse);
       if(i != CS_SUCCESS)
         break;
       link->conf.ConfigBase = parse.config.base;
@@ -3983,19 +3982,16 @@ wv_pcmcia_config(dev_link_t *	link)
   while(0);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, ParseTuple, i);
-      link->state &= ~DEV_CONFIG_PENDING;
+      cs_error(link, ParseTuple, i);
       return FALSE;
     }
-    
-  /* Configure card */
-  link->state |= DEV_CONFIG;
+
   do
     {
-      i = pcmcia_request_io(link->handle, &link->io);
+      i = pcmcia_request_io(link, &link->io);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestIO, i);
+          cs_error(link, RequestIO, i);
           break;
         }
 
@@ -4003,10 +3999,10 @@ wv_pcmcia_config(dev_link_t *	link)
        * Now allocate an interrupt line.  Note that this does not
        * actually assign a handler to the interrupt.
        */
-      i = pcmcia_request_irq(link->handle, &link->irq);
+      i = pcmcia_request_irq(link, &link->irq);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestIRQ, i);
+          cs_error(link, RequestIRQ, i);
           break;
         }
 
@@ -4015,15 +4011,15 @@ wv_pcmcia_config(dev_link_t *	link)
        * the I/O windows and the interrupt mapping.
        */
       link->conf.ConfigIndex = 1;
-      i = pcmcia_request_configuration(link->handle, &link->conf);
+      i = pcmcia_request_configuration(link, &link->conf);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestConfiguration, i);
+          cs_error(link, RequestConfiguration, i);
           break;
         }
 
       /*
-       * Allocate a small memory window.  Note that the dev_link_t
+       * Allocate a small memory window.  Note that the struct pcmcia_device
        * structure provides space for one window handle -- if your
        * device needs several windows, you'll need to keep track of
        * the handles in your private data structure, link->priv.
@@ -4031,10 +4027,10 @@ wv_pcmcia_config(dev_link_t *	link)
       req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
       req.Base = req.Size = 0;
       req.AccessSpeed = mem_speed;
-      i = pcmcia_request_window(&link->handle, &req, &link->win);
+      i = pcmcia_request_window(&link, &req, &link->win);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestWindow, i);
+          cs_error(link, RequestWindow, i);
           break;
         }
 
@@ -4046,7 +4042,7 @@ wv_pcmcia_config(dev_link_t *	link)
       i = pcmcia_map_mem_page(link->win, &mem);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, MapMemPage, i);
+          cs_error(link, MapMemPage, i);
           break;
         }
 
@@ -4060,7 +4056,7 @@ wv_pcmcia_config(dev_link_t *	link)
              lp->mem, dev->irq, (u_int) dev->base_addr);
 #endif
 
-      SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+      SET_NETDEV_DEV(dev, &handle_to_dev(link));
       i = register_netdev(dev);
       if(i != 0)
         {
@@ -4072,7 +4068,6 @@ wv_pcmcia_config(dev_link_t *	link)
     }
   while(0);             /* Humm... Disguised goto !!! */
 
-  link->state &= ~DEV_CONFIG_PENDING;
   /* If any step failed, release any partially configured state */
   if(i != 0)
     {
@@ -4081,7 +4076,7 @@ wv_pcmcia_config(dev_link_t *	link)
     }
 
   strcpy(((net_local *) netdev_priv(dev))->node.dev_name, dev->name);
-  link->dev = &((net_local *) netdev_priv(dev))->node;
+  link->dev_node = &((net_local *) netdev_priv(dev))->node;
 
 #ifdef DEBUG_CONFIG_TRACE
   printk(KERN_DEBUG "<-wv_pcmcia_config()\n");
@@ -4096,26 +4091,20 @@ wv_pcmcia_config(dev_link_t *	link)
  * still open, this will be postponed until it is closed.
  */
 static void
-wv_pcmcia_release(dev_link_t *link)
+wv_pcmcia_release(struct pcmcia_device *link)
 {
-  struct net_device *   dev = (struct net_device *) link->priv;
-  net_local *           lp = netdev_priv(dev);
+        struct net_device *     dev = (struct net_device *) link->priv;
+        net_local *             lp = netdev_priv(dev);
 
 #ifdef DEBUG_CONFIG_TRACE
-  printk(KERN_DEBUG "%s: -> wv_pcmcia_release(0x%p)\n", dev->name, link);
+        printk(KERN_DEBUG "%s: -> wv_pcmcia_release(0x%p)\n", dev->name, link);
 #endif
 
-  /* Don't bother checking to see if these succeed or not */
-  iounmap(lp->mem);
-  pcmcia_release_window(link->win);
-  pcmcia_release_configuration(link->handle);
-  pcmcia_release_io(link->handle, &link->io);
-  pcmcia_release_irq(link->handle, &link->irq);
-
-  link->state &= ~DEV_CONFIG;
+        iounmap(lp->mem);
+        pcmcia_disable_device(link);
 
 #ifdef DEBUG_CONFIG_TRACE
-  printk(KERN_DEBUG "%s: <- wv_pcmcia_release()\n", dev->name);
+        printk(KERN_DEBUG "%s: <- wv_pcmcia_release()\n", dev->name);
 #endif
 }
 
@@ -4479,7 +4468,7 @@ static int
 wavelan_open(struct net_device *        dev)
 {
   net_local *   lp = netdev_priv(dev);
-  dev_link_t *  link = lp->link;
+  struct pcmcia_device *        link = lp->link;
   kio_addr_t    base = dev->base_addr;
 
 #ifdef DEBUG_CALLBACK_TRACE
@@ -4533,7 +4522,7 @@ wavelan_open(struct net_device *	dev)
 static int
 wavelan_close(struct net_device *       dev)
 {
-  dev_link_t *  link = ((net_local *)netdev_priv(dev))->link;
+  struct pcmcia_device *        link = ((net_local *)netdev_priv(dev))->link;
   kio_addr_t    base = dev->base_addr;
 
 #ifdef DEBUG_CALLBACK_TRACE
@@ -4587,45 +4576,36 @@ wavelan_close(struct net_device *	dev)
  * card insertion event.
  */
 static int
-wavelan_attach(struct pcmcia_device *p_dev)
+wavelan_probe(struct pcmcia_device *p_dev)
 {
-  dev_link_t *  link;           /* Info for cardmgr */
   struct net_device *   dev;            /* Interface generic data */
   net_local *   lp;             /* Interface specific data */
+  int ret;
 
 #ifdef DEBUG_CALLBACK_TRACE
   printk(KERN_DEBUG "-> wavelan_attach()\n");
 #endif
 
-  /* Initialize the dev_link_t structure */
-  link = kzalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-  if (!link) return -ENOMEM;
-
   /* The io structure describes IO port mapping */
-  link->io.NumPorts1 = 8;
-  link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-  link->io.IOAddrLines = 3;
+  p_dev->io.NumPorts1 = 8;
+  p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+  p_dev->io.IOAddrLines = 3;
 
   /* Interrupt setup */
-  link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
-  link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-  link->irq.Handler = wavelan_interrupt;
+  p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+  p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+  p_dev->irq.Handler = wavelan_interrupt;
 
   /* General socket configuration */
-  link->conf.Attributes = CONF_ENABLE_IRQ;
-  link->conf.Vcc = 50;
-  link->conf.IntType = INT_MEMORY_AND_IO;
-
-  /* Chain drivers */
-  link->next = NULL;
+  p_dev->conf.Attributes = CONF_ENABLE_IRQ;
+  p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
   /* Allocate the generic data structure */
   dev = alloc_etherdev(sizeof(net_local));
-  if (!dev) {
-      kfree(link);
+  if (!dev)
       return -ENOMEM;
-  }
-  link->priv = link->irq.Instance = dev;
+
+  p_dev->priv = p_dev->irq.Instance = dev;
 
   lp = netdev_priv(dev);
 
@@ -4642,7 +4622,6 @@ wavelan_attach(struct pcmcia_device *p_dev)
   spin_lock_init(&lp->spinlock);
 
   /* back links */
-  lp->link = link;
   lp->dev = dev;
 
   /* wavelan NET3 callbacks */
@@ -4668,15 +4647,18 @@ wavelan_attach(struct pcmcia_device *p_dev)
   /* Other specific data */
   dev->mtu = WAVELAN_MTU;
 
-  link->handle = p_dev;
-  p_dev->instance = link;
+  ret = wv_pcmcia_config(p_dev);
+  if (ret)
+          return ret;
 
-  link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-  if(wv_pcmcia_config(link) &&
-     wv_hw_config(dev))
-          wv_init_info(dev);
-  else
+  ret = wv_hw_config(dev);
+  if (ret) {
           dev->irq = 0;
+          pcmcia_disable_device(p_dev);
+          return ret;
+  }
+
+  wv_init_info(dev);
 
 #ifdef DEBUG_CALLBACK_TRACE
   printk(KERN_DEBUG "<- wavelan_attach()\n");
@@ -4693,25 +4675,14 @@ wavelan_attach(struct pcmcia_device *p_dev)
  * is released.
  */
 static void
-wavelan_detach(struct pcmcia_device *p_dev)
+wavelan_detach(struct pcmcia_device *link)
 {
-   dev_link_t *link = dev_to_instance(p_dev);
-
 #ifdef DEBUG_CALLBACK_TRACE
   printk(KERN_DEBUG "-> wavelan_detach(0x%p)\n", link);
 #endif
 
-  /*
-   * If the device is currently configured and active, we won't
-   * actually delete it yet.  Instead, it is marked so that when the
-   * release() function is called, that will trigger a proper
-   * detach().
-   */
-  if(link->state & DEV_CONFIG)
-    {
-      /* Some others haven't done their job : give them another chance */
-      wv_pcmcia_release(link);
-    }
+  /* Some others haven't done their job : give them another chance */
+  wv_pcmcia_release(link);
 
   /* Free pieces */
   if(link->priv)
@@ -4720,23 +4691,21 @@ wavelan_detach(struct pcmcia_device *p_dev)
 
       /* Remove ourselves from the kernel list of ethernet devices */
       /* Warning : can't be called from interrupt, timer or wavelan_close() */
-      if (link->dev)
+      if (link->dev_node)
         unregister_netdev(dev);
-      link->dev = NULL;
+      link->dev_node = NULL;
       ((net_local *)netdev_priv(dev))->link = NULL;
       ((net_local *)netdev_priv(dev))->dev = NULL;
       free_netdev(dev);
     }
-  kfree(link);
 
 #ifdef DEBUG_CALLBACK_TRACE
   printk(KERN_DEBUG "<- wavelan_detach()\n");
 #endif
 }
 
-static int wavelan_suspend(struct pcmcia_device *p_dev)
+static int wavelan_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *     dev = (struct net_device *) link->priv;
 
         /* NB: wavelan_close will be called, but too late, so we are
@@ -4748,36 +4717,22 @@ static int wavelan_suspend(struct pcmcia_device *p_dev)
         /* Stop receiving new messages and wait end of transmission */
         wv_ru_stop(dev);
 
+        if (link->open)
+                netif_device_detach(dev);
+
         /* Power down the module */
         hacr_write(dev->base_addr, HACR_DEFAULT & (~HACR_PWR_STAT));
 
-        /* The card is now suspended */
-        link->state |= DEV_SUSPEND;
-
-        if(link->state & DEV_CONFIG)
-        {
-                if(link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
-
         return 0;
 }
 
-static int wavelan_resume(struct pcmcia_device *p_dev)
+static int wavelan_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *     dev = (struct net_device *) link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if(link->state & DEV_CONFIG)
-        {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if(link->open)  /* If RESET -> True, If RESUME -> False ? */
-                {
-                        wv_hw_reset(dev);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                wv_hw_reset(dev);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -4798,7 +4753,7 @@ static struct pcmcia_driver wavelan_driver = {
         .drv            = {
                 .name   = "wavelan_cs",
         },
-        .probe          = wavelan_attach,
+        .probe          = wavelan_probe,
         .remove         = wavelan_detach,
         .id_table       = wavelan_ids,
         .suspend        = wavelan_suspend,
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 451f6271dcbc..c65fe7a391ec 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -602,7 +602,7 @@ struct net_local
   dev_node_t    node;           /* ???? What is this stuff ???? */
   struct net_device *   dev;            /* Reverse link... */
   spinlock_t    spinlock;       /* Serialize access to the hardware (SMP) */
-  dev_link_t *  link;           /* pcmcia structure */
+  struct pcmcia_device *        link;           /* pcmcia structure */
   en_stats      stats;          /* Ethernet interface statistics */
   int           nresets;        /* Number of hw resets */
   u_char        configured;     /* If it is configured */
@@ -733,9 +733,9 @@ static int
 static inline void
         wv_hw_reset(struct net_device *);       /* Same, + start receiver unit */
 static inline int
-        wv_pcmcia_config(dev_link_t *); /* Configure the pcmcia interface */
+        wv_pcmcia_config(struct pcmcia_device *);       /* Configure the pcmcia interface */
 static void
-        wv_pcmcia_release(dev_link_t *);/* Remove a device */
+        wv_pcmcia_release(struct pcmcia_device *);/* Remove a device */
 /* ---------------------- INTERRUPT HANDLING ---------------------- */
 static irqreturn_t
         wavelan_interrupt(int,  /* Interrupt handler */
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index 4303c50c2ab6..65ceb088f700 100644
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -611,5 +611,6 @@ struct wl3501_card {
         struct iw_spy_data              spy_data;
         struct iw_public_data           wireless_data;
         struct dev_node_t               node;
+        struct pcmcia_device            *p_dev;
 };
 #endif
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 48e10b0c7e74..e52a650f6737 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -103,8 +103,8 @@ module_param(pc_debug, int, 0);
  * release a socket, in response to card insertion and ejection events.  They
  * are invoked from the wl24 event handler.
  */
-static void wl3501_config(dev_link_t *link);
-static void wl3501_release(dev_link_t *link);
+static int wl3501_config(struct pcmcia_device *link);
+static void wl3501_release(struct pcmcia_device *link);
 
 /*
  * The dev_info variable is the "key" that is used to match up this
@@ -226,17 +226,6 @@ static void iw_copy_mgmt_info_element(struct iw_mgmt_info_element *to,
         iw_set_mgmt_info_element(from->id, to, from->data, from->len);
 }
 
-/*
- * A linked list of "instances" of the wl24 device.  Each actual PCMCIA card
- * corresponds to one device instance, and is described by one dev_link_t
- * structure (defined in ds.h).
- *
- * You may not want to use a linked list for this -- for example, the memory
- * card driver uses an array of dev_link_t pointers, where minor device numbers
- * are used to derive the corresponding array index.
- */
-static dev_link_t *wl3501_dev_list;
-
 static inline void wl3501_switch_page(struct wl3501_card *this, u8 page)
 {
         wl3501_outb(page, this->base_addr + WL3501_NIC_BSS);
@@ -1281,15 +1270,10 @@ static int wl3501_close(struct net_device *dev)
         struct wl3501_card *this = dev->priv;
         int rc = -ENODEV;
         unsigned long flags;
-        dev_link_t *link;
+        struct pcmcia_device *link;
+        link = this->p_dev;
 
         spin_lock_irqsave(&this->lock, flags);
-        /* Check if the device is in wl3501_dev_list */
-        for (link = wl3501_dev_list; link; link = link->next)
-                if (link->priv == dev)
-                        break;
-        if (!link)
-                goto out;
         link->open--;
 
         /* Stop wl3501_hard_start_xmit() from now on */
@@ -1301,7 +1285,6 @@ static int wl3501_close(struct net_device *dev)
 
         rc = 0;
         printk(KERN_INFO "%s: WL3501 closed\n", dev->name);
-out:
         spin_unlock_irqrestore(&this->lock, flags);
         return rc;
 }
@@ -1400,14 +1383,11 @@ static int wl3501_open(struct net_device *dev)
         int rc = -ENODEV;
         struct wl3501_card *this = dev->priv;
         unsigned long flags;
-        dev_link_t *link;
+        struct pcmcia_device *link;
+        link = this->p_dev;
 
         spin_lock_irqsave(&this->lock, flags);
-        /* Check if the device is in wl3501_dev_list */
-        for (link = wl3501_dev_list; link; link = link->next)
-                if (link->priv == dev)
-                        break;
-        if (!DEV_OK(link))
+        if (!pcmcia_dev_present(link))
                 goto out;
         netif_device_attach(dev);
         link->open++;
@@ -1497,38 +1477,23 @@ static struct ethtool_ops ops = {
  * Services. If it has been released, all local data structures are freed.
  * Otherwise, the structures will be freed when the device is released.
  */
-static void wl3501_detach(struct pcmcia_device *p_dev)
+static void wl3501_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-        dev_link_t **linkp;
         struct net_device *dev = link->priv;
 
-        /* Locate device structure */
-        for (linkp = &wl3501_dev_list; *linkp; linkp = &(*linkp)->next)
-                if (*linkp == link)
-                        break;
-        if (!*linkp)
-                goto out;
-
         /* If the device is currently configured and active, we won't actually
          * delete it yet.  Instead, it is marked so that when the release()
          * function is called, that will trigger a proper detach(). */
 
-        if (link->state & DEV_CONFIG) {
-                while (link->open > 0)
-                        wl3501_close(dev);
-
-                netif_device_detach(dev);
-                wl3501_release(link);
-        }
+        while (link->open > 0)
+                wl3501_close(dev);
 
-        /* Unlink device structure, free pieces */
-        *linkp = link->next;
+        netif_device_detach(dev);
+        wl3501_release(link);
 
         if (link->priv)
                 free_netdev(link->priv);
-        kfree(link);
-out:
+
         return;
 }
 
@@ -1953,33 +1918,26 @@ static const struct iw_handler_def wl3501_handler_def = {
  * The dev_link structure is initialized, but we don't actually configure the
  * card at this point -- we wait until we receive a card insertion event.
  */
-static int wl3501_attach(struct pcmcia_device *p_dev)
+static int wl3501_probe(struct pcmcia_device *p_dev)
 {
-        dev_link_t *link;
         struct net_device *dev;
         struct wl3501_card *this;
 
-        /* Initialize the dev_link_t structure */
-        link = kzalloc(sizeof(*link), GFP_KERNEL);
-        if (!link)
-                return -ENOMEM;
-
         /* The io structure describes IO port mapping */
-        link->io.NumPorts1      = 16;
-        link->io.Attributes1    = IO_DATA_PATH_WIDTH_8;
-        link->io.IOAddrLines    = 5;
+        p_dev->io.NumPorts1     = 16;
+        p_dev->io.Attributes1   = IO_DATA_PATH_WIDTH_8;
+        p_dev->io.IOAddrLines   = 5;
 
         /* Interrupt setup */
-        link->irq.Attributes    = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
-        link->irq.IRQInfo1      = IRQ_LEVEL_ID;
-        link->irq.Handler = wl3501_interrupt;
+        p_dev->irq.Attributes   = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        p_dev->irq.IRQInfo1     = IRQ_LEVEL_ID;
+        p_dev->irq.Handler = wl3501_interrupt;
 
         /* General socket configuration */
-        link->conf.Attributes   = CONF_ENABLE_IRQ;
-        link->conf.Vcc          = 50;
-        link->conf.IntType      = INT_MEMORY_AND_IO;
-        link->conf.ConfigIndex  = 1;
-        link->conf.Present      = PRESENT_OPTION;
+        p_dev->conf.Attributes  = CONF_ENABLE_IRQ;
+        p_dev->conf.IntType     = INT_MEMORY_AND_IO;
+        p_dev->conf.ConfigIndex = 1;
+        p_dev->conf.Present     = PRESENT_OPTION;
 
         dev = alloc_etherdev(sizeof(struct wl3501_card));
         if (!dev)
@@ -1992,22 +1950,15 @@ static int wl3501_attach(struct pcmcia_device *p_dev)
         dev->get_stats          = wl3501_get_stats;
         this = dev->priv;
         this->wireless_data.spy_data = &this->spy_data;
+        this->p_dev = p_dev;
         dev->wireless_data      = &this->wireless_data;
         dev->wireless_handlers  = (struct iw_handler_def *)&wl3501_handler_def;
         SET_ETHTOOL_OPS(dev, &ops);
         netif_stop_queue(dev);
-        link->priv = link->irq.Instance = dev;
-
-        link->handle = p_dev;
-        p_dev->instance = link;
-
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        wl3501_config(link);
+        p_dev->priv = p_dev->irq.Instance = dev;
 
-        return 0;
+        return wl3501_config(p_dev);
 out_link:
-        kfree(link);
-        link = NULL;
         return -ENOMEM;
 }
 
@@ -2022,11 +1973,10 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
  * received, to configure the PCMCIA socket, and to make the ethernet device
  * available to the system.
  */
-static void wl3501_config(dev_link_t *link)
+static int wl3501_config(struct pcmcia_device *link)
 {
         tuple_t tuple;
         cisparse_t parse;
-        client_handle_t handle = link->handle;
         struct net_device *dev = link->priv;
         int i = 0, j, last_fn, last_ret;
         unsigned char bf[64];
@@ -2035,18 +1985,15 @@ static void wl3501_config(dev_link_t *link)
         /* This reads the card's CONFIG tuple to find its config registers. */
         tuple.Attributes        = 0;
         tuple.DesiredTuple      = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         tuple.TupleData         = bf;
         tuple.TupleDataMax      = sizeof(bf);
         tuple.TupleOffset       = 0;
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase   = parse.config.base;
         link->conf.Present      = parse.config.rmask[0];
 
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-
         /* Try allocating IO ports.  This tries a few fixed addresses.  If you
          * want, you can also read the card's config table to pick addresses --
          * see the serial driver for an example. */
@@ -2056,28 +2003,28 @@ static void wl3501_config(dev_link_t *link)
                  * 0x200-0x2ff, and so on, because this seems safer */
                 link->io.BasePort1 = j;
                 link->io.BasePort2 = link->io.BasePort1 + 0x10;
-                i = pcmcia_request_io(link->handle, &link->io);
+                i = pcmcia_request_io(link, &link->io);
                 if (i == CS_SUCCESS)
                         break;
         }
         if (i != CS_SUCCESS) {
-                cs_error(link->handle, RequestIO, i);
+                cs_error(link, RequestIO, i);
                 goto failed;
         }
 
         /* Now allocate an interrupt line. Note that this does not actually
          * assign a handler to the interrupt. */
 
-        CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
 
         /* This actually configures the PCMCIA socket -- setting up the I/O
          * windows and the interrupt mapping.  */
 
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
         dev->irq = link->irq.AssignedIRQ;
         dev->base_addr = link->io.BasePort1;
-        SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+        SET_NETDEV_DEV(dev, &handle_to_dev(link));
         if (register_netdev(dev)) {
                 printk(KERN_NOTICE "wl3501_cs: register_netdev() failed\n");
                 goto failed;
@@ -2088,10 +2035,9 @@ static void wl3501_config(dev_link_t *link)
         this = dev->priv;
         /*
          * At this point, the dev_node_t structure(s) should be initialized and
-         * arranged in a linked list at link->dev.
+         * arranged in a linked list at link->dev_node.
          */
-        link->dev = &this->node;
-        link->state &= ~DEV_CONFIG_PENDING;
+        link->dev_node = &this->node;
 
         this->base_addr = dev->base_addr;
 
@@ -2127,13 +2073,13 @@ static void wl3501_config(dev_link_t *link)
         spin_lock_init(&this->lock);
         init_waitqueue_head(&this->wait);
         netif_start_queue(dev);
-        goto out;
+        return 0;
+
 cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 failed:
         wl3501_release(link);
-out:
-        return;
+        return -ENODEV;
 }
 
 /**
@@ -2144,52 +2090,36 @@ out:
  * and release the PCMCIA configuration.  If the device is still open, this
  * will be postponed until it is closed.
  */
-static void wl3501_release(dev_link_t *link)
+static void wl3501_release(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
         /* Unlink the device chain */
-        if (link->dev) {
+        if (link->dev_node)
                 unregister_netdev(dev);
-                link->dev = NULL;
-        }
 
-        /* Don't bother checking to see if these succeed or not */
-        pcmcia_release_configuration(link->handle);
-        pcmcia_release_io(link->handle, &link->io);
-        pcmcia_release_irq(link->handle, &link->irq);
-        link->state &= ~DEV_CONFIG;
+        pcmcia_disable_device(link);
 }
 
-static int wl3501_suspend(struct pcmcia_device *p_dev)
+static int wl3501_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-
         wl3501_pwr_mgmt(dev->priv, WL3501_SUSPEND);
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
-                        netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
 
-static int wl3501_resume(struct pcmcia_device *p_dev)
+static int wl3501_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
         wl3501_pwr_mgmt(dev->priv, WL3501_RESUME);
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        wl3501_reset(dev);
-                        netif_device_attach(dev);
-                }
+        if (link->open) {
+                wl3501_reset(dev);
+                netif_device_attach(dev);
         }
 
         return 0;
@@ -2207,7 +2137,7 @@ static struct pcmcia_driver wl3501_driver = {
         .drv            = {
                 .name   = "wl3501_cs",
         },
-        .probe          = wl3501_attach,
+        .probe          = wl3501_probe,
         .remove         = wl3501_detach,
         .id_table       = wl3501_ids,
         .suspend        = wl3501_suspend,
@@ -2221,9 +2151,7 @@ static int __init wl3501_init_module(void)
 
 static void __exit wl3501_exit_module(void)
 {
-        dprintk(0, ": unloading");
         pcmcia_unregister_driver(&wl3501_driver);
-        BUG_ON(wl3501_dev_list != NULL);
 }
 
 module_init(wl3501_init_module);
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 75d56bfef0ee..fd0f43b7db5b 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -1441,8 +1441,7 @@ static void __devexit yellowfin_remove_one (struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
         struct yellowfin_private *np;
 
-        if (!dev)
-                BUG();
+        BUG_ON(!dev);
         np = netdev_priv(dev);
 
         pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status,