aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
commitdd8008aa78bed570c903cc167ba16591f246da78 (patch)
tree41e7adc38cd141c1e46de42d5ad433e6436e048d /package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
parent634e6c6b9ae7ed82ab8d95da8f2a596534534111 (diff)
downloadmaster-187ad058-dd8008aa78bed570c903cc167ba16591f246da78.tar.gz
master-187ad058-dd8008aa78bed570c903cc167ba16591f246da78.tar.bz2
master-187ad058-dd8008aa78bed570c903cc167ba16591f246da78.zip
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42683 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch')
-rw-r--r--package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch b/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
index 5e38460806..5735b66e02 100644
--- a/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
+++ b/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
-@@ -820,6 +820,7 @@ struct b43_wldev {
+@@ -837,6 +837,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,
-@@ -2814,10 +2819,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2844,10 +2849,10 @@ static int b43_gpio_init(struct b43_wlde
u32 mask, set;
b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);