diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-10-01 21:32:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-01 21:32:55 -0400 |
| commit | d3d5df2c4b86786ea792b073f0df9cd82f7efcaa (patch) | |
| tree | 1b7658dbe2e5a8db6ba3d166812b153b2fabcb13 /drivers/net/ethernet/sfc/selftest.c | |
| parent | vxlan: virtual extensible lan (diff) | |
| parent | sfc: Fix the reported priorities of different filter types (diff) | |
| download | linux-dev-d3d5df2c4b86786ea792b073f0df9cd82f7efcaa.tar.xz linux-dev-d3d5df2c4b86786ea792b073f0df9cd82f7efcaa.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
Some bug fixes that should go into 3.7:
1. Fix oops when removing device with SR-IOV enabled. (This regression
was introduced by the last set of changes, so the fix does not need to
be applied to any earlier kernel versions.)
2. Fix firmware structure field lookup bug that resulted in missing
sensor information.
3. Fix bug that makes self-test do very little in some configurations.
4. Fix the numbering of ethtool RX flow steering filters to reflect the
real hardware priorities.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/selftest.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/selftest.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, { enum efx_loopback_mode mode; struct efx_loopback_state *state; - struct efx_channel *channel = efx_get_channel(efx, 0); + struct efx_channel *channel = + efx_get_channel(efx, efx->tx_channel_offset); struct efx_tx_queue *tx_queue; int rc = 0; |