1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index c7cc760a1777..af251a5df844 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -814,7 +814,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
         }
 
         /* release skb */
-        BUG_TRAP(skb);
+        WARN_ON(!skb);
         dev_kfree_skb(skb);
         tx_buf->first_bd = 0;
         tx_buf->skb = NULL;
@@ -837,9 +837,9 @@ static inline u16 bnx2x_tx_avail(struct bnx2x_fastpath *fp)
         used = SUB_S16(prod, cons) + (s16)NUM_TX_RINGS;
 
 #ifdef BNX2X_STOP_ON_ERROR
-        BUG_TRAP(used >= 0);
-        BUG_TRAP(used <= fp->bp->tx_ring_size);
-        BUG_TRAP((fp->bp->tx_ring_size - used) <= MAX_TX_AVAIL);
+        WARN_ON(used < 0);
+        WARN_ON(used > fp->bp->tx_ring_size);
+        WARN_ON((fp->bp->tx_ring_size - used) > MAX_TX_AVAIL);
 #endif
 
         return (s16)(fp->bp->tx_ring_size) - used;
@@ -4374,7 +4374,7 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)
                         }
                         ring_prod = NEXT_RX_IDX(ring_prod);
                         cqe_ring_prod = NEXT_RCQ_IDX(cqe_ring_prod);
-                        BUG_TRAP(ring_prod > i);
+                        WARN_ON(ring_prod <= i);
                 }
 
                 fp->rx_bd_prod = ring_prod;