diff options
| author | Tejun Heo <tj@kernel.org> | 2012-12-21 17:56:54 -0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-02-09 11:30:48 -0800 |
| commit | 7c99e0bf86fdc1dee238eb6e213b980f887b68f1 (patch) | |
| tree | f290572f06bbecbaaa9907c857e3d7879931e41c /drivers/net/wireless/ipw2x00/ipw2100.h | |
| parent | 7d0315a2bec2dd7fe9cbe31098bb89536648224e (diff) | |
ipw2x00: simplify scan_event handling
* Drop unnesssary delayd_work_pending() tests.
* Unify scan_event_{now|later} by using mod_delayed_work() w/ 0 delay
for scan_event_now.
* Make ipw2200 scan_event handling match ipw2100 - use
mod_delayed_work() w/ 0 delay for immediate scanning.
Only compile tested.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Cc: linux-wireless@vger.kernel.org
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.h')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h index 5fe17cbab1f3..c6d78790cb0d 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.h +++ b/drivers/net/wireless/ipw2x00/ipw2100.h @@ -577,8 +577,7 @@ struct ipw2100_priv { struct delayed_work wx_event_work; struct delayed_work hang_check; struct delayed_work rf_kill; - struct work_struct scan_event_now; - struct delayed_work scan_event_later; + struct delayed_work scan_event; int user_requested_scan; |