Staging: rt3070: remove CONFIG_STA_SUPPORT ifdefs

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 20 deletions

diff --git a/drivers/staging/rt3070/oid.h b/drivers/staging/rt3070/oid.h
index a7fc23809f5..506f3c122a8 100644
--- a/drivers/staging/rt3070/oid.h
+++ b/drivers/staging/rt3070/oid.h
@@ -387,9 +387,6 @@ typedef struct PACKED _RADIUS_CONF
         RADIUS_KEY_INFO RadiusInfo[8/*MAX_MBSSID_NUM*/];
 } RADIUS_CONF, *PRADIUS_CONF;
 
-
-
-#ifdef CONFIG_STA_SUPPORT
 // Key mapping keys require a BSSID
 typedef struct _NDIS_802_11_KEY
 {
@@ -400,7 +397,6 @@ typedef struct _NDIS_802_11_KEY
     NDIS_802_11_KEY_RSC KeyRSC;
     UCHAR           KeyMaterial[1];     // variable length depending on above field
 } NDIS_802_11_KEY, *PNDIS_802_11_KEY;
-#endif // CONFIG_STA_SUPPORT //
 
 typedef struct _NDIS_802_11_REMOVE_KEY
 {
@@ -615,7 +611,6 @@ typedef enum _NDIS_802_11_MEDIA_STREAM_MODE
 // PMKID Structures
 typedef UCHAR   NDIS_802_11_PMKID_VALUE[16];
 
-#ifdef CONFIG_STA_SUPPORT
 typedef struct _BSSID_INFO
 {
     NDIS_802_11_MAC_ADDRESS BSSID;
@@ -628,8 +623,6 @@ typedef struct _NDIS_802_11_PMKID
     UINT    BSSIDInfoCount;
     BSSID_INFO BSSIDInfo[1];
 } NDIS_802_11_PMKID, *PNDIS_802_11_PMKID;
-#endif // CONFIG_STA_SUPPORT //
-
 
 typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION
 {
@@ -653,7 +646,6 @@ typedef struct _NDIS_802_11_CAPABILITY
 #define SIOCIWFIRSTPRIV                                                         SIOCDEVPRIVATE
 #endif
 
-#ifdef CONFIG_STA_SUPPORT
 #define RT_PRIV_IOCTL_EXT                                                       (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon
 #define RTPRIV_IOCTL_SET                                                        (SIOCIWFIRSTPRIV + 0x02)
 
@@ -686,11 +678,6 @@ enum {
         SHOW_CFG_VALUE = 20,
 };
 
-
-#endif // CONFIG_STA_SUPPORT //
-
-
-
 #define OID_802_11_BUILD_CHANNEL_EX                             0x0714
 #define OID_802_11_GET_CH_LIST                                  0x0715
 #define OID_802_11_GET_COUNTRY_CODE                             0x0716
@@ -698,7 +685,6 @@ enum {
 
 //#define RT_OID_802_11_STATISTICS              (OID_GET_SET_TOGGLE | OID_802_11_STATISTICS)
 
-#ifdef CONFIG_STA_SUPPORT
 #define RT_OID_WSC_SET_PASSPHRASE                   0x0740 // passphrase for wpa(2)-psk
 #define RT_OID_WSC_DRIVER_AUTO_CONNECT              0x0741
 #define RT_OID_WSC_QUERY_DEFAULT_PROFILE            0x0742
@@ -709,7 +695,7 @@ enum {
 #define RT_OID_WSC_SET_MODE                         0x0747 // PIN or PBC
 #define RT_OID_WSC_SET_CONF_MODE                    0x0748 // Enrollee or Registrar
 #define RT_OID_WSC_SET_PROFILE                      0x0749
-#endif // CONFIG_STA_SUPPORT //
+
 #define RT_OID_802_11_WSC_QUERY_PROFILE                         0x0750
 // for consistency with RT61
 #define RT_OID_WSC_QUERY_STATUS                                         0x0751
@@ -948,7 +934,6 @@ typedef struct _RT_LLTD_ASSOICATION_TABLE {
 } RT_LLTD_ASSOICATION_TABLE, *PRT_LLTD_ASSOICATION_TABLE;
 #endif // LLTD_SUPPORT //
 
-#ifdef CONFIG_STA_SUPPORT
 #ifdef WPA_SUPPLICANT_SUPPORT
 #ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
 #define RT_ASSOC_EVENT_FLAG                         0x0101
@@ -961,19 +946,15 @@ typedef struct _RT_LLTD_ASSOICATION_TABLE {
 #define RT_INTERFACE_UP                             0x0108
 #endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
 #endif // WPA_SUPPLICANT_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
-
 
 #define MAX_CUSTOM_LEN 128
 
-#ifdef CONFIG_STA_SUPPORT
 typedef enum _RT_802_11_D_CLIENT_MODE
 {
    Rt802_11_D_None,
    Rt802_11_D_Flexible,
    Rt802_11_D_Strict,
 } RT_802_11_D_CLIENT_MODE, *PRT_802_11_D_CLIENT_MODE;
-#endif // CONFIG_STA_SUPPORT //
 
 typedef struct _RT_CHANNEL_LIST_INFO
 {