From 70131cef26e66f35b2e601fb748900fe951335f0 Mon Sep 17 00:00:00 2001
From: Yuval Mintz <yuvalmin@broadcom.com>
Date: Sun, 18 Mar 2012 10:33:37 +0000
Subject: [PATCH] --- yaml --- r: 291585 b: refs/heads/master c:
 d8290ae54c88cab9f199a84125bd5fda9f48b032 h: refs/heads/master i:   291583:
 9390fb303b48a7332263115783095442eec30c11 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8931b4238c5f..ec46adcba02e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1f3ee1bcc996e21f122442fd8c34de51622c76a
+refs/heads/master: d8290ae54c88cab9f199a84125bd5fda9f48b032
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index b814f4eaed19..d888228d0787 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/trunk/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;