diff --git a/[refs] b/[refs] index 9ea58a05fae3..6f3db9d4cb08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caf1eae206688210f61f3b48627ce4ca3c709784 +refs/heads/master: 334df731976ee4042c9bf18b2eec9c0a71f45389 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index 1f06b31e21c1..b04a4378adcc 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -652,7 +652,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw, set_release_timer: mod_timer(&tid_agg_rx->reorder_timer, - tid_agg_rx->reorder_time[j] + + tid_agg_rx->reorder_time[j] + 1 + HT_RX_REORDER_BUF_TIMEOUT); } else { del_timer(&tid_agg_rx->reorder_timer);