rt2x00: Fix lock dependency errror

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / rt2x00 / rt2x00.h

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 333484ddb99396b28c15996569ddb6f80a421ae4..b4bf1e09cf9a906447ed8a5770e9e0cdfec52626 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -328,6 +328,11 @@ static inline int rt2x00_get_link_ant_rssi(struct link *link)
        return DEFAULT_RSSI;
 }
 
+static inline void rt2x00_reset_link_ant_rssi(struct link *link)
+{
+       link->ant.rssi_ant = 0;
+}
+
 static inline int rt2x00_get_link_ant_rssi_history(struct link *link,
                                                   enum antenna ant)
 {
@@ -385,6 +390,7 @@ struct rt2x00_intf {
        unsigned int delayed_flags;
 #define DELAYED_UPDATE_BEACON          0x00000001
 #define DELAYED_CONFIG_ERP             0x00000002
+#define DELAYED_LED_ASSOC              0x00000004
 };
 
 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
@@ -533,8 +539,6 @@ struct rt2x00lib_ops {
                            struct link_qual *qual);
        void (*reset_tuner) (struct rt2x00_dev *rt2x00dev);
        void (*link_tuner) (struct rt2x00_dev *rt2x00dev);
-       void (*led_brightness) (struct led_classdev *led_cdev,
-                               enum led_brightness brightness);
 
        /*
         * TX control handlers
@@ -674,7 +678,7 @@ struct rt2x00_dev {
         * This will only be compiled in when required.
         */
 #ifdef CONFIG_RT2X00_LIB_RFKILL
-unsigned long rfkill_state;
+       unsigned long rfkill_state;
 #define RFKILL_STATE_ALLOCATED         1
 #define RFKILL_STATE_REGISTERED                2
        struct rfkill *rfkill;
@@ -694,8 +698,6 @@ unsigned long rfkill_state;
         * by mac8011 or the kernel.
         */
 #ifdef CONFIG_RT2X00_LIB_LEDS
-       unsigned int led_flags;
-       struct rt2x00_trigger trigger_qual;
        struct rt2x00_led led_radio;
        struct rt2x00_led led_assoc;
        struct rt2x00_led led_qual;
@@ -819,6 +821,7 @@ unsigned long rfkill_state;
        /*
         * Scheduled work.
         */
+       struct workqueue_struct *workqueue;
        struct work_struct intf_work;
        struct work_struct filter_work;