mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0
This commit is contained in:
Stephan Raue
commit
4ceaa1ad08
@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="RTL8812AU"
|
||||
PKG_VERSION="b22cbdf"
|
||||
PKG_VERSION="3f015f0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="git@github.com:wuzzeb/rtl8812AU_8821AU_linux.git"
|
||||
PKG_SITE="git@github.com:abperiasamy/rtl8812AU_8821AU_linux.git"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c
|
||||
--- RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c 2014-04-12 01:49:09.000000000 +0200
|
||||
+++ RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c 2014-09-14 15:05:39.598324411 +0200
|
||||
@@ -285,6 +285,7 @@
|
||||
/*=== Customer ID ===*/
|
||||
{USB_DEVICE(0x7392, 0xA811),.driver_info = RTL8821}, /* Edimax - Edimax */
|
||||
{USB_DEVICE(0x2001, 0x3314),.driver_info = RTL8821}, /* D-Link - Cameo */
|
||||
+ {USB_DEVICE(0x0846, 0x9052),.driver_info = RTL8821}, /* Netgear - A6100 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RTL8192E
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c
|
||||
--- RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c 2014-09-14 15:05:39.598324411 +0200
|
||||
+++ RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c 2014-09-14 15:07:13.256227216 +0200
|
||||
@@ -284,6 +284,7 @@
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8822),.driver_info = RTL8821},/* Default ID */
|
||||
/*=== Customer ID ===*/
|
||||
{USB_DEVICE(0x7392, 0xA811),.driver_info = RTL8821}, /* Edimax - Edimax */
|
||||
+ {USB_DEVICE(0x7392, 0xA812),.driver_info = RTL8821}, /* Edimax - Edimax */
|
||||
{USB_DEVICE(0x2001, 0x3314),.driver_info = RTL8821}, /* D-Link - Cameo */
|
||||
{USB_DEVICE(0x0846, 0x9052),.driver_info = RTL8821}, /* Netgear - A6100 */
|
||||
#endif
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c
|
||||
--- RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c 2014-09-14 15:07:13.256227216 +0200
|
||||
+++ RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c 2014-09-14 15:09:05.875110344 +0200
|
||||
@@ -287,6 +287,7 @@
|
||||
{USB_DEVICE(0x7392, 0xA812),.driver_info = RTL8821}, /* Edimax - Edimax */
|
||||
{USB_DEVICE(0x2001, 0x3314),.driver_info = RTL8821}, /* D-Link - Cameo */
|
||||
{USB_DEVICE(0x0846, 0x9052),.driver_info = RTL8821}, /* Netgear - A6100 */
|
||||
+ {USB_DEVICE(0x0411, 0x0242),.driver_info = RTL8821}, /* BUFFALO - Edimax */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RTL8192E
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c
|
||||
--- RTL8812AU-b22cbdf/os_dep/linux/usb_intf.c 2014-09-14 15:09:05.875110344 +0200
|
||||
+++ RTL8812AU-b22cbdf.patch/os_dep/linux/usb_intf.c 2014-09-14 15:10:34.607018261 +0200
|
||||
@@ -275,6 +275,7 @@
|
||||
{USB_DEVICE(0x2001, 0x3316),.driver_info = RTL8812}, /* D-Link - Cameo */
|
||||
{USB_DEVICE(0x20F4, 0x805B),.driver_info = RTL8812}, /* TRENDnet - Cameo */
|
||||
{USB_DEVICE(0x13B1, 0x003F),.driver_info = RTL8812}, /* Linksys - SerComm */
|
||||
+ {USB_DEVICE(0x2357, 0x0101),.driver_info = RTL8812}, /* TP-Link - T4U */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RTL8821A
|
||||
@ -1,16 +0,0 @@
|
||||
diff -Naur RTL8812AU-b22cbdf/include/ioctl_cfg80211.h RTL8812AU-b22cbdf.patch/include/ioctl_cfg80211.h
|
||||
--- RTL8812AU-b22cbdf/include/ioctl_cfg80211.h 2014-04-12 01:49:09.000000000 +0200
|
||||
+++ RTL8812AU-b22cbdf.patch/include/ioctl_cfg80211.h 2015-01-11 14:02:03.978091783 +0100
|
||||
@@ -109,9 +109,11 @@
|
||||
#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, sig_dbm, buf, len, gfp)
|
||||
#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0))
|
||||
#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, gfp)
|
||||
-#else
|
||||
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0))
|
||||
// 3.12 added a flags argument which is just set to zero
|
||||
#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, 0, gfp)
|
||||
+#else
|
||||
+ #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, 0)
|
||||
#endif
|
||||
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && !defined(COMPAT_KERNEL_RELEASE)
|
||||
@ -1,69 +0,0 @@
|
||||
diff -Naur RTL8812AU-b22cbdf/os_dep/linux/ioctl_cfg80211.c RTL8812AU-b22cbdf.patch/os_dep/linux/ioctl_cfg80211.c
|
||||
--- RTL8812AU-b22cbdf/os_dep/linux/ioctl_cfg80211.c 2014-04-12 01:49:09.000000000 +0200
|
||||
+++ RTL8812AU-b22cbdf.patch/os_dep/linux/ioctl_cfg80211.c 2015-04-04 22:08:57.188321228 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#define _IOCTL_CFG80211_C_
|
||||
|
||||
#include <drv_types.h>
|
||||
+#include <linux/version.h>
|
||||
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
|
||||
@@ -1422,16 +1423,32 @@
|
||||
goto exit;
|
||||
}
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
|
||||
+ sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
|
||||
+#else
|
||||
sinfo->filled |= STATION_INFO_SIGNAL;
|
||||
+#endif
|
||||
sinfo->signal = translate_percentage_to_dbm(padapter->recvpriv.signal_strength);
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
|
||||
+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
|
||||
+#else
|
||||
sinfo->filled |= STATION_INFO_TX_BITRATE;
|
||||
+#endif
|
||||
sinfo->txrate.legacy = rtw_get_cur_max_rate(padapter);
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
|
||||
+ sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);
|
||||
+#else
|
||||
sinfo->filled |= STATION_INFO_RX_PACKETS;
|
||||
+#endif
|
||||
sinfo->rx_packets = sta_rx_data_pkts(psta);
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
|
||||
+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);
|
||||
+#else
|
||||
sinfo->filled |= STATION_INFO_TX_PACKETS;
|
||||
+#endif
|
||||
sinfo->tx_packets = psta->sta_stats.tx_pkts;
|
||||
|
||||
}
|
||||
@@ -3019,7 +3036,9 @@
|
||||
ie_offset = _REASOCREQ_IE_OFFSET_;
|
||||
|
||||
sinfo.filled = 0;
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0))
|
||||
sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
|
||||
+#endif
|
||||
sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;
|
||||
sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset;
|
||||
cfg80211_new_sta(ndev, GetAddr2Ptr(pmgmt_frame), &sinfo, GFP_ATOMIC);
|
||||
diff -Naur RTL8812AU-b22cbdf/os_dep/linux/rtw_android.c RTL8812AU-b22cbdf.patch/os_dep/linux/rtw_android.c
|
||||
--- RTL8812AU-b22cbdf/os_dep/linux/rtw_android.c 2014-04-12 01:49:09.000000000 +0200
|
||||
+++ RTL8812AU-b22cbdf.patch/os_dep/linux/rtw_android.c 2015-04-04 20:30:01.213141833 +0200
|
||||
@@ -224,7 +224,11 @@
|
||||
{
|
||||
int cmd_num;
|
||||
for(cmd_num=0 ; cmd_num<ANDROID_WIFI_CMD_MAX; cmd_num++)
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
|
||||
+ if(!strncasecmp(cmdstr , android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])) )
|
||||
+#else
|
||||
if(0 == strnicmp(cmdstr , android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])) )
|
||||
+#endif
|
||||
break;
|
||||
|
||||
return cmd_num;
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dvb-firmware"
|
||||
PKG_VERSION="0.0.47"
|
||||
PKG_VERSION="0.0.48"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user