More Libnl fixes for Broadcom's WifiHAL

We don't look for sequence match on event messages; also removed
references to netlink-types which is from an older version.

This change also reduces NUM_SCANS_TO_CACHE from 10 to 4 in order to
work around a driver bug.

Change-Id: I09de75b00a79635b0921a9fb1c2939438bc13287

1 files changed, 3 insertions, 4 deletions

diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp
index a73d4f6..6c923f9 100644
--- a/bcmdhd/wifi_hal/gscan.cpp
+++ b/bcmdhd/wifi_hal/gscan.cpp
@@ -14,9 +14,7 @@
 #include <netlink/object-api.h>
 #include <netlink/netlink.h>
 #include <netlink/socket.h>
-#include <netlink-types.h>
-
-#include "nl80211_copy.h"
+#include <netlink/handlers.h>
 
 #include "sync.h"
 
@@ -445,7 +443,7 @@ public:
             return result;
         }
 
-        int num_scans = 10;
+        int num_scans = 4;
         for (int i = 0; i < mParams->num_buckets; i++) {
             if (mParams->buckets[i].report_events == 1) {
                 num_scans = 1;
@@ -743,6 +741,7 @@ public:
         ALOGI("retrieving %d scan results", *mNum);
 
         for (int i = 0; i < 10 && mRetrieved < *mNum; i++) {
+            ALOGI("executing request number %d", i);
             int result = createRequest(request, (*mNum - mRetrieved), mFlush);
             if (result < 0) {
                 ALOGE("failed to create request");