diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_xmit.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | 6 |
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 3e246267169..f79fe11f9e8 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; |