Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150803
b: refs/heads/master
c: b52a033
h: refs/heads/master
i:
  150801: 1d05c80
  150799: 25b9e88
v: v3
  • Loading branch information
Matthieu CASTET authored and John W. Linville committed Jun 10, 2009
1 parent ae731a4 commit a398e30
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5ee58d7e6ad019675b4090582aec4fa1180d8703
refs/heads/master: b52a033c2c501a8015df3727a4bd73389ccb1641
5 changes: 2 additions & 3 deletions trunk/drivers/net/wireless/b43/xmit.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ u8 b43_plcp_get_ratecode_ofdm(const u8 bitrate)
void b43_generate_plcp_hdr(struct b43_plcp_hdr4 *plcp,
const u16 octets, const u8 bitrate)
{
__le32 *data = &(plcp->data);
__u8 *raw = plcp->raw;

if (b43_is_ofdm_rate(bitrate)) {
Expand All @@ -127,7 +126,7 @@ void b43_generate_plcp_hdr(struct b43_plcp_hdr4 *plcp,
d = b43_plcp_get_ratecode_ofdm(bitrate);
B43_WARN_ON(octets & 0xF000);
d |= (octets << 5);
*data = cpu_to_le32(d);
plcp->data = cpu_to_le32(d);
} else {
u32 plen;

Expand All @@ -141,7 +140,7 @@ void b43_generate_plcp_hdr(struct b43_plcp_hdr4 *plcp,
raw[1] = 0x04;
} else
raw[1] = 0x04;
*data |= cpu_to_le32(plen << 16);
plcp->data |= cpu_to_le32(plen << 16);
raw[0] = b43_plcp_get_ratecode_cck(bitrate);
}
}
Expand Down

0 comments on commit a398e30

Please sign in to comment.