From 8a6dda9884972405c4e25c32f1203836829446f5 Mon Sep 17 00:00:00 2001
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Thu, 17 Sep 2009 10:43:54 -0700
Subject: [PATCH] --- yaml --- r: 170563 b: refs/heads/master c:
 02f5dac08364d01a8b2c8e298b529b97f356b3f5 h: refs/heads/master i:   170561:
 dd7e21520af8febeac312ce37c89cb1cb83f68fd   170559:
 bba7384f90970aaca0ef21181f50072e9b674af9 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-led.c |  9 ++++++++-
 trunk/drivers/net/wireless/iwlwifi/iwl-led.h | 12 ++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 34e0409a6d87..411c66a6df45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5953a62e7df064a5d7ba7e790d590f27c65ddf4c
+refs/heads/master: 02f5dac08364d01a8b2c8e298b529b97f356b3f5
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-led.c b/trunk/drivers/net/wireless/iwlwifi/iwl-led.c
index f547233c5b79..685ba9d6f082 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -42,6 +42,12 @@
 #include "iwl-core.h"
 #include "iwl-io.h"
 
+/* default: IWL_LED_BLINK(0) using blinking index table */
+static int led_mode;
+module_param(led_mode, int, S_IRUGO);
+MODULE_PARM_DESC(led_mode, "led mode: 0=blinking, 1=On(RF On)/Off(RF Off), "
+			   "(default 0)\n");
+
 #ifdef CONFIG_IWLWIFI_DEBUG
 static const char *led_type_str[] = {
 	__stringify(IWL_LED_TRG_TX),
@@ -199,7 +205,8 @@ static int iwl_led_off_reg(struct iwl_priv *priv, int led_id)
 static int iwl_led_associate(struct iwl_priv *priv, int led_id)
 {
 	IWL_DEBUG_LED(priv, "Associated\n");
-	priv->allow_blinking = 1;
+	if (led_mode == IWL_LED_BLINK)
+		priv->allow_blinking = 1;
 	return iwl_led_on_reg(priv, led_id);
 }
 static int iwl_led_disassociate(struct iwl_priv *priv, int led_id)
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-led.h b/trunk/drivers/net/wireless/iwlwifi/iwl-led.h
index ef9b174c37ff..dd76b266c633 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-led.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-led.h
@@ -47,6 +47,18 @@ enum led_type {
 	IWL_LED_TRG_RADIO,
 	IWL_LED_TRG_MAX,
 };
+
+/*
+ * LED mode
+ *    IWL_LED_BLINK:    adjust led blink rate based on blink table
+ *    IWL_LED_RF_STATE: turn LED on/off based on RF state
+ *			LED ON  = RF ON
+ *			LED OFF = RF OFF
+ */
+enum iwl_led_mode {
+	IWL_LED_BLINK,
+	IWL_LED_RF_STATE,
+};
 #endif
 
 #ifdef CONFIG_IWLWIFI_LEDS