summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc/efx.c
diff options
context:
space:
mode:
authorStuart Hodgson <smhodgson@solarflare.com>2012-07-16 18:08:33 +0200
committerBen Hutchings <bhutchings@solarflare.com>2012-09-07 22:13:38 +0200
commit79d68b370074044d7a9dd789ee103ffe5ef00bda (patch)
treee516dcdfd499499fa718ddb6bdf6b7c7210c30fc /drivers/net/ethernet/sfc/efx.c
parentpps/ptp: Allow PHC devices to adjust PPS events for known delay (diff)
downloadlinux-79d68b370074044d7a9dd789ee103ffe5ef00bda.tar.xz
linux-79d68b370074044d7a9dd789ee103ffe5ef00bda.zip
sfc: Add explicit RX queue flag to channel
The PTP channel will have its own RX queue even though it's not a regular traffic channel. Original work by Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Stuart Hodgson <smhodgson@solarflare.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/efx.c')
-rw-r--r--drivers/net/ethernet/sfc/efx.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index a606db43c5ba..342a1f31e5b8 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1451,10 +1451,16 @@ static void efx_set_channels(struct efx_nic *efx)
efx->tx_channel_offset =
separate_tx_channels ? efx->n_channels - efx->n_tx_channels : 0;
- /* We need to adjust the TX queue numbers if we have separate
+ /* We need to mark which channels really have RX and TX
+ * queues, and adjust the TX queue numbers if we have separate
* RX-only and TX-only channels.
*/
efx_for_each_channel(channel, efx) {
+ if (channel->channel < efx->n_rx_channels)
+ channel->rx_queue.core_index = channel->channel;
+ else
+ channel->rx_queue.core_index = -1;
+
efx_for_each_channel_tx_queue(tx_queue, channel)
tx_queue->queue -= (efx->tx_channel_offset *
EFX_TXQ_TYPES);