From: "Dr. David Alan Gilbert" <linux@xxxxxxxxxxx>
ieee80211_nan_func_match() was explicitly added in 2016 by
commit 92bc43bce284 ("mac80211: Add API to report NAN function match")
but has remained unused.
Remove it.
Signed-off-by: Dr. David Alan Gilbert <linux@xxxxxxxxxxx>
---
include/net/mac80211.h | 15 ---------------
net/mac80211/cfg.c | 25 -------------------------
2 files changed, 40 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index ab8dce1f2c27..47d67b1f7d02 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -7550,21 +7550,6 @@ void ieee80211_nan_func_terminated(struct ieee80211_vif *vif,
enum nl80211_nan_func_term_reason reason,
gfp_t gfp);
-/**
- * ieee80211_nan_func_match - notify about NAN function match event.
- *
- * This function is used to notify mac80211 about NAN function match. The
- * cookie inside the match struct will be assigned by mac80211.
- * Note that this function can't be called from hard irq.
- *
- * @vif: &struct ieee80211_vif pointer from the add_interface callback.
- * @match: match event information
- * @gfp: allocation flags
- */
-void ieee80211_nan_func_match(struct ieee80211_vif *vif,
- struct cfg80211_nan_match_params *match,
- gfp_t gfp);
-
/**
* ieee80211_calc_rx_airtime - calculate estimated transmission airtime for RX.
*
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d3fc158ccaf6..50b4ec777349 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4525,31 +4525,6 @@ void ieee80211_nan_func_terminated(struct ieee80211_vif *vif,
}
EXPORT_SYMBOL(ieee80211_nan_func_terminated);
-void ieee80211_nan_func_match(struct ieee80211_vif *vif,
- struct cfg80211_nan_match_params *match,
- gfp_t gfp)
-{
- struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
- struct cfg80211_nan_func *func;
-
- if (WARN_ON(vif->type != NL80211_IFTYPE_NAN))
- return;
-
- spin_lock_bh(&sdata->u.nan.func_lock);
-
- func = idr_find(&sdata->u.nan.function_inst_ids, match->inst_id);
- if (WARN_ON(!func)) {
- spin_unlock_bh(&sdata->u.nan.func_lock);
- return;
- }
- match->cookie = func->cookie;
-
- spin_unlock_bh(&sdata->u.nan.func_lock);
-
- cfg80211_nan_match(ieee80211_vif_to_wdev(vif), match, gfp);
-}
-EXPORT_SYMBOL(ieee80211_nan_func_match);
-
static int ieee80211_set_multicast_to_unicast(struct wiphy *wiphy,
struct net_device *dev,
const bool enabled)
--
2.47.1
