diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-dev.h | 12 |
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 { | |||
129 | int read_ptr; /* last used entry (index) host_r*/ | 129 | int read_ptr; /* last used entry (index) host_r*/ |
130 | /* use for monitoring and recovering the stuck queue */ | 130 | /* use for monitoring and recovering the stuck queue */ |
131 | dma_addr_t dma_addr; /* physical addr for BD's */ | 131 | dma_addr_t dma_addr; /* physical addr for BD's */ |
132 | int n_window; /* safe queue window */ | 132 | int n_win; /* safe queue win */ |
133 | u32 id; | 133 | u32 id; |
134 | int low_mark; /* low watermark, resume queue if free | 134 | int low_mark; /* low watermark, resume queue if free |
135 | * space more than this */ | 135 | * space more than this */ |
@@ -377,9 +377,9 @@ struct il_rx_queue { | |||
377 | * @txq_id: Tx queue used for Tx attempt | 377 | * @txq_id: Tx queue used for Tx attempt |
378 | * @frame_count: # frames attempted by Tx command | 378 | * @frame_count: # frames attempted by Tx command |
379 | * @wait_for_ba: Expect block-ack before next Tx reply | 379 | * @wait_for_ba: Expect block-ack before next Tx reply |
380 | * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx window | 380 | * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx win |
381 | * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx window | 381 | * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx win |
382 | * @bitmap1: High order, one bit for each frame pending ACK in Tx window | 382 | * @bitmap1: High order, one bit for each frame pending ACK in Tx win |
383 | * @rate_n_flags: Rate at which Tx was attempted | 383 | * @rate_n_flags: Rate at which Tx was attempted |
384 | * | 384 | * |
385 | * If REPLY_TX indicates that aggregation was attempted, driver must wait | 385 | * 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, | |||
645 | * the big buffer at end of command array | 645 | * the big buffer at end of command array |
646 | */ | 646 | */ |
647 | if (is_huge) | 647 | if (is_huge) |
648 | return q->n_window; /* must be power of 2 */ | 648 | return q->n_win; /* must be power of 2 */ |
649 | 649 | ||
650 | /* Otherwise, use normal size buffers */ | 650 | /* Otherwise, use normal size buffers */ |
651 | return index & (q->n_window - 1); | 651 | return index & (q->n_win - 1); |
652 | } | 652 | } |
653 | 653 | ||
654 | 654 | ||