Browse Source

qcacld-3.0: Remove session_id from nan_datapath_peer_ind (Step 2)

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 (this change):
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: I2819556d48a9dd901158aaa04d6bda9c36f33012
CRs-Fixed: 2284400
Jeff Johnson 6 years ago
parent
commit
bffd274ba3
1 changed files with 0 additions and 3 deletions
  1. 0 3
      core/mac/src/pe/nan/nan_datapath.c

+ 0 - 3
core/mac/src/pe/nan/nan_datapath.c

@@ -315,7 +315,6 @@ void lim_process_ndi_del_sta_rsp(tpAniSirGlobal mac_ctx,
 	 * Copy peer info in del peer indication before
 	 * lim_delete_dph_hash_entry is called as this will be lost.
 	 */
-	peer_ind.session_id = pe_session->smeSessionId;
 	peer_ind.sta_id = sta_ds->staIndex;
 	qdf_mem_copy(&peer_ind.peer_mac_addr.bytes,
 		sta_ds->staAddr, sizeof(tSirMacAddr));
@@ -478,8 +477,6 @@ static QDF_STATUS lim_send_sme_ndp_add_sta_rsp(tpAniSirGlobal mac_ctx,
 		return QDF_STATUS_E_NOMEM;
 	}
 
-	/* this message is going to os_if, fill in sme session id */
-	new_peer_ind->session_id = add_sta_rsp->smesessionId;
 	qdf_mem_copy(new_peer_ind->peer_mac_addr.bytes, add_sta_rsp->staMac,
 		     sizeof(tSirMacAddr));
 	new_peer_ind->sta_id = add_sta_rsp->staIdx;