Deleted Added
full compact
if_igb.c (241856) if_igb.c (241885)
1/******************************************************************************
2
3 Copyright (c) 2001-2012, 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-2012, 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_igb.c 241856 2012-10-22 03:41:14Z eadler $*/
33/*$FreeBSD: head/sys/dev/e1000/if_igb.c 241885 2012-10-22 13:06:09Z eadler $*/
34
35
36#ifdef HAVE_KERNEL_OPTION_HEADERS
37#include "opt_device_polling.h"
38#include "opt_inet.h"
39#include "opt_inet6.h"
40#include "opt_altq.h"
41#endif

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

455igb_attach(device_t dev)
456{
457 struct adapter *adapter;
458 int error = 0;
459 u16 eeprom_data;
460
461 INIT_DEBUGOUT("igb_attach: begin");
462
34
35
36#ifdef HAVE_KERNEL_OPTION_HEADERS
37#include "opt_device_polling.h"
38#include "opt_inet.h"
39#include "opt_inet6.h"
40#include "opt_altq.h"
41#endif

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

455igb_attach(device_t dev)
456{
457 struct adapter *adapter;
458 int error = 0;
459 u16 eeprom_data;
460
461 INIT_DEBUGOUT("igb_attach: begin");
462
463 if (resource_disabled("igb", device_get_unit(dev))) {
464 device_printf(dev, "Disabled by device hint\n");
465 return (ENXIO);
466 }
467
463 adapter = device_get_softc(dev);
464 adapter->dev = adapter->osdep.dev = dev;
465 IGB_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
466
467 /* SYSCTL stuff */
468 SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
469 SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
470 OID_AUTO, "nvm", CTLTYPE_INT|CTLFLAG_RW, adapter, 0,

--- 5548 unchanged lines hidden ---
468 adapter = device_get_softc(dev);
469 adapter->dev = adapter->osdep.dev = dev;
470 IGB_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
471
472 /* SYSCTL stuff */
473 SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
474 SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
475 OID_AUTO, "nvm", CTLTYPE_INT|CTLFLAG_RW, adapter, 0,

--- 5548 unchanged lines hidden ---