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

Commit 881acd89 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: mvm: clean up invalid station handling 



Using IWL_MVM_STATION_COUNT and IWL_INVALID_STATION together
isn't a good idea as they have different values. Always use
IWL_MVM_STATION_COUNT for an invalid station in MVM and move
the definition of the IWL_INVALID_STATION constant into the
DVM driver to avoid making such mistakes again. The one use
in the transport code can be hard-coded to -1 instead as the
station ID is passed as an integer there.

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

drivers/net/wireless/iwlwifi/dvm/agn.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ 
/* AUX (TX during scan dwell) queue */

#define IWL_AUX_QUEUE		10



#define IWL_INVALID_STATION	255



/* device operations */

extern struct iwl_lib_ops iwl1000_lib;

extern struct iwl_lib_ops iwl2000_lib;

drivers/net/wireless/iwlwifi/iwl-trans.h

+1 −2
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static inline void iwl_free_rxb(struct iwl_rx_cmd_buffer *r) 
 * currently supports

 */

#define IWL_MAX_HW_QUEUES		32

#define IWL_INVALID_STATION	255

#define IWL_MAX_TID_COUNT	8

#define IWL_FRAME_LIMIT	64
@@ -682,7 +681,7 @@ static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue, 
static inline void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue,

					   int fifo)

{

	iwl_trans_txq_enable(trans, queue, fifo, IWL_INVALID_STATION,

	iwl_trans_txq_enable(trans, queue, fifo, -1,

			     IWL_MAX_TID_COUNT, IWL_FRAME_LIMIT, 0);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw, 
		 */

		break;

	case STA_NOTIFY_AWAKE:

		if (WARN_ON(mvmsta->sta_id == IWL_INVALID_STATION))

		if (WARN_ON(mvmsta->sta_id == IWL_MVM_STATION_COUNT))

			break;

		iwl_mvm_sta_modify_ps_wake(mvm, sta);

		break;

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

+4 −4
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static u8 iwl_mvm_get_key_sta_id(struct ieee80211_vif *vif, 
	    mvmvif->ap_sta_id != IWL_MVM_STATION_COUNT)

		return mvmvif->ap_sta_id;



	return IWL_INVALID_STATION;

	return IWL_MVM_STATION_COUNT;

}



static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
@@ -1093,7 +1093,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 


	/* Get the station id from the mvm local station table */

	sta_id = iwl_mvm_get_key_sta_id(vif, sta);

	if (sta_id == IWL_INVALID_STATION) {

	if (sta_id == IWL_MVM_STATION_COUNT) {

		IWL_ERR(mvm, "Failed to find station id\n");

		return -EINVAL;

	}
@@ -1188,7 +1188,7 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, 
		return -ENOENT;

	}



	if (sta_id == IWL_INVALID_STATION) {

	if (sta_id == IWL_MVM_STATION_COUNT) {

		IWL_DEBUG_WEP(mvm, "station non-existent, early return.\n");

		return 0;

	}
@@ -1254,7 +1254,7 @@ void iwl_mvm_update_tkip_key(struct iwl_mvm *mvm, 
	struct iwl_mvm_sta *mvm_sta;

	u8 sta_id = iwl_mvm_get_key_sta_id(vif, sta);



	if (WARN_ON_ONCE(sta_id == IWL_INVALID_STATION))

	if (WARN_ON_ONCE(sta_id == IWL_MVM_STATION_COUNT))

		return;



	rcu_read_lock();

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

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb, 
	if (WARN_ON_ONCE(!mvmsta))

		return -1;



	if (WARN_ON_ONCE(mvmsta->sta_id == IWL_INVALID_STATION))

	if (WARN_ON_ONCE(mvmsta->sta_id == IWL_MVM_STATION_COUNT))

		return -1;



	dev_cmd = iwl_mvm_set_tx_params(mvm, skb, sta, mvmsta->sta_id);