Skip to content

Commit

Permalink
b43: update hw/fw version info in wiphy struct
Browse files Browse the repository at this point in the history
This makes the information available through ethtool...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
John W. Linville committed Aug 16, 2010
1 parent 8f1d2d2 commit 652caa5
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/net/wireless/b43/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2280,6 +2280,7 @@ static int b43_request_firmware(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 __be32 *data;
unsigned int i, len;
Expand Down Expand Up @@ -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. */
Expand Down

0 comments on commit 652caa5

Please sign in to comment.