diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2011-08-11 15:07:14 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:45:58 -0400 |
| commit | 2391b7e8d40e4b3be0756396c628d2323f2d0b8d (patch) | |
| tree | 2841585b0b2f2cd02aa65b6e14b640e18af41f01 /drivers/net/wireless/b43/xmit.c | |
| parent | mac80211: Tear down BA session on BAR tx failure (diff) | |
| download | linux-dev-2391b7e8d40e4b3be0756396c628d2323f2d0b8d.tar.xz linux-dev-2391b7e8d40e4b3be0756396c628d2323f2d0b8d.zip | |
b43: rename TX header formats
Replace "old" and "new" with number of the first firmware known to use
the given format.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index b74f25ec1ab4..36c72438aac4 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -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), @@ -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, @@ -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, @@ -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; @@ -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; @@ -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 = |