| if_igb.c (269009) | if_igb.c (270063) |
|---|---|
| 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 269009 2014-07-23 05:40:28Z adrian $*/ | 33/*$FreeBSD: head/sys/dev/e1000/if_igb.c 270063 2014-08-16 15:00:01Z luigi $*/ |
| 34 35 36#include "opt_inet.h" 37#include "opt_inet6.h" 38#include "opt_rss.h" 39 40#ifdef HAVE_KERNEL_OPTION_HEADERS 41#include "opt_device_polling.h" --- 3582 unchanged lines hidden (view full) --- 3624 bus_dmamap_unload(txr->txtag, txbuf->map); 3625 m_freem(txbuf->m_head); 3626 txbuf->m_head = NULL; 3627 } 3628#ifdef DEV_NETMAP 3629 if (slot) { 3630 int si = netmap_idx_n2k(&na->tx_rings[txr->me], i); 3631 /* no need to set the address */ | 34 35 36#include "opt_inet.h" 37#include "opt_inet6.h" 38#include "opt_rss.h" 39 40#ifdef HAVE_KERNEL_OPTION_HEADERS 41#include "opt_device_polling.h" --- 3582 unchanged lines hidden (view full) --- 3624 bus_dmamap_unload(txr->txtag, txbuf->map); 3625 m_freem(txbuf->m_head); 3626 txbuf->m_head = NULL; 3627 } 3628#ifdef DEV_NETMAP 3629 if (slot) { 3630 int si = netmap_idx_n2k(&na->tx_rings[txr->me], i); 3631 /* no need to set the address */ |
| 3632 netmap_load_map(txr->txtag, txbuf->map, NMB(slot + si)); | 3632 netmap_load_map(na, txr->txtag, txbuf->map, NMB(na, slot + si)); |
| 3633 } 3634#endif /* DEV_NETMAP */ 3635 /* clear the watch index */ 3636 txbuf->eop = NULL; 3637 } 3638 3639 /* Set number of descriptors available */ 3640 txr->tx_avail = adapter->num_tx_desc; --- 787 unchanged lines hidden (view full) --- 4428 rxbuf = &rxr->rx_buffers[j]; 4429#ifdef DEV_NETMAP 4430 if (slot) { 4431 /* slot sj is mapped to the j-th NIC-ring entry */ 4432 int sj = netmap_idx_n2k(&na->rx_rings[rxr->me], j); 4433 uint64_t paddr; 4434 void *addr; 4435 | 3633 } 3634#endif /* DEV_NETMAP */ 3635 /* clear the watch index */ 3636 txbuf->eop = NULL; 3637 } 3638 3639 /* Set number of descriptors available */ 3640 txr->tx_avail = adapter->num_tx_desc; --- 787 unchanged lines hidden (view full) --- 4428 rxbuf = &rxr->rx_buffers[j]; 4429#ifdef DEV_NETMAP 4430 if (slot) { 4431 /* slot sj is mapped to the j-th NIC-ring entry */ 4432 int sj = netmap_idx_n2k(&na->rx_rings[rxr->me], j); 4433 uint64_t paddr; 4434 void *addr; 4435 |
| 4436 addr = PNMB(slot + sj, &paddr); 4437 netmap_load_map(rxr->ptag, rxbuf->pmap, addr); | 4436 addr = PNMB(na, slot + sj, &paddr); 4437 netmap_load_map(na, rxr->ptag, rxbuf->pmap, addr); |
| 4438 /* Update descriptor */ 4439 rxr->rx_base[j].read.pkt_addr = htole64(paddr); 4440 continue; 4441 } 4442#endif /* DEV_NETMAP */ 4443 if (rxr->hdr_split == FALSE) 4444 goto skip_head; 4445 --- 1885 unchanged lines hidden --- | 4438 /* Update descriptor */ 4439 rxr->rx_base[j].read.pkt_addr = htole64(paddr); 4440 continue; 4441 } 4442#endif /* DEV_NETMAP */ 4443 if (rxr->hdr_split == FALSE) 4444 goto skip_head; 4445 --- 1885 unchanged lines hidden --- |