From 50a22ddb02f443abc4c61c68ff83853737ae7bbb Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Thu, 8 Jan 2009 13:32:05 +0200
Subject: [PATCH] --- yaml --- r: 134103 b: refs/heads/master c:
 fdfacf0ae2e8339098b1164d2317b792d7662c0a h: refs/heads/master i:   134101:
 92951b23dc955cea4811341c63cbdc6b4de5f7d7   134099:
 7bbc073243267bf0f7503a6b2ffa269a7093ee8d   134095:
 e53fcc545c057f5b1c462dcd3b40a577d6f1b2cc v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/wireless.h   | 6 ++++++
 trunk/net/mac80211/ieee80211_i.h | 6 ++++++
 trunk/net/mac80211/mlme.c        | 4 ++++
 trunk/net/mac80211/wext.c        | 7 +++++++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1e92ede7436d..f69238eef054 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22787dbaa3b952602542506e0426ea6d5f104042
+refs/heads/master: fdfacf0ae2e8339098b1164d2317b792d7662c0a
diff --git a/trunk/include/linux/wireless.h b/trunk/include/linux/wireless.h
index 5d1f3fbffd77..cb24204851f7 100644
--- a/trunk/include/linux/wireless.h
+++ b/trunk/include/linux/wireless.h
@@ -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 */
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
index 8c3245717c55..212c732fbba7 100644
--- a/trunk/net/mac80211/ieee80211_i.h
+++ b/trunk/net/mac80211/ieee80211_i.h
@@ -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];
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index bc8a7f1a6a15..42c5f981c715 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -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
diff --git a/trunk/net/mac80211/wext.c b/trunk/net/mac80211/wext.c
index 7ba1d5ba3afa..2dd387495dfe 100644
--- a/trunk/net/mac80211/wext.c
+++ b/trunk/net/mac80211/wext.c
@@ -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;