sfc: Test only the first pair of TX queues

This makes no immediate difference, but we definitely do not want
to test all TX queues once we allocate a pair of TX queues to each
channel.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index d9f9c02a928ecdb8cb44537bcfccce51116bc708..cbe9319f8322e50c153a65c648dd7c8513745b34 100644 (file)
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -304,7 +304,7 @@ static int efx_fill_loopback_test(struct efx_nic *efx,
 {
        struct efx_tx_queue *tx_queue;
 
-       efx_for_each_tx_queue(tx_queue, efx) {
+       efx_for_each_channel_tx_queue(tx_queue, &efx->channel[0]) {
                efx_fill_test(test_index++, strings, data,
                              &lb_tests->tx_sent[tx_queue->queue],
                              EFX_TX_QUEUE_NAME(tx_queue),

diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 0106b1d9aae216312f344d6d25e5899c4ae4c2e6..3a16e06122671e503322ce72d8f7890b94f571d5 100644 (file)
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -616,8 +616,8 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,
                        goto out;
                }
 
-               /* Test every TX queue */
-               efx_for_each_tx_queue(tx_queue, efx) {
+               /* Test both types of TX queue */
+               efx_for_each_channel_tx_queue(tx_queue, &efx->channel[0]) {
                        state->offload_csum = (tx_queue->queue ==
                                               EFX_TX_QUEUE_OFFLOAD_CSUM);
                        rc = efx_test_loopback(tx_queue,