diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-07-15 18:43:56 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-22 16:29:51 -0400 |
| commit | ba5b6efe5d945f7a4c5b656051cc16698afdda24 (patch) | |
| tree | 59912fd776e116de54c8636ba0a5fe7fc6836107 /drivers/net/wireless/b43legacy | |
| parent | ded2ae7c1fbff22516fd55ff0edcf6cd86f76186 (diff) | |
| download | op-kernel-dev-ba5b6efe5d945f7a4c5b656051cc16698afdda24.zip op-kernel-dev-ba5b6efe5d945f7a4c5b656051cc16698afdda24.tar.gz | |
b43legacy: use le16 frame control directly, avoid byteswapping
Acked-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43legacy')
| -rw-r--r-- | drivers/net/wireless/b43legacy/xmit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c index 68e1f8c..c5ca72aa 100644 --- a/drivers/net/wireless/b43legacy/xmit.c +++ b/drivers/net/wireless/b43legacy/xmit.c @@ -193,7 +193,6 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, { const struct ieee80211_hdr *wlhdr; int use_encryption = !!info->control.hw_key; - u16 fctl; u8 rate; struct ieee80211_rate *rate_fb; int rate_ofdm; @@ -204,7 +203,6 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, struct ieee80211_rate *tx_rate; wlhdr = (const struct ieee80211_hdr *)fragment_data; - fctl = le16_to_cpu(wlhdr->frame_control); memset(txhdr, 0, sizeof(*txhdr)); @@ -253,7 +251,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, mac_ctl |= (key->algorithm << B43legacy_TX4_MAC_KEYALG_SHIFT) & B43legacy_TX4_MAC_KEYALG; - wlhdr_len = ieee80211_get_hdrlen(fctl); + wlhdr_len = ieee80211_hdrlen(wlhdr->frame_control); iv_len = min((size_t)info->control.iv_len, ARRAY_SIZE(txhdr->iv)); memcpy(txhdr->iv, ((u8 *)wlhdr) + wlhdr_len, iv_len); |
