commit eca664050ae87b7ec35fe0b660abe1156352a1bc
author Amarnath Hullur Subramanyam <amarnath@codeaurora.org> Wed Aug 26 20:16:44 2015 +0530
committer Vineeta Srivastava <vsrivastava@google.com> Wed Aug 26 22:50:43 2015 +0000
tree b9ec6410ed82502ee06922454ca9325f2bb3d141
parent 7325952cbfc88103197937b05c17c6e487e98cd9

WiFi-HAL: Do not consider request id to rssi-monitor deregister

RSSI monitoring gets issued from multiple places and request id
can be different. So, no need to consider request id for
deregistration.

Bug: 23483365
Change-Id: Idf93098e0273b6afaff161d85d805a317714dc24

qcwcn/wifi_hal/rssi_monitor.cpp

diff --git a/qcwcn/wifi_hal/rssi_monitor.cpp b/qcwcn/wifi_hal/rssi_monitor.cpp
index e942c7f..a276b55 100644
--- a/qcwcn/wifi_hal/rssi_monitor.cpp
+++ b/qcwcn/wifi_hal/rssi_monitor.cpp
@@ -181,10 +181,8 @@
     return ret;
 }
 
-wifi_error RSSIMonitorCommand::unregisterHandler(u32 subCmd, wifi_request_id reqid)
+wifi_error RSSIMonitorCommand::unregisterHandler(u32 subCmd)
 {
-    if (reqid != id())
-        return WIFI_ERROR_INVALID_REQUEST_ID;
     unregisterVendorHandler(mVendor_id, subCmd);
     return WIFI_SUCCESS;
 }
@@ -298,8 +296,8 @@
         goto cleanup;
     }
 
-    ret = rssiCommand->unregisterHandler(QCA_NL80211_VENDOR_SUBCMD_MONITOR_RSSI,
-                                         id);
+    ret = rssiCommand->unregisterHandler(
+                                        QCA_NL80211_VENDOR_SUBCMD_MONITOR_RSSI);
     if (ret != WIFI_SUCCESS)
         goto cleanup;
 

qcwcn/wifi_hal/rssi_monitor.h

diff --git a/qcwcn/wifi_hal/rssi_monitor.h b/qcwcn/wifi_hal/rssi_monitor.h
index 8d4cff9..bd3d88e 100644
--- a/qcwcn/wifi_hal/rssi_monitor.h
+++ b/qcwcn/wifi_hal/rssi_monitor.h
@@ -48,7 +48,7 @@
     static RSSIMonitorCommand* instance(wifi_handle handle, wifi_request_id id);
     virtual int setCallbackHandler(wifi_rssi_event_handler nHandler, u32 event);
     virtual int handleEvent(WifiEvent &event);
-    virtual wifi_error unregisterHandler(u32 subCmd, wifi_request_id id);
+    virtual wifi_error unregisterHandler(u32 subCmd);
     virtual void setReqId(wifi_request_id reqid);
 };