aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-rfkill.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-04-03 19:05:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-08 16:44:42 -0400
commitfee1247a30e5b3d48fe985b4a935eb6818f3b464 (patch)
tree43871f000014c29422c628ed505531670ebe1389 /drivers/net/wireless/iwlwifi/iwl-rfkill.c
parent12a81f60b98096079d392f8abc284cbd76aa719b (diff)
iwlwifi: move driver status inliners into iwl-core.h
This patch moves inline functions into iwl-core.h Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rfkill.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-rfkill.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index 66abf52e8987..308d69b18404 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -33,18 +33,11 @@
33#include <net/mac80211.h> 33#include <net/mac80211.h>
34 34
35#include "iwl-eeprom.h" 35#include "iwl-eeprom.h"
36#include "iwl-core.h"
37#include "iwl-4965.h" 36#include "iwl-4965.h"
37#include "iwl-core.h"
38#include "iwl-helpers.h" 38#include "iwl-helpers.h"
39 39
40 40
41static inline int iwl_is_rfkill(struct iwl_priv *priv)
42{
43 return test_bit(STATUS_RF_KILL_HW, &priv->status) ||
44 test_bit(STATUS_RF_KILL_SW, &priv->status);
45}
46
47
48/* software rf-kill from user */ 41/* software rf-kill from user */
49static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state) 42static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
50{ 43{