2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 24220992413f..4833b6a9031c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2957,9 +2957,13 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         skb_shinfo(skb)->nr_frags +
                         BDS_PER_TX_PKT +
                         NEXT_CNT_PER_TX_PKT(MAX_BDS_PER_TX_PKT))) {
-                bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++;
-                netif_tx_stop_queue(txq);
-                BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
+                /* Handle special storage cases separately */
+                if (txdata->tx_ring_size != 0) {
+                        BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
+                        bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++;
+                        netif_tx_stop_queue(txq);
+                }
+
                 return NETDEV_TX_BUSY;
         }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 71971a161bd1..614981c02264 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -126,7 +126,7 @@ static inline int bnx2x_exe_queue_add(struct bnx2x *bp,
                 /* Check if this request is ok */
                 rc = o->validate(bp, o->owner, elem);
                 if (rc) {
-                        BNX2X_ERR("Preamble failed: %d\n", rc);
+                        DP(BNX2X_MSG_SP, "Preamble failed: %d\n", rc);
                         goto free_and_exit;
                 }
         }