diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2010-02-12 15:47:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-13 02:05:54 +0100 |
| commit | c88734054e787542ea093b02120e324e92cad882 (patch) | |
| tree | a806cf12ff96314f2456960c2f667e8a0669fada /drivers | |
| parent | tg3: Reset phy during bringup when using phylib (diff) | |
| download | linux-c88734054e787542ea093b02120e324e92cad882.tar.xz linux-c88734054e787542ea093b02120e324e92cad882.zip | |
tg3: Fix napi assignments in loopback test
The 57765 lacks TSS support. This renders the napi assignments
incorrect in the loopback test function. This patch fixes the problem.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 33dfb7fda8cc..cb6967947c30 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -10780,12 +10780,12 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode) struct tg3_napi *tnapi, *rnapi; struct tg3_rx_prodring_set *tpr = &tp->prodring[0]; + tnapi = &tp->napi[0]; + rnapi = &tp->napi[0]; if (tp->irq_cnt > 1) { - tnapi = &tp->napi[1]; rnapi = &tp->napi[1]; - } else { - tnapi = &tp->napi[0]; - rnapi = &tp->napi[0]; + if (tp->tg3_flags3 & TG3_FLG3_ENABLE_TSS) + tnapi = &tp->napi[1]; } coal_now = tnapi->coal_now | rnapi->coal_now; |