From bc947a9faf95d66d8aaac2f4d251caa7405b60d5 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Mon, 5 Apr 2010 10:19:20 +0000 Subject: [PATCH] --- yaml --- r: 193959 b: refs/heads/master c: 6d40db7beaef823621ff3d340ef53d08445960b4 h: refs/heads/master i: 193957: 723317fbf5a13b39b6aee7200403ea986f4c092c 193955: 13ae80a0552b7645f50b9a6c66b70e6a70462cae 193951: 80fa49b48a9cf7be2ac18cd07b58eb8dd3a4c9f6 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f2f943e3fcbc..ee9bfc9271e7 100644 --- 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 index aff11f84f525..4c71f3efe07b 100644 --- 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);