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-23 21:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacmn: Check NAN iface with same name before creating another one"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-25 21:59:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit c436e5e3e6
1 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/os_if_nan.c
View file

@ -32,6 +32,7 @@
#include "wlan_objmgr_psoc_obj.h"
#include "wlan_objmgr_pdev_obj.h"
#include "wlan_objmgr_vdev_obj.h"
#include "wlan_utility.h"
/* NLA policy */
static const struct nla_policy
@ -87,6 +88,14 @@ static int os_if_nan_process_ndi_create(struct wlan_objmgr_psoc *psoc,
}
iface_name = nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]);
nan_vdev = wlan_util_get_vdev_by_ifname(psoc, iface_name, WLAN_NAN_ID);
if (nan_vdev) {
cfg80211_err("NAN data interface %s is already present",
iface_name);
wlan_objmgr_vdev_release_ref(nan_vdev, WLAN_NAN_ID);
return -EEXIST;
}
if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) {
cfg80211_err("transaction id is unavailable");
return -EINVAL;
@ -140,7 +149,7 @@ static int os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc,
return -EINVAL;
}
nan_vdev = ucfg_nan_get_ndi_vdev(psoc, WLAN_NAN_ID);
nan_vdev = wlan_util_get_vdev_by_ifname(psoc, iface_name, WLAN_NAN_ID);
if (!nan_vdev) {
cfg80211_err("Nan datapath interface is not present");
return -EINVAL;
@ -151,9 +160,8 @@ static int os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc,
vdev_id = wlan_vdev_get_id(nan_vdev);
num_peers = ucfg_nan_get_active_peers(nan_vdev);
/*
* wlan_objmgr_get_vdev_by_opmode_from_psoc API will have incremented
* ref count - decrement here since vdev returned by that api is not
* used any more
* wlan_util_get_vdev_by_ifname increments ref count
* decrement here since vdev returned by that api is not used any more
*/
wlan_objmgr_vdev_release_ref(nan_vdev, WLAN_NAN_ID);
@ -270,12 +278,17 @@ static int os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc,
}
iface_name = nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]);
nan_vdev = ucfg_nan_get_ndi_vdev(psoc, WLAN_NAN_ID);
nan_vdev = wlan_util_get_vdev_by_ifname(psoc, iface_name, WLAN_NAN_ID);
if (!nan_vdev) {
cfg80211_err("NAN data interface %s not available", iface_name);
return -EINVAL;
}
if (nan_vdev->vdev_mlme.vdev_opmode != QDF_NDI_MODE) {
cfg80211_err("Interface found is not NDI");
return -EINVAL;
}
state = ucfg_nan_get_ndi_state(nan_vdev);
if (state == NAN_DATA_NDI_DELETED_STATE ||
state == NAN_DATA_NDI_DELETING_STATE ||
@ -399,12 +412,17 @@ static int os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc,
iface_name = nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]);
/* Check if there is already an existing NAN interface */
nan_vdev = ucfg_nan_get_ndi_vdev(psoc, WLAN_NAN_ID);
nan_vdev = wlan_util_get_vdev_by_ifname(psoc, iface_name, WLAN_NAN_ID);
if (!nan_vdev) {
cfg80211_err("NAN data interface %s not available", iface_name);
return -EINVAL;
}
if (nan_vdev->vdev_mlme.vdev_opmode != QDF_NDI_MODE) {
cfg80211_err("Interface found is not NDI");
return -EINVAL;
}
state = ucfg_nan_get_ndi_state(nan_vdev);
if (state == NAN_DATA_NDI_DELETED_STATE ||
state == NAN_DATA_NDI_DELETING_STATE ||
@ -524,7 +542,8 @@ static int os_if_nan_process_ndp_end_req(struct wlan_objmgr_psoc *psoc,
cfg80211_debug("sending ndp_end_req to SME, transaction_id: %d",
req.transaction_id);
nan_vdev = ucfg_nan_get_ndi_vdev(psoc, WLAN_NAN_ID);
nan_vdev = wlan_objmgr_get_vdev_by_opmode_from_psoc(psoc, QDF_NDI_MODE,
WLAN_NAN_ID);
if (!nan_vdev) {
cfg80211_err("NAN data interface is not available");
return -EINVAL;