From: Yuval Mintz Date: Sun, 18 Mar 2012 10:33:37 +0000 (+0000) Subject: bnx2x: added 'likely' to fast-path skb existence X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d8290ae54c88cab9f199a84125bd5fda9f48b032;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git bnx2x: added 'likely' to fast-path skb existence Signed-off-by: Yuval Mintz Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index b814f4eaed1..d888228d078 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -120,10 +120,11 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata, /* release skb */ WARN_ON(!skb); - if (skb) { + if (likely(skb)) { (*pkts_compl)++; (*bytes_compl) += skb->len; } + dev_kfree_skb_any(skb); tx_buf->first_bd = 0; tx_buf->skb = NULL;