aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2010-09-30 10:34:34 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-01 00:24:43 -0700
commit1da85aa3db6878639e407548dad5b2404443e2c5 (patch)
treefd8c2ea8195227078ca551ee5aef5eb885131396 /drivers/net/tg3.c
parent37a949c54857d8b2a38dbdc75bc8666c3292cbc4 (diff)
downloadkernel_samsung_espresso10-1da85aa3db6878639e407548dad5b2404443e2c5.zip
kernel_samsung_espresso10-1da85aa3db6878639e407548dad5b2404443e2c5.tar.gz
kernel_samsung_espresso10-1da85aa3db6878639e407548dad5b2404443e2c5.tar.bz2
tg3: Futureproof the loopback test
There are other multiqueue modes 5717 and 5719 devices can assume. This patch makes sure that the loopback test is safe, should those other modes be enabled in the future. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 3b27566..3c9f95d 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10647,7 +10647,8 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
tnapi = &tp->napi[0];
rnapi = &tp->napi[0];
if (tp->irq_cnt > 1) {
- rnapi = &tp->napi[1];
+ if (tp->tg3_flags3 & TG3_FLG3_ENABLE_RSS)
+ rnapi = &tp->napi[1];
if (tp->tg3_flags3 & TG3_FLG3_ENABLE_TSS)
tnapi = &tp->napi[1];
}