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

Commit 9d8ce6af authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: use iwl_mvm_sta_from_mac80211() consistently 



A number of places (still) use a direct operation, use
iwl_mvm_sta_from_mac80211() consistently. In one place
also move it into the variable initializer.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 5b530e95

drivers/net/wireless/iwlwifi/mvm/d3.c

+2 −2
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ iwl_mvm_get_wowlan_config(struct iwl_mvm *mvm, 
			  struct ieee80211_sta *ap_sta)

{

	int ret;

	struct iwl_mvm_sta *mvm_ap_sta = (struct iwl_mvm_sta *)ap_sta->drv_priv;

	struct iwl_mvm_sta *mvm_ap_sta = iwl_mvm_sta_from_mac80211(ap_sta);



	/* TODO: wowlan_config_cmd->wowlan_ba_teardown_tids */
@@ -1657,7 +1657,7 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
	if (IS_ERR_OR_NULL(ap_sta))

		goto out_free;



	mvm_ap_sta = (struct iwl_mvm_sta *)ap_sta->drv_priv;

	mvm_ap_sta = iwl_mvm_sta_from_mac80211(ap_sta);

	for (i = 0; i < IWL_MAX_TID_COUNT; i++) {

		u16 seq = status.qos_seq_ctr[i];

		/* firmware stores last-used value, we store next value */

drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file, 
		sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[ap_sta_id],

						lockdep_is_held(&mvm->mutex));

		if (!IS_ERR_OR_NULL(sta)) {

			struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;

			struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);



			pos += scnprintf(buf+pos, bufsz-pos,

					 "ap_sta_id %d - reduced Tx power %d\n",

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -2137,7 +2137,7 @@ static void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw, 
				       struct ieee80211_sta *sta)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);



	/*

	 * This is called before mac80211 does RCU synchronisation,
@@ -3152,7 +3152,7 @@ static int iwl_mvm_set_tim(struct ieee80211_hw *hw, 
			   bool set)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);



	if (!mvm_sta || !mvm_sta->vif) {

		IWL_ERR(mvm, "Station is not associated to a vif\n");

drivers/net/wireless/iwlwifi/mvm/ops.c

+1 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ void iwl_mvm_d0i3_enable_tx(struct iwl_mvm *mvm, __le16 *qos_seq) 


	if (mvm->d0i3_offloading && qos_seq) {

		/* update qos seq numbers if offloading was enabled */

		mvm_ap_sta = (struct iwl_mvm_sta *)sta->drv_priv;

		mvm_ap_sta = iwl_mvm_sta_from_mac80211(sta);

		for (i = 0; i < IWL_MAX_TID_COUNT; i++) {

			u16 seq = le16_to_cpu(qos_seq[i]);

			/* firmware stores last-used one, we store next one */

drivers/net/wireless/iwlwifi/mvm/rs.c

+5 −8
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ static bool rs_tpc_perform(struct iwl_mvm *mvm, 
			   struct iwl_lq_sta *lq_sta,

			   struct iwl_scale_tbl_info *tbl)

{

	struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	struct ieee80211_vif *vif = mvm_sta->vif;

	struct ieee80211_chanctx_conf *chanctx_conf;

	enum ieee80211_band band;
@@ -2055,7 +2055,7 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm, 
	u16 high_low;

	s32 sr;

	u8 prev_agg = lq_sta->is_agg;

	struct iwl_mvm_sta *sta_priv = (void *)sta->drv_priv;

	struct iwl_mvm_sta *sta_priv = iwl_mvm_sta_from_mac80211(sta);

	struct iwl_mvm_tid_data *tid_data;

	struct rs_rate *rate;
@@ -2541,7 +2541,7 @@ static void rs_get_rate(void *mvm_r, struct ieee80211_sta *sta, void *mvm_sta, 
static void *rs_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta,

			  gfp_t gfp)

{

	struct iwl_mvm_sta *sta_priv = (struct iwl_mvm_sta *)sta->drv_priv;

	struct iwl_mvm_sta *sta_priv = iwl_mvm_sta_from_mac80211(sta);

	struct iwl_op_mode *op_mode = (struct iwl_op_mode *)mvm_rate;

	struct iwl_mvm *mvm  = IWL_OP_MODE_GET_MVM(op_mode);

	struct iwl_lq_sta *lq_sta = &sta_priv->lq_sta;
@@ -2694,14 +2694,11 @@ void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	struct ieee80211_hw *hw = mvm->hw;

	struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;

	struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;

	struct iwl_mvm_sta *sta_priv;

	struct iwl_lq_sta *lq_sta;

	struct iwl_mvm_sta *sta_priv = iwl_mvm_sta_from_mac80211(sta);

	struct iwl_lq_sta *lq_sta = &sta_priv->lq_sta;

	struct ieee80211_supported_band *sband;

	unsigned long supp; /* must be unsigned long for for_each_set_bit */



	sta_priv = (struct iwl_mvm_sta *)sta->drv_priv;

	lq_sta = &sta_priv->lq_sta;



	/* clear all non-persistent lq data */

	memset(lq_sta, 0, offsetof(typeof(*lq_sta), pers));