From 56c3c2adb629e7d1b72c364c0a0001a9d2321fe1 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Wed, 14 Nov 2012 23:38:08 +0200 Subject: [PATCH] --- yaml --- r: 341575 b: refs/heads/master c: 6ca6ebc1606c6fa7e8931445e84f21f4843e3bab h: refs/heads/master i: 341573: 00ebcbd84a4e604804b3853ac7516fc66d801675 341571: 139639670acd03d4c62a3c2de69b5ed9b6edefd2 341567: d496e863b2d7cf0a2e5e20d775a093790301f9a2 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/pcie/internal.h | 2 +- trunk/drivers/net/wireless/iwlwifi/pcie/tx.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ac68c3058cf5..bab522471ab2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 686681b066fed089d14c9cee60d9d95680da6cdb +refs/heads/master: 6ca6ebc1606c6fa7e8931445e84f21f4843e3bab diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h b/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h index 0d61e91c0a6f..e6b6dba982c7 100644 --- a/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h +++ b/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h @@ -423,7 +423,7 @@ static inline void iwl_stop_queue(struct iwl_trans *trans, txq->q.id); } -static inline int iwl_queue_used(const struct iwl_queue *q, int i) +static inline bool iwl_queue_used(const struct iwl_queue *q, int i) { return q->write_ptr >= q->read_ptr ? (i >= q->read_ptr && i < q->write_ptr) : diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/tx.c b/trunk/drivers/net/wireless/iwlwifi/pcie/tx.c index ba2a78c150bb..40e5a6d6e6d3 100644 --- a/trunk/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/pcie/tx.c @@ -918,7 +918,7 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn, * the last we will free. This one must be used */ last_to_free = iwl_queue_dec_wrap(tfd_num, q->n_bd); - if (iwl_queue_used(q, last_to_free) == 0) { + if (!iwl_queue_used(q, last_to_free)) { IWL_ERR(trans, "%s: Read index for DMA queue txq id (%d), last_to_free %d is out of range [0-%d] %d %d.\n", __func__, txq_id, last_to_free, q->n_bd, @@ -969,7 +969,7 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx) lockdep_assert_held(&txq->lock); - if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 0)) { + if ((idx >= q->n_bd) || (!iwl_queue_used(q, idx))) { IWL_ERR(trans, "%s: Read index for DMA queue txq id (%d), index %d is out of range [0-%d] %d %d.\n", __func__, txq_id, idx, q->n_bd,