rt2x00: Make use of MAC80211_LED_TRIGGERS

Make use of the led triggers provided by mac80211 to control
the led status. This can be enabled through a per-driver
configuration option which will automatically enable the
generic handler in rt2x00lib.

This has been enabled for rt2500usb and rt73usb for the moment
since the led class will call set_brightness in irq context which
will not work correctly with the usb drivers who need to sleep.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 93dbe2b286d5..76270e9c31ff 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -30,12 +30,14 @@
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
 #include <linux/firmware.h>
+#include <linux/leds.h>
 #include <linux/mutex.h>
 #include <linux/etherdevice.h>
 
 #include <net/mac80211.h>
 
 #include "rt2x00debug.h"
+#include "rt2x00leds.h"
 #include "rt2x00reg.h"
 #include "rt2x00queue.h"
 
@@ -512,6 +514,8 @@ 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
@@ -665,6 +669,19 @@ struct rt2x00_dev {
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 
         /*
+         * LED structure for changing the LED status
+         * 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;
+        u16 led_mcu_reg;
+#endif /* CONFIG_RT2X00_LIB_LEDS */
+
+        /*
          * Device flags.
          * In these flags the current status and some
          * of the device capabilities are stored.
@@ -756,16 +773,6 @@ struct rt2x00_dev {
         u16 tx_power;
 
         /*
-         * LED register (for rt61pci & rt73usb).
-         */
-        u16 led_reg;
-
-        /*
-         * Led mode (LED_MODE_*)
-         */
-        u8 led_mode;
-
-        /*
          * Rssi <-> Dbm offset
          */
         u8 rssi_offset;