leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8723au: rtw_cfg80211_set_wpa_ie(): Use cfg80211_ API

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-15 19:44:07 +02:00 committed by Greg Kroah-Hartman
parent f88ca60404
commit 58aedb498f
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
View File

@ -1686,9 +1686,7 @@ static int rtw_cfg80211_set_wpa_ie(struct rtw_adapter *padapter, const u8 *pie,
u8 *buf = NULL, *pos = NULL;
int group_cipher = 0, pairwise_cipher = 0;
int ret = 0;
int wpa_ielen = 0;
int wpa2_ielen = 0;
u8 *pwpa, *pwpa2;
const u8 *pwpa, *pwpa2;
int i;
if (!pie || !ielen) {
@ -1723,33 +1721,35 @@ static int rtw_cfg80211_set_wpa_ie(struct rtw_adapter *padapter, const u8 *pie,
goto exit;
}
pwpa = rtw_get_wpa_ie23a(buf, &wpa_ielen, ielen);
if (pwpa && wpa_ielen > 0) {
if (rtw_parse_wpa_ie23a(pwpa, wpa_ielen + 2, &group_cipher,
pwpa = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
WLAN_OUI_TYPE_MICROSOFT_WPA,
buf, ielen);
if (pwpa && pwpa[1] > 0) {
if (rtw_parse_wpa_ie23a(pwpa, pwpa[1] + 2, &group_cipher,
&pairwise_cipher, NULL) == _SUCCESS) {
padapter->securitypriv.dot11AuthAlgrthm =
dot11AuthAlgrthm_8021X;
padapter->securitypriv.ndisauthtype =
Ndis802_11AuthModeWPAPSK;
memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0],
wpa_ielen + 2);
memcpy(padapter->securitypriv.supplicant_ie, pwpa,
pwpa[1] + 2);
DBG_8723A("got wpa_ie, wpa_ielen:%u\n", wpa_ielen);
DBG_8723A("got wpa_ie, wpa_ielen:%u\n", pwpa[1]);
}
}
pwpa2 = rtw_get_wpa2_ie23a(buf, &wpa2_ielen, ielen);
if (pwpa2 && wpa2_ielen > 0) {
if (rtw_parse_wpa2_ie23a (pwpa2, wpa2_ielen + 2, &group_cipher,
pwpa2 = cfg80211_find_ie(WLAN_EID_RSN, buf, ielen);
if (pwpa2 && pwpa2[1] > 0) {
if (rtw_parse_wpa2_ie23a (pwpa2, pwpa2[1] + 2, &group_cipher,
&pairwise_cipher, NULL) == _SUCCESS) {
padapter->securitypriv.dot11AuthAlgrthm =
dot11AuthAlgrthm_8021X;
padapter->securitypriv.ndisauthtype =
Ndis802_11AuthModeWPA2PSK;
memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0],
wpa2_ielen + 2);
memcpy(padapter->securitypriv.supplicant_ie, pwpa2,
pwpa2[1] + 2);
DBG_8723A("got wpa2_ie, wpa2_ielen:%u\n", wpa2_ielen);
DBG_8723A("got wpa2_ie, wpa2_ielen:%u\n", pwpa2[1]);
}
}