Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d40db7b authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

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: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1f614a1

drivers/net/tg3.c

+2 −2
Original line number Diff line number Diff line
@@ -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);