diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-01-17 01:38:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-01-17 01:38:07 +0000 |
| commit | 9169dca26cd449a06a15ebe6c03e81890c86ead7 (patch) | |
| tree | f229079fb188e5c3e9fda0d76225a9ca5ea5e74f /package/mac80211/patches/540-short_slot_handling.patch | |
| parent | 6ddb26422e7ff7de02fda8018c693019fb009fde (diff) | |
| download | upstream-9169dca26cd449a06a15ebe6c03e81890c86ead7.tar.gz upstream-9169dca26cd449a06a15ebe6c03e81890c86ead7.tar.bz2 upstream-9169dca26cd449a06a15ebe6c03e81890c86ead7.zip | |
mac80211: upgrade to compat-wireless 2010-01-15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19176 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/540-short_slot_handling.patch')
| -rw-r--r-- | package/mac80211/patches/540-short_slot_handling.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/package/mac80211/patches/540-short_slot_handling.patch b/package/mac80211/patches/540-short_slot_handling.patch deleted file mode 100644 index 70341473e1..0000000000 --- a/package/mac80211/patches/540-short_slot_handling.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/net/mac80211/mlme.c -+++ b/net/mac80211/mlme.c -@@ -670,6 +670,8 @@ static u32 ieee80211_handle_bss_capabili - } - - use_short_slot = !!(capab & WLAN_CAPABILITY_SHORT_SLOT_TIME); -+ if (sdata->local->hw.conf.channel->band == IEEE80211_BAND_5GHZ) -+ use_short_slot = true; - - if (use_protection != bss_conf->use_cts_prot) { - bss_conf->use_cts_prot = use_protection; ---- a/net/mac80211/cfg.c -+++ b/net/mac80211/cfg.c -@@ -1087,6 +1087,13 @@ static int ieee80211_change_bss(struct w - params->use_short_preamble; - changed |= BSS_CHANGED_ERP_PREAMBLE; - } -+ -+ if (!sdata->vif.bss_conf.use_short_slot && -+ sdata->local->hw.conf.channel->band == IEEE80211_BAND_5GHZ) { -+ sdata->vif.bss_conf.use_short_slot = true; -+ changed |= BSS_CHANGED_ERP_SLOT; -+ } -+ - if (params->use_short_slot_time >= 0) { - sdata->vif.bss_conf.use_short_slot = - params->use_short_slot_time; |