From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 29 Jul 2010 17:58:48 +0000 (-0400)
Subject: zd1211rw: update fw version info in wiphy struct
X-Git-Tag: v2.6.37-rc1~147^2~679^2~109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68e887ef21dfd9adcf896ef92a9676bf9036a0aa;p=platform%2Fkernel%2Flinux-3.10.git

zd1211rw: update fw version info in wiphy struct

This makes the information available through ethtool...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index b2af3c5..87a95bc 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;
 }