aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManual Munz <freifunk@somakoma.de>2011-09-18 18:24:03 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:36 -0700
commitc086c605156a8a5356a331729c6a0cab85fb386a (patch)
tree630714f6dd87c19edf9e418c881bf513844ce1a8
parent4f56018181256496943d30defeff3f0e6b50e38b (diff)
downloadkernel_samsung_smdk4412-c086c605156a8a5356a331729c6a0cab85fb386a.zip
kernel_samsung_smdk4412-c086c605156a8a5356a331729c6a0cab85fb386a.tar.gz
kernel_samsung_smdk4412-c086c605156a8a5356a331729c6a0cab85fb386a.tar.bz2
b43: Fix beacon problem in ad-hoc mode
commit 8c23516fbb209ccf8f8c36268311c721faff29ee upstream. 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> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 eb41596..b1fe4fe 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1571,7 +1571,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. */