b973e42eb2
Fix iwlwifi so that it builds cleanly with CONFIG_INPUT=n. Also free the input device on exit. drivers/built-in.o: In function `iwl_rfkill_unregister': (.text+0xbf430): undefined reference to `input_unregister_device' drivers/built-in.o: In function `iwl_rfkill_init': (.text+0xbf51c): undefined reference to `input_allocate_device' drivers/built-in.o: In function `iwl_rfkill_init': (.text+0xbf5bf): undefined reference to `input_register_device' drivers/built-in.o: In function `iwl_rfkill_init': (.text+0xbf5e9): undefined reference to `input_free_device' net/built-in.o: In function `rfkill_disconnect': rfkill-input.c:(.text+0xe71e1): undefined reference to `input_close_device' rfkill-input.c:(.text+0xe71e9): undefined reference to `input_unregister_handle' net/built-in.o: In function `rfkill_connect': rfkill-input.c:(.text+0xe723e): undefined reference to `input_register_handle' rfkill-input.c:(.text+0xe724d): undefined reference to `input_open_device' rfkill-input.c:(.text+0xe725c): undefined reference to `input_unregister_handle' net/built-in.o: In function `rfkill_handler_init': rfkill-input.c:(.init.text+0x36ec): undefined reference to `input_register_handler' net/built-in.o: In function `rfkill_handler_exit': rfkill-input.c:(.exit.text+0x112c): undefined reference to `input_unregister_handler' make[1]: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
183 lines
5.3 KiB
C
183 lines
5.3 KiB
C
/******************************************************************************
|
|
*
|
|
* Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
|
|
*
|
|
* Portions of this file are derived from the ipw3945 project, as well
|
|
* as portions of the ieee80211 subsystem header files.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
|
|
*
|
|
* The full GNU General Public License is included in this distribution in the
|
|
* file called LICENSE.
|
|
*
|
|
* Contact Information:
|
|
* James P. Ketrenos <ipw2100-admin@linux.intel.com>
|
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
|
*****************************************************************************/
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/version.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <net/mac80211.h>
|
|
|
|
#include "iwl-eeprom.h"
|
|
#include "iwl-dev.h"
|
|
#include "iwl-core.h"
|
|
#include "iwl-helpers.h"
|
|
|
|
|
|
/* software rf-kill from user */
|
|
static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
|
|
{
|
|
struct iwl_priv *priv = data;
|
|
int err = 0;
|
|
|
|
if (!priv->rfkill_mngr.rfkill)
|
|
return 0;
|
|
|
|
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
|
|
return 0;
|
|
|
|
IWL_DEBUG_RF_KILL("we recieved soft RFKILL set to state %d\n", state);
|
|
mutex_lock(&priv->mutex);
|
|
|
|
switch (state) {
|
|
case RFKILL_STATE_ON:
|
|
iwl_radio_kill_sw_enable_radio(priv);
|
|
/* if HW rf-kill is set dont allow ON state */
|
|
if (iwl_is_rfkill(priv))
|
|
err = -EBUSY;
|
|
break;
|
|
case RFKILL_STATE_OFF:
|
|
iwl_radio_kill_sw_disable_radio(priv);
|
|
if (!iwl_is_rfkill(priv))
|
|
err = -EBUSY;
|
|
break;
|
|
}
|
|
mutex_unlock(&priv->mutex);
|
|
|
|
return err;
|
|
}
|
|
|
|
int iwl_rfkill_init(struct iwl_priv *priv)
|
|
{
|
|
struct device *device = wiphy_dev(priv->hw->wiphy);
|
|
int ret = 0;
|
|
|
|
BUG_ON(device == NULL);
|
|
|
|
IWL_DEBUG_RF_KILL("Initializing RFKILL.\n");
|
|
priv->rfkill_mngr.rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
|
|
if (!priv->rfkill_mngr.rfkill) {
|
|
IWL_ERROR("Unable to allocate rfkill device.\n");
|
|
ret = -ENOMEM;
|
|
goto error;
|
|
}
|
|
|
|
priv->rfkill_mngr.rfkill->name = priv->cfg->name;
|
|
priv->rfkill_mngr.rfkill->data = priv;
|
|
priv->rfkill_mngr.rfkill->state = RFKILL_STATE_ON;
|
|
priv->rfkill_mngr.rfkill->toggle_radio = iwl_rfkill_soft_rf_kill;
|
|
priv->rfkill_mngr.rfkill->user_claim_unsupported = 1;
|
|
|
|
priv->rfkill_mngr.rfkill->dev.class->suspend = NULL;
|
|
priv->rfkill_mngr.rfkill->dev.class->resume = NULL;
|
|
|
|
#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
|
|
priv->rfkill_mngr.input_dev = input_allocate_device();
|
|
if (!priv->rfkill_mngr.input_dev) {
|
|
IWL_ERROR("Unable to allocate rfkill input device.\n");
|
|
ret = -ENOMEM;
|
|
goto freed_rfkill;
|
|
}
|
|
|
|
priv->rfkill_mngr.input_dev->name = priv->cfg->name;
|
|
priv->rfkill_mngr.input_dev->phys = wiphy_name(priv->hw->wiphy);
|
|
priv->rfkill_mngr.input_dev->id.bustype = BUS_HOST;
|
|
priv->rfkill_mngr.input_dev->id.vendor = priv->pci_dev->vendor;
|
|
priv->rfkill_mngr.input_dev->dev.parent = device;
|
|
priv->rfkill_mngr.input_dev->evbit[0] = BIT(EV_KEY);
|
|
set_bit(KEY_WLAN, priv->rfkill_mngr.input_dev->keybit);
|
|
#endif
|
|
|
|
ret = rfkill_register(priv->rfkill_mngr.rfkill);
|
|
if (ret) {
|
|
IWL_ERROR("Unable to register rfkill: %d\n", ret);
|
|
goto free_input_dev;
|
|
}
|
|
|
|
#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
|
|
ret = input_register_device(priv->rfkill_mngr.input_dev);
|
|
if (ret) {
|
|
IWL_ERROR("Unable to register rfkill input device: %d\n", ret);
|
|
goto unregister_rfkill;
|
|
}
|
|
#endif
|
|
|
|
IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
|
|
return ret;
|
|
|
|
unregister_rfkill:
|
|
rfkill_unregister(priv->rfkill_mngr.rfkill);
|
|
priv->rfkill_mngr.rfkill = NULL;
|
|
|
|
free_input_dev:
|
|
#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
|
|
input_free_device(priv->rfkill_mngr.input_dev);
|
|
priv->rfkill_mngr.input_dev = NULL;
|
|
#endif
|
|
|
|
freed_rfkill:
|
|
if (priv->rfkill_mngr.rfkill != NULL)
|
|
rfkill_free(priv->rfkill_mngr.rfkill);
|
|
priv->rfkill_mngr.rfkill = NULL;
|
|
|
|
error:
|
|
IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(iwl_rfkill_init);
|
|
|
|
void iwl_rfkill_unregister(struct iwl_priv *priv)
|
|
{
|
|
|
|
#if defined(CONFIG_RFKILL_INPUT) || defined(CONFIG_RFKILL_INPUT_MODULE)
|
|
if (priv->rfkill_mngr.input_dev)
|
|
input_unregister_device(priv->rfkill_mngr.input_dev);
|
|
input_free_device(priv->rfkill_mngr.input_dev);
|
|
priv->rfkill_mngr.input_dev = NULL;
|
|
#endif
|
|
|
|
if (priv->rfkill_mngr.rfkill)
|
|
rfkill_unregister(priv->rfkill_mngr.rfkill);
|
|
|
|
priv->rfkill_mngr.rfkill = NULL;
|
|
}
|
|
EXPORT_SYMBOL(iwl_rfkill_unregister);
|
|
|
|
/* set rf-kill to the right state. */
|
|
void iwl_rfkill_set_hw_state(struct iwl_priv *priv)
|
|
{
|
|
|
|
if (!priv->rfkill_mngr.rfkill)
|
|
return;
|
|
|
|
if (!iwl_is_rfkill(priv))
|
|
priv->rfkill_mngr.rfkill->state = RFKILL_STATE_ON;
|
|
else
|
|
priv->rfkill_mngr.rfkill->state = RFKILL_STATE_OFF;
|
|
}
|
|
EXPORT_SYMBOL(iwl_rfkill_set_hw_state);
|