diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2015-03-13 12:11:07 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-13 15:52:31 -0400 |
| commit | ddd0ca5d60b350bbfbfb60b25885a9779ce6d6c7 (patch) | |
| tree | 974239fd13e2133fedb00e2096adfca16983440b /drivers/net/ethernet/broadcom | |
| parent | net: bcmgenet: update ring producer index and buffer count in xmit (diff) | |
| download | linux-dev-ddd0ca5d60b350bbfbfb60b25885a9779ce6d6c7.tar.xz linux-dev-ddd0ca5d60b350bbfbfb60b25885a9779ce6d6c7.zip | |
net: bcmgenet: add support for xmit_more
Delay the update of the TDMA producer index unless this is the last SKB
in a batch, or the queue is already stopped. Move the check for whether
the queue should be stopped before the xmit_more check to avoid locking
the transmit queue in case there was a SKB submitted which has xmit_more
set.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 53c916ea06a2..e74ae628bbb9 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1316,12 +1316,13 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) ring->prod_index += nr_frags + 1; ring->prod_index &= DMA_P_INDEX_MASK; - bcmgenet_tdma_ring_writel(priv, ring->index, - ring->prod_index, TDMA_PROD_INDEX); - if (ring->free_bds <= (MAX_SKB_FRAGS + 1)) netif_tx_stop_queue(txq); + if (!skb->xmit_more || netif_xmit_stopped(txq)) + /* Packets are ready, update producer index */ + bcmgenet_tdma_ring_writel(priv, ring->index, + ring->prod_index, TDMA_PROD_INDEX); out: spin_unlock_irqrestore(&ring->lock, flags); |