Deleted Added
sdiff udiff text old ( 241856 ) new ( 241885 )
full compact
if_lem.c (241856) if_lem.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_lem.c 241856 2012-10-22 03:41:14Z eadler $*/
33/*$FreeBSD: head/sys/dev/e1000/if_lem.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>

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

385lem_attach(device_t dev)
386{
387 struct adapter *adapter;
388 int tsize, rsize;
389 int error = 0;
390
391 INIT_DEBUGOUT("lem_attach: begin");
392
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>

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

385lem_attach(device_t dev)
386{
387 struct adapter *adapter;
388 int tsize, rsize;
389 int error = 0;
390
391 INIT_DEBUGOUT("lem_attach: begin");
392
393 if (resource_disabled("lem", device_get_unit(dev))) {
394 device_printf(dev, "Disabled by device hint\n");
395 return (ENXIO);
396 }
397
393 adapter = device_get_softc(dev);
394 adapter->dev = adapter->osdep.dev = dev;
395 EM_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
396 EM_TX_LOCK_INIT(adapter, device_get_nameunit(dev));
397 EM_RX_LOCK_INIT(adapter, device_get_nameunit(dev));
398
399 /* SYSCTL stuff */
400 SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),

--- 4247 unchanged lines hidden --- 		398 adapter = device_get_softc(dev);
399 adapter->dev = adapter->osdep.dev = dev;
400 EM_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
401 EM_TX_LOCK_INIT(adapter, device_get_nameunit(dev));
402 EM_RX_LOCK_INIT(adapter, device_get_nameunit(dev));
403
404 /* SYSCTL stuff */
405 SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),

--- 4247 unchanged lines hidden ---