Skip to content

Commit

Permalink
refresh patches
Browse files Browse the repository at this point in the history
  • Loading branch information
breeze303 committed Oct 5, 2024
1 parent 024558c commit bfe37d2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3134,7 +3134,8 @@ static int ieee80211_get_tx_power(struct
@@ -3111,7 +3111,8 @@ static int ieee80211_get_tx_power(struct
struct ieee80211_local *local = wiphy_priv(wiphy);
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (ret < 0)
return ret;

@@ -3992,7 +3992,7 @@ __ieee80211_channel_switch(struct wiphy
@@ -3993,7 +3993,7 @@ __ieee80211_channel_switch(struct wiphy
goto out;

/* if reservation is invalid then this will fail */
Expand All @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (err) {
ieee80211_link_unreserve_chanctx(link_data);
goto out;
@@ -5161,4 +5161,5 @@ const struct cfg80211_ops mac80211_confi
@@ -5162,4 +5162,5 @@ const struct cfg80211_ops mac80211_confi
.del_link_station = ieee80211_del_link_station,
.set_hw_timestamp = ieee80211_set_hw_timestamp,
.set_ttlm = ieee80211_set_ttlm,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@

data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
if (!data)
@@ -4869,6 +4975,14 @@ static void skb_extensions_init(void) {}
@@ -4865,6 +4971,14 @@ static void skb_extensions_init(void) {}

void __init skb_init(void)
{
Expand All @@ -403,15 +403,15 @@
skbuff_cache = kmem_cache_create_usercopy("skbuff_head_cache",
sizeof(struct sk_buff),
0,
@@ -4894,6 +5008,7 @@ void __init skb_init(void)
@@ -4890,6 +5004,7 @@ void __init skb_init(void)
SKB_SMALL_HEAD_HEADROOM,
NULL);
skb_extensions_init();
+ skb_recycler_init();
}

static int
@@ -6397,6 +6512,8 @@ static int pskb_carve_inside_header(stru
@@ -6393,6 +6508,8 @@ static int pskb_carve_inside_header(stru
if (skb_pfmemalloc(skb))
gfp_mask |= __GFP_MEMALLOC;

Expand All @@ -420,7 +420,7 @@
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
if (!data)
return -ENOMEM;
@@ -6513,6 +6630,8 @@ static int pskb_carve_inside_nonlinear(s
@@ -6509,6 +6626,8 @@ static int pskb_carve_inside_nonlinear(s
if (skb_pfmemalloc(skb))
gfp_mask |= __GFP_MEMALLOC;

Expand Down

0 comments on commit bfe37d2

Please sign in to comment.