commit 941360f589c021b97ba6f645cabcf58d328be7b0
author Vinay Krishna Eranna <c_veran@qti.qualcomm.com> Thu Jan 16 15:38:22 2014 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Mon Jan 27 18:39:12 2014 -0800
tree 114b9a5ab90c289b159daf58f779f5ccb2d5797f
parent d9cbdb3f5c6fcc8df3625bc7a005124402ae4243

wlan: Fix for handling IPv6 notifier block rightly.

Correct the register and unregister sequence of IPv6
notifier block.

Change-Id: I9fe6b72101399f76d6d9da621fd730668312b2be
CRs-Fixed: 600300

CORE/HDD/src/wlan_hdd_early_suspend.c

diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 9a83efc..a815c8f 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -569,6 +569,7 @@
     int status;
 
     hddLog(LOG1, FL("Reconfiguring NS Offload"));
+
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
@@ -577,7 +578,9 @@
         return;
     }
 
-    if (VOS_TRUE == pHddCtx->sus_res_mcastbcast_filter_valid)
+    if ((eConnectionState_Associated ==
+                (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState)
+         && (VOS_TRUE == pHddCtx->sus_res_mcastbcast_filter_valid))
     {
         // This invocation being part of the IPv6 registration callback,
         // we are passing second parameter as 2 to avoid registration
@@ -593,9 +596,19 @@
     struct net_device *ndev = ifa->idev->dev;
     hdd_adapter_t *pAdapter =
              container_of(nb, struct hdd_adapter_s, ipv6_notifier);
+    hdd_context_t *pHddCtx;
+    int status;
 
     if (pAdapter && pAdapter->dev == ndev)
     {
+        pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+        status = wlan_hdd_validate_context(pHddCtx);
+        if (0 != status)
+        {
+            hddLog(LOGE, FL("HDD context is invalid"));
+            return NOTIFY_DONE;
+        }
+
         schedule_work(&pAdapter->ipv6NotifierWorkQueue);
     }
 
@@ -631,9 +644,11 @@
     int ret =0;
     eHalStatus returnStatus;
 
+    ENTER();
+    hddLog(LOG1, FL(" fenable = %d"), fenable);
+
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
-    ENTER();
     if (fenable)
     {
         in6_dev = __in6_dev_get(pAdapter->dev);
@@ -738,7 +753,7 @@
                     vos_mem_zero(&offLoadRequest, sizeof(offLoadRequest));
                 }
             }
-            if (fenable == 1)
+            if (fenable == 1 && !pAdapter->ipv6_notifier_registered)
             {
                 // Register IPv6 notifier to notify if any change in IP
                 // So that we can reconfigure the offload parameters
@@ -749,6 +764,11 @@
                 {
                     hddLog(LOGE, FL("Failed to register IPv6 notifier"));
                 }
+                else
+                {
+                    hddLog(LOG1, FL("Registered IPv6 notifier"));
+                    pAdapter->ipv6_notifier_registered = true;
+                }
             }
         }
         else
@@ -761,7 +781,12 @@
     else
     {
         //Disable NSOffload
-        unregister_inet6addr_notifier(&pAdapter->ipv6_notifier);
+        if (pAdapter->ipv6_notifier_registered)
+        {
+            hddLog(LOG1, FL("Unregistered IPv6 notifier"));
+            unregister_inet6addr_notifier(&pAdapter->ipv6_notifier);
+            pAdapter->ipv6_notifier_registered = false;
+        }
         vos_mem_zero((void *)&offLoadRequest, sizeof(tSirHostOffloadReq));
         offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE;
         offLoadRequest.offloadType =  SIR_IPV6_NS_OFFLOAD;