mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
ieee802154: Drop device trackers
In order to prevent a device from disappearing when a background job was started, dev_hold() and dev_put() calls were made. During the stabilization phase of the scan/beacon features, it was later decided that removing the device while a background job was ongoing was a valid use case, and we should instead stop the background job and then remove the device, rather than prevent the device from being removed. This is what is currently done, which means manually reference counting the device during background jobs is no longer needed. Fixes:ed3557c947
("ieee802154: Add support for user scanning requests") Fixes:9bc114504b
("ieee802154: Add support for user beaconing requests") Reported-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/r/20230214135035.1202471-7-miquel.raynal@bootlin.com Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
This commit is contained in:
parent
61d7dddf46
commit
ed9a8ad7d8
@ -1453,20 +1453,14 @@ static int nl802154_trigger_scan(struct sk_buff *skb, struct genl_info *info)
|
||||
else
|
||||
request->duration = IEEE802154_MAX_SCAN_DURATION;
|
||||
|
||||
if (wpan_dev->netdev)
|
||||
dev_hold(wpan_dev->netdev);
|
||||
|
||||
err = rdev_trigger_scan(rdev, request);
|
||||
if (err) {
|
||||
pr_err("Failure starting scanning (%d)\n", err);
|
||||
goto free_device;
|
||||
goto free_request;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
free_device:
|
||||
if (wpan_dev->netdev)
|
||||
dev_put(wpan_dev->netdev);
|
||||
free_request:
|
||||
kfree(request);
|
||||
|
||||
@ -1555,9 +1549,6 @@ int nl802154_scan_done(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
|
||||
if (err == -ESRCH)
|
||||
err = 0;
|
||||
|
||||
if (wpan_dev->netdev)
|
||||
dev_put(wpan_dev->netdev);
|
||||
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nl802154_scan_done);
|
||||
@ -1605,21 +1596,15 @@ nl802154_send_beacons(struct sk_buff *skb, struct genl_info *info)
|
||||
else
|
||||
request->interval = IEEE802154_MAX_SCAN_DURATION;
|
||||
|
||||
if (wpan_dev->netdev)
|
||||
dev_hold(wpan_dev->netdev);
|
||||
|
||||
err = rdev_send_beacons(rdev, request);
|
||||
if (err) {
|
||||
pr_err("Failure starting sending beacons (%d)\n", err);
|
||||
goto free_device;
|
||||
goto free_request;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
free_device:
|
||||
if (wpan_dev->netdev)
|
||||
dev_put(wpan_dev->netdev);
|
||||
|
||||
free_request:
|
||||
kfree(request);
|
||||
|
||||
return err;
|
||||
@ -1627,8 +1612,7 @@ nl802154_send_beacons(struct sk_buff *skb, struct genl_info *info)
|
||||
|
||||
void nl802154_beaconing_done(struct wpan_dev *wpan_dev)
|
||||
{
|
||||
if (wpan_dev->netdev)
|
||||
dev_put(wpan_dev->netdev);
|
||||
/* NOP */
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nl802154_beaconing_done);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user