Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265606
b: refs/heads/master
c: 2391b7e
h: refs/heads/master
v: v3
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed Aug 22, 2011
1 parent e7f6998 commit d42fc70
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 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: e69deded2bc29e6dd176089252a11b1854012c76
refs/heads/master: 2391b7e8d40e4b3be0756396c628d2323f2d0b8d
24 changes: 12 additions & 12 deletions trunk/drivers/net/wireless/b43/xmit.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,10 @@ int b43_generate_txhdr(struct b43_wldev *dev,
}
}
if (b43_is_old_txhdr_format(dev)) {
b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)(&txhdr->old_format.plcp),
b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)(&txhdr->format_351.plcp),
plcp_fragment_len, rate);
} else {
b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)(&txhdr->new_format.plcp),
b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)(&txhdr->format_410.plcp),
plcp_fragment_len, rate);
}
b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)(&txhdr->plcp_fb),
Expand Down Expand Up @@ -433,10 +433,10 @@ int b43_generate_txhdr(struct b43_wldev *dev,

if (b43_is_old_txhdr_format(dev)) {
cts = (struct ieee80211_cts *)
(txhdr->old_format.rts_frame);
(txhdr->format_351.rts_frame);
} else {
cts = (struct ieee80211_cts *)
(txhdr->new_format.rts_frame);
(txhdr->format_410.rts_frame);
}
ieee80211_ctstoself_get(dev->wl->hw, info->control.vif,
fragment_data, fragment_len,
Expand All @@ -448,10 +448,10 @@ int b43_generate_txhdr(struct b43_wldev *dev,

if (b43_is_old_txhdr_format(dev)) {
rts = (struct ieee80211_rts *)
(txhdr->old_format.rts_frame);
(txhdr->format_351.rts_frame);
} else {
rts = (struct ieee80211_rts *)
(txhdr->new_format.rts_frame);
(txhdr->format_410.rts_frame);
}
ieee80211_rts_get(dev->wl->hw, info->control.vif,
fragment_data, fragment_len,
Expand All @@ -463,9 +463,9 @@ int b43_generate_txhdr(struct b43_wldev *dev,

/* Generate the PLCP headers for the RTS/CTS frame */
if (b43_is_old_txhdr_format(dev))
plcp = &txhdr->old_format.rts_plcp;
plcp = &txhdr->format_351.rts_plcp;
else
plcp = &txhdr->new_format.rts_plcp;
plcp = &txhdr->format_410.rts_plcp;
b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)plcp,
len, rts_rate);
plcp = &txhdr->rts_plcp_fb;
Expand All @@ -474,10 +474,10 @@ int b43_generate_txhdr(struct b43_wldev *dev,

if (b43_is_old_txhdr_format(dev)) {
hdr = (struct ieee80211_hdr *)
(&txhdr->old_format.rts_frame);
(&txhdr->format_351.rts_frame);
} else {
hdr = (struct ieee80211_hdr *)
(&txhdr->new_format.rts_frame);
(&txhdr->format_410.rts_frame);
}
txhdr->rts_dur_fb = hdr->duration_id;

Expand Down Expand Up @@ -506,9 +506,9 @@ int b43_generate_txhdr(struct b43_wldev *dev,

/* Magic cookie */
if (b43_is_old_txhdr_format(dev))
txhdr->old_format.cookie = cpu_to_le16(cookie);
txhdr->format_351.cookie = cpu_to_le16(cookie);
else
txhdr->new_format.cookie = cpu_to_le16(cookie);
txhdr->format_410.cookie = cpu_to_le16(cookie);

if (phy->type == B43_PHYTYPE_N) {
txhdr->phy_ctl1 =
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/net/wireless/b43/xmit.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct b43_txhdr {
__le32 timeout; /* Timeout */

union {
/* The new r410 format. */
/* Tested with 410.2160, 478.104 and 508.* */
struct {
__le16 mimo_antenna; /* MIMO antenna select */
__le16 preload_size; /* Preload size */
Expand All @@ -57,9 +57,9 @@ struct b43_txhdr {
__u8 rts_frame[16]; /* The RTS frame (if used) */
PAD_BYTES(2);
struct b43_plcp_hdr6 plcp; /* Main PLCP header */
} new_format __packed;
} format_410 __packed;

/* The old r351 format. */
/* Tested with 351.126 */
struct {
PAD_BYTES(2);
__le16 cookie; /* TX frame cookie */
Expand All @@ -68,7 +68,7 @@ struct b43_txhdr {
__u8 rts_frame[16]; /* The RTS frame (if used) */
PAD_BYTES(2);
struct b43_plcp_hdr6 plcp; /* Main PLCP header */
} old_format __packed;
} format_351 __packed;

} __packed;
} __packed;
Expand Down

0 comments on commit d42fc70

Please sign in to comment.