Deleted Added
full compact
if_lem.c (259907) if_lem.c (260368)
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 259907 2013-12-26 05:22:38Z luigi $*/
33/*$FreeBSD: head/sys/dev/e1000/if_lem.c 260368 2014-01-06 12:53:15Z luigi $*/
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#ifdef HAVE_KERNEL_OPTION_HEADERS
39#include "opt_device_polling.h"
40#endif
41

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

3362 * Setup the HW Rx Head and
3363 * Tail Descriptor Pointers
3364 */
3365 E1000_WRITE_REG(&adapter->hw, E1000_RDH(0), 0);
3366 rctl = adapter->num_rx_desc - 1; /* default RDT value */
3367#ifdef DEV_NETMAP
3368 /* preserve buffers already made available to clients */
3369 if (ifp->if_capenable & IFCAP_NETMAP)
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#ifdef HAVE_KERNEL_OPTION_HEADERS
39#include "opt_device_polling.h"
40#endif
41

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

3362 * Setup the HW Rx Head and
3363 * Tail Descriptor Pointers
3364 */
3365 E1000_WRITE_REG(&adapter->hw, E1000_RDH(0), 0);
3366 rctl = adapter->num_rx_desc - 1; /* default RDT value */
3367#ifdef DEV_NETMAP
3368 /* preserve buffers already made available to clients */
3369 if (ifp->if_capenable & IFCAP_NETMAP)
3370 rctl -= NA(adapter->ifp)->rx_rings[0].nr_hwavail;
3370 rctl -= nm_kr_rxspace(&NA(adapter->ifp)->rx_rings[0]);
3371#endif /* DEV_NETMAP */
3372 E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), rctl);
3373
3374 return;
3375}
3376
3377/*********************************************************************
3378 *

--- 1283 unchanged lines hidden ---
3371#endif /* DEV_NETMAP */
3372 E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), rctl);
3373
3374 return;
3375}
3376
3377/*********************************************************************
3378 *

--- 1283 unchanged lines hidden ---