From 30aadbc19404932955a3884065cd228db2772396 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Thu, 18 Aug 2011 22:27:04 +0200 Subject: [PATCH] --- yaml --- r: 278145 b: refs/heads/master c: b6297cd2aa4ec318b3634e6c1ca4cf063a0042c9 h: refs/heads/master i: 278143: b42e3c2c404bdcfac16b12a5bb0576c839228b71 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 2 +- trunk/drivers/net/wireless/iwlegacy/iwl-debug.h | 1 - trunk/drivers/net/wireless/iwlegacy/iwl3945-base.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cdc5a682c421..549479067eed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9406f79775a5374b932ac45ae9e84a71032a9d33 +refs/heads/master: b6297cd2aa4ec318b3634e6c1ca4cf063a0042c9 diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/trunk/drivers/net/wireless/iwlegacy/iwl-4965-lib.c index f4df28d5973c..6503b8faf08b 100644 --- a/trunk/drivers/net/wireless/iwlegacy/iwl-4965-lib.c +++ b/trunk/drivers/net/wireless/iwlegacy/iwl-4965-lib.c @@ -309,7 +309,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority) if ((rxq->free_count <= RX_LOW_WATERMARK) && net_ratelimit()) - IL_CRIT( + IL_ERR( "Failed to alloc_pages with %s. " "Only %u free buffers remaining.\n", priority == GFP_ATOMIC ? diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-debug.h b/trunk/drivers/net/wireless/iwlegacy/iwl-debug.h index 373188df7cc8..77467de7e028 100644 --- a/trunk/drivers/net/wireless/iwlegacy/iwl-debug.h +++ b/trunk/drivers/net/wireless/iwlegacy/iwl-debug.h @@ -35,7 +35,6 @@ extern u32 il_debug_level; #define IL_ERR(f, a...) dev_err(&il->pci_dev->dev, f, ## a) #define IL_WARN(f, a...) dev_warn(&il->pci_dev->dev, f, ## a) #define IL_INFO(f, a...) dev_info(&il->pci_dev->dev, f, ## a) -#define IL_CRIT(f, a...) dev_crit(&il->pci_dev->dev, f, ## a) #define il_print_hex_error(il, p, len) \ do { \ diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl3945-base.c b/trunk/drivers/net/wireless/iwlegacy/iwl3945-base.c index 8a6b1937336c..66aa8505f4fe 100644 --- a/trunk/drivers/net/wireless/iwlegacy/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlegacy/iwl3945-base.c @@ -1043,7 +1043,7 @@ static void il3945_rx_allocate(struct il_priv *il, gfp_t priority) D_INFO("Failed to allocate SKB buffer.\n"); if ((rxq->free_count <= RX_LOW_WATERMARK) && net_ratelimit()) - IL_CRIT("Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n", + IL_ERR("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