diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2010-04-05 10:19:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-06 03:57:58 -0700 |
| commit | 6d40db7beaef823621ff3d340ef53d08445960b4 (patch) | |
| tree | b21259d7c35c4558c72353acfc0d2c6af5570144 /drivers/net/tg3.c | |
| parent | c1f614a1214126d7c9f58bf8481070c66b3cc1af (diff) | |
| download | kernel_samsung_smdk4412-6d40db7beaef823621ff3d340ef53d08445960b4.tar.gz kernel_samsung_smdk4412-6d40db7beaef823621ff3d340ef53d08445960b4.tar.bz2 kernel_samsung_smdk4412-6d40db7beaef823621ff3d340ef53d08445960b4.zip | |
tg3: Restore likely() check in tg3_poll_msix()
When creating the new tg3_poll_msix() function, the likely() compiler
hint was dropped. This patch reintroduces it.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index aff11f84f52..4c71f3efe07 100644 --- a/drivers/net/tg3.c +++ b/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); |