---

yaml
---
r: 203071
b: refs/heads/master
c: 9a2af88
h: refs/heads/master
i:
  203069: 1cdeda4
  203067: 893f872
  203063: b71afa7
  203055: 9007dcc
  203039: 3319761
  203007: e8902f6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4a0ab3487d847ce8044a2d49f82391ea7d6489e
+refs/heads/master: 9a2af8892a74573cec4bea2149843a93442a12de

trunk/drivers/net/wireless/ath/ath9k/mac.c

@@ -555,8 +555,13 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
 		REGWRITE_BUFFER_FLUSH(ah);
 		DISABLE_REGWRITE_BUFFER(ah);
 
-		/* cwmin and cwmax should be 0 for beacon queue */
-		if (AR_SREV_9300_20_OR_LATER(ah)) {
+		/*
+		 * cwmin and cwmax should be 0 for beacon queue
+		 * but not for IBSS as we would create an imbalance
+		 * on beaconing fairness for participating nodes.
+		 */
+		if (AR_SREV_9300_20_OR_LATER(ah) &&
+		    ah->opmode != NL80211_IFTYPE_ADHOC) {
 			REG_WRITE(ah, AR_DLCL_IFS(q), SM(0, AR_D_LCL_IFS_CWMIN)
 				  | SM(0, AR_D_LCL_IFS_CWMAX)
 				  | SM(qi->tqi_aifs, AR_D_LCL_IFS_AIFS));