Deleted Added
full compact
ieee80211_var.h (189980) ieee80211_var.h (190526)
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 189980 2009-03-18 19:28:17Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211_var.h 190526 2009-03-29 17:59:14Z sam $
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 */

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

110struct ieee80211com {
111 struct ifnet *ic_ifp; /* associated device */
112 ieee80211_com_lock_t ic_comlock; /* state update lock */
113 TAILQ_HEAD(, ieee80211vap) ic_vaps; /* list of vap instances */
114 int ic_headroom; /* driver tx headroom needs */
115 enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */
116 enum ieee80211_opmode ic_opmode; /* operation mode */
117 struct ifmedia ic_media; /* interface media config */
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 */

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

110struct ieee80211com {
111 struct ifnet *ic_ifp; /* associated device */
112 ieee80211_com_lock_t ic_comlock; /* state update lock */
113 TAILQ_HEAD(, ieee80211vap) ic_vaps; /* list of vap instances */
114 int ic_headroom; /* driver tx headroom needs */
115 enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */
116 enum ieee80211_opmode ic_opmode; /* operation mode */
117 struct ifmedia ic_media; /* interface media config */
118 uint8_t ic_myaddr[IEEE80211_ADDR_LEN];
119 struct callout ic_inact; /* inactivity processing */
120 struct task ic_parent_task; /* deferred parent processing */
121
122 uint32_t ic_flags; /* state flags */
123 uint32_t ic_flags_ext; /* extended state flags */
124 uint32_t ic_flags_ven; /* vendor state flags */
125 uint32_t ic_caps; /* capabilities */
126 uint32_t ic_htcaps; /* HT capabilities */

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

570#define IEEE80211_HTC_HT 0x00040000 /* CAPABILITY: HT operation */
571#define IEEE80211_HTC_SMPS 0x00080000 /* CAPABILITY: MIMO power save*/
572#define IEEE80211_HTC_RIFS 0x00100000 /* CAPABILITY: RIFS support */
573
574#define IEEE80211_C_HTCAP_BITS \
575 "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
576 "\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS"
577
118 struct callout ic_inact; /* inactivity processing */
119 struct task ic_parent_task; /* deferred parent processing */
120
121 uint32_t ic_flags; /* state flags */
122 uint32_t ic_flags_ext; /* extended state flags */
123 uint32_t ic_flags_ven; /* vendor state flags */
124 uint32_t ic_caps; /* capabilities */
125 uint32_t ic_htcaps; /* HT capabilities */

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

569#define IEEE80211_HTC_HT 0x00040000 /* CAPABILITY: HT operation */
570#define IEEE80211_HTC_SMPS 0x00080000 /* CAPABILITY: MIMO power save*/
571#define IEEE80211_HTC_RIFS 0x00100000 /* CAPABILITY: RIFS support */
572
573#define IEEE80211_C_HTCAP_BITS \
574 "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
575 "\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS"
576
578void ieee80211_ifattach(struct ieee80211com *);
577void ieee80211_ifattach(struct ieee80211com *,
578 const uint8_t macaddr[IEEE80211_ADDR_LEN]);
579void ieee80211_ifdetach(struct ieee80211com *);
580int ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *,
581 const char name[IFNAMSIZ], int unit, int opmode, int flags,
582 const uint8_t bssid[IEEE80211_ADDR_LEN],
583 const uint8_t macaddr[IEEE80211_ADDR_LEN]);
584int ieee80211_vap_attach(struct ieee80211vap *,
585 ifm_change_cb_t, ifm_stat_cb_t);
586void ieee80211_vap_detach(struct ieee80211vap *);

--- 220 unchanged lines hidden ---
579void ieee80211_ifdetach(struct ieee80211com *);
580int ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *,
581 const char name[IFNAMSIZ], int unit, int opmode, int flags,
582 const uint8_t bssid[IEEE80211_ADDR_LEN],
583 const uint8_t macaddr[IEEE80211_ADDR_LEN]);
584int ieee80211_vap_attach(struct ieee80211vap *,
585 ifm_change_cb_t, ifm_stat_cb_t);
586void ieee80211_vap_detach(struct ieee80211vap *);

--- 220 unchanged lines hidden ---