mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
drivers_network: Bump several drivers from upstream
Also add commit dates to make life prettier and easier The following drivers have been updated with fixes for 6.8 - driver_rtl8811CU_rtl8821C - driver_rtl88x2bu - driver_rtl8811_rtl8812_rtl8814_rtl8821 The following drivers have been updated without specific 6.8 patches: - driver_rtl8189ES (patches for 6.7, deleted two upstreamed patches) - driver_rtl8189FS (patches for 6.7, deleted four upstreamed patches)
This commit is contained in:
ColorfulRhino
@@ -1,25 +0,0 @@
|
||||
From f8e116deb69b22fd056a121ee1d79fb8d7c490b8 Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Zhumarin <kirill.zhumarin@gmail.com>
|
||||
Date: Thu, 19 Jan 2023 21:46:16 +0000
|
||||
Subject: [PATCH] Fix uninitialized cfg80211_chan_def
|
||||
|
||||
Signed-off-by: Kirill Zhumarin <kirill.zhumarin@gmail.com>
|
||||
---
|
||||
drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
|
||||
index 4e810e5c4..b4e0acb70 100644
|
||||
--- a/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -430,7 +430,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
|
||||
u8 ret = _SUCCESS;
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
- struct cfg80211_chan_def chdef;
|
||||
+ struct cfg80211_chan_def chdef = {};
|
||||
|
||||
if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
|
||||
goto exit;
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
@@ -1,26 +0,0 @@
|
||||
From a6acdedc2b194f36f089630fb966b56408623c99 Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Zhumarin <kirill.zhumarin@gmail.com>
|
||||
Date: Thu, 19 Jan 2023 22:41:55 +0000
|
||||
Subject: [PATCH] Make different MAC for if1
|
||||
|
||||
Signed-off-by: Kirill Zhumarin <kirill.zhumarin@gmail.com>
|
||||
---
|
||||
drivers/net/wireless/rtl8189es/os_dep/linux/os_intfs.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8189es/os_dep/linux/os_intfs.c b/drivers/net/wireless/rtl8189es/os_dep/linux/os_intfs.c
|
||||
index bb4c5609f..f503fedc7 100644
|
||||
--- a/drivers/net/wireless/rtl8189es/os_dep/linux/os_intfs.c
|
||||
+++ b/drivers/net/wireless/rtl8189es/os_dep/linux/os_intfs.c
|
||||
@@ -3145,7 +3145,7 @@ _adapter *rtw_drv_add_vir_if(_adapter *primary_padapter,
|
||||
* If it is 1, the address is locally administered
|
||||
*/
|
||||
mac[0] |= BIT(1);
|
||||
- if (padapter->iface_id > IFACE_ID1)
|
||||
+ if (padapter->iface_id >= IFACE_ID1)
|
||||
mac[4] ^= BIT(padapter->iface_id);
|
||||
|
||||
_rtw_memcpy(adapter_mac_addr(padapter), mac, ETH_ALEN);
|
||||
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
@@ -1,43 +0,0 @@
|
||||
From 3d022cc1754fbb172ee0026ea0d0d988fa448cc8 Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Zhumarin <kirill.zhumarin@gmail.com>
|
||||
Date: Fri, 6 Jan 2023 19:57:51 +0200
|
||||
Subject: [PATCH] Enable secondary interface (wlan1)
|
||||
|
||||
---
|
||||
drivers/net/wireless/rtl8189fs/Makefile | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8189fs/Makefile b/drivers/net/wireless/rtl8189fs/Makefile
|
||||
index dfca3058..19df1972 100644
|
||||
--- a/drivers/net/wireless/rtl8189fs/Makefile
|
||||
+++ b/drivers/net/wireless/rtl8189fs/Makefile
|
||||
@@ -24,6 +24,7 @@ EXTRA_CFLAGS += -I$(src)/include
|
||||
|
||||
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
||||
EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
|
||||
+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
|
||||
|
||||
EXTRA_LDFLAGS += --strip-debug
|
||||
|
||||
From f62142efac5b115d231fedcfa41ea5161f6d59c7 Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Zhumarin <kirill.zhumarin@gmail.com>
|
||||
Date: Fri, 6 Jan 2023 19:18:59 +0200
|
||||
Subject: [PATCH] Make different MAC for if1
|
||||
|
||||
---
|
||||
drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c b/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c
|
||||
index 44bd029..509f2ab 100644
|
||||
--- a/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c
|
||||
+++ b/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c
|
||||
@@ -3036,7 +3036,7 @@ _adapter *rtw_drv_add_vir_if(_adapter *primary_padapter,
|
||||
* If it is 1, the address is locally administered
|
||||
*/
|
||||
mac[0] |= BIT(1);
|
||||
- if (padapter->iface_id > IFACE_ID1)
|
||||
+ if (padapter->iface_id >= IFACE_ID1)
|
||||
mac[4] ^= BIT(padapter->iface_id);
|
||||
|
||||
_rtw_memcpy(adapter_mac_addr(padapter), mac, ETH_ALEN);
|
||||
@@ -1,55 +0,0 @@
|
||||
From 2f2daa387fbaaef5290895ebe3e064aef40b667a Mon Sep 17 00:00:00 2001
|
||||
From: Gunjan Gupta <viraniac@gmail.com>
|
||||
Date: Sat, 23 Dec 2023 06:56:11 +0000
|
||||
Subject: [PATCH 3/4] wireless: rtl8189fs: fix compilation with 6.7 kernel
|
||||
|
||||
---
|
||||
.../rtl8189fs/os_dep/linux/ioctl_cfg80211.c | 25 +++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
|
||||
index 42bc69b2cafa..8ea27f1e5fb6 100644
|
||||
--- a/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -4988,6 +4988,29 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
||||
+static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
||||
+ struct cfg80211_ap_update *info)
|
||||
+{
|
||||
+ int ret = 0;
|
||||
+ _adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
|
||||
+
|
||||
+ RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
|
||||
+
|
||||
+ ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, info->beacon.tail, info->beacon.tail_len);
|
||||
+
|
||||
+ // In cases like WPS, the proberesp and assocresp IEs vary from the beacon, and need to be explicitly set
|
||||
+ if (ret == 0) {
|
||||
+ if (info->beacon.proberesp_ies && info->beacon.proberesp_ies_len > 0)
|
||||
+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) info->beacon.proberesp_ies, info->beacon.proberesp_ies_len, 0x2 /*PROBE_RESP*/);
|
||||
+
|
||||
+ if (info->beacon.assocresp_ies && info->beacon.assocresp_ies_len > 0)
|
||||
+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) info->beacon.assocresp_ies, info->beacon.assocresp_ies_len, 0x4 /*ASSOC_RESP*/);
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+#else
|
||||
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
||||
struct cfg80211_beacon_data *info)
|
||||
{
|
||||
@@ -5009,6 +5032,8 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
|
||||
|
||||
return ret;
|
||||
}
|
||||
+#endif
|
||||
+
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
|
||||
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
|
||||
#else
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -43,26 +43,3 @@ index 4ac88af..9c67bbf 100644
|
||||
return ret;
|
||||
}
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
|
||||
|
||||
From 5ef7643845caab699016983aef3aaf773988d026 Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Zhumarin <kirill.zhumarin@gmail.com>
|
||||
Date: Fri, 6 Jan 2023 17:07:53 +0200
|
||||
Subject: [PATCH] Fix uninitialized cfg80211_chan_def
|
||||
|
||||
---
|
||||
drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
|
||||
index 4ac88af..f0b3d49 100644
|
||||
--- a/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/net/wireless/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -413,7 +413,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
|
||||
u8 ret = _SUCCESS;
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
- struct cfg80211_chan_def chdef;
|
||||
+ struct cfg80211_chan_def chdef = {};
|
||||
|
||||
ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht);
|
||||
if (ret != _SUCCESS)
|
||||
|
||||
Reference in New Issue
Block a user