From f9b869f140a98b7dee761febce3bcccf713fc3f7 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 14 Jul 2017 19:25:23 +0100 Subject: [PATCH] RTL8812AU: switch to paspro repo, with kernel commit --- packages/linux-drivers/RTL8812AU/package.mk | 8 +-- .../patches/RTL8812AU-01-add_new_cards.patch | 58 +++++++++---------- ...patch => RTL8812AU-02-kernel-4.11.9.patch} | 40 +++++-------- .../patches/RTL8812AU-05-fix-AP-timeout.patch | 23 -------- .../RTL8812AU-06-disable-power-saving.patch | 23 -------- .../RTL8812AU-08-disable-debug-output.patch | 22 ------- .../patches/RTL8812AU-20-kernel-4.11.patch | 26 --------- ...TL8812AU-02-fix-multiple-definitions.patch | 27 ++++++--- 8 files changed, 64 insertions(+), 163 deletions(-) rename packages/linux-drivers/RTL8812AU/patches/{RTL8812AU-21-kernel-4.11.9.patch => RTL8812AU-02-kernel-4.11.9.patch} (50%) delete mode 100644 packages/linux-drivers/RTL8812AU/patches/RTL8812AU-05-fix-AP-timeout.patch delete mode 100644 packages/linux-drivers/RTL8812AU/patches/RTL8812AU-06-disable-power-saving.patch delete mode 100644 packages/linux-drivers/RTL8812AU/patches/RTL8812AU-08-disable-debug-output.patch delete mode 100644 packages/linux-drivers/RTL8812AU/patches/RTL8812AU-20-kernel-4.11.patch diff --git a/packages/linux-drivers/RTL8812AU/package.mk b/packages/linux-drivers/RTL8812AU/package.mk index 8985ed0df7..e36b92ec59 100644 --- a/packages/linux-drivers/RTL8812AU/package.mk +++ b/packages/linux-drivers/RTL8812AU/package.mk @@ -17,12 +17,12 @@ ################################################################################ PKG_NAME="RTL8812AU" -PKG_VERSION="4.3.20" +PKG_VERSION="b54ec67" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="https://github.com/Grawp/rtl8812au_rtl8821au" -PKG_URL="https://github.com/Grawp/rtl8812au_rtl8821au/archive/$PKG_VERSION.tar.gz" -PKG_SOURCE_DIR="rtl8812au_rtl8821au-$PKG_VERSION" +PKG_SITE="https://github.com/paspro/rtl8812au" +PKG_URL="https://github.com/paspro/rtl8812au/archive/$PKG_VERSION.tar.gz" +PKG_SOURCE_DIR="rtl8812au-$PKG_VERSION*" PKG_DEPENDS_TARGET="toolchain linux" PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_SECTION="driver" diff --git a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-01-add_new_cards.patch b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-01-add_new_cards.patch index a740a575dc..c089038f06 100644 --- a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-01-add_new_cards.patch +++ b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-01-add_new_cards.patch @@ -1,36 +1,30 @@ ---- a/os_dep/linux/usb_intf.c 2017-04-01 13:42:06.213757346 +0100 -+++ b/os_dep/linux/usb_intf.c 2017-04-01 13:43:43.195961025 +0100 -@@ -167,6 +167,12 @@ static struct usb_device_id rtw_usb_id_t - {USB_DEVICE(0x13b1, 0x003f),.driver_info = RTL8812}, /* Linksys - WUSB6300 */ - {USB_DEVICE(0x2357, 0x0101),.driver_info = RTL8812}, /* TP-Link - T4U */ - {USB_DEVICE(0x2357, 0x0103),.driver_info = RTL8812}, /* TP-Link - T4UH */ -+ /*=== Patched ID ===*/ +From ea455841e5d6081b33170fe3ea32aed9b7b2b72c Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 10 Jul 2017 19:44:54 +0100 +Subject: [PATCH] add new cards + +--- + os_dep/linux/usb_intf.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c +index ef79d2e..b098e56 100644 +--- a/os_dep/linux/usb_intf.c ++++ b/os_dep/linux/usb_intf.c +@@ -195,6 +195,13 @@ static struct usb_device_id rtw_usb_id_tbl[] = { + {USB_DEVICE(0x0846, 0x9052), .driver_info = RTL8821}, /* Netgear - A6100 */ + #endif + ++/*=== Patched ID ===*/ ++#ifdef CONFIG_RTL8812A + {USB_DEVICE(0x2357, 0x010d),.driver_info = RTL8812}, /* TP-Link - T4U v2 */ -+ {USB_DEVICE(0x050D, 0x1109),.driver_info = RTL8812}, /* Belkin F9L1109 - SerComm */ -+ {USB_DEVICE(0x20F4, 0x805B),.driver_info = RTL8812}, /* TRENDnet - Cameo */ + {USB_DEVICE(0x148F, 0x9097),.driver_info = RTL8812}, /* Amped Wireless ACA1 */ -+ - #endif - - #ifdef CONFIG_RTL8821A -@@ -184,9 +190,18 @@ static struct usb_device_id rtw_usb_id_t - {USB_DEVICE(0x2001, 0x3314),.driver_info = RTL8821}, /* D-Link - Cameo */ - {USB_DEVICE(0x2001, 0x3318),.driver_info = RTL8821}, /* D-Link - Cameo */ - {USB_DEVICE(0x0E66, 0x0023),.driver_info = RTL8821}, /* HAWKING - Edimax */ -- {USB_DEVICE(0x056E, 0x400E) , .driver_info = RTL8821}, /* ELECOM - ELECOM */ -- {USB_DEVICE(0x056E, 0x400F) , .driver_info = RTL8821}, /* ELECOM - ELECOM */ -+ {USB_DEVICE(0x056E, 0x400E),.driver_info = RTL8821}, /* ELECOM - ELECOM */ -+ {USB_DEVICE(0x056E, 0x400F),.driver_info = RTL8821}, /* ELECOM - ELECOM */ - {USB_DEVICE(0x0846, 0x9052),.driver_info = RTL8821}, /* Netgear - A6100 */ -+ /*=== Patched ID ===*/ -+ {USB_DEVICE(0x0BDA, 0xA811),.driver_info = RTL8821}, /* OUTLINK - Edimax */ -+ {USB_DEVICE(0x7392, 0xA812),.driver_info = RTL8821}, /* Edimax - Edimax */ -+ {USB_DEVICE(0x0411, 0x0242),.driver_info = RTL8821}, /* BUFFALO - Edimax */ -+ {USB_DEVICE(0x2001, 0x3318),.driver_info = RTL8821}, /* D-Link DWA-172 */ + {USB_DEVICE(0x056e, 0x4007),.driver_info = RTL8821}, /* Elecom - WDC-433DU2HBK */ -+ {USB_DEVICE(0x7392, 0xA813),.driver_info = RTL8821}, /* Edimax - EW-7811UAC */ -+ {USB_DEVICE(0x2019, 0xAB32),.driver_info = RTL8821}, /* Planex - GW-450S */ -+ {USB_DEVICE(0x0411, 0x025D),.driver_info = RTL8821}, /* BUFFALO WI-U3-866D */ - #endif - ++#endif ++ #ifdef CONFIG_RTL8192E + /*=== Realtek demoboard ===*/ + {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0x818B, 0xff, 0xff, 0xff), .driver_info = RTL8192E}, /* Default ID */ +-- +2.7.4 + diff --git a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-21-kernel-4.11.9.patch b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-02-kernel-4.11.9.patch similarity index 50% rename from packages/linux-drivers/RTL8812AU/patches/RTL8812AU-21-kernel-4.11.9.patch rename to packages/linux-drivers/RTL8812AU/patches/RTL8812AU-02-kernel-4.11.9.patch index a4c25c5f20..cb545712bb 100644 --- a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-21-kernel-4.11.9.patch +++ b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-02-kernel-4.11.9.patch @@ -1,29 +1,17 @@ -From 33c530916c48048683a9b81467866f18bb8d8678 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Tue, 20 Jun 2017 22:11:13 +0100 -Subject: [PATCH] rtl8812au: Fix build with kernel 4.11.9 - ---- - os_dep/linux/ioctl_cfg80211.c | 5 +++++ - 1 file changed, 5 insertions(+) - diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 492bb1a..63d438b 100644 +index 5c011ed..49d401b 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -3949,7 +3949,12 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne - mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP; - strncpy(mon_ndev->name, name, IFNAMSIZ); - mon_ndev->name[IFNAMSIZ - 1] = 0; -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(4,11,9)) -+ mon_ndev->needs_free_netdev = false; -+ mon_ndev->priv_destructor = rtw_ndev_destructor; -+#else - mon_ndev->destructor = rtw_ndev_destructor; -+#endif - - #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) - mon_ndev->netdev_ops = &rtw_cfg80211_monitor_if_ops; --- -2.7.4 - +@@ -3653,7 +3653,12 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne + mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP; + strncpy(mon_ndev->name, name, IFNAMSIZ); + mon_ndev->name[IFNAMSIZ - 1] = 0; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 9)) ++ mon_ndev->needs_free_netdev = false; ++ mon_ndev->priv_destructor = rtw_ndev_destructor; ++#else + mon_ndev->destructor = rtw_ndev_destructor; ++#endif + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)) + mon_ndev->netdev_ops = &rtw_cfg80211_monitor_if_ops; diff --git a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-05-fix-AP-timeout.patch b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-05-fix-AP-timeout.patch deleted file mode 100644 index 7345ac136a..0000000000 --- a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-05-fix-AP-timeout.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4037784fc342dc81c71f7b950f4f5d94c0c21e5c Mon Sep 17 00:00:00 2001 -From: Sam Nazarko -Date: Tue, 8 Sep 2015 18:36:02 +0100 -Subject: [PATCH] Fix potential issue for timeout when connecting to an AP. - -Signed-off-by: Sam Nazarko ---- - include/rtw_mlme_ext.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h -index cd52a90..4908e59 100644 ---- a/include/rtw_mlme_ext.h -+++ b/include/rtw_mlme_ext.h -@@ -27,7 +27,7 @@ - // So, this driver tried to extend the dwell time for each scanning channel. - // This will increase the chance to receive the probe response from SoftAP. - --#define SURVEY_TO (100) -+#define SURVEY_TO (150) - #define REAUTH_TO (300) //(50) - #define REASSOC_TO (300) //(50) - //#define DISCONNECT_TO (3000) diff --git a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-06-disable-power-saving.patch b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-06-disable-power-saving.patch deleted file mode 100644 index 390637d4f2..0000000000 --- a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-06-disable-power-saving.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b68705a507c47dc2ff2cc6121830af315fbcdc83 Mon Sep 17 00:00:00 2001 -From: Sam Nazarko -Date: Sat, 11 Jul 2015 02:31:07 +0100 -Subject: [PATCH] Disable power saving by default - -Signed-off-by: Sam Nazarko ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e97fbbf..7981e59 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ CONFIG_SDIO_HCI = n - CONFIG_GSPI_HCI = n - - CONFIG_MP_INCLUDED = y --CONFIG_POWER_SAVING = y -+CONFIG_POWER_SAVING = n - CONFIG_USB_AUTOSUSPEND = n - CONFIG_HW_PWRP_DETECTION = n - CONFIG_WIFI_TEST = n diff --git a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-08-disable-debug-output.patch b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-08-disable-debug-output.patch deleted file mode 100644 index 9c238ba248..0000000000 --- a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-08-disable-debug-output.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/include/autoconf.h b/include/autoconf.h -index 7cc4184..8135c1d 100755 ---- a/include/autoconf.h -+++ b/include/autoconf.h -@@ -343,14 +343,14 @@ - /* - * Debug Related Config - */ --#define DBG 1 -+#define DBG 0 - - //#define CONFIG_DEBUG /* DBG_871X, etc... */ - //#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */ - --#define CONFIG_PROC_DEBUG -+//#define CONFIG_PROC_DEBUG - --#define DBG_CONFIG_ERROR_DETECT -+//#define DBG_CONFIG_ERROR_DETECT - //#define DBG_CONFIG_ERROR_DETECT_INT - //#define DBG_CONFIG_ERROR_RESET - diff --git a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-20-kernel-4.11.patch b/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-20-kernel-4.11.patch deleted file mode 100644 index 8b1719ef60..0000000000 --- a/packages/linux-drivers/RTL8812AU/patches/RTL8812AU-20-kernel-4.11.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3224e74ad9c230b74a658e80dad66ab95c9e2ef5 Mon Sep 17 00:00:00 2001 -From: Vladimir Menshakov -Date: Tue, 16 May 2017 13:40:44 +0100 -Subject: [PATCH] added missing includes for linux-4.11.x - ---- - include/osdep_service_linux.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h -index 12fdd7e..560762d 100644 ---- a/include/osdep_service_linux.h -+++ b/include/osdep_service_linux.h -@@ -68,6 +68,11 @@ - #include - #endif - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) -+ #include -+ #include -+#endif -+ - #ifdef RTK_DMP_PLATFORM - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) - #include - diff --git a/packages/linux-drivers/RTL8812AU/patches/aarch64/RTL8812AU-02-fix-multiple-definitions.patch b/packages/linux-drivers/RTL8812AU/patches/aarch64/RTL8812AU-02-fix-multiple-definitions.patch index e586fe3d8a..263a970576 100644 --- a/packages/linux-drivers/RTL8812AU/patches/aarch64/RTL8812AU-02-fix-multiple-definitions.patch +++ b/packages/linux-drivers/RTL8812AU/patches/aarch64/RTL8812AU-02-fix-multiple-definitions.patch @@ -1,14 +1,24 @@ -diff -Naur a/include/ieee80211.h b/include/ieee80211.h ---- a/include/ieee80211.h 2016-10-20 12:20:19.000000000 -0700 -+++ b/include/ieee80211.h 2016-11-15 17:00:32.239848199 -0800 -@@ -1388,18 +1388,18 @@ - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) +From 92d01b516a77be6f21f6a3611c39f23e03fe4594 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 10 Jul 2017 20:11:37 +0100 +Subject: [PATCH] fix multiple definitions + +--- + include/ieee80211.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/ieee80211.h b/include/ieee80211.h +index 7a50a07..84aad12 100644 +--- a/include/ieee80211.h ++++ b/include/ieee80211.h +@@ -1481,18 +1481,18 @@ enum ieee80211_state { + (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ + (((Addr[5]) & 0xff) == 0xff)) #else -extern __inline int is_multicast_mac_addr(const u8 *addr) +static __inline int is_multicast_mac_addr(const u8 *addr) { - return ((addr[0] != 0xff) && (0x01 & addr[0])); + return (addr[0] != 0xff) && (0x01 & addr[0]); } -extern __inline int is_broadcast_mac_addr(const u8 *addr) @@ -23,3 +33,6 @@ diff -Naur a/include/ieee80211.h b/include/ieee80211.h { return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); +-- +2.7.4 +