-
Notifications
You must be signed in to change notification settings - Fork 8
/
Copy pathbackports-matrix-v6.x.patch
executable file
·73 lines (63 loc) · 2.78 KB
/
backports-matrix-v6.x.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
--- backports-5.15.92-1/Makefile 2023-03-25 14:57:25.521507446 -0400
+++ backports-5.15.92-1.new/Makefile 2023-03-25 14:57:37.765452730 -0400
@@ -85,7 +85,7 @@
done \
) > Kconfig.kernel ;\
kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \
- kernelversion | sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d');\
+ kernelversion | sed 's/^\(\([3-6]\|2\.6\)\.[0-9]\+\).*/\1/;t;d');\
test "$$kver" != "" || echo "Kernel version parse failed!" ;\
test "$$kver" != "" ;\
kvers="$$(seq 14 39 | sed 's/^/2.6./')" ;\
--- backports-5.15.92-1/net/wireless/util.c 2023-03-25 15:03:33.601358618 -0400
+++ backports-5.15.92-1.new/net/wireless/util.c 2023-03-25 15:03:47.181298350 -0400
@@ -2149,7 +2149,7 @@
skb->dev = dev;
skb->protocol = eth_type_trans(skb, dev);
memset(skb->cb, 0, sizeof(skb->cb));
- netif_rx_ni(skb);
+ netif_rx(skb);
}
EXPORT_SYMBOL(cfg80211_send_layer2_update);
--- backports-5.15.92-1/net/mac80211/ethtool.c 2023-03-25 15:16:17.665421365 -0400
+++ backports-5.15.92-1.new/net/mac80211/ethtool.c 2023-03-25 15:16:34.709435038 -0400
@@ -14,7 +14,7 @@
#include "driver-ops.h"
static int ieee80211_set_ringparam(struct net_device *dev,
- struct ethtool_ringparam *rp)
+ struct ethtool_ringparam *rp, struct kernel_ethtool_ringparam *, struct netlink_ext_ack *)
{
struct ieee80211_local *local = wiphy_priv(dev->ieee80211_ptr->wiphy);
@@ -25,7 +25,7 @@
}
static void ieee80211_get_ringparam(struct net_device *dev,
- struct ethtool_ringparam *rp)
+ struct ethtool_ringparam *rp, struct kernel_ethtool_ringparam *, struct netlink_ext_ack *)
{
struct ieee80211_local *local = wiphy_priv(dev->ieee80211_ptr->wiphy);
--- backports-5.15.92-1/net/mac80211/rx.c 2023-03-25 15:24:21.601634333 -0400
+++ backports-5.15.92-1.new/net/mac80211/rx.c 2023-03-25 15:24:38.829552304 -0400
@@ -49,7 +49,7 @@
if (present_fcs_len)
__pskb_trim(skb, skb->len - present_fcs_len);
- __pskb_pull(skb, rtap_space);
+ pskb_pull(skb, rtap_space);
hdr = (void *)skb->data;
fc = hdr->frame_control;
@@ -74,7 +74,7 @@
memmove(skb->data + IEEE80211_HT_CTL_LEN, skb->data,
hdrlen - IEEE80211_HT_CTL_LEN);
- __pskb_pull(skb, IEEE80211_HT_CTL_LEN);
+ pskb_pull(skb, IEEE80211_HT_CTL_LEN);
return skb;
}
--- backports-5.15.92-1/net/mac80211/rc80211_minstrel_ht.c 2023-03-25 15:30:10.697687288 -0400
+++ backports-5.15.92-1.new/net/mac80211/rc80211_minstrel_ht.c 2023-03-25 15:30:25.733692224 -0400
@@ -1911,7 +1911,7 @@
memset(sample_table, 0xff, sizeof(sample_table));
for (col = 0; col < SAMPLE_COLUMNS; col++) {
- prandom_bytes(rnd, sizeof(rnd));
+ get_random_bytes(rnd, sizeof(rnd));
for (i = 0; i < MCS_GROUP_RATES; i++) {
new_idx = (i + rnd[i]) % MCS_GROUP_RATES;
while (sample_table[col][new_idx] != 0xff)