Skip to content

Commit

Permalink
wl12xx: use 802.11 header location after relocation to frame start
Browse files Browse the repository at this point in the history
When operating with TKIP encryption, the function wl1271_tx_fill_hdr()
relocates the 802.11 header to the start of the frame, and leaves room
for the security header.

Some functions in the Tx path rely on the location of the header,
namely, for purposes of roaming in STA mode and connecting new stations
in AP mode. Call these functions only after the header is relocated.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Arik Nemtsov authored and Luciano Coelho committed Jul 5, 2011
1 parent 3618f30 commit fae2fd7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/wl12xx/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,15 +383,15 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,
if (ret < 0)
return ret;

wl1271_tx_fill_hdr(wl, skb, extra, info, hlid);

if (wl->bss_type == BSS_TYPE_AP_BSS) {
wl1271_tx_ap_update_inconnection_sta(wl, skb);
wl1271_tx_regulate_link(wl, hlid);
} else {
wl1271_tx_update_filters(wl, skb);
}

wl1271_tx_fill_hdr(wl, skb, extra, info, hlid);

/*
* The length of each packet is stored in terms of
* words. Thus, we must pad the skb data to make sure its
Expand Down

0 comments on commit fae2fd7

Please sign in to comment.