aboutsummaryrefslogtreecommitdiffstats
path: root/package/b43/src/xmit.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-11-11 11:44:59 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-11-11 11:44:59 +0000
commitd5345b5f7a4a8f9ec4c1b4b9801a19b4ffd5d547 (patch)
tree082bbcfc88019a856d9da9d8a7022f3ce3b8fc26 /package/b43/src/xmit.c
parent62ccdcedae255174a46ef74d2e0a887f16ddb30f (diff)
downloadupstream-d5345b5f7a4a8f9ec4c1b4b9801a19b4ffd5d547.tar.gz
upstream-d5345b5f7a4a8f9ec4c1b4b9801a19b4ffd5d547.tar.bz2
upstream-d5345b5f7a4a8f9ec4c1b4b9801a19b4ffd5d547.zip
add b43 fixes from #2677
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9535 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/b43/src/xmit.c')
-rw-r--r--package/b43/src/xmit.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/b43/src/xmit.c b/package/b43/src/xmit.c
index e6174b6f11..0bd6f8a348 100644
--- a/package/b43/src/xmit.c
+++ b/package/b43/src/xmit.c
@@ -121,10 +121,12 @@ void b43_generate_plcp_hdr(struct b43_plcp_hdr4 *plcp,
__u8 *raw = plcp->raw;
if (b43_is_ofdm_rate(bitrate)) {
- *data = b43_plcp_get_ratecode_ofdm(bitrate);
+ u32 d;
+
+ d = b43_plcp_get_ratecode_ofdm(bitrate);
B43_WARN_ON(octets & 0xF000);
- *data |= (octets << 5);
- *data = cpu_to_le32(*data);
+ d |= (octets << 5);
+ *data = cpu_to_le32(d);
} else {
u32 plen;