diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2011-08-11 15:07:15 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:45:58 -0400 |
| commit | efe0249b0fd1e9a32a7e6a5dc9c751d4d97b0adf (patch) | |
| tree | 1a1db659fda1dbf9fbe6e934d14e2f4b64b53b7b /drivers/net/wireless/b43/xmit.h | |
| parent | b43: rename TX header formats (diff) | |
| download | linux-dev-efe0249b0fd1e9a32a7e6a5dc9c751d4d97b0adf.tar.xz linux-dev-efe0249b0fd1e9a32a7e6a5dc9c751d4d97b0adf.zip | |
b43: use enum for firmware header 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.h')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h index 79fc162b90ec..a3ff727d27f2 100644 --- a/drivers/net/wireless/b43/xmit.h +++ b/drivers/net/wireless/b43/xmit.h @@ -166,19 +166,16 @@ struct b43_tx_legacy_rate_phy_ctl_entry { #define B43_TXH_PHY1_MODUL_QAM256 0x2000 /* QAM256 */ -/* r351 firmware compatibility stuff. */ -static inline -bool b43_is_old_txhdr_format(struct b43_wldev *dev) -{ - return (dev->fw.rev <= 351); -} - static inline size_t b43_txhdr_size(struct b43_wldev *dev) { - if (b43_is_old_txhdr_format(dev)) + switch (dev->fw.hdr_format) { + case B43_FW_HDR_410: + return 104 + sizeof(struct b43_plcp_hdr6); + case B43_FW_HDR_351: return 100 + sizeof(struct b43_plcp_hdr6); - return 104 + sizeof(struct b43_plcp_hdr6); + } + return 0; } |