From 5b4f358d54d1cf09103eade7df8c024c5d47fa9a Mon Sep 17 00:00:00 2001 From: CGarces Date: Sun, 26 Nov 2017 01:12:38 +0100 Subject: [PATCH] Change is_compat_task to in_compat_syscall --- os_dep/linux/ioctl_linux.c | 4 ++++ os_dep/linux/rtw_android.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index b856de8..d346dc3 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -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) { #ifdef CONFIG_COMPAT +#ifdef in_compat_syscall + if(in_compat_syscall()) +#else if(is_compat_task()) +#endif return rtw_ioctl_compat_wext_private( dev, rq ); else #endif // CONFIG_COMPAT diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c index b356bc4..2d3e214 100644 --- a/os_dep/linux/rtw_android.c +++ b/os_dep/linux/rtw_android.c @@ -574,7 +574,11 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) goto exit; } #ifdef CONFIG_COMPAT +#ifdef in_compat_syscall + if (in_compat_syscall()) { +#else if (is_compat_task()) { +#endif /* User space is 32-bit, use compat ioctl */ compat_android_wifi_priv_cmd compat_priv_cmd;