commit 218e29099b7cf7c3ccf5bd46dc15f88b8c7705b3
author Linux Build Service Account <lnxbuild@localhost> Thu Jan 07 13:29:44 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 07 13:29:44 2016 -0800
tree f0844afb5fcb54807a221060514797c632bb0b30
parent 6765883285a44fb7126a833ca95602ff2ce748ab
parent 038abc158cee63b4da5511a66d7bc6318135380e

Merge "wlan: Remove irrelevant checks in Monitor Mode."

CORE/HDD/src/wlan_hdd_wext.c

diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index d088c33..e21df64 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -5393,16 +5393,16 @@
         return ret;
     }
 
-    hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
-    if (NULL == hHal)
-    {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: Hal Context is NULL",__func__);
-        return -EINVAL;
-    }
-
     if ( VOS_MONITOR_MODE != hdd_get_conparam())
     {
+      /* In monitor mode hHal is NULL */
+      hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
+      if (NULL == hHal)
+      {
+          VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                 "%s: Hal Context is NULL",__func__);
+          return -EINVAL;
+      }
       pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
       if (NULL == pWextState)
       {