3 files changed, 10 insertions, 12 deletions

diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 6b41c884a337..26cde573af43 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -1884,17 +1884,13 @@ void __vxge_hw_mempool_destroy(struct vxge_hw_mempool *mempool)
                                 mempool->memblock_size, dma_object);
         }
 
-        if (mempool->items_arr)
-                vfree(mempool->items_arr);
+        vfree(mempool->items_arr);
 
-        if (mempool->memblocks_dma_arr)
-                vfree(mempool->memblocks_dma_arr);
+        vfree(mempool->memblocks_dma_arr);
 
-        if (mempool->memblocks_priv_arr)
-                vfree(mempool->memblocks_priv_arr);
+        vfree(mempool->memblocks_priv_arr);
 
-        if (mempool->memblocks_arr)
-                vfree(mempool->memblocks_arr);
+        vfree(mempool->memblocks_arr);
 
         vfree(mempool);
 }
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index b7f08f3e524b..6c838b3e063a 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -677,7 +677,7 @@ vxge_xmit_compl(struct __vxge_hw_fifo *fifo_hw, void *dtr,
         return VXGE_HW_OK;
 }
 
-/* select a vpath to trasmit the packet */
+/* select a vpath to transmit the packet */
 static u32 vxge_get_vpath_no(struct vxgedev *vdev, struct sk_buff *skb,
         int *do_lock)
 {
@@ -992,7 +992,9 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
                                         VXGE_HW_FIFO_TXD_TX_CKO_UDP_EN);
 
         vxge_hw_fifo_txdl_post(fifo_hw, dtr);
-        dev->trans_start = jiffies;
+#ifdef NETIF_F_LLTX
+        dev->trans_start = jiffies; /* NETIF_F_LLTX driver :( */
+#endif
         spin_unlock_irqrestore(&fifo->tx_lock, flags);
 
         VXGE_COMPLETE_VPATH_TX(fifo);
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index c2eeac4125f3..370f55cbbad7 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -1923,7 +1923,7 @@ enum vxge_hw_status __vxge_hw_vpath_alarm_process(
         if (vpath == NULL) {
                 alarm_event = VXGE_HW_SET_LEVEL(VXGE_HW_EVENT_UNKNOWN,
                         alarm_event);
-                goto out;
+                goto out2;
         }
 
         hldev = vpath->hldev;
@@ -2161,7 +2161,7 @@ enum vxge_hw_status __vxge_hw_vpath_alarm_process(
         }
 out:
         hldev->stats.sw_dev_err_stats.vpath_alarms++;
-
+out2:
         if ((alarm_event == VXGE_HW_EVENT_ALARM_CLEARED) ||
                 (alarm_event == VXGE_HW_EVENT_UNKNOWN))
                 return VXGE_HW_OK;