From 647020663dfb64f49f7a51d9765fa9959c642749 Mon Sep 17 00:00:00 2001
From: Sergei Makarenkov <serg@no-problem.cc>
Date: Sat, 21 Jan 2017 23:44:28 +0300
Subject: [PATCH] Use in_compat_syscall() instead of is_compat_task() if
 available

---
 os_dep/linux/ioctl_linux.c | 8 ++++++--
 os_dep/linux/rtw_android.c | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c
index f99cd5d..1a83b21 100644
--- a/os_dep/linux/ioctl_linux.c
+++ b/os_dep/linux/ioctl_linux.c
@@ -13120,8 +13120,12 @@ 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
-	if (is_compat_task())
-		return rtw_ioctl_compat_wext_private(dev, rq);
+#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 */
 		return rtw_ioctl_standard_wext_private(dev, rq);
diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c
index 5907a00..9066990 100644
--- a/os_dep/linux/rtw_android.c
+++ b/os_dep/linux/rtw_android.c
@@ -593,7 +593,11 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
 		goto exit;
 	}
 #ifdef CONFIG_COMPAT
-	if (is_compat_task()) {
+#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;