aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/pcu.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-09 23:10:21 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-04-12 16:59:09 -0400
commitb1ad1b6febb7772583c98d9a879fbbdb82a726a7 (patch)
tree9a6cdf99db5feeed59e9faf458007477552f5817 /drivers/net/wireless/ath/ath5k/pcu.c
parent488a50176c169eb36544b4f970c8bba68ede30a1 (diff)
downloadkernel_samsung_smdk4412-b1ad1b6febb7772583c98d9a879fbbdb82a726a7.zip
kernel_samsung_smdk4412-b1ad1b6febb7772583c98d9a879fbbdb82a726a7.tar.gz
kernel_samsung_smdk4412-b1ad1b6febb7772583c98d9a879fbbdb82a726a7.tar.bz2
ath5k: fix slot time handling
Set the slot time based on the mac80211 short slot vs long slot setting instead of just forcing long slot for all CCK-enabled channels. This slightly improves 802.11g mode performance in in my tests. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/pcu.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/pcu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index e342e47..71b60b7 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -151,9 +151,9 @@ unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah)
slot_time = AR5K_INIT_SLOT_TIME_QUARTER_RATE;
break;
case AR5K_BWMODE_DEFAULT:
- slot_time = AR5K_INIT_SLOT_TIME_DEFAULT;
default:
- if (channel->hw_value & CHANNEL_CCK)
+ slot_time = AR5K_INIT_SLOT_TIME_DEFAULT;
+ if ((channel->hw_value & CHANNEL_CCK) && !ah->ah_short_slot)
slot_time = AR5K_INIT_SLOT_TIME_B;
break;
}