iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ibmvnic: Free skb's in cases of failure in transmit

Browse Source 
When an error is encountered during transmit we need to free the
skb instead of returning TX_BUSY.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Falcon 2017-04-21 15:39:16 -04:00 committed by David S. Miller
parent 3ca1993264
commit 7f5b030830
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/ibm/ibmvnic.c
View File

@ -908,9 +908,13 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
be32_to_cpu(adapter->login_rsp_buf-> be32_to_cpu(adapter->login_rsp_buf->
off_txsubm_subcrqs)); off_txsubm_subcrqs));
if (adapter->migrated) { if (adapter->migrated) {
if (!netif_subqueue_stopped(netdev, skb))
netif_stop_subqueue(netdev, queue_num);
dev_kfree_skb_any(skb);
tx_send_failed++; tx_send_failed++;
tx_dropped++; tx_dropped++;
ret = NETDEV_TX_BUSY; ret = NETDEV_TX_OK;
goto out; goto out;
} }
@ -976,11 +980,13 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
sizeof(tx_buff->indir_arr), sizeof(tx_buff->indir_arr),
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (dma_mapping_error(dev, tx_buff->indir_dma)) { if (dma_mapping_error(dev, tx_buff->indir_dma)) {
dev_kfree_skb_any(skb);
tx_buff->skb = NULL;
if (!firmware_has_feature(FW_FEATURE_CMO)) if (!firmware_has_feature(FW_FEATURE_CMO))
dev_err(dev, "tx: unable to map descriptor array\n"); dev_err(dev, "tx: unable to map descriptor array\n");
tx_map_failed++; tx_map_failed++;
tx_dropped++; tx_dropped++;
ret = NETDEV_TX_BUSY; ret = NETDEV_TX_OK;
goto out; goto out;
} }
lpar_rc = send_subcrq_indirect(adapter, handle_array[queue_num], lpar_rc = send_subcrq_indirect(adapter, handle_array[queue_num],
@ -999,9 +1005,15 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
else else
tx_pool->consumer_index--; tx_pool->consumer_index--;
dev_kfree_skb_any(skb);
tx_buff->skb = NULL;
if (lpar_rc == H_CLOSED)
netif_stop_subqueue(netdev, queue_num);
tx_send_failed++; tx_send_failed++;
tx_dropped++; tx_dropped++;
ret = NETDEV_TX_BUSY; ret = NETDEV_TX_OK;
goto out; goto out;
} }