diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-19 17:13:33 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-19 17:13:33 +0000 |
| commit | bbd920a042aa9ec1438c4ffc392e560fc1a894cf (patch) | |
| tree | 312f59c8faccd6ff7daf9ae1d4da56188913b783 | |
| parent | d9dc8f2f05166e0e3515284111abbf8bf7f6a5c7 (diff) | |
| parent | 02b445ab8220c1737550109641afbf105d520ef3 (diff) | |
| download | qcacld-android-msm-eos-android13-wear-kr3-pixel-watch.tar.gz | |
Merge cherrypicks of ['partner-android-review.googlesource.com/2632869'] into android13-msm-pixelwatch-5.15-eos-release.android-wear-13.0.0_r0.8android-wear-13.0.0_r0.6android-wear-13.0.0_r0.14android-wear-13.0.0_r0.12android-wear-13.0.0_r0.10android-msm-eos-android13-wear-kr3-pixel-watchandroid-msm-eos-5.15-tm-wear-kr3-pixel-watch
Change-Id: I9593dcdf9026cc1cf46ac1ece31b81b9af67233e
| -rw-r--r-- | components/mlme/core/src/wlan_mlme_main.c | 1 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_assoc_utils.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 1e08d1ac58..fe7d2a8df9 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -283,6 +283,7 @@ mlme_peer_object_created_notification(struct wlan_objmgr_peer *peer, if (QDF_IS_STATUS_ERROR(status)) { mlme_legacy_err("unable to attach peer_priv obj to peer obj"); qdf_mem_free(peer_priv); + return status; } qdf_wake_lock_create(&peer_priv->peer_set_key_wakelock, "peer_set_key"); diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index c10981e584..7b88419003 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -1867,7 +1867,7 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, tDot11fIEeht_cap *eht_caps) { tSirMacRateSet temp_rate_set; - tSirMacRateSet temp_rate_set2; + tSirMacRateSet temp_rate_set2 = {0}; uint32_t i, j, val, min, is_arate; uint32_t phy_mode; uint8_t mcs_set[SIZE_OF_SUPPORTED_MCS_SET]; @@ -1891,8 +1891,6 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, session_entry->extRateSet.numRates); temp_rate_set2.numRates = (uint8_t) session_entry->extRateSet.numRates; - } else { - temp_rate_set2.numRates = 0; } lim_remove_membership_selectors(&temp_rate_set); |