diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-07-28 16:59:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-07-29 12:46:50 -0400 |
commit | 8b28e82224321d6fdabadd7d6ddc4bd28a3b5490 (patch) | |
tree | 6f1d52e25ae93fc94e67f702754bbb6f61760aa8 /drivers | |
parent | ece550d0e416b4146e1ec3d934f9773dbf8c7242 (diff) |
wl1251: 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: Kalle Valo <kvalo@adurom.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index a6d8d1ad5dc0..861a5f33761e 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c | |||
@@ -411,6 +411,7 @@ static int wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
411 | static int wl1251_op_start(struct ieee80211_hw *hw) | 411 | static int wl1251_op_start(struct ieee80211_hw *hw) |
412 | { | 412 | { |
413 | struct wl1251 *wl = hw->priv; | 413 | struct wl1251 *wl = hw->priv; |
414 | struct wiphy *wiphy = hw->wiphy; | ||
414 | int ret = 0; | 415 | int ret = 0; |
415 | 416 | ||
416 | wl1251_debug(DEBUG_MAC80211, "mac80211 start"); | 417 | wl1251_debug(DEBUG_MAC80211, "mac80211 start"); |
@@ -444,6 +445,10 @@ static int wl1251_op_start(struct ieee80211_hw *hw) | |||
444 | 445 | ||
445 | wl1251_info("firmware booted (%s)", wl->fw_ver); | 446 | wl1251_info("firmware booted (%s)", wl->fw_ver); |
446 | 447 | ||
448 | /* update hw/fw version info in wiphy struct */ | ||
449 | wiphy->hw_version = wl->chip_id; | ||
450 | strncpy(wiphy->fw_version, wl->fw_ver, sizeof(wiphy->fw_version)); | ||
451 | |||
447 | out: | 452 | out: |
448 | if (ret < 0) | 453 | if (ret < 0) |
449 | wl1251_power_off(wl); | 454 | wl1251_power_off(wl); |