Deleted Added
full compact
if_athvar.h (237152) if_athvar.h (237153)
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

21 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
22 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 *
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

21 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
22 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 *
29 * $FreeBSD: head/sys/dev/ath/if_athvar.h 237152 2012-06-16 04:36:08Z adrian $
29 * $FreeBSD: head/sys/dev/ath/if_athvar.h 237153 2012-06-16 04:41:35Z adrian $
30 */
31
32/*
33 * Defintions for the Atheros Wireless LAN controller driver.
34 */
35#ifndef _DEV_ATH_ATHVAR_H
36#define _DEV_ATH_ATHVAR_H
37

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

231 bfs_ismrr:1, /* do multi-rate TX retry */
232 bfs_doprot:1, /* do RTS/CTS based protection */
233 bfs_doratelookup:1; /* do rate lookup before each TX */
234
235 /*
236 * These fields are passed into the
237 * descriptor setup functions.
238 */
30 */
31
32/*
33 * Defintions for the Atheros Wireless LAN controller driver.
34 */
35#ifndef _DEV_ATH_ATHVAR_H
36#define _DEV_ATH_ATHVAR_H
37

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

231 bfs_ismrr:1, /* do multi-rate TX retry */
232 bfs_doprot:1, /* do RTS/CTS based protection */
233 bfs_doratelookup:1; /* do rate lookup before each TX */
234
235 /*
236 * These fields are passed into the
237 * descriptor setup functions.
238 */
239
240 /* Make this an 8 bit value? */
239 HAL_PKT_TYPE bfs_atype; /* packet type */
241 HAL_PKT_TYPE bfs_atype; /* packet type */
240 int bfs_pktlen; /* length of this packet */
241 int bfs_hdrlen; /* length of this packet header */
242
243 uint32_t bfs_pktlen; /* length of this packet */
244
245 uint16_t bfs_hdrlen; /* length of this packet header */
242 uint16_t bfs_al; /* length of aggregate */
246 uint16_t bfs_al; /* length of aggregate */
243 int bfs_txflags; /* HAL (tx) descriptor flags */
244 int bfs_txrate0; /* first TX rate */
245 int bfs_try0; /* first try count */
247
248 uint16_t bfs_txflags; /* HAL (tx) descriptor flags */
249 uint8_t bfs_txrate0; /* first TX rate */
250 uint8_t bfs_try0; /* first try count */
251
252 uint16_t bfs_txpower; /* tx power */
246 uint8_t bfs_ctsrate0; /* Non-zero - use this as ctsrate */
253 uint8_t bfs_ctsrate0; /* Non-zero - use this as ctsrate */
247 int bfs_keyix; /* crypto key index */
248 int bfs_txpower; /* tx power */
249 int bfs_txantenna; /* TX antenna config */
254 uint8_t bfs_ctsrate; /* CTS rate */
255
256 /* 16 bit? */
257 int32_t bfs_keyix; /* crypto key index */
258 int32_t bfs_txantenna; /* TX antenna config */
259
260 /* Make this an 8 bit value? */
250 enum ieee80211_protmode bfs_protmode;
261 enum ieee80211_protmode bfs_protmode;
251 int bfs_ctsrate; /* CTS rate */
252 int bfs_ctsduration; /* CTS duration (pre-11n NICs) */
262
263 /* 16 bit? */
264 uint32_t bfs_ctsduration; /* CTS duration (pre-11n NICs) */
253 struct ath_rc_series bfs_rc[ATH_RC_NUM]; /* non-11n TX series */
254 } bf_state;
255};
256typedef TAILQ_HEAD(ath_bufhead_s, ath_buf) ath_bufhead;
257
258#define ATH_BUF_MGMT 0x00000001 /* (tx) desc is a mgmt desc */
259#define ATH_BUF_BUSY 0x00000002 /* (tx) desc owned by h/w */
260

--- 784 unchanged lines hidden ---
265 struct ath_rc_series bfs_rc[ATH_RC_NUM]; /* non-11n TX series */
266 } bf_state;
267};
268typedef TAILQ_HEAD(ath_bufhead_s, ath_buf) ath_bufhead;
269
270#define ATH_BUF_MGMT 0x00000001 /* (tx) desc is a mgmt desc */
271#define ATH_BUF_BUSY 0x00000002 /* (tx) desc owned by h/w */
272

--- 784 unchanged lines hidden ---