Deleted Added
full compact
ieee80211_var.h (138568) ieee80211_var.h (139509)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2004 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:

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

24 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
25 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2004 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:

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

24 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
25 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/net80211/ieee80211_var.h 138568 2004-12-08 17:26:47Z sam $
32 * $FreeBSD: head/sys/net80211/ieee80211_var.h 139509 2004-12-31 20:56:32Z sam $
33 */
34#ifndef _NET80211_IEEE80211_VAR_H_
35#define _NET80211_IEEE80211_VAR_H_
36
37/*
38 * Definitions for IEEE 802.11 drivers.
39 */
40#define IEEE80211_DEBUG

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

277 ic->ic_crypto.cs_key_update_begin(ic);
278}
279static __inline void
280ieee80211_key_update_end(struct ieee80211com *ic)
281{
282 ic->ic_crypto.cs_key_update_end(ic);
283}
284
33 */
34#ifndef _NET80211_IEEE80211_VAR_H_
35#define _NET80211_IEEE80211_VAR_H_
36
37/*
38 * Definitions for IEEE 802.11 drivers.
39 */
40#define IEEE80211_DEBUG

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

277 ic->ic_crypto.cs_key_update_begin(ic);
278}
279static __inline void
280ieee80211_key_update_end(struct ieee80211com *ic)
281{
282 ic->ic_crypto.cs_key_update_end(ic);
283}
284
285/*
286 * XXX these need to be here for IEEE80211_F_DATAPAD
287 */
288
289/*
290 * Return the space occupied by the 802.11 header and any
291 * padding required by the driver. This works for a
292 * management or data frame.
293 */
294static __inline int
295ieee80211_hdrspace(struct ieee80211com *ic, const void *data)
296{
297 int size = ieee80211_hdrsize(data);
298 if (ic->ic_flags & IEEE80211_F_DATAPAD)
299 size = roundup(size, sizeof(u_int32_t));
300 return size;
301}
302
303/*
304 * Like ieee80211_hdrspace, but handles any type of frame.
305 */
306static __inline int
307ieee80211_anyhdrspace(struct ieee80211com *ic, const void *data)
308{
309 int size = ieee80211_anyhdrsize(data);
310 if (ic->ic_flags & IEEE80211_F_DATAPAD)
311 size = roundup(size, sizeof(u_int32_t));
312 return size;
313}
314
285#define IEEE80211_MSG_DEBUG 0x40000000 /* IFF_DEBUG equivalent */
286#define IEEE80211_MSG_DUMPPKTS 0x20000000 /* IFF_LINK2 equivalant */
287#define IEEE80211_MSG_CRYPTO 0x10000000 /* crypto work */
288#define IEEE80211_MSG_INPUT 0x08000000 /* input handling */
289#define IEEE80211_MSG_XRATE 0x04000000 /* rate set handling */
290#define IEEE80211_MSG_ELEMID 0x02000000 /* element id parsing */
291#define IEEE80211_MSG_NODE 0x01000000 /* node handling */
292#define IEEE80211_MSG_ASSOC 0x00800000 /* association handling */

--- 40 unchanged lines hidden ---
315#define IEEE80211_MSG_DEBUG 0x40000000 /* IFF_DEBUG equivalent */
316#define IEEE80211_MSG_DUMPPKTS 0x20000000 /* IFF_LINK2 equivalant */
317#define IEEE80211_MSG_CRYPTO 0x10000000 /* crypto work */
318#define IEEE80211_MSG_INPUT 0x08000000 /* input handling */
319#define IEEE80211_MSG_XRATE 0x04000000 /* rate set handling */
320#define IEEE80211_MSG_ELEMID 0x02000000 /* element id parsing */
321#define IEEE80211_MSG_NODE 0x01000000 /* node handling */
322#define IEEE80211_MSG_ASSOC 0x00800000 /* association handling */

--- 40 unchanged lines hidden ---