irda: convert to internal stats

[~andy/linux] / drivers / net / irda / sir-dev.h

diff --git a/drivers/net/irda/sir-dev.h b/drivers/net/irda/sir-dev.h
index f69fb4cec76f8a90e3b63e78f955c9d58469e4af..6d5b1e2b12893271adb7fd7d4c373cde4823d151 100644 (file)
--- a/drivers/net/irda/sir-dev.h
+++ b/drivers/net/irda/sir-dev.h
@@ -15,23 +15,14 @@
 #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 irda_request     rq;
+       struct delayed_work     work;
        unsigned                state, substate;
        int                     param;
        int                     result;
@@ -169,7 +160,6 @@ static inline int sirdev_schedule_mode(struct sir_dev *dev, int mode)
 
 struct sir_dev {
        struct net_device *netdev;
-       struct net_device_stats stats;
 
        struct irlap_cb    *irlap;