diff options
| author | Ajay Davanageri <ajay.davanageri@broadcom.com> | 2022-03-14 09:39:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-14 09:39:48 +0000 |
| commit | ab6e5e7465293aa7f0eedd5526097bb188df5adb (patch) | |
| tree | 80e2a68c2ba26c26a294116e2ca843fade7a19fd | |
| parent | 126525efbe5c26a93ef5c3b92e29da450dbd92af (diff) | |
| parent | 876b5f70e2dca82c7f0019f993cd68f3aec02836 (diff) | |
| download | wlan-ab6e5e7465293aa7f0eedd5526097bb188df5adb.tar.gz | |
Fix for second enable failure to handle the instant mode channel. am: 876b5f70e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/17147161
Change-Id: Ica6a681b8445d0a4e500d7e2dda9b5d740a13771
| -rwxr-xr-x | bcmdhd/wifi_hal/nan.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bcmdhd/wifi_hal/nan.cpp b/bcmdhd/wifi_hal/nan.cpp index 475c697..8fea66b 100755 --- a/bcmdhd/wifi_hal/nan.cpp +++ b/bcmdhd/wifi_hal/nan.cpp @@ -3254,13 +3254,15 @@ class NanMacControl : public WifiCommand } } - if (mParams->config_instant_mode_channel) { + if (mParams->enable_instant_mode && mParams->config_instant_mode_channel + && mParams->instant_mode_channel) { result = request.put_u32(NAN_ATTRIBUTE_INSTANT_COMM_CHAN, mParams->instant_mode_channel); if (result < 0) { ALOGE("%s: Failing in config instant channel, result = %d\n", __func__, result); return result; } + ALOGI("%s: instant mode channel = %d\n", __func__, mParams->instant_mode_channel); } request.attr_end(data); @@ -3868,7 +3870,6 @@ static int get_svc_hash(unsigned char *svc_name, return WIFI_SUCCESS; } -#ifdef CONFIG_BRCM static int dump_NanEnableRequest(NanEnableRequest* msg) { ALOGI("%s: Dump NanEnableRequest msg:\n", __func__); @@ -3974,6 +3975,7 @@ static int dump_NanEnableRequest(NanEnableRequest* msg) return WIFI_SUCCESS; } +#ifdef CONFIG_BRCM static int dump_NanConfigRequestRequest(NanConfigRequest* msg) { ALOGI("%s: Dump NanConfigRequest msg:\n", __func__); |