]> Pileus Git - ~andy/linux/blobdiff - drivers/staging/rtl8192su/ieee80211/ieee80211.h
staging: rtl8192su: fix compile error from wireless-testing commit
[~andy/linux] / drivers / staging / rtl8192su / ieee80211 / ieee80211.h
index 5e3a2cbed2b1324dbd883c7457780e34c824bf1c..6963e5448f340cdcdf04ad4e13fb92e0c28e1a63 100644 (file)
 #include <linux/kernel.h>   /* ARRAY_SIZE */
 #include <linux/version.h>
 #include <linux/module.h>
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 #include <linux/jiffies.h>
-#else
-#include <linux/jffs.h>
-#include <linux/tqueue.h>
-#endif
 #include <linux/timer.h>
 #include <linux/sched.h>
 
 #include <linux/delay.h>
 #include <linux/wireless.h>
+#include <linux/ieee80211.h>
 
 #include "rtl819x_HT.h"
 #include "rtl819x_BA.h"
 #include "rtl819x_TS.h"
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-#ifndef bool
-typedef enum{false = 0, true} bool;
-#endif
-#endif
-
-#ifndef IW_MODE_MONITOR
-#define IW_MODE_MONITOR 6
-#endif
-
-#ifndef IWEVCUSTOM
-#define IWEVCUSTOM 0x8c02
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#ifndef __bitwise
-#define __bitwise __attribute__((bitwise))
-#endif
-typedef __u16  __le16;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27))
-struct iw_spy_data{
-       /* --- Standard spy support --- */
-       int                     spy_number;
-       u_char                  spy_address[IW_MAX_SPY][ETH_ALEN];
-       struct iw_quality       spy_stat[IW_MAX_SPY];
-       /* --- Enhanced spy support (event) */
-       struct iw_quality       spy_thr_low; /* Low threshold */
-       struct iw_quality       spy_thr_high; /* High threshold */
-       u_char                  spy_thr_under[IW_MAX_SPY];
-};
-#endif
-#endif
-
-#ifndef container_of
-/**
- * container_of - cast a member of a structure out to the containing structure
- *
- * @ptr:        the pointer to the member.
- * @type:       the type of the container struct this is embedded in.
- * @member:     the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({                      \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
-#endif
-
 #define KEY_TYPE_NA            0x0
 #define KEY_TYPE_WEP40                 0x1
 #define KEY_TYPE_TKIP          0x2
 #define KEY_TYPE_CCMP          0x4
 #define KEY_TYPE_WEP104                0x5
 
-/* added for rtl819x tx procedure */
-#define MAX_QUEUE_SIZE         0x10
-
-//
-// 8190 queue mapping
-//
-#define BK_QUEUE                               0
-#define BE_QUEUE                               1
-#define VI_QUEUE                               2
-#define VO_QUEUE                               3
-#define HCCA_QUEUE                             4
-#define TXCMD_QUEUE                            5
-#define MGNT_QUEUE                             6
-#define HIGH_QUEUE                             7
-#define BEACON_QUEUE                           8
-
-#define LOW_QUEUE                              BE_QUEUE
-#define NORMAL_QUEUE                           MGNT_QUEUE
-
-//added by amy for ps
-#define SWRF_TIMEOUT                           50
-
-//added by amy for LEAP related
-#define IE_CISCO_FLAG_POSITION         0x08    // Flag byte: byte 8, numbered from 0.
-#define SUPPORT_CKIP_MIC                       0x08    // bit3
-#define SUPPORT_CKIP_PK                        0x10    // bit4
-//added by amy for ps
-// RF Off Level for IPS or HW/SW radio off
-#define        RT_RF_OFF_LEVL_ASPM                     BIT0    // PCI ASPM
-#define        RT_RF_OFF_LEVL_CLK_REQ          BIT1    // PCI clock request
-#define        RT_RF_OFF_LEVL_PCI_D3                   BIT2    // PCI D3 mode
-#define        RT_RF_OFF_LEVL_HALT_NIC         BIT3    // NIC halt, re-initialize hw parameters
-#define        RT_RF_OFF_LEVL_FREE_FW          BIT4    // FW free, re-download the FW
-#define        RT_RF_OFF_LEVL_FW_32K           BIT5    // FW in 32k
-#define        RT_RF_PS_LEVEL_ALWAYS_ASPM      BIT6    // Always enable ASPM and Clock Req in initialization.
-#define        RT_RF_LPS_DISALBE_2R                    BIT30   // When LPS is on, disable 2R if no packet is received or transmittd.
-#define        RT_RF_LPS_LEVEL_ASPM                    BIT31   // LPS with ASPM
-#define        RT_IN_PS_LEVEL(pPSC, _PS_FLAG)  ((pPSC->CurPsLevel & _PS_FLAG) ? true : false)
-#define        RT_CLEAR_PS_LEVEL(pPSC, _PS_FLAG)       (pPSC->CurPsLevel &= (~(_PS_FLAG)))
-#define        RT_SET_PS_LEVEL(pPSC, _PS_FLAG) (pPSC->CurPsLevel->CurPsLevel |= _PS_FLAG)
-/* defined for skb cb field */
-/* At most 28 byte */
-typedef struct cb_desc {
-        /* Tx Desc Related flags (8-9) */
-       u8 bLastIniPkt:1;
-       u8 bCmdOrInit:1;
-        u8 bFirstSeg:1;
-        u8 bLastSeg:1;
-        u8 bEncrypt:1;
-        u8 bTxDisableRateFallBack:1;
-        u8 bTxUseDriverAssingedRate:1;
-        u8 bHwSec:1; //indicate whether use Hw security. WB
-
-        u8 reserved1;
-
-        /* Tx Firmware Relaged flags (10-11)*/
-        u8 bCTSEnable:1;
-        u8 bRTSEnable:1;
-        u8 bUseShortGI:1;
-        u8 bUseShortPreamble:1;
-        u8 bTxEnableFwCalcDur:1;
-        u8 bAMPDUEnable:1;
-        u8 bRTSSTBC:1;
-        u8 RTSSC:1;
-
-        u8 bRTSBW:1;
-        u8 bPacketBW:1;
-       u8 bRTSUseShortPreamble:1;
-       u8 bRTSUseShortGI:1;
-       u8 bMulticast:1;
-       u8 bBroadcast:1;
-        //u8 reserved2:2;
-        u8 drv_agg_enable:1;
-        u8 reserved2:1;
-
-        /* Tx Desc related element(12-19) */
-        u8 rata_index;
-        u8 queue_index;
-        //u8 reserved3;
-        //u8 reserved4;
-        u16 txbuf_size;
-        //u8 reserved5;
-       u8 RATRIndex;
-        u8 reserved6;
-        u8 reserved7;
-        u8 reserved8;
-
-        /* Tx firmware related element(20-27) */
-        u8 data_rate;
-        u8 rts_rate;
-        u8 ampdu_factor;
-        u8 ampdu_density;
-        //u8 reserved9;
-        //u8 reserved10;
-        //u8 reserved11;
-        u8 DrvAggrNum;
-       u16 pkt_size;
-        u8 reserved12;
-}cb_desc, *pcb_desc;
-
-/*--------------------------Define -------------------------------------------*/
-#define MGN_1M                  0x02
-#define MGN_2M                  0x04
-#define MGN_5_5M                0x0b
-#define MGN_11M                 0x16
-
-#define MGN_6M                  0x0c
-#define MGN_9M                  0x12
-#define MGN_12M                 0x18
-#define MGN_18M                 0x24
-#define MGN_24M                 0x30
-#define MGN_36M                 0x48
-#define MGN_48M                 0x60
-#define MGN_54M                 0x6c
-
-#define MGN_MCS0                0x80
-#define MGN_MCS1                0x81
-#define MGN_MCS2                0x82
-#define MGN_MCS3                0x83
-#define MGN_MCS4                0x84
-#define MGN_MCS5                0x85
-#define MGN_MCS6                0x86
-#define MGN_MCS7                0x87
-#define MGN_MCS8                0x88
-#define MGN_MCS9                0x89
-#define MGN_MCS10               0x8a
-#define MGN_MCS11               0x8b
-#define MGN_MCS12               0x8c
-#define MGN_MCS13               0x8d
-#define MGN_MCS14               0x8e
-#define MGN_MCS15               0x8f
-#define        MGN_MCS0_SG                     0x90
-#define        MGN_MCS1_SG                     0x91
-#define        MGN_MCS2_SG                     0x92
-#define        MGN_MCS3_SG                     0x93
-#define        MGN_MCS4_SG                     0x94
-#define        MGN_MCS5_SG                     0x95
-#define        MGN_MCS6_SG                     0x96
-#define        MGN_MCS7_SG                     0x97
-#define        MGN_MCS8_SG                     0x98
-#define        MGN_MCS9_SG                     0x99
-#define        MGN_MCS10_SG            0x9a
-#define        MGN_MCS11_SG            0x9b
-#define        MGN_MCS12_SG            0x9c
-#define        MGN_MCS13_SG            0x9d
-#define        MGN_MCS14_SG            0x9e
-#define        MGN_MCS15_SG            0x9f
-
-
-//----------------------------------------------------------------------------
-//             802.11 Management frame Reason Code field
-//----------------------------------------------------------------------------
-enum   _ReasonCode{
-       unspec_reason   = 0x1,
-       auth_not_valid  = 0x2,
-       deauth_lv_ss    = 0x3,
-       inactivity              = 0x4,
-       ap_overload     = 0x5,
-       class2_err              = 0x6,
-       class3_err              = 0x7,
-       disas_lv_ss     = 0x8,
-       asoc_not_auth   = 0x9,
-
-       //----MIC_CHECK
-       mic_failure     = 0xe,
-       //----END MIC_CHECK
-
-       // Reason code defined in 802.11i D10.0 p.28.
-       invalid_IE              = 0x0d,
-       four_way_tmout  = 0x0f,
-       two_way_tmout   = 0x10,
-       IE_dismatch     = 0x11,
-       invalid_Gcipher = 0x12,
-       invalid_Pcipher = 0x13,
-       invalid_AKMP    = 0x14,
-       unsup_RSNIEver = 0x15,
-       invalid_RSNIE   = 0x16,
-       auth_802_1x_fail= 0x17,
-       ciper_reject            = 0x18,
-
-       // Reason code defined in 7.3.1.7, 802.1e D13.0, p.42. Added by Annie, 2005-11-15.
-       QoS_unspec              = 0x20, // 32
-       QAP_bandwidth   = 0x21, // 33
-       poor_condition  = 0x22, // 34
-       no_facility     = 0x23, // 35
-                                                       // Where is 36???
-       req_declined    = 0x25, // 37
-       invalid_param   = 0x26, // 38
-       req_not_honored= 0x27,  // 39
-       TS_not_created  = 0x2F, // 47
-       DL_not_allowed  = 0x30, // 48
-       dest_not_exist  = 0x31, // 49
-       dest_not_QSTA   = 0x32, // 50
-};
-
-
-
-#define aSifsTime       (((priv->ieee80211->current_network.mode == IEEE_A)||(priv->ieee80211->current_network.mode == IEEE_N_24G)||(priv->ieee80211->current_network.mode == IEEE_N_5G))? 16 : 10)
+#define aSifsTime (((priv->ieee80211->current_network.mode == IEEE_A) || \
+                   (priv->ieee80211->current_network.mode == IEEE_N_24G) || \
+                   (priv->ieee80211->current_network.mode == IEEE_N_5G)) \
+                  ? 16 : 10)
 
 #define MGMT_QUEUE_NUM 5
 
@@ -343,80 +98,6 @@ enum        _ReasonCode{
 
 #define MAX_IE_LEN  0xff
 
-// added for kernel conflict
-#define ieee80211_crypt_deinit_entries         ieee80211_crypt_deinit_entries_rsl
-#define ieee80211_crypt_deinit_handler         ieee80211_crypt_deinit_handler_rsl
-#define ieee80211_crypt_delayed_deinit         ieee80211_crypt_delayed_deinit_rsl
-#define ieee80211_register_crypto_ops          ieee80211_register_crypto_ops_rsl
-#define ieee80211_unregister_crypto_ops ieee80211_unregister_crypto_ops_rsl
-#define ieee80211_get_crypto_ops       ieee80211_get_crypto_ops_rsl
-
-#define ieee80211_ccmp_null            ieee80211_ccmp_null_rsl
-
-#define ieee80211_tkip_null            ieee80211_tkip_null_rsl
-
-#define ieee80211_wep_null             ieee80211_wep_null_rsl
-
-#define free_ieee80211                 free_ieee80211_rsl
-#define alloc_ieee80211                        alloc_ieee80211_rsl
-
-#define ieee80211_rx                   ieee80211_rx_rsl
-#define ieee80211_rx_mgt               ieee80211_rx_mgt_rsl
-
-#define ieee80211_get_beacon           ieee80211_get_beacon_rsl
-#define ieee80211_wake_queue           ieee80211_wake_queue_rsl
-#define ieee80211_stop_queue           ieee80211_stop_queue_rsl
-#define ieee80211_reset_queue          ieee80211_reset_queue_rsl
-#define ieee80211_softmac_stop_protocol        ieee80211_softmac_stop_protocol_rsl
-#define ieee80211_softmac_start_protocol ieee80211_softmac_start_protocol_rsl
-#define ieee80211_is_shortslot         ieee80211_is_shortslot_rsl
-#define ieee80211_is_54g               ieee80211_is_54g_rsl
-#define ieee80211_wpa_supplicant_ioctl ieee80211_wpa_supplicant_ioctl_rsl
-#define ieee80211_ps_tx_ack            ieee80211_ps_tx_ack_rsl
-#define ieee80211_softmac_xmit         ieee80211_softmac_xmit_rsl
-#define ieee80211_stop_send_beacons    ieee80211_stop_send_beacons_rsl
-#define notify_wx_assoc_event          notify_wx_assoc_event_rsl
-#define SendDisassociation             SendDisassociation_rsl
-#define ieee80211_disassociate         ieee80211_disassociate_rsl
-#define ieee80211_start_send_beacons   ieee80211_start_send_beacons_rsl
-#define ieee80211_stop_scan            ieee80211_stop_scan_rsl
-#define ieee80211_send_probe_requests  ieee80211_send_probe_requests_rsl
-#define ieee80211_softmac_scan_syncro  ieee80211_softmac_scan_syncro_rsl
-#define ieee80211_start_scan_syncro    ieee80211_start_scan_syncro_rsl
-
-#define ieee80211_wx_get_essid         ieee80211_wx_get_essid_rsl
-#define ieee80211_wx_set_essid         ieee80211_wx_set_essid_rsl
-#define ieee80211_wx_set_rate          ieee80211_wx_set_rate_rsl
-#define ieee80211_wx_get_rate          ieee80211_wx_get_rate_rsl
-#define ieee80211_wx_set_wap           ieee80211_wx_set_wap_rsl
-#define ieee80211_wx_get_wap           ieee80211_wx_get_wap_rsl
-#define ieee80211_wx_set_mode          ieee80211_wx_set_mode_rsl
-#define ieee80211_wx_get_mode          ieee80211_wx_get_mode_rsl
-#define ieee80211_wx_set_scan          ieee80211_wx_set_scan_rsl
-#define ieee80211_wx_get_freq          ieee80211_wx_get_freq_rsl
-#define ieee80211_wx_set_freq          ieee80211_wx_set_freq_rsl
-#define ieee80211_wx_set_rawtx         ieee80211_wx_set_rawtx_rsl
-#define ieee80211_wx_get_name          ieee80211_wx_get_name_rsl
-#define ieee80211_wx_set_power         ieee80211_wx_set_power_rsl
-#define ieee80211_wx_get_power         ieee80211_wx_get_power_rsl
-#define ieee80211_wlan_frequencies     ieee80211_wlan_frequencies_rsl
-#define ieee80211_wx_set_rts           ieee80211_wx_set_rts_rsl
-#define ieee80211_wx_get_rts           ieee80211_wx_get_rts_rsl
-
-#define ieee80211_txb_free             ieee80211_txb_free_rsl
-
-#define ieee80211_wx_set_gen_ie                ieee80211_wx_set_gen_ie_rsl
-#define ieee80211_wx_get_scan          ieee80211_wx_get_scan_rsl
-#define ieee80211_wx_set_encode                ieee80211_wx_set_encode_rsl
-#define ieee80211_wx_get_encode                ieee80211_wx_get_encode_rsl
-#if WIRELESS_EXT >= 18
-#define ieee80211_wx_set_mlme          ieee80211_wx_set_mlme_rsl
-#define ieee80211_wx_set_auth          ieee80211_wx_set_auth_rsl
-#define ieee80211_wx_set_encode_ext    ieee80211_wx_set_encode_ext_rsl
-#define ieee80211_wx_get_encode_ext    ieee80211_wx_get_encode_ext_rsl
-#endif
-
-
 typedef struct ieee_param {
        u32 cmd;
        u8 sta_addr[ETH_ALEN];
@@ -446,56 +127,8 @@ typedef struct ieee_param {
        } u;
 }ieee_param;
 
-
-#if WIRELESS_EXT < 17
-#define IW_QUAL_QUAL_INVALID   0x10
-#define IW_QUAL_LEVEL_INVALID  0x20
-#define IW_QUAL_NOISE_INVALID  0x40
-#define IW_QUAL_QUAL_UPDATED   0x1
-#define IW_QUAL_LEVEL_UPDATED  0x2
-#define IW_QUAL_NOISE_UPDATED  0x4
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static inline void tq_init(struct tq_struct * task, void(*func)(void *), void *data)
-{
-       task->routine = func;
-       task->data      = data;
-       //task->next = NULL;
-       INIT_LIST_HEAD(&task->list);
-       task->sync = 0;
-}
-#endif
-
-// linux under 2.6.9 release may not support it, so modify it for common use
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
-//#define MSECS(t)     (1000 * ((t) / HZ) + 1000 * ((t) % HZ) / HZ)
-#define MSECS(t)       (HZ * ((t) / 1000) + (HZ * ((t) % 1000)) / 1000)
-static inline unsigned long msleep_interruptible_rsl(unsigned int msecs)
-{
-         unsigned long timeout = MSECS(msecs) + 1;
-
-         while (timeout) {
-                 set_current_state(TASK_INTERRUPTIBLE);
-                 timeout = schedule_timeout(timeout);
-         }
-         return timeout;
-}
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,31))
-static inline void msleep(unsigned int msecs)
-{
-         unsigned long timeout = MSECS(msecs) + 1;
-
-         while (timeout) {
-                 set_current_state(TASK_UNINTERRUPTIBLE);
-                 timeout = schedule_timeout(timeout);
-         }
-}
-#endif
-#else
 #define MSECS(t) msecs_to_jiffies(t)
 #define msleep_interruptible_rsl  msleep_interruptible
-#endif
 
 #define IEEE80211_DATA_LEN             2304
 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
@@ -510,7 +143,7 @@ static inline void msleep(unsigned int msecs)
 #define IEEE80211_3ADDR_LEN 24
 #define IEEE80211_4ADDR_LEN 30
 #define IEEE80211_FCS_LEN    4
-#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
+#define IEEE80211_HLEN                 IEEE80211_4ADDR_LEN
 #define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
 #define IEEE80211_MGMT_HDR_LEN 24
 #define IEEE80211_DATA_HDR3_LEN 24
@@ -521,150 +154,50 @@ static inline void msleep(unsigned int msecs)
 
 
 /* Frame control field constants */
-#define IEEE80211_FCTL_VERS            0x0003
-#define IEEE80211_FCTL_FTYPE           0x000c
-#define IEEE80211_FCTL_STYPE           0x00f0
 #define IEEE80211_FCTL_FRAMETYPE       0x00fc
-#define IEEE80211_FCTL_TODS            0x0100
-#define IEEE80211_FCTL_FROMDS          0x0200
 #define IEEE80211_FCTL_DSTODS          0x0300 //added by david
-#define IEEE80211_FCTL_MOREFRAGS       0x0400
-#define IEEE80211_FCTL_RETRY           0x0800
-#define IEEE80211_FCTL_PM              0x1000
-#define IEEE80211_FCTL_MOREDATA                0x2000
 #define IEEE80211_FCTL_WEP             0x4000
-#define IEEE80211_FCTL_ORDER           0x8000
-
-#define IEEE80211_FTYPE_MGMT           0x0000
-#define IEEE80211_FTYPE_CTL            0x0004
-#define IEEE80211_FTYPE_DATA           0x0008
 
 /* management */
-#define IEEE80211_STYPE_ASSOC_REQ      0x0000
-#define IEEE80211_STYPE_ASSOC_RESP     0x0010
-#define IEEE80211_STYPE_REASSOC_REQ    0x0020
-#define IEEE80211_STYPE_REASSOC_RESP   0x0030
-#define IEEE80211_STYPE_PROBE_REQ      0x0040
-#define IEEE80211_STYPE_PROBE_RESP     0x0050
-#define IEEE80211_STYPE_BEACON         0x0080
-#define IEEE80211_STYPE_ATIM           0x0090
-#define IEEE80211_STYPE_DISASSOC       0x00A0
-#define IEEE80211_STYPE_AUTH           0x00B0
-#define IEEE80211_STYPE_DEAUTH         0x00C0
 #define IEEE80211_STYPE_MANAGE_ACT     0x00D0
 
 /* control */
-#define IEEE80211_STYPE_PSPOLL         0x00A0
-#define IEEE80211_STYPE_RTS            0x00B0
-#define IEEE80211_STYPE_CTS            0x00C0
-#define IEEE80211_STYPE_ACK            0x00D0
-#define IEEE80211_STYPE_CFEND          0x00E0
-#define IEEE80211_STYPE_CFENDACK       0x00F0
 #define IEEE80211_STYPE_BLOCKACK   0x0094
 
-/* data */
-#define IEEE80211_STYPE_DATA           0x0000
-#define IEEE80211_STYPE_DATA_CFACK     0x0010
-#define IEEE80211_STYPE_DATA_CFPOLL    0x0020
-#define IEEE80211_STYPE_DATA_CFACKPOLL 0x0030
-#define IEEE80211_STYPE_NULLFUNC       0x0040
-#define IEEE80211_STYPE_CFACK          0x0050
-#define IEEE80211_STYPE_CFPOLL         0x0060
-#define IEEE80211_STYPE_CFACKPOLL      0x0070
-#define IEEE80211_STYPE_QOS_DATA       0x0080 //added for WMM 2006/8/2
-#define IEEE80211_STYPE_QOS_NULL       0x00C0
-
-#define IEEE80211_SCTL_FRAG            0x000F
-#define IEEE80211_SCTL_SEQ             0xFFF0
-
 /* QOS control */
 #define IEEE80211_QCTL_TID              0x000F
 
-#define        FC_QOS_BIT                                      BIT7
-#define IsDataFrame(pdu)                       ( ((pdu[0] & 0x0C)==0x08) ? true : false )
-#define        IsLegacyDataFrame(pdu)  (IsDataFrame(pdu) && (!(pdu[0]&FC_QOS_BIT)) )
-//added by wb. Is this right?
-#define IsQoSDataFrame(pframe)  ((*(u16*)pframe&(IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA)) == (IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA))
-#define Frame_Order(pframe)     (*(u16*)pframe&IEEE80211_FCTL_ORDER)
-#define SN_LESS(a, b)          (((a-b)&0x800)!=0)
-#define SN_EQUAL(a, b) (a == b)
-#define MAX_DEV_ADDR_SIZE 8
-typedef enum _ACT_CATEGORY{
-        ACT_CAT_QOS = 1,
-        ACT_CAT_DLS = 2,
-        ACT_CAT_BA  = 3,
-        ACT_CAT_HT  = 7,
-        ACT_CAT_WMM = 17,
-} ACT_CATEGORY, *PACT_CATEGORY;
-
-typedef enum _TS_ACTION{
-        ACT_ADDTSREQ = 0,
-        ACT_ADDTSRSP = 1,
-        ACT_DELTS    = 2,
-        ACT_SCHEDULE = 3,
-} TS_ACTION, *PTS_ACTION;
-
-typedef enum _BA_ACTION{
-        ACT_ADDBAREQ = 0,
-        ACT_ADDBARSP = 1,
-        ACT_DELBA    = 2,
-} BA_ACTION, *PBA_ACTION;
-
-typedef enum _InitialGainOpType{
-       IG_Backup=0,
-       IG_Restore,
-       IG_Max
-}InitialGainOpType;
-//added by amy for LED 090319
-//================================================================================
-// LED customization.
-//================================================================================
-typedef enum _LED_CTL_MODE{
-        LED_CTL_POWER_ON = 1,
-        LED_CTL_LINK = 2,
-        LED_CTL_NO_LINK = 3,
-        LED_CTL_TX = 4,
-        LED_CTL_RX = 5,
-        LED_CTL_SITE_SURVEY = 6,
-        LED_CTL_POWER_OFF = 7,
-        LED_CTL_START_TO_LINK = 8,
-        LED_CTL_START_WPS = 9,
-        LED_CTL_STOP_WPS = 10,
-        LED_CTL_START_WPS_BOTTON = 11, //added for runtop
-}LED_CTL_MODE;
-
 /* debug macros */
 #define CONFIG_IEEE80211_DEBUG
 #ifdef CONFIG_IEEE80211_DEBUG
 extern u32 ieee80211_debug_level;
 #define IEEE80211_DEBUG(level, fmt, args...) \
-do { if (ieee80211_debug_level & (level)) \
-  printk(KERN_DEBUG "ieee80211: " fmt, ## args); } while (0)
-//wb added to debug out data buf
-//if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA
-#define IEEE80211_DEBUG_DATA(level, data, datalen)     \
-       do{ if ((ieee80211_debug_level & (level)) == (level))   \
-               {       \
-                       int i;                                  \
-                       u8* pdata = (u8*) data;                 \
-                       printk(KERN_DEBUG "ieee80211: %s()\n", __FUNCTION__);   \
-                       for(i=0; i<(int)(datalen); i++)                 \
-                       {                                               \
-                               printk("%2x ", pdata[i]);               \
-                               if ((i+1)%16 == 0) printk("\n");        \
-                       }                               \
-                       printk("\n");                   \
-               }                                       \
+       do { \
+               if (ieee80211_debug_level & (level)) \
+                       printk(KERN_DEBUG "ieee80211: " fmt, ## args); \
+       } while (0)
+#define IEEE80211_DEBUG_DATA(level, data, datalen) \
+       do { \
+               if ((ieee80211_debug_level & (level)) == (level)) { \
+                       u8 *pdata = (u8 *)data; \
+                       int i; \
+                       printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \
+                       for (i = 0; i < (int)(datalen); i++) { \
+                               printk("%2x ", pdata[i]); \
+                               if ((i + 1) % 16 == 0) \
+                                       printk("\n"); \
+                       } \
+                       printk("\n"); \
+               } \
        } while (0)
 #else
 #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
 #define IEEE80211_DEBUG_DATA(level, data, datalen) do {} while(0)
 #endif /* CONFIG_IEEE80211_DEBUG */
 
-/* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
-
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
+#define MAC_ARG(x) ((u8 *)(x))[0], ((u8 *)(x))[1], ((u8 *)(x))[2], \
+                  ((u8 *)(x))[3], ((u8 *)(x))[4], ((u8 *)(x))[5]
 
 /*
  * To use the debug system;
@@ -704,16 +237,17 @@ do { if (ieee80211_debug_level & (level)) \
 #define IEEE80211_DL_TX            (1<<8)
 #define IEEE80211_DL_RX            (1<<9)
 
-#define IEEE80211_DL_HT                   (1<<10)  //HT
-#define IEEE80211_DL_BA                   (1<<11)  //ba
-#define IEEE80211_DL_TS                   (1<<12)  //TS
-#define IEEE80211_DL_QOS           (1<<13)
-#define IEEE80211_DL_REORDER      (1<<14)
-#define IEEE80211_DL_IOT          (1<<15)
-#define IEEE80211_DL_IPS          (1<<16)
-#define IEEE80211_DL_TRACE        (1<<29)  //trace function, need to user net_ratelimit() together in order not to print too much to the screen
-#define IEEE80211_DL_DATA         (1<<30)   //use this flag to control whether print data buf out.
-#define IEEE80211_DL_ERR          (1<<31)   //always open
+#define IEEE80211_DL_HT                   (1 << 10)
+#define IEEE80211_DL_BA                   (1 << 11)
+#define IEEE80211_DL_TS                   (1 << 12)
+#define IEEE80211_DL_QOS           (1 << 13)
+#define IEEE80211_DL_REORDER      (1 << 14)
+#define IEEE80211_DL_IOT          (1 << 15)
+#define IEEE80211_DL_IPS          (1 << 16)
+#define IEEE80211_DL_TRACE        (1 << 29)
+#define IEEE80211_DL_DATA         (1 << 30)
+#define IEEE80211_DL_ERR          (1 << 31)
+
 #define IEEE80211_ERROR(f, a...) printk(KERN_ERR "ieee80211: " f, ## a)
 #define IEEE80211_WARNING(f, a...) printk(KERN_WARNING "ieee80211: " f, ## a)
 #define IEEE80211_DEBUG_INFO(f, a...)   IEEE80211_DEBUG(IEEE80211_DL_INFO, f, ## a)
@@ -729,32 +263,6 @@ do { if (ieee80211_debug_level & (level)) \
 #define IEEE80211_DEBUG_RX(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a)
 #define IEEE80211_DEBUG_QOS(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_QOS, f, ## a)
 
-#ifdef CONFIG_IEEE80211_DEBUG
-/* Added by Annie, 2005-11-22. */
-#define MAX_STR_LEN     64
-/* I want to see ASCII 33 to 126 only. Otherwise, I print '?'. Annie, 2005-11-22.*/
-#define PRINTABLE(_ch)  (_ch>'!' && _ch<'~')
-#define IEEE80211_PRINT_STR(_Comp, _TitleString, _Ptr, _Len)                                   \
-                        if((_Comp) & level)                                                    \
-                        {                                                                       \
-                                int             __i;                                            \
-                                u8  buffer[MAX_STR_LEN];                                       \
-                                int length = (_Len<MAX_STR_LEN)? _Len : (MAX_STR_LEN-1) ;      \
-                                memset(buffer, 0, MAX_STR_LEN);                                \
-                                memcpy(buffer, (u8 *)_Ptr, length );                           \
-                                for( __i=0; __i<MAX_STR_LEN; __i++ )                            \
-                                {                                                               \
-                                     if( !PRINTABLE(buffer[__i]) )   buffer[__i] = '?';        \
-                                }                                                               \
-                                buffer[length] = '\0';                                          \
-                                printk("Rtl819x: ");                                           \
-                                printk(_TitleString);                                         \
-                                printk(": %d, <%s>\n", _Len, buffer);                         \
-                        }
-#else
-#define IEEE80211_PRINT_STR(_Comp, _TitleString, _Ptr, _Len)  do {} while (0)
-#endif
-
 #include <linux/netdevice.h>
 #include <linux/if_arp.h> /* ARPHRD_ETHER */
 
@@ -796,93 +304,10 @@ struct ieee80211_snap_hdr {
 #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG)
 #define WLAN_GET_SEQ_SEQ(seq)  (((seq) & IEEE80211_SCTL_SEQ) >> 4)
 
-/* Authentication algorithms */
-#define WLAN_AUTH_OPEN 0
-#define WLAN_AUTH_SHARED_KEY 1
-#define WLAN_AUTH_LEAP 2
-
-#define WLAN_AUTH_CHALLENGE_LEN 128
+#define RTL_WLAN_AUTH_LEAP 2
 
 #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_SPECTRUM_MGMT (1<<8)
-#define WLAN_CAPABILITY_QOS (1<<9)
 #define WLAN_CAPABILITY_SHORT_SLOT (1<<10)
-#define WLAN_CAPABILITY_DSSS_OFDM (1<<13)
-
-/* 802.11g ERP information element */
-#define WLAN_ERP_NON_ERP_PRESENT (1<<0)
-#define WLAN_ERP_USE_PROTECTION (1<<1)
-#define WLAN_ERP_BARKER_PREAMBLE (1<<2)
-
-/* Status codes */
-enum ieee80211_statuscode {
-        WLAN_STATUS_SUCCESS = 0,
-        WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
-        WLAN_STATUS_CAPS_UNSUPPORTED = 10,
-        WLAN_STATUS_REASSOC_NO_ASSOC = 11,
-        WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
-        WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
-        WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
-        WLAN_STATUS_CHALLENGE_FAIL = 15,
-        WLAN_STATUS_AUTH_TIMEOUT = 16,
-        WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
-        WLAN_STATUS_ASSOC_DENIED_RATES = 18,
-        /* 802.11b */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
-        WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
-        WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
-        /* 802.11h */
-        WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
-        /* 802.11g */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
-        WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
-        /* 802.11i */
-        WLAN_STATUS_INVALID_IE = 40,
-        WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
-        WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
-        WLAN_STATUS_INVALID_AKMP = 43,
-        WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
-        WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
-        WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
-};
-
-/* Reason codes */
-enum ieee80211_reasoncode {
-        WLAN_REASON_UNSPECIFIED = 1,
-        WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
-        WLAN_REASON_DEAUTH_LEAVING = 3,
-        WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
-        WLAN_REASON_DISASSOC_AP_BUSY = 5,
-        WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
-        WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
-        WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
-        WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
-        /* 802.11h */
-        WLAN_REASON_DISASSOC_BAD_POWER = 10,
-        WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
-        /* 802.11i */
-        WLAN_REASON_INVALID_IE = 13,
-        WLAN_REASON_MIC_FAILURE = 14,
-        WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
-        WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
-        WLAN_REASON_IE_DIFFERENT = 17,
-        WLAN_REASON_INVALID_GROUP_CIPHER = 18,
-        WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
-        WLAN_REASON_INVALID_AKMP = 20,
-        WLAN_REASON_UNSUPP_RSN_VERSION = 21,
-        WLAN_REASON_INVALID_RSN_IE_CAP = 22,
-        WLAN_REASON_IEEE8021X_FAILED = 23,
-        WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
-};
 
 #define IEEE80211_STATMASK_SIGNAL (1<<0)
 #define IEEE80211_STATMASK_RSSI (1<<1)
@@ -974,7 +399,6 @@ struct ieee_ibss_seq {
  *       information for frames received.  Not setting these will not cause
  *       any adverse affects. */
 struct ieee80211_rx_stats {
-#if 1
        u32 mac_time[2];
        s8 rssi;
        u8 signal;
@@ -988,31 +412,29 @@ struct ieee80211_rx_stats {
        u64 tsf;
        u32 beacon_time;
        u8 nic_type;
+
        u16       Length;
-       //      u8        DataRate;      // In 0.5 Mbps
-       u8        SignalQuality; // in 0-100 index.
-       s32       RecvSignalPower; // Real power in dBm for this packet, no beautification and aggregation.
-       s8        RxPower; // in dBm Translate from PWdB
-       u8        SignalStrength; // in 0-100 index.
+       u8        SignalQuality;        /* in 0-100 index */
+       /* real power in dBm for this packet, no beautification & aggregation */
+       s32       RecvSignalPower;
+       s8        RxPower;              /* in dBm Translate from PWdB */
+       u8        SignalStrength;       /* in 0-100 index */
        u16       bHwError:1;
        u16       bCRC:1;
        u16       bICV:1;
        u16       bShortPreamble:1;
-       u16       Antenna:1;      //for rtl8185
-       u16       Decrypted:1;    //for rtl8185, rtl8187
-       u16       Wakeup:1;       //for rtl8185
-       u16       Reserved0:1;    //for rtl8185
+       u16       Antenna:1;            /* RTL8185 */
+       u16       Decrypted:1;          /* RTL8185, RTL8187 */
+       u16       Wakeup:1;             /* RTL8185 */
+       u16       Reserved0:1;          /* RTL8185 */
        u8        AGC;
        u32       TimeStampLow;
        u32       TimeStampHigh;
        bool      bShift;
-       bool      bIsQosData;             // Added by Annie, 2005-12-22.
+       bool      bIsQosData;
        u8        UserPriority;
 
-       //1!!!!!!!!!!!!!!!!!!!!!!!!!!!
-       //1Attention Please!!!<11n or 8190 specific code should be put below this line>
-       //1!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+       /* < 11n or 8190 specific code */
        u8        RxDrvInfoSize;
        u8        RxBufShift;
        bool      bIsAMPDU;
@@ -1020,25 +442,25 @@ struct ieee80211_rx_stats {
        bool      bContainHTC;
        bool      RxIs40MHzPacket;
        u32       RxPWDBAll;
-       u8        RxMIMOSignalStrength[4];        // in 0~100 index
+       u8        RxMIMOSignalStrength[4]; /* in 0~100 index */
        s8        RxMIMOSignalQuality[2];
        bool      bPacketMatchBSSID;
        bool      bIsCCK;
        bool      bPacketToSelf;
-       //added by amy
-       u8*       virtual_address;
-       u16          packetlength;              // Total packet length: Must equal to sum of all FragLength
-       u16          fraglength;                        // FragLength should equal to PacketLength in non-fragment case
-       u16          fragoffset;                        // Data offset for this fragment
-       u16          ntotalfrag;
-       bool              bisrxaggrsubframe;
-       bool              bPacketBeacon;        //cosa add for rssi
-       bool              bToSelfBA;            //cosa add for rssi
-       char      cck_adc_pwdb[4];      //cosa add for rx path selection
-       u16               Seq_Num;
-       u8              nTotalAggPkt;           // Number of aggregated packets.
-#endif
 
+       u8        *virtual_address;
+       /* total packet length: must equal to sum of all FragLength */
+       u16       packetlength;
+       /* FragLength should equal to PacketLength in non-fragment case */
+       u16       fraglength;
+       u16       fragoffset;           /* data offset for this fragment */
+       u16       ntotalfrag;
+       bool      bisrxaggrsubframe;
+       bool      bPacketBeacon;        /* for rssi */
+       bool      bToSelfBA;            /* for rssi */
+       char      cck_adc_pwdb[4];      /* for rx path selection */
+       u16       Seq_Num;
+       u8        nTotalAggPkt;         /* number of aggregated packets */
 };
 
 /* IEEE 802.11 requires that STA supports concurrent reception of at least
@@ -1093,7 +515,6 @@ struct ieee80211_device;
 #define SEC_UNICAST_GROUP (1<<6)
 #define SEC_LEVEL         (1<<7)
 #define SEC_ENABLED       (1<<8)
-#define SEC_ENCRYPT       (1<<9)
 
 #define SEC_LEVEL_0      0 /* None */
 #define SEC_LEVEL_1      1 /* WEP 40 and 104 bit */
@@ -1101,15 +522,9 @@ struct ieee80211_device;
 #define SEC_LEVEL_2_CKIP 3 /* Level 1 + CKIP */
 #define SEC_LEVEL_3      4 /* Level 2 + CCMP */
 
-#define SEC_ALG_NONE            0
-#define SEC_ALG_WEP             1
-#define SEC_ALG_TKIP            2
-#define SEC_ALG_CCMP            3
-
 #define WEP_KEYS               4
 #define WEP_KEY_LEN            13
 #define SCM_KEY_LEN             32
-#define SCM_TEMPORAL_KEY_LENGTH 16
 
 struct ieee80211_security {
        u16 active_key:2,
@@ -1137,7 +552,7 @@ Total: 28-2340 bytes
 */
 
 /* Management Frame Information Element Types */
-enum ieee80211_mfie {
+enum {
         MFIE_TYPE_SSID = 0,
         MFIE_TYPE_RATES = 1,
         MFIE_TYPE_FH_SET = 2,
@@ -1173,7 +588,7 @@ enum ieee80211_mfie {
 /* Minimal header; can be used for passing 802.11 frames with sufficient
  * information to determine what type of underlying data type is actually
  * stored in the data. */
-struct ieee80211_hdr {
+struct rtl_ieee80211_hdr {
         __le16 frame_ctl;
         __le16 duration_id;
         u8 payload[0];
@@ -1194,16 +609,6 @@ struct ieee80211_hdr_2addr {
         u8 payload[0];
 } __attribute__ ((packed));
 
-struct ieee80211_hdr_3addr {
-       __le16 frame_ctl;
-       __le16 duration_id;
-       u8 addr1[ETH_ALEN];
-       u8 addr2[ETH_ALEN];
-       u8 addr3[ETH_ALEN];
-       __le16 seq_ctl;
-        u8 payload[0];
-} __attribute__ ((packed));
-
 struct ieee80211_hdr_4addr {
        __le16 frame_ctl;
        __le16 duration_id;
@@ -1249,7 +654,7 @@ struct ieee80211_authentication {
        __le16 algorithm;
        __le16 transaction;
        __le16 status;
-       /*challenge*/
+       /* challenge */
        struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
@@ -1274,9 +679,6 @@ struct ieee80211_probe_response {
         struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
-/* Alias beacon for probe_response */
-#define ieee80211_beacon ieee80211_probe_response
-
 struct ieee80211_assoc_request_frame {
        struct ieee80211_hdr_3addr header;
        __le16 capability;
@@ -1313,12 +715,6 @@ struct ieee80211_txb {
        struct sk_buff *fragments[0];
 };
 
-#define MAX_TX_AGG_COUNT                 16
-struct ieee80211_drv_agg_txb {
-       u8 nr_drv_agg_frames;
-       struct sk_buff *tx_agg_frames[MAX_TX_AGG_COUNT];
-}__attribute__((packed));
-
 #define MAX_SUBFRAME_COUNT               64
 struct ieee80211_rxb {
        u8 nr_subframes;
@@ -1327,19 +723,7 @@ struct ieee80211_rxb {
        u8 src[ETH_ALEN];
 }__attribute__((packed));
 
-typedef union _frameqos {
-       u16 shortdata;
-       u8  chardata[2];
-       struct {
-               u16 tid:4;
-               u16 eosp:1;
-               u16 ack_policy:2;
-               u16 reserved:1;
-               u16 txop:8;
-       }field;
-}frameqos,*pframeqos;
-
-/* SWEEP TABLE ENTRIES NUMBER*/
+/* SWEEP TABLE ENTRIES NUMBER */
 #define MAX_SWEEP_TAB_ENTRIES            42
 #define MAX_SWEEP_TAB_ENTRIES_PER_PACKET  7
 /* MAX_RATES_LENGTH needs to be 12.  The spec says 8, and many APs
@@ -1351,31 +735,25 @@ typedef union _frameqos {
 #define MAX_NETWORK_COUNT                  128
 
 #define MAX_CHANNEL_NUMBER                 161
-#define IEEE80211_SOFTMAC_SCAN_TIME       100
-//(HZ / 2)
+
+#define IEEE80211_SOFTMAC_SCAN_TIME       100 /* (HZ / 2) */
 #define IEEE80211_SOFTMAC_ASSOC_RETRY_TIME (HZ * 2)
 
 #define CRC_LENGTH                 4U
 
 #define MAX_WPA_IE_LEN 64
 
-#define NETWORK_EMPTY_ESSID (1<<0)
-#define NETWORK_HAS_OFDM    (1<<1)
-#define NETWORK_HAS_CCK     (1<<2)
+#define NETWORK_EMPTY_ESSID    (1 << 0)
+#define NETWORK_HAS_OFDM       (1 << 1)
+#define NETWORK_HAS_CCK                (1 << 2)
 
 /* QoS structure */
-#define NETWORK_HAS_QOS_PARAMETERS      (1<<3)
-#define NETWORK_HAS_QOS_INFORMATION     (1<<4)
-#define NETWORK_HAS_QOS_MASK            (NETWORK_HAS_QOS_PARAMETERS | \
-                                         NETWORK_HAS_QOS_INFORMATION)
-/* 802.11h */
-#define NETWORK_HAS_POWER_CONSTRAINT    (1<<5)
-#define NETWORK_HAS_CSA                 (1<<6)
-#define NETWORK_HAS_QUIET               (1<<7)
-#define NETWORK_HAS_IBSS_DFS            (1<<8)
-#define NETWORK_HAS_TPC_REPORT          (1<<9)
-
-#define NETWORK_HAS_ERP_VALUE           (1<<10)
+#define NETWORK_HAS_QOS_PARAMETERS     (1 << 3)
+#define NETWORK_HAS_QOS_INFORMATION    (1 << 4)
+#define NETWORK_HAS_QOS_MASK           (NETWORK_HAS_QOS_PARAMETERS | \
+                                        NETWORK_HAS_QOS_INFORMATION)
+
+#define NETWORK_HAS_ERP_VALUE          (1 << 10)
 
 #define QOS_QUEUE_NUM                   4
 #define QOS_OUI_LEN                     3
@@ -1385,7 +763,7 @@ typedef union _frameqos {
 #define QOS_OUI_PARAM_SUB_TYPE          1
 #define QOS_VERSION_1                   1
 #define QOS_AIFSN_MIN_VALUE             2
-#if 1
+
 struct ieee80211_qos_information_element {
         u8 elementID;
         u8 length;
@@ -1429,7 +807,6 @@ struct ieee80211_tim_parameters {
         u8 tim_period;
 } __attribute__ ((packed));
 
-//#else
 struct ieee80211_wmm_ac_param {
        u8 ac_aci_acm_aifsn;
        u8 ac_ecwmin_ecwmax;
@@ -1460,7 +837,7 @@ struct ieee80211_wmm_tspec_elem {
        u16 surp_band_allow;
        u16 medium_time;
 }__attribute__((packed));
-#endif
+
 enum eap_type {
        EAP_PACKET = 0,
        EAPOL_START,
@@ -1481,17 +858,6 @@ static inline const char *eap_get_type(int type)
 {
        return ((u32)type >= ARRAY_SIZE(eap_types)) ? "Unknown" : eap_types[type];
 }
-//added by amy for reorder
-static inline u8 Frame_QoSTID(u8* buf)
-{
-       struct ieee80211_hdr_3addr *hdr;
-       u16 fc;
-       hdr = (struct ieee80211_hdr_3addr *)buf;
-       fc = le16_to_cpu(hdr->frame_ctl);
-       return (u8)((frameqos*)(buf + (((fc & IEEE80211_FCTL_TODS)&&(fc & IEEE80211_FCTL_FROMDS))? 30 : 24)))->field.tid;
-}
-
-//added by amy for reorder
 
 struct eapol {
        u8 snap[6];
@@ -1501,7 +867,7 @@ struct eapol {
        u16 length;
 } __attribute__ ((packed));
 
-struct ieee80211_softmac_stats{
+struct ieee80211_softmac_stats {
        unsigned int rx_ass_ok;
        unsigned int rx_ass_err;
        unsigned int rx_probe_rq;
@@ -1549,7 +915,7 @@ struct ieee80211_info_element_hdr {
 */
 
 #define IEEE80211_DEFAULT_TX_ESSID "Penguin"
-#define IEEE80211_DEFAULT_BASIC_RATE 2 //1Mbps
+#define IEEE80211_DEFAULT_BASIC_RATE 2 /* 1Mbps */
 
 enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM_six_frame};
 #define MAX_SP_Len  (WMM_all_frame << 4)
@@ -1579,18 +945,15 @@ enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM_six_frame};
 #define WME_AIFSN_MASK 0x03
 #define WME_AC_PRAM_LEN 16
 
-#define MAX_RECEIVE_BUFFER_SIZE 9100
-
 //UP Mapping to AC, using in MgntQuery_SequenceNumber() and maybe for DSCP
 //#define UP2AC(up)    ((up<3) ? ((up==0)?1:0) : (up>>1))
-#if 1
 #define UP2AC(up) (               \
        ((up) < 1) ? WME_AC_BE : \
        ((up) < 3) ? WME_AC_BK : \
        ((up) < 4) ? WME_AC_BE : \
        ((up) < 6) ? WME_AC_VI : \
        WME_AC_VO)
-#endif
+
 //AC Mapping to UP, using in Tx part for selecting the corresponding TX queue
 #define AC2UP(_ac)     (       \
        ((_ac) == WME_AC_VO) ? 6 : \
@@ -1599,7 +962,9 @@ enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM_six_frame};
        0)
 
 #define        ETHER_ADDR_LEN          6       /* length of an Ethernet address */
-#define ETHERNET_HEADER_SIZE    14      /* length of two Ethernet address plus ether type*/
+
+/* length of two Ethernet address plus ether type */
+#define ETHERNET_HEADER_SIZE   14
 
 struct ether_header {
        u8 ether_dhost[ETHER_ADDR_LEN];
@@ -1614,31 +979,6 @@ struct    ether_header {
 #define        ETHERTYPE_IP    0x0800          /* IP protocol */
 #endif
 
-typedef struct _bss_ht{
-
-       bool                            support_ht;
-
-       // HT related elements
-       u8                                      ht_cap_buf[32];
-       u16                                     ht_cap_len;
-       u8                                      ht_info_buf[32];
-       u16                                     ht_info_len;
-
-       HT_SPEC_VER                     ht_spec_ver;
-       //HT_CAPABILITY_ELE                     bdHTCapEle;
-       //HT_INFORMATION_ELE            bdHTInfoEle;
-
-       bool                            aggregation;
-       bool                            long_slot_time;
-}bss_ht, *pbss_ht;
-
-typedef enum _erp_t{
-       ERP_NonERPpresent       = 0x01,
-       ERP_UseProtection       = 0x02,
-       ERP_BarkerPreambleMode = 0x04,
-} erp_t;
-
-
 struct ieee80211_network {
        /* These entries are used to identify a unique network */
        u8 bssid[ETH_ALEN];
@@ -1646,25 +986,24 @@ struct ieee80211_network {
        /* Ensure null-terminated for any debug msgs */
        u8 ssid[IW_ESSID_MAX_SIZE + 1];
        u8 ssid_len;
-#if 1
+
         struct ieee80211_qos_data qos_data;
-#else
-       // Qos related. Added by Annie, 2005-11-01.
-        BSS_QOS   BssQos;
-#endif
 
-       //added by amy for LEAP
+       /* for LEAP */
        bool    bWithAironetIE;
        bool    bCkipSupported;
        bool    bCcxRmEnable;
        u16     CcxRmState[2];
-       // CCXv4 S59, MBSSID.
+
+       /* CCXv4 S59, MBSSID. */
        bool    bMBssidValid;
        u8      MBssidMask;
        u8      MBssid[6];
-       // CCX 2 S38, WLAN Device Version Number element. Annie, 2006-08-20.
+
+       /* CCX 2 S38, WLAN Device Version Number element. */
        bool    bWithCcxVerNum;
        u8      BssCcxVerNumber;
+
        /* These are network statistics */
        struct ieee80211_rx_stats stats;
        u16 capability;
@@ -1695,16 +1034,13 @@ struct ieee80211_network {
         u8 wmm_info;
         struct ieee80211_wmm_ac_param wmm_param[4];
         u8 QoS_Enable;
-#ifdef THOMAS_TURBO
        u8 Turbo_Enable;//enable turbo mode, added by thomas
-#endif
-#ifdef ENABLE_DOT11D
        u16 CountryIeLen;
        u8 CountryIeBuf[MAX_IE_LEN];
-#endif
-        // HT Related, by amy, 2008.04.29
+
+       /* HT Related */
        BSS_HT  bssht;
-       // Add to handle broadcom AP management frame CCK rate.
+       /* Added to handle broadcom AP management frame CCK rate. */
        bool broadcom_cap_exist;
        bool realtek_cap_exit;
        bool marvell_cap_exist;
@@ -1712,14 +1048,12 @@ struct ieee80211_network {
        bool atheros_cap_exist;
        bool cisco_cap_exist;
        bool unknown_cap_exist;
-//     u8      berp_info;
-       bool    berp_info_valid;
+       bool berp_info_valid;
        bool buseprotection;
-       //put at the end of the structure.
-       struct list_head list;
+
+       struct list_head list;  /* put at the end of the structure */
 };
 
-#if 1
 enum ieee80211_state {
 
        /* the card is not linked at all */
@@ -1758,24 +1092,12 @@ enum ieee80211_state {
        IEEE80211_LINKED_SCANNING,
 
 };
-#else
-enum ieee80211_state {
-        IEEE80211_UNINITIALIZED = 0,
-        IEEE80211_INITIALIZED,
-        IEEE80211_ASSOCIATING,
-        IEEE80211_ASSOCIATED,
-        IEEE80211_AUTHENTICATING,
-        IEEE80211_AUTHENTICATED,
-        IEEE80211_SHUTDOWN
-};
-#endif
 
 #define DEFAULT_MAX_SCAN_AGE (15 * HZ)
 #define DEFAULT_FTS 2346
 
 #define CFG_IEEE80211_RESERVE_FCS (1<<0)
 #define CFG_IEEE80211_COMPUTE_FCS (1<<1)
-#define CFG_IEEE80211_RTS (1<<2)
 
 #define IEEE80211_24GHZ_MIN_CHANNEL 1
 #define IEEE80211_24GHZ_MAX_CHANNEL 14
@@ -1787,167 +1109,12 @@ enum ieee80211_state {
 #define IEEE80211_52GHZ_CHANNELS (IEEE80211_52GHZ_MAX_CHANNEL - \
                                   IEEE80211_52GHZ_MIN_CHANNEL + 1)
 
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11))
-extern inline int is_multicast_ether_addr(const u8 *addr)
-{
-        return ((addr[0] != 0xff) && (0x01 & addr[0]));
-}
-#endif
-
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13))
-extern inline int is_broadcast_ether_addr(const u8 *addr)
-{
-       return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
-               (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
-}
-#endif
-
 typedef struct tx_pending_t{
        int frag;
        struct ieee80211_txb *txb;
 }tx_pending_t;
 
-typedef struct _bandwidth_autoswitch
-{
-       long threshold_20Mhzto40Mhz;
-       long    threshold_40Mhzto20Mhz;
-       bool bforced_tx20Mhz;
-       bool bautoswitch_enable;
-}bandwidth_autoswitch,*pbandwidth_autoswitch;
-
-
-//added by amy for order
-
-#define REORDER_WIN_SIZE       128
-#define REORDER_ENTRY_NUM      128
-typedef struct _RX_REORDER_ENTRY
-{
-       struct list_head        List;
-       u16                     SeqNum;
-       struct ieee80211_rxb* prxb;
-} RX_REORDER_ENTRY, *PRX_REORDER_ENTRY;
-//added by amy for order
-typedef enum _Fsync_State{
-       Default_Fsync,
-       HW_Fsync,
-       SW_Fsync
-}Fsync_State;
-
-// Power save mode configured.
-typedef        enum _RT_PS_MODE
-{
-       eActive,        // Active/Continuous access.
-       eMaxPs,         // Max power save mode.
-       eFastPs         // Fast power save mode.
-}RT_PS_MODE;
-
-typedef enum _IPS_CALLBACK_FUNCION
-{
-       IPS_CALLBACK_NONE = 0,
-       IPS_CALLBACK_MGNT_LINK_REQUEST = 1,
-       IPS_CALLBACK_JOIN_REQUEST = 2,
-}IPS_CALLBACK_FUNCION;
-
-typedef enum _RT_JOIN_ACTION{
-       RT_JOIN_INFRA   = 1,
-       RT_JOIN_IBSS  = 2,
-       RT_START_IBSS = 3,
-       RT_NO_ACTION  = 4,
-}RT_JOIN_ACTION;
-
-typedef struct _IbssParms{
-       u16   atimWin;
-}IbssParms, *PIbssParms;
-#define MAX_NUM_RATES  264 // Max num of support rates element: 8,  Max num of ext. support rate: 255. 061122, by rcnjko.
-
-// RF state.
-typedef        enum _RT_RF_POWER_STATE
-{
-       eRfOn,
-       eRfSleep,
-       eRfOff
-}RT_RF_POWER_STATE;
-
-typedef struct _RT_POWER_SAVE_CONTROL
-{
-
-       //
-       // Inactive Power Save(IPS) : Disable RF when disconnected
-       //
-       bool                            bInactivePs;
-       bool                            bIPSModeBackup;
-       bool                            bHaltAdapterClkRQ;
-       bool                            bSwRfProcessing;
-       RT_RF_POWER_STATE       eInactivePowerState;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
-       struct work_struct      InactivePsWorkItem;
-#else
-       struct tq_struct        InactivePsWorkItem;
-#endif
-       struct timer_list       InactivePsTimer;
-
-       // Return point for join action
-       IPS_CALLBACK_FUNCION    ReturnPoint;
-
-       // Recored Parameters for rescheduled JoinRequest
-       bool                            bTmpBssDesc;
-       RT_JOIN_ACTION          tmpJoinAction;
-       struct ieee80211_network tmpBssDesc;
-
-       // Recored Parameters for rescheduled MgntLinkRequest
-       bool                            bTmpScanOnly;
-       bool                            bTmpActiveScan;
-       bool                            bTmpFilterHiddenAP;
-       bool                            bTmpUpdateParms;
-       u8                                      tmpSsidBuf[33];
-       OCTET_STRING                    tmpSsid2Scan;
-       bool                            bTmpSsid2Scan;
-       u8                                      tmpNetworkType;
-       u8                                      tmpChannelNumber;
-       u16                                     tmpBcnPeriod;
-       u8                                      tmpDtimPeriod;
-       u16                                     tmpmCap;
-       OCTET_STRING                    tmpSuppRateSet;
-       u8                                      tmpSuppRateBuf[MAX_NUM_RATES];
-       bool                            bTmpSuppRate;
-       IbssParms                               tmpIbpm;
-       bool                            bTmpIbpm;
-
-       //
-       // Leisre Poswer Save : Disable RF if connected but traffic is not busy
-       //
-       bool                            bLeisurePs;
-       u32                             PowerProfile;
-       u8                              LpsIdleCount;
-       u8                              RegMaxLPSAwakeIntvl;
-       u8                              LPSAwakeIntvl;
-
-       //RF OFF Level
-       u32                             CurPsLevel;
-       u32                             RegRfPsLevel;
-
-       //Fw Control LPS
-       bool                            bFwCtrlLPS;
-       u8                              FWCtrlPSMode;
-
-       //2009.01.01 added by tynli
-       // Record if there is a link request in IPS RF off progress.
-       bool                            LinkReqInIPSRFOffPgs;
-       // To make sure that connect info should be executed, so we set the bit to filter the link info which comes after the connect info.
-       bool                            BufConnectinfoBefore;
-
-}RT_POWER_SAVE_CONTROL,*PRT_POWER_SAVE_CONTROL;
-
-typedef u32 RT_RF_CHANGE_SOURCE;
-#define RF_CHANGE_BY_SW BIT31
-#define RF_CHANGE_BY_HW BIT30
-#define RF_CHANGE_BY_PS BIT29
-#define RF_CHANGE_BY_IPS BIT28
-#define RF_CHANGE_BY_INIT      0       // Do not change the RFOff reason. Defined by Bruce, 2008-01-17.
-
-#ifdef ENABLE_DOT11D
-typedef enum
-{
+enum {
        COUNTRY_CODE_FCC = 0,
        COUNTRY_CODE_IC = 1,
        COUNTRY_CODE_ETSI = 2,
@@ -1959,108 +1126,66 @@ typedef enum
        COUNTRY_CODE_TELEC,
        COUNTRY_CODE_MIC,
        COUNTRY_CODE_GLOBAL_DOMAIN
-}country_code_type_t;
-#endif
-       // Firmware realted CMD IO.
-typedef        enum _FW_CMD_IO_TYPE{
-       FW_CMD_DIG_ENABLE = 0, // For DIG DM
-       FW_CMD_DIG_DISABLE = 1,
-       FW_CMD_DIG_HALT = 2,
-       FW_CMD_DIG_RESUME = 3,
-       FW_CMD_HIGH_PWR_ENABLE = 4, // For High Power DM
-       FW_CMD_HIGH_PWR_DISABLE = 5,
-       FW_CMD_RA_RESET = 6, // For Rate adaptive DM
-       FW_CMD_RA_ACTIVE= 7,
-       FW_CMD_RA_REFRESH_N= 8,
-       FW_CMD_RA_REFRESH_BG= 9,
-       FW_CMD_IQK_ENABLE = 10, // For FW supported IQK
-       FW_CMD_TXPWR_TRACK_ENABLE = 11, // Tx power tracking switch
-       FW_CMD_TXPWR_TRACK_DISABLE = 12,        // Tx power tracking switch
-       FW_CMD_PAUSE_DM_BY_SCAN = 13,
-       FW_CMD_RESUME_DM_BY_SCAN = 14,
-       FW_CMD_MID_HIGH_PWR_ENABLE = 15,
-       FW_CMD_LPS_ENTER = 16,                  // Indifate firmware that driver enters LPS, For PS-Poll hardware bug
-       FW_CMD_LPS_LEAVE = 17,                  // Indicate firmware that driver leave LPS, 2009/1/4, by Emily
-}FW_CMD_IO_TYPE,*PFW_CMD_IO_TYPE;
-#define RT_MAX_LD_SLOT_NUM     10
-typedef struct _RT_LINK_DETECT_T{
-
-       u32                             NumRecvBcnInPeriod;
-       u32                             NumRecvDataInPeriod;
-
-       u32                             RxBcnNum[RT_MAX_LD_SLOT_NUM];   // number of Rx beacon / CheckForHang_period  to determine link status
-       u32                             RxDataNum[RT_MAX_LD_SLOT_NUM];  // number of Rx data / CheckForHang_period  to determine link status
-       u16                             SlotNum;        // number of CheckForHang period to determine link status
-       u16                             SlotIndex;
-
-       u32                             NumTxOkInPeriod;
-       u32                             NumRxOkInPeriod;
-       bool                            bBusyTraffic;
-}RT_LINK_DETECT_T, *PRT_LINK_DETECT_T;
+};
 
+#include "ieee80211_r8192s.h"
 
 struct ieee80211_device {
        struct net_device *dev;
         struct ieee80211_security sec;
 
-       //hw security related
-//     u8 hwsec_support; //support?
-       u8 hwsec_active;  //hw security active.
+       /* hw security related */
+       u8 hwsec_active;
        bool is_silent_reset;
        bool is_roaming;
        bool ieee_up;
-       //added by amy
        bool bSupportRemoteWakeUp;
-       RT_PS_MODE      dot11PowerSaveMode; // Power save mode configured.
+       RT_PS_MODE dot11PowerSaveMode;
        bool actscanning;
-       //added by amy 090313
        bool be_scan_inprogress;
        bool beinretry;
-       RT_RF_POWER_STATE               eRFPowerState;
-       RT_RF_CHANGE_SOURCE     RfOffReason;
+       RT_RF_POWER_STATE eRFPowerState;
+       u32 RfOffReason;
        bool is_set_key;
-       //11n spec related I wonder if These info structure need to be moved out of ieee80211_device
 
-       //11n HT below
-       PRT_HIGH_THROUGHPUT     pHTInfo;
-       //struct timer_list             SwBwTimer;
-//     spinlock_t chnlop_spinlock;
+       /* 11n HT below */
+       PRT_HIGH_THROUGHPUT pHTInfo;
        spinlock_t bw_spinlock;
 
        spinlock_t reorder_spinlock;
-       // for HT operation rate set.  we use this one for HT data rate to seperate different descriptors
-       //the way fill this is the same as in the IE
-       u8      Regdot11HTOperationalRateSet[16];               //use RATR format
-       u8      dot11HTOperationalRateSet[16];          //use RATR format
+       /*
+        * for HT operation rate set, we use this one for HT data rate to
+        * seperate different descriptors the way fill this is the same as
+        * in the IE
+        */
+       u8      Regdot11HTOperationalRateSet[16];       /* use RATR format */
+       u8      dot11HTOperationalRateSet[16];          /* use RATR format */
        u8      RegHTSuppRateSet[16];
-       u8                              HTCurrentOperaRate;
-       u8                              HTHighestOperaRate;
-       //wb added for rate operation mode to firmware
+       u8      HTCurrentOperaRate;
+       u8      HTHighestOperaRate;
+       /* for rate operation mode to firmware */
        u8      bTxDisableRateFallBack;
        u8      bTxUseDriverAssingedRate;
        atomic_t        atm_chnlop;
        atomic_t        atm_swbw;
-//     u8      HTHighestOperaRate;
-//     u8      HTCurrentOperaRate;
 
-       // 802.11e and WMM Traffic Stream Info (TX)
-       struct list_head                Tx_TS_Admit_List;
-       struct list_head                Tx_TS_Pending_List;
-       struct list_head                Tx_TS_Unused_List;
+       /* 802.11e and WMM Traffic Stream Info (TX) */
+       struct list_head        Tx_TS_Admit_List;
+       struct list_head        Tx_TS_Pending_List;
+       struct list_head        Tx_TS_Unused_List;
        TX_TS_RECORD            TxTsRecord[TOTAL_TS_NUM];
-       // 802.11e and WMM Traffic Stream Info (RX)
-       struct list_head                Rx_TS_Admit_List;
-       struct list_head                Rx_TS_Pending_List;
-       struct list_head                Rx_TS_Unused_List;
+       /* 802.11e and WMM Traffic Stream Info (RX) */
+       struct list_head        Rx_TS_Admit_List;
+       struct list_head        Rx_TS_Pending_List;
+       struct list_head        Rx_TS_Unused_List;
        RX_TS_RECORD            RxTsRecord[TOTAL_TS_NUM];
-//#ifdef TO_DO_LIST
+
        RX_REORDER_ENTRY        RxReorderEntry[128];
-       struct list_head                RxReorder_Unused_List;
-//#endif
-       // Qos related. Added by Annie, 2005-11-01.
-//     PSTA_QOS                        pStaQos;
-       u8                              ForcedPriority;         // Force per-packet priority 1~7. (default: 0, not to force it.)
+       struct list_head        RxReorder_Unused_List;
 
+       /* Qos related */
+       /* Force per-packet priority 1~7. (default: 0, not to force it.) */
+       u8 ForcedPriority;
 
        /* Bookkeeping structures */
        struct net_device_stats stats;
@@ -2167,14 +1292,12 @@ struct ieee80211_device {
 
         u16 prev_seq_ctl;       /* used to drop duplicate frames */
 
-       /* map of allowed channels. 0 is dummy */
-       // FIXME: remeber to default to a basic channel plan depending of the PHY type
-#ifdef ENABLE_DOT11D
-       void* pDot11dInfo;
+       /*
+        * map of allowed channels. 0 is dummy, FIXME: remeber to default to
+        * a basic channel plan depending of the PHY type
+        */
+       void *pDot11dInfo;
        bool bGlobalDomain;
-#else
-       int channel_map[MAX_CHANNEL_NUMBER+1];
-#endif
        int rate;       /* current rate */
        int basic_rate;
        //FIXME: pleace callback, see if redundant with softmac_features
@@ -2242,46 +1365,46 @@ struct ieee80211_device {
        struct sk_buff *mgmt_queue_ring[MGMT_QUEUE_NUM];
        int mgmt_queue_head;
        int mgmt_queue_tail;
-//{ added for rtl819x
-#define IEEE80211_QUEUE_LIMIT 128
+
+/* rtl819x start */
        u8 AsocRetryCount;
        unsigned int hw_header;
        struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE];
-       struct sk_buff_head  skb_aggQ[MAX_QUEUE_SIZE];
-       struct sk_buff_head  skb_drv_aggQ[MAX_QUEUE_SIZE];
-       u32     sta_edca_param[4];
+       struct sk_buff_head skb_aggQ[MAX_QUEUE_SIZE];
+       struct sk_buff_head skb_drv_aggQ[MAX_QUEUE_SIZE];
+       u32 sta_edca_param[4];
        bool aggregation;
-       // Enable/Disable Rx immediate BA capability.
+       /* Enable/Disable Rx immediate BA capability. */
        bool enable_rx_imm_BA;
        bool bibsscoordinator;
 
-       //+by amy for DM ,080515
-       //Dynamic Tx power for near/far range enable/Disable  , by amy , 2008-05-15
-       bool    bdynamic_txpower_enable;
+       /* Dynamic Tx power for near/far range enable/disable. */
+       bool bdynamic_txpower_enable;
 
        bool bCTSToSelfEnable;
-       u8      CTSToSelfTH;
+       u8 CTSToSelfTH;
 
-       u32     fsync_time_interval;
+       u32     fsync_time_interval;
        u32     fsync_rate_bitmap;
        u8      fsync_rssi_threshold;
        bool    bfsync_enable;
 
-       u8      fsync_multiple_timeinterval;            // FsyncMultipleTimeInterval * FsyncTimeInterval
-       u32     fsync_firstdiff_ratethreshold;          // low threshold
-       u32     fsync_seconddiff_ratethreshold;  // decrease threshold
-       Fsync_State                     fsync_state;
+       u8      fsync_multiple_timeinterval;    /* value * FsyncTimeInterval */
+       u32     fsync_firstdiff_ratethreshold;  /* low threshold */
+       u32     fsync_seconddiff_ratethreshold; /* decrease threshold */
+       Fsync_State     fsync_state;
        bool            bis_any_nonbepkts;
-       //20Mhz 40Mhz AutoSwitch Threshold
-       bandwidth_autoswitch bandwidth_auto_switch;
-       //for txpower tracking
+       /* 20Mhz 40Mhz AutoSwitch Threshold */
+       struct bandwidth_autoswitch bandwidth_auto_switch;
+       /* for txpower tracking */
        bool FwRWRF;
 
-       //added by amy for AP roaming
-       RT_LINK_DETECT_T        LinkDetectInfo;
-        //added by amy for ps
-       RT_POWER_SAVE_CONTROL   PowerSaveControl;
-//}
+       /* for AP roaming */
+       struct rt_link_detect LinkDetectInfo;
+
+       struct rt_power_save_control PowerSaveControl;
+/* rtl819x end */
+
        /* used if IEEE_SOFTMAC_TX_QUEUE is set */
        struct  tx_pending_t tx_pending;
 
@@ -2290,47 +1413,16 @@ struct ieee80211_device {
 
        /* used if IEEE_SOFTMAC_BEACONS is set */
        struct timer_list beacon_timer;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
         struct work_struct associate_complete_wq;
         struct work_struct associate_procedure_wq;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
         struct delayed_work softmac_scan_wq;
         struct delayed_work associate_retry_wq;
-        struct delayed_work start_ibss_wq;
-        struct delayed_work hw_wakeup_wq;
+       struct delayed_work start_ibss_wq;
+       struct delayed_work hw_wakeup_wq;
        struct delayed_work hw_sleep_wq;
        struct delayed_work link_change_wq;
-#else
-        struct work_struct softmac_scan_wq;
-        struct work_struct associate_retry_wq;
-       struct work_struct start_ibss_wq;
-       struct work_struct hw_wakeup_wq;
-       struct work_struct hw_sleep_wq;
-       struct work_struct link_change_wq;
-#endif
         struct work_struct wx_sync_scan_wq;
         struct workqueue_struct *wq;
-#else
-       /* used for periodly scan */
-       struct timer_list scan_timer;
-
-       struct tq_struct associate_complete_wq;
-       struct tq_struct associate_retry_wq;
-       struct tq_struct start_ibss_wq;
-       struct tq_struct associate_procedure_wq;
-       struct tq_struct softmac_scan_wq;
-       struct tq_struct wx_sync_scan_wq;
-       struct tq_struct hw_wakeup_wq;
-       struct tq_struct hw_sleep_wq;
-       struct tq_struct link_change_wq;
-
-#endif
-        // Qos related. Added by Annie, 2005-11-01.
-        //STA_QOS  StaQos;
-
-        //u32 STA_EDCA_PARAM[4];
-       //CHANNEL_ACCESS_SETTING ChannelAccessSetting;
-
 
        /* Callback functions */
        void (*set_security)(struct net_device *dev,
@@ -2344,11 +1436,11 @@ struct ieee80211_device {
                               struct net_device *dev);
 
        int (*reset_port)(struct net_device *dev);
-        int (*is_queue_full) (struct net_device * dev, int pri);
+       int (*is_queue_full)(struct net_device *dev, int pri);
 
-        int (*handle_management) (struct net_device * dev,
-                                  struct ieee80211_network * network, u16 type);
-        int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
+       int (*handle_management)(struct net_device *dev,
+                                struct ieee80211_network *network, u16 type);
+       int (*is_qos_active)(struct net_device *dev, struct sk_buff *skb);
 
        /* Softmac-generated frames (mamagement) are TXed via this
         * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is
@@ -2421,52 +1513,30 @@ struct ieee80211_device {
 
        /* power save mode related */
        void (*sta_wake_up) (struct net_device *dev);
-//     void (*ps_request_tx_ack) (struct net_device *dev);
        void (*enter_sleep_state) (struct net_device *dev, u32 th, u32 tl);
        short (*ps_is_queue_empty) (struct net_device *dev);
-#if 0
-       /* Typical STA methods */
-        int (*handle_auth) (struct net_device * dev,
-                            struct ieee80211_auth * auth);
-        int (*handle_deauth) (struct net_device * dev,
-                              struct ieee80211_deauth * auth);
-        int (*handle_action) (struct net_device * dev,
-                              struct ieee80211_action * action,
-                              struct ieee80211_rx_stats * stats);
-        int (*handle_disassoc) (struct net_device * dev,
-                                struct ieee80211_disassoc * assoc);
-#endif
-        int (*handle_beacon) (struct net_device * dev, struct ieee80211_beacon * beacon, struct ieee80211_network * network);
-#if 0
-        int (*handle_probe_response) (struct net_device * dev,
-                                      struct ieee80211_probe_response * resp,
-                                      struct ieee80211_network * network);
-        int (*handle_probe_request) (struct net_device * dev,
-                                     struct ieee80211_probe_request * req,
-                                     struct ieee80211_rx_stats * stats);
-#endif
-        int (*handle_assoc_response) (struct net_device * dev, struct ieee80211_assoc_response_frame * resp, struct ieee80211_network * network);
 
-#if 0
-        /* Typical AP methods */
-        int (*handle_assoc_request) (struct net_device * dev);
-        int (*handle_reassoc_request) (struct net_device * dev,
-                                       struct ieee80211_reassoc_request * req);
-#endif
+       int (*handle_beacon)(struct net_device *dev,
+                            struct ieee80211_probe_response *beacon,
+                            struct ieee80211_network *network);
+       int (*handle_assoc_response)(struct net_device *dev,
+                               struct ieee80211_assoc_response_frame *resp,
+                               struct ieee80211_network *network);
 
        /* check whether Tx hw resouce available */
        short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
-       //added by wb for HT related
-//     void (*SwChnlByTimerHandler)(struct net_device *dev, int channel);
-       void (*SetBWModeHandler)(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset);
-//     void (*UpdateHalRATRTableHandler)(struct net_device* dev, u8* pMcsRate);
+       /* HT related */
+       void (*SetBWModeHandler)(struct net_device *dev,
+                                HT_CHANNEL_WIDTH Bandwidth,
+                                HT_EXTCHNL_OFFSET Offset);
        bool (*GetNmodeSupportBySecCfg)(struct net_device* dev);
        void (*SetWirelessMode)(struct net_device* dev, u8 wireless_mode);
        bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device* dev);
        bool (*is_ap_in_wep_tkip)(struct net_device* dev);
        void (*InitialGainHandler)(struct net_device *dev, u8 Operation);
-       bool (*SetFwCmdHandler)(struct net_device *dev, FW_CMD_IO_TYPE          FwCmdIO);
-       void (*LedControlHandler)(struct net_device * dev, LED_CTL_MODE LedAction);
+       bool (*SetFwCmdHandler)(struct net_device *dev, FW_CMD_IO_TYPE FwCmdIO);
+       void (*LedControlHandler)(struct net_device *dev,
+                                 LED_CTL_MODE LedAction);
        /* This must be the last item so that it points to the data
         * allocated beyond this structure by alloc_ieee80211 */
        u8 priv[0];
@@ -2512,11 +1582,7 @@ struct ieee80211_device {
 
 static inline void *ieee80211_priv(struct net_device *dev)
 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
-#else
-       return ((struct ieee80211_device *)dev->priv)->priv;
-#endif
 }
 
 extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
@@ -2588,7 +1654,7 @@ extern inline int ieee80211_get_hdrlen(u16 fc)
        return hdrlen;
 }
 
-static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)
+static inline u8 *ieee80211_get_payload(struct rtl_ieee80211_hdr *hdr)
 {
         switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) {
         case IEEE80211_1ADDR_LEN:
@@ -2596,7 +1662,7 @@ static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)
         case IEEE80211_2ADDR_LEN:
                 return ((struct ieee80211_hdr_2addr *)hdr)->payload;
         case IEEE80211_3ADDR_LEN:
-                return ((struct ieee80211_hdr_3addr *)hdr)->payload;
+                return (void *)hdr+sizeof(struct ieee80211_hdr_3addr);
         case IEEE80211_4ADDR_LEN:
                 return ((struct ieee80211_hdr_4addr *)hdr)->payload;
         }
@@ -2667,10 +1733,6 @@ extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
 extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
                                   struct iw_request_info *info,
                                   union iwreq_data *wrqu, char *key);
-#if WIRELESS_EXT >= 18
-extern int ieee80211_wx_get_encode_ext(struct ieee80211_device *ieee,
-                            struct iw_request_info *info,
-                            union iwreq_data* wrqu, char *extra);
 extern int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
                             struct iw_request_info *info,
                             union iwreq_data* wrqu, char *extra);
@@ -2680,7 +1742,6 @@ extern int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
 extern int ieee80211_wx_set_mlme(struct ieee80211_device *ieee,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra);
-#endif
 extern int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len);
 
 /* ieee80211_softmac.c */
@@ -2768,13 +1829,7 @@ extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_reques
 extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
                             union iwreq_data *wrqu, char *b);
 
-//extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
 extern void ieee80211_wx_sync_scan_wq(struct work_struct *work);
-#else
- extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
-#endif
-
 
 extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee,
                               struct iw_request_info *info,
@@ -2799,55 +1854,8 @@ extern int ieee80211_wx_set_rts(struct ieee80211_device *ieee,
 extern int ieee80211_wx_get_rts(struct ieee80211_device *ieee,
                             struct iw_request_info *info,
                             union iwreq_data *wrqu, char *extra);
-//HT
-#define MAX_RECEIVE_BUFFER_SIZE 9100  //
-extern void HTDebugHTCapability(u8* CapIE, u8* TitleString );
-extern void HTDebugHTInfo(u8*  InfoIE, u8* TitleString);
-
-void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET    Offset);
-extern void HTUpdateDefaultSetting(struct ieee80211_device* ieee);
-extern void HTConstructCapabilityElement(struct ieee80211_device* ieee, u8* posHTCap, u8* len, u8 isEncrypt);
-extern void HTConstructInfoElement(struct ieee80211_device* ieee, u8* posHTInfo, u8* len, u8 isEncrypt);
-extern void HTConstructRT2RTAggElement(struct ieee80211_device* ieee, u8* posRT2RTAgg, u8* len);
-extern void HTOnAssocRsp(struct ieee80211_device *ieee);
-extern void HTInitializeHTInfo(struct ieee80211_device* ieee);
-extern void HTInitializeBssDesc(PBSS_HT pBssHT);
-extern void HTResetSelfAndSavePeerSetting(struct ieee80211_device* ieee, struct ieee80211_network * pNetwork);
-extern void HTUpdateSelfAndPeerSetting(struct ieee80211_device* ieee,   struct ieee80211_network * pNetwork);
-extern u8 HTGetHighestMCSRate(struct ieee80211_device* ieee, u8* pMCSRateSet, u8* pMCSFilter);
-extern u8 MCS_FILTER_ALL[];
-extern u16 MCS_DATA_RATE[2][2][77] ;
-extern u8 HTCCheck(struct ieee80211_device* ieee, u8*   pFrame);
-//extern void HTSetConnectBwModeCallback(unsigned long data);
-extern void HTResetIOTSetting(PRT_HIGH_THROUGHPUT  pHTInfo);
-extern bool IsHTHalfNmodeAPs(struct ieee80211_device* ieee);
-extern u16 HTHalfMcsToDataRate(struct ieee80211_device* ieee,  u8      nMcsRate);
-extern u16 HTMcsToDataRate( struct ieee80211_device* ieee, u8 nMcsRate);
-extern u16  TxCountToDataRate( struct ieee80211_device* ieee, u8 nDataRate);
-//function in BAPROC.c
-extern int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb);
-extern int ieee80211_rx_ADDBARsp( struct ieee80211_device* ieee, struct sk_buff *skb);
-extern int ieee80211_rx_DELBA(struct ieee80211_device* ieee,struct sk_buff *skb);
-extern void TsInitAddBA( struct ieee80211_device* ieee, PTX_TS_RECORD   pTS, u8 Policy, u8 bOverwritePending);
-extern void TsInitDelBA( struct ieee80211_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect);
-extern void BaSetupTimeOut(unsigned long data);
-extern void TxBaInactTimeout(unsigned long data);
-extern void RxBaInactTimeout(unsigned long data);
-extern void ResetBaEntry( PBA_RECORD pBA);
-//function in TS.c
-extern bool GetTs(
-        struct ieee80211_device*        ieee,
-        PTS_COMMON_INFO                 *ppTS,
-        u8*                             Addr,
-        u8                              TID,
-        TR_SELECT                       TxRxSelect,  //Rx:1, Tx:0
-        bool                            bAddNewTs
-        );
-extern void TSInitialize(struct ieee80211_device *ieee);
-extern  void TsStartAddBaProcess(struct ieee80211_device* ieee, PTX_TS_RECORD   pTxTS);
-extern void RemovePeerTS(struct ieee80211_device* ieee, u8* Addr);
-extern void RemoveAllTS(struct ieee80211_device* ieee);
-void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
+
+extern void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
 
 extern const long ieee80211_wlan_frequencies[];
 
@@ -2896,6 +1904,8 @@ extern int ieee80211_parse_info_param(struct ieee80211_device *ieee,
                struct ieee80211_network *network,
                struct ieee80211_rx_stats *stats);
 
-void ieee80211_indicate_packets(struct ieee80211_device *ieee, struct ieee80211_rxb** prxbIndicateArray,u8  index);
+extern void ieee80211_indicate_packets(struct ieee80211_device *ieee,
+                                      struct ieee80211_rxb **prxbIndicateArray,
+                                      u8 index);
 #define RT_ASOC_RETRY_LIMIT    5
 #endif /* IEEE80211_H */