summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-12-30 17:29:53 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-01-04 14:46:13 -0500
commit707e634326448190bfe2d937c44ec05c8dea63c4 (patch)
tree5aa8d4976d01b7b189c2e1dd858a3012347d0158 /net/mac80211
parent24a8fdad35835e8d71f7c4b978a246fafed2e7b4 (diff)
downloadlinux-707e634326448190bfe2d937c44ec05c8dea63c4.tar.gz
linux-707e634326448190bfe2d937c44ec05c8dea63c4.tar.bz2
linux-707e634326448190bfe2d937c44ec05c8dea63c4.zip
Revert "mac80211: temporarily disable reorder release timer"
This reverts enables the reorder release timer once again. The issues laid out in: <http://www.spinics.net/lists/linux-wireless/msg57214.html> Have been addressed by: mac80211: serialize rx path workers mac80211: ignore PSM bit of reordered frames Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 12cbb4df81aa..9595e564badd 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -628,26 +628,6 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
tid_agg_rx->buf_size;
}
- /*
- * Disable the reorder release timer for now.
- *
- * The current implementation lacks a proper locking scheme
- * which would protect vital statistic and debug counters
- * from being updated by two different but concurrent BHs.
- *
- * More information about the topic is available from:
- * - thread: http://marc.info/?t=128635927000001
- *
- * What was wrong:
- * => http://marc.info/?l=linux-wireless&m=128636170811964
- * "Basically the thing is that until your patch, the data
- * in the struct didn't actually need locking because it
- * was accessed by the RX path only which is not concurrent."
- *
- * List of what needs to be fixed:
- * => http://marc.info/?l=linux-wireless&m=128656352920957
- *
-
if (tid_agg_rx->stored_mpdu_num) {
j = index = seq_sub(tid_agg_rx->head_seq_num,
tid_agg_rx->ssn) % tid_agg_rx->buf_size;
@@ -666,10 +646,6 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
} else {
del_timer(&tid_agg_rx->reorder_timer);
}
- */
-
-set_release_timer:
- return;
}
/*