43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Mon, 9 Jun 2014 15:15:55 +0200
|
|
Subject: [003/249] staging: rtl8723au: rtw_mlme.c: Convert rtw_get_wps_ie23a()
|
|
to cfg80211_find_vendor_ie()
|
|
Origin: https://git.kernel.org/linus/9c40e1230ec57a8ff7261681feeec6cbe72bbfb2
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/rtl8723au/core/rtw_mlme.c | 13 ++++++-------
|
|
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
index f292fce..0b9fd3a 100644
|
|
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
@@ -588,19 +588,18 @@ static int rtw_is_desired_network(struct rtw_adapter *adapter,
|
|
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
|
u32 desired_encmode;
|
|
u32 privacy;
|
|
-
|
|
- /* u8 wps_ie[512]; */
|
|
- uint wps_ielen;
|
|
-
|
|
int bselected = true;
|
|
|
|
desired_encmode = psecuritypriv->ndisencryptstatus;
|
|
privacy = pnetwork->network.Privacy;
|
|
|
|
if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) {
|
|
- if (rtw_get_wps_ie23a(pnetwork->network.IEs + _FIXED_IE_LENGTH_,
|
|
- pnetwork->network.IELength -
|
|
- _FIXED_IE_LENGTH_, &wps_ielen))
|
|
+ if (cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
|
|
+ WLAN_OUI_TYPE_MICROSOFT_WPA,
|
|
+ pnetwork->network.IEs +
|
|
+ _FIXED_IE_LENGTH_,
|
|
+ pnetwork->network.IELength -
|
|
+ _FIXED_IE_LENGTH_))
|
|
return true;
|
|
else
|
|
return false;
|