---

yaml --- r: 203991 b: refs/heads/master c: 774ee75 h: refs/heads/master i: 203989: 72784df 203987: 27dd165 203983: f16171d v: v3
git-mirror · Aug 2, 2010 · b9e11ec · b9e11ec
1 parent ec32217
commit b9e11ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de34cb963a934953fdd365937b4b75959256602
+refs/heads/master: 774ee7525ff94e597844c9f7f6a48938906df698
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -8864,7 +8864,7 @@ static void tg3_ints_fini(struct tg3 *tp)
 	else if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
 		pci_disable_msi(tp->pdev);
 	tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI_OR_MSIX;
-	tp->tg3_flags3 &= ~TG3_FLG3_ENABLE_RSS;
+	tp->tg3_flags3 &= ~(TG3_FLG3_ENABLE_RSS | TG3_FLG3_ENABLE_TSS);
 }
 
 static int tg3_open(struct net_device *dev)