wl1251: update hw/fw version info in wiphy struct
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Jul 2010 20:59:41 +0000 (16:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jul 2010 16:46:50 +0000 (12:46 -0400)
This makes the information available through ethtool...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
drivers/net/wireless/wl12xx/wl1251_main.c

index a6d8d1ad5dc0105a16e92d8d27b1f542e2833908..861a5f33761e9ea94d15d355a360835a0766ade0 100644 (file)
@@ -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);