1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 3da680073265..fa4bb940665c 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1568,6 +1568,8 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
                 lpar_rc = send_subcrq_indirect(adapter, handle_array[queue_num],
                                                (u64)tx_buff->indir_dma,
                                                (u64)num_entries);
+                dma_unmap_single(dev, tx_buff->indir_dma,
+                                 sizeof(tx_buff->indir_arr), DMA_TO_DEVICE);
         } else {
                 tx_buff->num_entries = num_entries;
                 lpar_rc = send_subcrq(adapter, handle_array[queue_num],
@@ -1981,6 +1983,10 @@ static void __ibmvnic_reset(struct work_struct *work)
 
         rwi = get_next_rwi(adapter);
         while (rwi) {
+                if (adapter->state == VNIC_REMOVING ||
+                    adapter->state == VNIC_REMOVED)
+                        goto out;
+
                 if (adapter->force_reset_recovery) {
                         adapter->force_reset_recovery = false;
                         rc = do_hard_reset(adapter, rwi, reset_state);
@@ -2005,7 +2011,7 @@ static void __ibmvnic_reset(struct work_struct *work)
                 netdev_dbg(adapter->netdev, "Reset failed\n");
                 free_all_rwi(adapter);
         }
-
+out:
         adapter->resetting = false;
         if (we_lock_rtnl)
                 rtnl_unlock();
@@ -2788,7 +2794,6 @@ static int ibmvnic_complete_tx(struct ibmvnic_adapter *adapter,
         union sub_crq *next;
         int index;
         int i, j;
-        u8 *first;
 
 restart_loop:
         while (pending_scrq(adapter, scrq)) {
@@ -2818,14 +2823,6 @@ restart_loop:
 
                                 txbuff->data_dma[j] = 0;
                         }
-                        /* if sub_crq was sent indirectly */
-                        first = &txbuff->indir_arr[0].generic.first;
-                        if (*first == IBMVNIC_CRQ_CMD) {
-                                dma_unmap_single(dev, txbuff->indir_dma,
-                                                 sizeof(txbuff->indir_arr),
-                                                 DMA_TO_DEVICE);
-                                *first = 0;
-                        }
 
                         if (txbuff->last_frag) {
                                 dev_kfree_skb_any(txbuff->skb);