Commit 652caa5b authored by John W. Linville's avatar John W. Linville

b43: update hw/fw version info in wiphy struct

This makes the information available through ethtool...
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8f1d2d2b
...@@ -2280,6 +2280,7 @@ static int b43_request_firmware(struct b43_wldev *dev) ...@@ -2280,6 +2280,7 @@ static int b43_request_firmware(struct b43_wldev *dev)
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) ...@@ -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. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment