diff options
| author | Sunil Ravi <sunilravi@google.com> | 2019-01-09 23:22:56 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2019-01-09 23:22:56 +0000 |
| commit | 5132f9a3f2e7f393873a85ef1cea8d9f53a67d34 (patch) | |
| tree | bce4ea07e4164018b92e2b92ed93c5fb955dba0d | |
| parent | 64aa33a3e074c23c44a771fdb9a6502c346adae2 (diff) | |
| parent | e0b19f23c8f8e51498ad9400e5678f3f12e03a13 (diff) | |
| download | qcacld-5132f9a3f2e7f393873a85ef1cea8d9f53a67d34.tar.gz | |
Merge "qcacld-3.0: Forward NDP Indication event for NDP initiator" into android-msm-bluecross-4.9
| -rw-r--r-- | core/mac/src/pe/nan/nan_datapath.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c index 6bf62c124d..82b78e2386 100644 --- a/core/mac/src/pe/nan/nan_datapath.c +++ b/core/mac/src/pe/nan/nan_datapath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -160,9 +160,8 @@ static QDF_STATUS lim_handle_ndp_indication_event(tpAniSirGlobal mac_ctx, goto ndp_indication_failed; } } - if (NDP_ROLE_RESPONDER == ndp_ind->role) - lim_send_ndp_event_to_sme(mac_ctx, eWNI_SME_NDP_INDICATION, - ndp_ind, sizeof(*ndp_ind), 0); + lim_send_ndp_event_to_sme(mac_ctx, eWNI_SME_NDP_INDICATION, + ndp_ind, sizeof(*ndp_ind), 0); /* * With NDP indication if peer does not exists already add_sta is * executed resulting in new peer else no action is taken. Note that @@ -172,13 +171,8 @@ static QDF_STATUS lim_handle_ndp_indication_event(tpAniSirGlobal mac_ctx, * used by service layer to identify failure. */ ndp_indication_failed: - /* - * Free config if failure or for NDP_ROLE_INITIATOR role - * As for success responder case this info is sent till HDD - * and will be freed in sme. - */ - if (status != QDF_STATUS_SUCCESS || - NDP_ROLE_INITIATOR == ndp_ind->role) { + /* free config and app info if failure */ + if (status != QDF_STATUS_SUCCESS) { qdf_mem_free(ndp_ind->ndp_config.ndp_cfg); qdf_mem_free(ndp_ind->ndp_info.ndp_app_info); ndp_ind->ndp_config.ndp_cfg = NULL; |