diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-20 18:14:35 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-20 18:14:35 +0000 |
| commit | 970252faf84b05f3e9abd5c401e13a9c625bfd92 (patch) | |
| tree | 401b89fb3739f7cee09c51ce1bd45eb32498f7a5 /package/mac80211/patches/463-ath5k_fix_slottime.patch | |
| parent | 79829783916d443ca560857b922168be04785cea (diff) | |
| download | upstream-970252faf84b05f3e9abd5c401e13a9c625bfd92.tar.gz upstream-970252faf84b05f3e9abd5c401e13a9c625bfd92.tar.bz2 upstream-970252faf84b05f3e9abd5c401e13a9c625bfd92.zip | |
mac80211: update to wireless-testing 2011-04-19, contains several beacon related fixes for ath9k
SVN-Revision: 26744
Diffstat (limited to 'package/mac80211/patches/463-ath5k_fix_slottime.patch')
| -rw-r--r-- | package/mac80211/patches/463-ath5k_fix_slottime.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/package/mac80211/patches/463-ath5k_fix_slottime.patch b/package/mac80211/patches/463-ath5k_fix_slottime.patch deleted file mode 100644 index 3f38ee392c..0000000000 --- a/package/mac80211/patches/463-ath5k_fix_slottime.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/ath5k.h -+++ b/drivers/net/wireless/ath/ath5k/ath5k.h -@@ -1057,6 +1057,7 @@ struct ath5k_hw { - u8 ah_coverage_class; - bool ah_ack_bitrate_high; - u8 ah_bwmode; -+ bool ah_short_slot; - - /* Antenna Control */ - u32 ah_ant_ctl[AR5K_EEPROM_N_MODES][AR5K_ANT_MAX]; ---- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c -+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c -@@ -277,6 +277,15 @@ ath5k_bss_info_changed(struct ieee80211_ - if (changes & BSS_CHANGED_BEACON_INT) - sc->bintval = bss_conf->beacon_int; - -+ if (changes & BSS_CHANGED_ERP_SLOT) { -+ int slot_time; -+ -+ ah->ah_short_slot = bss_conf->use_short_slot; -+ slot_time = ath5k_hw_get_default_slottime(ah) + -+ 3 * ah->ah_coverage_class; -+ ath5k_hw_set_ifs_intervals(ah, slot_time); -+ } -+ - if (changes & BSS_CHANGED_ASSOC) { - avf->assoc = bss_conf->assoc; - if (bss_conf->assoc) ---- 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_slotti - 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; - } |