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

diff --git a/drivers/staging/rtl8723au/include/wifi.h b/drivers/staging/rtl8723au/include/wifi.h
index 64ead4f0dc4c7e2b9c14d34a0963d36ccad13143..cccea6a50b3a3d2cfefddd9cbd7c2e10798d147e 100644 (file)
--- a/drivers/staging/rtl8723au/include/wifi.h
+++ b/drivers/staging/rtl8723au/include/wifi.h
@@ -23,103 +23,6 @@
  */
 #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),
-};
-
-
-#define SetToDs(pbuf)  \
-       (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_TODS))
-
-#define SetFrDs(pbuf)  \
-       (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS))
-
-#define SetPwrMgt(pbuf)        \
-       (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PM))
-
-#define SetMData(pbuf) \
-       (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREDATA))
-
-#define SetPrivacy(pbuf)       \
-       (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PROTECTED))
-
-#define SetFrameType(pbuf, type)       \
-       do {    \
-               *(__le16 *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \
-               *(__le16 *)(pbuf) |= __constant_cpu_to_le16(type); \
-       } while (0)
-
-#define SetFrameSubType(pbuf, type) \
-       do {    \
-               *(__le16 *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \
-               *(__le16 *)(pbuf) |= cpu_to_le16(type); \
-       } while (0)
-
-#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 {    \
-               *(__le16 *)((size_t)(pbuf) + 22) = \
-                       ((*(__le16 *)((size_t)(pbuf) + 22)) & cpu_to_le16((unsigned short)0x000f)) | \
-                       cpu_to_le16((unsigned short)(0xfff0 & (num << 4))); \
-       } while (0)
-
-#define SetDuration(pbuf, dur) \
-       (*(__le16 *)((unsigned long)(pbuf) + 2) =               \
-        cpu_to_le16(0xffff & (dur)))
-
-#define SetPriority(pbuf, tid) \
-       (*(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf))
-
-#define SetEOSP(pbuf, eosp)    \
-       (*(__le16 *)(pbuf) |= cpu_to_le16((eosp & 1) << 4))
-
-#define SetAckpolicy(pbuf, ack)        \
-       (*(__le16 *)(pbuf) |= cpu_to_le16((ack & 3) << 5))
-
 #define _ASOCREQ_IE_OFFSET_            4       /*  excluding wlan_hdr */
 #define        _ASOCRSP_IE_OFFSET_             6
 #define _REASOCREQ_IE_OFFSET_          10
@@ -235,20 +138,6 @@ struct ADDBA_request {
 #define WPS_ATTR_VENDOR_EXT                    0x1049
 #define WPS_ATTR_SELECTED_REGISTRAR            0x1041
 
-/*     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
-
 /*     WPS Configuration Method */
 #define        WPS_CM_NONE                                     0x0000
 #define        WPS_CM_LABEL                                    0x0004