Commit fdfacf0a authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

mac80211: 802.11w - Configuration of MFP disabled/optional/required 



Add new WEXT IW_AUTH_* parameter for setting MFP
disabled/optional/required.

Signed-off-by: default avatarJouni Malinen <j@w1.fi>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 22787dba

include/linux/wireless.h

+6 −0
Original line number Diff line number Diff line
@@ -578,6 +578,7 @@ 
#define IW_AUTH_ROAMING_CONTROL		9

#define IW_AUTH_PRIVACY_INVOKED		10

#define IW_AUTH_CIPHER_GROUP_MGMT	11

#define IW_AUTH_MFP			12



/* IW_AUTH_WPA_VERSION values (bit field) */

#define IW_AUTH_WPA_VERSION_DISABLED	0x00000001
@@ -607,6 +608,11 @@ 
#define IW_AUTH_ROAMING_DISABLE	1	/* user space program used for roaming

					 * control */



/* IW_AUTH_MFP (management frame protection) values */

#define IW_AUTH_MFP_DISABLED	0	/* MFP disabled */

#define IW_AUTH_MFP_OPTIONAL	1	/* MFP optional */

#define IW_AUTH_MFP_REQUIRED	2	/* MFP required */



/* SIOCSIWENCODEEXT definitions */

#define IW_ENCODE_SEQ_MAX_SIZE	8

/* struct iw_encode_ext ->alg */

net/mac80211/ieee80211_i.h

+6 −0
Original line number Diff line number Diff line
@@ -320,6 +320,12 @@ struct ieee80211_if_sta { 
	int auth_alg; /* currently used IEEE 802.11 authentication algorithm */

	int auth_transaction;



	enum {

		IEEE80211_MFP_DISABLED,

		IEEE80211_MFP_OPTIONAL,

		IEEE80211_MFP_REQUIRED

	} mfp; /* management frame protection */



	unsigned long ibss_join_req;

	struct sk_buff *probe_resp; /* ProbeResp template for IBSS */

	u32 supp_rates_bits[IEEE80211_NUM_BANDS];

net/mac80211/mlme.c

+4 −0
Original line number Diff line number Diff line
@@ -2317,6 +2317,10 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata, 
					       selected->ssid_len);

		ieee80211_sta_set_bssid(sdata, selected->bssid);

		ieee80211_sta_def_wmm_params(sdata, selected);

		if (sdata->u.sta.mfp == IEEE80211_MFP_REQUIRED)

			sdata->u.sta.flags |= IEEE80211_STA_MFP_ENABLED;

		else

			sdata->u.sta.flags &= ~IEEE80211_STA_MFP_ENABLED;



		/* Send out direct probe if no probe resp was received or

		 * the one we have is outdated

net/mac80211/wext.c

+7 −0
Original line number Diff line number Diff line
@@ -975,6 +975,13 @@ static int ieee80211_ioctl_siwauth(struct net_device *dev, 
		else

			ret = -EOPNOTSUPP;

		break;

	case IW_AUTH_MFP:

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

		    sdata->vif.type == NL80211_IFTYPE_ADHOC)

			sdata->u.sta.mfp = data->value;

		else

			ret = -EOPNOTSUPP;

		break;

	default:

		ret = -EOPNOTSUPP;

		break;