rtl8188eu: Remove tests on macro CONFIG_80211N_HT

This one is always selected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-11-12 14:06:58 -06:00
parent e9184bd34c
commit e3e242b712
28 changed files with 46 additions and 428 deletions

View file

@ -69,7 +69,6 @@
#ifdef CONFIG_XMIT_ACK
#define CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#endif
#define CONFIG_80211N_HT
#define CONFIG_RECV_REORDERING_CTRL

View file

@ -54,9 +54,7 @@ typedef struct _ADAPTER _adapter, ADAPTER, *PADAPTER;
#include <rtw_debug.h>
#include <rtw_rf.h>
#ifdef CONFIG_80211N_HT
#include <rtw_ht.h>
#endif
#ifdef CONFIG_INTEL_WIDI
#include <rtw_intel_widi.h>
@ -208,12 +206,8 @@ struct registry_priv {
u8 uapsd_acbe_en;
u8 uapsd_acvi_en;
u8 uapsd_acvo_en;
WLAN_BSSID_EX dev_network;
u8 tx_bw_mode;
#ifdef CONFIG_80211N_HT
u8 ht_enable;
/* 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160MHz */
/* 2.4G use bit 0 ~ 3, 5G use bit 4 ~ 7 */
@ -243,7 +237,6 @@ struct registry_priv {
u8 beamform_cap;
u8 beamformer_rf_num;
u8 beamformee_rf_num;
#endif /* CONFIG_80211N_HT */
u8 lowrate_two_xmit;

View file

@ -910,11 +910,9 @@ extern char *rtw_initmac;
#ifdef CONFIG_TX_MCAST2UNI
extern int rtw_mc2u_disable;
#endif
#ifdef CONFIG_80211N_HT
extern int rtw_ht_enable;
extern int rtw_bw_mode;
extern int rtw_ampdu_enable;/* for enable tx_ampdu */
#endif
int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
void netdev_br_init(struct net_device *netdev);

View file

@ -1669,9 +1669,7 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8
void dump_ies(void *sel, u8 *buf, u32 buf_len);
#ifdef CONFIG_80211N_HT
void dump_ht_cap_ie_content(void *sel, u8 *buf, u32 buf_len);
#endif
void dump_wps_ie(void *sel, u8 *ie, u32 ie_len);

View file

@ -428,7 +428,6 @@ ssize_t proc_set_rx_signal(struct file *file, const char __user *buffer, size_t
int proc_get_hw_status(struct seq_file *m, void *v);
ssize_t proc_set_hw_status(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
#ifdef CONFIG_80211N_HT
int proc_get_ht_enable(struct seq_file *m, void *v);
ssize_t proc_set_ht_enable(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
@ -472,17 +471,10 @@ ssize_t proc_set_tx_amsdu(struct file *file, const char __user *buffer, size_t c
int proc_get_tx_amsdu_rate(struct seq_file *m, void *v);
ssize_t proc_set_tx_amsdu_rate(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
#endif
#endif /* CONFIG_80211N_HT */
int proc_get_en_fwps(struct seq_file *m, void *v);
ssize_t proc_set_en_fwps(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
#if 0
int proc_get_two_path_rssi(struct seq_file *m, void *v);
int proc_get_rssi_disp(struct seq_file *m, void *v);
ssize_t proc_set_rssi_disp(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
#endif
#ifdef CONFIG_BT_COEXIST
int proc_get_btcoex_dbg(struct seq_file *m, void *v);
ssize_t proc_set_btcoex_dbg(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);

View file

@ -649,8 +649,6 @@ struct mlme_priv {
struct qos_priv qospriv;
#ifdef CONFIG_80211N_HT
/* Number of non-HT AP/stations */
int num_sta_no_ht;
@ -662,8 +660,6 @@ struct mlme_priv {
struct ht_priv htpriv;
#endif
#ifdef CONFIG_BEAMFORMING
#ifndef RTW_BEAMFORMING_VERSION_2
#if (BEAMFORMING_SUPPORT == 0)/*for driver beamforming*/
@ -724,12 +720,10 @@ struct mlme_priv {
/* Overlapping BSS information */
ATOMIC_T olbc_ht;
#ifdef CONFIG_80211N_HT
int ht_20mhz_width_req;
int ht_intolerant_ch_reported;
u16 ht_op_mode;
u8 sw_to_20mhz; /*switch to 20Mhz BW*/
#endif /* CONFIG_80211N_HT */
#ifdef CONFIG_RTW_80211R
u8 *auth_rsp;
@ -1104,17 +1098,14 @@ u8 *rtw_get_capability_from_ie(u8 *ie);
u8 *rtw_get_timestampe_from_ie(u8 *ie);
u8 *rtw_get_beacon_interval_from_ie(u8 *ie);
void rtw_joinbss_reset(_adapter *padapter);
#ifdef CONFIG_80211N_HT
void rtw_ht_use_default_setting(_adapter *padapter);
void rtw_build_wmm_ie_ht(_adapter *padapter, u8 *out_ie, uint *pout_len);
unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len, u8 channel);
void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len, u8 channel);
void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe);
void rtw_append_exented_cap(_adapter *padapter, u8 *out_ie, uint *pout_len);
#endif
int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork);
int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature);

View file

@ -612,10 +612,7 @@ struct mlme_ext_priv {
struct p2p_channels channel_list;
unsigned char basicrate[NumRates];
unsigned char datarate[NumRates];
#ifdef CONFIG_80211N_HT
unsigned char default_supported_mcs_set[16];
#endif
struct ss_res sitesurvey_res;
struct mlme_ext_info mlmext_info;/* for sta/adhoc mode, including current scanning/connecting/connected related info.
* for ap mode, network includes ap's cap_info */

View file

@ -323,11 +323,7 @@ struct sta_info {
/* for A-MPDU Tx */
/* unsigned char ampdu_txen_bitmap; */
u16 BA_starting_seqctrl[16];
#ifdef CONFIG_80211N_HT
struct ht_priv htpriv;
#endif
/* Notes: */
/* STA_Mode: */

View file

@ -756,8 +756,6 @@ typedef enum _ELEMENT_ID {
Below is the definition for 802.11n
------------------------------------------------------------------------------*/
/* #ifdef CONFIG_80211N_HT */
#define set_order_bit(pbuf) \
do { \
*(__le16 *)(pbuf) |= cpu_to_le16(_ORDER_); \