staging: rtl8723au: rtw_mlme.c: Convert rtw_get_wps_ie23a() to cfg80211_find_vendor_ie()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index f292fce8ad1f892715b9f2dc1efecacaaa2b2445..0b9fd3a915986e0b20d7d5f1ca6818e55c3936dc 100644 (file)
--- 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;