mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 08:34:20 +00:00
rtl8188eu: Remove configuration variables *ANDROID* and associated dead code
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
acda213bd2
commit
4c57c6047a
8 changed files with 12 additions and 172 deletions
|
@ -1914,11 +1914,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
|
|||
}
|
||||
#endif //CONFIG_P2P
|
||||
|
||||
wait_status = _FW_UNDER_SURVEY
|
||||
#ifndef CONFIG_ANDROID
|
||||
|_FW_UNDER_LINKING
|
||||
#endif
|
||||
;
|
||||
wait_status = _FW_UNDER_SURVEY | _FW_UNDER_LINKING;
|
||||
|
||||
while (check_fwstate(pmlmepriv, wait_status) == true)
|
||||
{
|
||||
|
@ -2709,7 +2705,6 @@ static int rtw_wx_set_auth(struct net_device *dev,
|
|||
}
|
||||
|
||||
case IW_AUTH_80211_AUTH_ALG:
|
||||
#if defined(CONFIG_ANDROID) || 1
|
||||
/*
|
||||
* It's the starting point of a link layer connection using wpa_supplicant
|
||||
*/
|
||||
|
@ -2720,7 +2715,6 @@ static int rtw_wx_set_auth(struct net_device *dev,
|
|||
rtw_indicate_disconnect(padapter);
|
||||
rtw_free_assoc_resources(padapter, 1);
|
||||
}
|
||||
#endif
|
||||
ret = wpa_set_auth_algs(dev, (u32)param->value);
|
||||
break;
|
||||
case IW_AUTH_WPA_ENABLED:
|
||||
|
@ -7809,80 +7803,6 @@ static int rtw_wx_set_priv(struct net_device *dev,
|
|||
goto FREE_EXT;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ANDROID
|
||||
//DBG_88E("rtw_wx_set_priv: %s req=%s\n", dev->name, ext);
|
||||
|
||||
i = rtw_android_cmdstr_to_num(ext);
|
||||
|
||||
switch (i) {
|
||||
case ANDROID_WIFI_CMD_START :
|
||||
indicate_wx_custom_event(padapter, "START");
|
||||
break;
|
||||
case ANDROID_WIFI_CMD_STOP :
|
||||
indicate_wx_custom_event(padapter, "STOP");
|
||||
break;
|
||||
case ANDROID_WIFI_CMD_RSSI :
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
|
||||
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
|
||||
sprintf(ext, "%s rssi %d", pcur_network->network.Ssid.Ssid, padapter->recvpriv.rssi);
|
||||
} else {
|
||||
sprintf(ext, "OK");
|
||||
}
|
||||
}
|
||||
break;
|
||||
case ANDROID_WIFI_CMD_LINKSPEED :
|
||||
{
|
||||
u16 mbps = rtw_get_cur_max_rate(padapter)/10;
|
||||
sprintf(ext, "LINKSPEED %d", mbps);
|
||||
}
|
||||
break;
|
||||
case ANDROID_WIFI_CMD_MACADDR :
|
||||
sprintf(ext, "MACADDR = %pM", (dev->dev_addr));
|
||||
break;
|
||||
case ANDROID_WIFI_CMD_SCAN_ACTIVE :
|
||||
{
|
||||
//rtw_set_scan_mode(padapter, SCAN_ACTIVE);
|
||||
sprintf(ext, "OK");
|
||||
}
|
||||
break;
|
||||
case ANDROID_WIFI_CMD_SCAN_PASSIVE :
|
||||
{
|
||||
//rtw_set_scan_mode(padapter, SCAN_PASSIVE);
|
||||
sprintf(ext, "OK");
|
||||
}
|
||||
break;
|
||||
|
||||
case ANDROID_WIFI_CMD_COUNTRY :
|
||||
{
|
||||
char country_code[10];
|
||||
sscanf(ext, "%*s %s", country_code);
|
||||
rtw_set_country(padapter, country_code);
|
||||
sprintf(ext, "OK");
|
||||
}
|
||||
break;
|
||||
default :
|
||||
#ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV
|
||||
DBG_88E("%s: %s unknowned req=%s\n", __func__,
|
||||
dev->name, ext_dbg);
|
||||
#endif
|
||||
|
||||
sprintf(ext, "OK");
|
||||
|
||||
}
|
||||
|
||||
if (copy_to_user(dwrq->pointer, ext, min(dwrq->length, (u16)(strlen(ext)+1))))
|
||||
ret = -EFAULT;
|
||||
|
||||
#ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV
|
||||
DBG_88E("%s: %s req=%s rep=%s dwrq->length=%d, strlen(ext)+1=%d\n", __func__,
|
||||
dev->name, ext_dbg ,ext, dwrq->length, (u16)(strlen(ext)+1));
|
||||
#endif
|
||||
#endif //end of CONFIG_ANDROID
|
||||
|
||||
|
||||
FREE_EXT:
|
||||
|
||||
rtw_vmfree(ext, len);
|
||||
|
@ -7890,11 +7810,7 @@ FREE_EXT:
|
|||
rtw_vmfree(ext_dbg, len);
|
||||
#endif
|
||||
|
||||
//DBG_88E("rtw_wx_set_priv: (SIOCSIWPRIV) %s ret=%d\n",
|
||||
// dev->name, ret);
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
static int rtw_pm_set(struct net_device *dev,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue