Deleted Added
full compact
if_lem.c (212902) if_lem.c (213234)
1/******************************************************************************
2
3 Copyright (c) 2001-2010, 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-2010, 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 212902 2010-09-20 16:04:44Z jhb $*/
33/*$FreeBSD: head/sys/dev/e1000/if_lem.c 213234 2010-09-28 00:13:15Z jfv $*/
34
35#ifdef HAVE_KERNEL_OPTION_HEADERS
36#include "opt_device_polling.h"
37#include "opt_inet.h"
38#endif
39
40#include <sys/param.h>
41#include <sys/systm.h>

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

81#include <dev/pci/pcireg.h>
82
83#include "e1000_api.h"
84#include "if_lem.h"
85
86/*********************************************************************
87 * Legacy Em Driver version:
88 *********************************************************************/
34
35#ifdef HAVE_KERNEL_OPTION_HEADERS
36#include "opt_device_polling.h"
37#include "opt_inet.h"
38#endif
39
40#include <sys/param.h>
41#include <sys/systm.h>

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

81#include <dev/pci/pcireg.h>
82
83#include "e1000_api.h"
84#include "if_lem.h"
85
86/*********************************************************************
87 * Legacy Em Driver version:
88 *********************************************************************/
89char lem_driver_version[] = "1.0.1";
89char lem_driver_version[] = "1.0.2";
90
91
92/*********************************************************************
93 * PCI Device ID Table
94 *
95 * Used by probe to select devices to load on
96 * Last field stores an index into e1000_strings
97 * Last entry must be all 0s

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

1748 ctxd->lower.data |=
1749 htole32(E1000_TXD_CMD_EOP | E1000_TXD_CMD_RS);
1750 /*
1751 * Keep track in the first buffer which
1752 * descriptor will be written back
1753 */
1754 tx_buffer = &adapter->tx_buffer_area[first];
1755 tx_buffer->next_eop = last;
90
91
92/*********************************************************************
93 * PCI Device ID Table
94 *
95 * Used by probe to select devices to load on
96 * Last field stores an index into e1000_strings
97 * Last entry must be all 0s

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

1748 ctxd->lower.data |=
1749 htole32(E1000_TXD_CMD_EOP | E1000_TXD_CMD_RS);
1750 /*
1751 * Keep track in the first buffer which
1752 * descriptor will be written back
1753 */
1754 tx_buffer = &adapter->tx_buffer_area[first];
1755 tx_buffer->next_eop = last;
1756 adapter->watchdog_time = ticks;
1756
1757 /*
1758 * Advance the Transmit Descriptor Tail (TDT), this tells the E1000
1759 * that this frame is available to transmit.
1760 */
1761 bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map,
1762 BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
1763 if (adapter->hw.mac.type == e1000_82547 &&

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

2005
2006static void
2007lem_local_timer(void *arg)
2008{
2009 struct adapter *adapter = arg;
2010
2011 EM_CORE_LOCK_ASSERT(adapter);
2012
1757
1758 /*
1759 * Advance the Transmit Descriptor Tail (TDT), this tells the E1000
1760 * that this frame is available to transmit.
1761 */
1762 bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map,
1763 BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
1764 if (adapter->hw.mac.type == e1000_82547 &&

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

2006
2007static void
2008lem_local_timer(void *arg)
2009{
2010 struct adapter *adapter = arg;
2011
2012 EM_CORE_LOCK_ASSERT(adapter);
2013
2013 taskqueue_enqueue(adapter->tq,
2014 &adapter->rxtx_task);
2015 lem_update_link_status(adapter);
2016 lem_update_stats_counters(adapter);
2017
2018 lem_smartspeed(adapter);
2019
2020 /*
2021 * We check the watchdog: the time since
2022 * the last TX descriptor was cleaned.

--- 2655 unchanged lines hidden ---
2014 lem_update_link_status(adapter);
2015 lem_update_stats_counters(adapter);
2016
2017 lem_smartspeed(adapter);
2018
2019 /*
2020 * We check the watchdog: the time since
2021 * the last TX descriptor was cleaned.

--- 2655 unchanged lines hidden ---