Deleted Added
full compact
ieee80211_ioctl.c (190532) ieee80211_ioctl.c (191532)
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 190532 2009-03-29 21:17:08Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 191532 2009-04-26 20:55:31Z sam $");
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"

--- 873 unchanged lines hidden (view full) ---

910 error = ieee80211_ioctl_getkey(vap, ireq);
911 break;
912 case IEEE80211_IOC_CHANINFO:
913 error = ieee80211_ioctl_getchaninfo(vap, ireq);
914 break;
915 case IEEE80211_IOC_BSSID:
916 if (ireq->i_len != IEEE80211_ADDR_LEN)
917 return EINVAL;
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"

--- 873 unchanged lines hidden (view full) ---

910 error = ieee80211_ioctl_getkey(vap, ireq);
911 break;
912 case IEEE80211_IOC_CHANINFO:
913 error = ieee80211_ioctl_getchaninfo(vap, ireq);
914 break;
915 case IEEE80211_IOC_BSSID:
916 if (ireq->i_len != IEEE80211_ADDR_LEN)
917 return EINVAL;
918 error = copyout(vap->iv_state == IEEE80211_S_RUN ?
919 vap->iv_bss->ni_bssid :
920 vap->iv_des_bssid,
921 ireq->i_data, ireq->i_len);
918 if (vap->iv_state == IEEE80211_S_RUN) {
919 error = copyout(vap->iv_opmode == IEEE80211_M_WDS ?
920 vap->iv_bss->ni_macaddr : vap->iv_bss->ni_bssid,
921 ireq->i_data, ireq->i_len);
922 } else
923 error = copyout(vap->iv_des_bssid, ireq->i_data,
924 ireq->i_len);
922 break;
923 case IEEE80211_IOC_WPAIE:
924 error = ieee80211_ioctl_getwpaie(vap, ireq, ireq->i_type);
925 break;
926 case IEEE80211_IOC_WPAIE2:
927 error = ieee80211_ioctl_getwpaie(vap, ireq, ireq->i_type);
928 break;
929 case IEEE80211_IOC_SCAN_RESULTS:

--- 2405 unchanged lines hidden ---
925 break;
926 case IEEE80211_IOC_WPAIE:
927 error = ieee80211_ioctl_getwpaie(vap, ireq, ireq->i_type);
928 break;
929 case IEEE80211_IOC_WPAIE2:
930 error = ieee80211_ioctl_getwpaie(vap, ireq, ireq->i_type);
931 break;
932 case IEEE80211_IOC_SCAN_RESULTS:

--- 2405 unchanged lines hidden ---