Commit 5ebeb5a6 authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

iwlwifi: provide firmware version 



By setting the firmware version in wiphy it is possible to obtain this
information via ethtool. Some examples,

	    # ethtool -i wlan1
	    driver: iwlagn
	    version: 2.6.32-rc5-wl-56840-g26d8540
	    firmware-version: 228.57.2.23
	    bus-info: 0000:03:00.0
	    # ethtool -i wlan0
	    driver: iwl3945
	    version: 2.6.32-rc5-wl-56840-g26d8540
	    firmware-version: 15.28.2.8
	    bus-info: 0000:02:00.0

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9aa4aee3

drivers/net/wireless/iwlwifi/iwl-agn.c

+8 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,14 @@ static int iwl_read_ucode(struct iwl_priv *priv) 
	       IWL_UCODE_API(priv->ucode_ver),

	       IWL_UCODE_SERIAL(priv->ucode_ver));



	snprintf(priv->hw->wiphy->fw_version,

		 sizeof(priv->hw->wiphy->fw_version),

		 "%u.%u.%u.%u",

		 IWL_UCODE_MAJOR(priv->ucode_ver),

		 IWL_UCODE_MINOR(priv->ucode_ver),

		 IWL_UCODE_API(priv->ucode_ver),

		 IWL_UCODE_SERIAL(priv->ucode_ver));



	if (build)

		IWL_DEBUG_INFO(priv, "Build %u\n", build);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+8 −0
Original line number Diff line number Diff line
@@ -2160,6 +2160,14 @@ static int iwl3945_read_ucode(struct iwl_priv *priv) 
		IWL_UCODE_API(priv->ucode_ver),

		IWL_UCODE_SERIAL(priv->ucode_ver));



	snprintf(priv->hw->wiphy->fw_version,

		 sizeof(priv->hw->wiphy->fw_version),

		 "%u.%u.%u.%u",

		 IWL_UCODE_MAJOR(priv->ucode_ver),

		 IWL_UCODE_MINOR(priv->ucode_ver),

		 IWL_UCODE_API(priv->ucode_ver),

		 IWL_UCODE_SERIAL(priv->ucode_ver));



	IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",

		       priv->ucode_ver);

	IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE