Deleted Added
full compact
ieee80211_var.h (121176) ieee80211_var.h (121180)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002, 2003 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, 2003 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 121176 2003-10-17 21:56:42Z sam $
32 * $FreeBSD: head/sys/net80211/ieee80211_var.h 121180 2003-10-17 23:15:30Z 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
41#include <net80211/ieee80211.h>
42#include <net80211/ieee80211_crypto.h>
33 */
34#ifndef _NET80211_IEEE80211_VAR_H_
35#define _NET80211_IEEE80211_VAR_H_
36
37/*
38 * Definitions for IEEE 802.11 drivers.
39 */
40
41#include <net80211/ieee80211.h>
42#include <net80211/ieee80211_crypto.h>
43#include <net80211/ieee80211_ioctl.h> /* for ieee80211_stats */
43#include <net80211/ieee80211_node.h>
44#include <net80211/ieee80211_proto.h>
45
46#define IEEE80211_CHAN_MAX 255
47#define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */
48#define IEEE80211_CHAN_ANYC \
49 ((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
50

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

188 int ic_des_esslen;
189 u_int8_t ic_des_essid[IEEE80211_NWID_LEN];
190 struct ieee80211_channel *ic_des_chan; /* desired channel */
191 u_int8_t ic_des_bssid[IEEE80211_ADDR_LEN];
192 struct ieee80211_wepkey ic_nw_keys[IEEE80211_WEP_NKID];
193 int ic_wep_txkey; /* default tx key index */
194 void *ic_wep_ctx; /* wep crypt context */
195 u_int32_t ic_iv; /* initial vector for wep */
44#include <net80211/ieee80211_node.h>
45#include <net80211/ieee80211_proto.h>
46
47#define IEEE80211_CHAN_MAX 255
48#define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */
49#define IEEE80211_CHAN_ANYC \
50 ((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
51

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

189 int ic_des_esslen;
190 u_int8_t ic_des_essid[IEEE80211_NWID_LEN];
191 struct ieee80211_channel *ic_des_chan; /* desired channel */
192 u_int8_t ic_des_bssid[IEEE80211_ADDR_LEN];
193 struct ieee80211_wepkey ic_nw_keys[IEEE80211_WEP_NKID];
194 int ic_wep_txkey; /* default tx key index */
195 void *ic_wep_ctx; /* wep crypt context */
196 u_int32_t ic_iv; /* initial vector for wep */
197 struct ieee80211_stats ic_stats; /* statistics */
196};
197#define ic_if ic_ac.ac_if
198#define ic_softc ic_if.if_softc
199
200#define IEEE80211_ADDR_EQ(a1,a2) (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0)
201#define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN)
202
203/* ic_flags */

--- 66 unchanged lines hidden ---
198};
199#define ic_if ic_ac.ac_if
200#define ic_softc ic_if.if_softc
201
202#define IEEE80211_ADDR_EQ(a1,a2) (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0)
203#define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN)
204
205/* ic_flags */

--- 66 unchanged lines hidden ---