diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-12 09:07:58 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-09-12 09:07:58 -0600 |
| commit | ec16ff43271e214c7ced1cc9f2a304d8cd14c859 (patch) | |
| tree | b789db2bb089f2a3173b8a48cbb616677b6231df | |
| parent | a472a38b37ea12e42137a8484ccd20bba6ed1d39 (diff) | |
| parent | 3a519f781abd4e5b6cff14a5c7c201252198da70 (diff) | |
| download | android_hardware_qcom_wlan-ec16ff43271e214c7ced1cc9f2a304d8cd14c859.tar.gz android_hardware_qcom_wlan-ec16ff43271e214c7ced1cc9f2a304d8cd14c859.tar.bz2 android_hardware_qcom_wlan-ec16ff43271e214c7ced1cc9f2a304d8cd14c859.zip | |
Merge 3a519f781abd4e5b6cff14a5c7c201252198da70 on remote branch
Change-Id: Iafd7e917eb1d8ee13145ca305f4e77afc151a783
| -rw-r--r-- | qcwcn/wifi_hal/wifilogger_diag.cpp | 2 | ||||
| -rw-r--r-- | qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211_extn.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/qcwcn/wifi_hal/wifilogger_diag.cpp b/qcwcn/wifi_hal/wifilogger_diag.cpp index 4df56e3..ede3050 100644 --- a/qcwcn/wifi_hal/wifilogger_diag.cpp +++ b/qcwcn/wifi_hal/wifilogger_diag.cpp @@ -2193,7 +2193,7 @@ wifi_error diag_message_handler(hal_info *info, nl_msg *msg) } } else if (wnl->nlh.nlmsg_type == ANI_NL_MSG_CNSS_DIAG) { uint16_t diag_fw_type; - buf = (uint8_t *)NLMSG_DATA(wnl); + buf = (uint8_t *)NLMSG_DATA(wnl) + sizeof(wnl->radio); fw_event_hdr_t *event_hdr = (fw_event_hdr_t *)(buf); diff --git a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211_extn.c b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211_extn.c index df0784e..b6136ce 100644 --- a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211_extn.c +++ b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211_extn.c @@ -49,8 +49,6 @@ int wpa_driver_oem_initialize(wpa_driver_oem_cb_table_t *oem_cb_table) void* oem_handle = dlopen("/vendor/lib/libwpa_drv_oem.so", RTLD_NOW); #endif if (!oem_handle) { - wpa_printf(MSG_ERROR, "%s: NULL oem_handle , err: %s", - __FUNCTION__, dlerror()); return WPA_DRIVER_OEM_STATUS_FAILURE; } |