aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-10-15 10:44:45 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-10-23 18:08:42 +0200
commite2d7896795bed7483fb08ff47801afdbd7cd9849 (patch)
tree95a65660e2d1252213615871bc2d64718551abb4
parentcf2e9f7e980ad5effce804c52d941c7fef4c24bb (diff)
downloadbackports-e2d7896795bed7483fb08ff47801afdbd7cd9849.tar.gz
patches: Refresh on top of kernel 5.15.74v5.15.74-1
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/0028-select_queue/r8188eu.patch2
-rw-r--r--patches/0077-genl-ro-after-init/hwsim.patch2
-rw-r--r--patches/0097-skb-list/mac80211-rx.patch12
-rw-r--r--patches/0097-skb-list/mt76.patch4
-rw-r--r--patches/0100-revert-small_ops/mac80211_hwsim.patch4
5 files changed, 12 insertions, 12 deletions
diff --git a/patches/0028-select_queue/r8188eu.patch b/patches/0028-select_queue/r8188eu.patch
index d12fa9c4..f1bf0381 100644
--- a/patches/0028-select_queue/r8188eu.patch
+++ b/patches/0028-select_queue/r8188eu.patch
@@ -1,6 +1,6 @@
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
-@@ -635,7 +635,15 @@ static unsigned int rtw_classify8021d(st
+@@ -636,7 +636,15 @@ static unsigned int rtw_classify8021d(st
return dscp >> 5;
}
diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch
index 5fea97e4..049c8f26 100644
--- a/patches/0077-genl-ro-after-init/hwsim.patch
+++ b/patches/0077-genl-ro-after-init/hwsim.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -4119,7 +4119,7 @@ static const struct genl_small_ops hwsim
+@@ -4123,7 +4123,7 @@ static const struct genl_small_ops hwsim
},
};
diff --git a/patches/0097-skb-list/mac80211-rx.patch b/patches/0097-skb-list/mac80211-rx.patch
index e7a4517e..29cefa93 100644
--- a/patches/0097-skb-list/mac80211-rx.patch
+++ b/patches/0097-skb-list/mac80211-rx.patch
@@ -37,7 +37,7 @@ the older kernel instead. The list attributes where also backported to
struct ieee80211_sub_if_data *sdata;
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -2610,7 +2610,11 @@ static void ieee80211_deliver_skb_to_loc
+@@ -2612,7 +2612,11 @@ static void ieee80211_deliver_skb_to_loc
/* deliver to local stack */
if (rx->list)
@@ -49,7 +49,7 @@ the older kernel instead. The list attributes where also backported to
else
netif_receive_skb(skb);
}
-@@ -4697,7 +4701,11 @@ static bool ieee80211_prepare_and_rx_han
+@@ -4699,7 +4703,11 @@ static bool ieee80211_prepare_and_rx_han
static void __ieee80211_rx_handle_8023(struct ieee80211_hw *hw,
struct ieee80211_sta *pubsta,
struct sk_buff *skb,
@@ -61,7 +61,7 @@ the older kernel instead. The list attributes where also backported to
{
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_fast_rx *fast_rx;
-@@ -4738,7 +4746,11 @@ drop:
+@@ -4740,7 +4748,11 @@ drop:
static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
struct ieee80211_sta *pubsta,
struct sk_buff *skb,
@@ -73,7 +73,7 @@ the older kernel instead. The list attributes where also backported to
{
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_sub_if_data *sdata;
-@@ -4863,7 +4875,11 @@ static void __ieee80211_rx_handle_packet
+@@ -4865,7 +4877,11 @@ static void __ieee80211_rx_handle_packet
* 802.11 MPDU is received from the hardware.
*/
void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
@@ -85,7 +85,7 @@ the older kernel instead. The list attributes where also backported to
{
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_rate *rate = NULL;
-@@ -4987,7 +5003,13 @@ void ieee80211_rx_napi(struct ieee80211_
+@@ -4989,7 +5005,13 @@ void ieee80211_rx_napi(struct ieee80211_
struct sk_buff *skb, struct napi_struct *napi)
{
struct sk_buff *tmp;
@@ -99,7 +99,7 @@ the older kernel instead. The list attributes where also backported to
/*
-@@ -5004,8 +5026,13 @@ void ieee80211_rx_napi(struct ieee80211_
+@@ -5006,8 +5028,13 @@ void ieee80211_rx_napi(struct ieee80211_
return;
}
diff --git a/patches/0097-skb-list/mt76.patch b/patches/0097-skb-list/mt76.patch
index c2c0bb58..b6b4f670 100644
--- a/patches/0097-skb-list/mt76.patch
+++ b/patches/0097-skb-list/mt76.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
-@@ -1024,7 +1024,13 @@ void mt76_rx_complete(struct mt76_dev *d
+@@ -1025,7 +1025,13 @@ void mt76_rx_complete(struct mt76_dev *d
struct ieee80211_sta *sta;
struct ieee80211_hw *hw;
struct sk_buff *skb, *tmp;
@@ -14,7 +14,7 @@
spin_lock(&dev->rx_lock);
while ((skb = __skb_dequeue(frames)) != NULL) {
-@@ -1056,8 +1062,13 @@ void mt76_rx_complete(struct mt76_dev *d
+@@ -1057,8 +1063,13 @@ void mt76_rx_complete(struct mt76_dev *d
return;
}
diff --git a/patches/0100-revert-small_ops/mac80211_hwsim.patch b/patches/0100-revert-small_ops/mac80211_hwsim.patch
index 0884dd7c..f9c2c412 100644
--- a/patches/0100-revert-small_ops/mac80211_hwsim.patch
+++ b/patches/0100-revert-small_ops/mac80211_hwsim.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -4082,7 +4082,11 @@ done:
+@@ -4086,7 +4086,11 @@ done:
}
/* Generic Netlink operations array */
@@ -12,7 +12,7 @@
{
.cmd = HWSIM_CMD_REGISTER,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-@@ -4126,8 +4130,13 @@ static struct genl_family hwsim_genl_fam
+@@ -4130,8 +4134,13 @@ static struct genl_family hwsim_genl_fam
.policy = hwsim_genl_policy,
.netnsok = true,
.module = THIS_MODULE,