diff options
Diffstat (limited to 'net/wimax')
| -rw-r--r-- | net/wimax/Kconfig | 14 | ||||
| -rw-r--r-- | net/wimax/id-table.c | 8 | ||||
| -rw-r--r-- | net/wimax/op-rfkill.c | 2 |
3 files changed, 20 insertions, 4 deletions
diff --git a/net/wimax/Kconfig b/net/wimax/Kconfig index 0bdbb6928205..18495cdcd10d 100644 --- a/net/wimax/Kconfig +++ b/net/wimax/Kconfig @@ -1,9 +1,23 @@ # # WiMAX LAN device configuration # +# Note the ugly 'depends on' on WIMAX: that disallows RFKILL to be a +# module if WIMAX is to be linked in. The WiMAX code is done in such a +# way that it doesn't require and explicit dependency on RFKILL in +# case an embedded system wants to rip it out. +# +# As well, enablement of the RFKILL code means we need the INPUT layer +# support to inject events coming from hw rfkill switches. That +# dependency could be killed if input.h provided appropiate means to +# work when input is disabled. + +comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled" + depends on INPUT = n && RFKILL != n menuconfig WIMAX tristate "WiMAX Wireless Broadband support" + depends on (y && RFKILL != m) || m + depends on (INPUT && RFKILL != n) || RFKILL = n help Select to configure support for devices that provide diff --git a/net/wimax/id-table.c b/net/wimax/id-table.c index d3b88558682c..5e685f7eda90 100644 --- a/net/wimax/id-table.c +++ b/net/wimax/id-table.c @@ -123,15 +123,17 @@ void wimax_id_table_rm(struct wimax_dev *wimax_dev) /* * Release the gennetlink family id / mapping table * - * On debug, verify that the table is empty upon removal. + * On debug, verify that the table is empty upon removal. We want the + * code always compiled, to ensure it doesn't bit rot. It will be + * compiled out if CONFIG_BUG is disabled. */ void wimax_id_table_release(void) { + struct wimax_dev *wimax_dev; + #ifndef CONFIG_BUG return; #endif - struct wimax_dev *wimax_dev; - spin_lock(&wimax_id_table_lock); list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) { printk(KERN_ERR "BUG: %s wimax_dev %p ifindex %d not cleared\n", diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c index 8745bac173f1..2b75aee04217 100644 --- a/net/wimax/op-rfkill.c +++ b/net/wimax/op-rfkill.c @@ -71,7 +71,7 @@ #define D_SUBMODULE op_rfkill #include "debug-levels.h" -#ifdef CONFIG_RFKILL +#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) /** |