[PATCH 73/92] nl80211: Extend the transmit cookie matching to NAN Data interface

[Andrei Otcheretianski]

From: Ilan Peer <ilan.peer at intel.com>

To support use cases where NAN action frames are transmitted
over NAN Data interfaces.

Signed-off-by: Ilan Peer <ilan.peer at intel.com>
---
 src/drivers/driver_nl80211.c       | 4 +++-
 src/drivers/driver_nl80211_event.c | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index d13fbc5ec7..6b9a712820 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -9836,7 +9836,9 @@ static int nl80211_send_frame_cmd(struct i802_bss *bss,
 		 * cases that the NAN Discovery Engine (NAN DE) is not managed
 		 * by the device.
 		 */
-		if (!wait && drv->nlmode != NL80211_IFTYPE_NAN)
+		if (!wait &&
+		    (drv->nlmode != NL80211_IFTYPE_NAN &&
+		     drv->nlmode != NL80211_IFTYPE_NAN_DATA))
 			goto fail;
 
 		if (drv->num_send_frame_cookies == MAX_SEND_FRAME_COOKIES) {
diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
index fe991b0b39..504ea5fc28 100644
--- a/src/drivers/driver_nl80211_event.c
+++ b/src/drivers/driver_nl80211_event.c
@@ -1510,7 +1510,8 @@ static void mlme_event_mgmt_tx_status(struct i802_bss *bss,
 			drv->send_frame_cookie = (u64)-1;
 		}
 
-		if (drv->nlmode == NL80211_IFTYPE_NAN &&
+		if ((drv->nlmode == NL80211_IFTYPE_NAN ||
+		     drv->nlmode == NL80211_IFTYPE_NAN_DATA) &&
 		    drv->num_send_frame_cookies > 0) {
 			unsigned int i;
 
-- 
2.53.0