diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-06-10 18:25:09 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2012-06-13 09:01:07 +0200 |
| commit | 49a4fc20df7fced31ffe4038b32b86a0438d1c27 (patch) | |
| tree | ae2f17f97dce8ebb570ac3b3e5da14950867644d /drivers/net/wireless | |
| parent | iwlwifi: turn on a lockdep assertion (diff) | |
| download | linux-dev-49a4fc20df7fced31ffe4038b32b86a0438d1c27.tar.xz linux-dev-49a4fc20df7fced31ffe4038b32b86a0438d1c27.zip | |
iwlwifi: don't modify the timer if we don't Tx
In fragmentation we don't update the write pointer of the
HW immediately. So we shouldn't modify the timer in that
case.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index d6a73179ebf1..b647eb4dca64 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -1354,7 +1354,8 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, skb->data + hdr_len, secondlen); /* start timer if queue currently empty */ - if (q->read_ptr == q->write_ptr && trans_pcie->wd_timeout) + if (txq->need_update && q->read_ptr == q->write_ptr && + trans_pcie->wd_timeout) mod_timer(&txq->stuck_timer, jiffies + trans_pcie->wd_timeout); /* Tell device the write index *just past* this latest filled TFD */ |