svn commit: r187871 - projects/vap7/sys/net80211

[Sam Leffler]

Author: sam
Date: Wed Jan 28 21:42:17 2009
New Revision: 187871
URL: http://svn.freebsd.org/changeset/base/187871

Log:
  merge r187678: defer updown event

Modified:
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_ioctl.c

Modified: projects/vap7/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_ioctl.c	Wed Jan 28 21:34:07 2009	(r187870)
+++ projects/vap7/sys/net80211/ieee80211_ioctl.c	Wed Jan 28 21:42:17 2009	(r187871)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
+#include <sys/taskqueue.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -3263,6 +3264,8 @@ ieee80211_ioctl(struct ifnet *ifp, u_lon
 			ieee80211_stop_locked(vap);
 		}
 		IEEE80211_UNLOCK(ic);
+		/* Wait for parent ioctl handler if it was queued */
+		taskqueue_drain(taskqueue_thread, &ic->ic_parent_task);
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI: