Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92bc43bc authored by Ayala Beker's avatar Ayala Beker Committed by Johannes Berg
Browse files

mac80211: Add API to report NAN function match 



Provide an API to report NAN function match. Mac80211 will lookup the
corresponding cookie and report the match to cfg80211.

Signed-off-by: default avatarAndrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 167e33f4

include/net/mac80211.h

+16 −0
Original line number Diff line number Diff line
@@ -5777,4 +5777,20 @@ void ieee80211_nan_func_terminated(struct ieee80211_vif *vif, 
				   u8 inst_id,

				   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);



#endif /* MAC80211_H */

net/mac80211/cfg.c

+25 −0
Original line number Diff line number Diff line
@@ -3555,6 +3555,31 @@ 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);



const struct cfg80211_ops mac80211_config_ops = {

	.add_virtual_intf = ieee80211_add_iface,

	.del_virtual_intf = ieee80211_del_iface,