---

yaml --- r: 193959 b: refs/heads/master c: 6d40db7 h: refs/heads/master i: 193957: 723317f 193955: 13ae80a 193951: 80fa49b v: v3
git-mirror · Apr 6, 2010 · bc947a9 · bc947a9
1 parent 9f44a09
commit bc947a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1f614a1214126d7c9f58bf8481070c66b3cc1af
+refs/heads/master: 6d40db7beaef823621ff3d340ef53d08445960b4
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -4987,8 +4987,8 @@ static int tg3_poll_msix(struct napi_struct *napi, int budget)
 		rmb();
 
 		/* check for RX/TX work to do */
-		if (sblk->idx[0].tx_consumer == tnapi->tx_cons &&
-		    *(tnapi->rx_rcb_prod_idx) == tnapi->rx_rcb_ptr) {
+		if (likely(sblk->idx[0].tx_consumer == tnapi->tx_cons &&
+			   *(tnapi->rx_rcb_prod_idx) == tnapi->rx_rcb_ptr)) {
 			napi_complete(napi);
 			/* Reenable interrupts. */
 			tw32_mailbox(tnapi->int_mbox, tnapi->last_tag << 24);