OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: notify the driver on reordering buffer timeout 

When frames time out in the reordering buffer, it is a
good indication that something went wrong and the driver
may want to know about that to take action or trigger
debug flows.
It is pointless to notify the driver about each frame that
is released. Notify each time the timer fires.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Emmanuel Grumbach 2015-04-20 22:53:38 +03:00 committed by Johannes Berg
parent 6382246e89
commit b497de63ad
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/mac80211.h
View File

@ -338,11 +338,15 @@ enum ieee80211_bss_change {
* @RSSI_EVENT: AP's rssi crossed the a threshold set by the driver.
* @MLME_EVENT: event related to MLME
* @BAR_RX_EVENT: a BAR was received
* @BA_FRAME_TIMEOUT: Frames were released from the reordering buffer because
* they timed out. This won't be called for each frame released, but only
* once each time the timeout triggers.
*/
enum ieee80211_event_type {
RSSI_EVENT,
MLME_EVENT,
BAR_RX_EVENT,
BA_FRAME_TIMEOUT,
};
/**
@ -405,7 +409,7 @@ struct ieee80211_mlme_event {
* struct ieee80211_ba_event - data attached for BlockAck related events
* @sta: pointer to the &ieee80211_sta to which this event relates
* @tid: the tid
* @ssn: the starting sequence number
* @ssn: the starting sequence number (for %BAR_RX_EVENT)
*/
struct ieee80211_ba_event {
struct ieee80211_sta *sta;
@ -418,7 +422,7 @@ struct ieee80211_ba_event {
* @type: The event itself. See &enum ieee80211_event_type.
* @rssi: relevant if &type is %RSSI_EVENT
* @mlme: relevant if &type is %AUTH_EVENT
* @ba: relevant if &type is %BAR_RX_EVENT
* @ba: relevant if &type is %BAR_RX_EVENT or %BA_FRAME_TIMEOUT
* @u:union holding the fields above
*/
struct ieee80211_event {

9
net/mac80211/rx.c
View File

@ -3229,6 +3229,15 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
ieee80211_sta_reorder_release(sta->sdata, tid_agg_rx, &frames);
spin_unlock(&tid_agg_rx->reorder_lock);
if (!skb_queue_empty(&frames)) {
struct ieee80211_event event = {
.type = BA_FRAME_TIMEOUT,
.u.ba.tid = tid,
.u.ba.sta = &sta->sta,
};
drv_event_callback(rx.local, rx.sdata, &event);
}
ieee80211_rx_handlers(&rx, &frames);
}