2 files changed, 20 insertions, 0 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d0ca6da33ca9..4e627cf2b8c1 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1253,6 +1253,14 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
         if (ret)
                 return ret;
 
+        if (req->use_mfp) {
+                sdata->u.mgd.mfp = IEEE80211_MFP_REQUIRED;
+                sdata->u.mgd.flags |= IEEE80211_STA_MFP_ENABLED;
+        } else {
+                sdata->u.mgd.mfp = IEEE80211_MFP_DISABLED;
+                sdata->u.mgd.flags &= ~IEEE80211_STA_MFP_ENABLED;
+        }
+
         sdata->u.mgd.flags |= IEEE80211_STA_EXT_SME;
         sdata->u.mgd.state = IEEE80211_STA_MLME_ASSOCIATE;
         ieee80211_sta_req_auth(sdata);
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 3c53c5cbc3a9..79927706937a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -122,6 +122,7 @@ static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = {
         [NL80211_ATTR_REASON_CODE] = { .type = NLA_U16 },
         [NL80211_ATTR_FREQ_FIXED] = { .type = NLA_FLAG },
         [NL80211_ATTR_TIMED_OUT] = { .type = NLA_FLAG },
+        [NL80211_ATTR_USE_MFP] = { .type = NLA_U32 },
 };
 
 /* IE validation */
@@ -3012,6 +3013,17 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
                 req.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
         }
 
+        if (info->attrs[NL80211_ATTR_USE_MFP]) {
+                enum nl80211_mfp use_mfp =
+                        nla_get_u32(info->attrs[NL80211_ATTR_USE_MFP]);
+                if (use_mfp == NL80211_MFP_REQUIRED)
+                        req.use_mfp = true;
+                else if (use_mfp != NL80211_MFP_NO) {
+                        err = -EINVAL;
+                        goto out;
+                }
+        }
+
         err = drv->ops->assoc(&drv->wiphy, dev, &req);
 
 out: