ath10k: do not restrict thermal throttling to ap mode
authorRajkumar Manoharan <rmanohar@qti.qualcomm.com>
Sun, 15 Mar 2015 15:06:23 +0000 (20:36 +0530)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 23 Mar 2015 15:16:43 +0000 (17:16 +0200)
Recently thermal mitigation is validated in station mode as well.
Hence allowing thermal throttling for all interfaces. This enables
user to validate thermal mitigation with different modes.

Reported-by: Matthias Kaehlcke <mka@google.com>
Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/thermal.c

index 8640f413f384752488b1b217d08c87f1fc9164f0..604ea002ff6fc70e9aea567b707fa32139a952af 100644 (file)
 #include "debug.h"
 #include "wmi-ops.h"
 
-static int ath10k_thermal_get_active_vifs(struct ath10k *ar,
-                                         enum wmi_vdev_type type)
-{
-       struct ath10k_vif *arvif;
-       int count = 0;
-
-       lockdep_assert_held(&ar->conf_mutex);
-
-       list_for_each_entry(arvif, &ar->arvifs, list) {
-               if (!arvif->is_started)
-                       continue;
-
-               if (!arvif->is_up)
-                       continue;
-
-               if (arvif->vdev_type != type)
-                       continue;
-
-               count++;
-       }
-       return count;
-}
-
 static int
 ath10k_thermal_get_max_throttle_state(struct thermal_cooling_device *cdev,
                                      unsigned long *state)
@@ -73,7 +50,7 @@ ath10k_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev,
                                      unsigned long throttle_state)
 {
        struct ath10k *ar = cdev->devdata;
-       int num_bss, ret = 0;
+       int ret = 0;
 
        mutex_lock(&ar->conf_mutex);
        if (ar->state != ATH10K_STATE_ON) {
@@ -87,17 +64,6 @@ ath10k_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev,
                ret = -EINVAL;
                goto out;
        }
-       /* TODO: Right now, thermal mitigation is handled only for single/multi
-        * vif AP mode. Since quiet param is not validated in STA mode, it needs
-        * to be investigated further to handle multi STA and multi-vif (AP+STA)
-        * mode properly.
-        */
-       num_bss = ath10k_thermal_get_active_vifs(ar, WMI_VDEV_TYPE_AP);
-       if (!num_bss) {
-               ath10k_warn(ar, "no active AP interfaces\n");
-               ret = -ENETDOWN;
-               goto out;
-       }
        ar->thermal.throttle_state = throttle_state;
        ath10k_thermal_set_throttling(ar);
 out: