]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/staging/rtl8723au/include/wifi.h
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[karo-tx-linux.git] / drivers / staging / rtl8723au / include / wifi.h
index b5034c6ef1dc7db10d811c8599c6ca82e595a130..cccea6a50b3a3d2cfefddd9cbd7c2e10798d147e 100644 (file)
  */
 #define        WiFiNavUpperUs          30000   /*  30 ms */
 
-enum WIFI_FRAME_TYPE {
-       WIFI_MGT_TYPE  =        (0),
-       WIFI_CTRL_TYPE =        (BIT(2)),
-       WIFI_DATA_TYPE =        (BIT(3)),
-       WIFI_QOS_DATA_TYPE      = (BIT(7)|BIT(3)),      /*  QoS Data */
-};
-
-enum WIFI_FRAME_SUBTYPE {
-       /*  below is for mgt frame */
-       WIFI_ASSOCREQ = (0 | WIFI_MGT_TYPE),
-       WIFI_ASSOCRSP = (BIT(4) | WIFI_MGT_TYPE),
-       WIFI_REASSOCREQ = (BIT(5) | WIFI_MGT_TYPE),
-       WIFI_REASSOCRSP = (BIT(5) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_PROBEREQ = (BIT(6) | WIFI_MGT_TYPE),
-       WIFI_PROBERSP = (BIT(6) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_BEACON = (BIT(7) | WIFI_MGT_TYPE),
-       WIFI_ATIM = (BIT(7) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_DISASSOC = (BIT(7) | BIT(5) | WIFI_MGT_TYPE),
-       WIFI_AUTH = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE),
-       WIFI_DEAUTH = (BIT(7) | BIT(6) | WIFI_MGT_TYPE),
-       WIFI_ACTION = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE),
-
-       /*  below is for control frame */
-       WIFI_PSPOLL = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE),
-       WIFI_RTS = (BIT(7) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE),
-       WIFI_CTS = (BIT(7) | BIT(6) | WIFI_CTRL_TYPE),
-       WIFI_ACK = (BIT(7) | BIT(6) | BIT(4) | WIFI_CTRL_TYPE),
-       WIFI_CFEND = (BIT(7) | BIT(6) | BIT(5) | WIFI_CTRL_TYPE),
-       WIFI_CFEND_CFACK = (BIT(7) | BIT(6) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE),
-
-       /*  below is for data frame */
-       WIFI_DATA = (0 | WIFI_DATA_TYPE),
-       WIFI_DATA_CFACK = (BIT(4) | WIFI_DATA_TYPE),
-       WIFI_DATA_CFPOLL = (BIT(5) | WIFI_DATA_TYPE),
-       WIFI_DATA_CFACKPOLL = (BIT(5) | BIT(4) | WIFI_DATA_TYPE),
-       WIFI_DATA_NULL = (BIT(6) | WIFI_DATA_TYPE),
-       WIFI_CF_ACK = (BIT(6) | BIT(4) | WIFI_DATA_TYPE),
-       WIFI_CF_POLL = (BIT(6) | BIT(5) | WIFI_DATA_TYPE),
-       WIFI_CF_ACKPOLL = (BIT(6) | BIT(5) | BIT(4) | WIFI_DATA_TYPE),
-       WIFI_QOS_DATA_NULL = (BIT(6) | WIFI_QOS_DATA_TYPE),
-};
-
-
-enum WIFI_REG_DOMAIN {
-       DOMAIN_FCC              = 1,
-       DOMAIN_IC               = 2,
-       DOMAIN_ETSI             = 3,
-       DOMAIN_SPAIN            = 4,
-       DOMAIN_FRANCE           = 5,
-       DOMAIN_MKK              = 6,
-       DOMAIN_ISRAEL           = 7,
-       DOMAIN_MKK1             = 8,
-       DOMAIN_MKK2             = 9,
-       DOMAIN_MKK3             = 10,
-       DOMAIN_MAX
-};
-
-
-#define SetToDs(pbuf)  \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_TODS))
-
-#define SetFrDs(pbuf)  \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS))
-
-#define get_tofr_ds(pframe)    ((ieee80211_has_tods(pframe) << 1) | \
-                                ieee80211_has_fromds(pframe))
-
-#define SetMFrag(pbuf) \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS))
-
-#define ClearMFrag(pbuf)       \
-       (*(unsigned short *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)))
-
-#define SetRetry(pbuf) \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_RETRY))
-
-#define SetPwrMgt(pbuf)        \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PM))
-
-#define SetMData(pbuf) \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREDATA))
-
-#define SetPrivacy(pbuf)       \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PROTECTED))
-
-#define SetFrameType(pbuf, type)       \
-       do {    \
-               *(unsigned short *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \
-               *(unsigned short *)(pbuf) |= __constant_cpu_to_le16(type); \
-       } while (0)
-
-#define SetFrameSubType(pbuf, type) \
-       do {    \
-               *(unsigned short *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \
-               *(unsigned short *)(pbuf) |= cpu_to_le16(type); \
-       } while (0)
-
-#define GetTupleCache(pbuf)    (cpu_to_le16(*(unsigned short *)((unsigned long)(pbuf) + 22)))
-
-#define SetFragNum(pbuf, num) \
-       do {    \
-               *(unsigned short *)((unsigned long)(pbuf) + 22) = \
-                       ((*(unsigned short *)((unsigned long)(pbuf) + 22)) & le16_to_cpu(~(0x000f))) | \
-                       cpu_to_le16(0x0f & (num));     \
-       } while (0)
-
-#define SetSeqNum(pbuf, num) \
-       do {    \
-               *(unsigned short *)((unsigned long)(pbuf) + 22) = \
-                       ((*(unsigned short *)((unsigned long)(pbuf) + 22)) & le16_to_cpu((unsigned short)0x000f)) | \
-                       le16_to_cpu((unsigned short)(0xfff0 & (num << 4))); \
-       } while (0)
-
-#define SetDuration(pbuf, dur) \
-       (*(unsigned short *)((unsigned long)(pbuf) + 2) =               \
-        cpu_to_le16(0xffff & (dur)))
-
-#define SetPriority(pbuf, tid) \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(tid & 0xf))
-
-#define SetEOSP(pbuf, eosp)    \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16((eosp & 1) << 4))
-
-#define SetAckpolicy(pbuf, ack)        \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16((ack & 3) << 5))
-
-#define SetAMsdu(pbuf, amsdu)  \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7))
-
-#define GetAid(pbuf)                                                   \
-       (cpu_to_le16(*(unsigned short *)((unsigned long)(pbuf) + 2)) &  \
-        0x3fff)
-
-#define GetTid(pbuf)                                                   \
-       (cpu_to_le16(*(unsigned short *)((unsigned long)(pbuf) +        \
-        (((ieee80211_has_tods(pbuf)<<1) |                              \
-        ieee80211_has_fromds(pbuf)) == 3 ? 30 : 24))) & 0x000f)
-
-static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
-{
-       unsigned char   *sa;
-       unsigned int    to_fr_ds;
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) pframe;
-
-       to_fr_ds = (ieee80211_has_tods(hdr->frame_control) << 1) |
-                   ieee80211_has_fromds(hdr->frame_control);
-
-       switch (to_fr_ds) {
-       case 0x00:      /*  ToDs=0, FromDs=0 */
-               sa = hdr->addr3;
-               break;
-       case 0x01:      /*  ToDs=0, FromDs=1 */
-               sa = hdr->addr2;
-               break;
-       case 0x02:      /*  ToDs=1, FromDs=0 */
-               sa = hdr->addr1;
-               break;
-       case 0x03:      /*  ToDs=1, FromDs=1 */
-               sa = hdr->addr1;
-               break;
-       default:
-               sa = NULL; /*  */
-               break;
-       }
-       return sa;
-}
-
-/*-----------------------------------------------------------------------------
-                       Below is for the security related definition
-------------------------------------------------------------------------------*/
-#define _RESERVED_FRAME_TYPE_          0
-#define _SKB_FRAME_TYPE_               2
-#define _PRE_ALLOCMEM_                 1
-#define _PRE_ALLOCHDR_                 3
-#define _PRE_ALLOCLLCHDR_              4
-#define _PRE_ALLOCICVHDR_              5
-#define _PRE_ALLOCMICHDR_              6
-
-#define _SIFSTIME_                                     \
-       ((priv->pmib->dot11BssType.net_work_type & WIRELESS_11A) ? 16 : 10)
-#define _ACKCTSLNG_                    14      /* 14 bytes long, including crclng */
-#define _CRCLNG_                       4
-
 #define _ASOCREQ_IE_OFFSET_            4       /*  excluding wlan_hdr */
 #define        _ASOCRSP_IE_OFFSET_             6
 #define _REASOCREQ_IE_OFFSET_          10
@@ -219,39 +36,8 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
 
 #define _FIXED_IE_LENGTH_              _BEACON_IE_OFFSET_
 
-#define _SSID_IE_                      0
-#define _SUPPORTEDRATES_IE_            1
-#define _DSSET_IE_                     3
-#define _TIM_IE_                       5
-#define _IBSS_PARA_IE_                 6
-#define _COUNTRY_IE_                   7
-#define _CHLGETXT_IE_                  16
-#define _SUPPORTED_CH_IE_              36
-#define _CH_SWTICH_ANNOUNCE_   37      /* Secondary Channel Offset */
-#define _RSN_IE_2_                     48
-#define _SSN_IE_1_                     221
-#define _ERPINFO_IE_                   42
-#define _EXT_SUPPORTEDRATES_IE_                50
-
-#define _HT_CAPABILITY_IE_             45
-#define _FTIE_                         55
-#define _TIMEOUT_ITVL_IE_              56
-#define _SRC_IE_                       59
-#define _HT_EXTRA_INFO_IE_             61
-#define _HT_ADD_INFO_IE_               61 /* _HT_EXTRA_INFO_IE_ */
 
-
-#define        EID_BSSCoexistence              72 /*  20/40 BSS Coexistence */
 #define        EID_BSSIntolerantChlReport      73
-#define _RIC_Descriptor_IE_            75
-
-#define _LINK_ID_IE_           101
-#define _CH_SWITCH_TIMING_     104
-#define _PTI_BUFFER_STATUS_    106
-#define _EXT_CAP_IE_           127
-#define _VENDOR_SPECIFIC_IE_   221
-
-#define        _RESERVED47_            47
 
 /* ---------------------------------------------------------------------------
                                        Below is the fixed elements...
@@ -266,41 +52,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
 #define _STATUS_CODE_          2
 #define _TIMESTAMP_            8
 
-#define AUTH_ODD_TO            0
-#define AUTH_EVEN_TO           1
-
-#define WLAN_ETHCONV_ENCAP     1
-#define WLAN_ETHCONV_RFC1042   2
-#define WLAN_ETHCONV_8021h     3
-
-#define cap_ESS                BIT(0)
-#define cap_IBSS       BIT(1)
-#define cap_CFPollable BIT(2)
-#define cap_CFRequest  BIT(3)
-#define cap_Privacy    BIT(4)
-#define cap_ShortPremble BIT(5)
-#define cap_PBCC       BIT(6)
-#define cap_ChAgility  BIT(7)
-#define cap_SpecMgmt   BIT(8)
-#define cap_QoS                BIT(9)
-#define cap_ShortSlot  BIT(10)
-
-/*-----------------------------------------------------------------------------
-                               Below is the definition for 802.11i / 802.1x
-------------------------------------------------------------------------------*/
-#define _IEEE8021X_MGT_                        1       /*  WPA */
-#define _IEEE8021X_PSK_                        2       /*  WPA with pre-shared key */
-
-/*
-#define _NO_PRIVACY_                   0
-#define _WEP_40_PRIVACY_               1
-#define _TKIP_PRIVACY_                 2
-#define _WRAP_PRIVACY_                 3
-#define _CCMP_PRIVACY_                 4
-#define _WEP_104_PRIVACY_              5
-#define _WEP_WPA_MIXED_PRIVACY_ 6      WEP + WPA
-*/
-
 /*-----------------------------------------------------------------------------
                                Below is the definition for WMM
 ------------------------------------------------------------------------------*/
@@ -312,13 +63,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
                                Below is the definition for 802.11n
 ------------------------------------------------------------------------------*/
 
-#define SetOrderBit(pbuf)                                              \
-       (*(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_))
-
-#define GetOrderBit(pbuf)              \
-       (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0)
-
-
 /* struct rtw_ieee80211_ht_cap - HT additional information
  *
  * This structure refers to "HT information element" as
@@ -372,38 +116,7 @@ struct ADDBA_request {
 }  __packed;
 
 
-#define OP_MODE_PURE                    0
-#define OP_MODE_MAY_BE_LEGACY_STAS      1
-#define OP_MODE_20MHZ_HT_STA_ASSOCED    2
-#define OP_MODE_MIXED                   3
-
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK       ((u8) BIT(0) | BIT(1))
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE          ((u8) BIT(0))
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW          ((u8) BIT(0) | BIT(1))
-#define HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH          ((u8) BIT(2))
-#define HT_INFO_HT_PARAM_RIFS_MODE                     ((u8) BIT(3))
-#define HT_INFO_HT_PARAM_CTRL_ACCESS_ONLY              ((u8) BIT(4))
-#define HT_INFO_HT_PARAM_SRV_INTERVAL_GRANULARITY      ((u8) BIT(5))
-
-#define HT_INFO_OPERATION_MODE_OP_MODE_MASK    \
-               ((u16) (0x0001 | 0x0002))
-#define HT_INFO_OPERATION_MODE_OP_MODE_OFFSET          0
-#define HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT     ((u8) BIT(2))
-#define HT_INFO_OPERATION_MODE_TRANSMIT_BURST_LIMIT    ((u8) BIT(3))
-#define HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT      ((u8) BIT(4))
-
-#define HT_INFO_STBC_PARAM_DUAL_BEACON         ((u16) BIT(6))
-#define HT_INFO_STBC_PARAM_DUAL_STBC_PROTECT   ((u16) BIT(7))
-#define HT_INFO_STBC_PARAM_SECONDARY_BCN       ((u16) BIT(8))
-#define HT_INFO_STBC_PARAM_LSIG_TXOP_PROTECT_ALLOWED   ((u16) BIT(9))
-#define HT_INFO_STBC_PARAM_PCO_ACTIVE          ((u16) BIT(10))
-#define HT_INFO_STBC_PARAM_PCO_PHASE           ((u16) BIT(11))
-
-
-
 /*     ===============WPS Section=============== */
-/*     For WPSv1.0 */
-#define WPSOUI                                 0x0050f204
 /*     WPS attribute ID */
 #define WPS_ATTR_VER1                          0x104A
 #define WPS_ATTR_SIMPLE_CONF_STATE             0x1044
@@ -425,182 +138,6 @@ struct ADDBA_request {
 #define WPS_ATTR_VENDOR_EXT                    0x1049
 #define WPS_ATTR_SELECTED_REGISTRAR            0x1041
 
-/*     Value of WPS attribute "WPS_ATTR_DEVICE_NAME */
-#define WPS_MAX_DEVICE_NAME_LEN                        32
-
-/*     Value of WPS Request Type Attribute */
-#define WPS_REQ_TYPE_ENROLLEE_INFO_ONLY                0x00
-#define WPS_REQ_TYPE_ENROLLEE_OPEN_8021X       0x01
-#define WPS_REQ_TYPE_REGISTRAR                 0x02
-#define WPS_REQ_TYPE_WLAN_MANAGER_REGISTRAR    0x03
-
-/*     Value of WPS Response Type Attribute */
-#define WPS_RESPONSE_TYPE_INFO_ONLY            0x00
-#define WPS_RESPONSE_TYPE_8021X                        0x01
-#define WPS_RESPONSE_TYPE_REGISTRAR            0x02
-#define WPS_RESPONSE_TYPE_AP                   0x03
-
-/*     Value of WPS WiFi Simple Configuration State Attribute */
-#define WPS_WSC_STATE_NOT_CONFIG               0x01
-#define WPS_WSC_STATE_CONFIG                   0x02
-
-/*     Value of WPS Version Attribute */
-#define WPS_VERSION_1                          0x10
-
-/*     Value of WPS Configuration Method Attribute */
-#define WPS_CONFIG_METHOD_FLASH                        0x0001
-#define WPS_CONFIG_METHOD_ETHERNET             0x0002
-#define WPS_CONFIG_METHOD_LABEL                        0x0004
-#define WPS_CONFIG_METHOD_DISPLAY              0x0008
-#define WPS_CONFIG_METHOD_E_NFC                        0x0010
-#define WPS_CONFIG_METHOD_I_NFC                        0x0020
-#define WPS_CONFIG_METHOD_NFC                  0x0040
-#define WPS_CONFIG_METHOD_PBC                  0x0080
-#define WPS_CONFIG_METHOD_KEYPAD               0x0100
-#define WPS_CONFIG_METHOD_VPBC                 0x0280
-#define WPS_CONFIG_METHOD_PPBC                 0x0480
-#define WPS_CONFIG_METHOD_VDISPLAY             0x2008
-#define WPS_CONFIG_METHOD_PDISPLAY             0x4008
-
-/*     Value of Category ID of WPS Primary Device Type Attribute */
-#define WPS_PDT_CID_DISPLAYS                   0x0007
-#define WPS_PDT_CID_MULIT_MEDIA                        0x0008
-#define WPS_PDT_CID_RTK_WIDI                   WPS_PDT_CID_MULIT_MEDIA
-
-/*     Value of Sub Category ID of WPS Primary Device Type Attribute */
-#define WPS_PDT_SCID_MEDIA_SERVER              0x0005
-#define WPS_PDT_SCID_RTK_DMP                   WPS_PDT_SCID_MEDIA_SERVER
-
-/*     Value of Device Password ID */
-#define WPS_DPID_PIN                           0x0000
-#define WPS_DPID_USER_SPEC                     0x0001
-#define WPS_DPID_MACHINE_SPEC                  0x0002
-#define WPS_DPID_REKEY                         0x0003
-#define WPS_DPID_PBC                           0x0004
-#define WPS_DPID_REGISTRAR_SPEC                        0x0005
-
-/*     Value of WPS RF Bands Attribute */
-#define WPS_RF_BANDS_2_4_GHZ                   0x01
-#define WPS_RF_BANDS_5_GHZ                     0x02
-
-/*     Value of WPS Association State Attribute */
-#define WPS_ASSOC_STATE_NOT_ASSOCIATED         0x00
-#define WPS_ASSOC_STATE_CONNECTION_SUCCESS     0x01
-#define WPS_ASSOC_STATE_CONFIGURATION_FAILURE  0x02
-#define WPS_ASSOC_STATE_ASSOCIATION_FAILURE    0x03
-#define WPS_ASSOC_STATE_IP_FAILURE             0x04
-
-/*     =====================P2P Section===================== */
-/*     For P2P */
-#define        P2POUI                                  0x506F9A09
-
-/*     P2P Attribute ID */
-#define        P2P_ATTR_STATUS                         0x00
-#define        P2P_ATTR_MINOR_REASON_CODE              0x01
-#define        P2P_ATTR_CAPABILITY                     0x02
-#define        P2P_ATTR_DEVICE_ID                      0x03
-#define        P2P_ATTR_GO_INTENT                      0x04
-#define        P2P_ATTR_CONF_TIMEOUT                   0x05
-#define        P2P_ATTR_LISTEN_CH                      0x06
-#define        P2P_ATTR_GROUP_BSSID                    0x07
-#define        P2P_ATTR_EX_LISTEN_TIMING               0x08
-#define        P2P_ATTR_INTENTED_IF_ADDR               0x09
-#define        P2P_ATTR_MANAGEABILITY                  0x0A
-#define        P2P_ATTR_CH_LIST                        0x0B
-#define        P2P_ATTR_NOA                            0x0C
-#define        P2P_ATTR_DEVICE_INFO                    0x0D
-#define        P2P_ATTR_GROUP_INFO                     0x0E
-#define        P2P_ATTR_GROUP_ID                       0x0F
-#define        P2P_ATTR_INTERFACE                      0x10
-#define        P2P_ATTR_OPERATING_CH                   0x11
-#define        P2P_ATTR_INVITATION_FLAGS               0x12
-
-/*     Value of Status Attribute */
-#define        P2P_STATUS_SUCCESS                      0x00
-#define        P2P_STATUS_FAIL_INFO_UNAVAILABLE        0x01
-#define        P2P_STATUS_FAIL_INCOMPATIBLE_PARAM      0x02
-#define        P2P_STATUS_FAIL_LIMIT_REACHED           0x03
-#define        P2P_STATUS_FAIL_INVALID_PARAM           0x04
-#define        P2P_STATUS_FAIL_REQUEST_UNABLE          0x05
-#define        P2P_STATUS_FAIL_PREVOUS_PROTO_ERR       0x06
-#define        P2P_STATUS_FAIL_NO_COMMON_CH            0x07
-#define        P2P_STATUS_FAIL_UNKNOWN_P2PGROUP        0x08
-#define        P2P_STATUS_FAIL_BOTH_GOINTENT_15        0x09
-#define        P2P_STATUS_FAIL_INCOMPATIBLE_PROVSION   0x0A
-#define        P2P_STATUS_FAIL_USER_REJECT             0x0B
-
-/*     Value of Inviation Flags Attribute */
-#define        P2P_INVITATION_FLAGS_PERSISTENT         BIT(0)
-
-#define        DMP_P2P_DEVCAP_SUPPORT  (P2P_DEVCAP_SERVICE_DISCOVERY | \
-                                P2P_DEVCAP_CLIENT_DISCOVERABILITY | \
-                                P2P_DEVCAP_CONCURRENT_OPERATION | \
-                                P2P_DEVCAP_INVITATION_PROC)
-
-#define        DMP_P2P_GRPCAP_SUPPORT  (P2P_GRPCAP_INTRABSS)
-
-/*     Value of Device Capability Bitmap */
-#define        P2P_DEVCAP_SERVICE_DISCOVERY            BIT(0)
-#define        P2P_DEVCAP_CLIENT_DISCOVERABILITY       BIT(1)
-#define        P2P_DEVCAP_CONCURRENT_OPERATION         BIT(2)
-#define        P2P_DEVCAP_INFRA_MANAGED                BIT(3)
-#define        P2P_DEVCAP_DEVICE_LIMIT                 BIT(4)
-#define        P2P_DEVCAP_INVITATION_PROC              BIT(5)
-
-/*     Value of Group Capability Bitmap */
-#define        P2P_GRPCAP_GO                           BIT(0)
-#define        P2P_GRPCAP_PERSISTENT_GROUP             BIT(1)
-#define        P2P_GRPCAP_GROUP_LIMIT                  BIT(2)
-#define        P2P_GRPCAP_INTRABSS                     BIT(3)
-#define        P2P_GRPCAP_CROSS_CONN                   BIT(4)
-#define        P2P_GRPCAP_PERSISTENT_RECONN            BIT(5)
-#define        P2P_GRPCAP_GROUP_FORMATION              BIT(6)
-
-/*     P2P Public Action Frame ( Management Frame ) */
-#define        P2P_PUB_ACTION_ACTION                   0x09
-
-/*     P2P Public Action Frame Type */
-#define        P2P_GO_NEGO_REQ                         0
-#define        P2P_GO_NEGO_RESP                        1
-#define        P2P_GO_NEGO_CONF                        2
-#define        P2P_INVIT_REQ                           3
-#define        P2P_INVIT_RESP                          4
-#define        P2P_DEVDISC_REQ                         5
-#define        P2P_DEVDISC_RESP                        6
-#define        P2P_PROVISION_DISC_REQ                  7
-#define        P2P_PROVISION_DISC_RESP                 8
-
-/*     P2P Action Frame Type */
-#define        P2P_NOTICE_OF_ABSENCE                   0
-#define        P2P_PRESENCE_REQUEST                    1
-#define        P2P_PRESENCE_RESPONSE                   2
-#define        P2P_GO_DISC_REQUEST                     3
-
-
-#define        P2P_MAX_PERSISTENT_GROUP_NUM            10
-
-#define        P2P_PROVISIONING_SCAN_CNT               3
-
-#define        P2P_WILDCARD_SSID_LEN                   7
-
-#define        P2P_FINDPHASE_EX_NONE                   0       /*  default value, used when: (1)p2p disabed or (2)p2p enabled but only do 1 scan phase */
-#define        P2P_FINDPHASE_EX_FULL                   1       /*  used when p2p enabled and want to do 1 scan phase and P2P_FINDPHASE_EX_MAX-1 find phase */
-#define        P2P_FINDPHASE_EX_SOCIAL_FIRST           (P2P_FINDPHASE_EX_FULL+1)
-#define        P2P_FINDPHASE_EX_MAX                                    4
-#define        P2P_FINDPHASE_EX_SOCIAL_LAST            P2P_FINDPHASE_EX_MAX
-
-#define        P2P_PROVISION_TIMEOUT                   5000    /*5 sec timeout for sending the provision discovery request */
-#define        P2P_CONCURRENT_PROVISION_TIMEOUT        3000    /*3 sec timeout for sending the provision discovery request under concurrent mode */
-#define        P2P_GO_NEGO_TIMEOUT                     5000    /*5 sec timeout for receiving the group negotation response */
-#define        P2P_CONCURRENT_GO_NEGO_TIMEOUT          3000    /*3 sec timeout for sending the negotiation request under concurrent mode */
-#define        P2P_TX_PRESCAN_TIMEOUT                  100     /*100ms */
-#define        P2P_INVITE_TIMEOUT                      5000    /*5 sec timeout for sending the invitation request */
-#define        P2P_CONCURRENT_INVITE_TIMEOUT           3000    /*3 sec timeout for sending the invitation request under concurrent mode */
-#define        P2P_RESET_SCAN_CH                       25000   /*25 sec t/o to reset the scan channel ( based on channel plan ) */
-#define        P2P_MAX_INTENT                          15
-
-#define        P2P_MAX_NOA_NUM                         2
-
 /*     WPS Configuration Method */
 #define        WPS_CM_NONE                                     0x0000
 #define        WPS_CM_LABEL                                    0x0004
@@ -615,93 +152,4 @@ struct ADDBA_request {
 #define        WPS_CM_SW_DISPLAY_PIN                           0x2008
 #define        WPS_CM_LCD_DISPLAY_PIN                          0x4008
 
-enum P2P_ROLE {
-       P2P_ROLE_DISABLE = 0,
-       P2P_ROLE_DEVICE = 1,
-       P2P_ROLE_CLIENT = 2,
-       P2P_ROLE_GO = 3
-};
-
-enum P2P_STATE {
-       P2P_STATE_NONE = 0,                     /*P2P disable */
-       P2P_STATE_IDLE = 1,                     /*P2P had enabled and do nothing */
-       P2P_STATE_LISTEN = 2,                   /*In pure listen state */
-       P2P_STATE_SCAN = 3,                     /*In scan phase */
-       P2P_STATE_FIND_PHASE_LISTEN = 4,        /*In the listen state of find phase */
-       P2P_STATE_FIND_PHASE_SEARCH = 5,        /*In the search state of find phase */
-       P2P_STATE_TX_PROVISION_DIS_REQ = 6,     /*In P2P provisioning discovery */
-       P2P_STATE_RX_PROVISION_DIS_RSP = 7,
-       P2P_STATE_RX_PROVISION_DIS_REQ = 8,
-       P2P_STATE_GONEGO_ING = 9,               /*Doing the group owner negoitation handshake */
-       P2P_STATE_GONEGO_OK = 10,               /*finish the group negoitation handshake with success */
-       P2P_STATE_GONEGO_FAIL = 11,             /*finish the group negoitation handshake with failure */
-       P2P_STATE_RECV_INVITE_REQ_MATCH = 12,   /*receiving the P2P Inviation request and match with the profile. */
-       P2P_STATE_PROVISIONING_ING = 13,        /*Doing the P2P WPS */
-       P2P_STATE_PROVISIONING_DONE = 14,       /*Finish the P2P WPS */
-       P2P_STATE_TX_INVITE_REQ = 15,           /*Transmit the P2P Invitation request */
-       P2P_STATE_RX_INVITE_RESP_OK = 16,       /*Receiving the P2P Invitation response */
-       P2P_STATE_RECV_INVITE_REQ_DISMATCH = 17,/*receiving the P2P Inviation request and dismatch with the profile. */
-       P2P_STATE_RECV_INVITE_REQ_GO = 18,      /*receiving the P2P Inviation request and this wifi is GO. */
-       P2P_STATE_RECV_INVITE_REQ_JOIN = 19,    /*receiving the P2P Inviation request to join an existing P2P Group. */
-       P2P_STATE_RX_INVITE_RESP_FAIL = 20,     /*receiving the P2P Inviation response with failure */
-       P2P_STATE_RX_INFOR_NOREADY = 21,        /*receiving p2p negotiation response with information is not available */
-       P2P_STATE_TX_INFOR_NOREADY = 22,        /*sending p2p negotiation response with information is not available */
-};
-
-enum P2P_WPSINFO {
-       P2P_NO_WPSINFO                          = 0,
-       P2P_GOT_WPSINFO_PEER_DISPLAY_PIN        = 1,
-       P2P_GOT_WPSINFO_SELF_DISPLAY_PIN        = 2,
-       P2P_GOT_WPSINFO_PBC                     = 3,
-};
-
-#define        P2P_PRIVATE_IOCTL_SET_LEN               64
-
-enum P2P_PROTO_WK_ID {
-       P2P_FIND_PHASE_WK = 0,
-       P2P_RESTORE_STATE_WK = 1,
-       P2P_PRE_TX_PROVDISC_PROCESS_WK = 2,
-       P2P_PRE_TX_NEGOREQ_PROCESS_WK = 3,
-       P2P_PRE_TX_INVITEREQ_PROCESS_WK = 4,
-       P2P_AP_P2P_CH_SWITCH_PROCESS_WK = 5,
-       P2P_RO_CH_WK = 6,
-};
-
-#ifdef CONFIG_8723AU_P2P
-enum P2P_PS_STATE {
-       P2P_PS_DISABLE = 0,
-       P2P_PS_ENABLE = 1,
-       P2P_PS_SCAN = 2,
-       P2P_PS_SCAN_DONE = 3,
-       P2P_PS_ALLSTASLEEP = 4, /*  for P2P GO */
-};
-
-enum P2P_PS_MODE {
-       P2P_PS_NONE = 0,
-       P2P_PS_CTWINDOW = 1,
-       P2P_PS_NOA       = 2,
-       P2P_PS_MIX = 3, /*  CTWindow and NoA */
-};
-#endif /*  CONFIG_8723AU_P2P */
-
-/*     =====================WFD Section===================== */
-/*     For Wi-Fi Display */
-#define        WFD_ATTR_DEVICE_INFO                    0x00
-#define        WFD_ATTR_ASSOC_BSSID                    0x01
-#define        WFD_ATTR_COUPLED_SINK_INFO      0x06
-#define        WFD_ATTR_LOCAL_IP_ADDR          0x08
-#define        WFD_ATTR_SESSION_INFO           0x09
-#define        WFD_ATTR_ALTER_MAC                      0x0a
-
-/*     For WFD Device Information Attribute */
-#define        WFD_DEVINFO_SOURCE                                      0x0000
-#define        WFD_DEVINFO_PSINK                                       0x0001
-#define        WFD_DEVINFO_SSINK                                       0x0002
-#define        WFD_DEVINFO_DUAL                                        0x0003
-
-#define        WFD_DEVINFO_SESSION_AVAIL                       0x0010
-#define        WFD_DEVINFO_WSD                                         0x0040
-#define        WFD_DEVINFO_PC_TDLS                                     0x0080
-#define        WFD_DEVINFO_HDCP_SUPPORT                        0x0100
-
 #endif /*  _WIFI_H_ */