diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2023-06-06 10:42:42 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2023-06-06 10:42:42 +0200 |
| commit | 5c68005083d620b1499fc81926a514d39ae8b88c (patch) | |
| tree | af84a24baea0fb494193a29a896ec0be7d7c7234 /net/mac802154 | |
| parent | 1af3de62f03f651c5e50c0e00f8fed34d07b9df3 (diff) | |
| parent | 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 (diff) | |
Merge tag 'v6.4-rc4' into wpan-next/staging
Linux 6.4-rc4
Diffstat (limited to 'net/mac802154')
| -rw-r--r-- | net/mac802154/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac802154/scan.c b/net/mac802154/scan.c index 618553a2e026..d9658f2c4ae6 100644 --- a/net/mac802154/scan.c +++ b/net/mac802154/scan.c @@ -56,7 +56,7 @@ static int mac802154_scan_cleanup_locked(struct ieee802154_local *local, request = rcu_replace_pointer(local->scan_req, NULL, 1); if (!request) return 0; - kfree_rcu(request); + kvfree_rcu_mightsleep(request); /* Advertize first, while we know the devices cannot be removed */ if (aborted) @@ -455,7 +455,7 @@ int mac802154_stop_beacons_locked(struct ieee802154_local *local, request = rcu_replace_pointer(local->beacon_req, NULL, 1); if (!request) return 0; - kfree_rcu(request); + kvfree_rcu_mightsleep(request); nl802154_beaconing_done(wpan_dev); |