Deleted Added
full compact
if_iwivar.h (286437) if_iwivar.h (287197)
1/* $FreeBSD: head/sys/dev/iwi/if_iwivar.h 286437 2015-08-08 01:10:17Z adrian $ */
1/* $FreeBSD: head/sys/dev/iwi/if_iwivar.h 287197 2015-08-27 08:56:39Z glebius $ */
2
3/*-
4 * Copyright (c) 2004, 2005
5 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

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

120 struct ieee80211vap iwi_vap;
121
122 int (*iwi_newstate)(struct ieee80211vap *,
123 enum ieee80211_state, int);
124};
125#define IWI_VAP(vap) ((struct iwi_vap *)(vap))
126
127struct iwi_softc {
2
3/*-
4 * Copyright (c) 2004, 2005
5 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

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

120 struct ieee80211vap iwi_vap;
121
122 int (*iwi_newstate)(struct ieee80211vap *,
123 enum ieee80211_state, int);
124};
125#define IWI_VAP(vap) ((struct iwi_vap *)(vap))
126
127struct iwi_softc {
128 struct ifnet *sc_ifp;
129 void (*sc_node_free)(struct ieee80211_node *);
128 struct mtx sc_mtx;
129 struct ieee80211com sc_ic;
130 struct mbufq sc_snd;
130 device_t sc_dev;
131
131 device_t sc_dev;
132
132 struct mtx sc_mtx;
133 void (*sc_node_free)(struct ieee80211_node *);
134
133 uint8_t sc_mcast[IEEE80211_ADDR_LEN];
134 struct unrhdr *sc_unr;
135
136 uint32_t flags;
137#define IWI_FLAG_FW_INITED (1 << 0)
138#define IWI_FLAG_BUSY (1 << 3) /* busy sending a command */
139#define IWI_FLAG_ASSOCIATED (1 << 4) /* currently associated */
140#define IWI_FLAG_CHANNEL_SCAN (1 << 5)

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

188
189 struct task sc_radiontask; /* radio on processing */
190 struct task sc_radiofftask; /* radio off processing */
191 struct task sc_restarttask; /* restart adapter processing */
192 struct task sc_disassoctask;
193 struct task sc_wmetask; /* set wme parameters */
194 struct task sc_monitortask;
195
135 uint8_t sc_mcast[IEEE80211_ADDR_LEN];
136 struct unrhdr *sc_unr;
137
138 uint32_t flags;
139#define IWI_FLAG_FW_INITED (1 << 0)
140#define IWI_FLAG_BUSY (1 << 3) /* busy sending a command */
141#define IWI_FLAG_ASSOCIATED (1 << 4) /* currently associated */
142#define IWI_FLAG_CHANNEL_SCAN (1 << 5)

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

190
191 struct task sc_radiontask; /* radio on processing */
192 struct task sc_radiofftask; /* radio off processing */
193 struct task sc_restarttask; /* restart adapter processing */
194 struct task sc_disassoctask;
195 struct task sc_wmetask; /* set wme parameters */
196 struct task sc_monitortask;
197
196 unsigned int sc_softled : 1, /* enable LED gpio status */
198 unsigned int sc_running : 1, /* initialized */
199 sc_softled : 1, /* enable LED gpio status */
197 sc_ledstate: 1, /* LED on/off state */
198 sc_blinking: 1; /* LED blink operation active */
199 u_int sc_nictype; /* NIC type from EEPROM */
200 u_int sc_ledpin; /* mask for activity LED */
201 u_int sc_ledidle; /* idle polling interval */
202 int sc_ledevent; /* time of last LED event */
203 u_int8_t sc_rxrate; /* current rx rate for LED */
204 u_int8_t sc_rxrix;

--- 54 unchanged lines hidden ---
200 sc_ledstate: 1, /* LED on/off state */
201 sc_blinking: 1; /* LED blink operation active */
202 u_int sc_nictype; /* NIC type from EEPROM */
203 u_int sc_ledpin; /* mask for activity LED */
204 u_int sc_ledidle; /* idle polling interval */
205 int sc_ledevent; /* time of last LED event */
206 u_int8_t sc_rxrate; /* current rx rate for LED */
207 u_int8_t sc_rxrix;

--- 54 unchanged lines hidden ---