| ieee80211_input.c (186302) | ieee80211_input.c (186904) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe |
| 3 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting | 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: 9 * 1. Redistributions of source code must retain the above copyright 10 * notice, this list of conditions and the following disclaimer. 11 * 2. Redistributions in binary form must reproduce the above copyright --- 8 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> | 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: 9 * 1. Redistributions of source code must retain the above copyright 10 * notice, this list of conditions and the following disclaimer. 11 * 2. Redistributions in binary form must reproduce the above copyright --- 8 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_input.c 186302 2008-12-18 23:00:09Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 186904 2009-01-08 17:12:47Z sam $"); |
| 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/endian.h> --- 593 unchanged lines hidden (view full) --- 630 break; 631 case IEEE80211_ELEMID_VENDOR: 632 if (iswpaoui(frm)) 633 scan->wpa = frm; 634 else if (iswmeparam(frm) || iswmeinfo(frm)) 635 scan->wme = frm; 636 else if (isatherosoui(frm)) 637 scan->ath = frm; | 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/endian.h> --- 593 unchanged lines hidden (view full) --- 630 break; 631 case IEEE80211_ELEMID_VENDOR: 632 if (iswpaoui(frm)) 633 scan->wpa = frm; 634 else if (iswmeparam(frm) || iswmeinfo(frm)) 635 scan->wme = frm; 636 else if (isatherosoui(frm)) 637 scan->ath = frm; |
| 638#ifdef IEEE80211_SUPPORT_TDMA 639 else if (istdmaoui(frm)) 640 scan->tdma = frm; 641#endif |
|
| 638 else if (vap->iv_flags_ext & IEEE80211_FEXT_HTCOMPAT) { 639 /* 640 * Accept pre-draft HT ie's if the 641 * standard ones have not been seen. 642 */ 643 if (ishtcapoui(frm)) { 644 if (scan->htcap == NULL) 645 scan->htcap = frm; --- 286 unchanged lines hidden --- | 642 else if (vap->iv_flags_ext & IEEE80211_FEXT_HTCOMPAT) { 643 /* 644 * Accept pre-draft HT ie's if the 645 * standard ones have not been seen. 646 */ 647 if (ishtcapoui(frm)) { 648 if (scan->htcap == NULL) 649 scan->htcap = frm; --- 286 unchanged lines hidden --- |