wifi: iwlwifi: mvm: Remove NAN support

NAN is not officially supported on any of the MVM devices so there
is no need to maintain it.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250723094230.b327adbf35c0.I0357e383ab5df72d8b87e0dee10609a6946865b6@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 7d2b496aadc56ff53a3b8e246df0e95dd2bf394d..8805ab344895a14e74787850acce4dc7f6839155 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -301,7 +301,7 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
        iwl_mvm_init_link(&mvmvif->deflink);
 
-       /* No need to allocate data queues to P2P Device MAC and NAN.*/
+       /* No need to allocate data queues to P2P Device MAC */
        if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
                return 0;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 55ae1caded53e886793b8813f891035b3b7c1879..ed19b82d14fa93e36213e8d8d9d91a769cf0ffb3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1833,12 +1833,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
 
        rcu_assign_pointer(mvm->vif_id_to_mac[mvmvif->id], vif);
 
-       /* Currently not much to do for NAN */
-       if (vif->type == NL80211_IFTYPE_NAN) {
-               ret = 0;
-               goto out;
-       }
-
        /*
         * The AP binding flow can be done only after the beacon
         * template is configured (which happens only in the mac80211

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c
index 3f8b840871d366b5c8e3dca9cebe3ef4bfef4e74..2d116a41913cd8c50da6de4cc04118df00ca4c2d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c
@@ -282,9 +282,6 @@ int iwl_mvm_mld_mac_ctxt_add(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
        int ret;
 
-       if (WARN_ON_ONCE(vif->type == NL80211_IFTYPE_NAN))
-               return -EOPNOTSUPP;
-
        if (WARN_ONCE(mvmvif->uploaded, "Adding active MAC %pM/%d\n",
                      vif->addr, ieee80211_vif_type_p2p(vif)))
                return -EIO;
@@ -307,9 +304,6 @@ int iwl_mvm_mld_mac_ctxt_changed(struct iwl_mvm *mvm,
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 
-       if (WARN_ON_ONCE(vif->type == NL80211_IFTYPE_NAN))
-               return -EOPNOTSUPP;
-
        if (WARN_ONCE(!mvmvif->uploaded, "Changing inactive MAC %pM/%d\n",
                      vif->addr, ieee80211_vif_type_p2p(vif)))
                return -EIO;
@@ -327,9 +321,6 @@ int iwl_mvm_mld_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        };
        int ret;
 
-       if (WARN_ON_ONCE(vif->type == NL80211_IFTYPE_NAN))
-               return -EOPNOTSUPP;
-
        if (WARN_ONCE(!mvmvif->uploaded, "Removing inactive MAC %pM/%d\n",
                      vif->addr, ieee80211_vif_type_p2p(vif)))
                return -EIO;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index af73ff09d60915fc48558ce5212338d60be204d7..fdaeefa305e177a0b25d165cdb5e0775abc40862 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1325,7 +1325,6 @@ struct iwl_mvm {
                u8 range_resp;
        } cmd_ver;
 
-       struct ieee80211_vif *nan_vif;
        struct iwl_mvm_baid_data __rcu *baid_map[IWL_MAX_BAID];
 
        /*

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/power.c b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
index 0057fddf88f021748fcacd041b237080d14ab7ac..610de29b7be0d15638b845aedf8fc636d554e988 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
@@ -231,7 +231,6 @@ static void iwl_mvm_allow_uapsd_iterator(void *_data, u8 *mac,
        switch (vif->type) {
        case NL80211_IFTYPE_AP:
        case NL80211_IFTYPE_ADHOC:
-       case NL80211_IFTYPE_NAN:
                data->allow_uapsd = false;
                break;
        case NL80211_IFTYPE_STATION: