Merge "qcacmn: Check NAN iface with same name before creating another one"
diff --git a/os_if/linux/nan/src/os_if_nan.c b/os_if/linux/nan/src/os_if_nan.c
index d65a1c6..7820c83 100644
--- a/os_if/linux/nan/src/os_if_nan.c
+++ b/os_if/linux/nan/src/os_if_nan.c
@@ -166,11 +166,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)) {
@@ -1267,7 +1265,7 @@
bool create_fail = false;
struct nan_callbacks cb_obj;
struct sk_buff *vendor_event;
- uint8_t create_transaction_id;
+ uint16_t create_transaction_id;
struct wlan_objmgr_pdev *pdev = wlan_vdev_get_pdev(vdev);
struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev);
uint32_t create_status = NAN_DATAPATH_RSP_STATUS_ERROR;