Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 707e6343 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

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: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 24a8fdad

net/mac80211/rx.c

+0 −24
Original line number Diff line number Diff line
@@ -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;

}



/*