Deleted Added
full compact
ieee80211_var.h (290058) ieee80211_var.h (293022)
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_var.h 290058 2015-10-27 20:40:57Z avos $
26 * $FreeBSD: head/sys/net80211/ieee80211_var.h 293022 2016-01-01 00:21:07Z adrian $
27 */
28#ifndef _NET80211_IEEE80211_VAR_H_
29#define _NET80211_IEEE80211_VAR_H_
30
31/*
32 * Definitions for IEEE 802.11 drivers.
33 */
34/* NB: portability glue must go first */

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

79#define IEEE80211_FIXED_RATE_NONE 0xff
80#define IEEE80211_TXMAX_DEFAULT 6 /* default ucast max retries */
81
82#define IEEE80211_RTS_DEFAULT IEEE80211_RTS_MAX
83#define IEEE80211_FRAG_DEFAULT IEEE80211_FRAG_MAX
84
85#define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
86#define IEEE80211_TU_TO_MS(x) (((x) * 1024) / 1000)
27 */
28#ifndef _NET80211_IEEE80211_VAR_H_
29#define _NET80211_IEEE80211_VAR_H_
30
31/*
32 * Definitions for IEEE 802.11 drivers.
33 */
34/* NB: portability glue must go first */

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

79#define IEEE80211_FIXED_RATE_NONE 0xff
80#define IEEE80211_TXMAX_DEFAULT 6 /* default ucast max retries */
81
82#define IEEE80211_RTS_DEFAULT IEEE80211_RTS_MAX
83#define IEEE80211_FRAG_DEFAULT IEEE80211_FRAG_MAX
84
85#define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
86#define IEEE80211_TU_TO_MS(x) (((x) * 1024) / 1000)
87/* XXX TODO: cap this at 1, in case hz is not 1000 */
87#define IEEE80211_TU_TO_TICKS(x)(((x) * 1024 * hz) / (1000 * 1000))
88
89/*
90 * 802.11 control state is split into a common portion that maps
91 * 1-1 to a physical device and one or more "Virtual AP's" (VAP)
92 * that are bound to an ieee80211com instance and share a single
93 * underlying device. Each VAP has a corresponding OS device
94 * entity through which traffic flows and that applications use

--- 907 unchanged lines hidden ---
88#define IEEE80211_TU_TO_TICKS(x)(((x) * 1024 * hz) / (1000 * 1000))
89
90/*
91 * 802.11 control state is split into a common portion that maps
92 * 1-1 to a physical device and one or more "Virtual AP's" (VAP)
93 * that are bound to an ieee80211com instance and share a single
94 * underlying device. Each VAP has a corresponding OS device
95 * entity through which traffic flows and that applications use

--- 907 unchanged lines hidden ---