brcm80211: smac: decreased timer callback irq level

[mv-sheeva.git] / drivers / net / wireless / brcm80211 / brcmsmac / mac80211_if.h

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
index 91e5f2ac56cf3ea41a1b8298e3977da08648f59b..177f0e44e4b60c12c4384f893c80067e592cbd3c 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
@@ -19,6 +19,8 @@
 
 #include <linux/timer.h>
 #include <linux/interrupt.h>
+#include <linux/workqueue.h>
+
 #include "ucode_loader.h"
 /*
  * Starting index for 5G rates in the
@@ -30,14 +32,14 @@
 #define BRCMS_SET_SHORTSLOT_OVERRIDE           146
 
 struct brcms_timer {
-       struct timer_list timer;
+       struct delayed_work dly_wrk;
        struct brcms_info *wl;
-       void (*fn) (void *);
-       void *arg;              /* argument to fn */
+       void (*fn) (void *);    /* function called upon expiration */
+       void *arg;              /* fixed argument provided to called function */
        uint ms;
        bool periodic;
-       bool set;
-       struct brcms_timer *next;
+       bool set;               /* indicates if timer is active */
+       struct brcms_timer *next;       /* for freeing on unload */
 #ifdef BCMDBG
        char *name;             /* Description of the timer */
 #endif