iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b43: update hw/fw version info in wiphy struct

Browse Source 
This makes the information available through ethtool...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2010-07-29 13:27:28 -04:00
parent 8f1d2d2be7
commit 652caa5b67
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/b43/main.c
View File

@ -2280,6 +2280,7 @@ out:
static int b43_upload_microcode(struct b43_wldev *dev) 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 size_t hdr_len = sizeof(struct b43_fw_header);
const __be32 *data; const __be32 *data;
unsigned int i, len; 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)) { if (b43_is_old_txhdr_format(dev)) {
/* We're over the deadline, but we keep support for old fw /* We're over the deadline, but we keep support for old fw
* until it turns out to be in major conflict with something new. */ * until it turns out to be in major conflict with something new. */