Seems OK to me...
On Tue, Jun 25, 2013 at 05:34:55PM +0200, Rafał Miłecki wrote:
> This allows enabling support for extra hardware with just a module
> param, without kernel/module recompilation.
>
> Signed-off-by: Rafał Miłecki <zaj...@gmail.com>
> ---
> drivers/net/wireless/b43/Kconfig | 6 ------
> drivers/net/wireless/b43/main.c | 16 ++++++++++++++--
> 2 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/Kconfig
> b/drivers/net/wireless/b43/Kconfig
> index 3f21e0b..51ff0b1 100644
> --- a/drivers/net/wireless/b43/Kconfig
> +++ b/drivers/net/wireless/b43/Kconfig
> @@ -31,12 +31,6 @@ config B43_BCMA
> depends on B43 && (BCMA = y || BCMA = B43)
> default y
>
> -config B43_BCMA_EXTRA
> - bool "Hardware support that overlaps with the brcmsmac driver"
> - depends on B43_BCMA
> - default n if BRCMSMAC
> - default y
> -
> config B43_SSB
> bool
> depends on B43 && (SSB = y || SSB = B43)
> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
> index a95b77a..583993c 100644
> --- a/drivers/net/wireless/b43/main.c
> +++ b/drivers/net/wireless/b43/main.c
> @@ -113,13 +113,19 @@ static int b43_modparam_pio = 0;
> module_param_named(pio, b43_modparam_pio, int, 0644);
> MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");
>
> +#ifdef CONFIG_BRCMSMAC
> +static int modparam_allhwsupport;
> +#else
> +static int modparam_allhwsupport = 1;
> +#endif
> +module_param_named(allhwsupport, modparam_allhwsupport, int, 0444);
> +MODULE_PARM_DESC(allhwsupport, "Enable support for all hardware (even it if
> overlaps with the brcmsmac driver)");
> +
> #ifdef CONFIG_B43_BCMA
> static const struct bcma_device_id b43_bcma_tbl[] = {
> BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),
> -#ifdef CONFIG_B43_BCMA_EXTRA
> BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),
> BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),
> -#endif
> BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS),
> BCMA_CORETABLE_END
> };
> @@ -5396,6 +5402,12 @@ static int b43_bcma_probe(struct bcma_device *core)
> struct b43_wl *wl;
> int err;
>
> + if (!modparam_allhwsupport &&
> + (core->id.rev == 0x17 || core->id.rev == 0x18)) {
> + pr_err("Support for cores revisions 0x17 and 0x18 disabled by
> module param allhwsupport=0. Try b43.allhwsupport=1\n");
> + return -ENOTSUPP;
> + }
> +
> dev = b43_bus_dev_bcma_init(core);
> if (!dev)
> return -ENODEV;
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
John W. Linville Someday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
_______________________________________________
b43-dev mailing list
b43-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/b43-dev
