aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-05-03 04:22:42 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-05-13 13:43:45 -0400
commit1ff504e07c0fb64a1ceca17d60cb2d82dc134f05 (patch)
treedf8d8e8b3697527383aa408f1dad17c6cf5e6ded
parentf862a2367b429d46d12362fea07d844c2bf55969 (diff)
iwlwifi: move iwl_free_tfds_in_queue to iwlagn
This function is only used by the agn drivers, so doesn't have to be in core and exported. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c13
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c15
4 files changed, 15 insertions, 17 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index c7ce63254373..5f07bc2e14e9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1529,3 +1529,16 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv,
1529 return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id, 1529 return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id,
1530 vif->bss_conf.bssid); 1530 vif->bss_conf.bssid);
1531} 1531}
1532
1533void iwl_free_tfds_in_queue(struct iwl_priv *priv,
1534 int sta_id, int tid, int freed)
1535{
1536 if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed)
1537 priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
1538 else {
1539 IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",
1540 priv->stations[sta_id].tid[tid].tfds_in_queue,
1541 freed);
1542 priv->stations[sta_id].tid[tid].tfds_in_queue = 0;
1543 }
1544}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 2d748053358e..fbbefe1a3b49 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -93,6 +93,8 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
93int iwlagn_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, 93int iwlagn_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
94 u16 ssn_idx, u8 tx_fifo); 94 u16 ssn_idx, u8 tx_fifo);
95void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask); 95void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask);
96void iwl_free_tfds_in_queue(struct iwl_priv *priv,
97 int sta_id, int tid, int freed);
96 98
97/* uCode */ 99/* uCode */
98int iwlagn_load_ucode(struct iwl_priv *priv); 100int iwlagn_load_ucode(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 7e5a5ba41fd2..63229dcb8eb1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -472,8 +472,6 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
472 dma_addr_t addr, u16 len, u8 reset, u8 pad); 472 dma_addr_t addr, u16 len, u8 reset, u8 pad);
473int iwl_hw_tx_queue_init(struct iwl_priv *priv, 473int iwl_hw_tx_queue_init(struct iwl_priv *priv,
474 struct iwl_tx_queue *txq); 474 struct iwl_tx_queue *txq);
475void iwl_free_tfds_in_queue(struct iwl_priv *priv,
476 int sta_id, int tid, int freed);
477void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq); 475void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
478int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq, 476int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
479 int slots_num, u32 txq_id); 477 int slots_num, u32 txq_id);
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index c3c6505a8c69..db83a0a7efc2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -76,21 +76,6 @@ void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq)
76} 76}
77EXPORT_SYMBOL(iwl_txq_update_write_ptr); 77EXPORT_SYMBOL(iwl_txq_update_write_ptr);
78 78
79
80void iwl_free_tfds_in_queue(struct iwl_priv *priv,
81 int sta_id, int tid, int freed)
82{
83 if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed)
84 priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
85 else {
86 IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",
87 priv->stations[sta_id].tid[tid].tfds_in_queue,
88 freed);
89 priv->stations[sta_id].tid[tid].tfds_in_queue = 0;
90 }
91}
92EXPORT_SYMBOL(iwl_free_tfds_in_queue);
93
94/** 79/**
95 * iwl_tx_queue_free - Deallocate DMA queue. 80 * iwl_tx_queue_free - Deallocate DMA queue.
96 * @txq: Transmit queue to deallocate. 81 * @txq: Transmit queue to deallocate.