Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 306665
b: refs/heads/master
c: a46c3e4
h: refs/heads/master
i:
  306663: b78fd5d
v: v3
  • Loading branch information
Emmanuel Grumbach authored and John W. Linville committed May 15, 2012
1 parent 4c63712 commit 7993183
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 11e116517be13da44da99f9532cfc23d08d9efb4
refs/heads/master: a46c3e424b2325c2592b65999466d4445e410b24
7 changes: 3 additions & 4 deletions trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1300,10 +1300,11 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
(u8 *) &ba_resp->sta_addr_lo32,
ba_resp->sta_id);
IWL_DEBUG_TX_REPLY(priv, "TID = %d, SeqCtl = %d, bitmap = 0x%llx, "
"scd_flow = %d, scd_ssn = %d\n",
"scd_flow = %d, scd_ssn = %d sent:%d, acked:%d\n",
ba_resp->tid, le16_to_cpu(ba_resp->seq_ctl),
(unsigned long long)le64_to_cpu(ba_resp->bitmap),
scd_flow, ba_resp_scd_ssn);
scd_flow, ba_resp_scd_ssn, ba_resp->txed,
ba_resp->txed_2_done);

/* Mark that the expected block-ack response arrived */
agg->wait_for_ba = false;
Expand All @@ -1319,8 +1320,6 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
*/
ba_resp->txed = ba_resp->txed_2_done;
}
IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",
ba_resp->txed, ba_resp->txed_2_done);

priv->tid_data[sta_id][tid].next_reclaimed = ba_resp_scd_ssn;

Expand Down

0 comments on commit 7993183

Please sign in to comment.