5 files changed, 74 insertions, 19 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 1a2114b8d221..eac670a22ef4 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1069,6 +1069,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw);
 #ifdef CONFIG_MAC80211_LEDS
 extern char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw);
 extern char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw);
+extern char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw);
 #endif
 /**
  * ieee80211_get_tx_led_name - get name of TX LED
@@ -1108,6 +1109,16 @@ static inline char *ieee80211_get_rx_led_name(struct ieee80211_hw *hw)
 #endif
 }
 
+static inline char *ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)
+{
+#ifdef CONFIG_MAC80211_LEDS
+        return __ieee80211_get_assoc_led_name(hw);
+#else
+        return NULL;
+#endif
+}
+
+
 /* Register a new hardware PHYMODE capability to the stack. */
 int ieee80211_register_hwmode(struct ieee80211_hw *hw,
                               struct ieee80211_hw_mode *mode);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index db80e1be1dcb..d34a9deca67a 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -503,8 +503,8 @@ struct ieee80211_local {
 
 #ifdef CONFIG_MAC80211_LEDS
         int tx_led_counter, rx_led_counter;
-        struct led_trigger *tx_led, *rx_led;
-        char tx_led_name[32], rx_led_name[32];
+        struct led_trigger *tx_led, *rx_led, *assoc_led;
+        char tx_led_name[32], rx_led_name[32], assoc_led_name[32];
 #endif
 
         u32 channel_use;
diff --git a/net/mac80211/ieee80211_led.c b/net/mac80211/ieee80211_led.c
index 719d75b20707..4cf89af9d100 100644
--- a/net/mac80211/ieee80211_led.c
+++ b/net/mac80211/ieee80211_led.c
@@ -33,33 +33,58 @@ void ieee80211_led_tx(struct ieee80211_local *local, int q)
                 led_trigger_event(local->tx_led, LED_FULL);
 }
 
+void ieee80211_led_assoc(struct ieee80211_local *local, bool associated)
+{
+        if (unlikely(!local->assoc_led))
+                return;
+        if (associated)
+                led_trigger_event(local->assoc_led, LED_FULL);
+        else
+                led_trigger_event(local->assoc_led, LED_OFF);
+}
+
 void ieee80211_led_init(struct ieee80211_local *local)
 {
         local->rx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
-        if (!local->rx_led)
-                return;
-        snprintf(local->rx_led_name, sizeof(local->rx_led_name),
-                 "%srx", wiphy_name(local->hw.wiphy));
-        local->rx_led->name = local->rx_led_name;
-        if (led_trigger_register(local->rx_led)) {
-                kfree(local->rx_led);
-                local->rx_led = NULL;
+        if (local->rx_led) {
+                snprintf(local->rx_led_name, sizeof(local->rx_led_name),
+                         "%srx", wiphy_name(local->hw.wiphy));
+                local->rx_led->name = local->rx_led_name;
+                if (led_trigger_register(local->rx_led)) {
+                        kfree(local->rx_led);
+                        local->rx_led = NULL;
+                }
         }
 
         local->tx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
-        if (!local->tx_led)
-                return;
-        snprintf(local->tx_led_name, sizeof(local->tx_led_name),
-                 "%stx", wiphy_name(local->hw.wiphy));
-        local->tx_led->name = local->tx_led_name;
-        if (led_trigger_register(local->tx_led)) {
-                kfree(local->tx_led);
-                local->tx_led = NULL;
+        if (local->tx_led) {
+                snprintf(local->tx_led_name, sizeof(local->tx_led_name),
+                         "%stx", wiphy_name(local->hw.wiphy));
+                local->tx_led->name = local->tx_led_name;
+                if (led_trigger_register(local->tx_led)) {
+                        kfree(local->tx_led);
+                        local->tx_led = NULL;
+                }
+        }
+
+        local->assoc_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
+        if (local->assoc_led) {
+                snprintf(local->assoc_led_name, sizeof(local->assoc_led_name),
+                         "%sassoc", wiphy_name(local->hw.wiphy));
+                local->assoc_led->name = local->assoc_led_name;
+                if (led_trigger_register(local->assoc_led)) {
+                        kfree(local->assoc_led);
+                        local->assoc_led = NULL;
+                }
         }
 }
 
 void ieee80211_led_exit(struct ieee80211_local *local)
 {
+        if (local->assoc_led) {
+                led_trigger_unregister(local->assoc_led);
+                kfree(local->assoc_led);
+        }
         if (local->tx_led) {
                 led_trigger_unregister(local->tx_led);
                 kfree(local->tx_led);
@@ -70,6 +95,16 @@ void ieee80211_led_exit(struct ieee80211_local *local)
         }
 }
 
+char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        if (local->assoc_led)
+                return local->assoc_led_name;
+        return NULL;
+}
+EXPORT_SYMBOL(__ieee80211_get_assoc_led_name);
+
 char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw)
 {
         struct ieee80211_local *local = hw_to_local(hw);
diff --git a/net/mac80211/ieee80211_led.h b/net/mac80211/ieee80211_led.h
index 5c8ab8263878..0feb22619835 100644
--- a/net/mac80211/ieee80211_led.h
+++ b/net/mac80211/ieee80211_led.h
@@ -14,6 +14,8 @@
 #ifdef CONFIG_MAC80211_LEDS
 extern void ieee80211_led_rx(struct ieee80211_local *local);
 extern void ieee80211_led_tx(struct ieee80211_local *local, int q);
+extern void ieee80211_led_assoc(struct ieee80211_local *local,
+                                bool associated);
 extern void ieee80211_led_init(struct ieee80211_local *local);
 extern void ieee80211_led_exit(struct ieee80211_local *local);
 #else
@@ -23,6 +25,10 @@ static inline void ieee80211_led_rx(struct ieee80211_local *local)
 static inline void ieee80211_led_tx(struct ieee80211_local *local, int q)
 {
 }
+static inline void ieee80211_led_assoc(struct ieee80211_local *local,
+                                       bool associated)
+{
+}
 static inline void ieee80211_led_init(struct ieee80211_local *local)
 {
 }
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index bd9d7aa74083..1641e8fe44b7 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -31,6 +31,7 @@
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
 #include "ieee80211_rate.h"
+#include "ieee80211_led.h"
 
 #define IEEE80211_AUTH_TIMEOUT (HZ / 5)
 #define IEEE80211_AUTH_MAX_TRIES 3
@@ -408,8 +409,9 @@ static void ieee80211_sta_send_associnfo(struct net_device *dev,
 
 static void ieee80211_set_associated(struct net_device *dev,
                                      struct ieee80211_if_sta *ifsta,
-                                     unsigned int assoc)
+                                     bool assoc)
 {
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         union iwreq_data wrqu;
 
         if (!!(ifsta->flags & IEEE80211_STA_ASSOCIATED) == assoc)
@@ -447,6 +449,7 @@ static void ieee80211_set_associated(struct net_device *dev,
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
         wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
         ifsta->last_probe = jiffies;
+        ieee80211_led_assoc(local, assoc);
 }
 
 static void ieee80211_set_disassoc(struct net_device *dev,