summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/zd1211rw
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-29 21:58:48 +0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-16 22:39:45 +0400
commit68e887ef21dfd9adcf896ef92a9676bf9036a0aa (patch)
treee030e63faf8f6fc1118fea1b1721dc4bda7c2bb1 /drivers/net/wireless/zd1211rw
parentdd358c9a45fc27f90e77992cf77117ab6e2fb467 (diff)
downloadlinux-68e887ef21dfd9adcf896ef92a9676bf9036a0aa.tar.xz
zd1211rw: update 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/zd1211rw')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index b2af3c549bb3..87a95bcfee57 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -973,6 +973,7 @@ static void dump_fw_registers(struct zd_chip *chip)
static int print_fw_version(struct zd_chip *chip)
{
+ struct wiphy *wiphy = zd_chip_to_mac(chip)->hw->wiphy;
int r;
u16 version;
@@ -982,6 +983,10 @@ static int print_fw_version(struct zd_chip *chip)
return r;
dev_info(zd_chip_dev(chip),"firmware version %04hx\n", version);
+
+ snprintf(wiphy->fw_version, sizeof(wiphy->fw_version),
+ "%04hx", version);
+
return 0;
}