diff options
| author | David S. Miller <davem@davemloft.net> | 2020-04-24 13:17:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-24 13:17:01 -0700 |
| commit | c651b461b55b82029f1e78e9430bde1a0d7ec5af (patch) | |
| tree | cd2e94423877e6024e00c1e4ff0e661e17361db0 /drivers/net/wireless/mac80211_hwsim.c | |
| parent | 0303b3a168080934a370a570ba162072139eedbe (diff) | |
| parent | 8ca47eb9f9e4e10e7e7fa695731a88941732c38d (diff) | |
| download | linux-stable-c651b461b55b82029f1e78e9430bde1a0d7ec5af.tar.gz linux-stable-c651b461b55b82029f1e78e9430bde1a0d7ec5af.tar.bz2 linux-stable-c651b461b55b82029f1e78e9430bde1a0d7ec5af.zip | |
Merge tag 'mac80211-for-net-2020-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just three changes:
* fix a wrong GFP_KERNEL in hwsim
* fix the debugfs mess after the mac80211 registration race fix
* suppress false-positive RCU list lockdep warnings
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 7c4b7c31d07a..0528d4cb4d37 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -4068,7 +4068,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 |