rtl8188eu: Remove CONFIG_SIGNAL_DISPLAY_DBM

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-06 18:58:36 -06:00
parent 4bf02bb7d8
commit 3b93a7822a
2 changed files with 1 additions and 28 deletions

View file

@ -27,17 +27,6 @@
#define CONFIG_ANDROID
#endif
#ifdef CONFIG_ANDROID
//Some Android build will restart the UI while non-printable ascii is passed
//between java and c/c++ layer (JNI). We force CONFIG_VALIDATE_SSID
//for Android here. If you are sure there is no risk on your system about this,
//mask this macro define to support non-printable ascii ssid.
//#define CONFIG_VALIDATE_SSID
//Android expect dbm as the rx signal strength unit
#define CONFIG_SIGNAL_DISPLAY_DBM
#endif
#if defined(CONFIG_HAS_EARLYSUSPEND) && defined (CONFIG_RESUME_IN_WORKQUEUE)
#warning "You have CONFIG_HAS_EARLYSUSPEND enabled in your system, we disable CONFIG_RESUME_IN_WORKQUEUE automatically"
#undef CONFIG_RESUME_IN_WORKQUEUE

View file

@ -535,11 +535,7 @@ static char *translate_scan(struct adapter *padapter,
/* Add quality statistics */
iwe.cmd = IWEVQUAL;
iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_INVALID
#ifdef CONFIG_SIGNAL_DISPLAY_DBM
| IW_QUAL_DBM
#endif
;
iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_INVALID;
if ( check_fwstate(pmlmepriv, _FW_LINKED)== true &&
is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network, 0)) {
@ -551,14 +547,10 @@ static char *translate_scan(struct adapter *padapter,
}
#ifdef CONFIG_SIGNAL_DISPLAY_DBM
iwe.u.qual.level = (u8) translate_percentage_to_dbm(ss);/* dbm */
#else
iwe.u.qual.level = (u8)ss;/* */
#ifdef CONFIG_BT_COEXIST
BT_SignalCompensation(padapter, &iwe.u.qual.level, NULL);
#endif /* CONFIG_BT_COEXIST */
#endif
iwe.u.qual.qual = (u8)sq; /* signal quality */
@ -9756,9 +9748,6 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
/* DBG_871X("No link level:%d, qual:%d, noise:%d\n", tmp_level, tmp_qual, tmp_noise); */
}
else{
#ifdef CONFIG_SIGNAL_DISPLAY_DBM
tmp_level = translate_percentage_to_dbm(padapter->recvpriv.signal_strength);
#else
tmp_level = padapter->recvpriv.signal_strength;
#ifdef CONFIG_BT_COEXIST
{
@ -9767,7 +9756,6 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
tmp_level= signal;
}
#endif /* CONFIG_BT_COEXIST */
#endif
tmp_qual = padapter->recvpriv.signal_qual;
tmp_noise =padapter->recvpriv.noise;
@ -9789,10 +9777,6 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
#endif
#endif
#ifdef CONFIG_SIGNAL_DISPLAY_DBM
piwstats->qual.updated = piwstats->qual.updated | IW_QUAL_DBM;
#endif
return &padapter->iwstats;
}
#endif