diff options
Diffstat (limited to 'drivers/staging/rt3070/oid.h')
-rw-r--r-- | drivers/staging/rt3070/oid.h | 21 |
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 | |||
387 | RADIUS_KEY_INFO RadiusInfo[8/*MAX_MBSSID_NUM*/]; | 387 | RADIUS_KEY_INFO RadiusInfo[8/*MAX_MBSSID_NUM*/]; |
388 | } RADIUS_CONF, *PRADIUS_CONF; | 388 | } RADIUS_CONF, *PRADIUS_CONF; |
389 | 389 | ||
390 | |||
391 | |||
392 | #ifdef CONFIG_STA_SUPPORT | ||
393 | // Key mapping keys require a BSSID | 390 | // Key mapping keys require a BSSID |
394 | typedef struct _NDIS_802_11_KEY | 391 | typedef struct _NDIS_802_11_KEY |
395 | { | 392 | { |
@@ -400,7 +397,6 @@ typedef struct _NDIS_802_11_KEY | |||
400 | NDIS_802_11_KEY_RSC KeyRSC; | 397 | NDIS_802_11_KEY_RSC KeyRSC; |
401 | UCHAR KeyMaterial[1]; // variable length depending on above field | 398 | UCHAR KeyMaterial[1]; // variable length depending on above field |
402 | } NDIS_802_11_KEY, *PNDIS_802_11_KEY; | 399 | } NDIS_802_11_KEY, *PNDIS_802_11_KEY; |
403 | #endif // CONFIG_STA_SUPPORT // | ||
404 | 400 | ||
405 | typedef struct _NDIS_802_11_REMOVE_KEY | 401 | typedef struct _NDIS_802_11_REMOVE_KEY |
406 | { | 402 | { |
@@ -615,7 +611,6 @@ typedef enum _NDIS_802_11_MEDIA_STREAM_MODE | |||
615 | // PMKID Structures | 611 | // PMKID Structures |
616 | typedef UCHAR NDIS_802_11_PMKID_VALUE[16]; | 612 | typedef UCHAR NDIS_802_11_PMKID_VALUE[16]; |
617 | 613 | ||
618 | #ifdef CONFIG_STA_SUPPORT | ||
619 | typedef struct _BSSID_INFO | 614 | typedef struct _BSSID_INFO |
620 | { | 615 | { |
621 | NDIS_802_11_MAC_ADDRESS BSSID; | 616 | NDIS_802_11_MAC_ADDRESS BSSID; |
@@ -628,8 +623,6 @@ typedef struct _NDIS_802_11_PMKID | |||
628 | UINT BSSIDInfoCount; | 623 | UINT BSSIDInfoCount; |
629 | BSSID_INFO BSSIDInfo[1]; | 624 | BSSID_INFO BSSIDInfo[1]; |
630 | } NDIS_802_11_PMKID, *PNDIS_802_11_PMKID; | 625 | } NDIS_802_11_PMKID, *PNDIS_802_11_PMKID; |
631 | #endif // CONFIG_STA_SUPPORT // | ||
632 | |||
633 | 626 | ||
634 | typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION | 627 | typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION |
635 | { | 628 | { |
@@ -653,7 +646,6 @@ typedef struct _NDIS_802_11_CAPABILITY | |||
653 | #define SIOCIWFIRSTPRIV SIOCDEVPRIVATE | 646 | #define SIOCIWFIRSTPRIV SIOCDEVPRIVATE |
654 | #endif | 647 | #endif |
655 | 648 | ||
656 | #ifdef CONFIG_STA_SUPPORT | ||
657 | #define RT_PRIV_IOCTL_EXT (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon | 649 | #define RT_PRIV_IOCTL_EXT (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon |
658 | #define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02) | 650 | #define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02) |
659 | 651 | ||
@@ -686,11 +678,6 @@ enum { | |||
686 | SHOW_CFG_VALUE = 20, | 678 | SHOW_CFG_VALUE = 20, |
687 | }; | 679 | }; |
688 | 680 | ||
689 | |||
690 | #endif // CONFIG_STA_SUPPORT // | ||
691 | |||
692 | |||
693 | |||
694 | #define OID_802_11_BUILD_CHANNEL_EX 0x0714 | 681 | #define OID_802_11_BUILD_CHANNEL_EX 0x0714 |
695 | #define OID_802_11_GET_CH_LIST 0x0715 | 682 | #define OID_802_11_GET_CH_LIST 0x0715 |
696 | #define OID_802_11_GET_COUNTRY_CODE 0x0716 | 683 | #define OID_802_11_GET_COUNTRY_CODE 0x0716 |
@@ -698,7 +685,6 @@ enum { | |||
698 | 685 | ||
699 | //#define RT_OID_802_11_STATISTICS (OID_GET_SET_TOGGLE | OID_802_11_STATISTICS) | 686 | //#define RT_OID_802_11_STATISTICS (OID_GET_SET_TOGGLE | OID_802_11_STATISTICS) |
700 | 687 | ||
701 | #ifdef CONFIG_STA_SUPPORT | ||
702 | #define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk | 688 | #define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk |
703 | #define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741 | 689 | #define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741 |
704 | #define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742 | 690 | #define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742 |
@@ -709,7 +695,7 @@ enum { | |||
709 | #define RT_OID_WSC_SET_MODE 0x0747 // PIN or PBC | 695 | #define RT_OID_WSC_SET_MODE 0x0747 // PIN or PBC |
710 | #define RT_OID_WSC_SET_CONF_MODE 0x0748 // Enrollee or Registrar | 696 | #define RT_OID_WSC_SET_CONF_MODE 0x0748 // Enrollee or Registrar |
711 | #define RT_OID_WSC_SET_PROFILE 0x0749 | 697 | #define RT_OID_WSC_SET_PROFILE 0x0749 |
712 | #endif // CONFIG_STA_SUPPORT // | 698 | |
713 | #define RT_OID_802_11_WSC_QUERY_PROFILE 0x0750 | 699 | #define RT_OID_802_11_WSC_QUERY_PROFILE 0x0750 |
714 | // for consistency with RT61 | 700 | // for consistency with RT61 |
715 | #define RT_OID_WSC_QUERY_STATUS 0x0751 | 701 | #define RT_OID_WSC_QUERY_STATUS 0x0751 |
@@ -948,7 +934,6 @@ typedef struct _RT_LLTD_ASSOICATION_TABLE { | |||
948 | } RT_LLTD_ASSOICATION_TABLE, *PRT_LLTD_ASSOICATION_TABLE; | 934 | } RT_LLTD_ASSOICATION_TABLE, *PRT_LLTD_ASSOICATION_TABLE; |
949 | #endif // LLTD_SUPPORT // | 935 | #endif // LLTD_SUPPORT // |
950 | 936 | ||
951 | #ifdef CONFIG_STA_SUPPORT | ||
952 | #ifdef WPA_SUPPLICANT_SUPPORT | 937 | #ifdef WPA_SUPPLICANT_SUPPORT |
953 | #ifndef NATIVE_WPA_SUPPLICANT_SUPPORT | 938 | #ifndef NATIVE_WPA_SUPPLICANT_SUPPORT |
954 | #define RT_ASSOC_EVENT_FLAG 0x0101 | 939 | #define RT_ASSOC_EVENT_FLAG 0x0101 |
@@ -961,19 +946,15 @@ typedef struct _RT_LLTD_ASSOICATION_TABLE { | |||
961 | #define RT_INTERFACE_UP 0x0108 | 946 | #define RT_INTERFACE_UP 0x0108 |
962 | #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // | 947 | #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // |
963 | #endif // WPA_SUPPLICANT_SUPPORT // | 948 | #endif // WPA_SUPPLICANT_SUPPORT // |
964 | #endif // CONFIG_STA_SUPPORT // | ||
965 | |||
966 | 949 | ||
967 | #define MAX_CUSTOM_LEN 128 | 950 | #define MAX_CUSTOM_LEN 128 |
968 | 951 | ||
969 | #ifdef CONFIG_STA_SUPPORT | ||
970 | typedef enum _RT_802_11_D_CLIENT_MODE | 952 | typedef enum _RT_802_11_D_CLIENT_MODE |
971 | { | 953 | { |
972 | Rt802_11_D_None, | 954 | Rt802_11_D_None, |
973 | Rt802_11_D_Flexible, | 955 | Rt802_11_D_Flexible, |
974 | Rt802_11_D_Strict, | 956 | Rt802_11_D_Strict, |
975 | } RT_802_11_D_CLIENT_MODE, *PRT_802_11_D_CLIENT_MODE; | 957 | } RT_802_11_D_CLIENT_MODE, *PRT_802_11_D_CLIENT_MODE; |
976 | #endif // CONFIG_STA_SUPPORT // | ||
977 | 958 | ||
978 | typedef struct _RT_CHANNEL_LIST_INFO | 959 | typedef struct _RT_CHANNEL_LIST_INFO |
979 | { | 960 | { |