Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8188eu / include / drv_types.h

diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index 55506a7da1a4bd22d47f12c84e9a5fc8e3b93b84..7af690ed2f0114025d548d3d4aa5ab7ed81e6927 100644 (file)
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -53,30 +53,17 @@
 #define SPEC_DEV_ID_ASSIGN_IFNAME      BIT(5)
 
 struct registry_priv {
-       u8      chip_version;
-       u8      rfintfs;
-       u8      lbkmode;
-       u8      hci;
        struct ndis_802_11_ssid ssid;
-       u8      network_mode;   /* infra, ad-hoc, auto */
        u8      channel;/* ad-hoc support requirement */
        u8      wireless_mode;/* A, B, G, auto */
-       u8      scan_mode;/* active, passive */
-       u8      radio_enable;
        u8      preamble;/* long, short, auto */
        u8      vrtl_carrier_sense;/* Enable, Disable, Auto */
        u8      vcs_type;/* RTS/CTS, CTS-to-self */
        u16     rts_thresh;
        u16     frag_thresh;
-       u8      adhoc_tx_pwr;
-       u8      soft_ap;
        u8      power_mgnt;
        u8      ips_mode;
        u8      smart_ps;
-       u8      long_retry_lmt;
-       u8      short_retry_lmt;
-       u16     busy_thresh;
-       u8      ack_policy;
        u8      mp_mode;
        u8      software_encrypt;
        u8      software_decrypt;
@@ -84,11 +71,6 @@ struct registry_priv {
          /* UAPSD */
        u8      wmm_enable;
        u8      uapsd_enable;
-       u8      uapsd_max_sp;
-       u8      uapsd_acbk_en;
-       u8      uapsd_acbe_en;
-       u8      uapsd_acvi_en;
-       u8      uapsd_acvo_en;
 
        struct wlan_bssid_ex    dev_network;
 
@@ -97,10 +79,6 @@ struct registry_priv {
        u8      ampdu_enable;/* for tx */
        u8      rx_stbc;
        u8      ampdu_amsdu;/* A-MPDU Supports A-MSDU is permitted */
-       u8      lowrate_two_xmit;
-
-       u8      rf_config;
-       u8      low_power;
 
        u8      wifi_spec;/*  !turbo_mode */
 
@@ -112,9 +90,6 @@ struct registry_priv {
 
        u8      usbss_enable;/* 0:disable,1:enable */
        u8      hwpdn_mode;/* 0:disable,1:enable,2:decide by EFUSE config */
-       u8      hwpwrp_detect;/* 0:disable,1:enable */
-
-       u8      hw_wps_pbc;/* 0:disable,1:enable */
 
        u8      max_roaming_times; /*  the max number driver will try */
 
@@ -149,16 +124,11 @@ struct dvobj_priv {
        u8      Queue2Pipe[HW_QUEUE_ENTRY];/* for out pipe mapping */
 
 /*-------- below is for USB INTERFACE --------*/
-
-       u8      nr_endpoint;
        u8      ishighspeed;
        u8      RtNumInPipes;
        u8      RtNumOutPipes;
-       int     ep_num[5]; /* endpoint number */
        struct mutex  usb_vendor_req_mutex;
 
-       u8 *usb_vendor_req_buf;
-
        struct usb_interface *pusbintf;
        struct usb_device *pusbdev;
 };
@@ -184,14 +154,7 @@ struct adapter {
        struct  eeprom_priv eeprompriv;
        struct  led_priv        ledpriv;
 
-#ifdef CONFIG_88EU_AP_MODE
-       struct  hostapd_priv    *phostapdpriv;
-#endif
-
-       struct wifidirect_info  wdinfo;
-
        void *HalData;
-       struct hal_ops  HalFunc;
 
        s32     bDriverStopped;
        s32     bSurpriseRemoved;
@@ -199,20 +162,11 @@ struct adapter {
        u8      hw_init_completed;
 
        void *cmdThread;
-       void *evtThread;
        void (*intf_start)(struct adapter *adapter);
        void (*intf_stop)(struct adapter *adapter);
        struct  net_device *pnetdev;
        struct  net_device *pmondev;
 
-       /*  used by rtw_rereg_nd_name related function */
-       struct rereg_nd_name_data {
-               struct  net_device *old_pnetdev;
-               char old_ifname[IFNAMSIZ];
-               u8 old_ips_mode;
-               u8 old_bRegUseLed;
-       } rereg_nd_name_priv;
-
        int bup;
        struct net_device_stats stats;
        struct iw_statistics iwstats;
@@ -223,17 +177,8 @@ struct adapter {
        u8 bReadPortCancel;
        u8 bWritePortCancel;
        u8 bRxRSSIDisplay;
-       /* The driver will show up the desired channel number
-        * when this flag is 1. */
-       u8 bNotifyChannelChange;
 
        struct mutex hw_init_mutex;
-
-       spinlock_t br_ext_lock;
-
-       u8      fix_rate;
-
-       unsigned char     in_cta_test;
 };
 
 #define adapter_to_dvobj(adapter) (adapter->dvobj)