From: John W. Linville Date: Thu, 29 Jul 2010 17:44:44 +0000 (-0400) Subject: p54: update fw version info in wiphy struct X-Git-Tag: v3.12-rc1~8399^2~679^2~111 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37269e805267ba68fe8c5d693ccf0ec5727155fa;p=kernel%2Fkernel-generic.git p54: update fw version info in wiphy struct This makes the information available through ethtool... Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c index 47006bc..6f027ab 100644 --- a/drivers/net/wireless/p54/fwio.c +++ b/drivers/net/wireless/p54/fwio.c @@ -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,