---

yaml --- r: 224596 b: refs/heads/master c: f8eaec6 h: refs/heads/master v: v3
git-mirror · Nov 17, 2010 · 92a7dcc · 92a7dcc
1 parent 5fe98a8
commit 92a7dcc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b43d63bd69ae5464a52bf1796e84097607917b2f
+refs/heads/master: f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -250,10 +250,9 @@ void rt2x00lib_txdone(struct queue_entry *entry,
 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);
 	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
 	enum data_queue_qid qid = skb_get_queue_mapping(entry->skb);
-	unsigned int header_length = ieee80211_get_hdrlen_from_skb(entry->skb);
+	unsigned int header_length, i;
 	u8 rate_idx, rate_flags, retry_rates;
 	u8 skbdesc_flags = skbdesc->flags;
-	unsigned int i;
 	bool success;
 
 	/*
@@ -271,6 +270,11 @@ void rt2x00lib_txdone(struct queue_entry *entry,
 	 */
 	skbdesc->flags &= ~SKBDESC_DESC_IN_SKB;
 
+	/*
+	 * Determine the length of 802.11 header.
+	 */
+	header_length = ieee80211_get_hdrlen_from_skb(entry->skb);
+
 	/*
 	 * Remove L2 padding which was added during
 	 */