From 8ed15d109c3d69d65199e5633dec69bfa80ed701 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 24 Jul 2018 10:07:17 -0700 Subject: [PATCH] qcacmn: Remove session_id from nan_datapath_peer_ind (Step 3) 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 (qcacld Change If6cf48ccbfe87b23b275720df51c6cc26af9fa5e): 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 (this change): Remove the session_id field from struct nan_datapath_peer_ind. Change-Id: Ibeb8007c96ae1a902bfd7dd99a42ba4a291a1dc6 CRs-Fixed: 2284401 --- umac/nan/core/inc/nan_public_structs.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/umac/nan/core/inc/nan_public_structs.h b/umac/nan/core/inc/nan_public_structs.h index 615b124ee9ff..7f65d9ee33e9 100644 --- a/umac/nan/core/inc/nan_public_structs.h +++ b/umac/nan/core/inc/nan_public_structs.h @@ -579,13 +579,11 @@ struct nan_datapath_indication_event { /** * struct nan_datapath_peer_ind - ndp peer indication - * @session_id: session id * @peer_mac_addr: peer mac address * @sta_id: station id * */ struct nan_datapath_peer_ind { - uint8_t session_id; struct qdf_mac_addr peer_mac_addr; uint16_t sta_id; };