Deleted Added
full compact
sctp_os_bsd.h (179786) sctp_os_bsd.h (180387)
1/*-
2 * Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met:
6 *
7 * a) Redistributions of source code must retain the above copyright notice,
8 * this list of conditions and the following disclaimer.

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

23 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGE.
29 */
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met:
6 *
7 * a) Redistributions of source code must retain the above copyright notice,
8 * this list of conditions and the following disclaimer.

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

23 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGE.
29 */
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/netinet/sctp_os_bsd.h 179786 2008-06-14 13:24:49Z rrs $");
31__FBSDID("$FreeBSD: head/sys/netinet/sctp_os_bsd.h 180387 2008-07-09 16:45:30Z rrs $");
32#ifndef __sctp_os_bsd_h__
33#define __sctp_os_bsd_h__
34/*
35 * includes
36 */
37#include "opt_ipsec.h"
38#include "opt_compat.h"
39#include "opt_inet6.h"

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

55#include <sys/uio.h>
56#include <sys/lock.h>
57#include <sys/rwlock.h>
58#include <sys/kthread.h>
59#include <sys/priv.h>
60#include <sys/random.h>
61#include <sys/limits.h>
62#include <sys/queue.h>
32#ifndef __sctp_os_bsd_h__
33#define __sctp_os_bsd_h__
34/*
35 * includes
36 */
37#include "opt_ipsec.h"
38#include "opt_compat.h"
39#include "opt_inet6.h"

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

55#include <sys/uio.h>
56#include <sys/lock.h>
57#include <sys/rwlock.h>
58#include <sys/kthread.h>
59#include <sys/priv.h>
60#include <sys/random.h>
61#include <sys/limits.h>
62#include <sys/queue.h>
63#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE)
64#include <sys/vimage.h>
65#endif
63#include <machine/cpu.h>
64
65#include <net/if.h>
66#include <net/if_types.h>
67#include <net/if_var.h>
68#include <net/route.h>
69
70#include <netinet/in.h>

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

134
135#define SCTP_BASE_INFO(__m) system_base_info.sctppcbinfo.__m
136#define SCTP_BASE_STATS system_base_info.sctpstat
137#define SCTP_BASE_STAT(__m) system_base_info.sctpstat.__m
138#define SCTP_BASE_SYSCTL(__m) system_base_info.sctpsysctl.__m
139#define SCTP_BASE_VAR(__m) system_base_info.__m
140
141/*
66#include <machine/cpu.h>
67
68#include <net/if.h>
69#include <net/if_types.h>
70#include <net/if_var.h>
71#include <net/route.h>
72
73#include <netinet/in.h>

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

137
138#define SCTP_BASE_INFO(__m) system_base_info.sctppcbinfo.__m
139#define SCTP_BASE_STATS system_base_info.sctpstat
140#define SCTP_BASE_STAT(__m) system_base_info.sctpstat.__m
141#define SCTP_BASE_SYSCTL(__m) system_base_info.sctpsysctl.__m
142#define SCTP_BASE_VAR(__m) system_base_info.__m
143
144/*
145 * Macros to expand out globals defined by various modules
146 * to either a real global or a virtualized instance of one,
147 * depending on whether VIMAGE is defined in opt_vimage.h
148 * XXX opt_vimage.h not yet present, more framework to come.
149 * XXX so will always evaluate to the global for now (VIMAGE not defined)
150 */
151/* first define modules that supply us information */
152#define MOD_NET net
153#define MOD_INET inet
154#define MOD_INET6 inet6
155#define MOD_IPSEC ipsec
156
157/* then define the macro(s) that hook into the vimage macros */
158#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE)
159#define VSYMNAME(__MODULE) vnet_ ## __MODULE
160#define MODULE_GLOBAL(__MODULE, __SYMBOL) VSYM(VSYMNAME(__MODULE), __SYMBOL)
161#else
162#define MODULE_GLOBAL(__MODULE, __SYMBOL) (__SYMBOL)
163#endif
164/*
142 *
143 */
144#define USER_ADDR_NULL (NULL) /* FIX ME: temp */
145#define SCTP_LIST_EMPTY(list) LIST_EMPTY(list)
146
147#if defined(SCTP_DEBUG)
148#define SCTPDBG(level, params...) \
149{ \

--- 329 unchanged lines hidden ---
165 *
166 */
167#define USER_ADDR_NULL (NULL) /* FIX ME: temp */
168#define SCTP_LIST_EMPTY(list) LIST_EMPTY(list)
169
170#if defined(SCTP_DEBUG)
171#define SCTPDBG(level, params...) \
172{ \

--- 329 unchanged lines hidden ---