brcm80211: use proper ieee80211 routines

[firefly-linux-kernel-4.4.55.git] / drivers / staging / brcm80211 / include / proto / 802.11.h

diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h
index 9ddf42aa3669fcc2d7dbd710ca9155e2c524b64f..5cdfc7a6e80cbe112216e83bafd68633c34a905a 100644 (file)
--- a/drivers/staging/brcm80211/include/proto/802.11.h
+++ b/drivers/staging/brcm80211/include/proto/802.11.h
@@ -48,15 +48,6 @@
 #define DOT11_BA_BITMAP_LEN            128
 #define DOT11_BA_LEN           4
 
-#define        DOT11_MGMT_HDR_LEN      24
-
-struct dot11_bcn_prb {
-       u32 timestamp[2];
-       u16 beacon_interval;
-       u16 capability;
-} __attribute__((packed));
-#define        DOT11_BCN_PRB_LEN       12
-
 #define WME_OUI                        "\x00\x50\xf2"
 #define WME_VER                        1
 #define WME_TYPE               2
@@ -121,45 +112,10 @@ typedef struct wme_param_ie wme_param_ie_t;
 
 #define EDCF_AC_VO_TXOP_AP           0x002f
 
-#define DOT11_OPEN_SYSTEM      0
-#define DOT11_SHARED_KEY       1
-
-#define FC_TYPE_MASK           0xC
-#define FC_TYPE_SHIFT          2
-#define FC_SUBTYPE_MASK                0xF0
-#define FC_SUBTYPE_SHIFT       4
-
 #define SEQNUM_SHIFT           4
 #define SEQNUM_MAX             0x1000
 #define FRAGNUM_MASK           0xF
 
-#define FC_TYPE_MNG            0
-#define FC_TYPE_CTL            1
-#define FC_TYPE_DATA           2
-
-#define FC_SUBTYPE_PROBE_REQ           4
-#define FC_SUBTYPE_PROBE_RESP          5
-#define FC_SUBTYPE_BEACON              8
-#define FC_SUBTYPE_PS_POLL             10
-#define FC_SUBTYPE_RTS                 11
-#define FC_SUBTYPE_CTS                 12
-
-#define FC_SUBTYPE_ANY_QOS(s)          (((s) & 8) != 0)
-
-#define FC_KIND_MASK           (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)
-
-#define FC_KIND(t, s)  (((t) << FC_TYPE_SHIFT) | ((s) << FC_SUBTYPE_SHIFT))
-
-#define FC_SUBTYPE(fc) (((fc) & IEEE80211_FCTL_STYPE) >> FC_SUBTYPE_SHIFT)
-#define FC_TYPE(fc)    (((fc) & IEEE80211_FCTL_FTYPE) >> FC_TYPE_SHIFT)
-
-#define FC_PROBE_REQ   FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_REQ)
-#define FC_PROBE_RESP  FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_RESP)
-#define FC_BEACON      FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_BEACON)
-#define FC_PS_POLL     FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_PS_POLL)
-#define FC_RTS         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_RTS)
-#define FC_CTS         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CTS)
-
 #define TLV_LEN_OFF            1
 #define TLV_HDR_LEN            2
 #define TLV_BODY_OFF           2
@@ -168,12 +124,6 @@ typedef struct wme_param_ie wme_param_ie_t;
 #define DOT11_MNG_WPA_ID                       221
 #define DOT11_MNG_VS_ID                                221
 
-#define DOT11_CAP_ESS                          0x0001
-#define DOT11_CAP_IBSS                         0x0002
-#define DOT11_CAP_PRIVACY                      0x0010
-#define DOT11_CAP_SHORT                                0x0020
-#define DOT11_CAP_SHORTSLOT                    0x0400
-
 #define DOT11_BSSTYPE_INFRASTRUCTURE           0
 #define DOT11_BSSTYPE_ANY                      2
 #define DOT11_SCANTYPE_ACTIVE                  0
@@ -223,43 +173,12 @@ typedef struct d11cnt {
 
 #define MCSSET_LEN     16
 
-struct ht_cap_ie {
-       u16 cap;
-       u8 params;
-       u8 supp_mcs[MCSSET_LEN];
-       u16 ext_htcap;
-       u32 txbf_cap;
-       u8 as_cap;
-} __attribute__((packed));
-typedef struct ht_cap_ie ht_cap_ie_t;
-
 #define HT_CAP_IE_LEN          26
 
-#define HT_CAP_LDPC_CODING     0x0001
-#define HT_CAP_40MHZ           0x0002
-#define HT_CAP_MIMO_PS_MASK    0x000C
-#define HT_CAP_MIMO_PS_SHIFT   0x0002
-#define HT_CAP_MIMO_PS_OFF     0x0003
-#define HT_CAP_MIMO_PS_ON      0x0000
-#define HT_CAP_GF              0x0010
-#define HT_CAP_SHORT_GI_20     0x0020
-#define HT_CAP_SHORT_GI_40     0x0040
-#define HT_CAP_TX_STBC         0x0080
-#define HT_CAP_RX_STBC_MASK    0x0300
-#define HT_CAP_RX_STBC_SHIFT   8
-#define HT_CAP_MAX_AMSDU       0x0800
-#define HT_CAP_DSSS_CCK        0x1000
-#define HT_CAP_40MHZ_INTOLERANT 0x4000
-
 #define HT_CAP_RX_STBC_NO              0x0
 #define HT_CAP_RX_STBC_ONE_STREAM      0x1
 
-#define HT_PARAMS_RX_FACTOR_MASK       0x03
-
-#define AMPDU_MAX_MPDU_DENSITY 7
-#define AMPDU_RX_FACTOR_16K    1
-#define AMPDU_RX_FACTOR_32K    2
-#define AMPDU_RX_FACTOR_64K    3
+#define AMPDU_MAX_MPDU_DENSITY IEEE80211_HT_MPDU_DENSITY_16
 
 #define AMPDU_DELIMITER_LEN    4
 
@@ -278,14 +197,8 @@ typedef struct ht_cap_ie ht_cap_ie_t;
 #define RSN_AKM_PSK            2
 
 #define DOT11_MAX_DEFAULT_KEYS 4
-#define DOT11_MAX_KEY_SIZE     32
 #define DOT11_WPA_KEY_RSC_LEN   8
 
-#define WEP1_KEY_SIZE          5
-#define WEP128_KEY_SIZE                13
-#define TKIP_KEY_SIZE          32
-#define AES_KEY_SIZE           16
-
 #define BRCM_OUI               "\x00\x10\x18"
 
 #endif                         /* _802_11_H_ */