summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorManual Munz <freifunk@somakoma.de>2011-09-18 18:24:03 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-09-19 14:51:51 -0400
commit8c23516fbb209ccf8f8c36268311c721faff29ee (patch)
tree2278e36af35b77f4b4cb5ba402adf1b90c4bacfa /drivers/net
parent5d59bbce3d5fba0c612e830f919e003d3da90d70 (diff)
b43: Fix beacon problem in ad-hoc mode
In ad-hoc mode, driver b43 does not issue beacons. Signed-off-by: Manual Munz <freifunk@somakoma.de> Tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@kernel.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/b43/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 26f1ab840cc7..e293a7921bf0 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1632,7 +1632,8 @@ static void handle_irq_beacon(struct b43_wldev *dev)
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. */