summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-01-26 16:39:55 -0800
committerJohannes Berg <johannes.berg@intel.com>2013-01-29 20:45:31 +0100
commit3b144658bc7be5f7fa68d13ba24afb4c24489965 (patch)
treefac04da654900336846ced78bacad067ab59fc80 /net/mac80211/mesh.c
parent8dcf011ab05bf1fdd9323a9c460bdd0e325b99e1 (diff)
downloadop-kernel-dev-3b144658bc7be5f7fa68d13ba24afb4c24489965.zip
op-kernel-dev-3b144658bc7be5f7fa68d13ba24afb4c24489965.tar.gz
mac80211: dynamic short slot time for MBSSs
The standard mandates mesh STAs to set the ERP Short Slot Time capability info bit in beacons to 0. Even though this is their way of disallowing short slot time for mesh STAs, there should be no harm in enabling it if we determine all STAs in the current MBSS support ERP rates. Increases throughput about 20% for legacy rates when enabled. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 694e273..f920da1 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -629,11 +629,6 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
sdata->vif.bss_conf.basic_rates =
ieee80211_mandatory_rates(local, band);
- if (band == IEEE80211_BAND_5GHZ) {
- sdata->vif.bss_conf.use_short_slot = true;
- changed |= BSS_CHANGED_ERP_SLOT;
- }
-
ieee80211_bss_info_change_notify(sdata, changed);
netif_carrier_on(sdata->dev);
OpenPOWER on IntegriCloud