]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
iwlwifi: mark 4965 ucode types
authorTomas Winkler <tomas.winkler@intel.com>
Thu, 29 May 2008 08:34:51 +0000 (16:34 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jun 2008 19:00:19 +0000 (15:00 -0400)
This patch marks 4965 ucode types.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-4965.c

index ca9ca92bb7fdc185dd8cf97f36748c6d3c3d3a35..063ba2ec1ebd788ff326c584226902505029ce73 100644 (file)
@@ -162,9 +162,10 @@ static int iwl4965_load_bsm(struct iwl_priv *priv)
 
        /* Tell bootstrap uCode where to find the "Initialize" uCode
         *   in host DRAM ... host DRAM physical address bits 35:4 for 4965.
-        * NOTE:  iwl4965_initialize_alive_start() will replace these values,
+        * NOTE:  iwl_init_alive_start() will replace these values,
         *        after the "initialize" uCode has run, to point to
-        *        runtime/protocol instructions and backup data cache. */
+        *        runtime/protocol instructions and backup data cache.
+        */
        pinst = priv->ucode_init.p_addr >> 4;
        pdata = priv->ucode_init_data.p_addr >> 4;
        inst_len = priv->ucode_init.len;
@@ -220,6 +221,8 @@ static int iwl4965_load_bsm(struct iwl_priv *priv)
 
        iwl_release_nic_access(priv);
 
+       priv->ucode_type = UCODE_INIT;
+
        return 0;
 }
 
@@ -266,6 +269,8 @@ static int iwl4965_set_ucode_ptrs(struct iwl_priv *priv)
 
        IWL_DEBUG_INFO("Runtime uCode pointers are set.\n");
 
+       priv->ucode_type = UCODE_RT;
+
        return ret;
 }