Deleted Added
full compact
if_igb.c (254262) if_igb.c (254263)
1/******************************************************************************
2
3 Copyright (c) 2001-2013, 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-2013, 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 254262 2013-08-12 22:54:38Z jfv $*/
33/*$FreeBSD: head/sys/dev/e1000/if_igb.c 254263 2013-08-12 23:30:01Z scottl $*/
34
35
36#include "opt_inet.h"
37#include "opt_inet6.h"
38
39#ifdef HAVE_KERNEL_OPTION_HEADERS
40#include "opt_device_polling.h"
41#include "opt_altq.h"

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

2405 *
2406 **********************************************************************/
2407static void
2408igb_identify_hardware(struct adapter *adapter)
2409{
2410 device_t dev = adapter->dev;
2411
2412 /* Make sure our PCI config space has the necessary stuff set */
34
35
36#include "opt_inet.h"
37#include "opt_inet6.h"
38
39#ifdef HAVE_KERNEL_OPTION_HEADERS
40#include "opt_device_polling.h"
41#include "opt_altq.h"

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

2405 *
2406 **********************************************************************/
2407static void
2408igb_identify_hardware(struct adapter *adapter)
2409{
2410 device_t dev = adapter->dev;
2411
2412 /* Make sure our PCI config space has the necessary stuff set */
2413 pci_enable_busmaster(dev);
2413 adapter->hw.bus.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2);
2414 adapter->hw.bus.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2);
2414 if (!((adapter->hw.bus.pci_cmd_word & PCIM_CMD_BUSMASTEREN) &&
2415 (adapter->hw.bus.pci_cmd_word & PCIM_CMD_MEMEN))) {
2416 INIT_DEBUGOUT("Memory Access and/or Bus Master "
2417 "bits were not set!\n");
2418 adapter->hw.bus.pci_cmd_word |=
2419 (PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN);
2420 pci_write_config(dev, PCIR_COMMAND,
2421 adapter->hw.bus.pci_cmd_word, 2);
2422 }
2423
2424 /* Save off the information about this board */
2425 adapter->hw.vendor_id = pci_get_vendor(dev);
2426 adapter->hw.device_id = pci_get_device(dev);
2427 adapter->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1);
2428 adapter->hw.subsystem_vendor_id =
2429 pci_read_config(dev, PCIR_SUBVEND_0, 2);
2430 adapter->hw.subsystem_device_id =

--- 3631 unchanged lines hidden ---
2415
2416 /* Save off the information about this board */
2417 adapter->hw.vendor_id = pci_get_vendor(dev);
2418 adapter->hw.device_id = pci_get_device(dev);
2419 adapter->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1);
2420 adapter->hw.subsystem_vendor_id =
2421 pci_read_config(dev, PCIR_SUBVEND_0, 2);
2422 adapter->hw.subsystem_device_id =

--- 3631 unchanged lines hidden ---