Deleted Added
full compact
ieee80211.h (231058) ieee80211.h (231187)
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:

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

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 *
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:

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

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 * $FreeBSD: head/sys/net80211/ieee80211.h 231058 2012-02-06 00:26:29Z adrian $
26 * $FreeBSD: head/sys/net80211/ieee80211.h 231187 2012-02-08 06:56:19Z adrian $
27 */
28#ifndef _NET80211_IEEE80211_H_
29#define _NET80211_IEEE80211_H_
30
31/*
32 * 802.11 protocol definitions.
33 */
34

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

704 IEEE80211_ELEMID_RSN = 48,
705 IEEE80211_ELEMID_XRATES = 50,
706 IEEE80211_ELEMID_HTINFO = 61,
707 IEEE80211_ELEMID_TPC = 150,
708 IEEE80211_ELEMID_CCKM = 156,
709 IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
710
711 /*
27 */
28#ifndef _NET80211_IEEE80211_H_
29#define _NET80211_IEEE80211_H_
30
31/*
32 * 802.11 protocol definitions.
33 */
34

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

704 IEEE80211_ELEMID_RSN = 48,
705 IEEE80211_ELEMID_XRATES = 50,
706 IEEE80211_ELEMID_HTINFO = 61,
707 IEEE80211_ELEMID_TPC = 150,
708 IEEE80211_ELEMID_CCKM = 156,
709 IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
710
711 /*
712 * 802.11s IEs based on D3.03 spec and were not assigned by
713 * ANA. Beware changing them because some of them are being
714 * kept compatible with Linux.
712 * 802.11s IEs
713 * NB: On vanilla Linux still IEEE80211_ELEMID_MESHPEER = 55,
714 * but they defined a new with id 117 called PEER_MGMT.
715 * NB: complies with open80211
715 */
716 */
716 IEEE80211_ELEMID_MESHCONF = 51,
717 IEEE80211_ELEMID_MESHID = 52,
718 IEEE80211_ELEMID_MESHLINK = 35,
719 IEEE80211_ELEMID_MESHCNGST = 36,
720 IEEE80211_ELEMID_MESHPEER = 55,
721 IEEE80211_ELEMID_MESHCSA = 38,
722 IEEE80211_ELEMID_MESHTIM = 39,
723 IEEE80211_ELEMID_MESHAWAKEW = 40,
724 IEEE80211_ELEMID_MESHBEACONT = 41,
725 IEEE80211_ELEMID_MESHPANN = 48,
726 IEEE80211_ELEMID_MESHRANN = 49,
727 IEEE80211_ELEMID_MESHPREQ = 68,
728 IEEE80211_ELEMID_MESHPREP = 69,
729 IEEE80211_ELEMID_MESHPERR = 70,
730 IEEE80211_ELEMID_MESHPXU = 53,
731 IEEE80211_ELEMID_MESHPXUC = 54,
732 IEEE80211_ELEMID_MESHAH = 60, /* Abbreviated Handshake */
717 IEEE80211_ELEMID_MESHCONF = 113,
718 IEEE80211_ELEMID_MESHID = 114,
719 IEEE80211_ELEMID_MESHLINK = 115,
720 IEEE80211_ELEMID_MESHCNGST = 116,
721 IEEE80211_ELEMID_MESHPEER = 117,
722 IEEE80211_ELEMID_MESHCSA = 118,
723 IEEE80211_ELEMID_MESHTIM = 39, /* XXX: remove */
724 IEEE80211_ELEMID_MESHAWAKEW = 119,
725 IEEE80211_ELEMID_MESHBEACONT = 120,
726 /* 121-124 MMCAOP not implemented yet */
727 IEEE80211_ELEMID_MESHPANN = 125, /* XXX: is GANN now, not used */
728 IEEE80211_ELEMID_MESHRANN = 126,
729 /* 127 Extended Capabilities */
730 /* 128-129 reserved */
731 IEEE80211_ELEMID_MESHPREQ = 130,
732 IEEE80211_ELEMID_MESHPREP = 131,
733 IEEE80211_ELEMID_MESHPERR = 132,
734 /* 133-136 reserved */
735 IEEE80211_ELEMID_MESHPXU = 137,
736 IEEE80211_ELEMID_MESHPXUC = 138,
737 IEEE80211_ELEMID_MESHAH = 60, /* XXX: remove */
733};
734
735struct ieee80211_tim_ie {
736 uint8_t tim_ie; /* IEEE80211_ELEMID_TIM */
737 uint8_t tim_len;
738 uint8_t tim_count; /* DTIM count */
739 uint8_t tim_period; /* DTIM period */
740 uint8_t tim_bitctl; /* bitmap control */

--- 362 unchanged lines hidden ---
738};
739
740struct ieee80211_tim_ie {
741 uint8_t tim_ie; /* IEEE80211_ELEMID_TIM */
742 uint8_t tim_len;
743 uint8_t tim_count; /* DTIM count */
744 uint8_t tim_period; /* DTIM period */
745 uint8_t tim_bitctl; /* bitmap control */

--- 362 unchanged lines hidden ---