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

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

467em_attach(device_t dev)
468{
469 struct adapter *adapter;
470 struct e1000_hw *hw;
471 int error = 0;
472
473 INIT_DEBUGOUT("em_attach: begin");
474
34
35#ifdef HAVE_KERNEL_OPTION_HEADERS
36#include "opt_device_polling.h"
37#include "opt_inet.h"
38#include "opt_inet6.h"
39#endif
40
41#include <sys/param.h>

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

467em_attach(device_t dev)
468{
469 struct adapter *adapter;
470 struct e1000_hw *hw;
471 int error = 0;
472
473 INIT_DEBUGOUT("em_attach: begin");
474
475 if (resource_disabled("em", device_get_unit(dev))) {
476 device_printf(dev, "Disabled by device hint\n");
477 return (ENXIO);
478 }
479
475 adapter = device_get_softc(dev);
476 adapter->dev = adapter->osdep.dev = dev;
477 hw = &adapter->hw;
478 EM_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
479
480 /* SYSCTL stuff */
481 SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
482 SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),

--- 5298 unchanged lines hidden --- 		480 adapter = device_get_softc(dev);
481 adapter->dev = adapter->osdep.dev = dev;
482 hw = &adapter->hw;
483 EM_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
484
485 /* SYSCTL stuff */
486 SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
487 SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),

--- 5298 unchanged lines hidden ---