aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-09-12 21:22:52 -0400
committerBen Hutchings <bhutchings@solarflare.com>2012-10-01 20:58:41 -0400
commit1ac0226eb04e56cacee080fb71938eb50b5245eb (patch)
treeb48353aaad1bbd35211aaff02d5630299b50776d
parent0a6e5008a9df678b48f8d4e57601aa4270df6c14 (diff)
sfc: Fix loopback self-test with separate_tx_channels=1
The loopback self-test iterates over all the TX queues of channel 0, which is not very interesting when that's an RX-only channel. Signed-off-by: Ben Hutchings <bhutchings@solarflre.com>
-rw-r--r--drivers/net/ethernet/sfc/ethtool.c3
-rw-r--r--drivers/net/ethernet/sfc/selftest.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 9df556c01b8e..cf772074145a 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -337,7 +337,8 @@ static int efx_fill_loopback_test(struct efx_nic *efx,
337 unsigned int test_index, 337 unsigned int test_index,
338 struct ethtool_string *strings, u64 *data) 338 struct ethtool_string *strings, u64 *data)
339{ 339{
340 struct efx_channel *channel = efx_get_channel(efx, 0); 340 struct efx_channel *channel =
341 efx_get_channel(efx, efx->tx_channel_offset);
341 struct efx_tx_queue *tx_queue; 342 struct efx_tx_queue *tx_queue;
342 343
343 efx_for_each_channel_tx_queue(tx_queue, channel) { 344 efx_for_each_channel_tx_queue(tx_queue, channel) {
diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
index 96068d15b601..ce72ae4f399f 100644
--- a/drivers/net/ethernet/sfc/selftest.c
+++ b/drivers/net/ethernet/sfc/selftest.c
@@ -614,7 +614,8 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,
614{ 614{
615 enum efx_loopback_mode mode; 615 enum efx_loopback_mode mode;
616 struct efx_loopback_state *state; 616 struct efx_loopback_state *state;
617 struct efx_channel *channel = efx_get_channel(efx, 0); 617 struct efx_channel *channel =
618 efx_get_channel(efx, efx->tx_channel_offset);
618 struct efx_tx_queue *tx_queue; 619 struct efx_tx_queue *tx_queue;
619 int rc = 0; 620 int rc = 0;
620 621