aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-11 15:02:47 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-11 15:02:47 +0000
commit9f5dba18e9a1a3716dd805702195521d32e385ca (patch)
treebff917861075b930a7cc3b520f0371ecdcddcdc8 /package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
parent61cd5ce994701218a033578d2174e4791c146771 (diff)
downloadupstream-9f5dba18e9a1a3716dd805702195521d32e385ca.tar.gz
upstream-9f5dba18e9a1a3716dd805702195521d32e385ca.tar.bz2
upstream-9f5dba18e9a1a3716dd805702195521d32e385ca.zip
mac80211: update to wireless-testing 2015-03-09
Based on patch by Bryan Forbes <bryan@reigndropsfall.net> Also update mt76 to update for API changes Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44655 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 5735b66e02..95867ef8da 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
-@@ -837,6 +837,7 @@ struct b43_wldev {
+@@ -839,6 +839,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,
-@@ -2844,10 +2849,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2882,10 +2887,10 @@ static int b43_gpio_init(struct b43_wlde
u32 mask, set;
b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);