diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-06-24 19:53:13 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-06-24 19:53:13 +0000 |
| commit | 2686ccd16df677ae3f4250bc51c7c2fd7b6688d7 (patch) | |
| tree | a44f783eb47dde96b98457e9980bab5808af8a0c /package/mac80211/patches/800-b43-gpio-mask-module-option.patch | |
| parent | fdc2c49a186b639f8398aa1f38d6a5175fdb57f3 (diff) | |
| download | upstream-2686ccd16df677ae3f4250bc51c7c2fd7b6688d7.tar.gz upstream-2686ccd16df677ae3f4250bc51c7c2fd7b6688d7.tar.bz2 upstream-2686ccd16df677ae3f4250bc51c7c2fd7b6688d7.zip | |
mac80211: update to wireless-testing 2011-06-22
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27275 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/800-b43-gpio-mask-module-option.patch')
| -rw-r--r-- | package/mac80211/patches/800-b43-gpio-mask-module-option.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 27a1ac104e..1dee123918 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 -@@ -720,6 +720,7 @@ struct b43_wldev { +@@ -740,6 +740,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 */ @@ -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, -@@ -2560,10 +2565,10 @@ static int b43_gpio_init(struct b43_wlde +@@ -2575,10 +2580,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,10 +32,10 @@ mask = 0x0000001F; - set = 0x0000000F; + set = modparam_gpiomask; - if (dev->sdev->bus->chip_id == 0x4301) { + if (dev->dev->chip_id == 0x4301) { mask |= 0x0060; set |= 0x0060; -@@ -5084,10 +5089,10 @@ static void b43_print_driverinfo(void) +@@ -5137,10 +5142,10 @@ static void b43_print_driverinfo(void) feat_sdio = "S"; #endif printk(KERN_INFO "Broadcom 43xx driver loaded " |