Start removing duplicated ieee80211 definitions

Switch to using the Linux kernel provided definitions

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>

diff --git a/core/rtw_ap.c b/core/rtw_ap.c
index d783d79..793bf50 100644 (file)
--- a/core/rtw_ap.c
+++ b/core/rtw_ap.c
@@ -22,6 +22,7 @@
 #include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
+#include <linux/ieee80211.h>
 #include <wifi.h>
 
 #ifdef CONFIG_AP_MODE
@@ -2086,7 +2087,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
        }
 
 #if 0
-       if (!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT) &&
+       if (!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME) &&
            !psta->no_short_slot_time_set) {
                psta->no_short_slot_time_set = 1;
                pmlmepriv->num_sta_no_short_slot_time++;
@@ -2096,7 +2097,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
        }
 #endif
 
-       if(!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT))
+       if(!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME))
        {
                if(!psta->no_short_slot_time_set)
                {

diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c
index 258e777..9b4759d 100644 (file)
--- a/core/rtw_ieee80211.c
+++ b/core/rtw_ieee80211.c
@@ -20,6 +20,7 @@
 #define _IEEE80211_C
 
 #include <drv_types.h>
+#include <linux/ieee80211.h>
 #include <ieee80211.h>
 #include <wifi.h>
 #include <osdep_service.h>
@@ -1196,7 +1197,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
                        elems->timeout_int = pos;
                        elems->timeout_int_len = elen;
                        break;
-               case WLAN_EID_HT_CAP:
+               case WLAN_EID_HT_CAPABILITY:
                        elems->ht_capabilities = pos;
                        elems->ht_capabilities_len = elen;
                        break;

diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index 0e02a50..a9243aa 100644 (file)
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -27,6 +27,7 @@
 #include <hal_intf.h>
 #include <mlme_osdep.h>
 #include <sta_info.h>
+#include <linux/ieee80211.h>
 #include <wifi.h>
 #include <wlan_bssdef.h>
 #include <rtw_ioctl_set.h>
@@ -591,8 +592,8 @@ _func_exit_;
                ((!memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength))) &&
                ((s_cap & WLAN_CAPABILITY_IBSS) ==
                 (d_cap & WLAN_CAPABILITY_IBSS)) &&
-               ((s_cap & WLAN_CAPABILITY_BSS) ==
-                (d_cap & WLAN_CAPABILITY_BSS)));
+               ((s_cap & WLAN_CAPABILITY_ESS) ==
+                (d_cap & WLAN_CAPABILITY_ESS)));
 }
 
 struct wlan_network    * rtw_get_oldest_wlan_network(_queue *scanned_queue)

diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index b92d495..f73d046 100644 (file)
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -27,6 +27,7 @@
 #include <wlan_bssdef.h>
 #include <mlme_osdep.h>
 #include <recv_osdep.h>
+#include <linux/ieee80211.h>
 
 #ifdef CONFIG_BT_COEXIST
 #include <rtl8723a_hal.h>
@@ -1611,10 +1612,10 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
                        pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher;
 
                        if(!pstat->wpa2_group_cipher)
-                               status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
+                               status = WLAN_REASON_INVALID_GROUP_CIPHER;
 
                        if(!pstat->wpa2_pairwise_cipher)
-                               status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
+                               status = WLAN_REASON_INVALID_PAIRWISE_CIPHER;
                } else {
                        status = WLAN_STATUS_INVALID_IE;
                }
@@ -1634,10 +1635,10 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
                        pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher;
 
                        if(!pstat->wpa_group_cipher)
-                               status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
+                               status = WLAN_STATUS_INVALID_GROUP_CIPHER;
 
                        if(!pstat->wpa_pairwise_cipher)
-                               status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
+                               status = WLAN_STATUS_INVALID_PAIRWISE_CIPHER;
 
                } else {
                        status = WLAN_STATUS_INVALID_IE;

diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index 49976d0..135526a 100644 (file)
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -27,6 +27,7 @@
 #include <if_ether.h>
 #include <ethernet.h>
 #include <usb_ops.h>
+#include <linux/ieee80211.h>
 #include <wifi.h>
 #include <circ_buf.h>
 

diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c
index f32abaa..6f30360 100644 (file)
--- a/core/rtw_wlan_util.c
+++ b/core/rtw_wlan_util.c
@@ -22,6 +22,7 @@
 #include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
+#include <linux/ieee80211.h>
 #include <wifi.h>
 
 unsigned char ARTHEROS_OUI1[] = {0x00, 0x03, 0x7f};

diff --git a/include/ieee80211.h b/include/ieee80211.h
index e4a7da3..93a0ec2 100644 (file)
--- a/include/ieee80211.h
+++ b/include/ieee80211.h
@@ -492,84 +492,9 @@ struct ieee80211_snap_hdr {
 
 #define WLAN_AUTH_CHALLENGE_LEN 128
 
-#define WLAN_CAPABILITY_BSS (1<<0)
-#define WLAN_CAPABILITY_IBSS (1<<1)
-#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
-#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
-#define WLAN_CAPABILITY_PRIVACY (1<<4)
-#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
-#define WLAN_CAPABILITY_PBCC (1<<6)
-#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)
-#define WLAN_CAPABILITY_SHORT_SLOT (1<<10)
-
-/* Status codes */
-#define WLAN_STATUS_SUCCESS 0
-#define WLAN_STATUS_UNSPECIFIED_FAILURE 1
-#define WLAN_STATUS_CAPS_UNSUPPORTED 10
-#define WLAN_STATUS_REASSOC_NO_ASSOC 11
-#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12
-#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13
-#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14
-#define WLAN_STATUS_CHALLENGE_FAIL 15
-#define WLAN_STATUS_AUTH_TIMEOUT 16
-#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17
-#define WLAN_STATUS_ASSOC_DENIED_RATES 18
-/* 802.11b */
-#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19
-#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20
-#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21
-
-/* Reason codes */
-#define WLAN_REASON_UNSPECIFIED 1
-#define WLAN_REASON_PREV_AUTH_NOT_VALID 2
-#define WLAN_REASON_DEAUTH_LEAVING 3
-#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4
-#define WLAN_REASON_DISASSOC_AP_BUSY 5
-#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6
-#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7
-#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8
-#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9
 #define WLAN_REASON_JOIN_WRONG_CHANNEL       65534
 #define WLAN_REASON_EXPIRATION_CHK 65535
 
-/* Information Element IDs */
-#define WLAN_EID_SSID 0
-#define WLAN_EID_SUPP_RATES 1
-#define WLAN_EID_FH_PARAMS 2
-#define WLAN_EID_DS_PARAMS 3
-#define WLAN_EID_CF_PARAMS 4
-#define WLAN_EID_TIM 5
-#define WLAN_EID_IBSS_PARAMS 6
-#define WLAN_EID_CHALLENGE 16
-/* EIDs defined by IEEE 802.11h - START */
-#define WLAN_EID_PWR_CONSTRAINT 32
-#define WLAN_EID_PWR_CAPABILITY 33
-#define WLAN_EID_TPC_REQUEST 34
-#define WLAN_EID_TPC_REPORT 35
-#define WLAN_EID_SUPPORTED_CHANNELS 36
-#define WLAN_EID_CHANNEL_SWITCH 37
-#define WLAN_EID_MEASURE_REQUEST 38
-#define WLAN_EID_MEASURE_REPORT 39
-#define WLAN_EID_QUITE 40
-#define WLAN_EID_IBSS_DFS 41
-/* EIDs defined by IEEE 802.11h - END */
-#define WLAN_EID_ERP_INFO 42
-#define WLAN_EID_HT_CAP 45
-#define WLAN_EID_RSN 48
-#define WLAN_EID_EXT_SUPP_RATES 50
-#define WLAN_EID_MOBILITY_DOMAIN 54
-#define WLAN_EID_FAST_BSS_TRANSITION 55
-#define WLAN_EID_TIMEOUT_INTERVAL 56
-#define WLAN_EID_RIC_DATA 57
-#define WLAN_EID_HT_OPERATION 61
-#define WLAN_EID_SECONDARY_CHANNEL_OFFSET 62
-#define WLAN_EID_20_40_BSS_COEXISTENCE 72
-#define WLAN_EID_20_40_BSS_INTOLERANT 73
-#define WLAN_EID_OVERLAPPING_BSS_SCAN_PARAMS 74
-#define WLAN_EID_MMIE 76
-#define WLAN_EID_VENDOR_SPECIFIC 221
-#define WLAN_EID_GENERIC (WLAN_EID_VENDOR_SPECIFIC)
-
 #define IEEE80211_MGMT_HDR_LEN 24
 #define IEEE80211_DATA_HDR3_LEN 24
 #define IEEE80211_DATA_HDR4_LEN 30

diff --git a/include/wifi.h b/include/wifi.h
index 30eca78..b785f25 100644 (file)
--- a/include/wifi.h
+++ b/include/wifi.h
@@ -132,36 +132,6 @@ enum WIFI_REASON_CODE      {
        _RSON_TDLS_TEAR_UN_RSN_                 = 26,
 };
 
-/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) */
-#if 0
-#define WLAN_REASON_UNSPECIFIED 1
-#define WLAN_REASON_PREV_AUTH_NOT_VALID 2
-#define WLAN_REASON_DEAUTH_LEAVING 3
-#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4
-#define WLAN_REASON_DISASSOC_AP_BUSY 5
-#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6
-#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7
-#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8
-#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9
-#endif
-/* IEEE 802.11h */
-#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10
-#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11
-#if 0
-/* IEEE 802.11i */
-#define WLAN_REASON_INVALID_IE 13
-#define WLAN_REASON_MICHAEL_MIC_FAILURE 14
-#define WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT 15
-#define WLAN_REASON_GROUP_KEY_UPDATE_TIMEOUT 16
-#define WLAN_REASON_IE_IN_4WAY_DIFFERS 17
-#define WLAN_REASON_GROUP_CIPHER_NOT_VALID 18
-#define WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID 19
-#define WLAN_REASON_AKMP_NOT_VALID 20
-#define WLAN_REASON_UNSUPPORTED_RSN_IE_VERSION 21
-#define WLAN_REASON_INVALID_RSN_IE_CAPAB 22
-#define WLAN_REASON_IEEE_802_1X_AUTH_FAILED 23
-#define WLAN_REASON_CIPHER_SUITE_REJECTED 24
-#endif
 
 enum WIFI_STATUS_CODE {
        _STATS_SUCCESSFUL_                      = 0,
@@ -177,55 +147,6 @@ enum WIFI_STATUS_CODE {
        _STATS_RATE_FAIL_                       = 18,
 };
 
-/* Status codes (IEEE 802.11-2007, 7.3.1.9, Table 7-23) */
-#if 0
-#define WLAN_STATUS_SUCCESS 0
-#define WLAN_STATUS_UNSPECIFIED_FAILURE 1
-#define WLAN_STATUS_CAPS_UNSUPPORTED 10
-#define WLAN_STATUS_REASSOC_NO_ASSOC 11
-#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12
-#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13
-#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14
-#define WLAN_STATUS_CHALLENGE_FAIL 15
-#define WLAN_STATUS_AUTH_TIMEOUT 16
-#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17
-#define WLAN_STATUS_ASSOC_DENIED_RATES 18
-#endif
-//entended
-/* IEEE 802.11b */
-#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19
-#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20
-#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21
-/* IEEE 802.11h */
-#define WLAN_STATUS_SPEC_MGMT_REQUIRED 22
-#define WLAN_STATUS_PWR_CAPABILITY_NOT_VALID 23
-#define WLAN_STATUS_SUPPORTED_CHANNEL_NOT_VALID 24
-/* IEEE 802.11g */
-#define WLAN_STATUS_ASSOC_DENIED_NO_SHORT_SLOT_TIME 25
-#define WLAN_STATUS_ASSOC_DENIED_NO_ER_PBCC 26
-#define WLAN_STATUS_ASSOC_DENIED_NO_DSSS_OFDM 27
-/* IEEE 802.11w */
-#define WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY 30
-#define WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION 31
-/* IEEE 802.11i */
-#define WLAN_STATUS_INVALID_IE 40
-#define WLAN_STATUS_GROUP_CIPHER_NOT_VALID 41
-#define WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID 42
-#define WLAN_STATUS_AKMP_NOT_VALID 43
-#define WLAN_STATUS_UNSUPPORTED_RSN_IE_VERSION 44
-#define WLAN_STATUS_INVALID_RSN_IE_CAPAB 45
-#define WLAN_STATUS_CIPHER_REJECTED_PER_POLICY 46
-#define WLAN_STATUS_TS_NOT_CREATED 47
-#define WLAN_STATUS_DIRECT_LINK_NOT_ALLOWED 48
-#define WLAN_STATUS_DEST_STA_NOT_PRESENT 49
-#define WLAN_STATUS_DEST_STA_NOT_QOS_STA 50
-#define WLAN_STATUS_ASSOC_DENIED_LISTEN_INT_TOO_LARGE 51
-/* IEEE 802.11r */
-#define WLAN_STATUS_INVALID_FT_ACTION_FRAME_COUNT 52
-#define WLAN_STATUS_INVALID_PMKID 53
-#define WLAN_STATUS_INVALID_MDIE 54
-#define WLAN_STATUS_INVALID_FTIE 55
-
 
 enum WIFI_REG_DOMAIN {
        DOMAIN_FCC              = 1,
@@ -650,26 +571,6 @@ __inline static int IsFrameTypeCtrl(unsigned char *pframe)
 #define GetOrderBit(pbuf)      (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0)
 
 
-/**
- * struct rtw_ieee80211_bar - HT Block Ack Request
- *
- * This structure refers to "HT BlockAckReq" as
- * described in 802.11n draft section 7.2.1.7.1
- */
-struct rtw_ieee80211_bar {
-       unsigned short frame_control;
-       unsigned short duration;
-       unsigned char ra[6];
-       unsigned char ta[6];
-       unsigned short control;
-       unsigned short start_seq_num;
-} __attribute__((packed));
-
-/* 802.11 BAR control masks */
-#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL     0x0000
-#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA  0x0004
-
-
  /**
  * struct rtw_ieee80211_ht_cap - HT capabilities
  *

diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index 40c2095..3a8e34c 100644 (file)
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -24,6 +24,7 @@
 #include <drv_types.h>
 #include <wlan_bssdef.h>
 #include <rtw_debug.h>
+#include <linux/ieee80211.h>
 #include <wifi.h>
 #include <rtw_mlme.h>
 #include <rtw_mlme_ext.h>
@@ -466,8 +467,8 @@ static char *translate_scan(_adapter *padapter,
 
        cap = le16_to_cpu(cap);
 
-       if(cap & (WLAN_CAPABILITY_IBSS |WLAN_CAPABILITY_BSS)){
-               if (cap & WLAN_CAPABILITY_BSS)
+       if(cap & (WLAN_CAPABILITY_IBSS |WLAN_CAPABILITY_ESS)){
+               if (cap & WLAN_CAPABILITY_ESS)
                        iwe.u.mode = IW_MODE_MASTER;
                else
                        iwe.u.mode = IW_MODE_ADHOC;
@@ -7814,7 +7815,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)
        psta = rtw_get_stainfo(pstapriv, param->sta_addr);
        if(psta)
        {
-               if((psta->wpa_ie[0] == WLAN_EID_RSN) || (psta->wpa_ie[0] == WLAN_EID_GENERIC))
+               if((psta->wpa_ie[0] == WLAN_EID_RSN) || (psta->wpa_ie[0] == WLAN_EID_VENDOR_SPECIFIC))
                {
                        int wpa_ie_len;
                        int copy_len;