From 19a28c488db478ee0e74451570a17196f9b388a4 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 12 Jul 2012 13:56:28 +0200
Subject: [PATCH] --- yaml --- r: 315551 b: refs/heads/master c:
 3ec4588231914344834805a6828551cd5c65afd8 h: refs/heads/master i:   315549:
 5318e66f757a06141c1c6182e2673dde286f9846   315547:
 42f52da0d189dd01767d36d907e5af512d5ba3f5   315543:
 7ee5085a9815d59673646bf30780f0ae0c24b053   315535:
 0db0a779e3cec78ca63dcc9bdcafd24c477dbff8   315519:
 c63b886852515b1cab31f09dbc0e57067d6dd37f v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-trans.h  | 1 +
 trunk/drivers/net/wireless/iwlwifi/pcie/trans.c | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4335b3618db0..f7e5ab4dd87e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e911ede7b7613ce231c8e10db8cb778d16013d33
+refs/heads/master: 3ec4588231914344834805a6828551cd5c65afd8
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h b/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
index 867d8e194da4..92576a3e84ef 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -458,6 +458,7 @@ struct iwl_trans {
 	/* The following fields are internal only */
 	struct kmem_cache *dev_cmd_pool;
 	size_t dev_cmd_headroom;
+	char dev_cmd_pool_name[50];
 
 	/* pointer to trans specific struct */
 	/*Ensure that this pointer will always be aligned to sizeof pointer */
diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c
index 203d575e4493..69bf6156fdf6 100644
--- a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -2080,7 +2080,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 {
 	struct iwl_trans_pcie *trans_pcie;
 	struct iwl_trans *trans;
-	char cmd_pool_name[100];
 	u16 pci_cmd;
 	int err;
 
@@ -2178,12 +2177,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 	init_waitqueue_head(&trans->wait_command_queue);
 	spin_lock_init(&trans->reg_lock);
 
-	snprintf(cmd_pool_name, sizeof(cmd_pool_name), "iwl_cmd_pool:%s",
-		 dev_name(trans->dev));
+	snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),
+		 "iwl_cmd_pool:%s", dev_name(trans->dev));
 
 	trans->dev_cmd_headroom = 0;
 	trans->dev_cmd_pool =
-		kmem_cache_create(cmd_pool_name,
+		kmem_cache_create(trans->dev_cmd_pool_name,
 				  sizeof(struct iwl_device_cmd)
 				  + trans->dev_cmd_headroom,
 				  sizeof(void *),