diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-17 10:48:17 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 16:09:54 +0100 |
| commit | 37e3308cb2b6933019d9d9c2045877d6d68d9c5a (patch) | |
| tree | d9b71804d022a78a65f55d1b6dce4012cd4ee97b /include/net | |
| parent | d9b8396a52b4e857263eeb9e1eba474ea11c19bf (diff) | |
| download | linux-37e3308cb2b6933019d9d9c2045877d6d68d9c5a.tar.gz linux-37e3308cb2b6933019d9d9c2045877d6d68d9c5a.tar.bz2 linux-37e3308cb2b6933019d9d9c2045877d6d68d9c5a.zip | |
mac80211: allow driver to return error from sched_scan_stop
In order to solve races with sched_scan_stop, it is necessary
for the driver to be able to return an error to propagate that
to cfg80211 so it doesn't send an event.
Reviewed-by: Alexander Bondar <alexander.bondar@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index a6bcc39e146e..86faa413b37d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -2460,6 +2460,7 @@ enum ieee80211_roc_type { * This process will continue until sched_scan_stop is called. * * @sched_scan_stop: Tell the hardware to stop an ongoing scheduled scan. + * In this case, ieee80211_sched_scan_stopped() must not be called. * * @sw_scan_start: Notifier function that is called just before a software scan * is started. Can be NULL, if the driver doesn't need this notification. @@ -2807,7 +2808,7 @@ struct ieee80211_ops { struct ieee80211_vif *vif, struct cfg80211_sched_scan_request *req, struct ieee80211_sched_scan_ies *ies); - void (*sched_scan_stop)(struct ieee80211_hw *hw, + int (*sched_scan_stop)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void (*sw_scan_start)(struct ieee80211_hw *hw); void (*sw_scan_complete)(struct ieee80211_hw *hw); |