p54: update fw version info in wiphy struct
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jul 2010 17:44:44 +0000 (13:44 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 16 Aug 2010 18:39:45 +0000 (14:39 -0400)
This makes the information available through ethtool...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/p54/fwio.c

index 47006bca485216609afb0f51a201c4d2ef1ef04a..6f027ab4c7750831142933cce25c203186aed366 100644 (file)
@@ -123,10 +123,14 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                bootrec = (struct bootrec *)&bootrec->data[len];
        }
 
-       if (fw_version)
+       if (fw_version) {
                wiphy_info(priv->hw->wiphy,
                           "fw rev %s - softmac protocol %x.%x\n",
                           fw_version, priv->fw_var >> 8, priv->fw_var & 0xff);
+               snprintf(dev->wiphy->fw_version, sizeof(dev->wiphy->fw_version),
+                               "%s - %x.%x", fw_version,
+                               priv->fw_var >> 8, priv->fw_var & 0xff);
+       }
 
        if (priv->fw_var < 0x500)
                wiphy_info(priv->hw->wiphy,