Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8960400e authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: replace B43_BCMA_EXTRA with modparam allhwsupport 



This allows enabling support for extra hardware with just a module
param, without kernel/module recompilation.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d847e3e2

drivers/net/wireless/b43/Kconfig

+0 −6
Original line number Original line Diff line number Diff line
@@ -31,12 +31,6 @@ config B43_BCMA 
	depends on B43 && (BCMA = y || BCMA = B43)

	depends on B43 && (BCMA = y || BCMA = B43)

	default y

	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

config B43_SSB

	bool

	bool

	depends on B43 && (SSB = y || SSB = B43)

	depends on B43 && (SSB = y || SSB = B43)

drivers/net/wireless/b43/main.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -113,13 +113,15 @@ static int b43_modparam_pio = 0; 
module_param_named(pio, b43_modparam_pio, int, 0644);

module_param_named(pio, b43_modparam_pio, int, 0644);

MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");

MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");





static int modparam_allhwsupport = !IS_ENABLED(CONFIG_BRCMSMAC);

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

#ifdef CONFIG_B43_BCMA

static const struct bcma_device_id b43_bcma_tbl[] = {

static const struct bcma_device_id b43_bcma_tbl[] = {

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),

	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, 0x17, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, 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_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS),

	BCMA_CORETABLE_END

	BCMA_CORETABLE_END

};

};
@@ -5396,6 +5398,12 @@ static int b43_bcma_probe(struct bcma_device *core) 
	struct b43_wl *wl;

	struct b43_wl *wl;

	int err;

	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);

	dev = b43_bus_dev_bcma_init(core);

	if (!dev)

	if (!dev)

		return -ENODEV;

		return -ENODEV;