[9610][7885][7872] wlbt: P2P Scan cleanup on intf down

Send mlme-del-scan.req when interface goes down for p2p-group interface

SCSC-Bug-Id: SSB-42480

Change-Id: I496c00b5872aaebfe860a3fa432cb5cad78c304a
Signed-off-by: Jayaprakash Sangaru <j.sangaru@samsung.com>

diff --git a/drivers/net/wireless/scsc/mgt.c b/drivers/net/wireless/scsc/mgt.c
index 3011ea33c6b56a01de2ca2a0edc1a341fac0c74c..2e7267b69453dec1f0a8b9db8e3106c40b17925b 100755 (executable)
--- a/drivers/net/wireless/scsc/mgt.c
+++ b/drivers/net/wireless/scsc/mgt.c
@@ -660,6 +660,9 @@ void slsi_scan_cleanup(struct slsi_dev *sdev, struct net_device *dev)
 
        SLSI_MUTEX_LOCK(ndev_vif->scan_mutex);
        for (i = 0; i < SLSI_SCAN_MAX; i++) {
+               if (ndev_vif->scan[i].scan_req && !sdev->mlme_blocked &&
+                   SLSI_IS_VIF_INDEX_P2P_GROUP(ndev_vif))
+                       slsi_mlme_del_scan(sdev, dev, (ndev_vif->ifnum << 8 | i), false);
                slsi_purge_scan_results(ndev_vif, i);
                if (ndev_vif->scan[i].scan_req && i == SLSI_SCAN_HW_ID)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0))

diff --git a/drivers/net/wireless/scsc/mlme.c b/drivers/net/wireless/scsc/mlme.c
index 32ddc35d8793721c00e1bd2100d74bef13f3300f..3cb3e303aacd8784f794820a2d45398d3162c6a4 100755 (executable)
--- a/drivers/net/wireless/scsc/mlme.c
+++ b/drivers/net/wireless/scsc/mlme.c
@@ -1419,7 +1419,7 @@ int slsi_mlme_add_scan(
                return -EINVAL;
 
        WARN_ON(!SLSI_MUTEX_IS_LOCKED(ndev_vif->scan_mutex));
-       SLSI_NET_DBG3(dev, SLSI_MLME, "id:0x%x, n_channels:%d, n_ssids\n", (ndev_vif->ifnum << 8 | SLSI_SCAN_HW_ID),
+       SLSI_NET_DBG3(dev, SLSI_MLME, "id:0x%x, n_channels:%d, n_ssids:%d\n", (ndev_vif->ifnum << 8 | SLSI_SCAN_HW_ID),
                      n_channels, n_ssids);
 
        alloc_data_size += sizeof(scan_timing_ie) +