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];
 	}