5 files changed, 167 insertions, 147 deletions

diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index a478786840a6..ca306fd5f588 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -16,7 +16,7 @@
  */
 #define DRV_NAME        "qlge"
 #define DRV_STRING      "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION     "v1.00.00.25.00.00-01"
+#define DRV_VERSION     "v1.00.00.29.00.00-01"
 
 #define WQ_ADDR_ALIGN   0x3     /* 4 byte alignment */
 
@@ -1996,6 +1996,7 @@ enum {
         QL_LB_LINK_UP = 10,
         QL_FRC_COREDUMP = 11,
         QL_EEH_FATAL = 12,
+        QL_ASIC_RECOVERY = 14, /* We are in ascic recovery. */
 };
 
 /* link_status bit definitions */
@@ -2083,6 +2084,7 @@ struct ql_adapter {
         u32 mailbox_in;
         u32 mailbox_out;
         struct mbox_params idc_mbc;
+        struct mutex    mpi_mutex;
 
         int tx_ring_size;
         int rx_ring_size;
@@ -2133,7 +2135,7 @@ struct ql_adapter {
         struct delayed_work mpi_idc_work;
         struct delayed_work mpi_core_to_log;
         struct completion ide_completion;
-        struct nic_operations *nic_ops;
+        const struct nic_operations *nic_ops;
         u16 device_id;
         struct timer_list timer;
         atomic_t lb_count;
@@ -2221,12 +2223,12 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data);
 int ql_unpause_mpi_risc(struct ql_adapter *qdev);
 int ql_pause_mpi_risc(struct ql_adapter *qdev);
 int ql_hard_reset_mpi_risc(struct ql_adapter *qdev);
+int ql_soft_reset_mpi_risc(struct ql_adapter *qdev);
 int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf,
                 u32 ram_addr, int word_count);
 int ql_core_dump(struct ql_adapter *qdev,
                 struct ql_mpi_coredump *mpi_coredump);
 int ql_mb_about_fw(struct ql_adapter *qdev);
-int ql_wol(struct ql_adapter *qdev);
 int ql_mb_wol_set_magic(struct ql_adapter *qdev, u32 enable_wol);
 int ql_mb_wol_mode(struct ql_adapter *qdev, u32 wol);
 int ql_mb_set_led_cfg(struct ql_adapter *qdev, u32 led_config);
@@ -2237,22 +2239,20 @@ int ql_mb_set_mgmnt_traffic_ctl(struct ql_adapter *qdev, u32 control);
 int ql_mb_get_port_cfg(struct ql_adapter *qdev);
 int ql_mb_set_port_cfg(struct ql_adapter *qdev);
 int ql_wait_fifo_empty(struct ql_adapter *qdev);
+void ql_get_dump(struct ql_adapter *qdev, void *buff);
 void ql_gen_reg_dump(struct ql_adapter *qdev,
                         struct ql_reg_dump *mpi_coredump);
 netdev_tx_t ql_lb_send(struct sk_buff *skb, struct net_device *ndev);
 void ql_check_lb_frame(struct ql_adapter *, struct sk_buff *);
 int ql_own_firmware(struct ql_adapter *qdev);
 int ql_clean_lb_rx_ring(struct rx_ring *rx_ring, int budget);
-void qlge_set_multicast_list(struct net_device *ndev);
 
-#if 1
-#define QL_ALL_DUMP
-#define QL_REG_DUMP
-#define QL_DEV_DUMP
-#define QL_CB_DUMP
+/* #define QL_ALL_DUMP */
+/* #define QL_REG_DUMP */
+/* #define QL_DEV_DUMP */
+/* #define QL_CB_DUMP */
 /* #define QL_IB_DUMP */
 /* #define QL_OB_DUMP */
-#endif
 
 #ifdef QL_REG_DUMP
 extern void ql_dump_xgmac_control_regs(struct ql_adapter *qdev);
diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c
index 4747492935ef..fca804f36d61 100644
--- a/drivers/net/qlge/qlge_dbg.c
+++ b/drivers/net/qlge/qlge_dbg.c
@@ -1317,9 +1317,28 @@ void ql_gen_reg_dump(struct ql_adapter *qdev,
         status = ql_get_ets_regs(qdev, &mpi_coredump->ets[0]);
         if (status)
                 return;
+}
+
+void ql_get_dump(struct ql_adapter *qdev, void *buff)
+{
+        /*
+         * If the dump has already been taken and is stored
+         * in our internal buffer and if force dump is set then
+         * just start the spool to dump it to the log file
+         * and also, take a snapshot of the general regs to
+         * to the user's buffer or else take complete dump
+         * to the user's buffer if force is not set.
+         */
 
-        if (test_bit(QL_FRC_COREDUMP, &qdev->flags))
+        if (!test_bit(QL_FRC_COREDUMP, &qdev->flags)) {
+                if (!ql_core_dump(qdev, buff))
+                        ql_soft_reset_mpi_risc(qdev);
+                else
+                        netif_err(qdev, drv, qdev->ndev, "coredump failed!\n");
+        } else {
+                ql_gen_reg_dump(qdev, buff);
                 ql_get_core_dump(qdev);
+        }
 }
 
 /* Coredump to messages log file using separate worker thread */
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c
index 4892d64f4e05..19b00fa0eaf0 100644
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@ -356,7 +356,7 @@ static int ql_get_settings(struct net_device *ndev,
                 ecmd->port = PORT_FIBRE;
         }
 
-        ecmd->speed = SPEED_10000;
+        ethtool_cmd_speed_set(ecmd, SPEED_10000);
         ecmd->duplex = DUPLEX_FULL;
 
         return 0;
@@ -375,7 +375,10 @@ static void ql_get_drvinfo(struct net_device *ndev,
         strncpy(drvinfo->bus_info, pci_name(qdev->pdev), 32);
         drvinfo->n_stats = 0;
         drvinfo->testinfo_len = 0;
-        drvinfo->regdump_len = 0;
+        if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))
+                drvinfo->regdump_len = sizeof(struct ql_mpi_coredump);
+        else
+                drvinfo->regdump_len = sizeof(struct ql_reg_dump);
         drvinfo->eedump_len = 0;
 }
 
@@ -409,31 +412,31 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
         return 0;
 }
 
-static int ql_phys_id(struct net_device *ndev, u32 data)
+static int ql_set_phys_id(struct net_device *ndev,
+                          enum ethtool_phys_id_state state)
+
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
-        u32 led_reg, i;
-        int status;
 
-        /* Save the current LED settings */
-        status = ql_mb_get_led_cfg(qdev);
-        if (status)
-                return status;
-        led_reg = qdev->led_config;
+        switch (state) {
+        case ETHTOOL_ID_ACTIVE:
+                /* Save the current LED settings */
+                if (ql_mb_get_led_cfg(qdev))
+                        return -EIO;
 
-        /* Start blinking the led */
-        if (!data || data > 300)
-                data = 300;
-
-        for (i = 0; i < (data * 10); i++)
+                /* Start blinking */
                 ql_mb_set_led_cfg(qdev, QL_LED_BLINK);
+                return 0;
 
-        /* Restore LED settings */
-        status = ql_mb_set_led_cfg(qdev, led_reg);
-        if (status)
-                return status;
+        case ETHTOOL_ID_INACTIVE:
+                /* Restore LED settings */
+                if (ql_mb_set_led_cfg(qdev, qdev->led_config))
+                        return -EIO;
+                return 0;
 
-        return 0;
+        default:
+                return -EINVAL;
+        }
 }
 
 static int ql_start_loopback(struct ql_adapter *qdev)
@@ -547,7 +550,12 @@ static void ql_self_test(struct net_device *ndev,
 
 static int ql_get_regs_len(struct net_device *ndev)
 {
-        return sizeof(struct ql_reg_dump);
+        struct ql_adapter *qdev = netdev_priv(ndev);
+
+        if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))
+                return sizeof(struct ql_mpi_coredump);
+        else
+                return sizeof(struct ql_reg_dump);
 }
 
 static void ql_get_regs(struct net_device *ndev,
@@ -555,7 +563,12 @@ static void ql_get_regs(struct net_device *ndev,
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
 
-        ql_gen_reg_dump(qdev, p);
+        ql_get_dump(qdev, p);
+        qdev->core_is_dumped = 0;
+        if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))
+                regs->len = sizeof(struct ql_mpi_coredump);
+        else
+                regs->len = sizeof(struct ql_reg_dump);
 }
 
 static int ql_get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
@@ -642,32 +655,6 @@ static int ql_set_pauseparam(struct net_device *netdev,
         return status;
 }
 
-static u32 ql_get_rx_csum(struct net_device *netdev)
-{
-        struct ql_adapter *qdev = netdev_priv(netdev);
-        return qdev->rx_csum;
-}
-
-static int ql_set_rx_csum(struct net_device *netdev, uint32_t data)
-{
-        struct ql_adapter *qdev = netdev_priv(netdev);
-        qdev->rx_csum = data;
-        return 0;
-}
-
-static int ql_set_tso(struct net_device *ndev, uint32_t data)
-{
-
-        if (data) {
-                ndev->features |= NETIF_F_TSO;
-                ndev->features |= NETIF_F_TSO6;
-        } else {
-                ndev->features &= ~NETIF_F_TSO;
-                ndev->features &= ~NETIF_F_TSO6;
-        }
-        return 0;
-}
-
 static u32 ql_get_msglevel(struct net_device *ndev)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
@@ -690,18 +677,10 @@ const struct ethtool_ops qlge_ethtool_ops = {
         .get_msglevel = ql_get_msglevel,
         .set_msglevel = ql_set_msglevel,
         .get_link = ethtool_op_get_link,
-        .phys_id                 = ql_phys_id,
+        .set_phys_id             = ql_set_phys_id,
         .self_test               = ql_self_test,
         .get_pauseparam          = ql_get_pauseparam,
         .set_pauseparam          = ql_set_pauseparam,
-        .get_rx_csum = ql_get_rx_csum,
-        .set_rx_csum = ql_set_rx_csum,
-        .get_tx_csum = ethtool_op_get_tx_csum,
-        .set_tx_csum = ethtool_op_set_tx_csum,
-        .get_sg = ethtool_op_get_sg,
-        .set_sg = ethtool_op_set_sg,
-        .get_tso = ethtool_op_get_tso,
-        .set_tso = ql_set_tso,
         .get_coalesce = ql_get_coalesce,
         .set_coalesce = ql_set_coalesce,
         .get_sset_count = ql_get_sset_count,
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 5f89e83501f4..6b4ff970972b 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <linux/prefetch.h>
 #include <net/ip6_checksum.h>
 
 #include "qlge.h"
@@ -62,15 +63,15 @@ static const u32 default_msg =
 /* NETIF_MSG_PKTDATA | */
     NETIF_MSG_HW | NETIF_MSG_WOL | 0;
 
-static int debug = 0x00007fff;  /* defaults above */
-module_param(debug, int, 0);
+static int debug = -1;  /* defaults above */
+module_param(debug, int, 0664);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 
 #define MSIX_IRQ 0
 #define MSI_IRQ 1
 #define LEG_IRQ 2
 static int qlge_irq_type = MSIX_IRQ;
-module_param(qlge_irq_type, int, MSIX_IRQ);
+module_param(qlge_irq_type, int, 0664);
 MODULE_PARM_DESC(qlge_irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy.");
 
 static int qlge_mpi_coredump;
@@ -94,6 +95,9 @@ static DEFINE_PCI_DEVICE_TABLE(qlge_pci_tbl) = {
 
 MODULE_DEVICE_TABLE(pci, qlge_pci_tbl);
 
+static int ql_wol(struct ql_adapter *qdev);
+static void qlge_set_multicast_list(struct net_device *ndev);
+
 /* This hardware semaphore causes exclusive access to
  * resources shared between the NIC driver, MPI firmware,
  * FCOE firmware and the FC driver.
@@ -657,7 +661,7 @@ static void ql_disable_interrupts(struct ql_adapter *qdev)
 /* If we're running with multiple MSI-X vectors then we enable on the fly.
  * Otherwise, we may have multiple outstanding workers and don't want to
  * enable until the last one finishes. In this case, the irq_cnt gets
- * incremented everytime we queue a worker and decremented everytime
+ * incremented every time we queue a worker and decremented every time
  * a worker finishes.  Once it hits zero we enable the interrupt.
  */
 u32 ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr)
@@ -1566,9 +1570,9 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
         rx_ring->rx_packets++;
         rx_ring->rx_bytes += skb->len;
         skb->protocol = eth_type_trans(skb, ndev);
-        skb->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb);
 
-        if (qdev->rx_csum &&
+        if ((ndev->features & NETIF_F_RXCSUM) &&
                 !(ib_mac_rsp->flags1 & IB_MAC_CSUM_ERR_MASK)) {
                 /* TCP frame. */
                 if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_T) {
@@ -1676,12 +1680,12 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
         rx_ring->rx_packets++;
         rx_ring->rx_bytes += skb->len;
         skb->protocol = eth_type_trans(skb, ndev);
-        skb->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb);
 
         /* If rx checksum is on, and there are no
          * csum or frame errors.
          */
-        if (qdev->rx_csum &&
+        if ((ndev->features & NETIF_F_RXCSUM) &&
                 !(ib_mac_rsp->flags1 & IB_MAC_CSUM_ERR_MASK)) {
                 /* TCP frame. */
                 if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_T) {
@@ -1996,12 +2000,12 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
         }
 
         skb->protocol = eth_type_trans(skb, ndev);
-        skb->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb);
 
         /* If rx checksum is on, and there are no
          * csum or frame errors.
          */
-        if (qdev->rx_csum &&
+        if ((ndev->features & NETIF_F_RXCSUM) &&
                 !(ib_mac_rsp->flags1 & IB_MAC_CSUM_ERR_MASK)) {
                 /* TCP frame. */
                 if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_T) {
@@ -2148,6 +2152,10 @@ void ql_queue_asic_error(struct ql_adapter *qdev)
          * thread
          */
         clear_bit(QL_ADAPTER_UP, &qdev->flags);
+        /* Set asic recovery bit to indicate reset process that we are
+         * in fatal error recovery process rather than normal close
+         */
+        set_bit(QL_ASIC_RECOVERY, &qdev->flags);
         queue_delayed_work(qdev->workqueue, &qdev->asic_reset_work, 0);
 }
 
@@ -2162,23 +2170,20 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev,
                 return;
 
         case CAM_LOOKUP_ERR_EVENT:
-                netif_err(qdev, link, qdev->ndev,
-                          "Multiple CAM hits lookup occurred.\n");
-                netif_err(qdev, drv, qdev->ndev,
-                          "This event shouldn't occur.\n");
+                netdev_err(qdev->ndev, "Multiple CAM hits lookup occurred.\n");
+                netdev_err(qdev->ndev, "This event shouldn't occur.\n");
                 ql_queue_asic_error(qdev);
                 return;
 
         case SOFT_ECC_ERROR_EVENT:
-                netif_err(qdev, rx_err, qdev->ndev,
-                          "Soft ECC error detected.\n");
+                netdev_err(qdev->ndev, "Soft ECC error detected.\n");
                 ql_queue_asic_error(qdev);
                 break;
 
         case PCI_ERR_ANON_BUF_RD:
-                netif_err(qdev, rx_err, qdev->ndev,
-                          "PCI error occurred when reading anonymous buffers from rx_ring %d.\n",
-                          ib_ae_rsp->q_id);
+                netdev_err(qdev->ndev, "PCI error occurred when reading "
+                                        "anonymous buffers from rx_ring %d.\n",
+                                        ib_ae_rsp->q_id);
                 ql_queue_asic_error(qdev);
                 break;
 
@@ -2222,10 +2227,11 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
                 ql_update_cq(rx_ring);
                 prod = ql_read_sh_reg(rx_ring->prod_idx_sh_reg);
         }
+        if (!net_rsp)
+                return 0;
         ql_write_cq_idx(rx_ring);
         tx_ring = &qdev->tx_ring[net_rsp->txq_idx];
-        if (__netif_subqueue_stopped(qdev->ndev, tx_ring->wq_id) &&
-                                        net_rsp != NULL) {
+        if (__netif_subqueue_stopped(qdev->ndev, tx_ring->wq_id)) {
                 if (atomic_read(&tx_ring->queue_stopped) &&
                     (atomic_read(&tx_ring->tx_count) > (tx_ring->wq_len / 4)))
                         /*
@@ -2381,6 +2387,20 @@ static void qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)
 
 }
 
+static void qlge_restore_vlan(struct ql_adapter *qdev)
+{
+        qlge_vlan_rx_register(qdev->ndev, qdev->vlgrp);
+
+        if (qdev->vlgrp) {
+                u16 vid;
+                for (vid = 0; vid < VLAN_N_VID; vid++) {
+                        if (!vlan_group_get_device(qdev->vlgrp, vid))
+                                continue;
+                        qlge_vlan_rx_add_vid(qdev->ndev, vid);
+                }
+        }
+}
+
 /* MSI-X Multiple Vector Interrupt Handler for inbound completions. */
 static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id)
 {
@@ -2418,11 +2438,10 @@ static irqreturn_t qlge_isr(int irq, void *dev_id)
          */
         if (var & STS_FE) {
                 ql_queue_asic_error(qdev);
-                netif_err(qdev, intr, qdev->ndev,
-                          "Got fatal error, STS = %x.\n", var);
+                netdev_err(qdev->ndev, "Got fatal error, STS = %x.\n", var);
                 var = ql_read32(qdev, ERR_STS);
-                netif_err(qdev, intr, qdev->ndev,
-                          "Resetting chip. Error Status Register = 0x%x\n", var);
+                netdev_err(qdev->ndev, "Resetting chip. "
+                                        "Error Status Register = 0x%x\n", var);
                 return IRQ_HANDLED;
         }
 
@@ -2571,7 +2590,7 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev)
 
         mac_iocb_ptr->frame_len = cpu_to_le16((u16) skb->len);
 
-        if (qdev->vlgrp && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 netif_printk(qdev, tx_queued, KERN_DEBUG, qdev->ndev,
                              "Adding a vlan tag %d.\n", vlan_tx_tag_get(skb));
                 mac_iocb_ptr->flags3 |= OB_MAC_IOCB_V;
@@ -3281,7 +3300,7 @@ msi:
  * will service it.  An example would be if there are
  * 2 vectors (so 2 RSS rings) and 8 TX completion rings.
  * This would mean that vector 0 would service RSS ring 0
- * and TX competion rings 0,1,2 and 3.  Vector 1 would
+ * and TX completion rings 0,1,2 and 3.  Vector 1 would
  * service RSS ring 1 and TX completion rings 4,5,6 and 7.
  */
 static void ql_set_tx_vect(struct ql_adapter *qdev)
@@ -3530,12 +3549,13 @@ err_irq:
 
 static int ql_start_rss(struct ql_adapter *qdev)
 {
-        u8 init_hash_seed[] = {0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
-                                0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f,
-                                0xb0, 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b,
-                                0x30, 0xb4, 0x77, 0xcb, 0x2d, 0xa3, 0x80,
-                                0x30, 0xf2, 0x0c, 0x6a, 0x42, 0xb7, 0x3b,
-                                0xbe, 0xac, 0x01, 0xfa};
+        static const u8 init_hash_seed[] = {
+                0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
+                0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
+                0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
+                0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
+                0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa
+        };
         struct ricb *ricb = &qdev->ricb;
         int status = 0;
         int i;
@@ -3798,11 +3818,17 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
         end_jiffies = jiffies +
                 max((unsigned long)1, usecs_to_jiffies(30));
 
-        /* Stop management traffic. */
-        ql_mb_set_mgmnt_traffic_ctl(qdev, MB_SET_MPI_TFK_STOP);
+        /* Check if bit is set then skip the mailbox command and
+         * clear the bit, else we are in normal reset process.
+         */
+        if (!test_bit(QL_ASIC_RECOVERY, &qdev->flags)) {
+                /* Stop management traffic. */
+                ql_mb_set_mgmnt_traffic_ctl(qdev, MB_SET_MPI_TFK_STOP);
 
-        /* Wait for the NIC and MGMNT FIFOs to empty. */
-        ql_wait_fifo_empty(qdev);
+                /* Wait for the NIC and MGMNT FIFOs to empty. */
+                ql_wait_fifo_empty(qdev);
+        } else
+                clear_bit(QL_ASIC_RECOVERY, &qdev->flags);
 
         ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR);
 
@@ -3826,7 +3852,7 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
 
 static void ql_display_dev_info(struct net_device *ndev)
 {
-        struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+        struct ql_adapter *qdev = netdev_priv(ndev);
 
         netif_info(qdev, probe, qdev->ndev,
                    "Function #%d, Port %d, NIC Roll %d, NIC Rev = %d, "
@@ -3841,7 +3867,7 @@ static void ql_display_dev_info(struct net_device *ndev)
                    "MAC address %pM\n", ndev->dev_addr);
 }
 
-int ql_wol(struct ql_adapter *qdev)
+static int ql_wol(struct ql_adapter *qdev)
 {
         int status = 0;
         u32 wol = MB_WOL_DISABLE;
@@ -3888,11 +3914,8 @@ int ql_wol(struct ql_adapter *qdev)
         return status;
 }
 
-static int ql_adapter_down(struct ql_adapter *qdev)
+static void ql_cancel_all_work_sync(struct ql_adapter *qdev)
 {
-        int i, status = 0;
-
-        ql_link_off(qdev);
 
         /* Don't kill the reset worker thread if we
          * are in the process of recovery.
@@ -3904,6 +3927,15 @@ static int ql_adapter_down(struct ql_adapter *qdev)
         cancel_delayed_work_sync(&qdev->mpi_idc_work);
         cancel_delayed_work_sync(&qdev->mpi_core_to_log);
         cancel_delayed_work_sync(&qdev->mpi_port_cfg_work);
+}
+
+static int ql_adapter_down(struct ql_adapter *qdev)
+{
+        int i, status = 0;
+
+        ql_link_off(qdev);
+
+        ql_cancel_all_work_sync(qdev);
 
         for (i = 0; i < qdev->rss_ring_count; i++)
                 napi_disable(&qdev->rx_ring[i].napi);
@@ -3950,6 +3982,9 @@ static int ql_adapter_up(struct ql_adapter *qdev)
         clear_bit(QL_PROMISCUOUS, &qdev->flags);
         qlge_set_multicast_list(qdev->ndev);
 
+        /* Restore vlan setting. */
+        qlge_restore_vlan(qdev);
+
         ql_enable_interrupts(qdev);
         ql_enable_all_completion_interrupts(qdev);
         netif_tx_start_all_queues(qdev->ndev);
@@ -4124,7 +4159,7 @@ static int ql_change_rx_buffers(struct ql_adapter *qdev)
         int i, status;
         u32 lbq_buf_len;
 
-        /* Wait for an oustanding reset to complete. */
+        /* Wait for an outstanding reset to complete. */
         if (!test_bit(QL_ADAPTER_UP, &qdev->flags)) {
                 int i = 3;
                 while (i-- && !test_bit(QL_ADAPTER_UP, &qdev->flags)) {
@@ -4235,9 +4270,9 @@ static struct net_device_stats *qlge_get_stats(struct net_device
         return &ndev->stats;
 }
 
-void qlge_set_multicast_list(struct net_device *ndev)
+static void qlge_set_multicast_list(struct net_device *ndev)
 {
-        struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+        struct ql_adapter *qdev = netdev_priv(ndev);
         struct netdev_hw_addr *ha;
         int i, status;
 
@@ -4253,7 +4288,7 @@ void qlge_set_multicast_list(struct net_device *ndev)
                         if (ql_set_routing_reg
                             (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 1)) {
                                 netif_err(qdev, hw, qdev->ndev,
-                                          "Failed to set promiscous mode.\n");
+                                          "Failed to set promiscuous mode.\n");
                         } else {
                                 set_bit(QL_PROMISCUOUS, &qdev->flags);
                         }
@@ -4263,7 +4298,7 @@ void qlge_set_multicast_list(struct net_device *ndev)
                         if (ql_set_routing_reg
                             (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 0)) {
                                 netif_err(qdev, hw, qdev->ndev,
-                                          "Failed to clear promiscous mode.\n");
+                                          "Failed to clear promiscuous mode.\n");
                         } else {
                                 clear_bit(QL_PROMISCUOUS, &qdev->flags);
                         }
@@ -4327,7 +4362,7 @@ exit:
 
 static int qlge_set_mac_address(struct net_device *ndev, void *p)
 {
-        struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+        struct ql_adapter *qdev = netdev_priv(ndev);
         struct sockaddr *addr = p;
         int status;
 
@@ -4350,7 +4385,7 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)
 
 static void qlge_tx_timeout(struct net_device *ndev)
 {
-        struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+        struct ql_adapter *qdev = netdev_priv(ndev);
         ql_queue_asic_error(qdev);
 }
 
@@ -4384,12 +4419,12 @@ error:
         rtnl_unlock();
 }
 
-static struct nic_operations qla8012_nic_ops = {
+static const struct nic_operations qla8012_nic_ops = {
         .get_flash              = ql_get_8012_flash_params,
         .port_initialize        = ql_8012_port_initialize,
 };
 
-static struct nic_operations qla8000_nic_ops = {
+static const struct nic_operations qla8000_nic_ops = {
         .get_flash              = ql_get_8000_flash_params,
         .port_initialize        = ql_8000_port_initialize,
 };
@@ -4593,7 +4628,6 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         /*
          * Set up the operating parameters.
          */
-        qdev->rx_csum = 1;
         qdev->workqueue = create_singlethread_workqueue(ndev->name);
         INIT_DELAYED_WORK(&qdev->asic_reset_work, ql_asic_reset_work);
         INIT_DELAYED_WORK(&qdev->mpi_reset_work, ql_mpi_reset_work);
@@ -4602,6 +4636,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         INIT_DELAYED_WORK(&qdev->mpi_idc_work, ql_mpi_idc_work);
         INIT_DELAYED_WORK(&qdev->mpi_core_to_log, ql_mpi_core_to_log);
         init_completion(&qdev->ide_completion);
+        mutex_init(&qdev->mpi_mutex);
 
         if (!cards_found) {
                 dev_info(&pdev->dev, "%s\n", DRV_STRING);
@@ -4666,15 +4701,11 @@ static int __devinit qlge_probe(struct pci_dev *pdev,
 
         qdev = netdev_priv(ndev);
         SET_NETDEV_DEV(ndev, &pdev->dev);
-        ndev->features = (0
-                          | NETIF_F_IP_CSUM
-                          | NETIF_F_SG
-                          | NETIF_F_TSO
-                          | NETIF_F_TSO6
-                          | NETIF_F_TSO_ECN
-                          | NETIF_F_HW_VLAN_TX
-                          | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER);
-        ndev->features |= NETIF_F_GRO;
+        ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
+                NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN |
+                NETIF_F_HW_VLAN_TX | NETIF_F_RXCSUM;
+        ndev->features = ndev->hw_features |
+                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
 
         if (test_bit(QL_DMA64, &qdev->flags))
                 ndev->features |= NETIF_F_HIGHDMA;
@@ -4726,6 +4757,7 @@ static void __devexit qlge_remove(struct pci_dev *pdev)
         struct net_device *ndev = pci_get_drvdata(pdev);
         struct ql_adapter *qdev = netdev_priv(ndev);
         del_timer_sync(&qdev->timer);
+        ql_cancel_all_work_sync(qdev);
         unregister_netdev(ndev);
         ql_release_all(pdev);
         pci_disable_device(pdev);
@@ -4745,13 +4777,7 @@ static void ql_eeh_close(struct net_device *ndev)
 
         /* Disabling the timer */
         del_timer_sync(&qdev->timer);
-        if (test_bit(QL_ADAPTER_UP, &qdev->flags))
-                cancel_delayed_work_sync(&qdev->asic_reset_work);
-        cancel_delayed_work_sync(&qdev->mpi_reset_work);
-        cancel_delayed_work_sync(&qdev->mpi_work);
-        cancel_delayed_work_sync(&qdev->mpi_idc_work);
-        cancel_delayed_work_sync(&qdev->mpi_core_to_log);
-        cancel_delayed_work_sync(&qdev->mpi_port_cfg_work);
+        ql_cancel_all_work_sync(qdev);
 
         for (i = 0; i < qdev->rss_ring_count; i++)
                 netif_napi_del(&qdev->rx_ring[i].napi);
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c
index f84e8570c7cb..ff2bf8a4e247 100644
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/qlge/qlge_mpi.c
@@ -534,6 +534,7 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp)
         int status;
         unsigned long count;
 
+        mutex_lock(&qdev->mpi_mutex);
 
         /* Begin polled mode for MPI */
         ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16));
@@ -603,6 +604,7 @@ done:
 end:
         /* End polled mode for MPI */
         ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16) | INTR_MASK_PI);
+        mutex_unlock(&qdev->mpi_mutex);
         return status;
 }
 
@@ -681,7 +683,7 @@ int ql_mb_get_fw_state(struct ql_adapter *qdev)
 /* Send and ACK mailbox command to the firmware to
  * let it continue with the change.
  */
-int ql_mb_idc_ack(struct ql_adapter *qdev)
+static int ql_mb_idc_ack(struct ql_adapter *qdev)
 {
         struct mbox_params mbc;
         struct mbox_params *mbcp = &mbc;
@@ -744,7 +746,7 @@ int ql_mb_set_port_cfg(struct ql_adapter *qdev)
         return status;
 }
 
-int ql_mb_dump_ram(struct ql_adapter *qdev, u64 req_dma, u32 addr,
+static int ql_mb_dump_ram(struct ql_adapter *qdev, u64 req_dma, u32 addr,
         u32 size)
 {
         int status = 0;
@@ -1099,9 +1101,7 @@ int ql_wait_fifo_empty(struct ql_adapter *qdev)
 static int ql_set_port_cfg(struct ql_adapter *qdev)
 {
         int status;
-        rtnl_lock();
         status = ql_mb_set_port_cfg(qdev);
-        rtnl_unlock();
         if (status)
                 return status;
         status = ql_idc_wait(qdev);
@@ -1122,9 +1122,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
             container_of(work, struct ql_adapter, mpi_port_cfg_work.work);
         int status;
 
-        rtnl_lock();
         status = ql_mb_get_port_cfg(qdev);
-        rtnl_unlock();
         if (status) {
                 netif_err(qdev, drv, qdev->ndev,
                           "Bug: Failed to get port config data.\n");
@@ -1167,7 +1165,6 @@ void ql_mpi_idc_work(struct work_struct *work)
         u32 aen;
         int timeout;
 
-        rtnl_lock();
         aen = mbcp->mbox_out[1] >> 16;
         timeout = (mbcp->mbox_out[1] >> 8) & 0xf;
 
@@ -1231,7 +1228,6 @@ void ql_mpi_idc_work(struct work_struct *work)
                 }
                 break;
         }
-        rtnl_unlock();
 }
 
 void ql_mpi_work(struct work_struct *work)
@@ -1242,7 +1238,7 @@ void ql_mpi_work(struct work_struct *work)
         struct mbox_params *mbcp = &mbc;
         int err = 0;
 
-        rtnl_lock();
+        mutex_lock(&qdev->mpi_mutex);
         /* Begin polled mode for MPI */
         ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16));
 
@@ -1259,7 +1255,7 @@ void ql_mpi_work(struct work_struct *work)
 
         /* End polled mode for MPI */
         ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16) | INTR_MASK_PI);
-        rtnl_unlock();
+        mutex_unlock(&qdev->mpi_mutex);
         ql_enable_completion_interrupt(qdev, 0);
 }