| ieee80211_ioctl.c (298605) | ieee80211_ioctl.c (298941) |
|---|---|
| 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 298605 2016-04-26 01:29:26Z adrian $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 298941 2016-05-02 20:46:05Z avos $"); |
| 29 30/* 31 * IEEE 802.11 ioctl support (FreeBSD-specific) 32 */ 33 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 3340 unchanged lines hidden (view full) --- 3377 * marked down the parent will also be taken down. 3378 */ 3379 if (ic->ic_nrunning == 1) 3380 wait = 1; 3381 ieee80211_stop_locked(vap); 3382 } 3383 IEEE80211_UNLOCK(ic); 3384 /* 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_wlan.h" 36 --- 3340 unchanged lines hidden (view full) --- 3377 * marked down the parent will also be taken down. 3378 */ 3379 if (ic->ic_nrunning == 1) 3380 wait = 1; 3381 ieee80211_stop_locked(vap); 3382 } 3383 IEEE80211_UNLOCK(ic); 3384 /* Wait for parent ioctl handler if it was queued */ |
| 3385 if (wait) | 3385 if (wait) { |
| 3386 ieee80211_waitfor_parent(ic); | 3386 ieee80211_waitfor_parent(ic); |
| 3387 3388 /* 3389 * Check if the MAC address was changed 3390 * via SIOCSIFLLADDR ioctl. 3391 */ 3392 if ((ifp->if_flags & IFF_UP) == 0 && 3393 !IEEE80211_ADDR_EQ(vap->iv_myaddr, IF_LLADDR(ifp))) 3394 IEEE80211_ADDR_COPY(vap->iv_myaddr, 3395 IF_LLADDR(ifp)); 3396 } |
|
| 3387 break; 3388 case SIOCADDMULTI: 3389 case SIOCDELMULTI: 3390 ieee80211_runtask(ic, &ic->ic_mcast_task); 3391 break; 3392 case SIOCSIFMEDIA: 3393 case SIOCGIFMEDIA: 3394 ifr = (struct ifreq *)data; --- 64 unchanged lines hidden --- | 3397 break; 3398 case SIOCADDMULTI: 3399 case SIOCDELMULTI: 3400 ieee80211_runtask(ic, &ic->ic_mcast_task); 3401 break; 3402 case SIOCSIFMEDIA: 3403 case SIOCGIFMEDIA: 3404 ifr = (struct ifreq *)data; --- 64 unchanged lines hidden --- |