diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-02-10 15:25:45 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-13 13:45:32 -0500 |
commit | 20ad19d0ac7389b04b566ebf3e0e497974f63ffa (patch) | |
tree | af1a3d93f6f16f20f514fb940003dd0a85aef196 /net/mac80211/rx.c | |
parent | 8b1c814d65ae3219ee19d39ad6097f3d5249c23d (diff) |
mac80211: fix RX aggregation timeouts
The values are in TUs (1.024ms), not ms.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5a733c52f889..f34cc66d3f4b 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -1673,11 +1673,9 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx) | |||
1673 | start_seq_num = le16_to_cpu(bar->start_seq_num) >> 4; | 1673 | start_seq_num = le16_to_cpu(bar->start_seq_num) >> 4; |
1674 | 1674 | ||
1675 | /* reset session timer */ | 1675 | /* reset session timer */ |
1676 | if (tid_agg_rx->timeout) { | 1676 | if (tid_agg_rx->timeout) |
1677 | unsigned long expires = | 1677 | mod_timer(&tid_agg_rx->session_timer, |
1678 | jiffies + (tid_agg_rx->timeout / 1000) * HZ; | 1678 | TU_TO_EXP_TIME(tid_agg_rx->timeout)); |
1679 | mod_timer(&tid_agg_rx->session_timer, expires); | ||
1680 | } | ||
1681 | 1679 | ||
1682 | /* manage reordering buffer according to requested */ | 1680 | /* manage reordering buffer according to requested */ |
1683 | /* sequence number */ | 1681 | /* sequence number */ |
@@ -2414,11 +2412,9 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, | |||
2414 | /* new un-ordered ampdu frame - process it */ | 2412 | /* new un-ordered ampdu frame - process it */ |
2415 | 2413 | ||
2416 | /* reset session timer */ | 2414 | /* reset session timer */ |
2417 | if (tid_agg_rx->timeout) { | 2415 | if (tid_agg_rx->timeout) |
2418 | unsigned long expires = | 2416 | mod_timer(&tid_agg_rx->session_timer, |
2419 | jiffies + (tid_agg_rx->timeout / 1000) * HZ; | 2417 | TU_TO_EXP_TIME(tid_agg_rx->timeout)); |
2420 | mod_timer(&tid_agg_rx->session_timer, expires); | ||
2421 | } | ||
2422 | 2418 | ||
2423 | /* if this mpdu is fragmented - terminate rx aggregation session */ | 2419 | /* if this mpdu is fragmented - terminate rx aggregation session */ |
2424 | sc = le16_to_cpu(hdr->seq_ctrl); | 2420 | sc = le16_to_cpu(hdr->seq_ctrl); |