Deleted Added
full compact
if_wpivar.h (282400) if_wpivar.h (282401)
1/* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 282400 2015-05-03 23:39:02Z adrian $ */
1/* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 282401 2015-05-03 23:39:44Z adrian $ */
2
3/*-
4 * Copyright (c) 2006,2007
5 * Damien Bergamini <damien.bergamini@free.fr>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.

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

116 struct ieee80211_node *ni;
117 struct mbuf *m;
118 size_t size;
119 int code;
120 int ac;
121};
122
123struct wpi_vap {
2
3/*-
4 * Copyright (c) 2006,2007
5 * Damien Bergamini <damien.bergamini@free.fr>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.

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

116 struct ieee80211_node *ni;
117 struct mbuf *m;
118 size_t size;
119 int code;
120 int ac;
121};
122
123struct wpi_vap {
124 struct ieee80211vap wv_vap;
124 struct ieee80211vap wv_vap;
125
125
126 struct wpi_buf wv_bcbuf;
127 struct ieee80211_beacon_offsets wv_boff;
128 struct mtx wv_mtx;
126 struct wpi_buf wv_bcbuf;
127 struct ieee80211_beacon_offsets wv_boff;
128 struct mtx wv_mtx;
129
129
130 uint32_t wv_gtk;
131#define WPI_VAP_KEY(kid) (1 << kid)
130 uint32_t wv_gtk;
131#define WPI_VAP_KEY(kid) (1 << kid)
132
132
133 int (*wv_newstate)(struct ieee80211vap *,
134 enum ieee80211_state, int);
133 int (*wv_newstate)(struct ieee80211vap *,
134 enum ieee80211_state, int);
135 void (*wv_recv_mgmt)(struct ieee80211_node *,
136 struct mbuf *, int, int, int);
135};
136#define WPI_VAP(vap) ((struct wpi_vap *)(vap))
137
138#define WPI_VAP_LOCK_INIT(_wvp) \
139 mtx_init(&(_wvp)->wv_mtx, "lock for wv_bcbuf/wv_boff structures", \
140 NULL, MTX_DEF)
141#define WPI_VAP_LOCK(_wvp) mtx_lock(&(_wvp)->wv_mtx)
142#define WPI_VAP_UNLOCK(_wvp) mtx_unlock(&(_wvp)->wv_mtx)

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

175 struct wpi_shared *shared;
176
177 struct wpi_tx_ring txq[WPI_NTXQUEUES];
178 struct mtx txq_mtx;
179 struct mtx txq_state_mtx;
180 uint32_t txq_active;
181
182 struct wpi_rx_ring rxq;
137};
138#define WPI_VAP(vap) ((struct wpi_vap *)(vap))
139
140#define WPI_VAP_LOCK_INIT(_wvp) \
141 mtx_init(&(_wvp)->wv_mtx, "lock for wv_bcbuf/wv_boff structures", \
142 NULL, MTX_DEF)
143#define WPI_VAP_LOCK(_wvp) mtx_lock(&(_wvp)->wv_mtx)
144#define WPI_VAP_UNLOCK(_wvp) mtx_unlock(&(_wvp)->wv_mtx)

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

177 struct wpi_shared *shared;
178
179 struct wpi_tx_ring txq[WPI_NTXQUEUES];
180 struct mtx txq_mtx;
181 struct mtx txq_state_mtx;
182 uint32_t txq_active;
183
184 struct wpi_rx_ring rxq;
185 uint64_t rx_tstamp;
183
184 /* TX Thermal Callibration. */
185 struct callout calib_to;
186 int calib_cnt;
187
188 struct callout scan_timeout;
189 struct callout tx_timeout;
190

--- 106 unchanged lines hidden ---
186
187 /* TX Thermal Callibration. */
188 struct callout calib_to;
189 int calib_cnt;
190
191 struct callout scan_timeout;
192 struct callout tx_timeout;
193

--- 106 unchanged lines hidden ---