2 files changed, 11 insertions, 1 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index d543cf152100..df82a5c9faee 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5932,6 +5932,15 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
                 connect.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
         }
 
+        if (info->attrs[NL80211_ATTR_USE_MFP]) {
+                connect.mfp = nla_get_u32(info->attrs[NL80211_ATTR_USE_MFP]);
+                if (connect.mfp != NL80211_MFP_REQUIRED &&
+                    connect.mfp != NL80211_MFP_NO)
+                        return -EINVAL;
+        } else {
+                connect.mfp = NL80211_MFP_NO;
+        }
+
         if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
                 connect.channel =
                         ieee80211_get_channel(wiphy,
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index d2d26518cdd7..a825dfe12cf7 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -192,7 +192,8 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
                                             prev_bssid,
                                             params->ssid, params->ssid_len,
                                             params->ie, params->ie_len,
-                                            false, &params->crypto,
+                                            params->mfp != NL80211_MFP_NO,
+                                            &params->crypto,
                                             params->flags, &params->ht_capa,
                                             &params->ht_capa_mask);
                 if (err)