diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-03-07 12:52:33 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-08 13:59:54 -0500 |
commit | 354928dd00d0437149991fad7637c411ba1c62f0 (patch) | |
tree | 31b46e1b4c9e7e3401b2be5882c9d5f529a29f75 /drivers/net/wireless/iwlwifi/iwl-agn-tx.c | |
parent | 9a716863ae4a2f039bc4d0b2b2bb4b24a1dc7a91 (diff) |
iwlwifi: make tx_cmd_pool kmem cache global
Otherwise we are not able to run more than one device per driver:
[ 24.743045] kmem_cache_create: duplicate cache iwl_dev_cmd
[ 24.743051] Pid: 3165, comm: NetworkManager Not tainted 3.3.0-rc2-wl+ #5
[ 24.743054] Call Trace:
[ 24.743066] [<ffffffff811717d5>] kmem_cache_create+0x655/0x700
[ 24.743101] [<ffffffffa03b9f8b>] iwl_alive_notify+0x1cb/0x1f0 [iwlwifi]
[ 24.743111] [<ffffffffa03ba442>] iwl_load_ucode_wait_alive+0x1b2/0x220 [iwlwifi]
[ 24.743142] [<ffffffffa03ba893>] iwl_run_init_ucode+0x73/0x100 [iwlwifi]
[ 24.743152] [<ffffffffa03b8fa1>] __iwl_up+0x81/0x220 [iwlwifi]
[ 24.743161] [<ffffffffa03b91c0>] iwlagn_mac_start+0x80/0x190 [iwlwifi]
[ 24.743188] [<ffffffffa03307b3>] ieee80211_do_open+0x293/0x770 [mac80211]
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index a19db4c0c9fa..97ebfd26212e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c | |||
@@ -367,7 +367,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
367 | if (info->flags & IEEE80211_TX_CTL_AMPDU) | 367 | if (info->flags & IEEE80211_TX_CTL_AMPDU) |
368 | is_agg = true; | 368 | is_agg = true; |
369 | 369 | ||
370 | dev_cmd = kmem_cache_alloc(priv->tx_cmd_pool, GFP_ATOMIC); | 370 | dev_cmd = kmem_cache_alloc(iwl_tx_cmd_pool, GFP_ATOMIC); |
371 | 371 | ||
372 | if (unlikely(!dev_cmd)) | 372 | if (unlikely(!dev_cmd)) |
373 | goto drop_unlock_priv; | 373 | goto drop_unlock_priv; |
@@ -458,7 +458,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
458 | 458 | ||
459 | drop_unlock_sta: | 459 | drop_unlock_sta: |
460 | if (dev_cmd) | 460 | if (dev_cmd) |
461 | kmem_cache_free(priv->tx_cmd_pool, dev_cmd); | 461 | kmem_cache_free(iwl_tx_cmd_pool, dev_cmd); |
462 | spin_unlock(&priv->sta_lock); | 462 | spin_unlock(&priv->sta_lock); |
463 | drop_unlock_priv: | 463 | drop_unlock_priv: |
464 | return -1; | 464 | return -1; |
@@ -1078,7 +1078,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb, | |||
1078 | 1078 | ||
1079 | info = IEEE80211_SKB_CB(skb); | 1079 | info = IEEE80211_SKB_CB(skb); |
1080 | ctx = info->driver_data[0]; | 1080 | ctx = info->driver_data[0]; |
1081 | kmem_cache_free(priv->tx_cmd_pool, | 1081 | kmem_cache_free(iwl_tx_cmd_pool, |
1082 | (info->driver_data[1])); | 1082 | (info->driver_data[1])); |
1083 | 1083 | ||
1084 | memset(&info->status, 0, sizeof(info->status)); | 1084 | memset(&info->status, 0, sizeof(info->status)); |
@@ -1229,7 +1229,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, | |||
1229 | WARN_ON_ONCE(1); | 1229 | WARN_ON_ONCE(1); |
1230 | 1230 | ||
1231 | info = IEEE80211_SKB_CB(skb); | 1231 | info = IEEE80211_SKB_CB(skb); |
1232 | kmem_cache_free(priv->tx_cmd_pool, (info->driver_data[1])); | 1232 | kmem_cache_free(iwl_tx_cmd_pool, (info->driver_data[1])); |
1233 | 1233 | ||
1234 | if (freed == 1) { | 1234 | if (freed == 1) { |
1235 | /* this is the first skb we deliver in this batch */ | 1235 | /* this is the first skb we deliver in this batch */ |