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

rtl8188eu: Remove dead code inside #if 0 .... #endif

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-11-12 19:26:10 -06:00
parent e3e242b712
commit f0050d3365
52 changed files with 38 additions and 3703 deletions
Download patch file Download diff file Expand all files Collapse all files

100
core/rtw_mlme.c
View file

@ -825,39 +825,6 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
, dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi);
}
#endif
#if 0 /* old codes, may be useful one day...
* RTW_INFO("update_network: rssi=0x%lx dst->Rssi=%d ,dst->Rssi=0x%lx , src->Rssi=0x%lx",(dst->Rssi+src->Rssi)/2,dst->Rssi,dst->Rssi,src->Rssi); */
if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&(padapter->mlmepriv.cur_network.network), src)) {
/* RTW_INFO("b:ssid=%s update_network: src->rssi=0x%d padapter->recvpriv.ui_rssi=%d\n",src->Ssid.Ssid,src->Rssi,padapter->recvpriv.signal); */
if (padapter->recvpriv.signal_qual_data.total_num++ >= PHY_LINKQUALITY_SLID_WIN_MAX) {
padapter->recvpriv.signal_qual_data.total_num = PHY_LINKQUALITY_SLID_WIN_MAX;
last_evm = padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index];
padapter->recvpriv.signal_qual_data.total_val -= last_evm;
}
padapter->recvpriv.signal_qual_data.total_val += query_rx_pwr_percentage(src->Rssi);
padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index++] = query_rx_pwr_percentage(src->Rssi);
if (padapter->recvpriv.signal_qual_data.index >= PHY_LINKQUALITY_SLID_WIN_MAX)
padapter->recvpriv.signal_qual_data.index = 0;
/* RTW_INFO("Total SQ=%d pattrib->signal_qual= %d\n", padapter->recvpriv.signal_qual_data.total_val, src->Rssi); */
/* <1> Showed on UI for user,in percentage. */
tmpVal = padapter->recvpriv.signal_qual_data.total_val / padapter->recvpriv.signal_qual_data.total_num;
padapter->recvpriv.signal = (u8)tmpVal; /* Link quality */
src->Rssi = translate_percentage_to_dbm(padapter->recvpriv.signal) ;
} else {
/* RTW_INFO("ELSE:ssid=%s update_network: src->rssi=0x%d dst->rssi=%d\n",src->Ssid.Ssid,src->Rssi,dst->Rssi); */
src->Rssi = (src->Rssi + dst->Rssi) / 2; /* dBM */
}
/* RTW_INFO("a:update_network: src->rssi=0x%d padapter->recvpriv.ui_rssi=%d\n",src->Rssi,padapter->recvpriv.signal); */
#endif
}
static void update_current_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
@ -871,13 +838,9 @@ static void update_current_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
&(pmlmepriv->cur_network.network));
if ((check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork, 0))) {
/* if(pmlmepriv->cur_network.network.IELength<= pnetwork->IELength) */
{
update_network(&(pmlmepriv->cur_network.network), pnetwork, adapter, _TRUE);
rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof(NDIS_802_11_FIXED_IEs),
update_network(&(pmlmepriv->cur_network.network), pnetwork, adapter, _TRUE);
rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof(NDIS_802_11_FIXED_IEs),
pmlmepriv->cur_network.network.IELength);
}
}
@ -1712,18 +1675,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
psta->aid = pnetwork->join_res;
#if 0 /* alloc macid when call rtw_alloc_stainfo(), and release macid when call rtw_free_stainfo() */
#ifdef CONFIG_CONCURRENT_MODE
if (PRIMARY_ADAPTER == padapter->adapter_type)
psta->mac_id = 0;
else
psta->mac_id = 2;
#else
psta->mac_id = 0;
#endif
#endif /* removed */
update_sta_info(padapter, psta);
/* update station supportRate */
@ -2602,15 +2553,6 @@ void _rtw_join_timeout_handler(_adapter *adapter)
_irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
#if 0
if (rtw_is_drv_stopped(adapter)) {
_rtw_up_sema(&pmlmepriv->assoc_terminate);
return;
}
#endif
RTW_INFO("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
if (RTW_CANNOT_RUN(adapter))
@ -3285,21 +3227,9 @@ candidate_exist:
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
RTW_INFO("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__);
#if 0 /* for WPA/WPA2 authentication, wpa_supplicant will expect authentication from AP, it is needed to reconnect AP... */
if (is_same_network(&pmlmepriv->cur_network.network, &candidate->network)) {
RTW_INFO("%s: _FW_LINKED and is same network, it needn't join again\n", __func__);
rtw_indicate_connect(adapter);/* rtw_indicate_connect again */
ret = 2;
goto exit;
} else
#endif
{
rtw_disassoc_cmd(adapter, 0, _TRUE);
rtw_indicate_disconnect(adapter, 0, _FALSE);
rtw_free_assoc_resources(adapter, 0);
}
rtw_disassoc_cmd(adapter, 0, _TRUE);
rtw_indicate_disconnect(adapter, 0, _FALSE);
rtw_free_assoc_resources(adapter, 0);
}
#ifdef CONFIG_ANTENNA_DIVERSITY
@ -3464,16 +3394,7 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u
ielength = initial_out_len;
if (in_ie[i] == 0xDD && in_ie[i + 2] == 0x00 && in_ie[i + 3] == 0x50 && in_ie[i + 4] == 0xF2 && in_ie[i + 5] == 0x02 && i + 5 < in_len) { /* WMM element ID and OUI */
/* Append WMM IE to the last index of out_ie */
#if 0
for (j = i; j < i + (in_ie[i + 1] + 2); j++) {
out_ie[ielength] = in_ie[j];
ielength++;
}
out_ie[initial_out_len + 8] = 0x00; /* force the QoS Info Field to be zero */
#endif
for (j = i; j < i + 9; j++) {
out_ie[ielength] = in_ie[j];
ielength++;
@ -3693,17 +3614,6 @@ void rtw_update_registrypriv_dev_network(_adapter *adapter)
/* struct xmit_priv *pxmitpriv = &adapter->xmitpriv; */
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
#if 0
pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense;
pxmitpriv->vcs = pregistrypriv->vcs_type;
pxmitpriv->vcs_type = pregistrypriv->vcs_type;
/* pxmitpriv->rts_thresh = pregistrypriv->rts_thresh; */
pxmitpriv->frag_len = pregistrypriv->frag_thresh;
adapter->qospriv.qos_option = pregistrypriv->wmm_enable;
#endif
pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0) ; /* adhoc no 802.1x */
pdev_network->Rssi = 0;