From: Christophe JAILLET Date: Sun, 20 Feb 2022 08:23:15 +0000 (+0100) Subject: mac80211: Use GFP_KERNEL instead of GFP_ATOMIC when possible X-Git-Tag: v5.18-rc1~136^2~110^2~4 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=60df54f8e6bb2c375a9d21f16c9d3983206709e7;p=linux-block.git mac80211: Use GFP_KERNEL instead of GFP_ATOMIC when possible Previous memory allocations in this function already use GFP_KERNEL, so use __dev_alloc_skb() and an explicit GFP_KERNEL instead of an implicit GFP_ATOMIC. This gives more opportunities of successful allocation. Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/194a0e2ff00c3fae88cc9fba47431747360c8242.1645345378.git.christophe.jaillet@wanadoo.fr Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 1d3b4ad32965..5275f4f32a78 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -853,7 +853,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) bcn = kzalloc(sizeof(*bcn) + head_len + tail_len, GFP_KERNEL); /* need an skb for IE builders to operate on */ - skb = dev_alloc_skb(max(head_len, tail_len)); + skb = __dev_alloc_skb(max(head_len, tail_len), GFP_KERNEL); if (!bcn || !skb) goto out_free;