A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Remove session_id from nan_datapath_peer_ind (Step 1)

Browse source 
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
This commit is contained in:
Jeff Johnson 2018-07-24 09:44:39 -07:00 • committed by nshrivas
commit 589959b228
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
os_if/linux/nan/src/os_if_nan.c
View file

@ -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,