skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove tests on macro CONFIG_80211N_HT

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

30
os_dep/ioctl_linux.c
View file

@ -33,10 +33,7 @@
#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e)
#endif
#ifdef CONFIG_80211N_HT
extern int rtw_ht_enable;
#endif
#define RTL_IOCTL_WPA_SUPPLICANT (SIOCIWFIRSTPRIV+30)
@ -6316,9 +6313,7 @@ static int rtw_dbg_port(struct net_device *dev,
break;
case 0x03:
RTW_INFO("qos_option=%d\n", pmlmepriv->qospriv.qos_option);
#ifdef CONFIG_80211N_HT
RTW_INFO("ht_option=%d\n", pmlmepriv->htpriv.ht_option);
#endif /* CONFIG_80211N_HT */
break;
case 0x04:
RTW_INFO("cur_ch=%d\n", pmlmeext->cur_channel);
@ -6338,12 +6333,10 @@ static int rtw_dbg_port(struct net_device *dev,
RTW_INFO("cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);
RTW_INFO("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
RTW_INFO("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
#ifdef CONFIG_80211N_HT
RTW_INFO("qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
RTW_INFO("bwmode=%d, ch_offset=%d, sgi_20m=%d,sgi_40m=%d\n", psta->bw_mode, psta->htpriv.ch_offset, psta->htpriv.sgi_20m, psta->htpriv.sgi_40m);
RTW_INFO("ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
RTW_INFO("agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
#endif /* CONFIG_80211N_HT */
sta_rx_reorder_ctl_dump(RTW_DBGDUMP, psta);
} else
@ -6392,13 +6385,11 @@ static int rtw_dbg_port(struct net_device *dev,
RTW_INFO("sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
RTW_INFO("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
RTW_INFO("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
#ifdef CONFIG_80211N_HT
RTW_INFO("qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
RTW_INFO("bwmode=%d, ch_offset=%d, sgi_20m=%d,sgi_40m=%d\n", psta->bw_mode, psta->htpriv.ch_offset, psta->htpriv.sgi_20m,
psta->htpriv.sgi_40m);
RTW_INFO("ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
RTW_INFO("agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
#endif /* CONFIG_80211N_HT */
#ifdef CONFIG_AP_MODE
RTW_INFO("capability=0x%x\n", psta->capability);
@ -6505,7 +6496,6 @@ static int rtw_dbg_port(struct net_device *dev,
}
break;
#ifdef CONFIG_80211N_HT
case 0x12: { /* set rx_stbc */
struct registry_priv *pregpriv = &padapter->registrypriv;
/* 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, 0x3: enable both 2.4g and 5g */
@ -6529,7 +6519,6 @@ static int rtw_dbg_port(struct net_device *dev,
}
break;
#endif
case 0x14: { /* get wifi_spec */
struct registry_priv *pregpriv = &padapter->registrypriv;
RTW_INFO("get wifi_spec=%d\n", pregpriv->wifi_spec);
@ -6546,7 +6535,6 @@ static int rtw_dbg_port(struct net_device *dev,
}
break;
#endif
#ifdef CONFIG_80211N_HT
case 0x19: {
struct registry_priv *pregistrypriv = &padapter->registrypriv;
/* extra_arg : */
@ -6575,16 +6563,13 @@ static int rtw_dbg_port(struct net_device *dev,
}
}
break;
#endif /* CONFIG_80211N_HT */
case 0x1b: {
struct registry_priv *pregistrypriv = &padapter->registrypriv;
if (arg == 0) {
RTW_INFO("disable driver ctrl max_rx_rate, reset to default_rate_set\n");
init_mlme_default_rate_set(padapter);
#ifdef CONFIG_80211N_HT
pregistrypriv->ht_enable = (u8)rtw_ht_enable;
#endif /* CONFIG_80211N_HT */
} else if (arg == 1) {
int i;
@ -6595,17 +6580,13 @@ static int rtw_dbg_port(struct net_device *dev,
max_rx_rate = (u8)extra_arg;
if (max_rx_rate < 0xc) { /* max_rx_rate < MSC0->B or G -> disable HT */
#ifdef CONFIG_80211N_HT
pregistrypriv->ht_enable = 0;
#endif /* CONFIG_80211N_HT */
for (i = 0; i < NumRates; i++) {
if (pmlmeext->datarate[i] > max_rx_rate)
pmlmeext->datarate[i] = 0xff;
}
}
#ifdef CONFIG_80211N_HT
else if (max_rx_rate < 0x1c) { /* mcs0~mcs15 */
} else if (max_rx_rate < 0x1c) { /* mcs0~mcs15 */
u32 mcs_bitmap = 0x0;
for (i = 0; i < ((max_rx_rate + 1) - 0xc); i++)
@ -6613,7 +6594,6 @@ static int rtw_dbg_port(struct net_device *dev,
set_mcs_rate_by_mask(pmlmeext->default_supported_mcs_set, mcs_bitmap);
}
#endif /* CONFIG_80211N_HT */
}
}
break;
@ -7422,8 +7402,6 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
if (pmlmepriv->qospriv.qos_option == 0)
psta->qos_option = 0;
#ifdef CONFIG_80211N_HT
/* chec 802.11n ht cap. */
if (WLAN_STA_HT & flags) {
psta->htpriv.ht_option = _TRUE;
@ -7434,8 +7412,6 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
if (pmlmepriv->htpriv.ht_option == _FALSE)
psta->htpriv.ht_option = _FALSE;
#endif
update_sta_info_apmode(padapter, psta);
@ -7557,9 +7533,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
psta_data->tx_supp_rates_len = psta->bssratelen;
_rtw_memcpy(psta_data->tx_supp_rates, psta->bssrateset, psta->bssratelen);
#ifdef CONFIG_80211N_HT
_rtw_memcpy(&psta_data->ht_cap, &psta->htpriv.ht_cap, sizeof(struct rtw_ieee80211_ht_cap));
#endif /* CONFIG_80211N_HT */
psta_data->rx_pkts = psta->sta_stats.rx_data_pkts;
psta_data->rx_bytes = psta->sta_stats.rx_bytes;
psta_data->rx_drops = psta->sta_stats.rx_drops;
@ -7567,8 +7541,6 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
psta_data->tx_pkts = psta->sta_stats.tx_pkts;
psta_data->tx_bytes = psta->sta_stats.tx_bytes;
psta_data->tx_drops = psta->sta_stats.tx_drops;
} else
ret = -1;

2
os_dep/ioctl_mp.c
View file

@ -1460,9 +1460,7 @@ int rtw_mp_pretx_proc(PADAPTER padapter, u8 bStartTest, char *extra)
pmp_priv->tx.stop = 1;
rtw_msleep_os(5);
}
#ifdef CONFIG_80211N_HT
pmp_priv->tx.attrib.ht_en = 1;
#endif
pmp_priv->tx.stop = 0;
pmp_priv->tx.count = 1;
SetPacketTx(padapter);

7
os_dep/os_intfs.c
View file

@ -114,7 +114,6 @@ static uint rtw_tx_bw_mode = 0x21;
module_param(rtw_tx_bw_mode, uint, 0644);
MODULE_PARM_DESC(rtw_tx_bw_mode, "The max tx bw for 2.4G and 5G. format is the same as rtw_bw_mode");
#ifdef CONFIG_80211N_HT
int rtw_ht_enable = 1;
/* 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160MHz, 4: 80+80MHz
* 2.4G use bit 0 ~ 3, 5G use bit 4 ~ 7
@ -145,8 +144,6 @@ static int rtw_beamform_cap = BIT(1) | BIT(3);
static int rtw_bfer_rf_number = 0; /*BeamformerCapRfNum Rf path number, 0 for auto, others for manual*/
static int rtw_bfee_rf_number = 0; /*BeamformeeCapRfNum Rf path number, 0 for auto, others for manual*/
#endif /* CONFIG_80211N_HT */
static int rtw_lowrate_two_xmit = 1;/* Use 2 path Tx to transmit MCS0~7 and legacy mode */
static int rtw_rf_config = RF_TYPE_AUTO;
@ -303,13 +300,11 @@ module_param(rtw_vrtl_carrier_sense, int, 0644);
module_param(rtw_vcs_type, int, 0644);
module_param(rtw_busy_thresh, int, 0644);
#ifdef CONFIG_80211N_HT
module_param(rtw_ht_enable, int, 0644);
module_param(rtw_bw_mode, int, 0644);
module_param(rtw_ampdu_enable, int, 0644);
module_param(rtw_rx_stbc, int, 0644);
module_param(rtw_ampdu_amsdu, int, 0644);
#endif /* CONFIG_80211N_HT */
#ifdef CONFIG_BEAMFORMING
module_param(rtw_beamform_cap, int, 0644);
@ -731,7 +726,6 @@ uint loadparam(_adapter *padapter)
registry_par->tx_bw_mode = (u8)rtw_tx_bw_mode;
#ifdef CONFIG_80211N_HT
registry_par->ht_enable = (u8)rtw_ht_enable;
registry_par->bw_mode = (u8)rtw_bw_mode;
registry_par->ampdu_enable = (u8)rtw_ampdu_enable;
@ -743,7 +737,6 @@ uint loadparam(_adapter *padapter)
registry_par->beamform_cap = (u8)rtw_beamform_cap;
registry_par->beamformer_rf_num = (u8)rtw_bfer_rf_number;
registry_par->beamformee_rf_num = (u8)rtw_bfee_rf_number;
#endif
#ifdef CONFIG_TX_EARLY_MODE
registry_par->early_mode = (u8)rtw_early_mode;

2
os_dep/rtw_proc.c
View file

@ -2390,7 +2390,6 @@ static const struct rtw_proc_hdl adapter_proc_hdls[] = {
RTW_PROC_HDL_SSEQ("rx_signal", proc_get_rx_signal, proc_set_rx_signal),
RTW_PROC_HDL_SSEQ("hw_info", proc_get_hw_status, proc_set_hw_status),
#ifdef CONFIG_80211N_HT
RTW_PROC_HDL_SSEQ("ht_enable", proc_get_ht_enable, proc_set_ht_enable),
RTW_PROC_HDL_SSEQ("bw_mode", proc_get_bw_mode, proc_set_bw_mode),
RTW_PROC_HDL_SSEQ("ampdu_enable", proc_get_ampdu_enable, proc_set_ampdu_enable),
@ -2402,7 +2401,6 @@ static const struct rtw_proc_hdl adapter_proc_hdls[] = {
RTW_PROC_HDL_SSEQ("tx_amsdu", proc_get_tx_amsdu, proc_set_tx_amsdu),
RTW_PROC_HDL_SSEQ("tx_amsdu_rate", proc_get_tx_amsdu_rate, proc_set_tx_amsdu_rate),
#endif
#endif /* CONFIG_80211N_HT */
RTW_PROC_HDL_SSEQ("en_fwps", proc_get_en_fwps, proc_set_en_fwps),
RTW_PROC_HDL_SSEQ("mac_rptbuf", proc_get_mac_rptbuf, NULL),

3
os_dep/usb_intf.c
View file

@ -515,14 +515,11 @@ static void process_spec_devid(const struct usb_device_id *pdid)
pid = specific_device_id_tbl[i].idProduct;
flags = specific_device_id_tbl[i].flags;
#ifdef CONFIG_80211N_HT
if ((pdid->idVendor == vid) && (pdid->idProduct == pid) && (flags & SPEC_DEV_ID_DISABLE_HT)) {
rtw_ht_enable = 0;
rtw_bw_mode = 0;
rtw_ampdu_enable = 0;
}
#endif
#ifdef RTK_DMP_PLATFORM
/* Change the ifname to wlan10 when PC side WFD dongle plugin on DMP platform. */
/* It is used to distinguish between normal and PC-side wifi dongle/module. */