diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2013-01-08 18:43:19 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-29 13:12:14 -0400 |
commit | ba8977bdb20d7ae72ec6fddc1c081ca2d56852cb (patch) | |
tree | 21b65914a3de92f9e69327ce1f7891fa8f39e0f7 /drivers/net/ethernet/sfc/tx.c | |
parent | 3881d8ab065b23bb07400aa820e737d80fdaced3 (diff) |
sfc: Extend struct efx_tx_buffer to allow pushing option descriptors
The TX path firmware for EF10 supports 'option descriptors' to control
offloads and various other features. Add a flag and field for these
in struct efx_tx_buffer, and don't treat them as DMA descriptors on
completion.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/tx.c')
-rw-r--r-- | drivers/net/ethernet/sfc/tx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index 85ee647b28ad..82075f9f02e6 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c | |||
@@ -306,7 +306,9 @@ static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue, | |||
306 | 306 | ||
307 | while (read_ptr != stop_index) { | 307 | while (read_ptr != stop_index) { |
308 | struct efx_tx_buffer *buffer = &tx_queue->buffer[read_ptr]; | 308 | struct efx_tx_buffer *buffer = &tx_queue->buffer[read_ptr]; |
309 | if (unlikely(buffer->len == 0)) { | 309 | |
310 | if (!(buffer->flags & EFX_TX_BUF_OPTION) && | ||
311 | unlikely(buffer->len == 0)) { | ||
310 | netif_err(efx, tx_err, efx->net_dev, | 312 | netif_err(efx, tx_err, efx->net_dev, |
311 | "TX queue %d spurious TX completion id %x\n", | 313 | "TX queue %d spurious TX completion id %x\n", |
312 | tx_queue->queue, read_ptr); | 314 | tx_queue->queue, read_ptr); |