diff options
| author | Arpan Kapoor | 2016-05-10 09:50:37 +0530 |
|---|---|---|
| committer | Arpan Kapoor | 2016-05-10 09:50:37 +0530 |
| commit | 66ba29244c2a2c932fa4f136c267e713c0ffcaed (patch) | |
| tree | daca951385dc69725f4e59fda0f62c1c709a9d7d /linux-4.6.patch | |
| parent | 2065c9ccec22dfe1032b7eec09123ff3995fd700 (diff) | |
| download | aur-66ba29244c2a2c932fa4f136c267e713c0ffcaed.tar.gz | |
Replace is_compat_task() with in_compat_syscall()
This change was introduced with commit id
5180e3e24fd3e8e7ea46fbe21e10f5ea3fb1edaa on Linus' tree.
Diffstat (limited to 'linux-4.6.patch')
| -rw-r--r-- | linux-4.6.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/linux-4.6.patch b/linux-4.6.patch new file mode 100644 index 000000000000..56f03ef38c95 --- /dev/null +++ b/linux-4.6.patch @@ -0,0 +1,24 @@ +diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c +index fc2f8d8..d31974f 100644 +--- a/os_dep/linux/rtw_android.c ++++ b/os_dep/linux/rtw_android.c +@@ -42,6 +42,10 @@ + #define strncasecmp strnicmp + #endif + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) ++#define in_compat_syscall is_compat_task ++#endif ++ + extern void macstr2num(u8 *dst, u8 *src); + + const char *android_wifi_cmd_str[ANDROID_WIFI_CMD_MAX] = { +@@ -512,7 +516,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) + goto exit; + } + #ifdef CONFIG_COMPAT +- if (is_compat_task()) { ++ if (in_compat_syscall()) { + /* User space is 32-bit, use compat ioctl */ + compat_android_wifi_priv_cmd compat_priv_cmd; + |