Upgrade b43 and mac80211.

[openwrt/staging/lynxis/omap.git] / package / mac80211 / src / net / mac80211 / ieee80211_led.c

diff --git a/package/mac80211/src/net/mac80211/ieee80211_led.c b/package/mac80211/src/net/mac80211/ieee80211_led.c
index 4cf89af9d1009ffc528622d2e0f64a550c4614d4..f401484ab6d7d1502ba79051e79d3af9f2d32369 100644 (file)
--- a/package/mac80211/src/net/mac80211/ieee80211_led.c
+++ b/package/mac80211/src/net/mac80211/ieee80211_led.c
@@ -43,6 +43,16 @@ void ieee80211_led_assoc(struct ieee80211_local *local, bool associated)
                led_trigger_event(local->assoc_led, LED_OFF);
 }
 
+void ieee80211_led_radio(struct ieee80211_local *local, bool enabled)
+{
+       if (unlikely(!local->radio_led))
+               return;
+       if (enabled)
+               led_trigger_event(local->radio_led, LED_FULL);
+       else
+               led_trigger_event(local->radio_led, LED_OFF);
+}
+
 void ieee80211_led_init(struct ieee80211_local *local)
 {
        local->rx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
@@ -77,10 +87,25 @@ void ieee80211_led_init(struct ieee80211_local *local)
                        local->assoc_led = NULL;
                }
        }
+
+       local->radio_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
+       if (local->radio_led) {
+               snprintf(local->radio_led_name, sizeof(local->radio_led_name),
+                        "%sradio", wiphy_name(local->hw.wiphy));
+               local->radio_led->name = local->radio_led_name;
+               if (led_trigger_register(local->radio_led)) {
+                       kfree(local->radio_led);
+                       local->radio_led = NULL;
+               }
+       }
 }
 
 void ieee80211_led_exit(struct ieee80211_local *local)
 {
+       if (local->radio_led) {
+               led_trigger_unregister(local->radio_led);
+               kfree(local->radio_led);
+       }
        if (local->assoc_led) {
                led_trigger_unregister(local->assoc_led);
                kfree(local->assoc_led);
@@ -95,6 +120,16 @@ void ieee80211_led_exit(struct ieee80211_local *local)
        }
 }
 
+char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw)
+{
+       struct ieee80211_local *local = hw_to_local(hw);
+
+       if (local->radio_led)
+               return local->radio_led_name;
+       return NULL;
+}
+EXPORT_SYMBOL(__ieee80211_get_radio_led_name);
+
 char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)
 {
        struct ieee80211_local *local = hw_to_local(hw);