Change is_compat_task to in_compat_syscall

This commit is contained in:
CGarces
2017-11-26 01:12:38 +01:00
committed by Icenowy Zheng
parent 96610a9c04
commit 5b4f358d54
2 changed files with 8 additions and 0 deletions

View File

@@ -13902,7 +13902,11 @@ static int rtw_ioctl_standard_wext_private(struct net_device *dev, struct ifreq
static int rtw_ioctl_wext_private(struct net_device *dev, struct ifreq *rq) static int rtw_ioctl_wext_private(struct net_device *dev, struct ifreq *rq)
{ {
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
#ifdef in_compat_syscall
if(in_compat_syscall())
#else
if(is_compat_task()) if(is_compat_task())
#endif
return rtw_ioctl_compat_wext_private( dev, rq ); return rtw_ioctl_compat_wext_private( dev, rq );
else else
#endif // CONFIG_COMPAT #endif // CONFIG_COMPAT

View File

@@ -574,7 +574,11 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit; goto exit;
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
#ifdef in_compat_syscall
if (in_compat_syscall()) {
#else
if (is_compat_task()) { if (is_compat_task()) {
#endif
/* User space is 32-bit, use compat ioctl */ /* User space is 32-bit, use compat ioctl */
compat_android_wifi_priv_cmd compat_priv_cmd; compat_android_wifi_priv_cmd compat_priv_cmd;