diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-19 21:58:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 21:58:41 +0100 |
| commit | 031cf0e94c9c8302a4592707939d6c2039f17f28 (patch) | |
| tree | 02f3f0d3f89f03217bdb83530af30a95c9ab6191 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | b43: N-PHY: drop unused definition, uncomment needed call (diff) | |
| parent | zd1211rw: adding 0409:0248 to supported device list (diff) | |
| download | linux-031cf0e94c9c8302a4592707939d6c2039f17f28.tar.xz linux-031cf0e94c9c8302a4592707939d6c2039f17f28.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 42f9b17327c3..70f0e79c8e4a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -712,7 +712,7 @@ extern void iwl_txq_ctx_stop(struct iwl_priv *priv); extern int iwl_queue_space(const struct iwl_queue *q); static inline int iwl_queue_used(const struct iwl_queue *q, int i) { - return q->write_ptr > q->read_ptr ? + return q->write_ptr >= q->read_ptr ? (i >= q->read_ptr && i < q->write_ptr) : !(i < q->read_ptr && i >= q->write_ptr); } |