aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-07-12 08:19:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-07-12 08:19:04 +0000
commitd1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (patch)
treeb4d150683b180b04da569f049a53d592956d705b /package/mac80211/patches/800-b43-gpio-mask-module-option.patch
parent700de21fec69cc8b11374be00d04660ffbd48943 (diff)
downloadupstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.gz
upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.bz2
upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.zip
mac80211: backport latest version from trunk (as of r37265)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37266 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 d8fb06de57..46de746db1 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
-@@ -812,6 +812,7 @@ struct b43_wldev {
+@@ -820,6 +820,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,
-@@ -2740,10 +2745,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2742,10 +2747,10 @@ static int b43_gpio_init(struct b43_wlde
u32 mask, set;
b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);