Commit 5dc53163 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwmc3200wifi: Set wiphy firmware version 



Our wiphy firmware version is a combination of the UMAC and LMAC ones.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7fd6b12f

drivers/net/wireless/iwmc3200wifi/fw.c

+7 −0
Original line number Diff line number Diff line
@@ -217,6 +217,13 @@ static int iwm_load_img(struct iwm_priv *iwm, const char *img_name) 
		 IWM_BUILD_YEAR(build_date), IWM_BUILD_MONTH(build_date),

		 IWM_BUILD_DAY(build_date));



	if (!strcmp(img_name, iwm->bus_ops->umac_name))

		sprintf(iwm->umac_version, "%02X.%02X",

			ver->major, ver->minor);



	if (!strcmp(img_name, iwm->bus_ops->lmac_name))

		sprintf(iwm->lmac_version, "%02X.%02X",

			ver->major, ver->minor);



 err_release_fw:

	release_firmware(fw);

drivers/net/wireless/iwmc3200wifi/iwm.h

+2 −0
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ struct iwm_priv { 
	int resp_ie_len;



	struct iwm_fw_error_hdr *last_fw_err;

	char umac_version[8];

	char lmac_version[8];



	char private[0] __attribute__((__aligned__(NETDEV_ALIGN)));

};

drivers/net/wireless/iwmc3200wifi/main.c

+4 −0
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ static int __iwm_up(struct iwm_priv *iwm) 
{

	int ret;

	struct iwm_notif *notif_reboot, *notif_ack = NULL;

	struct wiphy *wiphy = iwm_to_wiphy(iwm);



	ret = iwm_bus_enable(iwm);

	if (ret) {
@@ -689,6 +690,9 @@ static int __iwm_up(struct iwm_priv *iwm) 
		goto err_disable;

	}



	snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "L%s_U%s",

		 iwm->lmac_version, iwm->umac_version);



	/* We configure the UMAC and enable the wifi module */

	ret = iwm_send_umac_config(iwm,

			cpu_to_le32(UMAC_RST_CTRL_FLG_WIFI_CORE_EN) |