Deleted Added
full compact
if_em.h (205884) if_em.h (206001)
1/******************************************************************************
2
3 Copyright (c) 2001-2010, 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-2010, 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 205884 2010-03-30 17:05:24Z jfv $*/
33/*$FreeBSD: head/sys/dev/e1000/if_em.h 206001 2010-03-31 20:43:24Z marius $*/
34
35
36#ifndef _EM_H_DEFINED_
37#define _EM_H_DEFINED_
38
39
40/* Tunables */
41

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

332/* Our adapter structure */
333struct adapter {
334 struct ifnet *ifp;
335 struct e1000_hw hw;
336
337 /* FreeBSD operating-system-specific structures. */
338 struct e1000_osdep osdep;
339 struct device *dev;
34
35
36#ifndef _EM_H_DEFINED_
37#define _EM_H_DEFINED_
38
39
40/* Tunables */
41

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

332/* Our adapter structure */
333struct adapter {
334 struct ifnet *ifp;
335 struct e1000_hw hw;
336
337 /* FreeBSD operating-system-specific structures. */
338 struct e1000_osdep osdep;
339 struct device *dev;
340 struct cdev *led_dev;
340
341 struct resource *memory;
342 struct resource *flash;
343 struct resource *msix_mem;
344
345 struct resource *res;
346 void *tag;
347 u32 linkvec;

--- 109 unchanged lines hidden ---
341
342 struct resource *memory;
343 struct resource *flash;
344 struct resource *msix_mem;
345
346 struct resource *res;
347 void *tag;
348 u32 linkvec;

--- 109 unchanged lines hidden ---