Deleted Added
full compact
if_em.h (194865) if_em.h (200243)
1/******************************************************************************
2
3 Copyright (c) 2001-2009, Intel Corporation
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 are met:
8

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

25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 POSSIBILITY OF SUCH DAMAGE.
31
32******************************************************************************/
1/******************************************************************************
2
3 Copyright (c) 2001-2009, Intel Corporation
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 are met:
8

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

25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 POSSIBILITY OF SUCH DAMAGE.
31
32******************************************************************************/
33/*$FreeBSD: head/sys/dev/e1000/if_em.h 194865 2009-06-24 17:41:29Z jfv $*/
33/*$FreeBSD: head/sys/dev/e1000/if_em.h 200243 2009-12-08 01:07:44Z jfv $*/
34
35
36#ifndef _EM_H_DEFINED_
37#define _EM_H_DEFINED_
38
39
40/* Tunables */
41

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

130 * this value ensures that an interrupt is generated after the initial
131 * packet is received within the set amount of time. Proper tuning,
132 * along with EM_RDTR, may improve traffic throughput in specific network
133 * conditions.
134 */
135#define EM_RADV 64
136
137/*
34
35
36#ifndef _EM_H_DEFINED_
37#define _EM_H_DEFINED_
38
39
40/* Tunables */
41

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

130 * this value ensures that an interrupt is generated after the initial
131 * packet is received within the set amount of time. Proper tuning,
132 * along with EM_RDTR, may improve traffic throughput in specific network
133 * conditions.
134 */
135#define EM_RADV 64
136
137/*
138 * This parameter controls the duration of transmit watchdog timer.
138 * This parameter controls the max duration of transmit watchdog.
139 */
139 */
140#define EM_TX_TIMEOUT 5
140#define EM_WATCHDOG (5 * hz)
141
142/*
143 * This parameter controls when the driver calls the routine to reclaim
144 * transmit descriptors.
145 */
146#define EM_TX_CLEANUP_THRESHOLD (adapter->num_tx_desc / 8)
147#define EM_TX_OP_THRESHOLD (adapter->num_tx_desc / 32)
148

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

184#define EM_SMARTSPEED_MAX 15
185#define EM_MAX_INTR 10
186
187#define MAX_NUM_MULTICAST_ADDRESSES 128
188#define PCI_ANY_ID (~0U)
189#define ETHER_ALIGN 2
190#define EM_FC_PAUSE_TIME 0x0680
191#define EM_EEPROM_APME 0x400;
141
142/*
143 * This parameter controls when the driver calls the routine to reclaim
144 * transmit descriptors.
145 */
146#define EM_TX_CLEANUP_THRESHOLD (adapter->num_tx_desc / 8)
147#define EM_TX_OP_THRESHOLD (adapter->num_tx_desc / 32)
148

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

184#define EM_SMARTSPEED_MAX 15
185#define EM_MAX_INTR 10
186
187#define MAX_NUM_MULTICAST_ADDRESSES 128
188#define PCI_ANY_ID (~0U)
189#define ETHER_ALIGN 2
190#define EM_FC_PAUSE_TIME 0x0680
191#define EM_EEPROM_APME 0x400;
192#define EM_82544_APME 0x0004;
192
193/* Code compatilbility between 6 and 7 */
194#ifndef ETHER_BPF_MTAP
195#define ETHER_BPF_MTAP BPF_MTAP
196#endif
197
198/*
199 * TDBA/RDBA should be aligned on 16 byte boundary. But TDLEN/RDLEN should be

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

303 /* 82574 may use 3 int vectors */
304 struct resource *res[3];
305 void *tag[3];
306 int rid[3];
307
308 struct ifmedia media;
309 struct callout timer;
310 struct callout tx_fifo_timer;
193
194/* Code compatilbility between 6 and 7 */
195#ifndef ETHER_BPF_MTAP
196#define ETHER_BPF_MTAP BPF_MTAP
197#endif
198
199/*
200 * TDBA/RDBA should be aligned on 16 byte boundary. But TDLEN/RDLEN should be

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

304 /* 82574 may use 3 int vectors */
305 struct resource *res[3];
306 void *tag[3];
307 int rid[3];
308
309 struct ifmedia media;
310 struct callout timer;
311 struct callout tx_fifo_timer;
311 int watchdog_timer;
312 bool watchdog_check;
313 int watchdog_time;
312 int msi;
313 int if_flags;
314 int max_frame_size;
315 int min_frame_size;
316 struct mtx core_mtx;
317 struct mtx tx_mtx;
318 struct mtx rx_mtx;
319 int em_insert_vlan_header;

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

327
328#if __FreeBSD_version >= 700029
329 eventhandler_tag vlan_attach;
330 eventhandler_tag vlan_detach;
331 u32 num_vlans;
332#endif
333
334 /* Management and WOL features */
314 int msi;
315 int if_flags;
316 int max_frame_size;
317 int min_frame_size;
318 struct mtx core_mtx;
319 struct mtx tx_mtx;
320 struct mtx rx_mtx;
321 int em_insert_vlan_header;

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

329
330#if __FreeBSD_version >= 700029
331 eventhandler_tag vlan_attach;
332 eventhandler_tag vlan_detach;
333 u32 num_vlans;
334#endif
335
336 /* Management and WOL features */
335 int wol;
336 int has_manage;
337 u32 wol;
338 bool has_manage;
339 bool has_amt;
337
338 /* Info about the board itself */
339 uint8_t link_active;
340 uint16_t link_speed;
341 uint16_t link_duplex;
342 uint32_t smartspeed;
343 struct em_int_delay_info tx_int_delay;
344 struct em_int_delay_info tx_abs_int_delay;

--- 133 unchanged lines hidden ---
340
341 /* Info about the board itself */
342 uint8_t link_active;
343 uint16_t link_speed;
344 uint16_t link_duplex;
345 uint32_t smartspeed;
346 struct em_int_delay_info tx_int_delay;
347 struct em_int_delay_info tx_abs_int_delay;

--- 133 unchanged lines hidden ---