aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/sme.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2013-01-15 17:15:57 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-01-16 23:27:49 +0100
commitcee00a959c0a86571e6f99cf42f0261d7e54d2ae (patch)
treeca8fe105ffd7059ef4f4eaf33197ba0b9a7acb9c /net/wireless/sme.c
parentnl80211: allow user-space to set address for P2P_DEVICE (diff)
downloadlinux-dev-cee00a959c0a86571e6f99cf42f0261d7e54d2ae.tar.xz
linux-dev-cee00a959c0a86571e6f99cf42f0261d7e54d2ae.zip
cfg80211: Allow use_mfp to be specified with the connect command
The NL80211_ATTR_USE_MFP attribute was originally added for NL80211_CMD_ASSOCIATE, but it is actually as useful (if not even more useful) with NL80211_CMD_CONNECT, so process that attribute with the connect command, too. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r--net/wireless/sme.c3
1 files changed, 2 insertions, 1 deletions
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)