diff options
author | Vinit Deshpande <vinitd@google.com> | 2015-07-07 14:52:54 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2015-07-08 13:41:15 -0700 |
commit | c6e2679d2701404570f4f164e09dbdab92a1dafe (patch) | |
tree | dd2a7fa486052be74180af6451cdfa77124d970b /bcmdhd/wifi_hal/rtt.cpp | |
parent | ff1731f83e664b0f3389dd28e157eb922751b1f3 (diff) | |
download | hardware_broadcom_wlan-c6e2679d2701404570f4f164e09dbdab92a1dafe.zip hardware_broadcom_wlan-c6e2679d2701404570f4f164e09dbdab92a1dafe.tar.gz hardware_broadcom_wlan-c6e2679d2701404570f4f164e09dbdab92a1dafe.tar.bz2 |
Fix incorrect wifi_cleanup
The cleanup needs to cancel commands, not the event handlers;
and needs a while loop instead of a for loop.
Also added command names to identify which commands are causing
problems.
Bug: 22302517
Change-Id: I93c3e51f7cd3ad62c1a34eeb5708d9552e37342b
Diffstat (limited to 'bcmdhd/wifi_hal/rtt.cpp')
-rw-r--r-- | bcmdhd/wifi_hal/rtt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp index 9812fe5..f77fdb0 100644 --- a/bcmdhd/wifi_hal/rtt.cpp +++ b/bcmdhd/wifi_hal/rtt.cpp @@ -115,7 +115,7 @@ class GetRttCapabilitiesCommand : public WifiCommand wifi_rtt_capabilities *mCapabilities; public: GetRttCapabilitiesCommand(wifi_interface_handle iface, wifi_rtt_capabilities *capabitlites) - : WifiCommand(iface, 0), mCapabilities(capabitlites) + : WifiCommand("GetRttCapabilitiesCommand", iface, 0), mCapabilities(capabitlites) { memset(mCapabilities, 0, sizeof(*mCapabilities)); } @@ -170,7 +170,7 @@ class RttCommand : public WifiCommand public: RttCommand(wifi_interface_handle iface, int id, unsigned num_rtt_config, wifi_rtt_config rtt_config[], wifi_rtt_event_handler handler) - : WifiCommand(iface, id), numRttParams(num_rtt_config), rttParams(rtt_config), + : WifiCommand("RttCommand", iface, id), numRttParams(num_rtt_config), rttParams(rtt_config), rttHandler(handler) { memset(rttResults, 0, sizeof(rttResults)); @@ -180,7 +180,7 @@ public: } RttCommand(wifi_interface_handle iface, int id) - : WifiCommand(iface, id) + : WifiCommand("RttCommand", iface, id) { currentIdx = 0; mCompleted = 0; |