Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / ipw2100.h

diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index 2b8be2418fa772e93ac8c6dc53bac5137f93d9af..bbf1ddcafba8f6249f900b51dc8e660f7b043f8b 100644 (file)
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -586,6 +586,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;