summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-12-22 20:29:24 +0300
committerDavid S. Miller <davem@davemloft.net>2008-01-29 02:09:08 +0300
commitcecefb8e97695eef420aab43938c26141ab25344 (patch)
treea1d1f106df5104c1fc7a3d9c7c6b7243eda1f33e /drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
parent8160c031491015299afacb95a1c1113ccbfefe54 (diff)
downloadlinux-cecefb8e97695eef420aab43938c26141ab25344.tar.xz
bcm43xx annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_xmit.c')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_xmit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
index 3e2462671690..f79fe11f9e81 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -122,10 +122,10 @@ static void bcm43xx_generate_plcp_hdr(struct bcm43xx_plcp_hdr4 *plcp,
__u8 *raw = plcp->raw;
if (ofdm_modulation) {
- *data = bcm43xx_plcp_get_ratecode_ofdm(bitrate);
+ u32 val = bcm43xx_plcp_get_ratecode_ofdm(bitrate);
assert(!(octets & 0xF000));
- *data |= (octets << 5);
- *data = cpu_to_le32(*data);
+ val |= (octets << 5);
+ *data = cpu_to_le32(val);
} else {
u32 plen;