|
@@ -1668,7 +1668,7 @@ static int ath10k_mac_vif_recalc_ps_poll_count(struct ath10k_vif *arvif)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int ath10k_mac_ps_vif_count(struct ath10k *ar)
|
|
|
|
|
|
+static int ath10k_mac_num_vifs_started(struct ath10k *ar)
|
|
{
|
|
{
|
|
struct ath10k_vif *arvif;
|
|
struct ath10k_vif *arvif;
|
|
int num = 0;
|
|
int num = 0;
|
|
@@ -1676,7 +1676,7 @@ static int ath10k_mac_ps_vif_count(struct ath10k *ar)
|
|
lockdep_assert_held(&ar->conf_mutex);
|
|
lockdep_assert_held(&ar->conf_mutex);
|
|
|
|
|
|
list_for_each_entry(arvif, &ar->arvifs, list)
|
|
list_for_each_entry(arvif, &ar->arvifs, list)
|
|
- if (arvif->ps)
|
|
|
|
|
|
+ if (arvif->is_started)
|
|
num++;
|
|
num++;
|
|
|
|
|
|
return num;
|
|
return num;
|
|
@@ -1700,7 +1700,7 @@ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
|
|
|
|
|
|
enable_ps = arvif->ps;
|
|
enable_ps = arvif->ps;
|
|
|
|
|
|
- if (enable_ps && ath10k_mac_ps_vif_count(ar) > 1 &&
|
|
|
|
|
|
+ if (enable_ps && ath10k_mac_num_vifs_started(ar) > 1 &&
|
|
!test_bit(ATH10K_FW_FEATURE_MULTI_VIF_PS_SUPPORT,
|
|
!test_bit(ATH10K_FW_FEATURE_MULTI_VIF_PS_SUPPORT,
|
|
ar->fw_features)) {
|
|
ar->fw_features)) {
|
|
ath10k_warn(ar, "refusing to enable ps on vdev %i: not supported by fw\n",
|
|
ath10k_warn(ar, "refusing to enable ps on vdev %i: not supported by fw\n",
|