mac80211: Implement add_nan_func and rm_nan_func (167e33f4) · Commits · e / devices / android_kernel_fairphone_FP4

include/net/mac80211.h

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2177,6 +2177,8 @@ enum ieee80211_hw_flags {
	* @n_cipher_schemes: a size of an array of cipher schemes definitions.		* @n_cipher_schemes: a size of an array of cipher schemes definitions.
	* @cipher_schemes: a pointer to an array of cipher scheme definitions		* @cipher_schemes: a pointer to an array of cipher scheme definitions
	* supported by HW.		* supported by HW.
			* @max_nan_de_entries: maximum number of NAN DE functions supported by the
			* device.
	*/		*/
	struct ieee80211_hw {		struct ieee80211_hw {
	struct ieee80211_conf conf;		struct ieee80211_conf conf;
	@@ -2211,6 +2213,7 @@ struct ieee80211_hw {
	u8 uapsd_max_sp_len;		u8 uapsd_max_sp_len;
	u8 n_cipher_schemes;		u8 n_cipher_schemes;
	const struct ieee80211_cipher_scheme *cipher_schemes;		const struct ieee80211_cipher_scheme *cipher_schemes;
			u8 max_nan_de_entries;
	};		};

	static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw,		static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw,
	@@ -3429,6 +3432,12 @@ enum ieee80211_reconfig_type {
	* The driver gets both full configuration and the changed parameters since		* The driver gets both full configuration and the changed parameters since
	* some devices may need the full configuration while others need only the		* some devices may need the full configuration while others need only the
	* changed parameters.		* changed parameters.
			* @add_nan_func: Add a NAN function. Returns 0 on success. The data in
			* cfg80211_nan_func must not be referenced outside the scope of
			* this call.
			* @del_nan_func: Remove a NAN function. The driver must call
			* ieee80211_nan_func_terminated() with
			* NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST reason code upon removal.
	*/		*/
	struct ieee80211_ops {		struct ieee80211_ops {
	void (tx)(struct ieee80211_hw hw,		void (tx)(struct ieee80211_hw hw,
	@@ -3673,6 +3682,12 @@ struct ieee80211_ops {
	int (nan_change_conf)(struct ieee80211_hw hw,		int (nan_change_conf)(struct ieee80211_hw hw,
	struct ieee80211_vif *vif,		struct ieee80211_vif *vif,
	struct cfg80211_nan_conf *conf, u32 changes);		struct cfg80211_nan_conf *conf, u32 changes);
			int (add_nan_func)(struct ieee80211_hw hw,
			struct ieee80211_vif *vif,
			const struct cfg80211_nan_func *nan_func);
			void (del_nan_func)(struct ieee80211_hw hw,
			struct ieee80211_vif *vif,
			u8 instance_id);
	};		};

	/**		/**
	@@ -5746,4 +5761,20 @@ struct sk_buff ieee80211_tx_dequeue(struct ieee80211_hw hw,
	void ieee80211_txq_get_depth(struct ieee80211_txq *txq,		void ieee80211_txq_get_depth(struct ieee80211_txq *txq,
	unsigned long *frame_cnt,		unsigned long *frame_cnt,
	unsigned long *byte_cnt);		unsigned long *byte_cnt);

			/**
			* ieee80211_nan_func_terminated - notify about NAN function termination.
			*
			* This function is used to notify mac80211 about NAN function termination.
			* Note that this function can't be called from hard irq.
			*
			* @vif: &struct ieee80211_vif pointer from the add_interface callback.
			* @inst_id: the local instance id
			* @reason: termination reason (one of the NL80211_NAN_FUNC_TERM_REASON_*)
			* @gfp: allocation flags
			*/
			void ieee80211_nan_func_terminated(struct ieee80211_vif *vif,
			u8 inst_id,
			enum nl80211_nan_func_term_reason reason,
			gfp_t gfp);
	#endif /* MAC80211_H */		#endif /* MAC80211_H */

net/mac80211/cfg.c

+114 −0

Original line number	Original line	Diff line number	Diff line
	@@ -174,6 +174,8 @@ static int ieee80211_start_nan(struct wiphy *wiphy,
	if (ret)		if (ret)
	ieee80211_sdata_stop(sdata);		ieee80211_sdata_stop(sdata);

			sdata->u.nan.conf = *conf;

	return ret;		return ret;
	}		}

	@@ -216,6 +218,84 @@ static int ieee80211_nan_change_conf(struct wiphy *wiphy,
	return ret;		return ret;
	}		}

			static int ieee80211_add_nan_func(struct wiphy *wiphy,
			struct wireless_dev *wdev,
			struct cfg80211_nan_func *nan_func)
			{
			struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
			int ret;

			if (sdata->vif.type != NL80211_IFTYPE_NAN)
			return -EOPNOTSUPP;

			if (!ieee80211_sdata_running(sdata))
			return -ENETDOWN;

			spin_lock_bh(&sdata->u.nan.func_lock);

			ret = idr_alloc(&sdata->u.nan.function_inst_ids,
			nan_func, 1, sdata->local->hw.max_nan_de_entries + 1,
			GFP_ATOMIC);
			spin_unlock_bh(&sdata->u.nan.func_lock);

			if (ret < 0)
			return ret;

			nan_func->instance_id = ret;

			WARN_ON(nan_func->instance_id == 0);

			ret = drv_add_nan_func(sdata->local, sdata, nan_func);
			if (ret) {
			spin_lock_bh(&sdata->u.nan.func_lock);
			idr_remove(&sdata->u.nan.function_inst_ids,
			nan_func->instance_id);
			spin_unlock_bh(&sdata->u.nan.func_lock);
			}

			return ret;
			}

			static struct cfg80211_nan_func *
			ieee80211_find_nan_func_by_cookie(struct ieee80211_sub_if_data *sdata,
			u64 cookie)
			{
			struct cfg80211_nan_func *func;
			int id;

			lockdep_assert_held(&sdata->u.nan.func_lock);

			idr_for_each_entry(&sdata->u.nan.function_inst_ids, func, id) {
			if (func->cookie == cookie)
			return func;
			}

			return NULL;
			}

			static void ieee80211_del_nan_func(struct wiphy *wiphy,
			struct wireless_dev *wdev, u64 cookie)
			{
			struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
			struct cfg80211_nan_func *func;
			u8 instance_id = 0;

			if (sdata->vif.type != NL80211_IFTYPE_NAN \|\|
			!ieee80211_sdata_running(sdata))
			return;

			spin_lock_bh(&sdata->u.nan.func_lock);

			func = ieee80211_find_nan_func_by_cookie(sdata, cookie);
			if (func)
			instance_id = func->instance_id;

			spin_unlock_bh(&sdata->u.nan.func_lock);

			if (instance_id)
			drv_del_nan_func(sdata->local, sdata, instance_id);
			}

	static int ieee80211_set_noack_map(struct wiphy *wiphy,		static int ieee80211_set_noack_map(struct wiphy *wiphy,
	struct net_device *dev,		struct net_device *dev,
	u16 noack_map)		u16 noack_map)
	@@ -3443,6 +3523,38 @@ static int ieee80211_del_tx_ts(struct wiphy wiphy, struct net_device dev,
	return -ENOENT;		return -ENOENT;
	}		}

			void ieee80211_nan_func_terminated(struct ieee80211_vif *vif,
			u8 inst_id,
			enum nl80211_nan_func_term_reason reason,
			gfp_t gfp)
			{
			struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
			struct cfg80211_nan_func *func;
			u64 cookie;

			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, inst_id);
			if (WARN_ON(!func)) {
			spin_unlock_bh(&sdata->u.nan.func_lock);
			return;
			}

			cookie = func->cookie;
			idr_remove(&sdata->u.nan.function_inst_ids, inst_id);

			spin_unlock_bh(&sdata->u.nan.func_lock);

			cfg80211_free_nan_func(func);

			cfg80211_nan_func_terminated(ieee80211_vif_to_wdev(vif), inst_id,
			reason, cookie, gfp);
			}
			EXPORT_SYMBOL(ieee80211_nan_func_terminated);

	const struct cfg80211_ops mac80211_config_ops = {		const struct cfg80211_ops mac80211_config_ops = {
	.add_virtual_intf = ieee80211_add_iface,		.add_virtual_intf = ieee80211_add_iface,
	.del_virtual_intf = ieee80211_del_iface,		.del_virtual_intf = ieee80211_del_iface,
	@@ -3531,4 +3643,6 @@ const struct cfg80211_ops mac80211_config_ops = {
	.start_nan = ieee80211_start_nan,		.start_nan = ieee80211_start_nan,
	.stop_nan = ieee80211_stop_nan,		.stop_nan = ieee80211_stop_nan,
	.nan_change_conf = ieee80211_nan_change_conf,		.nan_change_conf = ieee80211_nan_change_conf,
			.add_nan_func = ieee80211_add_nan_func,
			.del_nan_func = ieee80211_del_nan_func,
	};		};

net/mac80211/driver-ops.h

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1213,4 +1213,36 @@ static inline int drv_nan_change_conf(struct ieee80211_local *local,
	return ret;		return ret;
	}		}

			static inline int drv_add_nan_func(struct ieee80211_local *local,
			struct ieee80211_sub_if_data *sdata,
			const struct cfg80211_nan_func *nan_func)
			{
			int ret;

			might_sleep();
			check_sdata_in_driver(sdata);

			if (!local->ops->add_nan_func)
			return -EOPNOTSUPP;

			trace_drv_add_nan_func(local, sdata, nan_func);
			ret = local->ops->add_nan_func(&local->hw, &sdata->vif, nan_func);
			trace_drv_return_int(local, ret);

			return ret;
			}

			static inline void drv_del_nan_func(struct ieee80211_local *local,
			struct ieee80211_sub_if_data *sdata,
			u8 instance_id)
			{
			might_sleep();
			check_sdata_in_driver(sdata);

			trace_drv_del_nan_func(local, sdata, instance_id);
			if (local->ops->del_nan_func)
			local->ops->del_nan_func(&local->hw, &sdata->vif, instance_id);
			trace_drv_return_void(local);
			}

	#endif /* __MAC80211_DRIVER_OPS */		#endif /* __MAC80211_DRIVER_OPS */

net/mac80211/ieee80211_i.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,8 @@ struct ieee80211_local;

	#define IEEE80211_DEAUTH_FRAME_LEN (24 /* hdr / + 2 / reason */)		#define IEEE80211_DEAUTH_FRAME_LEN (24 /* hdr / + 2 / reason */)

			#define IEEE80211_MAX_NAN_INSTANCE_ID 255

	struct ieee80211_fragment_entry {		struct ieee80211_fragment_entry {
	struct sk_buff_head skb_list;		struct sk_buff_head skb_list;
	unsigned long first_frag_time;		unsigned long first_frag_time;
	@@ -834,9 +836,14 @@ struct ieee80211_if_mntr {
	* struct ieee80211_if_nan - NAN state		* struct ieee80211_if_nan - NAN state
	*		*
	* @conf: current NAN configuration		* @conf: current NAN configuration
			* @func_ids: a bitmap of available instance_id's
	*/		*/
	struct ieee80211_if_nan {		struct ieee80211_if_nan {
	struct cfg80211_nan_conf conf;		struct cfg80211_nan_conf conf;

			/* protects function_inst_ids */
			spinlock_t func_lock;
			struct idr function_inst_ids;
	};		};

	struct ieee80211_sub_if_data {		struct ieee80211_sub_if_data {

net/mac80211/iface.c

+18 −2

Original line number	Original line	Diff line number	Diff line
	@@ -798,6 +798,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
	struct ps_data *ps;		struct ps_data *ps;
	struct cfg80211_chan_def chandef;		struct cfg80211_chan_def chandef;
	bool cancel_scan;		bool cancel_scan;
			struct cfg80211_nan_func *func;

	clear_bit(SDATA_STATE_RUNNING, &sdata->state);		clear_bit(SDATA_STATE_RUNNING, &sdata->state);

	@@ -950,11 +951,22 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,

	ieee80211_adjust_monitor_flags(sdata, -1);		ieee80211_adjust_monitor_flags(sdata, -1);
	break;		break;
			case NL80211_IFTYPE_NAN:
			/* clean all the functions */
			spin_lock_bh(&sdata->u.nan.func_lock);

			idr_for_each_entry(&sdata->u.nan.function_inst_ids, func, i) {
			idr_remove(&sdata->u.nan.function_inst_ids, i);
			cfg80211_free_nan_func(func);
			}
			idr_destroy(&sdata->u.nan.function_inst_ids);

			spin_unlock_bh(&sdata->u.nan.func_lock);
			break;
	case NL80211_IFTYPE_P2P_DEVICE:		case NL80211_IFTYPE_P2P_DEVICE:
	/* relies on synchronize_rcu() below */		/* relies on synchronize_rcu() below */
	RCU_INIT_POINTER(local->p2p_sdata, NULL);		RCU_INIT_POINTER(local->p2p_sdata, NULL);
	/* fall through */		/* fall through */
	case NL80211_IFTYPE_NAN:
	default:		default:
	cancel_work_sync(&sdata->work);		cancel_work_sync(&sdata->work);
	/*		/*
	@@ -1462,9 +1474,13 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
	case NL80211_IFTYPE_WDS:		case NL80211_IFTYPE_WDS:
	sdata->vif.bss_conf.bssid = NULL;		sdata->vif.bss_conf.bssid = NULL;
	break;		break;
			case NL80211_IFTYPE_NAN:
			idr_init(&sdata->u.nan.function_inst_ids);
			spin_lock_init(&sdata->u.nan.func_lock);
			sdata->vif.bss_conf.bssid = sdata->vif.addr;
			break;
	case NL80211_IFTYPE_AP_VLAN:		case NL80211_IFTYPE_AP_VLAN:
	case NL80211_IFTYPE_P2P_DEVICE:		case NL80211_IFTYPE_P2P_DEVICE:
	case NL80211_IFTYPE_NAN:
	sdata->vif.bss_conf.bssid = sdata->vif.addr;		sdata->vif.bss_conf.bssid = sdata->vif.addr;
	break;		break;
	case NL80211_IFTYPE_UNSPECIFIED:		case NL80211_IFTYPE_UNSPECIFIED: