From a4f749dbdbc21aa16d72b61d83d0bc96cbbc01de Mon Sep 17 00:00:00 2001
From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Date: Thu, 9 Oct 2008 18:15:30 -0300
Subject: [PATCH] --- yaml --- r: 121574 b: refs/heads/master c:
 68d2413bec7e1d97e906eafb05e78d925a5ca128 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/net/rfkill/rfkill-input.h |  1 +
 trunk/net/rfkill/rfkill.c       | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d3de438ce74d..33d8c1f6c019 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf4b4aab552f5f658ed400dd0cd41f9ac8aac7c1
+refs/heads/master: 68d2413bec7e1d97e906eafb05e78d925a5ca128
diff --git a/trunk/net/rfkill/rfkill-input.h b/trunk/net/rfkill/rfkill-input.h
index bbfa646157c6..d1e03e85cbed 100644
--- a/trunk/net/rfkill/rfkill-input.h
+++ b/trunk/net/rfkill/rfkill-input.h
@@ -14,5 +14,6 @@
 void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state);
 void rfkill_epo(void);
 void rfkill_restore_states(void);
+enum rfkill_state rfkill_get_global_state(const enum rfkill_type type);
 
 #endif /* __RFKILL_INPUT_H */
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
index 08be968f578d..fdf87d2ab25e 100644
--- a/trunk/net/rfkill/rfkill.c
+++ b/trunk/net/rfkill/rfkill.c
@@ -323,6 +323,19 @@ void rfkill_restore_states(void)
 }
 EXPORT_SYMBOL_GPL(rfkill_restore_states);
 
+/**
+ * rfkill_get_global_state - returns global state for a type
+ * @type: the type to get the global state of
+ *
+ * Returns the current global state for a given wireless
+ * device type.
+ */
+enum rfkill_state rfkill_get_global_state(const enum rfkill_type type)
+{
+	return rfkill_global_states[type].current_state;
+}
+EXPORT_SYMBOL_GPL(rfkill_get_global_state);
+
 /**
  * rfkill_force_state - Force the internal rfkill radio state
  * @rfkill: pointer to the rfkill class to modify.
@@ -834,6 +847,7 @@ int rfkill_set_default(enum rfkill_type type, enum rfkill_state state)
 
 	if (!test_and_set_bit(type, rfkill_states_lockdflt)) {
 		rfkill_global_states[type].default_state = state;
+		rfkill_global_states[type].current_state = state;
 		error = 0;
 	} else
 		error = -EPERM;