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

Commit ddd3d2be authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: make userspace-mlme a per-interface setting 



Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58d4185e

net/mac80211/ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int ieee80211_open(struct net_device *dev) 
		ieee80211_enable_keys(sdata);



		if (sdata->type == IEEE80211_IF_TYPE_STA &&

		    !local->user_space_mlme)

		    !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME))

			netif_carrier_off(dev);

		else

			netif_carrier_on(dev);

net/mac80211/ieee80211_i.h

+1 −2
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ struct ieee80211_if_sta { 
 * generator reports that there are no present stations that cannot support short

 * preambles */

#define IEEE80211_SDATA_SHORT_PREAMBLE	BIT(3)

#define IEEE80211_SDATA_USERSPACE_MLME	BIT(4)

struct ieee80211_sub_if_data {

	struct list_head list;

	enum ieee80211_if_types type;
@@ -553,8 +554,6 @@ struct ieee80211_local { 
	unsigned int hw_modes; /* bitfield of supported hardware modes;

				* (1 << MODE_*) */



	int user_space_mlme;



#ifdef CONFIG_MAC80211_DEBUGFS

	struct local_debugfsdentries {

		struct dentry *channel;

net/mac80211/ieee80211_ioctl.c

+5 −7
Original line number Diff line number Diff line
@@ -105,12 +105,12 @@ static int ieee80211_ioctl_siwgenie(struct net_device *dev, 
				    struct iw_point *data, char *extra)

{

	struct ieee80211_sub_if_data *sdata;

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);



	if (local->user_space_mlme)

	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)

		return -EOPNOTSUPP;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	if (sdata->type == IEEE80211_IF_TYPE_STA ||

	    sdata->type == IEEE80211_IF_TYPE_IBSS) {

		int ret = ieee80211_sta_set_extra_ie(dev, extra, data->length);
@@ -374,7 +374,6 @@ static int ieee80211_ioctl_siwessid(struct net_device *dev, 
				    struct iw_request_info *info,

				    struct iw_point *data, char *ssid)

{

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	struct ieee80211_sub_if_data *sdata;

	size_t len = data->length;
@@ -386,7 +385,7 @@ static int ieee80211_ioctl_siwessid(struct net_device *dev, 
	if (sdata->type == IEEE80211_IF_TYPE_STA ||

	    sdata->type == IEEE80211_IF_TYPE_IBSS) {

		int ret;

		if (local->user_space_mlme) {

		if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME) {

			if (len > IEEE80211_MAX_SSID_LEN)

				return -EINVAL;

			memcpy(sdata->u.sta.ssid, ssid, len);
@@ -451,14 +450,13 @@ static int ieee80211_ioctl_siwap(struct net_device *dev, 
				 struct iw_request_info *info,

				 struct sockaddr *ap_addr, char *extra)

{

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	struct ieee80211_sub_if_data *sdata;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	if (sdata->type == IEEE80211_IF_TYPE_STA ||

	    sdata->type == IEEE80211_IF_TYPE_IBSS) {

		int ret;

		if (local->user_space_mlme) {

		if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME) {

			memcpy(sdata->u.sta.bssid, (u8 *) &ap_addr->sa_data,

			       ETH_ALEN);

			return 0;

net/mac80211/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx) 
	sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);

	if ((sdata->type == IEEE80211_IF_TYPE_STA ||

	     sdata->type == IEEE80211_IF_TYPE_IBSS) &&

	    !rx->local->user_space_mlme)

	    !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME))

		ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status);

	else

		return TXRX_DROP;