From a6b80158ef84148fb48c2b27098db4443e87ecb1 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 8 Jan 2010 19:00:00 +0100
Subject: [PATCH] --- yaml --- r: 179248 b: refs/heads/master c:
 b49bb574e44226b332c28439999d196ddec2f643 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/iface.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 525e0581668b..00e7450b5679 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d79074488083ec0d7ecd15352192dc1631f25643
+refs/heads/master: b49bb574e44226b332c28439999d196ddec2f643
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 44188ef80a63..d62ec0803bec 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -675,10 +675,10 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
 		return 0;
 
 	if (skb->len < 4 ||
-	    skb->len < rtap->it_len + 2 /* frame control */)
+	    skb->len < le16_to_cpu(rtap->it_len) + 2 /* frame control */)
 		return 0; /* doesn't matter, frame will be dropped */
 
-	hdr = (void *)((u8 *)skb->data + rtap->it_len);
+	hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
 
 	if (!ieee80211_is_data(hdr->frame_control)) {
 		skb->priority = 7;