---

yaml --- r: 291585 b: refs/heads/master c: d8290ae h: refs/heads/master i: 291583: 9390fb3 v: v3
git-mirror · Mar 19, 2012 · 70131ce · 70131ce
1 parent 6544964
commit 70131ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;