mac80211: add ieee80211_sdata_running (9607e6b6) · Commits · e / devices / android_kernel_fairphone_FP4

net/mac80211/cfg.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -78,17 +78,15 @@ static int ieee80211_change_iface(struct wiphy *wiphy,
	enum nl80211_iftype type, u32 *flags,		enum nl80211_iftype type, u32 *flags,
	struct vif_params *params)		struct vif_params *params)
	{		{
	struct ieee80211_sub_if_data *sdata;		struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
	int ret;		int ret;

	if (netif_running(dev))		if (ieee80211_sdata_running(sdata))
	return -EBUSY;		return -EBUSY;

	if (!nl80211_params_check(type, params))		if (!nl80211_params_check(type, params))
	return -EINVAL;		return -EINVAL;

	sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	ret = ieee80211_if_change_type(sdata, type);		ret = ieee80211_if_change_type(sdata, type);
	if (ret)		if (ret)
	return ret;		return ret;

net/mac80211/ibss.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -744,7 +744,7 @@ static void ieee80211_ibss_work(struct work_struct *work)
	if (WARN_ON(local->suspended))		if (WARN_ON(local->suspended))
	return;		return;

	if (!netif_running(sdata->dev))		if (!ieee80211_sdata_running(sdata))
	return;		return;

	if (local->scanning)		if (local->scanning)
	@@ -827,7 +827,7 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local)

	mutex_lock(&local->iflist_mtx);		mutex_lock(&local->iflist_mtx);
	list_for_each_entry(sdata, &local->interfaces, list) {		list_for_each_entry(sdata, &local->interfaces, list) {
	if (!netif_running(sdata->dev))		if (!ieee80211_sdata_running(sdata))
	continue;		continue;
	if (sdata->vif.type != NL80211_IFTYPE_ADHOC)		if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
	continue;		continue;

net/mac80211/ieee80211_i.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -960,6 +960,11 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local);
	u32 __ieee80211_recalc_idle(struct ieee80211_local *local);		u32 __ieee80211_recalc_idle(struct ieee80211_local *local);
	void ieee80211_recalc_idle(struct ieee80211_local *local);		void ieee80211_recalc_idle(struct ieee80211_local *local);

			static inline bool ieee80211_sdata_running(struct ieee80211_sub_if_data *sdata)
			{
			return netif_running(sdata->dev);
			}

	/* tx handling */		/* tx handling */
	void ieee80211_clear_tx_pending(struct ieee80211_local *local);		void ieee80211_clear_tx_pending(struct ieee80211_local *local);
	void ieee80211_tx_pending(unsigned long data);		void ieee80211_tx_pending(unsigned long data);

net/mac80211/iface.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ static int ieee80211_change_mac(struct net_device dev, void addr)
	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);		struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
	int ret;		int ret;

	if (netif_running(dev))		if (ieee80211_sdata_running(sdata))
	return -EBUSY;		return -EBUSY;

	ret = eth_mac_addr(dev, addr);		ret = eth_mac_addr(dev, addr);
	@@ -111,7 +111,7 @@ static int ieee80211_open(struct net_device *dev)
	list_for_each_entry(nsdata, &local->interfaces, list) {		list_for_each_entry(nsdata, &local->interfaces, list) {
	struct net_device *ndev = nsdata->dev;		struct net_device *ndev = nsdata->dev;

	if (ndev != dev && netif_running(ndev)) {		if (ndev != dev && ieee80211_sdata_running(nsdata)) {
	/*		/*
	* Allow only a single IBSS interface to be up at any		* Allow only a single IBSS interface to be up at any
	* time. This is restricted because beacon distribution		* time. This is restricted because beacon distribution
	@@ -197,7 +197,7 @@ static int ieee80211_open(struct net_device *dev)
	struct net_device *ndev = nsdata->dev;		struct net_device *ndev = nsdata->dev;

	/*		/*
	* No need to check netif_running since we do not allow		* No need to check running since we do not allow
	* it to start up with this invalid address.		* it to start up with this invalid address.
	*/		*/
	if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) {		if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) {
	@@ -756,7 +756,7 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
	* and goes into the requested mode.		* and goes into the requested mode.
	*/		*/

	if (netif_running(sdata->dev))		if (ieee80211_sdata_running(sdata))
	return -EBUSY;		return -EBUSY;

	/* Purge and reset type-dependent state. */		/* Purge and reset type-dependent state. */
	@@ -930,7 +930,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
	return ieee80211_idle_off(local, "scanning");		return ieee80211_idle_off(local, "scanning");

	list_for_each_entry(sdata, &local->interfaces, list) {		list_for_each_entry(sdata, &local->interfaces, list) {
	if (!netif_running(sdata->dev))		if (!ieee80211_sdata_running(sdata))
	continue;		continue;
	/* do not count disabled managed interfaces */		/* do not count disabled managed interfaces */
	if (sdata->vif.type == NL80211_IFTYPE_STATION &&		if (sdata->vif.type == NL80211_IFTYPE_STATION &&

net/mac80211/key.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -443,7 +443,7 @@ void ieee80211_key_link(struct ieee80211_key *key,
	add_todo(old_key, KEY_FLAG_TODO_DELETE);		add_todo(old_key, KEY_FLAG_TODO_DELETE);

	add_todo(key, KEY_FLAG_TODO_ADD_DEBUGFS);		add_todo(key, KEY_FLAG_TODO_ADD_DEBUGFS);
	if (netif_running(sdata->dev))		if (ieee80211_sdata_running(sdata))
	add_todo(key, KEY_FLAG_TODO_HWACCEL_ADD);		add_todo(key, KEY_FLAG_TODO_HWACCEL_ADD);

	spin_unlock_irqrestore(&sdata->local->key_lock, flags);		spin_unlock_irqrestore(&sdata->local->key_lock, flags);
	@@ -509,7 +509,7 @@ void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata)
	{		{
	ASSERT_RTNL();		ASSERT_RTNL();

	if (WARN_ON(!netif_running(sdata->dev)))		if (WARN_ON(!ieee80211_sdata_running(sdata)))
	return;		return;

	ieee80211_todo_for_each_key(sdata, KEY_FLAG_TODO_HWACCEL_ADD);		ieee80211_todo_for_each_key(sdata, KEY_FLAG_TODO_HWACCEL_ADD);