diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 23:04:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-19 23:04:50 -0400 |
| commit | fe2520094d88018423dfc42b3cd0015f74e8adea (patch) | |
| tree | 859b78d64961ad92873e835ad1520caeb34b292f /drivers/net/wireless/ipw2100.h | |
| parent | c9b2ca735a7685fa8aafd17b3cf3f9f20449d10b (diff) | |
| parent | 1f06862e11f23ebc99438c592be9c92560d78548 (diff) | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/ipw2100.h')
| -rw-r--r-- | drivers/net/wireless/ipw2100.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h index de7d384d38a..1ee3348aedd 100644 --- a/drivers/net/wireless/ipw2100.h +++ b/drivers/net/wireless/ipw2100.h @@ -588,6 +588,10 @@ 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; + + int user_requested_scan; u32 interrupts; int tx_interrupts; |