| Message ID | alpine.LNX.2.00.1106292212110.3747@swampdragon.chaosbits.net |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2011-06-29 at 22:13 +0200, Jesper Juhl wrote: > If the 'driver_initiated' function argument to > __cfg80211_stop_sched_scan() is not 0 then we'll return an > uninitialized 'ret' from the function. 'err'. I also dislike the initialisation, can we just replace the "return err;" at the end of the function with "return 0;" instead? Luca, should it maybe be return -ENOENT anyway in the !sched_scan_req case? johannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2011-06-29 at 22:27 +0200, Johannes Berg wrote: > On Wed, 2011-06-29 at 22:13 +0200, Jesper Juhl wrote: > > If the 'driver_initiated' function argument to > > __cfg80211_stop_sched_scan() is not 0 then we'll return an > > uninitialized 'ret' from the function. > > 'err'. I also dislike the initialisation, can we just replace the > "return err;" at the end of the function with "return 0;" instead? Luckily we were never using the return value when passing driver_initiate =- false. And I agree with you, there's no use to return err at the end. Better to simply return 0. > Luca, should it maybe be return -ENOENT anyway in the !sched_scan_req > case? We could do that. I had just thought that stopping a scan that is not running would just be a NOP, but if you prefer to return an error in that case, I can do it.
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7a6c676..7940fa5 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -132,7 +132,7 @@ EXPORT_SYMBOL(cfg80211_sched_scan_stopped); int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, bool driver_initiated) { - int err; + int err = 0; struct net_device *dev; ASSERT_RDEV_LOCK(rdev);
If the 'driver_initiated' function argument to __cfg80211_stop_sched_scan() is not 0 then we'll return an uninitialized 'ret' from the function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> --- net/wireless/scan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)