X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4cc2bb43c85f28f4dec00197bd75ff7cca978610..dcf5cd5fc2fb73b8aa46afda5fef7ded9727b418:/package/mac80211/patches/800-b43-gpio-mask-module-option.patch

diff --git a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
index 86578724d..08ac033cc 100644
--- a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
+++ b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -718,6 +718,7 @@ struct b43_wldev {
+@@ -791,6 +791,7 @@ struct b43_wldev {
  	bool qos_enabled;		/* TRUE, if QoS is used. */
  	bool hwcrypto_enabled;		/* TRUE, if HW crypto acceleration is enabled. */
  	bool use_pio;			/* TRUE if next init should use PIO */
@@ -10,7 +10,7 @@
  	struct b43_phy phy;
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -75,6 +75,11 @@ MODULE_FIRMWARE("b43/ucode15.fw");
+@@ -76,6 +76,11 @@ MODULE_FIRMWARE("b43/ucode16_mimo.fw");
  MODULE_FIRMWARE("b43/ucode5.fw");
  MODULE_FIRMWARE("b43/ucode9.fw");
  
@@ -22,7 +22,7 @@
  static int modparam_bad_frames_preempt;
  module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
  MODULE_PARM_DESC(bad_frames_preempt,
-@@ -2536,10 +2541,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2686,10 +2691,10 @@ static int b43_gpio_init(struct b43_wlde
  		    & ~B43_MACCTL_GPOUTSMSK);
  
  	b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
@@ -32,19 +32,6 @@
  	mask = 0x0000001F;
 -	set = 0x0000000F;
 +	set = modparam_gpiomask;
- 	if (dev->dev->bus->chip_id == 0x4301) {
+ 	if (dev->dev->chip_id == 0x4301) {
  		mask |= 0x0060;
  		set |= 0x0060;
-@@ -5096,10 +5101,10 @@ static void b43_print_driverinfo(void)
- 	feat_sdio = "S";
- #endif
- 	printk(KERN_INFO "Broadcom 43xx driver loaded "
--	       "[ Features: %s%s%s%s%s, Firmware-ID: "
-+	       "[ Features: %s%s%s%s%s, GPIO LED Mask: 0x%04x, Firmware-ID: "
- 	       B43_SUPPORTED_FIRMWARE_ID " ]\n",
- 	       feat_pci, feat_pcmcia, feat_nphy,
--	       feat_leds, feat_sdio);
-+	       feat_leds, feat_sdio, modparam_gpiomask);
- }
- 
- static int __init b43_init(void)