aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-02-13 05:23:30 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-22 14:51:17 -0500
commit6668e4eb5030af96d2bde366b8f6614b34b8c96c (patch)
tree86be7f0f7118aa6b12544fc9081c462479036c7f /drivers
parentbc269a8e2701aaa6c53553eaef9f0866ef03e703 (diff)
iwlegacy: s/il_txq_mem/il_free_txq_mem/g
Previous name was confusing. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c2
-rw-r--r--drivers/net/wireless/iwlegacy/4965-mac.c2
-rw-r--r--drivers/net/wireless/iwlegacy/common.c4
-rw-r--r--drivers/net/wireless/iwlegacy/common.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 8900e3c42b02..456f32da6b26 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -1002,7 +1002,7 @@ il3945_hw_txq_ctx_free(struct il_priv *il)
1002 il_tx_queue_free(il, txq_id); 1002 il_tx_queue_free(il, txq_id);
1003 1003
1004 /* free tx queue structure */ 1004 /* free tx queue structure */
1005 il_txq_mem(il); 1005 il_free_txq_mem(il);
1006} 1006}
1007 1007
1008void 1008void
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 3aa0ee5458f9..2d01db0f08e0 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -1939,7 +1939,7 @@ il4965_hw_txq_ctx_free(struct il_priv *il)
1939 il4965_free_dma_ptr(il, &il->scd_bc_tbls); 1939 il4965_free_dma_ptr(il, &il->scd_bc_tbls);
1940 1940
1941 /* free tx queue structure */ 1941 /* free tx queue structure */
1942 il_txq_mem(il); 1942 il_free_txq_mem(il);
1943} 1943}
1944 1944
1945/** 1945/**
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index defe8d9a4f59..b42052b47d8e 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4591,12 +4591,12 @@ il_alloc_txq_mem(struct il_priv *il)
4591EXPORT_SYMBOL(il_alloc_txq_mem); 4591EXPORT_SYMBOL(il_alloc_txq_mem);
4592 4592
4593void 4593void
4594il_txq_mem(struct il_priv *il) 4594il_free_txq_mem(struct il_priv *il)
4595{ 4595{
4596 kfree(il->txq); 4596 kfree(il->txq);
4597 il->txq = NULL; 4597 il->txq = NULL;
4598} 4598}
4599EXPORT_SYMBOL(il_txq_mem); 4599EXPORT_SYMBOL(il_free_txq_mem);
4600 4600
4601int 4601int
4602il_force_reset(struct il_priv *il, bool external) 4602il_force_reset(struct il_priv *il, bool external)
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index 42820183dbe1..cee72f1523f7 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1747,7 +1747,7 @@ void il_mac_remove_interface(struct ieee80211_hw *hw,
1747int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 1747int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
1748 enum nl80211_iftype newtype, bool newp2p); 1748 enum nl80211_iftype newtype, bool newp2p);
1749int il_alloc_txq_mem(struct il_priv *il); 1749int il_alloc_txq_mem(struct il_priv *il);
1750void il_txq_mem(struct il_priv *il); 1750void il_free_txq_mem(struct il_priv *il);
1751 1751
1752#ifdef CONFIG_IWLEGACY_DEBUGFS 1752#ifdef CONFIG_IWLEGACY_DEBUGFS
1753extern void il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len); 1753extern void il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len);