commit 4c723bdc09755b4a4ac639255cea6a38ea478351
author Amar Singhal <asinghal@qca.qualcomm.com> Mon Mar 25 18:14:15 2013 -0700
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Wed Apr 03 13:07:36 2013 -0700
tree 92d8cbb49c722bba2d9313c01b0c126b3d73e8b1
parent 316247ed1bf0f89ccf4f8ed5fbad1f49502f38f0

wlan: Abort hdd_netdev_notifier_call during ssr

Abort the call to function hdd_netdev_notifier_call if
subsystem restart is in progress.

Change-Id: I8b39ff2c6e42a97380a1345856bf90c78d826e15
CRs-fixed: 461952

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 65ed305..eb3c584 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -177,6 +177,7 @@
 #endif
 
 void hdd_wlan_initial_scan(hdd_adapter_t *pAdapter);
+int isWDresetInProgress(void);
 
 extern int hdd_setBand_helper(struct net_device *dev, tANI_U8* ptr);
 #if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
@@ -198,7 +199,10 @@
 
    //Make sure that this callback corresponds to our device.
    if ((strncmp(dev->name, "wlan", 4)) &&
-       (strncmp(dev->name, "p2p", 3)))
+      (strncmp(dev->name, "p2p", 3)))
+      return NOTIFY_DONE;
+
+   if (isWDresetInProgress())
       return NOTIFY_DONE;
 
    if (!dev->ieee80211_ptr)
@@ -297,7 +301,6 @@
 /*---------------------------------------------------------------------------
  *   Function definitions
  *-------------------------------------------------------------------------*/
-int isWDresetInProgress(void);
 void hdd_unregister_mcast_bcast_filter(hdd_context_t *pHddCtx);
 void hdd_register_mcast_bcast_filter(hdd_context_t *pHddCtx);
 //variable to hold the insmod parameters