From: Tomas Winkler Date: Thu, 29 May 2008 08:34:51 +0000 (+0800) Subject: iwlwifi: mark 4965 ucode types X-Git-Tag: v2.6.27-rc1~969^2~337^2~46 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2d87889f61e97194891f7e7ff3a0e5f11e4392db;p=karo-tx-linux.git iwlwifi: mark 4965 ucode types This patch marks 4965 ucode types. Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index ca9ca92bb7fd..063ba2ec1ebd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -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; }