diff options
author | rwatson <rwatson@FreeBSD.org> | 2005-07-19 13:36:39 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2005-07-19 13:36:39 +0000 |
commit | 1fc26580fcbc0b402438a4c701ab4ba82f8b806a (patch) | |
tree | 5e7428078c89ab79b1f50da6ce2ffe4d444adc7d /sys/netnatm/natm.h | |
parent | d49765d3fd851d4b1a585c996379bc57a6dff02c (diff) | |
download | FreeBSD-src-1fc26580fcbc0b402438a4c701ab4ba82f8b806a.zip FreeBSD-src-1fc26580fcbc0b402438a4c701ab4ba82f8b806a.tar.gz |
Remove FreeBSD 2.2 protocol usrreq compatibility code.
Remove minor #ifdefs for early NetBSD and OpenBSD compatibility.
Remove spl-related definitions.
MFC after: 2 weeks
Diffstat (limited to 'sys/netnatm/natm.h')
-rw-r--r-- | sys/netnatm/natm.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h index 325a6b8..0a2ebb8 100644 --- a/sys/netnatm/natm.h +++ b/sys/netnatm/natm.h @@ -55,16 +55,6 @@ struct sockaddr_natm { u_int8_t snatm_vpi; /* vpi */ }; -#if defined(__FreeBSD__) && defined(_KERNEL) - -#define SPLSOFTNET() splnet() - -#elif defined(__NetBSD__) || defined(__OpenBSD__) - -#define SPLSOFTNET() splsoftnet() - -#endif - #ifdef _KERNEL /* @@ -119,22 +109,7 @@ void npcb_free(struct natmpcb *, int); struct natmpcb *npcb_add(struct natmpcb *, struct ifnet *, uint16_t, uint8_t); /* natm.c */ -#if defined(__NetBSD__) || defined(__OpenBSD__) -int natm_usrreq(struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *, struct proc *); -#elif defined(__FreeBSD__) -#if __FreeBSD__ > 2 -/* - * FreeBSD new usrreqs style appeared since 2.2. compatibility to old style - * has gone since 3.0. - */ -#define FREEBSD_USRREQS extern struct pr_usrreqs natm_usrreqs; -#else /* !( __FreeBSD__ > 2) */ -int natm_usrreq(struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *); -#endif /* !( __FreeBSD__ > 2) */ -#endif #ifdef SYSCTL_HANDLER_ARGS int natm0_sysctl(SYSCTL_HANDLER_ARGS); |