summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-28 17:09:41 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-29 12:46:51 -0400
commitac01e948b1c27059d47249ef601036633249cb2a (patch)
tree99c2f64e816894f3c70df8f3a2b4222a8944abb1
parent8b28e82224321d6fdabadd7d6ddc4bd28a3b5490 (diff)
downloadop-kernel-dev-ac01e948b1c27059d47249ef601036633249cb2a.zip
op-kernel-dev-ac01e948b1c27059d47249ef601036633249cb2a.tar.gz
wl1271: update hw/fw version info in wiphy struct
This makes the information available through ethtool... Signed-off-by: John W. Linville <linville@tuxdriver.com> Acked-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 374abf0..9d68f00 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -839,6 +839,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
struct ieee80211_vif *vif)
{
struct wl1271 *wl = hw->priv;
+ struct wiphy *wiphy = hw->wiphy;
int retries = WL1271_BOOT_RETRIES;
int ret = 0;
@@ -892,6 +893,12 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
wl->state = WL1271_STATE_ON;
wl1271_info("firmware booted (%s)", wl->chip.fw_ver);
+
+ /* update hw/fw version info in wiphy struct */
+ wiphy->hw_version = wl->chip.id;
+ strncpy(wiphy->fw_version, wl->chip.fw_ver,
+ sizeof(wiphy->fw_version));
+
goto out;
irq_disable:
OpenPOWER on IntegriCloud