From c5f3d21507050e0f34ddb0433f36aaf16b6b2a21 Mon Sep 17 00:00:00 2001 From: James Drabb Jr Date: Sun, 17 Mar 2019 05:22:44 -0400 Subject: [PATCH] Fixed to work with kernel versions 5.0.x --- dkms.conf | 2 +- include/rtw_version.h | 2 +- install.sh | 0 os_dep/linux/rtw_android.c | 6 +++++- runwpa | 4 +--- 5 files changed, 8 insertions(+), 6 deletions(-) mode change 100644 => 100755 install.sh diff --git a/dkms.conf b/dkms.conf index 3cff3fa..a9a062e 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME=8812au -PACKAGE_VERSION=4.2.2 +PACKAGE_VERSION=4.2.3 DEST_MODULE_LOCATION=/kernel/drivers/net/wireless BUILT_MODULE_NAME=8812au diff --git a/include/rtw_version.h b/include/rtw_version.h index 3c2314b..a9262d5 100644 --- a/include/rtw_version.h +++ b/include/rtw_version.h @@ -1 +1 @@ -#define DRIVERVERSION "v4.2.2_7502.20130517" +#define DRIVERVERSION "v4.2.3" diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c index d56c2ec..3ab6dfa 100644 --- a/os_dep/linux/rtw_android.c +++ b/os_dep/linux/rtw_android.c @@ -352,7 +352,11 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) goto exit; } - if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)) + if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){ +#else + if (!access_ok(priv_cmd.buf, priv_cmd.total_len)){ +#endif DBG_871X("%s: failed to access memory\n", __FUNCTION__); ret = -EFAULT; goto exit; diff --git a/runwpa b/runwpa index f825e8b..ebb21d4 100644 --- a/runwpa +++ b/runwpa @@ -1,7 +1,7 @@ #!/bin/bash if [ "`which iwconfig`" = "" ] ; then - echo "WARNING:Wireless tool not exist!" + echo "WARNING:Wireless tool (iwconfig) not exist!" echo " Please install it!" exit else @@ -16,5 +16,3 @@ else fi fi - -