wifi: mac80211: allow block ack agreements in NAN Data

Allow receiving and sending Add Block Ack action frames for NAN Data

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260326121156.fe51df9d65f4.I104435f2af65e032cba168b1d842cb9610720041@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 01d927b88264f400f7a2f6c0218288d68b7f1395..4833b46770b62c77598c56f55494cecd36eda037 100644 (file)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -641,7 +641,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
            sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
            sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
            sdata->vif.type != NL80211_IFTYPE_AP &&
-           sdata->vif.type != NL80211_IFTYPE_ADHOC)
+           sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+           sdata->vif.type != NL80211_IFTYPE_NAN_DATA)
                return -EINVAL;
 
        if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index a00b734209296350826b10ca642e03468e937dc4..979ac26d11733319a5830849ab1ae5f18b9c6aaa 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3748,7 +3748,8 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                    sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
                    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
                    sdata->vif.type != NL80211_IFTYPE_AP &&
-                   sdata->vif.type != NL80211_IFTYPE_ADHOC)
+                   sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+                   sdata->vif.type != NL80211_IFTYPE_NAN_DATA)
                        break;
 
                /* verify action_code is present */