Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c188f80e authored by Wei Yongjun's avatar Wei Yongjun Committed by Lee Jones
Browse files

UPSTREAM: mac80211_hwsim: use GFP_ATOMIC under spin lock 



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

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


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
(cherry picked from commit 0379861217dc2dd46e3bc517010060065b0dd6fc)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I60bb1e94123f511827c53cbe3f3706c005652758
parent 22cac0aa

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -3937,7 +3937,7 @@ static void hwsim_virtio_rx_work(struct work_struct *work) 
	}

	vq = hwsim_vqs[HWSIM_VQ_RX];

	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))

		nlmsg_free(skb);

	else