summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl-dev.h
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-08-26 15:49:28 +0200
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 12:26:33 +0100
commit6ce1dc45304eece672a36241cda587ba056d2b1f (patch)
treec6a7837c8d6af9f932f7cde0d235e10c4fb4a205 /drivers/net/wireless/iwlegacy/iwl-dev.h
parentebf0d90d12cf013019005a8ee7d1bc8599935356 (diff)
downloadlinux-6ce1dc45304eece672a36241cda587ba056d2b1f.tar.gz
linux-6ce1dc45304eece672a36241cda587ba056d2b1f.tar.bz2
linux-6ce1dc45304eece672a36241cda587ba056d2b1f.zip
iwlegacy: s/window/win/
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-dev.h')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-dev.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h
index 4388538b9de8..18dd253b43f7 100644
--- a/drivers/net/wireless/iwlegacy/iwl-dev.h
+++ b/drivers/net/wireless/iwlegacy/iwl-dev.h
@@ -129,7 +129,7 @@ struct il_queue {
int read_ptr; /* last used entry (index) host_r*/
/* use for monitoring and recovering the stuck queue */
dma_addr_t dma_addr; /* physical addr for BD's */
- int n_window; /* safe queue window */
+ int n_win; /* safe queue win */
u32 id;
int low_mark; /* low watermark, resume queue if free
* space more than this */
@@ -377,9 +377,9 @@ struct il_rx_queue {
* @txq_id: Tx queue used for Tx attempt
* @frame_count: # frames attempted by Tx command
* @wait_for_ba: Expect block-ack before next Tx reply
- * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx window
- * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx window
- * @bitmap1: High order, one bit for each frame pending ACK in Tx window
+ * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx win
+ * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx win
+ * @bitmap1: High order, one bit for each frame pending ACK in Tx win
* @rate_n_flags: Rate at which Tx was attempted
*
* If REPLY_TX indicates that aggregation was attempted, driver must wait
@@ -645,10 +645,10 @@ static inline u8 il_get_cmd_index(struct il_queue *q, u32 index,
* the big buffer at end of command array
*/
if (is_huge)
- return q->n_window; /* must be power of 2 */
+ return q->n_win; /* must be power of 2 */
/* Otherwise, use normal size buffers */
- return index & (q->n_window - 1);
+ return index & (q->n_win - 1);
}