commit 90ac7473ba1fd78e0f63a7c38f71c037e2d60733
author Linux Build Service Account <lnxbuild@quicinc.com> Fri Jul 21 02:05:05 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 21 02:05:05 2017 -0700
tree 7cab5da972a1074a9fdf1610d19a0bb9e8c3c27a
parent db0fa14b0ea4a07664b6b7b20372389a8efde3ce
parent 26cac01ab27a4d3210990ebbbd73ae241c30351f

Merge "qcacmn: Allow nan data interface delete with peers attached"

os_if/linux/nan/src/os_if_nan.c

diff --git a/os_if/linux/nan/src/os_if_nan.c b/os_if/linux/nan/src/os_if_nan.c
index f4d9220..93aae1e 100644
--- a/os_if/linux/nan/src/os_if_nan.c
+++ b/os_if/linux/nan/src/os_if_nan.c
@@ -158,11 +158,9 @@
 	wlan_objmgr_vdev_release_ref(nan_vdev, WLAN_NAN_ID);
 
 	/* check if there are active peers on the adapter */
-	if (num_peers) {
-		cfg80211_err("NDP peers active: %d, cannot delete NDI",
+	if (num_peers)
+		cfg80211_err("NDP peers active: %d, active NDPs may not be terminated",
 			     num_peers);
-		return -EINVAL;
-	}
 
 	status = ucfg_nan_get_callbacks(psoc, &cb_obj);
 	if (QDF_IS_STATUS_ERROR(status)) {