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

Commit 60771780 authored by Michal Kazior's avatar Michal Kazior Committed by Johannes Berg
Browse files

cfg80211: introduce cfg80211_stop_ap 



This functionality will be reused when interface
is going down. Avoids code duplication. Also adds
missing wdev locking.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b1fbd469

net/wireless/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ obj-$(CONFIG_WEXT_SPY) += wext-spy.o 
obj-$(CONFIG_WEXT_PRIV) += wext-priv.o



cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o

cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o

cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o

cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o

cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o

cfg80211-$(CONFIG_CFG80211_INTERNAL_REGDB) += regdb.o

net/wireless/ap.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
#include <linux/ieee80211.h>

#include <linux/export.h>

#include <net/cfg80211.h>

#include "nl80211.h"

#include "core.h"





static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,

			      struct net_device *dev)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	int err;



	ASSERT_WDEV_LOCK(wdev);



	if (!rdev->ops->stop_ap)

		return -EOPNOTSUPP;



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)

		return -EOPNOTSUPP;



	if (!wdev->beacon_interval)

		return -ENOENT;



	err = rdev->ops->stop_ap(&rdev->wiphy, dev);

	if (!err)

		wdev->beacon_interval = 0;



	return err;

}



int cfg80211_stop_ap(struct cfg80211_registered_device *rdev,

		     struct net_device *dev)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	int err;



	wdev_lock(wdev);

	err = __cfg80211_stop_ap(rdev, dev);

	wdev_unlock(wdev);



	return err;

}

net/wireless/core.h

+4 −0
Original line number Diff line number Diff line
@@ -289,6 +289,10 @@ int cfg80211_set_mesh_freq(struct cfg80211_registered_device *rdev, 
			   struct wireless_dev *wdev, int freq,

			   enum nl80211_channel_type channel_type);



/* AP */

int cfg80211_stop_ap(struct cfg80211_registered_device *rdev,

		     struct net_device *dev);



/* MLME */

int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,

			 struct net_device *dev,

net/wireless/nl80211.c

+1 −16
Original line number Diff line number Diff line
@@ -2521,23 +2521,8 @@ static int nl80211_stop_ap(struct sk_buff *skb, struct genl_info *info) 
{

	struct cfg80211_registered_device *rdev = info->user_ptr[0];

	struct net_device *dev = info->user_ptr[1];

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	int err;



	if (!rdev->ops->stop_ap)

		return -EOPNOTSUPP;



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)

		return -EOPNOTSUPP;



	if (!wdev->beacon_interval)

		return -ENOENT;



	err = rdev->ops->stop_ap(&rdev->wiphy, dev);

	if (!err)

		wdev->beacon_interval = 0;

	return err;

	return cfg80211_stop_ap(rdev, dev);

}



static const struct nla_policy sta_flags_policy[NL80211_STA_FLAG_MAX + 1] = {