diff options
| author | Ajit Vaishya <ajitv@codeaurora.org> | 2019-04-26 17:41:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-26 17:41:29 -0700 |
| commit | ac6efd76c2cae819c6f96f5750c2e7f843de46c7 (patch) | |
| tree | 04c6d277b5fd16a63a285fe8929561ff50855835 /qcwcn | |
| parent | 836fac4fcb5dab2b2c565b4b652b392e646bda6a (diff) | |
| parent | 35c34d329cef989f6cf881238f2613859a77fd54 (diff) | |
| download | wlan-ac6efd76c2cae819c6f96f5750c2e7f843de46c7.tar.gz | |
Wifi-Hal: Pass the address of the global variable to NL callback
am: 35c34d329c
Change-Id: If649c1642e47cff632e97ae28d8a1a337a8df4dc
Diffstat (limited to 'qcwcn')
| -rw-r--r-- | qcwcn/wifi_hal/common.h | 1 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/wifi_hal.cpp | 9 |
2 files changed, 5 insertions, 5 deletions
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 @@ typedef struct hal_info_s { 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 @@ static int wifi_get_iface_id(hal_info *info, const char *iface) 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 @@ wifi_error wifi_initialize(wifi_handle *handle) 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); |