Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

8 files changed, 247 insertions, 217 deletions

diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index a21a25d218b6..297f0d202073 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -183,8 +183,6 @@ __vxge_hw_device_pci_e_init(struct __vxge_hw_device *hldev)
         pci_write_config_word(hldev->pdev, PCI_COMMAND, cmd);
 
         pci_save_state(hldev->pdev);
-
-        return;
 }
 
 /*
@@ -342,8 +340,6 @@ void __vxge_hw_device_id_get(struct __vxge_hw_device *hldev)
 
         hldev->minor_revision =
                 (u8)VXGE_HW_TITAN_ASIC_ID_GET_INITIAL_MINOR_REVISION(val64);
-
-        return;
 }
 
 /*
@@ -357,8 +353,10 @@ __vxge_hw_device_access_rights_get(u32 host_type, u32 func_id)
 
         switch (host_type) {
         case VXGE_HW_NO_MR_NO_SR_NORMAL_FUNCTION:
-                access_rights |= VXGE_HW_DEVICE_ACCESS_RIGHT_MRPCIM |
-                                VXGE_HW_DEVICE_ACCESS_RIGHT_SRPCIM;
+                if (func_id == 0) {
+                        access_rights |= VXGE_HW_DEVICE_ACCESS_RIGHT_MRPCIM |
+                                        VXGE_HW_DEVICE_ACCESS_RIGHT_SRPCIM;
+                }
                 break;
         case VXGE_HW_MR_NO_SR_VH0_BASE_FUNCTION:
                 access_rights |= VXGE_HW_DEVICE_ACCESS_RIGHT_MRPCIM |
@@ -426,8 +424,6 @@ void __vxge_hw_device_host_info_get(struct __vxge_hw_device *hldev)
                 hldev->first_vp_id = i;
                 break;
         }
-
-        return;
 }
 
 /*
@@ -633,8 +629,10 @@ vxge_hw_device_initialize(
         __vxge_hw_device_pci_e_init(hldev);
 
         status = __vxge_hw_device_reg_addr_get(hldev);
-        if (status != VXGE_HW_OK)
+        if (status != VXGE_HW_OK) {
+                vfree(hldev);
                 goto exit;
+        }
         __vxge_hw_device_id_get(hldev);
 
         __vxge_hw_device_host_info_get(hldev);
@@ -1213,19 +1211,16 @@ __vxge_hw_ring_mempool_item_alloc(struct vxge_hw_mempool *mempoolh,
                 /* link this RxD block with previous one */
                 __vxge_hw_ring_rxdblock_link(mempoolh, ring, index - 1, index);
         }
-
-        return;
 }
 
 /*
- * __vxge_hw_ring_initial_replenish - Initial replenish of RxDs
+ * __vxge_hw_ring_replenish - Initial replenish of RxDs
  * This function replenishes the RxDs from reserve array to work array
  */
 enum vxge_hw_status
-vxge_hw_ring_replenish(struct __vxge_hw_ring *ring, u16 min_flag)
+vxge_hw_ring_replenish(struct __vxge_hw_ring *ring)
 {
         void *rxd;
-        int i = 0;
         struct __vxge_hw_channel *channel;
         enum vxge_hw_status status = VXGE_HW_OK;
 
@@ -1246,11 +1241,6 @@ vxge_hw_ring_replenish(struct __vxge_hw_ring *ring, u16 min_flag)
                 }
 
                 vxge_hw_ring_rxd_post(ring, rxd);
-                if (min_flag) {
-                        i++;
-                        if (i == VXGE_HW_RING_MIN_BUFF_ALLOCATION)
-                                break;
-                }
         }
         status = VXGE_HW_OK;
 exit:
@@ -1355,7 +1345,7 @@ __vxge_hw_ring_create(struct __vxge_hw_vpath_handle *vp,
          * Currently we don't have a case when the 1) is done without the 2).
          */
         if (ring->rxd_init) {
-                status = vxge_hw_ring_replenish(ring, 1);
+                status = vxge_hw_ring_replenish(ring);
                 if (status != VXGE_HW_OK) {
                         __vxge_hw_ring_delete(vp);
                         goto exit;
@@ -1417,7 +1407,7 @@ enum vxge_hw_status __vxge_hw_ring_reset(struct __vxge_hw_ring *ring)
                 goto exit;
 
         if (ring->rxd_init) {
-                status = vxge_hw_ring_replenish(ring, 1);
+                status = vxge_hw_ring_replenish(ring);
                 if (status != VXGE_HW_OK)
                         goto exit;
         }
@@ -2320,8 +2310,6 @@ __vxge_hw_fifo_mempool_item_alloc(
         txdl_priv->first_txdp = txdp;
         txdl_priv->next_txdl_priv = NULL;
         txdl_priv->alloc_frags = 0;
-
-        return;
 }
 
 /*
@@ -2578,7 +2566,6 @@ __vxge_hw_read_rts_ds(struct vxge_hw_vpath_reg __iomem *vpath_reg,
         writeq(dta_struct_sel, &vpath_reg->rts_access_steer_data0);
         writeq(0, &vpath_reg->rts_access_steer_data1);
         wmb();
-        return;
 }
 
 
@@ -3486,7 +3473,6 @@ __vxge_hw_vpath_prc_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                 val64 &= ~VXGE_HW_PRC_CFG4_RTH_DISABLE;
 
         writeq(val64, &vp_reg->prc_cfg4);
-        return;
 }
 
 /*
@@ -3905,7 +3891,6 @@ vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id)
                         &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
                 }
         }
-        return;
 }
 /*
  * __vxge_hw_vpath_initialize
@@ -5039,8 +5024,6 @@ __vxge_hw_blockpool_free(struct __vxge_hw_device *devh,
                 if (status == VXGE_HW_OK)
                         __vxge_hw_blockpool_blocks_remove(blockpool);
         }
-
-        return;
 }
 
 /*
@@ -5096,6 +5079,4 @@ __vxge_hw_blockpool_block_free(struct __vxge_hw_device *devh,
         }
 
         __vxge_hw_blockpool_blocks_remove(blockpool);
-
-        return;
 }
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index 13f5416307f8..4ae2625d4d8f 100644
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -765,10 +765,18 @@ struct vxge_hw_device_hw_info {
 #define VXGE_HW_SR_VH_VIRTUAL_FUNCTION                          6
 #define VXGE_HW_VH_NORMAL_FUNCTION                              7
         u64             function_mode;
-#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION                    0
-#define VXGE_HW_FUNCTION_MODE_SINGLE_FUNCTION                   1
+#define VXGE_HW_FUNCTION_MODE_SINGLE_FUNCTION                   0
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION                    1
 #define VXGE_HW_FUNCTION_MODE_SRIOV                             2
 #define VXGE_HW_FUNCTION_MODE_MRIOV                             3
+#define VXGE_HW_FUNCTION_MODE_MRIOV_8                           4
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_17                 5
+#define VXGE_HW_FUNCTION_MODE_SRIOV_8                           6
+#define VXGE_HW_FUNCTION_MODE_SRIOV_4                           7
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_2                  8
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_4                  9
+#define VXGE_HW_FUNCTION_MODE_MRIOV_4                           10
+
         u32             func_id;
         u64             vpath_mask;
         struct vxge_hw_device_version fw_version;
@@ -1915,20 +1923,32 @@ static inline void *vxge_os_dma_malloc(struct pci_dev *pdev,
         gfp_t flags;
         void *vaddr;
         unsigned long misaligned = 0;
+        int realloc_flag = 0;
         *p_dma_acch = *p_dmah = NULL;
 
         if (in_interrupt())
                 flags = GFP_ATOMIC | GFP_DMA;
         else
                 flags = GFP_KERNEL | GFP_DMA;
-
-        size += VXGE_CACHE_LINE_SIZE;
-
+realloc:
         vaddr = kmalloc((size), flags);
         if (vaddr == NULL)
                 return vaddr;
-        misaligned = (unsigned long)VXGE_ALIGN(*((u64 *)&vaddr),
+        misaligned = (unsigned long)VXGE_ALIGN((unsigned long)vaddr,
                                 VXGE_CACHE_LINE_SIZE);
+        if (realloc_flag)
+                goto out;
+
+        if (misaligned) {
+                /* misaligned, free current one and try allocating
+                 * size + VXGE_CACHE_LINE_SIZE memory
+                 */
+                kfree((void *) vaddr);
+                size += VXGE_CACHE_LINE_SIZE;
+                realloc_flag = 1;
+                goto realloc;
+        }
+out:
         *(unsigned long *)p_dma_acch = misaligned;
         vaddr = (void *)((u8 *)vaddr + misaligned);
         return vaddr;
@@ -2254,4 +2274,6 @@ enum vxge_hw_status vxge_hw_vpath_rts_rth_set(
         struct vxge_hw_rth_hash_types *hash_type,
         u16 bucket_size);
 
+enum vxge_hw_status
+__vxge_hw_device_is_privilaged(u32 host_type, u32 func_id);
 #endif
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c
index aaf374cfd322..cadef8549c06 100644
--- a/drivers/net/vxge/vxge-ethtool.c
+++ b/drivers/net/vxge/vxge-ethtool.c
@@ -109,7 +109,7 @@ static void vxge_ethtool_gregs(struct net_device *dev,
         int index, offset;
         enum vxge_hw_status status;
         u64 reg;
-        u8 *reg_space = (u8 *) space;
+        u64 *reg_space = (u64 *) space;
         struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev);
         struct __vxge_hw_device  *hldev = (struct __vxge_hw_device *)
                                         pci_get_drvdata(vdev->pdev);
@@ -129,8 +129,7 @@ static void vxge_ethtool_gregs(struct net_device *dev,
                                                 __func__, __LINE__);
                                 return;
                         }
-
-                        memcpy((reg_space + offset), &reg, 8);
+                        *reg_space++ = reg;
                 }
         }
 }
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index ba6d0da78c30..b504bd561362 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -445,7 +445,7 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
                 ring->ndev->name, __func__, __LINE__);
         ring->pkts_processed = 0;
 
-        vxge_hw_ring_replenish(ringh, 0);
+        vxge_hw_ring_replenish(ringh);
 
         do {
                 prefetch((char *)dtr + L1_CACHE_BYTES);
@@ -1118,7 +1118,7 @@ vxge_tx_term(void *dtrh, enum vxge_hw_txdl_state state, void *userdata)
  */
 static void vxge_set_multicast(struct net_device *dev)
 {
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         struct vxgedev *vdev;
         int i, mcast_cnt = 0;
         struct __vxge_hw_device  *hldev;
@@ -1218,8 +1218,8 @@ static void vxge_set_multicast(struct net_device *dev)
                 }
 
                 /* Add new ones */
-                netdev_for_each_mc_addr(mclist, dev) {
-                        memcpy(mac_info.macaddr, mclist->dmi_addr, ETH_ALEN);
+                netdev_for_each_mc_addr(ha, dev) {
+                        memcpy(mac_info.macaddr, ha->addr, ETH_ALEN);
                         for (vpath_idx = 0; vpath_idx < vdev->no_of_vpath;
                                         vpath_idx++) {
                                 mac_info.vpath_no = vpath_idx;
@@ -1364,28 +1364,26 @@ static int vxge_set_mac_addr(struct net_device *dev, void *p)
 void vxge_vpath_intr_enable(struct vxgedev *vdev, int vp_id)
 {
         struct vxge_vpath *vpath = &vdev->vpaths[vp_id];
-        int msix_id, alarm_msix_id;
-        int tim_msix_id[4] = {[0 ...3] = 0};
+        int msix_id = 0;
+        int tim_msix_id[4] = {0, 1, 0, 0};
+        int alarm_msix_id = VXGE_ALARM_MSIX_ID;
 
         vxge_hw_vpath_intr_enable(vpath->handle);
 
         if (vdev->config.intr_type == INTA)
                 vxge_hw_vpath_inta_unmask_tx_rx(vpath->handle);
         else {
-                msix_id = vp_id * VXGE_HW_VPATH_MSIX_ACTIVE;
-                alarm_msix_id =
-                        VXGE_HW_VPATH_MSIX_ACTIVE * vdev->no_of_vpath - 2;
-
-                tim_msix_id[0] = msix_id;
-                tim_msix_id[1] = msix_id + 1;
                 vxge_hw_vpath_msix_set(vpath->handle, tim_msix_id,
                         alarm_msix_id);
 
+                msix_id = vpath->device_id * VXGE_HW_VPATH_MSIX_ACTIVE;
                 vxge_hw_vpath_msix_unmask(vpath->handle, msix_id);
                 vxge_hw_vpath_msix_unmask(vpath->handle, msix_id + 1);
 
                 /* enable the alarm vector */
-                vxge_hw_vpath_msix_unmask(vpath->handle, alarm_msix_id);
+                msix_id = (vpath->handle->vpath->hldev->first_vp_id *
+                        VXGE_HW_VPATH_MSIX_ACTIVE) + alarm_msix_id;
+                vxge_hw_vpath_msix_unmask(vpath->handle, msix_id);
         }
 }
 
@@ -1406,12 +1404,13 @@ void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id)
         if (vdev->config.intr_type == INTA)
                 vxge_hw_vpath_inta_mask_tx_rx(vpath->handle);
         else {
-                msix_id = vp_id * VXGE_HW_VPATH_MSIX_ACTIVE;
+                msix_id = vpath->device_id * VXGE_HW_VPATH_MSIX_ACTIVE;
                 vxge_hw_vpath_msix_mask(vpath->handle, msix_id);
                 vxge_hw_vpath_msix_mask(vpath->handle, msix_id + 1);
 
                 /* disable the alarm vector */
-                msix_id = VXGE_HW_VPATH_MSIX_ACTIVE * vdev->no_of_vpath - 2;
+                msix_id = (vpath->handle->vpath->hldev->first_vp_id *
+                        VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID;
                 vxge_hw_vpath_msix_mask(vpath->handle, msix_id);
         }
 }
@@ -1765,7 +1764,6 @@ static void vxge_netpoll(struct net_device *dev)
 
         vxge_debug_entryexit(VXGE_TRACE,
                 "%s:%d  Exiting...", __func__, __LINE__);
-        return;
 }
 #endif
 
@@ -2224,19 +2222,18 @@ vxge_alarm_msix_handle(int irq, void *dev_id)
         enum vxge_hw_status status;
         struct vxge_vpath *vpath = (struct vxge_vpath *)dev_id;
         struct vxgedev *vdev = vpath->vdev;
-        int alarm_msix_id =
-                VXGE_HW_VPATH_MSIX_ACTIVE * vdev->no_of_vpath - 2;
+        int msix_id = (vpath->handle->vpath->vp_id *
+                VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID;
 
         for (i = 0; i < vdev->no_of_vpath; i++) {
-                vxge_hw_vpath_msix_mask(vdev->vpaths[i].handle,
-                        alarm_msix_id);
+                vxge_hw_vpath_msix_mask(vdev->vpaths[i].handle, msix_id);
 
                 status = vxge_hw_vpath_alarm_process(vdev->vpaths[i].handle,
                         vdev->exec_mode);
                 if (status == VXGE_HW_OK) {
 
                         vxge_hw_vpath_msix_unmask(vdev->vpaths[i].handle,
-                                alarm_msix_id);
+                                        msix_id);
                         continue;
                 }
                 vxge_debug_intr(VXGE_ERR,
@@ -2249,18 +2246,17 @@ vxge_alarm_msix_handle(int irq, void *dev_id)
 static int vxge_alloc_msix(struct vxgedev *vdev)
 {
         int j, i, ret = 0;
-        int intr_cnt = 0;
-        int alarm_msix_id = 0, msix_intr_vect = 0;
+        int msix_intr_vect = 0, temp;
         vdev->intr_cnt = 0;
 
+start:
         /* Tx/Rx MSIX Vectors count */
         vdev->intr_cnt = vdev->no_of_vpath * 2;
 
         /* Alarm MSIX Vectors count */
         vdev->intr_cnt++;
 
-        intr_cnt = (vdev->max_vpath_supported * 2) + 1;
-        vdev->entries = kzalloc(intr_cnt * sizeof(struct msix_entry),
+        vdev->entries = kzalloc(vdev->intr_cnt * sizeof(struct msix_entry),
                                                 GFP_KERNEL);
         if (!vdev->entries) {
                 vxge_debug_init(VXGE_ERR,
@@ -2269,8 +2265,9 @@ static int vxge_alloc_msix(struct vxgedev *vdev)
                 return  -ENOMEM;
         }
 
-        vdev->vxge_entries = kzalloc(intr_cnt * sizeof(struct vxge_msix_entry),
-                                                        GFP_KERNEL);
+        vdev->vxge_entries =
+                kzalloc(vdev->intr_cnt * sizeof(struct vxge_msix_entry),
+                                GFP_KERNEL);
         if (!vdev->vxge_entries) {
                 vxge_debug_init(VXGE_ERR, "%s: memory allocation failed",
                         VXGE_DRIVER_NAME);
@@ -2278,9 +2275,7 @@ static int vxge_alloc_msix(struct vxgedev *vdev)
                 return -ENOMEM;
         }
 
-        /* Last vector in the list is used for alarm */
-        alarm_msix_id = VXGE_HW_VPATH_MSIX_ACTIVE * vdev->no_of_vpath - 2;
-        for (i = 0, j = 0; i < vdev->max_vpath_supported; i++) {
+        for (i = 0, j = 0; i < vdev->no_of_vpath; i++) {
 
                 msix_intr_vect = i * VXGE_HW_VPATH_MSIX_ACTIVE;
 
@@ -2298,47 +2293,31 @@ static int vxge_alloc_msix(struct vxgedev *vdev)
         }
 
         /* Initialize the alarm vector */
-        vdev->entries[j].entry = alarm_msix_id;
-        vdev->vxge_entries[j].entry = alarm_msix_id;
+        vdev->entries[j].entry = VXGE_ALARM_MSIX_ID;
+        vdev->vxge_entries[j].entry = VXGE_ALARM_MSIX_ID;
         vdev->vxge_entries[j].in_use = 0;
 
-        ret = pci_enable_msix(vdev->pdev, vdev->entries, intr_cnt);
-        /* if driver request exceeeds available irq's, request with a small
-         * number.
-        */
-        if (ret > 0) {
-                vxge_debug_init(VXGE_ERR,
-                        "%s: MSI-X enable failed for %d vectors, available: %d",
-                        VXGE_DRIVER_NAME, intr_cnt, ret);
-                vdev->max_vpath_supported = vdev->no_of_vpath;
-                intr_cnt = (vdev->max_vpath_supported * 2) + 1;
-
-                /* Reset the alarm vector setting */
-                vdev->entries[j].entry = 0;
-                vdev->vxge_entries[j].entry = 0;
-
-                /* Initialize the alarm vector with new setting */
-                vdev->entries[intr_cnt - 1].entry = alarm_msix_id;
-                vdev->vxge_entries[intr_cnt - 1].entry = alarm_msix_id;
-                vdev->vxge_entries[intr_cnt - 1].in_use = 0;
-
-                ret = pci_enable_msix(vdev->pdev, vdev->entries, intr_cnt);
-                if (!ret)
-                        vxge_debug_init(VXGE_ERR,
-                                "%s: MSI-X enabled for %d vectors",
-                                VXGE_DRIVER_NAME, intr_cnt);
-        }
+        ret = pci_enable_msix(vdev->pdev, vdev->entries, vdev->intr_cnt);
 
-        if (ret) {
+        if (ret > 0) {
                 vxge_debug_init(VXGE_ERR,
                         "%s: MSI-X enable failed for %d vectors, ret: %d",
-                        VXGE_DRIVER_NAME, intr_cnt, ret);
+                        VXGE_DRIVER_NAME, vdev->intr_cnt, ret);
                 kfree(vdev->entries);
                 kfree(vdev->vxge_entries);
                 vdev->entries = NULL;
                 vdev->vxge_entries = NULL;
+
+                if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3))
+                        return -ENODEV;
+                /* Try with less no of vector by reducing no of vpaths count */
+                temp = (ret - 1)/2;
+                vxge_close_vpaths(vdev, temp);
+                vdev->no_of_vpath = temp;
+                goto start;
+        } else if (ret < 0)
                 return -ENODEV;
-        }
+
         return 0;
 }
 
@@ -2346,43 +2325,26 @@ static int vxge_enable_msix(struct vxgedev *vdev)
 {
 
         int i, ret = 0;
-        enum vxge_hw_status status;
         /* 0 - Tx, 1 - Rx  */
-        int tim_msix_id[4];
-        int alarm_msix_id = 0, msix_intr_vect = 0;
+        int tim_msix_id[4] = {0, 1, 0, 0};
+
         vdev->intr_cnt = 0;
 
         /* allocate msix vectors */
         ret = vxge_alloc_msix(vdev);
         if (!ret) {
-                /* Last vector in the list is used for alarm */
-                alarm_msix_id =
-                        VXGE_HW_VPATH_MSIX_ACTIVE * vdev->no_of_vpath - 2;
                 for (i = 0; i < vdev->no_of_vpath; i++) {
 
                         /* If fifo or ring are not enabled
                            the MSIX vector for that should be set to 0
                            Hence initializeing this array to all 0s.
                         */
-                        memset(tim_msix_id, 0, sizeof(tim_msix_id));
-                        msix_intr_vect = i * VXGE_HW_VPATH_MSIX_ACTIVE;
-                        tim_msix_id[0] = msix_intr_vect;
-
-                        tim_msix_id[1] = msix_intr_vect + 1;
-                        vdev->vpaths[i].ring.rx_vector_no = tim_msix_id[1];
+                        vdev->vpaths[i].ring.rx_vector_no =
+                                (vdev->vpaths[i].device_id *
+                                        VXGE_HW_VPATH_MSIX_ACTIVE) + 1;
 
-                        status = vxge_hw_vpath_msix_set(
-                                                vdev->vpaths[i].handle,
-                                                tim_msix_id, alarm_msix_id);
-                        if (status != VXGE_HW_OK) {
-                                vxge_debug_init(VXGE_ERR,
-                                        "vxge_hw_vpath_msix_set "
-                                        "failed with status : %x", status);
-                                kfree(vdev->entries);
-                                kfree(vdev->vxge_entries);
-                                pci_disable_msix(vdev->pdev);
-                                return -ENODEV;
-                        }
+                        vxge_hw_vpath_msix_set(vdev->vpaths[i].handle,
+                                        tim_msix_id, VXGE_ALARM_MSIX_ID);
                 }
         }
 
@@ -2393,7 +2355,7 @@ static void vxge_rem_msix_isr(struct vxgedev *vdev)
 {
         int intr_cnt;
 
-        for (intr_cnt = 0; intr_cnt < (vdev->max_vpath_supported * 2 + 1);
+        for (intr_cnt = 0; intr_cnt < (vdev->no_of_vpath * 2 + 1);
                 intr_cnt++) {
                 if (vdev->vxge_entries[intr_cnt].in_use) {
                         synchronize_irq(vdev->entries[intr_cnt].vector);
@@ -2458,9 +2420,10 @@ static int vxge_add_isr(struct vxgedev *vdev)
                         switch (msix_idx) {
                         case 0:
                                 snprintf(vdev->desc[intr_cnt], VXGE_INTR_STRLEN,
-                                        "%s:vxge fn: %d vpath: %d Tx MSI-X: %d",
-                                        vdev->ndev->name, pci_fun, vp_idx,
-                                        vdev->entries[intr_cnt].entry);
+                                "%s:vxge:MSI-X %d - Tx - fn:%d vpath:%d",
+                                        vdev->ndev->name,
+                                        vdev->entries[intr_cnt].entry,
+                                        pci_fun, vp_idx);
                                 ret = request_irq(
                                     vdev->entries[intr_cnt].vector,
                                         vxge_tx_msix_handle, 0,
@@ -2472,9 +2435,10 @@ static int vxge_add_isr(struct vxgedev *vdev)
                                 break;
                         case 1:
                                 snprintf(vdev->desc[intr_cnt], VXGE_INTR_STRLEN,
-                                        "%s:vxge fn: %d vpath: %d Rx MSI-X: %d",
-                                        vdev->ndev->name, pci_fun, vp_idx,
-                                        vdev->entries[intr_cnt].entry);
+                                "%s:vxge:MSI-X %d - Rx - fn:%d vpath:%d",
+                                        vdev->ndev->name,
+                                        vdev->entries[intr_cnt].entry,
+                                        pci_fun, vp_idx);
                                 ret = request_irq(
                                     vdev->entries[intr_cnt].vector,
                                         vxge_rx_msix_napi_handle,
@@ -2502,9 +2466,11 @@ static int vxge_add_isr(struct vxgedev *vdev)
                         if (irq_req) {
                                 /* We requested for this msix interrupt */
                                 vdev->vxge_entries[intr_cnt].in_use = 1;
+                                msix_idx +=  vdev->vpaths[vp_idx].device_id *
+                                        VXGE_HW_VPATH_MSIX_ACTIVE;
                                 vxge_hw_vpath_msix_unmask(
                                         vdev->vpaths[vp_idx].handle,
-                                        intr_idx);
+                                        msix_idx);
                                 intr_cnt++;
                         }
 
@@ -2514,16 +2480,17 @@ static int vxge_add_isr(struct vxgedev *vdev)
                                 vp_idx++;
                 }
 
-                intr_cnt = vdev->max_vpath_supported * 2;
+                intr_cnt = vdev->no_of_vpath * 2;
                 snprintf(vdev->desc[intr_cnt], VXGE_INTR_STRLEN,
-                        "%s:vxge Alarm fn: %d MSI-X: %d",
-                        vdev->ndev->name, pci_fun,
-                        vdev->entries[intr_cnt].entry);
+                        "%s:vxge:MSI-X %d - Alarm - fn:%d",
+                        vdev->ndev->name,
+                        vdev->entries[intr_cnt].entry,
+                        pci_fun);
                 /* For Alarm interrupts */
                 ret = request_irq(vdev->entries[intr_cnt].vector,
                                         vxge_alarm_msix_handle, 0,
                                         vdev->desc[intr_cnt],
-                                        &vdev->vpaths[vp_idx]);
+                                        &vdev->vpaths[0]);
                 if (ret) {
                         vxge_debug_init(VXGE_ERR,
                                 "%s: MSIX - %d Registration failed",
@@ -2536,16 +2503,19 @@ static int vxge_add_isr(struct vxgedev *vdev)
                                 goto INTA_MODE;
                 }
 
+                msix_idx = (vdev->vpaths[0].handle->vpath->vp_id *
+                        VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID;
                 vxge_hw_vpath_msix_unmask(vdev->vpaths[vp_idx].handle,
-                                        intr_idx - 2);
+                                        msix_idx);
                 vdev->vxge_entries[intr_cnt].in_use = 1;
-                vdev->vxge_entries[intr_cnt].arg = &vdev->vpaths[vp_idx];
+                vdev->vxge_entries[intr_cnt].arg = &vdev->vpaths[0];
         }
 INTA_MODE:
 #endif
-        snprintf(vdev->desc[0], VXGE_INTR_STRLEN, "%s:vxge", vdev->ndev->name);
 
         if (vdev->config.intr_type == INTA) {
+                snprintf(vdev->desc[0], VXGE_INTR_STRLEN,
+                        "%s:vxge:INTA", vdev->ndev->name);
                 vxge_hw_device_set_intr_type(vdev->devh,
                         VXGE_HW_INTR_MODE_IRQLINE);
                 vxge_hw_vpath_tti_ci_set(vdev->devh,
@@ -2844,7 +2814,6 @@ static void vxge_napi_del_all(struct vxgedev *vdev)
                 for (i = 0; i < vdev->no_of_vpath; i++)
                         netif_napi_del(&vdev->vpaths[i].ring.napi);
         }
-        return;
 }
 
 int do_vxge_close(struct net_device *dev, int do_io)
@@ -3529,8 +3498,6 @@ static void verify_bandwidth(void)
                 for (i = 1; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++)
                         bw_percentage[i] = bw_percentage[0];
         }
-
-        return;
 }
 
 /*
@@ -3995,6 +3962,36 @@ static void vxge_io_resume(struct pci_dev *pdev)
         netif_device_attach(netdev);
 }
 
+static inline u32 vxge_get_num_vfs(u64 function_mode)
+{
+        u32 num_functions = 0;
+
+        switch (function_mode) {
+        case VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION:
+        case VXGE_HW_FUNCTION_MODE_SRIOV_8:
+                num_functions = 8;
+                break;
+        case VXGE_HW_FUNCTION_MODE_SINGLE_FUNCTION:
+                num_functions = 1;
+                break;
+        case VXGE_HW_FUNCTION_MODE_SRIOV:
+        case VXGE_HW_FUNCTION_MODE_MRIOV:
+        case VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_17:
+                num_functions = 17;
+                break;
+        case VXGE_HW_FUNCTION_MODE_SRIOV_4:
+                num_functions = 4;
+                break;
+        case VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_2:
+                num_functions = 2;
+                break;
+        case VXGE_HW_FUNCTION_MODE_MRIOV_8:
+                num_functions = 8; /* TODO */
+                break;
+        }
+        return num_functions;
+}
+
 /**
  * vxge_probe
  * @pdev : structure containing the PCI related information of the device.
@@ -4022,14 +4019,19 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         u8 *macaddr;
         struct vxge_mac_addrs *entry;
         static int bus = -1, device = -1;
+        u32 host_type;
         u8 new_device = 0;
+        enum vxge_hw_status is_privileged;
+        u32 function_mode;
+        u32 num_vfs = 0;
 
         vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
         attr.pdev = pdev;
 
-        if (bus != pdev->bus->number)
-                new_device = 1;
-        if (device != PCI_SLOT(pdev->devfn))
+        /* In SRIOV-17 mode, functions of the same adapter
+         * can be deployed on different buses */
+        if ((!pdev->is_virtfn) && ((bus != pdev->bus->number) ||
+                (device != PCI_SLOT(pdev->devfn))))
                 new_device = 1;
 
         bus = pdev->bus->number;
@@ -4046,9 +4048,11 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                                 driver_config->total_dev_cnt);
                 driver_config->config_dev_cnt = 0;
                 driver_config->total_dev_cnt = 0;
-                driver_config->g_no_cpus = 0;
         }
-
+        /* Now making the CPU based no of vpath calculation
+         * applicable for individual functions as well.
+         */
+        driver_config->g_no_cpus = 0;
         driver_config->vpath_per_dev = max_config_vpath;
 
         driver_config->total_dev_cnt++;
@@ -4161,6 +4165,11 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 "%s:%d  Vpath mask = %llx", __func__, __LINE__,
                 (unsigned long long)vpath_mask);
 
+        function_mode = ll_config.device_hw_info.function_mode;
+        host_type = ll_config.device_hw_info.host_type;
+        is_privileged = __vxge_hw_device_is_privilaged(host_type,
+                ll_config.device_hw_info.func_id);
+
         /* Check how many vpaths are available */
         for (i = 0; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++) {
                 if (!((vpath_mask) & vxge_mBIT(i)))
@@ -4168,14 +4177,18 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 max_vpath_supported++;
         }
 
+        if (new_device)
+                num_vfs = vxge_get_num_vfs(function_mode) - 1;
+
         /* Enable SRIOV mode, if firmware has SRIOV support and if it is a PF */
-        if ((VXGE_HW_FUNCTION_MODE_SRIOV ==
-                ll_config.device_hw_info.function_mode) &&
-                (max_config_dev > 1) && (pdev->is_physfn)) {
-                        ret = pci_enable_sriov(pdev, max_config_dev - 1);
-                        if (ret)
-                                vxge_debug_ll_config(VXGE_ERR,
-                                        "Failed to enable SRIOV: %d \n", ret);
+        if (is_sriov(function_mode) && (max_config_dev > 1) &&
+                (ll_config.intr_type != INTA) &&
+                (is_privileged == VXGE_HW_OK)) {
+                ret = pci_enable_sriov(pdev, ((max_config_dev - 1) < num_vfs)
+                        ? (max_config_dev - 1) : num_vfs);
+                if (ret)
+                        vxge_debug_ll_config(VXGE_ERR,
+                                "Failed in enabling SRIOV mode: %d\n", ret);
         }
 
         /*
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h
index 7c83ba4be9d7..60276b20fa5e 100644
--- a/drivers/net/vxge/vxge-main.h
+++ b/drivers/net/vxge/vxge-main.h
@@ -31,6 +31,7 @@
 #define PCI_DEVICE_ID_TITAN_UNI         0x5833
 #define VXGE_USE_DEFAULT                0xffffffff
 #define VXGE_HW_VPATH_MSIX_ACTIVE       4
+#define VXGE_ALARM_MSIX_ID              2
 #define VXGE_HW_RXSYNC_FREQ_CNT         4
 #define VXGE_LL_WATCH_DOG_TIMEOUT       (15 * HZ)
 #define VXGE_LL_RX_COPY_THRESHOLD       256
@@ -89,6 +90,11 @@
 
 #define VXGE_LL_MAX_FRAME_SIZE(dev) ((dev)->mtu + VXGE_HW_MAC_HEADER_MAX_SIZE)
 
+#define is_sriov(function_mode) \
+        ((function_mode == VXGE_HW_FUNCTION_MODE_SRIOV) || \
+        (function_mode == VXGE_HW_FUNCTION_MODE_SRIOV_8) || \
+        (function_mode == VXGE_HW_FUNCTION_MODE_SRIOV_4))
+
 enum vxge_reset_event {
         /* reset events */
         VXGE_LL_VPATH_RESET     = 0,
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index 2c012f4ce465..6cc1dd79b40b 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -231,11 +231,8 @@ void vxge_hw_channel_msix_mask(struct __vxge_hw_channel *channel, int msix_id)
 {
 
         __vxge_hw_pio_mem_write32_upper(
-                (u32)vxge_bVALn(vxge_mBIT(channel->first_vp_id+(msix_id/4)),
-                        0, 32),
+                (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                 &channel->common_reg->set_msix_mask_vect[msix_id%4]);
-
-        return;
 }
 
 /**
@@ -252,11 +249,8 @@ vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channel, int msix_id)
 {
 
         __vxge_hw_pio_mem_write32_upper(
-                (u32)vxge_bVALn(vxge_mBIT(channel->first_vp_id+(msix_id/4)),
-                        0, 32),
+                (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                 &channel->common_reg->clear_msix_mask_vect[msix_id%4]);
-
-        return;
 }
 
 /**
@@ -331,8 +325,6 @@ void vxge_hw_device_intr_enable(struct __vxge_hw_device *hldev)
         val64 = readq(&hldev->common_reg->titan_general_int_status);
 
         vxge_hw_device_unmask_all(hldev);
-
-        return;
 }
 
 /**
@@ -364,8 +356,6 @@ void vxge_hw_device_intr_disable(struct __vxge_hw_device *hldev)
                 vxge_hw_vpath_intr_disable(
                         VXGE_HW_VIRTUAL_PATH_HANDLE(&hldev->virtual_paths[i]));
         }
-
-        return;
 }
 
 /**
@@ -385,8 +375,6 @@ void vxge_hw_device_mask_all(struct __vxge_hw_device *hldev)
 
         __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32),
                                 &hldev->common_reg->titan_mask_all_int);
-
-        return;
 }
 
 /**
@@ -406,8 +394,6 @@ void vxge_hw_device_unmask_all(struct __vxge_hw_device *hldev)
 
         __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32),
                         &hldev->common_reg->titan_mask_all_int);
-
-        return;
 }
 
 /**
@@ -649,8 +635,6 @@ void vxge_hw_device_clear_tx_rx(struct __vxge_hw_device *hldev)
                                  hldev->tim_int_mask1[VXGE_HW_VPATH_INTR_RX]),
                                 &hldev->common_reg->tim_int_status1);
         }
-
-        return;
 }
 
 /*
@@ -878,7 +862,7 @@ void vxge_hw_ring_rxd_post_post(struct __vxge_hw_ring *ring, void *rxdh)
 
         channel = &ring->channel;
 
-        rxdp->control_0 |= VXGE_HW_RING_RXD_LIST_OWN_ADAPTER;
+        rxdp->control_0 = VXGE_HW_RING_RXD_LIST_OWN_ADAPTER;
 
         if (ring->stats->common_stats.usage_cnt > 0)
                 ring->stats->common_stats.usage_cnt--;
@@ -902,7 +886,7 @@ void vxge_hw_ring_rxd_post(struct __vxge_hw_ring *ring, void *rxdh)
         channel = &ring->channel;
 
         wmb();
-        rxdp->control_0 |= VXGE_HW_RING_RXD_LIST_OWN_ADAPTER;
+        rxdp->control_0 = VXGE_HW_RING_RXD_LIST_OWN_ADAPTER;
 
         vxge_hw_channel_dtr_post(channel, rxdh);
 
@@ -966,6 +950,7 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed(
         struct __vxge_hw_channel *channel;
         struct vxge_hw_ring_rxd_1 *rxdp;
         enum vxge_hw_status status = VXGE_HW_OK;
+        u64 control_0, own;
 
         channel = &ring->channel;
 
@@ -977,8 +962,12 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed(
                 goto exit;
         }
 
+        control_0 = rxdp->control_0;
+        own = control_0 & VXGE_HW_RING_RXD_LIST_OWN_ADAPTER;
+        *t_code = (u8)VXGE_HW_RING_RXD_T_CODE_GET(control_0);
+
         /* check whether it is not the end */
-        if (!(rxdp->control_0 & VXGE_HW_RING_RXD_LIST_OWN_ADAPTER)) {
+        if (!own || ((*t_code == VXGE_HW_RING_T_CODE_FRM_DROP) && own)) {
 
                 vxge_assert(((struct vxge_hw_ring_rxd_1 *)rxdp)->host_control !=
                                 0);
@@ -986,8 +975,6 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed(
                 ++ring->cmpl_cnt;
                 vxge_hw_channel_dtr_complete(channel);
 
-                *t_code = (u8)VXGE_HW_RING_RXD_T_CODE_GET(rxdp->control_0);
-
                 vxge_assert(*t_code != VXGE_HW_RING_RXD_T_CODE_UNUSED);
 
                 ring->stats->common_stats.usage_cnt++;
@@ -1035,12 +1022,13 @@ enum vxge_hw_status vxge_hw_ring_handle_tcode(
          * such as unknown UPV6 header), Drop it !!!
          */
 
-        if (t_code == 0 || t_code == 5) {
+        if (t_code ==  VXGE_HW_RING_T_CODE_OK ||
+                t_code == VXGE_HW_RING_T_CODE_L3_PKT_ERR) {
                 status = VXGE_HW_OK;
                 goto exit;
         }
 
-        if (t_code > 0xF) {
+        if (t_code > VXGE_HW_RING_T_CODE_MULTI_ERR) {
                 status = VXGE_HW_ERR_INVALID_TCODE;
                 goto exit;
         }
@@ -2216,29 +2204,24 @@ exit:
  * This API will associate a given MSIX vector numbers with the four TIM
  * interrupts and alarm interrupt.
  */
-enum vxge_hw_status
+void
 vxge_hw_vpath_msix_set(struct __vxge_hw_vpath_handle *vp, int *tim_msix_id,
                        int alarm_msix_id)
 {
         u64 val64;
         struct __vxge_hw_virtualpath *vpath = vp->vpath;
         struct vxge_hw_vpath_reg __iomem *vp_reg = vpath->vp_reg;
-        u32 first_vp_id = vpath->hldev->first_vp_id;
+        u32 vp_id = vp->vpath->vp_id;
 
         val64 =  VXGE_HW_INTERRUPT_CFG0_GROUP0_MSIX_FOR_TXTI(
-                  (first_vp_id * 4) + tim_msix_id[0]) |
+                  (vp_id * 4) + tim_msix_id[0]) |
                  VXGE_HW_INTERRUPT_CFG0_GROUP1_MSIX_FOR_TXTI(
-                  (first_vp_id * 4) + tim_msix_id[1]) |
-                 VXGE_HW_INTERRUPT_CFG0_GROUP2_MSIX_FOR_TXTI(
-                        (first_vp_id * 4) + tim_msix_id[2]);
-
-                val64 |= VXGE_HW_INTERRUPT_CFG0_GROUP3_MSIX_FOR_TXTI(
-                        (first_vp_id * 4) + tim_msix_id[3]);
+                  (vp_id * 4) + tim_msix_id[1]);
 
         writeq(val64, &vp_reg->interrupt_cfg0);
 
         writeq(VXGE_HW_INTERRUPT_CFG2_ALARM_MAP_TO_MSG(
-                        (first_vp_id * 4) + alarm_msix_id),
+                        (vpath->hldev->first_vp_id * 4) + alarm_msix_id),
                         &vp_reg->interrupt_cfg2);
 
         if (vpath->hldev->config.intr_mode ==
@@ -2258,8 +2241,6 @@ vxge_hw_vpath_msix_set(struct __vxge_hw_vpath_handle *vp, int *tim_msix_id,
                                 VXGE_HW_ONE_SHOT_VECT3_EN_ONE_SHOT_VECT3_EN,
                                 0, 32), &vp_reg->one_shot_vect3_en);
         }
-
-        return VXGE_HW_OK;
 }
 
 /**
@@ -2279,11 +2260,8 @@ vxge_hw_vpath_msix_mask(struct __vxge_hw_vpath_handle *vp, int msix_id)
 {
         struct __vxge_hw_device *hldev = vp->vpath->hldev;
         __vxge_hw_pio_mem_write32_upper(
-                (u32) vxge_bVALn(vxge_mBIT(hldev->first_vp_id +
-                        (msix_id  / 4)), 0, 32),
+                (u32) vxge_bVALn(vxge_mBIT(msix_id  >> 2), 0, 32),
                 &hldev->common_reg->set_msix_mask_vect[msix_id % 4]);
-
-        return;
 }
 
 /**
@@ -2305,19 +2283,15 @@ vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id)
         if (hldev->config.intr_mode ==
                         VXGE_HW_INTR_MODE_MSIX_ONE_SHOT) {
                 __vxge_hw_pio_mem_write32_upper(
-                        (u32)vxge_bVALn(vxge_mBIT(hldev->first_vp_id +
-                                (msix_id/4)), 0, 32),
+                        (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                                 &hldev->common_reg->
                                         clr_msix_one_shot_vec[msix_id%4]);
         } else {
                 __vxge_hw_pio_mem_write32_upper(
-                        (u32)vxge_bVALn(vxge_mBIT(hldev->first_vp_id +
-                                (msix_id/4)), 0, 32),
+                        (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                                 &hldev->common_reg->
                                         clear_msix_mask_vect[msix_id%4]);
         }
-
-        return;
 }
 
 /**
@@ -2337,11 +2311,8 @@ vxge_hw_vpath_msix_unmask(struct __vxge_hw_vpath_handle *vp, int msix_id)
 {
         struct __vxge_hw_device *hldev = vp->vpath->hldev;
         __vxge_hw_pio_mem_write32_upper(
-                        (u32)vxge_bVALn(vxge_mBIT(hldev->first_vp_id +
-                        (msix_id/4)), 0, 32),
+                        (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                         &hldev->common_reg->clear_msix_mask_vect[msix_id%4]);
-
-        return;
 }
 
 /**
@@ -2358,8 +2329,6 @@ vxge_hw_vpath_msix_mask_all(struct __vxge_hw_vpath_handle *vp)
         __vxge_hw_pio_mem_write32_upper(
                 (u32)vxge_bVALn(vxge_mBIT(vp->vpath->vp_id), 0, 32),
                 &vp->vpath->hldev->common_reg->set_msix_mask_all_vect);
-
-        return;
 }
 
 /**
@@ -2398,8 +2367,6 @@ void vxge_hw_vpath_inta_mask_tx_rx(struct __vxge_hw_vpath_handle *vp)
                         tim_int_mask1[VXGE_HW_VPATH_INTR_RX] | val64),
                         &hldev->common_reg->tim_int_mask1);
         }
-
-        return;
 }
 
 /**
@@ -2436,8 +2403,6 @@ void vxge_hw_vpath_inta_unmask_tx_rx(struct __vxge_hw_vpath_handle *vp)
                           tim_int_mask1[VXGE_HW_VPATH_INTR_RX])) & val64,
                         &hldev->common_reg->tim_int_mask1);
         }
-
-        return;
 }
 
 /**
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
index 861c853e3e84..c252f3d3f650 100644
--- a/drivers/net/vxge/vxge-traffic.h
+++ b/drivers/net/vxge/vxge-traffic.h
@@ -1866,6 +1866,51 @@ struct vxge_hw_ring_rxd_info {
         u32     rth_hash_type;
         u32     rth_value;
 };
+/**
+ * enum vxge_hw_ring_tcode - Transfer codes returned by adapter
+ * @VXGE_HW_RING_T_CODE_OK: Transfer ok.
+ * @VXGE_HW_RING_T_CODE_L3_CKSUM_MISMATCH: Layer 3 checksum presentation
+ *              configuration mismatch.
+ * @VXGE_HW_RING_T_CODE_L4_CKSUM_MISMATCH: Layer 4 checksum presentation
+ *              configuration mismatch.
+ * @VXGE_HW_RING_T_CODE_L3_L4_CKSUM_MISMATCH: Layer 3 and Layer 4 checksum
+ *              presentation configuration mismatch.
+ * @VXGE_HW_RING_T_CODE_L3_PKT_ERR: Layer 3 error unparseable packet,
+ *              such as unknown IPv6 header.
+ * @VXGE_HW_RING_T_CODE_L2_FRM_ERR: Layer 2 error frame integrity
+ *              error, such as FCS or ECC).
+ * @VXGE_HW_RING_T_CODE_BUF_SIZE_ERR: Buffer size error the RxD buffer(
+ *              s) were not appropriately sized and data loss occurred.
+ * @VXGE_HW_RING_T_CODE_INT_ECC_ERR: Internal ECC error RxD corrupted.
+ * @VXGE_HW_RING_T_CODE_BENIGN_OVFLOW: Benign overflow the contents of
+ *              Segment1 exceeded the capacity of Buffer1 and the remainder
+ *              was placed in Buffer2. Segment2 now starts in Buffer3.
+ *              No data loss or errors occurred.
+ * @VXGE_HW_RING_T_CODE_ZERO_LEN_BUFF: Buffer size 0 one of the RxDs
+ *              assigned buffers has a size of 0 bytes.
+ * @VXGE_HW_RING_T_CODE_FRM_DROP: Frame dropped either due to
+ *              VPath Reset or because of a VPIN mismatch.
+ * @VXGE_HW_RING_T_CODE_UNUSED: Unused
+ * @VXGE_HW_RING_T_CODE_MULTI_ERR: Multiple errors more than one
+ *              transfer code condition occurred.
+ *
+ * Transfer codes returned by adapter.
+ */
+enum vxge_hw_ring_tcode {
+        VXGE_HW_RING_T_CODE_OK                          = 0x0,
+        VXGE_HW_RING_T_CODE_L3_CKSUM_MISMATCH           = 0x1,
+        VXGE_HW_RING_T_CODE_L4_CKSUM_MISMATCH           = 0x2,
+        VXGE_HW_RING_T_CODE_L3_L4_CKSUM_MISMATCH        = 0x3,
+        VXGE_HW_RING_T_CODE_L3_PKT_ERR                  = 0x5,
+        VXGE_HW_RING_T_CODE_L2_FRM_ERR                  = 0x6,
+        VXGE_HW_RING_T_CODE_BUF_SIZE_ERR                = 0x7,
+        VXGE_HW_RING_T_CODE_INT_ECC_ERR                 = 0x8,
+        VXGE_HW_RING_T_CODE_BENIGN_OVFLOW               = 0x9,
+        VXGE_HW_RING_T_CODE_ZERO_LEN_BUFF               = 0xA,
+        VXGE_HW_RING_T_CODE_FRM_DROP                    = 0xC,
+        VXGE_HW_RING_T_CODE_UNUSED                      = 0xE,
+        VXGE_HW_RING_T_CODE_MULTI_ERR                   = 0xF
+};
 
 /**
  * enum enum vxge_hw_ring_hash_type - RTH hash types
@@ -1910,7 +1955,7 @@ vxge_hw_ring_rxd_post_post(
         void *rxdh);
 
 enum vxge_hw_status
-vxge_hw_ring_replenish(struct __vxge_hw_ring *ring_handle, u16 min_flag);
+vxge_hw_ring_replenish(struct __vxge_hw_ring *ring_handle);
 
 void
 vxge_hw_ring_rxd_post_post_wmb(
@@ -2042,7 +2087,6 @@ void vxge_hw_fifo_txdl_free(
 
 #define VXGE_HW_RING_NEXT_BLOCK_POINTER_OFFSET  (VXGE_HW_BLOCK_SIZE-8)
 #define VXGE_HW_RING_MEMBLOCK_IDX_OFFSET                (VXGE_HW_BLOCK_SIZE-16)
-#define VXGE_HW_RING_MIN_BUFF_ALLOCATION                64
 
 /*
  * struct __vxge_hw_ring_rxd_priv - Receive descriptor HW-private data.
@@ -2332,7 +2376,7 @@ enum vxge_hw_status vxge_hw_vpath_alarm_process(
         struct __vxge_hw_vpath_handle *vpath_handle,
         u32 skip_alarms);
 
-enum vxge_hw_status
+void
 vxge_hw_vpath_msix_set(struct __vxge_hw_vpath_handle *vpath_handle,
                        int *tim_msix_id, int alarm_msix_id);
 
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/vxge/vxge-version.h
index 77c2a754b7b8..5da7ab1fd307 100644
--- a/drivers/net/vxge/vxge-version.h
+++ b/drivers/net/vxge/vxge-version.h
@@ -17,7 +17,7 @@
 
 #define VXGE_VERSION_MAJOR      "2"
 #define VXGE_VERSION_MINOR      "0"
-#define VXGE_VERSION_FIX        "6"
-#define VXGE_VERSION_BUILD      "18937"
+#define VXGE_VERSION_FIX        "8"
+#define VXGE_VERSION_BUILD      "20182"
 #define VXGE_VERSION_FOR        "k"
 #endif