[PATCH 09/28] iwlwifi: replace unnecessary GFP_ATOMIC with GFP_KERNEL

[Zhu Yi <yi.zhu@xxxxxxxxx>]

Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
---
 drivers/net/wireless/iwl-base.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c
index 8f55f0d..ca4edd2 100644
--- a/drivers/net/wireless/iwl-base.c
+++ b/drivers/net/wireless/iwl-base.c
@@ -222,7 +222,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,
 
 	if (id != IWL_CMD_QUEUE_NUM) {
 		txq->txb = kmalloc(sizeof(txq->txb[0]) *
-				   TFD_QUEUE_SIZE_MAX, GFP_ATOMIC);
+				   TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
 		if (!txq->txb) {
 			IWL_ERROR("kmalloc for auxilary BD "
 				  "structures failed\n");
@@ -1460,7 +1460,7 @@ static struct iwl_frame *iwl_get_free_frame(struct iwl_priv *priv)
 	struct iwl_frame *frame;
 	struct list_head *element;
 	if (list_empty(&priv->free_frames)) {
-		frame = kzalloc(sizeof(*frame), GFP_ATOMIC);
+		frame = kzalloc(sizeof(*frame), GFP_KERNEL);
 		if (!frame) {
 			IWL_ERROR("Could not allocate frame!\n");
 			return NULL;
@@ -5706,19 +5706,19 @@ static int iwl_init_geos(struct iwl_priv *priv)
 	}
 
 	modes = kzalloc(sizeof(struct ieee80211_hw_mode) * mode_count,
-			GFP_ATOMIC);
+			GFP_KERNEL);
 	if (!modes)
 		return -ENOMEM;
 
 	channels = kzalloc(sizeof(struct ieee80211_channel) *
-			   priv->channel_count, GFP_ATOMIC);
+			   priv->channel_count, GFP_KERNEL);
 	if (!channels) {
 		kfree(modes);
 		return -ENOMEM;
 	}
 
 	rates = kzalloc((sizeof(struct ieee80211_rate) * (IWL_MAX_RATES + 1)),
-			GFP_ATOMIC);
+			GFP_KERNEL);
 	if (!rates) {
 		kfree(modes);
 		kfree(channels);
@@ -7014,7 +7014,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
 
 	if (!priv->scan) {
 		priv->scan = kmalloc(sizeof(struct iwl_scan_cmd) +
-				     IWL_MAX_SCAN_SIZE, GFP_ATOMIC);
+				     IWL_MAX_SCAN_SIZE, GFP_KERNEL);
 		if (!priv->scan) {
 			rc = -ENOMEM;
 			goto done;
-- 
1.5.2
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html