Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10b15e6f authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: priv->lock moves to iwl_shared 



Since it is used by all the layers, it needs to move to iwl_shared.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 63013ae3

drivers/net/wireless/iwlwifi/iwl-5000.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv) 




	iwl_rf_config(priv);

	iwl_rf_config(priv);





	spin_lock_irqsave(&priv->lock, flags);

	spin_lock_irqsave(&priv->shrd->lock, flags);





	/* W/A : NIC is stuck in a reset state after Early PCIe power off

	/* W/A : NIC is stuck in a reset state after Early PCIe power off

	 * (PCIe power is lost before PERST# is asserted),

	 * (PCIe power is lost before PERST# is asserted),
@@ -80,7 +80,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv) 
				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);

				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);









	spin_unlock_irqrestore(&priv->lock, flags);

	spin_unlock_irqrestore(&priv->shrd->lock, flags);

}

}





static struct iwl_sensitivity_ranges iwl5000_sensitivity = {

static struct iwl_sensitivity_ranges iwl5000_sensitivity = {

drivers/net/wireless/iwlwifi/iwl-agn-calib.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -658,13 +658,13 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv) 
		return;

		return;

	}

	}





	spin_lock_irqsave(&priv->lock, flags);

	spin_lock_irqsave(&priv->shrd->lock, flags);

	rx_info = &priv->statistics.rx_non_phy;

	rx_info = &priv->statistics.rx_non_phy;

	ofdm = &priv->statistics.rx_ofdm;

	ofdm = &priv->statistics.rx_ofdm;

	cck = &priv->statistics.rx_cck;

	cck = &priv->statistics.rx_cck;

	if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {

	if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {

		IWL_DEBUG_CALIB(priv, "<< invalid data.\n");

		IWL_DEBUG_CALIB(priv, "<< invalid data.\n");

		spin_unlock_irqrestore(&priv->lock, flags);

		spin_unlock_irqrestore(&priv->shrd->lock, flags);

		return;

		return;

	}

	}
@@ -688,7 +688,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv) 
	statis.beacon_energy_c =

	statis.beacon_energy_c =

			le32_to_cpu(rx_info->beacon_energy_c);

			le32_to_cpu(rx_info->beacon_energy_c);





	spin_unlock_irqrestore(&priv->lock, flags);

	spin_unlock_irqrestore(&priv->shrd->lock, flags);





	IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time);

	IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time);
@@ -976,13 +976,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) 
		return;

		return;

	}

	}





	spin_lock_irqsave(&priv->lock, flags);

	spin_lock_irqsave(&priv->shrd->lock, flags);





	rx_info = &priv->statistics.rx_non_phy;

	rx_info = &priv->statistics.rx_non_phy;





	if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {

	if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {

		IWL_DEBUG_CALIB(priv, " << Interference data unavailable\n");

		IWL_DEBUG_CALIB(priv, " << Interference data unavailable\n");

		spin_unlock_irqrestore(&priv->lock, flags);

		spin_unlock_irqrestore(&priv->shrd->lock, flags);

		return;

		return;

	}

	}
@@ -997,7 +997,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) 
	if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) {

	if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) {

		IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n",

		IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n",

				rxon_chnum, rxon_band24);

				rxon_chnum, rxon_band24);

		spin_unlock_irqrestore(&priv->lock, flags);

		spin_unlock_irqrestore(&priv->shrd->lock, flags);

		return;

		return;

	}

	}
@@ -1016,7 +1016,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) 
	chain_sig_b = le32_to_cpu(rx_info->beacon_rssi_b) & IN_BAND_FILTER;

	chain_sig_b = le32_to_cpu(rx_info->beacon_rssi_b) & IN_BAND_FILTER;

	chain_sig_c = le32_to_cpu(rx_info->beacon_rssi_c) & IN_BAND_FILTER;

	chain_sig_c = le32_to_cpu(rx_info->beacon_rssi_c) & IN_BAND_FILTER;





	spin_unlock_irqrestore(&priv->lock, flags);

	spin_unlock_irqrestore(&priv->shrd->lock, flags);





	data->beacon_count++;

	data->beacon_count++;

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1673,9 +1673,9 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, 




	/* FIXME: based on notification, adjust the prio_boost */

	/* FIXME: based on notification, adjust the prio_boost */





	spin_lock_irqsave(&priv->lock, flags);

	spin_lock_irqsave(&priv->shrd->lock, flags);

	priv->bt_ci_compliance = coex->bt_ci_compliance;

	priv->bt_ci_compliance = coex->bt_ci_compliance;

	spin_unlock_irqrestore(&priv->lock, flags);

	spin_unlock_irqrestore(&priv->shrd->lock, flags);

}

}





void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv)

void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv)

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -877,12 +877,12 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx, 
		 * Is there a need to switch between

		 * Is there a need to switch between

		 * full concurrency and 3-wire?

		 * full concurrency and 3-wire?

		 */

		 */

		spin_lock_irqsave(&priv->lock, flags);

		spin_lock_irqsave(&priv->shrd->lock, flags);

		if (priv->bt_ci_compliance && priv->bt_ant_couple_ok)

		if (priv->bt_ci_compliance && priv->bt_ant_couple_ok)

			full_concurrent = true;

			full_concurrent = true;

		else

		else

			full_concurrent = false;

			full_concurrent = false;

		spin_unlock_irqrestore(&priv->lock, flags);

		spin_unlock_irqrestore(&priv->shrd->lock, flags);

	}

	}

	if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||

	if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||

	    (priv->bt_full_concurrent != full_concurrent)) {

	    (priv->bt_full_concurrent != full_concurrent)) {

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -576,7 +576,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
			goto out;

			goto out;

		}

		}





		spin_lock_irqsave(&priv->lock, flags);

		spin_lock_irqsave(&priv->shrd->lock, flags);





		for_each_context(priv, ctx) {

		for_each_context(priv, ctx) {

			/* Configure HT40 channels */

			/* Configure HT40 channels */
@@ -620,7 +620,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
					       ctx->vif);

					       ctx->vif);

		}

		}





		spin_unlock_irqrestore(&priv->lock, flags);

		spin_unlock_irqrestore(&priv->shrd->lock, flags);





		iwl_update_bcast_stations(priv);

		iwl_update_bcast_stations(priv);