summaryrefslogtreecommitdiff
path: root/net/mac80211/status.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-01-25 19:07:39 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-01-25 16:40:49 -0500
commit18c949070b57d2cbcc0b25c5cfa003ece204e468 (patch)
tree7f4c82063105476ba96a78a7a9f1d91248d8193f /net/mac80211/status.c
parentf2982181e0531c0b12752336a1578626f99e7828 (diff)
mac80211: fill jiffies/vif on filtered framesmaster-2010-01-25
Filtered frames not only need their control information cleared to avoid wrong checks, but also need to have jiffies and vif assigned so they can be processed or expired. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/status.c')
-rw-r--r--net/mac80211/status.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 800b6777e0e..e57ad6b1d7e 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -53,6 +53,9 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
* modified/encrypted again.
*/
memset(&info->control, 0, sizeof(info->control));
+
+ info->control.jiffies = jiffies;
+ info->control.vif = &sta->sdata->vif;
info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING |
IEEE80211_TX_INTFL_RETRANSMISSION;