diff options
author | Prashant Sreedharan <prashant@broadcom.com> | 2014-10-13 12:21:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-14 15:59:37 -0400 |
commit | 2c7c9ea429ba30fe506747b7da110e2212d8fefa (patch) | |
tree | 1df0acea19971b65dfc9b963b7ed99467e930dad /drivers/net/ethernet/broadcom/tg3.c | |
parent | f76936d07c4eeb36d8dbb64ebd30ab46ff85d9f7 (diff) |
tg3: Add skb->xmit_more support
Ring TX doorbell only if xmit_more is not set or the queue is stopped.
Suggested-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Prashant Sreedharan <prashant@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index ba499489969a..dbb41c1923e6 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -8099,9 +8099,6 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
8099 | /* Sync BD data before updating mailbox */ | 8099 | /* Sync BD data before updating mailbox */ |
8100 | wmb(); | 8100 | wmb(); |
8101 | 8101 | ||
8102 | /* Packets are ready, update Tx producer idx local and on card. */ | ||
8103 | tw32_tx_mbox(tnapi->prodmbox, entry); | ||
8104 | |||
8105 | tnapi->tx_prod = entry; | 8102 | tnapi->tx_prod = entry; |
8106 | if (unlikely(tg3_tx_avail(tnapi) <= (MAX_SKB_FRAGS + 1))) { | 8103 | if (unlikely(tg3_tx_avail(tnapi) <= (MAX_SKB_FRAGS + 1))) { |
8107 | netif_tx_stop_queue(txq); | 8104 | netif_tx_stop_queue(txq); |
@@ -8116,7 +8113,12 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
8116 | netif_tx_wake_queue(txq); | 8113 | netif_tx_wake_queue(txq); |
8117 | } | 8114 | } |
8118 | 8115 | ||
8119 | mmiowb(); | 8116 | if (!skb->xmit_more || netif_xmit_stopped(txq)) { |
8117 | /* Packets are ready, update Tx producer idx on card. */ | ||
8118 | tw32_tx_mbox(tnapi->prodmbox, entry); | ||
8119 | mmiowb(); | ||
8120 | } | ||
8121 | |||
8120 | return NETDEV_TX_OK; | 8122 | return NETDEV_TX_OK; |
8121 | 8123 | ||
8122 | dma_error: | 8124 | dma_error: |