Merge tag 'wireless-drivers-next-for-davem-2015-10-27' of git://git.kernel.org/pub...

[deliverable/linux.git] / drivers / net / wireless / ath / ath6kl / cfg80211.c

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index a511ef3614b9ed098558d1d86a9fec88b2330235..76b682e566ab217f842648cbd3e4e0177d3ef1da 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2217,7 +2217,7 @@ static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
 
        /* enter / leave wow suspend on first vif always */
        first_vif = ath6kl_vif_first(ar);
-       if (WARN_ON(unlikely(!first_vif)) ||
+       if (WARN_ON(!first_vif) ||
            !ath6kl_cfg80211_ready(first_vif))
                return -EIO;
 
@@ -2297,7 +2297,7 @@ static int ath6kl_wow_resume(struct ath6kl *ar)
        int ret;
 
        vif = ath6kl_vif_first(ar);
-       if (WARN_ON(unlikely(!vif)) ||
+       if (WARN_ON(!vif) ||
            !ath6kl_cfg80211_ready(vif))
                return -EIO;
 
@@ -3312,7 +3312,7 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
        }
 
        /* fw uses seconds, also make sure that it's >0 */
-       interval = max_t(u16, 1, request->interval / 1000);
+       interval = max_t(u16, 1, request->scan_plans[0].interval);
 
        ath6kl_wmi_scanparams_cmd(ar->wmi, vif->fw_vif_idx,
                                  interval, interval,