aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-05-31 23:07:29 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-05-31 23:07:29 +0000
commitf9b45ed9c5f8a04baa4056cd2a3094d5a2293f28 (patch)
tree162dd92bedb9c34bcb7e81601626a31f2a7553fb /package/mac80211/patches/800-b43-gpio-mask-module-option.patch
parent2ca6db7bcb65afd6250176741b76d3f8432ba782 (diff)
downloadupstream-f9b45ed9c5f8a04baa4056cd2a3094d5a2293f28.tar.gz
upstream-f9b45ed9c5f8a04baa4056cd2a3094d5a2293f28.tar.bz2
upstream-f9b45ed9c5f8a04baa4056cd2a3094d5a2293f28.zip
mac80211: update to wireless-testing 2011-05-27
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27071 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.patch8
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 dcbf6682fc..27a1ac104e 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 {
+@@ -720,6 +720,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,
-@@ -2543,10 +2548,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2560,10 +2565,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->dev->bus->chip_id == 0x4301) {
+ if (dev->sdev->bus->chip_id == 0x4301) {
mask |= 0x0060;
set |= 0x0060;
-@@ -5078,10 +5083,10 @@ static void b43_print_driverinfo(void)
+@@ -5084,10 +5089,10 @@ static void b43_print_driverinfo(void)
feat_sdio = "S";
#endif
printk(KERN_INFO "Broadcom 43xx driver loaded "