Skip to content

Commit

Permalink
rt2x00: Fix header_length in rt2x00lib_txdone
Browse files Browse the repository at this point in the history
Put the assignment of header_length after pull out extra tx headroom

Signed-off-by: RA-Jay Hung <jay_hung@ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
RA-Jay Hung authored and John W. Linville committed Nov 17, 2010
1 parent b43d63b commit f8eaec6
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/net/wireless/rt2x00/rt2x00dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand All @@ -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
*/
Expand Down

0 comments on commit f8eaec6

Please sign in to comment.