aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
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 /drivers
parent8b28e82224321d6fdabadd7d6ddc4bd28a3b5490 (diff)
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>
Diffstat (limited to 'drivers')
-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 374abf0f5cc7..9d68f0012f05 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,
839 struct ieee80211_vif *vif) 839 struct ieee80211_vif *vif)
840{ 840{
841 struct wl1271 *wl = hw->priv; 841 struct wl1271 *wl = hw->priv;
842 struct wiphy *wiphy = hw->wiphy;
842 int retries = WL1271_BOOT_RETRIES; 843 int retries = WL1271_BOOT_RETRIES;
843 int ret = 0; 844 int ret = 0;
844 845
@@ -892,6 +893,12 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
892 893
893 wl->state = WL1271_STATE_ON; 894 wl->state = WL1271_STATE_ON;
894 wl1271_info("firmware booted (%s)", wl->chip.fw_ver); 895 wl1271_info("firmware booted (%s)", wl->chip.fw_ver);
896
897 /* update hw/fw version info in wiphy struct */
898 wiphy->hw_version = wl->chip.id;
899 strncpy(wiphy->fw_version, wl->chip.fw_ver,
900 sizeof(wiphy->fw_version));
901
895 goto out; 902 goto out;
896 903
897irq_disable: 904irq_disable: