Merge pull request #1816 from MilhouseVH/bump_rtl8812au_paspro

RTL8812AU: update to RTL8812AU-887f8cc
This commit is contained in:
Christian Hewitt 2017-07-23 15:59:07 +04:00 committed by GitHub
commit 18851562a2
4 changed files with 2 additions and 95 deletions

View File

@ -17,8 +17,8 @@
################################################################################ ################################################################################
PKG_NAME="RTL8812AU" PKG_NAME="RTL8812AU"
PKG_VERSION="b54ec67" PKG_VERSION="887f8cc"
PKG_SHA256="1b02c0b7ba66dbcae1580fe92cf3123c2b2fcb7e0e3a6a80761439d21017c5e5" PKG_SHA256="82767acea89faa1c9ccac8799da98e1e5b785316e95c0ffa9f52670bb15e7c81"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://github.com/paspro/rtl8812au" PKG_SITE="https://github.com/paspro/rtl8812au"

View File

@ -1,30 +0,0 @@
From ea455841e5d6081b33170fe3ea32aed9b7b2b72c Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
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(0x148F, 0x9097),.driver_info = RTL8812}, /* Amped Wireless ACA1 */
+ {USB_DEVICE(0x056e, 0x4007),.driver_info = RTL8821}, /* Elecom - WDC-433DU2HBK */
+#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

View File

@ -1,17 +0,0 @@
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index 5c011ed..49d401b 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -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;

View File

@ -1,46 +0,0 @@
From e91f7f7053a68dbbf95818a5245deed7570f17be Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 14 Jul 2017 21:19:16 +0100
Subject: [PATCH] Fix kernel v4.12 support
---
os_dep/linux/ioctl_cfg80211.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index 5c011ed..6933a78 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -1747,10 +1747,17 @@ enum nl80211_iftype {
NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1
};
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
+ struct net_device *ndev,
+ enum nl80211_iftype type,
+ struct vif_params *params)
+#else
static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
struct net_device *ndev,
enum nl80211_iftype type, u32 *flags,
struct vif_params *params)
+#endif
{
enum nl80211_iftype old_type;
NDIS_802_11_NETWORK_INFRASTRUCTURE networkType;
@@ -3719,7 +3726,11 @@ static int
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
unsigned char name_assign_type,
#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
+ enum nl80211_iftype type, struct vif_params *params)
+ #else
enum nl80211_iftype type, u32 *flags, struct vif_params *params)
+ #endif
{
int ret = 0;
struct net_device *ndev = NULL;
--
2.7.4