diff options
| author |   Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-05-30 13:40:10 -0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-06-02 16:16:06 -0700 |
| commit | eee492ea35bd6f4bac229744eb0593547fb30826 (patch) | |
| tree | cfcb9320701ae13f88701ccaa5d344dd0d0ec8c1 /drivers/net/ethernet/marvell/mv643xx_eth.c | |
| parent | net: mv643xx_eth: Limit the TSO segments and adjust stop/wake thresholds (diff) | |
| download | linux-dev-eee492ea35bd6f4bac229744eb0593547fb30826.tar.xz linux-dev-eee492ea35bd6f4bac229744eb0593547fb30826.zip | |
net: mv643xx_eth: Drop the NETDEV_TX_BUSY return path
After adding proper stop/wake thresholds, we can expect a queue to never
be full and drop the NETDEV_TX_BUSY return path. In any case, if the queue
cannot accommodate a TSO packet, the packet would be discarded.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 2cea86d11a6e..88afbe0435d7 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -996,8 +996,6 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev) if (txq->tx_desc_count >= txq->tx_stop_threshold) netif_tx_stop_queue(nq); - } else if (ret == -EBUSY) { - return NETDEV_TX_BUSY; } else { txq->tx_dropped++; dev_kfree_skb_any(skb); |