diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2013-05-27 11:52:54 -0400 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 14:48:54 -0400 |
commit | d8aec745ddaf278ba187d7712c1becc5ffd0f7da (patch) | |
tree | 6f6f9c650a0eeb74d933bed7b032dd4554ca24b1 /drivers/net/ethernet/sfc/nic.c | |
parent | 1840667a851efb5f719d2c76b235c172104722e8 (diff) |
sfc: Stop RX refill before flushing RX queues
rx_queue::enabled guards refill, so rename it to reflect that. Clear
it at the start of the queue teardown process rather than waiting for
the RX queue to be flushed.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/nic.c')
-rw-r--r-- | drivers/net/ethernet/sfc/nic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c index 2d0a584e1af2..deb0ee04fe70 100644 --- a/drivers/net/ethernet/sfc/nic.c +++ b/drivers/net/ethernet/sfc/nic.c | |||
@@ -1204,7 +1204,6 @@ efx_handle_generated_event(struct efx_channel *channel, efx_qword_t *event) | |||
1204 | * queue. Refill it here */ | 1204 | * queue. Refill it here */ |
1205 | efx_fast_push_rx_descriptors(rx_queue); | 1205 | efx_fast_push_rx_descriptors(rx_queue); |
1206 | } else if (rx_queue && magic == EFX_CHANNEL_MAGIC_RX_DRAIN(rx_queue)) { | 1206 | } else if (rx_queue && magic == EFX_CHANNEL_MAGIC_RX_DRAIN(rx_queue)) { |
1207 | rx_queue->enabled = false; | ||
1208 | efx_handle_drain_event(channel); | 1207 | efx_handle_drain_event(channel); |
1209 | } else if (code == _EFX_CHANNEL_MAGIC_TX_DRAIN) { | 1208 | } else if (code == _EFX_CHANNEL_MAGIC_TX_DRAIN) { |
1210 | efx_handle_drain_event(channel); | 1209 | efx_handle_drain_event(channel); |