From b84691ec809c5deb4a420784c915ac4065b77f6e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 13 Dec 2010 08:40:51 +0100 Subject: [PATCH] --- yaml --- r: 225261 b: refs/heads/master c: caabf2bf228cd6b1c6197dbb25bddb4682d30c9d h: refs/heads/master i: 225259: a22818d4bf6fe5b420df5dc18f5ae9e23d720ae3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 356a2d134d0f..e4e5e0ae6f39 100644 --- 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 index ce4891ea4889..0f373be9ef8c 100644 --- 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)