|
@@ -729,9 +729,7 @@ static void ieee80211_release_reorder_frames(struct ieee80211_sub_if_data *sdata
|
|
|
lockdep_assert_held(&tid_agg_rx->reorder_lock);
|
|
|
|
|
|
while (ieee80211_sn_less(tid_agg_rx->head_seq_num, head_seq_num)) {
|
|
|
- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
|
|
|
- tid_agg_rx->ssn) %
|
|
|
- tid_agg_rx->buf_size;
|
|
|
+ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
|
|
|
ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,
|
|
|
frames);
|
|
|
}
|
|
@@ -757,8 +755,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata,
|
|
|
lockdep_assert_held(&tid_agg_rx->reorder_lock);
|
|
|
|
|
|
/* release the buffer until next missing frame */
|
|
|
- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
|
|
|
- tid_agg_rx->ssn) % tid_agg_rx->buf_size;
|
|
|
+ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
|
|
|
if (!tid_agg_rx->reorder_buf[index] &&
|
|
|
tid_agg_rx->stored_mpdu_num) {
|
|
|
/*
|
|
@@ -793,15 +790,11 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata,
|
|
|
} else while (tid_agg_rx->reorder_buf[index]) {
|
|
|
ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,
|
|
|
frames);
|
|
|
- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
|
|
|
- tid_agg_rx->ssn) %
|
|
|
- tid_agg_rx->buf_size;
|
|
|
+ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
|
|
|
}
|
|
|
|
|
|
if (tid_agg_rx->stored_mpdu_num) {
|
|
|
- j = index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
|
|
|
- tid_agg_rx->ssn) %
|
|
|
- tid_agg_rx->buf_size;
|
|
|
+ j = index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
|
|
|
|
|
|
for (; j != (index - 1) % tid_agg_rx->buf_size;
|
|
|
j = (j + 1) % tid_agg_rx->buf_size) {
|
|
@@ -861,8 +854,7 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_sub_if_data *sdata
|
|
|
|
|
|
/* Now the new frame is always in the range of the reordering buffer */
|
|
|
|
|
|
- index = ieee80211_sn_sub(mpdu_seq_num,
|
|
|
- tid_agg_rx->ssn) % tid_agg_rx->buf_size;
|
|
|
+ index = mpdu_seq_num % tid_agg_rx->buf_size;
|
|
|
|
|
|
/* check if we already stored this frame */
|
|
|
if (tid_agg_rx->reorder_buf[index]) {
|