diff options
| author | Arve Hjønnevåg <arve@android.com> | 2010-03-10 16:38:33 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2010-03-10 16:38:33 -0800 |
| commit | 67078ecae3edb5b4657dcb9f67f744ecccd18a97 (patch) | |
| tree | 90333318a7229fd977881577e0d19fd8e7e26423 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | dc136618cb23810dd3d4adfcb836b289cd528b4f (diff) | |
| parent | 7f5e918e62cbc9ac27c2f47d3c3dd4b86f67ff0e (diff) | |
Merge commit 'v2.6.32.9' into android-2.6.32
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 028d50599550..cea2ee25722c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -703,7 +703,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); } @@ -1149,7 +1149,7 @@ struct iwl_priv { u32 last_beacon_time; u64 last_tsf; - /* eeprom */ + /* eeprom -- this is in the card's little endian byte order */ u8 *eeprom; int nvm_device_type; struct iwl_eeprom_calib_info *calib_info; |