aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/300-pending_work.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-19 09:59:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-09-19 09:59:00 +0000
commitf4954abe390b304a20959925bbfd04342ab5ca91 (patch)
tree78b5ba3932f569edd3970e5756910b4e7bc80560 /package/mac80211/patches/300-pending_work.patch
parent32ae896d0070a4db8061e179b3cdfe314ab4530a (diff)
downloadupstream-f4954abe390b304a20959925bbfd04342ab5ca91.tar.gz
upstream-f4954abe390b304a20959925bbfd04342ab5ca91.tar.bz2
upstream-f4954abe390b304a20959925bbfd04342ab5ca91.zip
b43: merge ad-hoc beacon fix
SVN-Revision: 28258
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
-rw-r--r--package/mac80211/patches/300-pending_work.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 7a8e1b1e6a..fde95c940b 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -2848,3 +2848,15 @@
}
/* Note: country IE parsing is done for us by cfg80211 */
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -1613,7 +1613,8 @@ static void handle_irq_beacon(struct b43
+ u32 cmd, beacon0_valid, beacon1_valid;
+
+ if (!b43_is_mode(wl, NL80211_IFTYPE_AP) &&
+- !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT))
++ !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT) &&
++ !b43_is_mode(wl, NL80211_IFTYPE_ADHOC))
+ return;
+
+ /* This is the bottom half of the asynchronous beacon update. */