---

yaml --- r: 225261 b: refs/heads/master c: caabf2b h: refs/heads/master i: 225259: a22818d v: v3
git-mirror · Dec 13, 2010 · b84691e · b84691e
1 parent 00ec6e8
commit b84691e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4357c6bfc83d4e8b1f18588f640be27bf4b0d0f7
+refs/heads/master: caabf2bf228cd6b1c6197dbb25bddb4682d30c9d
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -808,7 +808,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
 	if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
 		acktimeout += 64 - sifstime - ah->slottime;
 
-	ath9k_hw_setslottime(ah, slottime);
+	ath9k_hw_setslottime(ah, ah->slottime);
 	ath9k_hw_set_ack_timeout(ah, acktimeout);
 	ath9k_hw_set_cts_timeout(ah, acktimeout);
 	if (ah->globaltxtimeout != (u32) -1)