diff options
| author | Xi Zhang <xi.zhang@broadcom.corp-partner.google.com> | 2020-04-29 15:46:44 +0800 |
|---|---|---|
| committer | Ahmed ElArabawy <arabawy@google.com> | 2020-05-01 00:42:32 +0000 |
| commit | a5e9eed6719025810849615d83a0529429eec57c (patch) | |
| tree | 094fbd6d6b02012a20175784699b616653766956 | |
| parent | 0a0cde39b24272a050167231827a249296b9e978 (diff) | |
| download | hardware_replicant_wlan-a5e9eed6719025810849615d83a0529429eec57c.tar.gz hardware_replicant_wlan-a5e9eed6719025810849615d83a0529429eec57c.tar.bz2 hardware_replicant_wlan-a5e9eed6719025810849615d83a0529429eec57c.zip | |
WifiHAl: Fix VtsHalWifiNanV1_2TargetTest test fails
Bug: 152621063
Test: Run '/data/VtsHalWifiNanV1_2TargetTest'
[==========] Running 5 tests from 2 test suites.
[----------] Global test environment set-up.
[----------] 1 test from WifiNanIfaceHidlTestNoFixture
[ RUN ] WifiNanIfaceHidlTestNoFixture.Create
[ OK ] WifiNanIfaceHidlTestNoFixture.Create (3039 ms)
[----------] 1 test from WifiNanIfaceHidlTestNoFixture (3039 ms total)
[----------] 4 tests from WifiNanIfaceHidlTest
[ RUN ] WifiNanIfaceHidlTest.enableRequest_1_2InvalidArgs
[ OK ] WifiNanIfaceHidlTest.enableRequest_1_2InvalidArgs (3092 ms)
[ RUN ] WifiNanIfaceHidlTest.enableRequest_1_2ShimInvalidArgs
[ OK ] WifiNanIfaceHidlTest.enableRequest_1_2ShimInvalidArgs (2980 ms)
[ RUN ] WifiNanIfaceHidlTest.configRequest_1_2InvalidArgs
[ OK ] WifiNanIfaceHidlTest.configRequest_1_2InvalidArgs (3060 ms)
[ RUN ] WifiNanIfaceHidlTest.configRequest_1_2ShimInvalidArgs
[ OK ] WifiNanIfaceHidlTest.configRequest_1_2ShimInvalidArgs (2973 ms)
[----------] 4 tests from WifiNanIfaceHidlTest (12105 ms total)
[----------] Global test environment tear-down
[==========] 5 tests from 2 test suites ran. (20149 ms total)
[ PASSED ] 5 tests.
Change-Id: Icee0fd8f5dbded4fd30122bfc0ac2e632708d862
| -rwxr-xr-x | bcmdhd/wifi_hal/nan.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bcmdhd/wifi_hal/nan.cpp b/bcmdhd/wifi_hal/nan.cpp index 735f284..cfabfa8 100755 --- a/bcmdhd/wifi_hal/nan.cpp +++ b/bcmdhd/wifi_hal/nan.cpp @@ -3211,6 +3211,19 @@ class NanMacControl : public WifiCommand GET_NAN_HANDLE(info)->mHandlers.NotifyResponse(id(), &rsp_data); } + if (rsp_vndr_data->subcmd == NAN_SUBCMD_ENABLE) { + NanResponseMsg rsp_data; + memset(&rsp_data, 0, sizeof(NanResponseMsg)); + rsp_data.response_type = get_response_type((WIFI_SUB_COMMAND)rsp_vndr_data->subcmd); + rsp_data.status = nan_map_response_status(rsp_vndr_data->status); + + ALOGI("NanMacControl:Received response for cmd [%s], TxID %d ret %d\n", + NanRspToString(rsp_data.response_type), mId, rsp_data.status); + + if( rsp_data.status != NAN_STATUS_SUCCESS) { + GET_NAN_HANDLE(info)->mHandlers.NotifyResponse(mId, &rsp_data); + } + } return NL_SKIP; } |