BTW, tomorrow I will send a fix for a bug in mac80211: a race in tx agg stop that made this warn_on trigger from time to time.
>
> From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
>
> Add more data when inconsistencies occur in the AGG state machine.
>
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
> ---
> drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 12 ++++++++++--
> 1 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
> b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
> index 527e795..2ac7542 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
> @@ -1099,13 +1099,21 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans,
> struct sk_buff *skb,
> hdr->seq_ctrl = hdr->seq_ctrl &
> cpu_to_le16(IEEE80211_SCTL_FRAG);
> 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) {
> - WARN_ON_ONCE(tid_data->agg.state != IWL_AGG_ON);
> + if (WARN_ON_ONCE(tid_data->agg.state != IWL_AGG_ON)) {
> + IWL_ERR(trans, "TX_CTL_AMPDU while not in AGG:"
> + " Tx flags = 0x%08x, agg.state = %d",
> + info->flags, tid_data->agg.state);
> + IWL_ERR(trans, "sta_id = %d, tid = %d "
> + "txq_id = %d, seq_num = %d", sta_id,
> + tid, tid_data->agg.txq_id,
> + seq_number >> 4);
> + }
> txq_id = tid_data->agg.txq_id;
> is_agg = true;
> }
> + seq_number += 0x10;
> }
>
> /* Copy MAC header from skb into command buffer */
> --
> 1.7.0.4
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
