aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/rt2x00/rt2800pci.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 77ddd1a97732..488d1c449349 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -56,12 +56,12 @@ static bool modparam_nohwcrypt = false;
56module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO); 56module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
57MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption."); 57MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
58 58
59#ifdef CONFIG_PCI
59static bool rt2800pci_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev) 60static bool rt2800pci_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
60{ 61{
61 return modparam_nohwcrypt; 62 return modparam_nohwcrypt;
62} 63}
63 64
64#ifdef CONFIG_PCI
65static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token) 65static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
66{ 66{
67 unsigned int i; 67 unsigned int i;
@@ -462,6 +462,11 @@ MODULE_DEVICE_TABLE(pci, rt2800pci_device_table);
462MODULE_LICENSE("GPL"); 462MODULE_LICENSE("GPL");
463 463
464#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X) 464#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
465static bool rt2800soc_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
466{
467 return modparam_nohwcrypt;
468}
469
465static void rt2800soc_disable_radio(struct rt2x00_dev *rt2x00dev) 470static void rt2800soc_disable_radio(struct rt2x00_dev *rt2x00dev)
466{ 471{
467 rt2800_disable_radio(rt2x00dev); 472 rt2800_disable_radio(rt2x00dev);
@@ -585,7 +590,7 @@ static const struct rt2800_ops rt2800soc_rt2800_ops = {
585 .register_multiwrite = rt2x00mmio_register_multiwrite, 590 .register_multiwrite = rt2x00mmio_register_multiwrite,
586 .regbusy_read = rt2x00mmio_regbusy_read, 591 .regbusy_read = rt2x00mmio_regbusy_read,
587 .read_eeprom = rt2800soc_read_eeprom, 592 .read_eeprom = rt2800soc_read_eeprom,
588 .hwcrypt_disabled = rt2800pci_hwcrypt_disabled, 593 .hwcrypt_disabled = rt2800soc_hwcrypt_disabled,
589 .drv_write_firmware = rt2800soc_write_firmware, 594 .drv_write_firmware = rt2800soc_write_firmware,
590 .drv_init_registers = rt2800mmio_init_registers, 595 .drv_init_registers = rt2800mmio_init_registers,
591 .drv_get_txwi = rt2800mmio_get_txwi, 596 .drv_get_txwi = rt2800mmio_get_txwi,