diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-03-22 11:51:44 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-18 10:29:59 -0400 |
commit | 2152268ff9119c16447f6bf6e61b02df796960fd (patch) | |
tree | 60c90431506a2dd20060fc8a1473ccc7839d65f2 /drivers/net/wireless/iwlwifi/iwl-testmode.c | |
parent | 68e8dfdadb424fd76ca81eeb399c3228adc5cea2 (diff) |
iwlwifi: op_mode holds its pointer to the config
Instead of using the shared area that we be killed.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-testmode.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-testmode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c index 0c516d08121a..a6b16aa29c72 100644 --- a/drivers/net/wireless/iwlwifi/iwl-testmode.c +++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c | |||
@@ -473,8 +473,8 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) | |||
473 | 473 | ||
474 | switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) { | 474 | switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) { |
475 | case IWL_TM_CMD_APP2DEV_GET_DEVICENAME: | 475 | case IWL_TM_CMD_APP2DEV_GET_DEVICENAME: |
476 | rsp_data_ptr = (unsigned char *)cfg(priv)->name; | 476 | rsp_data_ptr = (unsigned char *)priv->cfg->name; |
477 | rsp_data_len = strlen(cfg(priv)->name); | 477 | rsp_data_len = strlen(priv->cfg->name); |
478 | skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, | 478 | skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, |
479 | rsp_data_len + 20); | 479 | rsp_data_len + 20); |
480 | if (!skb) { | 480 | if (!skb) { |
@@ -534,7 +534,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) | |||
534 | case IWL_TM_CMD_APP2DEV_GET_EEPROM: | 534 | case IWL_TM_CMD_APP2DEV_GET_EEPROM: |
535 | if (priv->eeprom) { | 535 | if (priv->eeprom) { |
536 | skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, | 536 | skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, |
537 | cfg(priv)->base_params->eeprom_size + 20); | 537 | priv->cfg->base_params->eeprom_size + 20); |
538 | if (!skb) { | 538 | if (!skb) { |
539 | IWL_ERR(priv, "Memory allocation fail\n"); | 539 | IWL_ERR(priv, "Memory allocation fail\n"); |
540 | return -ENOMEM; | 540 | return -ENOMEM; |
@@ -542,7 +542,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) | |||
542 | NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND, | 542 | NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND, |
543 | IWL_TM_CMD_DEV2APP_EEPROM_RSP); | 543 | IWL_TM_CMD_DEV2APP_EEPROM_RSP); |
544 | NLA_PUT(skb, IWL_TM_ATTR_EEPROM, | 544 | NLA_PUT(skb, IWL_TM_ATTR_EEPROM, |
545 | cfg(priv)->base_params->eeprom_size, | 545 | priv->cfg->base_params->eeprom_size, |
546 | priv->eeprom); | 546 | priv->eeprom); |
547 | status = cfg80211_testmode_reply(skb); | 547 | status = cfg80211_testmode_reply(skb); |
548 | if (status < 0) | 548 | if (status < 0) |