[7872] [7570] [7885] Reduce wifi-hal logGing

Reduce wifi-hal logGing

SCSC-Bug-Id:SSB-31883

Change-Id: I626594b99e99a484475f43953b4f491ae7a4ef68
Signed-off-by: Jaya Prakash Sangaru <j.sangaru@samsung.com>

diff --git a/cpp_bindings.cpp b/cpp_bindings.cpp
index e815d05529766a7cf29d11a18822f2a650a995c0..5ab68b19a158f3c45ef0dd4ffdb9ec802544a065 100755 (executable)
--- a/cpp_bindings.cpp
+++ b/cpp_bindings.cpp
@@ -507,7 +507,6 @@ int WifiEvent::parse() {
     int result = nla_parse(mAttributes, NL80211_ATTR_MAX_INTERNAL, genlmsg_attrdata(mHeader, 0),
           genlmsg_attrlen(mHeader, 0), NULL);
 
-    ALOGD("event len = %d", nlmsg_hdr(mMsg)->nlmsg_len);
     return result;
 }
 
@@ -592,8 +591,6 @@ out:
 
 int WifiCommand::requestEvent(int cmd) {
 
-    ALOGD("requesting event %d", cmd);
-
     int res = wifi_register_handler(wifiHandle(), cmd, event_handler, this);
     if (res < 0) {
         return res;
@@ -603,13 +600,10 @@ int WifiCommand::requestEvent(int cmd) {
     if (res < 0)
         goto out;
 
-    ALOGD("waiting for response %d", cmd);
-
     res = nl_send_auto_complete(mInfo->cmd_sock, mMsg.getMessage());    /* send message */
     if (res < 0)
         goto out;
 
-    ALOGD("waiting for event %d", cmd);
     res = mCondition.wait();
     if (res < 0)
         goto out;
@@ -695,6 +689,6 @@ int WifiCommand::error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err, vo
     int *ret = (int *)arg;
     *ret = err->error;
 
-    ALOGD("error_handler received : %d", err->error);
+    /*ALOGD("error_handler received : %d", err->error);*/
     return NL_SKIP;
 }

diff --git a/gscan.cpp b/gscan.cpp
index f58b59cc3fdb7f1f4616b23bd33196c9c46bb50b..44ba5a54d4563847ede456289fa8488c531034b7 100755 (executable)
--- a/gscan.cpp
+++ b/gscan.cpp
@@ -130,8 +130,6 @@ public:
     }
 
     virtual int create() {
-        ALOGD("Creating message to get scan capablities; iface = %d", mIfaceInfo->id);
-
         int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_CAPABILITIES);
         if (ret < 0) {
             ALOGE("NL message creation failed");
@@ -155,9 +153,6 @@ protected:
         void *data = reply.get_vendor_data();
         int len = reply.get_vendor_data_len();
 
-        ALOGD("GetCapabilities::handleResponse - Id = %0x, subcmd = %d, len = %d, expected len = %d", id, subcmd, len,
-                    sizeof(*mCapabilities));
-
         memcpy(mCapabilities, data, min(len, (int) sizeof(*mCapabilities)));
 
         return NL_OK;
@@ -187,8 +182,6 @@ public:
         memset(channels, 0, sizeof(wifi_channel) * max_channels);
     }
     virtual int create() {
-        ALOGD("Creating message to get channel list; iface = %d", mIfaceInfo->id);
-
         int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_VALID_CHANNELS);
         if (ret < 0) {
             return ret;
@@ -220,7 +213,6 @@ protected:
         nlattr *vendor_data = reply.get_attribute(NL80211_ATTR_VENDOR_DATA);
         int len = reply.get_vendor_data_len();
 
-        ALOGD("GetChannelList::handleResponse - Id = %0x, subcmd = %d, len = %d", id, subcmd, len);
         if (vendor_data == NULL || len == 0) {
             ALOGE("no vendor data in GetChannelList response; ignoring it");
             return NL_SKIP;
@@ -229,7 +221,7 @@ protected:
         for (nl_iterator it(vendor_data); it.has_next(); it.next()) {
             if (it.get_type() == GSCAN_ATTRIBUTE_NUM_CHANNELS) {
                 num_channels_to_copy = it.get_u32();
-                ALOGD("Got channel list with %d channels", num_channels_to_copy);
+                /*ALOGD("Got channel list with %d channels", num_channels_to_copy);*/
                 if(num_channels_to_copy > max_channels)
                     num_channels_to_copy = max_channels;
                 *num_channels = num_channels_to_copy;
@@ -264,7 +256,6 @@ static int parseScanResults(wifi_scan_result *results, int num, nlattr *attr)
     for (nl_iterator it(attr); it.has_next() && i < num; it.next(), i++) {
 
         int index = it.get_type();
-        ALOGD("retrieved scan result %d", index);
         nlattr *sc_data = (nlattr *) it.get_data();
         wifi_scan_result *result = results + i;
 
@@ -425,14 +416,13 @@ public:
     }
 
     int start() {
-        ALOGD(" sending scan req to driver");
+        ALOGD("starting Gscan");
         WifiRequest request(familyId(), ifaceId());
         int result = createSetupRequest(request);
         if (result != WIFI_SUCCESS) {
             ALOGE("failed to create setup request; result = %d", result);
             return result;
         }
-        ALOGD("Starting scan");
 
         registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);
         registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);
@@ -461,7 +451,7 @@ public:
     }
 
     virtual int cancel() {
-        ALOGD("Stopping scan");
+        ALOGD("Stopping Gscan");
 
         WifiRequest request(familyId(), ifaceId());
         int result = createStopRequest(request);
@@ -487,14 +477,11 @@ public:
     }
 
     virtual int handleEvent(WifiEvent& event) {
-        ALOGD("Got a scan results event");
-
         event.log();
 
         nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
         unsigned int len = event.get_vendor_data_len();
         int event_id = event.get_vendor_subcmd();
-        ALOGD("handleEvent, event_id = %d", event_id);
 
         if(event_id == GSCAN_EVENT_COMPLETE_SCAN) {
             if (vendor_data == NULL || len != 4) {
@@ -504,7 +491,6 @@ public:
             wifi_scan_event evt_type;
 
             evt_type = (wifi_scan_event) event.get_u32(NL80211_ATTR_VENDOR_DATA);
-            ALOGD("Scan complete: Received event type %d", evt_type);
             if(*mHandler.on_scan_event)
                 (*mHandler.on_scan_event)(evt_type, evt_type);
         } else if(event_id == GSCAN_EVENT_FULL_SCAN_RESULTS) {
@@ -546,8 +532,6 @@ wifi_error wifi_start_gscan(
 {
     wifi_handle handle = getWifiHandle(iface);
 
-    ALOGD("Starting GScan, halHandle = %p", handle);
-
     ScanCommand *cmd = new ScanCommand(iface, id, &params, handler);
     wifi_register_cmd(handle, id, cmd);
     return (wifi_error)cmd->start();
@@ -555,7 +539,6 @@ wifi_error wifi_start_gscan(
 
 wifi_error wifi_stop_gscan(wifi_request_id id, wifi_interface_handle iface)
 {
-    ALOGD("Stopping GScan");
     wifi_handle handle = getWifiHandle(iface);
 
     if(id == -1) {
@@ -619,7 +602,6 @@ public:
 
     int execute() {
         WifiRequest request(familyId(), ifaceId());
-        ALOGD("retrieving %d scan results", mMax);
 
         for (int i = 0; i < 10 && mRetrieved < mMax; i++) {
             int result = createRequest(request, (mMax - mRetrieved), mFlush);
@@ -660,8 +642,6 @@ public:
         int id = reply.get_vendor_id();
         int subcmd = reply.get_vendor_subcmd();
 
-        ALOGD("GetScanResultsCommand::handleResponse - Id = %0x, subcmd = %d", id, subcmd);
-
         nlattr *vendor_data = reply.get_attribute(NL80211_ATTR_VENDOR_DATA);
         int len = reply.get_vendor_data_len();
 
@@ -730,8 +710,6 @@ public:
 
 wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface, byte flush,
         int max, wifi_cached_scan_results *results, int *num) {
-    ALOGD("Getting cached scan results, iface handle = %p, num = %d", iface, *num);
-
     GetScanResultsCommand *cmd = new GetScanResultsCommand(iface, flush, results, max, num);
     return (wifi_error)cmd->execute();
 }
@@ -802,7 +780,6 @@ public:
     }
 
     int start() {
-        ALOGD("Executing hotlist setup request, num = %d", mParams.num_bssid);
         WifiRequest request(familyId(), ifaceId());
         int result = createSetupRequest(request);
         if (result < 0) {
@@ -817,8 +794,6 @@ public:
             return result;
         }
 
-        ALOGD("Successfully set %d APs in the hotlist", mParams.num_bssid);
-
         registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND);
         registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_LOST);
 
@@ -841,7 +816,6 @@ public:
             return result;
         }
 
-        ALOGD("Successfully reset APs in current hotlist");
         return result;
     }
 
@@ -851,7 +825,6 @@ public:
     }
 
     virtual int handleEvent(WifiEvent& event) {
-        ALOGD("Hotlist AP event");
         int event_id = event.get_vendor_subcmd();
         event.log();
 
@@ -992,7 +965,6 @@ public:
     }
 
     int start() {
-        ALOGD("Set significant wifi change");
         WifiRequest request(familyId(), ifaceId());
 
         int result = createSetupRequest(request);
@@ -1027,7 +999,6 @@ public:
             return result;
         }
 
-        ALOGD("successfully reset significant wifi change");
         return result;
     }
 
@@ -1037,8 +1008,6 @@ public:
     }
 
     virtual int handleEvent(WifiEvent& event) {
-        ALOGD("Got a significant wifi change event");
-
         nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
         int len = event.get_vendor_data_len();
 
@@ -1073,8 +1042,6 @@ public:
             mResults[i] = reinterpret_cast<wifi_significant_change_result *>(&(mResultsBuffer[i]));
         }
 
-        ALOGD("Retrieved %d scan results", num);
-
         if (num != 0) {
             (*mHandler.on_significant_change)(id(), num, mResults);
         } else {
@@ -1174,14 +1141,14 @@ public:
         }
 
        ALOGI("ePNO [min5GHz_rssi:%d min24GHz_rssi:%d initial_score_max:%d current_connection_bonus:%d same_network_bonus:%d secure_bonus:%d band5GHz_bonus:%d num_networks:%d]",
-            epno_params->min5GHz_rssi,
-            epno_params->min24GHz_rssi,
-            epno_params->initial_score_max,
-            epno_params->current_connection_bonus,
-            epno_params->same_network_bonus,
-            epno_params->secure_bonus,
-            epno_params->band5GHz_bonus,
-            epno_params->num_networks);
+         epno_params->min5GHz_rssi,
+         epno_params->min24GHz_rssi,
+         epno_params->initial_score_max,
+         epno_params->current_connection_bonus,
+         epno_params->same_network_bonus,
+         epno_params->secure_bonus,
+         epno_params->band5GHz_bonus,
+         epno_params->num_networks);
 
         struct nlattr * attr = request.attr_start(EPNO_ATTRIBUTE_SSID_LIST);
         for (int i = 0; i < epno_params->num_networks; i++) {
@@ -1202,9 +1169,6 @@ public:
                 return result;
             }
             result = request.put(EPNO_ATTRIBUTE_SSID, epno_params->networks[i].ssid, strlen(epno_params->networks[i].ssid));
-            ALOGI("ePNO [SSID:%s flags:%d auth:%d]", epno_params->networks[i].ssid,
-                epno_params->networks[i].flags,
-                epno_params->networks[i].auth_bit_field);
             if (result < 0) {
                 return result;
             }
@@ -1232,10 +1196,7 @@ public:
         }
 
         if (epno_params) {
-            ALOGI("Successfully set %d SSIDs for ePNO", epno_params->num_networks);
             registerVendorHandler(GOOGLE_OUI, WIFI_EPNO_EVENT);
-        } else {
-            ALOGI("Successfully reset ePNO");
         }
         return result;
     }
@@ -1252,7 +1213,6 @@ public:
     }
 
     virtual int handleEvent(WifiEvent& event) {
-        ALOGI("ePNO event");
         int event_id = event.get_vendor_subcmd();
         // event.log();
 
@@ -1408,14 +1368,11 @@ public:
     }
 
     virtual int handleResponse(WifiEvent& reply) {
-         ALOGD("Request complete!");
         /* Nothing to do on response! */
         return NL_SKIP;
     }
 
     virtual int handleEvent(WifiEvent& event) {
-
-        ALOGI("hotspot matched event");
         nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
         unsigned int len = event.get_vendor_data_len();
         if (vendor_data == NULL || len < sizeof(wifi_scan_result)) {
@@ -1430,17 +1387,6 @@ public:
         int anqp_len = *(u16 *)anqp;
         anqp += sizeof(u16);
 
-        ALOGI("%-32s\t", result->ssid);
-
-        ALOGI("%02x:%02x:%02x:%02x:%02x:%02x ", result->bssid[0], result->bssid[1],
-                result->bssid[2], result->bssid[3], result->bssid[4], result->bssid[5]);
-
-        ALOGI("%d\t", result->rssi);
-        ALOGI("%d\t", result->channel);
-        ALOGI("%lld\t", result->ts);
-        ALOGI("%lld\t", result->rtt);
-        ALOGI("%lld\n", result->rtt_sd);
-
         if(*mHandler.on_passpoint_network_found)
             (*mHandler.on_passpoint_network_found)(id(), networkId, result, anqp_len, anqp);
 
@@ -1509,7 +1455,6 @@ public:
     }
 
     int start() {
-        ALOGD("Executing bssid blacklist request, num = %d", mParams->num_bssid);
         WifiRequest request(familyId(), ifaceId());
         int result = createRequest(request);
         if (result < 0) {
@@ -1522,7 +1467,6 @@ public:
             return result;
         }
 
-        ALOGI("Successfully added %d blacklist bssids", mParams->num_bssid);
         return result;
     }
 

diff --git a/link_layer_stats.cpp b/link_layer_stats.cpp
index 99ccea99c258c7162edc92b98c19fbe60bfde7ae..62ffe16ad7cd1cf1d38d0b9031cc28321443fc35 100755 (executable)
--- a/link_layer_stats.cpp
+++ b/link_layer_stats.cpp
@@ -118,7 +118,6 @@ public:
             return result;
         }
 
-        ALOGD("Successfully set Link Layer Statistics measurement");
         return result;
     }
 
@@ -137,7 +136,6 @@ public:
             return result;
         }
 
-        ALOGD("Successfully clear Link Layer Statistics measurement");
         return result;
     }
 
@@ -187,8 +185,6 @@ public:
     }
 
     virtual int create() {
-        ALOGI("Creating message to get link statistics");
-
         int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_LLS_GET_INFO);
         if (ret < 0) {
             ALOGE("Failed to create %x - %d", SLSI_NL80211_VENDOR_SUBCMD_LLS_GET_INFO, ret);
@@ -200,9 +196,6 @@ public:
 
 protected:
     virtual int handleResponse(WifiEvent& reply) {
-
-        ALOGI("In GetLinkStatsCommand::handleResponse");
-
         if (reply.get_cmd() != NL80211_CMD_VENDOR) {
             ALOGD("Ignoring reply with cmd = %d", reply.get_cmd());
             return NL_SKIP;
@@ -211,8 +204,6 @@ protected:
         int id = reply.get_vendor_id();
         int subcmd = reply.get_vendor_subcmd();
 
-        ALOGI("Id = %0x, subcmd = %d", id, subcmd);
-
         u8 *data = (u8 *)reply.get_vendor_data();
         int len = reply.get_vendor_data_len();
 

diff --git a/wifi_hal.cpp b/wifi_hal.cpp
index d5725e2c798ccb5b3794e238f536e023c22dcef6..ed69e14499590a8a08b29d5763fe6a4e0d2dbb11 100755 (executable)
--- a/wifi_hal.cpp
+++ b/wifi_hal.cpp
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <stdint.h>
+#include <string.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netlink/genl/genl.h>
@@ -72,7 +73,6 @@ void wifi_socket_set_local_port(struct nl_sock *sock, uint32_t port)
 
 static nl_sock * wifi_create_nl_socket(int port)
 {
-     ALOGI("Creating socket");
     struct nl_sock *sock = nl_socket_alloc();
     if (sock == NULL) {
         ALOGE("Could not create handle");
@@ -81,7 +81,6 @@ static nl_sock * wifi_create_nl_socket(int port)
 
     wifi_socket_set_local_port(sock, port);
 
-    ALOGI("Connecting socket");
     if (nl_connect(sock, NETLINK_GENERIC)) {
         ALOGE("Could not connect handle");
         nl_socket_free(sock);
@@ -148,7 +147,6 @@ wifi_error wifi_initialize(wifi_handle *handle)
 
     memset(info, 0, sizeof(*info));
 
-    ALOGI("Creating socket");
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, info->cleanup_socks) == -1) {
         ALOGE("Could not create cleanup sockets");
         free(info);
@@ -209,20 +207,25 @@ wifi_error wifi_initialize(wifi_handle *handle)
     pthread_mutex_init(&info->cb_lock, NULL);
 
     *handle = (wifi_handle) info;
-           ALOGD("wifi_initialize, handle = %p\n", handle);
-           ALOGD("wifi_initialize, *handle = %p\n", *handle);
-               ALOGD("wifi_initialize, info = %p\n", info);
-               ALOGD("wifi_initialize, *info = %pn", *info);
+
     wifi_add_membership(*handle, "scan");
     wifi_add_membership(*handle, "mlme");
     wifi_add_membership(*handle, "regulatory");
     wifi_add_membership(*handle, "vendor");
 
     wifi_init_interfaces(*handle);
-     ALOGD("Found %d interfaces", info->num_interfaces);
+    char intf_name_buff[10 * 10 + 4]; /* Randomly choosen max interface 10. each interface name max 9 + 1(for space) */
+    char *pos = intf_name_buff;
+    for (int i = 0; i < (info->num_interfaces < 10 ? info->num_interfaces : 10); i++) {
+        strncpy(pos, info->interfaces[i]->name, sizeof(intf_name_buff) - (pos - intf_name_buff));
+        pos += strlen(pos);
+    }
+    if (info->num_interfaces > 10) {
+        strncpy(pos, "...", 3);
+    }
 
+    ALOGD("Found %d interfaces[%s]. Initialized Wifi HAL Successfully", info->num_interfaces, intf_name_buff);
 
-    ALOGI("Initialized Wifi HAL Successfully; vendor cmd = %d", NL80211_CMD_VENDOR);
     return WIFI_SUCCESS;
 }
 
@@ -240,8 +243,6 @@ static int wifi_add_membership(wifi_handle handle, const char *group)
     if (ret < 0) {
         ALOGE("Could not add membership to group %s", group);
     }
-
-     ALOGI("Successfully added membership for group %s", group);
     return ret;
 }
 
@@ -262,8 +263,6 @@ static void internal_cleaned_up_handler(wifi_handle handle)
     (*cleaned_up_handler)(handle);
     pthread_mutex_destroy(&info->cb_lock);
     free(info);
-
-    ALOGI("Internal cleanup completed");
 }
 
 void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler)
@@ -283,9 +282,7 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler)
         memset(buf, 0, sizeof(buf));
         int result = read(info->cleanup_socks[0], buf, sizeof(buf));
         ALOGE("%s: Read after POLL returned %d, error no = %d", __FUNCTION__, result, errno);
-        if (strncmp(buf, "Done", 4) == 0) {
-            ALOGE("Event processing terminated");
-        } else {
+        if (strncmp(buf, "Done", 4) != 0) {
             ALOGD("Rx'ed %s", buf);
         }
     }
@@ -322,10 +319,8 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler)
 static int internal_pollin_handler(wifi_handle handle)
 {
     hal_info *info = getHalInfo(handle);
-               ALOGI("even_loop info = %p", info);
     struct nl_cb *cb = nl_socket_get_cb(info->event_sock);
     int res = nl_recvmsgs(info->event_sock, cb);
-     ALOGD("nl_recvmsgs returned %d", res);
     nl_cb_put(cb);
     return res;
 }
@@ -334,8 +329,6 @@ static int internal_pollin_handler(wifi_handle handle)
 void wifi_event_loop(wifi_handle handle)
 {
     hal_info *info = getHalInfo(handle);
-       ALOGI("even_loop info = %p", info);
-       ALOGI("even_loop info = %p", handle);
     if (info->in_event_loop) {
         return;
     } else {
@@ -359,9 +352,9 @@ void wifi_event_loop(wifi_handle handle)
         int result = poll(pfd, 2, timeout);
         if (result < 0) {
         } else if (pfd[0].revents & POLLERR) {
-            ALOGE("POLL Error; error no = %d", errno);
+            int prev_err = (int)errno;
             int result2 = read(pfd[0].fd, buf, sizeof(buf));
-            ALOGE("Read after POLL returned %d, error no = %d", result2, errno);
+            ALOGE("Poll err:%d | Read after POLL returned %d, error no = %d", prev_err, result2, errno);
         } else if (pfd[0].revents & POLLHUP) {
             ALOGE("Remote side hung up");
             break;
@@ -384,7 +377,6 @@ void wifi_event_loop(wifi_handle handle)
             ALOGE("Unknown event - %0x, %0x", pfd[0].revents, pfd[1].revents);
         }
     } while (!info->clean_up);
-    ALOGI("Exit %s", __FUNCTION__);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -398,8 +390,6 @@ static int internal_valid_message_handler(nl_msg *msg, void *arg)
 {
     wifi_handle handle = (wifi_handle)arg;
     hal_info *info = getHalInfo(handle);
-   ALOGI("even_loop info = %p", handle);
-   ALOGD("internal_valid_message_handler, info = %p", info);
 
     WifiEvent event(msg);
     int res = event.parse();
@@ -417,8 +407,6 @@ static int internal_valid_message_handler(nl_msg *msg, void *arg)
         subcmd = event.get_u32(NL80211_ATTR_VENDOR_SUBCMD);
         ALOGI("event received %s, vendor_id = 0x%0x, subcmd = 0x%0x",
                 event.get_cmdString(), vendor_id, subcmd);
-    } else {
-         ALOGI("event received %s", event.get_cmdString());
     }
 
      //ALOGI("event received %s, vendor_id = 0x%0x", event.get_cmdString(), vendor_id);
@@ -426,8 +414,6 @@ static int internal_valid_message_handler(nl_msg *msg, void *arg)
 
     pthread_mutex_lock(&info->cb_lock);
 
-    ALOGI("Number of events %d", info->num_event_cb);
-
     for (int i = 0; i < info->num_event_cb; i++) {
         if (cmd == info->event_cb[i].nl_cmd) {
             if (cmd == NL80211_CMD_VENDOR
@@ -484,7 +470,6 @@ public:
 
     virtual int create() {
         int nlctrlFamily = genl_ctrl_resolve(mInfo->cmd_sock, "nlctrl");
-        ALOGI("ctrl family = %d", nlctrlFamily);
         int ret = mMsg.create(nlctrlFamily, CTRL_CMD_GETFAMILY, 0, 0);
         if (ret < 0) {
             return ret;
@@ -494,9 +479,6 @@ public:
     }
 
     virtual int handleResponse(WifiEvent& reply) {
-
-         ALOGE("handling reponse in %s", __func__);
-
         struct nlattr **tb = reply.attributes();
         struct nlattr *mcgrp = NULL;
         int i;
@@ -504,13 +486,10 @@ public:
         if (!tb[CTRL_ATTR_MCAST_GROUPS]) {
             ALOGE("No multicast groups found");
             return NL_SKIP;
-        } else {
-             ALOGE("Multicast groups attr size = %d", nla_len(tb[CTRL_ATTR_MCAST_GROUPS]));
         }
 
         for_each_attr(mcgrp, tb[CTRL_ATTR_MCAST_GROUPS], i) {
 
-             ALOGE("Processing group");
             struct nlattr *tb2[CTRL_ATTR_MCAST_GRP_MAX + 1];
             nla_parse(tb2, CTRL_ATTR_MCAST_GRP_MAX, (nlattr *)nla_data(mcgrp),
                 nla_len(mcgrp), NULL);
@@ -521,8 +500,6 @@ public:
             char *grpName = (char *)nla_data(tb2[CTRL_ATTR_MCAST_GRP_NAME]);
             int grpNameLen = nla_len(tb2[CTRL_ATTR_MCAST_GRP_NAME]);
 
-             ALOGE("Found group name %s", grpName);
-
             if (strncmp(grpName, mGroup, grpNameLen) != 0)
                 continue;
 
@@ -568,7 +545,6 @@ public:
     }
 
     int start() {
-        ALOGD("Sending mac address OUI");
         WifiRequest request(familyId(), ifaceId());
         int result = createRequest(request, SLSI_NL80211_VENDOR_SUBCMD_SET_GSCAN_OUI, mOui);
         if (result != WIFI_SUCCESS) {
@@ -585,7 +561,6 @@ public:
     }
 protected:
     virtual int handleResponse(WifiEvent& reply) {
-         ALOGD("Request complete!");
         /* Nothing to do on response! */
         return NL_SKIP;
     }
@@ -643,7 +618,7 @@ public:
         if (result < 0) {
             return result;
         }
-        ALOGD("create request");
+
         result = request.put_u8(RSSI_MONITOR_ATTRIBUTE_MIN_RSSI, (enable? mMin_rssi: 0));
         if (result < 0) {
             return result;
@@ -670,7 +645,6 @@ public:
         ALOGI("Successfully set RSSI monitoring");
         registerVendorHandler(GOOGLE_OUI, WIFI_RSSI_REPORT_EVENT);
 
-        ALOGI("Done!");
         return result;
     }
 
@@ -696,7 +670,6 @@ public:
     }
 
    virtual int handleEvent(WifiEvent& event) {
-        ALOGI("Got a RSSI monitor event");
 
         nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
         int len = event.get_vendor_data_len();
@@ -833,15 +806,12 @@ static int get_interface(const char *name, interface_info *info)
 {
     strcpy(info->name, name);
     info->id = if_nametoindex(name);
-     ALOGI("found an interface : %s, id = %d", name, info->id);
     return WIFI_SUCCESS;
 }
 
 wifi_error wifi_init_interfaces(wifi_handle handle)
 {
     hal_info *info = (hal_info *)handle;
-       ALOGD("wifi_init_interfaces, info = %p", info);
-
     struct dirent *de;
 
     DIR *d = opendir("/sys/class/net");

diff --git a/wifi_offload.cpp b/wifi_offload.cpp
index eac0108a4a36bcc770f82b7652f74202470f7e1e..3dc48e776a87c7d4ff2289a94832a2bb36047eca 100755 (executable)
--- a/wifi_offload.cpp
+++ b/wifi_offload.cpp
@@ -174,7 +174,6 @@ public:
     }
 
     virtual int handleResponse(WifiEvent& reply) {
-        ALOGD("In MKeepAliveCommand::handleResponse");
 
         if (reply.get_cmd() != NL80211_CMD_VENDOR) {
             ALOGD("Ignoring reply with cmd = %d", reply.get_cmd());