From: Michael Buesch Date: Sun, 28 Jan 2007 20:32:52 +0000 (-0600) Subject: [PATCH] bcm43xx: Enable fwpostfix in nondebug bcm43xx X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95c777956d64c60631a637eb9a142fea88fb1e78;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [PATCH] bcm43xx: Enable fwpostfix in nondebug bcm43xx The in-kernel bcm43xx driver only works with V3 firmware, whereas the experimental version that incorporates the d80211 stack requires V4 firmware. In bcm43xx-d80211, the fwpostfix module parameter is used to differentiate between the versions. In bcm43xx-softmac, this module parameter is only enabled when debugging is on. This patch makes the module parameter available unconditionaly, and should ease the future transition from softmac to d80211. Signed-off-by: Michael Buesch Signed-off-by: Larry Finger Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 91b752e3d07e..62c623572c82 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -95,13 +95,9 @@ static int modparam_noleds; module_param_named(noleds, modparam_noleds, int, 0444); MODULE_PARM_DESC(noleds, "Turn off all LED activity"); -#ifdef CONFIG_BCM43XX_DEBUG static char modparam_fwpostfix[64]; module_param_string(fwpostfix, modparam_fwpostfix, 64, 0444); -MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for debugging."); -#else -# define modparam_fwpostfix "" -#endif /* CONFIG_BCM43XX_DEBUG*/ +MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for using multiple firmware image versions."); /* If you want to debug with just a single device, enable this,