From 56ff395348ce6e8e3981c2b6e4442024a935b507 Mon Sep 17 00:00:00 2001
From: Helmut Schaa <hschaa@suse.de>
Date: Fri, 21 Dec 2007 15:16:35 +0100
Subject: [PATCH] --- yaml --- r: 78690 b: refs/heads/master c:
 69f817b654d683265118188bbfb8bc0d8978cce6 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f91c1881db90..db354ac1ee39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6666351df90656677723f8232b3fdd26a500e51e
+refs/heads/master: 69f817b654d683265118188bbfb8bc0d8978cce6
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 505159f8dffc..306e6fc25d8f 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1746,6 +1746,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
 				       prev->dev->name);
 			continue;
 		}
+		rx.fc = le16_to_cpu(hdr->frame_control);
 		rx.skb = skb_new;
 		rx.dev = prev->dev;
 		rx.sdata = prev;
@@ -1754,6 +1755,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
 		prev = sdata;
 	}
 	if (prev) {
+		rx.fc = le16_to_cpu(hdr->frame_control);
 		rx.skb = skb;
 		rx.dev = prev->dev;
 		rx.sdata = prev;