| ieee80211_ioctl.c (251488) | ieee80211_ioctl.c (252369) |
|---|---|
| 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 251488 2013-06-07 09:03:56Z adrian $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 252369 2013-06-29 06:36:42Z rpaulo $"); |
| 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" --- 1547 unchanged lines hidden (view full) --- 1584 return EINVAL; 1585 error = copyin(ireq->i_data, &mlme, sizeof(mlme)); 1586 if (error) 1587 return error; 1588 if (vap->iv_opmode == IEEE80211_M_STA && 1589 mlme.im_op == IEEE80211_MLME_ASSOC) 1590 return setmlme_assoc_sta(vap, mlme.im_macaddr, 1591 vap->iv_des_ssid[0].len, vap->iv_des_ssid[0].ssid); | 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" --- 1547 unchanged lines hidden (view full) --- 1584 return EINVAL; 1585 error = copyin(ireq->i_data, &mlme, sizeof(mlme)); 1586 if (error) 1587 return error; 1588 if (vap->iv_opmode == IEEE80211_M_STA && 1589 mlme.im_op == IEEE80211_MLME_ASSOC) 1590 return setmlme_assoc_sta(vap, mlme.im_macaddr, 1591 vap->iv_des_ssid[0].len, vap->iv_des_ssid[0].ssid); |
| 1592 else if (mlme.im_op == IEEE80211_MLME_ASSOC) | 1592 else if ((vap->iv_opmode == IEEE80211_M_IBSS || 1593 vap->iv_opmode == IEEE80211_M_AHDEMO) && 1594 mlme.im_op == IEEE80211_MLME_ASSOC) |
| 1593 return setmlme_assoc_adhoc(vap, mlme.im_macaddr, 1594 mlme.im_ssid_len, mlme.im_ssid); 1595 else 1596 return setmlme_common(vap, mlme.im_op, 1597 mlme.im_macaddr, mlme.im_reason); 1598} 1599 1600static __noinline int --- 1859 unchanged lines hidden --- | 1595 return setmlme_assoc_adhoc(vap, mlme.im_macaddr, 1596 mlme.im_ssid_len, mlme.im_ssid); 1597 else 1598 return setmlme_common(vap, mlme.im_op, 1599 mlme.im_macaddr, mlme.im_reason); 1600} 1601 1602static __noinline int --- 1859 unchanged lines hidden --- |