diff options
| author | Xin Li <delphij@google.com> | 2024-03-07 06:41:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-07 06:41:06 +0000 |
| commit | 2dfae3b8cb7827b19cda68a514d34bc32036b80c (patch) | |
| tree | ebd450df8407ac7e96190633ea1631889b814d52 | |
| parent | 989e4c781713d6b496156c0761a400a7d335c150 (diff) | |
| parent | d02d706b3f05d3c60cf5e2394b71eead417af51f (diff) | |
| download | wlan-2dfae3b8cb7827b19cda68a514d34bc32036b80c.tar.gz | |
Merge "Merge Android 14 QPR2 to AOSP main" into main
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | wcn6740/qcwcn/wifi_hal/wificonfig.cpp | 5 |
2 files changed, 15 insertions, 0 deletions
@@ -48,6 +48,7 @@ soong_config_string_variable { name: "board_wlan_chip", values: [ "wcn6740", + "wcn3990", ], } @@ -64,6 +65,15 @@ wifihal_qcom_defaults { "libcrypto", ], }, + wcn3990: { + whole_static_libs: [ + "//hardware/qcom/sw5100/wlan:libwifi-hal-qcom", + ], + shared_libs: [ + "//hardware/qcom/sw5100/wlan:libcld80211", + "libcrypto", + ], + }, conditions_default: { whole_static_libs: [ "//hardware/qcom/wlan/legacy:libwifi-hal-qcom", diff --git a/wcn6740/qcwcn/wifi_hal/wificonfig.cpp b/wcn6740/qcwcn/wifi_hal/wificonfig.cpp index 3217c72..9e955ef 100644 --- a/wcn6740/qcwcn/wifi_hal/wificonfig.cpp +++ b/wcn6740/qcwcn/wifi_hal/wificonfig.cpp @@ -956,6 +956,11 @@ wifi_error WiFiConfigCommand::requestEvent() res = WIFI_ERROR_OUT_OF_MEMORY; goto out; } + if (mInfo == NULL || mInfo->cmd_sock == NULL) { + ALOGE("%s: Wifi is turned of or socket is Null",__FUNCTION__); + res = WIFI_ERROR_UNKNOWN; + goto out; + } status = nl_send_auto_complete(mInfo->cmd_sock, mMsg.getMessage()); if (status < 0) { |