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

Commit 4f23f206 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: cleanup incorrect and redundant define 



Currently we have up to 3 phy contexts - defined by NUM_PHY_CTX.
However - some code paths validate the ID by using MAX_PHYS define
which is set to 4.
While there is no harm it is incorrect - since the maximum is 3.
Remove the define and use the correct one.
Cleanup the code a bit while at it.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 6574dc94

drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h

+0 −1
Original line number Diff line number Diff line
@@ -713,7 +713,6 @@ struct iwl_error_resp { 
#define MAX_MACS_IN_BINDING	(3)

#define MAX_BINDINGS		(4)

#define AUX_BINDING_INDEX	(3)

#define MAX_PHYS		(4)



/* Used to extract ID and color from the context dword */

#define FW_CTXT_ID_POS	  (0)

drivers/net/wireless/intel/iwlwifi/mvm/power.c

+11 −15
Original line number Diff line number Diff line
@@ -599,8 +599,7 @@ static void iwl_mvm_power_ps_disabled_iterator(void *_data, u8* mac, 
	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	bool *disable_ps = _data;



	if (mvmvif->phy_ctxt)

		if (mvmvif->phy_ctxt->id < MAX_PHYS)

	if (mvmvif->phy_ctxt && mvmvif->phy_ctxt->id < NUM_PHY_CTX)

		*disable_ps |= mvmvif->ps_disabled;

}
@@ -609,6 +608,7 @@ static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac, 
{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_power_vifs *power_iterator = _data;

	bool active = mvmvif->phy_ctxt && mvmvif->phy_ctxt->id < NUM_PHY_CTX;



	switch (ieee80211_vif_type_p2p(vif)) {

	case NL80211_IFTYPE_P2P_DEVICE:
@@ -619,8 +619,7 @@ static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac, 
		/* only a single MAC of the same type */

		WARN_ON(power_iterator->ap_vif);

		power_iterator->ap_vif = vif;

		if (mvmvif->phy_ctxt)

			if (mvmvif->phy_ctxt->id < MAX_PHYS)

		if (active)

			power_iterator->ap_active = true;

		break;
@@ -628,8 +627,7 @@ static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac, 
		/* only a single MAC of the same type */

		WARN_ON(power_iterator->monitor_vif);

		power_iterator->monitor_vif = vif;

		if (mvmvif->phy_ctxt)

			if (mvmvif->phy_ctxt->id < MAX_PHYS)

		if (active)

			power_iterator->monitor_active = true;

		break;
@@ -637,15 +635,13 @@ static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac, 
		/* only a single MAC of the same type */

		WARN_ON(power_iterator->p2p_vif);

		power_iterator->p2p_vif = vif;

		if (mvmvif->phy_ctxt)

			if (mvmvif->phy_ctxt->id < MAX_PHYS)

		if (active)

			power_iterator->p2p_active = true;

		break;



	case NL80211_IFTYPE_STATION:

		power_iterator->bss_vif = vif;

		if (mvmvif->phy_ctxt)

			if (mvmvif->phy_ctxt->id < MAX_PHYS)

		if (active)

			power_iterator->bss_active = true;

		break;

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void iwl_mvm_scan_condition_iterator(void *data, u8 *mac, 
	int *global_cnt = data;



	if (vif->type != NL80211_IFTYPE_P2P_DEVICE && mvmvif->phy_ctxt &&

	    mvmvif->phy_ctxt->id < MAX_PHYS)

	    mvmvif->phy_ctxt->id < NUM_PHY_CTX)

		*global_cnt += 1;

}