298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: backports linux 6.1 support

Browse Source
This commit is contained in:
coolsnowwolf 2022-12-14 01:52:15 +08:00
parent 74a3f1191b
commit 4212f116b4
5 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/kernel/mac80211/patches/subsys/995-backport-pskb_pull.patch Normal file
View File

@ -0,0 +1,27 @@
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -49,7 +49,11 @@
if (present_fcs_len)
__pskb_trim(skb, skb->len - present_fcs_len);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
__pskb_pull(skb, rtap_space);
+#else
+ pskb_pull(skb, rtap_space);
+#endif
hdr = (void *)skb->data;
fc = hdr->frame_control;
@@ -74,8 +78,11 @@
memmove(skb->data + IEEE80211_HT_CTL_LEN, skb->data,
hdrlen - IEEE80211_HT_CTL_LEN);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
__pskb_pull(skb, IEEE80211_HT_CTL_LEN);
-
+#else
+ pskb_pull(skb, IEEE80211_HT_CTL_LEN);
+#endif
return skb;
}

14
package/kernel/mac80211/patches/subsys/996-use-prandom_u32_max.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -1867,7 +1867,11 @@
memset(sample_table, 0xff, sizeof(sample_table));
for (col = 0; col < SAMPLE_COLUMNS; col++) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
prandom_bytes(rnd, sizeof(rnd));
+#else
+ get_random_bytes(rnd, sizeof(rnd));
+#endif
for (i = 0; i < MCS_GROUP_RATES; i++) {
new_idx = (i + rnd[i]) % MCS_GROUP_RATES;
while (sample_table[col][new_idx] != 0xff)

2
package/kernel/mt76/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mt76
PKG_RELEASE=5
PKG_RELEASE=6
PKG_LICENSE:=GPLv2
PKG_LICENSE_FILES:=

33
package/kernel/mt76/patches/091-fix-linux-6.1-build.patch Normal file
View File

@ -0,0 +1,33 @@
--- a/mt7921/dma.c
--- b/mt7921/dma.c
@@ -283,10 +283,15 @@
if (ret < 0)
return ret;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
mt7921_poll_tx, NAPI_POLL_WEIGHT);
napi_enable(&dev->mt76.tx_napi);
-
+#else
+ netif_napi_add_tx_weight(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
+ mt7921_poll_tx, NAPI_POLL_WEIGHT);
+ napi_enable(&dev->mt76.tx_napi);
+#endif
return mt7921_dma_enable(dev);
}
--- a/dma.c
--- b/dma.c
@@ -895,7 +895,11 @@
dev->napi_dev.threaded = 1;
mt76_for_each_q_rx(dev, i) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
netif_napi_add(&dev->napi_dev, &dev->napi[i], poll, 64);
+#else
+ netif_napi_add_weight(&dev->napi_dev, &dev->napi[i], poll, 64);
+#endif
mt76_dma_rx_fill(dev, &dev->q_rx[i]);
napi_enable(&dev->napi[i]);
}

4
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
View File

@ -23,8 +23,8 @@
keyup-threshold-microvolt = <1750000>;
button-power {
label = "Power";
linux,code = <KEY_POWER>;
label = "Power Button";
// linux,code = <KEY_POWER>;
press-threshold-microvolt = <0>;
};
};