iwlwifi: move ucode_type from shared to op_mode

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / iwl-testmode.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index 645b8500d02fbbc18eaf7f25565e981a5748032a..d65dac88e1902ec9602bc8ccafa9b64cb89d2fa2 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -601,11 +601,11 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                        IWL_ERR(priv, "No uCode has not been loaded\n");
                        return -EINVAL;
                } else {
-                       img = &priv->fw->img[priv->shrd->ucode_type];
+                       img = &priv->fw->img[priv->cur_ucode];
                        inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
                        data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
                }
-               NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type);
+               NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode);
                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
                status = cfg80211_testmode_reply(skb);