diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/nl80211.c | 6 | ||||
| -rw-r--r-- | net/wireless/wext-compat.c | 6 |
2 files changed, 6 insertions, 6 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; } diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 2c33cd83cfe..9d101d566bb 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -855,7 +855,7 @@ static int cfg80211_set_wpa_version(struct wireless_dev *wdev, u32 wpa_versions) return 0; } -int cfg80211_set_cipher_group(struct wireless_dev *wdev, u32 cipher) +static int cfg80211_set_cipher_group(struct wireless_dev *wdev, u32 cipher) { wdev->wext.connect.crypto.cipher_group = 0; @@ -880,7 +880,7 @@ int cfg80211_set_cipher_group(struct wireless_dev *wdev, u32 cipher) return 0; } -int cfg80211_set_cipher_pairwise(struct wireless_dev *wdev, u32 cipher) +static int cfg80211_set_cipher_pairwise(struct wireless_dev *wdev, u32 cipher) { int nr_ciphers = 0; u32 *ciphers_pairwise = wdev->wext.connect.crypto.ciphers_pairwise; @@ -918,7 +918,7 @@ int cfg80211_set_cipher_pairwise(struct wireless_dev *wdev, u32 cipher) } -int cfg80211_set_key_mgt(struct wireless_dev *wdev, u32 key_mgt) +static int cfg80211_set_key_mgt(struct wireless_dev *wdev, u32 key_mgt) { int nr_akm_suites = 0; |