Commit 305c5f54 authored Apr 22, 2020 by Wei Yongjun Committed by Connor O'Brien May 03, 2021

UPSTREAM: mac80211_hwsim: use GFP_ATOMIC under spin lock



A spin lock is taken here so we should use GFP_ATOMIC.

Fixes: 5d44fe7c9808 ("mac80211_hwsim: add frame transmission support over virtio")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20200422020154.112088-1-weiyongjun1@huawei.com


Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit 0379861217dc2dd46e3bc517010060065b0dd6fc)
Bug: 187129171
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I16c7f59f3e695ac6a6ffaa25217e3d7309827dca

parent 48ffcbf0

drivers/net/wireless/mac80211_hwsim.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4041,7 +4041,7 @@ static void hwsim_virtio_rx_work(struct work_struct *work)
	}		}
	vq = hwsim_vqs[HWSIM_VQ_RX];		vq = hwsim_vqs[HWSIM_VQ_RX];
	sg_init_one(sg, skb->head, skb_end_offset(skb));		sg_init_one(sg, skb->head, skb_end_offset(skb));
	err = virtqueue_add_inbuf(vq, sg, 1, skb, GFP_KERNEL);		err = virtqueue_add_inbuf(vq, sg, 1, skb, GFP_ATOMIC);
	if (WARN(err, "virtqueue_add_inbuf returned %d\n", err))		if (WARN(err, "virtqueue_add_inbuf returned %d\n", err))
	nlmsg_free(skb);		nlmsg_free(skb);
	else		else