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: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
index 0b77073e719aa9b6395d00d87937f16da8825f24..91f53596130b2514cc10c55299d6adca26f7a11c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
@@ -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)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/power.c b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
index 3a8e9379da2f92c23bb0318bad237ddb8004b87f..e684811f8e8b3156b4f392d1fc5624a299d22465 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
@@ -599,9 +599,8 @@ 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)
-                       *disable_ps |= mvmvif->ps_disabled;
+       if (mvmvif->phy_ctxt && mvmvif->phy_ctxt->id < NUM_PHY_CTX)
+               *disable_ps |= mvmvif->ps_disabled;
 }
 
 static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac,
@@ -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,34 +619,30 @@ 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)
-                               power_iterator->ap_active = true;
+               if (active)
+                       power_iterator->ap_active = true;
                break;
 
        case NL80211_IFTYPE_MONITOR:
                /* 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)
-                               power_iterator->monitor_active = true;
+               if (active)
+                       power_iterator->monitor_active = true;
                break;
 
        case NL80211_IFTYPE_P2P_CLIENT:
                /* 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)
-                               power_iterator->p2p_active = true;
+               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)
-                               power_iterator->bss_active = true;
+               if (active)
+                       power_iterator->bss_active = true;
                break;
 
        default:

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index fa97432054912b53493d6e0f75000c6def479d93..2aaa5ecf97bc5eeae8bd84a5b241e5bdcd3e3566 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -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;
 }