linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / irda / sir-dev.h

diff --git a/drivers/net/irda/sir-dev.h b/drivers/net/irda/sir-dev.h
index 9fa294a..f69fb4c 100644 (file)
--- a/drivers/net/irda/sir-dev.h
+++ b/drivers/net/irda/sir-dev.h
@@ -15,14 +15,23 @@
 #define IRDA_SIR_H
 
 #include <linux/netdevice.h>
-#include <linux/workqueue.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>              // iobuff_t
 
+/* FIXME: unify irda_request with sir_fsm! */
+
+struct irda_request {
+       struct list_head lh_request;
+       unsigned long pending;
+       void (*func)(void *);
+       void *data;
+       struct timer_list timer;
+};
+
 struct sir_fsm {
        struct semaphore        sem;
-       struct work_struct      work;
+       struct irda_request     rq;
        unsigned                state, substate;
        int                     param;
        int                     result;