diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-09-19 09:59:00 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-19 09:59:00 +0000 |
commit | 5445bf0cdeddf9297e07c61a922876ba0b78f1aa (patch) | |
tree | 83e0d44f7261b3d11a5e120b5e407e3b4689ee20 /package/mac80211/patches/300-pending_work.patch | |
parent | a3c71fc56c1c31e01e17a7f3d82c595fc274cb20 (diff) | |
download | master-187ad058-5445bf0cdeddf9297e07c61a922876ba0b78f1aa.tar.gz master-187ad058-5445bf0cdeddf9297e07c61a922876ba0b78f1aa.tar.bz2 master-187ad058-5445bf0cdeddf9297e07c61a922876ba0b78f1aa.zip |
b43: merge ad-hoc beacon fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28258 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
-rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 12 |
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. */ |