diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-03-22 17:51:44 +0200 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-18 07:29:59 -0700 |
| commit | 2152268ff9119c16447f6bf6e61b02df796960fd (patch) | |
| tree | 60c90431506a2dd20060fc8a1473ccc7839d65f2 /drivers/net/wireless/iwlwifi/iwl-mac80211.c | |
| parent | 68e8dfdadb424fd76ca81eeb399c3228adc5cea2 (diff) | |
| download | blackbird-op-linux-2152268ff9119c16447f6bf6e61b02df796960fd.tar.gz blackbird-op-linux-2152268ff9119c16447f6bf6e61b02df796960fd.zip | |
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-mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index 20388ec8f9db..293110bf8bfe 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c @@ -1130,8 +1130,8 @@ void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw, IWL_DEBUG_MAC80211(priv, "enter\n"); mutex_lock(&priv->mutex); - if (cfg(priv)->bt_params && - cfg(priv)->bt_params->advanced_bt_coexist) { + if (priv->cfg->bt_params && + priv->cfg->bt_params->advanced_bt_coexist) { if (rssi_event == RSSI_EVENT_LOW) priv->bt_enable_pspoll = true; else if (rssi_event == RSSI_EVENT_HIGH) @@ -1240,7 +1240,7 @@ int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx) return err; } - if (cfg(priv)->bt_params && cfg(priv)->bt_params->advanced_bt_coexist && + if (priv->cfg->bt_params && priv->cfg->bt_params->advanced_bt_coexist && vif->type == NL80211_IFTYPE_ADHOC) { /* * pretend to have high BT traffic as long as we |
