82 files changed, 2115 insertions, 1180 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 11d170afa9c3..06e33786078d 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -922,7 +922,7 @@ int __init init_module(void)
 * and then free up the resources we took when the card was found.
 */
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        struct net_device *dev = dev_3c501;
        unregister_netdev(dev);
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index a34b2206132d..7e34c4f07b70 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -726,7 +726,7 @@ static void cleanup_card(struct net_device *dev)
                iounmap(ei_status.mem);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 458cb9cbe915..702bfb2a5e99 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1670,7 +1670,7 @@ int __init init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index aa43563610ae..54e1d5aebed3 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -940,7 +940,7 @@ int __init init_module(void)
        return IS_ERR(dev_3c507) ? PTR_ERR(dev_3c507) : 0;
 }
-void
+void __exit
 cleanup_module(void)
 {
        struct net_device *dev = dev_3c507;
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 91849469b4f4..17d61eb0a7e5 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -1302,7 +1302,7 @@ int __init init_module(void)
        } else return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
        for (this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index f4aca5386add..6c7437e60bd2 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -1659,7 +1659,7 @@ int __init init_module(void)
 *      transmit operations are allowed to start scribbling into memory.
 */
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(this_device);
        cleanup_card(this_device);
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 0dca8bb9d2c7..c01f87f5bed7 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -405,7 +405,7 @@ static void cleanup_card(struct net_device *dev)
        iounmap(ei_status.mem);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 9164d8cd670e..d4e408169073 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -568,7 +568,7 @@ static irqreturn_t apne_interrupt(int irq, void *dev_id)
 #ifdef MODULE
 static struct net_device *apne_dev;
-int init_module(void)
+int __init init_module(void)
 {
        apne_dev = apne_probe(-1);
        if (IS_ERR(apne_dev))
@@ -576,7 +576,7 @@ int init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(apne_dev);
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index cc1a27ed197f..dba5e5165452 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -1041,7 +1041,7 @@ int __init init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(cops_dev);
        cleanup_card(cops_dev);
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index b54b857e357e..fada15d959de 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -41,9 +41,6 @@
 #define DRV_NAME        "at91_ether"
 #define DRV_VERSION     "1.0"
-static struct net_device *at91_dev;
-static struct timer_list check_timer;
 #define LINK_POLL_INTERVAL      (HZ)
 /* ..................................................................... */
@@ -146,7 +143,7 @@ static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int
 */
 static void update_linkspeed(struct net_device *dev, int silent)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned int bmsr, bmcr, lpa, mac_cfg;
        unsigned int speed, duplex;
@@ -199,7 +196,7 @@ static void update_linkspeed(struct net_device *dev, int silent)
 static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = (struct net_device *) dev_id;
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned int phy;
        /*
@@ -242,7 +239,7 @@ done:
 */
 static void enable_phyirq(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned int dsintr, irq_number;
        int status;
@@ -252,8 +249,7 @@ static void enable_phyirq(struct net_device *dev)
                 * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),
                 * or board does not have it connected.
                 */
-                check_timer.expires = jiffies + LINK_POLL_INTERVAL;
+                mod_timer(&lp->check_timer, jiffies + LINK_POLL_INTERVAL);
-                add_timer(&check_timer);
                return;
        }
@@ -294,13 +290,13 @@ static void enable_phyirq(struct net_device *dev)
 */
 static void disable_phyirq(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned int dsintr;
        unsigned int irq_number;
        irq_number = lp->board_data.phy_irq_pin;
        if (!irq_number) {
-                del_timer_sync(&check_timer);
+                del_timer_sync(&lp->check_timer);
                return;
        }
@@ -340,7 +336,7 @@ static void disable_phyirq(struct net_device *dev)
 #if 0
 static void reset_phy(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned int bmcr;
        spin_lock_irq(&lp->lock);
@@ -362,13 +358,13 @@ static void reset_phy(struct net_device *dev)
 static void at91ether_check_link(unsigned long dev_id)
 {
        struct net_device *dev = (struct net_device *) dev_id;
+        struct at91_private *lp = netdev_priv(dev);
        enable_mdi();
        update_linkspeed(dev, 1);
        disable_mdi();
-        check_timer.expires = jiffies + LINK_POLL_INTERVAL;
+        mod_timer(&lp->check_timer, jiffies + LINK_POLL_INTERVAL);
-        add_timer(&check_timer);
 }
 /* ......................... ADDRESS MANAGEMENT ........................ */
@@ -590,7 +586,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
 static int at91ether_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        int ret;
        spin_lock_irq(&lp->lock);
@@ -611,7 +607,7 @@ static int at91ether_get_settings(struct net_device *dev, struct ethtool_cmd *cm
 static int at91ether_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        int ret;
        spin_lock_irq(&lp->lock);
@@ -627,7 +623,7 @@ static int at91ether_set_settings(struct net_device *dev, struct ethtool_cmd *cm
 static int at91ether_nwayreset(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        int ret;
        spin_lock_irq(&lp->lock);
@@ -658,7 +654,7 @@ static const struct ethtool_ops at91ether_ethtool_ops = {
 static int at91ether_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        int res;
        if (!netif_running(dev))
@@ -680,7 +676,7 @@ static int at91ether_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 */
 static void at91ether_start(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        struct recv_desc_bufs *dlist, *dlist_phys;
        int i;
        unsigned long ctl;
@@ -712,7 +708,7 @@ static void at91ether_start(struct net_device *dev)
 */
 static int at91ether_open(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned long ctl;
        if (!is_valid_ether_addr(dev->dev_addr))
@@ -752,7 +748,7 @@ static int at91ether_open(struct net_device *dev)
 */
 static int at91ether_close(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned long ctl;
        /* Disable Receiver and Transmitter */
@@ -779,7 +775,7 @@ static int at91ether_close(struct net_device *dev)
 */
 static int at91ether_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        if (at91_emac_read(AT91_EMAC_TSR) & AT91_EMAC_TSR_BNQ) {
                netif_stop_queue(dev);
@@ -811,7 +807,7 @@ static int at91ether_tx(struct sk_buff *skb, struct net_device *dev)
 */
 static struct net_device_stats *at91ether_stats(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        int ale, lenerr, seqe, lcol, ecol;
        if (netif_running(dev)) {
@@ -847,7 +843,7 @@ static struct net_device_stats *at91ether_stats(struct net_device *dev)
 */
 static void at91ether_rx(struct net_device *dev)
 {
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        struct recv_desc_bufs *dlist;
        unsigned char *p_recv;
        struct sk_buff *skb;
@@ -857,14 +853,13 @@ static void at91ether_rx(struct net_device *dev)
        while (dlist->descriptors[lp->rxBuffIndex].addr & EMAC_DESC_DONE) {
                p_recv = dlist->recv_buf[lp->rxBuffIndex];
                pktlen = dlist->descriptors[lp->rxBuffIndex].size & 0x7ff;      /* Length of frame including FCS */
-                skb = alloc_skb(pktlen + 2, GFP_ATOMIC);
+                skb = dev_alloc_skb(pktlen + 2);
                if (skb != NULL) {
                        skb_reserve(skb, 2);
                        memcpy(skb_put(skb, pktlen), p_recv, pktlen);
                        skb->dev = dev;
                        skb->protocol = eth_type_trans(skb, dev);
-                        skb->len = pktlen;
                        dev->last_rx = jiffies;
                        lp->stats.rx_bytes += pktlen;
                        netif_rx(skb);
@@ -891,7 +886,7 @@ static void at91ether_rx(struct net_device *dev)
 static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = (struct net_device *) dev_id;
-        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct at91_private *lp = netdev_priv(dev);
        unsigned long intstatus, ctl;
        /* MAC Interrupt Status register indicates what interrupts are pending.
@@ -927,6 +922,17 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void at91ether_poll_controller(struct net_device *dev)
+{
+        unsigned long flags;
+        local_irq_save(flags);
+        at91ether_interrupt(dev->irq, dev);
+        local_irq_restore(flags);
+}
+#endif
 /*
 * Initialize the ethernet interface
 */
@@ -939,9 +945,6 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
        unsigned int val;
        int res;
-        if (at91_dev)                   /* already initialized */
-                return 0;
        dev = alloc_etherdev(sizeof(struct at91_private));
        if (!dev)
                return -ENOMEM;
@@ -957,7 +960,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
        }
        /* Allocate memory for DMA Receive descriptors */
-        lp = (struct at91_private *)dev->priv;
+        lp = netdev_priv(dev);
        lp->dlist = (struct recv_desc_bufs *) dma_alloc_coherent(NULL, sizeof(struct recv_desc_bufs), (dma_addr_t *) &lp->dlist_phys, GFP_KERNEL);
        if (lp->dlist == NULL) {
                free_irq(dev->irq, dev);
@@ -979,6 +982,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
        dev->set_mac_address = set_mac_address;
        dev->ethtool_ops = &at91ether_ethtool_ops;
        dev->do_ioctl = at91ether_ioctl;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = at91ether_poll_controller;
+#endif
        SET_NETDEV_DEV(dev, &pdev->dev);
@@ -1024,7 +1030,6 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
                return res;
        }
-        at91_dev = dev;
        /* Determine current link speed */
        spin_lock_irq(&lp->lock);
@@ -1036,9 +1041,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
        /* If board has no PHY IRQ, use a timer to poll the PHY */
        if (!lp->board_data.phy_irq_pin) {
-                init_timer(&check_timer);
+                init_timer(&lp->check_timer);
-                check_timer.data = (unsigned long)dev;
+                lp->check_timer.data = (unsigned long)dev;
-                check_timer.function = at91ether_check_link;
+                lp->check_timer.function = at91ether_check_link;
        }
        /* Display ethernet banner */
@@ -1115,15 +1120,16 @@ static int __init at91ether_probe(struct platform_device *pdev)
 static int __devexit at91ether_remove(struct platform_device *pdev)
 {
-        struct at91_private *lp = (struct at91_private *) at91_dev->priv;
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct at91_private *lp = netdev_priv(dev);
-        unregister_netdev(at91_dev);
+        unregister_netdev(dev);
-        free_irq(at91_dev->irq, at91_dev);
+        free_irq(dev->irq, dev);
        dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
        clk_put(lp->ether_clk);
-        free_netdev(at91_dev);
+        platform_set_drvdata(pdev, NULL);
-        at91_dev = NULL;
+        free_netdev(dev);
        return 0;
 }
@@ -1131,8 +1137,8 @@ static int __devexit at91ether_remove(struct platform_device *pdev)
 static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
-        struct at91_private *lp = (struct at91_private *) at91_dev->priv;
        struct net_device *net_dev = platform_get_drvdata(pdev);
+        struct at91_private *lp = netdev_priv(net_dev);
        int phy_irq = lp->board_data.phy_irq_pin;
        if (netif_running(net_dev)) {
@@ -1149,8 +1155,8 @@ static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)
 static int at91ether_resume(struct platform_device *pdev)
 {
-        struct at91_private *lp = (struct at91_private *) at91_dev->priv;
        struct net_device *net_dev = platform_get_drvdata(pdev);
+        struct at91_private *lp = netdev_priv(net_dev);
        int phy_irq = lp->board_data.phy_irq_pin;
        if (netif_running(net_dev)) {
diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h
index d1e72e02be3a..b6b665de2ea0 100644
--- a/drivers/net/arm/at91_ether.h
+++ b/drivers/net/arm/at91_ether.h
@@ -87,6 +87,7 @@ struct at91_private
        spinlock_t lock;                        /* lock for MDI interface */
        short phy_media;                        /* media interface type */
        unsigned short phy_address;             /* 5-bit MDI address of PHY (0..31) */
+        struct timer_list check_timer;          /* Poll link status */
        /* Transmit */
        struct sk_buff *skb;                    /* holds skb until xmit interrupt completes */
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index f3478a30e778..d6da3ce9ad79 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -254,7 +254,7 @@ ether1_readbuffer (struct net_device *dev, void *data, unsigned int start, unsig
        } while (thislen);
 }
-static int __init
+static int __devinit
 ether1_ramtest(struct net_device *dev, unsigned char byte)
 {
        unsigned char *buffer = kmalloc (BUFFER_SIZE, GFP_KERNEL);
@@ -308,7 +308,7 @@ ether1_reset (struct net_device *dev)
        return BUS_16;
 }
-static int __init
+static int __devinit
 ether1_init_2(struct net_device *dev)
 {
        int i;
@@ -986,7 +986,7 @@ ether1_setmulticastlist (struct net_device *dev)
 /* ------------------------------------------------------------------------- */
-static void __init ether1_banner(void)
+static void __devinit ether1_banner(void)
 {
        static unsigned int version_printed = 0;
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 84686c8a5bc2..4fc234785d56 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -198,7 +198,7 @@ static inline void ether3_ledon(struct net_device *dev)
 * Read the ethernet address string from the on board rom.
 * This is an ascii string!!!
 */
-static int __init
+static int __devinit
 ether3_addr(char *addr, struct expansion_card *ec)
 {
        struct in_chunk_dir cd;
@@ -223,7 +223,7 @@ ether3_addr(char *addr, struct expansion_card *ec)
 /* --------------------------------------------------------------------------- */
-static int __init
+static int __devinit
 ether3_ramtest(struct net_device *dev, unsigned char byte)
 {
        unsigned char *buffer = kmalloc(RX_END, GFP_KERNEL);
@@ -272,7 +272,7 @@ ether3_ramtest(struct net_device *dev, unsigned char byte)
 /* ------------------------------------------------------------------------------- */
-static int __init ether3_init_2(struct net_device *dev)
+static int __devinit ether3_init_2(struct net_device *dev)
 {
        int i;
@@ -765,7 +765,7 @@ static void ether3_tx(struct net_device *dev)
        }
 }
-static void __init ether3_banner(void)
+static void __devinit ether3_banner(void)
 {
        static unsigned version_printed = 0;
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 8620a5b470f5..56ae8babd919 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -908,7 +908,7 @@ int __init init_module(void)
        return 0;
 }
-void
+void __exit
 cleanup_module(void)
 {
        unregister_netdev(dev_at1700);
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index d79489e46249..7e37ac86a69a 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -1179,7 +1179,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr )
 #ifdef MODULE
 static struct net_device *atarilance_dev;
-int init_module(void)
+int __init init_module(void)
 {
        atarilance_dev = atarilance_probe(-1);
        if (IS_ERR(atarilance_dev))
@@ -1187,7 +1187,7 @@ int init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(atarilance_dev);
        free_irq(atarilance_dev->irq, atarilance_dev);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 488d8ed9e740..6482aed4bb7c 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3684,7 +3684,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                        mii->val_out = 0;
                        read_lock_bh(&bond->lock);
                        read_lock(&bond->curr_slave_lock);
-                        if (bond->curr_active_slave) {
+                        if (netif_carrier_ok(bond->dev)) {
                                mii->val_out = BMSR_LSTATUS;
                        }
                        read_unlock(&bond->curr_slave_lock);
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index dec70c2b374a..4612f71a7106 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -1974,7 +1974,7 @@ out:
        return ret;
 }
-void
+void __exit
 cleanup_module(void)
 {
        unregister_netdev(dev_cs89x0);
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 00e2a8a134d7..4ae0fed7122e 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -40,6 +40,10 @@
 *
 *      v0.009: Module support fixes, multiple interfaces support, various
 *              bits. macro
+ *
+ *      v0.010: Fixes for the PMAD mapping of the LANCE buffer and for the
+ *              PMAX requirement to only use halfword accesses to the
+ *              buffer. macro
 */
 #include <linux/crc32.h>
@@ -54,6 +58,7 @@
 #include <linux/spinlock.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
@@ -67,7 +72,7 @@
 #include <asm/dec/tc.h>
 static char version[] __devinitdata =
-"declance.c: v0.009 by Linux MIPS DECstation task force\n";
+"declance.c: v0.010 by Linux MIPS DECstation task force\n";
 MODULE_AUTHOR("Linux MIPS DECstation task force");
 MODULE_DESCRIPTION("DEC LANCE (DECstation onboard, PMAD-xx) driver");
@@ -110,24 +115,25 @@ MODULE_LICENSE("GPL");
 #define LE_C3_BCON      0x1     /* Byte control */
 /* Receive message descriptor 1 */
-#define LE_R1_OWN       0x80    /* Who owns the entry */
+#define LE_R1_OWN       0x8000  /* Who owns the entry */
-#define LE_R1_ERR       0x40    /* Error: if FRA, OFL, CRC or BUF is set */
+#define LE_R1_ERR       0x4000  /* Error: if FRA, OFL, CRC or BUF is set */
-#define LE_R1_FRA       0x20    /* FRA: Frame error */
+#define LE_R1_FRA       0x2000  /* FRA: Frame error */
-#define LE_R1_OFL       0x10    /* OFL: Frame overflow */
+#define LE_R1_OFL       0x1000  /* OFL: Frame overflow */
-#define LE_R1_CRC       0x08    /* CRC error */
+#define LE_R1_CRC       0x0800  /* CRC error */
-#define LE_R1_BUF       0x04    /* BUF: Buffer error */
+#define LE_R1_BUF       0x0400  /* BUF: Buffer error */
-#define LE_R1_SOP       0x02    /* Start of packet */
+#define LE_R1_SOP       0x0200  /* Start of packet */
-#define LE_R1_EOP       0x01    /* End of packet */
+#define LE_R1_EOP       0x0100  /* End of packet */
-#define LE_R1_POK       0x03    /* Packet is complete: SOP + EOP */
+#define LE_R1_POK       0x0300  /* Packet is complete: SOP + EOP */
-#define LE_T1_OWN       0x80    /* Lance owns the packet */
+/* Transmit message descriptor 1 */
-#define LE_T1_ERR       0x40    /* Error summary */
+#define LE_T1_OWN       0x8000  /* Lance owns the packet */
-#define LE_T1_EMORE     0x10    /* Error: more than one retry needed */
+#define LE_T1_ERR       0x4000  /* Error summary */
-#define LE_T1_EONE      0x08    /* Error: one retry needed */
+#define LE_T1_EMORE     0x1000  /* Error: more than one retry needed */
-#define LE_T1_EDEF      0x04    /* Error: deferred */
+#define LE_T1_EONE      0x0800  /* Error: one retry needed */
-#define LE_T1_SOP       0x02    /* Start of packet */
+#define LE_T1_EDEF      0x0400  /* Error: deferred */
-#define LE_T1_EOP       0x01    /* End of packet */
+#define LE_T1_SOP       0x0200  /* Start of packet */
-#define LE_T1_POK       0x03    /* Packet is complete: SOP + EOP */
+#define LE_T1_EOP       0x0100  /* End of packet */
+#define LE_T1_POK       0x0300  /* Packet is complete: SOP + EOP */
 #define LE_T3_BUF       0x8000  /* Buffer error */
 #define LE_T3_UFL       0x4000  /* Error underflow */
@@ -156,69 +162,57 @@ MODULE_LICENSE("GPL");
 #undef TEST_HITS
 #define ZERO 0
-/* The DS2000/3000 have a linear 64 KB buffer.
+/*
+ * The DS2100/3100 have a linear 64 kB buffer which supports halfword
- * The PMAD-AA has 128 kb buffer on-board.
+ * accesses only.  Each halfword of the buffer is word-aligned in the
+ * CPU address space.
 *
- * The IOASIC LANCE devices use a shared memory region. This region as seen
+ * The PMAD-AA has a 128 kB buffer on-board.
- * from the CPU is (max) 128 KB long and has to be on an 128 KB boundary.
- * The LANCE sees this as a 64 KB long continuous memory region.
 *
- * The LANCE's DMA address is used as an index in this buffer and DMA takes
+ * The IOASIC LANCE devices use a shared memory region.  This region
- * place in bursts of eight 16-Bit words which are packed into four 32-Bit words
+ * as seen from the CPU is (max) 128 kB long and has to be on an 128 kB
- * by the IOASIC. This leads to a strange padding: 16 bytes of valid data followed
+ * boundary.  The LANCE sees this as a 64 kB long continuous memory
- * by a 16 byte gap :-(.
+ * region.
+ *
+ * The LANCE's DMA address is used as an index in this buffer and DMA
+ * takes place in bursts of eight 16-bit words which are packed into
+ * four 32-bit words by the IOASIC.  This leads to a strange padding:
+ * 16 bytes of valid data followed by a 16 byte gap :-(.
 */
 struct lance_rx_desc {
        unsigned short rmd0;            /* low address of packet */
-        short gap0;
+        unsigned short rmd1;            /* high address of packet
-        unsigned char rmd1_hadr;        /* high address of packet */
+                                           and descriptor bits */
-        unsigned char rmd1_bits;        /* descriptor bits */
-        short gap1;
        short length;                   /* 2s complement (negative!)
                                           of buffer length */
-        short gap2;
        unsigned short mblength;        /* actual number of bytes received */
-        short gap3;
 };
 struct lance_tx_desc {
        unsigned short tmd0;            /* low address of packet */
-        short gap0;
+        unsigned short tmd1;            /* high address of packet
-        unsigned char tmd1_hadr;        /* high address of packet */
+                                           and descriptor bits */
-        unsigned char tmd1_bits;        /* descriptor bits */
-        short gap1;
        short length;                   /* 2s complement (negative!)
                                           of buffer length */
-        short gap2;
        unsigned short misc;
-        short gap3;
 };
 /* First part of the LANCE initialization block, described in databook. */
 struct lance_init_block {
        unsigned short mode;            /* pre-set mode (reg. 15) */
-        short gap0;
-        unsigned char phys_addr[12];    /* physical ethernet address
+        unsigned short phys_addr[3];    /* physical ethernet address */
-                                           only 0, 1, 4, 5, 8, 9 are valid
+        unsigned short filter[4];       /* multicast filter */
-                                           2, 3, 6, 7, 10, 11 are gaps */
-        unsigned short filter[8];       /* multicast filter
-                                           only 0, 2, 4, 6 are valid
-                                           1, 3, 5, 7 are gaps */
        /* Receive and transmit ring base, along with extra bits. */
        unsigned short rx_ptr;          /* receive descriptor addr */
-        short gap1;
        unsigned short rx_len;          /* receive len and high addr */
-        short gap2;
        unsigned short tx_ptr;          /* transmit descriptor addr */
-        short gap3;
        unsigned short tx_len;          /* transmit len and high addr */
-        short gap4;
-        short gap5[8];
+        short gap[4];
        /* The buffer descriptors */
        struct lance_rx_desc brx_ring[RX_RING_SIZE];
@@ -226,15 +220,28 @@ struct lance_init_block {
 };
 #define BUF_OFFSET_CPU sizeof(struct lance_init_block)
-#define BUF_OFFSET_LNC (sizeof(struct lance_init_block)>>1)
+#define BUF_OFFSET_LNC sizeof(struct lance_init_block)
-#define libdesc_offset(rt, elem) \
+#define shift_off(off, type)                                            \
-((__u32)(((unsigned long)(&(((struct lance_init_block *)0)->rt[elem])))))
+        (type == ASIC_LANCE || type == PMAX_LANCE ? off << 1 : off)
-/*
+#define lib_off(rt, type)                                               \
- * This works *only* for the ring descriptors
+        shift_off(offsetof(struct lance_init_block, rt), type)
- */
-#define LANCE_ADDR(x) (CPHYSADDR(x) >> 1)
+#define lib_ptr(ib, rt, type)                                           \
+        ((volatile u16 *)((u8 *)(ib) + lib_off(rt, type)))
+#define rds_off(rt, type)                                               \
+        shift_off(offsetof(struct lance_rx_desc, rt), type)
+#define rds_ptr(rd, rt, type)                                           \
+        ((volatile u16 *)((u8 *)(rd) + rds_off(rt, type)))
+#define tds_off(rt, type)                                               \
+        shift_off(offsetof(struct lance_tx_desc, rt), type)
+#define tds_ptr(td, rt, type)                                           \
+        ((volatile u16 *)((u8 *)(td) + tds_off(rt, type)))
 struct lance_private {
        struct net_device *next;
@@ -242,7 +249,6 @@ struct lance_private {
        int slot;
        int dma_irq;
        volatile struct lance_regs *ll;
-        volatile struct lance_init_block *init_block;
        spinlock_t      lock;
@@ -260,8 +266,8 @@ struct lance_private {
        char *tx_buf_ptr_cpu[TX_RING_SIZE];
        /* Pointers to the ring buffers as seen from the LANCE */
-        char *rx_buf_ptr_lnc[RX_RING_SIZE];
+        uint rx_buf_ptr_lnc[RX_RING_SIZE];
-        char *tx_buf_ptr_lnc[TX_RING_SIZE];
+        uint tx_buf_ptr_lnc[TX_RING_SIZE];
 };
 #define TX_BUFFS_AVAIL ((lp->tx_old<=lp->tx_new)?\
@@ -294,7 +300,7 @@ static inline void writereg(volatile unsigned short *regptr, short value)
 static void load_csrs(struct lance_private *lp)
 {
        volatile struct lance_regs *ll = lp->ll;
-        int leptr;
+        uint leptr;
        /* The address space as seen from the LANCE
         * begins at address 0. HK
@@ -316,12 +322,14 @@ static void load_csrs(struct lance_private *lp)
 * Our specialized copy routines
 *
 */
-void cp_to_buf(const int type, void *to, const void *from, int len)
+static void cp_to_buf(const int type, void *to, const void *from, int len)
 {
        unsigned short *tp, *fp, clen;
        unsigned char *rtp, *rfp;
-        if (type == PMAX_LANCE) {
+        if (type == PMAD_LANCE) {
+                memcpy(to, from, len);
+        } else if (type == PMAX_LANCE) {
                clen = len >> 1;
                tp = (unsigned short *) to;
                fp = (unsigned short *) from;
@@ -370,12 +378,14 @@ void cp_to_buf(const int type, void *to, const void *from, int len)
        iob();
 }
-void cp_from_buf(const int type, void *to, const void *from, int len)
+static void cp_from_buf(const int type, void *to, const void *from, int len)
 {
        unsigned short *tp, *fp, clen;
        unsigned char *rtp, *rfp;
-        if (type == PMAX_LANCE) {
+        if (type == PMAD_LANCE) {
+                memcpy(to, from, len);
+        } else if (type == PMAX_LANCE) {
                clen = len >> 1;
                tp = (unsigned short *) to;
                fp = (unsigned short *) from;
@@ -431,12 +441,10 @@ void cp_from_buf(const int type, void *to, const void *from, int len)
 static void lance_init_ring(struct net_device *dev)
 {
        struct lance_private *lp = netdev_priv(dev);
-        volatile struct lance_init_block *ib;
+        volatile u16 *ib = (volatile u16 *)dev->mem_start;
-        int leptr;
+        uint leptr;
        int i;
-        ib = (struct lance_init_block *) (dev->mem_start);
        /* Lock out other processes while setting up hardware */
        netif_stop_queue(dev);
        lp->rx_new = lp->tx_new = 0;
@@ -445,55 +453,64 @@ static void lance_init_ring(struct net_device *dev)
        /* Copy the ethernet address to the lance init block.
         * XXX bit 0 of the physical address registers has to be zero
         */
-        ib->phys_addr[0] = dev->dev_addr[0];
+        *lib_ptr(ib, phys_addr[0], lp->type) = (dev->dev_addr[1] << 8) |
-        ib->phys_addr[1] = dev->dev_addr[1];
+                                     dev->dev_addr[0];
-        ib->phys_addr[4] = dev->dev_addr[2];
+        *lib_ptr(ib, phys_addr[1], lp->type) = (dev->dev_addr[3] << 8) |
-        ib->phys_addr[5] = dev->dev_addr[3];
+                                     dev->dev_addr[2];
-        ib->phys_addr[8] = dev->dev_addr[4];
+        *lib_ptr(ib, phys_addr[2], lp->type) = (dev->dev_addr[5] << 8) |
-        ib->phys_addr[9] = dev->dev_addr[5];
+                                     dev->dev_addr[4];
        /* Setup the initialization block */
        /* Setup rx descriptor pointer */
-        leptr = LANCE_ADDR(libdesc_offset(brx_ring, 0));
+        leptr = offsetof(struct lance_init_block, brx_ring);
-        ib->rx_len = (LANCE_LOG_RX_BUFFERS << 13) | (leptr >> 16);
+        *lib_ptr(ib, rx_len, lp->type) = (LANCE_LOG_RX_BUFFERS << 13) |
-        ib->rx_ptr = leptr;
+                                         (leptr >> 16);
+        *lib_ptr(ib, rx_ptr, lp->type) = leptr;
        if (ZERO)
-                printk("RX ptr: %8.8x(%8.8x)\n", leptr, libdesc_offset(brx_ring, 0));
+                printk("RX ptr: %8.8x(%8.8x)\n",
+                       leptr, lib_off(brx_ring, lp->type));
        /* Setup tx descriptor pointer */
-        leptr = LANCE_ADDR(libdesc_offset(btx_ring, 0));
+        leptr = offsetof(struct lance_init_block, btx_ring);
-        ib->tx_len = (LANCE_LOG_TX_BUFFERS << 13) | (leptr >> 16);
+        *lib_ptr(ib, tx_len, lp->type) = (LANCE_LOG_TX_BUFFERS << 13) |
-        ib->tx_ptr = leptr;
+                                         (leptr >> 16);
+        *lib_ptr(ib, tx_ptr, lp->type) = leptr;
        if (ZERO)
-                printk("TX ptr: %8.8x(%8.8x)\n", leptr, libdesc_offset(btx_ring, 0));
+                printk("TX ptr: %8.8x(%8.8x)\n",
+                       leptr, lib_off(btx_ring, lp->type));
        if (ZERO)
                printk("TX rings:\n");
        /* Setup the Tx ring entries */
        for (i = 0; i < TX_RING_SIZE; i++) {
-                leptr = (int) lp->tx_buf_ptr_lnc[i];
+                leptr = lp->tx_buf_ptr_lnc[i];
-                ib->btx_ring[i].tmd0 = leptr;
+                *lib_ptr(ib, btx_ring[i].tmd0, lp->type) = leptr;
-                ib->btx_ring[i].tmd1_hadr = leptr >> 16;
+                *lib_ptr(ib, btx_ring[i].tmd1, lp->type) = (leptr >> 16) &
-                ib->btx_ring[i].tmd1_bits = 0;
+                                                           0xff;
-                ib->btx_ring[i].length = 0xf000;        /* The ones required by tmd2 */
+                *lib_ptr(ib, btx_ring[i].length, lp->type) = 0xf000;
-                ib->btx_ring[i].misc = 0;
+                                                /* The ones required by tmd2 */
+                *lib_ptr(ib, btx_ring[i].misc, lp->type) = 0;
                if (i < 3 && ZERO)
-                        printk("%d: 0x%8.8x(0x%8.8x)\n", i, leptr, (int) lp->tx_buf_ptr_cpu[i]);
+                        printk("%d: 0x%8.8x(0x%8.8x)\n",
+                               i, leptr, (uint)lp->tx_buf_ptr_cpu[i]);
        }
        /* Setup the Rx ring entries */
        if (ZERO)
                printk("RX rings:\n");
        for (i = 0; i < RX_RING_SIZE; i++) {
-                leptr = (int) lp->rx_buf_ptr_lnc[i];
+                leptr = lp->rx_buf_ptr_lnc[i];
-                ib->brx_ring[i].rmd0 = leptr;
+                *lib_ptr(ib, brx_ring[i].rmd0, lp->type) = leptr;
-                ib->brx_ring[i].rmd1_hadr = leptr >> 16;
+                *lib_ptr(ib, brx_ring[i].rmd1, lp->type) = ((leptr >> 16) &
-                ib->brx_ring[i].rmd1_bits = LE_R1_OWN;
+                                                            0xff) |
-                ib->brx_ring[i].length = -RX_BUFF_SIZE | 0xf000;
+                                                           LE_R1_OWN;
-                ib->brx_ring[i].mblength = 0;
+                *lib_ptr(ib, brx_ring[i].length, lp->type) = -RX_BUFF_SIZE |
+                                                             0xf000;
+                *lib_ptr(ib, brx_ring[i].mblength, lp->type) = 0;
                if (i < 3 && ZERO)
-                        printk("%d: 0x%8.8x(0x%8.8x)\n", i, leptr, (int) lp->rx_buf_ptr_cpu[i]);
+                        printk("%d: 0x%8.8x(0x%8.8x)\n",
+                               i, leptr, (uint)lp->rx_buf_ptr_cpu[i]);
        }
        iob();
 }
@@ -511,11 +528,13 @@ static int init_restart_lance(struct lance_private *lp)
                udelay(10);
        }
        if ((i == 100) || (ll->rdp & LE_C0_ERR)) {
-                printk("LANCE unopened after %d ticks, csr0=%4.4x.\n", i, ll->rdp);
+                printk("LANCE unopened after %d ticks, csr0=%4.4x.\n",
+                       i, ll->rdp);
                return -1;
        }
        if ((ll->rdp & LE_C0_ERR)) {
-                printk("LANCE unopened after %d ticks, csr0=%4.4x.\n", i, ll->rdp);
+                printk("LANCE unopened after %d ticks, csr0=%4.4x.\n",
+                       i, ll->rdp);
                return -1;
        }
        writereg(&ll->rdp, LE_C0_IDON);
@@ -528,12 +547,11 @@ static int init_restart_lance(struct lance_private *lp)
 static int lance_rx(struct net_device *dev)
 {
        struct lance_private *lp = netdev_priv(dev);
-        volatile struct lance_init_block *ib;
+        volatile u16 *ib = (volatile u16 *)dev->mem_start;
-        volatile struct lance_rx_desc *rd = 0;
+        volatile u16 *rd;
-        unsigned char bits;
+        unsigned short bits;
-        int len = 0;
+        int entry, len;
-        struct sk_buff *skb = 0;
+        struct sk_buff *skb;
-        ib = (struct lance_init_block *) (dev->mem_start);
 #ifdef TEST_HITS
        {
@@ -542,19 +560,22 @@ static int lance_rx(struct net_device *dev)
                printk("[");
                for (i = 0; i < RX_RING_SIZE; i++) {
                        if (i == lp->rx_new)
-                                printk("%s", ib->brx_ring[i].rmd1_bits &
+                                printk("%s", *lib_ptr(ib, brx_ring[i].rmd1,
+                                                      lp->type) &
                                             LE_R1_OWN ? "_" : "X");
                        else
-                                printk("%s", ib->brx_ring[i].rmd1_bits &
+                                printk("%s", *lib_ptr(ib, brx_ring[i].rmd1,
+                                                      lp->type) &
                                             LE_R1_OWN ? "." : "1");
                }
                printk("]");
        }
 #endif
-        for (rd = &ib->brx_ring[lp->rx_new];
+        for (rd = lib_ptr(ib, brx_ring[lp->rx_new], lp->type);
-             !((bits = rd->rmd1_bits) & LE_R1_OWN);
+             !((bits = *rds_ptr(rd, rmd1, lp->type)) & LE_R1_OWN);
-             rd = &ib->brx_ring[lp->rx_new]) {
+             rd = lib_ptr(ib, brx_ring[lp->rx_new], lp->type)) {
+                entry = lp->rx_new;
                /* We got an incomplete frame? */
                if ((bits & LE_R1_POK) != LE_R1_POK) {
@@ -575,16 +596,18 @@ static int lance_rx(struct net_device *dev)
                        if (bits & LE_R1_EOP)
                                lp->stats.rx_errors++;
                } else {
-                        len = (rd->mblength & 0xfff) - 4;
+                        len = (*rds_ptr(rd, mblength, lp->type) & 0xfff) - 4;
                        skb = dev_alloc_skb(len + 2);
                        if (skb == 0) {
                                printk("%s: Memory squeeze, deferring packet.\n",
                                       dev->name);
                                lp->stats.rx_dropped++;
-                                rd->mblength = 0;
+                                *rds_ptr(rd, mblength, lp->type) = 0;
-                                rd->rmd1_bits = LE_R1_OWN;
+                                *rds_ptr(rd, rmd1, lp->type) =
-                                lp->rx_new = (lp->rx_new + 1) & RX_RING_MOD_MASK;
+                                        ((lp->rx_buf_ptr_lnc[entry] >> 16) &
+                                         0xff) | LE_R1_OWN;
+                                lp->rx_new = (entry + 1) & RX_RING_MOD_MASK;
                                return 0;
                        }
                        lp->stats.rx_bytes += len;
@@ -594,8 +617,7 @@ static int lance_rx(struct net_device *dev)
                        skb_put(skb, len);      /* make room */
                        cp_from_buf(lp->type, skb->data,
-                                    (char *)lp->rx_buf_ptr_cpu[lp->rx_new],
+                                    (char *)lp->rx_buf_ptr_cpu[entry], len);
-                                    len);
                        skb->protocol = eth_type_trans(skb, dev);
                        netif_rx(skb);
@@ -604,10 +626,11 @@ static int lance_rx(struct net_device *dev)
                }
                /* Return the packet to the pool */
-                rd->mblength = 0;
+                *rds_ptr(rd, mblength, lp->type) = 0;
-                rd->length = -RX_BUFF_SIZE | 0xf000;
+                *rds_ptr(rd, length, lp->type) = -RX_BUFF_SIZE | 0xf000;
-                rd->rmd1_bits = LE_R1_OWN;
+                *rds_ptr(rd, rmd1, lp->type) =
-                lp->rx_new = (lp->rx_new + 1) & RX_RING_MOD_MASK;
+                        ((lp->rx_buf_ptr_lnc[entry] >> 16) & 0xff) | LE_R1_OWN;
+                lp->rx_new = (entry + 1) & RX_RING_MOD_MASK;
        }
        return 0;
 }
@@ -615,24 +638,24 @@ static int lance_rx(struct net_device *dev)
 static void lance_tx(struct net_device *dev)
 {
        struct lance_private *lp = netdev_priv(dev);
-        volatile struct lance_init_block *ib;
+        volatile u16 *ib = (volatile u16 *)dev->mem_start;
        volatile struct lance_regs *ll = lp->ll;
-        volatile struct lance_tx_desc *td;
+        volatile u16 *td;
        int i, j;
        int status;
-        ib = (struct lance_init_block *) (dev->mem_start);
        j = lp->tx_old;
        spin_lock(&lp->lock);
        for (i = j; i != lp->tx_new; i = j) {
-                td = &ib->btx_ring[i];
+                td = lib_ptr(ib, btx_ring[i], lp->type);
                /* If we hit a packet not owned by us, stop */
-                if (td->tmd1_bits & LE_T1_OWN)
+                if (*tds_ptr(td, tmd1, lp->type) & LE_T1_OWN)
                        break;
-                if (td->tmd1_bits & LE_T1_ERR) {
+                if (*tds_ptr(td, tmd1, lp->type) & LE_T1_ERR) {
-                        status = td->misc;
+                        status = *tds_ptr(td, misc, lp->type);
                        lp->stats.tx_errors++;
                        if (status & LE_T3_RTY)
@@ -667,18 +690,19 @@ static void lance_tx(struct net_device *dev)
                                init_restart_lance(lp);
                                goto out;
                        }
-                } else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) {
+                } else if ((*tds_ptr(td, tmd1, lp->type) & LE_T1_POK) ==
+                           LE_T1_POK) {
                        /*
                         * So we don't count the packet more than once.
                         */
-                        td->tmd1_bits &= ~(LE_T1_POK);
+                        *tds_ptr(td, tmd1, lp->type) &= ~(LE_T1_POK);
                        /* One collision before packet was sent. */
-                        if (td->tmd1_bits & LE_T1_EONE)
+                        if (*tds_ptr(td, tmd1, lp->type) & LE_T1_EONE)
                                lp->stats.collisions++;
                        /* More than one collision, be optimistic. */
-                        if (td->tmd1_bits & LE_T1_EMORE)
+                        if (*tds_ptr(td, tmd1, lp->type) & LE_T1_EMORE)
                                lp->stats.collisions += 2;
                        lp->stats.tx_packets++;
@@ -752,7 +776,7 @@ struct net_device *last_dev = 0;
 static int lance_open(struct net_device *dev)
 {
-        volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start);
+        volatile u16 *ib = (volatile u16 *)dev->mem_start;
        struct lance_private *lp = netdev_priv(dev);
        volatile struct lance_regs *ll = lp->ll;
        int status = 0;
@@ -769,11 +793,11 @@ static int lance_open(struct net_device *dev)
         *
         * BTW it is common bug in all lance drivers! --ANK
         */
-        ib->mode = 0;
+        *lib_ptr(ib, mode, lp->type) = 0;
-        ib->filter [0] = 0;
+        *lib_ptr(ib, filter[0], lp->type) = 0;
-        ib->filter [2] = 0;
+        *lib_ptr(ib, filter[1], lp->type) = 0;
-        ib->filter [4] = 0;
+        *lib_ptr(ib, filter[2], lp->type) = 0;
-        ib->filter [6] = 0;
+        *lib_ptr(ib, filter[3], lp->type) = 0;
        lance_init_ring(dev);
        load_csrs(lp);
@@ -874,12 +898,10 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct lance_private *lp = netdev_priv(dev);
        volatile struct lance_regs *ll = lp->ll;
-        volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start);
+        volatile u16 *ib = (volatile u16 *)dev->mem_start;
-        int entry, skblen, len;
+        int entry, len;
-        skblen = skb->len;
+        len = skb->len;
-        len = skblen;
        if (len < ETH_ZLEN) {
                if (skb_padto(skb, ETH_ZLEN))
@@ -889,23 +911,17 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
        lp->stats.tx_bytes += len;
-        entry = lp->tx_new & TX_RING_MOD_MASK;
+        entry = lp->tx_new;
-        ib->btx_ring[entry].length = (-len);
+        *lib_ptr(ib, btx_ring[entry].length, lp->type) = (-len);
-        ib->btx_ring[entry].misc = 0;
+        *lib_ptr(ib, btx_ring[entry].misc, lp->type) = 0;
-        cp_to_buf(lp->type, (char *)lp->tx_buf_ptr_cpu[entry], skb->data,
-                  skblen);
-        /* Clear the slack of the packet, do I need this? */
+        cp_to_buf(lp->type, (char *)lp->tx_buf_ptr_cpu[entry], skb->data, len);
-        /* For a firewall it's a good idea - AC */
-/*
-   if (len != skblen)
-   memset ((char *) &ib->tx_buf [entry][skblen], 0, (len - skblen) << 1);
- */
        /* Now, give the packet to the lance */
-        ib->btx_ring[entry].tmd1_bits = (LE_T1_POK | LE_T1_OWN);
+        *lib_ptr(ib, btx_ring[entry].tmd1, lp->type) =
-        lp->tx_new = (lp->tx_new + 1) & TX_RING_MOD_MASK;
+                ((lp->tx_buf_ptr_lnc[entry] >> 16) & 0xff) |
+                (LE_T1_POK | LE_T1_OWN);
+        lp->tx_new = (entry + 1) & TX_RING_MOD_MASK;
        if (TX_BUFFS_AVAIL <= 0)
                netif_stop_queue(dev);
@@ -930,8 +946,8 @@ static struct net_device_stats *lance_get_stats(struct net_device *dev)
 static void lance_load_multicast(struct net_device *dev)
 {
-        volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start);
+        struct lance_private *lp = netdev_priv(dev);
-        volatile u16 *mcast_table = (u16 *) & ib->filter;
+        volatile u16 *ib = (volatile u16 *)dev->mem_start;
        struct dev_mc_list *dmi = dev->mc_list;
        char *addrs;
        int i;
@@ -939,17 +955,17 @@ static void lance_load_multicast(struct net_device *dev)
        /* set all multicast bits */
        if (dev->flags & IFF_ALLMULTI) {
-                ib->filter[0] = 0xffff;
+                *lib_ptr(ib, filter[0], lp->type) = 0xffff;
-                ib->filter[2] = 0xffff;
+                *lib_ptr(ib, filter[1], lp->type) = 0xffff;
-                ib->filter[4] = 0xffff;
+                *lib_ptr(ib, filter[2], lp->type) = 0xffff;
-                ib->filter[6] = 0xffff;
+                *lib_ptr(ib, filter[3], lp->type) = 0xffff;
                return;
        }
        /* clear the multicast filter */
-        ib->filter[0] = 0;
+        *lib_ptr(ib, filter[0], lp->type) = 0;
-        ib->filter[2] = 0;
+        *lib_ptr(ib, filter[1], lp->type) = 0;
-        ib->filter[4] = 0;
+        *lib_ptr(ib, filter[2], lp->type) = 0;
-        ib->filter[6] = 0;
+        *lib_ptr(ib, filter[3], lp->type) = 0;
        /* Add addresses */
        for (i = 0; i < dev->mc_count; i++) {
@@ -962,7 +978,7 @@ static void lance_load_multicast(struct net_device *dev)
                crc = ether_crc_le(ETH_ALEN, addrs);
                crc = crc >> 26;
-                mcast_table[2 * (crc >> 4)] |= 1 << (crc & 0xf);
+                *lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf);
        }
        return;
 }
@@ -970,11 +986,9 @@ static void lance_load_multicast(struct net_device *dev)
 static void lance_set_multicast(struct net_device *dev)
 {
        struct lance_private *lp = netdev_priv(dev);
-        volatile struct lance_init_block *ib;
+        volatile u16 *ib = (volatile u16 *)dev->mem_start;
        volatile struct lance_regs *ll = lp->ll;
-        ib = (struct lance_init_block *) (dev->mem_start);
        if (!netif_running(dev))
                return;
@@ -992,9 +1006,9 @@ static void lance_set_multicast(struct net_device *dev)
        lance_init_ring(dev);
        if (dev->flags & IFF_PROMISC) {
-                ib->mode |= LE_MO_PROM;
+                *lib_ptr(ib, mode, lp->type) |= LE_MO_PROM;
        } else {
-                ib->mode &= ~LE_MO_PROM;
+                *lib_ptr(ib, mode, lp->type) &= ~LE_MO_PROM;
                lance_load_multicast(dev);
        }
        load_csrs(lp);
@@ -1051,7 +1065,6 @@ static int __init dec_lance_init(const int type, const int slot)
        lp->type = type;
        lp->slot = slot;
        switch (type) {
-#ifdef CONFIG_TC
        case ASIC_LANCE:
                dev->base_addr = CKSEG1ADDR(dec_kn_slot_base + IOASIC_LANCE);
@@ -1073,20 +1086,20 @@ static int __init dec_lance_init(const int type, const int slot)
                 */
                for (i = 0; i < RX_RING_SIZE; i++) {
                        lp->rx_buf_ptr_cpu[i] =
-                                (char *)(dev->mem_start + BUF_OFFSET_CPU +
+                                (char *)(dev->mem_start + 2 * BUF_OFFSET_CPU +
                                         2 * i * RX_BUFF_SIZE);
                        lp->rx_buf_ptr_lnc[i] =
-                                (char *)(BUF_OFFSET_LNC + i * RX_BUFF_SIZE);
+                                (BUF_OFFSET_LNC + i * RX_BUFF_SIZE);
                }
                for (i = 0; i < TX_RING_SIZE; i++) {
                        lp->tx_buf_ptr_cpu[i] =
-                                (char *)(dev->mem_start + BUF_OFFSET_CPU +
+                                (char *)(dev->mem_start + 2 * BUF_OFFSET_CPU +
                                         2 * RX_RING_SIZE * RX_BUFF_SIZE +
                                         2 * i * TX_BUFF_SIZE);
                        lp->tx_buf_ptr_lnc[i] =
-                                (char *)(BUF_OFFSET_LNC +
+                                (BUF_OFFSET_LNC +
-                                         RX_RING_SIZE * RX_BUFF_SIZE +
+                                 RX_RING_SIZE * RX_BUFF_SIZE +
-                                         i * TX_BUFF_SIZE);
+                                 i * TX_BUFF_SIZE);
                }
                /* Setup I/O ASIC LANCE DMA.  */
@@ -1095,11 +1108,12 @@ static int __init dec_lance_init(const int type, const int slot)
                             CPHYSADDR(dev->mem_start) << 3);
                break;
+#ifdef CONFIG_TC
        case PMAD_LANCE:
                claim_tc_card(slot);
                dev->mem_start = CKSEG1ADDR(get_tc_base_addr(slot));
+                dev->mem_end = dev->mem_start + 0x100000;
                dev->base_addr = dev->mem_start + 0x100000;
                dev->irq = get_tc_irq_nr(slot);
                esar_base = dev->mem_start + 0x1c0002;
@@ -1110,7 +1124,7 @@ static int __init dec_lance_init(const int type, const int slot)
                                (char *)(dev->mem_start + BUF_OFFSET_CPU +
                                         i * RX_BUFF_SIZE);
                        lp->rx_buf_ptr_lnc[i] =
-                                (char *)(BUF_OFFSET_LNC + i * RX_BUFF_SIZE);
+                                (BUF_OFFSET_LNC + i * RX_BUFF_SIZE);
                }
                for (i = 0; i < TX_RING_SIZE; i++) {
                        lp->tx_buf_ptr_cpu[i] =
@@ -1118,18 +1132,18 @@ static int __init dec_lance_init(const int type, const int slot)
                                         RX_RING_SIZE * RX_BUFF_SIZE +
                                         i * TX_BUFF_SIZE);
                        lp->tx_buf_ptr_lnc[i] =
-                                (char *)(BUF_OFFSET_LNC +
+                                (BUF_OFFSET_LNC +
-                                         RX_RING_SIZE * RX_BUFF_SIZE +
+                                 RX_RING_SIZE * RX_BUFF_SIZE +
-                                         i * TX_BUFF_SIZE);
+                                 i * TX_BUFF_SIZE);
                }
                break;
 #endif
        case PMAX_LANCE:
                dev->irq = dec_interrupt[DEC_IRQ_LANCE];
                dev->base_addr = CKSEG1ADDR(KN01_SLOT_BASE + KN01_LANCE);
                dev->mem_start = CKSEG1ADDR(KN01_SLOT_BASE + KN01_LANCE_MEM);
+                dev->mem_end = dev->mem_start + KN01_SLOT_SIZE;
                esar_base = CKSEG1ADDR(KN01_SLOT_BASE + KN01_ESAR + 1);
                lp->dma_irq = -1;
@@ -1138,20 +1152,20 @@ static int __init dec_lance_init(const int type, const int slot)
                 */
                for (i = 0; i < RX_RING_SIZE; i++) {
                        lp->rx_buf_ptr_cpu[i] =
-                                (char *)(dev->mem_start + BUF_OFFSET_CPU +
+                                (char *)(dev->mem_start + 2 * BUF_OFFSET_CPU +
                                         2 * i * RX_BUFF_SIZE);
                        lp->rx_buf_ptr_lnc[i] =
-                                (char *)(BUF_OFFSET_LNC + i * RX_BUFF_SIZE);
+                                (BUF_OFFSET_LNC + i * RX_BUFF_SIZE);
                }
                for (i = 0; i < TX_RING_SIZE; i++) {
                        lp->tx_buf_ptr_cpu[i] =
-                                (char *)(dev->mem_start + BUF_OFFSET_CPU +
+                                (char *)(dev->mem_start + 2 * BUF_OFFSET_CPU +
                                         2 * RX_RING_SIZE * RX_BUFF_SIZE +
                                         2 * i * TX_BUFF_SIZE);
                        lp->tx_buf_ptr_lnc[i] =
-                                (char *)(BUF_OFFSET_LNC +
+                                (BUF_OFFSET_LNC +
-                                         RX_RING_SIZE * RX_BUFF_SIZE +
+                                 RX_RING_SIZE * RX_BUFF_SIZE +
-                                         i * TX_BUFF_SIZE);
+                                 i * TX_BUFF_SIZE);
                }
                break;
@@ -1279,10 +1293,8 @@ static int __init dec_lance_probe(void)
        /* Then handle onboard devices. */
        if (dec_interrupt[DEC_IRQ_LANCE] >= 0) {
                if (dec_interrupt[DEC_IRQ_LANCE_MERR] >= 0) {
-#ifdef CONFIG_TC
                        if (dec_lance_init(ASIC_LANCE, -1) >= 0)
                                count++;
-#endif
                } else if (!TURBOCHANNEL) {
                        if (dec_lance_init(PMAX_LANCE, -1) >= 0)
                                count++;
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index d39e8480ca56..c62d9c6363c6 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -463,7 +463,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr, E21_IO_EXTENT);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index a4eb0dc99ecf..b4463094c93a 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -1827,7 +1827,7 @@ int __init init_module(void)
        return n_eepro ? 0 : -ENODEV;
 }
-void
+void __exit
 cleanup_module(void)
 {
        int i;
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index e14be020e562..4a50fcb5ad6b 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -1719,7 +1719,7 @@ int __init init_module(void)
        return -ENXIO;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index fd7b32a24ea4..2d2ea94a00bb 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -455,7 +455,7 @@ static void cleanup_card(struct net_device *dev)
        iounmap(ei_status.mem);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index b7b8bc2a6307..93283e386f3a 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -1475,7 +1475,7 @@ int __init init_module(void)
        return -ENXIO;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 6abcfd2a4b28..99a36cc3f8df 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -482,7 +482,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 29470970aa27..635b13c2e2aa 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -444,7 +444,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 4256c13c73c2..a3843320dbe1 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -368,7 +368,7 @@ static void cleanup_card(struct net_device *dev)
        kfree(lp);
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index 5795ee116205..0a08d0c4e7b4 100644
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
@@ -440,7 +440,7 @@ static void cleanup_card(struct net_device *dev)
        iounmap(ei_status.mem);
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index d9f48bb04b05..c41ae4286eea 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1100,7 +1100,7 @@ static void eth_tx_fill_frag_descs(struct mv643xx_private *mp,
                                         ETH_TX_ENABLE_INTERRUPT;
                        mp->tx_skb[tx_index] = skb;
                } else
-                        mp->tx_skb[tx_index] = 0;
+                        mp->tx_skb[tx_index] = NULL;
                desc = &mp->p_tx_desc_area[tx_index];
                desc->l4i_chk = 0;
@@ -1136,7 +1136,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
                eth_tx_fill_frag_descs(mp, skb);
                length = skb_headlen(skb);
-                mp->tx_skb[tx_index] = 0;
+                mp->tx_skb[tx_index] = NULL;
        } else {
                cmd_sts |= ETH_ZERO_PADDING |
                           ETH_TX_LAST_DESC |
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c
index 56a82d8ee8f5..e246d00bba6d 100644
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -184,7 +184,7 @@ static int m147lance_close(struct net_device *dev)
 MODULE_LICENSE("GPL");
 static struct net_device *dev_mvme147_lance;
-int init_module(void)
+int __init init_module(void)
 {
        dev_mvme147_lance = mvme147lance_probe(-1);
        if (IS_ERR(dev_mvme147_lance))
@@ -192,7 +192,7 @@ int init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        struct m147lance_private *lp = dev_mvme147_lance->priv;
        unregister_netdev(dev_mvme147_lance);
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 38df42802386..81f127a78afa 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -89,7 +89,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 #define MYRI10GE_EEPROM_STRINGS_SIZE 256
 #define MYRI10GE_MAX_SEND_DESC_TSO ((65536 / 2048) * 2)
-#define MYRI10GE_NO_CONFIRM_DATA 0xffffffff
+#define MYRI10GE_NO_CONFIRM_DATA htonl(0xffffffff)
 #define MYRI10GE_NO_RESPONSE_RESULT 0xffffffff
 struct myri10ge_rx_buffer_state {
@@ -156,8 +156,8 @@ struct myri10ge_priv {
        int sram_size;
        unsigned long board_span;
        unsigned long iomem_base;
-        u32 __iomem *irq_claim;
+        __be32 __iomem *irq_claim;
-        u32 __iomem *irq_deassert;
+        __be32 __iomem *irq_deassert;
        char *mac_addr_string;
        struct mcp_cmd_response *cmd;
        dma_addr_t cmd_bus;
@@ -165,10 +165,10 @@ struct myri10ge_priv {
        dma_addr_t fw_stats_bus;
        struct pci_dev *pdev;
        int msi_enabled;
-        unsigned int link_state;
+        __be32 link_state;
        unsigned int rdma_tags_available;
        int intr_coal_delay;
-        u32 __iomem *intr_coal_delay_ptr;
+        __be32 __iomem *intr_coal_delay_ptr;
        int mtrr;
        int wake_queue;
        int stop_queue;
@@ -273,6 +273,11 @@ MODULE_PARM_DESC(myri10ge_debug, "Debug level (0=none,...,16=all)");
 #define myri10ge_pio_copy(to,from,size) __iowrite64_copy(to,from,size/8)
+static inline void put_be32(__be32 val, __be32 __iomem *p)
+{
+        __raw_writel((__force __u32)val, (__force void __iomem *)p);
+}
 static int
 myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,
                  struct myri10ge_cmd *data, int atomic)
@@ -296,7 +301,7 @@ myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,
        buf->response_addr.low = htonl(dma_low);
        buf->response_addr.high = htonl(dma_high);
-        response->result = MYRI10GE_NO_RESPONSE_RESULT;
+        response->result = htonl(MYRI10GE_NO_RESPONSE_RESULT);
        mb();
        myri10ge_pio_copy(cmd_addr, buf, sizeof(*buf));
@@ -311,14 +316,14 @@ myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,
                 * (1ms will be enough for those commands) */
                for (sleep_total = 0;
                     sleep_total < 1000
-                     && response->result == MYRI10GE_NO_RESPONSE_RESULT;
+                     && response->result == htonl(MYRI10GE_NO_RESPONSE_RESULT);
                     sleep_total += 10)
                        udelay(10);
        } else {
                /* use msleep for most command */
                for (sleep_total = 0;
                     sleep_total < 15
-                     && response->result == MYRI10GE_NO_RESPONSE_RESULT;
+                     && response->result == htonl(MYRI10GE_NO_RESPONSE_RESULT);
                     sleep_total++)
                        msleep(1);
        }
@@ -393,7 +398,7 @@ abort:
 static void myri10ge_dummy_rdma(struct myri10ge_priv *mgp, int enable)
 {
        char __iomem *submit;
-        u32 buf[16];
+        __be32 buf[16];
        u32 dma_low, dma_high;
        int i;
@@ -410,7 +415,7 @@ static void myri10ge_dummy_rdma(struct myri10ge_priv *mgp, int enable)
        buf[0] = htonl(dma_high);       /* confirm addr MSW */
        buf[1] = htonl(dma_low);        /* confirm addr LSW */
-        buf[2] = htonl(MYRI10GE_NO_CONFIRM_DATA);       /* confirm data */
+        buf[2] = MYRI10GE_NO_CONFIRM_DATA;      /* confirm data */
        buf[3] = htonl(dma_high);       /* dummy addr MSW */
        buf[4] = htonl(dma_low);        /* dummy addr LSW */
        buf[5] = htonl(enable); /* enable? */
@@ -479,7 +484,7 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size)
        }
        /* check id */
-        hdr_offset = ntohl(*(u32 *) (fw->data + MCP_HEADER_PTR_OFFSET));
+        hdr_offset = ntohl(*(__be32 *) (fw->data + MCP_HEADER_PTR_OFFSET));
        if ((hdr_offset & 3) || hdr_offset + sizeof(*hdr) > fw->size) {
                dev_err(dev, "Bad firmware file\n");
                status = -EINVAL;
@@ -550,7 +555,7 @@ static int myri10ge_adopt_running_firmware(struct myri10ge_priv *mgp)
 static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
 {
        char __iomem *submit;
-        u32 buf[16];
+        __be32 buf[16];
        u32 dma_low, dma_high, size;
        int status, i;
@@ -600,7 +605,7 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
        buf[0] = htonl(dma_high);       /* confirm addr MSW */
        buf[1] = htonl(dma_low);        /* confirm addr LSW */
-        buf[2] = htonl(MYRI10GE_NO_CONFIRM_DATA);       /* confirm data */
+        buf[2] = MYRI10GE_NO_CONFIRM_DATA;      /* confirm data */
        /* FIX: All newest firmware should un-protect the bottom of
         * the sram before handoff. However, the very first interfaces
@@ -705,21 +710,21 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
        status |=
            myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &cmd, 0);
-        mgp->irq_claim = (__iomem u32 *) (mgp->sram + cmd.data0);
+        mgp->irq_claim = (__iomem __be32 *) (mgp->sram + cmd.data0);
        if (!mgp->msi_enabled) {
                status |= myri10ge_send_cmd
                    (mgp, MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET, &cmd, 0);
-                mgp->irq_deassert = (__iomem u32 *) (mgp->sram + cmd.data0);
+                mgp->irq_deassert = (__iomem __be32 *) (mgp->sram + cmd.data0);
        }
        status |= myri10ge_send_cmd
            (mgp, MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET, &cmd, 0);
-        mgp->intr_coal_delay_ptr = (__iomem u32 *) (mgp->sram + cmd.data0);
+        mgp->intr_coal_delay_ptr = (__iomem __be32 *) (mgp->sram + cmd.data0);
        if (status != 0) {
                dev_err(&mgp->pdev->dev, "failed set interrupt parameters\n");
                return status;
        }
-        __raw_writel(htonl(mgp->intr_coal_delay), mgp->intr_coal_delay_ptr);
+        put_be32(htonl(mgp->intr_coal_delay), mgp->intr_coal_delay_ptr);
        /* Run a small DMA test.
         * The magic multipliers to the length tell the firmware
@@ -786,14 +791,16 @@ static inline void
 myri10ge_submit_8rx(struct mcp_kreq_ether_recv __iomem * dst,
                    struct mcp_kreq_ether_recv *src)
 {
-        u32 low;
+        __be32 low;
        low = src->addr_low;
-        src->addr_low = DMA_32BIT_MASK;
+        src->addr_low = htonl(DMA_32BIT_MASK);
-        myri10ge_pio_copy(dst, src, 8 * sizeof(*src));
+        myri10ge_pio_copy(dst, src, 4 * sizeof(*src));
+        mb();
+        myri10ge_pio_copy(dst + 4, src + 4, 4 * sizeof(*src));
        mb();
        src->addr_low = low;
-        __raw_writel(low, &dst->addr_low);
+        put_be32(low, &dst->addr_low);
        mb();
 }
@@ -939,11 +946,11 @@ done:
        return retval;
 }
-static inline void myri10ge_vlan_ip_csum(struct sk_buff *skb, u16 hw_csum)
+static inline void myri10ge_vlan_ip_csum(struct sk_buff *skb, __wsum hw_csum)
 {
        struct vlan_hdr *vh = (struct vlan_hdr *)(skb->data);
-        if ((skb->protocol == ntohs(ETH_P_8021Q)) &&
+        if ((skb->protocol == htons(ETH_P_8021Q)) &&
            (vh->h_vlan_encapsulated_proto == htons(ETH_P_IP) ||
             vh->h_vlan_encapsulated_proto == htons(ETH_P_IPV6))) {
                skb->csum = hw_csum;
@@ -953,7 +960,7 @@ static inline void myri10ge_vlan_ip_csum(struct sk_buff *skb, u16 hw_csum)
 static inline unsigned long
 myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
-                 int bytes, int len, int csum)
+                 int bytes, int len, __wsum csum)
 {
        dma_addr_t bus;
        struct sk_buff *skb;
@@ -986,12 +993,12 @@ myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
        skb->protocol = eth_type_trans(skb, mgp->dev);
        if (mgp->csum_flag) {
-                if ((skb->protocol == ntohs(ETH_P_IP)) ||
+                if ((skb->protocol == htons(ETH_P_IP)) ||
-                    (skb->protocol == ntohs(ETH_P_IPV6))) {
+                    (skb->protocol == htons(ETH_P_IPV6))) {
-                        skb->csum = ntohs((u16) csum);
+                        skb->csum = csum;
                        skb->ip_summed = CHECKSUM_COMPLETE;
                } else
-                        myri10ge_vlan_ip_csum(skb, ntohs((u16) csum));
+                        myri10ge_vlan_ip_csum(skb, csum);
        }
        netif_receive_skb(skb);
@@ -1060,12 +1067,12 @@ static inline void myri10ge_clean_rx_done(struct myri10ge_priv *mgp, int *limit)
        int idx = rx_done->idx;
        int cnt = rx_done->cnt;
        u16 length;
-        u16 checksum;
+        __wsum checksum;
        while (rx_done->entry[idx].length != 0 && *limit != 0) {
                length = ntohs(rx_done->entry[idx].length);
                rx_done->entry[idx].length = 0;
-                checksum = ntohs(rx_done->entry[idx].checksum);
+                checksum = csum_unfold(rx_done->entry[idx].checksum);
                if (length <= mgp->small_bytes)
                        rx_ok = myri10ge_rx_done(mgp, &mgp->rx_small,
                                                 mgp->small_bytes,
@@ -1142,7 +1149,7 @@ static int myri10ge_poll(struct net_device *netdev, int *budget)
        if (rx_done->entry[rx_done->idx].length == 0 || !netif_running(netdev)) {
                netif_rx_complete(netdev);
-                __raw_writel(htonl(3), mgp->irq_claim);
+                put_be32(htonl(3), mgp->irq_claim);
                return 0;
        }
        return 1;
@@ -1166,7 +1173,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)
                netif_rx_schedule(mgp->dev);
        if (!mgp->msi_enabled) {
-                __raw_writel(0, mgp->irq_deassert);
+                put_be32(0, mgp->irq_deassert);
                if (!myri10ge_deassert_wait)
                        stats->valid = 0;
                mb();
@@ -1195,7 +1202,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)
        myri10ge_check_statblock(mgp);
-        __raw_writel(htonl(3), mgp->irq_claim + 1);
+        put_be32(htonl(3), mgp->irq_claim + 1);
        return (IRQ_HANDLED);
 }
@@ -1233,7 +1240,7 @@ myri10ge_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coal)
        struct myri10ge_priv *mgp = netdev_priv(netdev);
        mgp->intr_coal_delay = coal->rx_coalesce_usecs;
-        __raw_writel(htonl(mgp->intr_coal_delay), mgp->intr_coal_delay_ptr);
+        put_be32(htonl(mgp->intr_coal_delay), mgp->intr_coal_delay_ptr);
        return 0;
 }
@@ -1748,7 +1755,7 @@ static int myri10ge_open(struct net_device *dev)
                goto abort_with_rings;
        }
-        mgp->link_state = -1;
+        mgp->link_state = htonl(~0U);
        mgp->rdma_tags_available = 15;
        netif_poll_enable(mgp->dev);    /* must happen prior to any irq */
@@ -1876,7 +1883,7 @@ myri10ge_submit_req(struct myri10ge_tx_buf *tx, struct mcp_kreq_ether_send *src,
        /* re-write the last 32-bits with the valid flags */
        src->flags = last_flags;
-        __raw_writel(*((u32 *) src + 3), (u32 __iomem *) dst + 3);
+        put_be32(*((__be32 *) src + 3), (__be32 __iomem *) dst + 3);
        tx->req += cnt;
        mb();
 }
@@ -1919,7 +1926,8 @@ static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev)
        struct myri10ge_tx_buf *tx = &mgp->tx;
        struct skb_frag_struct *frag;
        dma_addr_t bus;
-        u32 low, high_swapped;
+        u32 low;
+        __be32 high_swapped;
        unsigned int len;
        int idx, last_idx, avail, frag_cnt, frag_idx, count, mss, max_segments;
        u16 pseudo_hdr_offset, cksum_offset;
@@ -1964,7 +1972,6 @@ again:
                        cksum_offset = 0;
                        pseudo_hdr_offset = 0;
                } else {
-                        pseudo_hdr_offset = htons(pseudo_hdr_offset);
                        odd_flag = MXGEFW_FLAGS_ALIGN_ODD;
                        flags |= MXGEFW_FLAGS_CKSUM;
                }
@@ -1986,7 +1993,7 @@ again:
                /* for TSO, pseudo_hdr_offset holds mss.
                 * The firmware figures out where to put
                 * the checksum by parsing the header. */
-                pseudo_hdr_offset = htons(mss);
+                pseudo_hdr_offset = mss;
        } else
 #endif                          /*NETIF_F_TSO */
                /* Mark small packets, and pad out tiny packets */
@@ -2086,7 +2093,7 @@ again:
 #endif                          /* NETIF_F_TSO */
                        req->addr_high = high_swapped;
                        req->addr_low = htonl(low);
-                        req->pseudo_hdr_offset = pseudo_hdr_offset;
+                        req->pseudo_hdr_offset = htons(pseudo_hdr_offset);
                        req->pad = 0;   /* complete solid 16-byte block; does this matter? */
                        req->rdma_count = 1;
                        req->length = htons(seglen);
@@ -2199,6 +2206,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
        struct myri10ge_cmd cmd;
        struct myri10ge_priv *mgp;
        struct dev_mc_list *mc_list;
+        __be32 data[2] = {0, 0};
        int err;
        mgp = netdev_priv(dev);
@@ -2237,10 +2245,9 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
        /* Walk the multicast list, and add each address */
        for (mc_list = dev->mc_list; mc_list != NULL; mc_list = mc_list->next) {
-                memcpy(&cmd.data0, &mc_list->dmi_addr, 4);
+                memcpy(data, &mc_list->dmi_addr, 6);
-                memcpy(&cmd.data1, ((char *)&mc_list->dmi_addr) + 4, 2);
+                cmd.data0 = ntohl(data[0]);
-                cmd.data0 = htonl(cmd.data0);
+                cmd.data1 = ntohl(data[1]);
-                cmd.data1 = htonl(cmd.data1);
                err = myri10ge_send_cmd(mgp, MXGEFW_JOIN_MULTICAST_GROUP,
                                        &cmd, 1);
diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/myri10ge/myri10ge_mcp.h
index 9519ae7cd5ec..29463b301a84 100644
--- a/drivers/net/myri10ge/myri10ge_mcp.h
+++ b/drivers/net/myri10ge/myri10ge_mcp.h
@@ -6,23 +6,23 @@
 /* 8 Bytes */
 struct mcp_dma_addr {
-        u32 high;
+        __be32 high;
-        u32 low;
+        __be32 low;
 };
 /* 4 Bytes */
 struct mcp_slot {
-        u16 checksum;
+        __sum16 checksum;
-        u16 length;
+        __be16 length;
 };
 /* 64 Bytes */
 struct mcp_cmd {
-        u32 cmd;
+        __be32 cmd;
-        u32 data0;              /* will be low portion if data > 32 bits */
+        __be32 data0;           /* will be low portion if data > 32 bits */
        /* 8 */
-        u32 data1;              /* will be high portion if data > 32 bits */
+        __be32 data1;           /* will be high portion if data > 32 bits */
-        u32 data2;              /* currently unused.. */
+        __be32 data2;           /* currently unused.. */
        /* 16 */
        struct mcp_dma_addr response_addr;
        /* 24 */
@@ -31,8 +31,8 @@ struct mcp_cmd {
 /* 8 Bytes */
 struct mcp_cmd_response {
-        u32 data;
+        __be32 data;
-        u32 result;
+        __be32 result;
 };
 /*
@@ -73,10 +73,10 @@ union mcp_pso_or_cumlen {
 /* 16 Bytes */
 struct mcp_kreq_ether_send {
-        u32 addr_high;
+        __be32 addr_high;
-        u32 addr_low;
+        __be32 addr_low;
-        u16 pseudo_hdr_offset;
+        __be16 pseudo_hdr_offset;
-        u16 length;
+        __be16 length;
        u8 pad;
        u8 rdma_count;
        u8 cksum_offset;        /* where to start computing cksum */
@@ -85,8 +85,8 @@ struct mcp_kreq_ether_send {
 /* 8 Bytes */
 struct mcp_kreq_ether_recv {
-        u32 addr_high;
+        __be32 addr_high;
-        u32 addr_low;
+        __be32 addr_low;
 };
 /* Commands */
@@ -219,19 +219,19 @@ enum myri10ge_mcp_cmd_status {
 struct mcp_irq_data {
        /* add new counters at the beginning */
-        u32 future_use[5];
+        __be32 future_use[5];
-        u32 dropped_multicast_filtered;
+        __be32 dropped_multicast_filtered;
        /* 40 Bytes */
-        u32 send_done_count;
+        __be32 send_done_count;
-        u32 link_up;
+        __be32 link_up;
-        u32 dropped_link_overflow;
+        __be32 dropped_link_overflow;
-        u32 dropped_link_error_or_filtered;
+        __be32 dropped_link_error_or_filtered;
-        u32 dropped_runt;
+        __be32 dropped_runt;
-        u32 dropped_overrun;
+        __be32 dropped_overrun;
-        u32 dropped_no_small_buffer;
+        __be32 dropped_no_small_buffer;
-        u32 dropped_no_big_buffer;
+        __be32 dropped_no_big_buffer;
-        u32 rdma_tags_available;
+        __be32 rdma_tags_available;
        u8 tx_stopped;
        u8 link_down;
diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
index 487f7792fd46..16a810dd6d51 100644
--- a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
+++ b/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
@@ -36,7 +36,7 @@
 struct mcp_gen_header {
        /* the first 4 fields are filled at compile time */
        unsigned header_length;
-        unsigned mcp_type;
+        __be32 mcp_type;
        char version[128];
        unsigned mcp_globals;   /* pointer to mcp-type specific structure */
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index 787aa4221528..a5c4199e2754 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -867,7 +867,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr, NE_IO_EXTENT);
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index 5fccfea66d87..089b5bb702fc 100644
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -813,7 +813,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr, NE_IO_EXTENT);
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 9c588af8ab74..b5410bee5f21 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -1,25 +1,25 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
- *                            
+ *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *                                   
+ *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -63,40 +63,68 @@
 #include "netxen_nic_hw.h"
-#define NETXEN_NIC_BUILD_NO     "5"
+#define NETXEN_NIC_BUILD_NO     "1"
-#define _NETXEN_NIC_LINUX_MAJOR 2
+#define _NETXEN_NIC_LINUX_MAJOR 3
 #define _NETXEN_NIC_LINUX_MINOR 3
-#define _NETXEN_NIC_LINUX_SUBVERSION 59
+#define _NETXEN_NIC_LINUX_SUBVERSION 2
-#define NETXEN_NIC_LINUX_VERSIONID  "2.3.59" "-" NETXEN_NIC_BUILD_NO
+#define NETXEN_NIC_LINUX_VERSIONID  "3.3.2" "-" NETXEN_NIC_BUILD_NO
-#define NETXEN_NIC_FW_VERSIONID "2.3.59"
+#define NETXEN_NIC_FW_VERSIONID "3.3.2"
 #define RCV_DESC_RINGSIZE       \
        (sizeof(struct rcv_desc) * adapter->max_rx_desc_count)
 #define STATUS_DESC_RINGSIZE    \
        (sizeof(struct status_desc)* adapter->max_rx_desc_count)
+#define LRO_DESC_RINGSIZE       \
+        (sizeof(rcvDesc_t) * adapter->max_lro_rx_desc_count)
 #define TX_RINGSIZE     \
        (sizeof(struct netxen_cmd_buffer) * adapter->max_tx_desc_count)
 #define RCV_BUFFSIZE    \
        (sizeof(struct netxen_rx_buffer) * rcv_desc->max_rx_desc_count)
 #define find_diff_among(a,b,range) ((a)<(b)?((b)-(a)):((b)+(range)-(a)))
-#define NETXEN_NETDEV_STATUS 0x1
+#define NETXEN_NETDEV_STATUS            0x1
+#define NETXEN_RCV_PRODUCER_OFFSET      0
+#define NETXEN_RCV_PEG_DB_ID            2
+#define NETXEN_HOST_DUMMY_DMA_SIZE 1024
 #define ADDR_IN_WINDOW1(off)    \
        ((off > NETXEN_CRB_PCIX_HOST2) && (off < NETXEN_CRB_MAX)) ? 1 : 0
+/*
+ * In netxen_nic_down(), we must wait for any pending callback requests into
+ * netxen_watchdog_task() to complete; eg otherwise the watchdog_timer could be
+ * reenabled right after it is deleted in netxen_nic_down(). FLUSH_SCHEDULED_WORK()
+ * does this synchronization.
+ *
+ * Normally, schedule_work()/flush_scheduled_work() could have worked, but
+ * netxen_nic_close() is invoked with kernel rtnl lock held. netif_carrier_off()
+ * call in netxen_nic_close() triggers a schedule_work(&linkwatch_work), and a
+ * subsequent call to flush_scheduled_work() in netxen_nic_down() would cause
+ * linkwatch_event() to be executed which also attempts to acquire the rtnl
+ * lock thus causing a deadlock.
+ */
+#define SCHEDULE_WORK(tp)       queue_work(netxen_workq, tp)
+#define FLUSH_SCHEDULED_WORK()  flush_workqueue(netxen_workq)
+extern struct workqueue_struct *netxen_workq;
 /* 
 * normalize a 64MB crb address to 32MB PCI window 
 * To use NETXEN_CRB_NORMALIZE, window _must_ be set to 1
 */
-#define NETXEN_CRB_NORMAL(reg)        \
+#define NETXEN_CRB_NORMAL(reg)  \
-        (reg) - NETXEN_CRB_PCIX_HOST2 + NETXEN_CRB_PCIX_HOST
+        ((reg) - NETXEN_CRB_PCIX_HOST2 + NETXEN_CRB_PCIX_HOST)
 #define NETXEN_CRB_NORMALIZE(adapter, reg) \
        pci_base_offset(adapter, NETXEN_CRB_NORMAL(reg))
+#define DB_NORMALIZE(adapter, off) \
+        (adapter->ahw.db_base + (off))
+#define NX_P2_C0                0x24
+#define NX_P2_C1                0x25
 #define FIRST_PAGE_GROUP_START  0
-#define FIRST_PAGE_GROUP_END    0x400000
+#define FIRST_PAGE_GROUP_END    0x100000
 #define SECOND_PAGE_GROUP_START 0x4000000
 #define SECOND_PAGE_GROUP_END   0x66BC000
@@ -108,11 +136,13 @@
 #define SECOND_PAGE_GROUP_SIZE SECOND_PAGE_GROUP_END - SECOND_PAGE_GROUP_START
 #define THIRD_PAGE_GROUP_SIZE  THIRD_PAGE_GROUP_END - THIRD_PAGE_GROUP_START
-#define MAX_RX_BUFFER_LENGTH            2000
+#define MAX_RX_BUFFER_LENGTH            1760
 #define MAX_RX_JUMBO_BUFFER_LENGTH      9046
-#define RX_DMA_MAP_LEN                  (MAX_RX_BUFFER_LENGTH - NET_IP_ALIGN)
+#define MAX_RX_LRO_BUFFER_LENGTH        ((48*1024)-512)
+#define RX_DMA_MAP_LEN                  (MAX_RX_BUFFER_LENGTH - 2)
 #define RX_JUMBO_DMA_MAP_LEN    \
-        (MAX_RX_JUMBO_BUFFER_LENGTH - NET_IP_ALIGN)
+        (MAX_RX_JUMBO_BUFFER_LENGTH - 2)
+#define RX_LRO_DMA_MAP_LEN              (MAX_RX_LRO_BUFFER_LENGTH - 2)
 #define NETXEN_ROM_ROUNDUP              0x80000000ULL
 /*
@@ -151,30 +181,38 @@ enum {
 /* Host writes the following to notify that it has done the init-handshake */
 #define PHAN_INITIALIZE_ACK     0xf00f
-#define NUM_RCV_DESC_RINGS      2       /* No of Rcv Descriptor contexts */
+#define NUM_RCV_DESC_RINGS      3       /* No of Rcv Descriptor contexts */
 /* descriptor types */
 #define RCV_DESC_NORMAL         0x01
 #define RCV_DESC_JUMBO          0x02
+#define RCV_DESC_LRO            0x04
 #define RCV_DESC_NORMAL_CTXID   0
 #define RCV_DESC_JUMBO_CTXID    1
+#define RCV_DESC_LRO_CTXID      2
 #define RCV_DESC_TYPE(ID) \
-        ((ID == RCV_DESC_JUMBO_CTXID) ? RCV_DESC_JUMBO : RCV_DESC_NORMAL)
+        ((ID == RCV_DESC_JUMBO_CTXID)   \
+                ? RCV_DESC_JUMBO        \
+                : ((ID == RCV_DESC_LRO_CTXID)   \
+                        ? RCV_DESC_LRO :        \
+                        (RCV_DESC_NORMAL)))
 #define MAX_CMD_DESCRIPTORS             1024
 #define MAX_RCV_DESCRIPTORS             32768
-#define MAX_JUMBO_RCV_DESCRIPTORS       1024
+#define MAX_JUMBO_RCV_DESCRIPTORS       4096
+#define MAX_LRO_RCV_DESCRIPTORS         2048
 #define MAX_RCVSTATUS_DESCRIPTORS       MAX_RCV_DESCRIPTORS
 #define MAX_JUMBO_RCV_DESC      MAX_JUMBO_RCV_DESCRIPTORS
 #define MAX_RCV_DESC            MAX_RCV_DESCRIPTORS
 #define MAX_RCVSTATUS_DESC      MAX_RCV_DESCRIPTORS
-#define NUM_RCV_DESC            (MAX_RCV_DESC + MAX_JUMBO_RCV_DESCRIPTORS)
 #define MAX_EPG_DESCRIPTORS     (MAX_CMD_DESCRIPTORS * 8)
+#define NUM_RCV_DESC            (MAX_RCV_DESC + MAX_JUMBO_RCV_DESCRIPTORS + \
+                                 MAX_LRO_RCV_DESCRIPTORS)
 #define MIN_TX_COUNT    4096
 #define MIN_RX_COUNT    4096
+#define NETXEN_CTX_SIGNATURE    0xdee0
+#define NETXEN_RCV_PRODUCER(ringid)     (ringid)
 #define MAX_FRAME_SIZE  0x10000 /* 64K MAX size for LSO */
 #define PHAN_PEG_RCV_INITIALIZED        0xff01
@@ -186,6 +224,67 @@ enum {
 #define get_index_range(index,length,count)     \
        (((index) + (count)) & ((length) - 1))
+#define MPORT_SINGLE_FUNCTION_MODE 0x1111
+extern unsigned long long netxen_dma_mask;
+/*
+ * NetXen host-peg signal message structure
+ *
+ *      Bit 0-1         : peg_id => 0x2 for tx and 01 for rx
+ *      Bit 2           : priv_id => must be 1
+ *      Bit 3-17        : count => for doorbell
+ *      Bit 18-27       : ctx_id => Context id
+ *      Bit 28-31       : opcode
+ */
+typedef u32 netxen_ctx_msg;
+#define _netxen_set_bits(config_word, start, bits, val) {\
+        unsigned long long mask = (((1ULL << (bits)) - 1) << (start));  \
+        unsigned long long value = (val);       \
+        (config_word) &= ~mask; \
+        (config_word) |= (((value) << (start)) & mask); \
+}
+#define netxen_set_msg_peg_id(config_word, val) \
+        _netxen_set_bits(config_word, 0, 2, val)
+#define netxen_set_msg_privid(config_word)      \
+        set_bit(2, (unsigned long*)&config_word)
+#define netxen_set_msg_count(config_word, val)  \
+        _netxen_set_bits(config_word, 3, 15, val)
+#define netxen_set_msg_ctxid(config_word, val)  \
+        _netxen_set_bits(config_word, 18, 10, val)
+#define netxen_set_msg_opcode(config_word, val) \
+        _netxen_set_bits(config_word, 28, 4, val)
+struct netxen_rcv_context {
+        u32 rcv_ring_addr_lo;
+        u32 rcv_ring_addr_hi;
+        u32 rcv_ring_size;
+        u32 rsrvd;
+};
+struct netxen_ring_ctx {
+        /* one command ring */
+        u64 cmd_consumer_offset;
+        u32 cmd_ring_addr_lo;
+        u32 cmd_ring_addr_hi;
+        u32 cmd_ring_size;
+        u32 rsrvd;
+        /* three receive rings */
+        struct netxen_rcv_context rcv_ctx[3];
+        /* one status ring */
+        u32 sts_ring_addr_lo;
+        u32 sts_ring_addr_hi;
+        u32 sts_ring_size;
+        u32 ctx_id;
+} __attribute__ ((aligned(64)));
 /*
 * Following data structures describe the descriptors that will be used.
 * Added fileds of tcpHdrSize and ipHdrSize, The driver needs to do it only when
@@ -203,22 +302,32 @@ enum {
 #define FLAGS_IPSEC_SA_DELETE   0x08
 #define FLAGS_VLAN_TAGGED       0x10
-#define CMD_DESC_TOTAL_LENGTH(cmd_desc) \
+#define netxen_set_cmd_desc_port(cmd_desc, var) \
-                ((cmd_desc)->length_tcp_hdr & 0x00FFFFFF)
+        ((cmd_desc)->port_ctxid |= ((var) & 0x0F))
-#define CMD_DESC_TCP_HDR_OFFSET(cmd_desc)       \
-                (((cmd_desc)->length_tcp_hdr >> 24) & 0x0FF)
-#define CMD_DESC_PORT(cmd_desc)         ((cmd_desc)->port_ctxid & 0x0F)
-#define CMD_DESC_CTX_ID(cmd_desc)       (((cmd_desc)->port_ctxid >> 4) & 0x0F)
-#define CMD_DESC_TOTAL_LENGTH_WRT(cmd_desc, var)        \
+#define netxen_set_cmd_desc_flags(cmd_desc, val)        \
-                ((cmd_desc)->length_tcp_hdr |= ((var) & 0x00FFFFFF))
+        _netxen_set_bits((cmd_desc)->flags_opcode, 0, 7, val)
-#define CMD_DESC_TCP_HDR_OFFSET_WRT(cmd_desc, var)      \
+#define netxen_set_cmd_desc_opcode(cmd_desc, val)       \
-                ((cmd_desc)->length_tcp_hdr |= (((var) << 24) & 0xFF000000))
+        _netxen_set_bits((cmd_desc)->flags_opcode, 7, 6, val)
-#define CMD_DESC_PORT_WRT(cmd_desc, var)        \
-                ((cmd_desc)->port_ctxid |= ((var) & 0x0F))
+#define netxen_set_cmd_desc_num_of_buff(cmd_desc, val)  \
+        _netxen_set_bits((cmd_desc)->num_of_buffers_total_length, 0, 8, val);
+#define netxen_set_cmd_desc_totallength(cmd_desc, val)  \
+        _netxen_set_bits((cmd_desc)->num_of_buffers_total_length, 8, 24, val);
+#define netxen_get_cmd_desc_opcode(cmd_desc)    \
+        (((cmd_desc)->flags_opcode >> 7) & 0x003F)
+#define netxen_get_cmd_desc_totallength(cmd_desc)       \
+        (((cmd_desc)->num_of_buffers_total_length >> 8) & 0x0FFFFFF)
 struct cmd_desc_type0 {
-        u64 netxen_next;        /* for fragments handled by Phantom */
+        u8 tcp_hdr_offset;      /* For LSO only */
+        u8 ip_hdr_offset;       /* For LSO only */
+        /* Bit pattern: 0-6 flags, 7-12 opcode, 13-15 unused */
+        u16 flags_opcode;
+        /* Bit pattern: 0-7 total number of segments,
+           8-31 Total size of the packet */
+        u32 num_of_buffers_total_length;
        union {
                struct {
                        u32 addr_low_part2;
@@ -227,13 +336,6 @@ struct cmd_desc_type0 {
                u64 addr_buffer2;
        };
-        /* Bit pattern: 0-23 total length, 24-32 tcp header offset */
-        u32 length_tcp_hdr;
-        u8 ip_hdr_offset;       /* For LSO only */
-        u8 num_of_buffers;      /* total number of segments */
-        u8 flags;               /* as defined above */
-        u8 opcode;
        u16 reference_handle;   /* changed to u16 to add mss */
        u16 mss;                /* passed by NDIS_PACKET for LSO */
        /* Bit pattern 0-3 port, 0-3 ctx id */
@@ -248,7 +350,6 @@ struct cmd_desc_type0 {
                };
                u64 addr_buffer3;
        };
        union {
                struct {
                        u32 addr_low_part1;
@@ -270,6 +371,8 @@ struct cmd_desc_type0 {
                u64 addr_buffer4;
        };
+        u64 unused;
 } __attribute__ ((aligned(64)));
 /* Note: sizeof(rcv_desc) should always be a mutliple of 2 */
@@ -296,22 +399,49 @@ struct rcv_desc {
 #define NETXEN_PROT_UNKNOWN     (0)
 /* Note: sizeof(status_desc) should always be a mutliple of 2 */
-#define STATUS_DESC_PORT(status_desc)   \
-                ((status_desc)->port_status_type_op & 0x0F)
+#define netxen_get_sts_desc_lro_cnt(status_desc)        \
-#define STATUS_DESC_STATUS(status_desc) \
+        ((status_desc)->lro & 0x7F)
-                (((status_desc)->port_status_type_op >> 4) & 0x0F)
+#define netxen_get_sts_desc_lro_last_frag(status_desc)  \
-#define STATUS_DESC_TYPE(status_desc)   \
+        (((status_desc)->lro & 0x80) >> 7)
-                (((status_desc)->port_status_type_op >> 8) & 0x0F)
-#define STATUS_DESC_OPCODE(status_desc) \
+#define netxen_get_sts_port(status_desc)        \
-                (((status_desc)->port_status_type_op >> 12) & 0x0F)
+        ((status_desc)->status_desc_data & 0x0F)
+#define netxen_get_sts_status(status_desc)      \
+        (((status_desc)->status_desc_data >> 4) & 0x0F)
+#define netxen_get_sts_type(status_desc)        \
+        (((status_desc)->status_desc_data >> 8) & 0x0F)
+#define netxen_get_sts_totallength(status_desc) \
+        (((status_desc)->status_desc_data >> 12) & 0xFFFF)
+#define netxen_get_sts_refhandle(status_desc)   \
+        (((status_desc)->status_desc_data >> 28) & 0xFFFF)
+#define netxen_get_sts_prot(status_desc)        \
+        (((status_desc)->status_desc_data >> 44) & 0x0F)
+#define netxen_get_sts_owner(status_desc)       \
+        (((status_desc)->status_desc_data >> 56) & 0x03)
+#define netxen_get_sts_opcode(status_desc)      \
+        (((status_desc)->status_desc_data >> 58) & 0x03F)
+#define netxen_clear_sts_owner(status_desc)     \
+        ((status_desc)->status_desc_data &=     \
+        ~(((unsigned long long)3) << 56 ))
+#define netxen_set_sts_owner(status_desc, val)  \
+        ((status_desc)->status_desc_data |=     \
+        (((unsigned long long)((val) & 0x3)) << 56 ))
 struct status_desc {
-        /* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-15 opcode */
+        /* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-27 total_length
-        u16 port_status_type_op;
+           28-43 reference_handle, 44-47 protocol, 48-52 unused
-        u16 total_length;       /* NIC mode */
+           53-55 desc_cnt, 56-57 owner, 58-63 opcode
-        u16 reference_handle;   /* handle for the associated packet */
+         */
-        /* Bit pattern: 0-1 owner, 2-5 protocol */
+        u64 status_desc_data;
-        u16 owner;              /* Owner of the descriptor */
+        u32 hash_value;
+        u8 hash_type;
+        u8 msg_type;
+        u8 unused;
+        /* Bit pattern: 0-6 lro_count indicates frag sequence,
+           7 last_frag indicates last frag */
+        u8 lro;
 } __attribute__ ((aligned(8)));
 enum {
@@ -559,11 +689,12 @@ typedef enum {
 #define PRIMARY_START           (BOOTLD_START)
 #define FLASH_CRBINIT_SIZE      (0x4000)
 #define FLASH_BRDCFG_SIZE       (sizeof(struct netxen_board_info))
-#define FLASH_USER_SIZE         (sizeof(netxen_user_info)/sizeof(u32))
+#define FLASH_USER_SIZE         (sizeof(struct netxen_user_info)/sizeof(u32))
 #define FLASH_SECONDARY_SIZE    (USER_START-SECONDARY_START)
 #define NUM_PRIMARY_SECTORS     (0x20)
 #define NUM_CONFIG_SECTORS      (1)
-#define PFX "netxen: "
+#define PFX "NetXen: "
+extern char netxen_nic_driver_name[];
 /* Note: Make sure to not call this before adapter->port is valid */
 #if !defined(NETXEN_DEBUG)
@@ -572,7 +703,7 @@ typedef enum {
 #else
 #define DPRINTK(klevel, fmt, args...)   do { \
        printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\
-                (adapter != NULL && adapter->port != NULL && \
+                (adapter != NULL && \
                adapter->port[0] != NULL && \
                adapter->port[0]->netdev != NULL) ? \
                adapter->port[0]->netdev->name : NULL, \
@@ -609,7 +740,6 @@ struct netxen_cmd_buffer {
        u8 frag_count;
        unsigned long time_stamp;
        u32 state;
-        u32 no_of_descriptors;
 };
 /* In rx_buffer, we do not need multiple fragments as is a single buffer */
@@ -618,6 +748,9 @@ struct netxen_rx_buffer {
        u64 dma;
        u16 ref_handle;
        u16 state;
+        u32 lro_expected_frags;
+        u32 lro_current_frags;
+        u32 lro_length;
 };
 /* Board types */
@@ -633,6 +766,8 @@ struct netxen_hardware_context {
        void __iomem *pci_base0;
        void __iomem *pci_base1;
        void __iomem *pci_base2;
+        void __iomem *db_base;
+        unsigned long db_len;
        u8 revision_id;
        u16 board_type;
@@ -642,14 +777,13 @@ struct netxen_hardware_context {
        u32 qg_linksup;
        /* Address of cmd ring in Phantom */
        struct cmd_desc_type0 *cmd_desc_head;
-        char *pauseaddr;
        struct pci_dev *cmd_desc_pdev;
        dma_addr_t cmd_desc_phys_addr;
-        dma_addr_t pause_physaddr;
-        struct pci_dev *pause_pdev;
        struct netxen_adapter *adapter;
 };
+#define RCV_RING_LRO    RCV_DESC_LRO
 #define MINIMUM_ETHERNET_FRAME_SIZE     64      /* With FCS */
 #define ETHERNET_FCS_SIZE               4
@@ -702,8 +836,13 @@ struct netxen_recv_context {
 };
 #define NETXEN_NIC_MSI_ENABLED 0x02
+#define NETXEN_DMA_MASK 0xfffffffe
+#define NETXEN_DB_MAPSIZE_BYTES    0x1000
-struct netxen_drvops;
+struct netxen_dummy_dma {
+        void *addr;
+        dma_addr_t phys_addr;
+};
 struct netxen_adapter {
        struct netxen_hardware_context ahw;
@@ -720,12 +859,13 @@ struct netxen_adapter {
        u32 curr_window;
        u32 cmd_producer;
-        u32 cmd_consumer;
+        u32 *cmd_consumer;
        u32 last_cmd_consumer;
        u32 max_tx_desc_count;
        u32 max_rx_desc_count;
        u32 max_jumbo_rx_desc_count;
+        u32 max_lro_rx_desc_count;
        /* Num of instances active on cmd buffer ring */
        u32 proc_cmd_buf_counter;
@@ -747,8 +887,27 @@ struct netxen_adapter {
        struct netxen_recv_context recv_ctx[MAX_RCV_CTX];
        int is_up;
-        int work_done;
+        int number;
-        struct netxen_drvops *ops;
+        struct netxen_dummy_dma dummy_dma;
+        /* Context interface shared between card and host */
+        struct netxen_ring_ctx *ctx_desc;
+        struct pci_dev *ctx_desc_pdev;
+        dma_addr_t ctx_desc_phys_addr;
+        int (*enable_phy_interrupts) (struct netxen_adapter *, int);
+        int (*disable_phy_interrupts) (struct netxen_adapter *, int);
+        void (*handle_phy_intr) (struct netxen_adapter *);
+        int (*macaddr_set) (struct netxen_port *, netxen_ethernet_macaddr_t);
+        int (*set_mtu) (struct netxen_port *, int);
+        int (*set_promisc) (struct netxen_adapter *, int,
+                            netxen_niu_prom_mode_t);
+        int (*unset_promisc) (struct netxen_adapter *, int,
+                              netxen_niu_prom_mode_t);
+        int (*phy_read) (struct netxen_adapter *, long phy, long reg, u32 *);
+        int (*phy_write) (struct netxen_adapter *, long phy, long reg, u32 val);
+        int (*init_port) (struct netxen_adapter *, int);
+        void (*init_niu) (struct netxen_adapter *);
+        int (*stop_port) (struct netxen_adapter *, int);
 };                              /* netxen_adapter structure */
 /* Max number of xmit producer threads that can run simultaneously */
@@ -830,25 +989,6 @@ static inline void __iomem *pci_base(struct netxen_adapter *adapter,
        return NULL;
 }
-struct netxen_drvops {
-        int (*enable_phy_interrupts) (struct netxen_adapter *, int);
-        int (*disable_phy_interrupts) (struct netxen_adapter *, int);
-        void (*handle_phy_intr) (struct netxen_adapter *);
-        int (*macaddr_set) (struct netxen_port *, netxen_ethernet_macaddr_t);
-        int (*set_mtu) (struct netxen_port *, int);
-        int (*set_promisc) (struct netxen_adapter *, int,
-                            netxen_niu_prom_mode_t);
-        int (*unset_promisc) (struct netxen_adapter *, int,
-                              netxen_niu_prom_mode_t);
-        int (*phy_read) (struct netxen_adapter *, long phy, long reg, u32 *);
-        int (*phy_write) (struct netxen_adapter *, long phy, long reg, u32 val);
-        int (*init_port) (struct netxen_adapter *, int);
-        void (*init_niu) (struct netxen_adapter *);
-        int (*stop_port) (struct netxen_adapter *, int);
-};
-extern char netxen_nic_driver_name[];
 int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter,
                                          int port);
 int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter,
@@ -887,10 +1027,20 @@ int netxen_nic_hw_read_wx(struct netxen_adapter *adapter, u64 off, void *data,
                          int len);
 int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off, void *data,
                           int len);
+int netxen_nic_hw_read_ioctl(struct netxen_adapter *adapter, u64 off,
+                             void *data, int len);
+int netxen_nic_hw_write_ioctl(struct netxen_adapter *adapter, u64 off,
+                              void *data, int len);
+int netxen_nic_pci_mem_write_ioctl(struct netxen_adapter *adapter,
+                                   u64 off, void *data, int size);
+int netxen_nic_pci_mem_read_ioctl(struct netxen_adapter *adapter,
+                                  u64 off, void *data, int size);
 void netxen_crb_writelit_adapter(struct netxen_adapter *adapter,
                                 unsigned long off, int data);
 /* Functions from netxen_nic_init.c */
+void netxen_free_adapter_offload(struct netxen_adapter *adapter);
+int netxen_initialize_adapter_offload(struct netxen_adapter *adapter);
 void netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val);
 void netxen_load_firmware(struct netxen_adapter *adapter);
 int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose);
@@ -925,7 +1075,9 @@ int netxen_nic_tx_has_work(struct netxen_adapter *adapter);
 void netxen_watchdog_task(struct work_struct *work);
 void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx,
                            u32 ringid);
-void netxen_process_cmd_ring(unsigned long data);
+void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, u32 ctx,
+                                 u32 ringid);
+int netxen_process_cmd_ring(unsigned long data);
 u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max);
 void netxen_nic_set_multi(struct net_device *netdev);
 int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
@@ -1019,7 +1171,6 @@ static inline void get_brd_name_by_type(u32 type, char *name)
 int netxen_is_flash_supported(struct netxen_adapter *adapter);
 int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[]);
 extern void netxen_change_ringparam(struct netxen_adapter *adapter);
 extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,
                                int *valp);
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 9a914aeba5bc..2ab4885cc950 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -1,25 +1,25 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
- *                            
+ *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *                                   
+ *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -118,7 +118,7 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
        u32 fw_minor = 0;
        u32 fw_build = 0;
-        strncpy(drvinfo->driver, "netxen_nic", 32);
+        strncpy(drvinfo->driver, netxen_nic_driver_name, 32);
        strncpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID, 32);
        fw_major = readl(NETXEN_CRB_NORMALIZE(adapter,
                                              NETXEN_FW_VERSION_MAJOR));
@@ -210,7 +210,6 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                printk(KERN_ERR "netxen-nic: Unsupported board model %d\n",
                       (netxen_brdtype_t) boardinfo->board_type);
                return -EIO;
        }
        return 0;
@@ -226,18 +225,18 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
        /* read which mode */
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                /* autonegotiation */
-                if (adapter->ops->phy_write
+                if (adapter->phy_write
-                    && adapter->ops->phy_write(adapter, port->portnum,
+                    && adapter->phy_write(adapter, port->portnum,
-                                               NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
+                                          NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                               (__le32) ecmd->autoneg) != 0)
+                                          (__le32) ecmd->autoneg) != 0)
                        return -EIO;
                else
                        port->link_autoneg = ecmd->autoneg;
-                if (adapter->ops->phy_read
+                if (adapter->phy_read
-                    && adapter->ops->phy_read(adapter, port->portnum,
+                    && adapter->phy_read(adapter, port->portnum,
-                                              NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                         NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                              &status) != 0)
+                                         &status) != 0)
                        return -EIO;
                /* speed */
@@ -257,10 +256,10 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                        netxen_clear_phy_duplex(status);
                if (ecmd->duplex == DUPLEX_FULL)
                        netxen_set_phy_duplex(status);
-                if (adapter->ops->phy_write
+                if (adapter->phy_write
-                    && adapter->ops->phy_write(adapter, port->portnum,
+                    && adapter->phy_write(adapter, port->portnum,
-                                               NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                          NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                               *((int *)&status)) != 0)
+                                          *((int *)&status)) != 0)
                        return -EIO;
                else {
                        port->link_speed = ecmd->speed;
@@ -422,10 +421,10 @@ static u32 netxen_nic_get_link(struct net_device *dev)
        /* read which mode */
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
-                if (adapter->ops->phy_read
+                if (adapter->phy_read
-                    && adapter->ops->phy_read(adapter, port->portnum,
+                    && adapter->phy_read(adapter, port->portnum,
-                                              NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                         NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                              &status) != 0)
+                                         &status) != 0)
                        return -EIO;
                else
                        return (netxen_get_phy_link(status));
@@ -460,20 +459,22 @@ netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
 {
        struct netxen_port *port = netdev_priv(dev);
        struct netxen_adapter *adapter = port->adapter;
-        int i, j;
+        int i;
        ring->rx_pending = 0;
+        ring->rx_jumbo_pending = 0;
        for (i = 0; i < MAX_RCV_CTX; ++i) {
-                for (j = 0; j < NUM_RCV_DESC_RINGS; j++)
+                ring->rx_pending += adapter->recv_ctx[i].
-                        ring->rx_pending +=
+                    rcv_desc[RCV_DESC_NORMAL_CTXID].rcv_pending;
-                            adapter->recv_ctx[i].rcv_desc[j].rcv_pending;
+                ring->rx_jumbo_pending += adapter->recv_ctx[i].
+                    rcv_desc[RCV_DESC_JUMBO_CTXID].rcv_pending;
        }
        ring->rx_max_pending = adapter->max_rx_desc_count;
        ring->tx_max_pending = adapter->max_tx_desc_count;
+        ring->rx_jumbo_max_pending = adapter->max_jumbo_rx_desc_count;
        ring->rx_mini_max_pending = 0;
        ring->rx_mini_pending = 0;
-        ring->rx_jumbo_max_pending = 0;
        ring->rx_jumbo_pending = 0;
 }
@@ -526,10 +527,10 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                                    *(u32 *) (&val));
                /* set autoneg */
                autoneg = pause->autoneg;
-                if (adapter->ops->phy_write
+                if (adapter->phy_write
-                    && adapter->ops->phy_write(adapter, port->portnum,
+                    && adapter->phy_write(adapter, port->portnum,
-                                               NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
+                                          NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                               (__le32) autoneg) != 0)
+                                          (__le32) autoneg) != 0)
                        return -EIO;
                else {
                        port->link_autoneg = pause->autoneg;
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 72c6ec4ee2a0..fe8b675f9e72 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
@@ -16,10 +16,10 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 105c24f0ad4c..9147b6048dfb 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
@@ -16,10 +16,10 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -42,7 +42,7 @@
 #define NETXEN_FLASH_BASE       (BOOTLD_START)
 #define NETXEN_PHANTOM_MEM_BASE (NETXEN_FLASH_BASE)
-#define NETXEN_MAX_MTU          8000
+#define NETXEN_MAX_MTU          8000 + NETXEN_ENET_HEADER_SIZE + NETXEN_ETH_FCS_SIZE
 #define NETXEN_MIN_MTU          64
 #define NETXEN_ETH_FCS_SIZE     4
 #define NETXEN_ENET_HEADER_SIZE 14
@@ -81,8 +81,8 @@ int netxen_nic_set_mac(struct net_device *netdev, void *p)
        DPRINTK(INFO, "valid ether addr\n");
        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-        if (adapter->ops->macaddr_set)
+        if (adapter->macaddr_set)
-                adapter->ops->macaddr_set(port, addr->sa_data);
+                adapter->macaddr_set(port, addr->sa_data);
        return 0;
 }
@@ -99,17 +99,17 @@ void netxen_nic_set_multi(struct net_device *netdev)
        mc_ptr = netdev->mc_list;
        if (netdev->flags & IFF_PROMISC) {
-                if (adapter->ops->set_promisc)
+                if (adapter->set_promisc)
-                        adapter->ops->set_promisc(adapter,
+                        adapter->set_promisc(adapter,
-                                                  port->portnum,
+                                             port->portnum,
-                                                  NETXEN_NIU_PROMISC_MODE);
+                                             NETXEN_NIU_PROMISC_MODE);
        } else {
-                if (adapter->ops->unset_promisc &&
+                if (adapter->unset_promisc &&
                    adapter->ahw.boardcfg.board_type
                    != NETXEN_BRDTYPE_P2_SB31_10G_IMEZ)
-                        adapter->ops->unset_promisc(adapter,
+                        adapter->unset_promisc(adapter,
-                                                    port->portnum,
+                                               port->portnum,
-                                                    NETXEN_NIU_NON_PROMISC_MODE);
+                                               NETXEN_NIU_NON_PROMISC_MODE);
        }
        if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
                netxen_nic_mcr_set_mode_select(netxen_mac_addr_cntl_data, 0x03);
@@ -160,8 +160,8 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu)
                return -EINVAL;
        }
-        if (adapter->ops->set_mtu)
+        if (adapter->set_mtu)
-                adapter->ops->set_mtu(port, mtu);
+                adapter->set_mtu(port, mtu);
        netdev->mtu = mtu;
        return 0;
@@ -176,22 +176,18 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
        struct netxen_hardware_context *hw = &adapter->ahw;
        u32 state = 0;
        void *addr;
-        void *pause_addr;
        int loops = 0, err = 0;
        int ctx, ring;
        u32 card_cmdring = 0;
-        struct netxen_rcv_desc_crb *rcv_desc_crb = NULL;
        struct netxen_recv_context *recv_ctx;
        struct netxen_rcv_desc_ctx *rcv_desc;
-        DPRINTK(INFO, "crb_base: %lx %lx", NETXEN_PCI_CRBSPACE,
+        DPRINTK(INFO, "crb_base: %lx %x", NETXEN_PCI_CRBSPACE,
                PCI_OFFSET_SECOND_RANGE(adapter, NETXEN_PCI_CRBSPACE));
-        DPRINTK(INFO, "cam base: %lx %lx", NETXEN_CRB_CAM,
+        DPRINTK(INFO, "cam base: %lx %x", NETXEN_CRB_CAM,
                pci_base_offset(adapter, NETXEN_CRB_CAM));
-        DPRINTK(INFO, "cam RAM: %lx %lx", NETXEN_CAM_RAM_BASE,
+        DPRINTK(INFO, "cam RAM: %lx %x", NETXEN_CAM_RAM_BASE,
                pci_base_offset(adapter, NETXEN_CAM_RAM_BASE));
-        DPRINTK(INFO, "NIC base:%lx %lx\n", NIC_CRB_BASE_PORT1,
-                pci_base_offset(adapter, NIC_CRB_BASE_PORT1));
        /* Window 1 call */
        card_cmdring = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_CMDRING));
@@ -226,33 +222,42 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
        DPRINTK(INFO, "Recieve Peg ready too. starting stuff\n");
        addr = netxen_alloc(adapter->ahw.pdev,
-                            sizeof(struct cmd_desc_type0) *
+                            sizeof(struct netxen_ring_ctx) +
-                            adapter->max_tx_desc_count,
+                            sizeof(uint32_t),
-                            &hw->cmd_desc_phys_addr, &hw->cmd_desc_pdev);
+                            (dma_addr_t *) & adapter->ctx_desc_phys_addr,
+                            &adapter->ctx_desc_pdev);
+        printk("ctx_desc_phys_addr: 0x%llx\n",
+               (u64) adapter->ctx_desc_phys_addr);
        if (addr == NULL) {
                DPRINTK(ERR, "bad return from pci_alloc_consistent\n");
-                return -ENOMEM;
+                err = -ENOMEM;
+                return err;
        }
+        memset(addr, 0, sizeof(struct netxen_ring_ctx));
+        adapter->ctx_desc = (struct netxen_ring_ctx *)addr;
+        adapter->ctx_desc->cmd_consumer_offset = adapter->ctx_desc_phys_addr
+            + sizeof(struct netxen_ring_ctx);
+        adapter->cmd_consumer = (uint32_t *) (((char *)addr) +
+                                              sizeof(struct netxen_ring_ctx));
+        addr = pci_alloc_consistent(adapter->ahw.pdev,
+                                    sizeof(struct cmd_desc_type0) *
+                                    adapter->max_tx_desc_count,
+                                    (dma_addr_t *) & hw->cmd_desc_phys_addr);
+        printk("cmd_desc_phys_addr: 0x%llx\n", (u64) hw->cmd_desc_phys_addr);
-        pause_addr = netxen_alloc(adapter->ahw.pdev, 512,
+        if (addr == NULL) {
-                                  (dma_addr_t *) & hw->pause_physaddr,
+                DPRINTK(ERR, "bad return from pci_alloc_consistent\n");
-                                  &hw->pause_pdev);
+                netxen_free_hw_resources(adapter);
-        if (pause_addr == NULL) {
-                DPRINTK(1, ERR, "bad return from pci_alloc_consistent\n");
                return -ENOMEM;
        }
-        hw->pauseaddr = (char *)pause_addr;
+        adapter->ctx_desc->cmd_ring_addr_lo =
-        {
+            hw->cmd_desc_phys_addr & 0xffffffffUL;
-                u64 *ptr = (u64 *) pause_addr;
+        adapter->ctx_desc->cmd_ring_addr_hi =
-                *ptr++ = NETXEN_NIC_ZERO_PAUSE_ADDR;
+            ((u64) hw->cmd_desc_phys_addr >> 32);
-                *ptr++ = NETXEN_NIC_ZERO_PAUSE_ADDR;
+        adapter->ctx_desc->cmd_ring_size = adapter->max_tx_desc_count;
-                *ptr++ = NETXEN_NIC_UNIT_PAUSE_ADDR;
-                *ptr++ = NETXEN_NIC_ZERO_PAUSE_ADDR;
-                *ptr++ = NETXEN_NIC_EPG_PAUSE_ADDR1;
-                *ptr++ = NETXEN_NIC_EPG_PAUSE_ADDR2;
-        }
        hw->cmd_desc_head = (struct cmd_desc_type0 *)addr;
@@ -273,6 +278,12 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
                                return err;
                        }
                        rcv_desc->desc_head = (struct rcv_desc *)addr;
+                        adapter->ctx_desc->rcv_ctx[ring].rcv_ring_addr_lo =
+                            rcv_desc->phys_addr & 0xffffffffUL;
+                        adapter->ctx_desc->rcv_ctx[ring].rcv_ring_addr_hi =
+                            ((u64) rcv_desc->phys_addr >> 32);
+                        adapter->ctx_desc->rcv_ctx[ring].rcv_ring_size =
+                            rcv_desc->max_rx_desc_count;
                }
                addr = netxen_alloc(adapter->ahw.pdev, STATUS_DESC_RINGSIZE,
@@ -286,47 +297,21 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
                        return err;
                }
                recv_ctx->rcv_status_desc_head = (struct status_desc *)addr;
-                for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
+                adapter->ctx_desc->sts_ring_addr_lo =
-                        rcv_desc = &recv_ctx->rcv_desc[ring];
+                    recv_ctx->rcv_status_desc_phys_addr & 0xffffffffUL;
-                        rcv_desc_crb =
+                adapter->ctx_desc->sts_ring_addr_hi =
-                            &recv_crb_registers[ctx].rcv_desc_crb[ring];
+                    ((u64) recv_ctx->rcv_status_desc_phys_addr >> 32);
-                        DPRINTK(INFO, "ring #%d crb global ring reg 0x%x\n",
+                adapter->ctx_desc->sts_ring_size = adapter->max_rx_desc_count;
-                                ring, rcv_desc_crb->crb_globalrcv_ring);
-                        /* Window = 1 */
-                        writel(lower32(rcv_desc->phys_addr),
-                               NETXEN_CRB_NORMALIZE(adapter,
-                                                    rcv_desc_crb->
-                                                    crb_globalrcv_ring));
-                        DPRINTK(INFO, "GLOBAL_RCV_RING ctx %d, addr 0x%x"
-                                " val 0x%llx,"
-                                " virt %p\n", ctx,
-                                rcv_desc_crb->crb_globalrcv_ring,
-                                (unsigned long long)rcv_desc->phys_addr,
-                                +rcv_desc->desc_head);
-                }
-                /* Window = 1 */
-                writel(lower32(recv_ctx->rcv_status_desc_phys_addr),
-                       NETXEN_CRB_NORMALIZE(adapter,
-                                            recv_crb_registers[ctx].
-                                            crb_rcvstatus_ring));
-                DPRINTK(INFO, "RCVSTATUS_RING, ctx %d, addr 0x%x,"
-                        " val 0x%x,virt%p\n",
-                        ctx,
-                        recv_crb_registers[ctx].crb_rcvstatus_ring,
-                        (unsigned long long)recv_ctx->rcv_status_desc_phys_addr,
-                        recv_ctx->rcv_status_desc_head);
        }
        /* Window = 1 */
-        writel(lower32(hw->pause_physaddr),
-               NETXEN_CRB_NORMALIZE(adapter, CRB_PAUSE_ADDR_LO));
+        writel(lower32(adapter->ctx_desc_phys_addr),
-        writel(upper32(hw->pause_physaddr),
+               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_ADDR_REG_LO));
-               NETXEN_CRB_NORMALIZE(adapter, CRB_PAUSE_ADDR_HI));
+        writel(upper32(adapter->ctx_desc_phys_addr),
+               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_ADDR_REG_HI));
-        writel(lower32(hw->cmd_desc_phys_addr),
+        writel(NETXEN_CTX_SIGNATURE,
-               NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_CMD_ADDR_LO));
+               NETXEN_CRB_NORMALIZE(adapter, CRB_CTX_SIGNATURE_REG));
-        writel(upper32(hw->cmd_desc_phys_addr),
-               NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_CMD_ADDR_HI));
        return err;
 }
@@ -336,6 +321,15 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter)
        struct netxen_rcv_desc_ctx *rcv_desc;
        int ctx, ring;
+        if (adapter->ctx_desc != NULL) {
+                pci_free_consistent(adapter->ctx_desc_pdev,
+                                    sizeof(struct netxen_ring_ctx) +
+                                    sizeof(uint32_t),
+                                    adapter->ctx_desc,
+                                    adapter->ctx_desc_phys_addr);
+                adapter->ctx_desc = NULL;
+        }
        if (adapter->ahw.cmd_desc_head != NULL) {
                pci_free_consistent(adapter->ahw.cmd_desc_pdev,
                                    sizeof(struct cmd_desc_type0) *
@@ -344,11 +338,9 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter)
                                    adapter->ahw.cmd_desc_phys_addr);
                adapter->ahw.cmd_desc_head = NULL;
        }
-        if (adapter->ahw.pauseaddr != NULL) {
+        /* Special handling: there are 2 ports on this board */
-                pci_free_consistent(adapter->ahw.pause_pdev, 512,
+        if (adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) {
-                                    adapter->ahw.pauseaddr,
+                adapter->ahw.max_ports = 2;
-                                    adapter->ahw.pause_physaddr);
-                adapter->ahw.pauseaddr = NULL;
        }
        for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
@@ -383,19 +375,22 @@ void netxen_tso_check(struct netxen_adapter *adapter,
                desc->total_hdr_length = sizeof(struct ethhdr) +
                    ((skb->nh.iph)->ihl * sizeof(u32)) +
                    ((skb->h.th)->doff * sizeof(u32));
-                desc->opcode = TX_TCP_LSO;
+                netxen_set_cmd_desc_opcode(desc, TX_TCP_LSO);
        } else if (skb->ip_summed == CHECKSUM_COMPLETE) {
                if (skb->nh.iph->protocol == IPPROTO_TCP) {
-                        desc->opcode = TX_TCP_PKT;
+                        netxen_set_cmd_desc_opcode(desc, TX_TCP_PKT);
                } else if (skb->nh.iph->protocol == IPPROTO_UDP) {
-                        desc->opcode = TX_UDP_PKT;
+                        netxen_set_cmd_desc_opcode(desc, TX_UDP_PKT);
                } else {
                        return;
                }
        }
        adapter->stats.xmitcsummed++;
-        CMD_DESC_TCP_HDR_OFFSET_WRT(desc, skb->h.raw - skb->data);
+        desc->tcp_hdr_offset = skb->h.raw - skb->data;
-        desc->length_tcp_hdr = cpu_to_le32(desc->length_tcp_hdr);
+        netxen_set_cmd_desc_totallength(desc,
+                                        cpu_to_le32
+                                        (netxen_get_cmd_desc_totallength
+                                         (desc)));
        desc->ip_hdr_offset = skb->nh.raw - skb->data;
 }
@@ -648,7 +643,7 @@ void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val)
        addr = NETXEN_CRB_NORMALIZE(adapter, off);
        DPRINTK(INFO, "writing to base %lx offset %llx addr %p data %x\n",
-                pci_base(adapter, off), off, addr);
+                pci_base(adapter, off), off, addr, val);
        writel(val, addr);
 }
@@ -660,7 +655,7 @@ int netxen_nic_reg_read(struct netxen_adapter *adapter, u64 off)
        addr = NETXEN_CRB_NORMALIZE(adapter, off);
        DPRINTK(INFO, "reading from base %lx offset %llx addr %p\n",
-                adapter->ahw.pci_base, off, addr);
+                pci_base(adapter, off), off, addr);
        val = readl(addr);
        writel(val, addr);
@@ -848,8 +843,8 @@ void netxen_nic_stop_all_ports(struct netxen_adapter *adapter)
        for (port_nr = 0; port_nr < adapter->ahw.max_ports; port_nr++) {
                port = adapter->port[port_nr];
-                if (adapter->ops->stop_port)
+                if (adapter->stop_port)
-                        adapter->ops->stop_port(adapter, port->portnum);
+                        adapter->stop_port(adapter, port->portnum);
        }
 }
@@ -873,13 +868,13 @@ void netxen_nic_set_link_parameters(struct netxen_port *port)
 {
        struct netxen_adapter *adapter = port->adapter;
        __le32 status;
-        u16 autoneg;
+        __le32 autoneg;
        __le32 mode;
        netxen_nic_read_w0(adapter, NETXEN_NIU_MODE, &mode);
        if (netxen_get_niu_enable_ge(mode)) {   /* Gb 10/100/1000 Mbps mode */
-                if (adapter->ops->phy_read
+                if (adapter->phy_read
-                    && adapter->ops->
+                    && adapter->
                    phy_read(adapter, port->portnum,
                             NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                             &status) == 0) {
@@ -909,11 +904,11 @@ void netxen_nic_set_link_parameters(struct netxen_port *port)
                                        port->link_duplex = -1;
                                        break;
                                }
-                                if (adapter->ops->phy_read
+                                if (adapter->phy_read
-                                    && adapter->ops->
+                                    && adapter->
                                    phy_read(adapter, port->portnum,
                                             NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                             (__le32 *) & autoneg) != 0)
+                                             &autoneg) != 0)
                                        port->link_autoneg = autoneg;
                        } else
                                goto link_down;
@@ -1008,3 +1003,291 @@ int netxen_crb_read_val(struct netxen_adapter *adapter, unsigned long off)
        netxen_nic_hw_read_wx(adapter, off, &data, 4);
        return data;
 }
+int netxen_nic_hw_write_ioctl(struct netxen_adapter *adapter, u64 off,
+                              void *data, int len)
+{
+        void *addr;
+        u64 offset = off;
+        u8 *mem_ptr = NULL;
+        unsigned long mem_base;
+        unsigned long mem_page;
+        if (ADDR_IN_WINDOW1(off)) {
+                addr = NETXEN_CRB_NORMALIZE(adapter, off);
+                if (!addr) {
+                        mem_base = pci_resource_start(adapter->ahw.pdev, 0);
+                        offset = NETXEN_CRB_NORMAL(off);
+                        mem_page = offset & PAGE_MASK;
+                        if (mem_page != ((offset + len - 1) & PAGE_MASK))
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE * 2);
+                        else
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE);
+                        if (mem_ptr == 0UL) {
+                                return 1;
+                        }
+                        addr = mem_ptr;
+                        addr += offset & (PAGE_SIZE - 1);
+                }
+        } else {
+                addr = pci_base_offset(adapter, off);
+                if (!addr) {
+                        mem_base = pci_resource_start(adapter->ahw.pdev, 0);
+                        mem_page = off & PAGE_MASK;
+                        if (mem_page != ((off + len - 1) & PAGE_MASK))
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE * 2);
+                        else
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE);
+                        if (mem_ptr == 0UL) {
+                                return 1;
+                        }
+                        addr = mem_ptr;
+                        addr += off & (PAGE_SIZE - 1);
+                }
+                netxen_nic_pci_change_crbwindow(adapter, 0);
+        }
+        switch (len) {
+        case 1:
+                writeb(*(u8 *) data, addr);
+                break;
+        case 2:
+                writew(*(u16 *) data, addr);
+                break;
+        case 4:
+                writel(*(u32 *) data, addr);
+                break;
+        case 8:
+                writeq(*(u64 *) data, addr);
+                break;
+        default:
+                DPRINTK(INFO,
+                        "writing data %lx to offset %llx, num words=%d\n",
+                        *(unsigned long *)data, off, (len >> 3));
+                netxen_nic_hw_block_write64((u64 __iomem *) data, addr,
+                                            (len >> 3));
+                break;
+        }
+        if (!ADDR_IN_WINDOW1(off))
+                netxen_nic_pci_change_crbwindow(adapter, 1);
+        if (mem_ptr)
+                iounmap(mem_ptr);
+        return 0;
+}
+int netxen_nic_hw_read_ioctl(struct netxen_adapter *adapter, u64 off,
+                             void *data, int len)
+{
+        void *addr;
+        u64 offset;
+        u8 *mem_ptr = NULL;
+        unsigned long mem_base;
+        unsigned long mem_page;
+        if (ADDR_IN_WINDOW1(off)) {
+                addr = NETXEN_CRB_NORMALIZE(adapter, off);
+                if (!addr) {
+                        mem_base = pci_resource_start(adapter->ahw.pdev, 0);
+                        offset = NETXEN_CRB_NORMAL(off);
+                        mem_page = offset & PAGE_MASK;
+                        if (mem_page != ((offset + len - 1) & PAGE_MASK))
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE * 2);
+                        else
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE);
+                        if (mem_ptr == 0UL) {
+                                *(u8 *) data = 0;
+                                return 1;
+                        }
+                        addr = mem_ptr;
+                        addr += offset & (PAGE_SIZE - 1);
+                }
+        } else {
+                addr = pci_base_offset(adapter, off);
+                if (!addr) {
+                        mem_base = pci_resource_start(adapter->ahw.pdev, 0);
+                        mem_page = off & PAGE_MASK;
+                        if (mem_page != ((off + len - 1) & PAGE_MASK))
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE * 2);
+                        else
+                                mem_ptr =
+                                    ioremap(mem_base + mem_page, PAGE_SIZE);
+                        if (mem_ptr == 0UL)
+                                return 1;
+                        addr = mem_ptr;
+                        addr += off & (PAGE_SIZE - 1);
+                }
+                netxen_nic_pci_change_crbwindow(adapter, 0);
+        }
+        switch (len) {
+        case 1:
+                *(u8 *) data = readb(addr);
+                break;
+        case 2:
+                *(u16 *) data = readw(addr);
+                break;
+        case 4:
+                *(u32 *) data = readl(addr);
+                break;
+        case 8:
+                *(u64 *) data = readq(addr);
+                break;
+        default:
+                netxen_nic_hw_block_read64((u64 __iomem *) data, addr,
+                                           (len >> 3));
+                break;
+        }
+        if (!ADDR_IN_WINDOW1(off))
+                netxen_nic_pci_change_crbwindow(adapter, 1);
+        if (mem_ptr)
+                iounmap(mem_ptr);
+        return 0;
+}
+int netxen_nic_pci_mem_write_ioctl(struct netxen_adapter *adapter, u64 off,
+                                   void *data, int size)
+{
+        void *addr;
+        int ret = 0;
+        u8 *mem_ptr = NULL;
+        unsigned long mem_base;
+        unsigned long mem_page;
+        if (data == NULL || off > (128 * 1024 * 1024)) {
+                printk(KERN_ERR "%s: data: %p off:%llx\n",
+                       netxen_nic_driver_name, data, off);
+                return 1;
+        }
+        off = netxen_nic_pci_set_window(adapter, off);
+        /* Corner case : Malicious user tried to break the driver by reading
+           last few bytes in ranges and tries to read further addresses.
+         */
+        if (!pci_base(adapter, off + size - 1) && pci_base(adapter, off)) {
+                printk(KERN_ERR "%s: Invalid access to memory address range"
+                       " 0x%llx - 0x%llx\n", netxen_nic_driver_name, off,
+                       off + size);
+                return 1;
+        }
+        addr = pci_base_offset(adapter, off);
+        DPRINTK(INFO, "writing data %llx to offset %llx\n",
+                *(unsigned long long *)data, off);
+        if (!addr) {
+                mem_base = pci_resource_start(adapter->ahw.pdev, 0);
+                mem_page = off & PAGE_MASK;
+                /* Map two pages whenever user tries to access addresses in two
+                   consecutive pages.
+                 */
+                if (mem_page != ((off + size - 1) & PAGE_MASK))
+                        mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE * 2);
+                else
+                        mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE);
+                if (mem_ptr == 0UL) {
+                        return 1;
+                }
+                addr = mem_ptr;
+                addr += off & (PAGE_SIZE - 1);
+        }
+        switch (size) {
+        case 1:
+                writeb(*(u8 *) data, addr);
+                break;
+        case 2:
+                writew(*(u16 *) data, addr);
+                break;
+        case 4:
+                writel(*(u32 *) data, addr);
+                break;
+        case 8:
+                writeq(*(u64 *) data, addr);
+                break;
+        default:
+                DPRINTK(INFO,
+                        "writing data %lx to offset %llx, num words=%d\n",
+                        *(unsigned long *)data, off, (size >> 3));
+                netxen_nic_hw_block_write64((u64 __iomem *) data, addr,
+                                            (size >> 3));
+                break;
+        }
+        if (mem_ptr)
+                iounmap(mem_ptr);
+        DPRINTK(INFO, "wrote %llx\n", *(unsigned long long *)data);
+        return ret;
+}
+int netxen_nic_pci_mem_read_ioctl(struct netxen_adapter *adapter,
+                                  u64 off, void *data, int size)
+{
+        void *addr;
+        int ret = 0;
+        u8 *mem_ptr = NULL;
+        unsigned long mem_base;
+        unsigned long mem_page;
+        if (data == NULL || off > (128 * 1024 * 1024)) {
+                printk(KERN_ERR "%s: data: %p off:%llx\n",
+                       netxen_nic_driver_name, data, off);
+                return 1;
+        }
+        off = netxen_nic_pci_set_window(adapter, off);
+        /* Corner case : Malicious user tried to break the driver by reading
+           last few bytes in ranges and tries to read further addresses.
+         */
+        if (!pci_base(adapter, off + size - 1) && pci_base(adapter, off)) {
+                printk(KERN_ERR "%s: Invalid access to memory address range"
+                       " 0x%llx - 0x%llx\n", netxen_nic_driver_name, off,
+                       off + size);
+                return 1;
+        }
+        addr = pci_base_offset(adapter, off);
+        if (!addr) {
+                mem_base = pci_resource_start(adapter->ahw.pdev, 0);
+                mem_page = off & PAGE_MASK;
+                /* Map two pages whenever user tries to access addresses in two
+                   consecutive pages.
+                 */
+                if (mem_page != ((off + size - 1) & PAGE_MASK))
+                        mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE * 2);
+                else
+                        mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE);
+                if (mem_ptr == 0UL) {
+                        *(u8 *) data = 0;
+                        return 1;
+                }
+                addr = mem_ptr;
+                addr += off & (PAGE_SIZE - 1);
+        }
+        switch (size) {
+        case 1:
+                *(u8 *) data = readb(addr);
+                break;
+        case 2:
+                *(u16 *) data = readw(addr);
+                break;
+        case 4:
+                *(u32 *) data = readl(addr);
+                break;
+        case 8:
+                *(u64 *) data = readq(addr);
+                break;
+        default:
+                netxen_nic_hw_block_read64((u64 __iomem *) data, addr,
+                                           (size >> 3));
+                break;
+        }
+        if (mem_ptr)
+                iounmap(mem_ptr);
+        DPRINTK(INFO, "read %llx\n", *(unsigned long long *)data);
+        return ret;
+}
diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/netxen/netxen_nic_hw.h
index 201a636b7ab8..0685633a9c1e 100644
--- a/drivers/net/netxen/netxen_nic_hw.h
+++ b/drivers/net/netxen/netxen_nic_hw.h
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
@@ -16,10 +16,10 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -83,8 +83,8 @@ struct netxen_adapter;
 #define NETXEN_PCI_MAPSIZE_BYTES  (NETXEN_PCI_MAPSIZE << 20)
 #define NETXEN_NIC_LOCKED_READ_REG(X, Y)        \
-        addr = pci_base_offset(adapter, (X));   \
+        addr = pci_base_offset(adapter, X);     \
-        *(u32 *)Y = readl(addr);
+        *(u32 *)Y = readl((void __iomem*) addr);
 struct netxen_port;
 void netxen_nic_set_link_parameters(struct netxen_port *port);
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index eae18236aefa..869725f0bb18 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1,25 +1,25 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
- *                            
+ *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *                                   
+ *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -137,6 +137,8 @@ int netxen_init_firmware(struct netxen_adapter *adapter)
                return err;
        }
        /* Window 1 call */
+        writel(MPORT_SINGLE_FUNCTION_MODE,
+               NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE));
        writel(PHAN_INITIALIZE_ACK,
               NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
@@ -184,15 +186,12 @@ void netxen_initialize_adapter_sw(struct netxen_adapter *adapter)
                        for (i = 0; i < num_rx_bufs; i++) {
                                rx_buf->ref_handle = i;
                                rx_buf->state = NETXEN_BUFFER_FREE;
                                DPRINTK(INFO, "Rx buf:ctx%d i(%d) rx_buf:"
                                        "%p\n", ctxid, i, rx_buf);
                                rx_buf++;
                        }
                }
        }
-        DPRINTK(INFO, "initialized buffers for %s and %s\n",
-                "adapter->free_cmd_buf_list", "adapter->free_rxbuf");
 }
 void netxen_initialize_adapter_hw(struct netxen_adapter *adapter)
@@ -212,37 +211,36 @@ void netxen_initialize_adapter_hw(struct netxen_adapter *adapter)
 void netxen_initialize_adapter_ops(struct netxen_adapter *adapter)
 {
-        struct netxen_drvops *ops = adapter->ops;
        switch (adapter->ahw.board_type) {
        case NETXEN_NIC_GBE:
-                ops->enable_phy_interrupts =
+                adapter->enable_phy_interrupts =
                    netxen_niu_gbe_enable_phy_interrupts;
-                ops->disable_phy_interrupts =
+                adapter->disable_phy_interrupts =
                    netxen_niu_gbe_disable_phy_interrupts;
-                ops->handle_phy_intr = netxen_nic_gbe_handle_phy_intr;
+                adapter->handle_phy_intr = netxen_nic_gbe_handle_phy_intr;
-                ops->macaddr_set = netxen_niu_macaddr_set;
+                adapter->macaddr_set = netxen_niu_macaddr_set;
-                ops->set_mtu = netxen_nic_set_mtu_gb;
+                adapter->set_mtu = netxen_nic_set_mtu_gb;
-                ops->set_promisc = netxen_niu_set_promiscuous_mode;
+                adapter->set_promisc = netxen_niu_set_promiscuous_mode;
-                ops->unset_promisc = netxen_niu_set_promiscuous_mode;
+                adapter->unset_promisc = netxen_niu_set_promiscuous_mode;
-                ops->phy_read = netxen_niu_gbe_phy_read;
+                adapter->phy_read = netxen_niu_gbe_phy_read;
-                ops->phy_write = netxen_niu_gbe_phy_write;
+                adapter->phy_write = netxen_niu_gbe_phy_write;
-                ops->init_port = netxen_niu_gbe_init_port;
+                adapter->init_port = netxen_niu_gbe_init_port;
-                ops->init_niu = netxen_nic_init_niu_gb;
+                adapter->init_niu = netxen_nic_init_niu_gb;
-                ops->stop_port = netxen_niu_disable_gbe_port;
+                adapter->stop_port = netxen_niu_disable_gbe_port;
                break;
        case NETXEN_NIC_XGBE:
-                ops->enable_phy_interrupts =
+                adapter->enable_phy_interrupts =
                    netxen_niu_xgbe_enable_phy_interrupts;
-                ops->disable_phy_interrupts =
+                adapter->disable_phy_interrupts =
                    netxen_niu_xgbe_disable_phy_interrupts;
-                ops->handle_phy_intr = netxen_nic_xgbe_handle_phy_intr;
+                adapter->handle_phy_intr = netxen_nic_xgbe_handle_phy_intr;
-                ops->macaddr_set = netxen_niu_xg_macaddr_set;
+                adapter->macaddr_set = netxen_niu_xg_macaddr_set;
-                ops->set_mtu = netxen_nic_set_mtu_xgb;
+                adapter->set_mtu = netxen_nic_set_mtu_xgb;
-                ops->init_port = netxen_niu_xg_init_port;
+                adapter->init_port = netxen_niu_xg_init_port;
-                ops->set_promisc = netxen_niu_xg_set_promiscuous_mode;
+                adapter->set_promisc = netxen_niu_xg_set_promiscuous_mode;
-                ops->unset_promisc = netxen_niu_xg_set_promiscuous_mode;
+                adapter->unset_promisc = netxen_niu_xg_set_promiscuous_mode;
-                ops->stop_port = netxen_niu_disable_xg_port;
+                adapter->stop_port = netxen_niu_disable_xg_port;
                break;
        default:
@@ -383,8 +381,8 @@ int netxen_rom_wip_poll(struct netxen_adapter *adapter)
        return 0;
 }
-static inline int do_rom_fast_write(struct netxen_adapter *adapter,
+static inline int do_rom_fast_write(struct netxen_adapter *adapter, int addr,
-                                    int addr, int data)
+                                    int data)
 {
        if (netxen_rom_wren(adapter)) {
                return -1;
@@ -622,6 +620,43 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose)
        return 0;
 }
+int netxen_initialize_adapter_offload(struct netxen_adapter *adapter)
+{
+        uint64_t addr;
+        uint32_t hi;
+        uint32_t lo;
+        adapter->dummy_dma.addr =
+            pci_alloc_consistent(adapter->ahw.pdev,
+                                 NETXEN_HOST_DUMMY_DMA_SIZE,
+                                 &adapter->dummy_dma.phys_addr);
+        if (adapter->dummy_dma.addr == NULL) {
+                printk("%s: ERROR: Could not allocate dummy DMA memory\n",
+                       __FUNCTION__);
+                return -ENOMEM;
+        }
+        addr = (uint64_t) adapter->dummy_dma.phys_addr;
+        hi = (addr >> 32) & 0xffffffff;
+        lo = addr & 0xffffffff;
+        writel(hi, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_DUMMY_BUF_ADDR_HI));
+        writel(lo, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_DUMMY_BUF_ADDR_LO));
+        return 0;
+}
+void netxen_free_adapter_offload(struct netxen_adapter *adapter)
+{
+        if (adapter->dummy_dma.addr) {
+                pci_free_consistent(adapter->ahw.pdev,
+                                    NETXEN_HOST_DUMMY_DMA_SIZE,
+                                    adapter->dummy_dma.addr,
+                                    adapter->dummy_dma.phys_addr);
+                adapter->dummy_dma.addr = NULL;
+        }
+}
 void netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
 {
        u32 val = 0;
@@ -656,7 +691,8 @@ int netxen_nic_rx_has_work(struct netxen_adapter *adapter)
                desc_head = recv_ctx->rcv_status_desc_head;
                desc = &desc_head[consumer];
-                if (((le16_to_cpu(desc->owner)) & STATUS_OWNER_HOST))
+                if (((le16_to_cpu(netxen_get_sts_owner(desc)))
+                     & STATUS_OWNER_HOST))
                        return 1;
        }
@@ -735,8 +771,8 @@ void netxen_watchdog_task(struct work_struct *work)
                        netif_wake_queue(netdev);
        }
-        if (adapter->ops->handle_phy_intr)
+        if (adapter->handle_phy_intr)
-                adapter->ops->handle_phy_intr(adapter);
+                adapter->handle_phy_intr(adapter);
        mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
 }
@@ -749,19 +785,19 @@ void
 netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
                   struct status_desc *desc)
 {
-        struct netxen_port *port = adapter->port[STATUS_DESC_PORT(desc)];
+        struct netxen_port *port = adapter->port[netxen_get_sts_port(desc)];
        struct pci_dev *pdev = port->pdev;
        struct net_device *netdev = port->netdev;
-        int index = le16_to_cpu(desc->reference_handle);
+        int index = le16_to_cpu(netxen_get_sts_refhandle(desc));
        struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctxid]);
        struct netxen_rx_buffer *buffer;
        struct sk_buff *skb;
-        u32 length = le16_to_cpu(desc->total_length);
+        u32 length = le16_to_cpu(netxen_get_sts_totallength(desc));
        u32 desc_ctx;
        struct netxen_rcv_desc_ctx *rcv_desc;
        int ret;
-        desc_ctx = STATUS_DESC_TYPE(desc);
+        desc_ctx = netxen_get_sts_type(desc);
        if (unlikely(desc_ctx >= NUM_RCV_DESC_RINGS)) {
                printk("%s: %s Bad Rcv descriptor ring\n",
                       netxen_nic_driver_name, netdev->name);
@@ -769,20 +805,49 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
        }
        rcv_desc = &recv_ctx->rcv_desc[desc_ctx];
+        if (unlikely(index > rcv_desc->max_rx_desc_count)) {
+                DPRINTK(ERR, "Got a buffer index:%x Max is %x\n",
+                        index, rcv_desc->max_rx_desc_count);
+                return;
+        }
        buffer = &rcv_desc->rx_buf_arr[index];
+        if (desc_ctx == RCV_DESC_LRO_CTXID) {
+                buffer->lro_current_frags++;
+                if (netxen_get_sts_desc_lro_last_frag(desc)) {
+                        buffer->lro_expected_frags =
+                            netxen_get_sts_desc_lro_cnt(desc);
+                        buffer->lro_length = length;
+                }
+                if (buffer->lro_current_frags != buffer->lro_expected_frags) {
+                        if (buffer->lro_expected_frags != 0) {
+                                printk("LRO: (refhandle:%x) recv frag."
+                                       "wait for last. flags: %x expected:%d"
+                                       "have:%d\n", index,
+                                       netxen_get_sts_desc_lro_last_frag(desc),
+                                       buffer->lro_expected_frags,
+                                       buffer->lro_current_frags);
+                        }
+                        return;
+                }
+        }
        pci_unmap_single(pdev, buffer->dma, rcv_desc->dma_size,
                         PCI_DMA_FROMDEVICE);
        skb = (struct sk_buff *)buffer->skb;
-        if (likely(STATUS_DESC_STATUS(desc) == STATUS_CKSUM_OK)) {
+        if (likely(netxen_get_sts_status(desc) == STATUS_CKSUM_OK)) {
                port->stats.csummed++;
                skb->ip_summed = CHECKSUM_UNNECESSARY;
-        } else
+        }
-                skb->ip_summed = CHECKSUM_NONE;
        skb->dev = netdev;
-        skb_put(skb, length);
+        if (desc_ctx == RCV_DESC_LRO_CTXID) {
+                /* True length was only available on the last pkt */
+                skb_put(skb, buffer->lro_length);
+        } else {
+                skb_put(skb, length);
+        }
        skb->protocol = eth_type_trans(skb, netdev);
        ret = netif_receive_skb(skb);
@@ -828,6 +893,8 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
        adapter->stats.post_called++;
        buffer->skb = NULL;
        buffer->state = NETXEN_BUFFER_FREE;
+        buffer->lro_current_frags = 0;
+        buffer->lro_expected_frags = 0;
        port->stats.no_rcv++;
        port->stats.rxbytes += length;
@@ -840,6 +907,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
        struct status_desc *desc_head = recv_ctx->rcv_status_desc_head;
        struct status_desc *desc;       /* used to read status desc here */
        u32 consumer = recv_ctx->status_rx_consumer;
+        u32 producer = 0;
        int count = 0, ring;
        DPRINTK(INFO, "procesing receive\n");
@@ -851,18 +919,22 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
         */
        while (count < max) {
                desc = &desc_head[consumer];
-                if (!((le16_to_cpu(desc->owner)) & STATUS_OWNER_HOST)) {
+                if (!
-                        DPRINTK(ERR, "desc %p ownedby %x\n", desc, desc->owner);
+                    (le16_to_cpu(netxen_get_sts_owner(desc)) &
+                     STATUS_OWNER_HOST)) {
+                        DPRINTK(ERR, "desc %p ownedby %x\n", desc,
+                                netxen_get_sts_owner(desc));
                        break;
                }
                netxen_process_rcv(adapter, ctxid, desc);
-                desc->owner = STATUS_OWNER_PHANTOM;
+                netxen_clear_sts_owner(desc);
+                netxen_set_sts_owner(desc, STATUS_OWNER_PHANTOM);
                consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
                count++;
        }
        if (count) {
                for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
-                        netxen_post_rx_buffers(adapter, ctxid, ring);
+                        netxen_post_rx_buffers_nodb(adapter, ctxid, ring);
                }
        }
@@ -870,6 +942,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
        if (count) {
                adapter->stats.process_rcv++;
                recv_ctx->status_rx_consumer = consumer;
+                recv_ctx->status_rx_producer = producer;
                /* Window = 1 */
                writel(consumer,
@@ -882,12 +955,13 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
 }
 /* Process Command status ring */
-void netxen_process_cmd_ring(unsigned long data)
+int netxen_process_cmd_ring(unsigned long data)
 {
        u32 last_consumer;
        u32 consumer;
        struct netxen_adapter *adapter = (struct netxen_adapter *)data;
-        int count = 0;
+        int count1 = 0;
+        int count2 = 0;
        struct netxen_cmd_buffer *buffer;
        struct netxen_port *port;       /* port #1 */
        struct netxen_port *nport;
@@ -896,6 +970,7 @@ void netxen_process_cmd_ring(unsigned long data)
        u32 i;
        struct sk_buff *skb = NULL;
        int p;
+        int done;
        spin_lock(&adapter->tx_lock);
        last_consumer = adapter->last_cmd_consumer;
@@ -905,14 +980,13 @@ void netxen_process_cmd_ring(unsigned long data)
         * number as part of the descriptor. This way we will be able to get
         * the netdev which is associated with that device.
         */
-        consumer =
-            readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMD_CONSUMER_OFFSET));
+        consumer = *(adapter->cmd_consumer);
        if (last_consumer == consumer) {        /* Ring is empty    */
                DPRINTK(INFO, "last_consumer %d == consumer %d\n",
                        last_consumer, consumer);
                spin_unlock(&adapter->tx_lock);
-                return;
+                return 1;
        }
        adapter->proc_cmd_buf_counter++;
@@ -923,7 +997,7 @@ void netxen_process_cmd_ring(unsigned long data)
         */
        spin_unlock(&adapter->tx_lock);
-        while ((last_consumer != consumer) && (count < MAX_STATUS_HANDLE)) {
+        while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) {
                buffer = &adapter->cmd_buf_arr[last_consumer];
                port = adapter->port[buffer->port];
                pdev = port->pdev;
@@ -949,24 +1023,24 @@ void netxen_process_cmd_ring(unsigned long data)
                             && netif_carrier_ok(port->netdev))
                    && ((jiffies - port->netdev->trans_start) >
                        port->netdev->watchdog_timeo)) {
-                        schedule_work(&port->adapter->tx_timeout_task);
+                        SCHEDULE_WORK(&port->adapter->tx_timeout_task);
                }
                last_consumer = get_next_index(last_consumer,
                                               adapter->max_tx_desc_count);
-                count++;
+                count1++;
        }
-        adapter->stats.noxmitdone += count;
+        adapter->stats.noxmitdone += count1;
-        count = 0;
+        count2 = 0;
        spin_lock(&adapter->tx_lock);
        if ((--adapter->proc_cmd_buf_counter) == 0) {
                adapter->last_cmd_consumer = last_consumer;
                while ((adapter->last_cmd_consumer != consumer)
-                       && (count < MAX_STATUS_HANDLE)) {
+                       && (count2 < MAX_STATUS_HANDLE)) {
                        buffer =
                            &adapter->cmd_buf_arr[adapter->last_cmd_consumer];
-                        count++;
+                        count2++;
                        if (buffer->skb)
                                break;
                        else
@@ -975,7 +1049,7 @@ void netxen_process_cmd_ring(unsigned long data)
                                                   adapter->max_tx_desc_count);
                }
        }
-        if (count) {
+        if (count1 || count2) {
                for (p = 0; p < adapter->ahw.max_ports; p++) {
                        nport = adapter->port[p];
                        if (netif_queue_stopped(nport->netdev)
@@ -985,10 +1059,30 @@ void netxen_process_cmd_ring(unsigned long data)
                        }
                }
        }
+        /*
+         * If everything is freed up to consumer then check if the ring is full
+         * If the ring is full then check if more needs to be freed and
+         * schedule the call back again.
+         *
+         * This happens when there are 2 CPUs. One could be freeing and the
+         * other filling it. If the ring is full when we get out of here and
+         * the card has already interrupted the host then the host can miss the
+         * interrupt.
+         *
+         * There is still a possible race condition and the host could miss an
+         * interrupt. The card has to take care of this.
+         */
+        if (adapter->last_cmd_consumer == consumer &&
+            (((adapter->cmd_producer + 1) %
+              adapter->max_tx_desc_count) == adapter->last_cmd_consumer)) {
+                consumer = *(adapter->cmd_consumer);
+        }
+        done = (adapter->last_cmd_consumer == consumer);
        spin_unlock(&adapter->tx_lock);
        DPRINTK(INFO, "last consumer is %d in %s\n", last_consumer,
                __FUNCTION__);
+        return (done);
 }
 /*
@@ -1000,17 +1094,16 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
        struct sk_buff *skb;
        struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctx]);
        struct netxen_rcv_desc_ctx *rcv_desc = NULL;
-        struct netxen_recv_crb *crbarea = &recv_crb_registers[ctx];
+        uint producer;
-        struct netxen_rcv_desc_crb *rcv_desc_crb = NULL;
-        u32 producer;
        struct rcv_desc *pdesc;
        struct netxen_rx_buffer *buffer;
        int count = 0;
        int index = 0;
+        netxen_ctx_msg msg = 0;
+        dma_addr_t dma;
        adapter->stats.post_called++;
        rcv_desc = &recv_ctx->rcv_desc[ringid];
-        rcv_desc_crb = &crbarea->rcv_desc_crb[ringid];
        producer = rcv_desc->producer;
        index = rcv_desc->begin_alloc;
@@ -1020,6 +1113,7 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                skb = dev_alloc_skb(rcv_desc->skb_size);
                if (unlikely(!skb)) {
                        /*
+                         * TODO
                         * We need to schedule the posting of buffers to the pegs.
                         */
                        rcv_desc->begin_alloc = index;
@@ -1027,9 +1121,105 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                                " allocated only %d buffers\n", count);
                        break;
                }
                count++;        /* now there should be no failure */
                pdesc = &rcv_desc->desc_head[producer];
-                skb_reserve(skb, NET_IP_ALIGN);
+#if defined(XGB_DEBUG)
+                *(unsigned long *)(skb->head) = 0xc0debabe;
+                if (skb_is_nonlinear(skb)) {
+                        printk("Allocated SKB @%p is nonlinear\n");
+                }
+#endif
+                skb_reserve(skb, 2);
+                /* This will be setup when we receive the
+                 * buffer after it has been filled  FSL  TBD TBD
+                 * skb->dev = netdev;
+                 */
+                dma = pci_map_single(pdev, skb->data, rcv_desc->dma_size,
+                                     PCI_DMA_FROMDEVICE);
+                pdesc->addr_buffer = dma;
+                buffer->skb = skb;
+                buffer->state = NETXEN_BUFFER_BUSY;
+                buffer->dma = dma;
+                /* make a rcv descriptor  */
+                pdesc->reference_handle = buffer->ref_handle;
+                pdesc->buffer_length = rcv_desc->dma_size;
+                DPRINTK(INFO, "done writing descripter\n");
+                producer =
+                    get_next_index(producer, rcv_desc->max_rx_desc_count);
+                index = get_next_index(index, rcv_desc->max_rx_desc_count);
+                buffer = &rcv_desc->rx_buf_arr[index];
+        }
+        /* if we did allocate buffers, then write the count to Phantom */
+        if (count) {
+                rcv_desc->begin_alloc = index;
+                rcv_desc->rcv_pending += count;
+                adapter->stats.lastposted = count;
+                adapter->stats.posted += count;
+                rcv_desc->producer = producer;
+                if (rcv_desc->rcv_free >= 32) {
+                        rcv_desc->rcv_free = 0;
+                        /* Window = 1 */
+                        writel((producer - 1) &
+                               (rcv_desc->max_rx_desc_count - 1),
+                               NETXEN_CRB_NORMALIZE(adapter,
+                                                    recv_crb_registers[0].
+                                                    rcv_desc_crb[ringid].
+                                                    crb_rcv_producer_offset));
+                        /*
+                         * Write a doorbell msg to tell phanmon of change in
+                         * receive ring producer
+                         */
+                        netxen_set_msg_peg_id(msg, NETXEN_RCV_PEG_DB_ID);
+                        netxen_set_msg_privid(msg);
+                        netxen_set_msg_count(msg,
+                                             ((producer -
+                                               1) & (rcv_desc->
+                                                     max_rx_desc_count - 1)));
+                        netxen_set_msg_ctxid(msg, 0);
+                        netxen_set_msg_opcode(msg, NETXEN_RCV_PRODUCER(ringid));
+                        writel(msg,
+                               DB_NORMALIZE(adapter,
+                                            NETXEN_RCV_PRODUCER_OFFSET));
+                }
+        }
+}
+void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ctx,
+                                 uint32_t ringid)
+{
+        struct pci_dev *pdev = adapter->ahw.pdev;
+        struct sk_buff *skb;
+        struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctx]);
+        struct netxen_rcv_desc_ctx *rcv_desc = NULL;
+        u32 producer;
+        struct rcv_desc *pdesc;
+        struct netxen_rx_buffer *buffer;
+        int count = 0;
+        int index = 0;
+        adapter->stats.post_called++;
+        rcv_desc = &recv_ctx->rcv_desc[ringid];
+        producer = rcv_desc->producer;
+        index = rcv_desc->begin_alloc;
+        buffer = &rcv_desc->rx_buf_arr[index];
+        /* We can start writing rx descriptors into the phantom memory. */
+        while (buffer->state == NETXEN_BUFFER_FREE) {
+                skb = dev_alloc_skb(rcv_desc->skb_size);
+                if (unlikely(!skb)) {
+                        /*
+                         * We need to schedule the posting of buffers to the pegs.
+                         */
+                        rcv_desc->begin_alloc = index;
+                        DPRINTK(ERR, "netxen_post_rx_buffers_nodb: "
+                                " allocated only %d buffers\n", count);
+                        break;
+                }
+                count++;        /* now there should be no failure */
+                pdesc = &rcv_desc->desc_head[producer];
+                skb_reserve(skb, 2);
                /* 
                 * This will be setup when we receive the
                 * buffer after it has been filled
@@ -1040,6 +1230,7 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                buffer->dma = pci_map_single(pdev, skb->data,
                                             rcv_desc->dma_size,
                                             PCI_DMA_FROMDEVICE);
                /* make a rcv descriptor  */
                pdesc->reference_handle = le16_to_cpu(buffer->ref_handle);
                pdesc->buffer_length = le16_to_cpu(rcv_desc->dma_size);
@@ -1064,7 +1255,8 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                        writel((producer - 1) &
                               (rcv_desc->max_rx_desc_count - 1),
                               NETXEN_CRB_NORMALIZE(adapter,
-                                                    rcv_desc_crb->
+                                                    recv_crb_registers[0].
+                                                    rcv_desc_crb[ringid].
                                                    crb_rcv_producer_offset));
                        wmb();
                }
@@ -1197,8 +1389,8 @@ netxen_nic_do_ioctl(struct netxen_adapter *adapter, void *u_data,
        switch (data.cmd) {
        case netxen_nic_cmd_pci_read:
-                if ((retval = netxen_nic_hw_read_wx(adapter, data.off,
+                if ((retval = netxen_nic_hw_read_ioctl(adapter, data.off,
-                                                    &(data.u), data.size)))
+                                                       &(data.u), data.size)))
                        goto error_out;
                if (copy_to_user
                    ((void __user *)&(up_data->u), &(data.u), data.size)) {
@@ -1211,8 +1403,35 @@ netxen_nic_do_ioctl(struct netxen_adapter *adapter, void *u_data,
                break;
        case netxen_nic_cmd_pci_write:
-                data.rv = netxen_nic_hw_write_wx(adapter, data.off, &(data.u),
+                if ((retval = netxen_nic_hw_write_ioctl(adapter, data.off,
-                                                 data.size);
+                                                        &(data.u), data.size)))
+                        goto error_out;
+                data.rv = 0;
+                break;
+        case netxen_nic_cmd_pci_mem_read:
+                if (netxen_nic_pci_mem_read_ioctl(adapter, data.off, &(data.u),
+                                                  data.size)) {
+                        DPRINTK(ERR, "Failed to read the data.\n");
+                        retval = -EFAULT;
+                        goto error_out;
+                }
+                if (copy_to_user
+                    ((void __user *)&(up_data->u), &(data.u), data.size)) {
+                        DPRINTK(ERR, "bad copy to userland: %d\n",
+                                (int)sizeof(data));
+                        retval = -EFAULT;
+                        goto error_out;
+                }
+                data.rv = 0;
+                break;
+        case netxen_nic_cmd_pci_mem_write:
+                if ((retval = netxen_nic_pci_mem_write_ioctl(adapter, data.off,
+                                                             &(data.u),
+                                                             data.size)))
+                        goto error_out;
+                data.rv = 0;
                break;
        case netxen_nic_cmd_pci_config_read:
@@ -1297,7 +1516,7 @@ netxen_nic_do_ioctl(struct netxen_adapter *adapter, void *u_data,
                retval = -EOPNOTSUPP;
                goto error_out;
        }
-        put_user(data.rv, (u16 __user *) (&(up_data->rv)));
+        put_user(data.rv, (&(up_data->rv)));
        DPRINTK(INFO, "done ioctl for %p well.\n", adapter);
      error_out:
diff --git a/drivers/net/netxen/netxen_nic_ioctl.h b/drivers/net/netxen/netxen_nic_ioctl.h
index 23e53adbf123..1221fa527552 100644
--- a/drivers/net/netxen/netxen_nic_ioctl.h
+++ b/drivers/net/netxen/netxen_nic_ioctl.h
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
@@ -16,10 +16,10 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -36,7 +36,7 @@
 #define NETXEN_NIC_CMD          (NETXEN_CMD_START + 1)
 #define NETXEN_NIC_NAME         (NETXEN_CMD_START + 2)
 #define NETXEN_NIC_NAME_LEN     16
-#define NETXEN_NIC_NAME_RSP     "NETXEN"
+#define NETXEN_NIC_NAME_RSP     "NETXEN-UNM"
 typedef enum {
        netxen_nic_cmd_none = 0,
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c
index ae180fee8008..1b45f50fa6aa 100644
--- a/drivers/net/netxen/netxen_nic_isr.c
+++ b/drivers/net/netxen/netxen_nic_isr.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
@@ -16,10 +16,10 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -68,8 +68,7 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
 void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 portno,
                                 u32 link)
 {
-        struct netxen_port *pport = adapter->port[portno];
+        struct net_device *netdev = (adapter->port[portno])->netdev;
-        struct net_device *netdev = pport->netdev;
        if (link)
                netif_carrier_on(netdev);
@@ -84,46 +83,41 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 portno,
        struct netxen_port *port;
        /*  This should clear the interrupt source */
-        if (adapter->ops->phy_read)
+        if (adapter->phy_read)
-                adapter->ops->phy_read(adapter, portno,
+                adapter->phy_read(adapter, portno,
-                                       NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
+                                  NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
-                                       &int_src);
+                                  &int_src);
        if (int_src == 0) {
                DPRINTK(INFO, "No phy interrupts for port #%d\n", portno);
                return;
        }
-        if (adapter->ops->disable_phy_interrupts)
+        if (adapter->disable_phy_interrupts)
-                adapter->ops->disable_phy_interrupts(adapter, portno);
+                adapter->disable_phy_interrupts(adapter, portno);
        port = adapter->port[portno];
        if (netxen_get_phy_int_jabber(int_src))
-                DPRINTK(INFO, "NetXen: %s Jabber interrupt \n",
+                DPRINTK(INFO, "Jabber interrupt \n");
-                        port->netdev->name);
        if (netxen_get_phy_int_polarity_changed(int_src))
-                DPRINTK(INFO, "NetXen: %s POLARITY CHANGED int \n",
+                DPRINTK(INFO, "POLARITY CHANGED int \n");
-                        port->netdev->name);
        if (netxen_get_phy_int_energy_detect(int_src))
-                DPRINTK(INFO, "NetXen: %s ENERGY DETECT INT \n",
+                DPRINTK(INFO, "ENERGY DETECT INT \n");
-                        port->netdev->name);
        if (netxen_get_phy_int_downshift(int_src))
-                DPRINTK(INFO, "NetXen: %s DOWNSHIFT INT \n",
+                DPRINTK(INFO, "DOWNSHIFT INT \n");
-                        port->netdev->name);
        /* write it down later.. */
        if ((netxen_get_phy_int_speed_changed(int_src))
            || (netxen_get_phy_int_link_status_changed(int_src))) {
                __le32 status;
-                DPRINTK(INFO, "NetXen: %s SPEED CHANGED OR"
+                DPRINTK(INFO, "SPEED CHANGED OR LINK STATUS CHANGED \n");
-                        " LINK STATUS CHANGED \n", port->netdev->name);
-                if (adapter->ops->phy_read
+                if (adapter->phy_read
-                    && adapter->ops->phy_read(adapter, portno,
+                    && adapter->phy_read(adapter, portno,
-                                              NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                         NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                              &status) == 0) {
+                                         &status) == 0) {
                        if (netxen_get_phy_int_link_status_changed(int_src)) {
                                if (netxen_get_phy_link(status)) {
                                        netxen_niu_gbe_init_port(adapter,
@@ -143,8 +137,8 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 portno,
                        }
                }
        }
-        if (adapter->ops->enable_phy_interrupts)
+        if (adapter->enable_phy_interrupts)
-                adapter->ops->enable_phy_interrupts(adapter, portno);
+                adapter->enable_phy_interrupts(adapter, portno);
 }
 void netxen_nic_isr_other(struct netxen_adapter *adapter)
@@ -159,8 +153,7 @@ void netxen_nic_isr_other(struct netxen_adapter *adapter)
        qg_linksup = adapter->ahw.qg_linksup;
        adapter->ahw.qg_linksup = val;
-        DPRINTK(1, INFO, "%s: link update 0x%08x\n", netxen_nic_driver_name,
+        DPRINTK(INFO, "link update 0x%08x\n", val);
-                val);
        for (portno = 0; portno < NETXEN_NIU_MAX_GBE_PORTS; portno++) {
                linkup = val & 1;
                if (linkup != (qg_linksup & 1)) {
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index df0bb36a1cfb..575b71b67202 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1,25 +1,25 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
- *                            
+ *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *                                   
+ *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -32,6 +32,7 @@
 */
 #include <linux/vmalloc.h>
+#include <linux/highmem.h>
 #include "netxen_nic_hw.h"
 #include "netxen_nic.h"
@@ -48,14 +49,21 @@ MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
-char netxen_nic_driver_name[] = "netxen";
+char netxen_nic_driver_name[] = "netxen-nic";
 static char netxen_nic_driver_string[] = "NetXen Network Driver version "
    NETXEN_NIC_LINUX_VERSIONID;
+struct netxen_adapter *g_adapter = NULL;
 #define NETXEN_NETDEV_WEIGHT 120
 #define NETXEN_ADAPTER_UP_MAGIC 777
 #define NETXEN_NIC_PEG_TUNE 0
+u8 nx_p2_id = NX_P2_C0;
+#define DMA_32BIT_MASK  0x00000000ffffffffULL
+#define DMA_35BIT_MASK  0x00000007ffffffffULL
 /* Local functions to NetXen NIC driver */
 static int __devinit netxen_nic_probe(struct pci_dev *pdev,
                                      const struct pci_device_id *ent);
@@ -87,6 +95,9 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
 MODULE_DEVICE_TABLE(pci, netxen_pci_tbl);
+struct workqueue_struct *netxen_workq;
+static void netxen_watchdog(unsigned long);
 /*
 * netxen_nic_probe()
 *
@@ -105,20 +116,28 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct net_device *netdev = NULL;
        struct netxen_adapter *adapter = NULL;
        struct netxen_port *port = NULL;
-        u8 *mem_ptr0 = NULL;
+        void __iomem *mem_ptr0 = NULL;
-        u8 *mem_ptr1 = NULL;
+        void __iomem *mem_ptr1 = NULL;
-        u8 *mem_ptr2 = NULL;
+        void __iomem *mem_ptr2 = NULL;
-        unsigned long mem_base, mem_len;
+        u8 *db_ptr = NULL;
+        unsigned long mem_base, mem_len, db_base, db_len;
        int pci_using_dac, i, err;
        int ring;
        struct netxen_recv_context *recv_ctx = NULL;
        struct netxen_rcv_desc_ctx *rcv_desc = NULL;
        struct netxen_cmd_buffer *cmd_buf_arr = NULL;
        u64 mac_addr[FLASH_NUM_PORTS + 1];
-        int valid_mac;
+        int valid_mac = 0;
+        static int netxen_cards_found = 0;
        printk(KERN_INFO "%s \n", netxen_nic_driver_string);
+        /* In current scheme, we use only PCI function 0 */
+        if (PCI_FUNC(pdev->devfn) != 0) {
+                DPRINTK(ERR, "NetXen function %d will not be enabled.\n",
+                        PCI_FUNC(pdev->devfn));
+                return -ENODEV;
+        }
        if ((err = pci_enable_device(pdev)))
                return err;
        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
@@ -130,10 +149,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_out_disable_pdev;
        pci_set_master(pdev);
-        if ((pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) &&
+        pci_read_config_byte(pdev, PCI_REVISION_ID, &nx_p2_id);
-            (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) == 0))
+        if (nx_p2_id == NX_P2_C1 &&
+            (pci_set_dma_mask(pdev, DMA_35BIT_MASK) == 0) &&
+            (pci_set_consistent_dma_mask(pdev, DMA_35BIT_MASK) == 0)) {
                pci_using_dac = 1;
-        else {
+        } else {
                if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) ||
                    (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)))
                        goto err_out_free_res;
@@ -153,21 +174,34 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
            ioremap(mem_base + THIRD_PAGE_GROUP_START, THIRD_PAGE_GROUP_SIZE);
        if ((mem_ptr0 == 0UL) || (mem_ptr1 == 0UL) || (mem_ptr2 == 0UL)) {
-                DPRINTK(1, ERR,
+                DPRINTK(ERR,
                        "Cannot remap adapter memory aborting.:"
                        "0 -> %p, 1 -> %p, 2 -> %p\n",
                        mem_ptr0, mem_ptr1, mem_ptr2);
                err = -EIO;
-                if (mem_ptr0)
+                goto err_out_iounmap;
-                        iounmap(mem_ptr0);
+        }
-                if (mem_ptr1)
+        db_base = pci_resource_start(pdev, 4);  /* doorbell is on bar 4 */
-                        iounmap(mem_ptr1);
+        db_len = pci_resource_len(pdev, 4);
-                if (mem_ptr2)
-                        iounmap(mem_ptr2);
+        if (db_len == 0) {
+                printk(KERN_ERR "%s: doorbell is disabled\n",
-                goto err_out_free_res;
+                       netxen_nic_driver_name);
+                err = -EIO;
+                goto err_out_iounmap;
+        }
+        DPRINTK(INFO, "doorbell ioremap from %lx a size of %lx\n", db_base,
+                db_len);
+        db_ptr = ioremap(db_base, NETXEN_DB_MAPSIZE_BYTES);
+        if (db_ptr == 0UL) {
+                printk(KERN_ERR "%s: Failed to allocate doorbell map.",
+                       netxen_nic_driver_name);
+                err = -EIO;
+                goto err_out_iounmap;
        }
+        DPRINTK(INFO, "doorbell ioremaped at %p\n", db_ptr);
 /*
 *      Allocate a adapter structure which will manage all the initialization
@@ -183,17 +217,24 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                       netxen_nic_driver_name,
                       (int)sizeof(struct netxen_adapter));
                err = -ENOMEM;
-                goto err_out_iounmap;
+                goto err_out_dbunmap;
        }
+        if (netxen_cards_found == 0) {
+                g_adapter = adapter;
+        }
        adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS;
        adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS;
        adapter->max_jumbo_rx_desc_count = MAX_JUMBO_RCV_DESCRIPTORS;
+        adapter->max_lro_rx_desc_count = MAX_LRO_RCV_DESCRIPTORS;
        pci_set_drvdata(pdev, adapter);
        cmd_buf_arr = (struct netxen_cmd_buffer *)vmalloc(TX_RINGSIZE);
        if (cmd_buf_arr == NULL) {
+                printk(KERN_ERR
+                       "%s: Could not allocate cmd_buf_arr memory:%d\n",
+                       netxen_nic_driver_name, (int)TX_RINGSIZE);
                err = -ENOMEM;
                goto err_out_free_adapter;
        }
@@ -220,11 +261,23 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                rcv_desc->skb_size = MAX_RX_JUMBO_BUFFER_LENGTH;
                                break;
+                        case RCV_RING_LRO:
+                                rcv_desc->max_rx_desc_count =
+                                    adapter->max_lro_rx_desc_count;
+                                rcv_desc->flags = RCV_DESC_LRO;
+                                rcv_desc->dma_size = RX_LRO_DMA_MAP_LEN;
+                                rcv_desc->skb_size = MAX_RX_LRO_BUFFER_LENGTH;
+                                break;
                        }
                        rcv_desc->rx_buf_arr = (struct netxen_rx_buffer *)
                            vmalloc(RCV_BUFFSIZE);
                        if (rcv_desc->rx_buf_arr == NULL) {
+                                printk(KERN_ERR "%s: Could not allocate"
+                                       "rcv_desc->rx_buf_arr memory:%d\n",
+                                       netxen_nic_driver_name,
+                                       (int)RCV_BUFFSIZE);
                                err = -ENOMEM;
                                goto err_out_free_rx_buffer;
                        }
@@ -233,30 +286,21 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
-        adapter->ops = kzalloc(sizeof(struct netxen_drvops), GFP_KERNEL);
-        if (adapter->ops == NULL) {
-                printk(KERN_ERR
-                       "%s: Could not allocate memory for adapter->ops:%d\n",
-                       netxen_nic_driver_name,
-                       (int)sizeof(struct netxen_adapter));
-                err = -ENOMEM;
-                goto err_out_free_rx_buffer;
-        }
        adapter->cmd_buf_arr = cmd_buf_arr;
        adapter->ahw.pci_base0 = mem_ptr0;
        adapter->ahw.pci_base1 = mem_ptr1;
        adapter->ahw.pci_base2 = mem_ptr2;
+        adapter->ahw.db_base = db_ptr;
+        adapter->ahw.db_len = db_len;
        spin_lock_init(&adapter->tx_lock);
        spin_lock_init(&adapter->lock);
+        netxen_initialize_adapter_sw(adapter);  /* initialize the buffers in adapter */
 #ifdef CONFIG_IA64
        netxen_pinit_from_rom(adapter, 0);
        udelay(500);
        netxen_load_firmware(adapter);
 #endif
-        /* initialize the buffers in adapter */
-        netxen_initialize_adapter_sw(adapter);
        /*
         * Set the CRB window to invalid. If any register in window 0 is
         * accessed it should set the window to 0 and then reset it to 1.
@@ -277,7 +321,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
        adapter->ahw.pdev = pdev;
        adapter->proc_cmd_buf_counter = 0;
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &adapter->ahw.revision_id);
+        adapter->ahw.revision_id = nx_p2_id;
        if (pci_enable_msi(pdev)) {
                adapter->flags &= ~NETXEN_NIC_MSI_ENABLED;
@@ -299,6 +343,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMD_CONSUMER_OFFSET));
        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_CMD_ADDR_LO));
+        /* do this before waking up pegs so that we have valid dummy dma addr */
+        err = netxen_initialize_adapter_offload(adapter);
+        if (err) {
+                goto err_out_free_dev;
+        }
        /* Unlock the HW, prompting the boot sequence */
        writel(1,
               NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
@@ -307,6 +357,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
        /* initialize the all the ports */
+        adapter->active_ports = 0;
        for (i = 0; i < adapter->ahw.max_ports; i++) {
                netdev = alloc_etherdev(sizeof(struct netxen_port));
@@ -372,10 +423,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                       netdev->dev_addr[4],
                                       netdev->dev_addr[5]);
                        } else {
-                                if (adapter->ops->macaddr_set)
+                                if (adapter->macaddr_set)
-                                        adapter->ops->macaddr_set(port,
+                                        adapter->macaddr_set(port,
-                                                                  netdev->
+                                                             netdev->dev_addr);
-                                                                  dev_addr);
                        }
                }
                adapter->netdev = netdev;
@@ -391,7 +441,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        goto err_out_free_dev;
                }
                adapter->port_count++;
-                adapter->active_ports = 0;
                adapter->port[i] = port;
        }
@@ -412,6 +461,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                break;
        }
+        adapter->number = netxen_cards_found;
        adapter->driver_mismatch = 0;
        return 0;
@@ -426,7 +476,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        free_netdev(port->netdev);
                }
        }
-        kfree(adapter->ops);
+        netxen_free_adapter_offload(adapter);
      err_out_free_rx_buffer:
        for (i = 0; i < MAX_RCV_CTX; ++i) {
@@ -439,19 +490,23 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        }
                }
        }
        vfree(cmd_buf_arr);
-        kfree(adapter->port);
      err_out_free_adapter:
        pci_set_drvdata(pdev, NULL);
        kfree(adapter);
+      err_out_dbunmap:
+        if (db_ptr)
+                iounmap(db_ptr);
      err_out_iounmap:
-        iounmap(mem_ptr0);
+        if (mem_ptr0)
-        iounmap(mem_ptr1);
+                iounmap(mem_ptr0);
-        iounmap(mem_ptr2);
+        if (mem_ptr1)
+                iounmap(mem_ptr1);
+        if (mem_ptr2)
+                iounmap(mem_ptr2);
      err_out_free_res:
        pci_release_regions(pdev);
@@ -476,12 +531,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
        netxen_nic_stop_all_ports(adapter);
        /* leave the hw in the same state as reboot */
-        netxen_pinit_from_rom(adapter, 0);
-        udelay(500);
        netxen_load_firmware(adapter);
+        netxen_free_adapter_offload(adapter);
-        if ((adapter->flags & NETXEN_NIC_MSI_ENABLED))
-                netxen_nic_disable_int(adapter);
        udelay(500);            /* Delay for a while to drain the DMA engines */
        for (i = 0; i < adapter->port_count; i++) {
@@ -498,6 +549,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
                netxen_free_hw_resources(adapter);
+        iounmap(adapter->ahw.db_base);
        iounmap(adapter->ahw.pci_base0);
        iounmap(adapter->ahw.pci_base1);
        iounmap(adapter->ahw.pci_base2);
@@ -524,7 +576,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
        }
        vfree(adapter->cmd_buf_arr);
-        kfree(adapter->ops);
        kfree(adapter);
 }
@@ -546,6 +597,8 @@ static int netxen_nic_open(struct net_device *netdev)
                        return -EIO;
                }
                netxen_nic_flash_print(adapter);
+                if (adapter->init_niu)
+                        adapter->init_niu(adapter);
                /* setup all the resources for the Phantom... */
                /* this include the descriptors for rcv, tx, and status */
@@ -556,32 +609,31 @@ static int netxen_nic_open(struct net_device *netdev)
                               err);
                        return err;
                }
-                if (adapter->ops->init_port
+                if (adapter->init_port
-                    && adapter->ops->init_port(adapter, port->portnum) != 0) {
+                    && adapter->init_port(adapter, port->portnum) != 0) {
                        printk(KERN_ERR "%s: Failed to initialize port %d\n",
                               netxen_nic_driver_name, port->portnum);
                        netxen_free_hw_resources(adapter);
                        return -EIO;
                }
-                if (adapter->ops->init_niu)
-                        adapter->ops->init_niu(adapter);
                for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
                        for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++)
                                netxen_post_rx_buffers(adapter, ctx, ring);
                }
-                adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
+                adapter->irq = adapter->ahw.pdev->irq;
-        }
-        adapter->active_ports++;
-        if (adapter->active_ports == 1) {
                err = request_irq(adapter->ahw.pdev->irq, &netxen_intr,
                                  SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name,
                                  adapter);
                if (err) {
                        printk(KERN_ERR "request_irq failed with: %d\n", err);
-                        adapter->active_ports--;
+                        netxen_free_hw_resources(adapter);
                        return err;
                }
-                adapter->irq = adapter->ahw.pdev->irq;
+                adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
+        }
+        adapter->active_ports++;
+        if (adapter->active_ports == 1) {
                if (!adapter->driver_mismatch)
                        mod_timer(&adapter->watchdog_timer, jiffies);
@@ -590,11 +642,14 @@ static int netxen_nic_open(struct net_device *netdev)
        /* Done here again so that even if phantom sw overwrote it,
         * we set it */
-        if (adapter->ops->macaddr_set)
+        if (adapter->macaddr_set)
-                adapter->ops->macaddr_set(port, netdev->dev_addr);
+                adapter->macaddr_set(port, netdev->dev_addr);
        netxen_nic_set_link_parameters(port);
        netxen_nic_set_multi(netdev);
+        if (adapter->set_mtu)
+                adapter->set_mtu(port, netdev->mtu);
        if (!adapter->driver_mismatch)
                netif_start_queue(netdev);
@@ -647,6 +702,7 @@ static int netxen_nic_close(struct net_device *netdev)
                        }
                        cmd_buff++;
                }
+                FLUSH_SCHEDULED_WORK();
                del_timer_sync(&adapter->watchdog_timer);
        }
@@ -667,7 +723,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        struct cmd_desc_type0 *hwdesc;
        int k;
        struct netxen_cmd_buffer *pbuf = NULL;
-        unsigned int tries = 0;
        static int dropped_packet = 0;
        int frag_count;
        u32 local_producer = 0;
@@ -729,7 +784,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                        if (((skb->nh.iph)->ihl * sizeof(u32)) +
                            ((skb->h.th)->doff * sizeof(u32)) +
                            sizeof(struct ethhdr) >
-                            (sizeof(struct cmd_desc_type0) - NET_IP_ALIGN)) {
+                            (sizeof(struct cmd_desc_type0) - 2)) {
                                no_of_desc++;
                        }
                }
@@ -740,27 +795,17 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        if ((k + no_of_desc) >=
            ((last_cmd_consumer <= k) ? last_cmd_consumer + max_tx_desc_count :
             last_cmd_consumer)) {
+                port->stats.nocmddescriptor++;
+                DPRINTK(ERR, "No command descriptors available,"
+                        " producer = %d, consumer = %d count=%llu,"
+                        " dropping packet\n", producer,
+                        adapter->last_cmd_consumer,
+                        port->stats.nocmddescriptor);
+                netif_stop_queue(netdev);
+                port->flags |= NETXEN_NETDEV_STATUS;
                spin_unlock_bh(&adapter->tx_lock);
-                if (tries == 0) {
+                return NETDEV_TX_BUSY;
-                        local_bh_disable();
-                        netxen_process_cmd_ring((unsigned long)adapter);
-                        local_bh_enable();
-                        ++tries;
-                        goto retry_getting_window;
-                } else {
-                        port->stats.nocmddescriptor++;
-                        DPRINTK(ERR, "No command descriptors available,"
-                                " producer = %d, consumer = %d count=%llu,"
-                                " dropping packet\n", producer,
-                                adapter->last_cmd_consumer,
-                                port->stats.nocmddescriptor);
-                        spin_lock_bh(&adapter->tx_lock);
-                        netif_stop_queue(netdev);
-                        port->flags |= NETXEN_NETDEV_STATUS;
-                        spin_unlock_bh(&adapter->tx_lock);
-                        return NETDEV_TX_BUSY;
-                }
        }
        k = get_index_range(k, max_tx_desc_count, no_of_desc);
        adapter->cmd_producer = k;
@@ -782,7 +827,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                pbuf->mss = 0;
                hwdesc->mss = 0;
        }
-        pbuf->no_of_descriptors = no_of_desc;
        pbuf->total_length = skb->len;
        pbuf->skb = skb;
        pbuf->cmd = TX_ETHER_PKT;
@@ -792,11 +836,11 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        buffrag->dma = pci_map_single(port->pdev, skb->data, first_seg_len,
                                      PCI_DMA_TODEVICE);
        buffrag->length = first_seg_len;
-        CMD_DESC_TOTAL_LENGTH_WRT(hwdesc, skb->len);
+        netxen_set_cmd_desc_totallength(hwdesc, skb->len);
-        hwdesc->num_of_buffers = frag_count;
+        netxen_set_cmd_desc_num_of_buff(hwdesc, frag_count);
-        hwdesc->opcode = TX_ETHER_PKT;
+        netxen_set_cmd_desc_opcode(hwdesc, TX_ETHER_PKT);
-        CMD_DESC_PORT_WRT(hwdesc, port->portnum);
+        netxen_set_cmd_desc_port(hwdesc, port->portnum);
        hwdesc->buffer1_length = cpu_to_le16(first_seg_len);
        hwdesc->addr_buffer1 = cpu_to_le64(buffrag->dma);
@@ -855,12 +899,12 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        /* For LSO, we need to copy the MAC/IP/TCP headers into
         * the descriptor ring
         */
-        if (hw->cmd_desc_head[saved_producer].opcode == TX_TCP_LSO) {
+        if (netxen_get_cmd_desc_opcode(&hw->cmd_desc_head[saved_producer])
+            == TX_TCP_LSO) {
                int hdr_len, first_hdr_len, more_hdr;
                hdr_len = hw->cmd_desc_head[saved_producer].total_hdr_length;
-                if (hdr_len > (sizeof(struct cmd_desc_type0) - NET_IP_ALIGN)) {
+                if (hdr_len > (sizeof(struct cmd_desc_type0) - 2)) {
-                        first_hdr_len =
+                        first_hdr_len = sizeof(struct cmd_desc_type0) - 2;
-                            sizeof(struct cmd_desc_type0) - NET_IP_ALIGN;
                        more_hdr = 1;
                } else {
                        first_hdr_len = hdr_len;
@@ -870,7 +914,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                hwdesc = &hw->cmd_desc_head[producer];
                /* copy the first 64 bytes */
-                memcpy(((void *)hwdesc) + NET_IP_ALIGN,
+                memcpy(((void *)hwdesc) + 2,
                       (void *)(skb->data), first_hdr_len);
                producer = get_next_index(producer, max_tx_desc_count);
@@ -886,7 +930,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        }
        spin_lock_bh(&adapter->tx_lock);
        port->stats.txbytes +=
-            CMD_DESC_TOTAL_LENGTH(&hw->cmd_desc_head[saved_producer]);
+            netxen_get_cmd_desc_totallength(&hw->cmd_desc_head[saved_producer]);
        /* Code to update the adapter considering how many producer threads
           are currently working */
        if ((--adapter->num_threads) == 0) {
@@ -896,20 +940,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                       NETXEN_CRB_NORMALIZE(adapter, CRB_CMD_PRODUCER_OFFSET));
                wmb();
                adapter->total_threads = 0;
-        } else {
-                u32 crb_producer = 0;
-                crb_producer =
-                    readl(NETXEN_CRB_NORMALIZE
-                          (adapter, CRB_CMD_PRODUCER_OFFSET));
-                if (crb_producer == local_producer) {
-                        crb_producer = get_index_range(crb_producer,
-                                                       max_tx_desc_count,
-                                                       no_of_desc);
-                        writel(crb_producer,
-                               NETXEN_CRB_NORMALIZE(adapter,
-                                                    CRB_CMD_PRODUCER_OFFSET));
-                        wmb();
-                }
        }
        port->stats.xmitfinished++;
@@ -926,15 +956,20 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 static void netxen_watchdog(unsigned long v)
 {
        struct netxen_adapter *adapter = (struct netxen_adapter *)v;
-        schedule_work(&adapter->watchdog_task);
+        if (adapter != g_adapter) {
+                printk("%s: ***BUG*** adapter[%p] != g_adapter[%p]\n",
+                       __FUNCTION__, adapter, g_adapter);
+                return;
+        }
+        SCHEDULE_WORK(&adapter->watchdog_task);
 }
 static void netxen_tx_timeout(struct net_device *netdev)
 {
        struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev);
-        struct netxen_adapter *adapter = port->adapter;
-        schedule_work(&adapter->tx_timeout_task);
+        SCHEDULE_WORK(&port->adapter->tx_timeout_task);
 }
 static void netxen_tx_timeout_task(struct work_struct *work)
@@ -967,6 +1002,11 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
        if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
                int count = 0;
                u32 mask;
+                mask = readl(pci_base_offset(adapter, ISR_INT_VECTOR));
+                if ((mask & 0x80) == 0) {
+                        /* not our interrupt */
+                        return ret;
+                }
                netxen_nic_disable_int(adapter);
                /* Window = 0 or 1 */
                do {
@@ -1026,7 +1066,10 @@ irqreturn_t netxen_intr(int irq, void *data)
                netdev = port->netdev;
                /* process our status queue (for all 4 ports) */
-                netxen_handle_int(adapter, netdev);
+                if (netif_running(netdev)) {
+                        netxen_handle_int(adapter, netdev);
+                        break;
+                }
        }
        return IRQ_HANDLED;
@@ -1040,11 +1083,12 @@ static int netxen_nic_poll(struct net_device *netdev, int *budget)
        int done = 1;
        int ctx;
        int this_work_done;
+        int work_done = 0;
        DPRINTK(INFO, "polling for %d descriptors\n", *budget);
        port->stats.polled++;
-        adapter->work_done = 0;
+        work_done = 0;
        for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
                /*
                 * Fairness issue. This will give undue weight to the
@@ -1061,20 +1105,20 @@ static int netxen_nic_poll(struct net_device *netdev, int *budget)
                this_work_done = netxen_process_rcv_ring(adapter, ctx,
                                                         work_to_do /
                                                         MAX_RCV_CTX);
-                adapter->work_done += this_work_done;
+                work_done += this_work_done;
        }
-        netdev->quota -= adapter->work_done;
+        netdev->quota -= work_done;
-        *budget -= adapter->work_done;
+        *budget -= work_done;
-        if (adapter->work_done >= work_to_do
+        if (work_done >= work_to_do && netxen_nic_rx_has_work(adapter) != 0)
-            && netxen_nic_rx_has_work(adapter) != 0)
                done = 0;
-        netxen_process_cmd_ring((unsigned long)adapter);
+        if (netxen_process_cmd_ring((unsigned long)adapter) == 0)
+                done = 0;
        DPRINTK(INFO, "new work_done: %d work_to_do: %d\n",
-                adapter->work_done, work_to_do);
+                work_done, work_to_do);
        if (done) {
                netif_rx_complete(netdev);
                netxen_nic_enable_int(adapter);
@@ -1117,8 +1161,9 @@ netxen_nic_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
                if (ifr->ifr_data) {
                        sprintf(dev_name, "%s-%d", NETXEN_NIC_NAME_RSP,
                                port->portnum);
-                        nr_bytes = copy_to_user((char *)ifr->ifr_data, dev_name,
+                        nr_bytes =
-                                                NETXEN_NIC_NAME_LEN);
+                            copy_to_user((char __user *)ifr->ifr_data, dev_name,
+                                         NETXEN_NIC_NAME_LEN);
                        if (nr_bytes)
                                err = -EIO;
@@ -1145,6 +1190,9 @@ static struct pci_driver netxen_driver = {
 static int __init netxen_init_module(void)
 {
+        if ((netxen_workq = create_singlethread_workqueue("netxen")) == 0)
+                return -ENOMEM;
        return pci_module_init(&netxen_driver);
 }
@@ -1155,7 +1203,7 @@ static void __exit netxen_exit_module(void)
        /*
         * Wait for some time to allow the dma to drain, if any.
         */
-        mdelay(5);
+        destroy_workqueue(netxen_workq);
        pci_unregister_driver(&netxen_driver);
 }
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 7950a04532e6..4987dc765d99 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2003 - 2006 NetXen, Inc.
 * All rights reserved.
- * 
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
@@ -16,10 +16,10 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA  02111-1307, USA.
- * 
+ *
 * The full GNU General Public License is included in this distribution
 * in the file called LICENSE.
- * 
+ *
 * Contact Information:
 *    info@netxen.com
 * NetXen,
@@ -40,13 +40,15 @@
 static long phy_lock_timeout = 100000000;
-static inline int phy_lock(void)
+static inline int phy_lock(struct netxen_adapter *adapter)
 {
        int i;
        int done = 0, timeout = 0;
        while (!done) {
-                done = readl((void __iomem *)NETXEN_PCIE_REG(PCIE_SEM3_LOCK));
+                done =
+                    readl(pci_base_offset
+                          (adapter, NETXEN_PCIE_REG(PCIE_SEM3_LOCK)));
                if (done == 1)
                        break;
                if (timeout >= phy_lock_timeout) {
@@ -61,13 +63,15 @@ static inline int phy_lock(void)
                }
        }
-        writel(NETXEN_PHY_LOCK_ID, (void __iomem *)PHY_LOCK_DRIVER);
+        writel(PHY_LOCK_DRIVER,
+               NETXEN_CRB_NORMALIZE(adapter, NETXEN_PHY_LOCK_ID));
        return 0;
 }
-static inline int phy_unlock(void)
+static inline int phy_unlock(struct netxen_adapter *adapter)
 {
-        readl((void __iomem *)NETXEN_PCIE_REG(PCIE_SEM3_UNLOCK));
+        readl(pci_base_offset(adapter, NETXEN_PCIE_REG(PCIE_SEM3_UNLOCK)));
        return 0;
 }
@@ -95,7 +99,7 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long phy,
        __le32 status;
        __le32 mac_cfg0;
-        if (phy_lock() != 0) {
+        if (phy_lock(adapter) != 0) {
                return -1;
        }
@@ -162,7 +166,7 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long phy,
                                           NETXEN_NIU_GB_MAC_CONFIG_0(0),
                                           &mac_cfg0, 4))
                        return -EIO;
-        phy_unlock();
+        phy_unlock(adapter);
        return result;
 }
@@ -399,8 +403,8 @@ int netxen_niu_gbe_init_port(struct netxen_adapter *adapter, int port)
 {
        int result = 0;
        __le32 status;
-        if (adapter->ops->disable_phy_interrupts)
+        if (adapter->disable_phy_interrupts)
-                adapter->ops->disable_phy_interrupts(adapter, port);
+                adapter->disable_phy_interrupts(adapter, port);
        mdelay(2);
        if (0 ==
@@ -612,7 +616,7 @@ int netxen_niu_macaddr_set(struct netxen_port *port,
        __le32 temp = 0;
        struct netxen_adapter *adapter = port->adapter;
        int phy = port->portnum;
-        unsigned char mac_addr[MAX_ADDR_LEN];
+        unsigned char mac_addr[6];
        int i;
        for (i = 0; i < 10; i++) {
@@ -631,7 +635,7 @@ int netxen_niu_macaddr_set(struct netxen_port *port,
                netxen_niu_macaddr_get(adapter, phy,
                                       (netxen_ethernet_macaddr_t *) mac_addr);
-                if (memcmp(mac_addr, addr, MAX_ADDR_LEN == 0))
+                if (memcmp(mac_addr, addr, 6) == 0)
                        break;
        }
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h
index 8181d436783f..7879f855af0b 100644
--- a/drivers/net/netxen/netxen_nic_phan_reg.h
+++ b/drivers/net/netxen/netxen_nic_phan_reg.h
@@ -33,15 +33,74 @@
 /* 
 * CRB Registers or queue message done only at initialization time.
 */
+#define NIC_CRB_BASE               NETXEN_CAM_RAM(0x200)
+#define NETXEN_NIC_REG(X)             (NIC_CRB_BASE+(X))
-/*
+#define CRB_PHAN_CNTRL_LO_OFFSET    NETXEN_NIC_REG(0x00)
- * The following 2 are the base adresses for the CRB registers and their
+#define CRB_PHAN_CNTRL_HI_OFFSET    NETXEN_NIC_REG(0x04)
- * offsets will be added to get addresses for the index addresses.
+#define CRB_CMD_PRODUCER_OFFSET     NETXEN_NIC_REG(0x08)
- */
+#define CRB_CMD_CONSUMER_OFFSET     NETXEN_NIC_REG(0x0c)
-#define NIC_CRB_BASE_PORT1      NETXEN_CAM_RAM(0x200)
+#define CRB_PAUSE_ADDR_LO           NETXEN_NIC_REG(0x10)        /* C0 EPG BUG  */
-#define NIC_CRB_BASE_PORT2      NETXEN_CAM_RAM(0x250)
+#define CRB_PAUSE_ADDR_HI           NETXEN_NIC_REG(0x14)
+#define CRB_HOST_CMD_ADDR_HI        NETXEN_NIC_REG(0x18)        /* host add:cmd ring */
+#define CRB_HOST_CMD_ADDR_LO        NETXEN_NIC_REG(0x1c)
+#define CRB_CMD_INTR_LOOP           NETXEN_NIC_REG(0x20)        /* 4 regs for perf */
+#define CRB_CMD_DMA_LOOP            NETXEN_NIC_REG(0x24)
+#define CRB_RCV_INTR_LOOP           NETXEN_NIC_REG(0x28)
+#define CRB_RCV_DMA_LOOP            NETXEN_NIC_REG(0x2c)
+#define CRB_ENABLE_TX_INTR          NETXEN_NIC_REG(0x30)        /* phantom init status */
+#define CRB_MMAP_ADDR_3             NETXEN_NIC_REG(0x34)
+#define CRB_CMDPEG_CMDRING          NETXEN_NIC_REG(0x38)
+#define CRB_HOST_DUMMY_BUF_ADDR_HI  NETXEN_NIC_REG(0x3c)
+#define CRB_HOST_DUMMY_BUF_ADDR_LO  NETXEN_NIC_REG(0x40)
+#define CRB_MMAP_ADDR_0             NETXEN_NIC_REG(0x44)
+#define CRB_MMAP_ADDR_1             NETXEN_NIC_REG(0x48)
+#define CRB_MMAP_ADDR_2             NETXEN_NIC_REG(0x4c)
+#define CRB_CMDPEG_STATE            NETXEN_NIC_REG(0x50)
+#define CRB_MMAP_SIZE_0             NETXEN_NIC_REG(0x54)
+#define CRB_MMAP_SIZE_1             NETXEN_NIC_REG(0x58)
+#define CRB_MMAP_SIZE_2             NETXEN_NIC_REG(0x5c)
+#define CRB_MMAP_SIZE_3             NETXEN_NIC_REG(0x60)
+#define CRB_GLOBAL_INT_COAL         NETXEN_NIC_REG(0x64)        /* interrupt coalescing */
+#define CRB_INT_COAL_MODE           NETXEN_NIC_REG(0x68)
+#define CRB_MAX_RCV_BUFS            NETXEN_NIC_REG(0x6c)
+#define CRB_TX_INT_THRESHOLD        NETXEN_NIC_REG(0x70)
+#define CRB_RX_PKT_TIMER            NETXEN_NIC_REG(0x74)
+#define CRB_TX_PKT_TIMER            NETXEN_NIC_REG(0x78)
+#define CRB_RX_PKT_CNT              NETXEN_NIC_REG(0x7c)
+#define CRB_RX_TMR_CNT              NETXEN_NIC_REG(0x80)
+#define CRB_RX_LRO_TIMER            NETXEN_NIC_REG(0x84)
+#define CRB_RX_LRO_MID_TIMER        NETXEN_NIC_REG(0x88)
+#define CRB_DMA_MAX_RCV_BUFS        NETXEN_NIC_REG(0x8c)
+#define CRB_MAX_DMA_ENTRIES         NETXEN_NIC_REG(0x90)
+#define CRB_XG_STATE                NETXEN_NIC_REG(0x94)        /* XG Link status */
+#define CRB_AGENT_GO                NETXEN_NIC_REG(0x98)        /* NIC pkt gen agent */
+#define CRB_AGENT_TX_SIZE           NETXEN_NIC_REG(0x9c)
+#define CRB_AGENT_TX_TYPE           NETXEN_NIC_REG(0xa0)
+#define CRB_AGENT_TX_ADDR           NETXEN_NIC_REG(0xa4)
+#define CRB_AGENT_TX_MSS            NETXEN_NIC_REG(0xa8)
+#define CRB_TX_STATE                NETXEN_NIC_REG(0xac)        /* Debug -performance */
+#define CRB_TX_COUNT                NETXEN_NIC_REG(0xb0)
+#define CRB_RX_STATE                NETXEN_NIC_REG(0xb4)
+#define CRB_RX_PERF_DEBUG_1         NETXEN_NIC_REG(0xb8)
+#define CRB_RX_LRO_CONTROL          NETXEN_NIC_REG(0xbc)        /* LRO On/OFF */
+#define CRB_RX_LRO_START_NUM        NETXEN_NIC_REG(0xc0)
+#define CRB_MPORT_MODE              NETXEN_NIC_REG(0xc4)        /* Multiport Mode */
+#define CRB_CMD_RING_SIZE           NETXEN_NIC_REG(0xc8)
+#define CRB_INT_VECTOR              NETXEN_NIC_REG(0xd4)
+#define CRB_CTX_RESET               NETXEN_NIC_REG(0xd8)
+#define CRB_HOST_STS_PROD           NETXEN_NIC_REG(0xdc)
+#define CRB_HOST_STS_CONS           NETXEN_NIC_REG(0xe0)
+#define CRB_PEG_CMD_PROD            NETXEN_NIC_REG(0xe4)
+#define CRB_PEG_CMD_CONS            NETXEN_NIC_REG(0xe8)
+#define CRB_HOST_BUFFER_PROD        NETXEN_NIC_REG(0xec)
+#define CRB_HOST_BUFFER_CONS        NETXEN_NIC_REG(0xf0)
+#define CRB_JUMBO_BUFFER_PROD       NETXEN_NIC_REG(0xf4)
+#define CRB_JUMBO_BUFFER_CONS       NETXEN_NIC_REG(0xf8)
-#define NETXEN_NIC_REG(X)       (NIC_CRB_BASE_PORT1+(X))
+#define CRB_CMD_PRODUCER_OFFSET_1   NETXEN_NIC_REG(0x1ac)
+#define CRB_CMD_CONSUMER_OFFSET_1   NETXEN_NIC_REG(0x1b0)
+#define CRB_TEMP_STATE              NETXEN_NIC_REG(0x1b4)
 /*
 * CrbPortPhanCntrHi/Lo is used to pass the address of HostPhantomIndex address
@@ -51,74 +110,20 @@
 * on the Phantom.
 */
-#define CRB_PHAN_CNTRL_LO_OFFSET        NETXEN_NIC_REG(0x00)
+#define nx_get_temp_val(x)              ((x) >> 16)
-#define CRB_PHAN_CNTRL_HI_OFFSET        NETXEN_NIC_REG(0x04)
+#define nx_get_temp_state(x)            ((x) & 0xffff)
+#define nx_encode_temp(val, state)      (((val) << 16) | (state))
-/* point to the indexes */
-#define CRB_CMD_PRODUCER_OFFSET         NETXEN_NIC_REG(0x08)
-#define CRB_CMD_CONSUMER_OFFSET         NETXEN_NIC_REG(0x0c)
-#define CRB_PAUSE_ADDR_LO               NETXEN_NIC_REG(0x10)
-#define CRB_PAUSE_ADDR_HI               NETXEN_NIC_REG(0x14)
-/* address of command descriptors in the host memory */
-#define CRB_HOST_CMD_ADDR_HI            NETXEN_NIC_REG(0x30)
-#define CRB_HOST_CMD_ADDR_LO            NETXEN_NIC_REG(0x34)
-/* The following 4 CRB registers are for doing performance coal */
-#define CRB_CMD_INTR_LOOP               NETXEN_NIC_REG(0x38)
-#define CRB_CMD_DMA_LOOP                NETXEN_NIC_REG(0x3c)
-#define CRB_RCV_INTR_LOOP               NETXEN_NIC_REG(0x40)
-#define CRB_RCV_DMA_LOOP                NETXEN_NIC_REG(0x44)
-/* Needed by the host to find out the state of Phantom's initialization */
-#define CRB_ENABLE_TX_INTR              NETXEN_NIC_REG(0x4c)
-#define CRB_CMDPEG_STATE                NETXEN_NIC_REG(0x50)
-#define CRB_CMDPEG_CMDRING              NETXEN_NIC_REG(0x54)
-/* Interrupt coalescing parameters */
-#define CRB_GLOBAL_INT_COAL             NETXEN_NIC_REG(0x80)
-#define CRB_INT_COAL_MODE               NETXEN_NIC_REG(0x84)
-#define CRB_MAX_RCV_BUFS                NETXEN_NIC_REG(0x88)
-#define CRB_TX_INT_THRESHOLD            NETXEN_NIC_REG(0x8c)
-#define CRB_RX_PKT_TIMER                NETXEN_NIC_REG(0x90)
-#define CRB_TX_PKT_TIMER                NETXEN_NIC_REG(0x94)
-#define CRB_RX_PKT_CNT                  NETXEN_NIC_REG(0x98)
-#define CRB_RX_TMR_CNT                  NETXEN_NIC_REG(0x9c)
-#define CRB_INT_THRESH           NETXEN_NIC_REG(0xa4)
-/* Register for communicating XG link status */
-#define CRB_XG_STATE                    NETXEN_NIC_REG(0xa0)
-/* Register for communicating card temperature */
-/* Upper 16 bits are temperature value. Lower 16 bits are the state */
-#define CRB_TEMP_STATE           NETXEN_NIC_REG(0xa8)
-#define nx_get_temp_val(x)           ((x) >> 16)
-#define nx_get_temp_state(x)       ((x) & 0xffff)
-#define nx_encode_temp(val, state)     (((val) << 16) | (state))
-/* Debug registers for controlling NIC pkt gen agent */
-#define CRB_AGENT_GO                    NETXEN_NIC_REG(0xb0)
-#define CRB_AGENT_TX_SIZE               NETXEN_NIC_REG(0xb4)
-#define CRB_AGENT_TX_TYPE               NETXEN_NIC_REG(0xb8)
-#define CRB_AGENT_TX_ADDR               NETXEN_NIC_REG(0xbc)
-#define CRB_AGENT_TX_MSS                NETXEN_NIC_REG(0xc0)
-/* Debug registers for observing NIC performance */
-#define CRB_TX_STATE                    NETXEN_NIC_REG(0xd0)
-#define CRB_TX_COUNT                    NETXEN_NIC_REG(0xd4)
-#define CRB_RX_STATE                    NETXEN_NIC_REG(0xd8)
 /* CRB registers per Rcv Descriptor ring */
 struct netxen_rcv_desc_crb {
        u32 crb_rcv_producer_offset __attribute__ ((aligned(512)));
        u32 crb_rcv_consumer_offset;
        u32 crb_globalrcv_ring;
+        u32 crb_rcv_ring_size;
 };
 /*
- * CRB registers used by the receive peg logic. One instance of these
+ * CRB registers used by the receive peg logic.
- * needs to be instantiated per instance of the receive peg.
 */
 struct netxen_recv_crb {
@@ -127,6 +132,7 @@ struct netxen_recv_crb {
        u32 crb_rcv_status_producer;
        u32 crb_rcv_status_consumer;
        u32 crb_rcvpeg_state;
+        u32 crb_status_ring_size;
 };
 #if defined(DEFINE_GLOBAL_RECV_CRB)
@@ -139,30 +145,48 @@ struct netxen_recv_crb recv_crb_registers[] = {
         {
          {
           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x18),
+           NETXEN_NIC_REG(0x100),
           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x1c),
+           NETXEN_NIC_REG(0x104),
           /* crb_gloablrcv_ring: */
-           NETXEN_NIC_REG(0x20),
+           NETXEN_NIC_REG(0x108),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x10c),
           },
          /* Jumbo frames */
          {
           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x100),
+           NETXEN_NIC_REG(0x110),
           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x104),
+           NETXEN_NIC_REG(0x114),
           /* crb_gloablrcv_ring: */
-           NETXEN_NIC_REG(0x108),
+           NETXEN_NIC_REG(0x118),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x11c),
+           },
+          /* LRO */
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x120),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x124),
+           /* crb_gloablrcv_ring: */
+           NETXEN_NIC_REG(0x128),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x12c),
           }
          },
         /* crb_rcvstatus_ring: */
-         NETXEN_NIC_REG(0x24),
+         NETXEN_NIC_REG(0x130),
         /* crb_rcv_status_producer: */
-         NETXEN_NIC_REG(0x28),
+         NETXEN_NIC_REG(0x134),
         /* crb_rcv_status_consumer: */
-         NETXEN_NIC_REG(0x2c),
+         NETXEN_NIC_REG(0x138),
         /* crb_rcvpeg_state: */
-         NETXEN_NIC_REG(0x48),
+         NETXEN_NIC_REG(0x13c),
+         /* crb_status_ring_size */
+         NETXEN_NIC_REG(0x140),
         },
        /*
@@ -173,34 +197,66 @@ struct netxen_recv_crb recv_crb_registers[] = {
         {
          {
           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x80),
+           NETXEN_NIC_REG(0x144),
           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x84),
+           NETXEN_NIC_REG(0x148),
           /* crb_globalrcv_ring: */
-           NETXEN_NIC_REG(0x88),
+           NETXEN_NIC_REG(0x14c),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x150),
           },
          /* Jumbo frames */
          {
           /* crb_rcv_producer_offset: */
-           NETXEN_NIC_REG(0x10C),
+           NETXEN_NIC_REG(0x154),
           /* crb_rcv_consumer_offset: */
-           NETXEN_NIC_REG(0x110),
+           NETXEN_NIC_REG(0x158),
           /* crb_globalrcv_ring: */
-           NETXEN_NIC_REG(0x114),
+           NETXEN_NIC_REG(0x15c),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x160),
+           },
+          /* LRO */
+          {
+           /* crb_rcv_producer_offset: */
+           NETXEN_NIC_REG(0x164),
+           /* crb_rcv_consumer_offset: */
+           NETXEN_NIC_REG(0x168),
+           /* crb_globalrcv_ring: */
+           NETXEN_NIC_REG(0x16c),
+           /* crb_rcv_ring_size */
+           NETXEN_NIC_REG(0x170),
           }
          },
         /* crb_rcvstatus_ring: */
-         NETXEN_NIC_REG(0x8c),
+         NETXEN_NIC_REG(0x174),
         /* crb_rcv_status_producer: */
-         NETXEN_NIC_REG(0x90),
+         NETXEN_NIC_REG(0x178),
         /* crb_rcv_status_consumer: */
-         NETXEN_NIC_REG(0x94),
+         NETXEN_NIC_REG(0x17c),
         /* crb_rcvpeg_state: */
-         NETXEN_NIC_REG(0x98),
+         NETXEN_NIC_REG(0x180),
+         /* crb_status_ring_size */
+         NETXEN_NIC_REG(0x184),
         },
 };
+u64 ctx_addr_sig_regs[][3] = {
+        {NETXEN_NIC_REG(0x188), NETXEN_NIC_REG(0x18c), NETXEN_NIC_REG(0x1c0)},
+        {NETXEN_NIC_REG(0x190), NETXEN_NIC_REG(0x194), NETXEN_NIC_REG(0x1c4)},
+        {NETXEN_NIC_REG(0x198), NETXEN_NIC_REG(0x19c), NETXEN_NIC_REG(0x1c8)},
+        {NETXEN_NIC_REG(0x1a0), NETXEN_NIC_REG(0x1a4), NETXEN_NIC_REG(0x1cc)}
+};
 #else
 extern struct netxen_recv_crb recv_crb_registers[];
+extern u64 ctx_addr_sig_regs[][3];
+#define CRB_CTX_ADDR_REG_LO            (ctx_addr_sig_regs[0][0])
+#define CRB_CTX_ADDR_REG_HI            (ctx_addr_sig_regs[0][2])
+#define CRB_CTX_SIGNATURE_REG       (ctx_addr_sig_regs[0][1])
 #endif                          /* DEFINE_GLOBAL_RECEIVE_CRB */
 /*
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 26e42f6e9fb1..196993a29b09 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -1335,7 +1335,7 @@ int __init init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(dev_ni52);
        release_region(dev_ni52->base_addr, NI52_TOTAL_SIZE);
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 340ad0d5388a..1578f4d98498 100644
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -1259,7 +1259,7 @@ int __init init_module(void)
        return IS_ERR(dev_ni65) ? PTR_ERR(dev_ni65) : 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(dev_ni65);
        cleanup_card(dev_ni65);
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 312e0e331712..568daeb3e9d8 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -414,10 +414,10 @@ struct rx_info {
        struct sk_buff  *skbs[NR_RX_DESC];
-        u32             *next_rx_desc;
+        __le32          *next_rx_desc;
        u16             next_rx, next_empty;
-        u32             *descs;
+        __le32          *descs;
        dma_addr_t      phy_descs;
 };
@@ -460,7 +460,7 @@ struct ns83820 {
        struct sk_buff  *tx_skbs[NR_TX_DESC];
        char            pad[16] __attribute__((aligned(16)));
-        u32             *tx_descs;
+        __le32          *tx_descs;
        dma_addr_t      tx_phy_descs;
        struct timer_list       tx_watchdog;
@@ -534,7 +534,7 @@ static void ns83820_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid
 * conditions, still route realtime traffic with as low jitter as
 * possible.
 */
-static inline void build_rx_desc(struct ns83820 *dev, u32 *desc, dma_addr_t link, dma_addr_t buf, u32 cmdsts, u32 extsts)
+static inline void build_rx_desc(struct ns83820 *dev, __le32 *desc, dma_addr_t link, dma_addr_t buf, u32 cmdsts, u32 extsts)
 {
        desc_addr_set(desc + DESC_LINK, link);
        desc_addr_set(desc + DESC_BUFPTR, buf);
@@ -548,7 +548,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
 {
        unsigned next_empty;
        u32 cmdsts;
-        u32 *sg;
+        __le32 *sg;
        dma_addr_t buf;
        next_empty = dev->rx_info.next_empty;
@@ -875,7 +875,8 @@ static void fastcall rx_irq(struct net_device *ndev)
        struct rx_info *info = &dev->rx_info;
        unsigned next_rx;
        int rx_rc, len;
-        u32 cmdsts, *desc;
+        u32 cmdsts;
+        __le32 *desc;
        unsigned long flags;
        int nr = 0;
@@ -1011,7 +1012,8 @@ static inline void kick_tx(struct ns83820 *dev)
 static void do_tx_done(struct net_device *ndev)
 {
        struct ns83820 *dev = PRIV(ndev);
-        u32 cmdsts, tx_done_idx, *desc;
+        u32 cmdsts, tx_done_idx;
+        __le32 *desc;
        dprintk("do_tx_done(%p)\n", ndev);
        tx_done_idx = dev->tx_done_idx;
@@ -1078,7 +1080,7 @@ static void ns83820_cleanup_tx(struct ns83820 *dev)
                struct sk_buff *skb = dev->tx_skbs[i];
                dev->tx_skbs[i] = NULL;
                if (skb) {
-                        u32 *desc = dev->tx_descs + (i * DESC_SIZE);
+                        __le32 *desc = dev->tx_descs + (i * DESC_SIZE);
                        pci_unmap_single(dev->pci_dev,
                                        desc_addr_get(desc + DESC_BUFPTR),
                                        le32_to_cpu(desc[DESC_CMDSTS]) & CMDSTS_LEN_MASK,
@@ -1108,7 +1110,7 @@ static int ns83820_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        skb_frag_t *frag;
        int stopped = 0;
        int do_intr = 0;
-        volatile u32 *first_desc;
+        volatile __le32 *first_desc;
        dprintk("ns83820_hard_start_xmit\n");
@@ -1181,7 +1183,7 @@ again:
        first_desc = dev->tx_descs + (free_idx * DESC_SIZE);
        for (;;) {
-                volatile u32 *desc = dev->tx_descs + (free_idx * DESC_SIZE);
+                volatile __le32 *desc = dev->tx_descs + (free_idx * DESC_SIZE);
                dprintk("frag[%3u]: %4u @ 0x%08Lx\n", free_idx, len,
                        (unsigned long long)buf);
@@ -1456,7 +1458,8 @@ static int ns83820_stop(struct net_device *ndev)
 static void ns83820_tx_timeout(struct net_device *ndev)
 {
        struct ns83820 *dev = PRIV(ndev);
-        u32 tx_done_idx, *desc;
+        u32 tx_done_idx;
+        __le32 *desc;
        unsigned long flags;
        spin_lock_irqsave(&dev->tx_lock, flags);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 85a392fab5cc..f83b41d4cb0e 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -225,6 +225,7 @@ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
 static int rx_copybreak = 200;
 static int use_dac;
+static int ignore_parity_err;
 static struct {
        u32 msg_enable;
 } debug = { -1 };
@@ -470,6 +471,8 @@ module_param(use_dac, int, 0);
 MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot.");
 module_param_named(debug, debug.msg_enable, int, 0);
 MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)");
+module_param_named(ignore_parity_err, ignore_parity_err, bool, 0);
+MODULE_PARM_DESC(ignore_parity_err, "Ignore PCI parity error as target. Default: false");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(RTL8169_VERSION);
@@ -1284,11 +1287,6 @@ static void rtl8169_hw_phy_config(struct net_device *dev)
        /* Shazam ! */
        if (tp->mac_version == RTL_GIGA_MAC_VER_04) {
-                mdio_write(ioaddr, 31, 0x0001);
-                mdio_write(ioaddr,  9, 0x273a);
-                mdio_write(ioaddr, 14, 0x7bfb);
-                mdio_write(ioaddr, 27, 0x841e);
                mdio_write(ioaddr, 31, 0x0002);
                mdio_write(ioaddr,  1, 0x90d0);
                mdio_write(ioaddr, 31, 0x0000);
@@ -1817,12 +1815,25 @@ static void rtl8169_hw_reset(void __iomem *ioaddr)
        RTL_R8(ChipCmd);
 }
-static void
+static void rtl8169_set_rx_tx_config_registers(struct rtl8169_private *tp)
-rtl8169_hw_start(struct net_device *dev)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        u32 cfg = rtl8169_rx_config;
+        cfg |= (RTL_R32(RxConfig) & rtl_chip_info[tp->chipset].RxConfigMask);
+        RTL_W32(RxConfig, cfg);
+        /* Set DMA burst size and Interframe Gap Time */
+        RTL_W32(TxConfig, (TX_DMA_BURST << TxDMAShift) |
+                (InterFrameGap << TxInterFrameGapShift));
+}
+static void rtl8169_hw_start(struct net_device *dev)
 {
        struct rtl8169_private *tp = netdev_priv(dev);
        void __iomem *ioaddr = tp->mmio_addr;
        struct pci_dev *pdev = tp->pci_dev;
+        u16 cmd;
        u32 i;
        /* Soft reset the chip. */
@@ -1835,6 +1846,11 @@ rtl8169_hw_start(struct net_device *dev)
                msleep_interruptible(1);
        }
+        if (tp->mac_version == RTL_GIGA_MAC_VER_05) {
+                RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | PCIMulRW);
+                pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08);
+        }
        if (tp->mac_version == RTL_GIGA_MAC_VER_13) {
                pci_write_config_word(pdev, 0x68, 0x00);
                pci_write_config_word(pdev, 0x69, 0x08);
@@ -1842,8 +1858,6 @@ rtl8169_hw_start(struct net_device *dev)
        /* Undocumented stuff. */
        if (tp->mac_version == RTL_GIGA_MAC_VER_05) {
-                u16 cmd;
                /* Realtek's r1000_n.c driver uses '&& 0x01' here. Well... */
                if ((RTL_R8(Config2) & 0x07) & 0x01)
                        RTL_W32(0x7c, 0x0007ffff);
@@ -1855,23 +1869,29 @@ rtl8169_hw_start(struct net_device *dev)
                pci_write_config_word(pdev, PCI_COMMAND, cmd);
        }
        RTL_W8(Cfg9346, Cfg9346_Unlock);
+        if ((tp->mac_version == RTL_GIGA_MAC_VER_01) ||
+            (tp->mac_version == RTL_GIGA_MAC_VER_02) ||
+            (tp->mac_version == RTL_GIGA_MAC_VER_03) ||
+            (tp->mac_version == RTL_GIGA_MAC_VER_04))
+                RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
        RTL_W8(EarlyTxThres, EarlyTxThld);
        /* Low hurts. Let's disable the filtering. */
        RTL_W16(RxMaxSize, 16383);
-        /* Set Rx Config register */
+        if ((tp->mac_version == RTL_GIGA_MAC_VER_01) ||
-        i = rtl8169_rx_config |
+            (tp->mac_version == RTL_GIGA_MAC_VER_02) ||
-                (RTL_R32(RxConfig) & rtl_chip_info[tp->chipset].RxConfigMask);
+            (tp->mac_version == RTL_GIGA_MAC_VER_03) ||
-        RTL_W32(RxConfig, i);
+            (tp->mac_version == RTL_GIGA_MAC_VER_04))
+                RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+                rtl8169_set_rx_tx_config_registers(tp);
-        /* Set DMA burst size and Interframe Gap Time */
+        cmd = RTL_R16(CPlusCmd);
-        RTL_W32(TxConfig, (TX_DMA_BURST << TxDMAShift) |
+        RTL_W16(CPlusCmd, cmd);
-                (InterFrameGap << TxInterFrameGapShift));
-        tp->cp_cmd |= RTL_R16(CPlusCmd) | PCIMulRW;
+        tp->cp_cmd |= cmd | PCIMulRW;
        if ((tp->mac_version == RTL_GIGA_MAC_VER_02) ||
            (tp->mac_version == RTL_GIGA_MAC_VER_03)) {
@@ -1897,7 +1917,15 @@ rtl8169_hw_start(struct net_device *dev)
        RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr & DMA_32BIT_MASK));
        RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr >> 32));
        RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr & DMA_32BIT_MASK));
-        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+        if ((tp->mac_version != RTL_GIGA_MAC_VER_01) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_02) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_03) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_04)) {
+                RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+                rtl8169_set_rx_tx_config_registers(tp);
+        }
        RTL_W8(Cfg9346, Cfg9346_Lock);
        /* Initially a 10 us delay. Turned it into a PCI commit. - FR */
@@ -1992,7 +2020,7 @@ static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
        if (!skb)
                goto err_out;
-        skb_reserve(skb, align);
+        skb_reserve(skb, (align - 1) & (u32)skb->data);
        *sk_buff = skb;
        mapping = pci_map_single(pdev, skb->data, rx_buf_sz,
@@ -2355,12 +2383,17 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
        /*
         * The recovery sequence below admits a very elaborated explanation:
         * - it seems to work;
-         * - I did not see what else could be done.
+         * - I did not see what else could be done;
+         * - it makes iop3xx happy.
         *
         * Feel free to adjust to your needs.
         */
-        pci_write_config_word(pdev, PCI_COMMAND,
+        if (ignore_parity_err)
-                              pci_cmd | PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
+                pci_cmd &= ~PCI_COMMAND_PARITY;
+        else
+                pci_cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY;
+        pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
        pci_write_config_word(pdev, PCI_STATUS,
                pci_status & (PCI_STATUS_DETECTED_PARITY |
@@ -2374,10 +2407,11 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
                tp->cp_cmd &= ~PCIDAC;
                RTL_W16(CPlusCmd, tp->cp_cmd);
                dev->features &= ~NETIF_F_HIGHDMA;
-                rtl8169_schedule_work(dev, rtl8169_reinit_task);
        }
        rtl8169_hw_reset(ioaddr);
+        rtl8169_schedule_work(dev, rtl8169_reinit_task);
 }
 static void
@@ -2457,7 +2491,7 @@ static inline int rtl8169_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
                skb = dev_alloc_skb(pkt_size + align);
                if (skb) {
-                        skb_reserve(skb, align);
+                        skb_reserve(skb, (align - 1) & (u32)skb->data);
                        eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0);
                        *sk_buff = skb;
                        rtl8169_mark_to_asic(desc, rx_buf_sz);
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index d9d0a3a3c558..0d6c95c7aedf 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -750,7 +750,7 @@ int __init init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(dev_seeq);
        release_region(dev_seeq->base_addr, SEEQ8005_IO_EXTENT);
diff --git a/drivers/net/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c
index ab66d80a4455..3e7aa49afd00 100644
--- a/drivers/net/sk98lin/skgesirq.c
+++ b/drivers/net/sk98lin/skgesirq.c
@@ -1319,7 +1319,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &Isrc);
 #ifdef xDEBUG
-        if ((Isrc & ~(PHY_B_IS_HCT | PHY_B_IS_LCT) ==
+        if ((Isrc & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) ==
                (PHY_B_IS_SCR_S_ER | PHY_B_IS_RRS_CHANGE | PHY_B_IS_LRS_CHANGE)) {
                SK_U32  Stat1, Stat2, Stat3;
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 23e5275d920c..f6223c533c01 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -389,10 +389,10 @@ enum {
 /* Packet Arbiter Registers */
 /*      B3_PA_CTRL              16 bit  Packet Arbiter Ctrl Register */
 enum {
-        PA_CLR_TO_TX2   = 1<<13,        /* Clear IRQ Packet Timeout TX2 */
+        PA_CLR_TO_TX2   = 1<<13,/* Clear IRQ Packet Timeout TX2 */
-        PA_CLR_TO_TX1   = 1<<12,        /* Clear IRQ Packet Timeout TX1 */
+        PA_CLR_TO_TX1   = 1<<12,/* Clear IRQ Packet Timeout TX1 */
-        PA_CLR_TO_RX2   = 1<<11,        /* Clear IRQ Packet Timeout RX2 */
+        PA_CLR_TO_RX2   = 1<<11,/* Clear IRQ Packet Timeout RX2 */
-        PA_CLR_TO_RX1   = 1<<10,        /* Clear IRQ Packet Timeout RX1 */
+        PA_CLR_TO_RX1   = 1<<10,/* Clear IRQ Packet Timeout RX1 */
        PA_ENA_TO_TX2   = 1<<9, /* Enable  Timeout Timer TX2 */
        PA_DIS_TO_TX2   = 1<<8, /* Disable Timeout Timer TX2 */
        PA_ENA_TO_TX1   = 1<<7, /* Enable  Timeout Timer TX1 */
@@ -481,14 +481,14 @@ enum {
 /* RAM Buffer Register Offsets */
 enum {
-        RB_START        = 0x00,/* 32 bit        RAM Buffer Start Address */
+        RB_START= 0x00,/* 32 bit        RAM Buffer Start Address */
        RB_END  = 0x04,/* 32 bit        RAM Buffer End Address */
        RB_WP   = 0x08,/* 32 bit        RAM Buffer Write Pointer */
        RB_RP   = 0x0c,/* 32 bit        RAM Buffer Read Pointer */
-        RB_RX_UTPP      = 0x10,/* 32 bit        Rx Upper Threshold, Pause Packet */
+        RB_RX_UTPP= 0x10,/* 32 bit      Rx Upper Threshold, Pause Packet */
-        RB_RX_LTPP      = 0x14,/* 32 bit        Rx Lower Threshold, Pause Packet */
+        RB_RX_LTPP= 0x14,/* 32 bit      Rx Lower Threshold, Pause Packet */
-        RB_RX_UTHP      = 0x18,/* 32 bit        Rx Upper Threshold, High Prio */
+        RB_RX_UTHP= 0x18,/* 32 bit      Rx Upper Threshold, High Prio */
-        RB_RX_LTHP      = 0x1c,/* 32 bit        Rx Lower Threshold, High Prio */
+        RB_RX_LTHP= 0x1c,/* 32 bit      Rx Lower Threshold, High Prio */
        /* 0x10 - 0x1f: reserved at Tx RAM Buffer Registers */
        RB_PC   = 0x20,/* 32 bit        RAM Buffer Packet Counter */
        RB_LEV  = 0x24,/* 32 bit        RAM Buffer Level Register */
@@ -532,7 +532,7 @@ enum {
        PHY_ADDR_MARV   = 0,
 };
-#define RB_ADDR(offs, queue) (B16_RAM_REGS + (queue) + (offs))
+#define RB_ADDR(offs, queue) ((u16)B16_RAM_REGS + (u16)(queue) + (offs))
 /* Receive MAC FIFO, Receive LED, and Link_Sync regs (GENESIS only) */
 enum {
@@ -578,15 +578,15 @@ enum {
        MFF_DIS_TIST    = 1<<2, /* Disable Time Stamp Gener */
        MFF_CLR_INTIST  = 1<<1, /* Clear IRQ No Time Stamp */
        MFF_CLR_INSTAT  = 1<<0, /* Clear IRQ No Status */
-#define MFF_RX_CTRL_DEF MFF_ENA_TIM_PAT
+        MFF_RX_CTRL_DEF = MFF_ENA_TIM_PAT,
 };
 /*      TX_MFF_CTRL1    16 bit  Transmit MAC FIFO Control Reg 1 */
 enum {
-        MFF_CLR_PERR    = 1<<15,        /* Clear Parity Error IRQ */
+        MFF_CLR_PERR    = 1<<15, /* Clear Parity Error IRQ */
-                                                                /* Bit 14:      reserved */
-        MFF_ENA_PKT_REC = 1<<13,        /* Enable  Packet Recovery */
+        MFF_ENA_PKT_REC = 1<<13, /* Enable  Packet Recovery */
-        MFF_DIS_PKT_REC = 1<<12,        /* Disable Packet Recovery */
+        MFF_DIS_PKT_REC = 1<<12, /* Disable Packet Recovery */
        MFF_ENA_W4E     = 1<<7, /* Enable  Wait for Empty */
        MFF_DIS_W4E     = 1<<6, /* Disable Wait for Empty */
@@ -595,9 +595,10 @@ enum {
        MFF_DIS_LOOPB   = 1<<2, /* Disable Loopback */
        MFF_CLR_MAC_RST = 1<<1, /* Clear XMAC Reset */
        MFF_SET_MAC_RST = 1<<0, /* Set   XMAC Reset */
+        MFF_TX_CTRL_DEF  = MFF_ENA_PKT_REC | (u16) MFF_ENA_TIM_PAT | MFF_ENA_FLUSH,
 };
-#define MFF_TX_CTRL_DEF (MFF_ENA_PKT_REC | MFF_ENA_TIM_PAT | MFF_ENA_FLUSH)
 /*      RX_MFF_TST2              8 bit  Receive MAC FIFO Test Register 2 */
 /*      TX_MFF_TST2              8 bit  Transmit MAC FIFO Test Register 2 */
@@ -1304,8 +1305,8 @@ enum {
 /* special defines for FIBER (88E1011S only) */
 enum {
-        PHY_M_AN_ASP_X  = 1<<8, /* Asymmetric Pause */
+        PHY_M_AN_ASP_X          = 1<<8, /* Asymmetric Pause */
-        PHY_M_AN_PC_X   = 1<<7, /* MAC Pause implemented */
+        PHY_M_AN_PC_X           = 1<<7, /* MAC Pause implemented */
        PHY_M_AN_1000X_AHD      = 1<<6, /* Advertise 10000Base-X Half Duplex */
        PHY_M_AN_1000X_AFD      = 1<<5, /* Advertise 10000Base-X Full Duplex */
 };
@@ -1320,7 +1321,7 @@ enum {
 /*****  PHY_MARV_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
 enum {
-        PHY_M_1000C_TEST        = 7<<13,/* Bit 15..13:  Test Modes */
+        PHY_M_1000C_TEST= 7<<13,/* Bit 15..13:  Test Modes */
        PHY_M_1000C_MSE = 1<<12, /* Manual Master/Slave Enable */
        PHY_M_1000C_MSC = 1<<11, /* M/S Configuration (1=Master) */
        PHY_M_1000C_MPD = 1<<10, /* Multi-Port Device */
@@ -1349,7 +1350,7 @@ enum {
        PHY_M_PC_EN_DET_PLUS    = 3<<8, /* Energy Detect Plus (Mode 2) */
 };
-#define PHY_M_PC_MDI_XMODE(x)   (((x)<<5) & PHY_M_PC_MDIX_MSK)
+#define PHY_M_PC_MDI_XMODE(x)   ((((u16)(x)<<5) & PHY_M_PC_MDIX_MSK)
 enum {
        PHY_M_PC_MAN_MDI        = 0, /* 00 = Manual MDI configuration */
@@ -1432,24 +1433,24 @@ enum {
        PHY_M_EC_DIS_LINK_P = 1<<12, /* Disable Link Pulses (88E1111 only) */
        PHY_M_EC_M_DSC_MSK  = 3<<10, /* Bit 11..10:     Master Downshift Counter */
                                        /* (88E1011 only) */
-        PHY_M_EC_S_DSC_MSK      = 3<<8,/* Bit  9.. 8:   Slave  Downshift Counter */
+        PHY_M_EC_S_DSC_MSK  = 3<<8,  /* Bit  9.. 8:     Slave  Downshift Counter */
                                       /* (88E1011 only) */
-        PHY_M_EC_M_DSC_MSK2     = 7<<9,/* Bit 11.. 9:   Master Downshift Counter */
+        PHY_M_EC_M_DSC_MSK2  = 7<<9, /* Bit 11.. 9:     Master Downshift Counter */
                                        /* (88E1111 only) */
-        PHY_M_EC_DOWN_S_ENA     = 1<<8, /* Downshift Enable (88E1111 only) */
+        PHY_M_EC_DOWN_S_ENA  = 1<<8, /* Downshift Enable (88E1111 only) */
                                        /* !!! Errata in spec. (1 = disable) */
-        PHY_M_EC_RX_TIM_CT      = 1<<7, /* RGMII Rx Timing Control*/
+        PHY_M_EC_RX_TIM_CT   = 1<<7, /* RGMII Rx Timing Control*/
-        PHY_M_EC_MAC_S_MSK      = 7<<4,/* Bit  6.. 4:   Def. MAC interface speed */
+        PHY_M_EC_MAC_S_MSK   = 7<<4, /* Bit  6.. 4:     Def. MAC interface speed */
-        PHY_M_EC_FIB_AN_ENA     = 1<<3, /* Fiber Auto-Neg. Enable (88E1011S only) */
+        PHY_M_EC_FIB_AN_ENA  = 1<<3, /* Fiber Auto-Neg. Enable (88E1011S only) */
-        PHY_M_EC_DTE_D_ENA      = 1<<2, /* DTE Detect Enable (88E1111 only) */
+        PHY_M_EC_DTE_D_ENA   = 1<<2, /* DTE Detect Enable (88E1111 only) */
-        PHY_M_EC_TX_TIM_CT      = 1<<1, /* RGMII Tx Timing Control */
+        PHY_M_EC_TX_TIM_CT   = 1<<1, /* RGMII Tx Timing Control */
-        PHY_M_EC_TRANS_DIS      = 1<<0, /* Transmitter Disable (88E1111 only) */};
+        PHY_M_EC_TRANS_DIS   = 1<<0, /* Transmitter Disable (88E1111 only) */};
-#define PHY_M_EC_M_DSC(x)       ((x)<<10) /* 00=1x; 01=2x; 10=3x; 11=4x */
+#define PHY_M_EC_M_DSC(x)       ((u16)(x)<<10) /* 00=1x; 01=2x; 10=3x; 11=4x */
-#define PHY_M_EC_S_DSC(x)       ((x)<<8) /* 00=dis; 01=1x; 10=2x; 11=3x */
+#define PHY_M_EC_S_DSC(x)       ((u16)(x)<<8) /* 00=dis; 01=1x; 10=2x; 11=3x */
-#define PHY_M_EC_MAC_S(x)       ((x)<<4) /* 01X=0; 110=2.5; 111=25 (MHz) */
+#define PHY_M_EC_MAC_S(x)       ((u16)(x)<<4) /* 01X=0; 110=2.5; 111=25 (MHz) */
-#define PHY_M_EC_M_DSC_2(x)     ((x)<<9) /* 000=1x; 001=2x; 010=3x; 011=4x */
+#define PHY_M_EC_M_DSC_2(x)     ((u16)(x)<<9) /* 000=1x; 001=2x; 010=3x; 011=4x */
                                                                                        /* 100=5x; 101=6x; 110=7x; 111=8x */
 enum {
        MAC_TX_CLK_0_MHZ        = 2,
@@ -1468,10 +1469,12 @@ enum {
        PHY_M_LEDC_LK_C_MSK     = 7<<3,/* Bit  5.. 3: Link Control Mask */
                                        /* (88E1111 only) */
 };
+#define PHY_M_LED_PULS_DUR(x)   (((u16)(x)<<12) & PHY_M_LEDC_PULS_MSK)
+#define PHY_M_LED_BLINK_RT(x)   (((u16)(x)<<8) & PHY_M_LEDC_BL_R_MSK)
 enum {
-        PHY_M_LEDC_LINK_MSK     = 3<<3,/* Bit  4.. 3: Link Control Mask */
+        PHY_M_LEDC_LINK_MSK     = 3<<3, /* Bit  4.. 3: Link Control Mask */
-                                                                        /* (88E1011 only) */
+                                        /* (88E1011 only) */
        PHY_M_LEDC_DP_CTRL      = 1<<2, /* Duplex Control */
        PHY_M_LEDC_DP_C_MSB     = 1<<2, /* Duplex Control (MSB, 88E1111 only) */
        PHY_M_LEDC_RX_CTRL      = 1<<1, /* Rx Activity / Link */
@@ -1479,27 +1482,24 @@ enum {
        PHY_M_LEDC_TX_C_MSB     = 1<<0, /* Tx Control (MSB, 88E1111 only) */
 };
-#define PHY_M_LED_PULS_DUR(x)   (((x)<<12) & PHY_M_LEDC_PULS_MSK)
 enum {
-        PULS_NO_STR     = 0,/* no pulse stretching */
+        PULS_NO_STR     = 0, /* no pulse stretching */
-        PULS_21MS       = 1,/* 21 ms to 42 ms */
+        PULS_21MS       = 1, /* 21 ms to 42 ms */
-        PULS_42MS       = 2,/* 42 ms to 84 ms */
+        PULS_42MS       = 2, /* 42 ms to 84 ms */
-        PULS_84MS       = 3,/* 84 ms to 170 ms */
+        PULS_84MS       = 3, /* 84 ms to 170 ms */
-        PULS_170MS      = 4,/* 170 ms to 340 ms */
+        PULS_170MS      = 4, /* 170 ms to 340 ms */
-        PULS_340MS      = 5,/* 340 ms to 670 ms */
+        PULS_340MS      = 5, /* 340 ms to 670 ms */
-        PULS_670MS      = 6,/* 670 ms to 1.3 s */
+        PULS_670MS      = 6, /* 670 ms to 1.3 s */
-        PULS_1300MS     = 7,/* 1.3 s to 2.7 s */
+        PULS_1300MS     = 7, /* 1.3 s to 2.7 s */
 };
-#define PHY_M_LED_BLINK_RT(x)   (((x)<<8) & PHY_M_LEDC_BL_R_MSK)
 enum {
-        BLINK_42MS      = 0,/* 42 ms */
+        BLINK_42MS      = 0, /* 42 ms */
-        BLINK_84MS      = 1,/* 84 ms */
+        BLINK_84MS      = 1, /* 84 ms */
-        BLINK_170MS     = 2,/* 170 ms */
+        BLINK_170MS     = 2, /* 170 ms */
-        BLINK_340MS     = 3,/* 340 ms */
+        BLINK_340MS     = 3, /* 340 ms */
-        BLINK_670MS     = 4,/* 670 ms */
+        BLINK_670MS     = 4, /* 670 ms */
 };
 /*****  PHY_MARV_LED_OVER       16 bit r/w      Manual LED Override Reg *****/
@@ -1525,7 +1525,7 @@ enum {
        PHY_M_EC2_FO_IMPED      = 1<<5, /* Fiber Output Impedance */
        PHY_M_EC2_FO_M_CLK      = 1<<4, /* Fiber Mode Clock Enable */
        PHY_M_EC2_FO_BOOST      = 1<<3, /* Fiber Output Boost */
-        PHY_M_EC2_FO_AM_MSK     = 7,/* Bit  2.. 0:      Fiber Output Amplitude */
+        PHY_M_EC2_FO_AM_MSK     = 7, /* Bit  2.. 0:     Fiber Output Amplitude */
 };
 /*****  PHY_MARV_EXT_P_STAT 16 bit r/w  Ext. PHY Specific Status *****/
@@ -1550,7 +1550,7 @@ enum {
        PHY_M_CABD_DIS_WAIT     = 1<<15, /* Disable Waiting Period (Page 1) */
                                        /* (88E1111 only) */
        PHY_M_CABD_STAT_MSK     = 3<<13, /* Bit 14..13: Status Mask */
-        PHY_M_CABD_AMPL_MSK     = 0x1f<<8,/* Bit 12.. 8: Amplitude Mask */
+        PHY_M_CABD_AMPL_MSK     = 0x1f<<8, /* Bit 12.. 8: Amplitude Mask */
                                        /* (88E1111 only) */
        PHY_M_CABD_DIST_MSK     = 0xff, /* Bit  7.. 0: Distance Mask */
 };
@@ -1605,9 +1605,9 @@ enum {
 /*****  PHY_MARV_PHY_CTRL (page 3)              16 bit r/w      LED Control Reg. *****/
 enum {
-        PHY_M_LEDC_LOS_MSK      = 0xf<<12,/* Bit 15..12: LOS LED Ctrl. Mask */
+        PHY_M_LEDC_LOS_MSK      = 0xf<<12, /* Bit 15..12: LOS LED Ctrl. Mask */
        PHY_M_LEDC_INIT_MSK     = 0xf<<8, /* Bit 11.. 8: INIT LED Ctrl. Mask */
-        PHY_M_LEDC_STA1_MSK     = 0xf<<4,/* Bit  7.. 4: STAT1 LED Ctrl. Mask */
+        PHY_M_LEDC_STA1_MSK     = 0xf<<4, /* Bit  7.. 4: STAT1 LED Ctrl. Mask */
        PHY_M_LEDC_STA0_MSK     = 0xf, /* Bit  3.. 0: STAT0 LED Ctrl. Mask */
 };
@@ -1804,8 +1804,8 @@ enum {
 /*      GM_SMI_CTRL                     16 bit r/w      SMI Control Register */
 enum {
-        GM_SMI_CT_PHY_A_MSK     = 0x1f<<11,/* Bit 15..11:       PHY Device Address */
+        GM_SMI_CT_PHY_A_MSK     = 0x1f<<11, /* Bit 15..11:      PHY Device Address */
-        GM_SMI_CT_REG_A_MSK     = 0x1f<<6,/* Bit 10.. 6:        PHY Register Address */
+        GM_SMI_CT_REG_A_MSK     = 0x1f<<6, /* Bit 10.. 6:       PHY Register Address */
        GM_SMI_CT_OP_RD         = 1<<5, /* Bit  5:      OpCode Read (0=Write)*/
        GM_SMI_CT_RD_VAL        = 1<<4, /* Bit  4:      Read Valid (Read completed) */
        GM_SMI_CT_BUSY          = 1<<3, /* Bit  3:      Busy (Operation in progress) */
@@ -1875,9 +1875,9 @@ enum {
 /*      TX_GMF_CTRL_T   32 bit  Tx GMAC FIFO Control/Test */
 enum {
-        GMF_WSP_TST_ON  = 1<<18,/* Write Shadow Pointer Test On */
+        GMF_WSP_TST_ON  = 1<<18, /* Write Shadow Pointer Test On */
-        GMF_WSP_TST_OFF = 1<<17,/* Write Shadow Pointer Test Off */
+        GMF_WSP_TST_OFF = 1<<17, /* Write Shadow Pointer Test Off */
-        GMF_WSP_STEP    = 1<<16,/* Write Shadow Pointer Step/Increment */
+        GMF_WSP_STEP    = 1<<16, /* Write Shadow Pointer Step/Increment */
        GMF_CLI_TX_FU   = 1<<6, /* Clear IRQ Tx FIFO Underrun */
        GMF_CLI_TX_FC   = 1<<5, /* Clear IRQ Tx Frame Complete */
@@ -2111,18 +2111,18 @@ enum {
 /*      XM_MMU_CMD      16 bit r/w      MMU Command Register */
 enum {
-        XM_MMU_PHY_RDY  = 1<<12,/* Bit 12:      PHY Read Ready */
+        XM_MMU_PHY_RDY  = 1<<12, /* Bit 12:     PHY Read Ready */
-        XM_MMU_PHY_BUSY = 1<<11,/* Bit 11:      PHY Busy */
+        XM_MMU_PHY_BUSY = 1<<11, /* Bit 11:     PHY Busy */
-        XM_MMU_IGN_PF   = 1<<10,/* Bit 10:      Ignore Pause Frame */
+        XM_MMU_IGN_PF   = 1<<10, /* Bit 10:     Ignore Pause Frame */
-        XM_MMU_MAC_LB   = 1<<9, /* Bit  9:      Enable MAC Loopback */
+        XM_MMU_MAC_LB   = 1<<9,  /* Bit  9:     Enable MAC Loopback */
-        XM_MMU_FRC_COL  = 1<<7, /* Bit  7:      Force Collision */
+        XM_MMU_FRC_COL  = 1<<7,  /* Bit  7:     Force Collision */
-        XM_MMU_SIM_COL  = 1<<6, /* Bit  6:      Simulate Collision */
+        XM_MMU_SIM_COL  = 1<<6,  /* Bit  6:     Simulate Collision */
-        XM_MMU_NO_PRE   = 1<<5, /* Bit  5:      No MDIO Preamble */
+        XM_MMU_NO_PRE   = 1<<5,  /* Bit  5:     No MDIO Preamble */
-        XM_MMU_GMII_FD  = 1<<4, /* Bit  4:      GMII uses Full Duplex */
+        XM_MMU_GMII_FD  = 1<<4,  /* Bit  4:     GMII uses Full Duplex */
-        XM_MMU_RAT_CTRL = 1<<3, /* Bit  3:      Enable Rate Control */
+        XM_MMU_RAT_CTRL = 1<<3,  /* Bit  3:     Enable Rate Control */
-        XM_MMU_GMII_LOOP= 1<<2, /* Bit  2:      PHY is in Loopback Mode */
+        XM_MMU_GMII_LOOP= 1<<2,  /* Bit  2:     PHY is in Loopback Mode */
-        XM_MMU_ENA_RX   = 1<<1, /* Bit  1:      Enable Receiver */
+        XM_MMU_ENA_RX   = 1<<1,  /* Bit  1:     Enable Receiver */
-        XM_MMU_ENA_TX   = 1<<0, /* Bit  0:      Enable Transmitter */
+        XM_MMU_ENA_TX   = 1<<0,  /* Bit  0:     Enable Transmitter */
 };
@@ -2506,7 +2506,7 @@ static inline void skge_write8(const struct skge_hw *hw, int reg, u8 val)
 }
 /* MAC Related Registers inside the device. */
-#define SK_REG(port,reg)        (((port)<<7)+(reg))
+#define SK_REG(port,reg)        (((port)<<7)+(u16)(reg))
 #define SK_XMAC_REG(port, reg) \
        ((BASE_XMAC_1 + (port) * (BASE_XMAC_2 - BASE_XMAC_1)) | (reg) << 1)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 842abd9396c6..fb1d2c30c1bb 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -100,33 +100,32 @@ module_param(idle_timeout, int, 0);
 MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
 static const struct pci_device_id sky2_id_table[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
+        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
-        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
+        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) },    /* DGE-560T */
        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4001) },    /* DGE-550SX */
        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4B02) },    /* DGE-560SX */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) }, /* 88E8021 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) }, /* 88E8022 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) }, /* 88E8061 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4343) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4343) }, /* 88E8062 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4344) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4344) }, /* 88E8021 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4345) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4345) }, /* 88E8022 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4346) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4346) }, /* 88E8061 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4347) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4347) }, /* 88E8062 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4350) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4350) }, /* 88E8035 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4351) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4351) }, /* 88E8036 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) }, /* 88E8038 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4353) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4353) }, /* 88E8039 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4360) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4356) }, /* 88EC033 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4361) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4360) }, /* 88E8052 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4362) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4361) }, /* 88E8050 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4363) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4362) }, /* 88E8053 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4364) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4363) }, /* 88E8055 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4365) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4364) }, /* 88E8056 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4366) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4366) }, /* 88EC036 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4367) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4367) }, /* 88EC032 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4368) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4368) }, /* 88EC034 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4369) },
        { 0 }
 };
@@ -522,7 +521,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                /* set Tx LED (LED_TX) to blink mode on Rx OR Tx activity */
                ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) | PHY_M_LEDC_TX_CTRL;
                /* turn off the Rx LED (LED_RX) */
-                ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);
+                ledover &= ~PHY_M_LED_MO_RX;
        }
        if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev == CHIP_REV_YU_EC_A1) {
@@ -545,7 +544,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                if (sky2->autoneg == AUTONEG_DISABLE || sky2->speed == SPEED_100) {
                        /* turn on 100 Mbps LED (LED_LINK100) */
-                        ledover |= PHY_M_LED_MO_100(MO_LED_ON);
+                        ledover |= PHY_M_LED_MO_100;
                }
                if (ledover)
@@ -697,10 +696,15 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 }
-/* Assign Ram Buffer allocation in units of 64bit (8 bytes) */
+/* Assign Ram Buffer allocation to queue */
-static void sky2_ramset(struct sky2_hw *hw, u16 q, u32 start, u32 end)
+static void sky2_ramset(struct sky2_hw *hw, u16 q, u32 start, u32 space)
 {
-        pr_debug(PFX "q %d %#x %#x\n", q, start, end);
+        u32 end;
+        /* convert from K bytes to qwords used for hw register */
+        start *= 1024/8;
+        space *= 1024/8;
+        end = start + space - 1;
        sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_RST_CLR);
        sky2_write32(hw, RB_ADDR(q, RB_START), start);
@@ -709,7 +713,6 @@ static void sky2_ramset(struct sky2_hw *hw, u16 q, u32 start, u32 end)
        sky2_write32(hw, RB_ADDR(q, RB_RP), start);
        if (q == Q_R1 || q == Q_R2) {
-                u32 space = end - start + 1;
                u32 tp = space - space/4;
                /* On receive queue's set the thresholds
@@ -1059,11 +1062,16 @@ static int sky2_rx_start(struct sky2_port *sky2)
        sky2->rx_put = sky2->rx_next = 0;
        sky2_qset(hw, rxq);
+        /* On PCI express lowering the watermark gives better performance */
+        if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP))
+                sky2_write32(hw, Q_ADDR(rxq, Q_WM), BMU_WM_PEX);
+        /* These chips have no ram buffer?
+         * MAC Rx RAM Read is controlled by hardware */
        if (hw->chip_id == CHIP_ID_YUKON_EC_U &&
-            (hw->chip_rev == CHIP_REV_YU_EC_U_A1 || hw->chip_rev == CHIP_REV_YU_EC_U_B0)) {
+            (hw->chip_rev == CHIP_REV_YU_EC_U_A1
-                /* MAC Rx RAM Read is controlled by hardware */
+             || hw->chip_rev == CHIP_REV_YU_EC_U_B0))
                sky2_write32(hw, Q_ADDR(rxq, Q_F), F_M_RX_RAM_DIS);
-        }
        sky2_prefetch_init(hw, rxq, sky2->rx_le_map, RX_LE_SIZE - 1);
@@ -1139,7 +1147,7 @@ static int sky2_up(struct net_device *dev)
        struct sky2_port *sky2 = netdev_priv(dev);
        struct sky2_hw *hw = sky2->hw;
        unsigned port = sky2->port;
-        u32 ramsize, rxspace, imask;
+        u32 ramsize, imask;
        int cap, err = -ENOMEM;
        struct net_device *otherdev = hw->dev[sky2->port^1];
@@ -1192,20 +1200,25 @@ static int sky2_up(struct net_device *dev)
        sky2_mac_init(hw, port);
-        /* Determine available ram buffer space in qwords.  */
+        /* Register is number of 4K blocks on internal RAM buffer. */
-        ramsize = sky2_read8(hw, B2_E_0) * 4096/8;
+        ramsize = sky2_read8(hw, B2_E_0) * 4;
+        printk(KERN_INFO PFX "%s: ram buffer %dK\n", dev->name, ramsize);
-        if (ramsize > 6*1024/8)
+        if (ramsize > 0) {
-                rxspace = ramsize - (ramsize + 2) / 3;
+                u32 rxspace;
-        else
-                rxspace = ramsize / 2;
-        sky2_ramset(hw, rxqaddr[port], 0, rxspace-1);
+                if (ramsize < 16)
-        sky2_ramset(hw, txqaddr[port], rxspace, ramsize-1);
+                        rxspace = ramsize / 2;
+                else
+                        rxspace = 8 + (2*(ramsize - 16))/3;
+                sky2_ramset(hw, rxqaddr[port], 0, rxspace);
+                sky2_ramset(hw, txqaddr[port], rxspace, ramsize - rxspace);
-        /* Make sure SyncQ is disabled */
+                /* Make sure SyncQ is disabled */
-        sky2_write8(hw, RB_ADDR(port == 0 ? Q_XS1 : Q_XS2, RB_CTRL),
+                sky2_write8(hw, RB_ADDR(port == 0 ? Q_XS1 : Q_XS2, RB_CTRL),
-                    RB_RST_SET);
+                            RB_RST_SET);
+        }
        sky2_qset(hw, txqaddr[port]);
@@ -2917,18 +2930,8 @@ static void sky2_led(struct sky2_hw *hw, unsigned port, int on)
        default:
                gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
-                gm_phy_write(hw, port, PHY_MARV_LED_OVER,
+                gm_phy_write(hw, port, PHY_MARV_LED_OVER, 
-                             on ? PHY_M_LED_MO_DUP(MO_LED_ON) |
+                             on ? PHY_M_LED_ALL : 0);
-                             PHY_M_LED_MO_10(MO_LED_ON) |
-                             PHY_M_LED_MO_100(MO_LED_ON) |
-                             PHY_M_LED_MO_1000(MO_LED_ON) |
-                             PHY_M_LED_MO_RX(MO_LED_ON)
-                             : PHY_M_LED_MO_DUP(MO_LED_OFF) |
-                             PHY_M_LED_MO_10(MO_LED_OFF) |
-                             PHY_M_LED_MO_100(MO_LED_OFF) |
-                             PHY_M_LED_MO_1000(MO_LED_OFF) |
-                             PHY_M_LED_MO_RX(MO_LED_OFF));
        }
 }
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 7760545edbf2..6ed1d47dbbd3 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -608,7 +608,7 @@ enum {
        PHY_ADDR_MARV   = 0,
 };
-#define RB_ADDR(offs, queue) (B16_RAM_REGS + (queue) + (offs))
+#define RB_ADDR(offs, queue) ((u16) B16_RAM_REGS + (queue) + (offs))
 enum {
@@ -680,6 +680,7 @@ enum {
                          BMU_FIFO_ENA | BMU_OP_ON,
        BMU_WM_DEFAULT = 0x600,
+        BMU_WM_PEX     = 0x80,
 };
 /* Tx BMU Control / Status Registers (Yukon-2) */
@@ -1060,7 +1061,7 @@ enum {
        PHY_M_PC_EN_DET_PLUS    = 3<<8, /* Energy Detect Plus (Mode 2) */
 };
-#define PHY_M_PC_MDI_XMODE(x)   (((x)<<5) & PHY_M_PC_MDIX_MSK)
+#define PHY_M_PC_MDI_XMODE(x)   (((u16)(x)<<5) & PHY_M_PC_MDIX_MSK)
 enum {
        PHY_M_PC_MAN_MDI        = 0, /* 00 = Manual MDI configuration */
@@ -1156,13 +1157,13 @@ enum {
        PHY_M_EC_TX_TIM_CT  = 1<<1, /* RGMII Tx Timing Control */
        PHY_M_EC_TRANS_DIS  = 1<<0, /* Transmitter Disable (88E1111 only) */};
-#define PHY_M_EC_M_DSC(x)       ((x)<<10 & PHY_M_EC_M_DSC_MSK)
+#define PHY_M_EC_M_DSC(x)       ((u16)(x)<<10 & PHY_M_EC_M_DSC_MSK)
                                        /* 00=1x; 01=2x; 10=3x; 11=4x */
-#define PHY_M_EC_S_DSC(x)       ((x)<<8 & PHY_M_EC_S_DSC_MSK)
+#define PHY_M_EC_S_DSC(x)       ((u16)(x)<<8 & PHY_M_EC_S_DSC_MSK)
                                        /* 00=dis; 01=1x; 10=2x; 11=3x */
-#define PHY_M_EC_DSC_2(x)       ((x)<<9 & PHY_M_EC_M_DSC_MSK2)
+#define PHY_M_EC_DSC_2(x)       ((u16)(x)<<9 & PHY_M_EC_M_DSC_MSK2)
                                        /* 000=1x; 001=2x; 010=3x; 011=4x */
-#define PHY_M_EC_MAC_S(x)       ((x)<<4 & PHY_M_EC_MAC_S_MSK)
+#define PHY_M_EC_MAC_S(x)       ((u16)(x)<<4 & PHY_M_EC_MAC_S_MSK)
                                        /* 01X=0; 110=2.5; 111=25 (MHz) */
 /* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */
@@ -1173,7 +1174,7 @@ enum {
 };
 /* !!! Errata in spec. (1 = disable) */
-#define PHY_M_PC_DSC(x)                 (((x)<<12) & PHY_M_PC_DSC_MSK)
+#define PHY_M_PC_DSC(x)                 (((u16)(x)<<12) & PHY_M_PC_DSC_MSK)
                                                                                        /* 100=5x; 101=6x; 110=7x; 111=8x */
 enum {
        MAC_TX_CLK_0_MHZ        = 2,
@@ -1203,7 +1204,7 @@ enum {
        PHY_M_LEDC_TX_C_MSB     = 1<<0, /* Tx Control (MSB, 88E1111 only) */
 };
-#define PHY_M_LED_PULS_DUR(x)   (((x)<<12) & PHY_M_LEDC_PULS_MSK)
+#define PHY_M_LED_PULS_DUR(x)   (((u16)(x)<<12) & PHY_M_LEDC_PULS_MSK)
 /*****  PHY_MARV_PHY_STAT (page 3)16 bit r/w    Polarity Control Reg. *****/
 enum {
@@ -1233,7 +1234,7 @@ enum {
        PULS_1300MS     = 7,/* 1.3 s to 2.7 s */
 };
-#define PHY_M_LED_BLINK_RT(x)   (((x)<<8) & PHY_M_LEDC_BL_R_MSK)
+#define PHY_M_LED_BLINK_RT(x)   (((u16)(x)<<8) & PHY_M_LEDC_BL_R_MSK)
 enum {
        BLINK_42MS      = 0,/* 42 ms */
@@ -1243,21 +1244,18 @@ enum {
        BLINK_670MS     = 4,/* 670 ms */
 };
-/*****  PHY_MARV_LED_OVER       16 bit r/w      Manual LED Override Reg *****/
+/**** PHY_MARV_LED_OVER    16 bit r/w LED control */
-#define PHY_M_LED_MO_SGMII(x)   ((x)<<14) /* Bit 15..14:  SGMII AN Timer */
-                                                                                /* Bit 13..12:  reserved */
-#define PHY_M_LED_MO_DUP(x)     ((x)<<10) /* Bit 11..10:  Duplex */
-#define PHY_M_LED_MO_10(x)      ((x)<<8) /* Bit  9.. 8:  Link 10 */
-#define PHY_M_LED_MO_100(x)     ((x)<<6) /* Bit  7.. 6:  Link 100 */
-#define PHY_M_LED_MO_1000(x)    ((x)<<4) /* Bit  5.. 4:  Link 1000 */
-#define PHY_M_LED_MO_RX(x)      ((x)<<2) /* Bit  3.. 2:  Rx */
-#define PHY_M_LED_MO_TX(x)      ((x)<<0) /* Bit  1.. 0:  Tx */
 enum {
-        MO_LED_NORM     = 0,
+        PHY_M_LED_MO_DUP  = 3<<10,/* Bit 11..10:  Duplex */
-        MO_LED_BLINK    = 1,
+        PHY_M_LED_MO_10   = 3<<8, /* Bit  9.. 8:  Link 10 */
-        MO_LED_OFF      = 2,
+        PHY_M_LED_MO_100  = 3<<6, /* Bit  7.. 6:  Link 100 */
-        MO_LED_ON       = 3,
+        PHY_M_LED_MO_1000 = 3<<4, /* Bit  5.. 4:  Link 1000 */
+        PHY_M_LED_MO_RX   = 3<<2, /* Bit  3.. 2:  Rx */
+        PHY_M_LED_MO_TX   = 3<<0, /* Bit  1.. 0:  Tx */
+        PHY_M_LED_ALL     = PHY_M_LED_MO_DUP | PHY_M_LED_MO_10 
+                            | PHY_M_LED_MO_100 | PHY_M_LED_MO_1000
+                            | PHY_M_LED_MO_RX,
 };
 /*****  PHY_MARV_EXT_CTRL_2     16 bit r/w      Ext. PHY Specific Ctrl 2 *****/
@@ -1294,9 +1292,9 @@ enum {
        PHY_M_FELP_LED0_MSK = 0xf, /* Bit  3.. 0: LED0 Mask (SPEED) */
 };
-#define PHY_M_FELP_LED2_CTRL(x) (((x)<<8) & PHY_M_FELP_LED2_MSK)
+#define PHY_M_FELP_LED2_CTRL(x) (((u16)(x)<<8) & PHY_M_FELP_LED2_MSK)
-#define PHY_M_FELP_LED1_CTRL(x) (((x)<<4) & PHY_M_FELP_LED1_MSK)
+#define PHY_M_FELP_LED1_CTRL(x) (((u16)(x)<<4) & PHY_M_FELP_LED1_MSK)
-#define PHY_M_FELP_LED0_CTRL(x) (((x)<<0) & PHY_M_FELP_LED0_MSK)
+#define PHY_M_FELP_LED0_CTRL(x) (((u16)(x)<<0) & PHY_M_FELP_LED0_MSK)
 enum {
        LED_PAR_CTRL_COLX       = 0x00,
@@ -1552,8 +1550,8 @@ enum {
        GM_SMI_CT_BUSY          = 1<<3, /* Bit  3:      Busy (Operation in progress) */
 };
-#define GM_SMI_CT_PHY_AD(x)     (((x)<<11) & GM_SMI_CT_PHY_A_MSK)
+#define GM_SMI_CT_PHY_AD(x)     (((u16)(x)<<11) & GM_SMI_CT_PHY_A_MSK)
-#define GM_SMI_CT_REG_AD(x)     (((x)<<6) & GM_SMI_CT_REG_A_MSK)
+#define GM_SMI_CT_REG_AD(x)     (((u16)(x)<<6) & GM_SMI_CT_REG_A_MSK)
 /*      GM_PHY_ADDR                             16 bit r/w      GPHY Address Register */
 enum {
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index 889ef0d7c374..d70bc9795346 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -593,7 +593,7 @@ static void cleanup_card(struct net_device *dev)
        iounmap(ei_status.mem);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index e10755ec5def..2c5319c62fa5 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -437,7 +437,7 @@ int __init init_module(void)
        return -ENXIO;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index c0d13d650913..bd6e84506c29 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -1616,7 +1616,7 @@ int __init init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(devSMC9194);
        free_irq(devSMC9194->irq, devSMC9194);
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index a8640169fc77..9367c574477a 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -238,7 +238,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_CAN_USE_16BIT       1
 #define SMC_CAN_USE_32BIT       0
-#define SMC_inb(a, r)           inb((u32)a) + (r))
+#define SMC_inb(a, r)           inb(((u32)a) + (r))
 #define SMC_inw(a, r)           inw(((u32)a) + (r))
 #define SMC_outb(v, a, r)       outb(v, ((u32)a) + (r))
 #define SMC_outw(v, a, r)       outw(v, ((u32)a) + (r))
@@ -434,6 +434,24 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 #define SMC_IRQ_FLAGS           (0)
+#elif   defined(CONFIG_ARCH_VERSATILE)
+#define SMC_CAN_USE_8BIT        1
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       1
+#define SMC_NOWAIT              1
+#define SMC_inb(a, r)           readb((a) + (r))
+#define SMC_inw(a, r)           readw((a) + (r))
+#define SMC_inl(a, r)           readl((a) + (r))
+#define SMC_outb(v, a, r)       writeb(v, (a) + (r))
+#define SMC_outw(v, a, r)       writew(v, (a) + (r))
+#define SMC_outl(v, a, r)       writel(v, (a) + (r))
+#define SMC_insl(a, r, p, l)    readsl((a) + (r), p, l)
+#define SMC_outsl(a, r, p, l)   writesl((a) + (r), p, l)
+#define SMC_IRQ_FLAGS           (0)
 #else
 #define SMC_CAN_USE_8BIT        1
@@ -1216,7 +1234,7 @@ static const char * chip_ids[ 16 ] =  {
                if (SMC_CAN_USE_32BIT) {                                \
                        void *__ptr = (p);                              \
                        int __len = (l);                                \
-                        void *__ioaddr = ioaddr;                        \
+                        void __iomem *__ioaddr = ioaddr;                \
                        if (__len >= 2 && (unsigned long)__ptr & 2) {   \
                                __len -= 2;                             \
                                SMC_outw(*(u16 *)__ptr, ioaddr, DATA_REG); \
@@ -1240,7 +1258,7 @@ static const char * chip_ids[ 16 ] =  {
                if (SMC_CAN_USE_32BIT) {                                \
                        void *__ptr = (p);                              \
                        int __len = (l);                                \
-                        void *__ioaddr = ioaddr;                        \
+                        void __iomem *__ioaddr = ioaddr;                \
                        if ((unsigned long)__ptr & 2) {                 \
                                /*                                      \
                                 * We want 32bit alignment here.        \
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 47a1c09d19ac..c62e85d89f41 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -945,7 +945,7 @@ static void set_multicast_list( struct net_device *dev )
 static struct net_device *sun3lance_dev;
-int init_module(void)
+int __init init_module(void)
 {
        sun3lance_dev = sun3lance_probe(-1);
        if (IS_ERR(sun3lance_dev))
@@ -953,7 +953,7 @@ int init_module(void)
        return 0;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        unregister_netdev(sun3lance_dev);
 #ifdef CONFIG_SUN3
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 46dabdb12071..cec282a6f62d 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -5706,7 +5706,7 @@ int __init init_module(void)
        return found ? 0 : -ENODEV;
 }
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int i;
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index 41f1d6778849..7f38012b9c92 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -538,7 +538,7 @@ static void cleanup_card(struct net_device *dev)
        iounmap(ei_status.mem);
 }
-void
+void __exit
 cleanup_module(void)
 {
        int this_dev;
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 08bc57a4b895..974a8e5bec8b 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -1100,15 +1100,13 @@ static struct sta_info * ap_add_sta(struct ap_data *ap, u8 *addr)
 {
        struct sta_info *sta;
-        sta = (struct sta_info *)
+        sta = kzalloc(sizeof(struct sta_info), GFP_ATOMIC);
-                kmalloc(sizeof(struct sta_info), GFP_ATOMIC);
        if (sta == NULL) {
                PDEBUG(DEBUG_AP, "AP: kmalloc failed\n");
                return NULL;
        }
        /* initialize STA info data */
-        memset(sta, 0, sizeof(struct sta_info));
        sta->local = ap->local;
        skb_queue_head_init(&sta->tx_buf);
        memcpy(sta->addr, addr, ETH_ALEN);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index ee542ec6d6a8..8d8f4b9b8b07 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -563,12 +563,11 @@ static int prism2_config(struct pcmcia_device *link)
        PDEBUG(DEBUG_FLOW, "prism2_config()\n");
        parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
-        hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+        hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
        if (parse == NULL || hw_priv == NULL) {
                ret = -ENOMEM;
                goto failed;
        }
-        memset(hw_priv, 0, sizeof(*hw_priv));
        tuple.Attributes = 0;
        tuple.TupleData = buf;
diff --git a/drivers/net/wireless/hostap/hostap_download.c b/drivers/net/wireless/hostap/hostap_download.c
index ab26b52b3e76..24fc387bba67 100644
--- a/drivers/net/wireless/hostap/hostap_download.c
+++ b/drivers/net/wireless/hostap/hostap_download.c
@@ -685,14 +685,12 @@ static int prism2_download(local_info_t *local,
                goto out;
        }
-        dl = kmalloc(sizeof(*dl) + param->num_areas *
+        dl = kzalloc(sizeof(*dl) + param->num_areas *
                     sizeof(struct prism2_download_data_area), GFP_KERNEL);
        if (dl == NULL) {
                ret = -ENOMEM;
                goto out;
        }
-        memset(dl, 0, sizeof(*dl) + param->num_areas *
-               sizeof(struct prism2_download_data_area));
        dl->dl_cmd = param->dl_cmd;
        dl->start_addr = param->start_addr;
        dl->num_areas = param->num_areas;
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index c19e68636a1c..a394a23b9a20 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -347,14 +347,12 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
        if (signal_pending(current))
                return -EINTR;
-        entry = (struct hostap_cmd_queue *)
+        entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-                kmalloc(sizeof(*entry), GFP_ATOMIC);
        if (entry == NULL) {
                printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",
                       dev->name);
                return -ENOMEM;
        }
-        memset(entry, 0, sizeof(*entry));
        atomic_set(&entry->usecnt, 1);
        entry->type = CMD_SLEEP;
        entry->cmd = cmd;
@@ -517,14 +515,12 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,
                return -1;
        }
-        entry = (struct hostap_cmd_queue *)
+        entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-                kmalloc(sizeof(*entry), GFP_ATOMIC);
        if (entry == NULL) {
                printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "
                       "failed\n", dev->name);
                return -ENOMEM;
        }
-        memset(entry, 0, sizeof(*entry));
        atomic_set(&entry->usecnt, 1);
        entry->type = CMD_CALLBACK;
        entry->cmd = cmd;
@@ -3016,14 +3012,12 @@ static int prism2_set_tim(struct net_device *dev, int aid, int set)
        iface = netdev_priv(dev);
        local = iface->local;
-        new_entry = (struct set_tim_data *)
+        new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC);
-                kmalloc(sizeof(*new_entry), GFP_ATOMIC);
        if (new_entry == NULL) {
                printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",
                       local->dev->name);
                return -ENOMEM;
        }
-        memset(new_entry, 0, sizeof(*new_entry));
        new_entry->aid = aid;
        new_entry->set = set;
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index 5fd2b1ad7f5e..b6a02a02da74 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -327,11 +327,10 @@ static void prism2_info_hostscanresults(local_info_t *local,
        ptr = (u8 *) pos;
        new_count = left / result_size;
-        results = kmalloc(new_count * sizeof(struct hfa384x_hostscan_result),
+        results = kcalloc(new_count, sizeof(struct hfa384x_hostscan_result),
                          GFP_ATOMIC);
        if (results == NULL)
                return;
-        memset(results, 0, new_count * sizeof(struct hfa384x_hostscan_result));
        for (i = 0; i < new_count; i++) {
                memcpy(&results[i], ptr, copy_len);
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index d061fb3443ff..3b7b8063ff1c 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -181,12 +181,10 @@ static int prism2_ioctl_siwencode(struct net_device *dev,
                struct ieee80211_crypt_data *new_crypt;
                /* take WEP into use */
-                new_crypt = (struct ieee80211_crypt_data *)
+                new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
-                        kmalloc(sizeof(struct ieee80211_crypt_data),
                                GFP_KERNEL);
                if (new_crypt == NULL)
                        return -ENOMEM;
-                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                new_crypt->ops = ieee80211_get_crypto_ops("WEP");
                if (!new_crypt->ops) {
                        request_module("ieee80211_crypt_wep");
@@ -3320,14 +3318,12 @@ static int prism2_ioctl_siwencodeext(struct net_device *dev,
                prism2_crypt_delayed_deinit(local, crypt);
-                new_crypt = (struct ieee80211_crypt_data *)
+                new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
-                        kmalloc(sizeof(struct ieee80211_crypt_data),
                                GFP_KERNEL);
                if (new_crypt == NULL) {
                        ret = -ENOMEM;
                        goto done;
                }
-                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                new_crypt->ops = ops;
                new_crypt->priv = new_crypt->ops->init(i);
                if (new_crypt->priv == NULL) {
@@ -3538,14 +3534,12 @@ static int prism2_ioctl_set_encryption(local_info_t *local,
                prism2_crypt_delayed_deinit(local, crypt);
-                new_crypt = (struct ieee80211_crypt_data *)
+                new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
-                        kmalloc(sizeof(struct ieee80211_crypt_data),
                                GFP_KERNEL);
                if (new_crypt == NULL) {
                        ret = -ENOMEM;
                        goto done;
                }
-                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                new_crypt->ops = ops;
                new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
                if (new_crypt->priv == NULL) {
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index d1de9766c831..c4f6020baa9e 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -300,10 +300,9 @@ static int prism2_pci_probe(struct pci_dev *pdev,
        struct hostap_interface *iface;
        struct hostap_pci_priv *hw_priv;
-        hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+        hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
        if (hw_priv == NULL)
                return -ENOMEM;
-        memset(hw_priv, 0, sizeof(*hw_priv));
        if (pci_enable_device(pdev))
                goto err_out_free;
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index bc81b13a5a2a..e235e0647897 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -447,10 +447,9 @@ static int prism2_plx_probe(struct pci_dev *pdev,
        int tmd7160;
        struct hostap_plx_priv *hw_priv;
-        hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+        hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
        if (hw_priv == NULL)
                return -ENOMEM;
-        memset(hw_priv, 0, sizeof(*hw_priv));
        if (pci_enable_device(pdev))
                goto err_out_free;
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 1bcd352a813b..dd9ba4aad7bb 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6220,7 +6220,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
        /* Allocate and initialize the Tx/Rx queues and lists */
        if (ipw2100_queues_allocate(priv)) {
                printk(KERN_WARNING DRV_NAME
-                       "Error calilng ipw2100_queues_allocate.\n");
+                       "Error calling ipw2100_queues_allocate.\n");
                err = -ENOMEM;
                goto fail;
        }
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index e82e56bb85e1..22cb3fb7502e 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -70,7 +70,7 @@
 #define VQ
 #endif
-#define IPW2200_VERSION "1.1.4" VK VD VM VP VR VQ
+#define IPW2200_VERSION "1.2.0" VK VD VM VP VR VQ
 #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2200/2915 Network Driver"
 #define DRV_COPYRIGHT   "Copyright(c) 2003-2006 Intel Corporation"
 #define DRV_VERSION     IPW2200_VERSION
@@ -7677,7 +7677,8 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
        /* Big bitfield of all the fields we provide in radiotap */
        ipw_rt->rt_hdr.it_present =
-            ((1 << IEEE80211_RADIOTAP_FLAGS) |
+            ((1 << IEEE80211_RADIOTAP_TSFT) |
+             (1 << IEEE80211_RADIOTAP_FLAGS) |
             (1 << IEEE80211_RADIOTAP_RATE) |
             (1 << IEEE80211_RADIOTAP_CHANNEL) |
             (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
@@ -7686,10 +7687,14 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
        /* Zero the flags, we'll add to them as we go */
        ipw_rt->rt_flags = 0;
-        ipw_rt->rt_tsf = 0ULL;
+        ipw_rt->rt_tsf = (u64)(frame->parent_tsf[3] << 24 |
+                               frame->parent_tsf[2] << 16 |
+                               frame->parent_tsf[1] << 8  |
+                               frame->parent_tsf[0]);
        /* Convert signal to DBM */
        ipw_rt->rt_dbmsignal = antsignal;
+        ipw_rt->rt_dbmnoise = frame->noise;
        /* Convert the channel data and set the flags */
        ipw_rt->rt_channel = cpu_to_le16(ieee80211chan2mhz(received_channel));
@@ -7889,7 +7894,8 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
        /* Big bitfield of all the fields we provide in radiotap */
        ipw_rt->rt_hdr.it_present =
-            ((1 << IEEE80211_RADIOTAP_FLAGS) |
+            ((1 << IEEE80211_RADIOTAP_TSFT) |
+             (1 << IEEE80211_RADIOTAP_FLAGS) |
             (1 << IEEE80211_RADIOTAP_RATE) |
             (1 << IEEE80211_RADIOTAP_CHANNEL) |
             (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
@@ -7898,7 +7904,10 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
        /* Zero the flags, we'll add to them as we go */
        ipw_rt->rt_flags = 0;
-        ipw_rt->rt_tsf = 0ULL;
+        ipw_rt->rt_tsf = (u64)(frame->parent_tsf[3] << 24 |
+                               frame->parent_tsf[2] << 16 |
+                               frame->parent_tsf[1] << 8  |
+                               frame->parent_tsf[0]);
        /* Convert to DBM */
        ipw_rt->rt_dbmsignal = signal;
@@ -8297,7 +8306,7 @@ static void ipw_rx(struct ipw_priv *priv)
                                    ("Notification: subtype=%02X flags=%02X size=%d\n",
                                     pkt->u.notification.subtype,
                                     pkt->u.notification.flags,
-                                     pkt->u.notification.size);
+                                     le16_to_cpu(pkt->u.notification.size));
                                ipw_rx_notification(priv, &pkt->u.notification);
                                break;
                        }
@@ -11145,14 +11154,13 @@ static int ipw_up(struct ipw_priv *priv)
                return -EIO;
        if (cmdlog && !priv->cmdlog) {
-                priv->cmdlog = kmalloc(sizeof(*priv->cmdlog) * cmdlog,
+                priv->cmdlog = kcalloc(cmdlog, sizeof(*priv->cmdlog),
                                       GFP_KERNEL);
                if (priv->cmdlog == NULL) {
                        IPW_ERROR("Error allocating %d command log entries.\n",
                                  cmdlog);
                        return -ENOMEM;
                } else {
-                        memset(priv->cmdlog, 0, sizeof(*priv->cmdlog) * cmdlog);
                        priv->cmdlog_len = cmdlog;
                }
        }
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index a87eb51886c8..96606ed10076 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2141,11 +2141,9 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                                         struct islpci_bss_wpa_ie, list);
                        list_del(&bss->list);
                } else {
-                        bss = kmalloc(sizeof (*bss), GFP_ATOMIC);
+                        bss = kzalloc(sizeof (*bss), GFP_ATOMIC);
-                        if (bss != NULL) {
+                        if (bss != NULL)
                                priv->num_bss_wpa++;
-                                memset(bss, 0, sizeof (*bss));
-                        }
                }
                if (bss != NULL) {
                        memcpy(bss->bssid, bssid, ETH_ALEN);
@@ -2686,11 +2684,10 @@ prism2_ioctl_set_generic_element(struct net_device *ndev,
               return -EINVAL;
       alen = sizeof(*attach) + len;
-       attach = kmalloc(alen, GFP_KERNEL);
+       attach = kzalloc(alen, GFP_KERNEL);
       if (attach == NULL)
               return -ENOMEM;
-       memset(attach, 0, alen);
 #define WLAN_FC_TYPE_MGMT 0
 #define WLAN_FC_STYPE_ASSOC_REQ 0
 #define WLAN_FC_STYPE_REASSOC_REQ 2
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index fbc52b6a3024..e6cf9df2c206 100644
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -235,12 +235,10 @@ mgt_init(islpci_private *priv)
 {
        int i;
-        priv->mib = kmalloc(OID_NUM_LAST * sizeof (void *), GFP_KERNEL);
+        priv->mib = kcalloc(OID_NUM_LAST, sizeof (void *), GFP_KERNEL);
        if (!priv->mib)
                return -ENOMEM;
-        memset(priv->mib, 0, OID_NUM_LAST * sizeof (void *));
        /* Alloc the cache */
        for (i = 0; i < OID_NUM_LAST; i++) {
                if (isl_oid[i].flags & OID_FLAG_CACHED) {
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 8be99ebbe1cd..77e11ddad836 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1673,3 +1673,16 @@ int zd_rfwritev_cr_locked(struct zd_chip *chip,
        return 0;
 }
+int zd_chip_set_multicast_hash(struct zd_chip *chip,
+                               struct zd_mc_hash *hash)
+{
+        struct zd_ioreq32 ioreqs[] = {
+                { CR_GROUP_HASH_P1, hash->low },
+                { CR_GROUP_HASH_P2, hash->high },
+        };
+        dev_dbg_f(zd_chip_dev(chip), "hash l 0x%08x h 0x%08x\n",
+                ioreqs[0].value, ioreqs[1].value);
+        return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index ca892b9a6448..a4e3cee9b59d 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -390,10 +390,19 @@
 #define CR_BSSID_P1                     CTL_REG(0x0618)
 #define CR_BSSID_P2                     CTL_REG(0x061C)
 #define CR_BCN_PLCP_CFG                 CTL_REG(0x0620)
+/* Group hash table for filtering incoming packets.
+ *
+ * The group hash table is 64 bit large and split over two parts. The first
+ * part is the lower part. The upper 6 bits of the last byte of the target
+ * address are used as index. Packets are received if the hash table bit is
+ * set. This is used for multicast handling, but for broadcasts (address
+ * ff:ff:ff:ff:ff:ff) the highest bit in the second table must also be set.
+ */
 #define CR_GROUP_HASH_P1                CTL_REG(0x0624)
 #define CR_GROUP_HASH_P2                CTL_REG(0x0628)
-#define CR_RX_TIMEOUT                   CTL_REG(0x062C)
+#define CR_RX_TIMEOUT                   CTL_REG(0x062C)
 /* Basic rates supported by the BSS. When producing ACK or CTS messages, the
 * device will use a rate in this table that is less than or equal to the rate
 * of the incoming frame which prompted the response */
@@ -864,4 +873,36 @@ u8 zd_rx_strength_percent(u8 rssi);
 u16 zd_rx_rate(const void *rx_frame, const struct rx_status *status);
+struct zd_mc_hash {
+        u32 low;
+        u32 high;
+};
+static inline void zd_mc_clear(struct zd_mc_hash *hash)
+{
+        hash->low = 0;
+        /* The interfaces must always received broadcasts.
+         * The hash of the broadcast address ff:ff:ff:ff:ff:ff is 63.
+         */
+        hash->high = 0x80000000;
+}
+static inline void zd_mc_add_all(struct zd_mc_hash *hash)
+{
+        hash->low = hash->high = 0xffffffff;
+}
+static inline void zd_mc_add_addr(struct zd_mc_hash *hash, u8 *addr)
+{
+        unsigned int i = addr[5] >> 2;
+        if (i < 32) {
+                hash->low |= 1 << i;
+        } else {
+                hash->high |= 1 << (i-32);
+        }
+}
+int zd_chip_set_multicast_hash(struct zd_chip *chip,
+                               struct zd_mc_hash *hash);
 #endif /* _ZD_CHIP_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index f1573a9c2336..00ca704ece35 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -39,6 +39,8 @@ static void housekeeping_init(struct zd_mac *mac);
 static void housekeeping_enable(struct zd_mac *mac);
 static void housekeeping_disable(struct zd_mac *mac);
+static void set_multicast_hash_handler(struct work_struct *work);
 int zd_mac_init(struct zd_mac *mac,
                struct net_device *netdev,
                struct usb_interface *intf)
@@ -55,6 +57,7 @@ int zd_mac_init(struct zd_mac *mac,
        softmac_init(ieee80211_priv(netdev));
        zd_chip_init(&mac->chip, netdev, intf);
        housekeeping_init(mac);
+        INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler);
        return 0;
 }
@@ -136,6 +139,7 @@ out:
 void zd_mac_clear(struct zd_mac *mac)
 {
+        flush_workqueue(zd_workqueue);
        zd_chip_clear(&mac->chip);
        ZD_ASSERT(!spin_is_locked(&mac->lock));
        ZD_MEMCLEAR(mac, sizeof(struct zd_mac));
@@ -256,6 +260,43 @@ int zd_mac_set_mac_address(struct net_device *netdev, void *p)
        return 0;
 }
+static void set_multicast_hash_handler(struct work_struct *work)
+{
+        struct zd_mac *mac = container_of(work, struct zd_mac,
+                                          set_multicast_hash_work);
+        struct zd_mc_hash hash;
+        spin_lock_irq(&mac->lock);
+        hash = mac->multicast_hash;
+        spin_unlock_irq(&mac->lock);
+        zd_chip_set_multicast_hash(&mac->chip, &hash);
+}
+void zd_mac_set_multicast_list(struct net_device *dev)
+{
+        struct zd_mc_hash hash;
+        struct zd_mac *mac = zd_netdev_mac(dev);
+        struct dev_mc_list *mc;
+        unsigned long flags;
+        if (dev->flags & (IFF_PROMISC|IFF_ALLMULTI)) {
+                zd_mc_add_all(&hash);
+        } else {
+                zd_mc_clear(&hash);
+                for (mc = dev->mc_list; mc; mc = mc->next) {
+                        dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
+                                  MAC_ARG(mc->dmi_addr));
+                        zd_mc_add_addr(&hash, mc->dmi_addr);
+                }
+        }
+        spin_lock_irqsave(&mac->lock, flags);
+        mac->multicast_hash = hash;
+        spin_unlock_irqrestore(&mac->lock, flags);
+        queue_work(zd_workqueue, &mac->set_multicast_hash_work);
+}
 int zd_mac_set_regdomain(struct zd_mac *mac, u8 regdomain)
 {
        int r;
@@ -618,6 +659,9 @@ int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range)
        range->we_version_compiled = WIRELESS_EXT;
        range->we_version_source = 20;
+        range->enc_capa = IW_ENC_CAPA_WPA |  IW_ENC_CAPA_WPA2 |
+                          IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
        ZD_ASSERT(!irqs_disabled());
        spin_lock_irq(&mac->lock);
        regdomain = mac->regdomain;
@@ -930,7 +974,8 @@ static int is_data_packet_for_us(struct ieee80211_device *ieee,
        }
        return memcmp(hdr->addr1, netdev->dev_addr, ETH_ALEN) == 0 ||
-               is_multicast_ether_addr(hdr->addr1) ||
+               (is_multicast_ether_addr(hdr->addr1) &&
+                memcmp(hdr->addr3, netdev->dev_addr, ETH_ALEN) != 0) ||
               (netdev->flags & IFF_PROMISC);
 }
@@ -1062,10 +1107,8 @@ int zd_mac_rx(struct zd_mac *mac, const u8 *buffer, unsigned int length)
        memcpy(skb_put(skb, length), buffer, length);
        r = ieee80211_rx(ieee, skb, &stats);
-        if (!r) {
+        if (!r)
-                ZD_ASSERT(in_irq());
+                dev_kfree_skb_any(skb);
-                dev_kfree_skb_irq(skb);
-        }
        return 0;
 }
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index d4e8b870409d..f0cf05dc7d3e 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -133,6 +133,8 @@ struct zd_mac {
        struct iw_statistics iw_stats;
        struct housekeeping housekeeping;
+        struct work_struct set_multicast_hash_work;
+        struct zd_mc_hash multicast_hash;
        struct delayed_work set_rts_cts_work;
        struct delayed_work set_basic_rates_work;
@@ -189,6 +191,7 @@ int zd_mac_init_hw(struct zd_mac *mac, u8 device_type);
 int zd_mac_open(struct net_device *netdev);
 int zd_mac_stop(struct net_device *netdev);
 int zd_mac_set_mac_address(struct net_device *dev, void *p);
+void zd_mac_set_multicast_list(struct net_device *netdev);
 int zd_mac_rx(struct zd_mac *mac, const u8 *buffer, unsigned int length);
diff --git a/drivers/net/wireless/zd1211rw/zd_netdev.c b/drivers/net/wireless/zd1211rw/zd_netdev.c
index 60f1b0f6d45b..8bda48de31ef 100644
--- a/drivers/net/wireless/zd1211rw/zd_netdev.c
+++ b/drivers/net/wireless/zd1211rw/zd_netdev.c
@@ -242,7 +242,7 @@ struct net_device *zd_netdev_alloc(struct usb_interface *intf)
        netdev->open = zd_mac_open;
        netdev->stop = zd_mac_stop;
        /* netdev->get_stats = */
-        /* netdev->set_multicast_list = */
+        netdev->set_multicast_list = zd_mac_set_multicast_list;
        netdev->set_mac_address = zd_mac_set_mac_address;
        netdev->wireless_handlers = &iw_handler_def;
        /* netdev->ethtool_ops = */
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index 08386c102954..eec1a1dd91da 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -431,6 +431,17 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
        return 0;
 }
+void
+ieee80211softmac_try_reassoc(struct ieee80211softmac_device *mac)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&mac->lock, flags);
+        mac->associnfo.associating = 1;
+        schedule_work(&mac->associnfo.work);
+        spin_unlock_irqrestore(&mac->lock, flags);
+}
 int
 ieee80211softmac_handle_disassoc(struct net_device * dev,
                                 struct ieee80211_disassoc *disassoc)
@@ -449,8 +460,7 @@ ieee80211softmac_handle_disassoc(struct net_device * dev,
        dprintk(KERN_INFO PFX "got disassoc frame\n");
        ieee80211softmac_disassoc(mac);
-        /* try to reassociate */
+        ieee80211softmac_try_reassoc(mac);
-        schedule_delayed_work(&mac->associnfo.work, 0);
        return 0;
 }
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index 6012705aa4f8..8ed3e59b8024 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -337,6 +337,8 @@ ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac,
        /* can't transmit data right now... */
        netif_carrier_off(mac->dev);
        spin_unlock_irqrestore(&mac->lock, flags);
+        ieee80211softmac_try_reassoc(mac);
 }
 /* 
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
index c0dbe070e548..4c2bba34d328 100644
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -239,4 +239,6 @@ void ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, in
 int ieee80211softmac_notify_internal(struct ieee80211softmac_device *mac,
        int event, void *event_context, notify_function_ptr fun, void *context, gfp_t gfp_mask);
+void ieee80211softmac_try_reassoc(struct ieee80211softmac_device *mac);
 #endif /* IEEE80211SOFTMAC_PRIV_H_ */
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 2ffaebd21c53..480d72c7a42c 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -495,7 +495,8 @@ ieee80211softmac_wx_set_mlme(struct net_device *dev,
                        printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n");
                        goto out;
                }
-                return ieee80211softmac_deauth_req(mac, net, reason);
+                err =  ieee80211softmac_deauth_req(mac, net, reason);
+                goto out;
        case IW_MLME_DISASSOC:
                ieee80211softmac_send_disassoc_req(mac, reason);
                mac->associnfo.associated = 0;