---

yaml --- r: 533 b: refs/heads/master c: f4d0ee9 h: refs/heads/master i: 531: bf81ba1 v: v3
git-mirror · Apr 28, 2005 · d2a1531 · d2a1531
1 parent 4fdd3c0
commit d2a1531
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9acf6597c533f3d5c991f730c6a1be296679018e
+refs/heads/master: f4d0ee983ec01e59a77e157ab702246f397b2a2b
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -5830,7 +5830,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
 	free_irq(tp->pdev->irq, dev);
 
 	err = request_irq(tp->pdev->irq, tg3_test_isr,
-			  SA_SHIRQ, dev->name, dev);
+			  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 	if (err)
 		return err;
 
@@ -5852,10 +5852,10 @@ static int tg3_test_interrupt(struct tg3 *tp)
 
 	if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
 		err = request_irq(tp->pdev->irq, tg3_msi,
-				  0, dev->name, dev);
+				  SA_SAMPLE_RANDOM, dev->name, dev);
 	else
 		err = request_irq(tp->pdev->irq, tg3_interrupt,
-				  SA_SHIRQ, dev->name, dev);
+				  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
 	if (err)
 		return err;
@@ -5908,7 +5908,7 @@ static int tg3_test_msi(struct tg3 *tp)
 	tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
 
 	err = request_irq(tp->pdev->irq, tg3_interrupt,
-			  SA_SHIRQ, dev->name, dev);
+			  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
 	if (err)
 		return err;
@@ -5965,10 +5965,10 @@ static int tg3_open(struct net_device *dev)
 	}
 	if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
 		err = request_irq(tp->pdev->irq, tg3_msi,
-				  0, dev->name, dev);
+				  SA_SAMPLE_RANDOM, dev->name, dev);
 	else
 		err = request_irq(tp->pdev->irq, tg3_interrupt,
-				  SA_SHIRQ, dev->name, dev);
+				  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
 	if (err) {
 		if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {