aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/main.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2009-10-16 01:18:59 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:27 -0400
commit5dc53163c24ad288cfa2369b14a073992e069908 (patch)
tree91af11beac51db9e396bdb8f77a18468cf9fda82 /drivers/net/wireless/iwmc3200wifi/main.c
parent7fd6b12f329b7ec1c1e3ad49d701d2ac7ab42d9e (diff)
iwmc3200wifi: Set wiphy firmware version
Our wiphy firmware version is a combination of the UMAC and LMAC ones. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/main.c')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index 952701e6127..f93e9139b0f 100644
--- a/drivers/net/wireless/iwmc3200wifi/main.c
+++ b/drivers/net/wireless/iwmc3200wifi/main.c
@@ -628,6 +628,7 @@ static int __iwm_up(struct iwm_priv *iwm)
628{ 628{
629 int ret; 629 int ret;
630 struct iwm_notif *notif_reboot, *notif_ack = NULL; 630 struct iwm_notif *notif_reboot, *notif_ack = NULL;
631 struct wiphy *wiphy = iwm_to_wiphy(iwm);
631 632
632 ret = iwm_bus_enable(iwm); 633 ret = iwm_bus_enable(iwm);
633 if (ret) { 634 if (ret) {
@@ -689,6 +690,9 @@ static int __iwm_up(struct iwm_priv *iwm)
689 goto err_disable; 690 goto err_disable;
690 } 691 }
691 692
693 snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "L%s_U%s",
694 iwm->lmac_version, iwm->umac_version);
695
692 /* We configure the UMAC and enable the wifi module */ 696 /* We configure the UMAC and enable the wifi module */
693 ret = iwm_send_umac_config(iwm, 697 ret = iwm_send_umac_config(iwm,
694 cpu_to_le32(UMAC_RST_CTRL_FLG_WIFI_CORE_EN) | 698 cpu_to_le32(UMAC_RST_CTRL_FLG_WIFI_CORE_EN) |