forked from Minki/linux
nl80211: Simplify error handling path in 'nl80211_trigger_scan()'
Re-write the end of 'nl80211_trigger_scan()' with a more standard, easy to understand and future proof version. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/20200712173551.274448-1-christophe.jaillet@wanadoo.fr Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
8328685682
commit
504776be46
|
@ -7993,15 +7993,18 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
|
||||||
rdev->scan_req = request;
|
rdev->scan_req = request;
|
||||||
err = rdev_scan(rdev, request);
|
err = rdev_scan(rdev, request);
|
||||||
|
|
||||||
if (!err) {
|
if (err)
|
||||||
|
goto out_free;
|
||||||
|
|
||||||
nl80211_send_scan_start(rdev, wdev);
|
nl80211_send_scan_start(rdev, wdev);
|
||||||
if (wdev->netdev)
|
if (wdev->netdev)
|
||||||
dev_hold(wdev->netdev);
|
dev_hold(wdev->netdev);
|
||||||
} else {
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
out_free:
|
out_free:
|
||||||
rdev->scan_req = NULL;
|
rdev->scan_req = NULL;
|
||||||
kfree(request);
|
kfree(request);
|
||||||
}
|
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user