diff options
| author | Rafał Miłecki | 2011-08-11 15:07:15 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-08-22 20:45:58 +0200 |
| commit | efe0249b0fd1e9a32a7e6a5dc9c751d4d97b0adf (patch) | |
| tree | 1a1db659fda1dbf9fbe6e934d14e2f4b64b53b7b /drivers/net/wireless/b43/main.c | |
| parent | b43: rename TX header formats (diff) | |
| download | kernel-qcow2-linux-efe0249b0fd1e9a32a7e6a5dc9c751d4d97b0adf.tar.gz kernel-qcow2-linux-efe0249b0fd1e9a32a7e6a5dc9c751d4d97b0adf.tar.xz kernel-qcow2-linux-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/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 4a5cac600916..cc3dd800559e 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2514,6 +2514,10 @@ static int b43_upload_microcode(struct b43_wldev *dev) } dev->fw.rev = fwrev; dev->fw.patch = fwpatch; + if (dev->fw.rev >= 410) + dev->fw.hdr_format = B43_FW_HDR_410; + else + dev->fw.hdr_format = B43_FW_HDR_351; dev->fw.opensource = (fwdate == 0xFFFF); /* Default to use-all-queues. */ @@ -2561,7 +2565,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) dev->fw.rev, dev->fw.patch); wiphy->hw_version = dev->dev->core_id; - if (b43_is_old_txhdr_format(dev)) { + if (dev->fw.hdr_format == B43_FW_HDR_351) { /* We're over the deadline, but we keep support for old fw * until it turns out to be in major conflict with something new. */ b43warn(dev->wl, "You are using an old firmware image. " |