commit 296cc55f72c1a68b8c7d70058ffe003132a79b35
author Vinit Deshpande <vinitd@google.com> Mon Dec 28 19:58:54 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 28 19:58:54 2015 +0000
tree 1e8fb51dbdff627d25806664ca5459e9c81aab71
parent 410c95ef085f6f35ad39bdc552c308ad292db01e
parent d67d125603c2beb1dad13e68774677d3c47cb760

Merge "Use unsigned int to fix wrong full scan bucket calculation"
am: d67d125603

* commit 'd67d125603c2beb1dad13e68774677d3c47cb760':
  Use unsigned int to fix wrong full scan bucket calculation

bcmdhd/wifi_hal/cpp_bindings.cpp

diff --git a/bcmdhd/wifi_hal/cpp_bindings.cpp b/bcmdhd/wifi_hal/cpp_bindings.cpp
index 5b085d8..399199d 100644
--- a/bcmdhd/wifi_hal/cpp_bindings.cpp
+++ b/bcmdhd/wifi_hal/cpp_bindings.cpp
@@ -538,6 +538,9 @@
 }
 
 int WifiRequest::create(int family, uint8_t cmd, int flags, int hdrlen) {
+
+    destroy();
+
     mMsg = nlmsg_alloc();
     if (mMsg != NULL) {
         genlmsg_put(mMsg, /* pid = */ 0, /* seq = */ 0, family,

bcmdhd/wifi_hal/wifi_hal.cpp

diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp
index 28f5565..fdb7d7b 100644
--- a/bcmdhd/wifi_hal/wifi_hal.cpp
+++ b/bcmdhd/wifi_hal/wifi_hal.cpp
@@ -335,12 +335,12 @@
             pthread_mutex_unlock(&info->cb_lock);
             cmd->cancel();
             pthread_mutex_lock(&info->cb_lock);
-            /* release reference added when command is saved */
-            cmd->releaseRef();
             if (num_cmd == info->num_cmd) {
                 ALOGI("Cancelling command %p:%s did not work", cmd, (cmd ? cmd->getType(): ""));
                 bad_commands++;
             }
+            /* release reference added when command is saved */
+            cmd->releaseRef();
         }
     }