From 634d8e81113519b5939cc9cf0db29871f17f503a Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 24 Jul 2018 09:44:39 -0700 Subject: [PATCH] qcacmn: Remove session_id from nan_datapath_peer_ind (Step 1) Currently struct nan_datapath_peer_ind contains the following: uint8_t session_id; This is problematic since "session_id" is a legacy concept and should not be used in the converged project. Fortunately this field does not actually serve any purpose. But in order to cleanly remove it a 3-step approach is required. Step 1 (this change): Remove the logic from the converged NAN code which currently reads this field and logs the value. Step 2 (qcacld-3.0 Change I2819556d48a9dd901158aaa04d6bda9c36f33012): Remove the logic from the legacy NAN code which sets this field. Step 3 (qcacld Change Ibeb8007c96ae1a902bfd7dd99a42ba4a291a1dc6): Remove the session_id field from struct nan_datapath_peer_ind. Change-Id: If6cf48ccbfe87b23b275720df51c6cc26af9fa5e CRs-Fixed: 2284399 --- src/os_if_nan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/os_if_nan.c b/src/os_if_nan.c index b55ec22fec38..37f97272c240 100644 --- a/src/os_if_nan.c +++ b/src/os_if_nan.c @@ -1565,9 +1565,9 @@ static void os_if_new_peer_ind_handler(struct wlan_objmgr_vdev *vdev, return; } - cfg80211_debug("session_id: %d, peer_mac: %pM, sta_id: %d", - peer_ind->session_id, peer_ind->peer_mac_addr.bytes, - peer_ind->sta_id); + cfg80211_debug("vdev_id: %d, peer_mac: %pM, sta_id: %d", + vdev_id, peer_ind->peer_mac_addr.bytes, + peer_ind->sta_id); ret = cb_obj.new_peer_ind(vdev_id, peer_ind->sta_id, &peer_ind->peer_mac_addr, (active_peers == 0 ? true : false)); @@ -1607,9 +1607,9 @@ static void os_if_peer_departed_ind_handler(struct wlan_objmgr_vdev *vdev, cfg80211_err("Invalid new NDP peer params"); return; } - cfg80211_debug("session_id: %d, peer_mac: %pM, sta_id: %d", - peer_ind->session_id, peer_ind->peer_mac_addr.bytes, - peer_ind->sta_id); + cfg80211_debug("vdev_id: %d, peer_mac: %pM, sta_id: %d", + vdev_id, peer_ind->peer_mac_addr.bytes, + peer_ind->sta_id); active_peers--; ucfg_nan_set_active_peers(vdev, active_peers); cb_obj.peer_departed_ind(vdev_id, peer_ind->sta_id,