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 | |
| parent | ece550d0e416b4146e1ec3d934f9773dbf8c7242 (diff) | |
| download | blackbird-op-linux-8b28e82224321d6fdabadd7d6ddc4bd28a3b5490.tar.gz blackbird-op-linux-8b28e82224321d6fdabadd7d6ddc4bd28a3b5490.zip | |
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>
| -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) static int wl1251_op_start(struct ieee80211_hw *hw) { struct wl1251 *wl = hw->priv; + struct wiphy *wiphy = hw->wiphy; int ret = 0; wl1251_debug(DEBUG_MAC80211, "mac80211 start"); @@ -444,6 +445,10 @@ static int wl1251_op_start(struct ieee80211_hw *hw) wl1251_info("firmware booted (%s)", wl->fw_ver); + /* update hw/fw version info in wiphy struct */ + wiphy->hw_version = wl->chip_id; + strncpy(wiphy->fw_version, wl->fw_ver, sizeof(wiphy->fw_version)); + out: if (ret < 0) wl1251_power_off(wl); |
