diff options
| author | Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> | 2013-07-08 10:55:51 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-07-16 02:58:04 -0400 |
| commit | 438b61b77082e70d2a408cc77b8c5faac312e940 (patch) | |
| tree | 2a4575f29605a16fc051a6b81c71d0f3b31d7d77 /net/mac80211/rc80211_minstrel_ht.c | |
| parent | 3de805cf965d69c8d3d7d69368d5fd2c925a2d5a (diff) | |
mac80211: fix timing for 5 MHz and 10 MHz channels
according to IEEE 802.11-2012 section 18, various timings change
when using 5 MHz and 10 MHz. Reflect this by using a "shift" when
calculating durations.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 52562973fbd1..7475a7a33797 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c | |||
| @@ -862,8 +862,9 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, | |||
| 862 | mi->sta = sta; | 862 | mi->sta = sta; |
| 863 | mi->stats_update = jiffies; | 863 | mi->stats_update = jiffies; |
| 864 | 864 | ||
| 865 | ack_dur = ieee80211_frame_duration(sband->band, 10, 60, 1, 1); | 865 | ack_dur = ieee80211_frame_duration(sband->band, 10, 60, 1, 1, 0); |
| 866 | mi->overhead = ieee80211_frame_duration(sband->band, 0, 60, 1, 1) + ack_dur; | 866 | mi->overhead = ieee80211_frame_duration(sband->band, 0, 60, 1, 1, 0); |
| 867 | mi->overhead += ack_dur; | ||
| 867 | mi->overhead_rtscts = mi->overhead + 2 * ack_dur; | 868 | mi->overhead_rtscts = mi->overhead + 2 * ack_dur; |
| 868 | 869 | ||
| 869 | mi->avg_ampdu_len = MINSTREL_FRAC(1, 1); | 870 | mi->avg_ampdu_len = MINSTREL_FRAC(1, 1); |