diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-20 05:04:50 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-20 05:04:50 +0200 |
| commit | fe2520094d88018423dfc42b3cd0015f74e8adea (patch) | |
| tree | 859b78d64961ad92873e835ad1520caeb34b292f /drivers/net/wireless/ipw2100.h | |
| parent | Fix build break in tsi108.c (diff) | |
| parent | [PATCH] rt2x00: Add new rt73usb USB ID (diff) | |
| download | linux-fe2520094d88018423dfc42b3cd0015f74e8adea.tar.xz linux-fe2520094d88018423dfc42b3cd0015f74e8adea.zip | |
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 de7d384d38af..1ee3348aedd9 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; |