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

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

396 struct adapter *adapter;
397 struct ixgbe_hw *hw;
398 int error = 0;
399 u16 csum;
400 u32 ctrl_ext;
401
402 INIT_DEBUGOUT("ixgbe_attach: begin");
403
34
35#ifdef HAVE_KERNEL_OPTION_HEADERS
36#include "opt_inet.h"
37#include "opt_inet6.h"
38#endif
39
40#include "ixgbe.h"
41

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

396 struct adapter *adapter;
397 struct ixgbe_hw *hw;
398 int error = 0;
399 u16 csum;
400 u32 ctrl_ext;
401
402 INIT_DEBUGOUT("ixgbe_attach: begin");
403
404 if (resource_disabled("ixgbe", device_get_unit(dev))) {
405 device_printf(dev, "Disabled by device hint\n");
406 return (ENXIO);
407 }
408
404 /* Allocate, clear, and link in our adapter structure */
405 adapter = device_get_softc(dev);
406 adapter->dev = adapter->osdep.dev = dev;
407 hw = &adapter->hw;
408
409 /* Core Lock Init*/
410 IXGBE_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
411

--- 5428 unchanged lines hidden ---
409 /* Allocate, clear, and link in our adapter structure */
410 adapter = device_get_softc(dev);
411 adapter->dev = adapter->osdep.dev = dev;
412 hw = &adapter->hw;
413
414 /* Core Lock Init*/
415 IXGBE_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
416

--- 5428 unchanged lines hidden ---