Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: move ucode_ver to iwl_nic

Browse Source 
Delete ucode_ver from iwl_priv and use iwl_nic instead.

Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Don Fry 2012-02-06 15:51:15 -08:00 committed by Wey-Yi Guy
parent b1c23d9ec3
commit d359667767
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
View File

@ -77,7 +77,7 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
tx_power_cmd.flags = IWLAGN_TX_POWER_NO_CLOSED; tx_power_cmd.flags = IWLAGN_TX_POWER_NO_CLOSED;
tx_power_cmd.srv_chan_lmt = IWLAGN_TX_POWER_AUTO; tx_power_cmd.srv_chan_lmt = IWLAGN_TX_POWER_AUTO;
if (IWL_UCODE_API(priv->ucode_ver) == 1) if (IWL_UCODE_API(nic(priv)->fw.ucode_ver) == 1)
tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD_V1; tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD_V1;
else else
tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD; tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD;

2
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -618,7 +618,7 @@ static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)
.valid = cpu_to_le32(valid_tx_ant), .valid = cpu_to_le32(valid_tx_ant),
}; };
if (IWL_UCODE_API(priv->ucode_ver) > 1) { if (IWL_UCODE_API(nic(priv)->fw.ucode_ver) > 1) {
IWL_DEBUG_HC(priv, "select valid tx ant: %u\n", valid_tx_ant); IWL_DEBUG_HC(priv, "select valid tx ant: %u\n", valid_tx_ant);
return iwl_trans_send_cmd_pdu(trans(priv), return iwl_trans_send_cmd_pdu(trans(priv),
TX_ANT_CONFIGURATION_CMD, TX_ANT_CONFIGURATION_CMD,

3
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -789,9 +789,6 @@ struct iwl_priv {
/* uCode images, save to reload in case of failure */ /* uCode images, save to reload in case of failure */
int fw_index; /* firmware we're trying to load */ int fw_index; /* firmware we're trying to load */
u32 ucode_ver; /* version of ucode, copy of
iwl_ucode.ver */
char firmware_name[25]; char firmware_name[25];
struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX]; struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];

6
drivers/net/wireless/iwlwifi/iwl-testmode.c
View File

@ -553,14 +553,16 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
break; break;
case IWL_TM_CMD_APP2DEV_GET_FW_VERSION: case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
IWL_INFO(priv, "uCode version raw: 0x%x\n", priv->ucode_ver); IWL_INFO(priv, "uCode version raw: 0x%x\n",
nic(priv)->fw.ucode_ver);
skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20); skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
if (!skb) { if (!skb) {
IWL_ERR(priv, "Memory allocation fail\n"); IWL_ERR(priv, "Memory allocation fail\n");
return -ENOMEM; return -ENOMEM;
} }
NLA_PUT_U32(skb, IWL_TM_ATTR_FW_VERSION, priv->ucode_ver); NLA_PUT_U32(skb, IWL_TM_ATTR_FW_VERSION,
nic(priv)->fw.ucode_ver);
status = cfg80211_testmode_reply(skb); status = cfg80211_testmode_reply(skb);
if (status < 0) if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n", status); IWL_ERR(priv, "Error sending msg : %d\n", status);

29
drivers/net/wireless/iwlwifi/iwl-ucode.c
View File

@ -738,12 +738,13 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv,
const struct firmware *ucode_raw, const struct firmware *ucode_raw,
struct iwlagn_firmware_pieces *pieces) struct iwlagn_firmware_pieces *pieces)
{ {
struct iwl_nic *nic = nic(priv);
struct iwl_ucode_header *ucode = (void *)ucode_raw->data; struct iwl_ucode_header *ucode = (void *)ucode_raw->data;
u32 api_ver, hdr_size; u32 api_ver, hdr_size;
const u8 *src; const u8 *src;
priv->ucode_ver = le32_to_cpu(ucode->ver); nic->fw.ucode_ver = le32_to_cpu(ucode->ver);
api_ver = IWL_UCODE_API(priv->ucode_ver); api_ver = IWL_UCODE_API(nic->fw.ucode_ver);
switch (api_ver) { switch (api_ver) {
default: default:
@ -804,6 +805,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
struct iwlagn_firmware_pieces *pieces, struct iwlagn_firmware_pieces *pieces,
struct iwlagn_ucode_capabilities *capa) struct iwlagn_ucode_capabilities *capa)
{ {
struct iwl_nic *nic = nic(priv);
struct iwl_tlv_ucode_header *ucode = (void *)ucode_raw->data; struct iwl_tlv_ucode_header *ucode = (void *)ucode_raw->data;
struct iwl_ucode_tlv *tlv; struct iwl_ucode_tlv *tlv;
size_t len = ucode_raw->size; size_t len = ucode_raw->size;
@ -843,7 +845,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
"uCode alternative %d not available, choosing %d\n", "uCode alternative %d not available, choosing %d\n",
tmp, wanted_alternative); tmp, wanted_alternative);
priv->ucode_ver = le32_to_cpu(ucode->ver); nic->fw.ucode_ver = le32_to_cpu(ucode->ver);
pieces->build = le32_to_cpu(ucode->build); pieces->build = le32_to_cpu(ucode->build);
data = ucode->data; data = ucode->data;
@ -1008,6 +1010,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
{ {
struct iwl_priv *priv = context; struct iwl_priv *priv = context;
struct iwl_nic *nic = nic(priv);
struct iwl_ucode_header *ucode; struct iwl_ucode_header *ucode;
int err; int err;
struct iwlagn_firmware_pieces pieces; struct iwlagn_firmware_pieces pieces;
@ -1057,7 +1060,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
if (err) if (err)
goto try_again; goto try_again;
api_ver = IWL_UCODE_API(priv->ucode_ver); api_ver = IWL_UCODE_API(nic->fw.ucode_ver);
build = pieces.build; build = pieces.build;
/* /*
@ -1097,19 +1100,19 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
buildstr[0] = '\0'; buildstr[0] = '\0';
IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u%s\n", IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u%s\n",
IWL_UCODE_MAJOR(priv->ucode_ver), IWL_UCODE_MAJOR(nic->fw.ucode_ver),
IWL_UCODE_MINOR(priv->ucode_ver), IWL_UCODE_MINOR(nic->fw.ucode_ver),
IWL_UCODE_API(priv->ucode_ver), IWL_UCODE_API(nic->fw.ucode_ver),
IWL_UCODE_SERIAL(priv->ucode_ver), IWL_UCODE_SERIAL(nic->fw.ucode_ver),
buildstr); buildstr);
snprintf(priv->hw->wiphy->fw_version, snprintf(priv->hw->wiphy->fw_version,
sizeof(priv->hw->wiphy->fw_version), sizeof(priv->hw->wiphy->fw_version),
"%u.%u.%u.%u%s", "%u.%u.%u.%u%s",
IWL_UCODE_MAJOR(priv->ucode_ver), IWL_UCODE_MAJOR(nic->fw.ucode_ver),
IWL_UCODE_MINOR(priv->ucode_ver), IWL_UCODE_MINOR(nic->fw.ucode_ver),
IWL_UCODE_API(priv->ucode_ver), IWL_UCODE_API(nic->fw.ucode_ver),
IWL_UCODE_SERIAL(priv->ucode_ver), IWL_UCODE_SERIAL(nic->fw.ucode_ver),
buildstr); buildstr);
/* /*
@ -1119,7 +1122,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
*/ */
IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n", IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
priv->ucode_ver); nic->fw.ucode_ver);
IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %Zd\n", IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %Zd\n",
pieces.inst_size); pieces.inst_size);
IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %Zd\n", IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %Zd\n",