Deleted Added
full compact
ieee80211.h (182820) ieee80211.h (183243)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2008 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-2008 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 182820 2008-09-06 17:14:27Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211.h 183243 2008-09-21 22:09:18Z sam $
27 */
28#ifndef _NET80211_IEEE80211_H_
29#define _NET80211_IEEE80211_H_
30
31/*
32 * 802.11 protocol definitions.
33 */
34

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

183#define IEEE80211_QOS_TXOP 0x00ff
184/* bit 8 is reserved */
185#define IEEE80211_QOS_AMSDU 0x80
186#define IEEE80211_QOS_AMSDU_S 7
187#define IEEE80211_QOS_ACKPOLICY 0x60
188#define IEEE80211_QOS_ACKPOLICY_S 5
189#define IEEE80211_QOS_ACKPOLICY_NOACK 0x20 /* No ACK required */
190#define IEEE80211_QOS_ACKPOLICY_BA 0x60 /* Block ACK */
27 */
28#ifndef _NET80211_IEEE80211_H_
29#define _NET80211_IEEE80211_H_
30
31/*
32 * 802.11 protocol definitions.
33 */
34

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

183#define IEEE80211_QOS_TXOP 0x00ff
184/* bit 8 is reserved */
185#define IEEE80211_QOS_AMSDU 0x80
186#define IEEE80211_QOS_AMSDU_S 7
187#define IEEE80211_QOS_ACKPOLICY 0x60
188#define IEEE80211_QOS_ACKPOLICY_S 5
189#define IEEE80211_QOS_ACKPOLICY_NOACK 0x20 /* No ACK required */
190#define IEEE80211_QOS_ACKPOLICY_BA 0x60 /* Block ACK */
191#define IEEE80211_QOS_ESOP 0x10
192#define IEEE80211_QOS_ESOP_S 4
191#define IEEE80211_QOS_EOSP 0x10 /* EndOfService Period*/
192#define IEEE80211_QOS_EOSP_S 4
193#define IEEE80211_QOS_TID 0x0f
194
195/* does frame have QoS sequence control data */
196#define IEEE80211_QOS_HAS_SEQ(wh) \
197 (((wh)->i_fc[0] & \
198 (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
199 (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
200

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

535 uint32_t hc_txbf; /* txbf capabilities */
536 uint8_t hc_antenna; /* antenna capabilities */
537} __packed;
538
539/* HT capability flags (ht_cap) */
540#define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */
541#define IEEE80211_HTCAP_CHWIDTH40 0x0002 /* 20/40 supported */
542#define IEEE80211_HTCAP_SMPS 0x000c /* SM Power Save mode */
193#define IEEE80211_QOS_TID 0x0f
194
195/* does frame have QoS sequence control data */
196#define IEEE80211_QOS_HAS_SEQ(wh) \
197 (((wh)->i_fc[0] & \
198 (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
199 (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
200

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

535 uint32_t hc_txbf; /* txbf capabilities */
536 uint8_t hc_antenna; /* antenna capabilities */
537} __packed;
538
539/* HT capability flags (ht_cap) */
540#define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */
541#define IEEE80211_HTCAP_CHWIDTH40 0x0002 /* 20/40 supported */
542#define IEEE80211_HTCAP_SMPS 0x000c /* SM Power Save mode */
543#define IEEE80211_HTCAP_SMPS_OFF 0x0000 /* none (static mode) */
543#define IEEE80211_HTCAP_SMPS_OFF 0x000c /* disabled */
544#define IEEE80211_HTCAP_SMPS_DYNAMIC 0x0004 /* send RTS first */
545/* NB: SMPS value 2 is reserved */
544#define IEEE80211_HTCAP_SMPS_DYNAMIC 0x0004 /* send RTS first */
545/* NB: SMPS value 2 is reserved */
546#define IEEE80211_HTCAP_SMPS_ENA 0x000c /* enabled */
546#define IEEE80211_HTCAP_SMPS_ENA 0x0000 /* enabled (static mode) */
547#define IEEE80211_HTCAP_GREENFIELD 0x0010 /* Greenfield supported */
548#define IEEE80211_HTCAP_SHORTGI20 0x0020 /* Short GI in 20MHz */
549#define IEEE80211_HTCAP_SHORTGI40 0x0040 /* Short GI in 40MHz */
550#define IEEE80211_HTCAP_TXSTBC 0x0080 /* STBC tx ok */
551#define IEEE80211_HTCAP_RXSTBC 0x0300 /* STBC rx support */
552#define IEEE80211_HTCAP_RXSTBC_S 8
553#define IEEE80211_HTCAP_RXSTBC_1STREAM 0x0100 /* 1 spatial stream */
554#define IEEE80211_HTCAP_RXSTBC_2STREAM 0x0200 /* 1-2 spatial streams*/

--- 513 unchanged lines hidden ---
547#define IEEE80211_HTCAP_GREENFIELD 0x0010 /* Greenfield supported */
548#define IEEE80211_HTCAP_SHORTGI20 0x0020 /* Short GI in 20MHz */
549#define IEEE80211_HTCAP_SHORTGI40 0x0040 /* Short GI in 40MHz */
550#define IEEE80211_HTCAP_TXSTBC 0x0080 /* STBC tx ok */
551#define IEEE80211_HTCAP_RXSTBC 0x0300 /* STBC rx support */
552#define IEEE80211_HTCAP_RXSTBC_S 8
553#define IEEE80211_HTCAP_RXSTBC_1STREAM 0x0100 /* 1 spatial stream */
554#define IEEE80211_HTCAP_RXSTBC_2STREAM 0x0200 /* 1-2 spatial streams*/

--- 513 unchanged lines hidden ---