diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-06-09 15:16:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-18 13:51:47 -0700 |
| commit | 77953edfac8dfc2c5b0d2007fdc64839c736e7a1 (patch) | |
| tree | be851156c9f89a006c210751bf2b289a5c48a32d | |
| parent | 54ddd2266a429e801382a32733177ec33384c8a0 (diff) | |
staging: rtl8723au: rtw_wlan_util.c: Use cfg80211_* to determine crypto
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_wlan_util.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c index 82904d067b2e..043ba40fadf0 100644 --- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c @@ -887,7 +887,6 @@ int rtw_check_bcn_info23a(struct rtw_adapter *Adapter, struct ieee80211_ht_operation *pht_info; struct wlan_bssid_ex *bssid; unsigned short val16; - u16 wpa_len = 0, rsn_len = 0; u8 encryp_protocol; int group_cipher = 0, pairwise_cipher = 0, is_8021x = 0, r; u32 bcn_channel; @@ -1009,14 +1008,14 @@ int rtw_check_bcn_info23a(struct rtw_adapter *Adapter, goto _mismatch; } - rtw_get_sec_ie23a(bssid->IEs, bssid->IELength, NULL, &rsn_len, NULL, - &wpa_len); - - if (rsn_len > 0) + p = cfg80211_find_ie(WLAN_EID_RSN, pie, pie_len); + if (p && p[1]) { encryp_protocol = ENCRYP_PROTOCOL_WPA2; - else if (wpa_len > 0) + } else if (cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT, + WLAN_OUI_TYPE_MICROSOFT_WPA, + pie, pie_len)) { encryp_protocol = ENCRYP_PROTOCOL_WPA; - else { + } else { if (bssid->Privacy) encryp_protocol = ENCRYP_PROTOCOL_WEP; else |