b43: Fix kconfig dependencies for rfkill and leds

[safe/jmp/linux-2.6] / drivers / net / wireless / ipw2200.h

diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index b49f766..bec8e37 100644 (file)
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -45,7 +45,6 @@
 
 #include <linux/firmware.h>
 #include <linux/wireless.h>
-#include <linux/dma-mapping.h>
 #include <linux/jiffies.h>
 #include <asm/io.h>
 
@@ -713,7 +712,6 @@ struct ipw_rx_packet {
 
 struct ipw_rx_mem_buffer {
        dma_addr_t dma_addr;
-       struct ipw_rx_buffer *rxb;
        struct sk_buff *skb;
        struct list_head list;
 };                             /* Not transferred over network, so not  __attribute__ ((packed)) */
@@ -1289,22 +1287,26 @@ struct ipw_priv {
 
        struct iw_public_data wireless_data;
 
+       int user_requested_scan;
+
        struct workqueue_struct *workqueue;
 
-       struct work_struct adhoc_check;
+       struct delayed_work adhoc_check;
        struct work_struct associate;
        struct work_struct disassociate;
        struct work_struct system_config;
        struct work_struct rx_replenish;
-       struct work_struct request_scan;
+       struct delayed_work request_scan;
+       struct delayed_work scan_event;
+       struct work_struct request_passive_scan;
        struct work_struct adapter_restart;
-       struct work_struct rf_kill;
+       struct delayed_work rf_kill;
        struct work_struct up;
        struct work_struct down;
-       struct work_struct gather_stats;
+       struct delayed_work gather_stats;
        struct work_struct abort_scan;
        struct work_struct roam;
-       struct work_struct scan_check;
+       struct delayed_work scan_check;
        struct work_struct link_up;
        struct work_struct link_down;
 
@@ -1319,9 +1321,9 @@ struct ipw_priv {
        u32 led_ofdm_on;
        u32 led_ofdm_off;
 
-       struct work_struct led_link_on;
-       struct work_struct led_link_off;
-       struct work_struct led_act_off;
+       struct delayed_work led_link_on;
+       struct delayed_work led_link_off;
+       struct delayed_work led_act_off;
        struct work_struct merge_networks;
 
        struct ipw_cmd_log *cmdlog;
@@ -1951,10 +1953,17 @@ struct host_cmd {
        u32 *param;
 } __attribute__ ((packed));
 
+struct cmdlog_host_cmd {
+       u8 cmd;
+       u8 len;
+       u16 reserved;
+       char param[124];
+} __attribute__ ((packed));
+
 struct ipw_cmd_log {
        unsigned long jiffies;
        int retcode;
-       struct host_cmd cmd;
+       struct cmdlog_host_cmd cmd;
 };
 
 /* SysConfig command parameters ... */