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

Commit f2129354 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: managed mode wext compatibility 



This adds code to make it possible to use the cfg80211
connect() API with wireless extensions, and because the
previous patch added emulation of that API with auth()
and assoc(), by extension also supports wext on that.
At the same time, removes code from mac80211 for wext,
but doesn't yet clean up mac80211's mlme code more.

Signed-off-by: default avatarSamuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6829c878

include/net/cfg80211.h

+35 −1
Original line number Diff line number Diff line
@@ -1253,8 +1253,14 @@ struct wireless_dev { 
#ifdef CONFIG_WIRELESS_EXT

	/* wext data */

	struct {

		union {

			struct cfg80211_ibss_params ibss;

			struct cfg80211_connect_params connect;

		};

		u8 *ie;

		size_t ie_len;

		u8 bssid[ETH_ALEN];

		u8 ssid[IEEE80211_MAX_SSID_LEN];

		s8 default_key, default_mgmt_key;

	} wext;

#endif
@@ -1535,6 +1541,34 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev, 
			     struct iw_request_info *info,

			     struct sockaddr *ap_addr, char *extra);



int cfg80211_mgd_wext_siwfreq(struct net_device *dev,

			      struct iw_request_info *info,

			      struct iw_freq *freq, char *extra);

int cfg80211_mgd_wext_giwfreq(struct net_device *dev,

			      struct iw_request_info *info,

			      struct iw_freq *freq, char *extra);

int cfg80211_mgd_wext_siwessid(struct net_device *dev,

			       struct iw_request_info *info,

			       struct iw_point *data, char *ssid);

int cfg80211_mgd_wext_giwessid(struct net_device *dev,

			       struct iw_request_info *info,

			       struct iw_point *data, char *ssid);

int cfg80211_mgd_wext_siwap(struct net_device *dev,

			    struct iw_request_info *info,

			    struct sockaddr *ap_addr, char *extra);

int cfg80211_mgd_wext_giwap(struct net_device *dev,

			    struct iw_request_info *info,

			    struct sockaddr *ap_addr, char *extra);

int cfg80211_wext_siwgenie(struct net_device *dev,

			   struct iw_request_info *info,

			   struct iw_point *data, char *extra);

int cfg80211_wext_siwauth(struct net_device *dev,

			  struct iw_request_info *info,

			  struct iw_param *data, char *extra);

int cfg80211_wext_giwauth(struct net_device *dev,

			  struct iw_request_info *info,

			  struct iw_param *data, char *extra);



struct ieee80211_channel *cfg80211_wext_freq(struct wiphy *wiphy,

					     struct iw_freq *freq);

net/mac80211/mlme.c

+0 −69
Original line number Diff line number Diff line
@@ -870,70 +870,6 @@ static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata, 
	return changed;

}



static void ieee80211_sta_send_apinfo(struct ieee80211_sub_if_data *sdata)

{

	union iwreq_data wrqu;



	memset(&wrqu, 0, sizeof(wrqu));

	if (sdata->u.mgd.flags & IEEE80211_STA_ASSOCIATED)

		memcpy(wrqu.ap_addr.sa_data, sdata->u.mgd.bssid, ETH_ALEN);

	wrqu.ap_addr.sa_family = ARPHRD_ETHER;

	wireless_send_event(sdata->dev, SIOCGIWAP, &wrqu, NULL);

}



static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	char *buf;

	size_t len;

	int i;

	union iwreq_data wrqu;



	if (!ifmgd->assocreq_ies && !ifmgd->assocresp_ies)

		return;



	buf = kmalloc(50 + 2 * (ifmgd->assocreq_ies_len +

				ifmgd->assocresp_ies_len), GFP_KERNEL);

	if (!buf)

		return;



	len = sprintf(buf, "ASSOCINFO(");

	if (ifmgd->assocreq_ies) {

		len += sprintf(buf + len, "ReqIEs=");

		for (i = 0; i < ifmgd->assocreq_ies_len; i++) {

			len += sprintf(buf + len, "%02x",

				       ifmgd->assocreq_ies[i]);

		}

	}

	if (ifmgd->assocresp_ies) {

		if (ifmgd->assocreq_ies)

			len += sprintf(buf + len, " ");

		len += sprintf(buf + len, "RespIEs=");

		for (i = 0; i < ifmgd->assocresp_ies_len; i++) {

			len += sprintf(buf + len, "%02x",

				       ifmgd->assocresp_ies[i]);

		}

	}

	len += sprintf(buf + len, ")");



	if (len > IW_CUSTOM_MAX) {

		len = sprintf(buf, "ASSOCRESPIE=");

		for (i = 0; i < ifmgd->assocresp_ies_len; i++) {

			len += sprintf(buf + len, "%02x",

				       ifmgd->assocresp_ies[i]);

		}

	}



	if (len <= IW_CUSTOM_MAX) {

		memset(&wrqu, 0, sizeof(wrqu));

		wrqu.data.length = len;

		wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);

	}



	kfree(buf);

}





static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,

				     u32 bss_info_changed)

{
@@ -966,7 +902,6 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, 


	ifmgd->flags |= IEEE80211_STA_PREV_BSSID_SET;

	memcpy(ifmgd->prev_bssid, sdata->u.mgd.bssid, ETH_ALEN);

	ieee80211_sta_send_associnfo(sdata);



	ifmgd->last_probe = jiffies;

	ieee80211_led_assoc(local, 1);
@@ -993,8 +928,6 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, 


	netif_tx_start_all_queues(sdata->dev);

	netif_carrier_on(sdata->dev);



	ieee80211_sta_send_apinfo(sdata);

}



static void ieee80211_direct_probe(struct ieee80211_sub_if_data *sdata)
@@ -1147,8 +1080,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
	changed |= BSS_CHANGED_ASSOC;

	sdata->vif.bss_conf.assoc = false;



	ieee80211_sta_send_apinfo(sdata);



	if (self_disconnected || reason == WLAN_REASON_DISASSOC_STA_HAS_LEFT) {

		ifmgd->state = IEEE80211_STA_MLME_DISABLED;

		ieee80211_rx_bss_remove(sdata, ifmgd->bssid,

net/mac80211/wext.c

+20 −195
Original line number Diff line number Diff line
@@ -27,29 +27,6 @@ 
#include "aes_ccm.h"





static int ieee80211_ioctl_siwgenie(struct net_device *dev,

				    struct iw_request_info *info,

				    struct iw_point *data, char *extra)

{

	struct ieee80211_sub_if_data *sdata;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (sdata->vif.type == NL80211_IFTYPE_STATION) {

		int ret = ieee80211_sta_set_extra_ie(sdata, extra, data->length);

		if (ret && ret != -EALREADY)

			return ret;

		sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_BSSID_SEL;

		sdata->u.mgd.flags &= ~IEEE80211_STA_EXT_SME;

		sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT;

		if (ret != -EALREADY)

			ieee80211_sta_req_auth(sdata);

		return 0;

	}



	return -EOPNOTSUPP;

}



static int ieee80211_ioctl_siwfreq(struct net_device *dev,

				   struct iw_request_info *info,

				   struct iw_freq *freq, char *extra)
@@ -61,16 +38,13 @@ static int ieee80211_ioctl_siwfreq(struct net_device *dev, 
	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_siwfreq(dev, info, freq, extra);

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_CHANNEL_SEL;

		return cfg80211_mgd_wext_siwfreq(dev, info, freq, extra);



	/* freq->e == 0: freq->m = channel; otherwise freq = m * 10^e */

	if (freq->e == 0) {

		if (freq->m < 0) {

			if (sdata->vif.type == NL80211_IFTYPE_STATION)

				sdata->u.mgd.flags |=

					IEEE80211_STA_AUTO_CHANNEL_SEL;

			return 0;

		} else

		if (freq->m < 0)

			return -EINVAL;

		else

			chan = ieee80211_get_channel(local->hw.wiphy,

				ieee80211_channel_to_frequency(freq->m));

	} else {
@@ -95,9 +69,6 @@ static int ieee80211_ioctl_siwfreq(struct net_device *dev, 
	if (local->oper_channel == chan)

		return 0;



	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		ieee80211_sta_req_auth(sdata);



	local->oper_channel = chan;

	local->oper_channel_type = NL80211_CHAN_NO_HT;

	ieee80211_hw_config(local, 0);
@@ -115,6 +86,8 @@ static int ieee80211_ioctl_giwfreq(struct net_device *dev, 


	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);



	freq->m = local->oper_channel->center_freq;

	freq->e = 6;
@@ -128,31 +101,11 @@ static int ieee80211_ioctl_siwessid(struct net_device *dev, 
				    struct iw_point *data, char *ssid)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	size_t len = data->length;

	int ret;



	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_siwessid(dev, info, data, ssid);



	/* iwconfig uses nul termination in SSID.. */

	if (len > 0 && ssid[len - 1] == '\0')

		len--;



	if (sdata->vif.type == NL80211_IFTYPE_STATION) {

		if (data->flags)

			sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_SSID_SEL;

		else

			sdata->u.mgd.flags |= IEEE80211_STA_AUTO_SSID_SEL;



		ret = ieee80211_sta_set_ssid(sdata, ssid, len);

		if (ret)

			return ret;



		sdata->u.mgd.flags &= ~IEEE80211_STA_EXT_SME;

		sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT;

		ieee80211_sta_req_auth(sdata);

		return 0;

	}

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return cfg80211_mgd_wext_siwessid(dev, info, data, ssid);



	return -EOPNOTSUPP;

}
@@ -162,23 +115,14 @@ static int ieee80211_ioctl_giwessid(struct net_device *dev, 
				    struct iw_request_info *info,

				    struct iw_point *data, char *ssid)

{

	size_t len;

	struct ieee80211_sub_if_data *sdata;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_giwessid(dev, info, data, ssid);



	if (sdata->vif.type == NL80211_IFTYPE_STATION) {

		int res = ieee80211_sta_get_ssid(sdata, ssid, &len);

		if (res == 0) {

			data->length = len;

			data->flags = 1;

		} else

			data->flags = 0;

		return res;

	}

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return cfg80211_mgd_wext_giwessid(dev, info, data, ssid);



	return -EOPNOTSUPP;

}
@@ -193,24 +137,10 @@ static int ieee80211_ioctl_siwap(struct net_device *dev, 
	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_siwap(dev, info, ap_addr, extra);



	if (sdata->vif.type == NL80211_IFTYPE_STATION) {

		int ret;

	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);



		if (is_zero_ether_addr((u8 *) &ap_addr->sa_data))

			sdata->u.mgd.flags |= IEEE80211_STA_AUTO_BSSID_SEL |

				IEEE80211_STA_AUTO_CHANNEL_SEL;

		else if (is_broadcast_ether_addr((u8 *) &ap_addr->sa_data))

			sdata->u.mgd.flags |= IEEE80211_STA_AUTO_BSSID_SEL;

		else

			sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_BSSID_SEL;

		ret = ieee80211_sta_set_bssid(sdata, (u8 *) &ap_addr->sa_data);

		if (ret)

			return ret;

		sdata->u.mgd.flags &= ~IEEE80211_STA_EXT_SME;

		sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT;

		ieee80211_sta_req_auth(sdata);

		return 0;

	} else if (sdata->vif.type == NL80211_IFTYPE_WDS) {

	if (sdata->vif.type == NL80211_IFTYPE_WDS) {

		/*

		 * If it is necessary to update the WDS peer address

		 * while the interface is running, then we need to do
@@ -240,14 +170,10 @@ static int ieee80211_ioctl_giwap(struct net_device *dev, 
	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_giwap(dev, info, ap_addr, extra);



	if (sdata->vif.type == NL80211_IFTYPE_STATION) {

		if (sdata->u.mgd.state == IEEE80211_STA_MLME_ASSOCIATED) {

			ap_addr->sa_family = ARPHRD_ETHER;

			memcpy(&ap_addr->sa_data, sdata->u.mgd.bssid, ETH_ALEN);

		} else

			memset(&ap_addr->sa_data, 0, ETH_ALEN);

		return 0;

	} else if (sdata->vif.type == NL80211_IFTYPE_WDS) {

	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);



	if (sdata->vif.type == NL80211_IFTYPE_WDS) {

		ap_addr->sa_family = ARPHRD_ETHER;

		memcpy(&ap_addr->sa_data, sdata->u.wds.remote_addr, ETH_ALEN);

		return 0;
@@ -395,85 +321,6 @@ static int ieee80211_ioctl_giwpower(struct net_device *dev, 
	return 0;

}



static int ieee80211_ioctl_siwauth(struct net_device *dev,

				   struct iw_request_info *info,

				   struct iw_param *data, char *extra)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	int ret = 0;



	switch (data->flags & IW_AUTH_INDEX) {

	case IW_AUTH_WPA_VERSION:

	case IW_AUTH_CIPHER_GROUP:

	case IW_AUTH_WPA_ENABLED:

	case IW_AUTH_RX_UNENCRYPTED_EAPOL:

	case IW_AUTH_KEY_MGMT:

	case IW_AUTH_CIPHER_GROUP_MGMT:

		break;

	case IW_AUTH_CIPHER_PAIRWISE:

		if (sdata->vif.type == NL80211_IFTYPE_STATION) {

			if (data->value & (IW_AUTH_CIPHER_WEP40 |

			    IW_AUTH_CIPHER_WEP104 | IW_AUTH_CIPHER_TKIP))

				sdata->u.mgd.flags |=

					IEEE80211_STA_TKIP_WEP_USED;

			else

				sdata->u.mgd.flags &=

					~IEEE80211_STA_TKIP_WEP_USED;

		}

		break;

	case IW_AUTH_DROP_UNENCRYPTED:

		sdata->drop_unencrypted = !!data->value;

		break;

	case IW_AUTH_PRIVACY_INVOKED:

		if (sdata->vif.type != NL80211_IFTYPE_STATION)

			ret = -EINVAL;

		else {

			sdata->u.mgd.flags &= ~IEEE80211_STA_PRIVACY_INVOKED;

			/*

			 * Privacy invoked by wpa_supplicant, store the

			 * value and allow associating to a protected

			 * network without having a key up front.

			 */

			if (data->value)

				sdata->u.mgd.flags |=

					IEEE80211_STA_PRIVACY_INVOKED;

		}

		break;

	case IW_AUTH_80211_AUTH_ALG:

		if (sdata->vif.type == NL80211_IFTYPE_STATION)

			sdata->u.mgd.auth_algs = data->value;

		else

			ret = -EOPNOTSUPP;

		break;

	case IW_AUTH_MFP:

		if (!(sdata->local->hw.flags & IEEE80211_HW_MFP_CAPABLE)) {

			ret = -EOPNOTSUPP;

			break;

		}

		if (sdata->vif.type == NL80211_IFTYPE_STATION) {

			switch (data->value) {

			case IW_AUTH_MFP_DISABLED:

				sdata->u.mgd.mfp = IEEE80211_MFP_DISABLED;

				break;

			case IW_AUTH_MFP_OPTIONAL:

				sdata->u.mgd.mfp = IEEE80211_MFP_OPTIONAL;

				break;

			case IW_AUTH_MFP_REQUIRED:

				sdata->u.mgd.mfp = IEEE80211_MFP_REQUIRED;

				break;

			default:

				ret = -EINVAL;

			}

		} else

			ret = -EOPNOTSUPP;

		break;

	default:

		ret = -EOPNOTSUPP;

		break;

	}

	return ret;

}



/* Get wireless statistics.  Called by /proc/net/wireless and by SIOCGIWSTATS */

static struct iw_statistics *ieee80211_get_wireless_stats(struct net_device *dev)

{
@@ -541,28 +388,6 @@ static struct iw_statistics *ieee80211_get_wireless_stats(struct net_device *dev 
	return wstats;

}



static int ieee80211_ioctl_giwauth(struct net_device *dev,

				   struct iw_request_info *info,

				   struct iw_param *data, char *extra)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	int ret = 0;



	switch (data->flags & IW_AUTH_INDEX) {

	case IW_AUTH_80211_AUTH_ALG:

		if (sdata->vif.type == NL80211_IFTYPE_STATION)

			data->value = sdata->u.mgd.auth_algs;

		else

			ret = -EOPNOTSUPP;

		break;

	default:

		ret = -EOPNOTSUPP;

		break;

	}

	return ret;

}





/* Structures to export the Wireless Handlers */



static const iw_handler ieee80211_handler[] =
@@ -615,10 +440,10 @@ static const iw_handler ieee80211_handler[] = 
	(iw_handler) ieee80211_ioctl_giwpower,		/* SIOCGIWPOWER */

	(iw_handler) NULL,				/* -- hole -- */

	(iw_handler) NULL,				/* -- hole -- */

	(iw_handler) ieee80211_ioctl_siwgenie,		/* SIOCSIWGENIE */

	(iw_handler) cfg80211_wext_siwgenie,		/* SIOCSIWGENIE */

	(iw_handler) NULL,				/* SIOCGIWGENIE */

	(iw_handler) ieee80211_ioctl_siwauth,		/* SIOCSIWAUTH */

	(iw_handler) ieee80211_ioctl_giwauth,		/* SIOCGIWAUTH */

	(iw_handler) cfg80211_wext_siwauth,		/* SIOCSIWAUTH */

	(iw_handler) cfg80211_wext_giwauth,		/* SIOCGIWAUTH */

	(iw_handler) cfg80211_wext_siwencodeext,	/* SIOCSIWENCODEEXT */

	(iw_handler) NULL,				/* SIOCGIWENCODEEXT */

	(iw_handler) NULL,				/* SIOCSIWPMKSA */

net/wireless/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o 


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

cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o

cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o

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



ccflags-y += -D__CHECK_ENDIAN__

net/wireless/core.c

+19 −4
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
#ifdef CONFIG_WIRELESS_EXT

		wdev->wext.default_key = -1;

		wdev->wext.default_mgmt_key = -1;

		wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;

#endif

		mutex_unlock(&rdev->devlist_mtx);

		break;
@@ -565,8 +566,13 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
			cfg80211_leave_ibss(rdev, dev, true);

			break;

		case NL80211_IFTYPE_STATION:

#ifdef CONFIG_WIRELESS_EXT

			kfree(wdev->wext.ie);

			wdev->wext.ie = NULL;

			wdev->wext.ie_len = 0;

#endif

			cfg80211_disconnect(rdev, dev,

					    WLAN_REASON_DEAUTH_LEAVING);

					    WLAN_REASON_DEAUTH_LEAVING, true);

			break;

		default:

			break;
@@ -578,11 +584,20 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
		break;

	case NETDEV_UP:

#ifdef CONFIG_WIRELESS_EXT

		if (wdev->iftype != NL80211_IFTYPE_ADHOC)

		switch (wdev->iftype) {

		case NL80211_IFTYPE_ADHOC:

			if (wdev->wext.ibss.ssid_len)

				cfg80211_join_ibss(rdev, dev,

						   &wdev->wext.ibss);

			break;

		if (!wdev->wext.ibss.ssid_len)

		case NL80211_IFTYPE_STATION:

			if (wdev->wext.connect.ssid_len)

				cfg80211_connect(rdev, dev,

						 &wdev->wext.connect);

			break;

		default:

			break;

		cfg80211_join_ibss(rdev, dev, &wdev->wext.ibss);

		}

#endif

		break;

	case NETDEV_UNREGISTER: