The values are in TUs (1.024ms), not ms. Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> --- net/mac80211/rx.c | 4 ++-- net/mac80211/sta_info.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- wireless-testing.orig/net/mac80211/rx.c 2009-01-26 16:56:28.000000000 +0100 +++ wireless-testing/net/mac80211/rx.c 2009-01-26 16:56:46.000000000 +0100 @@ -1652,7 +1652,7 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_ /* reset session timer */ if (tid_agg_rx->timeout) { unsigned long expires = - jiffies + (tid_agg_rx->timeout / 1000) * HZ; + jiffies + (tid_agg_rx->timeout / 1024) * HZ; mod_timer(&tid_agg_rx->session_timer, expires); } @@ -2393,7 +2393,7 @@ static u8 ieee80211_rx_reorder_ampdu(str /* reset session timer */ if (tid_agg_rx->timeout) { unsigned long expires = - jiffies + (tid_agg_rx->timeout / 1000) * HZ; + jiffies + (tid_agg_rx->timeout / 1024) * HZ; mod_timer(&tid_agg_rx->session_timer, expires); } --- wireless-testing.orig/net/mac80211/sta_info.h 2009-01-26 16:55:59.000000000 +0100 +++ wireless-testing/net/mac80211/sta_info.h 2009-01-26 16:56:10.000000000 +0100 @@ -88,7 +88,7 @@ struct tid_ampdu_tx { * @stored_mpdu_num: number of MPDUs in reordering buffer * @ssn: Starting Sequence Number expected to be aggregated. * @buf_size: buffer size for incoming A-MPDUs - * @timeout: reset timer value. + * @timeout: reset timer value (in TUs). * @dialog_token: dialog token for aggregation session */ struct tid_ampdu_rx { -- -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html