Deleted Added
full compact
ixl_txrx.c (283119) ixl_txrx.c (295831)
1/******************************************************************************
2
3 Copyright (c) 2013-2015, 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) 2013-2015, 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/ixl/ixl_txrx.c 283119 2015-05-19 18:35:18Z jhb $*/
33/*$FreeBSD: head/sys/dev/ixl/ixl_txrx.c 295831 2016-02-19 22:48:20Z erj $*/
34
35/*
36** IXL driver TX/RX Routines:
37** This was seperated to allow usage by
38** both the BASE and the VF drivers.
39*/
40
41#ifndef IXL_STANDALONE_BUILD

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

281 * Map the packet for DMA.
282 */
283 error = bus_dmamap_load_mbuf_sg(tag, map,
284 *m_headp, segs, &nsegs, BUS_DMA_NOWAIT);
285
286 if (error == EFBIG) {
287 struct mbuf *m;
288
34
35/*
36** IXL driver TX/RX Routines:
37** This was seperated to allow usage by
38** both the BASE and the VF drivers.
39*/
40
41#ifndef IXL_STANDALONE_BUILD

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

281 * Map the packet for DMA.
282 */
283 error = bus_dmamap_load_mbuf_sg(tag, map,
284 *m_headp, segs, &nsegs, BUS_DMA_NOWAIT);
285
286 if (error == EFBIG) {
287 struct mbuf *m;
288
289 m = m_collapse(*m_headp, M_NOWAIT, maxsegs);
289 m = m_defrag(*m_headp, M_NOWAIT);
290 if (m == NULL) {
291 que->mbuf_defrag_failed++;
292 m_freem(*m_headp);
293 *m_headp = NULL;
294 return (ENOBUFS);
295 }
296 *m_headp = m;
297

--- 1535 unchanged lines hidden ---
290 if (m == NULL) {
291 que->mbuf_defrag_failed++;
292 m_freem(*m_headp);
293 *m_headp = NULL;
294 return (ENOBUFS);
295 }
296 *m_headp = m;
297

--- 1535 unchanged lines hidden ---