commit 5286bb9352b05aee0077ac7b6ab720000c878e1c
author Rajeev Kumar <rajekuma@qca.qualcomm.com> Thu Dec 05 11:52:10 2013 -0800
committer Kiet Lam <c_kietl@qca.qualcomm.com> Wed Dec 18 00:40:18 2013 -0800
tree 02a096c0491a728f1d962222742643f77ccf6f41
parent 6d2a33222f80a92b9938a38f76ae97989208e3fa

wlan: Fix of WLS_BATCHING SET command failure

In hdd_ioctl() while handling WLS_BATCHING SET DEV IOCTL HDD
is only checking for STA and P2P client mode of pAdapter where
as in latest builds pAdapter mode is coming as P2P device. In additon to
this this gerrit is also fixing a potential null pointer dereference
in hdd_batch_scan_result_ind_callback

Change-Id: I0edee3597d5aff6b6f05eb365c950a5c86be4928
CRs-fixed: 585666

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 0721b28..d7d6630 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1127,7 +1127,7 @@
 
     pAdapter = (hdd_adapter_t *)callbackContext;
     /*sanity check*/
-    if ((NULL != pAdapter) && (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
+    if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                   "%s: Invalid pAdapter magic", __func__);
@@ -3365,7 +3365,8 @@
 
 
           if ((WLAN_HDD_INFRA_STATION != pAdapter->device_mode) &&
-              (WLAN_HDD_P2P_CLIENT != pAdapter->device_mode))
+              (WLAN_HDD_P2P_CLIENT != pAdapter->device_mode) &&
+              (WLAN_HDD_P2P_DEVICE != pAdapter->device_mode))
           {
              VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                 "Received WLS_BATCHING SET command in invalid mode %d "