aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-02-07 11:28:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-02-07 11:28:11 +0000
commitea63948914b33029f287188c4fb984ee9f97e8e0 (patch)
tree230240e51165116d8a2b2065982f58df67c73219 /package/mac80211/patches/800-b43-gpio-mask-module-option.patch
parente430c864f45e1f437c96a1e8a416e8b32edf5598 (diff)
downloadupstream-ea63948914b33029f287188c4fb984ee9f97e8e0.tar.gz
upstream-ea63948914b33029f287188c4fb984ee9f97e8e0.tar.bz2
upstream-ea63948914b33029f287188c4fb984ee9f97e8e0.zip
mac80211: update to wireless-testing 2012-02-06
SVN-Revision: 30346
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.patch12
1 files changed, 6 insertions, 6 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 08ac033cc5..f3c278ee24 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
-@@ -791,6 +791,7 @@ struct b43_wldev {
+@@ -803,6 +803,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,12 +22,12 @@
static int modparam_bad_frames_preempt;
module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
MODULE_PARM_DESC(bad_frames_preempt,
-@@ -2686,10 +2691,10 @@ static int b43_gpio_init(struct b43_wlde
- & ~B43_MACCTL_GPOUTSMSK);
+@@ -2674,10 +2679,10 @@ static int b43_gpio_init(struct b43_wlde
+ u32 mask, set;
- b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
-- | 0x000F);
-+ | modparam_gpiomask);
+ b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
+- b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xF);
++ b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, modparam_gpiomask);
mask = 0x0000001F;
- set = 0x0000000F;