1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 6d143e453f9e..bf5e7d519398 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2760,6 +2760,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
         int res;
         int i, ret;
         u16 rsn_capab = 0;
+        int inactivity_timeout = 0;
 
         ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s:\n", __func__);
 
@@ -2896,8 +2897,15 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
         }
 
         if (info->inactivity_timeout) {
+
+                inactivity_timeout = info->inactivity_timeout;
+
+                if (ar->hw.flags & ATH6KL_HW_AP_INACTIVITY_MINS)
+                        inactivity_timeout = DIV_ROUND_UP(inactivity_timeout,
+                                                          60);
+
                 res = ath6kl_wmi_set_inact_period(ar->wmi, vif->fw_vif_idx,
-                                                  info->inactivity_timeout);
+                                                  inactivity_timeout);
                 if (res < 0)
                         return res;
         }