X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Firda%2Fsir-dev.h;h=2a57bc67ce357cc45dc82c589941d9fe12fbd198;hb=e5a4ad0dda8f79a984ba6391af65274b482b6703;hp=f69fb4cec76f8a90e3b63e78f955c9d58469e4af;hpb=9fdb62af92c741addbea15545f214a6e89460865;p=linux-2.6 diff --git a/drivers/net/irda/sir-dev.h b/drivers/net/irda/sir-dev.h index f69fb4cec7..2a57bc67ce 100644 --- a/drivers/net/irda/sir-dev.h +++ b/drivers/net/irda/sir-dev.h @@ -15,23 +15,14 @@ #define IRDA_SIR_H #include +#include #include #include // 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 irda_request rq; + struct delayed_work work; unsigned state, substate; int param; int result;