| ieee80211_input.c (296302) | ieee80211_input.c (296823) |
|---|---|
| 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_input.c 296302 2016-03-02 05:01:58Z markj $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 296823 2016-03-14 04:39:35Z adrian $"); |
| 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> --- 528 unchanged lines hidden (view full) --- 565 case IEEE80211_ELEMID_TIM: 566 /* XXX ATIM? */ 567 scan->tim = frm; 568 scan->timoff = frm - mtod(m, uint8_t *); 569 break; 570 case IEEE80211_ELEMID_IBSSPARMS: 571 case IEEE80211_ELEMID_CFPARMS: 572 case IEEE80211_ELEMID_PWRCNSTR: | 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> --- 528 unchanged lines hidden (view full) --- 565 case IEEE80211_ELEMID_TIM: 566 /* XXX ATIM? */ 567 scan->tim = frm; 568 scan->timoff = frm - mtod(m, uint8_t *); 569 break; 570 case IEEE80211_ELEMID_IBSSPARMS: 571 case IEEE80211_ELEMID_CFPARMS: 572 case IEEE80211_ELEMID_PWRCNSTR: |
| 573 case IEEE80211_ELEMID_BSSLOAD: 574 case IEEE80211_ELEMID_APCHANREP: |
|
| 573 /* NB: avoid debugging complaints */ 574 break; 575 case IEEE80211_ELEMID_XRATES: 576 scan->xrates = frm; 577 break; 578 case IEEE80211_ELEMID_ERP: 579 if (frm[1] != 1) { 580 IEEE80211_DISCARD_IE(vap, --- 15 unchanged lines hidden (view full) --- 596 break; 597#ifdef IEEE80211_SUPPORT_MESH 598 case IEEE80211_ELEMID_MESHID: 599 scan->meshid = frm; 600 break; 601 case IEEE80211_ELEMID_MESHCONF: 602 scan->meshconf = frm; 603 break; | 575 /* NB: avoid debugging complaints */ 576 break; 577 case IEEE80211_ELEMID_XRATES: 578 scan->xrates = frm; 579 break; 580 case IEEE80211_ELEMID_ERP: 581 if (frm[1] != 1) { 582 IEEE80211_DISCARD_IE(vap, --- 15 unchanged lines hidden (view full) --- 598 break; 599#ifdef IEEE80211_SUPPORT_MESH 600 case IEEE80211_ELEMID_MESHID: 601 scan->meshid = frm; 602 break; 603 case IEEE80211_ELEMID_MESHCONF: 604 scan->meshconf = frm; 605 break; |
| 606 case IEEE80211_ELEMID_MESHEXTCAP: 607 break; |
|
| 604#endif 605 case IEEE80211_ELEMID_VENDOR: 606 if (iswpaoui(frm)) 607 scan->wpa = frm; 608 else if (iswmeparam(frm) || iswmeinfo(frm)) 609 scan->wme = frm; 610#ifdef IEEE80211_SUPPORT_SUPERG 611 else if (isatherosoui(frm)) --- 365 unchanged lines hidden --- | 608#endif 609 case IEEE80211_ELEMID_VENDOR: 610 if (iswpaoui(frm)) 611 scan->wpa = frm; 612 else if (iswmeparam(frm) || iswmeinfo(frm)) 613 scan->wme = frm; 614#ifdef IEEE80211_SUPPORT_SUPERG 615 else if (isatherosoui(frm)) --- 365 unchanged lines hidden --- |