diff --git a/package/kernel/rtl88x2bu/Makefile b/package/kernel/rtl88x2bu/Makefile index 63ce0c6817..bb62018cca 100644 --- a/package/kernel/rtl88x2bu/Makefile +++ b/package/kernel/rtl88x2bu/Makefile @@ -11,15 +11,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl88x2bu PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/cilynx/rtl88x2bu.git +PKG_SOURCE_URL:=https://github.com/morrownr/88x2bu.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-01-21 -PKG_SOURCE_VERSION:=48e7c19c92a77554403e1347447f8e2cfd780228 -PKG_MIRROR_HASH:=2991028fb7bd7e31d041b1e99d0e0d86781fff95fc70e4560ca9fcbe038f063f +PKG_SOURCE_DATE:=2021-11-09 +PKG_SOURCE_VERSION:=47a666315d0a5ff37b53adb48ca21404787565cf +PKG_MIRROR_HASH:=454449d0d11dec7cfc4196899ddbb6cd4851dcc767b7f40e293820952a12b024 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINTER:=ElonH PKG_BUILD_PARALLEL:=1 @@ -50,14 +49,11 @@ NOSTDINC_FLAGS = \ EXTRA_CFLAGS:= \ -DRTW_SINGLE_WIPHY \ -DRTW_USE_CFG80211_STA_EVENT \ - -DCONFIG_RADIO_WORK \ -DCONFIG_IOCTL_CFG80211 \ -DCONFIG_CONCURRENT_MODE \ -DBUILD_OPENWRT EXTRA_KCONFIG:= \ - CONFIG_POWER_SAVING=n \ - CONFIG_RTW_DEBUG=y \ CONFIG_RTL8822BU=m \ USER_MODULE_NAME=rtl88x2bu diff --git a/package/kernel/rtl88x2bu/patches/010-remove-repeat-flies.patch b/package/kernel/rtl88x2bu/patches/010-remove-repeat-flies.patch index 51bbd8d3e0..67cfa1d87a 100644 --- a/package/kernel/rtl88x2bu/patches/010-remove-repeat-flies.patch +++ b/package/kernel/rtl88x2bu/patches/010-remove-repeat-flies.patch @@ -27,8 +27,8 @@ index 0d20a7e..f0a9f88 100644 +#include +#include "rtl_autoconf.h" #include "hal_ic_cfg.h" - #if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) + #define CONFIG_RSSI_PRIORITY diff --git a/include/linux/wireless.h b/include/linux/old_unused_rtl_wireless.h similarity index 100% rename from include/linux/wireless.h diff --git a/package/kernel/rtl88x2bu/patches/020-change-value-of-vht-enable-and-usb-mode.patch b/package/kernel/rtl88x2bu/patches/020-change-value-of-vht-enable-and-usb-mode.patch new file mode 100644 index 0000000000..2944a514cf --- /dev/null +++ b/package/kernel/rtl88x2bu/patches/020-change-value-of-vht-enable-and-usb-mode.patch @@ -0,0 +1,20 @@ +--- a/os_dep/linux/os_intfs.c ++++ b/os_dep/linux/os_intfs.c +@@ -309,7 +309,7 @@ int rtw_bfee_rf_number = 0; /*BeamformeeCapRfNum Rf path number, 0 for auto, ot + #endif /* CONFIG_80211N_HT */ + + #ifdef CONFIG_80211AC_VHT +-int rtw_vht_enable = 1; /* 0:disable, 1:enable, 2:force auto enable */ ++int rtw_vht_enable = 2; /* 0:disable, 1:enable, 2:force auto enable */ + module_param(rtw_vht_enable, int, 0644); + + int rtw_ampdu_factor = 7; +@@ -392,7 +392,7 @@ int rtw_drv_ant_band_switch = 1; /* 0:OFF , 1:ON, Driver control antenna band sw + int rtw_single_ant_path; /*0:main ant , 1:aux ant , Fixed single antenna path, default main ant*/ + + /* 0: doesn't switch, 1: switch from usb2.0 to usb 3.0 2: switch from usb3.0 to usb 2.0 */ +-int rtw_switch_usb_mode = 0; ++int rtw_switch_usb_mode = 1; + + #ifdef CONFIG_USB_AUTOSUSPEND + int rtw_enusbss = 1;/* 0:disable,1:enable */ diff --git a/package/kernel/rtl88x2bu/patches/020-wireless-5.8.patch b/package/kernel/rtl88x2bu/patches/020-wireless-5.8.patch index 96b1d956ce..b5911b0436 100644 --- a/package/kernel/rtl88x2bu/patches/020-wireless-5.8.patch +++ b/package/kernel/rtl88x2bu/patches/020-wireless-5.8.patch @@ -1,38 +1,20 @@ --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7325,7 +7325,7 @@ exit: +@@ -7808,7 +7808,7 @@ exit: return ret; } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) && !defined(BUILD_OPENWRT) - static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) -@@ -7341,7 +7341,7 @@ static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, - struct mgmt_frame_regs *upd) - #endif - { --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) - u32 rtw_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4); - #endif + struct wireless_dev *wdev, +@@ -10286,7 +10286,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { -@@ -7371,7 +7371,7 @@ static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, - /* Wait QC Verify */ - return; - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) && !defined(BUILD_OPENWRT) - switch (frame_type) { - case IEEE80211_STYPE_PROBE_REQ: /* 0x0040 */ - SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, reg); -@@ -9672,7 +9672,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) .mgmt_tx = cfg80211_rtw_mgmt_tx, - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) && !defined(BUILD_OPENWRT) .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, #else - .update_mgmt_frame_registrations = + .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register,