summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-29 13:30:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-16 14:39:45 -0400
commitbcf3c7c5264f06cd2542e6bece94c65bf0ac482b (patch)
tree1773578f1ff9094cb07c5585d9c745ef71fcfae8
parent652caa5b67b096b13c34f299db238e1daeab1f67 (diff)
downloadop-kernel-dev-bcf3c7c5264f06cd2542e6bece94c65bf0ac482b.zip
op-kernel-dev-bcf3c7c5264f06cd2542e6bece94c65bf0ac482b.tar.gz
b43legacy: update hw/fw version info in wiphy struct
This makes the information available through ethtool... Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43legacy/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 1713f5f..67f18ec 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1623,6 +1623,7 @@ error:
static int b43legacy_upload_microcode(struct b43legacy_wldev *dev)
{
+ struct wiphy *wiphy = dev->wl->hw->wiphy;
const size_t hdr_len = sizeof(struct b43legacy_fw_header);
const __be32 *data;
unsigned int i;
@@ -1732,6 +1733,10 @@ static int b43legacy_upload_microcode(struct b43legacy_wldev *dev)
dev->fw.rev = fwrev;
dev->fw.patch = fwpatch;
+ snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "%u.%u",
+ dev->fw.rev, dev->fw.patch);
+ wiphy->hw_version = dev->dev->id.coreid;
+
return 0;
error:
OpenPOWER on IntegriCloud