samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Fix assignment of vdev in cm_ctx and few prints

Browse Source 
Fix the assignment of vdev in cm_ctx and fix few prints.

Change-Id: I5d76ab2ca39a1a84b3987fd9cb566c2f08ecc399
CRs-Fixed: 2856499
This commit is contained in:
gaurank kathpalia
2021-01-16 16:58:36 +05:30
committed by snandini
parent a3f2a76372
commit 6dc7ecfcb8
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
os_if/linux/mlme/src/osif_cm_connect_rsp.c
View File

@@ -101,7 +101,7 @@ osif_validate_connect_and_reset_src_id(struct vdev_osif_priv *osif_priv,
(osif_priv->cm_info.last_source != CM_OSIF_CONNECT &&
!(osif_priv->cm_info.last_source == CM_OSIF_CFG_CONNECT &&
QDF_IS_STATUS_ERROR(rsp->connect_status)))) {
osif_debug("Ignore as cm_id(%d)/src(%d) didn't match stored cm_id(%d)/src(%d)",
osif_debug("Ignore as cm_id(0x%x)/src(%d) didn't match stored cm_id(0x%x)/src(%d)",
rsp->cm_id, CM_OSIF_CONNECT,
osif_priv->cm_info.last_id,
osif_priv->cm_info.last_source);
@@ -526,7 +526,7 @@ QDF_STATUS osif_connect_handler(struct wlan_objmgr_vdev *vdev,
struct vdev_osif_priv *osif_priv = wlan_vdev_get_ospriv(vdev);
QDF_STATUS status;
osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"%.*s\" is %s cm_id %d cm_reason %d status_code %d",
osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"%.*s\" is %s cm_id 0x%x cm_reason %d status_code %d",
osif_priv->wdev->netdev->name, rsp->vdev_id,
QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)),
QDF_MAC_ADDR_REF(rsp->bssid.bytes),
@@ -556,7 +556,7 @@ QDF_STATUS osif_failed_candidate_handler(struct wlan_objmgr_vdev *vdev,
{
struct vdev_osif_priv *osif_priv = wlan_vdev_get_ospriv(vdev);
osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"%.*s\" FAILED cm_id %d cm_reason %d reason_code %d",
osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"%.*s\" FAILED cm_id 0x%x cm_reason %d reason_code %d",
osif_priv->wdev->netdev->name, rsp->vdev_id,
QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)),
QDF_MAC_ADDR_REF(rsp->bssid.bytes),

11
os_if/linux/mlme/src/osif_cm_disconnect_rsp.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2015, 2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2015, 2020-2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -61,7 +61,7 @@ osif_validate_disconnect_and_reset_src_id(struct vdev_osif_priv *osif_priv,
*/
if (rsp->req.cm_id != osif_priv->cm_info.last_id ||
rsp->req.req.source != osif_priv->cm_info.last_source) {
osif_debug("Ignore as cm_id(%d)/src(%d) didn't match stored cm_id(%d)/src(%d)",
osif_debug("Ignore as cm_id(0x%x)/src(%d) didn't match stored cm_id(0x%x)/src(%d)",
rsp->req.cm_id, rsp->req.req.source,
osif_priv->cm_info.last_id,
osif_priv->cm_info.last_source);
@@ -127,8 +127,10 @@ QDF_STATUS osif_disconnect_handler(struct wlan_objmgr_vdev *vdev,
ieee80211_reason =
osif_cm_get_disconnect_reason(osif_priv,
rsp->req.req.reason_code);
if (rsp->req.req.source == CM_PEER_DISCONNECT)
locally_generated = false;
osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " %sdisconnect " QDF_MAC_ADDR_FMT " cm_id %d source %d reason:%u %s vendor:%u %s",
osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " %sdisconnect " QDF_MAC_ADDR_FMT " cm_id 0x%x source %d reason:%u %s vendor:%u %s",
osif_priv->wdev->netdev->name,
rsp->req.req.vdev_id,
QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)),
@@ -151,9 +153,6 @@ QDF_STATUS osif_disconnect_handler(struct wlan_objmgr_vdev *vdev,
return status;
}
if (rsp->req.req.source == CM_PEER_DISCONNECT)
locally_generated = false;
osif_cm_disconnect_comp_ind(vdev, rsp, OSIF_PRE_USERSPACE_UPDATE);
osif_cm_indicate_disconnect(osif_priv->wdev->netdev, ieee80211_reason,
locally_generated, rsp->ap_discon_ie.ptr,