aboutsummaryrefslogtreecommitdiff
path: root/sys/netatm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netatm')
-rw-r--r--sys/netatm/atm_cm.h8
-rw-r--r--sys/netatm/atm_if.h4
-rw-r--r--sys/netatm/atm_pcb.h4
-rw-r--r--sys/netatm/atm_sigmgr.h8
-rw-r--r--sys/netatm/atm_stack.h4
-rw-r--r--sys/netatm/atm_sys.h4
-rw-r--r--sys/netatm/atm_var.h4
-rw-r--r--sys/netatm/atm_vc.h4
-rw-r--r--sys/netatm/ipatm/ipatm_var.h8
-rw-r--r--sys/netatm/kern_include.h5
-rw-r--r--sys/netatm/port.h8
-rw-r--r--sys/netatm/sigpvc/sigpvc_var.h12
-rw-r--r--sys/netatm/spans/spans_cls.h4
-rw-r--r--sys/netatm/spans/spans_var.h12
-rw-r--r--sys/netatm/uni/sscf_uni_var.h4
-rw-r--r--sys/netatm/uni/sscop_var.h4
-rw-r--r--sys/netatm/uni/uniip_var.h12
-rw-r--r--sys/netatm/uni/unisig_var.h12
18 files changed, 58 insertions, 63 deletions
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index 0507caa8fcfa..bbeb18a6f2e3 100644
--- a/sys/netatm/atm_cm.h
+++ b/sys/netatm/atm_cm.h
@@ -45,7 +45,7 @@ struct atm_connection;
struct atm_attributes;
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure used to define a kernel ATM endpoint service module and its
* associated entry points. An endpoint service is defined as a kernel
@@ -94,7 +94,7 @@ struct atm_endpoint {
__P((void *, KBuffer *, u_int));
};
typedef struct atm_endpoint Atm_endpoint;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* Endpoint IDs
@@ -230,7 +230,7 @@ typedef struct atm_attributes Atm_attributes;
#define CMAPI_SSCOP 2 /* Reliable data (SSCOP) */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM Connection Instance
*
@@ -343,6 +343,6 @@ struct atm_cm_stat {
u_long cms_rcvconn; /* Packets dropped, bad conn state */
u_long cms_rcvconnvc; /* Packets dropped, bad connvc state */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_CM_H */
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index 3664cba370f3..e7370c60526d 100644
--- a/sys/netatm/atm_if.h
+++ b/sys/netatm/atm_if.h
@@ -142,7 +142,7 @@ struct atm_config {
typedef struct atm_config Atm_config;
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Common structure used to define each physical ATM device interface.
* This structure will (normally) be embedded at the top of each driver's
@@ -381,6 +381,6 @@ typedef atm_intr_t *atm_intr_func_t; /* Pointer to callback function */
extern int atm_intr_index;
#define SCHED_ATM schednetisr(atm_intr_index)
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_IF_H */
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index b5518e8079ac..af273fa69f60 100644
--- a/sys/netatm/atm_pcb.h
+++ b/sys/netatm/atm_pcb.h
@@ -39,7 +39,7 @@
#define _NETATM_ATM_PCB_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM Socket PCB
*
@@ -87,6 +87,6 @@ struct atm_sock_stat {
u_long as_indrop[ATPT_NUM]; /* Input packets dropped */
u_long as_outdrop[ATPT_NUM]; /* Output packets dropped */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_PCB_H */
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index bd502a32424e..6b1d63d92734 100644
--- a/sys/netatm/atm_sigmgr.h
+++ b/sys/netatm/atm_sigmgr.h
@@ -38,7 +38,7 @@
#ifndef _NETATM_ATM_SIGMGR_H
#define _NETATM_ATM_SIGMGR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure common to all ATM Signalling Managers. Each Signalling
* Manager must create one of these and use it to register itself
@@ -66,7 +66,7 @@ struct sigmgr {
int (*sm_ioctl) /* Ioctl handler */
__P((int, caddr_t, caddr_t));
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* ATM Signalling Protocols
@@ -78,7 +78,7 @@ struct sigmgr {
#define ATM_SIG_UNI40 5 /* ATM Forum UNI 4.0 */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Signalling Protocol Instance control block header. Common header for
* every signalling protocol instance control block.
@@ -104,6 +104,6 @@ struct siginst {
#define CALL_CONNECTED 3 /* Connection setup successful */
#define CALL_CLEARED 4 /* Connection has been terminated */
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_SIGMGR_H */
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index be7edc851821..345a1af6a27d 100644
--- a/sys/netatm/atm_stack.h
+++ b/sys/netatm/atm_stack.h
@@ -38,7 +38,7 @@
#ifndef _NETATM_ATM_STACK_H
#define _NETATM_ATM_STACK_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure used to define a kernel-provided ATM stack service and its
* associated entry points. Each stack service provider must register
@@ -282,6 +282,6 @@ struct stackq_entry {
if (atm_stackq_head) \
atm_stack_drain(); \
}
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_STACK_H */
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index 0c240bfceef8..0c71bec534f1 100644
--- a/sys/netatm/atm_sys.h
+++ b/sys/netatm/atm_sys.h
@@ -151,7 +151,7 @@ typedef u_char Encaps_t;
#define ATM_ENC_LLC 2 /* LLC encapsulation */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM timer control block. Used to schedule a timeout via atm_timeout().
* This control block will typically be embedded in a processing-specific
@@ -270,6 +270,6 @@ struct sp_link {
#define ATM_DEBUGN5(f,a1,a2,a3,a4,a5)
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_SYS_H */
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index d19a475bd33d..66edeb542830 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -39,7 +39,7 @@
#define _NETATM_ATM_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global variable declarations
*/
@@ -203,6 +203,6 @@ int atm_dgram_usrreq __P((struct socket *, int, KBuffer *,
KBuffer *, KBuffer *));
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_VAR_H */
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index 64d1b6f39a9d..8ee42530aa4f 100644
--- a/sys/netatm/atm_vc.h
+++ b/sys/netatm/atm_vc.h
@@ -39,7 +39,7 @@
#define _NETATM_ATM_VC_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM Virtual Channel Connection control block. All vccb's are created
* and controlled by an ATM signalling manager. Each ATM signalling
@@ -66,7 +66,7 @@ struct vccb {
long vc_oerrors; /* Errors sending to VCC */
time_t vc_tstamp; /* State transition timestamp */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* VCC Types
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index b587a6e0e4cd..fc5be44beba2 100644
--- a/sys/netatm/ipatm/ipatm_var.h
+++ b/sys/netatm/ipatm/ipatm_var.h
@@ -38,7 +38,7 @@
#ifndef _IPATM_IPATM_VAR_H
#define _IPATM_IPATM_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing information for each VCC, both SVC and PVC, which
* supports IP traffic.
@@ -60,7 +60,7 @@ struct ipvcc {
};
#define iv_forw iv_elem.q_forw
#define iv_back iv_elem.q_back
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* VCC Flags
@@ -83,7 +83,7 @@ struct ipvcc {
#define IPVCC_CLOSED 6 /* VCC has been closed */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing IP-specific information for each ATM network
* interface in the system.
@@ -210,6 +210,6 @@ extern Atm_attributes ipatm_aal5llc;
extern Atm_attributes ipatm_aal5null;
extern Atm_attributes ipatm_aal4null;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _IPATM_IPATM_VAR_H */
diff --git a/sys/netatm/kern_include.h b/sys/netatm/kern_include.h
index 58547413db83..3817c2cf050c 100644
--- a/sys/netatm/kern_include.h
+++ b/sys/netatm/kern_include.h
@@ -38,11 +38,6 @@
#ifndef _NETATM_KERN_INCLUDE_H
#define _NETATM_KERN_INCLUDE_H
-/*
- * Note that we're compiling kernel code
- */
-#define ATM_KERNEL
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index d9a0b133c4ec..ca111c7b43e2 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -72,7 +72,7 @@
* Zeros len bytes of data from addr.
*
*/
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
#if (defined(BSD) && (BSD >= 199103))
#include <sys/malloc.h>
#define KM_ALLOC(size, type, flags) malloc((size), (type), (flags))
@@ -119,10 +119,10 @@
#endif
#define XM_COPY(f, t, l) UM_COPY((f), (t), (l))
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Kernel buffers
*
@@ -526,7 +526,7 @@ typedef int KTimeout_ret;
#define KT_TIME(t) ((t) = time)
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#ifndef NTOHL
#if BYTE_ORDER == BIG_ENDIAN
diff --git a/sys/netatm/sigpvc/sigpvc_var.h b/sys/netatm/sigpvc/sigpvc_var.h
index 2cb96bcda2f0..3488a0f303ed 100644
--- a/sys/netatm/sigpvc/sigpvc_var.h
+++ b/sys/netatm/sigpvc/sigpvc_var.h
@@ -38,7 +38,7 @@
#ifndef _SIGPVC_SIGPVC_VAR_H
#define _SIGPVC_SIGPVC_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing state information for each SigPVC protocol instance.
* There will be one instance for each ATM device interface using the SigPVC
@@ -52,7 +52,7 @@ struct sigpvc {
#define pv_addr pv_inst.si_addr
#define pv_vccq pv_inst.si_vccq
#define pv_state pv_inst.si_state
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* SigPVC Protocol States
@@ -61,7 +61,7 @@ struct sigpvc {
#define SIGPVC_DETACH 2 /* Detach in progress */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* SigPVC Virtual Channel Connection control block. All information regarding
* the state of a SigPVC controlled VCC will be recorded here. There will be
@@ -70,7 +70,7 @@ struct sigpvc {
struct sigpvc_vccb {
struct vccb vcp_hdr; /* Generic vccb */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* SigPVC VCC Signalling Protocol States
@@ -80,7 +80,7 @@ struct sigpvc_vccb {
#define VCCS_FREE 2 /* Waiting for user to free resources */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global function declarations
*/
@@ -90,6 +90,6 @@ struct sigpvc_vccb {
int sigpvc_create_pvc __P((struct sigpvc *, Atm_connvc *, int *));
void sigpvc_close_vcc __P((struct vccb *));
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _SIGPVC_SIGPVC_VAR_H */
diff --git a/sys/netatm/spans/spans_cls.h b/sys/netatm/spans/spans_cls.h
index 02e2f6a12a07..3c7a7ffe673d 100644
--- a/sys/netatm/spans/spans_cls.h
+++ b/sys/netatm/spans/spans_cls.h
@@ -147,7 +147,7 @@ struct spansarp_hdr {
#define ARP_PACKET_LEN \
(sizeof(struct spanscls_hdr) + sizeof(struct spansarp_hdr))
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Macros for manipulating SPANS ARP tables and entries
*/
@@ -183,6 +183,6 @@ struct spansarp_hdr {
extern struct spanscls *spanscls_head;
extern struct spanscls_hdr spanscls_hdr;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _SPANS_SPANSCLS_H */
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index f93d1fc5a2d2..3f0dbb34b07b 100644
--- a/sys/netatm/spans/spans_var.h
+++ b/sys/netatm/spans/spans_var.h
@@ -38,7 +38,7 @@
#ifndef _SPANS_SPANS_VAR_H
#define _SPANS_SPANS_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Constants to indicate the state of the signalling interface
*/
@@ -74,7 +74,7 @@ struct spans {
#define sp_vccq sp_inst.si_vccq
#define sp_state sp_inst.si_state
#define sp_ipserv sp_inst.si_ipserv
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* SPANS Protocol States
@@ -89,7 +89,7 @@ struct spans {
#define SPANS_PROBE_ERR_WAIT (3 * ATM_HZ) /* Time to wait if send probe fails */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* SPANS Virtual Channel Connection control block. All information
* regarding the state of a SPANS-controlled VCC will be recorded here.
@@ -130,7 +130,7 @@ struct spans_vccb {
#define SV_MAX_RETRY 3
#define SV_TIMEOUT (ATM_HZ)
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
@@ -147,7 +147,7 @@ struct spans_vccb {
#define SPANS_VC_FREE 8 /* Waiting for user to free resources */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Macro to compare two SPANS addresses.
*
@@ -254,6 +254,6 @@ extern struct sp_info spans_vcpool;
extern struct sp_info spans_msgpool;
extern struct t_atm_cause spans_cause;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _SPANS_SPANS_VAR_H */
diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h
index f8b70aacaf76..4f4cea77c985 100644
--- a/sys/netatm/uni/sscf_uni_var.h
+++ b/sys/netatm/uni/sscf_uni_var.h
@@ -87,7 +87,7 @@ struct univcc {
#define UVF_NOESTIND 0x0001 /* Don't process ESTABLISH_IND */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global function declarations
*/
@@ -110,6 +110,6 @@ void sscf_uni_upper __P((int, void *, int, int));
*/
extern int sscf_uni_vccnt;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNI_SSCF_UNI_VAR_H */
diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h
index f29108a40d0b..b06321272981 100644
--- a/sys/netatm/uni/sscop_var.h
+++ b/sys/netatm/uni/sscop_var.h
@@ -134,7 +134,7 @@ struct sscop_stat {
u_long sos_maa_error[MAA_ERROR_COUNT]; /* Management errors */
};
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global function declarations
*/
@@ -278,6 +278,6 @@ extern void (*(*sscop_qsaal_pdutab[]))
extern void (*(*sscop_q2110_pdutab[]))
__P((struct sscop *, KBuffer *, caddr_t));
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNI_SSCOP_VAR_H */
diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h
index 409d2ad6de0f..343fd78af667 100644
--- a/sys/netatm/uni/uniip_var.h
+++ b/sys/netatm/uni/uniip_var.h
@@ -38,7 +38,7 @@
#ifndef _UNI_UNIIP_VAR_H
#define _UNI_UNIIP_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* UNI IP network interface structure. There will be one such structure for
* each IP network interface attached via a UNI signalling instance.
@@ -59,7 +59,7 @@ struct uniip {
#define uip_arpsvrip uip_arpsvrmap.am_dstip
#define uip_arpsvratm uip_arpsvrmap.am_dstatm
#define uip_arpsvrsub uip_arpsvrmap.am_dstatmsub
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* UNI Interface Flags
@@ -77,7 +77,7 @@ struct uniip {
#define UIAS_CLIENT_ACTIVE 6 /* Client - active */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure for allowable IP prefixes for ATMARP server registration
*/
@@ -126,7 +126,7 @@ struct uniarp {
#define ua_dstip ua_arpmap.am_dstip
#define ua_dstatm ua_arpmap.am_dstatm
#define ua_dstatmsub ua_arpmap.am_dstatmsub
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* UNIARP Entry Flags
@@ -197,7 +197,7 @@ struct atmarp_hdr {
#define ARP_TL_LMASK 0x3f /* Length mask */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Timer macros
*/
@@ -313,6 +313,6 @@ int uniip_start __P((void));
int uniip_stop __P((void));
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNI_UNIIP_VAR_H */
diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h
index ca7e7faf56d5..92e836276fa7 100644
--- a/sys/netatm/uni/unisig_var.h
+++ b/sys/netatm/uni/unisig_var.h
@@ -43,7 +43,7 @@
#define FALSE 0
#endif
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing state information for each UNI protocol
* instance. There will be one instance for each ATM device interface
@@ -68,7 +68,7 @@ struct unisig {
#define us_vccq us_inst.si_vccq
#define us_state us_inst.si_state
#define us_ipserv us_inst.si_ipserv
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* Signalling manager states
@@ -99,7 +99,7 @@ struct unisig {
#define UNISIG_SSCF_TIMEOUT (3 * ATM_HZ)
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* UNI Virtual Channel Connection control block. All information
* regarding the state of a UNI-controlled VCC will be recorded here.
@@ -130,7 +130,7 @@ struct unisig_vccb {
#define uv_ierrors vcp_hdr.vc_ierrors
#define uv_oerrors vcp_hdr.vc_oerrors
#define uv_tstamp vcp_hdr.vc_tstamp
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* UNI VCC protocol states. Taken from The ATM Forum UNI 3.0 (section
@@ -182,7 +182,7 @@ struct unisig_vccb {
#define UNI_VC_SAAL_ESTAB 20 /* Signalling AAL back up */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* UNI Timer Values. These values (except for T317) are taken from
* The ATM Forum UNI 3.0 (section 5.7.2).
@@ -318,6 +318,6 @@ extern struct sp_info unisig_vcpool;
extern struct sp_info unisig_msgpool;
extern struct sp_info unisig_iepool;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNISIG_VAR_H */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 03:30:06 +0000