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

Commit 8bd413e6 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: move virtual interface pointer into context 



iwlwifi occasionally needs to find the virtual
interface pointer to give it to mac80211, but right
now it only keeps one. Move it into the context so
that we can keep one pointer each.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent c90cbbbd

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

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) 


	rcu_read_lock();



	sta = ieee80211_find_sta(priv->vif,

	sta = ieee80211_find_sta(priv->contexts[IWL_RXON_CTX_BSS].vif,

				 priv->stations[sta_id].sta.sta.addr);

	if (!sta) {

		IWL_DEBUG_RATE(priv, "Unable to find station to initialize rate scaling.\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, 
	u32 tsf_low;

	u8 switch_count;

	u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);

	struct ieee80211_vif *vif = priv->vif;

	struct ieee80211_vif *vif = ctx->vif;

	band = priv->band == IEEE80211_BAND_2GHZ;



	is_ht40 = is_ht40_channel(ctx->staging.flags);

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

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 
	u32 tsf_low;

	u8 switch_count;

	u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);

	struct ieee80211_vif *vif = priv->vif;

	struct ieee80211_vif *vif = ctx->vif;

	struct iwl_host_cmd hcmd = {

		.id = REPLY_CHANNEL_SWITCH,

		.len = sizeof(cmd),

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 
	u32 tsf_low;

	u8 switch_count;

	u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);

	struct ieee80211_vif *vif = priv->vif;

	struct ieee80211_vif *vif = ctx->vif;

	struct iwl_host_cmd hcmd = {

		.id = REPLY_CHANNEL_SWITCH,

		.len = sizeof(cmd),

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

+7 −3
Original line number Diff line number Diff line
@@ -1720,6 +1720,7 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work) 
{

	struct iwl_priv *priv =

		container_of(work, struct iwl_priv, bt_traffic_change_work);

	struct iwl_rxon_context *ctx;

	int smps_request = -1;



	IWL_DEBUG_INFO(priv, "BT traffic load changes: %d\n",
@@ -1747,9 +1748,12 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work) 
	if (priv->cfg->ops->lib->update_chain_flags)

		priv->cfg->ops->lib->update_chain_flags(priv);



	if (smps_request != -1 &&

	    priv->vif && priv->vif->type == NL80211_IFTYPE_STATION)

		ieee80211_request_smps(priv->vif, smps_request);

	if (smps_request != -1) {

		for_each_context(priv, ctx) {

			if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION)

				ieee80211_request_smps(ctx->vif, smps_request);

		}

	}



	mutex_unlock(&priv->mutex);

}