From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Wey-Yi Guy <wey-yi.w.guy@intel.com>
Subject: [PATCH 7/8] iwlagn: pending frames musn't be incremented if agg is on
Date: Tue, 20 Sep 2011 15:37:26 -0700 [thread overview]
Message-ID: <1316558247-10018-8-git-send-email-wey-yi.w.guy@intel.com> (raw)
In-Reply-To: <1316558247-10018-1-git-send-email-wey-yi.w.guy@intel.com>
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
During my works on the transport layer I removed code that updated
a local variable (is_agg) that is needed to keep the pending_frames
count up to date. Fix this.
Also, there should be no way to have a packet with TX_CTL_AMPDU set
while the internal aggregation state machine is not in AGG_ON state.
Add a WARN_ON to ensure that.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 3 +++
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index abb702d..8c0f07f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -313,6 +313,9 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
iwl_sta_modify_sleep_tx_count(priv, sta_id, 1);
}
+ if (info->flags & IEEE80211_TX_CTL_AMPDU)
+ is_agg = true;
+
/* irqs already disabled/saved above when locking priv->shrd->lock */
spin_lock(&priv->shrd->sta_lock);
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index dbb7eb3..3e69e87 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1096,8 +1096,8 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
hdr->seq_ctrl |= cpu_to_le16(seq_number);
seq_number += 0x10;
/* aggregation is on for this <sta,tid> */
- if (info->flags & IEEE80211_TX_CTL_AMPDU &&
- tid_data->agg.state == IWL_AGG_ON) {
+ if (info->flags & IEEE80211_TX_CTL_AMPDU) {
+ WARN_ON(tid_data->agg.state != IWL_AGG_ON);
txq_id = tid_data->agg.txq_id;
is_agg = true;
}
--
1.7.0.4
next prev parent reply other threads:[~2011-09-20 23:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-20 22:37 [PATCH 0/8] update for 3.2 Wey-Yi Guy
2011-09-20 22:37 ` [PATCH 1/8] iwlagn: move scan code to scan file Wey-Yi Guy
2011-09-20 22:37 ` [PATCH 2/8] iwlagn: remove common station priv Wey-Yi Guy
2011-09-20 22:37 ` [PATCH 3/8] iwlagn: split remain-on-channel Wey-Yi Guy
2011-09-20 22:37 ` [PATCH 4/8] iwlagn: remove the callback in host commands Wey-Yi Guy
2011-09-20 22:37 ` [PATCH 5/8] iwlagn: simplify the iwl_device_cmd layout Wey-Yi Guy
2011-09-20 22:37 ` [PATCH 6/8] iwlagn: remove uneeded declaration Wey-Yi Guy
2011-09-20 22:37 ` Wey-Yi Guy [this message]
2011-09-20 23:51 ` [PATCH 7/8] iwlagn: pending frames musn't be incremented if agg is on Daniel Halperin
2011-09-21 0:35 ` wwguy
2011-09-21 5:06 ` Grumbach, Emmanuel
2011-09-20 22:37 ` [PATCH 8/8] iwlagn: remove duplicate list init Wey-Yi Guy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316558247-10018-8-git-send-email-wey-yi.w.guy@intel.com \
--to=wey-yi.w.guy@intel.com \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox