staging: r8188eu: Remove _func_enter and _func_exit macros

[sfrench/cifs-2.6.git] / drivers / staging / rtl8188eu / core / rtw_wlan_util.c

diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 153ec61493ab6ef94a4ec71f886b8a700ecad4ad..f64b9795a712f6fd7103a7bfe7020bdb2fd6e7f9 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -912,12 +912,12 @@ int rtw_check_bcn_info(struct adapter  *Adapter, u8 *pframe, u32 packet_len)
        unsigned char *pbuf;
        u32 wpa_ielen = 0;
        u8 *pbssid = GetAddr3Ptr(pframe);
-       u32 hidden_ssid = 0;
        struct HT_info_element *pht_info = NULL;
        struct rtw_ieee80211_ht_cap *pht_cap = NULL;
        u32 bcn_channel;
        unsigned short  ht_cap_info;
        unsigned char   ht_info_infos_0;
+       int ssid_len;
 
        if (is_client_associated_to_ap(Adapter) == false)
                return true;
@@ -929,7 +929,7 @@ int rtw_check_bcn_info(struct adapter  *Adapter, u8 *pframe, u32 packet_len)
                return _FAIL;
        }
 
-       if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == false) {
+       if (!memcmp(cur_network->network.MacAddress, pbssid, 6) == false) {
                DBG_88E("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n%pM %pM\n",
                        (pbssid), (cur_network->network.MacAddress));
                return true;
@@ -999,28 +999,22 @@ int rtw_check_bcn_info(struct adapter  *Adapter, u8 *pframe, u32 packet_len)
        }
 
        /* checking SSID */
+       ssid_len = 0;
        p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);
-       if (p == NULL) {
-               DBG_88E("%s marc: cannot find SSID for survey event\n", __func__);
-               hidden_ssid = true;
-       } else {
-               hidden_ssid = false;
-       }
-
-       if ((NULL != p) && (false == hidden_ssid && (*(p + 1)))) {
-               memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1));
-               bssid->Ssid.SsidLength = *(p + 1);
-       } else {
-               bssid->Ssid.SsidLength = 0;
-               bssid->Ssid.Ssid[0] = '\0';
+       if (p) {
+               ssid_len = *(p + 1);
+               if (ssid_len > NDIS_802_11_LENGTH_SSID)
+                       ssid_len = 0;
        }
+       memcpy(bssid->Ssid.Ssid, (p + 2), ssid_len);
+       bssid->Ssid.SsidLength = ssid_len;
 
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s bssid.Ssid.Ssid:%s bssid.Ssid.SsidLength:%d "
                                "cur_network->network.Ssid.Ssid:%s len:%d\n", __func__, bssid->Ssid.Ssid,
                                bssid->Ssid.SsidLength, cur_network->network.Ssid.Ssid,
                                cur_network->network.Ssid.SsidLength));
 
-       if (!_rtw_memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) ||
+       if (memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) ||
            bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) {
                if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */
                        DBG_88E("%s(), SSID is not match return FAIL\n", __func__);
@@ -1096,12 +1090,10 @@ int rtw_check_bcn_info(struct adapter  *Adapter, u8 *pframe, u32 packet_len)
        }
 
        kfree(bssid);
-       _func_exit_;
        return _SUCCESS;
 
 _mismatch:
        kfree(bssid);
-       _func_exit_;
        return _FAIL;
 }
 
@@ -1147,11 +1139,11 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
 
                        switch (pIE->ElementID) {
                        case _VENDOR_SPECIFIC_IE_:
-                               if ((_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) && (_rtw_memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4)))
+                               if ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) && (!memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4)))
                                        return true;
                                break;
                        case _RSN_IE_2_:
-                               if (_rtw_memcmp((pIE->data + 8), RSN_TKIP_CIPHER, 4))
+                               if (!memcmp((pIE->data + 8), RSN_TKIP_CIPHER, 4))
                                        return true;
                        default:
                                break;
@@ -1178,14 +1170,14 @@ unsigned int should_forbid_n_rate(struct adapter *padapter)
 
                        switch (pIE->ElementID) {
                        case _VENDOR_SPECIFIC_IE_:
-                               if (_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4) &&
-                                   ((_rtw_memcmp((pIE->data + 12), WPA_CIPHER_SUITE_CCMP, 4)) ||
-                                   (_rtw_memcmp((pIE->data + 16), WPA_CIPHER_SUITE_CCMP, 4))))
+                               if (!memcmp(pIE->data, RTW_WPA_OUI, 4) &&
+                                   ((!memcmp((pIE->data + 12), WPA_CIPHER_SUITE_CCMP, 4)) ||
+                                   (!memcmp((pIE->data + 16), WPA_CIPHER_SUITE_CCMP, 4))))
                                        return false;
                                break;
                        case _RSN_IE_2_:
-                               if  ((_rtw_memcmp((pIE->data + 8), RSN_CIPHER_SUITE_CCMP, 4))  ||
-                                      (_rtw_memcmp((pIE->data + 12), RSN_CIPHER_SUITE_CCMP, 4)))
+                               if  ((!memcmp((pIE->data + 8), RSN_CIPHER_SUITE_CCMP, 4))  ||
+                                      (!memcmp((pIE->data + 12), RSN_CIPHER_SUITE_CCMP, 4)))
                                        return false;
                        default:
                                break;
@@ -1214,7 +1206,7 @@ unsigned int is_ap_in_wep(struct adapter *padapter)
 
                        switch (pIE->ElementID) {
                        case _VENDOR_SPECIFIC_IE_:
-                               if (_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4))
+                               if (!memcmp(pIE->data, RTW_WPA_OUI, 4))
                                        return false;
                                break;
                        case _RSN_IE_2_:
@@ -1406,35 +1398,35 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
 
                switch (pIE->ElementID) {
                case _VENDOR_SPECIFIC_IE_:
-                       if ((_rtw_memcmp(pIE->data, ARTHEROS_OUI1, 3)) ||
-                           (_rtw_memcmp(pIE->data, ARTHEROS_OUI2, 3))) {
+                       if ((!memcmp(pIE->data, ARTHEROS_OUI1, 3)) ||
+                           (!memcmp(pIE->data, ARTHEROS_OUI2, 3))) {
                                DBG_88E("link to Artheros AP\n");
                                return HT_IOT_PEER_ATHEROS;
-                       } else if ((_rtw_memcmp(pIE->data, BROADCOM_OUI1, 3)) ||
-                                  (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3)) ||
-                                  (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3))) {
+                       } else if ((!memcmp(pIE->data, BROADCOM_OUI1, 3)) ||
+                                  (!memcmp(pIE->data, BROADCOM_OUI2, 3)) ||
+                                  (!memcmp(pIE->data, BROADCOM_OUI2, 3))) {
                                DBG_88E("link to Broadcom AP\n");
                                return HT_IOT_PEER_BROADCOM;
-                       } else if (_rtw_memcmp(pIE->data, MARVELL_OUI, 3)) {
+                       } else if (!memcmp(pIE->data, MARVELL_OUI, 3)) {
                                DBG_88E("link to Marvell AP\n");
                                return HT_IOT_PEER_MARVELL;
-                       } else if (_rtw_memcmp(pIE->data, RALINK_OUI, 3)) {
+                       } else if (!memcmp(pIE->data, RALINK_OUI, 3)) {
                                if (!ralink_vendor_flag) {
                                        ralink_vendor_flag = 1;
                                } else {
                                        DBG_88E("link to Ralink AP\n");
                                        return HT_IOT_PEER_RALINK;
                                }
-                       } else if (_rtw_memcmp(pIE->data, CISCO_OUI, 3)) {
+                       } else if (!memcmp(pIE->data, CISCO_OUI, 3)) {
                                DBG_88E("link to Cisco AP\n");
                                return HT_IOT_PEER_CISCO;
-                       } else if (_rtw_memcmp(pIE->data, REALTEK_OUI, 3)) {
+                       } else if (!memcmp(pIE->data, REALTEK_OUI, 3)) {
                                DBG_88E("link to Realtek 96B\n");
                                return HT_IOT_PEER_REALTEK;
-                       } else if (_rtw_memcmp(pIE->data, AIRGOCAP_OUI, 3)) {
+                       } else if (!memcmp(pIE->data, AIRGOCAP_OUI, 3)) {
                                DBG_88E("link to Airgo Cap\n");
                                return HT_IOT_PEER_AIRGO;
-                       } else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3)) {
+                       } else if (!memcmp(pIE->data, EPIGRAM_OUI, 3)) {
                                epigram_vendor_flag = 1;
                                if (ralink_vendor_flag) {
                                        DBG_88E("link to Tenda W311R AP\n");