1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 090966837f3c..4f2d43937283 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1146,11 +1146,18 @@ static void iwl3945_rx_allocate(struct iwl_priv *priv, gfp_t priority)
                 }
                 spin_unlock_irqrestore(&rxq->lock, flags);
 
+                if (rxq->free_count > RX_LOW_WATERMARK)
+                        priority |= __GFP_NOWARN;
                 /* Alloc a new receive buffer */
                 skb = alloc_skb(priv->hw_params.rx_buf_size, priority);
                 if (!skb) {
                         if (net_ratelimit())
-                                IWL_CRIT(priv, ": Can not allocate SKB buffers\n");
+                                IWL_DEBUG_INFO(priv, "Failed to allocate SKB buffer.\n");
+                        if ((rxq->free_count <= RX_LOW_WATERMARK) &&
+                            net_ratelimit())
+                                IWL_CRIT(priv, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
+                                         priority == GFP_ATOMIC ?  "GFP_ATOMIC" : "GFP_KERNEL",
+                                         rxq->free_count);
                         /* We don't reschedule replenish work here -- we will
                          * call the restock method and if it still needs
                          * more buffers it will schedule replenish */