]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Internal branch sync. Included in this change:
authorVMware, Inc <>
Tue, 17 Nov 2009 21:52:05 +0000 (13:52 -0800)
committerMarcelo Vanzin <mvanzin@vmware.com>
Tue, 17 Nov 2009 21:52:05 +0000 (13:52 -0800)
. Handle ethtool CSO operations in vmxnet2.

. Sync vmxnet3 driver with upstreamed version.

. Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
open-vm-tools/lib/include/vm_assert.h
open-vm-tools/modules/linux/vmxnet/vmxnet.c
open-vm-tools/modules/linux/vmxnet/vmxnet_version.h
open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c
open-vm-tools/modules/linux/vmxnet3/vmxnet3_ethtool.c [new file with mode: 0644]
open-vm-tools/modules/linux/vmxnet3/vmxnet3_int.h
open-vm-tools/modules/linux/vmxnet3/vmxnet3_shm.c
open-vm-tools/modules/linux/vmxnet3/vmxnet3_shm.h

index ee1e8e336a45e4a923e53a7ad7b5470b67794cb1..09859b989b6c0bf282f8faaff72b8c73716a5859 100644 (file)
@@ -350,10 +350,19 @@ EXTERN void WarningThrottled(uint32 *count, const char *fmt, ...)
 
 #if !defined VMM || defined MONITOR_APP // {
 
+#if defined VMKERNEL
+// vmkernel Panic() function does not want a trailing newline.
+#define _ASSERT_PANIC(name) \
+           Panic(_##name##Fmt, __FILE__, __LINE__)
+#define _ASSERT_PANIC_BUG(bug, name) \
+           Panic(_##name##Fmt " bugNr=%d", __FILE__, __LINE__, bug)
+
+#else /* !VMKERNEL */
 #define _ASSERT_PANIC(name) \
            Panic(_##name##Fmt "\n", __FILE__, __LINE__)
 #define _ASSERT_PANIC_BUG(bug, name) \
            Panic(_##name##Fmt " bugNr=%d\n", __FILE__, __LINE__, bug)
+#endif /* VMKERNEL */
 
 #define AssertLengthFmt     _AssertLengthFmt
 #define AssertUnexpectedFmt _AssertUnexpectedFmt
index a8e040271821fade6e00ac0a60c19496b082e092..659f59a1de8f9df2c2f155c22bb316930cd78f46 100644 (file)
@@ -365,6 +365,118 @@ vmxnet_get_drvinfo(struct net_device *dev,
 }
 
 
+/*
+ *----------------------------------------------------------------------------
+ *
+ * vmxnet_get_tx_csum --
+ *
+ *    Ethtool op to check whether or not hw csum offload is enabled.
+ *
+ * Result:
+ *    1 if csum offload is currently used and 0 otherwise.
+ *
+ * Side-effects:
+ *    None
+ *
+ *----------------------------------------------------------------------------
+ */
+
+static uint32
+vmxnet_get_tx_csum(struct net_device *netdev)
+{
+   return (netdev->features & NETIF_F_HW_CSUM) != 0;
+}
+
+/*
+ *----------------------------------------------------------------------------
+ *
+ * vmxnet_get_rx_csum --
+ *
+ *    Ethtool op to check whether or not rx csum offload is enabled.
+ *
+ * Result:
+ *    Always return 1 to indicate that rx csum is enabled.
+ *
+ * Side-effects:
+ *    None
+ *
+ *----------------------------------------------------------------------------
+ */
+
+static uint32
+vmxnet_get_rx_csum(struct net_device *netdev)
+{
+   return 1;
+}
+
+
+/*
+ *----------------------------------------------------------------------------
+ *
+ * vmxnet_set_tx_csum --
+ *
+ *    Ethtool op to change if hw csum offloading should be used or not.
+ *    If the device supports hardware checksum capability netdev features bit
+ *    is set/reset. This bit is referred to while setting hw checksum required
+ *    flag (VMXNET2_TX_HW_XSUM) in xmit ring entry.
+ *
+ * Result:
+ *    0 on success. -EOPNOTSUPP if ethtool asks to set hw checksum and device
+ *    does not support it.
+ *
+ * Side-effects:
+ *    None
+ *
+ *----------------------------------------------------------------------------
+ */
+
+static int
+vmxnet_set_tx_csum(struct net_device *netdev, uint32 val)
+{
+   if (val) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+      struct Vmxnet_Private *lp = netdev_priv(netdev);
+      if (lp->capabilities & VMNET_CAP_HW_CSUM) {
+         netdev->features |= NETIF_F_HW_CSUM;
+         return 0;
+      }
+#endif
+      return -EOPNOTSUPP;
+   } else {
+      netdev->features &= ~NETIF_F_HW_CSUM;
+   }
+   return 0;
+}
+
+/*
+ *----------------------------------------------------------------------------
+ *
+ * vmxnet_set_rx_csum --
+ *
+ *    Ethtool op to change if hw csum offloading should be used or not for
+ *    received packets. Hardware checksum on received packets cannot be turned
+ *    off. Hence we fail the ethtool op which turns h/w csum off.
+ *
+ * Result:
+ *    0 when rx csum is set. -EOPNOTSUPP when ethtool tries to reset rx csum.
+ *
+ * Side-effects:
+ *    None
+ *
+ *----------------------------------------------------------------------------
+ */
+
+static int
+vmxnet_set_rx_csum(struct net_device *netdev, uint32 val)
+{
+   if (val) {
+      return 0;
+   } else {
+      return -EOPNOTSUPP;
+   }
+}
+
+
 /*
  *----------------------------------------------------------------------------
  *
@@ -406,11 +518,18 @@ vmxnet_ethtool_ops = {
    .get_settings        = vmxnet_get_settings,
    .get_drvinfo         = vmxnet_get_drvinfo,
    .get_link            = ethtool_op_get_link,
+   .get_rx_csum         = vmxnet_get_rx_csum,
+   .set_rx_csum         = vmxnet_set_rx_csum,
+   .get_tx_csum         = vmxnet_get_tx_csum,
+   .set_tx_csum         = vmxnet_set_tx_csum,
    .get_sg              = ethtool_op_get_sg,
    .set_sg              = ethtool_op_set_sg,
 #ifdef VMXNET_DO_TSO
    .get_tso             = ethtool_op_get_tso,
    .set_tso             = vmxnet_set_tso,
+#   if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+   .get_ufo             = ethtool_op_get_ufo,
+#   endif
 #endif
 };
 
@@ -2280,7 +2399,8 @@ vmxnet_tx(struct sk_buff *skb, struct net_device *dev)
    }
 
    /* at this point, xre must point to the 1st tx entry for the pkt */
-   if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL) {
+   if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL &&
+       ((dev->features & NETIF_F_HW_CSUM) != 0)) {
       xre->flags |= VMXNET2_TX_HW_XSUM | VMXNET2_TX_CAN_KEEP;
    } else {
       xre->flags |= VMXNET2_TX_CAN_KEEP;
index 39db609ce6fe7f69d08ba9286bde7f241090cb71..bb4a27b0d2a5279a1e00b17c3ba9cb51967c5832 100644 (file)
@@ -25,8 +25,8 @@
 #ifndef _VMXNET_VERSION_H_
 #define _VMXNET_VERSION_H_
 
-#define VMXNET_DRIVER_VERSION          2.0.4.0
-#define VMXNET_DRIVER_VERSION_COMMAS   2,0,4,0
-#define VMXNET_DRIVER_VERSION_STRING   "2.0.4.0"
+#define VMXNET_DRIVER_VERSION          2.0.5.0
+#define VMXNET_DRIVER_VERSION_COMMAS   2,0,5,0
+#define VMXNET_DRIVER_VERSION_STRING   "2.0.5.0"
 
 #endif /* _VMXNET_VERSION_H_ */
index b9b9bb679770a3a6f78b662828cddd5805317643..0267f8a312444085961f45a45a8a511e21ab5aa8 100644 (file)
  *
  *********************************************************/
 
-/*
- * vmxnet3.c --
- *
- *      Linux driver for VMXNET3 NIC
- * XXX:
- * + invoke request_irq after device is activated
- */
 #include "driver-config.h"
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 #error "vmxnet3 driver is not supported on kernels earlier than 2.6"
 #endif
 
-#include "compat_module.h"
-//#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9)
-#include <linux/moduleparam.h>
-//#endif
-
-#include "compat_slab.h"
-#include "compat_spinlock.h"
-#include "compat_ioport.h"
-#include "compat_pci.h"
-#include "compat_highmem.h"
-#include "compat_init.h"
-#include "compat_timer.h"
-#include "compat_netdevice.h"
-#include "compat_skbuff.h"
-#include "compat_interrupt.h"
-#include "compat_workqueue.h"
-
-#include <asm/dma.h>
-#include <asm/page.h>
-#include <asm/uaccess.h>
-#include <linux/types.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <linux/in.h>
-#include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/delay.h>
-#include <asm/checksum.h>
-
-#include <linux/if_vlan.h>
-#include <linux/if_arp.h>
-#include <linux/inetdevice.h>
-
-#ifdef CONFIG_COMPAT
-#ifndef HAVE_UNLOCKED_IOCTL
-#include <linux/ioctl32.h>
-#endif
-#endif
-
-#include "vm_basic_types.h"
-#include "vmnet_def.h"
 #include "vm_device_version.h"
-#include "vmxnet3_version.h"
 
 #include "vmxnet3_int.h"
 #include "vmxnet3_shm.h"
 
-#ifdef VLAN_GROUP_ARRAY_SPLIT_PARTS
-#   define compat_vlan_group_get_device(vlan_grp, vid)       vlan_group_get_device(vlan_grp, vid)
-#   define compat_vlan_group_set_device(vlan_grp, vid, dev)  vlan_group_set_device(vlan_grp, vid, dev)
-#else
-#   define compat_vlan_group_get_device(vlan_grp, vid)      ((vlan_grp)->vlan_devices[(vid)])
-#   define compat_vlan_group_set_device(vlan_grp, vid, dev) ((vlan_grp)->vlan_devices[(vid)] = (dev))
-#endif
-
-
-#ifdef VMXNET3_NAPI
-#   ifdef VMX86_DEBUG
-#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING"-NAPI(debug)"
-#   else
-#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING"-NAPI"
-#   endif
-#else
-#   ifdef VMX86_DEBUG
-#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING"(debug)"
-#   else
-#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING
-#   endif
-#endif
 
-static char vmxnet3_driver_name[] = "vmxnet3";
+char vmxnet3_driver_name[] = "vmxnet3";
 #define VMXNET3_DRIVER_DESC "VMware vmxnet3 virtual NIC driver"
 
 static const struct pci_device_id vmxnet3_pciid_table[] = {
-   {PCI_DEVICE(PCI_VENDOR_ID_VMWARE, PCI_DEVICE_ID_VMWARE_VMXNET3)},
-   {0}
+       {PCI_DEVICE(PCI_VENDOR_ID_VMWARE, PCI_DEVICE_ID_VMWARE_VMXNET3)},
+       {0}
 };
 
-static void vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter);
-static int  vmxnet3_probe_device(struct pci_dev *pdev, const struct pci_device_id *id);
-static void vmxnet3_remove_device(struct pci_dev *pdev);
-#ifdef CONFIG_PM
-static int vmxnet3_suspend(struct pci_dev *pdev, pm_message_t state);
-static int vmxnet3_resume(struct pci_dev *pdev);
-#endif
-static int  vmxnet3_tq_tx_complete(struct vmxnet3_tx_queue *tq,
-                                   struct vmxnet3_adapter *adapter);
-#ifdef VMXNET3_NAPI
-static int vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
-                                  struct vmxnet3_adapter *adapter,
-                                  int quota);
-#else
-static int vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
-                                  struct vmxnet3_adapter *adapter);
-#endif
-static inline Bool vmxnet3_tq_stopped(struct vmxnet3_tx_queue *tq,
-                                      struct vmxnet3_adapter *adapter);
-static inline void vmxnet3_tq_start(struct vmxnet3_tx_queue *tq,
-                                    struct vmxnet3_adapter  *adapter);
-static inline void vmxnet3_tq_stop(struct vmxnet3_tx_queue *tq,
-                                   struct vmxnet3_adapter  *adapter);
-static inline void vmxnet3_tq_wake(struct vmxnet3_tx_queue *tq,
-                                   struct vmxnet3_adapter  *adapter);
+MODULE_DEVICE_TABLE(pci, vmxnet3_pciid_table);
 
-static struct pci_driver vmxnet3_driver = {
-   .name     = vmxnet3_driver_name,
-   .id_table = vmxnet3_pciid_table,
-   .probe    = vmxnet3_probe_device,
-   .remove   = vmxnet3_remove_device,
-#ifdef CONFIG_PM
-   .suspend  = vmxnet3_suspend,
-   .resume   = vmxnet3_resume,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+static int disable_lro;
 #endif
-};
 
-static int disable_lro;
-static int devices_found;
+static atomic_t devices_found;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 2)
 static unsigned int num_enable_shm;
 #endif
 #define VMXNET3_SHM_MAX_DEVICES 10
 static int enable_shm[VMXNET3_SHM_MAX_DEVICES + 1] =
-   { [0 ... VMXNET3_SHM_MAX_DEVICES] = -1 };
+{ [0 ... VMXNET3_SHM_MAX_DEVICES] = -1 };
 static char *shm_disclaimer = NULL;
 static int correct_shm_disclaimer;
 #define VMXNET3_SHM_DISCLAIMER "IReallyWantThisModeIAmAVMwarePartner"
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_enable_intr/vmxnet3_disable_intr --
- *
  *    Enable/Disable the given intr
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
  */
 
 static inline void
 vmxnet3_enable_intr(struct vmxnet3_adapter *adapter, unsigned intr_idx)
 {
-   VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_IMR + intr_idx * 8, 0);
+       VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_IMR + intr_idx * 8, 0);
 }
 
 
 static inline void
 vmxnet3_disable_intr(struct vmxnet3_adapter *adapter, unsigned intr_idx)
 {
-   VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_IMR + intr_idx * 8, 1);
+       VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_IMR + intr_idx * 8, 1);
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_enable_all_intrs/vmxnet3_disable_all_intrs--
- *
  *    Enable/Disable all intrs used by the device
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
  */
 
 static void
 vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)
 {
-   int i;
+       int i;
 
-   for (i = 0; i < adapter->intr.num_intrs; i++) {
-      vmxnet3_enable_intr(adapter, i);
-   }
+       for (i = 0; i < adapter->intr.num_intrs; i++)
+               vmxnet3_enable_intr(adapter, i);
 }
 
 
 static void
 vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
 {
-   int i;
+       int i;
 
-   for (i = 0; i < adapter->intr.num_intrs; i++) {
-      vmxnet3_disable_intr(adapter, i);
-   }
+       for (i = 0; i < adapter->intr.num_intrs; i++)
+               vmxnet3_disable_intr(adapter, i);
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_ack_events --
- *
- *    Ack the events we received.
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
 static INLINE void
-vmxnet3_ack_events(struct vmxnet3_adapter *adapter, uint32 events)
+vmxnet3_ack_events(struct vmxnet3_adapter *adapter, u32 events)
 {
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_ECR, events);
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_ECR, events);
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_check_link --
- *
- *      Check link state.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      May start or stop the tx queue.
- *
- *----------------------------------------------------------------------------
- */
-
-static void
-vmxnet3_check_link(struct vmxnet3_adapter *adapter)
+static inline Bool
+vmxnet3_tq_stopped(struct vmxnet3_tx_queue *tq, struct vmxnet3_adapter *adapter)
 {
-   uint32 ret;
-
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK);
-   ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
-   adapter->link_speed = ret >> 16;
-   if (ret & 1) { /* Link is up. */
-      printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n", adapter->netdev->name, 
-             adapter->link_speed);
-      if (!netif_carrier_ok(adapter->netdev)) {
-         netif_carrier_on(adapter->netdev);
-      }
-      vmxnet3_tq_start(&adapter->tx_queue, adapter);
-   } else {
-      printk(KERN_INFO "%s: NIC Link is Down\n", adapter->netdev->name);
-      if (netif_carrier_ok(adapter->netdev)) {
-         netif_carrier_off(adapter->netdev);
-      }
-      vmxnet3_tq_stop(&adapter->tx_queue, adapter);
-   }
+       return compat_netif_queue_stopped(adapter->netdev);
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_process_events --
- *
- *    process events indicated in ECR
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
  *
- *----------------------------------------------------------------------------
+ * Request the stack to start/stop/wake the tq. This only deals with the OS
+ * side, it does NOT handle the device side
  */
-
-static void
-vmxnet3_process_events(struct vmxnet3_adapter *adapter)
+static inline void
+vmxnet3_tq_start(struct vmxnet3_tx_queue *tq, struct vmxnet3_adapter  *adapter)
 {
-   uint32 events = adapter->shared->ecr;
-   if (events) {
-      vmxnet3_ack_events(adapter, events);
-
-      if (events & VMXNET3_ECR_LINK) {
-         vmxnet3_check_link(adapter);
-      }
-      if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
-         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_QUEUE_STATUS);
-
-         if (adapter->tqd_start->status.stopped) {
-            printk(KERN_ERR "%s: tq error 0x%x\n", adapter->netdev->name,
-                   adapter->tqd_start->status.error);
-         }
-         if (adapter->rqd_start->status.stopped) {
-            printk(KERN_ERR "%s: rq error 0x%x\n", adapter->netdev->name,
-                   adapter->rqd_start->status.error);
-         }
-
-         compat_schedule_work(&adapter->work);
-      }
-   }
+       tq->stopped = FALSE;
+       compat_netif_start_queue(adapter->netdev);
 }
 
 
-#ifdef VMXNET3_NAPI
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_do_poll --
- *
- *    The actual polling function.
- *
- * Results:
- *    void
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
 static inline void
-vmxnet3_do_poll(struct vmxnet3_adapter *adapter, int budget, 
-                int *txd_done, int *rxd_done)
+vmxnet3_tq_wake(struct vmxnet3_tx_queue *tq, struct vmxnet3_adapter  *adapter)
 {
-   if (UNLIKELY(adapter->shared->ecr)) {
-      vmxnet3_process_events(adapter);
-   }
+       tq->stopped = FALSE;
+       compat_netif_wake_queue(adapter->netdev);
+}
 
-   *txd_done = vmxnet3_tq_tx_complete(&adapter->tx_queue, adapter);
-   *rxd_done = vmxnet3_rq_rx_complete(&adapter->rx_queue, adapter, budget);
+
+static inline void
+vmxnet3_tq_stop(struct vmxnet3_tx_queue *tq, struct vmxnet3_adapter  *adapter)
+{
+       tq->stopped = TRUE;
+       tq->num_stop++;
+       compat_netif_stop_queue(adapter->netdev);
 }
 
 
-#ifdef VMXNET3_NEW_NAPI
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_poll --
- *
- *    new NAPI polling function
- *
- * Result:
- *    # of the NAPI credit consumed (# of rx descriptors processed)
- *
- *----------------------------------------------------------------------------
+ * This may start or stop the tx queue.
  */
-static int
-vmxnet3_poll(struct napi_struct *napi, int budget)
+
+static void
+vmxnet3_check_link(struct vmxnet3_adapter *adapter)
 {
-   struct vmxnet3_adapter *adapter = container_of(napi, struct vmxnet3_adapter, napi);
-   int rxd_done, txd_done;
+       u32 ret;
 
-   vmxnet3_do_poll(adapter, budget, &txd_done, &rxd_done);
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK);
+       ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+       adapter->link_speed = ret >> 16;
+       if (ret & 1) { /* Link is up. */
+               printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n",
+                      adapter->netdev->name, adapter->link_speed);
+               if (!netif_carrier_ok(adapter->netdev))
+                       netif_carrier_on(adapter->netdev);
 
-   if (rxd_done < budget) {
-      compat_napi_complete(adapter->netdev, napi);
-      vmxnet3_enable_intr(adapter, 0);
-   }
-   return rxd_done;
+               vmxnet3_tq_start(&adapter->tx_queue, adapter);
+       } else {
+               printk(KERN_INFO "%s: NIC Link is Down\n",
+                      adapter->netdev->name);
+               if (netif_carrier_ok(adapter->netdev))
+                       netif_carrier_off(adapter->netdev);
+
+               vmxnet3_tq_stop(&adapter->tx_queue, adapter);
+       }
 }
-#else
+
+
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_poll --
- *
- *    NAPI polling function
- *
- * Result:
- *    0: napi is done
- *    1: continue polling
- *
- *----------------------------------------------------------------------------
+ * process events indicated in ECR
  */
 
-static int
-vmxnet3_poll(struct net_device *poll_dev, int *budget)
+static void
+vmxnet3_process_events(struct vmxnet3_adapter *adapter)
 {
-   int rxd_done, txd_done, quota;
-   struct vmxnet3_adapter *adapter = netdev_priv(poll_dev);
+       u32 events = adapter->shared->ecr;
+       if (!events)
+               return;
 
-   quota = min(*budget, poll_dev->quota);
+       vmxnet3_ack_events(adapter, events);
 
-   vmxnet3_do_poll(adapter, quota, &txd_done, &rxd_done);
+       /* Check if link state has changed */
+       if (events & VMXNET3_ECR_LINK)
+               vmxnet3_check_link(adapter);
 
-   *budget -= rxd_done;
-   poll_dev->quota -= rxd_done;
+       /* Check if there is an error on xmit/recv queues */
+       if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
+               VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                      VMXNET3_CMD_GET_QUEUE_STATUS);
 
-   if (rxd_done < quota) {
-      compat_napi_complete(poll_dev, unused);
-      vmxnet3_enable_intr(adapter, 0);
-      return 0;
-   }
+               if (adapter->tqd_start->status.stopped) {
+                       printk(KERN_ERR "%s: tq error 0x%x\n",
+                              adapter->netdev->name,
+                              adapter->tqd_start->status.error);
+               }
+               if (adapter->rqd_start->status.stopped) {
+                       printk(KERN_ERR "%s: rq error 0x%x\n",
+                              adapter->netdev->name,
+                              adapter->rqd_start->status.error);
+               }
 
-   return 1; /* not done */
+               compat_schedule_work(&adapter->work);
+       }
+}
+
+
+static void
+vmxnet3_unmap_tx_buf(struct vmxnet3_tx_buf_info *tbi,
+                    struct pci_dev *pdev)
+{
+       if (tbi->map_type == VMXNET3_MAP_SINGLE)
+               pci_unmap_single(pdev, tbi->dma_addr, tbi->len,
+                                PCI_DMA_TODEVICE);
+       else if (tbi->map_type == VMXNET3_MAP_PAGE)
+               pci_unmap_page(pdev, tbi->dma_addr, tbi->len,
+                              PCI_DMA_TODEVICE);
+       else
+               BUG_ON(tbi->map_type != VMXNET3_MAP_NONE);
+
+       tbi->map_type = VMXNET3_MAP_NONE; /* to help debugging */
 }
-#endif
-#endif
 
 
 /*
- *----------------------------------------------------------------------------
+ *    Returns # of tx descs that this pkt used
  *
- * vmxnet3_intr --
- *
- *    vmxnet3 intr handler, the same version for all intr types
- *
- * Result:
- *    whether or not the intr is handled
- *
- *----------------------------------------------------------------------------
+ * Side-effects:
+ *    1. mappings are freed
+ *    2. buf_info[] are updated
+ *    3. tx_ring.{avail, next2comp} are updated.
  */
 
-static compat_irqreturn_t
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-vmxnet3_intr(int irq, void *dev_id, struct pt_regs * regs)
-#else
-vmxnet3_intr(int irq, void *dev_id)
-#endif
+static int
+vmxnet3_unmap_pkt(u32 eop_idx, struct vmxnet3_tx_queue *tq,
+                 struct pci_dev *pdev, struct vmxnet3_adapter *adapter)
 {
-   struct net_device *dev = dev_id;
-   struct vmxnet3_adapter *adapter = netdev_priv(dev);
+       struct sk_buff *skb;
+       int entries = 0;
 
-   if (UNLIKELY(adapter->intr.type == VMXNET3_IT_INTX)) {
-      uint32 icr = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_ICR);
-      if (UNLIKELY(icr == 0)) {
-         /* not ours */
-         return COMPAT_IRQ_NONE;
-      }
-   }
+       /* no out of order completion */
+       BUG_ON(tq->buf_info[eop_idx].sop_idx != tq->tx_ring.next2comp);
+       BUG_ON(tq->tx_ring.base[eop_idx].txd.eop != 1);
 
-#ifdef VMXNET3_NAPI
-   /* disable intr if needed */
-   if (adapter->intr.mask_mode == VMXNET3_IMM_ACTIVE) {
-      vmxnet3_disable_intr(adapter, 0);
-   }
+       dev_dbg(&adapter->pdev->dev, "tx complete [%u %u]\n",
+               tq->tx_ring.next2comp, eop_idx);
+       skb = tq->buf_info[eop_idx].skb;
+       BUG_ON(skb == NULL);
+       tq->buf_info[eop_idx].skb = NULL;
 
-   compat_napi_schedule(dev, &adapter->napi);
+       VMXNET3_INC_RING_IDX_ONLY(eop_idx, tq->tx_ring.size);
 
-#else
-   vmxnet3_tq_tx_complete(&adapter->tx_queue, adapter);
-   vmxnet3_rq_rx_complete(&adapter->rx_queue, adapter);
-   if (UNLIKELY(adapter->shared->ecr)) {
-      vmxnet3_process_events(adapter);
-   }
-   vmxnet3_enable_intr(adapter, 0);
-#endif
+       while (tq->tx_ring.next2comp != eop_idx) {
+               vmxnet3_unmap_tx_buf(tq->buf_info + tq->tx_ring.next2comp,
+                                    pdev);
 
-   return COMPAT_IRQ_HANDLED;
+               /* update next2comp w/o tx_lock. Since we are marking more,
+                * instead of less, tx ring entries avail, the worst case is
+                * that the tx routine incorrectly re-queues a pkt due to
+                * insufficient tx ring entries.
+                */
+               vmxnet3_cmd_ring_adv_next2comp(&tq->tx_ring);
+               entries++;
+       }
+
+       vmxnet3_dev_kfree_skb_any(adapter, skb);
+       return entries;
 }
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_netpoll --
- *
- *    netpoll callback.
- *
- * Results:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-static void
-vmxnet3_netpoll(struct net_device *netdev)
+
+static int
+vmxnet3_tq_tx_complete(struct vmxnet3_tx_queue *tq,
+                      struct vmxnet3_adapter *adapter)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   int irq;
+       int completed = 0;
+       union Vmxnet3_GenericDesc *gdesc;
 
-#ifdef CONFIG_PCI_MSI
-   if (adapter->intr.type == VMXNET3_IT_MSIX) {
-      irq = adapter->intr.msix_entries[0].vector;
-   } else 
-#endif
-   {
-      irq = adapter->pdev->irq;
-   }
+       gdesc = tq->comp_ring.base + tq->comp_ring.next2proc;
+       while (gdesc->tcd.gen == tq->comp_ring.gen) {
+               completed += vmxnet3_unmap_pkt(gdesc->tcd.txdIdx, tq,
+                                              adapter->pdev, adapter);
 
-   disable_irq(irq);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-   vmxnet3_intr(irq, netdev, NULL);
-#else
-   vmxnet3_intr(irq, netdev);
-#endif
-   enable_irq(irq);
+               vmxnet3_comp_ring_adv_next2proc(&tq->comp_ring);
+               gdesc = tq->comp_ring.base + tq->comp_ring.next2proc;
+       }
+
+       if (completed) {
+               spin_lock(&tq->tx_lock);
+               if (unlikely(vmxnet3_tq_stopped(tq, adapter) &&
+                            vmxnet3_cmd_ring_desc_avail(&tq->tx_ring) >
+                            VMXNET3_WAKE_QUEUE_THRESHOLD(tq) &&
+                            compat_netif_carrier_ok(adapter->netdev))) {
+                       vmxnet3_tq_wake(tq, adapter);
+               }
+               spin_unlock(&tq->tx_lock);
+       }
+       return completed;
 }
-#endif
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_request_irqs --
- *
- *    based on adapter->intr.type, register the intr handler
- *
- * Result:
- *    0 or error code
- *
- * Side-effects:
- *    1. event_intr_idx and intr_idx for different comp rings are updated
- *
- *----------------------------------------------------------------------------
- */
 
-static int
-vmxnet3_request_irqs(struct vmxnet3_adapter *adapter)
+static void
+vmxnet3_tq_cleanup(struct vmxnet3_tx_queue *tq,
+                  struct vmxnet3_adapter *adapter)
 {
-   int err;
+       while (tq->tx_ring.next2comp != tq->tx_ring.next2fill) {
+               struct vmxnet3_tx_buf_info *tbi;
+               union Vmxnet3_GenericDesc *gdesc;
 
-#ifdef CONFIG_PCI_MSI
-   if (adapter->intr.type == VMXNET3_IT_MSIX) {
-      /* we only use 1 MSI-X vector */
-      err = request_irq(adapter->intr.msix_entries[0].vector,
-                        vmxnet3_intr, 0, adapter->netdev->name, adapter->netdev);
-      if (err) {
-         printk(KERN_ERR "Failed to request irq for MSIX, %s, error %d\n",
-                adapter->netdev->name, err);
-      }
-   } else if (adapter->intr.type == VMXNET3_IT_MSI) {
-      err = request_irq(adapter->pdev->irq, vmxnet3_intr, 0,
-                        adapter->netdev->name, adapter->netdev);
-      if (err) {
-         printk(KERN_ERR "Failed to request irq for MSI, %s, error %d\n",
-                adapter->netdev->name, err);
-      }
-   } else {
-#endif
-      VMXNET3_ASSERT(adapter->intr.type == VMXNET3_IT_INTX);
-
-      err = request_irq(adapter->pdev->irq, vmxnet3_intr, COMPAT_IRQF_SHARED,
-                        adapter->netdev->name, adapter->netdev);
-      if (err) {
-         printk(KERN_ERR "Failed to request irq, %s, error %d\n",
-                adapter->netdev->name, err);
-      }
-#ifdef CONFIG_PCI_MSI
-   }
+               tbi = tq->buf_info + tq->tx_ring.next2comp;
+               gdesc = tq->tx_ring.base + tq->tx_ring.next2comp;
+
+               vmxnet3_unmap_tx_buf(tbi, adapter->pdev);
+               if (tbi->skb) {
+                       vmxnet3_dev_kfree_skb_any(adapter, tbi->skb);
+                       tbi->skb = NULL;
+               }
+               vmxnet3_cmd_ring_adv_next2comp(&tq->tx_ring);
+       }
+
+       /* sanity check */
+#ifdef VMX86_DEBUG
+       {
+               /* verify all buffers are indeed unmapped and freed */
+               int i;
+               for (i = 0; i < tq->tx_ring.size; i++) {
+                       BUG_ON(tq->buf_info[i].skb != NULL ||
+                              tq->buf_info[i].map_type != VMXNET3_MAP_NONE);
+               }
+       }
 #endif
 
-   if (!err) {
-      int i;
-      /* init our intr settings */
-      for (i = 0; i < adapter->intr.num_intrs; i++) {
-         adapter->intr.mod_levels[i] = UPT1_IML_ADAPTIVE;
-      }
+       tq->tx_ring.gen = VMXNET3_INIT_GEN;
+       tq->tx_ring.next2fill = tq->tx_ring.next2comp = 0;
+
+       tq->comp_ring.gen = VMXNET3_INIT_GEN;
+       tq->comp_ring.next2proc = 0;
+}
 
-      /* next setup intr index for all intr sources */
-      adapter->tx_queue.comp_ring.intr_idx = 0;
-      adapter->rx_queue.comp_ring.intr_idx = 0;
-      adapter->intr.event_intr_idx = 0;
 
-      printk(KERN_INFO "%s: intr type %u, mode %u, %u vectors allocated\n",
-             adapter->netdev->name, adapter->intr.type, 
-             adapter->intr.mask_mode, adapter->intr.num_intrs);
-   }
+/*
+ *     free rings and buf_info for the tx queue. There must be no pending pkt
+ *     in the tx ring. the .base fields of all rings and buf_info will be
+ *     set to NULL
+ */
 
-   return err;
+void
+vmxnet3_tq_destroy(struct vmxnet3_tx_queue *tq,
+                  struct vmxnet3_adapter *adapter)
+{
+       if (tq->tx_ring.base) {
+               pci_free_consistent(adapter->pdev, tq->tx_ring.size *
+                                   sizeof(struct Vmxnet3_TxDesc),
+                                   tq->tx_ring.base, tq->tx_ring.basePA);
+               tq->tx_ring.base = NULL;
+       }
+       if (tq->data_ring.base) {
+               pci_free_consistent(adapter->pdev, tq->data_ring.size *
+                                   sizeof(struct Vmxnet3_TxDataDesc),
+                                   tq->data_ring.base, tq->data_ring.basePA);
+               tq->data_ring.base = NULL;
+       }
+       if (tq->comp_ring.base) {
+               pci_free_consistent(adapter->pdev, tq->comp_ring.size *
+                                   sizeof(struct Vmxnet3_TxCompDesc),
+                                   tq->comp_ring.base, tq->comp_ring.basePA);
+               tq->comp_ring.base = NULL;
+       }
+
+       if (tq->buf_info) {
+               kfree(tq->buf_info);
+               tq->buf_info = NULL;
+       }
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_free_irqs --
- *
- *    free IRQs allocated 
- *
- * Result:
- *    None
- *
+ *    reset all internal states and rings for a tx queue
  * Side-effects:
- *    None
- *----------------------------------------------------------------------------
+ *    1. contents of the rings are reset to 0
+ *    2. indices and gen of rings are reset
+ *    3. bookkeeping data is reset
  */
-
 static void
-vmxnet3_free_irqs(struct vmxnet3_adapter *adapter)
+vmxnet3_tq_init(struct vmxnet3_tx_queue *tq,
+               struct vmxnet3_adapter *adapter)
 {
-   VMXNET3_ASSERT(adapter->intr.type != VMXNET3_IT_AUTO &&
-                  adapter->intr.num_intrs > 0);
+       int i;
 
-   switch (adapter->intr.type) {
-#ifdef CONFIG_PCI_MSI
-   case VMXNET3_IT_MSIX:
-      {
-         int i;
-
-         for (i = 0; i < adapter->intr.num_intrs; i++) {
-            free_irq(adapter->intr.msix_entries[i].vector, adapter->netdev);
-         }
-         break;
-      }
-   case VMXNET3_IT_MSI:
-      free_irq(adapter->pdev->irq, adapter->netdev);
-      break;
-#endif
-   case VMXNET3_IT_INTX:
-      free_irq(adapter->pdev->irq, adapter->netdev);
-      break;
-   default:
-      VMXNET3_ASSERT(FALSE);
-   }
+       /* reset the tx ring contents to 0 and reset the tx ring states */
+       memset(tq->tx_ring.base, 0,
+              tq->tx_ring.size * sizeof(struct Vmxnet3_TxDesc));
+       tq->tx_ring.next2fill = tq->tx_ring.next2comp = 0;
+       tq->tx_ring.gen = VMXNET3_INIT_GEN;
+
+       memset(tq->data_ring.base, 0,
+              tq->data_ring.size * sizeof(struct Vmxnet3_TxDataDesc));
+
+       /* reset the tx comp ring contents to 0 and reset comp ring states */
+       memset(tq->comp_ring.base, 0,
+              tq->comp_ring.size * sizeof(struct Vmxnet3_TxCompDesc));
+       tq->comp_ring.next2proc = 0;
+       tq->comp_ring.gen = VMXNET3_INIT_GEN;
+
+       /* reset the bookkeeping data */
+       memset(tq->buf_info, 0, sizeof(tq->buf_info[0]) * tq->tx_ring.size);
+       for (i = 0; i < tq->tx_ring.size; i++)
+               tq->buf_info[i].map_type = VMXNET3_MAP_NONE;
+
+       /* stats are not reset */
 }
 
 
-static inline Bool
-vmxnet3_tq_stopped(struct vmxnet3_tx_queue *tq,
-                  struct vmxnet3_adapter *adapter)
-{
-   return compat_netif_queue_stopped(adapter->netdev);
+/*
+ * allocate and initialize rings for the tx queue, also allocate and
+ * initialize buf_info. Returns 0 on success, negative errno on failure.
+ */
+static int
+vmxnet3_tq_create(struct vmxnet3_tx_queue *tq,
+                 struct vmxnet3_adapter *adapter)
+{
+       BUG_ON(tq->tx_ring.size <= 0 ||
+              tq->data_ring.size != tq->tx_ring.size);
+       BUG_ON((tq->tx_ring.size & VMXNET3_RING_SIZE_MASK) != 0);
+       BUG_ON(tq->tx_ring.base || tq->data_ring.base || tq->comp_ring.base ||
+              tq->buf_info);
+
+       tq->tx_ring.base = pci_alloc_consistent(adapter->pdev,
+                          tq->tx_ring.size * sizeof(struct Vmxnet3_TxDesc),
+                          &tq->tx_ring.basePA);
+       if (!tq->tx_ring.base) {
+               printk(KERN_ERR "%s: failed to allocate tx ring\n",
+                      adapter->netdev->name);
+               goto err;
+       }
+
+       tq->data_ring.base = pci_alloc_consistent(adapter->pdev,
+                            tq->data_ring.size *
+                            sizeof(struct Vmxnet3_TxDataDesc),
+                            &tq->data_ring.basePA);
+       if (!tq->data_ring.base) {
+               printk(KERN_ERR "%s: failed to allocate data ring\n",
+                      adapter->netdev->name);
+               goto err;
+       }
+
+       tq->comp_ring.base = pci_alloc_consistent(adapter->pdev,
+                            tq->comp_ring.size *
+                            sizeof(struct Vmxnet3_TxCompDesc),
+                            &tq->comp_ring.basePA);
+       if (!tq->comp_ring.base) {
+               printk(KERN_ERR "%s: failed to allocate tx comp ring\n",
+                      adapter->netdev->name);
+               goto err;
+       }
+
+       tq->buf_info = kcalloc(tq->tx_ring.size, sizeof(tq->buf_info[0]),
+                              GFP_KERNEL);
+       if (!tq->buf_info) {
+               printk(KERN_ERR "%s: failed to allocate tx bufinfo\n",
+                      adapter->netdev->name);
+               goto err;
+       }
+
+       return 0;
+
+err:
+       vmxnet3_tq_destroy(tq, adapter);
+       return -ENOMEM;
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tq_start/stop/wake --
- *
- *    Request the stack to start/stop/wake the tq. This only deals with the OS side,
- *    it does NOT handle the device side
- *
- * Result:
- *    None
+ *    starting from ring->next2fill, allocate rx buffers for the given ring
+ *    of the rx queue and update the rx desc. stop after @num_to_alloc buffers
+ *    are allocated or allocation fails. Returns # of buffers allocated
  *
  * Side-effects:
- *    None
- *----------------------------------------------------------------------------
+ *    1. rx descs are updated
+ *    2. ring->{gen, next2fill} are updated
+ *    3. uncommitted[ring_idx] is incremented
  */
-static inline void
-vmxnet3_tq_start(struct vmxnet3_tx_queue *tq,
-                 struct vmxnet3_adapter  *adapter)
-{
-   tq->stopped = FALSE;
-   compat_netif_start_queue(adapter->netdev);
-}
 
+static int
+vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx,
+                       int num_to_alloc, struct vmxnet3_adapter *adapter)
+{
+       int num_allocated = 0;
+       struct vmxnet3_rx_buf_info *rbi_base = rq->buf_info[ring_idx];
+       struct vmxnet3_cmd_ring *ring = &rq->rx_ring[ring_idx];
+       u32 val;
+
+       while (num_allocated < num_to_alloc) {
+               struct vmxnet3_rx_buf_info *rbi;
+               union Vmxnet3_GenericDesc *gd;
+
+               rbi = rbi_base + ring->next2fill;
+               gd = ring->base + ring->next2fill;
+
+               if (rbi->buf_type == VMXNET3_RX_BUF_SKB) {
+                       if (rbi->skb == NULL) {
+                               rbi->skb = vmxnet3_dev_alloc_skb(adapter,
+                                               rbi->len + COMPAT_NET_IP_ALIGN);
+                               if (unlikely(rbi->skb == NULL)) {
+                                       rq->stats.rx_buf_alloc_failure++;
+                                       break;
+                               }
+                               rbi->skb->dev = adapter->netdev;
+
+                               if (!adapter->is_shm)
+                                       skb_reserve(rbi->skb, NET_IP_ALIGN);
+                               rbi->dma_addr = vmxnet3_map_single(
+                                               adapter, rbi->skb, 0,
+                                               rbi->len, PCI_DMA_FROMDEVICE);
+                       } else {
+                               /* rx buffer skipped by the device */
+                       }
+                       val = VMXNET3_RXD_BTYPE_HEAD << VMXNET3_RXD_BTYPE_SHIFT;
+               } else {
+                       BUG_ON(rbi->buf_type != VMXNET3_RX_BUF_PAGE ||
+                              rbi->len  != PAGE_SIZE);
+
+                       if (rbi->page == NULL) {
+                               rbi->page = vmxnet3_alloc_page(adapter);
+                               if (unlikely(rbi->page == NULL)) {
+                                       rq->stats.rx_buf_alloc_failure++;
+                                       break;
+                               }
+                               rbi->dma_addr = vmxnet3_map_page(adapter,
+                                               rbi->page, 0, PAGE_SIZE,
+                                               PCI_DMA_FROMDEVICE);
+                       } else {
+                               /* rx buffers skipped by the device */
+                       }
+                       val = VMXNET3_RXD_BTYPE_BODY << VMXNET3_RXD_BTYPE_SHIFT;
+               }
+
+               BUG_ON(rbi->dma_addr == 0);
+               gd->rxd.addr = rbi->dma_addr;
+               wmb();
+               gd->dword[2] = (ring->gen << VMXNET3_RXD_GEN_SHIFT) | val |
+                               rbi->len;
+
+               num_allocated++;
+               vmxnet3_cmd_ring_adv_next2fill(ring);
+       }
+       rq->uncommitted[ring_idx] += num_allocated;
+
+       dev_dbg(&adapter->pdev->dev, "alloc_rx_buf: %d allocated, next2fill "
+               "%u, next2comp %u, uncommited %u\n", num_allocated,
+               ring->next2fill, ring->next2comp, rq->uncommitted[ring_idx]);
+
+       /* so that the device can distinguish a full ring and an empty ring */
+       BUG_ON(num_allocated != 0 && ring->next2fill == ring->next2comp);
+
+       return num_allocated;
+}
+
+
+/*
+ * It assumes the skb still has space to accommodate the frag. It only
+ * increments skb->data_len
+ */
 
-static inline void
-vmxnet3_tq_wake(struct vmxnet3_tx_queue *tq,
-                struct vmxnet3_adapter  *adapter)
+static void
+vmxnet3_append_frag(struct sk_buff *skb, struct Vmxnet3_RxCompDesc *rcd,
+                   struct vmxnet3_rx_buf_info *rbi)
 {
-   tq->stopped = FALSE;
-   compat_netif_wake_queue(adapter->netdev);
-}
+       struct skb_frag_struct *frag = skb_shinfo(skb)->frags +
+               skb_shinfo(skb)->nr_frags;
 
+       BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
 
-static inline void
-vmxnet3_tq_stop(struct vmxnet3_tx_queue *tq,
-                struct vmxnet3_adapter  *adapter)
-{
-   tq->stopped = TRUE;
-   tq->num_stop++;
-   compat_netif_stop_queue(adapter->netdev);
+       frag->page = rbi->page;
+       frag->page_offset = 0;
+       frag->size = rcd->len;
+       skb->data_len += frag->size;
+       skb_shinfo(skb)->nr_frags++;
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_map_pkt --
- *
- *    map the tx buffer and set up ONLY TXD.{addr, len, gen} based on the mapping.
- *    It sets the other fields of the descriptors to 0.
- *
- * Result:
- *    None
- *
- * Side-effects:
+ * Map the tx buffer and set up ONLY TXD.{addr, len, gen} based on the mapping.
+ * It sets the other fields of the descriptors to 0.
+ * Side Effects :
  *    1. the corresponding buf_info entries are upated,
  *    2. ring indices are advanced
- *
- *----------------------------------------------------------------------------
  */
 
 static void
-vmxnet3_map_pkt(struct sk_buff *skb,
-                struct vmxnet3_tx_ctx *ctx,
-                struct vmxnet3_tx_queue *tq,
-                struct pci_dev *pdev,
-                struct vmxnet3_adapter *adapter)
-{
-   uint32 dw2, len;
-   unsigned long buf_offset;
-   int i;
-   Vmxnet3_GenericDesc *gdesc;
-   struct vmxnet3_tx_buf_info *tbi = NULL;
-
-   VMXNET3_ASSERT(ctx->copy_size <= vmxnet3_skb_headlen(adapter, skb));
+vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
+               struct vmxnet3_tx_queue *tq, struct pci_dev *pdev,
+               struct vmxnet3_adapter *adapter)
+{
+       u32 dw2, len;
+       unsigned long buf_offset;
+       int i;
+       union Vmxnet3_GenericDesc *gdesc;
+       struct vmxnet3_tx_buf_info *tbi = NULL;
+
+       BUG_ON(ctx->copy_size > skb_headlen(skb));
+
+       /* use the previous gen bit for the SOP desc */
+       dw2 = (tq->tx_ring.gen ^ 0x1) << VMXNET3_TXD_GEN_SHIFT;
 
-   /* use the previous gen bit for the SOP desc */
-   dw2 = (tq->tx_ring.gen ^ 0x1) << VMXNET3_TXD_GEN_SHIFT;
+       ctx->sop_txd = tq->tx_ring.base + tq->tx_ring.next2fill;
+       gdesc = ctx->sop_txd; /* both loops below can be skipped */
 
-   ctx->sop_txd = tq->tx_ring.base + tq->tx_ring.next2fill;
-   gdesc = ctx->sop_txd; // both loops below can be skipped
+       /* no need to map the buffer if headers are copied */
+       if (ctx->copy_size) {
+               BUG_ON(ctx->sop_txd->txd.gen == tq->tx_ring.gen);
 
-   /* no need to map the buffer if headers are copied */
-   if (ctx->copy_size) {
-      VMXNET3_ASSERT(ctx->sop_txd->txd.gen != tq->tx_ring.gen);
+               ctx->sop_txd->txd.addr = tq->data_ring.basePA +
+                                        tq->tx_ring.next2fill *
+                                        sizeof(Vmxnet3_TxDataDesc);
+               ctx->sop_txd->dword[2] = dw2 | ctx->copy_size;
+               ctx->sop_txd->dword[3] = 0;
 
-      ctx->sop_txd->txd.addr = tq->data_ring.basePA +
-                               tq->tx_ring.next2fill * sizeof(Vmxnet3_TxDataDesc);
-      ctx->sop_txd->dword[2] = dw2 | ctx->copy_size;
-      ctx->sop_txd->dword[3] = 0;
+               tbi = tq->buf_info + tq->tx_ring.next2fill;
+               tbi->map_type = VMXNET3_MAP_NONE;
 
-      tbi = tq->buf_info + tq->tx_ring.next2fill;
-      tbi->map_type = VMXNET3_MAP_NONE;
+               dev_dbg(&adapter->pdev->dev, "txd[%u]: 0x%"FMT64"x 0x%x 0x%x\n",
+                       tq->tx_ring.next2fill, ctx->sop_txd->txd.addr,
+                       ctx->sop_txd->dword[2], ctx->sop_txd->dword[3]);
+               vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
 
-      VMXNET3_LOG("txd[%u]: 0x%"FMT64"x 0x%x 0x%x\n", tq->tx_ring.next2fill,
-                  ctx->sop_txd->txd.addr, ctx->sop_txd->dword[2],
-                  ctx->sop_txd->dword[3]);
-      vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
+               /* use the right gen for non-SOP desc */
+               dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
+       }
 
-      /* use the right gen for non-SOP desc */
-      dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
-   }
+       /* linear part can use multiple tx desc if it's big */
+       len = vmxnet3_skb_headlen(adapter, skb) - ctx->copy_size;
+       buf_offset = ctx->copy_size;
+       while (len) {
+               u32 buf_size;
 
-   /* linear part can use multiple tx desc if it's big */
-   len = vmxnet3_skb_headlen(adapter, skb) - ctx->copy_size;
-   buf_offset = ctx->copy_size;
-   while (len) {
-      uint32 buf_size;
+               buf_size = len > VMXNET3_MAX_TX_BUF_SIZE ?
+                          VMXNET3_MAX_TX_BUF_SIZE : len;
 
-      buf_size = len > VMXNET3_MAX_TX_BUF_SIZE ? VMXNET3_MAX_TX_BUF_SIZE : len;
+               tbi = tq->buf_info + tq->tx_ring.next2fill;
+               tbi->map_type = VMXNET3_MAP_SINGLE;
+               tbi->dma_addr = vmxnet3_map_single(adapter, skb, buf_offset,
+                               buf_size, PCI_DMA_TODEVICE);
 
-      tbi = tq->buf_info + tq->tx_ring.next2fill;
-      tbi->map_type = VMXNET3_MAP_SINGLE;
-      tbi->dma_addr = vmxnet3_map_single(adapter, skb, buf_offset,
-                                         buf_size, PCI_DMA_TODEVICE);
+               tbi->len = buf_size; /* this automatically convert 2^14 to 0 */
 
-      tbi->len = buf_size; /* this automatically convert 2^14 to 0 */
+               gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
+               BUG_ON(gdesc->txd.gen == tq->tx_ring.gen);
 
-      gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
-      VMXNET3_ASSERT(gdesc->txd.gen != tq->tx_ring.gen);
+               gdesc->txd.addr = tbi->dma_addr;
+               gdesc->dword[2] = dw2 | buf_size;
+               gdesc->dword[3] = 0;
 
-      gdesc->txd.addr = tbi->dma_addr;
-      gdesc->dword[2] = dw2 | buf_size;
-      gdesc->dword[3] = 0;
+               dev_dbg(&adapter->pdev->dev, "txd[%u]: 0x%"FMT64"x 0x%x 0x%x\n",
+                       tq->tx_ring.next2fill, gdesc->txd.addr,
+                       gdesc->dword[2], gdesc->dword[3]);
+               vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
+               dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
 
-      VMXNET3_LOG("txd[%u]: 0x%"FMT64"x 0x%x 0x%x\n", tq->tx_ring.next2fill,
-                  gdesc->txd.addr, gdesc->dword[2], gdesc->dword[3]);
-      vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
-      dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
+               len -= buf_size;
+               buf_offset += buf_size;
 
-      len -= buf_size;
-      buf_offset += buf_size;
+               if (adapter->is_shm) {
+               /*
+                * The linear region of the skb is never larger than a page, so
+                * it always fits into one descriptor.
+                */
+                       BUG_ON(len != 0);
+               }
+       }
 
-      if (adapter->is_shm) {
-         /*
-          * The linear region of the skb is never larger than a page, so
-          * it always fits into one descriptor.
-          */
-         VMXNET3_ASSERT(len == 0);
-      }
-   }
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+               struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
 
-   for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-      struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
+               tbi = tq->buf_info + tq->tx_ring.next2fill;
+               tbi->map_type = VMXNET3_MAP_PAGE;
+               tbi->dma_addr = vmxnet3_map_page(adapter, frag->page,
+                                               frag->page_offset, frag->size,
+                                               PCI_DMA_TODEVICE);
 
-      tbi = tq->buf_info + tq->tx_ring.next2fill;
-      tbi->map_type = VMXNET3_MAP_PAGE;
-      tbi->dma_addr = vmxnet3_map_page(adapter, frag->page,
-                                       frag->page_offset,
-                                       frag->size, PCI_DMA_TODEVICE);
+               tbi->len = frag->size;
 
-      tbi->len = frag->size;
+               gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
+               BUG_ON(gdesc->txd.gen == tq->tx_ring.gen);
 
-      gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
-      VMXNET3_ASSERT(gdesc->txd.gen != tq->tx_ring.gen);
+               gdesc->txd.addr = tbi->dma_addr;
+               gdesc->dword[2] = dw2 | frag->size;
+               gdesc->dword[3] = 0;
 
-      gdesc->txd.addr = tbi->dma_addr;
-      gdesc->dword[2] = dw2 | frag->size;
-      gdesc->dword[3] = 0;
+               dev_dbg(&adapter->pdev->dev, "txd[%u]: 0x%"FMT64"x %u %u\n",
+                       tq->tx_ring.next2fill, gdesc->txd.addr,
+                       gdesc->dword[2], gdesc->dword[3]);
+               vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
+               dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
+       }
 
-      VMXNET3_LOG("txd[%u]: %"FMT64"u %u %u\n", tq->tx_ring.next2fill,
-                  gdesc->txd.addr, gdesc->dword[2], gdesc->dword[3]);
-      vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
-      dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
-   }
+       ctx->eop_txd = gdesc;
 
-   ctx->eop_txd = gdesc;
-
-   /* set the last buf_info for the pkt */
-   tbi->skb = skb;
-   tbi->sop_idx = ctx->sop_txd - tq->tx_ring.base;
+       /* set the last buf_info for the pkt */
+       tbi->skb = skb;
+       tbi->sop_idx = ctx->sop_txd - tq->tx_ring.base;
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_parse_and_copy_hdr --
- *
  *    parse and copy relevant protocol headers:
- *      For a tso pkt, relevant headers are L2/3/4 including options
- *      For a pkt requesting csum offloading, they are L2/3 and may include L4
- *      if it's a TCP/UDP pkt
+ *     For a tso pkt, relevant headers are L2/3/4 including options
+ *     For a pkt requesting csum offloading, they are L2/3 and may include L4
+ *     if it's a TCP/UDP pkt
  *
  *    The implementation works only when h/w vlan insertion is used, see PR
  *    171928
@@ -845,134 +721,119 @@ vmxnet3_map_pkt(struct sk_buff *skb,
  *    1. related *ctx fields are updated.
  *    2. ctx->copy_size is # of bytes copied
  *    3. the portion copied is guaranteed to be in the linear part
- *
- *----------------------------------------------------------------------------
  */
 static int
-vmxnet3_parse_and_copy_hdr(struct sk_buff *skb,
-                           struct vmxnet3_tx_queue *tq,
-                           struct vmxnet3_tx_ctx *ctx,
-                           struct vmxnet3_adapter *adapter)
-{
-   Vmxnet3_TxDataDesc *tdd;
-
-   if (ctx->mss) {
-      ctx->eth_ip_hdr_size = compat_skb_transport_offset(skb);
-      ctx->l4_hdr_size = compat_skb_tcp_header(skb)->doff * 4;
-      ctx->copy_size = ctx->eth_ip_hdr_size + ctx->l4_hdr_size;
-   } else {
-      unsigned int pull_size;
-
-      if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL) {
-         ctx->eth_ip_hdr_size = compat_skb_transport_offset(skb);
-
-         if (ctx->ipv4) {
-            if (compat_skb_ip_header(skb)->protocol == IPPROTO_TCP) {
-               pull_size = ctx->eth_ip_hdr_size + sizeof(struct tcphdr);
-
-               if (UNLIKELY(!compat_pskb_may_pull(skb, pull_size))) {
-                  goto err;
-               }
-               ctx->l4_hdr_size = compat_skb_tcp_header(skb)->doff * 4;
-            } else if (compat_skb_ip_header(skb)->protocol == IPPROTO_UDP) {
-               ctx->l4_hdr_size = sizeof(struct udphdr);
-            } else {
-               ctx->l4_hdr_size = 0;
-            }
-         } else {
-            // for simplicity, don't copy L4 headers
-            ctx->l4_hdr_size = 0;
-         }
-         ctx->copy_size = ctx->eth_ip_hdr_size + ctx->l4_hdr_size;
-      } else {
-         ctx->eth_ip_hdr_size = 0;
-         ctx->l4_hdr_size = 0;
-         /* copy as much as allowed */
-         ctx->copy_size = min((unsigned int)VMXNET3_HDR_COPY_SIZE,
-                              vmxnet3_skb_headlen(adapter, skb));
-      }
-
-      if (!adapter->is_shm) {
-         /* make sure headers are accessible directly */
-         if (UNLIKELY(!compat_pskb_may_pull(skb, ctx->copy_size))) {
-            goto err;
-         }
-      }
-   }
-
-   if (UNLIKELY(ctx->copy_size > VMXNET3_HDR_COPY_SIZE)) {
-      tq->stats.oversized_hdr++;
-      ctx->copy_size = 0;
-      return 0;
-   }
-
-   tdd = tq->data_ring.base + tq->tx_ring.next2fill;
-   VMXNET3_ASSERT(ctx->copy_size <= vmxnet3_skb_headlen(adapter, skb));
-
-   if (!adapter->is_shm) {
-      memcpy(tdd->data, skb->data, ctx->copy_size);
-   } else {
-      void *virt = kmap(VMXNET3_SHM_IDX2PAGE(adapter->shm, VMXNET3_SHM_SKB_GETIDX(skb)));
-      memcpy(tdd->data,
-             virt,
-             ctx->copy_size);
-      kunmap(VMXNET3_SHM_IDX2PAGE(adapter->shm, VMXNET3_SHM_SKB_GETIDX(skb)));
-   }
-   VMXNET3_LOG("copy %u bytes to dataRing[%u]\n",
-               ctx->copy_size, tq->tx_ring.next2fill);
-   return 1;
+vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
+                          struct vmxnet3_tx_ctx *ctx,
+                          struct vmxnet3_adapter *adapter)
+{
+       struct Vmxnet3_TxDataDesc *tdd;
+
+       if (ctx->mss) {
+               ctx->eth_ip_hdr_size = compat_skb_transport_offset(skb);
+               ctx->l4_hdr_size = compat_skb_tcp_header(skb)->doff * 4;
+               ctx->copy_size = ctx->eth_ip_hdr_size + ctx->l4_hdr_size;
+       } else {
+               unsigned int pull_size;
+
+               if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL) {
+                       ctx->eth_ip_hdr_size = compat_skb_transport_offset(skb);
+
+                       if (ctx->ipv4) {
+                               struct iphdr *iph = (struct iphdr *)
+                                                   compat_skb_ip_header(skb);
+                               if (iph->protocol == IPPROTO_TCP) {
+                                       pull_size = ctx->eth_ip_hdr_size +
+                                                   sizeof(struct tcphdr);
+
+                                       if (unlikely(!compat_pskb_may_pull(skb,
+                                                               pull_size))) {
+                                               goto err;
+                                       }
+                                       ctx->l4_hdr_size =
+                                          compat_skb_tcp_header(skb)->doff * 4;
+                               } else if (iph->protocol == IPPROTO_UDP) {
+                                       ctx->l4_hdr_size =
+                                                       sizeof(struct udphdr);
+                               } else {
+                                       ctx->l4_hdr_size = 0;
+                               }
+                       } else {
+                               /* for simplicity, don't copy L4 headers */
+                               ctx->l4_hdr_size = 0;
+                       }
+                       ctx->copy_size = ctx->eth_ip_hdr_size +
+                                        ctx->l4_hdr_size;
+               } else {
+                       ctx->eth_ip_hdr_size = 0;
+                       ctx->l4_hdr_size = 0;
+                       /* copy as much as allowed */
+                       ctx->copy_size = min((unsigned int)VMXNET3_HDR_COPY_SIZE
+                                          , vmxnet3_skb_headlen(adapter, skb));
+               }
+
+               if(!adapter->is_shm) {
+                        /* make sure headers are accessible directly */
+                       if (unlikely(!compat_pskb_may_pull(skb,
+                                                       ctx->copy_size)))
+                               goto err;
+
+               }
+       }
+
+       if (unlikely(ctx->copy_size > VMXNET3_HDR_COPY_SIZE)) {
+               tq->stats.oversized_hdr++;
+               ctx->copy_size = 0;
+               return 0;
+       }
+
+       tdd = tq->data_ring.base + tq->tx_ring.next2fill;
+       BUG_ON(ctx->copy_size > vmxnet3_skb_headlen(adapter, skb));
+
+       if (!adapter->is_shm) {
+               memcpy(tdd->data, skb->data, ctx->copy_size);
+       } else {
+               void *virt = kmap(VMXNET3_SHM_IDX2PAGE(adapter->shm,
+                                 VMXNET3_SHM_SKB_GETIDX(skb)));
+               memcpy(tdd->data, virt, ctx->copy_size);
+               kunmap(VMXNET3_SHM_IDX2PAGE(adapter->shm,
+                      VMXNET3_SHM_SKB_GETIDX(skb)));
+       }
+
+       dev_dbg(&adapter->pdev->dev, "copy %u bytes to dataRing[%u]\n",
+               ctx->copy_size, tq->tx_ring.next2fill);
+       return 1;
 
 err:
-   return -1;
+       return -1;
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_prepare_tso --
- *
- *    Fix pkt headers for tso
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    ip hdr and tcp hdr are changed
- *
- *----------------------------------------------------------------------------
+ *    Fix pkt headers for tso. ip hdr and tcp hdr are changed
  */
 
 static void
-vmxnet3_prepare_tso(struct sk_buff *skb,
-                    struct vmxnet3_tx_ctx *ctx)
-{
-   if (ctx->ipv4) {
-      struct iphdr *iph = compat_skb_ip_header(skb);
-      iph->check = 0;
-      compat_skb_tcp_header(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                             iph->daddr,
-                                                             0,
-                                                             IPPROTO_TCP,
-                                                             0);
+vmxnet3_prepare_tso(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx)
+{
+       struct tcphdr *tcph = compat_skb_tcp_header(skb);
+       if (ctx->ipv4) {
+               struct iphdr *iph = compat_skb_ip_header(skb);
+               iph->check = 0;
+               tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr, 0,
+                                                IPPROTO_TCP, 0);
 #ifdef NETIF_F_TSO6
-   } else {
-      struct ipv6hdr *iph = (struct ipv6hdr*)compat_skb_network_header(skb);
-      compat_skb_tcp_header(skb)->check = ~csum_ipv6_magic(&iph->saddr,
-                                                           &iph->daddr,
-                                                           0,
-                                                           IPPROTO_TCP,
-                                                           0);
+       } else {
+               struct ipv6hdr *iph = (struct ipv6hdr *)
+                                     compat_skb_network_header(skb);
+               tcph->check = ~csum_ipv6_magic(&iph->saddr, &iph->daddr, 0,
+                                              IPPROTO_TCP, 0);
 #endif
-   }
+       }
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tq_xmit --
- *
  *    transmit a pkt thru a given tq
  *
  * Result:
@@ -984,3724 +845,2190 @@ vmxnet3_prepare_tso(struct sk_buff *skb,
  *    1. tx ring may be changed
  *    2. tq stats may be updated accordingly
  *    3. shared->txNumDeferred may be updated
- *----------------------------------------------------------------------------
  */
 
 int
 vmxnet3_tq_xmit(struct sk_buff *skb,
-                struct vmxnet3_tx_queue *tq,
-                struct vmxnet3_adapter *adapter,
-                struct net_device *netdev)
-{
-   int ret;
-   uint32 count;
-   unsigned long flags;
-   struct vmxnet3_tx_ctx ctx;
-   Vmxnet3_GenericDesc *gdesc;
-
-   /* conservatively estimate # of descriptors to use */
-   count = VMXNET3_TXD_NEEDED(vmxnet3_skb_headlen(adapter, skb)) +
-           skb_shinfo(skb)->nr_frags + 1;
-
-   ctx.ipv4 = (skb->protocol == __constant_ntohs(ETH_P_IP));
-
-   ctx.mss = compat_skb_mss(skb);
-   if (ctx.mss) {
-      if (compat_skb_header_cloned(skb)) {
-         if (UNLIKELY(pskb_expand_head(skb, 0, 0, GFP_ATOMIC) != 0)) {
-            tq->stats.drop_tso++;
-            goto drop_pkt;
-         }
-         tq->stats.copy_skb_header++;
-      }
-      vmxnet3_prepare_tso(skb, &ctx);
-   } else {
-      if (UNLIKELY(count > VMXNET3_MAX_TXD_PER_PKT)) {
-         if (UNLIKELY(adapter->is_shm)) {
-            VMXNET3_ASSERT(count <= VMXNET3_MAX_TXD_PER_PKT_SHM);
-            if (count > VMXNET3_MAX_TXD_PER_PKT_SHM) {
-               tq->stats.drop_too_many_frags++;
-               goto drop_pkt;
-            }
-         } else {
-            /* non-tso pkts must not use more than VMXNET3_MAX_TXD_PER_PKT entries */
-            if (compat_skb_linearize(skb) != 0) {
-               tq->stats.drop_too_many_frags++;
-               goto drop_pkt;
-            }
-            tq->stats.linearized++;
-
-            /* recalculate the # of descriptors to use */
-            count = VMXNET3_TXD_NEEDED(vmxnet3_skb_headlen(adapter, skb)) + 1;
-         }
-      }
-   }
-
-   ret = vmxnet3_parse_and_copy_hdr(skb, tq, &ctx, adapter);
-   if (ret >= 0) {
-      VMXNET3_ASSERT(ret > 0 || ctx.copy_size == 0);
-      /* hdrs parsed, check against other limits */
-      if (ctx.mss) {
-         if (UNLIKELY(ctx.eth_ip_hdr_size + ctx.l4_hdr_size > VMXNET3_MAX_TX_BUF_SIZE)) {
-            goto hdr_too_big;
-         }
-      } else {
-         if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL) {
-            if (UNLIKELY(ctx.eth_ip_hdr_size + compat_skb_csum_offset(skb) > 
-                         VMXNET3_MAX_CSUM_OFFSET)) {
-               goto hdr_too_big;
-            }
-         }
-      }
-   } else {
-      tq->stats.drop_hdr_inspect_err++;
-      goto drop_pkt;
-   }
-
-   spin_lock_irqsave(&tq->tx_lock, flags);
-
-   if (count > vmxnet3_cmd_ring_desc_avail(&tq->tx_ring)) {
-      tq->stats.tx_ring_full++;
-      VMXNET3_LOG("tx queue stopped on %s, next2comp %u next2fill %u\n",
-                  adapter->netdev->name, tq->tx_ring.next2comp, tq->tx_ring.next2fill);
-
-      vmxnet3_tq_stop(tq, adapter);
-      spin_unlock_irqrestore(&tq->tx_lock, flags);
-      return COMPAT_NETDEV_TX_BUSY;
-   }
-
-   /* fill tx descs related to addr & len */
-   vmxnet3_map_pkt(skb, &ctx, tq, adapter->pdev, adapter);
-
-   /* setup the EOP desc */
-   ctx.eop_txd->dword[3] = VMXNET3_TXD_CQ | VMXNET3_TXD_EOP;
-
-   /* setup the SOP desc */
-   gdesc = ctx.sop_txd;
-   if (ctx.mss) {
-      gdesc->txd.hlen = ctx.eth_ip_hdr_size + ctx.l4_hdr_size;
-      gdesc->txd.om = VMXNET3_OM_TSO;
-      gdesc->txd.msscof = ctx.mss;
-      tq->shared->txNumDeferred += (skb->len - gdesc->txd.hlen + ctx.mss - 1) / ctx.mss;
-   } else {
-      if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL) {
-         gdesc->txd.hlen = ctx.eth_ip_hdr_size;
-         gdesc->txd.om = VMXNET3_OM_CSUM;
-         gdesc->txd.msscof = ctx.eth_ip_hdr_size + compat_skb_csum_offset(skb);
-      } else {
-         gdesc->txd.om = 0;
-         gdesc->txd.msscof = 0;
-      }
-      tq->shared->txNumDeferred ++;
-   }
-
-   if (vlan_tx_tag_present(skb)) {
-      gdesc->txd.ti = 1;
-      gdesc->txd.tci = vlan_tx_tag_get(skb);
-   }
-
-   wmb();
-
-   /* finally flips the GEN bit of the SOP desc */
-   gdesc->dword[2] ^= VMXNET3_TXD_GEN;
-   VMXNET3_LOG("txd[%u]: SOP 0x%"FMT64"x 0x%x 0x%x\n",
-               (uint32)((Vmxnet3_GenericDesc *)ctx.sop_txd - tq->tx_ring.base),
-               gdesc->txd.addr, gdesc->dword[2], gdesc->dword[3]);
-
-   spin_unlock_irqrestore(&tq->tx_lock, flags);
-
-   if (tq->shared->txNumDeferred >= tq->shared->txThreshold) {
-      tq->shared->txNumDeferred = 0;
-      VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_TXPROD, tq->tx_ring.next2fill);
-   }
-   netdev->trans_start = jiffies;
-
-   return COMPAT_NETDEV_TX_OK;
+               struct vmxnet3_tx_queue *tq,
+               struct vmxnet3_adapter *adapter,
+               struct net_device *netdev)
+{
+       int ret;
+       u32 count;
+       unsigned long flags;
+       struct vmxnet3_tx_ctx ctx;
+       union Vmxnet3_GenericDesc *gdesc;
+
+       /* conservatively estimate # of descriptors to use */
+       count = VMXNET3_TXD_NEEDED(vmxnet3_skb_headlen(adapter, skb)) +
+               skb_shinfo(skb)->nr_frags + 1;
+
+       ctx.ipv4 = (skb->protocol == __constant_ntohs(ETH_P_IP));
+
+       ctx.mss = compat_skb_mss(skb);
+       if (ctx.mss) {
+               if (compat_skb_header_cloned(skb)) {
+                       if (unlikely(pskb_expand_head(skb, 0, 0,
+                                                     GFP_ATOMIC) != 0)) {
+                               tq->stats.drop_tso++;
+                               goto drop_pkt;
+                       }
+                       tq->stats.copy_skb_header++;
+               }
+               vmxnet3_prepare_tso(skb, &ctx);
+       } else {
+               if (unlikely(count > VMXNET3_MAX_TXD_PER_PKT)) {
+                       if (unlikely(adapter->is_shm)) {
+                               BUG_ON(count > VMXNET3_MAX_TXD_PER_PKT_SHM);
+                               if (count > VMXNET3_MAX_TXD_PER_PKT_SHM) {
+                                       tq->stats.drop_too_many_frags++;
+                                       goto drop_pkt;
+                               }
+                       } else {
+                               /* non-tso pkts must not use more than
+                                * VMXNET3_MAX_TXD_PER_PKT entries
+                                */
+                               if (compat_skb_linearize(skb) != 0) {
+                                       tq->stats.drop_too_many_frags++;
+                                       goto drop_pkt;
+                               }
+                               tq->stats.linearized++;
+
+                               /* recalculate the # of descriptors to use */
+                               count = VMXNET3_TXD_NEEDED(vmxnet3_skb_headlen(
+                                                       adapter, skb)) + 1;
+                       }
+               }
+       }
+
+       ret = vmxnet3_parse_and_copy_hdr(skb, tq, &ctx, adapter);
+       if (ret >= 0) {
+               BUG_ON(ret <= 0 && ctx.copy_size != 0);
+               /* hdrs parsed, check against other limits */
+               if (ctx.mss) {
+                       if (unlikely(ctx.eth_ip_hdr_size + ctx.l4_hdr_size >
+                                    VMXNET3_MAX_TX_BUF_SIZE)) {
+                               goto hdr_too_big;
+                       }
+               } else {
+                       if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL) {
+                               if (unlikely(ctx.eth_ip_hdr_size +
+                                            compat_skb_csum_offset(skb) >
+                                            VMXNET3_MAX_CSUM_OFFSET)) {
+                                       goto hdr_too_big;
+                               }
+                       }
+               }
+       } else {
+               tq->stats.drop_hdr_inspect_err++;
+               goto drop_pkt;
+       }
+
+       spin_lock_irqsave(&tq->tx_lock, flags);
+
+       if (count > vmxnet3_cmd_ring_desc_avail(&tq->tx_ring)) {
+               tq->stats.tx_ring_full++;
+               dev_dbg(&adapter->pdev->dev, "tx queue stopped on %s, next2comp"
+                       " %u next2fill %u\n", adapter->netdev->name,
+                       tq->tx_ring.next2comp, tq->tx_ring.next2fill);
+
+               vmxnet3_tq_stop(tq, adapter);
+               spin_unlock_irqrestore(&tq->tx_lock, flags);
+               return COMPAT_NETDEV_TX_BUSY;
+       }
+
+       /* fill tx descs related to addr & len */
+       vmxnet3_map_pkt(skb, &ctx, tq, adapter->pdev, adapter);
+
+       /* setup the EOP desc */
+       ctx.eop_txd->dword[3] = VMXNET3_TXD_CQ | VMXNET3_TXD_EOP;
+
+       /* setup the SOP desc */
+       gdesc = ctx.sop_txd;
+       if (ctx.mss) {
+               gdesc->txd.hlen = ctx.eth_ip_hdr_size + ctx.l4_hdr_size;
+               gdesc->txd.om = VMXNET3_OM_TSO;
+               gdesc->txd.msscof = ctx.mss;
+               tq->shared->txNumDeferred += (skb->len - gdesc->txd.hlen +
+                                            ctx.mss - 1) / ctx.mss;
+       } else {
+               if (skb->ip_summed == VM_TX_CHECKSUM_PARTIAL) {
+                       gdesc->txd.hlen = ctx.eth_ip_hdr_size;
+                       gdesc->txd.om = VMXNET3_OM_CSUM;
+                       gdesc->txd.msscof = ctx.eth_ip_hdr_size +
+                                           compat_skb_csum_offset(skb);
+               } else {
+                       gdesc->txd.om = 0;
+                       gdesc->txd.msscof = 0;
+               }
+               tq->shared->txNumDeferred++;
+       }
+
+       if (vlan_tx_tag_present(skb)) {
+               gdesc->txd.ti = 1;
+               gdesc->txd.tci = vlan_tx_tag_get(skb);
+       }
+
+       wmb();
+
+       /* finally flips the GEN bit of the SOP desc */
+       gdesc->dword[2] ^= VMXNET3_TXD_GEN;
+       dev_dbg(&adapter->pdev->dev, "txd[%u]: SOP 0x%"FMT64"x 0x%x 0x%x\n",
+               (u32)((union Vmxnet3_GenericDesc *)ctx.sop_txd -
+               tq->tx_ring.base), gdesc->txd.addr, gdesc->dword[2],
+               gdesc->dword[3]);
+
+       spin_unlock_irqrestore(&tq->tx_lock, flags);
+
+       if (tq->shared->txNumDeferred >= tq->shared->txThreshold) {
+               tq->shared->txNumDeferred = 0;
+               VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_TXPROD,
+                                      tq->tx_ring.next2fill);
+       }
+       netdev->trans_start = jiffies;
+
+       return COMPAT_NETDEV_TX_OK;
 
 hdr_too_big:
-   tq->stats.drop_oversized_hdr++;
+       tq->stats.drop_oversized_hdr++;
 drop_pkt:
-   tq->stats.drop_total++;
-   vmxnet3_dev_kfree_skb(adapter, skb);
-   return COMPAT_NETDEV_TX_OK;
+       tq->stats.drop_total++;
+       vmxnet3_dev_kfree_skb(adapter, skb);
+       return COMPAT_NETDEV_TX_OK;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_xmit_frame --
- *
- *    called by the stack to tx a pkt
- *
- * Result:
- *    COMPAT_NETDEV_TX_OK if the pkt is sent or dropped
- *    COMPAT_NETDEV_TX_BUSY if the pkt has to be requeued
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
 static int
+#else
+static netdev_tx_t
+#endif
 vmxnet3_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-
-   if (adapter->is_shm) {
-      return vmxnet3_shm_start_tx(skb, netdev);
-   }
-
-   struct vmxnet3_tx_queue *tq = &adapter->tx_queue;
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       if (adapter->is_shm)
+               return vmxnet3_shm_start_tx(skb, netdev);
+       struct vmxnet3_tx_queue *tq = &adapter->tx_queue;
 
-   return vmxnet3_tq_xmit(skb, tq, adapter, netdev);
+       return vmxnet3_tq_xmit(skb, tq, adapter, netdev);
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_unmap_tx_buf --
- *
- *    unmap, if necessay, the given tx buffer
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    1. tbi->map_type is reset to VMXNET3_MAP_NONE
- *
- *----------------------------------------------------------------------------
- */
-
-static inline void
-vmxnet3_unmap_tx_buf(struct vmxnet3_tx_buf_info *tbi,
-                     struct pci_dev *pdev)
-{
-   if (tbi->map_type == VMXNET3_MAP_SINGLE) {
-      pci_unmap_single(pdev,
-                       tbi->dma_addr,
-                       tbi->len,
-                       PCI_DMA_TODEVICE);
-   } else if (tbi->map_type == VMXNET3_MAP_PAGE) {
-      pci_unmap_page(pdev,
-                     tbi->dma_addr,
-                     tbi->len,
-                     PCI_DMA_TODEVICE);
-   } else {
-      VMXNET3_ASSERT(tbi->map_type == VMXNET3_MAP_NONE);
-   }
-   tbi->map_type = VMXNET3_MAP_NONE; /* to help debugging */
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_unmap_pkt --
- *
- *    handle tx completion for a pkt. Basically undo vmxnet3_map_pkt().
- *    @eop_idx is the index of the eop desc in the tx ring for the pkt
- *
- * Result:
- *    # of tx descs that this pkt used
- *
- * Side-effects:
- *    1. mappings are freed
- *    2. buf_info[] are updated
- *    3. tx_ring.{avail, next2comp} are updated.
- *
- *----------------------------------------------------------------------------
- */
-
-static int
-vmxnet3_unmap_pkt(uint32 eop_idx,
-                  struct vmxnet3_tx_queue *tq,
-                  struct pci_dev *pdev,
-                  struct vmxnet3_adapter *adapter)
-{
-   struct sk_buff *skb;
-   int entries = 0;
-
-   /* no out of order completion */
-   VMXNET3_ASSERT(tq->buf_info[eop_idx].sop_idx == tq->tx_ring.next2comp);
-   VMXNET3_ASSERT(tq->tx_ring.base[eop_idx].txd.eop == 1);
-
-   VMXNET3_LOG("tx complete [%u %u]\n", tq->tx_ring.next2comp, eop_idx);
-
-   skb = tq->buf_info[eop_idx].skb;
-   VMXNET3_ASSERT(skb != NULL);
-   tq->buf_info[eop_idx].skb = NULL;
-
-   VMXNET3_INC_RING_IDX_ONLY(eop_idx, tq->tx_ring.size);
-
-   while (tq->tx_ring.next2comp != eop_idx) {
-      vmxnet3_unmap_tx_buf(tq->buf_info + tq->tx_ring.next2comp, pdev);
-
-      /* update next2comp w/o tx_lock. Since we are marking more, instead of
-       * less, tx ring entries avail, the worst case is that the tx routine
-       * incorrectly re-queues a pkt due to insufficient tx ring entries.
-       */
-      vmxnet3_cmd_ring_adv_next2comp(&tq->tx_ring);
-      entries ++;
-   }
-
-   vmxnet3_dev_kfree_skb_any(adapter, skb);
-   return entries;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tq_tx_complete --
- *
- *    process tx completion for the given tx queue
- *
- * Result:
- *    # of tx ring entries completed
- *
- *----------------------------------------------------------------------------
- */
-
-static int
-vmxnet3_tq_tx_complete(struct vmxnet3_tx_queue *tq,
-                       struct vmxnet3_adapter *adapter)
-{
-   int completed = 0;
-   Vmxnet3_GenericDesc *gdesc;
-
-   gdesc = tq->comp_ring.base + tq->comp_ring.next2proc;
-   while (gdesc->tcd.gen == tq->comp_ring.gen) {
-      completed += vmxnet3_unmap_pkt(gdesc->tcd.txdIdx, tq,
-                                     adapter->pdev, adapter);
-
-      vmxnet3_comp_ring_adv_next2proc(&tq->comp_ring);
-      gdesc = tq->comp_ring.base + tq->comp_ring.next2proc;
-   }
-
-   if (completed) {
-      spin_lock(&tq->tx_lock);
-      if (UNLIKELY(vmxnet3_tq_stopped(tq, adapter) &&
-                   vmxnet3_cmd_ring_desc_avail(&tq->tx_ring) >
-                      VMXNET3_WAKE_QUEUE_THRESHOLD(tq) &&
-                   compat_netif_carrier_ok(adapter->netdev))) {
-         vmxnet3_tq_wake(tq, adapter);
-      }
-      spin_unlock(&tq->tx_lock);
-   }
-   return completed;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tq_cleanup --
- *
- *   unmap tx buffers, free pkts, and reset ring indices and gen
- *
- * Result:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
-static void
-vmxnet3_tq_cleanup(struct vmxnet3_tx_queue *tq,
-                   struct vmxnet3_adapter *adapter)
-{
-   while (tq->tx_ring.next2comp != tq->tx_ring.next2fill) {
-      struct vmxnet3_tx_buf_info *tbi;
-      Vmxnet3_GenericDesc *gdesc;
-
-      tbi = tq->buf_info + tq->tx_ring.next2comp;
-      gdesc = tq->tx_ring.base + tq->tx_ring.next2comp;
-
-      vmxnet3_unmap_tx_buf(tbi, adapter->pdev);
-      if (tbi->skb) {
-         vmxnet3_dev_kfree_skb_any(adapter, tbi->skb);
-         tbi->skb = NULL;
-      }
-      vmxnet3_cmd_ring_adv_next2comp(&tq->tx_ring);
-   }
-
-   /* sanity check */
-#ifdef VMX86_DEBUG
-   {
-      /* verify all buffers are indeed unmapped and freed */
-      int i;
-      for (i = 0; i < tq->tx_ring.size; i++) {
-         VMXNET3_ASSERT(tq->buf_info[i].skb == NULL &&
-                        tq->buf_info[i].map_type == VMXNET3_MAP_NONE);
-      }
-   }
-#endif
-
-   tq->tx_ring.gen = VMXNET3_INIT_GEN;
-   tq->tx_ring.next2fill = tq->tx_ring.next2comp = 0;
-
-   tq->comp_ring.gen = VMXNET3_INIT_GEN;
-   tq->comp_ring.next2proc = 0;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tq_destroy --
- *
- *    free rings and buf_info for the tx queue. There must be no pending pkt
- *    in the tx ring.
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    the .base fields of all rings and buf_info will be set to NULL
- *
- *----------------------------------------------------------------------------
- */
-
-static void
-vmxnet3_tq_destroy(struct vmxnet3_tx_queue *tq,
-                   struct vmxnet3_adapter *adapter)
-{
-   if (tq->tx_ring.base) {
-      pci_free_consistent(adapter->pdev,
-                          tq->tx_ring.size * sizeof(Vmxnet3_TxDesc),
-                          tq->tx_ring.base, tq->tx_ring.basePA);
-      tq->tx_ring.base = NULL;
-   }
-   if (tq->data_ring.base) {
-      pci_free_consistent(adapter->pdev,
-                          tq->data_ring.size * sizeof(Vmxnet3_TxDataDesc),
-                          tq->data_ring.base, tq->data_ring.basePA);
-      tq->data_ring.base = NULL;
-   }
-   if (tq->comp_ring.base) {
-      pci_free_consistent(adapter->pdev,
-                          tq->comp_ring.size * sizeof(Vmxnet3_TxCompDesc),
-                          tq->comp_ring.base, tq->comp_ring.basePA);
-      tq->comp_ring.base = NULL;
-   }
-   if (tq->buf_info) {
-      kfree(tq->buf_info);
-      tq->buf_info = NULL;
-   }
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tq_init --
- *
- *    reset all internal states and rings for a tx queue
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    1. contents of the rings are reset to 0
- *    2. indices and gen of rings are reset
- *    3. bookkeeping data is reset
- *
- *----------------------------------------------------------------------------
- */
+/* called to process csum related bits in the EOP RCD descriptor */
 static void
-vmxnet3_tq_init(struct vmxnet3_tx_queue *tq,
-                struct vmxnet3_adapter *adapter)
-{
-   int i;
-
-   /* reset the tx ring contents to 0 and reset the tx ring states */
-   memset(tq->tx_ring.base, 0, tq->tx_ring.size * sizeof(Vmxnet3_TxDesc));
-   tq->tx_ring.next2fill = tq->tx_ring.next2comp = 0;
-   tq->tx_ring.gen = VMXNET3_INIT_GEN;
-
-   memset(tq->data_ring.base, 0, tq->data_ring.size * sizeof(Vmxnet3_TxDataDesc));
-
-   /* reset the tx comp ring contents to 0 and reset the comp ring states */
-   memset(tq->comp_ring.base, 0, tq->comp_ring.size * sizeof(Vmxnet3_TxCompDesc));
-   tq->comp_ring.next2proc = 0;
-   tq->comp_ring.gen = VMXNET3_INIT_GEN;
-
-   /* reset the bookkeeping data */
-   memset(tq->buf_info, 0, sizeof(tq->buf_info[0]) * tq->tx_ring.size);
-   for (i = 0; i < tq->tx_ring.size; i++) {
-      tq->buf_info[i].map_type = VMXNET3_MAP_NONE;
-   }
-
-   /* stats are not reset */
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tq_create --
- *
- *    allocate and initialize rings for the tx queue, also allocate and
- *    initialize buf_info
- *
- * Result:
- *    0 on success, negative errno on failure.
- *
- *----------------------------------------------------------------------------
- */
-static int
-vmxnet3_tq_create(struct vmxnet3_tx_queue *tq,
-                  struct vmxnet3_adapter *adapter)
-{
-   VMXNET3_ASSERT(tq->tx_ring.size > 0 &&
-                  tq->data_ring.size == tq->tx_ring.size);
-   VMXNET3_ASSERT((tq->tx_ring.size & VMXNET3_RING_SIZE_MASK) == 0);
-   VMXNET3_ASSERT(!tq->tx_ring.base && !tq->data_ring.base &&
-                  !tq->comp_ring.base && !tq->buf_info);
-
-   tq->tx_ring.base = pci_alloc_consistent(adapter->pdev,
-                                           tq->tx_ring.size * sizeof(Vmxnet3_TxDesc),
-                                           &tq->tx_ring.basePA);
-   if (!tq->tx_ring.base) {
-      printk(KERN_ERR "%s: failed to allocate tx ring\n", adapter->netdev->name);
-      goto err;
-   }
-
-   tq->data_ring.base = pci_alloc_consistent(adapter->pdev,
-                                             tq->data_ring.size * sizeof(Vmxnet3_TxDataDesc),
-                                             &tq->data_ring.basePA);
-   if (!tq->data_ring.base) {
-      printk(KERN_ERR "%s: failed to allocate data ring\n", adapter->netdev->name);
-      goto err;
-   }
-
-   tq->comp_ring.base = pci_alloc_consistent(adapter->pdev,
-                                             tq->comp_ring.size * sizeof(Vmxnet3_TxCompDesc),
-                                             &tq->comp_ring.basePA);
-   if (!tq->comp_ring.base) {
-      printk(KERN_ERR "%s: failed to allocate tx comp ring\n", adapter->netdev->name);
-      goto err;
-   }
-
-   tq->buf_info = kmalloc(sizeof(tq->buf_info[0]) * tq->tx_ring.size, GFP_KERNEL);
-   if (!tq->buf_info) {
-      printk(KERN_ERR "%s: failed to allocate tx bufinfo\n", adapter->netdev->name);
-      goto err;
-   }
-
-   return 0;
-
-err:
-   vmxnet3_tq_destroy(tq, adapter);
-   return -ENOMEM;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rq_alloc_rx_buf --
- *
- *    starting from ring->next2fill, allocate rx buffers for the given ring
- *    of the rx queue and update the rx desc. stop after @num_to_alloc buffers
- *    are allocated or allocation fails
- *
- * Result:
- *    returns # of buffers allocated
- *
- * Side-effects:
- *    1. rx descs are updated
- *    2. ring->{gen, next2fill} are updated
- *    3. uncommitted[ring_idx] is incremented
- *
- *----------------------------------------------------------------------------
- */
-
-static int
-vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq,
-                        uint32 ring_idx,
-                        int num_to_alloc,
-                        struct vmxnet3_adapter *adapter)
-{
-   int num_allocated = 0;
-   struct vmxnet3_rx_buf_info *rbi_base = rq->buf_info[ring_idx];
-   struct vmxnet3_cmd_ring *ring = &rq->rx_ring[ring_idx];
-   uint32 val;
-
-   while (num_allocated < num_to_alloc) {
-      struct vmxnet3_rx_buf_info *rbi;
-      Vmxnet3_GenericDesc *gd;
-
-      rbi = rbi_base + ring->next2fill;
-      gd = ring->base + ring->next2fill;
-
-      if (rbi->buf_type == VMXNET3_RX_BUF_SKB) {
-         if (rbi->skb == NULL) {
-            rbi->skb = vmxnet3_dev_alloc_skb(adapter, rbi->len + COMPAT_NET_IP_ALIGN);
-            if (UNLIKELY(rbi->skb == NULL)) {
-               rq->stats.rx_buf_alloc_failure++;
-               break;
-            }
-            rbi->skb->dev = adapter->netdev;
-
-            if (!adapter->is_shm) {
-               skb_reserve(rbi->skb, COMPAT_NET_IP_ALIGN);
-            }
-            rbi->dma_addr = vmxnet3_map_single(adapter, rbi->skb, 0,
-                                               rbi->len, PCI_DMA_FROMDEVICE);
-         } else {
-            /* rx buffer skipped by the device */
-         }
-         val = VMXNET3_RXD_BTYPE_HEAD << VMXNET3_RXD_BTYPE_SHIFT;
-      } else {
-         VMXNET3_ASSERT(rbi->buf_type == VMXNET3_RX_BUF_PAGE &&
-                        rbi->len  == PAGE_SIZE);
-
-         if (rbi->page == NULL) {
-            rbi->page = vmxnet3_alloc_page(adapter);
-            if (UNLIKELY(rbi->page == NULL)) {
-               rq->stats.rx_buf_alloc_failure++;
-               break;
-            }
-            rbi->dma_addr = vmxnet3_map_page(adapter, rbi->page,
-                                             0, PAGE_SIZE,
-                                             PCI_DMA_FROMDEVICE);
-         } else {
-            /* rx buffers skipped by the device */
-         }
-         val = VMXNET3_RXD_BTYPE_BODY << VMXNET3_RXD_BTYPE_SHIFT;
-      }
-
-      VMXNET3_ASSERT(rbi->dma_addr != 0);
-      gd->rxd.addr = rbi->dma_addr;
-      wmb();
-      gd->dword[2] = (ring->gen << VMXNET3_RXD_GEN_SHIFT) | val | rbi->len;
-
-      num_allocated ++;
-      vmxnet3_cmd_ring_adv_next2fill(ring);
-   }
-   rq->uncommitted[ring_idx] += num_allocated;
-
-   VMXNET3_LOG("alloc_rx_buf: %d allocated, next2fill %u, next2comp %u, uncommited %u\n",
-               num_allocated, ring->next2fill, ring->next2comp,
-               rq->uncommitted[ring_idx]);
-
-   /* so that the device can distinguish a full ring and an empty ring */
-   VMXNET3_ASSERT(num_allocated == 0 || ring->next2fill != ring->next2comp);
-
-   return num_allocated;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_append_frag --
- *
- *    Append a frag to the speicified skb. It assumes the skb still has space
- *    to accommodate the frag. It only increments skb->data_len
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
-static inline void
-vmxnet3_append_frag(struct sk_buff *skb,
-                    Vmxnet3_RxCompDesc *rcd,
-                    struct vmxnet3_rx_buf_info *rbi)
-{
-   struct skb_frag_struct *frag = skb_shinfo(skb)->frags +
-                                  skb_shinfo(skb)->nr_frags;
-
-   VMXNET3_ASSERT(skb_shinfo(skb)->nr_frags < MAX_SKB_FRAGS);
-
-   frag->page = rbi->page;
-   frag->page_offset = 0;
-   frag->size = rcd->len;
-   skb->data_len += frag->size;
-   skb_shinfo(skb)->nr_frags ++;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rx_csum --
- *
- *    called to process csum related bits in the EOP RCD descriptor
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
-static inline void
 vmxnet3_rx_csum(struct vmxnet3_adapter *adapter,
-                struct sk_buff *skb,
-                Vmxnet3_GenericDesc *gdesc)
-{
-   if (!gdesc->rcd.cnc && adapter->rxcsum) {
-      /* typical case: TCP/UDP over IP and both csums are correct */
-      if ((gdesc->dword[3] & VMXNET3_RCD_CSUM_OK) == VMXNET3_RCD_CSUM_OK) {
-         skb->ip_summed = VM_CHECKSUM_UNNECESSARY;
-         VMXNET3_ASSERT((gdesc->rcd.tcp || gdesc->rcd.udp) &&
-                        (gdesc->rcd.v4  || gdesc->rcd.v6) &&
-                        !gdesc->rcd.frg);
-      } else {
-         if (gdesc->rcd.csum) {
-            skb->csum = htons(gdesc->rcd.csum);
-            skb->ip_summed = VM_RX_CHECKSUM_PARTIAL;
-         } else {
-            skb->ip_summed = CHECKSUM_NONE;
-         }
-      }
-   } else {
-      skb->ip_summed = CHECKSUM_NONE;
-   }
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rx_error --
- *
- *    called when ERR bit is set for a received pkt. The desc and the associated 
- *    rx buffer have not been processed yet.
- *
- * Result:
- *    none
+               struct sk_buff *skb,
+               union Vmxnet3_GenericDesc *gdesc)
+{
+       if (!gdesc->rcd.cnc && adapter->rxcsum) {
+               /* typical case: TCP/UDP over IP and both csums are correct */
+               if ((gdesc->dword[3] & VMXNET3_RCD_CSUM_OK) ==
+                                                       VMXNET3_RCD_CSUM_OK) {
+                       skb->ip_summed = VM_CHECKSUM_UNNECESSARY;
+                       BUG_ON(!(gdesc->rcd.tcp || gdesc->rcd.udp));
+                       BUG_ON(!(gdesc->rcd.v4  || gdesc->rcd.v6));
+                       BUG_ON(gdesc->rcd.frg);
+               } else {
+                       if (gdesc->rcd.csum) {
+                               skb->csum = htons(gdesc->rcd.csum);
+                               skb->ip_summed = VM_RX_CHECKSUM_PARTIAL;
+                       } else {
+                               skb->ip_summed = CHECKSUM_NONE;
+                       }
+               }
+       } else {
+               skb->ip_summed = CHECKSUM_NONE;
+       }
+}
+
+
+/*
+ * called when ERR bit is set for a received pkt. The desc and the associated
+ * rx buffer have not been processed yet.
  *
  * Side-effects:
  *    1. up the stat counters
  *    2. free the skb if needed
  *    3. reset ctx->skb
- *
- *----------------------------------------------------------------------------
  */
 
 static void
-vmxnet3_rx_error(struct vmxnet3_rx_queue *rq,
-                 Vmxnet3_RxCompDesc *rcd,
-                 struct vmxnet3_rx_ctx *ctx,
-                 struct vmxnet3_adapter *adapter)
+vmxnet3_rx_error(struct vmxnet3_rx_queue *rq, struct Vmxnet3_RxCompDesc *rcd,
+                struct vmxnet3_rx_ctx *ctx,  struct vmxnet3_adapter *adapter)
 {
-   rq->stats.drop_err++;
-   if (!rcd->fcs) {
-      rq->stats.drop_fcs++;
-   }
-   rq->stats.drop_total++;
-
-   /* 
-    * We do not unmap and chain the rx buffer to the skb.
-    * We basically pretend this buffer is not used and will be recycled
-    * by vmxnet3_rq_alloc_rx_buf()
-    */
-
-   /* 
-    * ctx->skb may be NULL if this is the first and the only one
-    * desc for the pkt
-    */
-   if (ctx->skb) {
-      vmxnet3_dev_kfree_skb_irq(adapter, ctx->skb);
-   }
-   ctx->skb = NULL;
-}
+       rq->stats.drop_err++;
+       if (!rcd->fcs)
+               rq->stats.drop_fcs++;
 
+       rq->stats.drop_total++;
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rq_rx_complete --
- *
- *    process the rx completion ring of the given rx queue. Quota specified the
- *    max # of rx completion entries to be processed
- *
- * Result:
- *    # of rx descs completed
- *
- * Side-effects:
- *    None
- *----------------------------------------------------------------------------
+       /*
+        * We do not unmap and chain the rx buffer to the skb.
+        * We basically pretend this buffer is not used and will be recycled
+        * by vmxnet3_rq_alloc_rx_buf()
+        */
+
+       /*
+        * ctx->skb may be NULL if this is the first and the only one
+        * desc for the pkt
+        */
+       if (ctx->skb)
+               vmxnet3_dev_kfree_skb_irq(adapter, ctx->skb);
+
+       ctx->skb = NULL;
+}
+
+/* process the rx completion ring of the given rx queue. Quota specifies the
+ * max # of rx completion entries to be processed. Returns # of descs completed.
  */
 static int
 #ifdef VMXNET3_NAPI
 vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
-                       struct vmxnet3_adapter *adapter,
-                       int quota)
+                      struct vmxnet3_adapter *adapter, int quota)
 #else
 vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
-                       struct vmxnet3_adapter *adapter)
+                      struct vmxnet3_adapter *adapter)
 #endif
 {
-   static uint32 rxprod_reg[2] = {VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2};
-   uint32 num_rxd = 0;
-   Vmxnet3_RxCompDesc *rcd;
-   struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
-
-   rcd = &rq->comp_ring.base[rq->comp_ring.next2proc].rcd;
-   while (rcd->gen == rq->comp_ring.gen) {
-      struct vmxnet3_rx_buf_info *rbi;
-      struct sk_buff *skb;
-      int num_to_alloc;
-      Vmxnet3_RxDesc *rxd;
-      uint32 idx, ring_idx;
+       static u32 rxprod_reg[2] = {VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2};
+       u32 num_rxd = 0;
+       struct Vmxnet3_RxCompDesc *rcd;
+       struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
+
+       rcd = &rq->comp_ring.base[rq->comp_ring.next2proc].rcd;
+       while (rcd->gen == rq->comp_ring.gen) {
+               struct vmxnet3_rx_buf_info *rbi;
+               struct sk_buff *skb;
+               int num_to_alloc;
+               struct Vmxnet3_RxDesc *rxd;
+               u32 idx, ring_idx;
 #ifdef VMXNET3_NAPI
-      if (num_rxd >= quota) {
-         /* we may stop even before we see the EOP desc of the current pkt */
-         break;
-      }
-      num_rxd++;
+               if (num_rxd >= quota) {
+                       /* we may stop even before we see the EOP desc of
+                        * the current pkt
+                        */
+                       break;
+               }
+               num_rxd++;
 #endif
 
-      idx = rcd->rxdIdx;
-      ring_idx = rcd->rqID == rq->qid ? 0 : 1;
-
-      rxd = &rq->rx_ring[ring_idx].base[idx].rxd;
-      rbi = rq->buf_info[ring_idx] + idx;
-
-      VMXNET3_ASSERT(rcd->len <= rxd->len);
-      VMXNET3_ASSERT(rxd->addr == rbi->dma_addr && rxd->len == rbi->len);
-
-      if (UNLIKELY(rcd->eop && rcd->err)) {
-         vmxnet3_rx_error(rq, rcd, ctx, adapter);
-         goto rcd_done;
-      }
-
-      if (rcd->sop) { /* first buf of the pkt */
-         VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_HEAD &&
-                        rcd->rqID == rq->qid);
-
-         VMXNET3_ASSERT(rbi->buf_type == VMXNET3_RX_BUF_SKB);
-         VMXNET3_ASSERT(ctx->skb == NULL && rbi->skb != NULL);
-
-         if (UNLIKELY(rcd->len == 0)) {
-            /* Pretend the rx buffer is skipped. */
-            VMXNET3_ASSERT(rcd->sop && rcd->eop);
-            VMXNET3_LOG("rxRing[%u][%u] 0 length\n", ring_idx, idx);
-            goto rcd_done;
-         }
-
-         ctx->skb = rbi->skb;
-         rbi->skb = NULL;
-
-         pci_unmap_single(adapter->pdev,
-                          rbi->dma_addr,
-                          rbi->len,
-                          PCI_DMA_FROMDEVICE);
-
-         vmxnet3_skb_put(adapter, ctx->skb, rcd->len);
-      } else {
-         VMXNET3_ASSERT(ctx->skb != NULL);
-         /* non SOP buffer must be type 1 in most cases */
-         if (rbi->buf_type == VMXNET3_RX_BUF_PAGE) {
-            VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_BODY);
-
-            if (rcd->len) {
-               pci_unmap_page(adapter->pdev,
-                              rbi->dma_addr,
-                              rbi->len,
-                              PCI_DMA_FROMDEVICE);
-
-               vmxnet3_append_frag(ctx->skb, rcd, rbi);
-               rbi->page = NULL;
-            }
-         } else {
-            /* 
-             * The only time a non-SOP buffer is type 0 is when it's EOP and
-             * error flag is raised, which has already been handled.
-             */
-            VMXNET3_ASSERT(FALSE);
-         }
-      }
-
-      skb = ctx->skb;
-      if (rcd->eop) {
-         if (adapter->is_shm) {
-            vmxnet3_shm_rx_skb(adapter, skb);
-
-            wake_up(&adapter->shm->rxq);
-         } else {
-            skb->len += skb->data_len;
-            skb->truesize += skb->data_len;
-
-            vmxnet3_rx_csum(adapter, skb, (Vmxnet3_GenericDesc*)rcd);
-            skb->protocol = eth_type_trans(skb, adapter->netdev);
+               idx = rcd->rxdIdx;
+               ring_idx = rcd->rqID == rq->qid ? 0 : 1;
+
+               rxd = &rq->rx_ring[ring_idx].base[idx].rxd;
+               rbi = rq->buf_info[ring_idx] + idx;
+
+               BUG_ON(rcd->len > rxd->len);
+               BUG_ON(rxd->addr != rbi->dma_addr || rxd->len != rbi->len);
+
+               if (unlikely(rcd->eop && rcd->err)) {
+                       vmxnet3_rx_error(rq, rcd, ctx, adapter);
+                       goto rcd_done;
+               }
+
+               if (rcd->sop) { /* first buf of the pkt */
+                       BUG_ON(rxd->btype != VMXNET3_RXD_BTYPE_HEAD ||
+                              rcd->rqID != rq->qid);
+
+                       BUG_ON(rbi->buf_type != VMXNET3_RX_BUF_SKB);
+                       BUG_ON(ctx->skb != NULL || rbi->skb == NULL);
+
+                       if (unlikely(rcd->len == 0)) {
+                               /* Pretend the rx buffer is skipped. */
+                               BUG_ON(!(rcd->sop && rcd->eop));
+                               dev_dbg(&adapter->pdev->dev, "rxRing[%u][%u] 0"
+                                       " length\n", ring_idx, idx);
+                               goto rcd_done;
+                       }
+
+                       ctx->skb = rbi->skb;
+                       rbi->skb = NULL;
+
+                       pci_unmap_single(adapter->pdev, rbi->dma_addr, rbi->len,
+                                        PCI_DMA_FROMDEVICE);
+
+                       vmxnet3_skb_put(adapter, ctx->skb, rcd->len);
+               } else {
+                       BUG_ON(ctx->skb == NULL);
+                       /* non SOP buffer must be type 1 in most cases */
+                       if (rbi->buf_type == VMXNET3_RX_BUF_PAGE) {
+                               BUG_ON(rxd->btype != VMXNET3_RXD_BTYPE_BODY);
+
+                               if (rcd->len) {
+                                       pci_unmap_page(adapter->pdev,
+                                                      rbi->dma_addr, rbi->len,
+                                                      PCI_DMA_FROMDEVICE);
+
+                                       vmxnet3_append_frag(ctx->skb, rcd, rbi);
+                                       rbi->page = NULL;
+                               }
+                       } else {
+                               /*
+                                * The only time a non-SOP buffer is type 0 is
+                                * when it's EOP and error flag is raised, which
+                                * has already been handled.
+                                */
+                               BUG_ON(TRUE);
+                       }
+               }
+
+               skb = ctx->skb;
+               if (rcd->eop) {
+                       if (adapter->is_shm) {
+                               vmxnet3_shm_rx_skb(adapter, skb);
+
+                               wake_up(&adapter->shm->rxq);
+                       } else {
+                               skb->len += skb->data_len;
+                               skb->truesize += skb->data_len;
+
+                               vmxnet3_rx_csum(adapter, skb,
+                                       (union Vmxnet3_GenericDesc *)rcd);
+                               skb->protocol = eth_type_trans(skb,
+                                                              adapter->netdev);
 
 #ifdef VMXNET3_NAPI
-            if (UNLIKELY(adapter->vlan_grp && rcd->ts)) {
-               vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, rcd->tci);
-            } else {
-               netif_receive_skb(skb);
-            }
+                               if (unlikely(adapter->vlan_grp && rcd->ts)) {
+                                       vlan_hwaccel_receive_skb(skb,
+                                               adapter->vlan_grp, rcd->tci);
+                               } else {
+                                       netif_receive_skb(skb);
+                               }
 #else
-            if (UNLIKELY(adapter->vlan_grp && rcd->ts)) {
-               vlan_hwaccel_rx(skb, adapter->vlan_grp, rcd->tci);
-            } else {
-               netif_rx(skb);
-            }
+                               if (unlikely(adapter->vlan_grp && rcd->ts)) {
+                                       vlan_hwaccel_rx(skb, adapter->vlan_grp,
+                                                       rcd->tci);
+                               } else {
+                                       netif_rx(skb);
+                               }
 #endif
-         }
+                       }
 
-         adapter->netdev->last_rx = jiffies;
-         ctx->skb = NULL;
-      }
+                       adapter->netdev->last_rx = jiffies;
+                       ctx->skb = NULL;
+               }
 
 rcd_done:
-      /* device may skip some rx descs */
-      rq->rx_ring[ring_idx].next2comp = idx;
-      VMXNET3_INC_RING_IDX_ONLY(rq->rx_ring[ring_idx].next2comp,
-                                rq->rx_ring[ring_idx].size);
-
-      /* refill rx buffers from time to time to avoid starving the h/w */
-      num_to_alloc = vmxnet3_cmd_ring_desc_avail(rq->rx_ring + ring_idx);
-      if (UNLIKELY(num_to_alloc > VMXNET3_RX_ALLOC_THRESHOLD(rq, ring_idx, adapter))) {
-         vmxnet3_rq_alloc_rx_buf(rq, ring_idx, num_to_alloc, adapter);
-
-         /* if needed, update the register */
-         if (UNLIKELY(rq->shared->updateRxProd)) {
-            VMXNET3_WRITE_BAR0_REG(adapter, rxprod_reg[ring_idx] + rq->qid * 8,
-                                   rq->rx_ring[ring_idx].next2fill);
-            rq->uncommitted[ring_idx] = 0;
-         }
-      }
-
-      vmxnet3_comp_ring_adv_next2proc(&rq->comp_ring);
-      rcd = &rq->comp_ring.base[rq->comp_ring.next2proc].rcd;
-   }
-
-   return num_rxd;
-}
-
+               /* device may skip some rx descs */
+               rq->rx_ring[ring_idx].next2comp = idx;
+               VMXNET3_INC_RING_IDX_ONLY(rq->rx_ring[ring_idx].next2comp,
+                                         rq->rx_ring[ring_idx].size);
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rq_cleanup --
- *
- *    Unmap and free the rx buffers allocated to the rx queue. Other resources
- *    are NOT freed. This is the counterpart of vmxnet3_rq_init()
- *
- *    the content of the rx rings must still be valid when we are invoked
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    1. indices and gen of each ring are reset to the initial value
- *    2. buf_info[] and buf_info2[] are cleared.
- *
- *----------------------------------------------------------------------------
- */
-
-static void
-vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq,
-                   struct vmxnet3_adapter *adapter)
-{
-   uint32 i, ring_idx;
-   Vmxnet3_RxDesc *rxd;
-
-   for (ring_idx = 0; ring_idx < 2; ring_idx++) {
-      for (i = 0; i < rq->rx_ring[ring_idx].size; i++) {
-         rxd = &rq->rx_ring[ring_idx].base[i].rxd;
-
-         if (rxd->btype == VMXNET3_RXD_BTYPE_HEAD &&
-             rq->buf_info[ring_idx][i].skb) {
-            pci_unmap_single(adapter->pdev,
-                             rxd->addr,
-                             rxd->len,
-                             PCI_DMA_FROMDEVICE);
-            vmxnet3_dev_kfree_skb(adapter, rq->buf_info[ring_idx][i].skb);
-            rq->buf_info[ring_idx][i].skb = NULL;
-         } else if (rxd->btype == VMXNET3_RXD_BTYPE_BODY &&
-                    rq->buf_info[ring_idx][i].page) {
-            pci_unmap_page(adapter->pdev,
-                           rxd->addr,
-                           rxd->len,
-                           PCI_DMA_FROMDEVICE);
-            vmxnet3_put_page(adapter, rq->buf_info[ring_idx][i].page);
-            rq->buf_info[ring_idx][i].page = NULL;
-         }
-      }
-
-      rq->rx_ring[ring_idx].gen = VMXNET3_INIT_GEN;
-      rq->rx_ring[ring_idx].next2fill = rq->rx_ring[ring_idx].next2comp = 0;
-      rq->uncommitted[ring_idx] = 0;
-   }
-
-   rq->comp_ring.gen = VMXNET3_INIT_GEN;
-   rq->comp_ring.next2proc = 0;
-}
+               /* refill rx buffers frequently to avoid starving the h/w */
+               num_to_alloc = vmxnet3_cmd_ring_desc_avail(rq->rx_ring +
+                                                          ring_idx);
+               if (unlikely(num_to_alloc > VMXNET3_RX_ALLOC_THRESHOLD(rq,
+                                                       ring_idx, adapter))) {
+                       vmxnet3_rq_alloc_rx_buf(rq, ring_idx, num_to_alloc,
+                                               adapter);
 
+                       /* if needed, update the register */
+                       if (unlikely(rq->shared->updateRxProd)) {
+                               VMXNET3_WRITE_BAR0_REG(adapter,
+                                       rxprod_reg[ring_idx] + rq->qid * 8,
+                                       rq->rx_ring[ring_idx].next2fill);
+                               rq->uncommitted[ring_idx] = 0;
+                       }
+               }
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rq_destroy --
- *
- *    Free rings and buf_info for the rx queue. The rx buffers must have
- *    ALREADY been freed.
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    the .base fields of all rings will be set to NULL
- *----------------------------------------------------------------------------
- */
-
-static void
-vmxnet3_rq_destroy(struct vmxnet3_rx_queue *rq,
-                   struct vmxnet3_adapter *adapter)
-{
-   int i;
+               vmxnet3_comp_ring_adv_next2proc(&rq->comp_ring);
+               rcd = &rq->comp_ring.base[rq->comp_ring.next2proc].rcd;
+       }
 
-#ifdef VMX86_DEBUG
-   /* all rx buffers must have already been freed */
-   {
-      int j;
-
-      for (i = 0; i < 2; i++) {
-         if (rq->buf_info[i]) {
-            for (j = 0; j < rq->rx_ring[i].size; j++) {
-               VMXNET3_ASSERT(rq->buf_info[i][j].page == NULL);
-            }
-         }
-      }
-   }
-#endif
-
-   if (rq->buf_info[0]) {
-      kfree(rq->buf_info[0]);
-   }
-
-   for (i = 0; i < 2; i++) {
-      if (rq->rx_ring[i].base) {
-         pci_free_consistent(adapter->pdev,
-                                    rq->rx_ring[i].size * sizeof(Vmxnet3_RxDesc),
-                                    rq->rx_ring[i].base, rq->rx_ring[i].basePA);
-         rq->rx_ring[i].base = NULL;
-      }
-      rq->buf_info[i] = NULL;
-   }
-
-   if (rq->comp_ring.base) {
-      pci_free_consistent(adapter->pdev,
-                                 rq->comp_ring.size * sizeof(Vmxnet3_RxCompDesc),
-                                 rq->comp_ring.base, rq->comp_ring.basePA);
-      rq->comp_ring.base = NULL;
-   }
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rq_init --
- *
- *    initialize buf_info, allocate rx buffers and fill the rx rings. On
- *    failure, the rx buffers already allocated are NOT freed
- *
- * Result:
- *    0 on success or error code
- *
- *----------------------------------------------------------------------------
- */
-
-static int
-vmxnet3_rq_init(struct vmxnet3_rx_queue *rq,
-                struct vmxnet3_adapter  *adapter)
-{
-   int i;
-
-   VMXNET3_ASSERT(adapter->rx_buf_per_pkt > 0 &&
-                  rq->rx_ring[0].size % adapter->rx_buf_per_pkt == 0);
-
-   /* initialize buf_info */
-   for (i = 0; i < rq->rx_ring[0].size; i++) {
-      VMXNET3_ASSERT(rq->buf_info[0][i].skb == NULL);
-      if (i % adapter->rx_buf_per_pkt == 0) { /* 1st buf for a pkt is skbuff */
-         rq->buf_info[0][i].buf_type = VMXNET3_RX_BUF_SKB;
-         rq->buf_info[0][i].len = adapter->skb_buf_size;
-      } else { /* subsequent bufs for a pkt is frag */
-         rq->buf_info[0][i].buf_type = VMXNET3_RX_BUF_PAGE;
-         rq->buf_info[0][i].len = PAGE_SIZE;
-      }
-   }
-   for (i = 0; i < rq->rx_ring[1].size; i++) {
-      VMXNET3_ASSERT(rq->buf_info[1][i].page == NULL);
-      rq->buf_info[1][i].buf_type = VMXNET3_RX_BUF_PAGE;
-      rq->buf_info[1][i].len = PAGE_SIZE;
-   }
-
-   /* reset internal state and allocate buffers for both rings */
-   for (i = 0; i < 2; i++) {
-      rq->rx_ring[i].next2fill = rq->rx_ring[i].next2comp = 0;
-      rq->uncommitted[i] = 0;
-
-      memset(rq->rx_ring[i].base, 0, rq->rx_ring[i].size * sizeof(Vmxnet3_RxDesc));
-      rq->rx_ring[i].gen = VMXNET3_INIT_GEN;
-   }
-   if (vmxnet3_rq_alloc_rx_buf(rq, 0, rq->rx_ring[0].size - 1, adapter) == 0) {
-      // at least has 1 rx buffer for the 1st ring
-      return -ENOMEM;
-   }
-   vmxnet3_rq_alloc_rx_buf(rq, 1, rq->rx_ring[1].size - 1, adapter);
-
-   /* reset the comp ring */
-   rq->comp_ring.next2proc = 0;
-   memset(rq->comp_ring.base, 0, rq->comp_ring.size * sizeof(Vmxnet3_RxCompDesc));
-   rq->comp_ring.gen = VMXNET3_INIT_GEN;
-
-   /* reset rxctx */
-   rq->rx_ctx.skb = NULL;
-
-   /* stats are not reset */
-   return 0;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_rq_create --
- *
- *    allocate and initialize two cmd rings and the completion ring for the
- *    given rx queue. Also allocate and initialize buf_info.
- *    rx buffers are NOT allocated
- *
- * Result:
- *    0 on success, negative errno on failure
- *----------------------------------------------------------------------------
- */
-static int
-vmxnet3_rq_create(struct vmxnet3_rx_queue *rq,
-                  struct vmxnet3_adapter *adapter)
-{
-   int i;
-   size_t sz;
-   struct vmxnet3_rx_buf_info *bi;
-
-   VMXNET3_ASSERT(rq->rx_ring[0].size % adapter->rx_buf_per_pkt == 0);
-
-   for (i = 0; i < 2; i++) {
-      VMXNET3_ASSERT((rq->rx_ring[i].size & VMXNET3_RING_SIZE_MASK) == 0);
-      VMXNET3_ASSERT(rq->rx_ring[i].base == NULL);
-
-      sz = rq->rx_ring[i].size * sizeof(Vmxnet3_RxDesc);
-      rq->rx_ring[i].base = pci_alloc_consistent(adapter->pdev,
-                                                 sz,
-                                                 &rq->rx_ring[i].basePA);
-      if (!rq->rx_ring[i].base) {
-         printk(KERN_ERR "%s: failed to allocate rx ring %d\n", adapter->netdev->name, i);
-         goto err;
-      }
-   }
-
-   sz = rq->comp_ring.size * sizeof(Vmxnet3_RxCompDesc);
-   VMXNET3_ASSERT(rq->comp_ring.base == NULL);
-   rq->comp_ring.base = pci_alloc_consistent(adapter->pdev,
-                                             sz,
-                                             &rq->comp_ring.basePA);
-   if (!rq->comp_ring.base) {
-      printk(KERN_ERR "%s: failed to allocate rx comp ring\n", adapter->netdev->name);
-      goto err;
-   }
-
-   VMXNET3_ASSERT(!rq->buf_info[0] && !rq->buf_info[1]);
-   sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size + rq->rx_ring[1].size);
-   bi = kmalloc(sz, GFP_KERNEL);
-   if (!bi) {
-      printk(KERN_ERR "%s: failed to allocate rx bufinfo\n", adapter->netdev->name);
-      goto err;
-   }
-   memset(bi, 0, sz);
-   rq->buf_info[0] = bi;
-   rq->buf_info[1] = bi + rq->rx_ring[0].size;
-
-   return 0;
-
-err:
-   vmxnet3_rq_destroy(rq, adapter);
-   return -ENOMEM;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_vlan_features --
- *
- *      Inherit net_device features from real device to VLAN device.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      Modifies VLAN net_device's features.
- *
- *----------------------------------------------------------------------------
- */
-
-static void
-vmxnet3_vlan_features(struct vmxnet3_adapter *adapter,  // IN:
-                      uint16_t vid,                     // IN:
-                      Bool allvids)                     // IN:
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
-   struct net_device *v_netdev;
-
-   if (adapter->vlan_grp) {
-      if (allvids) {
-         for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
-            v_netdev = compat_vlan_group_get_device(adapter->vlan_grp, vid);
-            if (v_netdev) {
-               v_netdev->features |= adapter->netdev->features;
-               compat_vlan_group_set_device(adapter->vlan_grp, vid, v_netdev);
-            }
-         }
-      } else {
-         v_netdev = compat_vlan_group_get_device(adapter->vlan_grp, vid);
-         if (v_netdev) {
-            v_netdev->features |= adapter->netdev->features;
-            compat_vlan_group_set_device(adapter->vlan_grp, vid, v_netdev);
-         }
-      }
-   }
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_vlan_rx_register --
- *
- *    Called to enable/disable VLAN stripping.
- *
- * Result:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-static void
-vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   Vmxnet3_DriverShared *shared = adapter->shared;
-   uint32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
-
-   if (grp) {
-      // add vlan rx stripping.
-      if (adapter->netdev->features & NETIF_F_HW_VLAN_RX) {
-         int i;
-         Vmxnet3_DSDevRead *devRead = &shared->devRead;
-         adapter->vlan_grp = grp;
-
-         /* update FEATURES to device */
-         devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_FEATURE);
-         /* 
-          *  Clear entire vfTable; then enable untagged pkts.  
-          *  Note: setting one entry in vfTable to non-zero turns on VLAN rx filtering.
-          */
-         for (i = 0; i < VMXNET3_VFT_SIZE; i++) {
-            // 
-            vfTable[i] = 0;
-         }
-         VMXNET3_SET_VFTABLE_ENTRY(vfTable, 0);
-         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_VLAN_FILTERS);
-      } else {
-         printk(KERN_ERR "%s: vlan_rx_register when device has no NETIF_F_HW_VLAN_RX\n",
-                netdev->name);
-      }
-   } else {
-      // remove vlan rx stripping.
-      Vmxnet3_DSDevRead *devRead = &shared->devRead;
-      adapter->vlan_grp = NULL;
-      
-      if (devRead->misc.uptFeatures & UPT1_F_RXVLAN) {
-         int i;
-
-         for (i = 0; i < VMXNET3_VFT_SIZE; i++) {
-            // clear entire vfTable; this also disables VLAN rx filtering
-            vfTable[i] = 0;
-         }
-         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_VLAN_FILTERS);
-
-         /* update FEATURES to device */
-         devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
-         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_FEATURE);
-      }
-   }
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_restore_vlan --
- *
- *    Setup driverShared.devRead.rxFilter.vfTable
- *
- * Result:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-static void
-vmxnet3_restore_vlan(struct vmxnet3_adapter *adapter)
-{
-   if (adapter->vlan_grp) {
-      uint16 vid;
-      uint32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
-      Bool activeVlan = FALSE;
-
-      for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
-         if (compat_vlan_group_get_device(adapter->vlan_grp, vid)) {
-            VMXNET3_SET_VFTABLE_ENTRY(vfTable, vid);
-            activeVlan = TRUE;
-         }
-      }
-      if (activeVlan) {
-         /* continue to allow untagged pkts */
-         VMXNET3_SET_VFTABLE_ENTRY(vfTable, 0);
-      }
-   }
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_vlan_rx_add_vid --
- *
- *    Called to add a VLAN ID.
- *
- * Result:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-static void
-vmxnet3_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   uint32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
-
-   vmxnet3_vlan_features(adapter, vid, FALSE);
-   VMXNET3_SET_VFTABLE_ENTRY(vfTable, vid);
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_VLAN_FILTERS);
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_vlan_rx_kill_vid --
- *
- *    Called to remove a VLAN ID.
- *
- * Result:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-static void
-vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   uint32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
-
-   VMXNET3_CLEAR_VFTABLE_ENTRY(vfTable, vid);
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_VLAN_FILTERS);
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_copy_mc --
- *
- *    Allocate a buffer and copy into the mcast list. 
- *    It returns NULL if the mcast list exceeds the limit.
- *
- * Result:
- *    The addr of the allocated buffer or NULL.
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-static uint8 *
-vmxnet3_copy_mc(struct net_device *netdev)
-{
-   uint8 *buf = NULL;
-   uint32 sz = netdev->mc_count * ETH_ALEN;
-
-   /* Vmxnet3_RxFilterConf.mfTableLen is uint16. */
-   if (sz <= 0xffff) {
-      /* We may be called with BH disabled */
-      buf = kmalloc(sz, GFP_ATOMIC);
-      if (buf) {
-         int i;
-         struct dev_mc_list *mc = netdev->mc_list;
-
-         for (i = 0; i < netdev->mc_count; i++) {
-            VMXNET3_ASSERT(mc);
-            memcpy(buf + i * ETH_ALEN, mc->dmi_addr, ETH_ALEN);
-            mc = mc->next;
-         }
-      }
-   }
-   return buf;
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_mc --
- *
- *    Called to change rx mode as well as multicast list.
- *
- * Result:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-static void
-vmxnet3_set_mc(struct net_device *netdev)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   Vmxnet3_RxFilterConf *rxConf = &adapter->shared->devRead.rxFilterConf;
-   uint8 *new_table = NULL;
-   uint32 new_mode = VMXNET3_RXM_UCAST;
-
-   if (netdev->flags & IFF_PROMISC) {
-      new_mode |= VMXNET3_RXM_PROMISC;
-   }
-   if (netdev->flags & IFF_BROADCAST) {
-      new_mode |= VMXNET3_RXM_BCAST;
-   }
-   if (netdev->flags & IFF_ALLMULTI) {
-      new_mode |= VMXNET3_RXM_ALL_MULTI;
-   } else {
-      if (netdev->mc_count > 0) {
-         new_table = vmxnet3_copy_mc(netdev);
-         if (new_table) {
-            new_mode |= VMXNET3_RXM_MCAST;
-            rxConf->mfTableLen = netdev->mc_count * ETH_ALEN;
-            rxConf->mfTablePA = virt_to_phys(new_table);
-         } else {
-            printk(KERN_INFO "%s: failed to copy mcast list, setting ALL_MULTI\n",
-                   netdev->name);
-            new_mode |= VMXNET3_RXM_ALL_MULTI;
-         }
-      }
-   }
-   if (!(new_mode & VMXNET3_RXM_MCAST)) {
-      rxConf->mfTableLen = 0;
-      rxConf->mfTablePA = 0;
-   }
-
-   if (new_mode != rxConf->rxMode) {
-      rxConf->rxMode = new_mode;
-      VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_RX_MODE);
-   }
-
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_MAC_FILTERS);
-
-   if (new_table) {
-      kfree(new_table);
-   }
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_activate_dev --
- *
- *    put the vNIC into an operational state. After this function finishes, the
- *    adapter is fully functional. It does the following:
- *
- *    1. initialize tq and rq
- *    2. fill rx rings with rx buffers
- *    3. setup intr
- *    4. setup driver_shared
- *    5. activate the dev
- *    6. signal the stack that the vNIC is ready to tx/rx
- *    7. enable intrs for the vNIC
- *
- * Result:
- *    0 if the vNIC is in operation state
- *    error code if any intermediate step fails.
- *
- *----------------------------------------------------------------------------
- */
-
-int
-vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
-{
-   int err;
-   uint32 ret;
-
-   VMXNET3_LOG("%s: skb_buf_size %d, rx_buf_per_pkt %d, ring sizes %u %u %u\n",
-               adapter->netdev->name,
-               adapter->skb_buf_size, adapter->rx_buf_per_pkt,
-               adapter->tx_queue.tx_ring.size,
-               adapter->rx_queue.rx_ring[0].size,
-               adapter->rx_queue.rx_ring[1].size);
-
-   vmxnet3_tq_init(&adapter->tx_queue, adapter);
-   err = vmxnet3_rq_init(&adapter->rx_queue, adapter);
-   if (err) {
-      printk(KERN_ERR "Failed to init rx queue for %s: error %d\n",
-             adapter->netdev->name, err);
-      goto rq_err;
-   }
-
-   err = vmxnet3_request_irqs(adapter);
-   if (err) {
-      printk(KERN_ERR "Failed to setup irq for %s: error %d\n",
-             adapter->netdev->name, err);
-      goto irq_err;
-   }
-
-   vmxnet3_setup_driver_shared(adapter);
-
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAL, VMXNET3_GET_ADDR_LO(adapter->shared_pa));
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH, VMXNET3_GET_ADDR_HI(adapter->shared_pa));
-
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_ACTIVATE_DEV);
-   ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
-   if (ret != 0) {
-      printk(KERN_ERR "Failed to activate dev %s: error %u\n",
-             adapter->netdev->name, ret);
-      err = -EINVAL;
-      goto activate_err;
-   }
-   VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_RXPROD,
-                          adapter->rx_queue.rx_ring[0].next2fill);
-   VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_RXPROD2,
-                          adapter->rx_queue.rx_ring[1].next2fill);
-
-   /* Apply the rx filter settins last. */
-   vmxnet3_set_mc(adapter->netdev);
-
-   /*
-    * Check link state when first activating device. It will start the tx queue
-    * if the link is up.
-    */
-   vmxnet3_check_link(adapter);
-
-#ifdef VMXNET3_NAPI
-   compat_napi_enable(adapter->netdev, &adapter->napi);
-#endif
-
-   vmxnet3_enable_all_intrs(adapter);
-
-   clear_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
-   return 0;
-
-activate_err:
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAL, 0);
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH, 0);
-   vmxnet3_free_irqs(adapter);
-irq_err:
-rq_err:
-   /* free up buffers we allocated */
-   vmxnet3_rq_cleanup(&adapter->rx_queue, adapter);
-   return err;
-}
-
-
-static void
-vmxnet3_reset_dev(struct vmxnet3_adapter *adapter)
-{
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_quiesce_dev --
- *
- *    stop the device. After this function returns, the adapter stop pkt tx/rx
- *    and won't generate intrs. The stack won't try to xmit pkts through us,
- *    nor will it poll us for pkts. It does the following:
- *
- *    1. ask the vNIC to quiesce
- *    2. disable the vNIC from generating intrs
- *    3. free intr
- *    4. stop the stack from xmiting pkts thru us and polling
- *    5. free rx buffers
- *    6. tx complete pkts pending
- *
- * Result:
- *    0 on success
- *
- *----------------------------------------------------------------------------
- */
-
-int
-vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter)
-{
-   if (test_and_set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state)) {
-      printk(KERN_INFO "%s: already quiesced\n", adapter->netdev->name);
-      return 0;
-   }
-
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_QUIESCE_DEV);
-   vmxnet3_disable_all_intrs(adapter);
-
-#ifdef VMXNET3_NAPI
-   compat_napi_disable(adapter->netdev, &adapter->napi);
-#endif
-
-   netif_tx_disable(adapter->netdev);
-
-   adapter->link_speed = 0;
-   netif_carrier_off(adapter->netdev);
-
-   /* TODO: force tx completion */
-
-   vmxnet3_tq_cleanup(&adapter->tx_queue, adapter);
-   vmxnet3_rq_cleanup(&adapter->rx_queue, adapter);
-
-   vmxnet3_free_irqs(adapter);
-   return 0;
+       return num_rxd;
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_write_mac_addr --
- *
- *    Write the given MAC address to the device register
- *
- * Result:
- *    None
- *
+ * Unmap and free the rx buffers allocated to the rx queue. Other resources
+ * are NOT freed. This is the counterpart of vmxnet3_rq_init()
  * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
+ *    1. indices and gen of each ring are reset to the initial value
+ *    2. buf_info[] and buf_info2[] are cleared.
  */
 
 static void
-vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, uint8 *mac)
+vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq,
+                  struct vmxnet3_adapter *adapter)
 {
-   uint32 tmp;
-
-   tmp = *(uint32*)mac;
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_MACL, tmp);
+       u32 i, ring_idx;
+       struct Vmxnet3_RxDesc *rxd;
 
-   tmp = (mac[5] << 8) | mac[4];
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_MACH, tmp);
-}
-
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_mac_addr --
- *
- *    Change the current MAC address
- *
- * Result:
- *    0 on success
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
+       for (ring_idx = 0; ring_idx < 2; ring_idx++) {
+               for (i = 0; i < rq->rx_ring[ring_idx].size; i++) {
+                       rxd = &rq->rx_ring[ring_idx].base[i].rxd;
 
-static int
-vmxnet3_set_mac_addr(struct net_device *netdev, void *p)
-{
-   struct sockaddr *addr = p;
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+                       if (rxd->btype == VMXNET3_RXD_BTYPE_HEAD &&
+                                       rq->buf_info[ring_idx][i].skb) {
+                               pci_unmap_single(adapter->pdev, rxd->addr,
+                                                rxd->len, PCI_DMA_FROMDEVICE);
+                               vmxnet3_dev_kfree_skb(adapter,
+                                               rq->buf_info[ring_idx][i].skb);
+                               rq->buf_info[ring_idx][i].skb = NULL;
+                       } else if (rxd->btype == VMXNET3_RXD_BTYPE_BODY &&
+                                       rq->buf_info[ring_idx][i].page) {
+                               pci_unmap_page(adapter->pdev, rxd->addr,
+                                              rxd->len, PCI_DMA_FROMDEVICE);
+                               vmxnet3_put_page(adapter,
+                                               rq->buf_info[ring_idx][i].page);
+                               rq->buf_info[ring_idx][i].page = NULL;
+                       }
+               }
 
-   memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-   vmxnet3_write_mac_addr(adapter, addr->sa_data);
+               rq->rx_ring[ring_idx].gen = VMXNET3_INIT_GEN;
+               rq->rx_ring[ring_idx].next2fill =
+                                       rq->rx_ring[ring_idx].next2comp = 0;
+               rq->uncommitted[ring_idx] = 0;
+       }
 
-   return 0;
+       rq->comp_ring.gen = VMXNET3_INIT_GEN;
+       rq->comp_ring.next2proc = 0;
 }
 
 
-/* ==================== initialization and cleanup routines ============ */
-
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_alloc_pci_resources --
- *
- *    allocate pci resources
- *
- * Result:
- *    0 on success or error code
- *
- *----------------------------------------------------------------------------
+ *    Free rings and buf_info for the rx queue. The rx buffers must have
+ *    ALREADY been freed. the .base fields of all rings will be set to NULL
  */
-static int
-vmxnet3_alloc_pci_resources(struct vmxnet3_adapter *adapter, Bool *dma64)
-{
-   int err;
-   unsigned long mmio_start, mmio_len;
-   struct pci_dev *pdev = adapter->pdev;
 
-   err = compat_pci_enable_device(pdev);
-   if (err) {
-      printk(KERN_ERR "Failed to enable adapter %s: error %d\n",
-             compat_pci_name(pdev), err);
-      return err;
-   }
+void
+vmxnet3_rq_destroy(struct vmxnet3_rx_queue *rq,
+               struct vmxnet3_adapter *adapter)
+{
+       int i;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 6)
-   if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) == 0) {
-      if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) {
-         printk(KERN_ERR "pci_set_consistent_dma_mask failed for adapter %s\n",
-                compat_pci_name(pdev));
-         err = -EIO;
-         goto err_set_mask;
-      }
-      *dma64 = TRUE;
-   } else {
-      if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) {
-         printk(KERN_ERR "pci_set_dma_mask failed for adapter %s\n",
-                compat_pci_name(pdev));
-         err = -EIO;
-         goto err_set_mask;
-      }
-      *dma64 = FALSE;
-   }
-#else
-   *dma64 = TRUE;
+#ifdef VMX86_DEBUG
+       /* all rx buffers must have already been freed */
+       {
+               int j;
+
+               for (i = 0; i < 2; i++) {
+                       if (rq->buf_info[i]) {
+                               for (j = 0; j < rq->rx_ring[i].size; j++) {
+                                       BUG_ON(rq->buf_info[i][j].page != NULL);
+                               }
+                       }
+               }
+       }
 #endif
 
-   err = compat_pci_request_regions(pdev, vmxnet3_driver_name);
-   if (err) {
-      printk(KERN_ERR "Failed to request region for adapter %s: error %d\n",
-             compat_pci_name(pdev), err);
-      goto err_set_mask;
-   }
-
-   compat_pci_set_master(pdev);
-
-   mmio_start = compat_pci_resource_start(pdev, 0);
-   mmio_len = compat_pci_resource_len(pdev, 0);
-   adapter->hw_addr0 = ioremap(mmio_start, mmio_len);
-   if (!adapter->hw_addr0) {
-      printk(KERN_ERR "Failed to map bar0 for adapter %s\n",
-             compat_pci_name(pdev));
-      err = -EIO;
-      goto err_ioremap;
-   }
-
-   mmio_start = compat_pci_resource_start(pdev, 1);
-   mmio_len = compat_pci_resource_len(pdev, 1);
-   adapter->hw_addr1 = ioremap(mmio_start, mmio_len);
-   if (!adapter->hw_addr1) {
-      printk(KERN_ERR "Failed to map bar1 for adapter %s\n",
-             compat_pci_name(pdev));
-      err = -EIO;
-      goto err_bar1;
-   }
-   return 0;
 
-err_bar1:
-   iounmap(adapter->hw_addr0);
-err_ioremap:
-   compat_pci_release_regions(pdev);
-err_set_mask:
-   compat_pci_disable_device(pdev);
-   return err;
-}
-
-
-static void
-vmxnet3_free_pci_resources(struct vmxnet3_adapter *adapter)
-{
-   VMXNET3_ASSERT(adapter->pdev);
+       kfree(rq->buf_info[0]);
 
-   iounmap(adapter->hw_addr0);
-   iounmap(adapter->hw_addr1);
-   compat_pci_release_regions(adapter->pdev);
-   compat_pci_disable_device(adapter->pdev);
+       for (i = 0; i < 2; i++) {
+               if (rq->rx_ring[i].base) {
+                       pci_free_consistent(adapter->pdev, rq->rx_ring[i].size
+                                           * sizeof(struct Vmxnet3_RxDesc),
+                                           rq->rx_ring[i].base,
+                                           rq->rx_ring[i].basePA);
+                       rq->rx_ring[i].base = NULL;
+               }
+               rq->buf_info[i] = NULL;
+       }
+
+       if (rq->comp_ring.base) {
+               pci_free_consistent(adapter->pdev, rq->comp_ring.size *
+                                   sizeof(struct Vmxnet3_RxCompDesc),
+                                   rq->comp_ring.base, rq->comp_ring.basePA);
+               rq->comp_ring.base = NULL;
+       }
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_setup_driver_shared --
- *
- *   Set up driver_shared based on settings in adapter.
- *
- * Result:
- *    1. the whole driver_shared area is wiped out and re-initialized
- *
- *----------------------------------------------------------------------------
+ *    initialize buf_info, allocate rx buffers and fill the rx rings. On
+ *    failure, the rx buffers already allocated are NOT freed
  */
 
-static void
-vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
-{
-   Vmxnet3_DriverShared *shared = adapter->shared;
-   Vmxnet3_DSDevRead *devRead = &shared->devRead;
-   Vmxnet3_TxQueueConf *tqc;
-   Vmxnet3_RxQueueConf *rqc;
-   int i;
-
-   memset(shared, 0, sizeof(*shared));
-
-   /* driver settings */
-   shared->magic = VMXNET3_REV1_MAGIC;
-   devRead->misc.driverInfo.version = VMXNET3_DRIVER_VERSION_NUM;
-   devRead->misc.driverInfo.gos.gosBits = sizeof(void*) == 4 ? VMXNET3_GOS_BITS_32 :
-                                                     VMXNET3_GOS_BITS_64;
-   devRead->misc.driverInfo.gos.gosType = VMXNET3_GOS_TYPE_LINUX;
-   devRead->misc.driverInfo.vmxnet3RevSpt = 1;
-   devRead->misc.driverInfo.uptVerSpt = 1;
-
-   devRead->misc.ddPA = virt_to_phys(adapter);
-   devRead->misc.ddLen = sizeof(struct vmxnet3_adapter);
-
-   /* set up feature flags */
-   if (adapter->rxcsum) {
-      devRead->misc.uptFeatures |= UPT1_F_RXCSUM;
-   }
-   if (adapter->lro) {
-      devRead->misc.uptFeatures |= UPT1_F_LRO;
-      devRead->misc.maxNumRxSG = 1 + MAX_SKB_FRAGS;
-   }
-   if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX)
-       && adapter->vlan_grp) {
-      devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-   }
-
-   devRead->misc.mtu = adapter->netdev->mtu;
-   devRead->misc.queueDescPA = adapter->queue_desc_pa;
-   devRead->misc.queueDescLen = sizeof(Vmxnet3_TxQueueDesc) + 
-                                sizeof(Vmxnet3_RxQueueDesc);
-
-   /* tx queue settings */
-   VMXNET3_ASSERT(adapter->tx_queue.tx_ring.base != NULL);
-
-   devRead->misc.numTxQueues = 1;
-   tqc = &adapter->tqd_start->conf;
-   tqc->txRingBasePA   = adapter->tx_queue.tx_ring.basePA;
-   tqc->dataRingBasePA = adapter->tx_queue.data_ring.basePA;
-   tqc->compRingBasePA = adapter->tx_queue.comp_ring.basePA;
-   tqc->ddPA           = virt_to_phys(adapter->tx_queue.buf_info);
-   tqc->txRingSize     = adapter->tx_queue.tx_ring.size;
-   tqc->dataRingSize   = adapter->tx_queue.data_ring.size;
-   tqc->compRingSize   = adapter->tx_queue.comp_ring.size;
-   tqc->ddLen          = sizeof(struct vmxnet3_tx_buf_info) *
-                         tqc->txRingSize;
-   tqc->intrIdx        = adapter->tx_queue.comp_ring.intr_idx;
-
-   /* rx queue settings */
-   devRead->misc.numRxQueues = 1;
-   rqc = &adapter->rqd_start->conf;
-   rqc->rxRingBasePA[0] = adapter->rx_queue.rx_ring[0].basePA;
-   rqc->rxRingBasePA[1] = adapter->rx_queue.rx_ring[1].basePA;
-   rqc->compRingBasePA  = adapter->rx_queue.comp_ring.basePA;
-   rqc->ddPA            = virt_to_phys(adapter->rx_queue.buf_info);
-   rqc->rxRingSize[0]   = adapter->rx_queue.rx_ring[0].size;
-   rqc->rxRingSize[1]   = adapter->rx_queue.rx_ring[1].size;
-   rqc->compRingSize    = adapter->rx_queue.comp_ring.size;
-   rqc->ddLen           = sizeof(struct vmxnet3_rx_buf_info) *
-                          (rqc->rxRingSize[0] + rqc->rxRingSize[1]);
-   rqc->intrIdx         = adapter->rx_queue.comp_ring.intr_idx;
-
-   /* intr settings */
-   devRead->intrConf.autoMask = adapter->intr.mask_mode == VMXNET3_IMM_AUTO;
-   devRead->intrConf.numIntrs = adapter->intr.num_intrs;
-   for (i = 0; i < adapter->intr.num_intrs; i++) {
-      devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];
-   }
-   devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
-
-   /* rx filter settings */
-   devRead->rxFilterConf.rxMode   = 0;
-   vmxnet3_restore_vlan(adapter);
-   /* the rest are already zeroed */
+static int
+vmxnet3_rq_init(struct vmxnet3_rx_queue *rq,
+               struct vmxnet3_adapter  *adapter)
+{
+       int i;
+
+       BUG_ON(adapter->rx_buf_per_pkt <= 0 ||
+              rq->rx_ring[0].size % adapter->rx_buf_per_pkt != 0);
+       /* initialize buf_info */
+       for (i = 0; i < rq->rx_ring[0].size; i++) {
+               BUG_ON(rq->buf_info[0][i].skb != NULL);
+               /* 1st buf for a pkt is skbuff */
+               if (i % adapter->rx_buf_per_pkt == 0) {
+                       rq->buf_info[0][i].buf_type = VMXNET3_RX_BUF_SKB;
+                       rq->buf_info[0][i].len = adapter->skb_buf_size;
+               } else { /* subsequent bufs for a pkt is frag */
+                       rq->buf_info[0][i].buf_type = VMXNET3_RX_BUF_PAGE;
+                       rq->buf_info[0][i].len = PAGE_SIZE;
+               }
+       }
+       for (i = 0; i < rq->rx_ring[1].size; i++) {
+               BUG_ON(rq->buf_info[1][i].page != NULL);
+               rq->buf_info[1][i].buf_type = VMXNET3_RX_BUF_PAGE;
+               rq->buf_info[1][i].len = PAGE_SIZE;
+       }
+
+       /* reset internal state and allocate buffers for both rings */
+       for (i = 0; i < 2; i++) {
+               rq->rx_ring[i].next2fill = rq->rx_ring[i].next2comp = 0;
+               rq->uncommitted[i] = 0;
+
+               memset(rq->rx_ring[i].base, 0, rq->rx_ring[i].size *
+                      sizeof(struct Vmxnet3_RxDesc));
+               rq->rx_ring[i].gen = VMXNET3_INIT_GEN;
+       }
+       if (vmxnet3_rq_alloc_rx_buf(rq, 0, rq->rx_ring[0].size - 1,
+                                   adapter) == 0) {
+               /* at least has 1 rx buffer for the 1st ring */
+               return -ENOMEM;
+       }
+       vmxnet3_rq_alloc_rx_buf(rq, 1, rq->rx_ring[1].size - 1, adapter);
+
+       /* reset the comp ring */
+       rq->comp_ring.next2proc = 0;
+       memset(rq->comp_ring.base, 0, rq->comp_ring.size *
+              sizeof(struct Vmxnet3_RxCompDesc));
+       rq->comp_ring.gen = VMXNET3_INIT_GEN;
+
+       /* reset rxctx */
+       rq->rx_ctx.skb = NULL;
+
+       /* stats are not reset */
+       return 0;
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_adjust_rx_ring_size --
- *
- *    calc the # of buffers for a pkt based on mtu, then adjust the size of the
- *    1st rx ring accordingly
- *
- * Result:
- *    None
- *
- *----------------------------------------------------------------------------
+ *    allocate and initialize two cmd rings and the completion ring for the
+ *    given rx queue. Also allocate and initialize buf_info.
+ *    rx buffers are NOT allocated
  */
+static int
+vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter)
+{
+       int i;
+       size_t sz;
+       struct vmxnet3_rx_buf_info *bi;
+
+       BUG_ON(rq->rx_ring[0].size % adapter->rx_buf_per_pkt != 0);
+       for (i = 0; i < 2; i++) {
+               BUG_ON((rq->rx_ring[i].size & VMXNET3_RING_SIZE_MASK) != 0);
+               BUG_ON(rq->rx_ring[i].base != NULL);
+               sz = rq->rx_ring[i].size * sizeof(struct Vmxnet3_RxDesc);
+               rq->rx_ring[i].base = pci_alloc_consistent(adapter->pdev, sz,
+                                                       &rq->rx_ring[i].basePA);
+               if (!rq->rx_ring[i].base) {
+                       printk(KERN_ERR "%s: failed to allocate rx ring %d\n",
+                              adapter->netdev->name, i);
+                       goto err;
+               }
+       }
+
+       sz = rq->comp_ring.size * sizeof(Vmxnet3_RxCompDesc);
+       BUG_ON(rq->comp_ring.base != NULL);
+       rq->comp_ring.base = pci_alloc_consistent(adapter->pdev,
+                       sz,
+                       &rq->comp_ring.basePA);
+       if (!rq->comp_ring.base) {
+               printk(KERN_ERR "%s: failed to allocate rx comp ring\n",
+                      adapter->netdev->name);
+               goto err;
+       }
+
+       BUG_ON(rq->buf_info[0] || rq->buf_info[1]);
+       sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
+                                                  rq->rx_ring[1].size);
+       bi = kmalloc(sz, GFP_KERNEL);
+       if (!bi) {
+               printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
+                      adapter->netdev->name);
+               goto err;
+       }
+       memset(bi, 0, sz);
+       rq->buf_info[0] = bi;
+       rq->buf_info[1] = bi + rq->rx_ring[0].size;
+
+       return 0;
+
+err:
+       vmxnet3_rq_destroy(rq, adapter);
+       return -ENOMEM;
+}
+
+#ifdef VMXNET3_NAPI
 
 static void
-vmxnet3_adjust_rx_ring_size(struct vmxnet3_adapter *adapter)
+vmxnet3_do_poll(struct vmxnet3_adapter *adapter, int budget, int *txd_done,
+               int *rxd_done)
 {
-   size_t sz;
-
-   if (adapter->netdev->mtu <= VMXNET3_MAX_SKB_BUF_SIZE - VMXNET3_MAX_ETH_HDR_SIZE) {
-      adapter->skb_buf_size = adapter->netdev->mtu + VMXNET3_MAX_ETH_HDR_SIZE;
-      if (adapter->skb_buf_size < VMXNET3_MIN_T0_BUF_SIZE) {
-         adapter->skb_buf_size = VMXNET3_MIN_T0_BUF_SIZE;
-      }
-      adapter->rx_buf_per_pkt = 1;
-   } else {
-      adapter->skb_buf_size = VMXNET3_MAX_SKB_BUF_SIZE;
-      sz = adapter->netdev->mtu - VMXNET3_MAX_SKB_BUF_SIZE + VMXNET3_MAX_ETH_HDR_SIZE;
-      adapter->rx_buf_per_pkt = 1 + (sz + PAGE_SIZE - 1) / PAGE_SIZE;
-   }
-
-   if (adapter->is_shm) {
-      adapter->skb_buf_size = PAGE_SIZE;
-   }
-
-   /*
-    * for simplicity, force the ring0 size to be a multiple of
-    * rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN
-    */
-   sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN;
-   adapter->rx_queue.rx_ring[0].size =
-      (adapter->rx_queue.rx_ring[0].size + sz - 1) / sz * sz;
-   adapter->rx_queue.rx_ring[0].size = min_t(uint32, adapter->rx_queue.rx_ring[0].size,
-                                             VMXNET3_RX_RING_MAX_SIZE / sz * sz);
+       if (unlikely(adapter->shared->ecr))
+               vmxnet3_process_events(adapter);
+
+       *txd_done = vmxnet3_tq_tx_complete(&adapter->tx_queue, adapter);
+       *rxd_done = vmxnet3_rq_rx_complete(&adapter->rx_queue, adapter, budget);
 }
 
 
+#ifdef VMXNET3_NEW_NAPI
+
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_create_queues --
- *
- *    Create the specified number of tx queues and rx queues. On failure, it
- *    destroys the queues created.
- *
- * Results:
- *    0 on success, errno value on failure.
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
+ * New NAPI polling function. Returns # of the NAPI credit consumed (# of rx
+ * descriptors processed)
  */
 static int
-vmxnet3_create_queues(struct vmxnet3_adapter *adapter,
-                      uint32 tx_ring_size,
-                      uint32 rx_ring_size,
-                      uint32 rx_ring2_size)
+vmxnet3_poll(struct napi_struct *napi, int budget)
 {
-   int err;
-
-   adapter->tx_queue.tx_ring.size   = tx_ring_size;
-   adapter->tx_queue.data_ring.size = tx_ring_size;
-   adapter->tx_queue.comp_ring.size = tx_ring_size;
-   adapter->tx_queue.shared = &adapter->tqd_start->ctrl;
-   adapter->tx_queue.stopped = TRUE;
-   err = vmxnet3_tq_create(&adapter->tx_queue, adapter);
-   if (err) {
-      return err;
-   }
-
-   adapter->rx_queue.rx_ring[0].size = rx_ring_size;
-   adapter->rx_queue.rx_ring[1].size = rx_ring2_size;
-   vmxnet3_adjust_rx_ring_size(adapter);
-   adapter->rx_queue.comp_ring.size  = adapter->rx_queue.rx_ring[0].size +
-                                       adapter->rx_queue.rx_ring[1].size;
-   adapter->rx_queue.qid  = 0;
-   adapter->rx_queue.qid2 = 1;
-   adapter->rx_queue.shared = &adapter->rqd_start->ctrl;
-   err = vmxnet3_rq_create(&adapter->rx_queue, adapter);
-   if (err) {
-      vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
-   }
-
-   return err;
-}
+       struct vmxnet3_adapter *adapter = container_of(napi,
+                                         struct vmxnet3_adapter, napi);
+       int rxd_done, txd_done;
 
+       vmxnet3_do_poll(adapter, budget, &txd_done, &rxd_done);
+
+       if (rxd_done < budget) {
+               compat_napi_complete(adapter->netdev, napi);
+               vmxnet3_enable_intr(adapter, 0);
+       }
+       return rxd_done;
+}
+#else
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_open --
- *
- *    called when the interface is brought up
- *
  * Result:
- *    0 on success, negative errno value on failure
- *
- * Side-effects:
- *    setup rings, allocate necessary resources, request for IRQs, configure
- *    the device. The device is functional after this function finishes
- *    successfully.
- *
- *----------------------------------------------------------------------------
+ *    0: napi is done
+ *    1: continue polling
  */
 
 static int
-vmxnet3_open(struct net_device *netdev)
+vmxnet3_poll(struct net_device *poll_dev, int *budget)
 {
-   struct vmxnet3_adapter *adapter;
-   int err;
-
-   adapter = compat_netdev_priv(netdev);
+       int rxd_done, txd_done, quota;
+       struct vmxnet3_adapter *adapter = netdev_priv(poll_dev);
 
-   spin_lock_init(&adapter->tx_queue.tx_lock);
+       quota = min(*budget, poll_dev->quota);
 
-   if (adapter->is_shm) {
-      printk(KERN_INFO "bringing up shared memory vmxnet3 %s\n", netdev->name);
-      err = vmxnet3_shm_open(adapter, netdev->name);
-      if (err) {
-         goto shm_err;
-      }
-   }
+       vmxnet3_do_poll(adapter, quota, &txd_done, &rxd_done);
 
-   err = vmxnet3_create_queues(adapter, VMXNET3_DEF_TX_RING_SIZE, 
-                               VMXNET3_DEF_RX_RING_SIZE, VMXNET3_DEF_RX_RING_SIZE);
-   if (err) {
-      goto queue_err;
-   }
+       *budget -= rxd_done;
+       poll_dev->quota -= rxd_done;
 
-   err = vmxnet3_activate_dev(adapter);
-   if (err) {
-      goto activate_err;
-   }
+       if (rxd_done < quota) {
+               compat_napi_complete(poll_dev, unused);
+               vmxnet3_enable_intr(adapter, 0);
+               return 0;
+       }
 
-   COMPAT_NETDEV_MOD_INC_USE_COUNT;
-
-   return 0;
-
-activate_err:
-   vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
-   vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
-queue_err:
-   if (adapter->is_shm) {
-     vmxnet3_shm_close(adapter);
-   }
-shm_err:
-   return err;
+       return 1; /* not done */
 }
 
+#endif /* VMXNET3_NEW_NAPI  */
+#endif /* VMXNET3_NAPI  */
 
-static int
-vmxnet3_close(struct net_device *netdev)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-
-   /* 
-    * Reset_work may be in the middle of resetting the device, wait for its
-    * completion.
-    */
-   while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state)) {
-      compat_msleep(1);
-   }
-
-   vmxnet3_quiesce_dev(adapter);
 
-   if (adapter->is_shm) {
-      vmxnet3_shm_close(adapter);
-   }
+/* Interrupt handler for vmxnet3  */
+static compat_irqreturn_t
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+vmxnet3_intr(int irq, void *dev_id, struct pt_regs * regs)
+#else
+vmxnet3_intr(int irq, void *dev_id)
+#endif
+{
+       struct net_device *dev = dev_id;
+       struct vmxnet3_adapter *adapter = netdev_priv(dev);
 
-   vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
-   vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
+       if (unlikely(adapter->intr.type == VMXNET3_IT_INTX)) {
+               u32 icr = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_ICR);
+               if (unlikely(icr == 0))
+                       /* not ours */
+                       return IRQ_NONE;
+       }
 
-   COMPAT_NETDEV_MOD_DEC_USE_COUNT;
+#ifdef VMXNET3_NAPI
+       /* disable intr if needed */
+       if (adapter->intr.mask_mode == VMXNET3_IMM_ACTIVE)
+               vmxnet3_disable_intr(adapter, 0);
 
-   clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
+       compat_napi_schedule(dev, &adapter->napi);
 
+#else
+       vmxnet3_tq_tx_complete(&adapter->tx_queue, adapter);
+       vmxnet3_rq_rx_complete(&adapter->rx_queue, adapter);
+       if (unlikely(adapter->shared->ecr)) {
+               vmxnet3_process_events(adapter);
+       }
+       vmxnet3_enable_intr(adapter, 0);
+#endif
 
-   return 0;
+       return COMPAT_IRQ_HANDLED;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_force_close  --
- *
- *    called to forcibly close the device when the driver failed to re-activate it.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
- *
- *----------------------------------------------------------------------------
- */
-void
-vmxnet3_force_close(struct vmxnet3_adapter *adapter)
+static void
+vmxnet3_netpoll(struct net_device *netdev)
 {
-   /* 
-    * we must clear VMXNET3_STATE_BIT_RESETTING, otherwise
-    * vmxnet3_close() will deadlock.
-    */
-   VMXNET3_ASSERT(!test_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state));
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       int irq;
 
-#ifdef VMXNET3_NAPI
-   /* we need to enable NAPI, otherwise dev_close will deadlock */
-   compat_napi_enable(adapter->netdev, &adapter->napi);
+#ifdef CONFIG_PCI_MSI
+       if (adapter->intr.type == VMXNET3_IT_MSIX)
+               irq = adapter->intr.msix_entries[0].vector;
+       else
 #endif
-   dev_close(adapter->netdev);
-}
-
+               irq = adapter->pdev->irq;
 
-static int
-vmxnet3_change_mtu(struct net_device *netdev, int new_mtu)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   int err = 0;
-
-   if (new_mtu < VMXNET3_MIN_MTU || new_mtu > VMXNET3_MAX_MTU) {
-      return -EINVAL;
-   }
-
-   if (new_mtu > 1500 && !adapter->jumbo_frame) {
-      return -EINVAL;
-   }
-
-   netdev->mtu = new_mtu;
-
-   /* 
-    * Reset_work may be in the middle of resetting the device, wait for its
-    * completion.
-    */
-   while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state)) {
-      compat_msleep(1);
-   }
-
-   if (compat_netif_running(netdev)) {
-      vmxnet3_quiesce_dev(adapter);
-      vmxnet3_reset_dev(adapter);
-
-      /* we need to re-create the rx queue based on the new mtu */
-      vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
-      vmxnet3_adjust_rx_ring_size(adapter);
-      adapter->rx_queue.comp_ring.size  = adapter->rx_queue.rx_ring[0].size +
-                                          adapter->rx_queue.rx_ring[1].size;
-      err = vmxnet3_rq_create(&adapter->rx_queue, adapter);
-      if (err) {
-         printk(KERN_ERR "%s: failed to re-create rx queue, error %d. Closing it.\n",
-                netdev->name, err);
-         goto out;
-      }
-
-      err = vmxnet3_activate_dev(adapter);
-      if (err) {
-         printk(KERN_ERR "%s: failed to re-activate, error %d. Closing it\n",
-                netdev->name, err);
-         goto out;
-      }
-   }
-
-out:
-   clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
-   if (err) {
-      vmxnet3_force_close(adapter);
-   }
-   return err;
+       disable_irq(irq);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+       vmxnet3_intr(irq, netdev, NULL);
+#else
+       vmxnet3_intr(irq, netdev);
+#endif
+       enable_irq(irq);
 }
+#endif
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_declare_features --
- *
- *    set netdev->features based on the device's capabilities
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    netdev->features is set
- *
- *----------------------------------------------------------------------------
+ * event_intr_idx and intr_idx for different comp rings get updated here.
  */
 
-static void
-vmxnet3_declare_features(struct vmxnet3_adapter *adapter, Bool dma64)
+static int
+vmxnet3_request_irqs(struct vmxnet3_adapter *adapter)
 {
-   struct net_device *netdev = adapter->netdev;
+       int err;
 
-   netdev->features = NETIF_F_SG |
-                      NETIF_F_HW_CSUM |
-                      NETIF_F_HW_VLAN_TX |
-                      NETIF_F_HW_VLAN_RX |
-                      NETIF_F_HW_VLAN_FILTER |
-                      NETIF_F_TSO;
-   printk(KERN_INFO "features: sg csum vlan jf tso");
+#ifdef CONFIG_PCI_MSI
+       if (adapter->intr.type == VMXNET3_IT_MSIX)
+               /* we only use 1 MSI-X vector */
+               err = request_irq(adapter->intr.msix_entries[0].vector,
+                                 vmxnet3_intr, 0, adapter->netdev->name,
+                                 adapter->netdev);
+       else if (adapter->intr.type == VMXNET3_IT_MSI)
+               err = request_irq(adapter->pdev->irq, vmxnet3_intr, 0,
+                                 adapter->netdev->name, adapter->netdev);
+       else
+#endif
+               err = request_irq(adapter->pdev->irq, vmxnet3_intr,
+                                 COMPAT_IRQF_SHARED, adapter->netdev->name,
+                                 adapter->netdev);
 
-   adapter->rxcsum = TRUE;
-   adapter->jumbo_frame = TRUE;
+       if (err)
+               printk(KERN_ERR "Failed to request irq %s (intr type:%d), error"
+                      ":%d\n", adapter->netdev->name, adapter->intr.type, err);
 
-#ifdef NETIF_F_TSO6
-   netdev->features |= NETIF_F_TSO6;
-   printk(" tsoIPv6");
-#endif
 
-   if (!disable_lro) {
-      adapter->lro = TRUE;
-      printk(" lro");
-   }
+       if (!err) {
+               int i;
+               /* init our intr settings */
+               for (i = 0; i < adapter->intr.num_intrs; i++)
+                       adapter->intr.mod_levels[i] = UPT1_IML_ADAPTIVE;
 
-   if (dma64) {
-      netdev->features |= NETIF_F_HIGHDMA;
-      printk(" highDMA");
-   }
+               /* next setup intr index for all intr sources */
+               adapter->tx_queue.comp_ring.intr_idx = 0;
+               adapter->rx_queue.comp_ring.intr_idx = 0;
+               adapter->intr.event_intr_idx = 0;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
-   netdev->vlan_features = netdev->features;
-#endif
+               printk(KERN_INFO "%s: intr type %u, mode %u, %u vectors "
+                      "allocated\n", adapter->netdev->name, adapter->intr.type,
+                      adapter->intr.mask_mode, adapter->intr.num_intrs);
+       }
 
-   printk("\n");
+       return err;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_read_mac_addr --
- *
- *    Read the current MAC address from the device and store into @mac
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
 static void
-vmxnet3_read_mac_addr(struct vmxnet3_adapter *adapter, uint8 *mac)
+vmxnet3_free_irqs(struct vmxnet3_adapter *adapter)
 {
-   uint32 tmp;
-
-   tmp = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_MACL);
-   *(uint32*)mac = tmp;
+       BUG_ON(adapter->intr.type == VMXNET3_IT_AUTO ||
+              adapter->intr.num_intrs <= 0);
 
-   tmp = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_MACH);
-   mac[4] = tmp & 0xff;
-   mac[5] = (tmp >> 8) & 0xff;
+       switch (adapter->intr.type) {
+#ifdef CONFIG_PCI_MSI
+       case VMXNET3_IT_MSIX:
+       {
+               int i;
+
+               for (i = 0; i < adapter->intr.num_intrs; i++)
+                       free_irq(adapter->intr.msix_entries[i].vector,
+                                adapter->netdev);
+               break;
+       }
+       case VMXNET3_IT_MSI:
+               free_irq(adapter->pdev->irq, adapter->netdev);
+               break;
+#endif
+       case VMXNET3_IT_INTX:
+               free_irq(adapter->pdev->irq, adapter->netdev);
+               break;
+       default:
+               BUG_ON(TRUE);
+       }
 }
 
+static void
+vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       struct Vmxnet3_DriverShared *shared = adapter->shared;
+       u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+
+       if (grp) {
+               /* add vlan rx stripping. */
+               if (adapter->netdev->features & NETIF_F_HW_VLAN_RX) {
+                       int i;
+                       struct Vmxnet3_DSDevRead *devRead = &shared->devRead;
+                       adapter->vlan_grp = grp;
+
+                       /* update FEATURES to device */
+                       devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
+                       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                              VMXNET3_CMD_UPDATE_FEATURE);
+                       /*
+                        *  Clear entire vfTable; then enable untagged pkts.
+                        *  Note: setting one entry in vfTable to non-zero turns
+                        *  on VLAN rx filtering.
+                        */
+                       for (i = 0; i < VMXNET3_VFT_SIZE; i++)
+                               vfTable[i] = 0;
+
+                       VMXNET3_SET_VFTABLE_ENTRY(vfTable, 0);
+                       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                              VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+               } else {
+                       printk(KERN_ERR "%s: vlan_rx_register when device has "
+                              "no NETIF_F_HW_VLAN_RX\n", netdev->name);
+               }
+       } else {
+               /* remove vlan rx stripping. */
+               struct Vmxnet3_DSDevRead *devRead = &shared->devRead;
+               adapter->vlan_grp = NULL;
+
+               if (devRead->misc.uptFeatures & UPT1_F_RXVLAN) {
+                       int i;
+
+                       for (i = 0; i < VMXNET3_VFT_SIZE; i++) {
+                               /* clear entire vfTable; this also disables
+                                * VLAN rx filtering
+                                */
+                               vfTable[i] = 0;
+                       }
+                       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                              VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+
+                       /* update FEATURES to device */
+                       devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
+                       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                              VMXNET3_CMD_UPDATE_FEATURE);
+               }
+       }
+}
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_rx_csum --
- *
- *    Ethtool callback to return whether or not the dev verifies rx csum
- *
- * Result:
- *    1 if the device verifies rx csum and 0 otherwise
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
 
-static uint32
-vmxnet3_get_rx_csum(struct net_device *netdev)
+static void
+vmxnet3_restore_vlan(struct vmxnet3_adapter *adapter)
+{
+       if (adapter->vlan_grp) {
+               u16 vid;
+               u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+               Bool activeVlan = FALSE;
+
+               for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
+                       if (compat_vlan_group_get_device(adapter->vlan_grp,
+                                                        vid)) {
+                               VMXNET3_SET_VFTABLE_ENTRY(vfTable, vid);
+                               activeVlan = TRUE;
+                       }
+               }
+               if (activeVlan) {
+                       /* continue to allow untagged pkts */
+                       VMXNET3_SET_VFTABLE_ENTRY(vfTable, 0);
+               }
+       }
+}
+
+/* Inherit net_device features from real device to VLAN device. */
+void
+vmxnet3_vlan_features(struct vmxnet3_adapter *adapter, u16 vid, Bool allvids)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   return adapter->rxcsum;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+       struct net_device *v_netdev;
+
+       if (adapter->vlan_grp) {
+               if (allvids) {
+                       for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
+                               v_netdev = compat_vlan_group_get_device(
+                                                       adapter->vlan_grp, vid);
+                               if (v_netdev) {
+                                       v_netdev->features |=
+                                                     adapter->netdev->features;
+                                       compat_vlan_group_set_device(
+                                             adapter->vlan_grp, vid, v_netdev);
+                               }
+                       }
+               } else {
+                       v_netdev = compat_vlan_group_get_device(
+                                                       adapter->vlan_grp, vid);
+                       if (v_netdev) {
+                               v_netdev->features |= adapter->netdev->features;
+                               compat_vlan_group_set_device(adapter->vlan_grp,
+                                                            vid, v_netdev);
+                       }
+               }
+       }
+#endif
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_rx_csum --
- *
- *    Ethtool callback to change if rx csum verification should be done
- *
- * Result:
- *    0 on success
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
-static int
-vmxnet3_set_rx_csum(struct net_device *netdev, uint32 val)
+static void
+vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-
-   if (adapter->rxcsum != val) {
-      adapter->rxcsum = val;
-      if (compat_netif_running(netdev)) {
-         if (val) {
-            adapter->shared->devRead.misc.uptFeatures |= UPT1_F_RXCSUM;
-         } else {
-            adapter->shared->devRead.misc.uptFeatures &= ~UPT1_F_RXCSUM;
-         }
-         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_FEATURE);
-      }
-   }
-   return 0;
-}
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
 
+       vmxnet3_vlan_features(adapter, vid, FALSE);
+       VMXNET3_SET_VFTABLE_ENTRY(vfTable, vid);
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+}
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_tx_csum --
- *
- *    Ethtool op to return whether or not tx csum offload is enabled
- *
- * Result:
- *    1 if tx csum offload is currently used and 0 otherwise
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
 
-static uint32
-vmxnet3_get_tx_csum(struct net_device *netdev)
+static void
+vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
 {
-   return (netdev->features & NETIF_F_HW_CSUM) != 0;
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+
+       VMXNET3_CLEAR_VFTABLE_ENTRY(vfTable, vid);
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_UPDATE_VLAN_FILTERS);
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_tx_csum --
- *
- *    Ethtool op to change if tx csum offloading should be used or not
- *
- * Result:
- *    0 on success
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
+ * Allocate a buffer and copy into the mcast list. Returns NULL if the mcast
+ * list exceeds the limit. Returns the addr of the allocated buffer or NULL.
  */
 
-static int
-vmxnet3_set_tx_csum(struct net_device *netdev, uint32 val)
+static u8 *
+vmxnet3_copy_mc(struct net_device *netdev)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   if (val) {
-      netdev->features |= NETIF_F_HW_CSUM;
-   } else {
-      netdev->features &= ~ NETIF_F_HW_CSUM;
-   }
-   vmxnet3_vlan_features(adapter, 0, TRUE);
-   return 0;
-}
+       u8 *buf = NULL;
+       u32 sz = netdev->mc_count * ETH_ALEN;
 
+       /* Vmxnet3_RxFilterConf.mfTableLen is u16. */
+       if (sz <= 0xffff) {
+               /* We may be called with BH disabled */
+               buf = kmalloc(sz, GFP_ATOMIC);
+               if (buf) {
+                       int i;
+                       struct dev_mc_list *mc = netdev->mc_list;
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_sg --
- *
- *      Ethtool op to change Scatter/gather IO feature.
- *
- * Results:
- *      0 on success.
- *
- * Side effects:
- *      Change SG feature on any VLAN interfaces associated with netdev.
- *
- *----------------------------------------------------------------------------
- */
+                       for (i = 0; i < netdev->mc_count; i++) {
+                               BUG_ON(!mc);
+                               memcpy(buf + i * ETH_ALEN, mc->dmi_addr,
+                                      ETH_ALEN);
+                               mc = mc->next;
+                       }
+               }
+       }
+       return buf;
+}
 
-static int
-vmxnet3_set_sg(struct net_device *netdev, uint32 val)
+
+static void
+vmxnet3_set_mc(struct net_device *netdev)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   ethtool_op_set_sg(netdev, val);
-   vmxnet3_vlan_features(adapter, 0, TRUE);
-   return 0;
-}
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       struct Vmxnet3_RxFilterConf *rxConf =
+                                       &adapter->shared->devRead.rxFilterConf;
+       u8 *new_table = NULL;
+       u32 new_mode = VMXNET3_RXM_UCAST;
 
+       if (netdev->flags & IFF_PROMISC)
+               new_mode |= VMXNET3_RXM_PROMISC;
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_tso --
- *
- *      Ethtool op to change TCP Segmentation Offload feature.
- *
- * Results:
- *      0 on success.
- *
- * Side effects:
- *      Change TSO feature on any VLAN interfaces associated with netdev.
- *
- *----------------------------------------------------------------------------
- */
+       if (netdev->flags & IFF_BROADCAST)
+               new_mode |= VMXNET3_RXM_BCAST;
 
-static int
-vmxnet3_set_tso(struct net_device *netdev, uint32 val)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   ethtool_op_set_tso(netdev, val);
-   vmxnet3_vlan_features(adapter, 0, TRUE);
-   return 0;
-}
+       if (netdev->flags & IFF_ALLMULTI)
+               new_mode |= VMXNET3_RXM_ALL_MULTI;
+       else if (netdev->mc_count > 0) {
+               new_table = vmxnet3_copy_mc(netdev);
+               if (new_table) {
+                       new_mode |= VMXNET3_RXM_MCAST;
+                       rxConf->mfTableLen = netdev->mc_count * ETH_ALEN;
+                       rxConf->mfTablePA = virt_to_phys(new_table);
+               } else {
+                       printk(KERN_INFO "%s: failed to copy mcast list, "
+                              "setting ALL_MULTI\n", netdev->name);
+                       new_mode |= VMXNET3_RXM_ALL_MULTI;
+               }
+       }
 
 
-/* per tq stats maintained by the device */
-static const struct vmxnet3_stat_desc
-vmxnet3_tq_dev_stats[] = {
-   /* description,         offset */
-   { "TSO pkts tx",        offsetof(UPT1_TxStats, TSOPktsTxOK) },
-   { "TSO bytes tx",       offsetof(UPT1_TxStats, TSOBytesTxOK) },
-   { "ucast pkts tx",      offsetof(UPT1_TxStats, ucastPktsTxOK) },
-   { "ucast bytes tx",     offsetof(UPT1_TxStats, ucastBytesTxOK) },
-   { "mcast pkts tx",      offsetof(UPT1_TxStats, mcastPktsTxOK) },
-   { "mcast bytes tx",     offsetof(UPT1_TxStats, mcastBytesTxOK) },
-   { "bcast pkts tx",      offsetof(UPT1_TxStats, bcastPktsTxOK) },
-   { "bcast bytes tx",     offsetof(UPT1_TxStats, bcastBytesTxOK) },
-   { "pkts tx err",        offsetof(UPT1_TxStats, pktsTxError) },
-   { "pkts tx discard",    offsetof(UPT1_TxStats, pktsTxDiscard) },
-};
+       if (!(new_mode & VMXNET3_RXM_MCAST)) {
+               rxConf->mfTableLen = 0;
+               rxConf->mfTablePA = 0;
+       }
 
-/* per tq stats maintained by the driver */
-static const struct vmxnet3_stat_desc
-vmxnet3_tq_driver_stats[] = {
-   /* description,         offset */
-   { "drv dropped tx total", offsetof(struct vmxnet3_tq_driver_stats, drop_total) },
-   { "   too many frags",  offsetof(struct vmxnet3_tq_driver_stats, drop_too_many_frags) },
-   { "   giant hdr",       offsetof(struct vmxnet3_tq_driver_stats, drop_oversized_hdr) },
-   { "   hdr err",         offsetof(struct vmxnet3_tq_driver_stats, drop_hdr_inspect_err) },
-   { "   tso",             offsetof(struct vmxnet3_tq_driver_stats, drop_tso) },
-   { "ring full",          offsetof(struct vmxnet3_tq_driver_stats, tx_ring_full) },
-   { "pkts linearized",    offsetof(struct vmxnet3_tq_driver_stats, linearized) },
-   { "hdr cloned",         offsetof(struct vmxnet3_tq_driver_stats, copy_skb_header) },
-   { "giant hdr",          offsetof(struct vmxnet3_tq_driver_stats, oversized_hdr) },
-};
+       if (new_mode != rxConf->rxMode) {
+               rxConf->rxMode = new_mode;
+               VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                      VMXNET3_CMD_UPDATE_RX_MODE);
+       }
 
-/* per rq stats maintained by the device */
-static const struct vmxnet3_stat_desc
-vmxnet3_rq_dev_stats[] = {
-   { "LRO pkts rx",        offsetof(UPT1_RxStats, LROPktsRxOK) },
-   { "LRO byte rx",        offsetof(UPT1_RxStats, LROBytesRxOK) },
-   { "ucast pkts rx",      offsetof(UPT1_RxStats, ucastPktsRxOK) },
-   { "ucast bytes rx",     offsetof(UPT1_RxStats, ucastBytesRxOK) },
-   { "mcast pkts rx",      offsetof(UPT1_RxStats, mcastPktsRxOK) },
-   { "mcast bytes rx",     offsetof(UPT1_RxStats, mcastBytesRxOK) },
-   { "bcast pkts rx",      offsetof(UPT1_RxStats, bcastPktsRxOK) },
-   { "bcast bytes rx",     offsetof(UPT1_RxStats, bcastBytesRxOK) },
-   { "pkts rx out of buf", offsetof(UPT1_RxStats, pktsRxOutOfBuf) },
-   { "pkts rx err",        offsetof(UPT1_RxStats, pktsRxError) },
-};
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_UPDATE_MAC_FILTERS);
 
-/* per rq stats maintained by the driver */
-static const struct vmxnet3_stat_desc
-vmxnet3_rq_driver_stats[] = {
-   /* description,         offset */
-   { "drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats, drop_total) },
-   { "   err",            offsetof(struct vmxnet3_rq_driver_stats, drop_err) },
-   { "   fcs",            offsetof(struct vmxnet3_rq_driver_stats, drop_fcs) },
-   { "rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats, rx_buf_alloc_failure) },
-};
+       kfree(new_table);
+}
 
-/* gloabl stats maintained by the driver */
-static const struct vmxnet3_stat_desc
-vmxnet3_global_stats[] = {
-   /* description,         offset */
-   { "tx timeout count",   offsetof(struct vmxnet3_adapter, tx_timeout_count) }
-};
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_stats --
- *
- *    Collect the device and driver statistics and present in the
- *    net_device_stats format.
- *
- * Results:
- *    Pointer to the net_device_stats struct in the adapter.
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
+ * Wipes out the whole driver_shared area and re-initializes it
  */
 
-
-static struct net_device_stats*
-vmxnet3_get_stats(struct net_device *netdev)
+static void
+vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
 {
-   struct vmxnet3_adapter *adapter;
-   struct vmxnet3_tq_driver_stats *drvTxStats;
-   struct vmxnet3_rq_driver_stats *drvRxStats;
-   UPT1_TxStats *devTxStats;
-   UPT1_RxStats *devRxStats;
-
-   adapter = compat_netdev_priv(netdev);
+       struct Vmxnet3_DriverShared *shared = adapter->shared;
+       struct Vmxnet3_DSDevRead *devRead = &shared->devRead;
+       struct Vmxnet3_TxQueueConf *tqc;
+       struct Vmxnet3_RxQueueConf *rqc;
+       int i;
+
+       memset(shared, 0, sizeof(*shared));
+
+       /* driver settings */
+       shared->magic = VMXNET3_REV1_MAGIC;
+       devRead->misc.driverInfo.version = VMXNET3_DRIVER_VERSION_NUM;
+       devRead->misc.driverInfo.gos.gosBits = (sizeof(void *) == 4 ?
+                               VMXNET3_GOS_BITS_32 : VMXNET3_GOS_BITS_64);
+       devRead->misc.driverInfo.gos.gosType = VMXNET3_GOS_TYPE_LINUX;
+       devRead->misc.driverInfo.vmxnet3RevSpt = 1;
+       devRead->misc.driverInfo.uptVerSpt = 1;
+
+       devRead->misc.ddPA = virt_to_phys(adapter);
+       devRead->misc.ddLen = sizeof(struct vmxnet3_adapter);
+
+       /* set up feature flags */
+       if (adapter->rxcsum)
+               devRead->misc.uptFeatures |= UPT1_F_RXCSUM;
+
+       if (adapter->lro) {
+               devRead->misc.uptFeatures |= UPT1_F_LRO;
+               devRead->misc.maxNumRxSG = 1 + MAX_SKB_FRAGS;
+       }
+       if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX)
+                       && adapter->vlan_grp) {
+               devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
+       }
+
+       devRead->misc.mtu = adapter->netdev->mtu;
+       devRead->misc.queueDescPA = adapter->queue_desc_pa;
+       devRead->misc.queueDescLen = sizeof(struct Vmxnet3_TxQueueDesc) +
+                                    sizeof(struct Vmxnet3_RxQueueDesc);
+
+       /* tx queue settings */
+       BUG_ON(adapter->tx_queue.tx_ring.base == NULL);
+
+       devRead->misc.numTxQueues = 1;
+       tqc = &adapter->tqd_start->conf;
+       tqc->txRingBasePA   = adapter->tx_queue.tx_ring.basePA;
+       tqc->dataRingBasePA = adapter->tx_queue.data_ring.basePA;
+       tqc->compRingBasePA = adapter->tx_queue.comp_ring.basePA;
+       tqc->ddPA           = virt_to_phys(adapter->tx_queue.buf_info);
+       tqc->txRingSize     = adapter->tx_queue.tx_ring.size;
+       tqc->dataRingSize   = adapter->tx_queue.data_ring.size;
+       tqc->compRingSize   = adapter->tx_queue.comp_ring.size;
+       tqc->ddLen          = sizeof(struct vmxnet3_tx_buf_info) *
+                             tqc->txRingSize;
+       tqc->intrIdx        = adapter->tx_queue.comp_ring.intr_idx;
+
+       /* rx queue settings */
+       devRead->misc.numRxQueues = 1;
+       rqc = &adapter->rqd_start->conf;
+       rqc->rxRingBasePA[0] = adapter->rx_queue.rx_ring[0].basePA;
+       rqc->rxRingBasePA[1] = adapter->rx_queue.rx_ring[1].basePA;
+       rqc->compRingBasePA  = adapter->rx_queue.comp_ring.basePA;
+       rqc->ddPA            = virt_to_phys(adapter->rx_queue.buf_info);
+       rqc->rxRingSize[0]   = adapter->rx_queue.rx_ring[0].size;
+       rqc->rxRingSize[1]   = adapter->rx_queue.rx_ring[1].size;
+       rqc->compRingSize    = adapter->rx_queue.comp_ring.size;
+       rqc->ddLen           = sizeof(struct vmxnet3_rx_buf_info) *
+                              (rqc->rxRingSize[0] + rqc->rxRingSize[1]);
+       rqc->intrIdx         = adapter->rx_queue.comp_ring.intr_idx;
+
+       /* intr settings */
+       devRead->intrConf.autoMask = adapter->intr.mask_mode ==
+                                    VMXNET3_IMM_AUTO;
+       devRead->intrConf.numIntrs = adapter->intr.num_intrs;
+       for (i = 0; i < adapter->intr.num_intrs; i++)
+               devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];
+
+       devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
+
+       /* rx filter settings */
+       devRead->rxFilterConf.rxMode = 0;
+       vmxnet3_restore_vlan(adapter);
+       /* the rest are already zeroed */
+}
+
+/*
+ * put the vNIC into an operational state. After this function finishes, the
+ * adapter is fully functional. It does the following:
+ * 1. initialize tq and rq
+ * 2. fill rx rings with rx buffers
+ * 3. setup intr
+ * 4. setup driver_shared
+ * 5. activate the dev
+ * 6. signal the stack that the vNIC is ready to tx/rx
+ * 7. enable intrs for the vNIC
+ *
+ * Returns:
+ *    0 if the vNIC is in operation state
+ *    error code if any intermediate step fails.
+ */
 
-   /* Collect the dev stats into the shared area */
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+int
+vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
+{
+       int err;
+       u32 ret;
+
+       dev_dbg(&adapter->pdev->dev, "%s: skb_buf_size %d, rx_buf_per_pkt %d, "
+               "ring sizes %u %u %u\n", adapter->netdev->name,
+               adapter->skb_buf_size, adapter->rx_buf_per_pkt,
+               adapter->tx_queue.tx_ring.size,
+               adapter->rx_queue.rx_ring[0].size,
+               adapter->rx_queue.rx_ring[1].size);
+
+       vmxnet3_tq_init(&adapter->tx_queue, adapter);
+       err = vmxnet3_rq_init(&adapter->rx_queue, adapter);
+       if (err) {
+               printk(KERN_ERR "Failed to init rx queue for %s: error %d\n",
+                      adapter->netdev->name, err);
+               goto rq_err;
+       }
+
+       err = vmxnet3_request_irqs(adapter);
+       if (err) {
+               printk(KERN_ERR "Failed to setup irq for %s: error %d\n",
+                      adapter->netdev->name, err);
+               goto irq_err;
+       }
+
+       vmxnet3_setup_driver_shared(adapter);
+
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAL,
+                              VMXNET3_GET_ADDR_LO(adapter->shared_pa));
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH,
+                              VMXNET3_GET_ADDR_HI(adapter->shared_pa));
+
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_ACTIVATE_DEV);
+       ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+       if (ret != 0) {
+               printk(KERN_ERR "Failed to activate dev %s: error %u\n",
+                      adapter->netdev->name, ret);
+               err = -EINVAL;
+               goto activate_err;
+       }
+       VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_RXPROD,
+                              adapter->rx_queue.rx_ring[0].next2fill);
+       VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_RXPROD2,
+                              adapter->rx_queue.rx_ring[1].next2fill);
+
+       /* Apply the rx filter settins last. */
+       vmxnet3_set_mc(adapter->netdev);
+
+       /*
+        * Check link state when first activating device. It will start the
+        * tx queue if the link is up.
+        */
+       vmxnet3_check_link(adapter);
+#ifdef VMXNET3_NAPI
+       compat_napi_enable(adapter->netdev, &adapter->napi);
+#endif
+       vmxnet3_enable_all_intrs(adapter);
+       clear_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
+       return 0;
 
-   /* Assuming that we have a single queue device */
-   devTxStats = &adapter->tqd_start->stats;
-   devRxStats = &adapter->rqd_start->stats;
+activate_err:
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAL, 0);
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH, 0);
+       vmxnet3_free_irqs(adapter);
+irq_err:
+rq_err:
+       /* free up buffers we allocated */
+       vmxnet3_rq_cleanup(&adapter->rx_queue, adapter);
+       return err;
+}
 
-   /* Get access to the driver stats per queue */
-   drvTxStats = &adapter->tx_queue.stats;
-   drvRxStats = &adapter->rx_queue.stats;
 
-   memset(&adapter->net_stats, 0, sizeof(adapter->net_stats));
+void
+vmxnet3_reset_dev(struct vmxnet3_adapter *adapter)
+{
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
+}
 
-   adapter->net_stats.rx_packets = devRxStats->ucastPktsRxOK +
-                                   devRxStats->mcastPktsRxOK +
-                                   devRxStats->bcastPktsRxOK;
 
-   adapter->net_stats.tx_packets = devTxStats->ucastPktsTxOK +
-                                   devTxStats->mcastPktsTxOK +
-                                   devTxStats->bcastPktsTxOK;
+/*
+ * Stop the device. After this function returns, the adapter stop pkt tx/rx
+ * and won't generate intrs. The stack won't try to xmit pkts through us,
+ * nor will it poll us for pkts. It does the following:
+ *
+ * 1. ask the vNIC to quiesce
+ * 2. disable the vNIC from generating intrs
+ * 3. free intr
+ * 4. stop the stack from xmiting pkts thru us and polling
+ * 5. free rx buffers
+ * 6. tx complete pkts pending
+ *
+ */
 
-   adapter->net_stats.rx_bytes = devRxStats->ucastBytesRxOK +
-                                 devRxStats->mcastBytesRxOK +
-                                 devRxStats->bcastBytesRxOK;
+int
+vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter)
+{
+       if (test_and_set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state))
+               return 0;
 
-   adapter->net_stats.tx_bytes = devTxStats->ucastBytesTxOK +
-                                 devTxStats->mcastBytesTxOK +
-                                 devTxStats->bcastBytesTxOK;
 
-   adapter->net_stats.rx_errors = devRxStats->pktsRxError;
-   adapter->net_stats.tx_errors = devTxStats->pktsTxError;
-   adapter->net_stats.rx_dropped = drvRxStats->drop_total;
-   adapter->net_stats.tx_dropped = drvTxStats->drop_total;
-   adapter->net_stats.multicast =  devRxStats->mcastPktsRxOK;
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_QUIESCE_DEV);
+       vmxnet3_disable_all_intrs(adapter);
+#ifdef VMXNET3_NAPI
+       compat_napi_disable(adapter->netdev, &adapter->napi);
+#endif
+       netif_tx_disable(adapter->netdev);
+       adapter->link_speed = 0;
+       netif_carrier_off(adapter->netdev);
 
-   return &adapter->net_stats;
+       vmxnet3_tq_cleanup(&adapter->tx_queue, adapter);
+       vmxnet3_rq_cleanup(&adapter->rx_queue, adapter);
+       vmxnet3_free_irqs(adapter);
+       return 0;
 }
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_stats_count --
- *
- *    Return the number of counters we will return in vmxnet3_get_ethtool_stats.
- *    Assume each counter is uint64
- *
- * Result:
- *    # of counters we will return in vmxnet3_get_ethtool_stats
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
 
-static int
-vmxnet3_get_stats_count(struct net_device *netdev)
+static void
+vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac)
 {
-   return ARRAY_SIZE(vmxnet3_tq_dev_stats) +
-          ARRAY_SIZE(vmxnet3_tq_driver_stats) +
-          ARRAY_SIZE(vmxnet3_rq_dev_stats) +
-          ARRAY_SIZE(vmxnet3_rq_driver_stats) +
-          ARRAY_SIZE(vmxnet3_global_stats);
+       u32 tmp;
+
+       tmp = *(u32 *)mac;
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_MACL, tmp);
+
+       tmp = (mac[5] << 8) | mac[4];
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_MACH, tmp);
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_regs_len --
- *
- *    Return the size of buffer needed to dump registers.
- *
- * Result:
- *    The number of bytes needed.
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
 static int
-vmxnet3_get_regs_len(struct net_device *netdev)
+vmxnet3_set_mac_addr(struct net_device *netdev, void *p)
 {
-   return 20 * sizeof(uint32);
+       struct sockaddr *addr = p;
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+       vmxnet3_write_mac_addr(adapter, addr->sa_data);
+
+       return 0;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_drvinfo --
- *
- *    Ethtool callback to return driver information
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    1. *drvinfo is updated
- *
- *----------------------------------------------------------------------------
- */
+/* ==================== initialization and cleanup routines ============ */
 
-static void
-vmxnet3_get_drvinfo(struct net_device *netdev,
-                    struct ethtool_drvinfo *drvinfo)
+static int
+vmxnet3_alloc_pci_resources(struct vmxnet3_adapter *adapter, Bool *dma64)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-
-   strncpy(drvinfo->driver, vmxnet3_driver_name, sizeof(drvinfo->driver));
-   drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0';
+       int err;
+       unsigned long mmio_start, mmio_len;
+       struct pci_dev *pdev = adapter->pdev;
 
-   strncpy(drvinfo->version, VMXNET3_DRIVER_VERSION_REPORT, sizeof(drvinfo->version));
-   drvinfo->driver[sizeof(drvinfo->version) - 1] = '\0';
+       err = compat_pci_enable_device(pdev);
+       if (err) {
+               printk(KERN_ERR "Failed to enable adapter %s: error %d\n",
+                      compat_pci_name(pdev), err);
+               return err;
+       }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 6)
+       if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) == 0) {
+               if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) {
+                       printk(KERN_ERR "pci_set_consistent_dma_mask failed "
+                              "for adapter %s\n", compat_pci_name(pdev));
+                       err = -EIO;
+                       goto err_set_mask;
+               }
+               *dma64 = TRUE;
+       } else {
+               if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) {
+                       printk(KERN_ERR "pci_set_dma_mask failed for adapter "
+                              "%s\n",  compat_pci_name(pdev));
+                       err = -EIO;
+                       goto err_set_mask;
+               }
+               *dma64 = FALSE;
+       }
+#else
+       *dma64 = TRUE;
+#endif
 
-   strncpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
-   drvinfo->fw_version[sizeof(drvinfo->fw_version) - 1] = '\0';
+       err = compat_pci_request_regions(pdev, vmxnet3_driver_name);
+       if (err) {
+               printk(KERN_ERR "Failed to request region for adapter %s: "
+                      "error %d\n", compat_pci_name(pdev), err);
+               goto err_set_mask;
+       }
+
+       compat_pci_set_master(pdev);
+
+       mmio_start = compat_pci_resource_start(pdev, 0);
+       mmio_len = compat_pci_resource_len(pdev, 0);
+       adapter->hw_addr0 = ioremap(mmio_start, mmio_len);
+       if (!adapter->hw_addr0) {
+               printk(KERN_ERR "Failed to map bar0 for adapter %s\n",
+                      compat_pci_name(pdev));
+               err = -EIO;
+               goto err_ioremap;
+       }
+
+       mmio_start = compat_pci_resource_start(pdev, 1);
+       mmio_len = compat_pci_resource_len(pdev, 1);
+       adapter->hw_addr1 = ioremap(mmio_start, mmio_len);
+       if (!adapter->hw_addr1) {
+               printk(KERN_ERR "Failed to map bar1 for adapter %s\n",
+                      compat_pci_name(pdev));
+               err = -EIO;
+               goto err_bar1;
+       }
+       return 0;
 
-   strncpy(drvinfo->bus_info,   compat_pci_name(adapter->pdev), ETHTOOL_BUSINFO_LEN);
-   drvinfo->n_stats = vmxnet3_get_stats_count(netdev);
-   drvinfo->testinfo_len = 0;
-   drvinfo->eedump_len   = 0;
-   drvinfo->regdump_len  = vmxnet3_get_regs_len(netdev);
+err_bar1:
+       iounmap(adapter->hw_addr0);
+err_ioremap:
+       compat_pci_release_regions(pdev);
+err_set_mask:
+       compat_pci_disable_device(pdev);
+       return err;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_strings  --
- *
- *    Return the description strings for the counters returned by
- *    vmxnet3_get_ethtool_stats.
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
 static void
-vmxnet3_get_strings(struct net_device *netdev,
-                    u32 stringset,
-                    u8 *buf)
+vmxnet3_free_pci_resources(struct vmxnet3_adapter *adapter)
 {
-   if (stringset == ETH_SS_STATS) {
-      int i;
-
-      for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
-         memcpy(buf, vmxnet3_tq_dev_stats[i].desc, ETH_GSTRING_LEN);
-         buf += ETH_GSTRING_LEN;
-      }
-      for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++) {
-         memcpy(buf, vmxnet3_tq_driver_stats[i].desc, ETH_GSTRING_LEN);
-         buf += ETH_GSTRING_LEN;
-      }
-      for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
-         memcpy(buf, vmxnet3_rq_dev_stats[i].desc, ETH_GSTRING_LEN);
-         buf += ETH_GSTRING_LEN;
-      }
-      for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++) {
-         memcpy(buf, vmxnet3_rq_driver_stats[i].desc, ETH_GSTRING_LEN);
-         buf += ETH_GSTRING_LEN;
-      }
-      for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++) {
-         memcpy(buf, vmxnet3_global_stats[i].desc, ETH_GSTRING_LEN);
-         buf += ETH_GSTRING_LEN;
-      }
-   }
+       BUG_ON(!adapter->pdev);
+
+       iounmap(adapter->hw_addr0);
+       iounmap(adapter->hw_addr1);
+       compat_pci_release_regions(adapter->pdev);
+       compat_pci_disable_device(adapter->pdev);
 }
 
 
+
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_ethtool_stats --
- *
- *    Return the values of the maintained counters in 'buf'
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
+ * Calculate the # of buffers for a pkt based on mtu, then adjust the size of
+ * the 1st rx ring accordingly
  */
 
 static void
-vmxnet3_get_ethtool_stats(struct net_device *netdev,
-                          struct ethtool_stats *stats,
-                          u64  *buf)
+vmxnet3_adjust_rx_ring_size(struct vmxnet3_adapter *adapter)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   uint8 *base;
-   int i;
-
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
-
-   /* this does assume each counter is 64-bit wide */
-
-   base = (uint8*)&adapter->tqd_start->stats;
-   for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
-      *buf++ = *(uint64*)(base + vmxnet3_tq_dev_stats[i].offset);
-   }
-
-   base = (uint8*)&adapter->tx_queue.stats;
-   for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++) {
-      *buf++ = *(uint64*)(base + vmxnet3_tq_driver_stats[i].offset);
-   }
-
-   base = (uint8*)&adapter->rqd_start->stats;
-   for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
-      *buf++ = *(uint64*)(base + vmxnet3_rq_dev_stats[i].offset);
-   }
-
-   base = (uint8*)&adapter->rx_queue.stats;
-   for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++) {
-      *buf++ = *(uint64*)(base + vmxnet3_rq_driver_stats[i].offset);
-   }
-
-   base = (uint8*)adapter;
-   for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++) {
-      *buf++ = *(uint64*)(base + vmxnet3_global_stats[i].offset);
-   }
-}
+       size_t sz;
+
+       if (adapter->netdev->mtu <= VMXNET3_MAX_SKB_BUF_SIZE -
+                                   VMXNET3_MAX_ETH_HDR_SIZE) {
+               adapter->skb_buf_size = adapter->netdev->mtu +
+                                       VMXNET3_MAX_ETH_HDR_SIZE;
+               if (adapter->skb_buf_size < VMXNET3_MIN_T0_BUF_SIZE)
+                       adapter->skb_buf_size = VMXNET3_MIN_T0_BUF_SIZE;
+
+               adapter->rx_buf_per_pkt = 1;
+       } else {
+               adapter->skb_buf_size = VMXNET3_MAX_SKB_BUF_SIZE;
+               sz = adapter->netdev->mtu - VMXNET3_MAX_SKB_BUF_SIZE +
+                                           VMXNET3_MAX_ETH_HDR_SIZE;
+               adapter->rx_buf_per_pkt = 1 + (sz + PAGE_SIZE - 1) / PAGE_SIZE;
+       }
+
+       if (adapter->is_shm) {
+               adapter->skb_buf_size = PAGE_SIZE;
+       }
+
+       /*
+        * for simplicity, force the ring0 size to be a multiple of
+        * rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN
+        */
+       sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN;
+       adapter->rx_queue.rx_ring[0].size = (adapter->rx_queue.rx_ring[0].size +
+                                            sz - 1) / sz * sz;
+       adapter->rx_queue.rx_ring[0].size = min_t(u32,
+                                           adapter->rx_queue.rx_ring[0].size,
+                                           VMXNET3_RX_RING_MAX_SIZE / sz * sz);
+}
+
+/* Create the specified number of tx queues and rx queues. On failure, it
+ * destroys the queues created. */
+int
+vmxnet3_create_queues(struct vmxnet3_adapter *adapter, u32 tx_ring_size,
+                     u32 rx_ring_size, u32 rx_ring2_size)
+{
+       int err;
+
+       adapter->tx_queue.tx_ring.size   = tx_ring_size;
+       adapter->tx_queue.data_ring.size = tx_ring_size;
+       adapter->tx_queue.comp_ring.size = tx_ring_size;
+       adapter->tx_queue.shared = &adapter->tqd_start->ctrl;
+       adapter->tx_queue.stopped = TRUE;
+       err = vmxnet3_tq_create(&adapter->tx_queue, adapter);
+       if (err)
+               return err;
+
+       adapter->rx_queue.rx_ring[0].size = rx_ring_size;
+       adapter->rx_queue.rx_ring[1].size = rx_ring2_size;
+       vmxnet3_adjust_rx_ring_size(adapter);
+       adapter->rx_queue.comp_ring.size  = adapter->rx_queue.rx_ring[0].size +
+                                           adapter->rx_queue.rx_ring[1].size;
+       adapter->rx_queue.qid  = 0;
+       adapter->rx_queue.qid2 = 1;
+       adapter->rx_queue.shared = &adapter->rqd_start->ctrl;
+       err = vmxnet3_rq_create(&adapter->rx_queue, adapter);
+       if (err)
+               vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
 
+       return err;
+}
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_regs --
- *
- *    Dump out the register values.
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    None
- *
- *----------------------------------------------------------------------------
+ * setup rings, allocate necessary resources, request for IRQs, configure
+ * the device. The device is functional after this function finishes
+ * successfully.
+ * Returns 0 on success, negative errno value on failure
  */
 
-static void
-vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
+static int
+vmxnet3_open(struct net_device *netdev)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   uint32 *buf = p;
-
-   memset(p, 0, vmxnet3_get_regs_len(netdev));
+       struct vmxnet3_adapter *adapter;
+       int err;
 
-   regs->version = 1;
+       adapter = compat_netdev_priv(netdev);
 
-   /* Update vmxnet3_get_regs_len if we want to dump more registers */
+       spin_lock_init(&adapter->tx_queue.tx_lock);
 
-   /* make each ring use multiple of 16 bytes */
-   buf[0] = adapter->tx_queue.tx_ring.next2fill;
-   buf[1] = adapter->tx_queue.tx_ring.next2comp;
-   buf[2] = adapter->tx_queue.tx_ring.gen;
-   buf[3] = 0;
+       if (adapter->is_shm) {
+               printk(KERN_INFO "bringing up shared memory vmxnet3 %s\n",
+                      netdev->name);
+               err = vmxnet3_shm_open(adapter, netdev->name);
+               if (err) {
+                       goto shm_err;
+               }
+       }
+       err = vmxnet3_create_queues(adapter, VMXNET3_DEF_TX_RING_SIZE,
+                                   VMXNET3_DEF_RX_RING_SIZE,
+                                   VMXNET3_DEF_RX_RING_SIZE);
+       if (err)
+               goto queue_err;
 
-   buf[4] = adapter->tx_queue.comp_ring.next2proc;
-   buf[5] = adapter->tx_queue.comp_ring.gen;
-   buf[6] = adapter->tx_queue.stopped;
-   buf[7] = 0;
+       err = vmxnet3_activate_dev(adapter);
+       if (err)
+               goto activate_err;
 
-   buf[8] = adapter->rx_queue.rx_ring[0].next2fill;
-   buf[9] = adapter->rx_queue.rx_ring[0].next2comp;
-   buf[10] = adapter->rx_queue.rx_ring[0].gen;
-   buf[11] = 0;
+       COMPAT_NETDEV_MOD_INC_USE_COUNT;
 
-   buf[12] = adapter->rx_queue.rx_ring[1].next2fill;
-   buf[13] = adapter->rx_queue.rx_ring[1].next2comp;
-   buf[14] = adapter->rx_queue.rx_ring[1].gen;
-   buf[15] = 0;
+       return 0;
 
-   buf[16] = adapter->rx_queue.comp_ring.next2proc;
-   buf[17] = adapter->rx_queue.comp_ring.gen;
-   buf[18] = 0;
-   buf[19] = 0;
+activate_err:
+       vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
+       vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
+queue_err:
+       if (adapter->is_shm) {
+               vmxnet3_shm_close(adapter);
+       }
+shm_err:
+       return err;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_wol --
- *
- *      Report whether Wake-on-Lan is enabled.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------------
- */
-
-static void
-vmxnet3_get_wol(struct net_device *netdev,
-               struct ethtool_wolinfo *wol)
+static int
+vmxnet3_close(struct net_device *netdev)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
 
-   wol->supported = WAKE_UCAST | WAKE_ARP | WAKE_MAGIC;
-   wol->wolopts = adapter->wol;
-}
+       /*
+        * Reset_work may be in the middle of resetting the device, wait for its
+        * completion.
+        */
+       while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state))
+               compat_msleep(1);
 
+       vmxnet3_quiesce_dev(adapter);
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_wol --
- *
- *      Turn Wake-on-Lan on or off.
- *
- * Results:
- *      0 on success, errno on failure.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------------
- */
+       if (adapter->is_shm) {
+               vmxnet3_shm_close(adapter);
+       }
 
-static int
-vmxnet3_set_wol(struct net_device *netdev,
-               struct ethtool_wolinfo *wol)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
+       vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
 
-   if (wol->wolopts & (WAKE_PHY | WAKE_MCAST | WAKE_BCAST |
-                       WAKE_MAGICSECURE)) {
-       return -EOPNOTSUPP;
-   }
+       COMPAT_NETDEV_MOD_DEC_USE_COUNT;
 
-   adapter->wol = wol->wolopts;
+       clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
 
-   compat_device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
 
-   return 0;
+       return 0;
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_settings --
- *
- *      Get device-specific settings.
- *
- * Results:
- *      0 on success, errno on failure.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------------
+ * Called to forcibly close the device when the driver failed to re-activate it.
  */
+void
+vmxnet3_force_close(struct vmxnet3_adapter *adapter)
+{
+       /*
+        * we must clear VMXNET3_STATE_BIT_RESETTING, otherwise
+        * vmxnet3_close() will deadlock.
+        */
+       BUG_ON(test_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state));
+
+#ifdef VMXNET3_NAPI
+       /* we need to enable NAPI, otherwise dev_close will deadlock */
+       compat_napi_enable(adapter->netdev, &adapter->napi);
+#endif
+       dev_close(adapter->netdev);
+}
+
 
 static int
-vmxnet3_get_settings(struct net_device *netdev,
-                     struct ethtool_cmd *ecmd)
+vmxnet3_change_mtu(struct net_device *netdev, int new_mtu)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-
-   ecmd->supported = SUPPORTED_10000baseT_Full | SUPPORTED_1000baseT_Full |
-                     SUPPORTED_TP;
-   ecmd->advertising = ADVERTISED_TP;
-   ecmd->port = PORT_TP;
-   ecmd->transceiver = XCVR_INTERNAL;
-
-   if (adapter->link_speed) {
-      ecmd->speed = adapter->link_speed;
-      ecmd->duplex = DUPLEX_FULL;
-   } else {
-      ecmd->speed = -1;
-      ecmd->duplex = -1;
-   }
-   return 0;
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       int err = 0;
+
+       if (new_mtu < VMXNET3_MIN_MTU || new_mtu > VMXNET3_MAX_MTU)
+               return -EINVAL;
+
+       if (new_mtu > 1500 && !adapter->jumbo_frame)
+               return -EINVAL;
+
+       netdev->mtu = new_mtu;
+
+       /*
+        * Reset_work may be in the middle of resetting the device, wait for its
+        * completion.
+        */
+       while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state))
+               compat_msleep(1);
+
+       if (compat_netif_running(netdev)) {
+               vmxnet3_quiesce_dev(adapter);
+               vmxnet3_reset_dev(adapter);
+
+               /* we need to re-create the rx queue based on the new mtu */
+               vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
+               vmxnet3_adjust_rx_ring_size(adapter);
+               adapter->rx_queue.comp_ring.size  =
+                                       adapter->rx_queue.rx_ring[0].size +
+                                       adapter->rx_queue.rx_ring[1].size;
+               err = vmxnet3_rq_create(&adapter->rx_queue, adapter);
+               if (err) {
+                       printk(KERN_ERR "%s: failed to re-create rx queue,"
+                               " error %d. Closing it.\n", netdev->name, err);
+                       goto out;
+               }
+
+               err = vmxnet3_activate_dev(adapter);
+               if (err) {
+                       printk(KERN_ERR "%s: failed to re-activate, error %d. "
+                               "Closing it\n", netdev->name, err);
+                       goto out;
+               }
+       }
+
+out:
+       clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
+       if (err)
+               vmxnet3_force_close(adapter);
+
+       return err;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_get_ringparam --
- *
- *      Get ring sizes
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------------
- */
 static void
-vmxnet3_get_ringparam(struct net_device *netdev,
-                      struct ethtool_ringparam *param)
+vmxnet3_declare_features(struct vmxnet3_adapter *adapter, Bool dma64)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       struct net_device *netdev = adapter->netdev;
 
-   param->rx_max_pending = VMXNET3_RX_RING_MAX_SIZE;
-   param->tx_max_pending = VMXNET3_TX_RING_MAX_SIZE;
-   param->rx_mini_max_pending = 0;
-   param->rx_jumbo_max_pending = 0;
+       netdev->features = NETIF_F_SG |
+               NETIF_F_HW_CSUM |
+               NETIF_F_HW_VLAN_TX |
+               NETIF_F_HW_VLAN_RX |
+               NETIF_F_HW_VLAN_FILTER |
+               NETIF_F_TSO;
+       printk(KERN_INFO "features: sg csum vlan jf tso");
 
-   param->rx_pending = adapter->rx_queue.rx_ring[0].size;
-   param->tx_pending = adapter->tx_queue.tx_ring.size;
-   param->rx_mini_pending = 0;
-   param->rx_jumbo_pending = 0;
-}
+       adapter->rxcsum = TRUE;
+       adapter->jumbo_frame = TRUE;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+        /* LRO feature control by module param */
+       if (!disable_lro) {
+#else
+        /* LRO feature control by ethtool */
+               netdev->features |= NETIF_F_LRO;
+#endif
 
+               adapter->lro = TRUE;
+               printk(" lro");
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_set_ringparam --
- *
- *      Set ring sizes
- *
- * Results:
- *      0 on success or errno.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------------
- */
-static int
-vmxnet3_set_ringparam(struct net_device *netdev,
-                      struct ethtool_ringparam *param)
-{
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   uint32 new_tx_ring_size, new_rx_ring_size;
-   uint32 sz;
-   int err = 0;
-
-   if (param->tx_pending == 0 || param->tx_pending > VMXNET3_TX_RING_MAX_SIZE) {
-      printk(KERN_ERR "%s: invalid tx ring size %u\n", netdev->name, param->tx_pending);
-      return -EINVAL;
-   }
-   if (param->rx_pending == 0 || param->rx_pending > VMXNET3_RX_RING_MAX_SIZE) {
-      printk(KERN_ERR "%s: invalid rx ring size %u\n", netdev->name, param->rx_pending);
-      return -EINVAL;
-   }
-
-   /* round it up to a multiple of VMXNET3_RING_SIZE_ALIGN */
-   new_tx_ring_size = (param->tx_pending + VMXNET3_RING_SIZE_MASK) & 
-                      ~VMXNET3_RING_SIZE_MASK;
-   new_tx_ring_size = min_t(uint32, new_tx_ring_size, VMXNET3_TX_RING_MAX_SIZE);
-   VMXNET3_ASSERT(new_tx_ring_size <= VMXNET3_TX_RING_MAX_SIZE);
-   VMXNET3_ASSERT(new_tx_ring_size % VMXNET3_RING_SIZE_ALIGN == 0);
-
-   /* ring0 has to be a multiple of rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN */
-   sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN;
-   new_rx_ring_size = (param->rx_pending + sz - 1) / sz * sz;
-   new_rx_ring_size = min_t(uint32, new_rx_ring_size, 
-                            VMXNET3_RX_RING_MAX_SIZE / sz * sz);
-   VMXNET3_ASSERT(new_rx_ring_size <= VMXNET3_RX_RING_MAX_SIZE);
-   VMXNET3_ASSERT(new_rx_ring_size % sz == 0);
-
-   if (new_tx_ring_size == adapter->tx_queue.tx_ring.size &&
-       new_rx_ring_size == adapter->rx_queue.rx_ring[0].size) {
-      return 0;
-   }
-
-   /* 
-    * Reset_work may be in the middle of resetting the device, wait for its
-    * completion.
-    */
-   while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state)) {
-      compat_msleep(1);
-   }
-
-   if (compat_netif_running(netdev)) {
-      vmxnet3_quiesce_dev(adapter);
-      vmxnet3_reset_dev(adapter);
-
-      /* recreate the rx queue and the tx queue based on the new sizes */
-      vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
-      vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
-
-      err = vmxnet3_create_queues(adapter, new_tx_ring_size, new_rx_ring_size,
-                                  VMXNET3_DEF_RX_RING_SIZE);
-      if (err) {
-         /* failed, most likely because of OOM, try the default size */
-         printk(KERN_ERR "%s: failed to apply new sizes, try the default ones\n", 
-                netdev->name);
-         err = vmxnet3_create_queues(adapter, VMXNET3_DEF_TX_RING_SIZE,
-                                     VMXNET3_DEF_RX_RING_SIZE, VMXNET3_DEF_RX_RING_SIZE);
-         if (err) {
-            printk(KERN_ERR "%s: failed to create queues with default sizes. Closing it\n",
-                   netdev->name);
-            goto out;
-         }
-      }
-
-      err = vmxnet3_activate_dev(adapter);
-      if (err) {
-         printk(KERN_ERR "%s: failed to re-activate, error %d. Closing it\n",
-                netdev->name, err);
-         goto out;
-      }
-   }
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+       }
+#endif
 
-out:
-   clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
-   if (err) {
-      vmxnet3_force_close(adapter);
-   }
-   return err;
+#ifdef NETIF_F_TSO6
+       netdev->features |= NETIF_F_TSO6;
+       printk(" tsoIPv6");
+#endif
+
+       if (dma64) {
+               netdev->features |= NETIF_F_HIGHDMA;
+               printk(" highDMA");
+       }
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+       netdev->vlan_features = netdev->features;
+#endif
+       printk("\n");
 }
 
 
-static struct ethtool_ops
-vmxnet3_ethtool_ops = {
-   .get_settings      = vmxnet3_get_settings,
-   .get_drvinfo       = vmxnet3_get_drvinfo,
-   .get_regs_len      = vmxnet3_get_regs_len,
-   .get_regs          = vmxnet3_get_regs,
-   .get_wol           = vmxnet3_get_wol,
-   .set_wol           = vmxnet3_set_wol,
-   .get_link          = ethtool_op_get_link,
-   .get_rx_csum       = vmxnet3_get_rx_csum,
-   .set_rx_csum       = vmxnet3_set_rx_csum,
-   .get_tx_csum       = vmxnet3_get_tx_csum,
-   .set_tx_csum       = vmxnet3_set_tx_csum,
-   .get_sg            = ethtool_op_get_sg,
-   .set_sg            = vmxnet3_set_sg,
-   .get_tso           = ethtool_op_get_tso,
-   .set_tso           = vmxnet3_set_tso,
-   .get_strings       = vmxnet3_get_strings,
-   .get_stats_count   = vmxnet3_get_stats_count,
-   .get_ethtool_stats = vmxnet3_get_ethtool_stats,
-   .get_ringparam     = vmxnet3_get_ringparam,
-   .set_ringparam     = vmxnet3_set_ringparam,
-};
+static void
+vmxnet3_read_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac)
+{
+       u32 tmp;
+
+       tmp = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_MACL);
+       *(u32 *)mac = tmp;
+
+       tmp = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_MACH);
+       mac[4] = tmp & 0xff;
+       mac[5] = (tmp >> 8) & 0xff;
+}
+
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_alloc_intr_resources --
- *
- *    read the intr configuration, pick the intr type, and enable MSI/MSI-X if
- *    needed.
- *
- * Results:
- *    None
- *
- * Side effects:
- *    adapter->intr.{type, mask_mode, num_intr} are modified
- *
- *----------------------------------------------------------------------------
+ * read the intr configuration, pick the intr type, and enable MSI/MSI-X if
+ * needed. adapter->intr.{type, mask_mode, num_intr} are modified
  */
+
 static void
 vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
 {
-   uint32 cfg;
+       u32 cfg;
 
-   /* intr settings */
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_CONF_INTR);
-   cfg = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
-   adapter->intr.type = cfg & 0x3;
-   adapter->intr.mask_mode = (cfg >> 2) & 0x3;
+       /* intr settings */
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_GET_CONF_INTR);
+       cfg = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+       adapter->intr.type = cfg & 0x3;
+       adapter->intr.mask_mode = (cfg >> 2) & 0x3;
 
 #ifdef CONFIG_PCI_MSI
-   if (adapter->intr.type == VMXNET3_IT_AUTO) {
+       if (adapter->intr.type == VMXNET3_IT_AUTO) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-      /* start with MSI-X */
-      adapter->intr.type = VMXNET3_IT_MSIX;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-      adapter->intr.type = VMXNET3_IT_MSI;
-#else
-      adapter->intr.type = VMXNET3_IT_INTX;
+               /* start with MSI-X */
+               adapter->intr.type = VMXNET3_IT_MSIX;
+               adapter->intr.msix_entries[0].entry = 0;
+               if (!pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
+                                    VMXNET3_LINUX_MAX_MSIX_VECT)) {
+                       adapter->intr.num_intrs = 1;
+                       return;
+               }
 #endif
-   }
-
-   if (adapter->intr.type == VMXNET3_IT_MSIX) {
-      int err;
-
-      adapter->intr.msix_entries[0].entry = 0;
-      err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
-                            VMXNET3_LINUX_MAX_MSIX_VECT);
-      if (!err) {
-         adapter->intr.num_intrs = 1;
-         return;
-      } 
-
-      printk(KERN_INFO "Failed to enable MSI-X for %s, error %d, try MSI\n",
-             adapter->netdev->name, err);
-      adapter->intr.type = VMXNET3_IT_MSI;
-   }
-
-   if (adapter->intr.type == VMXNET3_IT_MSI) {
-      int err;
-
-      err = pci_enable_msi(adapter->pdev);
-      if (!err) {
-         adapter->intr.num_intrs = 1;
-         return;
-      } 
-
-      printk(KERN_INFO "Failed to enable MSI for %s, error %d, use INTx\n",
-             adapter->netdev->name, err);
-      adapter->intr.type = VMXNET3_IT_INTX;
-   }
-#else
-   adapter->intr.type = VMXNET3_IT_INTX;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+               adapter->intr.type = VMXNET3_IT_MSI;
+               if (!pci_enable_msi(adapter->pdev)) {
+                       adapter->intr.num_intrs = 1;
+                       return;
+               }
 #endif
+       }
+#endif
+       adapter->intr.type = VMXNET3_IT_INTX;
 
-   /* INT-X related setting */
-   adapter->intr.num_intrs = 1;
+       /* INT-X related setting */
+       adapter->intr.num_intrs = 1;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_free_intr_resources --
- *
- *    disable MSI/MSI-X if previously enabled
- *
- * Results:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
 static void
 vmxnet3_free_intr_resources(struct vmxnet3_adapter *adapter)
 {
 #ifdef CONFIG_PCI_MSI
-   if (adapter->intr.type == VMXNET3_IT_MSIX) {
-      pci_disable_msix(adapter->pdev);
-   } else if (adapter->intr.type == VMXNET3_IT_MSI) {
-      pci_disable_msi(adapter->pdev);
-   } else 
+       if (adapter->intr.type == VMXNET3_IT_MSIX)
+               pci_disable_msix(adapter->pdev);
+       else if (adapter->intr.type == VMXNET3_IT_MSI)
+               pci_disable_msi(adapter->pdev);
+       else
 #endif
-   {
-      VMXNET3_ASSERT(adapter->intr.type == VMXNET3_IT_INTX);
-   }
+       {
+               BUG_ON(adapter->intr.type != VMXNET3_IT_INTX);
+       }
+
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_tx_timeout --
- *
- *    Called when the stack detects a Tx hang.
- *
- * Results:
- *    None
- *
- * Side effects:
- *    schedule a job to reset the device
- *
- *----------------------------------------------------------------------------
+ * Called when the stack detects a Tx hang. Schedule a job to reset the device
  */
 
 static void
 vmxnet3_tx_timeout(struct net_device *netdev)
 {
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   adapter->tx_timeout_count++;
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       adapter->tx_timeout_count++;
 
-   printk(KERN_ERR "%s: tx hang\n", adapter->netdev->name);
-   compat_schedule_work(&adapter->work);
+       printk(KERN_ERR "%s: tx hang\n", adapter->netdev->name);
+       compat_schedule_work(&adapter->work);
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_reset_work --
- *
- *    Reset the device
- *
- * Results:
- *    None
- *
- * Side effects:
- *    None
- *
- *----------------------------------------------------------------------------
- */
-
 static void
 vmxnet3_reset_work(compat_work_arg data)
 {
-   struct vmxnet3_adapter *adapter;
-   
-   adapter = COMPAT_WORK_GET_DATA(data, struct vmxnet3_adapter, work);
-   
-   /* if another thread is resetting the device, no need to proceed */
-   if (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state)) {
-      printk(KERN_INFO "%s: resetting already in progress\n", adapter->netdev->name);
-      return;
-   }
-
-   /* if the device is closed, we must leave it alone */
-   if (netif_running(adapter->netdev)) {
-      printk(KERN_INFO "%s: resetting\n", adapter->netdev->name);
-
-      vmxnet3_quiesce_dev(adapter);
-      vmxnet3_reset_dev(adapter);
-      vmxnet3_activate_dev(adapter);
-   } else {
-      printk(KERN_INFO "%s: already closed\n", adapter->netdev->name);
-   }
-
-   clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
+       struct vmxnet3_adapter *adapter;
+
+       adapter = COMPAT_WORK_GET_DATA(data, struct vmxnet3_adapter, work);
+
+       /* if another thread is resetting the device, no need to proceed */
+       if (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state))
+               return;
+
+       /* if the device is closed, we must leave it alone */
+       if (netif_running(adapter->netdev)) {
+               printk(KERN_INFO "%s: resetting\n", adapter->netdev->name);
+
+               vmxnet3_quiesce_dev(adapter);
+               vmxnet3_reset_dev(adapter);
+               vmxnet3_activate_dev(adapter);
+       } else {
+               printk(KERN_INFO "%s: already closed\n", adapter->netdev->name);
+       }
+
+       clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
 }
 
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_probe_device --
- *
- *    initialize a vmxnet3 device
- *
- * Result:
- *    0 on success, negative errno code otherwise
- *
- * Side-effects:
- *    Initialize the h/w and allocate necessary resources
- *
- *----------------------------------------------------------------------------
+ * Initialize a vmxnet3 device. Returns 0 on success, negative errno code
+ * otherwise. Initialize the h/w and allocate necessary resources
  */
 
-static int
+static int __devinit
 vmxnet3_probe_device(struct pci_dev *pdev,
-                     const struct pci_device_id *id)
+                    const struct pci_device_id *id)
 {
 #ifdef HAVE_NET_DEVICE_OPS
-   static const struct net_device_ops vmxnet3_netdev_ops = {
-      .ndo_open  = vmxnet3_open,
-      .ndo_stop  = vmxnet3_close,
-      .ndo_start_xmit = vmxnet3_xmit_frame,
-      .ndo_set_mac_address = vmxnet3_set_mac_addr,
-      .ndo_change_mtu = vmxnet3_change_mtu,
-      .ndo_get_stats = vmxnet3_get_stats,
-      .ndo_tx_timeout = vmxnet3_tx_timeout,
-      .ndo_set_multicast_list = vmxnet3_set_mc,
-      .ndo_vlan_rx_register = vmxnet3_vlan_rx_register,
-      .ndo_vlan_rx_add_vid = vmxnet3_vlan_rx_add_vid,
-      .ndo_vlan_rx_kill_vid = vmxnet3_vlan_rx_kill_vid,
-#   ifdef CONFIG_NET_POLL_CONTROLLER
-      .ndo_poll_controller = vmxnet3_netpoll,
-#   endif
-   };
-#endif /* HAVE_NET_DEVICE_OPS */
-   int err;
-   Bool dma64 = FALSE; /* stupid gcc */
-   uint32 ver;
-   struct net_device *netdev;
-   struct vmxnet3_adapter *adapter;
-   uint8  mac[ETH_ALEN];
-
-   netdev = compat_alloc_etherdev(sizeof(struct vmxnet3_adapter));
-   if (!netdev) {
-      printk(KERN_ERR "Failed to alloc ethernet device for adapter %s\n",
-             compat_pci_name(pdev));
-      return -ENOMEM;
-   }
-
-   pci_set_drvdata(pdev, netdev);
-   adapter = compat_netdev_priv(netdev);
-   adapter->netdev = netdev;
-   adapter->pdev = pdev;
-
-   adapter->shared = pci_alloc_consistent(adapter->pdev,
-                                          sizeof(Vmxnet3_DriverShared),
-                                          &adapter->shared_pa);
-   if (!adapter->shared) {
-      printk(KERN_ERR "Failed to allocate memory for %s\n", compat_pci_name(pdev));
-      err = -ENOMEM;
-      goto err_alloc_shared;
-   }
-
-   adapter->tqd_start  = pci_alloc_consistent(adapter->pdev,
-                              sizeof(Vmxnet3_TxQueueDesc) + sizeof(Vmxnet3_RxQueueDesc),
-                              &adapter->queue_desc_pa);
-   if (!adapter->tqd_start) {
-      printk(KERN_ERR "Failed to allocate memory for %s\n", compat_pci_name(pdev));
-      err = -ENOMEM;
-      goto err_alloc_queue_desc;
-   }
-   adapter->rqd_start = (Vmxnet3_RxQueueDesc *)(adapter->tqd_start + 1);
-
-   adapter->pm_conf = kmalloc(sizeof(Vmxnet3_PMConf), GFP_KERNEL);
-   if (adapter->pm_conf == NULL) {
-      printk(KERN_ERR "Failed to allocate memory for %s\n", compat_pci_name(pdev));
-      err = -ENOMEM;
-      goto err_alloc_pm;
-   }
-
-   err = vmxnet3_alloc_pci_resources(adapter, &dma64);
-   if (err < 0) {
-      goto err_alloc_pci;
-   }
-
-   ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_VRRS);
-   if (ver & 1) {
-      VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_VRRS, 1);
-   } else {
-      printk(KERN_ERR "Incompatible h/w version (0x%x) for adapter %s\n",
-             ver, compat_pci_name(pdev));
-      err = -EBUSY;
-      goto err_ver;
-   }
-
-   ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_UVRS);
-   if (ver & 1) {
-      VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_UVRS, 1);
-   } else {
-      printk(KERN_ERR "Incompatible upt version (0x%x) for adapter %s\n",
-             ver, compat_pci_name(pdev));
-      err = -EBUSY;
-      goto err_ver;
-   }
-
-   vmxnet3_declare_features(adapter, dma64);
-
-   adapter->dev_number = devices_found;
-   adapter->is_shm = FALSE;
-   if (adapter->dev_number < VMXNET3_SHM_MAX_DEVICES) {
-      if (enable_shm[adapter->dev_number] == 1) {
-         if (!correct_shm_disclaimer) {
-            printk(KERN_ERR "Did not activate shm, disclaimer missing\n");
-         } else {
-            adapter->is_shm = TRUE;
-         }
-      }
-   }
-
-   vmxnet3_alloc_intr_resources(adapter);
-
-   vmxnet3_read_mac_addr(adapter, mac);
-   memcpy(netdev->dev_addr,  mac, netdev->addr_len);
+       static const struct net_device_ops vmxnet3_netdev_ops = {
+               .ndo_open = vmxnet3_open,
+               .ndo_stop = vmxnet3_close,
+               .ndo_start_xmit = vmxnet3_xmit_frame,
+               .ndo_set_mac_address = vmxnet3_set_mac_addr,
+               .ndo_change_mtu = vmxnet3_change_mtu,
+               .ndo_get_stats = vmxnet3_get_stats,
+               .ndo_tx_timeout = vmxnet3_tx_timeout,
+               .ndo_set_multicast_list = vmxnet3_set_mc,
+               .ndo_vlan_rx_register = vmxnet3_vlan_rx_register,
+               .ndo_vlan_rx_add_vid = vmxnet3_vlan_rx_add_vid,
+               .ndo_vlan_rx_kill_vid = vmxnet3_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+               .ndo_poll_controller = vmxnet3_netpoll,
+#endif
+       };
+#endif /* HAVE_NET_DEVICE_OPS  */
+       int err;
+       Bool dma64 = FALSE; /* stupid gcc */
+       u32 ver;
+       struct net_device *netdev;
+       struct vmxnet3_adapter *adapter;
+       u8 mac[ETH_ALEN];
+
+       netdev = compat_alloc_etherdev(sizeof(struct vmxnet3_adapter));
+       if (!netdev) {
+               printk(KERN_ERR "Failed to alloc ethernet device %s\n",
+                               compat_pci_name(pdev));
+               return -ENOMEM;
+       }
+
+       pci_set_drvdata(pdev, netdev);
+       adapter = compat_netdev_priv(netdev);
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+
+       adapter->shared = pci_alloc_consistent(adapter->pdev,
+                         sizeof(struct Vmxnet3_DriverShared),
+                         &adapter->shared_pa);
+       if (!adapter->shared) {
+               printk(KERN_ERR "Failed to allocate memory for %s\n",
+                       compat_pci_name(pdev));
+               err = -ENOMEM;
+               goto err_alloc_shared;
+       }
+
+       adapter->tqd_start = pci_alloc_consistent(adapter->pdev,
+                            sizeof(struct Vmxnet3_TxQueueDesc) +
+                            sizeof(struct Vmxnet3_RxQueueDesc),
+                            &adapter->queue_desc_pa);
+
+       if (!adapter->tqd_start) {
+               printk(KERN_ERR "Failed to allocate memory for %s\n",
+                       compat_pci_name(pdev));
+               err = -ENOMEM;
+               goto err_alloc_queue_desc;
+       }
+       adapter->rqd_start = (struct Vmxnet3_RxQueueDesc *)(adapter->tqd_start
+                                                           + 1);
+
+       adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL);
+       if (adapter->pm_conf == NULL) {
+               printk(KERN_ERR "Failed to allocate memory for %s\n",
+                       compat_pci_name(pdev));
+               err = -ENOMEM;
+               goto err_alloc_pm;
+       }
+
+       err = vmxnet3_alloc_pci_resources(adapter, &dma64);
+       if (err < 0)
+               goto err_alloc_pci;
+
+       ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_VRRS);
+       if (ver & 1) {
+               VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_VRRS, 1);
+       } else {
+               printk(KERN_ERR "Incompatible h/w version (0x%x) for adapter"
+                      " %s\n", ver, compat_pci_name(pdev));
+               err = -EBUSY;
+               goto err_ver;
+       }
+
+       ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_UVRS);
+       if (ver & 1) {
+               VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_UVRS, 1);
+       } else {
+               printk(KERN_ERR "Incompatible upt version (0x%x) for "
+                      "adapter %s\n", ver, compat_pci_name(pdev));
+               err = -EBUSY;
+               goto err_ver;
+       }
+
+       vmxnet3_declare_features(adapter, dma64);
+
+       adapter->dev_number = atomic_read(&devices_found);
+       adapter->is_shm = FALSE;
+       if (adapter->dev_number < VMXNET3_SHM_MAX_DEVICES) {
+               if (enable_shm[adapter->dev_number] == 1) {
+                       if (!correct_shm_disclaimer) {
+                               printk(KERN_ERR "Did not activate shm, "
+                                      "disclaimer missing\n");
+                       } else {
+                               adapter->is_shm = TRUE;
+                       }
+               }
+       }
+
+       vmxnet3_alloc_intr_resources(adapter);
+
+       vmxnet3_read_mac_addr(adapter, mac);
+       memcpy(netdev->dev_addr,  mac, netdev->addr_len);
 
 #ifdef HAVE_NET_DEVICE_OPS
-   netdev->netdev_ops = &vmxnet3_netdev_ops;
+       netdev->netdev_ops = &vmxnet3_netdev_ops;
 #else
-   netdev->open  = vmxnet3_open;
-   netdev->stop  = vmxnet3_close;
-   netdev->hard_start_xmit = vmxnet3_xmit_frame;
-   netdev->set_mac_address = vmxnet3_set_mac_addr;
-   netdev->change_mtu = vmxnet3_change_mtu;
-   netdev->get_stats = vmxnet3_get_stats;
-   netdev->tx_timeout = vmxnet3_tx_timeout;
-   netdev->set_multicast_list = vmxnet3_set_mc;
-   netdev->vlan_rx_register = vmxnet3_vlan_rx_register;
-   netdev->vlan_rx_add_vid  = vmxnet3_vlan_rx_add_vid;
-   netdev->vlan_rx_kill_vid = vmxnet3_vlan_rx_kill_vid;
+       netdev->open  = vmxnet3_open;
+       netdev->stop  = vmxnet3_close;
+       netdev->hard_start_xmit = vmxnet3_xmit_frame;
+       netdev->set_mac_address = vmxnet3_set_mac_addr;
+       netdev->change_mtu = vmxnet3_change_mtu;
+       netdev->get_stats = vmxnet3_get_stats;
+       netdev->tx_timeout = vmxnet3_tx_timeout;
+       netdev->set_multicast_list = vmxnet3_set_mc;
+       netdev->vlan_rx_register = vmxnet3_vlan_rx_register;
+       netdev->vlan_rx_add_vid  = vmxnet3_vlan_rx_add_vid;
+       netdev->vlan_rx_kill_vid = vmxnet3_vlan_rx_kill_vid;
 #ifdef CONFIG_NET_POLL_CONTROLLER
-   netdev->poll_controller  = vmxnet3_netpoll;
+       netdev->poll_controller  = vmxnet3_netpoll;
 #endif
-#endif /* HAVE_NET_DEVICE_OPS */
-
-   netdev->watchdog_timeo = 5 * HZ;
-   SET_ETHTOOL_OPS(netdev, &vmxnet3_ethtool_ops);
+#endif /* HAVE_NET_DEVICE_OPS  */
+       netdev->watchdog_timeo = 5 * HZ;
+       vmxnet3_set_ethtool_ops(netdev);
 
-   COMPAT_INIT_WORK(&adapter->work, vmxnet3_reset_work, adapter);
+       COMPAT_INIT_WORK(&adapter->work, vmxnet3_reset_work, adapter);
 
 #ifdef VMXNET3_NAPI
-   compat_netif_napi_add(netdev, &adapter->napi, vmxnet3_poll, 64);
+       compat_netif_napi_add(netdev, &adapter->napi, vmxnet3_poll, 64);
 #endif
 
-   COMPAT_SET_MODULE_OWNER(netdev);
-   COMPAT_SET_NETDEV_DEV(netdev, &pdev->dev);
+       COMPAT_SET_MODULE_OWNER(netdev);
+       COMPAT_SET_NETDEV_DEV(netdev, &pdev->dev);
 
-   err = register_netdev(netdev);
-   if (err) {
-      printk(KERN_ERR "Failed to register adapter %s\n", compat_pci_name(pdev));
-      goto err_register;
-   }
+       err = register_netdev(netdev);
+       if (err) {
+               printk(KERN_ERR "Failed to register adapter %s\n",
+                      compat_pci_name(pdev));
+               goto err_register;
+       }
 
-   set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
-   devices_found++;
-   return 0;
+       set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
+       atomic_inc(&devices_found);
+       return 0;
 
 err_register:
-   vmxnet3_free_intr_resources(adapter);
+       vmxnet3_free_intr_resources(adapter);
 err_ver:
-   vmxnet3_free_pci_resources(adapter);
+       vmxnet3_free_pci_resources(adapter);
 err_alloc_pci:
-   kfree(adapter->pm_conf);
+       kfree(adapter->pm_conf);
 err_alloc_pm:
-   pci_free_consistent(adapter->pdev, 
-                       sizeof(Vmxnet3_TxQueueDesc) + sizeof(Vmxnet3_RxQueueDesc),
-                       adapter->tqd_start, adapter->queue_desc_pa);
+       pci_free_consistent(adapter->pdev, sizeof(struct Vmxnet3_TxQueueDesc) +
+                           sizeof(struct Vmxnet3_RxQueueDesc),
+                           adapter->tqd_start, adapter->queue_desc_pa);
 err_alloc_queue_desc:
-   pci_free_consistent(adapter->pdev, sizeof(Vmxnet3_DriverShared),
-                       adapter->shared, adapter->shared_pa);
+       pci_free_consistent(adapter->pdev, sizeof(struct Vmxnet3_DriverShared),
+                           adapter->shared, adapter->shared_pa);
 err_alloc_shared:
-   pci_set_drvdata(pdev, NULL);
-   compat_free_netdev(netdev);
-   return err;
+       pci_set_drvdata(pdev, NULL);
+       compat_free_netdev(netdev);
+       return err;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_remove_device --
- *
- *    Called by the PCI subsystem to release a device
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    unregister the adapter with the kernel and free resources
- *
- *----------------------------------------------------------------------------
- */
-
-static void
+static void __devexit
 vmxnet3_remove_device(struct pci_dev *pdev)
 {
-   struct net_device *netdev = pci_get_drvdata(pdev);
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   flush_scheduled_work();
-
-   unregister_netdev(netdev);   
-
-   vmxnet3_free_intr_resources(adapter);
-   vmxnet3_free_pci_resources(adapter);
-   kfree(adapter->pm_conf);
-   pci_free_consistent(adapter->pdev, 
-                       sizeof(Vmxnet3_TxQueueDesc) + sizeof(Vmxnet3_RxQueueDesc),
-                       adapter->tqd_start, adapter->queue_desc_pa);
-   pci_free_consistent(adapter->pdev, sizeof(Vmxnet3_DriverShared),
-                       adapter->shared, adapter->shared_pa);
-   compat_free_netdev(netdev);
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       flush_scheduled_work();
+
+       unregister_netdev(netdev);
+
+       vmxnet3_free_intr_resources(adapter);
+       vmxnet3_free_pci_resources(adapter);
+       kfree(adapter->pm_conf);
+       pci_free_consistent(adapter->pdev, sizeof(struct Vmxnet3_TxQueueDesc) +
+                           sizeof(struct Vmxnet3_RxQueueDesc),
+                           adapter->tqd_start, adapter->queue_desc_pa);
+       pci_free_consistent(adapter->pdev, sizeof(struct Vmxnet3_DriverShared),
+                           adapter->shared, adapter->shared_pa);
+       compat_free_netdev(netdev);
 }
 
 
 #ifdef CONFIG_PM
 
 /*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_suspend --
- *
- *      Called by the PCI subsystem to save device state before suspending
- *      system.
- *
- * Results:
- *      0 on success, errno on failure.
- *
- * Side effects:
  *      May programs the wake-up filters if configured to do so.
- *
- *----------------------------------------------------------------------------
  */
 
 static int
 vmxnet3_suspend(struct pci_dev *pdev, pm_message_t state)
 {
-   struct net_device *netdev = pci_get_drvdata(pdev);
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   Vmxnet3_PMConf *pmConf;
-   struct ethhdr *ehdr;
-   struct arphdr *ahdr;
-   uint8 *arpreq;
-   struct in_device *in_dev;
-   struct in_ifaddr *ifa;
-   int i = 0;
-
-   if (!compat_netif_running(netdev)) {
-      return 0;
-   }
-
-   vmxnet3_disable_all_intrs(adapter);
-   vmxnet3_free_irqs(adapter);
-   vmxnet3_free_intr_resources(adapter);
-   netif_device_detach(netdev);
-   netif_stop_queue(netdev);
-
-   /* Create wake-up filters. */
-   pmConf = adapter->pm_conf;
-   memset(pmConf, 0, sizeof (*pmConf));
-
-   if (adapter->wol & WAKE_UCAST) {
-      pmConf->filters[i].patternSize = ETH_ALEN;
-      pmConf->filters[i].maskSize = 1;
-      memcpy(pmConf->filters[i].pattern, netdev->dev_addr, ETH_ALEN);
-      pmConf->filters[i].mask[0] = 0x3F; // LSB ETH_ALEN bits
-
-      pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_FILTER;
-      i++;
-   }
-
-   if (adapter->wol & WAKE_ARP) {
-      in_dev = in_dev_get(netdev);
-      if (!in_dev) {
-         VMXNET3_LOG("Cannot program WoL ARP filter for %s: IPv4 not enabled.\n",
-                     netdev->name);
-         goto skip_arp;
-      }
-      ifa = (struct in_ifaddr *)in_dev->ifa_list;
-      if (!ifa) {
-         VMXNET3_LOG("Cannot program WoL ARP filter for %s: no IPv4 address.\n",
-                     netdev->name);
-         in_dev_put(in_dev);
-         goto skip_arp;
-      }
-      pmConf->filters[i].patternSize = ETH_HLEN + // Ethernet header
-         sizeof(struct arphdr) +                  // ARP header
-         2 * ETH_ALEN +                           // 2 Ethernet addresses
-         2 * sizeof (uint32);                     // 2 IPv4 addresses
-      pmConf->filters[i].maskSize =
-         (pmConf->filters[i].patternSize - 1) / 8 + 1;
-      /* ETH_P_ARP in Ethernet header. */
-      ehdr = (struct ethhdr *)pmConf->filters[i].pattern;
-      ehdr->h_proto = htons(ETH_P_ARP);
-      /* ARPOP_REQUEST in ARP header. */
-      ahdr = (struct arphdr *)&pmConf->filters[i].pattern[ETH_HLEN];
-      ahdr->ar_op = htons(ARPOP_REQUEST);
-      arpreq = (uint8 *)(ahdr + 1);
-      /* The Unicast IPv4 address in 'tip' field. */
-      arpreq += 2 * ETH_ALEN + sizeof(uint32);
-      *(uint32 *)arpreq = ifa->ifa_address;
-      /* The mask for the relevant bits. */
-      pmConf->filters[i].mask[0] = 0x00;
-      pmConf->filters[i].mask[1] = 0x30; // ETH_P_ARP
-      pmConf->filters[i].mask[2] = 0x30; // ARPOP_REQUEST
-      pmConf->filters[i].mask[3] = 0x00;
-      pmConf->filters[i].mask[4] = 0xC0; // IPv4 TIP
-      pmConf->filters[i].mask[5] = 0x03; // IPv4 TIP
-      in_dev_put(in_dev);
-
-      pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_FILTER;
-      i++;
-   }
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       struct Vmxnet3_PMConf *pmConf;
+       struct ethhdr *ehdr;
+       struct arphdr *ahdr;
+       u8 *arpreq;
+       struct in_device *in_dev;
+       struct in_ifaddr *ifa;
+       int i = 0;
+
+       if (!compat_netif_running(netdev))
+               return 0;
+
+       vmxnet3_disable_all_intrs(adapter);
+       vmxnet3_free_irqs(adapter);
+       vmxnet3_free_intr_resources(adapter);
+       netif_device_detach(netdev);
+       netif_stop_queue(netdev);
+
+       /* Create wake-up filters. */
+       pmConf = adapter->pm_conf;
+       memset(pmConf, 0, sizeof(*pmConf));
+
+       if (adapter->wol & WAKE_UCAST) {
+               pmConf->filters[i].patternSize = ETH_ALEN;
+               pmConf->filters[i].maskSize = 1;
+               memcpy(pmConf->filters[i].pattern, netdev->dev_addr, ETH_ALEN);
+               pmConf->filters[i].mask[0] = 0x3F; /* LSB ETH_ALEN bits */
+
+               pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_FILTER;
+               i++;
+       }
+
+       if (adapter->wol & WAKE_ARP) {
+               in_dev = in_dev_get(netdev);
+               if (!in_dev)
+                       goto skip_arp;
+
+               ifa = (struct in_ifaddr *)in_dev->ifa_list;
+               if (!ifa) {
+                       dev_dbg(&adapter->pdev->dev, "Cannot program WoL ARP"
+                               " filter for %s: no IPv4 address.\n",
+                               netdev->name);
+                       in_dev_put(in_dev);
+                       goto skip_arp;
+               }
+               pmConf->filters[i].patternSize = ETH_HLEN + /* Ethernet header */
+                       sizeof(struct arphdr) +                  /* ARP header */
+                       2 * ETH_ALEN +                           /* 2 Ethernet addresses */
+                       2 * sizeof (u32);                     /* 2 IPv4 addresses */
+               pmConf->filters[i].maskSize =
+                       (pmConf->filters[i].patternSize - 1) / 8 + 1;
+               /* ETH_P_ARP in Ethernet header. */
+               ehdr = (struct ethhdr *)pmConf->filters[i].pattern;
+               ehdr->h_proto = htons(ETH_P_ARP);
+               /* ARPOP_REQUEST in ARP header. */
+               ahdr = (struct arphdr *)&pmConf->filters[i].pattern[ETH_HLEN];
+               ahdr->ar_op = htons(ARPOP_REQUEST);
+               arpreq = (u8 *)(ahdr + 1);
+
+               /* The Unicast IPv4 address in 'tip' field. */
+               arpreq += 2 * ETH_ALEN + sizeof(u32);
+               *(u32 *)arpreq = ifa->ifa_address;
+
+               /* The mask for the relevant bits. */
+               pmConf->filters[i].mask[0] = 0x00;
+               pmConf->filters[i].mask[1] = 0x30; /* ETH_P_ARP */
+               pmConf->filters[i].mask[2] = 0x30; /* ARPOP_REQUEST */
+               pmConf->filters[i].mask[3] = 0x00;
+               pmConf->filters[i].mask[4] = 0xC0; /* IPv4 TIP */
+               pmConf->filters[i].mask[5] = 0x03; /* IPv4 TIP */
+               in_dev_put(in_dev);
+
+               pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_FILTER;
+               i++;
+       }
 
 skip_arp:
-   if (adapter->wol & WAKE_MAGIC) {
-      pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_MAGIC;
-   }
+       if (adapter->wol & WAKE_MAGIC)
+               pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_MAGIC;
 
-   pmConf->numFilters = i;
+       pmConf->numFilters = i;
 
-   adapter->shared->devRead.pmConfDesc.confVer = 1;
-   adapter->shared->devRead.pmConfDesc.confLen = sizeof(*pmConf);
-   adapter->shared->devRead.pmConfDesc.confPA = virt_to_phys(pmConf);
+       adapter->shared->devRead.pmConfDesc.confVer = 1;
+       adapter->shared->devRead.pmConfDesc.confLen = sizeof(*pmConf);
+       adapter->shared->devRead.pmConfDesc.confPA = virt_to_phys(pmConf);
 
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_PMCFG);
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_UPDATE_PMCFG);
 
-   compat_pci_save_state(pdev);
-   pci_enable_wake(pdev, compat_pci_choose_state(pdev, state), adapter->wol);
-   compat_pci_disable_device(pdev);
-   pci_set_power_state(pdev, compat_pci_choose_state(pdev, state));
+       compat_pci_save_state(pdev);
+       pci_enable_wake(pdev, compat_pci_choose_state(pdev, state),
+                       adapter->wol);
+       compat_pci_disable_device(pdev);
+       pci_set_power_state(pdev, compat_pci_choose_state(pdev, state));
 
-   return 0;
+       return 0;
 }
 
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_resume --
- *
- *      Called by the PCI subsystem to restore device state when resuming the
- *      system.
- *
- * Results:
- *      0 on success, errno on failure.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------------
- */
-
 static int
 vmxnet3_resume(struct pci_dev *pdev)
 {
-   int err;
-   struct net_device *netdev = pci_get_drvdata(pdev);
-   struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
-   Vmxnet3_PMConf *pmConf;
-
-   if (!compat_netif_running(netdev)) {
-      return 0;
-   }
-
-   /* Destroy wake-up filters. */
-   pmConf = adapter->pm_conf;
-   memset(pmConf, 0, sizeof (*pmConf));
-
-   adapter->shared->devRead.pmConfDesc.confVer = 1;
-   adapter->shared->devRead.pmConfDesc.confLen = sizeof(*pmConf);
-   adapter->shared->devRead.pmConfDesc.confPA = virt_to_phys(pmConf);
-
-   netif_device_attach(netdev);
-   pci_set_power_state(pdev, PCI_D0);
-   compat_pci_restore_state(pdev);
-   err = compat_pci_enable_device(pdev);
-   if (err != 0) {
-      return err;
-   }
-
-   pci_enable_wake(pdev, PCI_D0, 0);
-
-   VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_PMCFG);
-   vmxnet3_alloc_intr_resources(adapter);
-   vmxnet3_request_irqs(adapter);
-   vmxnet3_enable_all_intrs(adapter);
-
-   return 0;
+       int err;
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       struct Vmxnet3_PMConf *pmConf;
+
+       if (!compat_netif_running(netdev))
+               return 0;
+
+       /* Destroy wake-up filters. */
+       pmConf = adapter->pm_conf;
+       memset(pmConf, 0, sizeof(*pmConf));
+
+       adapter->shared->devRead.pmConfDesc.confVer = 1;
+       adapter->shared->devRead.pmConfDesc.confLen = sizeof(*pmConf);
+       adapter->shared->devRead.pmConfDesc.confPA = virt_to_phys(pmConf);
+
+       netif_device_attach(netdev);
+       pci_set_power_state(pdev, PCI_D0);
+       compat_pci_restore_state(pdev);
+       err = compat_pci_enable_device(pdev);
+       if (err != 0)
+               return err;
+
+       pci_enable_wake(pdev, PCI_D0, 0);
+
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_UPDATE_PMCFG);
+       vmxnet3_alloc_intr_resources(adapter);
+       vmxnet3_request_irqs(adapter);
+       vmxnet3_enable_all_intrs(adapter);
+
+       return 0;
 }
 
 #endif
 
+static struct pci_driver vmxnet3_driver = {
+       .name           = vmxnet3_driver_name,
+       .id_table       = vmxnet3_pciid_table,
+       .probe          = vmxnet3_probe_device,
+       .remove         = __devexit_p(vmxnet3_remove_device),
+#ifdef CONFIG_PM
+       .suspend        = vmxnet3_suspend,
+       .resume         = vmxnet3_resume,
+#endif
+};
 
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_init_module --
- *
- *    Called when the driver is loaded
- *
- * Result:
- *    0 on success, negative errno value on error
- *
- * Side-effects:
- *    register ourselves with the pci system, and claim devices
- *
- *----------------------------------------------------------------------------
- */
 
 static int __init
 vmxnet3_init_module(void)
 {
-   printk(KERN_INFO "%s - version %s\n", VMXNET3_DRIVER_DESC, VMXNET3_DRIVER_VERSION_REPORT);
+       printk(KERN_INFO "%s - version %s\n", VMXNET3_DRIVER_DESC,
+              VMXNET3_DRIVER_VERSION_REPORT);
 
-   correct_shm_disclaimer = shm_disclaimer &&
-      (strncmp(shm_disclaimer, VMXNET3_SHM_DISCLAIMER, strlen(VMXNET3_SHM_DISCLAIMER)) == 0);
+       correct_shm_disclaimer = shm_disclaimer &&
+               (strncmp(shm_disclaimer, VMXNET3_SHM_DISCLAIMER,
+               strlen(VMXNET3_SHM_DISCLAIMER)) == 0);
 
 #ifdef CONFIG_COMPAT
 #ifndef HAVE_UNLOCKED_IOCTL
-   if (correct_shm_disclaimer) {
-      register_ioctl32_conversion(SHM_IOCTL_TX, NULL);
-      register_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE, NULL);
-      register_ioctl32_conversion(SHM_IOCTL_ALLOC_MANY, NULL);
-      register_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE_AND_MANY, NULL);
-      register_ioctl32_conversion(SHM_IOCTL_FREE_ONE, NULL);
-   }
+       if (correct_shm_disclaimer) {
+               register_ioctl32_conversion(SHM_IOCTL_TX, NULL);
+               register_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE, NULL);
+               register_ioctl32_conversion(SHM_IOCTL_ALLOC_MANY, NULL);
+               register_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE_AND_MANY, NULL);
+               register_ioctl32_conversion(SHM_IOCTL_FREE_ONE, NULL);
+       }
 #endif
 #endif
-   return pci_register_driver(&vmxnet3_driver);
+       return pci_register_driver(&vmxnet3_driver);
 }
 
-
-/*
- *----------------------------------------------------------------------------
- *
- * vmxnet3_exit_module --
- *
- *    Called when the driver is to be unloaded
- *
- * Result:
- *    None
- *
- * Side-effects:
- *    unregister ourselves with the pci system
- *
- *----------------------------------------------------------------------------
- */
+module_init(vmxnet3_init_module);
 
 static void
 vmxnet3_exit_module(void)
 {
 #ifdef CONFIG_COMPAT
 #ifndef HAVE_UNLOCKED_IOCTL
-   if (correct_shm_disclaimer) {
-      unregister_ioctl32_conversion(SHM_IOCTL_TX);
-      unregister_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE);
-      unregister_ioctl32_conversion(SHM_IOCTL_ALLOC_MANY);
-      unregister_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE_AND_MANY);
-      unregister_ioctl32_conversion(SHM_IOCTL_FREE_ONE);
-   }
+       if (correct_shm_disclaimer) {
+               unregister_ioctl32_conversion(SHM_IOCTL_TX);
+               unregister_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE);
+               unregister_ioctl32_conversion(SHM_IOCTL_ALLOC_MANY);
+               unregister_ioctl32_conversion(SHM_IOCTL_ALLOC_ONE_AND_MANY);
+               unregister_ioctl32_conversion(SHM_IOCTL_FREE_ONE);
+       }
 #endif
 #endif
-   pci_unregister_driver(&vmxnet3_driver);
+       pci_unregister_driver(&vmxnet3_driver);
 }
 
 
-module_init(vmxnet3_init_module);
 module_exit(vmxnet3_exit_module);
-MODULE_DEVICE_TABLE(pci, vmxnet3_pciid_table);
 
 MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION(VMXNET3_DRIVER_DESC);
@@ -4714,7 +3041,10 @@ MODULE_VERSION(VMXNET3_DRIVER_VERSION_STRING);
  * by default (i.e., neither mkinitrd nor modprobe will accept it).
  */
 MODULE_INFO(supported, "external");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
 module_param(disable_lro, int, 0);
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
 MODULE_PARM(enable_shm, "0-10i");
 #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
diff --git a/open-vm-tools/modules/linux/vmxnet3/vmxnet3_ethtool.c b/open-vm-tools/modules/linux/vmxnet3/vmxnet3_ethtool.c
new file mode 100644 (file)
index 0000000..825798a
--- /dev/null
@@ -0,0 +1,592 @@
+/*********************************************************
+ * Copyright (C) 2007 VMware, 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 version 2 and no 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.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ *********************************************************/
+
+#include "driver-config.h"
+#include "compat_module.h"
+#include <linux/moduleparam.h>
+#include "vm_basic_types.h"
+#include "vmxnet3_int.h"
+#include <linux/pm.h>
+
+static u32
+vmxnet3_get_rx_csum(struct net_device *netdev)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       return adapter->rxcsum;
+}
+
+
+static int
+vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       if (adapter->rxcsum != val) {
+               adapter->rxcsum = val;
+               if (compat_netif_running(netdev)) {
+                       if (val)
+                               adapter->shared->devRead.misc.uptFeatures |=
+                                                               UPT1_F_RXCSUM;
+                       else
+                               adapter->shared->devRead.misc.uptFeatures &=
+                                                               ~UPT1_F_RXCSUM;
+
+                       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                              VMXNET3_CMD_UPDATE_FEATURE);
+               }
+       }
+       return 0;
+}
+
+
+/* per tq stats maintained by the device */
+static const struct vmxnet3_stat_desc
+vmxnet3_tq_dev_stats[] = {
+       /* description,         offset */
+       { "TSO pkts tx",        offsetof(UPT1_TxStats, TSOPktsTxOK) },
+       { "TSO bytes tx",       offsetof(UPT1_TxStats, TSOBytesTxOK) },
+       { "ucast pkts tx",      offsetof(UPT1_TxStats, ucastPktsTxOK) },
+       { "ucast bytes tx",     offsetof(UPT1_TxStats, ucastBytesTxOK) },
+       { "mcast pkts tx",      offsetof(UPT1_TxStats, mcastPktsTxOK) },
+       { "mcast bytes tx",     offsetof(UPT1_TxStats, mcastBytesTxOK) },
+       { "bcast pkts tx",      offsetof(UPT1_TxStats, bcastPktsTxOK) },
+       { "bcast bytes tx",     offsetof(UPT1_TxStats, bcastBytesTxOK) },
+       { "pkts tx err",        offsetof(UPT1_TxStats, pktsTxError) },
+       { "pkts tx discard",    offsetof(UPT1_TxStats, pktsTxDiscard) },
+};
+
+/* per tq stats maintained by the driver */
+static const struct vmxnet3_stat_desc
+vmxnet3_tq_driver_stats[] = {
+       /* description,         offset */
+       {"drv dropped tx total", offsetof(struct vmxnet3_tq_driver_stats,
+                                       drop_total) },
+       { "   too many frags",  offsetof(struct vmxnet3_tq_driver_stats,
+                                       drop_too_many_frags) },
+       { "   giant hdr",       offsetof(struct vmxnet3_tq_driver_stats,
+                                       drop_oversized_hdr) },
+       { "   hdr err",         offsetof(struct vmxnet3_tq_driver_stats,
+                                       drop_hdr_inspect_err) },
+       { "   tso",             offsetof(struct vmxnet3_tq_driver_stats,
+                                       drop_tso) },
+       { "ring full",          offsetof(struct vmxnet3_tq_driver_stats,
+                                       tx_ring_full) },
+       { "pkts linearized",    offsetof(struct vmxnet3_tq_driver_stats,
+                                       linearized) },
+       { "hdr cloned",         offsetof(struct vmxnet3_tq_driver_stats,
+                                       copy_skb_header) },
+       { "giant hdr",          offsetof(struct vmxnet3_tq_driver_stats,
+                                       oversized_hdr) },
+};
+
+/* per rq stats maintained by the device */
+static const struct vmxnet3_stat_desc
+vmxnet3_rq_dev_stats[] = {
+       { "LRO pkts rx",        offsetof(UPT1_RxStats, LROPktsRxOK) },
+       { "LRO byte rx",        offsetof(UPT1_RxStats, LROBytesRxOK) },
+       { "ucast pkts rx",      offsetof(UPT1_RxStats, ucastPktsRxOK) },
+       { "ucast bytes rx",     offsetof(UPT1_RxStats, ucastBytesRxOK) },
+       { "mcast pkts rx",      offsetof(UPT1_RxStats, mcastPktsRxOK) },
+       { "mcast bytes rx",     offsetof(UPT1_RxStats, mcastBytesRxOK) },
+       { "bcast pkts rx",      offsetof(UPT1_RxStats, bcastPktsRxOK) },
+       { "bcast bytes rx",     offsetof(UPT1_RxStats, bcastBytesRxOK) },
+       { "pkts rx out of buf", offsetof(UPT1_RxStats, pktsRxOutOfBuf) },
+       { "pkts rx err",        offsetof(UPT1_RxStats, pktsRxError) },
+};
+
+/* per rq stats maintained by the driver */
+static const struct vmxnet3_stat_desc
+vmxnet3_rq_driver_stats[] = {
+       /* description,         offset */
+       { "drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats,
+                                          drop_total) },
+       { "   err",            offsetof(struct vmxnet3_rq_driver_stats,
+                                       drop_err) },
+       { "   fcs",            offsetof(struct vmxnet3_rq_driver_stats,
+                                       drop_fcs) },
+       { "rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats,
+                                       rx_buf_alloc_failure) },
+};
+
+/* gloabl stats maintained by the driver */
+static const struct vmxnet3_stat_desc
+vmxnet3_global_stats[] = {
+       /* description,         offset */
+       { "tx timeout count",   offsetof(struct vmxnet3_adapter,
+                                        tx_timeout_count) }
+};
+
+/* Returns pointer to net_device_stats struct in the adapter/netdev */
+struct net_device_stats *
+vmxnet3_get_stats(struct net_device *netdev)
+{
+       struct vmxnet3_adapter *adapter;
+       struct vmxnet3_tq_driver_stats *drvTxStats;
+       struct vmxnet3_rq_driver_stats *drvRxStats;
+       struct UPT1_TxStats *devTxStats;
+       struct UPT1_RxStats *devRxStats;
+       struct net_device_stats *net_stats;
+
+       adapter = compat_netdev_priv(netdev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+       net_stats = &adapter->net_stats;
+#else
+       net_stats = &netdev->stats;
+#endif
+
+       /* Collect the dev stats into the shared area */
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+
+       /* Assuming that we have a single queue device */
+       devTxStats = &adapter->tqd_start->stats;
+       devRxStats = &adapter->rqd_start->stats;
+
+       /* Get access to the driver stats per queue */
+       drvTxStats = &adapter->tx_queue.stats;
+       drvRxStats = &adapter->rx_queue.stats;
+
+       memset(net_stats, 0, sizeof(*net_stats));
+
+       net_stats->rx_packets = devRxStats->ucastPktsRxOK +
+                               devRxStats->mcastPktsRxOK +
+                               devRxStats->bcastPktsRxOK;
+
+       net_stats->tx_packets = devTxStats->ucastPktsTxOK +
+                               devTxStats->mcastPktsTxOK +
+                               devTxStats->bcastPktsTxOK;
+
+       net_stats->rx_bytes = devRxStats->ucastBytesRxOK +
+                             devRxStats->mcastBytesRxOK +
+                             devRxStats->bcastBytesRxOK;
+
+       net_stats->tx_bytes = devTxStats->ucastBytesTxOK +
+                             devTxStats->mcastBytesTxOK +
+                             devTxStats->bcastBytesTxOK;
+
+       net_stats->rx_errors = devRxStats->pktsRxError;
+       net_stats->tx_errors = devTxStats->pktsTxError;
+       net_stats->rx_dropped = drvRxStats->drop_total;
+       net_stats->tx_dropped = drvTxStats->drop_total;
+       net_stats->multicast =  devRxStats->mcastPktsRxOK;
+
+       return net_stats;
+}
+
+/* Returns the number of counters we will return in vmxnet3_get_ethtool_stats.
+ * Assume each counter is uint64.
+ */
+static int
+vmxnet3_get_stats_count(struct net_device *netdev)
+{
+       return ARRAY_SIZE(vmxnet3_tq_dev_stats) +
+               ARRAY_SIZE(vmxnet3_tq_driver_stats) +
+               ARRAY_SIZE(vmxnet3_rq_dev_stats) +
+               ARRAY_SIZE(vmxnet3_rq_driver_stats) +
+               ARRAY_SIZE(vmxnet3_global_stats);
+}
+
+
+static int
+vmxnet3_get_regs_len(struct net_device *netdev)
+{
+       return 20 * sizeof(u32);
+}
+
+
+/*
+ * *drvinfo is updated
+ */
+static void
+vmxnet3_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       strlcpy(drvinfo->driver, vmxnet3_driver_name, sizeof(drvinfo->driver));
+       drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0';
+
+       strlcpy(drvinfo->version, VMXNET3_DRIVER_VERSION_REPORT,
+               sizeof(drvinfo->version));
+       drvinfo->driver[sizeof(drvinfo->version) - 1] = '\0';
+
+       strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
+       drvinfo->fw_version[sizeof(drvinfo->fw_version) - 1] = '\0';
+
+       strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
+               ETHTOOL_BUSINFO_LEN);
+       drvinfo->n_stats = vmxnet3_get_stats_count(netdev);
+       drvinfo->testinfo_len = 0;
+       drvinfo->eedump_len   = 0;
+       drvinfo->regdump_len  = vmxnet3_get_regs_len(netdev);
+}
+
+/* Returns the description strings for the counters returned by
+ * vmxnet3_get_ethtool_stats.
+ */
+static void
+vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
+{
+       if (stringset == ETH_SS_STATS) {
+               int i;
+
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
+                       memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
+                              ETH_GSTRING_LEN);
+                       buf += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++) {
+                       memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
+                              ETH_GSTRING_LEN);
+                       buf += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
+                       memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
+                              ETH_GSTRING_LEN);
+                       buf += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++) {
+                       memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
+                              ETH_GSTRING_LEN);
+                       buf += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++) {
+                       memcpy(buf, vmxnet3_global_stats[i].desc,
+                               ETH_GSTRING_LEN);
+                       buf += ETH_GSTRING_LEN;
+               }
+       }
+}
+
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 23)
+static u32
+vmxnet3_get_flags(struct net_device *netdev) {
+       return netdev->features;
+}
+
+static int
+vmxnet3_set_flags(struct net_device *netdev, u32 data) {
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       u8 lro_requested = (data & ETH_FLAG_LRO) == 0 ? 0 : 1;
+       u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;
+
+       if (lro_requested != lro_present) {
+               /* toggle the LRO feature*/
+               netdev->features ^= NETIF_F_LRO;
+
+               /* update harware LRO capability accordingly */
+               if (lro_requested)
+                       adapter->shared->devRead.misc.uptFeatures &= UPT1_F_LRO;
+               else
+                       adapter->shared->devRead.misc.uptFeatures &=
+                                                               ~UPT1_F_LRO;
+               VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+                                      VMXNET3_CMD_UPDATE_FEATURE);
+       }
+       return 0;
+}
+
+#endif
+
+
+static void
+vmxnet3_get_ethtool_stats(struct net_device *netdev,
+                         struct ethtool_stats *stats, u64 *buf)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       u8 *base;
+       int i;
+
+       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+
+       /* this does assume each counter is 64-bit wide */
+
+       base = (u8 *)&adapter->tqd_start->stats;
+       for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
+               *buf++ = *(u64 *)(base + vmxnet3_tq_dev_stats[i].offset);
+
+       base = (u8 *)&adapter->tx_queue.stats;
+       for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
+               *buf++ = *(u64 *)(base + vmxnet3_tq_driver_stats[i].offset);
+
+       base = (u8 *)&adapter->rqd_start->stats;
+       for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
+               *buf++ = *(u64 *)(base + vmxnet3_rq_dev_stats[i].offset);
+
+       base = (u8 *)&adapter->rx_queue.stats;
+       for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
+               *buf++ = *(u64 *)(base + vmxnet3_rq_driver_stats[i].offset);
+
+       base = (u8 *)adapter;
+       for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++)
+               *buf++ = *(u64 *)(base + vmxnet3_global_stats[i].offset);
+}
+
+
+static void
+vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       u32 *buf = p;
+
+       memset(p, 0, vmxnet3_get_regs_len(netdev));
+
+       regs->version = 1;
+
+       /* Update vmxnet3_get_regs_len if we want to dump more registers */
+
+       /* make each ring use multiple of 16 bytes */
+       buf[0] = adapter->tx_queue.tx_ring.next2fill;
+       buf[1] = adapter->tx_queue.tx_ring.next2comp;
+       buf[2] = adapter->tx_queue.tx_ring.gen;
+       buf[3] = 0;
+
+       buf[4] = adapter->tx_queue.comp_ring.next2proc;
+       buf[5] = adapter->tx_queue.comp_ring.gen;
+       buf[6] = adapter->tx_queue.stopped;
+       buf[7] = 0;
+
+       buf[8] = adapter->rx_queue.rx_ring[0].next2fill;
+       buf[9] = adapter->rx_queue.rx_ring[0].next2comp;
+       buf[10] = adapter->rx_queue.rx_ring[0].gen;
+       buf[11] = 0;
+
+       buf[12] = adapter->rx_queue.rx_ring[1].next2fill;
+       buf[13] = adapter->rx_queue.rx_ring[1].next2comp;
+       buf[14] = adapter->rx_queue.rx_ring[1].gen;
+       buf[15] = 0;
+
+       buf[16] = adapter->rx_queue.comp_ring.next2proc;
+       buf[17] = adapter->rx_queue.comp_ring.gen;
+       buf[18] = 0;
+       buf[19] = 0;
+}
+
+
+static void
+vmxnet3_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       wol->supported = WAKE_UCAST | WAKE_ARP | WAKE_MAGIC;
+       wol->wolopts = adapter->wol;
+}
+
+
+static int
+vmxnet3_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       if (wol->wolopts & (WAKE_PHY | WAKE_MCAST | WAKE_BCAST |
+                           WAKE_MAGICSECURE)) {
+               return -EOPNOTSUPP;
+       }
+
+       adapter->wol = wol->wolopts;
+
+       compat_device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       return 0;
+}
+
+
+static int
+vmxnet3_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       ecmd->supported = SUPPORTED_10000baseT_Full | SUPPORTED_1000baseT_Full |
+                         SUPPORTED_TP;
+       ecmd->advertising = ADVERTISED_TP;
+       ecmd->port = PORT_TP;
+       ecmd->transceiver = XCVR_INTERNAL;
+
+       if (adapter->link_speed) {
+               ecmd->speed = adapter->link_speed;
+               ecmd->duplex = DUPLEX_FULL;
+       } else {
+               ecmd->speed = -1;
+               ecmd->duplex = -1;
+       }
+       return 0;
+}
+
+
+static void
+vmxnet3_get_ringparam(struct net_device *netdev,
+                     struct ethtool_ringparam *param)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+
+       param->rx_max_pending = VMXNET3_RX_RING_MAX_SIZE;
+       param->tx_max_pending = VMXNET3_TX_RING_MAX_SIZE;
+       param->rx_mini_max_pending = 0;
+       param->rx_jumbo_max_pending = 0;
+
+       param->rx_pending = adapter->rx_queue.rx_ring[0].size;
+       param->tx_pending = adapter->tx_queue.tx_ring.size;
+       param->rx_mini_pending = 0;
+       param->rx_jumbo_pending = 0;
+}
+
+
+
+static int
+vmxnet3_set_ringparam(struct net_device *netdev,
+                     struct ethtool_ringparam *param)
+{
+       struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+       u32 new_tx_ring_size, new_rx_ring_size;
+       u32 sz;
+       int err = 0;
+
+       if (param->tx_pending == 0 ||
+           param->tx_pending > VMXNET3_TX_RING_MAX_SIZE)
+               return -EINVAL;
+
+       if (param->rx_pending == 0 ||
+           param->rx_pending > VMXNET3_RX_RING_MAX_SIZE)
+               return -EINVAL;
+
+
+       /* round it up to a multiple of VMXNET3_RING_SIZE_ALIGN */
+       new_tx_ring_size = (param->tx_pending + VMXNET3_RING_SIZE_MASK) &
+               ~VMXNET3_RING_SIZE_MASK;
+       new_tx_ring_size = min_t(u32, new_tx_ring_size,
+                                VMXNET3_TX_RING_MAX_SIZE);
+       BUG_ON(new_tx_ring_size > VMXNET3_TX_RING_MAX_SIZE);
+       BUG_ON(new_tx_ring_size % VMXNET3_RING_SIZE_ALIGN != 0);
+
+       /* ring0 has to be a multiple of
+        * rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN
+        */
+       sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN;
+       new_rx_ring_size = (param->rx_pending + sz - 1) / sz * sz;
+       new_rx_ring_size = min_t(u32, new_rx_ring_size,
+                       VMXNET3_RX_RING_MAX_SIZE / sz * sz);
+       BUG_ON(new_rx_ring_size > VMXNET3_RX_RING_MAX_SIZE);
+       BUG_ON(new_rx_ring_size % sz != 0);
+
+       if (new_tx_ring_size == adapter->tx_queue.tx_ring.size &&
+                       new_rx_ring_size == adapter->rx_queue.rx_ring[0].size) {
+               return 0;
+       }
+
+
+       /*
+        * Reset_work may be in the middle of resetting the device, wait for its
+        * completion.
+        */
+       while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state))
+               compat_msleep(1);
+
+       if (compat_netif_running(netdev)) {
+               vmxnet3_quiesce_dev(adapter);
+               vmxnet3_reset_dev(adapter);
+
+               /* recreate the rx queue and the tx queue based on the
+                * new sizes */
+               vmxnet3_tq_destroy(&adapter->tx_queue, adapter);
+               vmxnet3_rq_destroy(&adapter->rx_queue, adapter);
+
+               err = vmxnet3_create_queues(adapter, new_tx_ring_size,
+                       new_rx_ring_size, VMXNET3_DEF_RX_RING_SIZE);
+               if (err) {
+                       /* failed, most likely because of OOM, try the default
+                        * size */
+                       printk(KERN_ERR "%s: failed to apply new sizes, try the"
+                               " default ones\n", netdev->name);
+                       err = vmxnet3_create_queues(adapter,
+                                                   VMXNET3_DEF_TX_RING_SIZE,
+                                                   VMXNET3_DEF_RX_RING_SIZE,
+                                                   VMXNET3_DEF_RX_RING_SIZE);
+                       if (err) {
+                               printk(KERN_ERR "%s: failed to create queues "
+                                       "with default sizes. Closing it\n",
+                                       netdev->name);
+                               goto out;
+                       }
+               }
+
+               err = vmxnet3_activate_dev(adapter);
+               if (err)
+                       printk(KERN_ERR "%s: failed to re-activate, error %d."
+                               " Closing it\n", netdev->name, err);
+       }
+
+out:
+       clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
+       if (err)
+               vmxnet3_force_close(adapter);
+
+       return err;
+}
+
+
+static u32
+vmxnet3_get_tx_csum(struct net_device *netdev)
+{
+        return (netdev->features & NETIF_F_HW_CSUM) != 0;
+}
+
+static int
+vmxnet3_set_tx_csum(struct net_device *netdev, u32 val)
+{
+        struct vmxnet3_adapter *adapter = compat_netdev_priv(netdev);
+        if (val) {
+                netdev->features |= NETIF_F_HW_CSUM;
+        } else {
+                netdev->features &= ~ NETIF_F_HW_CSUM;
+        }
+        vmxnet3_vlan_features(adapter, 0, TRUE);
+        return 0;
+}
+
+
+static struct ethtool_ops vmxnet3_ethtool_ops = {
+       .get_settings      = vmxnet3_get_settings,
+       .get_drvinfo       = vmxnet3_get_drvinfo,
+       .get_regs_len      = vmxnet3_get_regs_len,
+       .get_regs          = vmxnet3_get_regs,
+       .get_wol           = vmxnet3_get_wol,
+       .set_wol           = vmxnet3_set_wol,
+       .get_link          = ethtool_op_get_link,
+       .get_rx_csum       = vmxnet3_get_rx_csum,
+       .set_rx_csum       = vmxnet3_set_rx_csum,
+       .get_tx_csum       = vmxnet3_get_tx_csum,
+       .set_tx_csum       = vmxnet3_set_tx_csum,
+       .get_sg            = ethtool_op_get_sg,
+       .set_sg            = ethtool_op_set_sg,
+       .get_tso           = ethtool_op_get_tso,
+       .set_tso           = ethtool_op_set_tso,
+       .get_strings       = vmxnet3_get_strings,
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 23)
+       .get_flags         = vmxnet3_get_flags,
+       .set_flags         = vmxnet3_set_flags,
+#endif
+       .get_stats_count   = vmxnet3_get_stats_count,
+       .get_ethtool_stats = vmxnet3_get_ethtool_stats,
+       .get_ringparam     = vmxnet3_get_ringparam,
+       .set_ringparam     = vmxnet3_set_ringparam,
+};
+
+void vmxnet3_set_ethtool_ops(struct net_device *netdev)
+{
+       SET_ETHTOOL_OPS(netdev, &vmxnet3_ethtool_ops);
+}
+
index f4972351004823b472282921568f9ca8decf76bc..7f4dfd7b309325c1b4e3ea24962432d39ca1f869 100644 (file)
 #define INCLUDE_ALLOW_MODULE
 #include "includeCheck.h"
 
+#include "compat_slab.h"
+#include "compat_spinlock.h"
+#include "compat_ioport.h"
+#include "compat_pci.h"
+#include "compat_highmem.h"
+#include "compat_init.h"
+#include "compat_timer.h"
+#include "compat_netdevice.h"
+#include "compat_skbuff.h"
+#include "compat_interrupt.h"
+#include "compat_workqueue.h"
+#include "compat_module.h"
+
+#include <asm/dma.h>
+#include <asm/page.h>
+#include <asm/uaccess.h>
+#include <linux/types.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <linux/in.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <asm/checksum.h>
+#include <linux/moduleparam.h>
+
+
+#include <linux/if_vlan.h>
+#include <linux/if_arp.h>
+#include <linux/inetdevice.h>
+
+#ifdef CONFIG_COMPAT
+#ifndef HAVE_UNLOCKED_IOCTL
+#include <linux/ioctl32.h>
+#endif
+#endif
+
+#include "vm_basic_types.h"
 #include "vmxnet3_defs.h"
+#include "vmxnet3_version.h"
+#include <linux/stddef.h>
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && !defined(VMXNET3_NO_NAPI)
 #   define VMXNET3_NAPI
 #endif
 #endif
 
-typedef struct vmxnet3_cmd_ring {
-   Vmxnet3_GenericDesc *base;
-   uint32               size;
-   uint32               next2fill;
-   uint32               next2comp;
-   uint8                gen;
-   dma_addr_t           basePA;
-} Vmxnet3_CmdRing;
 
-static INLINE void 
+#ifdef VLAN_GROUP_ARRAY_SPLIT_PARTS
+#define compat_vlan_group_get_device(vlan_grp, vid)    vlan_group_get_device(vlan_grp, vid)
+#define compat_vlan_group_set_device(vlan_grp, vid, dev)       vlan_group_set_device(vlan_grp, vid, dev)
+#else
+#define compat_vlan_group_get_device(vlan_grp, vid)    ((vlan_grp)->vlan_devices[(vid)])
+#define compat_vlan_group_set_device(vlan_grp, vid, dev)       ((vlan_grp)->vlan_devices[(vid)] = (dev))
+#endif
+
+
+#ifdef VMXNET3_NAPI
+#   ifdef VMX86_DEBUG
+#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING"-NAPI(debug)"
+#   else
+#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING"-NAPI"
+#   endif
+#else
+#   ifdef VMX86_DEBUG
+#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING"(debug)"
+#   else
+#      define VMXNET3_DRIVER_VERSION_REPORT VMXNET3_DRIVER_VERSION_STRING
+#   endif
+#endif
+
+
+struct vmxnet3_cmd_ring {
+       Vmxnet3_GenericDesc *base;
+       u32             size;
+       u32             next2fill;
+       u32             next2comp;
+       u8              gen;
+       dma_addr_t           basePA;
+};
+
+static inline void
 vmxnet3_cmd_ring_adv_next2fill(struct vmxnet3_cmd_ring *ring)
 {
-   ring->next2fill++;
-   if (UNLIKELY(ring->next2fill == ring->size)) {
-      ring->next2fill = 0;
-      VMXNET3_FLIP_RING_GEN(ring->gen);
-   }
+       ring->next2fill++;
+       if (unlikely(ring->next2fill == ring->size)) {
+               ring->next2fill = 0;
+               VMXNET3_FLIP_RING_GEN(ring->gen);
+       }
 }
 
-static INLINE void
+static inline void
 vmxnet3_cmd_ring_adv_next2comp(struct vmxnet3_cmd_ring *ring)
 {
-   VMXNET3_INC_RING_IDX_ONLY(ring->next2comp, ring->size);
+       VMXNET3_INC_RING_IDX_ONLY(ring->next2comp, ring->size);
 }
 
-static INLINE int
+static inline int
 vmxnet3_cmd_ring_desc_avail(struct vmxnet3_cmd_ring *ring)
 {
-   return (ring->next2comp > ring->next2fill ? 0 : ring->size) + 
-           ring->next2comp - ring->next2fill - 1;
+       return (ring->next2comp > ring->next2fill ? 0 : ring->size) +
+               ring->next2comp - ring->next2fill - 1;
 }
 
-typedef struct vmxnet3_comp_ring {
-   Vmxnet3_GenericDesc *base;
-   uint32               size;
-   uint32               next2proc;
-   uint8                gen;
-   uint8                intr_idx;
-   dma_addr_t           basePA;
-} Vmxnet3_CompRing;
+struct vmxnet3_comp_ring {
+       Vmxnet3_GenericDesc *base;
+       u32               size;
+       u32               next2proc;
+       u8                gen;
+       u8                intr_idx;
+       dma_addr_t        basePA;
+};
 
-static INLINE void
+static inline void
 vmxnet3_comp_ring_adv_next2proc(struct vmxnet3_comp_ring *ring)
 {
-   ring->next2proc++;
-   if (UNLIKELY(ring->next2proc == ring->size)) {
-      ring->next2proc = 0;
-      VMXNET3_FLIP_RING_GEN(ring->gen);
-   }
+       ring->next2proc++;
+       if (unlikely(ring->next2proc == ring->size)) {
+               ring->next2proc = 0;
+               VMXNET3_FLIP_RING_GEN(ring->gen);
+       }
 }
 
 struct vmxnet3_tx_data_ring {
-   Vmxnet3_TxDataDesc *base;
-   uint32              size;
-   dma_addr_t          basePA;
+       Vmxnet3_TxDataDesc *base;
+       u32                 size;
+       dma_addr_t          basePA;
 };
 
 enum vmxnet3_buf_map_type {
-   VMXNET3_MAP_INVALID = 0,
-   VMXNET3_MAP_NONE,
-   VMXNET3_MAP_SINGLE,
-   VMXNET3_MAP_PAGE,
+       VMXNET3_MAP_INVALID = 0,
+       VMXNET3_MAP_NONE,
+       VMXNET3_MAP_SINGLE,
+       VMXNET3_MAP_PAGE,
 };
 
 struct vmxnet3_tx_buf_info {
-   uint32      map_type;
-   uint16      len;
-   uint16      sop_idx;
-   dma_addr_t  dma_addr;
-   struct sk_buff *skb;
+       u32      map_type;
+       u16      len;
+       u16      sop_idx;
+       dma_addr_t  dma_addr;
+       struct sk_buff *skb;
 };
 
 struct vmxnet3_tq_driver_stats {
-   uint64 drop_total;     /* # of pkts dropped by the driver, the 
+       u64 drop_total;     /* # of pkts dropped by the driver, the
                            * counters below track droppings due to 
                            * different reasons
                            */
-   uint64 drop_too_many_frags;
-   uint64 drop_oversized_hdr;
-   uint64 drop_hdr_inspect_err; 
-   uint64 drop_tso;
-
-   uint64 tx_ring_full;
-   uint64 linearized;         /* # of pkts linearized */
-   uint64 copy_skb_header;    /* # of times we have to copy skb header */
-   uint64 oversized_hdr;    
+       u64 drop_too_many_frags;
+       u64 drop_oversized_hdr;
+       u64 drop_hdr_inspect_err;
+       u64 drop_tso;
+
+       u64 tx_ring_full;
+       u64 linearized;         /* # of pkts linearized */
+       u64 copy_skb_header;    /* # of times we have to copy skb header */
+       u64 oversized_hdr;
 };
 
 struct vmxnet3_tx_ctx {
-   Bool   ipv4;
-   uint16 mss;
-   uint32 eth_ip_hdr_size; /* only valid for pkts requesting tso or csum offloading */
-   uint32 l4_hdr_size;     /* only valid if mss != 0 */
-   uint32 copy_size;       /* # of bytes copied into the data ring */
-   Vmxnet3_GenericDesc *sop_txd;
-   Vmxnet3_GenericDesc *eop_txd;
+       Bool   ipv4;
+       u16 mss;
+       u32 eth_ip_hdr_size; /* only valid for pkts requesting tso or csum
+                                * offloading
+                                */
+       u32 l4_hdr_size;     /* only valid if mss != 0 */
+       u32 copy_size;       /* # of bytes copied into the data ring */
+       Vmxnet3_GenericDesc *sop_txd;
+       Vmxnet3_GenericDesc *eop_txd;
 };
 
 struct vmxnet3_tx_queue {
-   spinlock_t                      tx_lock;
-   struct vmxnet3_cmd_ring         tx_ring;
-   struct vmxnet3_tx_buf_info     *buf_info;
-   struct vmxnet3_tx_data_ring     data_ring;
-   struct vmxnet3_comp_ring        comp_ring;
-   Vmxnet3_TxQueueCtrl            *shared;
-   struct vmxnet3_tq_driver_stats  stats;
-   Bool                            stopped;   
-   int                             num_stop;  /* # of time queue is stopped */
+       spinlock_t                      tx_lock;
+       struct vmxnet3_cmd_ring         tx_ring;
+       struct vmxnet3_tx_buf_info     *buf_info;
+       struct vmxnet3_tx_data_ring     data_ring;
+       struct vmxnet3_comp_ring        comp_ring;
+       Vmxnet3_TxQueueCtrl            *shared;
+       struct vmxnet3_tq_driver_stats  stats;
+       Bool                            stopped;
+       int                             num_stop;  /* # of times the queue is
+                                                   * stopped */
 } __attribute__((__aligned__(SMP_CACHE_BYTES)));
 
 enum vmxnet3_rx_buf_type {
-   VMXNET3_RX_BUF_NONE = 0,
-   VMXNET3_RX_BUF_SKB = 1,
-   VMXNET3_RX_BUF_PAGE = 2
+       VMXNET3_RX_BUF_NONE = 0,
+       VMXNET3_RX_BUF_SKB = 1,
+       VMXNET3_RX_BUF_PAGE = 2
 };
 
 struct vmxnet3_rx_buf_info {
-   enum vmxnet3_rx_buf_type buf_type;
-   uint16     len;
-   union {
-      struct sk_buff *skb;
-      struct page    *page;
-      unsigned long   shm_idx;
-   };
-   dma_addr_t dma_addr;
+       enum vmxnet3_rx_buf_type buf_type;
+       u16     len;
+       union {
+               struct sk_buff *skb;
+               struct page    *page;
+               unsigned long   shm_idx;
+       };
+       dma_addr_t dma_addr;
 };
 
 struct vmxnet3_rx_ctx {
-   struct sk_buff *skb;
-   uint32 sop_idx;
+       struct sk_buff *skb;
+       u32 sop_idx;
 };
 
 struct vmxnet3_rq_driver_stats {
-   uint64 drop_total;
-   uint64 drop_err;
-   uint64 drop_fcs;
-   uint64 rx_buf_alloc_failure;
+       u64 drop_total;
+       u64 drop_err;
+       u64 drop_fcs;
+       u64 rx_buf_alloc_failure;
 };
 
 struct vmxnet3_rx_queue {
-   struct vmxnet3_cmd_ring   rx_ring[2];
-   struct vmxnet3_comp_ring  comp_ring;
-   struct vmxnet3_rx_ctx     rx_ctx;
-   uint32 qid;            /* rqID in RCD for buffer from 1st ring */
-   uint32 qid2;           /* rqID in RCD for buffer from 2nd ring */
-   uint32 uncommitted[2]; /* # of buffers allocated since last RXPROD update */
-   struct vmxnet3_rx_buf_info     *buf_info[2];
-   Vmxnet3_RxQueueCtrl            *shared;
-   struct vmxnet3_rq_driver_stats  stats;
+       struct vmxnet3_cmd_ring   rx_ring[2];
+       struct vmxnet3_comp_ring  comp_ring;
+       struct vmxnet3_rx_ctx     rx_ctx;
+       u32 qid;            /* rqID in RCD for buffer from 1st ring */
+       u32 qid2;           /* rqID in RCD for buffer from 2nd ring */
+       u32 uncommitted[2]; /* # of buffers allocated since last RXPROD
+                            * update */
+       struct vmxnet3_rx_buf_info     *buf_info[2];
+       Vmxnet3_RxQueueCtrl            *shared;
+       struct vmxnet3_rq_driver_stats  stats;
 } __attribute__((__aligned__(SMP_CACHE_BYTES)));
 
 #define VMXNET3_LINUX_MAX_MSIX_VECT     1
 
 struct vmxnet3_intr {
-   enum vmxnet3_intr_mask_mode  mask_mode;
-   enum vmxnet3_intr_type       type;          /* MSI-X, MSI, or INTx? */
-   uint8  num_intrs;                           /* # of intr vectors */
-   uint8  event_intr_idx;                      /* idx of the intr vector for event */
-   uint8  mod_levels[VMXNET3_LINUX_MAX_MSIX_VECT]; /* moderation level */
+       enum vmxnet3_intr_mask_mode  mask_mode;
+       enum vmxnet3_intr_type       type;          /* MSI-X, MSI, or INTx? */
+       u8  num_intrs;                  /* # of intr vectors */
+       u8  event_intr_idx;             /* idx of the intr vector for event */
+       u8  mod_levels[VMXNET3_LINUX_MAX_MSIX_VECT]; /* moderation level */
 #ifdef CONFIG_PCI_MSI
-   struct msix_entry msix_entries[VMXNET3_LINUX_MAX_MSIX_VECT];
+       struct msix_entry msix_entries[VMXNET3_LINUX_MAX_MSIX_VECT];
 #endif
 };
 
-#define VMXNET3_STATE_BIT_RESETTING   0  
-#define VMXNET3_STATE_BIT_QUIESCED    1  
+#define VMXNET3_STATE_BIT_RESETTING   0
+#define VMXNET3_STATE_BIT_QUIESCED    1
 struct vmxnet3_adapter {
-   struct vmxnet3_tx_queue        tx_queue;
-   struct vmxnet3_rx_queue        rx_queue;
+       struct vmxnet3_tx_queue        tx_queue;
+       struct vmxnet3_rx_queue        rx_queue;
 #ifdef VMXNET3_NAPI
-   struct napi_struct             napi;
+       struct napi_struct             napi;
 #endif
-   struct vlan_group             *vlan_grp;
+       struct vlan_group             *vlan_grp;
 
-   struct vmxnet3_intr            intr;
+       struct vmxnet3_intr            intr;
 
-   struct Vmxnet3_DriverShared   *shared;
-   struct Vmxnet3_PMConf         *pm_conf;
-   struct Vmxnet3_TxQueueDesc    *tqd_start;     /* first tx queue desc */
-   struct Vmxnet3_RxQueueDesc    *rqd_start;     /* first rx queue desc */;
-   struct net_device             *netdev;
-   struct net_device_stats        net_stats;
-   struct pci_dev                *pdev;
+       Vmxnet3_DriverShared            *shared;
+       Vmxnet3_PMConf                  *pm_conf;
+       Vmxnet3_TxQueueDesc             *tqd_start;    /* first tx queue desc */
+       Vmxnet3_RxQueueDesc             *rqd_start;    /* first rx queue desc */
+       struct net_device             *netdev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+       struct net_device_stats        net_stats;
+#endif
+       struct pci_dev                *pdev;
 
-   uint8  *hw_addr0; /* for BAR 0 */
-   uint8  *hw_addr1; /* for BAR 1 */
+       u8                              *hw_addr0; /* for BAR 0 */
+       u8                              *hw_addr1; /* for BAR 1 */
 
-   /* feature control */
-   Bool   rxcsum;
-   Bool   lro;
-   Bool   jumbo_frame;
+       /* feature control */
+       Bool                            rxcsum;
+       Bool                            lro;
+       Bool                            jumbo_frame;
 
-   /* rx buffer related */
-   unsigned   skb_buf_size;
-   int        rx_buf_per_pkt;  /* only apply to the 1st ring */
-   dma_addr_t shared_pa;
-   dma_addr_t queue_desc_pa;
+       /* rx buffer related */
+       unsigned   skb_buf_size;
+       int        rx_buf_per_pkt;  /* only apply to the 1st ring */
+       dma_addr_t shared_pa;
+       dma_addr_t queue_desc_pa;
 
-   /* Wake-on-LAN */
-   uint32     wol;
+       /* Wake-on-LAN */
+       u32     wol;
 
-   /* Link speed */
-   uint32     link_speed; /* in mbps */
+       /* Link speed */
+       u32     link_speed; /* in mbps */
 
-   uint64     tx_timeout_count;
-   compat_work work;
+       u64     tx_timeout_count;
+       compat_work work;
 
-   unsigned long  state;    /* VMXNET3_STATE_BIT_xxx */
+       unsigned long  state;    /* VMXNET3_STATE_BIT_xxx */
 
-   int dev_number;
-   Bool is_shm;
-   struct vmxnet3_shm_pool *shm;
+       int dev_number;
+       Bool is_shm;
+       struct vmxnet3_shm_pool *shm;
 };
 
 struct vmxnet3_stat_desc {
-   char desc[ETH_GSTRING_LEN];
-   int  offset;
+       char desc[ETH_GSTRING_LEN];
+       int  offset;
 };
 
 #define VMXNET3_WRITE_BAR0_REG(adapter, reg, val)  \
-   writel((val), (adapter)->hw_addr0 + (reg))
+       writel((val), (adapter)->hw_addr0 + (reg))
 #define VMXNET3_READ_BAR0_REG(adapter, reg)        \
-   readl((adapter)->hw_addr0 + (reg))
+       readl((adapter)->hw_addr0 + (reg))
 
 #define VMXNET3_WRITE_BAR1_REG(adapter, reg, val)  \
-   writel((val), (adapter)->hw_addr1 + (reg))
+       writel((val), (adapter)->hw_addr1 + (reg))
 #define VMXNET3_READ_BAR1_REG(adapter, reg)        \
-   readl((adapter)->hw_addr1 + (reg))
+       readl((adapter)->hw_addr1 + (reg))
 
 #define VMXNET3_WAKE_QUEUE_THRESHOLD(tq)  (5)
 #define VMXNET3_RX_ALLOC_THRESHOLD(rq, ring_idx, adapter) \
-   ((rq)->rx_ring[ring_idx].size >> 3)
+       ((rq)->rx_ring[ring_idx].size >> 3)
 
-#define VMXNET3_GET_ADDR_LO(dma)   ((uint32)(dma))
-#define VMXNET3_GET_ADDR_HI(dma)   ((uint32)(((uint64)(dma)) >> 32))
+#define VMXNET3_GET_ADDR_LO(dma)   ((u32)(dma))
+#define VMXNET3_GET_ADDR_HI(dma)   ((u32)(((u64)(dma)) >> 32))
 
 /* must be a multiple of VMXNET3_RING_SIZE_ALIGN */
 #define VMXNET3_DEF_TX_RING_SIZE    512
 #define VMXNET3_DEF_RX_RING_SIZE    256
 
 /* FIXME: what's the right value for this? */
-#define VMXNET3_MAX_ETH_HDR_SIZE    22 
+#define VMXNET3_MAX_ETH_HDR_SIZE    22
 
 #define VMXNET3_MAX_SKB_BUF_SIZE    (3*1024)
-#endif
-
-#ifdef VMX86_DEBUG
-#   define VMXNET3_ASSERT(cond) BUG_ON(!(cond))
-#else
-#   define VMXNET3_ASSERT(cond) do {} while (0)
-#endif
 
-#ifdef VMXNET3_DO_LOG
-#   define VMXNET3_LOG(msg...) printk(KERN_ERR msg)
-#else
-#   define VMXNET3_LOG(msg...)
-#endif
-
-// used by vmxnet3_shm_tx_pkt
 int
-vmxnet3_tq_xmit(struct sk_buff *skb,
-                struct vmxnet3_tx_queue *tq,
-                struct vmxnet3_adapter *adapter,
-                struct net_device *netdev);
-
+vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, struct
+               vmxnet3_adapter *adapter, struct net_device *netdev);
 int
 vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter);
 
@@ -309,3 +366,29 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter);
 
 void
 vmxnet3_force_close(struct vmxnet3_adapter *adapter);
+
+void
+vmxnet3_reset_dev(struct vmxnet3_adapter *adapter);
+
+void
+vmxnet3_tq_destroy(struct vmxnet3_tx_queue *tq,
+                  struct vmxnet3_adapter *adapter);
+
+void
+vmxnet3_rq_destroy(struct vmxnet3_rx_queue *rq,
+                  struct vmxnet3_adapter *adapter);
+
+int
+vmxnet3_create_queues(struct vmxnet3_adapter *adapter,
+                     u32 tx_ring_size, u32 rx_ring_size, u32 rx_ring2_size);
+
+void
+vmxnet3_vlan_features(struct vmxnet3_adapter *adapter, u16 vid, Bool allvids);
+
+extern void vmxnet3_set_ethtool_ops(struct net_device *netdev);
+extern struct net_device_stats *vmxnet3_get_stats(struct net_device *netdev);
+
+extern char vmxnet3_driver_name[];
+
+
+#endif
index 283e364a741890cec95a16a0a2b6386dc7b6fc7d..468b790484c075d7d3b7dd5f5af96b2f8d3273a4 100644 (file)
  */
 #include "driver-config.h"
 
-#include "compat_module.h"
-#include <linux/moduleparam.h>
-
-#include "compat_slab.h"
-#include "compat_spinlock.h"
-#include "compat_ioport.h"
-#include "compat_pci.h"
-#include "compat_highmem.h"
-#include "compat_init.h"
-#include "compat_timer.h"
-#include "compat_netdevice.h"
-#include "compat_skbuff.h"
-#include "compat_interrupt.h"
-#include "compat_workqueue.h"
-
-#include <asm/dma.h>
-#include <asm/page.h>
-#include <asm/uaccess.h>
-#include <linux/types.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <linux/in.h>
-#include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/delay.h>
-#include <asm/checksum.h>
-
-#include <linux/if_vlan.h>
-#include <linux/if_arp.h>
-#include <linux/inetdevice.h>
-
-#include "vm_basic_types.h"
+#include "vmxnet3_int.h"
 #include "vmnet_def.h"
 #include "vm_device_version.h"
-#include "vmxnet3_version.h"
-
-
-#include "vmxnet3_int.h"
 #include "vmxnet3_shm.h"
 
 
@@ -73,9 +36,9 @@ vmxnet3_shm_consume_user_tx_queue(struct vmxnet3_shm_pool *shm);
 
 int
 vmxnet3_shm_tq_xmit(struct sk_buff *skb,
-                    struct vmxnet3_tx_queue *tq,
-                    struct vmxnet3_adapter *adapter,
-                    struct net_device *netdev);
+               struct vmxnet3_tx_queue *tq,
+               struct vmxnet3_adapter *adapter,
+               struct net_device *netdev);
 
 /*
  *----------------------------------------------------------------------------
@@ -91,10 +54,10 @@ vmxnet3_shm_tq_xmit(struct sk_buff *skb,
  *----------------------------------------------------------------------------
  */
 
-static inline uint16
+static inline u16
 kernel_rx_idx(const struct vmxnet3_shm_pool *shm)
 {
-   return shm->ctl.ptr->kernel_rxi;
+       return shm->ctl.ptr->kernel_rxi;
 }
 
 
@@ -115,7 +78,7 @@ kernel_rx_idx(const struct vmxnet3_shm_pool *shm)
 static inline void
 inc_kernel_rx_idx(const struct vmxnet3_shm_pool *shm)
 {
-   shm->ctl.ptr->kernel_rxi = (shm->ctl.ptr->kernel_rxi + 1) % SHM_RX_RING_SIZE;
+       shm->ctl.ptr->kernel_rxi = (shm->ctl.ptr->kernel_rxi + 1) % SHM_RX_RING_SIZE;
 }
 
 
@@ -133,10 +96,10 @@ inc_kernel_rx_idx(const struct vmxnet3_shm_pool *shm)
  *----------------------------------------------------------------------------
  */
 
-static inline uint16
+static inline u16
 kernel_tx_idx(const struct vmxnet3_shm_pool *shm)
 {
-   return shm->ctl.ptr->kernel_txi;
+       return shm->ctl.ptr->kernel_txi;
 }
 
 
@@ -157,7 +120,7 @@ kernel_tx_idx(const struct vmxnet3_shm_pool *shm)
 static inline void
 inc_kernel_tx_idx(const struct vmxnet3_shm_pool *shm)
 {
-   shm->ctl.ptr->kernel_txi = (shm->ctl.ptr->kernel_txi + 1) % SHM_TX_RING_SIZE;
+       shm->ctl.ptr->kernel_txi = (shm->ctl.ptr->kernel_txi + 1) % SHM_TX_RING_SIZE;
 }
 
 
@@ -175,10 +138,10 @@ inc_kernel_tx_idx(const struct vmxnet3_shm_pool *shm)
  *----------------------------------------------------------------------------
  */
 
-static inline uint16
+static inline u16
 user_rx_idx(const struct vmxnet3_shm_pool *shm)
 {
-   return shm->ctl.ptr->user_rxi;
+       return shm->ctl.ptr->user_rxi;
 }
 
 /*
@@ -198,7 +161,7 @@ user_rx_idx(const struct vmxnet3_shm_pool *shm)
 static inline struct vmxnet3_shm_ringentry *
 kernel_rx_entry(const struct vmxnet3_shm_pool *shm)
 {
-   return &shm->ctl.ptr->rx_ring[kernel_rx_idx(shm)];
+       return &shm->ctl.ptr->rx_ring[kernel_rx_idx(shm)];
 }
 
 /*
@@ -218,7 +181,7 @@ kernel_rx_entry(const struct vmxnet3_shm_pool *shm)
 static inline struct vmxnet3_shm_ringentry *
 kernel_tx_entry(const struct vmxnet3_shm_pool *shm)
 {
-   return &shm->ctl.ptr->tx_ring[kernel_tx_idx(shm)];
+       return &shm->ctl.ptr->tx_ring[kernel_tx_idx(shm)];
 }
 
 
@@ -241,102 +204,102 @@ kernel_tx_entry(const struct vmxnet3_shm_pool *shm)
 static inline struct vmxnet3_shm_ringentry *
 user_rx_entry(const struct vmxnet3_shm_pool *shm)
 {
-   return &shm->ctl.ptr->rx_ring[user_rx_idx(shm)];
+       return &shm->ctl.ptr->rx_ring[user_rx_idx(shm)];
 }
 
 
-// kobject type
+/* kobject type */
 static void
 vmxnet3_shm_pool_release(struct kobject *kobj);
 
 static const struct kobj_type vmxnet3_shm_pool_type = {
-   .release = vmxnet3_shm_pool_release
+       .release = vmxnet3_shm_pool_release
 };
 
-// vm operations
+/* vm operations */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
 static int
 vmxnet3_shm_chardev_fault(struct vm_area_struct *vma,
-                          struct vm_fault *vmf);
+               struct vm_fault *vmf);
 
 static struct vm_operations_struct vmxnet3_shm_vm_ops = {
-   .fault = vmxnet3_shm_chardev_fault,
+       .fault = vmxnet3_shm_chardev_fault,
 };
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 1)
 static struct page *
 vmxnet3_shm_chardev_nopage(struct vm_area_struct *vma,
-                           unsigned long address,
-                           int *type);
+               unsigned long address,
+               int *type);
 
 static struct vm_operations_struct vmxnet3_shm_vm_ops = {
-   .nopage = vmxnet3_shm_chardev_nopage,
+       .nopage = vmxnet3_shm_chardev_nopage,
 };
 #else
 static struct page *
 vmxnet3_shm_chardev_nopage(struct vm_area_struct *vma,
-                           unsigned long address,
-                           int unused);
+               unsigned long address,
+               int unused);
 
 static struct vm_operations_struct vmxnet3_shm_vm_ops = {
-   .nopage = vmxnet3_shm_chardev_nopage,
+       .nopage = vmxnet3_shm_chardev_nopage,
 };
 #endif
 
-// file operations
+/* file operations */
 static int vmxnet3_shm_chardev_mmap(struct file *filp,
-                                    struct vm_area_struct *vma);
+               struct vm_area_struct *vma);
 
 static int vmxnet3_shm_chardev_open(struct inode * inode,
-                                    struct file * filp);
+               struct file * filp);
 
 static int vmxnet3_shm_chardev_release(struct inode * inode,
-                                       struct file * filp);
+               struct file * filp);
 
 static unsigned int vmxnet3_shm_chardev_poll(struct file *filp,
-                                             poll_table *wait);
+               poll_table *wait);
 
 static long vmxnet3_shm_chardev_ioctl(struct file *filp,
-                                      unsigned int cmd,
-                                      unsigned long arg);
+               unsigned int cmd,
+               unsigned long arg);
 
 #ifndef HAVE_UNLOCKED_IOCTL
 static int vmxnet3_shm_chardev_old_ioctl(struct inode *inode,
-                                         struct file *filp,
-                                         unsigned int cmd,
-                                         unsigned long arg);
+               struct file *filp,
+               unsigned int cmd,
+               unsigned long arg);
 #endif
 
 static struct file_operations shm_fops = {
-   .owner = THIS_MODULE,
-   .mmap = vmxnet3_shm_chardev_mmap,
-   .open = vmxnet3_shm_chardev_open,
-   .release = vmxnet3_shm_chardev_release,
-   .poll = vmxnet3_shm_chardev_poll,
+       .owner = THIS_MODULE,
+       .mmap = vmxnet3_shm_chardev_mmap,
+       .open = vmxnet3_shm_chardev_open,
+       .release = vmxnet3_shm_chardev_release,
+       .poll = vmxnet3_shm_chardev_poll,
 #ifdef HAVE_UNLOCKED_IOCTL
-   .unlocked_ioctl = vmxnet3_shm_chardev_ioctl,
+       .unlocked_ioctl = vmxnet3_shm_chardev_ioctl,
 #ifdef CONFIG_COMPAT
-   .compat_ioctl = vmxnet3_shm_chardev_ioctl,
+       .compat_ioctl = vmxnet3_shm_chardev_ioctl,
 #endif
 #else
-   .ioctl = vmxnet3_shm_chardev_old_ioctl,
+       .ioctl = vmxnet3_shm_chardev_old_ioctl,
 #endif
 };
 
 static LIST_HEAD(vmxnet3_shm_list);
 static spinlock_t vmxnet3_shm_list_lock = SPIN_LOCK_UNLOCKED;
 
-////////////////////////////////// vmxnet3_shm_pool kobject
+/* vmxnet3_shm_pool kobject */
 
 
-//// Lifecycle
+/* Lifecycle */
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
 #define compat_kobject_init(kobj, ktype) { kobject_init(kobj, (struct kobj_type *) ktype); }
 #else
 #define compat_kobject_init(kobj, _ktype) {  \
-   (kobj)->ktype = (struct kobj_type *) _ktype; \
-   kobject_init(kobj); \
-   }
+       (kobj)->ktype = (struct kobj_type *) _ktype; \
+       kobject_init(kobj); \
+}
 #endif
 
 
@@ -356,20 +319,20 @@ static spinlock_t vmxnet3_shm_list_lock = SPIN_LOCK_UNLOCKED;
 static void
 vmxnet3_shm_init_allocator(struct vmxnet3_shm_pool *shm)
 {
-   int i;
+       int i;
 
-   shm->allocator.count = 0;
-   for (i = 1; i < shm->data.num_pages; i++) {
-      struct page *page = VMXNET3_SHM_IDX2PAGE(shm, i);
-      void *virt = kmap(page);
-      memset(virt, 0, PAGE_SIZE);
-      kunmap(page);
+       shm->allocator.count = 0;
+       for (i = 1; i < shm->data.num_pages; i++) {
+               struct page *page = VMXNET3_SHM_IDX2PAGE(shm, i);
+               void *virt = kmap(page);
+               memset(virt, 0, PAGE_SIZE);
+               kunmap(page);
 
-      shm->allocator.stack[shm->allocator.count++] = i;
+               shm->allocator.stack[shm->allocator.count++] = i;
 
-      VMXNET3_ASSERT(i != SHM_INVALID_IDX);
-   }
-   VMXNET3_ASSERT(shm->allocator.count <= SHM_DATA_SIZE);
+               BUG_ON(i == SHM_INVALID_IDX);
+       }
+       BUG_ON(shm->allocator.count > SHM_DATA_SIZE);
 }
 
 
@@ -392,34 +355,30 @@ vmxnet3_shm_init_allocator(struct vmxnet3_shm_pool *shm)
 static void
 vmxnet3_shm_pool_reset(struct vmxnet3_shm_pool *shm)
 {
-   int err = 0;
-   printk(KERN_INFO "resetting shm pool\n");
+       int err = 0;
+       printk(KERN_INFO "resetting shm pool\n");
 
-   /*
-    * Reset_work may be in the middle of resetting the device, wait for its
-    * completion.
-    */
-   while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &shm->adapter->state)) {
-      compat_msleep(1);
-   }
+       /*
+        * Reset_work may be in the middle of resetting the device, wait for its
+        * completion.
+        */
+       while (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &shm->adapter->state))
+               compat_msleep(1);
 
-   if (compat_netif_running(shm->adapter->netdev)) {
-      vmxnet3_quiesce_dev(shm->adapter);
-   }
+       if (compat_netif_running(shm->adapter->netdev))
+               vmxnet3_quiesce_dev(shm->adapter);
 
-   vmxnet3_shm_init_allocator(shm);
+       vmxnet3_shm_init_allocator(shm);
 
-   if (compat_netif_running(shm->adapter->netdev)) {
-      err = vmxnet3_activate_dev(shm->adapter);
-   }
+       if (compat_netif_running(shm->adapter->netdev))
+               err = vmxnet3_activate_dev(shm->adapter);
 
-   memset(shm->ctl.ptr, 0, PAGE_SIZE);
+       memset(shm->ctl.ptr, 0, PAGE_SIZE);
 
-   clear_bit(VMXNET3_STATE_BIT_RESETTING, &shm->adapter->state);
+       clear_bit(VMXNET3_STATE_BIT_RESETTING, &shm->adapter->state);
 
-   if (err) {
-      vmxnet3_force_close(shm->adapter);
-   }
+       if (err)
+               vmxnet3_force_close(shm->adapter);
 }
 
 /*
@@ -443,92 +402,90 @@ vmxnet3_shm_pool_reset(struct vmxnet3_shm_pool *shm)
 
 struct vmxnet3_shm_pool *
 vmxnet3_shm_pool_create(struct vmxnet3_adapter *adapter,
-                        char *name)
+               char *name)
 {
-   int i;
-   unsigned long flags;
-   struct vmxnet3_shm_pool *shm;
-   struct vmxnet3_shm_ctl *ctl_ptr;
-   struct page *ctl_page;
-
-   // Allocate shm_pool kobject
-   shm = kmalloc(sizeof(*shm), GFP_KERNEL);
-   if (shm == NULL) {
-      goto fail_shm;
-   }
-   memset(shm, 0, sizeof(*shm));
-   compat_kobject_init(&shm->kobj, &vmxnet3_shm_pool_type);
-   //shm->kobj.ktype = &vmxnet3_shm_pool_type;
-   //kobject_init(&shm->kobj);
-   snprintf(shm->name, sizeof(shm->name), "vmxnet_%s_shm", name);
-   kobject_set_name(&shm->kobj, shm->name);
-   shm->adapter = adapter;
-
-   // Allocate data pages
-   shm->data.num_pages = SHM_DATA_SIZE;
-   for (i = 1; i < shm->data.num_pages; i++) {
-      struct page *page = alloc_page(GFP_KERNEL);
-      if (page == NULL) {
-         goto fail_data;
-      }
-
-      VMXNET3_SHM_SET_IDX2PAGE(shm, i, page);
-
-      VMXNET3_ASSERT(i != SHM_INVALID_IDX);
-   }
-
-   // Allocate control page
-   ctl_page = alloc_page(GFP_KERNEL);
-   if (ctl_page == NULL) {
-      goto fail_ctl;
-   }
-   ctl_ptr = (void*)kmap(ctl_page);
-   shm->ctl.pages[0] = ctl_page;
-   shm->ctl.ptr = ctl_ptr;
-
-   // Reset data and control pages
-   vmxnet3_shm_init_allocator(shm);
-   memset(shm->ctl.ptr, 0, PAGE_SIZE);
-
-   // Register char device
-   shm->misc_dev.minor = MISC_DYNAMIC_MINOR;
-   shm->misc_dev.name = shm->name;
-   shm->misc_dev.fops = &shm_fops;
-   if (misc_register(&shm->misc_dev)) {
-      printk(KERN_ERR "failed to register vmxnet3_shm character device\n");
-      goto fail_cdev;
-   }
-
-   // Initialize locks
-   spin_lock_init(&shm->alloc_lock);
-   spin_lock_init(&shm->tx_lock);
-   spin_lock_init(&shm->rx_lock);
-   init_waitqueue_head(&shm->rxq);
-
-   spin_lock_irqsave(&vmxnet3_shm_list_lock, flags);
-   list_add(&shm->list, &vmxnet3_shm_list);
-   spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
-
-   printk(KERN_INFO "created vmxnet shared memory pool %s\n", shm->name);
-
-   return shm;
+       int i;
+       unsigned long flags;
+       struct vmxnet3_shm_pool *shm;
+       struct vmxnet3_shm_ctl *ctl_ptr;
+       struct page *ctl_page;
+
+       /* Allocate shm_pool kobject */
+       shm = kmalloc(sizeof(*shm), GFP_KERNEL);
+       if (shm == NULL)
+               goto fail_shm;
+
+       memset(shm, 0, sizeof(*shm));
+       compat_kobject_init(&shm->kobj, &vmxnet3_shm_pool_type);
+       /* shm->kobj.ktype = &vmxnet3_shm_pool_type; */
+       /* kobject_init(&shm->kobj); */
+       snprintf(shm->name, sizeof(shm->name), "vmxnet_%s_shm", name);
+       kobject_set_name(&shm->kobj, shm->name);
+       shm->adapter = adapter;
+
+       /* Allocate data pages */
+       shm->data.num_pages = SHM_DATA_SIZE;
+       for (i = 1; i < shm->data.num_pages; i++) {
+               struct page *page = alloc_page(GFP_KERNEL);
+               if (page == NULL)
+                       goto fail_data;
+
+               VMXNET3_SHM_SET_IDX2PAGE(shm, i, page);
+
+               BUG_ON(i == SHM_INVALID_IDX);
+       }
+
+       /* Allocate control page */
+       ctl_page = alloc_page(GFP_KERNEL);
+       if (ctl_page == NULL)
+               goto fail_ctl;
+
+       ctl_ptr = (void*)kmap(ctl_page);
+       shm->ctl.pages[0] = ctl_page;
+       shm->ctl.ptr = ctl_ptr;
+
+       /* Reset data and control pages */
+       vmxnet3_shm_init_allocator(shm);
+       memset(shm->ctl.ptr, 0, PAGE_SIZE);
+
+       /* Register char device */
+       shm->misc_dev.minor = MISC_DYNAMIC_MINOR;
+       shm->misc_dev.name = shm->name;
+       shm->misc_dev.fops = &shm_fops;
+       if (misc_register(&shm->misc_dev)) {
+               printk(KERN_ERR "failed to register vmxnet3_shm character device\n");
+               goto fail_cdev;
+       }
+
+       /* Initialize locks */
+       spin_lock_init(&shm->alloc_lock);
+       spin_lock_init(&shm->tx_lock);
+       spin_lock_init(&shm->rx_lock);
+       init_waitqueue_head(&shm->rxq);
+
+       spin_lock_irqsave(&vmxnet3_shm_list_lock, flags);
+       list_add(&shm->list, &vmxnet3_shm_list);
+       spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
+
+       printk(KERN_INFO "created vmxnet shared memory pool %s\n", shm->name);
+
+       return shm;
 
 fail_cdev:
-   kunmap(ctl_page);
-   __free_page(ctl_page);
+       kunmap(ctl_page);
+       __free_page(ctl_page);
 
 fail_data:
 fail_ctl:
-   for (i = 0; i < shm->data.num_pages; i++) {
-      if (VMXNET3_SHM_IDX2PAGE(shm, i) != NULL) {
-         __free_page(VMXNET3_SHM_IDX2PAGE(shm, i));
-      }
-   }
+       for (i = 0; i < shm->data.num_pages; i++) {
+               if (VMXNET3_SHM_IDX2PAGE(shm, i) != NULL)
+                       __free_page(VMXNET3_SHM_IDX2PAGE(shm, i));
+       }
 
-   kfree(shm);
+       kfree(shm);
 
 fail_shm:
-   return NULL;
+       return NULL;
 }
 
 
@@ -551,34 +508,33 @@ fail_shm:
 static void
 vmxnet3_shm_pool_release(struct kobject *kobj)
 {
-   int i;
-   unsigned long flags;
-   struct vmxnet3_shm_pool *shm = container_of(kobj, struct vmxnet3_shm_pool, kobj);
+       int i;
+       unsigned long flags;
+       struct vmxnet3_shm_pool *shm = container_of(kobj, struct vmxnet3_shm_pool, kobj);
 
-   spin_lock_irqsave(&vmxnet3_shm_list_lock, flags);
-   list_del(&shm->list);
-   spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
+       spin_lock_irqsave(&vmxnet3_shm_list_lock, flags);
+       list_del(&shm->list);
+       spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
 
-   misc_deregister(&shm->misc_dev);
+       misc_deregister(&shm->misc_dev);
 
-   // Free control pages
-   for (i = 0; i < SHM_CTL_SIZE; i++) {
-      kunmap(shm->ctl.pages[i]);
-      __free_page(shm->ctl.pages[i]);
-   }
+       /* Free control pages */
+       for (i = 0; i < SHM_CTL_SIZE; i++) {
+               kunmap(shm->ctl.pages[i]);
+               __free_page(shm->ctl.pages[i]);
+       }
 
-   // Free data pages
-   for (i = 1; i < SHM_DATA_SIZE; i++) {
-      __free_page(VMXNET3_SHM_IDX2PAGE(shm, i));
-   }
+       /* Free data pages */
+       for (i = 1; i < SHM_DATA_SIZE; i++)
+               __free_page(VMXNET3_SHM_IDX2PAGE(shm, i));
 
-   kfree(shm);
+       kfree(shm);
 
-   printk(KERN_INFO "destroyed vmxnet shared memory pool %s\n", shm->name);
+       printk(KERN_INFO "destroyed vmxnet shared memory pool %s\n", shm->name);
 }
 
 
-//// Shared memory pool management
+/* Shared memory pool management */
 
 /*
  *-----------------------------------------------------------------------------
@@ -599,20 +555,19 @@ vmxnet3_shm_pool_release(struct kobject *kobj)
 uint16
 vmxnet3_shm_alloc_page(struct vmxnet3_shm_pool *shm)
 {
-   uint16 idx;
-   unsigned long flags;
-
-   spin_lock_irqsave(&shm->alloc_lock, flags);
-   if (shm->allocator.count == 0) {
-      idx = SHM_INVALID_IDX;
-   } else {
-      idx = shm->allocator.stack[--shm->allocator.count];
-      VMXNET3_ASSERT(idx != SHM_INVALID_IDX);
-   }
-   //printk(KERN_INFO "allocator count: %d (alloc idx: %d)\n", shm->allocator.count, idx);
-   spin_unlock_irqrestore(&shm->alloc_lock, flags);
-
-   return idx;
+       uint16 idx;
+       unsigned long flags;
+
+       spin_lock_irqsave(&shm->alloc_lock, flags);
+       if (shm->allocator.count == 0) {
+               idx = SHM_INVALID_IDX;
+       } else {
+               idx = shm->allocator.stack[--shm->allocator.count];
+               BUG_ON(idx == SHM_INVALID_IDX);
+       }
+       spin_unlock_irqrestore(&shm->alloc_lock, flags);
+
+       return idx;
 }
 
 
@@ -634,19 +589,18 @@ vmxnet3_shm_alloc_page(struct vmxnet3_shm_pool *shm)
 
 void
 vmxnet3_shm_free_page(struct vmxnet3_shm_pool *shm,
-                      uint16 idx)
+               uint16 idx)
 {
-   unsigned long flags;
+       unsigned long flags;
 
-   spin_lock_irqsave(&shm->alloc_lock, flags);
-   VMXNET3_ASSERT(shm->allocator.count < SHM_DATA_SIZE);
-   shm->allocator.stack[shm->allocator.count++] = idx;
-   //printk(KERN_INFO "allocator count: %d (freed idx: %d)\n", shm->allocator.count, idx);
-   spin_unlock_irqrestore(&shm->alloc_lock, flags);
+       spin_lock_irqsave(&shm->alloc_lock, flags);
+       BUG_ON(shm->allocator.count >= SHM_DATA_SIZE);
+       shm->allocator.stack[shm->allocator.count++] = idx;
+       spin_unlock_irqrestore(&shm->alloc_lock, flags);
 }
 
 
-//// Char device
+/* Char device */
 
 /*
  *-----------------------------------------------------------------------------
@@ -666,9 +620,9 @@ vmxnet3_shm_free_page(struct vmxnet3_shm_pool *shm,
 
 static inline unsigned long
 vmxnet3_shm_addr2idx(struct vm_area_struct *vma,
-                     unsigned long address)
+               unsigned long address)
 {
-   return vma->vm_pgoff + ((address - vma->vm_start) >> PAGE_SHIFT);
+       return vma->vm_pgoff + ((address - vma->vm_start) >> PAGE_SHIFT);
 }
 
 
@@ -693,28 +647,26 @@ vmxnet3_shm_addr2idx(struct vm_area_struct *vma,
 
 static int
 vmxnet3_shm_chardev_fault(struct vm_area_struct *vma,
-                          struct vm_fault *vmf)
+               struct vm_fault *vmf)
 {
-   struct vmxnet3_shm_pool *shm = vma->vm_private_data;
-   unsigned long address = (unsigned long)vmf->virtual_address;
-   unsigned long idx = vmxnet3_shm_addr2idx(vma, address);
-   struct page *pageptr;
-
-   if (idx >= SHM_DATA_START && idx < SHM_DATA_START + SHM_DATA_SIZE) {
-      pageptr = VMXNET3_SHM_IDX2PAGE(shm, idx - SHM_DATA_START);
-   } else if (idx >= SHM_CTL_START && idx < SHM_CTL_START + SHM_CTL_SIZE) {
-      pageptr = shm->ctl.pages[idx - SHM_CTL_START];
-   } else {
-      pageptr = NULL;
-   }
-
-   if (pageptr) {
-      get_page(pageptr);
-   }
-
-   vmf->page = pageptr;
-
-   return pageptr ? VM_FAULT_MINOR : VM_FAULT_ERROR;
+       struct vmxnet3_shm_pool *shm = vma->vm_private_data;
+       unsigned long address = (unsigned long)vmf->virtual_address;
+       unsigned long idx = vmxnet3_shm_addr2idx(vma, address);
+       struct page *pageptr;
+
+       if (idx >= SHM_DATA_START && idx < SHM_DATA_START + SHM_DATA_SIZE)
+               pageptr = VMXNET3_SHM_IDX2PAGE(shm, idx - SHM_DATA_START);
+       else if (idx >= SHM_CTL_START && idx < SHM_CTL_START + SHM_CTL_SIZE)
+               pageptr = shm->ctl.pages[idx - SHM_CTL_START];
+       else
+               pageptr = NULL;
+
+       if (pageptr)
+               get_page(pageptr);
+
+       vmf->page = pageptr;
+
+       return pageptr ? VM_FAULT_MINOR : VM_FAULT_ERROR;
 }
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 1)
 
@@ -738,30 +690,27 @@ vmxnet3_shm_chardev_fault(struct vm_area_struct *vma,
 
 static struct page *
 vmxnet3_shm_chardev_nopage(struct vm_area_struct *vma,
-                           unsigned long address,
-                           int *type)
+               unsigned long address,
+               int *type)
 {
-   struct vmxnet3_shm_pool *shm = vma->vm_private_data;
-   unsigned long idx = vmxnet3_shm_addr2idx(vma, address);
-   struct page *pageptr;
-
-   if (idx >= SHM_DATA_START && idx < SHM_DATA_START + SHM_DATA_SIZE) {
-      pageptr = VMXNET3_SHM_IDX2PAGE(shm, idx - SHM_DATA_START);
-   } else if (idx >= SHM_CTL_START && idx < SHM_CTL_START + SHM_CTL_SIZE) {
-      pageptr = shm->ctl.pages[idx - SHM_CTL_START];
-   } else {
-      pageptr = NULL;
-   }
-
-   if (pageptr) {
-      get_page(pageptr);
-   }
-
-   if (type) {
-      *type = pageptr ? VM_FAULT_MINOR : VM_FAULT_SIGBUS;
-   }
-
-   return pageptr;
+       struct vmxnet3_shm_pool *shm = vma->vm_private_data;
+       unsigned long idx = vmxnet3_shm_addr2idx(vma, address);
+       struct page *pageptr;
+
+       if (idx >= SHM_DATA_START && idx < SHM_DATA_START + SHM_DATA_SIZE)
+               pageptr = VMXNET3_SHM_IDX2PAGE(shm, idx - SHM_DATA_START);
+       else if (idx >= SHM_CTL_START && idx < SHM_CTL_START + SHM_CTL_SIZE)
+               pageptr = shm->ctl.pages[idx - SHM_CTL_START];
+       else
+               pageptr = NULL;
+
+       if (pageptr)
+               get_page(pageptr);
+
+       if (type)
+               *type = pageptr ? VM_FAULT_MINOR : VM_FAULT_SIGBUS;
+
+       return pageptr;
 }
 
 #else
@@ -785,26 +734,24 @@ vmxnet3_shm_chardev_nopage(struct vm_area_struct *vma,
 
 static struct page *
 vmxnet3_shm_chardev_nopage(struct vm_area_struct *vma,
-                           unsigned long address,
-                           int unused)
+               unsigned long address,
+               int unused)
 {
-   struct vmxnet3_shm_pool *shm = vma->vm_private_data;
-   unsigned long idx = vmxnet3_shm_addr2idx(vma, address);
-   struct page *pageptr;
-
-   if (idx >= SHM_DATA_START && idx < SHM_DATA_START + SHM_DATA_SIZE) {
-      pageptr = VMXNET3_SHM_IDX2PAGE(shm, idx - SHM_DATA_START);
-   } else if (idx >= SHM_CTL_START && idx < SHM_CTL_START + SHM_CTL_SIZE) {
-      pageptr = shm->ctl.pages[idx - SHM_CTL_START];
-   } else {
-      pageptr = NULL;
-   }
-
-   if (pageptr) {
-      get_page(pageptr);
-   }
-
-   return pageptr;
+       struct vmxnet3_shm_pool *shm = vma->vm_private_data;
+       unsigned long idx = vmxnet3_shm_addr2idx(vma, address);
+       struct page *pageptr;
+
+       if (idx >= SHM_DATA_START && idx < SHM_DATA_START + SHM_DATA_SIZE)
+               pageptr = VMXNET3_SHM_IDX2PAGE(shm, idx - SHM_DATA_START);
+       else if (idx >= SHM_CTL_START && idx < SHM_CTL_START + SHM_CTL_SIZE)
+               pageptr = shm->ctl.pages[idx - SHM_CTL_START];
+       else
+               pageptr = NULL;
+
+       if (pageptr)
+               get_page(pageptr);
+
+       return pageptr;
 }
 #endif
 
@@ -826,12 +773,12 @@ vmxnet3_shm_chardev_nopage(struct vm_area_struct *vma,
  */
 static int
 vmxnet3_shm_chardev_mmap(struct file *filp,
-                         struct vm_area_struct *vma)
+               struct vm_area_struct *vma)
 {
-   vma->vm_private_data = filp->private_data;
-   vma->vm_ops = &vmxnet3_shm_vm_ops;
-   vma->vm_flags |= VM_RESERVED;
-   return 0;
+       vma->vm_private_data = filp->private_data;
+       vma->vm_ops = &vmxnet3_shm_vm_ops;
+       vma->vm_flags |= VM_RESERVED;
+       return 0;
 }
 
 
@@ -854,35 +801,37 @@ vmxnet3_shm_chardev_mmap(struct file *filp,
 
 static unsigned int
 vmxnet3_shm_chardev_poll(struct file *filp,
-                         poll_table *wait)
+               poll_table *wait)
 {
-   struct vmxnet3_shm_pool *shm = filp->private_data;
-   unsigned int mask = 0;
-   unsigned long flags;
-   struct vmxnet3_shm_ringentry *re;
-
-   // consume TX queue
-   if (vmxnet3_shm_consume_user_tx_queue(shm) == -1) {
-      // the device has been closed, let the user space
-      // know there is activity, so that it gets a chance
-      // to read the channelBad flag.
-      mask |= POLLIN;
-      return mask;
-   }
-
-   // Wait on the rxq for an interrupt to wake us
-   poll_wait(filp, &shm->rxq, wait);
-
-   // Check if the user's current RX entry is full
-   spin_lock_irqsave(&shm->rx_lock, flags);
-   re = user_rx_entry(shm);
-   if (re->own) {
-      // XXX: We need a comment that explains what this does.
-      mask |= POLLIN | POLLRDNORM;
-   }
-   spin_unlock_irqrestore(&shm->rx_lock, flags);
-
-   return mask;
+       struct vmxnet3_shm_pool *shm = filp->private_data;
+       unsigned int mask = 0;
+       unsigned long flags;
+       struct vmxnet3_shm_ringentry *re;
+
+       /* consume TX queue */
+       if (vmxnet3_shm_consume_user_tx_queue(shm) == -1) {
+               /*
+                * The device has been closed, let the user space
+                * know there is activity, so that it gets a chance
+                * to read the channelBad flag.
+                */
+               mask |= POLLIN;
+               return mask;
+       }
+
+       /* Wait on the rxq for an interrupt to wake us */
+       poll_wait(filp, &shm->rxq, wait);
+
+       /* Check if the user's current RX entry is full */
+       spin_lock_irqsave(&shm->rx_lock, flags);
+       re = user_rx_entry(shm);
+       if (re->own)
+               /* XXX: We need a comment that explains what this does. */
+               mask |= POLLIN | POLLRDNORM;
+
+       spin_unlock_irqrestore(&shm->rx_lock, flags);
+
+       return mask;
 }
 
 
@@ -904,75 +853,75 @@ vmxnet3_shm_chardev_poll(struct file *filp,
 
 static long
 vmxnet3_shm_chardev_ioctl(struct file *filp,
-                          unsigned int cmd,
-                          unsigned long arg)
+               unsigned int cmd,
+               unsigned long arg)
 {
-   struct vmxnet3_shm_pool *shm = filp->private_data;
-   uint16 idx;
-   uint16 idx1;
-   int i;
-
-   switch(cmd) {
-
-      case SHM_IOCTL_TX:
-         vmxnet3_shm_consume_user_tx_queue(shm);
-         return 0;
-
-      case SHM_IOCTL_ALLOC_ONE:
-         idx = vmxnet3_shm_alloc_page(shm);
-         return idx;
-
-      case SHM_IOCTL_ALLOC_MANY:
-         for (i = 0; i < arg; i++) {
-            idx = vmxnet3_shm_alloc_page(shm);
-            if (idx != SHM_INVALID_IDX) {
-               if (vmxnet3_shm_user_rx(shm, idx, 0, 1, 1)) {
-                  vmxnet3_shm_free_page(shm, idx);
-                  return SHM_INVALID_IDX;
-               }
-            } else {
-               return SHM_INVALID_IDX;
-            }
-         }
-         return 0;
-
-      case SHM_IOCTL_ALLOC_ONE_AND_MANY:
-         idx1 = vmxnet3_shm_alloc_page(shm);
-         if (idx1 == SHM_INVALID_IDX) {
-            return SHM_INVALID_IDX;
-         }
-         for (i = 0; i < arg - 1; i++) {
-            idx = vmxnet3_shm_alloc_page(shm);
-            if (idx != SHM_INVALID_IDX) {
-               if (vmxnet3_shm_user_rx(shm, idx, 0, 1, 1)) {
-                  vmxnet3_shm_free_page(shm, idx);
-                  vmxnet3_shm_free_page(shm, idx1);
-                  return SHM_INVALID_IDX;
-               }
-            } else {
-               vmxnet3_shm_free_page(shm, idx1);
-               return SHM_INVALID_IDX;
-            }
-         }
-         return idx1;
-
-      case SHM_IOCTL_FREE_ONE:
-         if (arg != SHM_INVALID_IDX && arg < SHM_DATA_SIZE) {
-            vmxnet3_shm_free_page(shm, arg);
-         }
-         return 0;
-   }
-
-   return -ENOTTY;
+       struct vmxnet3_shm_pool *shm = filp->private_data;
+       u16 idx;
+       u16 idx1;
+       int i;
+
+       switch(cmd) {
+
+               case SHM_IOCTL_TX:
+                       vmxnet3_shm_consume_user_tx_queue(shm);
+                       return 0;
+
+               case SHM_IOCTL_ALLOC_ONE:
+                       idx = vmxnet3_shm_alloc_page(shm);
+                       return idx;
+
+               case SHM_IOCTL_ALLOC_MANY:
+                       for (i = 0; i < arg; i++) {
+                               idx = vmxnet3_shm_alloc_page(shm);
+                               if (idx != SHM_INVALID_IDX) {
+                                       if (vmxnet3_shm_user_rx(shm, idx, 0, 1, 1)) {
+                                               vmxnet3_shm_free_page(shm, idx);
+                                               return SHM_INVALID_IDX;
+                                       }
+                               } else {
+                                       return SHM_INVALID_IDX;
+                               }
+                       }
+                       return 0;
+
+               case SHM_IOCTL_ALLOC_ONE_AND_MANY:
+                       idx1 = vmxnet3_shm_alloc_page(shm);
+                       if (idx1 == SHM_INVALID_IDX)
+                               return SHM_INVALID_IDX;
+
+                       for (i = 0; i < arg - 1; i++) {
+                               idx = vmxnet3_shm_alloc_page(shm);
+                               if (idx != SHM_INVALID_IDX) {
+                                       if (vmxnet3_shm_user_rx(shm, idx, 0, 1, 1)) {
+                                               vmxnet3_shm_free_page(shm, idx);
+                                               vmxnet3_shm_free_page(shm, idx1);
+                                               return SHM_INVALID_IDX;
+                                       }
+                               } else {
+                                       vmxnet3_shm_free_page(shm, idx1);
+                                       return SHM_INVALID_IDX;
+                               }
+                       }
+                       return idx1;
+
+               case SHM_IOCTL_FREE_ONE:
+                       if (arg != SHM_INVALID_IDX && arg < SHM_DATA_SIZE)
+                               vmxnet3_shm_free_page(shm, arg);
+
+                       return 0;
+       }
+
+       return -ENOTTY;
 }
 
 #ifndef HAVE_UNLOCKED_IOCTL
 static int vmxnet3_shm_chardev_old_ioctl(struct inode *inode,
-                                         struct file *filp,
-                                         unsigned int cmd,
-                                         unsigned long arg)
+               struct file *filp,
+               unsigned int cmd,
+               unsigned long arg)
 {
-   return vmxnet3_shm_chardev_ioctl(filp, cmd, arg);
+       return vmxnet3_shm_chardev_ioctl(filp, cmd, arg);
 }
 #endif
 
@@ -996,21 +945,21 @@ static int vmxnet3_shm_chardev_old_ioctl(struct inode *inode,
 static struct vmxnet3_shm_pool *
 vmxnet3_shm_chardev_find_by_minor(unsigned int minor)
 {
-   struct vmxnet3_shm_pool *shm, *tmp;
-   unsigned long flags;
+       struct vmxnet3_shm_pool *shm, *tmp;
+       unsigned long flags;
 
-   spin_lock_irqsave(&vmxnet3_shm_list_lock, flags);
+       spin_lock_irqsave(&vmxnet3_shm_list_lock, flags);
 
-   list_for_each_entry_safe(shm, tmp, &vmxnet3_shm_list, list) {
-      if (shm->misc_dev.minor == minor && kobject_get(&shm->kobj)) {
-         spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
-         return shm;
-      }
-   }
+       list_for_each_entry_safe(shm, tmp, &vmxnet3_shm_list, list) {
+               if (shm->misc_dev.minor == minor && kobject_get(&shm->kobj)) {
+                       spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
+                       return shm;
+               }
+       }
 
-   spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
+       spin_unlock_irqrestore(&vmxnet3_shm_list_lock, flags);
 
-   return NULL;
+       return NULL;
 }
 
 
@@ -1033,20 +982,20 @@ vmxnet3_shm_chardev_find_by_minor(unsigned int minor)
 
 static int
 vmxnet3_shm_chardev_open(struct inode * inode,
-                         struct file * filp)
+               struct file * filp)
 {
-   // Stash pointer to shm in file so file ops can use it
-   filp->private_data = vmxnet3_shm_chardev_find_by_minor(iminor(inode));
-   if (filp->private_data == NULL) {
-      return -ENODEV;
-   }
+       /* Stash pointer to shm in file so file ops can use it */
+       filp->private_data = vmxnet3_shm_chardev_find_by_minor(iminor(inode));
+       if (filp->private_data == NULL)
+               return -ENODEV;
 
-   // XXX: What does this do??
+
+       /* XXX: What does this do?? */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-//   filp->f_mapping->backing_dev_info = &directly_mappable_cdev_bdi;
+       /*   filp->f_mapping->backing_dev_info = &directly_mappable_cdev_bdi; */
 #endif
 
-   return 0;
+       return 0;
 }
 
 
@@ -1069,24 +1018,24 @@ vmxnet3_shm_chardev_open(struct inode * inode,
 
 static int
 vmxnet3_shm_chardev_release(struct inode * inode,
-                            struct file * filp)
+               struct file * filp)
 {
-   struct vmxnet3_shm_pool *shm = filp->private_data;
-
-   if (shm->adapter) {
-      vmxnet3_shm_pool_reset(shm);
-   } else {
-      vmxnet3_shm_init_allocator(shm);
-      memset(shm->ctl.ptr, 0, PAGE_SIZE);
-   }
-   
-   kobject_put(&shm->kobj);
-
-   return 0;
+       struct vmxnet3_shm_pool *shm = filp->private_data;
+
+       if (shm->adapter) {
+               vmxnet3_shm_pool_reset(shm);
+       } else {
+               vmxnet3_shm_init_allocator(shm);
+               memset(shm->ctl.ptr, 0, PAGE_SIZE);
+       }
+
+       kobject_put(&shm->kobj);
+
+       return 0;
 }
 
 
-//// TX and RX
+/* TX and RX */
 
 /*
  *-----------------------------------------------------------------------------
@@ -1106,18 +1055,18 @@ vmxnet3_shm_chardev_release(struct inode * inode,
 
 void
 vmxnet3_free_skbpages(struct vmxnet3_adapter *adapter,
-                      struct sk_buff *skb)
+               struct sk_buff *skb)
 {
-   int i;
+       int i;
 
-   vmxnet3_shm_free_page(adapter->shm, VMXNET3_SHM_SKB_GETIDX(skb));
-   for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-      struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
+       vmxnet3_shm_free_page(adapter->shm, VMXNET3_SHM_SKB_GETIDX(skb));
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+               struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
 
-      vmxnet3_shm_free_page(adapter->shm, (unsigned long)frag->page);
-   }
+               vmxnet3_shm_free_page(adapter->shm, (unsigned long)frag->page);
+       }
 
-   skb_shinfo(skb)->nr_frags = 0;
+       skb_shinfo(skb)->nr_frags = 0;
 }
 
 
@@ -1141,10 +1090,10 @@ vmxnet3_free_skbpages(struct vmxnet3_adapter *adapter,
 
 int
 vmxnet3_shm_start_tx(struct sk_buff *skb,
-                     struct net_device *dev)
+               struct net_device *dev)
 {
-   compat_dev_kfree_skb_irq(skb, FREE_WRITE);
-   return COMPAT_NETDEV_TX_OK;
+       compat_dev_kfree_skb_irq(skb, FREE_WRITE);
+       return COMPAT_NETDEV_TX_OK;
 }
 
 
@@ -1166,52 +1115,51 @@ vmxnet3_shm_start_tx(struct sk_buff *skb,
  *-----------------------------------------------------------------------------
  */
 
-static inline int
+static int
 vmxnet3_shm_tx_pkt(struct vmxnet3_adapter *adapter,
-                   struct vmxnet3_shm_ringentry *res,
-                   int frags)
+               struct vmxnet3_shm_ringentry *res,
+               int frags)
 {
-   struct sk_buff* skb;
-   int i;
-
-   skb = dev_alloc_skb(100);
-   if (skb == NULL) {
-      for (i = 0; i < frags; i++) {
-         vmxnet3_shm_free_page(adapter->shm, res[i].idx);
-      }
-      VMXNET3_ASSERT(FALSE);
-      return -ENOMEM;
-   }
-
-   VMXNET3_SHM_SKB_SETIDX(skb, res[0].idx);
-   VMXNET3_SHM_SKB_SETLEN(skb, res[0].len);
-
-   for (i = 1; i < frags; i++) {
-      struct skb_frag_struct *frag = skb_shinfo(skb)->frags +
-                                     skb_shinfo(skb)->nr_frags;
-
-      VMXNET3_ASSERT(skb_shinfo(skb)->nr_frags < MAX_SKB_FRAGS);
-
-      frag->page = (struct page*)(unsigned long)res[i].idx;
-      frag->page_offset = 0;
-      frag->size = res[i].len;
-      skb_shinfo(skb)->nr_frags ++;
-   }
-
-   {
-      struct vmxnet3_tx_queue *tq = &adapter->tx_queue;
-      int ret;
-      skb->protocol = htons(ETH_P_IPV6);
-      adapter->shm->ctl.ptr->stats.kernel_tx += frags; // XXX: move to better place
-      ret = vmxnet3_shm_tq_xmit(skb, tq, adapter, adapter->netdev);
-      if (ret == COMPAT_NETDEV_TX_BUSY) {
-         vmxnet3_dev_kfree_skb(adapter, skb);
-      }
-
-      return ret;
-   }
-
-   return 0;
+       struct sk_buff* skb;
+       int i;
+
+       skb = dev_alloc_skb(100);
+       if (skb == NULL) {
+               for (i = 0; i < frags; i++)
+                       vmxnet3_shm_free_page(adapter->shm, res[i].idx);
+
+               BUG_ON(TRUE);
+               return -ENOMEM;
+       }
+
+       VMXNET3_SHM_SKB_SETIDX(skb, res[0].idx);
+       VMXNET3_SHM_SKB_SETLEN(skb, res[0].len);
+
+       for (i = 1; i < frags; i++) {
+               struct skb_frag_struct *frag = skb_shinfo(skb)->frags +
+                       skb_shinfo(skb)->nr_frags;
+
+               BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
+
+               frag->page = (struct page*)(unsigned long)res[i].idx;
+               frag->page_offset = 0;
+               frag->size = res[i].len;
+               skb_shinfo(skb)->nr_frags ++;
+       }
+
+       {
+               struct vmxnet3_tx_queue *tq = &adapter->tx_queue;
+               int ret;
+               skb->protocol = htons(ETH_P_IPV6);
+               adapter->shm->ctl.ptr->stats.kernel_tx += frags; /* XXX: move to better place */
+               ret = vmxnet3_shm_tq_xmit(skb, tq, adapter, adapter->netdev);
+               if (ret == COMPAT_NETDEV_TX_BUSY)
+                       vmxnet3_dev_kfree_skb(adapter, skb);
+
+               return ret;
+       }
+
+       return 0;
 }
 
 /*
@@ -1233,17 +1181,17 @@ vmxnet3_shm_tx_pkt(struct vmxnet3_adapter *adapter,
  */
 int
 vmxnet3_shm_tq_xmit(struct sk_buff *skb,
-                    struct vmxnet3_tx_queue *tq,
-                    struct vmxnet3_adapter *adapter,
-                    struct net_device *netdev)
+               struct vmxnet3_tx_queue *tq,
+               struct vmxnet3_adapter *adapter,
+               struct net_device *netdev)
 {
-   int ret = COMPAT_NETDEV_TX_BUSY;
-   compat_netif_tx_lock(netdev);
-   if (!netif_queue_stopped(netdev)) {
-      ret = vmxnet3_tq_xmit(skb, tq, adapter, netdev);
-   }
-   compat_netif_tx_unlock(netdev);
-   return ret;
+       int ret = COMPAT_NETDEV_TX_BUSY;
+       compat_netif_tx_lock(netdev);
+       if (!netif_queue_stopped(netdev))
+               ret = vmxnet3_tq_xmit(skb, tq, adapter, netdev);
+
+       compat_netif_tx_unlock(netdev);
+       return ret;
 }
 
 
@@ -1266,37 +1214,38 @@ vmxnet3_shm_tq_xmit(struct sk_buff *skb,
 
 static int
 vmxnet3_shm_tx_re(struct vmxnet3_shm_pool *shm,
-                  struct vmxnet3_shm_ringentry re)
+               struct vmxnet3_shm_ringentry re)
 {
-   int i;
-
-   VMXNET3_ASSERT(shm->partial_tx.frags <= VMXNET3_SHM_MAX_FRAGS);
-   if (shm->partial_tx.frags == VMXNET3_SHM_MAX_FRAGS) {
-      if (re.eop) {
-         printk("dropped oversize shm packet\n");
-         for (i = 0; i < shm->partial_tx.frags; i++) {
-            vmxnet3_shm_free_page(shm, shm->partial_tx.res[i].idx);
-         }
-         shm->partial_tx.frags = 0;
-      }
-      vmxnet3_shm_free_page(shm, re.idx);
-      return re.eop;
-   }
-
-   shm->partial_tx.res[shm->partial_tx.frags++] = re;
-
-   if (re.eop) {
-      int status = vmxnet3_shm_tx_pkt(shm->adapter,
-                                     shm->partial_tx.res,
-                                     shm->partial_tx.frags);
-      if (status < 0) {
-         VMXNET3_LOG("vmxnet3_shm_tx_pkt failed %d\n", status);
-      }
-      shm->partial_tx.frags = 0;
-      return 1;
-   }
-
-   return 0;
+       int i;
+
+       BUG_ON(shm->partial_tx.frags > VMXNET3_SHM_MAX_FRAGS);
+       if (shm->partial_tx.frags == VMXNET3_SHM_MAX_FRAGS) {
+               if (re.eop) {
+                       printk("dropped oversize shm packet\n");
+                       for (i = 0; i < shm->partial_tx.frags; i++)
+                               vmxnet3_shm_free_page(shm,
+                                               shm->partial_tx.res[i].idx);
+
+                       shm->partial_tx.frags = 0;
+               }
+               vmxnet3_shm_free_page(shm, re.idx);
+               return re.eop;
+       }
+
+       shm->partial_tx.res[shm->partial_tx.frags++] = re;
+
+       if (re.eop) {
+               int status = vmxnet3_shm_tx_pkt(shm->adapter,
+                               shm->partial_tx.res,
+                               shm->partial_tx.frags);
+               if (status < 0)
+                       printk(KERN_DEBUG "vmxnet3_shm_tx_pkt failed %d\n", status);
+
+               shm->partial_tx.frags = 0;
+               return 1;
+       }
+
+       return 0;
 }
 
 
@@ -1320,36 +1269,36 @@ vmxnet3_shm_tx_re(struct vmxnet3_shm_pool *shm,
 static int
 vmxnet3_shm_consume_user_tx_queue(struct vmxnet3_shm_pool *shm)
 {
-   unsigned long flags;
-   struct vmxnet3_shm_ringentry *re;
-
-   spin_lock_irqsave(&shm->tx_lock, flags);
-
-   // Check if the device has been closed
-   if (shm->adapter == NULL) {
-      spin_unlock_irqrestore(&shm->tx_lock, flags);
-      return -1;
-   }
-
-   /*
-    * Loop through each full entry in the user TX ring. Discard trash frags and
-    * add the others to the partial TX array. If an entry has eop set, TX the
-    * partial packet.
-    */
-   while ((re = kernel_tx_entry(shm))->own) {
-      if (re->trash) {
-         vmxnet3_shm_free_page(shm, re->idx);
-         shm->ctl.ptr->stats.kernel_tx++;
-      } else {
-         vmxnet3_shm_tx_re(shm, *re);
-      }
-      inc_kernel_tx_idx(shm);
-      *re = RE_ZERO;
-   }
-
-   spin_unlock_irqrestore(&shm->tx_lock, flags);
-
-   return 0;
+       unsigned long flags;
+       struct vmxnet3_shm_ringentry *re;
+
+       spin_lock_irqsave(&shm->tx_lock, flags);
+
+       /* Check if the device has been closed */
+       if (shm->adapter == NULL) {
+               spin_unlock_irqrestore(&shm->tx_lock, flags);
+               return -1;
+       }
+
+       /*
+        * Loop through each full entry in the user TX ring. Discard trash frags and
+        * add the others to the partial TX array. If an entry has eop set, TX the
+        * partial packet.
+        */
+       while ((re = kernel_tx_entry(shm))->own) {
+               if (re->trash) {
+                       vmxnet3_shm_free_page(shm, re->idx);
+                       shm->ctl.ptr->stats.kernel_tx++;
+               } else {
+                       vmxnet3_shm_tx_re(shm, *re);
+               }
+               inc_kernel_tx_idx(shm);
+               *re = RE_ZERO;
+       }
+
+       spin_unlock_irqrestore(&shm->tx_lock, flags);
+
+       return 0;
 }
 
 
@@ -1372,21 +1321,21 @@ vmxnet3_shm_consume_user_tx_queue(struct vmxnet3_shm_pool *shm)
 
 static int
 vmxnet3_shm_user_desc_available(struct vmxnet3_shm_pool *shm,
-                                uint16 num_entries)
+               u16 num_entries)
 {
-   struct vmxnet3_shm_ringentry *re;
-   uint16 reIdx = kernel_rx_idx(shm);
-
-   while (num_entries > 0) {
-      re = &shm->ctl.ptr->rx_ring[reIdx];
-      if (re->own) {
-         return -ENOMEM;
-      }
-      reIdx = (reIdx + 1) % SHM_RX_RING_SIZE;
-      num_entries--;
-   }
-
-   return 0;
+       struct vmxnet3_shm_ringentry *re;
+       u16 reIdx = kernel_rx_idx(shm);
+
+       while (num_entries > 0) {
+               re = &shm->ctl.ptr->rx_ring[reIdx];
+               if (re->own)
+                       return -ENOMEM;
+
+               reIdx = (reIdx + 1) % SHM_RX_RING_SIZE;
+               num_entries--;
+       }
+
+       return 0;
 }
 
 
@@ -1410,55 +1359,55 @@ vmxnet3_shm_user_desc_available(struct vmxnet3_shm_pool *shm,
 
 int
 vmxnet3_shm_rx_skb(struct vmxnet3_adapter *adapter,
-                   struct sk_buff *skb)
+               struct sk_buff *skb)
 {
-   int ret;
-   int i;
-   int num_entries = 1 + skb_shinfo(skb)->nr_frags;
-   int eop = (num_entries == 1);
-
-   if (vmxnet3_shm_user_desc_available(adapter->shm, num_entries) == -ENOMEM) {
-      vmxnet3_dev_kfree_skb_irq(adapter, skb);
-      return -ENOMEM;
-   }
-
-   ret = vmxnet3_shm_user_rx(adapter->shm,
-                            VMXNET3_SHM_SKB_GETIDX(skb),
-                            VMXNET3_SHM_SKB_GETLEN(skb),
-                            0 /* trash */,
-                            eop);
-   if (ret != 0) {
-      VMXNET3_ASSERT(FALSE);
-      printk(KERN_ERR "vmxnet3_shm_user_rx failed on frag 0\n");
-   }
-
-   for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-      struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
-      unsigned long shm_idx = (unsigned long)frag->page;
-
-      eop = (i == skb_shinfo(skb)->nr_frags - 1);
-
-      ret = vmxnet3_shm_user_rx(adapter->shm,
-                               shm_idx,
-                               frag->size,
-                               0 /* trash */,
-                               eop);
-      if (ret != 0) {
-         VMXNET3_ASSERT(FALSE);
-         printk(KERN_ERR "vmxnet3_shm_user_rx failed on frag 1+\n");
-      }
-   }
-
-
-   /*
-    * Do NOT use the vmxnet3 version of kfree_skb, as we handed
-    * ownership of shm pages to the user space, thus we must not
-    * free them again.
-    */
-   skb_shinfo(skb)->nr_frags = 0;
-   compat_dev_kfree_skb_irq(skb, FREE_WRITE);
-
-   return 0;
+       int ret;
+       int i;
+       int num_entries = 1 + skb_shinfo(skb)->nr_frags;
+       int eop = (num_entries == 1);
+
+       if (vmxnet3_shm_user_desc_available(adapter->shm, num_entries) == -ENOMEM) {
+               vmxnet3_dev_kfree_skb_irq(adapter, skb);
+               return -ENOMEM;
+       }
+
+       ret = vmxnet3_shm_user_rx(adapter->shm,
+                       VMXNET3_SHM_SKB_GETIDX(skb),
+                       VMXNET3_SHM_SKB_GETLEN(skb),
+                       0 /* trash */,
+                       eop);
+       if (ret != 0) {
+               BUG_ON(TRUE);
+               printk(KERN_ERR "vmxnet3_shm_user_rx failed on frag 0\n");
+       }
+
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+               struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
+               unsigned long shm_idx = (unsigned long)frag->page;
+
+               eop = (i == skb_shinfo(skb)->nr_frags - 1);
+
+               ret = vmxnet3_shm_user_rx(adapter->shm,
+                               shm_idx,
+                               frag->size,
+                               0 /* trash */,
+                               eop);
+               if (ret != 0) {
+                       BUG_ON(TRUE);
+                       printk(KERN_ERR "vmxnet3_shm_user_rx failed on frag 1+\n");
+               }
+       }
+
+
+       /*
+        * Do NOT use the vmxnet3 version of kfree_skb, as we handed
+        * ownership of shm pages to the user space, thus we must not
+        * free them again.
+        */
+       skb_shinfo(skb)->nr_frags = 0;
+       compat_dev_kfree_skb_irq(skb, FREE_WRITE);
+
+       return 0;
 }
 
 
@@ -1481,23 +1430,23 @@ vmxnet3_shm_rx_skb(struct vmxnet3_adapter *adapter,
 
 int
 vmxnet3_shm_user_rx(struct vmxnet3_shm_pool *shm,
-                    uint16 idx,
-                    uint16 len,
-                    int trash,
-                    int eop)
+               uint16 idx,
+               uint16 len,
+               int trash,
+               int eop)
 {
-   struct vmxnet3_shm_ringentry *re = kernel_rx_entry(shm);
-   shm->ctl.ptr->stats.kernel_rx++;
-   if (re->own) {
-      return -ENOMEM;
-   }
-   inc_kernel_rx_idx(shm);
-   re->idx = idx;
-   re->len = len;
-   re->trash = trash;
-   re->eop = eop;
-   re->own = TRUE;
-   return 0;
+       struct vmxnet3_shm_ringentry *re = kernel_rx_entry(shm);
+       shm->ctl.ptr->stats.kernel_rx++;
+       if (re->own)
+               return -ENOMEM;
+
+       inc_kernel_rx_idx(shm);
+       re->idx = idx;
+       re->len = len;
+       re->trash = trash;
+       re->eop = eop;
+       re->own = TRUE;
+       return 0;
 }
 
 
@@ -1521,14 +1470,14 @@ vmxnet3_shm_user_rx(struct vmxnet3_shm_pool *shm,
 
 int
 vmxnet3_shm_open(struct vmxnet3_adapter *adapter,
-                 char *name)
+               char *name)
 {
-   adapter->shm = vmxnet3_shm_pool_create(adapter, name);
-   if (adapter->shm == NULL) {
-      printk(KERN_ERR "failed to create shared memory pool\n");
-      return -ENOMEM;
-   }
-   return 0;
+       adapter->shm = vmxnet3_shm_pool_create(adapter, name);
+       if (adapter->shm == NULL) {
+               printk(KERN_ERR "failed to create shared memory pool\n");
+               return -ENOMEM;
+       }
+       return 0;
 }
 
 
@@ -1555,19 +1504,19 @@ vmxnet3_shm_open(struct vmxnet3_adapter *adapter,
 int
 vmxnet3_shm_close(struct vmxnet3_adapter *adapter)
 {
-   unsigned long flags;
+       unsigned long flags;
+
+       /* Can't unset the lp pointer if a TX is in progress */
+       spin_lock_irqsave(&adapter->shm->tx_lock, flags);
+       adapter->shm->adapter = NULL;
+       spin_unlock_irqrestore(&adapter->shm->tx_lock, flags);
+
+       /* Mark the channel as 'in bad state'  */
+       adapter->shm->ctl.ptr->channelBad = 1;
 
-   // Can't unset the lp pointer if a TX is in progress
-   spin_lock_irqsave(&adapter->shm->tx_lock, flags);
-   adapter->shm->adapter = NULL;
-   spin_unlock_irqrestore(&adapter->shm->tx_lock, flags);
+       kobject_put(&adapter->shm->kobj);
 
-   // Mark the channel as 'in bad state' 
-   adapter->shm->ctl.ptr->channelBad = 1;
-   
-   kobject_put(&adapter->shm->kobj);
-   
-   wake_up(&adapter->shm->rxq);
+       wake_up(&adapter->shm->rxq);
 
-   return 0;
+       return 0;
 }
index a6cf90e51583f052c041470cefa5f93c44df1d6f..bda62f959ab28177cd8b2bd34355bb4f354c8de0 100644 (file)
 
 struct vmxnet3_shm_mapped_page
 {
-   struct page *page;
-   void *virt;
+       struct page *page;
+       void *virt;
 };
 
 struct vmxnet3_shm_pool
 {
-   struct list_head list;
-   char name[IFNAMSIZ + 16];
-   struct kobject kobj;
-
-   struct
-   {
-      // pages backing the map in virtual address order
-      struct vmxnet3_shm_mapped_page pages[SHM_DATA_SIZE];
-      unsigned int num_pages;
-   } data;
-
-   struct
-   {
-      // pages backing the map in virtual address order
-      struct page *pages[SHM_CTL_SIZE];
-      struct vmxnet3_shm_ctl *ptr;
-   } ctl;
-
-   struct
-   {
-      /*
-       * This is a stack of free pages. count is the number of free pages, so
-       * count - 1 is the topmost free page.
-       */
-      uint16 count;
-      uint16 stack[SHM_DATA_SIZE];
-   } allocator;
-
-   struct
-   {
-      struct vmxnet3_shm_ringentry res[VMXNET3_SHM_MAX_FRAGS];
-      int frags;
-   } partial_tx;
-
-   struct miscdevice misc_dev;
-
-   wait_queue_head_t rxq;
-   spinlock_t alloc_lock, tx_lock, rx_lock;
-   struct vmxnet3_adapter *adapter;
+       struct list_head list;
+       char name[IFNAMSIZ + 16];
+       struct kobject kobj;
+
+       struct
+       {
+               /* pages backing the map in virtual address order */
+               struct vmxnet3_shm_mapped_page pages[SHM_DATA_SIZE];
+               unsigned int num_pages;
+       } data;
+
+       struct
+       {
+               /* pages backing the map in virtual address order */
+               struct page *pages[SHM_CTL_SIZE];
+               struct vmxnet3_shm_ctl *ptr;
+       } ctl;
+
+       struct
+       {
+               /*
+                * This is a stack of free pages. count is the number of free pages, so
+                * count - 1 is the topmost free page.
+                */
+               u16 count;
+               u16 stack[SHM_DATA_SIZE];
+       } allocator;
+
+       struct
+       {
+               struct vmxnet3_shm_ringentry res[VMXNET3_SHM_MAX_FRAGS];
+               int frags;
+       } partial_tx;
+
+       struct miscdevice misc_dev;
+
+       wait_queue_head_t rxq;
+       spinlock_t alloc_lock, tx_lock, rx_lock;
+       struct vmxnet3_adapter *adapter;
 };
 
-// Convert ring index to the struct page* or virt address.
+/* Convert ring index to the struct page* or virt address. */
 #define VMXNET3_SHM_IDX2PAGE(shm, idx) (shm->data.pages[(idx)].page)
 #define VMXNET3_SHM_SET_IDX2PAGE(shm, idx, x) (shm->data.pages[(idx)].page = (x))
 
@@ -98,15 +98,15 @@ int
 vmxnet3_shm_open(struct vmxnet3_adapter *adapter, char *name);
 int
 vmxnet3_shm_user_rx(struct vmxnet3_shm_pool *shm,
-                   uint16 idx, uint16 len,
-                   int trash, int eop);
+               u16 idx, u16 len,
+               int trash, int eop);
 void
 vmxnet3_free_skbpages(struct vmxnet3_adapter *adapter, struct sk_buff *skb);
 
-uint16
+u16
 vmxnet3_shm_alloc_page(struct vmxnet3_shm_pool *shm);
 void
-vmxnet3_shm_free_page(struct vmxnet3_shm_pool *shm, uint16 idx);
+vmxnet3_shm_free_page(struct vmxnet3_shm_pool *shm, u16 idx);
 
 int
 vmxnet3_shm_start_tx(struct sk_buff *skb, struct net_device *dev);
@@ -131,28 +131,28 @@ vmxnet3_shm_rx_skb(struct vmxnet3_adapter *adapter, struct sk_buff *skb);
 static inline void
 vmxnet3_dev_kfree_skb(struct vmxnet3_adapter *adapter, struct sk_buff *skb)
 {
-   if (adapter->is_shm) {
-      vmxnet3_free_skbpages(adapter, skb);
-   }
-   compat_dev_kfree_skb(skb, FREE_WRITE);
+       if (adapter->is_shm)
+               vmxnet3_free_skbpages(adapter, skb);
+
+       compat_dev_kfree_skb(skb, FREE_WRITE);
 }
 
 static inline void
 vmxnet3_dev_kfree_skb_any(struct vmxnet3_adapter *adapter, struct sk_buff *skb)
 {
-   if (adapter->is_shm) {
-      vmxnet3_free_skbpages(adapter, skb);
-   }
-   compat_dev_kfree_skb_any(skb, FREE_WRITE);
+       if (adapter->is_shm)
+               vmxnet3_free_skbpages(adapter, skb);
+
+       compat_dev_kfree_skb_any(skb, FREE_WRITE);
 }
 
 static inline void
 vmxnet3_dev_kfree_skb_irq(struct vmxnet3_adapter *adapter, struct sk_buff *skb)
 {
-   if (adapter->is_shm) {
-      vmxnet3_free_skbpages(adapter, skb);
-   }
-   compat_dev_kfree_skb_irq(skb, FREE_WRITE);
+       if (adapter->is_shm)
+               vmxnet3_free_skbpages(adapter, skb);
+
+       compat_dev_kfree_skb_irq(skb, FREE_WRITE);
 }
 
 /*
@@ -173,49 +173,49 @@ vmxnet3_dev_kfree_skb_irq(struct vmxnet3_adapter *adapter, struct sk_buff *skb)
 static inline unsigned int
 vmxnet3_skb_headlen(struct vmxnet3_adapter *adapter, struct sk_buff *skb)
 {
-   if (adapter->is_shm) {
-      return VMXNET3_SHM_SKB_GETLEN(skb);
-   } else {
-      return compat_skb_headlen(skb);
-   }
+       if (adapter->is_shm)
+               return VMXNET3_SHM_SKB_GETLEN(skb);
+       else
+               return compat_skb_headlen(skb);
+
 }
 
 static inline void
 vmxnet3_skb_put(struct vmxnet3_adapter *adapter, struct sk_buff *skb, unsigned int len)
 {
-   if (!adapter->is_shm) {
-      skb_put(skb, len);
-   } else {
-      unsigned int oldlen = VMXNET3_SHM_SKB_GETLEN(skb);
-      VMXNET3_SHM_SKB_SETLEN(skb, len + oldlen);
-   }
+       if (!adapter->is_shm) {
+               skb_put(skb, len);
+       } else {
+               unsigned int oldlen = VMXNET3_SHM_SKB_GETLEN(skb);
+               VMXNET3_SHM_SKB_SETLEN(skb, len + oldlen);
+       }
 }
 
 static inline struct sk_buff*
 vmxnet3_dev_alloc_skb(struct vmxnet3_adapter *adapter, unsigned long length)
 {
-   if (adapter->is_shm) {
-      int idx;
-      struct sk_buff* skb;
-      idx = vmxnet3_shm_alloc_page(adapter->shm);
-      if (idx == SHM_INVALID_IDX) {
-         return NULL;
-      }
-
-      // The length is arbitrary because that memory shouldn't be used
-      skb = dev_alloc_skb(100);
-      if (skb == NULL) {
-         vmxnet3_shm_free_page(adapter->shm, idx);
-         return NULL;
-      }
-
-      VMXNET3_SHM_SKB_SETIDX(skb, idx);
-      VMXNET3_SHM_SKB_SETLEN(skb, 0);
-
-      return skb;
-   } else {
-      return dev_alloc_skb(length);
-   }
+       if (adapter->is_shm) {
+               int idx;
+               struct sk_buff* skb;
+               idx = vmxnet3_shm_alloc_page(adapter->shm);
+               if (idx == SHM_INVALID_IDX)
+                       return NULL;
+
+
+               /* The length is arbitrary because that memory shouldn't be used */
+               skb = dev_alloc_skb(100);
+               if (skb == NULL) {
+                       vmxnet3_shm_free_page(adapter->shm, idx);
+                       return NULL;
+               }
+
+               VMXNET3_SHM_SKB_SETIDX(skb, idx);
+               VMXNET3_SHM_SKB_SETLEN(skb, 0);
+
+               return skb;
+       } else {
+               return dev_alloc_skb(length);
+       }
 }
 
 /*
@@ -235,45 +235,45 @@ vmxnet3_dev_alloc_skb(struct vmxnet3_adapter *adapter, unsigned long length)
  */
 static inline dma_addr_t
 vmxnet3_map_single(struct vmxnet3_adapter *adapter,
-                   struct sk_buff * skb,
-                   size_t offset,
-                   size_t len,
-                   int direction)
+               struct sk_buff * skb,
+               size_t offset,
+               size_t len,
+               int direction)
 {
-   if (adapter->is_shm) {
-      unsigned long shm_idx = VMXNET3_SHM_SKB_GETIDX(skb);
-      struct page *real_page = VMXNET3_SHM_IDX2PAGE(adapter->shm, shm_idx);
-      return pci_map_page(adapter->pdev,
-                          real_page,
-                          offset,
-                          len,
-                          direction);
-   } else {
-      return pci_map_single(adapter->pdev,
-                            skb->data + offset,
-                            len,
-                            direction);
-   }
+       if (adapter->is_shm) {
+               unsigned long shm_idx = VMXNET3_SHM_SKB_GETIDX(skb);
+               struct page *real_page = VMXNET3_SHM_IDX2PAGE(adapter->shm, shm_idx);
+               return pci_map_page(adapter->pdev,
+                               real_page,
+                               offset,
+                               len,
+                               direction);
+       } else {
+               return pci_map_single(adapter->pdev,
+                               skb->data + offset,
+                               len,
+                               direction);
+       }
 
 }
 
 static inline dma_addr_t
 vmxnet3_map_page(struct vmxnet3_adapter *adapter,
-                 struct page *page,
-                 size_t offset,
-                 size_t len,
-                 int direction)
+               struct page *page,
+               size_t offset,
+               size_t len,
+               int direction)
 {
-   if (adapter->is_shm) {
-      unsigned long shm_idx = (unsigned long)page;
-      page = VMXNET3_SHM_IDX2PAGE(adapter->shm, shm_idx);
-   }
-
-   return pci_map_page(adapter->pdev,
-                       page,
-                       offset,
-                       len,
-                       direction);
+       if (adapter->is_shm) {
+               unsigned long shm_idx = (unsigned long)page;
+               page = VMXNET3_SHM_IDX2PAGE(adapter->shm, shm_idx);
+       }
+
+       return pci_map_page(adapter->pdev,
+                       page,
+                       offset,
+                       len,
+                       direction);
 }
 
 /*
@@ -294,23 +294,22 @@ vmxnet3_map_page(struct vmxnet3_adapter *adapter,
  */
 static inline void
 vmxnet3_put_page(struct vmxnet3_adapter *adapter,
-                 struct page *page)
+               struct page *page)
 {
-   if (!adapter->is_shm) {
-      put_page(page);
-   } else {
-      vmxnet3_shm_free_page(adapter->shm, (unsigned long)page);
-   }
+       if (!adapter->is_shm)
+               put_page(page);
+       else
+               vmxnet3_shm_free_page(adapter->shm, (unsigned long)page);
 }
 
 static inline void *
 vmxnet3_alloc_page(struct vmxnet3_adapter *adapter)
 {
-   if (adapter->is_shm) {
-      return (void*) (unsigned long) vmxnet3_shm_alloc_page(adapter->shm);
-   } else {
-      return alloc_page(GFP_ATOMIC);
-   }
+       if (adapter->is_shm)
+               return (void*) (unsigned long) vmxnet3_shm_alloc_page(adapter->shm);
+       else
+               return alloc_page(GFP_ATOMIC);
+
 }