| ieee80211_ioctl.c (187835) | ieee80211_ioctl.c (188533) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 187835 2009-01-28 18:39:23Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 188533 2009-02-12 18:57:18Z thompsa $"); |
| 29 30/* 31 * IEEE 802.11 ioctl support (FreeBSD-specific) 32 */ 33 34#include "opt_inet.h" 35#include "opt_ipx.h" 36#include "opt_wlan.h" --- 3223 unchanged lines hidden (view full) --- 3260 /* 3261 * Stop ourself. If we are the last vap to be 3262 * marked down the parent will also be taken down. 3263 */ 3264 ieee80211_stop_locked(vap); 3265 } 3266 IEEE80211_UNLOCK(ic); 3267 /* Wait for parent ioctl handler if it was queued */ | 29 30/* 31 * IEEE 802.11 ioctl support (FreeBSD-specific) 32 */ 33 34#include "opt_inet.h" 35#include "opt_ipx.h" 36#include "opt_wlan.h" --- 3223 unchanged lines hidden (view full) --- 3260 /* 3261 * Stop ourself. If we are the last vap to be 3262 * marked down the parent will also be taken down. 3263 */ 3264 ieee80211_stop_locked(vap); 3265 } 3266 IEEE80211_UNLOCK(ic); 3267 /* Wait for parent ioctl handler if it was queued */ |
| 3268 taskqueue_drain(taskqueue_thread, &ic->ic_parent_task); | 3268 ieee80211_waitfor_parent(ic); |
| 3269 break; 3270 case SIOCADDMULTI: 3271 case SIOCDELMULTI: 3272 ieee80211_ioctl_updatemulti(vap->iv_ic); 3273 break; 3274 case SIOCSIFMEDIA: 3275 case SIOCGIFMEDIA: 3276 ifr = (struct ifreq *)data; --- 83 unchanged lines hidden --- | 3269 break; 3270 case SIOCADDMULTI: 3271 case SIOCDELMULTI: 3272 ieee80211_ioctl_updatemulti(vap->iv_ic); 3273 break; 3274 case SIOCSIFMEDIA: 3275 case SIOCGIFMEDIA: 3276 ifr = (struct ifreq *)data; --- 83 unchanged lines hidden --- |