| ieee80211_ioctl.c (186904) | ieee80211_ioctl.c (187060) |
|---|---|
| 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 186904 2009-01-08 17:12:47Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 187060 2009-01-11 18:59:14Z 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" --- 2654 unchanged lines hidden (view full) --- 2691 break; 2692 case 2: 2693 if (!(vap->iv_caps & IEEE80211_C_WPA2)) 2694 return EOPNOTSUPP; 2695 flags |= IEEE80211_F_WPA2; 2696 break; 2697 case 3: 2698 if ((vap->iv_caps & IEEE80211_C_WPA) != IEEE80211_C_WPA) | 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" --- 2654 unchanged lines hidden (view full) --- 2691 break; 2692 case 2: 2693 if (!(vap->iv_caps & IEEE80211_C_WPA2)) 2694 return EOPNOTSUPP; 2695 flags |= IEEE80211_F_WPA2; 2696 break; 2697 case 3: 2698 if ((vap->iv_caps & IEEE80211_C_WPA) != IEEE80211_C_WPA) |
| 2699 return EOPNOTSUPP; |
|
| 2699 flags |= IEEE80211_F_WPA1 | IEEE80211_F_WPA2; 2700 break; 2701 default: /* Can't set any -> error */ 2702 return EOPNOTSUPP; 2703 } 2704 vap->iv_flags = flags; 2705 error = ERESTART; /* NB: can change beacon frame */ 2706 break; --- 619 unchanged lines hidden --- | 2700 flags |= IEEE80211_F_WPA1 | IEEE80211_F_WPA2; 2701 break; 2702 default: /* Can't set any -> error */ 2703 return EOPNOTSUPP; 2704 } 2705 vap->iv_flags = flags; 2706 error = ERESTART; /* NB: can change beacon frame */ 2707 break; --- 619 unchanged lines hidden --- |