From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 25 Jan 2010 18:07:39 +0000 (+0100)
Subject: mac80211: fill jiffies/vif on filtered frames
X-Git-Tag: v2.6.34-rc1~233^2~49^2~159
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=18c949070b57d2cbcc0b25c5cfa003ece204e468;p=cascardo%2Flinux.git

mac80211: fill jiffies/vif on filtered frames

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>
---

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 800b6777e0ed..e57ad6b1d7ea 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;