Deleted Added
full compact
if_iwnvar.h (284588) if_iwnvar.h (286410)
1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 284588 2015-06-19 01:44:17Z adrian $ */
1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 286410 2015-08-07 11:43:14Z glebius $ */
2/* $OpenBSD: if_iwnvar.h,v 1.18 2010/04/30 16:06:46 damien Exp $ */
3
4/*-
5 * Copyright (c) 2013 Cedric GROSS <cg@cgross.info>
6 * Copyright (c) 2011 Intel Corporation
7 * Copyright (c) 2007, 2008
8 * Damien Bergamini <damien.bergamini@free.fr>
9 * Copyright (c) 2008 Sam Leffler, Errno Consulting

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

223struct iwn_vap {
224 struct ieee80211vap iv_vap;
225 uint8_t iv_ridx;
226
227 int (*iv_newstate)(struct ieee80211vap *,
228 enum ieee80211_state, int);
229 int ctx;
230 int beacon_int;
2/* $OpenBSD: if_iwnvar.h,v 1.18 2010/04/30 16:06:46 damien Exp $ */
3
4/*-
5 * Copyright (c) 2013 Cedric GROSS <cg@cgross.info>
6 * Copyright (c) 2011 Intel Corporation
7 * Copyright (c) 2007, 2008
8 * Damien Bergamini <damien.bergamini@free.fr>
9 * Copyright (c) 2008 Sam Leffler, Errno Consulting

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

223struct iwn_vap {
224 struct ieee80211vap iv_vap;
225 uint8_t iv_ridx;
226
227 int (*iv_newstate)(struct ieee80211vap *,
228 enum ieee80211_state, int);
229 int ctx;
230 int beacon_int;
231 uint8_t macaddr[IEEE80211_ADDR_LEN];
232
233};
234#define IWN_VAP(_vap) ((struct iwn_vap *)(_vap))
235
236struct iwn_softc {
237 device_t sc_dev;
231
232};
233#define IWN_VAP(_vap) ((struct iwn_vap *)(_vap))
234
235struct iwn_softc {
236 device_t sc_dev;
238
239 struct ifnet *sc_ifp;
240 int sc_debug;
237 int sc_debug;
241
242 struct mtx sc_mtx;
238 struct mtx sc_mtx;
239 struct ieee80211com sc_ic;
240 struct mbufq sc_snd;
243
244 u_int sc_flags;
245#define IWN_FLAG_HAS_OTPROM (1 << 1)
246#define IWN_FLAG_CALIB_DONE (1 << 2)
247#define IWN_FLAG_USE_ICT (1 << 3)
248#define IWN_FLAG_INTERNAL_PA (1 << 4)
249#define IWN_FLAG_HAS_11N (1 << 6)
250#define IWN_FLAG_ENH_SENS (1 << 7)
251#define IWN_FLAG_ADV_BTCOEX (1 << 8)
252#define IWN_FLAG_PAN_SUPPORT (1 << 9)
253#define IWN_FLAG_BTCOEX (1 << 10)
241
242 u_int sc_flags;
243#define IWN_FLAG_HAS_OTPROM (1 << 1)
244#define IWN_FLAG_CALIB_DONE (1 << 2)
245#define IWN_FLAG_USE_ICT (1 << 3)
246#define IWN_FLAG_INTERNAL_PA (1 << 4)
247#define IWN_FLAG_HAS_11N (1 << 6)
248#define IWN_FLAG_ENH_SENS (1 << 7)
249#define IWN_FLAG_ADV_BTCOEX (1 << 8)
250#define IWN_FLAG_PAN_SUPPORT (1 << 9)
251#define IWN_FLAG_BTCOEX (1 << 10)
252#define IWN_FLAG_RUNNING (1 << 11)
254
255 uint8_t hw_type;
256 /* subdevice_id used to adjust configuration */
257 uint16_t subdevice_id;
258
259 struct iwn_ops ops;
260 const char *fwname;
261 const struct iwn_sensitivity_limits

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

315 struct taskqueue *sc_tq;
316
317 /* Calibration information */
318 struct callout calib_to;
319 int calib_cnt;
320 struct iwn_calib_state calib;
321 int last_calib_ticks;
322 struct callout watchdog_to;
253
254 uint8_t hw_type;
255 /* subdevice_id used to adjust configuration */
256 uint16_t subdevice_id;
257
258 struct iwn_ops ops;
259 const char *fwname;
260 const struct iwn_sensitivity_limits

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

314 struct taskqueue *sc_tq;
315
316 /* Calibration information */
317 struct callout calib_to;
318 int calib_cnt;
319 struct iwn_calib_state calib;
320 int last_calib_ticks;
321 struct callout watchdog_to;
323 struct callout ct_kill_exit_to;
324 struct iwn_fw_info fw;
325 struct iwn_calib_info calibcmd[IWN5000_PHY_CALIB_MAX_RESULT];
326 uint32_t errptr;
327
328 struct iwn_rx_stat last_rx_stat;
329 int last_rx_valid;
330 struct iwn_ucode_info ucode_info;
331 struct iwn_rxon rx_on[IWN_NUM_RXON_CTX];

--- 108 unchanged lines hidden ---
322 struct iwn_fw_info fw;
323 struct iwn_calib_info calibcmd[IWN5000_PHY_CALIB_MAX_RESULT];
324 uint32_t errptr;
325
326 struct iwn_rx_stat last_rx_stat;
327 int last_rx_valid;
328 struct iwn_ucode_info ucode_info;
329 struct iwn_rxon rx_on[IWN_NUM_RXON_CTX];

--- 108 unchanged lines hidden ---