summaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-07 03:56:10 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:02:32 -0400
commit4f5dadcebb55fccef34722bbbf6401d39124c8a4 (patch)
treec29d44d5e5605db36c28cb3052a238bbe45bf77e /net/wireless/nl80211.c
parent4d0c8aead32ecdbe1310ad473b3637991f560865 (diff)
cfg80211: fix MFP bug, sparse warnings
sparse warns about a number of things, and one of them (use_mfp shadowed variable) actually is a bug, fix all of them. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index df22048419e..4976eac888a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3239,11 +3239,11 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
}
if (info->attrs[NL80211_ATTR_USE_MFP]) {
- enum nl80211_mfp use_mfp =
+ enum nl80211_mfp mfp =
nla_get_u32(info->attrs[NL80211_ATTR_USE_MFP]);
- if (use_mfp == NL80211_MFP_REQUIRED)
+ if (mfp == NL80211_MFP_REQUIRED)
use_mfp = true;
- else if (use_mfp != NL80211_MFP_NO) {
+ else if (mfp != NL80211_MFP_NO) {
err = -EINVAL;
goto out;
}