diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-09 06:56:01 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-11 15:53:39 -0400 |
commit | 5825fe100d654fff89aa67a1e202af1f8a7f0ad0 (patch) | |
tree | 09c9b6f7e1f51a34fcc5d5030d6339b642e41057 /net/mac80211/mlme.c | |
parent | 3110bef78cb4282c58245bc8fd6d95d9ccb19749 (diff) |
mac80211: initialise queue QoS parameters at hw start
When hardware is started it might be in a confused state with
respect to queue QoS parameters. This patch changes mac80211
to set sane defaults right after the hardware is brought up.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index f754ad273f92..c22dcd605e48 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -539,32 +539,6 @@ static void ieee80211_send_refuse_measurement_request(struct ieee80211_sub_if_da | |||
539 | } | 539 | } |
540 | 540 | ||
541 | /* MLME */ | 541 | /* MLME */ |
542 | static void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata) | ||
543 | { | ||
544 | struct ieee80211_local *local = sdata->local; | ||
545 | struct ieee80211_tx_queue_params qparam; | ||
546 | int i; | ||
547 | |||
548 | if (!local->ops->conf_tx) | ||
549 | return; | ||
550 | |||
551 | memset(&qparam, 0, sizeof(qparam)); | ||
552 | |||
553 | qparam.aifs = 2; | ||
554 | |||
555 | if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ && | ||
556 | !(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)) | ||
557 | qparam.cw_min = 31; | ||
558 | else | ||
559 | qparam.cw_min = 15; | ||
560 | |||
561 | qparam.cw_max = 1023; | ||
562 | qparam.txop = 0; | ||
563 | |||
564 | for (i = 0; i < local_to_hw(local)->queues; i++) | ||
565 | local->ops->conf_tx(local_to_hw(local), i, &qparam); | ||
566 | } | ||
567 | |||
568 | static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, | 542 | static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, |
569 | struct ieee80211_sta_bss *bss) | 543 | struct ieee80211_sta_bss *bss) |
570 | { | 544 | { |