From 2ede86c0399a6313236878bb489fbd8f4db7c1c6 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Thu, 30 Sep 2010 10:34:34 +0000
Subject: [PATCH] --- yaml --- r: 214827 b: refs/heads/master c:
 1da85aa3db6878639e407548dad5b2404443e2c5 h: refs/heads/master i:   214825:
 9a41d3705df0575ca2dd11ab22db858fc61677e4   214823:
 c93449a3df248acf8af5a8db647414fcb5531c1c v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb61f7ee2b8c..5a2f626eea86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37a949c54857d8b2a38dbdc75bc8666c3292cbc4
+refs/heads/master: 1da85aa3db6878639e407548dad5b2404443e2c5
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 3b275663bbd8..3c9f95dd61e0 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/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];
 	}