[NEUS7920-133][9610][7885] wlbt: Increase timeout waiting for mlme cfm/ind

Sometimes when system is heavily loaded, HIP needs more time to
retrive cfms/ind, So increase this timeout to 6 secs.

Change-Id: Ie1972509ef47edf1d631a355fa49511af89a7d69
SCSC-Bug-Id: SSB-50283
Signed-off-by: Jaya Prakash Sangaru <j.sangaru@samsung.com>

diff --git a/drivers/net/wireless/scsc/cfg80211_ops.c b/drivers/net/wireless/scsc/cfg80211_ops.c
index 17e90344fc283ca112edb7f10806fa1a0131d361..87ffdc6b7f7141ce552dcb36fa7877492fd9dac7 100755 (executable)
--- a/drivers/net/wireless/scsc/cfg80211_ops.c
+++ b/drivers/net/wireless/scsc/cfg80211_ops.c
@@ -2383,7 +2383,7 @@ int slsi_start_ap(struct wiphy *wiphy, struct net_device *dev,
 
        r = slsi_read_disconnect_ind_timeout(sdev, SLSI_PSID_UNIFI_DISCONNECT_TIMEOUT);
        if (r != 0)
-               sdev->device_config.ap_disconnect_ind_timeout = *sdev->sig_wait_cfm_timeout + 2000;
+               sdev->device_config.ap_disconnect_ind_timeout = *sdev->sig_wait_cfm_timeout;
 
        SLSI_NET_DBG2(dev, SLSI_CFG80211, "slsi_read_disconnect_ind_timeout: timeout = %d", sdev->device_config.ap_disconnect_ind_timeout);
        goto exit_with_vif_mutex;

diff --git a/drivers/net/wireless/scsc/dev.c b/drivers/net/wireless/scsc/dev.c
index 65159c5e5d65f06c63592e82f2cbcca5ee0570b3..dd797709c1ce6bf9f9245bfd0fa1589825647ca3 100644 (file)
--- a/drivers/net/wireless/scsc/dev.c
+++ b/drivers/net/wireless/scsc/dev.c
@@ -49,7 +49,7 @@ static bool term_udi_users = true;
 module_param(term_udi_users, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(term_udi_users, "Try to terminate UDI user space users (applications) connected on the cdev (0, 1)");
 
-static int sig_wait_cfm_timeout = 3000;
+static int sig_wait_cfm_timeout = 6000;
 module_param(sig_wait_cfm_timeout, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(sig_wait_cfm_timeout, "Signal wait timeout in milliseconds (default: 3000)");
 

diff --git a/drivers/net/wireless/scsc/mlme.c b/drivers/net/wireless/scsc/mlme.c
index efe6eaa5309518b3c944acaaf53f04d5dd871f48..d38507b3dc71601afdb6269b3d4e562a3abb36c9 100755 (executable)
--- a/drivers/net/wireless/scsc/mlme.c
+++ b/drivers/net/wireless/scsc/mlme.c
@@ -151,7 +151,7 @@ static struct sk_buff *slsi_mlme_wait_for_ind(struct slsi_dev *sdev, struct net_
        else if ((ind_id == MLME_DISCONNECT_IND) && (ndev_vif->vif_type == FAPI_VIFTYPE_AP))
                tm = wait_for_completion_timeout(&sig_wait->completion, msecs_to_jiffies(sdev->device_config.ap_disconnect_ind_timeout));
        else
-               tm = wait_for_completion_timeout(&sig_wait->completion, msecs_to_jiffies(*sdev->sig_wait_cfm_timeout + 2000));
+               tm = wait_for_completion_timeout(&sig_wait->completion, msecs_to_jiffies(*sdev->sig_wait_cfm_timeout));
 
        spin_lock_bh(&sig_wait->send_signal_lock);