summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2005-07-30 12:50:06 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-07-30 18:17:23 -0400
commitf3b10e1636dec053f4874d593e3de5d46da48a5f (patch)
tree57d78b3fd950bfa2c6991e14090ee9bee98f51f4 /drivers/net/wireless
parentb15eff2632be3fcea68e01ba7f12e26a731e3157 (diff)
[PATCH] hostap update
Fixed beacon frame when moving from monitor mode to master mode (workaround for firmware bug that left IBSS IE in the Beacon frames). This is using the same workaround that was previously used when moving from adhoc mode to master mode. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/hostap/hostap_ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 97836198691a..bbed1e634583 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1182,7 +1182,8 @@ static int prism2_ioctl_siwmode(struct net_device *dev,
if (local->iw_mode == IW_MODE_MONITOR)
hostap_monitor_mode_disable(local);
- if (local->iw_mode == IW_MODE_ADHOC && *mode == IW_MODE_MASTER) {
+ if ((local->iw_mode == IW_MODE_ADHOC ||
+ local->iw_mode == IW_MODE_MONITOR) && *mode == IW_MODE_MASTER) {
/* There seems to be a firmware bug in at least STA f/w v1.5.6
* that leaves beacon frames to use IBSS type when moving from
* IBSS to Host AP mode. Doing double Port0 reset seems to be