summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorAlexander Bondar2013-01-22 15:52:23 +0100
committerJohannes Berg2013-03-25 14:43:05 +0100
commit219c38674c262378ec411dd8318ebfd199fbce8d (patch)
treeebe6f4a191c5ddf4286b195a35e709bf1228af7f /net/mac80211/mlme.c
parentmac80211: ibss: use beacon_data struct for beacon and probe response (diff)
downloadkernel-qcow2-linux-219c38674c262378ec411dd8318ebfd199fbce8d.tar.gz
kernel-qcow2-linux-219c38674c262378ec411dd8318ebfd199fbce8d.tar.xz
kernel-qcow2-linux-219c38674c262378ec411dd8318ebfd199fbce8d.zip
mac80211: allow drivers to set default uAPSD parameters
mac80211 currently sets uAPSD parameters to have VO AC trigger- and delivery-enabled, with maximum service period length. Allow drivers to change these default settings since different uAPSD client implementations may handle errors differently and be able to recover from some errors. Note: some APs may not function correctly if one or all ACs are trigger- and delivery-enabled, see http://thread.gmane.org/gmane.linux.kernel.wireless.general/93577. We retested with this AP and later firmware doesn't have this bug any more. Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 8b3e852d6032..9958cb7df8f1 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3525,8 +3525,8 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
ifmgd->flags = 0;
ifmgd->powersave = sdata->wdev.ps;
- ifmgd->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
- ifmgd->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
+ ifmgd->uapsd_queues = sdata->local->hw.uapsd_queues;
+ ifmgd->uapsd_max_sp_len = sdata->local->hw.uapsd_max_sp_len;
ifmgd->p2p_noa_index = -1;
mutex_init(&ifmgd->mtx);