diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-29 13:27:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 14:39:45 -0400 |
| commit | 652caa5b67b096b13c34f299db238e1daeab1f67 (patch) | |
| tree | a7c3672905826001d1554c8917ca5fb8f5c52894 /drivers/net/wireless/b43/main.c | |
| parent | 8f1d2d2be73a98c21e68fe2a26f633892d4abdd1 (diff) | |
| download | kernel_samsung_smdk4412-652caa5b67b096b13c34f299db238e1daeab1f67.zip kernel_samsung_smdk4412-652caa5b67b096b13c34f299db238e1daeab1f67.tar.gz kernel_samsung_smdk4412-652caa5b67b096b13c34f299db238e1daeab1f67.tar.bz2 | |
b43: update hw/fw version info in wiphy struct
This makes the information available through ethtool...
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 20631ae..294b688 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2280,6 +2280,7 @@ out: static int b43_upload_microcode(struct b43_wldev *dev) { + struct wiphy *wiphy = dev->wl->hw->wiphy; const size_t hdr_len = sizeof(struct b43_fw_header); const __be32 *data; unsigned int i, len; @@ -2405,6 +2406,10 @@ static int b43_upload_microcode(struct b43_wldev *dev) } } + snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "%u.%u", + dev->fw.rev, dev->fw.patch); + wiphy->hw_version = dev->dev->id.coreid; + if (b43_is_old_txhdr_format(dev)) { /* We're over the deadline, but we keep support for old fw * until it turns out to be in major conflict with something new. */ |