Snap for 5511022 from 35c34d329cef989f6cf881238f2613859a77fd54 to qt-release
Change-Id: I42e792fdd143e98100bcb2c181d0fa1ec57bcecf
diff --git a/qcwcn/wifi_hal/common.h b/qcwcn/wifi_hal/common.h
index 0b3a765..759ae01 100644
--- a/qcwcn/wifi_hal/common.h
+++ b/qcwcn/wifi_hal/common.h
@@ -133,6 +133,7 @@
u32 supported_logger_feature_set;
// add other details
int user_sock_arg;
+ int event_sock_arg;
struct rb_info rb_infos[NUM_RING_BUFS];
void (*on_ring_buffer_data) (char *ring_name, char *buffer, int buffer_size,
wifi_ring_buffer_status *status);
diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index 0881c0b..198ab01 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -487,7 +487,6 @@
wifi_error wifi_initialize(wifi_handle *handle)
{
- int err = 0;
wifi_error ret = WIFI_SUCCESS;
wifi_interface_handle iface_handle;
struct nl_sock *cmd_sock = NULL;
@@ -544,11 +543,11 @@
goto unload;
}
- err = 1;
+ info->event_sock_arg = 1;
nl_cb_set(cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, no_seq_check, NULL);
- nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err);
- nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err);
- nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err);
+ nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &info->event_sock_arg);
+ nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &info->event_sock_arg);
+ nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &info->event_sock_arg);
nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, internal_valid_message_handler,
info);