staging: rtl8723au: Remove redundant checks of WPA OUI
authorJes Sorensen <Jes.Sorensen@redhat.com>
Sat, 26 Apr 2014 16:55:45 +0000 (18:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Apr 2014 17:16:21 +0000 (10:16 -0700)
All callers get here by searching for the WPA OUI first, so no point
checking for it once we get here.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/core/rtw_ieee80211.c

index 7c899d8..b56055e 100644 (file)
@@ -503,11 +503,8 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int
                return _FAIL;
        }
 
-       if ((*wpa_ie != WLAN_EID_VENDOR_SPECIFIC) ||
-           (*(wpa_ie+1) != (u8)(wpa_ie_len - 2)) ||
-           memcmp(wpa_ie + 2, RTW_WPA_OUI23A_TYPE, WPA_SELECTOR_LEN)) {
+       if (wpa_ie[1] != (u8)(wpa_ie_len - 2))
                return _FAIL;
-       }
 
        pos = wpa_ie;