---

yaml --- r: 6752 b: refs/heads/master c: f3b10e1 h: refs/heads/master v: v3
git-mirror · Jul 30, 2005 · b96789d · b96789d
1 parent 21a9cac
commit b96789d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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