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

Commit 7a10e3e4 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: iwl-trans.c can't dereference iwl_priv any more 



This reaches encapsulation for this file. In order to reach this:
 * move priv->valid_context to iwl_shared
 * move the last_rejected initialization to the upper layer
 * define a wrapper iwl_nic_config in the upper layer that calls to
   cfg->lib->ops->nic_config

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 41f5e047

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

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control) 
				 IWL_SCD_BE_MSK | IWL_SCD_BK_MSK |

				 IWL_SCD_MGMT_MSK;

	if ((flush_control & BIT(IWL_RXON_CTX_PAN)) &&

	    (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS)))

	    (priv->shrd->valid_contexts != BIT(IWL_RXON_CTX_BSS)))

		flush_cmd.fifo_control |= IWL_PAN_SCD_VO_MSK |

				IWL_PAN_SCD_VI_MSK | IWL_PAN_SCD_BE_MSK |

				IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |

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

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ int iwlagn_set_pan_params(struct iwl_priv *priv) 
	int slot0 = 300, slot1 = 0;

	int ret;



	if (priv->valid_contexts == BIT(IWL_RXON_CTX_BSS))

	if (priv->shrd->valid_contexts == BIT(IWL_RXON_CTX_BSS))

		return 0;



	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);

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

+3 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ int iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type) 


static int iwlagn_alive_notify(struct iwl_priv *priv)

{

	struct iwl_rxon_context *ctx;

	int ret;



	if (!priv->tx_cmd_pool)
@@ -361,6 +362,8 @@ static int iwlagn_alive_notify(struct iwl_priv *priv) 
		return -ENOMEM;



	iwl_trans_tx_start(trans(priv));

	for_each_context(priv, ctx)

		ctx->last_tx_rejected = false;



	ret = iwlagn_send_wimax_coex(priv);

	if (ret)

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

+4 −4
Original line number Diff line number Diff line
@@ -623,9 +623,9 @@ static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags) 
	 * The default context is always valid,

	 * the PAN context depends on uCode.

	 */

	priv->valid_contexts = BIT(IWL_RXON_CTX_BSS);

	priv->shrd->valid_contexts = BIT(IWL_RXON_CTX_BSS);

	if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN)

		priv->valid_contexts |= BIT(IWL_RXON_CTX_PAN);

		priv->shrd->valid_contexts |= BIT(IWL_RXON_CTX_PAN);



	for (i = 0; i < NUM_IWL_RXON_CTX; i++)

		priv->contexts[i].ctxid = i;
@@ -2880,7 +2880,7 @@ static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw, 
	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_PAN];

	int err = 0;



	if (!(priv->valid_contexts & BIT(IWL_RXON_CTX_PAN)))

	if (!(priv->shrd->valid_contexts & BIT(IWL_RXON_CTX_PAN)))

		return -EOPNOTSUPP;



	if (!(ctx->interface_modes & BIT(NL80211_IFTYPE_P2P_CLIENT)))
@@ -2945,7 +2945,7 @@ static int iwl_mac_cancel_remain_on_channel(struct ieee80211_hw *hw) 
{

	struct iwl_priv *priv = hw->priv;



	if (!(priv->valid_contexts & BIT(IWL_RXON_CTX_PAN)))

	if (!(priv->shrd->valid_contexts & BIT(IWL_RXON_CTX_PAN)))

		return -EOPNOTSUPP;



	mutex_lock(&priv->shrd->mutex);

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

+6 −0
Original line number Diff line number Diff line
@@ -1870,3 +1870,9 @@ void iwl_set_hw_rfkill_state(struct iwl_priv *priv, bool state) 
{

	wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);

}



void iwl_nic_config(struct iwl_priv *priv)

{

	priv->cfg->lib->nic_config(priv);



}