Deleted Added
full compact
oce_util.c (231879) oce_util.c (247880)
1/*-
2 * Copyright (C) 2012 Emulex
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright notice,

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

31 * Contact Information:
32 * freebsd-drivers@emulex.com
33 *
34 * Emulex
35 * 3333 Susan Street
36 * Costa Mesa, CA 92626
37 */
38
1/*-
2 * Copyright (C) 2012 Emulex
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright notice,

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

31 * Contact Information:
32 * freebsd-drivers@emulex.com
33 *
34 * Emulex
35 * 3333 Susan Street
36 * Costa Mesa, CA 92626
37 */
38
39/* $FreeBSD: head/sys/dev/oce/oce_util.c 231879 2012-02-17 13:55:17Z luigi $ */
40
39
40/* $FreeBSD: head/sys/dev/oce/oce_util.c 247880 2013-03-06 09:53:38Z delphij $ */
41
42
41#include "oce_if.h"
42
43static void oce_dma_map_ring(void *arg,
44 bus_dma_segment_t *segs,
45 int nseg,
46 int error);
47
48/**

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

66 BUS_SPACE_MAXADDR,
67 BUS_SPACE_MAXADDR,
68 NULL, NULL,
69 size, 1, size, 0, NULL, NULL, &dma->tag);
70
71 if (rc == 0) {
72 rc = bus_dmamem_alloc(dma->tag,
73 &dma->ptr,
43#include "oce_if.h"
44
45static void oce_dma_map_ring(void *arg,
46 bus_dma_segment_t *segs,
47 int nseg,
48 int error);
49
50/**

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

68 BUS_SPACE_MAXADDR,
69 BUS_SPACE_MAXADDR,
70 NULL, NULL,
71 size, 1, size, 0, NULL, NULL, &dma->tag);
72
73 if (rc == 0) {
74 rc = bus_dmamem_alloc(dma->tag,
75 &dma->ptr,
74 BUS_DMA_NOWAIT | BUS_DMA_COHERENT,
76 BUS_DMA_NOWAIT | BUS_DMA_COHERENT |
77 BUS_DMA_ZERO,
75 &dma->map);
76 }
77
78 dma->paddr = 0;
79 if (rc == 0) {
80 rc = bus_dmamap_load(dma->tag,
81 dma->map,
82 dma->ptr,

--- 186 unchanged lines hidden ---
78 &dma->map);
79 }
80
81 dma->paddr = 0;
82 if (rc == 0) {
83 rc = bus_dmamap_load(dma->tag,
84 dma->map,
85 dma->ptr,

--- 186 unchanged lines hidden ---