aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-09-08 11:10:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-09-08 11:10:54 +0000
commitb4f512b67c2ed5e8d3a8cedefb76193e3e699e1b (patch)
tree8c49adee2d02a47208f7d920f1fff9941c0f3f50 /package/mac80211/patches/800-b43-gpio-mask-module-option.patch
parent2daf0ae2046f31ef96f2a413955032e0cded60f1 (diff)
downloadupstream-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.tar.gz
upstream-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.tar.bz2
upstream-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.zip
mac80211: update to 2012-09-07, adds ath9k beacon fixes, mesh/adhoc fixes, and more
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33331 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.patch4
1 files changed, 2 insertions, 2 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 01f270ff83..55ab0aa3a2 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
-@@ -803,6 +803,7 @@ struct b43_wldev {
+@@ -807,6 +807,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,
-@@ -2690,10 +2695,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2688,10 +2693,10 @@ static int b43_gpio_init(struct b43_wlde
u32 mask, set;
b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);