aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-15 17:55:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-09-15 17:55:16 +0000
commitb65db4089dfd161286634ec82c7aaec11dc84ac4 (patch)
treeaa6b1ef5eb5fa5afdaa907307757781f101bf85f /package/mac80211/patches/800-b43-gpio-mask-module-option.patch
parent9ac95ba999b6908e5d57d661c9ebe3f638ceaf6e (diff)
downloadupstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.tar.gz
upstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.tar.bz2
upstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.zip
mac80211: update to wireless-testing 2011-09-14
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28245 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.patch6
1 files changed, 3 insertions, 3 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 a9958829f8..ca6374fa2d 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
-@@ -751,6 +751,7 @@ struct b43_wldev {
+@@ -753,6 +753,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
-@@ -74,6 +74,11 @@ MODULE_FIRMWARE("b43/ucode16_mimo.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,
-@@ -2676,10 +2681,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2678,10 +2683,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)