aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-06-05 17:54:36 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-05 17:55:06 +0200
commit1c5ac6320840533fe6767122b65f27ced3699a53 (patch)
treedcdfed6ab61325fbb2d86aa51ee8994599336181
parent7b5533e18905ba3ddbe11f4460ae9122ad00efaa (diff)
downloadbackports-1c5ac6320840533fe6767122b65f27ced3699a53.tar.gz
patches: Refresh on kernel 5.10.42
No manual changes needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/0024-led-blink-api/mac80211.patch2
-rw-r--r--patches/0028-select_queue/mac80211.patch4
-rw-r--r--patches/0097-skb-list/mac80211-rx.patch14
3 files changed, 10 insertions, 10 deletions
diff --git a/patches/0024-led-blink-api/mac80211.patch b/patches/0024-led-blink-api/mac80211.patch
index 9138c74c..b1712de4 100644
--- a/patches/0024-led-blink-api/mac80211.patch
+++ b/patches/0024-led-blink-api/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -1333,6 +1333,7 @@ struct ieee80211_local {
+@@ -1320,6 +1320,7 @@ struct ieee80211_local {
struct mutex chanctx_mtx;
#ifdef CONFIG_MAC80211_LEDS
diff --git a/patches/0028-select_queue/mac80211.patch b/patches/0028-select_queue/mac80211.patch
index b9f25461..eae033ad 100644
--- a/patches/0028-select_queue/mac80211.patch
+++ b/patches/0028-select_queue/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -699,9 +699,29 @@ static void ieee80211_uninit(struct net_
+@@ -695,9 +695,29 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -30,7 +30,7 @@
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -723,9 +743,29 @@ static const struct net_device_ops ieee8
+@@ -719,9 +739,29 @@ static const struct net_device_ops ieee8
.ndo_get_stats64 = ieee80211_get_stats64,
};
diff --git a/patches/0097-skb-list/mac80211-rx.patch b/patches/0097-skb-list/mac80211-rx.patch
index f65b4aad..dc76fc34 100644
--- a/patches/0097-skb-list/mac80211-rx.patch
+++ b/patches/0097-skb-list/mac80211-rx.patch
@@ -23,7 +23,7 @@ the older kernel instead. The list attributes where also backported to
* ieee80211_rx_napi - receive frame from NAPI context
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -217,7 +217,11 @@ enum ieee80211_rx_flags {
+@@ -199,7 +199,11 @@ enum ieee80211_rx_flags {
};
struct ieee80211_rx_data {
@@ -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
-@@ -2539,7 +2539,11 @@ static void ieee80211_deliver_skb_to_loc
+@@ -2605,7 +2605,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);
}
-@@ -4461,7 +4465,11 @@ static bool ieee80211_invoke_fast_rx(str
+@@ -4545,7 +4549,11 @@ static bool ieee80211_invoke_fast_rx(str
skb->protocol = eth_type_trans(skb, fast_rx->dev);
memset(skb->cb, 0, sizeof(skb->cb));
if (rx->list)
@@ -61,7 +61,7 @@ the older kernel instead. The list attributes where also backported to
else
netif_receive_skb(skb);
-@@ -4528,7 +4536,11 @@ static bool ieee80211_prepare_and_rx_han
+@@ -4612,7 +4620,11 @@ static bool ieee80211_prepare_and_rx_han
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;
-@@ -4653,7 +4665,11 @@ static void __ieee80211_rx_handle_packet
+@@ -4737,7 +4749,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;
-@@ -4770,7 +4786,13 @@ void ieee80211_rx_napi(struct ieee80211_
+@@ -4854,7 +4870,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
/*
-@@ -4787,8 +4809,13 @@ void ieee80211_rx_napi(struct ieee80211_
+@@ -4871,8 +4893,13 @@ void ieee80211_rx_napi(struct ieee80211_
return;
}