diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2013-01-15 19:15:57 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-17 02:27:49 +0400 |
| commit | cee00a959c0a86571e6f99cf42f0261d7e54d2ae (patch) | |
| tree | ca8fe105ffd7059ef4f4eaf33197ba0b9a7acb9c /net/wireless/nl80211.c | |
| parent | 1c18f1452a772dfe884ed25677bddb3ecaf9c43a (diff) | |
| download | linux-cee00a959c0a86571e6f99cf42f0261d7e54d2ae.tar.xz | |
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/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 9 |
1 files changed, 9 insertions, 0 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, |