From b96789d70c9448c7fc0f67afe45b55a64cf2d303 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 30 Jul 2005 12:50:06 -0700 Subject: [PATCH] --- yaml --- r: 6752 b: refs/heads/master c: f3b10e1636dec053f4874d593e3de5d46da48a5f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/hostap/hostap_ioctl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f822b76b69ec..ef6b87984e61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b15eff2632be3fcea68e01ba7f12e26a731e3157 +refs/heads/master: f3b10e1636dec053f4874d593e3de5d46da48a5f diff --git a/trunk/drivers/net/wireless/hostap/hostap_ioctl.c b/trunk/drivers/net/wireless/hostap/hostap_ioctl.c index 97836198691a..bbed1e634583 100644 --- a/trunk/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/trunk/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