mwifiex: scan: factor out has_ieee_hdr/has_vendor_hdr

Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index 99026cef3179d8045b02dd68b42846b3c4451949..e926d3ab728653322ee686f3ae8217ba718c5ed9 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -76,6 +76,18 @@ static u8 mwifiex_rsn_oui[CIPHER_SUITE_MAX][4] = {
        { 0x00, 0x0f, 0xac, 0x04 },     /* AES  */
 };
 
+static bool
+has_ieee_hdr(struct ieee_types_generic *ie, u8 key)
+{
+       return (ie && ie->ieee_hdr.element_id == key);
+}
+
+static bool
+has_vendor_hdr(struct ieee_types_vendor_specific *ie, u8 key)
+{
+       return (ie && ie->vend_hdr.element_id == key);
+}
+
 /*
  * This function parses a given IE for a given OUI.
  *
@@ -121,8 +133,7 @@ mwifiex_is_rsn_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
        struct ie_body *iebody;
        u8 ret = MWIFIEX_OUI_NOT_PRESENT;
 
-       if (bss_desc->bcn_rsn_ie &&
-           bss_desc->bcn_rsn_ie->ieee_hdr.element_id == WLAN_EID_RSN) {
+       if (has_ieee_hdr(bss_desc->bcn_rsn_ie, WLAN_EID_RSN)) {
                iebody = (struct ie_body *)
                         (((u8 *) bss_desc->bcn_rsn_ie->data) +
                          RSN_GTK_OUI_OFFSET);
@@ -148,9 +159,7 @@ mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
        struct ie_body *iebody;
        u8 ret = MWIFIEX_OUI_NOT_PRESENT;
 
-       if (bss_desc->bcn_wpa_ie &&
-           bss_desc->bcn_wpa_ie->vend_hdr.element_id ==
-           WLAN_EID_VENDOR_SPECIFIC) {
+       if (has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC)) {
                iebody = (struct ie_body *) bss_desc->bcn_wpa_ie->data;
                oui = &mwifiex_wpa_oui[cipher][0];
                ret = mwifiex_search_oui_in_ie(iebody, oui);
@@ -180,11 +189,8 @@ mwifiex_is_bss_wapi(struct mwifiex_private *priv,
                    struct mwifiex_bssdescriptor *bss_desc)
 {
        if (priv->sec_info.wapi_enabled &&
-           (bss_desc->bcn_wapi_ie &&
-            bss_desc->bcn_wapi_ie->ieee_hdr.element_id ==
-            WLAN_EID_BSS_AC_ACCESS_DELAY)) {
+           has_ieee_hdr(bss_desc->bcn_wapi_ie, WLAN_EID_BSS_AC_ACCESS_DELAY))
                return true;
-       }
        return false;
 }
 
@@ -198,11 +204,8 @@ mwifiex_is_bss_no_sec(struct mwifiex_private *priv,
 {
        if (!priv->sec_info.wep_enabled && !priv->sec_info.wpa_enabled &&
            !priv->sec_info.wpa2_enabled &&
-           (!bss_desc->bcn_wpa_ie ||
-            bss_desc->bcn_wpa_ie->vend_hdr.element_id !=
-            WLAN_EID_VENDOR_SPECIFIC) &&
-           (!bss_desc->bcn_rsn_ie ||
-            bss_desc->bcn_rsn_ie->ieee_hdr.element_id != WLAN_EID_RSN) &&
+           !has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC) &&
+           !has_ieee_hdr(bss_desc->bcn_rsn_ie, WLAN_EID_RSN) &&
            !priv->sec_info.encryption_mode && !bss_desc->privacy) {
                return true;
        }
@@ -234,9 +237,7 @@ mwifiex_is_bss_wpa(struct mwifiex_private *priv,
 {
        if (!priv->sec_info.wep_enabled && priv->sec_info.wpa_enabled &&
            !priv->sec_info.wpa2_enabled &&
-           (bss_desc->bcn_wpa_ie &&
-            bss_desc->bcn_wpa_ie->vend_hdr.element_id ==
-            WLAN_EID_VENDOR_SPECIFIC)
+           has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC)
           /*
            * Privacy bit may NOT be set in some APs like
            * LinkSys WRT54G && bss_desc->privacy
@@ -270,8 +271,7 @@ mwifiex_is_bss_wpa2(struct mwifiex_private *priv,
 {
        if (!priv->sec_info.wep_enabled && !priv->sec_info.wpa_enabled &&
            priv->sec_info.wpa2_enabled &&
-           (bss_desc->bcn_rsn_ie &&
-            bss_desc->bcn_rsn_ie->ieee_hdr.element_id == WLAN_EID_RSN)) {
+           has_ieee_hdr(bss_desc->bcn_rsn_ie, WLAN_EID_RSN)) {
                /*
                 * Privacy bit may NOT be set in some APs like
                 * LinkSys WRT54G && bss_desc->privacy
@@ -304,11 +304,8 @@ mwifiex_is_bss_adhoc_aes(struct mwifiex_private *priv,
 {
        if (!priv->sec_info.wep_enabled && !priv->sec_info.wpa_enabled &&
            !priv->sec_info.wpa2_enabled &&
-           (!bss_desc->bcn_wpa_ie ||
-            bss_desc->bcn_wpa_ie->vend_hdr.element_id !=
-            WLAN_EID_VENDOR_SPECIFIC) &&
-           (!bss_desc->bcn_rsn_ie ||
-            bss_desc->bcn_rsn_ie->ieee_hdr.element_id != WLAN_EID_RSN) &&
+           !has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC) &&
+           !has_ieee_hdr(bss_desc->bcn_rsn_ie, WLAN_EID_RSN) &&
            !priv->sec_info.encryption_mode && bss_desc->privacy) {
                return true;
        }
@@ -325,11 +322,8 @@ mwifiex_is_bss_dynamic_wep(struct mwifiex_private *priv,
 {
        if (!priv->sec_info.wep_enabled && !priv->sec_info.wpa_enabled &&
            !priv->sec_info.wpa2_enabled &&
-           (!bss_desc->bcn_wpa_ie ||
-            bss_desc->bcn_wpa_ie->vend_hdr.element_id !=
-            WLAN_EID_VENDOR_SPECIFIC) &&
-           (!bss_desc->bcn_rsn_ie ||
-            bss_desc->bcn_rsn_ie->ieee_hdr.element_id != WLAN_EID_RSN) &&
+           !has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC) &&
+           !has_ieee_hdr(bss_desc->bcn_rsn_ie, WLAN_EID_RSN) &&
            priv->sec_info.encryption_mode && bss_desc->privacy) {
                mwifiex_dbg(priv->adapter, INFO,
                            "info: %s: dynamic\t"