aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2010-02-12 14:47:11 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-12 17:05:54 -0800
commitc88734054e787542ea093b02120e324e92cad882 (patch)
treea806cf12ff96314f2456960c2f667e8a0669fada /drivers/net/tg3.c
parent603f11738cee4d46a2a1d394ae80d718f8d37cba (diff)
downloadkernel_samsung_smdk4412-c88734054e787542ea093b02120e324e92cad882.zip
kernel_samsung_smdk4412-c88734054e787542ea093b02120e324e92cad882.tar.gz
kernel_samsung_smdk4412-c88734054e787542ea093b02120e324e92cad882.tar.bz2
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/net/tg3.c')
-rw-r--r--drivers/net/tg3.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 33dfb7f..cb69679 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;