diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-06-13 12:47:30 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-17 14:22:18 -0400 |
| commit | b856439b1b54358e580aaee5dbe683af5ada9403 (patch) | |
| tree | dc38beee0a1585693fa228e33646dee5a37f456d /net/mac80211/driver-trace.h | |
| parent | eb40e3e8bb453519ae17d42e7cab6bdd2b4b9fc5 (diff) | |
| download | linux-stable-b856439b1b54358e580aaee5dbe683af5ada9403.tar.gz linux-stable-b856439b1b54358e580aaee5dbe683af5ada9403.tar.bz2 linux-stable-b856439b1b54358e580aaee5dbe683af5ada9403.zip | |
mac80211: add cancel_hw_scan() callback
When suspending, __ieee80211_suspend() calls ieee80211_scan_cancel(),
which will only cancel sw scan. In order to cancel hw scan, the
low-level driver has to cancel it in the suspend() callback. however,
this is too late, as a new scan_work will be enqueued (while the driver
is going into suspend).
Add a new cancel_hw_scan() callback, asking the driver to cancel an
active hw scan, and call it in ieee80211_scan_cancel().
Signed-off-by: Eliad Peller <eliad@wizery.com>
Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/driver-trace.h')
| -rw-r--r-- | net/mac80211/driver-trace.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index ed9edcbd9aa5..3cb6795e926d 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h @@ -460,6 +460,12 @@ DEFINE_EVENT(local_sdata_evt, drv_hw_scan, TP_ARGS(local, sdata) ); +DEFINE_EVENT(local_sdata_evt, drv_cancel_hw_scan, + TP_PROTO(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata), + TP_ARGS(local, sdata) +); + DEFINE_EVENT(local_sdata_evt, drv_sched_scan_start, TP_PROTO(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata), |